diff --git a/lit-code-block/src/components/editor/ui/button/button.ts b/lit-code-block/src/components/editor/ui/button/button.ts
index aef47e4e1f..e9979fb5c3 100644
--- a/lit-code-block/src/components/editor/ui/button/button.ts
+++ b/lit-code-block/src/components/editor/ui/button/button.ts
@@ -45,31 +45,37 @@ class LitButton extends LitElement {
             ?disabled=${this.disabled}
             @mousedown=${this.handleMouseDown}
           >
-            ${this.icon
-              ? html`
-                  <div class="${this.icon}"></div>
-                `
-              : nothing}
-            ${tooltip
-              ? html`
-                  <span class="sr-only">${tooltip}</span>
-                `
-              : nothing}
+            ${
+              this.icon
+                ? html`
+                    <div class="${this.icon}"></div>
+                  `
+                : nothing
+            }
+            ${
+              tooltip
+                ? html`
+                    <span class="sr-only">${tooltip}</span>
+                  `
+                : nothing
+            }
           </button>
         </prosekit-tooltip-trigger>
-        ${tooltip
-          ? html`
-              <prosekit-tooltip-positioner
-                class="block overflow-visible w-min h-min z-50 ease-out transition-transform duration-100 motion-reduce:transition-none"
-              >
-                <prosekit-tooltip-popup
-                  class="flex box-border origin-(--transform-origin) transition-[opacity,scale] transition-discrete motion-reduce:transition-none duration-100 data-[state=closed]:duration-150 data-[state=closed]:opacity-0 starting:opacity-0 data-[state=closed]:scale-95 starting:scale-95 overflow-hidden rounded-md border border-solid bg-gray-900 dark:bg-gray-50 px-3 py-1.5 text-xs text-gray-50 dark:text-gray-900 shadow-xs text-nowrap"
+        ${
+          tooltip
+            ? html`
+                <prosekit-tooltip-positioner
+                  class="block overflow-visible w-min h-min z-50 ease-out transition-transform duration-100 motion-reduce:transition-none"
                 >
-                  ${tooltip}
-                </prosekit-tooltip-popup>
-              </prosekit-tooltip-positioner>
-            `
-          : nothing}
+                  <prosekit-tooltip-popup
+                    class="flex box-border origin-(--transform-origin) transition-[opacity,scale] transition-discrete motion-reduce:transition-none duration-100 data-[state=closed]:duration-150 data-[state=closed]:opacity-0 starting:opacity-0 data-[state=closed]:scale-95 starting:scale-95 overflow-hidden rounded-md border border-solid bg-gray-900 dark:bg-gray-50 px-3 py-1.5 text-xs text-gray-50 dark:text-gray-900 shadow-xs text-nowrap"
+                  >
+                    ${tooltip}
+                  </prosekit-tooltip-popup>
+                </prosekit-tooltip-positioner>
+              `
+            : nothing
+        }
       </prosekit-tooltip-root>
     `
   }
diff --git a/lit-code-block/src/components/editor/ui/image-upload-popover/image-upload-popover.ts b/lit-code-block/src/components/editor/ui/image-upload-popover/image-upload-popover.ts
index 4ddfdbce9a..6fae6c64ba 100644
--- a/lit-code-block/src/components/editor/ui/image-upload-popover/image-upload-popover.ts
+++ b/lit-code-block/src/components/editor/ui/image-upload-popover/image-upload-popover.ts
@@ -127,51 +127,59 @@ class LitImageUploadPopover extends LitElement {
           <prosekit-popover-popup
             class="box-border origin-(--transform-origin) transition-[opacity,scale] transition-discrete motion-reduce:transition-none data-[state=closed]:duration-150 data-[state=closed]:opacity-0 starting:opacity-0 data-[state=closed]:scale-95 starting:scale-95 duration-40 rounded-xl border border-gray-200 dark:border-gray-800 shadow-lg bg-[canvas] flex flex-col gap-y-4 p-6 text-sm w-sm"
           >
-            ${!this.file
-              ? html`
-                  <label for="id-link-${this.ariaId}">Embed Link</label>
-                  <input
-                    id="id-link-${this.ariaId}"
-                    class="flex h-9 rounded-md w-full bg-[canvas] px-3 py-2 text-sm placeholder:text-gray-500 dark:placeholder:text-gray-500 transition border box-border border-gray-200 dark:border-gray-800 border-solid ring-0 ring-transparent focus-visible:ring-2 focus-visible:ring-gray-900 dark:focus-visible:ring-gray-300 focus-visible:ring-offset-0 outline-hidden focus-visible:outline-hidden file:border-0 file:bg-transparent file:text-sm file:font-medium disabled:cursor-not-allowed disabled:opacity-50"
-                    placeholder="Paste the image link..."
-                    type="url"
-                    .value=${this.url}
-                    @input=${this.handleUrlChange}
-                  />
-                `
-              : nothing}
-            ${!this.url
-              ? html`
-                  <label for="id-upload-${this.ariaId}">Upload</label>
-                  <input
-                    id="id-upload-${this.ariaId}"
-                    class="flex h-9 rounded-md w-full bg-[canvas] px-3 py-2 text-sm placeholder:text-gray-500 dark:placeholder:text-gray-500 transition border box-border border-gray-200 dark:border-gray-800 border-solid ring-0 ring-transparent focus-visible:ring-2 focus-visible:ring-gray-900 dark:focus-visible:ring-gray-300 focus-visible:ring-offset-0 outline-hidden focus-visible:outline-hidden file:border-0 file:bg-transparent file:text-sm file:font-medium disabled:cursor-not-allowed disabled:opacity-50"
-                    accept="image/*"
-                    type="file"
-                    @change=${this.handleFileChange}
-                  />
-                `
-              : nothing}
-            ${this.url
-              ? html`
-                  <button
-                    class="inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium ring-offset-white dark:ring-offset-gray-950 transition-colors focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-gray-900 dark:focus-visible:ring-gray-300 focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 border-0 bg-gray-900 dark:bg-gray-50 text-gray-50 dark:text-gray-900 hover:bg-gray-900/90 dark:hover:bg-gray-50/90 h-10 px-4 py-2 w-full"
-                    @click=${this.handleSubmit}
-                  >
-                    Insert Image
-                  </button>
-                `
-              : nothing}
-            ${this.file
-              ? html`
-                  <button
-                    class="inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium ring-offset-white dark:ring-offset-gray-950 transition-colors focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-gray-900 dark:focus-visible:ring-gray-300 focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 border-0 bg-gray-900 dark:bg-gray-50 text-gray-50 dark:text-gray-900 hover:bg-gray-900/90 dark:hover:bg-gray-50/90 h-10 px-4 py-2 w-full"
-                    @click=${this.handleSubmit}
-                  >
-                    Upload Image
-                  </button>
-                `
-              : nothing}
+            ${
+              !this.file
+                ? html`
+                    <label for="id-link-${this.ariaId}">Embed Link</label>
+                    <input
+                      id="id-link-${this.ariaId}"
+                      class="flex h-9 rounded-md w-full bg-[canvas] px-3 py-2 text-sm placeholder:text-gray-500 dark:placeholder:text-gray-500 transition border box-border border-gray-200 dark:border-gray-800 border-solid ring-0 ring-transparent focus-visible:ring-2 focus-visible:ring-gray-900 dark:focus-visible:ring-gray-300 focus-visible:ring-offset-0 outline-hidden focus-visible:outline-hidden file:border-0 file:bg-transparent file:text-sm file:font-medium disabled:cursor-not-allowed disabled:opacity-50"
+                      placeholder="Paste the image link..."
+                      type="url"
+                      .value=${this.url}
+                      @input=${this.handleUrlChange}
+                    />
+                  `
+                : nothing
+            }
+            ${
+              !this.url
+                ? html`
+                    <label for="id-upload-${this.ariaId}">Upload</label>
+                    <input
+                      id="id-upload-${this.ariaId}"
+                      class="flex h-9 rounded-md w-full bg-[canvas] px-3 py-2 text-sm placeholder:text-gray-500 dark:placeholder:text-gray-500 transition border box-border border-gray-200 dark:border-gray-800 border-solid ring-0 ring-transparent focus-visible:ring-2 focus-visible:ring-gray-900 dark:focus-visible:ring-gray-300 focus-visible:ring-offset-0 outline-hidden focus-visible:outline-hidden file:border-0 file:bg-transparent file:text-sm file:font-medium disabled:cursor-not-allowed disabled:opacity-50"
+                      accept="image/*"
+                      type="file"
+                      @change=${this.handleFileChange}
+                    />
+                  `
+                : nothing
+            }
+            ${
+              this.url
+                ? html`
+                    <button
+                      class="inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium ring-offset-white dark:ring-offset-gray-950 transition-colors focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-gray-900 dark:focus-visible:ring-gray-300 focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 border-0 bg-gray-900 dark:bg-gray-50 text-gray-50 dark:text-gray-900 hover:bg-gray-900/90 dark:hover:bg-gray-50/90 h-10 px-4 py-2 w-full"
+                      @click=${this.handleSubmit}
+                    >
+                      Insert Image
+                    </button>
+                  `
+                : nothing
+            }
+            ${
+              this.file
+                ? html`
+                    <button
+                      class="inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium ring-offset-white dark:ring-offset-gray-950 transition-colors focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-gray-900 dark:focus-visible:ring-gray-300 focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 border-0 bg-gray-900 dark:bg-gray-50 text-gray-50 dark:text-gray-900 hover:bg-gray-900/90 dark:hover:bg-gray-50/90 h-10 px-4 py-2 w-full"
+                      @click=${this.handleSubmit}
+                    >
+                      Upload Image
+                    </button>
+                  `
+                : nothing
+            }
           </prosekit-popover-popup>
         </prosekit-popover-positioner>
       </prosekit-popover-root>
diff --git a/lit-code-block/src/components/editor/ui/toolbar/toolbar.ts b/lit-code-block/src/components/editor/ui/toolbar/toolbar.ts
index 11c3f99372..99762750ca 100644
--- a/lit-code-block/src/components/editor/ui/toolbar/toolbar.ts
+++ b/lit-code-block/src/components/editor/ui/toolbar/toolbar.ts
@@ -220,8 +220,7 @@ class LitToolbar extends LitElement {
 
   override render() {
     const editor = this.editorConsumer.value as
-      | Editor<BasicExtension>
-      | undefined
+      Editor<BasicExtension> | undefined
     if (!editor) {
       return nothing
     }
@@ -232,226 +231,266 @@ class LitToolbar extends LitElement {
       <div
         class="z-2 box-border border-gray-200 dark:border-gray-800 border-solid border-l-0 border-r-0 border-t-0 border-b flex flex-wrap gap-1 p-2 items-center"
       >
-        ${items.undo
-          ? html`
-              <lit-editor-button
-                .pressed=${items.undo.isActive}
-                .disabled=${!items.undo.canExec}
-                tooltip="Undo"
-                icon="i-lucide-undo-2 size-5 block"
-                @click=${items.undo.command}
-              ></lit-editor-button>
-            `
-          : nothing}
-        ${items.redo
-          ? html`
-              <lit-editor-button
-                .pressed=${items.redo.isActive}
-                .disabled=${!items.redo.canExec}
-                tooltip="Redo"
-                icon="i-lucide-redo-2 size-5 block"
-                @click=${items.redo.command}
-              ></lit-editor-button>
-            `
-          : nothing}
-        ${items.bold
-          ? html`
-              <lit-editor-button
-                .pressed=${items.bold.isActive}
-                .disabled=${!items.bold.canExec}
-                tooltip="Bold"
-                icon="i-lucide-bold size-5 block"
-                @click=${items.bold.command}
-              ></lit-editor-button>
-            `
-          : nothing}
-        ${items.italic
-          ? html`
-              <lit-editor-button
-                .pressed=${items.italic.isActive}
-                .disabled=${!items.italic.canExec}
-                tooltip="Italic"
-                icon="i-lucide-italic size-5 block"
-                @click=${items.italic.command}
-              ></lit-editor-button>
-            `
-          : nothing}
-        ${items.underline
-          ? html`
-              <lit-editor-button
-                .pressed=${items.underline.isActive}
-                .disabled=${!items.underline.canExec}
-                tooltip="Underline"
-                icon="i-lucide-underline size-5 block"
-                @click=${items.underline.command}
-              ></lit-editor-button>
-            `
-          : nothing}
-        ${items.strike
-          ? html`
-              <lit-editor-button
-                .pressed=${items.strike.isActive}
-                .disabled=${!items.strike.canExec}
-                tooltip="Strike"
-                icon="i-lucide-strikethrough size-5 block"
-                @click=${items.strike.command}
-              ></lit-editor-button>
-            `
-          : nothing}
-        ${items.code
-          ? html`
-              <lit-editor-button
-                .pressed=${items.code.isActive}
-                .disabled=${!items.code.canExec}
-                tooltip="Code"
-                icon="i-lucide-code size-5 block"
-                @click=${items.code.command}
-              ></lit-editor-button>
-            `
-          : nothing}
-        ${items.codeBlock
-          ? html`
-              <lit-editor-button
-                .pressed=${items.codeBlock.isActive}
-                .disabled=${!items.codeBlock.canExec}
-                tooltip="Code Block"
-                icon="i-lucide-square-code size-5 block"
-                @click=${items.codeBlock.command}
-              ></lit-editor-button>
-            `
-          : nothing}
-        ${items.heading1
-          ? html`
-              <lit-editor-button
-                .pressed=${items.heading1.isActive}
-                .disabled=${!items.heading1.canExec}
-                tooltip="Heading 1"
-                icon="i-lucide-heading-1 size-5 block"
-                @click=${items.heading1.command}
-              ></lit-editor-button>
-            `
-          : nothing}
-        ${items.heading2
-          ? html`
-              <lit-editor-button
-                .pressed=${items.heading2.isActive}
-                .disabled=${!items.heading2.canExec}
-                tooltip="Heading 2"
-                icon="i-lucide-heading-2 size-5 block"
-                @click=${items.heading2.command}
-              ></lit-editor-button>
-            `
-          : nothing}
-        ${items.heading3
-          ? html`
-              <lit-editor-button
-                .pressed=${items.heading3.isActive}
-                .disabled=${!items.heading3.canExec}
-                tooltip="Heading 3"
-                icon="i-lucide-heading-3 size-5 block"
-                @click=${items.heading3.command}
-              ></lit-editor-button>
-            `
-          : nothing}
-        ${items.horizontalRule
-          ? html`
-              <lit-editor-button
-                .pressed=${items.horizontalRule.isActive}
-                .disabled=${!items.horizontalRule.canExec}
-                tooltip="Divider"
-                icon="i-lucide-minus size-5 block"
-                @click=${items.horizontalRule.command}
-              ></lit-editor-button>
-            `
-          : nothing}
-        ${items.blockquote
-          ? html`
-              <lit-editor-button
-                .pressed=${items.blockquote.isActive}
-                .disabled=${!items.blockquote.canExec}
-                tooltip="Blockquote"
-                icon="i-lucide-text-quote size-5 block"
-                @click=${items.blockquote.command}
-              ></lit-editor-button>
-            `
-          : nothing}
-        ${items.bulletList
-          ? html`
-              <lit-editor-button
-                .pressed=${items.bulletList.isActive}
-                .disabled=${!items.bulletList.canExec}
-                tooltip="Bullet List"
-                icon="i-lucide-list size-5 block"
-                @click=${items.bulletList.command}
-              ></lit-editor-button>
-            `
-          : nothing}
-        ${items.orderedList
-          ? html`
-              <lit-editor-button
-                .pressed=${items.orderedList.isActive}
-                .disabled=${!items.orderedList.canExec}
-                tooltip="Ordered List"
-                icon="i-lucide-list-ordered size-5 block"
-                @click=${items.orderedList.command}
-              ></lit-editor-button>
-            `
-          : nothing}
-        ${items.taskList
-          ? html`
-              <lit-editor-button
-                .pressed=${items.taskList.isActive}
-                .disabled=${!items.taskList.canExec}
-                tooltip="Task List"
-                icon="i-lucide-list-checks size-5 block"
-                @click=${items.taskList.command}
-              ></lit-editor-button>
-            `
-          : nothing}
-        ${items.toggleList
-          ? html`
-              <lit-editor-button
-                .pressed=${items.toggleList.isActive}
-                .disabled=${!items.toggleList.canExec}
-                tooltip="Toggle List"
-                icon="i-lucide-list-collapse size-5 block"
-                @click=${items.toggleList.command}
-              ></lit-editor-button>
-            `
-          : nothing}
-        ${items.indentList
-          ? html`
-              <lit-editor-button
-                .pressed=${items.indentList.isActive}
-                .disabled=${!items.indentList.canExec}
-                tooltip="Increase indentation"
-                icon="i-lucide-indent-increase size-5 block"
-                @click=${items.indentList.command}
-              ></lit-editor-button>
-            `
-          : nothing}
-        ${items.dedentList
-          ? html`
-              <lit-editor-button
-                .pressed=${items.dedentList.isActive}
-                .disabled=${!items.dedentList.canExec}
-                tooltip="Decrease indentation"
-                icon="i-lucide-indent-decrease size-5 block"
-                @click=${items.dedentList.command}
-              ></lit-editor-button>
-            `
-          : nothing}
-        ${this.uploader && items.insertImage
-          ? html`
-              <lit-editor-image-upload-popover
-                .editor=${editor}
-                .uploader=${this.uploader}
-                .disabled=${!items.insertImage.canExec}
-                tooltip="Insert Image"
-                icon="i-lucide-image size-5 block"
-              ></lit-editor-image-upload-popover>
-            `
-          : nothing}
+        ${
+          items.undo
+            ? html`
+                <lit-editor-button
+                  .pressed=${items.undo.isActive}
+                  .disabled=${!items.undo.canExec}
+                  tooltip="Undo"
+                  icon="i-lucide-undo-2 size-5 block"
+                  @click=${items.undo.command}
+                ></lit-editor-button>
+              `
+            : nothing
+        }
+        ${
+          items.redo
+            ? html`
+                <lit-editor-button
+                  .pressed=${items.redo.isActive}
+                  .disabled=${!items.redo.canExec}
+                  tooltip="Redo"
+                  icon="i-lucide-redo-2 size-5 block"
+                  @click=${items.redo.command}
+                ></lit-editor-button>
+              `
+            : nothing
+        }
+        ${
+          items.bold
+            ? html`
+                <lit-editor-button
+                  .pressed=${items.bold.isActive}
+                  .disabled=${!items.bold.canExec}
+                  tooltip="Bold"
+                  icon="i-lucide-bold size-5 block"
+                  @click=${items.bold.command}
+                ></lit-editor-button>
+              `
+            : nothing
+        }
+        ${
+          items.italic
+            ? html`
+                <lit-editor-button
+                  .pressed=${items.italic.isActive}
+                  .disabled=${!items.italic.canExec}
+                  tooltip="Italic"
+                  icon="i-lucide-italic size-5 block"
+                  @click=${items.italic.command}
+                ></lit-editor-button>
+              `
+            : nothing
+        }
+        ${
+          items.underline
+            ? html`
+                <lit-editor-button
+                  .pressed=${items.underline.isActive}
+                  .disabled=${!items.underline.canExec}
+                  tooltip="Underline"
+                  icon="i-lucide-underline size-5 block"
+                  @click=${items.underline.command}
+                ></lit-editor-button>
+              `
+            : nothing
+        }
+        ${
+          items.strike
+            ? html`
+                <lit-editor-button
+                  .pressed=${items.strike.isActive}
+                  .disabled=${!items.strike.canExec}
+                  tooltip="Strike"
+                  icon="i-lucide-strikethrough size-5 block"
+                  @click=${items.strike.command}
+                ></lit-editor-button>
+              `
+            : nothing
+        }
+        ${
+          items.code
+            ? html`
+                <lit-editor-button
+                  .pressed=${items.code.isActive}
+                  .disabled=${!items.code.canExec}
+                  tooltip="Code"
+                  icon="i-lucide-code size-5 block"
+                  @click=${items.code.command}
+                ></lit-editor-button>
+              `
+            : nothing
+        }
+        ${
+          items.codeBlock
+            ? html`
+                <lit-editor-button
+                  .pressed=${items.codeBlock.isActive}
+                  .disabled=${!items.codeBlock.canExec}
+                  tooltip="Code Block"
+                  icon="i-lucide-square-code size-5 block"
+                  @click=${items.codeBlock.command}
+                ></lit-editor-button>
+              `
+            : nothing
+        }
+        ${
+          items.heading1
+            ? html`
+                <lit-editor-button
+                  .pressed=${items.heading1.isActive}
+                  .disabled=${!items.heading1.canExec}
+                  tooltip="Heading 1"
+                  icon="i-lucide-heading-1 size-5 block"
+                  @click=${items.heading1.command}
+                ></lit-editor-button>
+              `
+            : nothing
+        }
+        ${
+          items.heading2
+            ? html`
+                <lit-editor-button
+                  .pressed=${items.heading2.isActive}
+                  .disabled=${!items.heading2.canExec}
+                  tooltip="Heading 2"
+                  icon="i-lucide-heading-2 size-5 block"
+                  @click=${items.heading2.command}
+                ></lit-editor-button>
+              `
+            : nothing
+        }
+        ${
+          items.heading3
+            ? html`
+                <lit-editor-button
+                  .pressed=${items.heading3.isActive}
+                  .disabled=${!items.heading3.canExec}
+                  tooltip="Heading 3"
+                  icon="i-lucide-heading-3 size-5 block"
+                  @click=${items.heading3.command}
+                ></lit-editor-button>
+              `
+            : nothing
+        }
+        ${
+          items.horizontalRule
+            ? html`
+                <lit-editor-button
+                  .pressed=${items.horizontalRule.isActive}
+                  .disabled=${!items.horizontalRule.canExec}
+                  tooltip="Divider"
+                  icon="i-lucide-minus size-5 block"
+                  @click=${items.horizontalRule.command}
+                ></lit-editor-button>
+              `
+            : nothing
+        }
+        ${
+          items.blockquote
+            ? html`
+                <lit-editor-button
+                  .pressed=${items.blockquote.isActive}
+                  .disabled=${!items.blockquote.canExec}
+                  tooltip="Blockquote"
+                  icon="i-lucide-text-quote size-5 block"
+                  @click=${items.blockquote.command}
+                ></lit-editor-button>
+              `
+            : nothing
+        }
+        ${
+          items.bulletList
+            ? html`
+                <lit-editor-button
+                  .pressed=${items.bulletList.isActive}
+                  .disabled=${!items.bulletList.canExec}
+                  tooltip="Bullet List"
+                  icon="i-lucide-list size-5 block"
+                  @click=${items.bulletList.command}
+                ></lit-editor-button>
+              `
+            : nothing
+        }
+        ${
+          items.orderedList
+            ? html`
+                <lit-editor-button
+                  .pressed=${items.orderedList.isActive}
+                  .disabled=${!items.orderedList.canExec}
+                  tooltip="Ordered List"
+                  icon="i-lucide-list-ordered size-5 block"
+                  @click=${items.orderedList.command}
+                ></lit-editor-button>
+              `
+            : nothing
+        }
+        ${
+          items.taskList
+            ? html`
+                <lit-editor-button
+                  .pressed=${items.taskList.isActive}
+                  .disabled=${!items.taskList.canExec}
+                  tooltip="Task List"
+                  icon="i-lucide-list-checks size-5 block"
+                  @click=${items.taskList.command}
+                ></lit-editor-button>
+              `
+            : nothing
+        }
+        ${
+          items.toggleList
+            ? html`
+                <lit-editor-button
+                  .pressed=${items.toggleList.isActive}
+                  .disabled=${!items.toggleList.canExec}
+                  tooltip="Toggle List"
+                  icon="i-lucide-list-collapse size-5 block"
+                  @click=${items.toggleList.command}
+                ></lit-editor-button>
+              `
+            : nothing
+        }
+        ${
+          items.indentList
+            ? html`
+                <lit-editor-button
+                  .pressed=${items.indentList.isActive}
+                  .disabled=${!items.indentList.canExec}
+                  tooltip="Increase indentation"
+                  icon="i-lucide-indent-increase size-5 block"
+                  @click=${items.indentList.command}
+                ></lit-editor-button>
+              `
+            : nothing
+        }
+        ${
+          items.dedentList
+            ? html`
+                <lit-editor-button
+                  .pressed=${items.dedentList.isActive}
+                  .disabled=${!items.dedentList.canExec}
+                  tooltip="Decrease indentation"
+                  icon="i-lucide-indent-decrease size-5 block"
+                  @click=${items.dedentList.command}
+                ></lit-editor-button>
+              `
+            : nothing
+        }
+        ${
+          this.uploader && items.insertImage
+            ? html`
+                <lit-editor-image-upload-popover
+                  .editor=${editor}
+                  .uploader=${this.uploader}
+                  .disabled=${!items.insertImage.canExec}
+                  tooltip="Insert Image"
+                  icon="i-lucide-image size-5 block"
+                ></lit-editor-image-upload-popover>
+              `
+            : nothing
+        }
       </div>
     `
   }
diff --git a/lit-full/src/components/editor/ui/button/button.ts b/lit-full/src/components/editor/ui/button/button.ts
index aef47e4e1f..e9979fb5c3 100644
--- a/lit-full/src/components/editor/ui/button/button.ts
+++ b/lit-full/src/components/editor/ui/button/button.ts
@@ -45,31 +45,37 @@ class LitButton extends LitElement {
             ?disabled=${this.disabled}
             @mousedown=${this.handleMouseDown}
           >
-            ${this.icon
-              ? html`
-                  <div class="${this.icon}"></div>
-                `
-              : nothing}
-            ${tooltip
-              ? html`
-                  <span class="sr-only">${tooltip}</span>
-                `
-              : nothing}
+            ${
+              this.icon
+                ? html`
+                    <div class="${this.icon}"></div>
+                  `
+                : nothing
+            }
+            ${
+              tooltip
+                ? html`
+                    <span class="sr-only">${tooltip}</span>
+                  `
+                : nothing
+            }
           </button>
         </prosekit-tooltip-trigger>
-        ${tooltip
-          ? html`
-              <prosekit-tooltip-positioner
-                class="block overflow-visible w-min h-min z-50 ease-out transition-transform duration-100 motion-reduce:transition-none"
-              >
-                <prosekit-tooltip-popup
-                  class="flex box-border origin-(--transform-origin) transition-[opacity,scale] transition-discrete motion-reduce:transition-none duration-100 data-[state=closed]:duration-150 data-[state=closed]:opacity-0 starting:opacity-0 data-[state=closed]:scale-95 starting:scale-95 overflow-hidden rounded-md border border-solid bg-gray-900 dark:bg-gray-50 px-3 py-1.5 text-xs text-gray-50 dark:text-gray-900 shadow-xs text-nowrap"
+        ${
+          tooltip
+            ? html`
+                <prosekit-tooltip-positioner
+                  class="block overflow-visible w-min h-min z-50 ease-out transition-transform duration-100 motion-reduce:transition-none"
                 >
-                  ${tooltip}
-                </prosekit-tooltip-popup>
-              </prosekit-tooltip-positioner>
-            `
-          : nothing}
+                  <prosekit-tooltip-popup
+                    class="flex box-border origin-(--transform-origin) transition-[opacity,scale] transition-discrete motion-reduce:transition-none duration-100 data-[state=closed]:duration-150 data-[state=closed]:opacity-0 starting:opacity-0 data-[state=closed]:scale-95 starting:scale-95 overflow-hidden rounded-md border border-solid bg-gray-900 dark:bg-gray-50 px-3 py-1.5 text-xs text-gray-50 dark:text-gray-900 shadow-xs text-nowrap"
+                  >
+                    ${tooltip}
+                  </prosekit-tooltip-popup>
+                </prosekit-tooltip-positioner>
+              `
+            : nothing
+        }
       </prosekit-tooltip-root>
     `
   }
diff --git a/lit-full/src/components/editor/ui/image-upload-popover/image-upload-popover.ts b/lit-full/src/components/editor/ui/image-upload-popover/image-upload-popover.ts
index 4ddfdbce9a..6fae6c64ba 100644
--- a/lit-full/src/components/editor/ui/image-upload-popover/image-upload-popover.ts
+++ b/lit-full/src/components/editor/ui/image-upload-popover/image-upload-popover.ts
@@ -127,51 +127,59 @@ class LitImageUploadPopover extends LitElement {
           <prosekit-popover-popup
             class="box-border origin-(--transform-origin) transition-[opacity,scale] transition-discrete motion-reduce:transition-none data-[state=closed]:duration-150 data-[state=closed]:opacity-0 starting:opacity-0 data-[state=closed]:scale-95 starting:scale-95 duration-40 rounded-xl border border-gray-200 dark:border-gray-800 shadow-lg bg-[canvas] flex flex-col gap-y-4 p-6 text-sm w-sm"
           >
-            ${!this.file
-              ? html`
-                  <label for="id-link-${this.ariaId}">Embed Link</label>
-                  <input
-                    id="id-link-${this.ariaId}"
-                    class="flex h-9 rounded-md w-full bg-[canvas] px-3 py-2 text-sm placeholder:text-gray-500 dark:placeholder:text-gray-500 transition border box-border border-gray-200 dark:border-gray-800 border-solid ring-0 ring-transparent focus-visible:ring-2 focus-visible:ring-gray-900 dark:focus-visible:ring-gray-300 focus-visible:ring-offset-0 outline-hidden focus-visible:outline-hidden file:border-0 file:bg-transparent file:text-sm file:font-medium disabled:cursor-not-allowed disabled:opacity-50"
-                    placeholder="Paste the image link..."
-                    type="url"
-                    .value=${this.url}
-                    @input=${this.handleUrlChange}
-                  />
-                `
-              : nothing}
-            ${!this.url
-              ? html`
-                  <label for="id-upload-${this.ariaId}">Upload</label>
-                  <input
-                    id="id-upload-${this.ariaId}"
-                    class="flex h-9 rounded-md w-full bg-[canvas] px-3 py-2 text-sm placeholder:text-gray-500 dark:placeholder:text-gray-500 transition border box-border border-gray-200 dark:border-gray-800 border-solid ring-0 ring-transparent focus-visible:ring-2 focus-visible:ring-gray-900 dark:focus-visible:ring-gray-300 focus-visible:ring-offset-0 outline-hidden focus-visible:outline-hidden file:border-0 file:bg-transparent file:text-sm file:font-medium disabled:cursor-not-allowed disabled:opacity-50"
-                    accept="image/*"
-                    type="file"
-                    @change=${this.handleFileChange}
-                  />
-                `
-              : nothing}
-            ${this.url
-              ? html`
-                  <button
-                    class="inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium ring-offset-white dark:ring-offset-gray-950 transition-colors focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-gray-900 dark:focus-visible:ring-gray-300 focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 border-0 bg-gray-900 dark:bg-gray-50 text-gray-50 dark:text-gray-900 hover:bg-gray-900/90 dark:hover:bg-gray-50/90 h-10 px-4 py-2 w-full"
-                    @click=${this.handleSubmit}
-                  >
-                    Insert Image
-                  </button>
-                `
-              : nothing}
-            ${this.file
-              ? html`
-                  <button
-                    class="inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium ring-offset-white dark:ring-offset-gray-950 transition-colors focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-gray-900 dark:focus-visible:ring-gray-300 focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 border-0 bg-gray-900 dark:bg-gray-50 text-gray-50 dark:text-gray-900 hover:bg-gray-900/90 dark:hover:bg-gray-50/90 h-10 px-4 py-2 w-full"
-                    @click=${this.handleSubmit}
-                  >
-                    Upload Image
-                  </button>
-                `
-              : nothing}
+            ${
+              !this.file
+                ? html`
+                    <label for="id-link-${this.ariaId}">Embed Link</label>
+                    <input
+                      id="id-link-${this.ariaId}"
+                      class="flex h-9 rounded-md w-full bg-[canvas] px-3 py-2 text-sm placeholder:text-gray-500 dark:placeholder:text-gray-500 transition border box-border border-gray-200 dark:border-gray-800 border-solid ring-0 ring-transparent focus-visible:ring-2 focus-visible:ring-gray-900 dark:focus-visible:ring-gray-300 focus-visible:ring-offset-0 outline-hidden focus-visible:outline-hidden file:border-0 file:bg-transparent file:text-sm file:font-medium disabled:cursor-not-allowed disabled:opacity-50"
+                      placeholder="Paste the image link..."
+                      type="url"
+                      .value=${this.url}
+                      @input=${this.handleUrlChange}
+                    />
+                  `
+                : nothing
+            }
+            ${
+              !this.url
+                ? html`
+                    <label for="id-upload-${this.ariaId}">Upload</label>
+                    <input
+                      id="id-upload-${this.ariaId}"
+                      class="flex h-9 rounded-md w-full bg-[canvas] px-3 py-2 text-sm placeholder:text-gray-500 dark:placeholder:text-gray-500 transition border box-border border-gray-200 dark:border-gray-800 border-solid ring-0 ring-transparent focus-visible:ring-2 focus-visible:ring-gray-900 dark:focus-visible:ring-gray-300 focus-visible:ring-offset-0 outline-hidden focus-visible:outline-hidden file:border-0 file:bg-transparent file:text-sm file:font-medium disabled:cursor-not-allowed disabled:opacity-50"
+                      accept="image/*"
+                      type="file"
+                      @change=${this.handleFileChange}
+                    />
+                  `
+                : nothing
+            }
+            ${
+              this.url
+                ? html`
+                    <button
+                      class="inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium ring-offset-white dark:ring-offset-gray-950 transition-colors focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-gray-900 dark:focus-visible:ring-gray-300 focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 border-0 bg-gray-900 dark:bg-gray-50 text-gray-50 dark:text-gray-900 hover:bg-gray-900/90 dark:hover:bg-gray-50/90 h-10 px-4 py-2 w-full"
+                      @click=${this.handleSubmit}
+                    >
+                      Insert Image
+                    </button>
+                  `
+                : nothing
+            }
+            ${
+              this.file
+                ? html`
+                    <button
+                      class="inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium ring-offset-white dark:ring-offset-gray-950 transition-colors focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-gray-900 dark:focus-visible:ring-gray-300 focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 border-0 bg-gray-900 dark:bg-gray-50 text-gray-50 dark:text-gray-900 hover:bg-gray-900/90 dark:hover:bg-gray-50/90 h-10 px-4 py-2 w-full"
+                      @click=${this.handleSubmit}
+                    >
+                      Upload Image
+                    </button>
+                  `
+                : nothing
+            }
           </prosekit-popover-popup>
         </prosekit-popover-positioner>
       </prosekit-popover-root>
diff --git a/lit-full/src/components/editor/ui/image-view/image-view.ts b/lit-full/src/components/editor/ui/image-view/image-view.ts
index 4ec54fd1c7..852a70faff 100644
--- a/lit-full/src/components/editor/ui/image-view/image-view.ts
+++ b/lit-full/src/components/editor/ui/image-view/image-view.ts
@@ -128,40 +128,46 @@ class ImageNodeView {
           ?data-selected=${this.selected}
           @resizeEnd=${this.handleResizeEnd}
         >
-          ${url && !this.error
-            ? html`
-                <img
-                  src=${url}
-                  alt="upload preview"
-                  class="h-full w-full max-w-full max-h-full object-contain"
-                  @load=${this.handleImageLoad}
-                />
-              `
-            : ''}
-          ${uploading && !this.error
-            ? html`
-                <div
-                  class="absolute bottom-0 left-0 m-1 flex content-center items-center gap-2 rounded-sm bg-gray-800/60 p-1.5 text-xs text-white/80 transition"
-                >
+          ${
+            url && !this.error
+              ? html`
+                  <img
+                    src=${url}
+                    alt="upload preview"
+                    class="h-full w-full max-w-full max-h-full object-contain"
+                    @load=${this.handleImageLoad}
+                  />
+                `
+              : ''
+          }
+          ${
+            uploading && !this.error
+              ? html`
                   <div
-                    class="i-lucide-loader-circle size-4 animate-spin block"
-                  ></div>
-                  <div>${Math.round(this.progress * 100)}%</div>
-                </div>
-              `
-            : ''}
-          ${this.error
-            ? html`
-                <div
-                  class="absolute bottom-0 left-0 right-0 top-0 flex flex-col items-center justify-center gap-4 bg-gray-200 p-2 text-sm dark:bg-gray-800 @container"
-                >
-                  <div class="i-lucide-image-off size-8 block"></div>
-                  <div class="hidden opacity-80 @xs:block">
-                    Failed to upload image
+                    class="absolute bottom-0 left-0 m-1 flex content-center items-center gap-2 rounded-sm bg-gray-800/60 p-1.5 text-xs text-white/80 transition"
+                  >
+                    <div
+                      class="i-lucide-loader-circle size-4 animate-spin block"
+                    ></div>
+                    <div>${Math.round(this.progress * 100)}%</div>
                   </div>
-                </div>
-              `
-            : ''}
+                `
+              : ''
+          }
+          ${
+            this.error
+              ? html`
+                  <div
+                    class="absolute bottom-0 left-0 right-0 top-0 flex flex-col items-center justify-center gap-4 bg-gray-200 p-2 text-sm dark:bg-gray-800 @container"
+                  >
+                    <div class="i-lucide-image-off size-8 block"></div>
+                    <div class="hidden opacity-80 @xs:block">
+                      Failed to upload image
+                    </div>
+                  </div>
+                `
+              : ''
+          }
           <prosekit-resizable-handle
             class="absolute bottom-0 right-0 rounded-sm m-1.5 p-1 transition bg-gray-900/30 active:bg-gray-800/60 hover:bg-gray-800/60 text-white/50 active:text-white/80 active:translate-x-0.5 active:translate-y-0.5 opacity-0 hover:opacity-100 group-hover:opacity-100 group-data-resizing:opacity-100"
           >
diff --git a/lit-full/src/components/editor/ui/inline-menu/inline-menu.ts b/lit-full/src/components/editor/ui/inline-menu/inline-menu.ts
index efc7cc3a96..7cd3843f60 100644
--- a/lit-full/src/components/editor/ui/inline-menu/inline-menu.ts
+++ b/lit-full/src/components/editor/ui/inline-menu/inline-menu.ts
@@ -152,8 +152,7 @@ class LitInlineMenu extends LitElement {
 
   override render() {
     const editor = this.editorConsumer.value as
-      | Editor<BasicExtension>
-      | undefined
+      Editor<BasicExtension> | undefined
     if (!editor) {
       return nothing
     }
@@ -176,100 +175,114 @@ class LitInlineMenu extends LitElement {
             data-testid="inline-menu-main"
             class="box-border origin-(--transform-origin) transition-[opacity,scale] transition-discrete motion-reduce:transition-none data-[state=closed]:duration-150 data-[state=closed]:opacity-0 starting:opacity-0 data-[state=closed]:scale-95 starting:scale-95 duration-40 border border-gray-200 dark:border-gray-800 shadow-lg bg-[canvas] relative flex min-w-32 space-x-1 overflow-auto whitespace-nowrap rounded-lg p-1"
           >
-            ${items.bold
-              ? html`
-                  <lit-editor-button
-                    .pressed=${items.bold.isActive}
-                    .disabled=${!items.bold.canExec}
-                    tooltip="Bold"
-                    icon="i-lucide-bold size-5 block"
-                    @click=${items.bold.command}
-                  ></lit-editor-button>
-                `
-              : nothing}
-            ${items.italic
-              ? html`
-                  <lit-editor-button
-                    .pressed=${items.italic.isActive}
-                    .disabled=${!items.italic.canExec}
-                    tooltip="Italic"
-                    icon="i-lucide-italic size-5 block"
-                    @click=${items.italic.command}
-                  ></lit-editor-button>
-                `
-              : nothing}
-            ${items.underline
-              ? html`
-                  <lit-editor-button
-                    .pressed=${items.underline.isActive}
-                    .disabled=${!items.underline.canExec}
-                    tooltip="Underline"
-                    icon="i-lucide-underline size-5 block"
-                    @click=${items.underline.command}
-                  ></lit-editor-button>
-                `
-              : nothing}
-            ${items.strike
-              ? html`
-                  <lit-editor-button
-                    .pressed=${items.strike.isActive}
-                    .disabled=${!items.strike.canExec}
-                    tooltip="Strikethrough"
-                    icon="i-lucide-strikethrough size-5 block"
-                    @click=${items.strike.command}
-                  ></lit-editor-button>
-                `
-              : nothing}
-            ${items.code
-              ? html`
-                  <lit-editor-button
-                    .pressed=${items.code.isActive}
-                    .disabled=${!items.code.canExec}
-                    tooltip="Code"
-                    icon="i-lucide-code size-5 block"
-                    @click=${items.code.command}
-                  ></lit-editor-button>
-                `
-              : nothing}
-            ${items.link && items.link.canExec
-              ? html`
-                  <lit-editor-button
-                    .pressed=${items.link.isActive}
-                    tooltip="Link"
-                    icon="i-lucide-link size-5 block"
-                    @click=${() => {
+            ${
+              items.bold
+                ? html`
+                    <lit-editor-button
+                      .pressed=${items.bold.isActive}
+                      .disabled=${!items.bold.canExec}
+                      tooltip="Bold"
+                      icon="i-lucide-bold size-5 block"
+                      @click=${items.bold.command}
+                    ></lit-editor-button>
+                  `
+                : nothing
+            }
+            ${
+              items.italic
+                ? html`
+                    <lit-editor-button
+                      .pressed=${items.italic.isActive}
+                      .disabled=${!items.italic.canExec}
+                      tooltip="Italic"
+                      icon="i-lucide-italic size-5 block"
+                      @click=${items.italic.command}
+                    ></lit-editor-button>
+                  `
+                : nothing
+            }
+            ${
+              items.underline
+                ? html`
+                    <lit-editor-button
+                      .pressed=${items.underline.isActive}
+                      .disabled=${!items.underline.canExec}
+                      tooltip="Underline"
+                      icon="i-lucide-underline size-5 block"
+                      @click=${items.underline.command}
+                    ></lit-editor-button>
+                  `
+                : nothing
+            }
+            ${
+              items.strike
+                ? html`
+                    <lit-editor-button
+                      .pressed=${items.strike.isActive}
+                      .disabled=${!items.strike.canExec}
+                      tooltip="Strikethrough"
+                      icon="i-lucide-strikethrough size-5 block"
+                      @click=${items.strike.command}
+                    ></lit-editor-button>
+                  `
+                : nothing
+            }
+            ${
+              items.code
+                ? html`
+                    <lit-editor-button
+                      .pressed=${items.code.isActive}
+                      .disabled=${!items.code.canExec}
+                      tooltip="Code"
+                      icon="i-lucide-code size-5 block"
+                      @click=${items.code.command}
+                    ></lit-editor-button>
+                  `
+                : nothing
+            }
+            ${
+              items.link && items.link.canExec
+                ? html`
+                    <lit-editor-button
+                      .pressed=${items.link.isActive}
+                      tooltip="Link"
+                      icon="i-lucide-link size-5 block"
+                      @click=${() => {
                       items.link?.command?.()
                       this.linkMenuOpen = !this.linkMenuOpen
                     }}
-                  ></lit-editor-button>
-                `
-              : nothing}
+                    ></lit-editor-button>
+                  `
+                : nothing
+            }
           </prosekit-inline-popover-popup>
         </prosekit-inline-popover-positioner>
       </prosekit-inline-popover-root>
 
-      ${items.link
-        ? html`
-            <prosekit-inline-popover-root
-              .editor=${editor}
-              .defaultOpen=${false}
-              .open=${this.linkMenuOpen}
-              @openChange=${(event: OpenChangeEvent) => {
+      ${
+        items.link
+          ? html`
+              <prosekit-inline-popover-root
+                .editor=${editor}
+                .defaultOpen=${false}
+                .open=${this.linkMenuOpen}
+                @openChange=${(event: OpenChangeEvent) => {
                 this.linkMenuOpen = event.detail
               }}
-            >
-              <prosekit-inline-popover-positioner
-                placement="bottom"
-                class="block overflow-visible w-min h-min z-50 ease-out transition-transform duration-100 motion-reduce:transition-none"
               >
-                <prosekit-inline-popover-popup
-                  data-testid="inline-menu-link"
-                  class="box-border origin-(--transform-origin) transition-[opacity,scale] transition-discrete motion-reduce:transition-none data-[state=closed]:duration-150 data-[state=closed]:opacity-0 starting:opacity-0 data-[state=closed]:scale-95 starting:scale-95 duration-40 border border-gray-200 dark:border-gray-800 shadow-lg bg-[canvas] relative flex flex-col w-xs rounded-lg p-4 gap-y-2 items-stretch"
+                <prosekit-inline-popover-positioner
+                  placement="bottom"
+                  class="block overflow-visible w-min h-min z-50 ease-out transition-transform duration-100 motion-reduce:transition-none"
                 >
-                  ${this.linkMenuOpen
-                    ? html`
-                        <form
-                          @submit=${(event: SubmitEvent) => {
+                  <prosekit-inline-popover-popup
+                    data-testid="inline-menu-link"
+                    class="box-border origin-(--transform-origin) transition-[opacity,scale] transition-discrete motion-reduce:transition-none data-[state=closed]:duration-150 data-[state=closed]:opacity-0 starting:opacity-0 data-[state=closed]:scale-95 starting:scale-95 duration-40 border border-gray-200 dark:border-gray-800 shadow-lg bg-[canvas] relative flex flex-col w-xs rounded-lg p-4 gap-y-2 items-stretch"
+                  >
+                    ${
+                    this.linkMenuOpen
+                      ? html`
+                          <form
+                            @submit=${(event: SubmitEvent) => {
                             event.preventDefault()
                             const target =
                               event.target as HTMLFormElement | null
@@ -278,32 +291,35 @@ class LitInlineMenu extends LitElement {
                               ?.value?.trim()
                             this.handleLinkUpdate(editor, href)
                           }}
-                        >
-                          <input
-                            placeholder="Paste the link..."
-                            value=${items.link.currentLink}
-                            class="flex h-9 rounded-md w-full bg-[canvas] px-3 py-2 text-sm placeholder:text-gray-500 dark:placeholder:text-gray-500 transition border box-border border-gray-200 dark:border-gray-800 border-solid ring-0 ring-transparent focus-visible:ring-2 focus-visible:ring-gray-900 dark:focus-visible:ring-gray-300 focus-visible:ring-offset-0 outline-hidden focus-visible:outline-hidden file:border-0 file:bg-transparent file:text-sm file:font-medium disabled:cursor-not-allowed disabled:opacity-50"
-                          />
-                        </form>
-                      `
-                    : nothing}
-                  ${items.link.isActive
-                    ? html`
-                        <button
-                          @click=${() => this.handleLinkUpdate(editor)}
-                          @mousedown=${(event: MouseEvent) =>
-                            event.preventDefault()}
-                          class="inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium ring-offset-white dark:ring-offset-gray-950 transition-colors focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-gray-900 dark:focus-visible:ring-gray-300 focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 border-0 bg-gray-900 dark:bg-gray-50 text-gray-50 dark:text-gray-900 hover:bg-gray-900/90 dark:hover:bg-gray-50/90 h-9 px-3"
-                        >
-                          Remove link
-                        </button>
-                      `
-                    : nothing}
-                </prosekit-inline-popover-popup>
-              </prosekit-inline-popover-positioner>
-            </prosekit-inline-popover-root>
-          `
-        : nothing}
+                          >
+                            <input
+                              placeholder="Paste the link..."
+                              value=${items.link.currentLink}
+                              class="flex h-9 rounded-md w-full bg-[canvas] px-3 py-2 text-sm placeholder:text-gray-500 dark:placeholder:text-gray-500 transition border box-border border-gray-200 dark:border-gray-800 border-solid ring-0 ring-transparent focus-visible:ring-2 focus-visible:ring-gray-900 dark:focus-visible:ring-gray-300 focus-visible:ring-offset-0 outline-hidden focus-visible:outline-hidden file:border-0 file:bg-transparent file:text-sm file:font-medium disabled:cursor-not-allowed disabled:opacity-50"
+                            />
+                          </form>
+                        `
+                      : nothing
+                  }
+                    ${
+                    items.link.isActive
+                      ? html`
+                          <button
+                            @click=${() => this.handleLinkUpdate(editor)}
+                            @mousedown=${(event: MouseEvent) => event.preventDefault()}
+                            class="inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium ring-offset-white dark:ring-offset-gray-950 transition-colors focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-gray-900 dark:focus-visible:ring-gray-300 focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 border-0 bg-gray-900 dark:bg-gray-50 text-gray-50 dark:text-gray-900 hover:bg-gray-900/90 dark:hover:bg-gray-50/90 h-9 px-3"
+                          >
+                            Remove link
+                          </button>
+                        `
+                      : nothing
+                  }
+                  </prosekit-inline-popover-popup>
+                </prosekit-inline-popover-positioner>
+              </prosekit-inline-popover-root>
+            `
+          : nothing
+      }
     `
   }
 }
diff --git a/lit-full/src/components/editor/ui/slash-menu/slash-menu-item.ts b/lit-full/src/components/editor/ui/slash-menu/slash-menu-item.ts
index ad7bd23cf7..3cc7c0e4bb 100644
--- a/lit-full/src/components/editor/ui/slash-menu/slash-menu-item.ts
+++ b/lit-full/src/components/editor/ui/slash-menu/slash-menu-item.ts
@@ -31,13 +31,15 @@ export class SlashMenuItemElement extends LitElement {
         class="relative flex items-center justify-between min-w-32 scroll-my-1 rounded-md px-3 py-1.5 text-sm box-border cursor-default select-none whitespace-nowrap outline-hidden data-highlighted:bg-gray-100 dark:data-highlighted:bg-gray-800"
       >
         <span>${this.label}</span>
-        ${this.kbd
+        ${
+        this.kbd
           ? html`
               <kbd class="text-xs font-mono text-gray-400 dark:text-gray-500">
                 ${this.kbd}
               </kbd>
             `
-          : ''}
+          : ''
+      }
       </prosekit-autocomplete-item>
     `
   }
diff --git a/lit-full/src/components/editor/ui/slash-menu/slash-menu.ts b/lit-full/src/components/editor/ui/slash-menu/slash-menu.ts
index f4cc8b3ada..0b75c62abc 100644
--- a/lit-full/src/components/editor/ui/slash-menu/slash-menu.ts
+++ b/lit-full/src/components/editor/ui/slash-menu/slash-menu.ts
@@ -31,8 +31,7 @@ class SlashMenuElement extends LitElement {
 
   override render() {
     const editor = this.editorConsumer.value as
-      | Editor<BasicExtension>
-      | undefined
+      Editor<BasicExtension> | undefined
     if (!editor) {
       return html``
     }
diff --git a/lit-full/src/components/editor/ui/table-handle/table-handle.ts b/lit-full/src/components/editor/ui/table-handle/table-handle.ts
index 0cedbd8247..d314b1bb93 100644
--- a/lit-full/src/components/editor/ui/table-handle/table-handle.ts
+++ b/lit-full/src/components/editor/ui/table-handle/table-handle.ts
@@ -124,8 +124,7 @@ class LitTableHandle extends LitElement {
 
   override render() {
     const editor = this.editorConsumer.value as
-      | Editor<TableExtension>
-      | undefined
+      Editor<TableExtension> | undefined
     if (!editor) {
       return nothing
     }
@@ -163,7 +162,8 @@ class LitTableHandle extends LitElement {
                 <prosekit-menu-popup
                   class="box-border origin-(--transform-origin) transition-[opacity,scale] transition-discrete motion-reduce:transition-none data-[state=closed]:duration-150 data-[state=closed]:opacity-0 starting:opacity-0 data-[state=closed]:scale-95 starting:scale-95 duration-40 rounded-xl border border-gray-200 dark:border-gray-800 shadow-lg bg-[canvas] relative flex flex-col max-h-100 min-w-32 select-none overflow-auto whitespace-nowrap p-1 outline-none"
                 >
-                  ${state.addTableColumnBefore.canExec
+                  ${
+                  state.addTableColumnBefore.canExec
                     ? html`
                         <prosekit-menu-item
                           class="relative min-w-32 scroll-my-1 rounded-sm px-3 py-1.5 flex items-center justify-between gap-8 data-[disabled=true]:pointer-events-none data-[disabled=true]:opacity-50 hover:data-[disabled=true]:opacity-50 data-danger:text-red-500 box-border cursor-default select-none whitespace-nowrap outline-hidden data-highlighted:bg-gray-100 dark:data-highlighted:bg-gray-800"
@@ -172,8 +172,10 @@ class LitTableHandle extends LitElement {
                           <span>Insert Left</span>
                         </prosekit-menu-item>
                       `
-                    : nothing}
-                  ${state.addTableColumnAfter.canExec
+                    : nothing
+                }
+                  ${
+                  state.addTableColumnAfter.canExec
                     ? html`
                         <prosekit-menu-item
                           class="relative min-w-32 scroll-my-1 rounded-sm px-3 py-1.5 flex items-center justify-between gap-8 data-[disabled=true]:pointer-events-none data-[disabled=true]:opacity-50 hover:data-[disabled=true]:opacity-50 data-danger:text-red-500 box-border cursor-default select-none whitespace-nowrap outline-hidden data-highlighted:bg-gray-100 dark:data-highlighted:bg-gray-800"
@@ -182,8 +184,10 @@ class LitTableHandle extends LitElement {
                           <span>Insert Right</span>
                         </prosekit-menu-item>
                       `
-                    : nothing}
-                  ${state.deleteCellSelection.canExec
+                    : nothing
+                }
+                  ${
+                  state.deleteCellSelection.canExec
                     ? html`
                         <prosekit-menu-item
                           class="relative min-w-32 scroll-my-1 rounded-sm px-3 py-1.5 flex items-center justify-between gap-8 data-[disabled=true]:pointer-events-none data-[disabled=true]:opacity-50 hover:data-[disabled=true]:opacity-50 data-danger:text-red-500 box-border cursor-default select-none whitespace-nowrap outline-hidden data-highlighted:bg-gray-100 dark:data-highlighted:bg-gray-800"
@@ -197,8 +201,10 @@ class LitTableHandle extends LitElement {
                           </span>
                         </prosekit-menu-item>
                       `
-                    : nothing}
-                  ${state.deleteTableColumn.canExec
+                    : nothing
+                }
+                  ${
+                  state.deleteTableColumn.canExec
                     ? html`
                         <prosekit-menu-item
                           class="relative min-w-32 scroll-my-1 rounded-sm px-3 py-1.5 flex items-center justify-between gap-8 data-[disabled=true]:pointer-events-none data-[disabled=true]:opacity-50 hover:data-[disabled=true]:opacity-50 data-danger:text-red-500 box-border cursor-default select-none whitespace-nowrap outline-hidden data-highlighted:bg-gray-100 dark:data-highlighted:bg-gray-800"
@@ -207,8 +213,10 @@ class LitTableHandle extends LitElement {
                           <span>Delete Column</span>
                         </prosekit-menu-item>
                       `
-                    : nothing}
-                  ${state.deleteTable.canExec
+                    : nothing
+                }
+                  ${
+                  state.deleteTable.canExec
                     ? html`
                         <prosekit-menu-item
                           class="relative min-w-32 scroll-my-1 rounded-sm px-3 py-1.5 flex items-center justify-between gap-8 data-[disabled=true]:pointer-events-none data-[disabled=true]:opacity-50 hover:data-[disabled=true]:opacity-50 data-danger:text-red-500 box-border cursor-default select-none whitespace-nowrap outline-hidden data-highlighted:bg-gray-100 dark:data-highlighted:bg-gray-800"
@@ -218,7 +226,8 @@ class LitTableHandle extends LitElement {
                           <span>Delete Table</span>
                         </prosekit-menu-item>
                       `
-                    : nothing}
+                    : nothing
+                }
                 </prosekit-menu-popup>
               </prosekit-menu-positioner>
             </prosekit-table-handle-column-menu-root>
@@ -247,7 +256,8 @@ class LitTableHandle extends LitElement {
                 <prosekit-menu-popup
                   class="box-border origin-(--transform-origin) transition-[opacity,scale] transition-discrete motion-reduce:transition-none data-[state=closed]:duration-150 data-[state=closed]:opacity-0 starting:opacity-0 data-[state=closed]:scale-95 starting:scale-95 duration-40 rounded-xl border border-gray-200 dark:border-gray-800 shadow-lg bg-[canvas] relative flex flex-col max-h-100 min-w-32 select-none overflow-auto whitespace-nowrap p-1 outline-none"
                 >
-                  ${state.addTableRowAbove.canExec
+                  ${
+                  state.addTableRowAbove.canExec
                     ? html`
                         <prosekit-menu-item
                           class="relative min-w-32 scroll-my-1 rounded-sm px-3 py-1.5 flex items-center justify-between gap-8 data-[disabled=true]:pointer-events-none data-[disabled=true]:opacity-50 hover:data-[disabled=true]:opacity-50 data-danger:text-red-500 box-border cursor-default select-none whitespace-nowrap outline-hidden data-highlighted:bg-gray-100 dark:data-highlighted:bg-gray-800"
@@ -256,8 +266,10 @@ class LitTableHandle extends LitElement {
                           <span>Insert Above</span>
                         </prosekit-menu-item>
                       `
-                    : nothing}
-                  ${state.addTableRowBelow.canExec
+                    : nothing
+                }
+                  ${
+                  state.addTableRowBelow.canExec
                     ? html`
                         <prosekit-menu-item
                           class="relative min-w-32 scroll-my-1 rounded-sm px-3 py-1.5 flex items-center justify-between gap-8 data-[disabled=true]:pointer-events-none data-[disabled=true]:opacity-50 hover:data-[disabled=true]:opacity-50 data-danger:text-red-500 box-border cursor-default select-none whitespace-nowrap outline-hidden data-highlighted:bg-gray-100 dark:data-highlighted:bg-gray-800"
@@ -266,8 +278,10 @@ class LitTableHandle extends LitElement {
                           <span>Insert Below</span>
                         </prosekit-menu-item>
                       `
-                    : nothing}
-                  ${state.deleteCellSelection.canExec
+                    : nothing
+                }
+                  ${
+                  state.deleteCellSelection.canExec
                     ? html`
                         <prosekit-menu-item
                           class="relative min-w-32 scroll-my-1 rounded-sm px-3 py-1.5 flex items-center justify-between gap-8 data-[disabled=true]:pointer-events-none data-[disabled=true]:opacity-50 hover:data-[disabled=true]:opacity-50 data-danger:text-red-500 box-border cursor-default select-none whitespace-nowrap outline-hidden data-highlighted:bg-gray-100 dark:data-highlighted:bg-gray-800"
@@ -281,8 +295,10 @@ class LitTableHandle extends LitElement {
                           </span>
                         </prosekit-menu-item>
                       `
-                    : nothing}
-                  ${state.deleteTableRow.canExec
+                    : nothing
+                }
+                  ${
+                  state.deleteTableRow.canExec
                     ? html`
                         <prosekit-menu-item
                           class="relative min-w-32 scroll-my-1 rounded-sm px-3 py-1.5 flex items-center justify-between gap-8 data-[disabled=true]:pointer-events-none data-[disabled=true]:opacity-50 hover:data-[disabled=true]:opacity-50 data-danger:text-red-500 box-border cursor-default select-none whitespace-nowrap outline-hidden data-highlighted:bg-gray-100 dark:data-highlighted:bg-gray-800"
@@ -291,8 +307,10 @@ class LitTableHandle extends LitElement {
                           <span>Delete Row</span>
                         </prosekit-menu-item>
                       `
-                    : nothing}
-                  ${state.deleteTable.canExec
+                    : nothing
+                }
+                  ${
+                  state.deleteTable.canExec
                     ? html`
                         <prosekit-menu-item
                           class="relative min-w-32 scroll-my-1 rounded-sm px-3 py-1.5 flex items-center justify-between gap-8 data-[disabled=true]:pointer-events-none data-[disabled=true]:opacity-50 hover:data-[disabled=true]:opacity-50 data-danger:text-red-500 box-border cursor-default select-none whitespace-nowrap outline-hidden data-highlighted:bg-gray-100 dark:data-highlighted:bg-gray-800"
@@ -302,7 +320,8 @@ class LitTableHandle extends LitElement {
                           <span>Delete Table</span>
                         </prosekit-menu-item>
                       `
-                    : nothing}
+                    : nothing
+                }
                 </prosekit-menu-popup>
               </prosekit-menu-positioner>
             </prosekit-table-handle-row-menu-root>
diff --git a/lit-full/src/components/editor/ui/tag-menu/tag-menu.ts b/lit-full/src/components/editor/ui/tag-menu/tag-menu.ts
index 9db33b32e3..d465fc045a 100644
--- a/lit-full/src/components/editor/ui/tag-menu/tag-menu.ts
+++ b/lit-full/src/components/editor/ui/tag-menu/tag-menu.ts
@@ -52,8 +52,7 @@ class TagMenuElement extends LitElement {
 
   override render() {
     const editor = this.editorConsumer.value as
-      | Editor<Union<[MentionExtension, BasicExtension]>>
-      | undefined
+      Editor<Union<[MentionExtension, BasicExtension]>> | undefined
     if (!editor) {
       return nothing
     }
@@ -75,18 +74,17 @@ class TagMenuElement extends LitElement {
                 No results
               </prosekit-autocomplete-empty>
               ${repeat(
-                this.tags,
-                (tag) => tag.id,
-                (tag) => html`
-                  <prosekit-autocomplete-item
-                    class="relative flex items-center justify-between min-w-32 scroll-my-1 rounded-md px-3 py-1.5 text-sm box-border cursor-default select-none whitespace-nowrap outline-hidden data-highlighted:bg-gray-100 dark:data-highlighted:bg-gray-800"
-                    @select=${() =>
-                      this.handleTagInsert(editor, tag.id, tag.label)}
-                  >
-                    ${'#' + tag.label}
-                  </prosekit-autocomplete-item>
-                `,
-              )}
+              this.tags,
+              (tag) => tag.id,
+              (tag) => html`
+                <prosekit-autocomplete-item
+                  class="relative flex items-center justify-between min-w-32 scroll-my-1 rounded-md px-3 py-1.5 text-sm box-border cursor-default select-none whitespace-nowrap outline-hidden data-highlighted:bg-gray-100 dark:data-highlighted:bg-gray-800"
+                  @select=${() => this.handleTagInsert(editor, tag.id, tag.label)}
+                >
+                  ${'#' + tag.label}
+                </prosekit-autocomplete-item>
+              `,
+            )}
             </div>
           </prosekit-autocomplete-popup>
         </prosekit-autocomplete-positioner>
diff --git a/lit-full/src/components/editor/ui/toolbar/toolbar.ts b/lit-full/src/components/editor/ui/toolbar/toolbar.ts
index 11c3f99372..99762750ca 100644
--- a/lit-full/src/components/editor/ui/toolbar/toolbar.ts
+++ b/lit-full/src/components/editor/ui/toolbar/toolbar.ts
@@ -220,8 +220,7 @@ class LitToolbar extends LitElement {
 
   override render() {
     const editor = this.editorConsumer.value as
-      | Editor<BasicExtension>
-      | undefined
+      Editor<BasicExtension> | undefined
     if (!editor) {
       return nothing
     }
@@ -232,226 +231,266 @@ class LitToolbar extends LitElement {
       <div
         class="z-2 box-border border-gray-200 dark:border-gray-800 border-solid border-l-0 border-r-0 border-t-0 border-b flex flex-wrap gap-1 p-2 items-center"
       >
-        ${items.undo
-          ? html`
-              <lit-editor-button
-                .pressed=${items.undo.isActive}
-                .disabled=${!items.undo.canExec}
-                tooltip="Undo"
-                icon="i-lucide-undo-2 size-5 block"
-                @click=${items.undo.command}
-              ></lit-editor-button>
-            `
-          : nothing}
-        ${items.redo
-          ? html`
-              <lit-editor-button
-                .pressed=${items.redo.isActive}
-                .disabled=${!items.redo.canExec}
-                tooltip="Redo"
-                icon="i-lucide-redo-2 size-5 block"
-                @click=${items.redo.command}
-              ></lit-editor-button>
-            `
-          : nothing}
-        ${items.bold
-          ? html`
-              <lit-editor-button
-                .pressed=${items.bold.isActive}
-                .disabled=${!items.bold.canExec}
-                tooltip="Bold"
-                icon="i-lucide-bold size-5 block"
-                @click=${items.bold.command}
-              ></lit-editor-button>
-            `
-          : nothing}
-        ${items.italic
-          ? html`
-              <lit-editor-button
-                .pressed=${items.italic.isActive}
-                .disabled=${!items.italic.canExec}
-                tooltip="Italic"
-                icon="i-lucide-italic size-5 block"
-                @click=${items.italic.command}
-              ></lit-editor-button>
-            `
-          : nothing}
-        ${items.underline
-          ? html`
-              <lit-editor-button
-                .pressed=${items.underline.isActive}
-                .disabled=${!items.underline.canExec}
-                tooltip="Underline"
-                icon="i-lucide-underline size-5 block"
-                @click=${items.underline.command}
-              ></lit-editor-button>
-            `
-          : nothing}
-        ${items.strike
-          ? html`
-              <lit-editor-button
-                .pressed=${items.strike.isActive}
-                .disabled=${!items.strike.canExec}
-                tooltip="Strike"
-                icon="i-lucide-strikethrough size-5 block"
-                @click=${items.strike.command}
-              ></lit-editor-button>
-            `
-          : nothing}
-        ${items.code
-          ? html`
-              <lit-editor-button
-                .pressed=${items.code.isActive}
-                .disabled=${!items.code.canExec}
-                tooltip="Code"
-                icon="i-lucide-code size-5 block"
-                @click=${items.code.command}
-              ></lit-editor-button>
-            `
-          : nothing}
-        ${items.codeBlock
-          ? html`
-              <lit-editor-button
-                .pressed=${items.codeBlock.isActive}
-                .disabled=${!items.codeBlock.canExec}
-                tooltip="Code Block"
-                icon="i-lucide-square-code size-5 block"
-                @click=${items.codeBlock.command}
-              ></lit-editor-button>
-            `
-          : nothing}
-        ${items.heading1
-          ? html`
-              <lit-editor-button
-                .pressed=${items.heading1.isActive}
-                .disabled=${!items.heading1.canExec}
-                tooltip="Heading 1"
-                icon="i-lucide-heading-1 size-5 block"
-                @click=${items.heading1.command}
-              ></lit-editor-button>
-            `
-          : nothing}
-        ${items.heading2
-          ? html`
-              <lit-editor-button
-                .pressed=${items.heading2.isActive}
-                .disabled=${!items.heading2.canExec}
-                tooltip="Heading 2"
-                icon="i-lucide-heading-2 size-5 block"
-                @click=${items.heading2.command}
-              ></lit-editor-button>
-            `
-          : nothing}
-        ${items.heading3
-          ? html`
-              <lit-editor-button
-                .pressed=${items.heading3.isActive}
-                .disabled=${!items.heading3.canExec}
-                tooltip="Heading 3"
-                icon="i-lucide-heading-3 size-5 block"
-                @click=${items.heading3.command}
-              ></lit-editor-button>
-            `
-          : nothing}
-        ${items.horizontalRule
-          ? html`
-              <lit-editor-button
-                .pressed=${items.horizontalRule.isActive}
-                .disabled=${!items.horizontalRule.canExec}
-                tooltip="Divider"
-                icon="i-lucide-minus size-5 block"
-                @click=${items.horizontalRule.command}
-              ></lit-editor-button>
-            `
-          : nothing}
-        ${items.blockquote
-          ? html`
-              <lit-editor-button
-                .pressed=${items.blockquote.isActive}
-                .disabled=${!items.blockquote.canExec}
-                tooltip="Blockquote"
-                icon="i-lucide-text-quote size-5 block"
-                @click=${items.blockquote.command}
-              ></lit-editor-button>
-            `
-          : nothing}
-        ${items.bulletList
-          ? html`
-              <lit-editor-button
-                .pressed=${items.bulletList.isActive}
-                .disabled=${!items.bulletList.canExec}
-                tooltip="Bullet List"
-                icon="i-lucide-list size-5 block"
-                @click=${items.bulletList.command}
-              ></lit-editor-button>
-            `
-          : nothing}
-        ${items.orderedList
-          ? html`
-              <lit-editor-button
-                .pressed=${items.orderedList.isActive}
-                .disabled=${!items.orderedList.canExec}
-                tooltip="Ordered List"
-                icon="i-lucide-list-ordered size-5 block"
-                @click=${items.orderedList.command}
-              ></lit-editor-button>
-            `
-          : nothing}
-        ${items.taskList
-          ? html`
-              <lit-editor-button
-                .pressed=${items.taskList.isActive}
-                .disabled=${!items.taskList.canExec}
-                tooltip="Task List"
-                icon="i-lucide-list-checks size-5 block"
-                @click=${items.taskList.command}
-              ></lit-editor-button>
-            `
-          : nothing}
-        ${items.toggleList
-          ? html`
-              <lit-editor-button
-                .pressed=${items.toggleList.isActive}
-                .disabled=${!items.toggleList.canExec}
-                tooltip="Toggle List"
-                icon="i-lucide-list-collapse size-5 block"
-                @click=${items.toggleList.command}
-              ></lit-editor-button>
-            `
-          : nothing}
-        ${items.indentList
-          ? html`
-              <lit-editor-button
-                .pressed=${items.indentList.isActive}
-                .disabled=${!items.indentList.canExec}
-                tooltip="Increase indentation"
-                icon="i-lucide-indent-increase size-5 block"
-                @click=${items.indentList.command}
-              ></lit-editor-button>
-            `
-          : nothing}
-        ${items.dedentList
-          ? html`
-              <lit-editor-button
-                .pressed=${items.dedentList.isActive}
-                .disabled=${!items.dedentList.canExec}
-                tooltip="Decrease indentation"
-                icon="i-lucide-indent-decrease size-5 block"
-                @click=${items.dedentList.command}
-              ></lit-editor-button>
-            `
-          : nothing}
-        ${this.uploader && items.insertImage
-          ? html`
-              <lit-editor-image-upload-popover
-                .editor=${editor}
-                .uploader=${this.uploader}
-                .disabled=${!items.insertImage.canExec}
-                tooltip="Insert Image"
-                icon="i-lucide-image size-5 block"
-              ></lit-editor-image-upload-popover>
-            `
-          : nothing}
+        ${
+          items.undo
+            ? html`
+                <lit-editor-button
+                  .pressed=${items.undo.isActive}
+                  .disabled=${!items.undo.canExec}
+                  tooltip="Undo"
+                  icon="i-lucide-undo-2 size-5 block"
+                  @click=${items.undo.command}
+                ></lit-editor-button>
+              `
+            : nothing
+        }
+        ${
+          items.redo
+            ? html`
+                <lit-editor-button
+                  .pressed=${items.redo.isActive}
+                  .disabled=${!items.redo.canExec}
+                  tooltip="Redo"
+                  icon="i-lucide-redo-2 size-5 block"
+                  @click=${items.redo.command}
+                ></lit-editor-button>
+              `
+            : nothing
+        }
+        ${
+          items.bold
+            ? html`
+                <lit-editor-button
+                  .pressed=${items.bold.isActive}
+                  .disabled=${!items.bold.canExec}
+                  tooltip="Bold"
+                  icon="i-lucide-bold size-5 block"
+                  @click=${items.bold.command}
+                ></lit-editor-button>
+              `
+            : nothing
+        }
+        ${
+          items.italic
+            ? html`
+                <lit-editor-button
+                  .pressed=${items.italic.isActive}
+                  .disabled=${!items.italic.canExec}
+                  tooltip="Italic"
+                  icon="i-lucide-italic size-5 block"
+                  @click=${items.italic.command}
+                ></lit-editor-button>
+              `
+            : nothing
+        }
+        ${
+          items.underline
+            ? html`
+                <lit-editor-button
+                  .pressed=${items.underline.isActive}
+                  .disabled=${!items.underline.canExec}
+                  tooltip="Underline"
+                  icon="i-lucide-underline size-5 block"
+                  @click=${items.underline.command}
+                ></lit-editor-button>
+              `
+            : nothing
+        }
+        ${
+          items.strike
+            ? html`
+                <lit-editor-button
+                  .pressed=${items.strike.isActive}
+                  .disabled=${!items.strike.canExec}
+                  tooltip="Strike"
+                  icon="i-lucide-strikethrough size-5 block"
+                  @click=${items.strike.command}
+                ></lit-editor-button>
+              `
+            : nothing
+        }
+        ${
+          items.code
+            ? html`
+                <lit-editor-button
+                  .pressed=${items.code.isActive}
+                  .disabled=${!items.code.canExec}
+                  tooltip="Code"
+                  icon="i-lucide-code size-5 block"
+                  @click=${items.code.command}
+                ></lit-editor-button>
+              `
+            : nothing
+        }
+        ${
+          items.codeBlock
+            ? html`
+                <lit-editor-button
+                  .pressed=${items.codeBlock.isActive}
+                  .disabled=${!items.codeBlock.canExec}
+                  tooltip="Code Block"
+                  icon="i-lucide-square-code size-5 block"
+                  @click=${items.codeBlock.command}
+                ></lit-editor-button>
+              `
+            : nothing
+        }
+        ${
+          items.heading1
+            ? html`
+                <lit-editor-button
+                  .pressed=${items.heading1.isActive}
+                  .disabled=${!items.heading1.canExec}
+                  tooltip="Heading 1"
+                  icon="i-lucide-heading-1 size-5 block"
+                  @click=${items.heading1.command}
+                ></lit-editor-button>
+              `
+            : nothing
+        }
+        ${
+          items.heading2
+            ? html`
+                <lit-editor-button
+                  .pressed=${items.heading2.isActive}
+                  .disabled=${!items.heading2.canExec}
+                  tooltip="Heading 2"
+                  icon="i-lucide-heading-2 size-5 block"
+                  @click=${items.heading2.command}
+                ></lit-editor-button>
+              `
+            : nothing
+        }
+        ${
+          items.heading3
+            ? html`
+                <lit-editor-button
+                  .pressed=${items.heading3.isActive}
+                  .disabled=${!items.heading3.canExec}
+                  tooltip="Heading 3"
+                  icon="i-lucide-heading-3 size-5 block"
+                  @click=${items.heading3.command}
+                ></lit-editor-button>
+              `
+            : nothing
+        }
+        ${
+          items.horizontalRule
+            ? html`
+                <lit-editor-button
+                  .pressed=${items.horizontalRule.isActive}
+                  .disabled=${!items.horizontalRule.canExec}
+                  tooltip="Divider"
+                  icon="i-lucide-minus size-5 block"
+                  @click=${items.horizontalRule.command}
+                ></lit-editor-button>
+              `
+            : nothing
+        }
+        ${
+          items.blockquote
+            ? html`
+                <lit-editor-button
+                  .pressed=${items.blockquote.isActive}
+                  .disabled=${!items.blockquote.canExec}
+                  tooltip="Blockquote"
+                  icon="i-lucide-text-quote size-5 block"
+                  @click=${items.blockquote.command}
+                ></lit-editor-button>
+              `
+            : nothing
+        }
+        ${
+          items.bulletList
+            ? html`
+                <lit-editor-button
+                  .pressed=${items.bulletList.isActive}
+                  .disabled=${!items.bulletList.canExec}
+                  tooltip="Bullet List"
+                  icon="i-lucide-list size-5 block"
+                  @click=${items.bulletList.command}
+                ></lit-editor-button>
+              `
+            : nothing
+        }
+        ${
+          items.orderedList
+            ? html`
+                <lit-editor-button
+                  .pressed=${items.orderedList.isActive}
+                  .disabled=${!items.orderedList.canExec}
+                  tooltip="Ordered List"
+                  icon="i-lucide-list-ordered size-5 block"
+                  @click=${items.orderedList.command}
+                ></lit-editor-button>
+              `
+            : nothing
+        }
+        ${
+          items.taskList
+            ? html`
+                <lit-editor-button
+                  .pressed=${items.taskList.isActive}
+                  .disabled=${!items.taskList.canExec}
+                  tooltip="Task List"
+                  icon="i-lucide-list-checks size-5 block"
+                  @click=${items.taskList.command}
+                ></lit-editor-button>
+              `
+            : nothing
+        }
+        ${
+          items.toggleList
+            ? html`
+                <lit-editor-button
+                  .pressed=${items.toggleList.isActive}
+                  .disabled=${!items.toggleList.canExec}
+                  tooltip="Toggle List"
+                  icon="i-lucide-list-collapse size-5 block"
+                  @click=${items.toggleList.command}
+                ></lit-editor-button>
+              `
+            : nothing
+        }
+        ${
+          items.indentList
+            ? html`
+                <lit-editor-button
+                  .pressed=${items.indentList.isActive}
+                  .disabled=${!items.indentList.canExec}
+                  tooltip="Increase indentation"
+                  icon="i-lucide-indent-increase size-5 block"
+                  @click=${items.indentList.command}
+                ></lit-editor-button>
+              `
+            : nothing
+        }
+        ${
+          items.dedentList
+            ? html`
+                <lit-editor-button
+                  .pressed=${items.dedentList.isActive}
+                  .disabled=${!items.dedentList.canExec}
+                  tooltip="Decrease indentation"
+                  icon="i-lucide-indent-decrease size-5 block"
+                  @click=${items.dedentList.command}
+                ></lit-editor-button>
+              `
+            : nothing
+        }
+        ${
+          this.uploader && items.insertImage
+            ? html`
+                <lit-editor-image-upload-popover
+                  .editor=${editor}
+                  .uploader=${this.uploader}
+                  .disabled=${!items.insertImage.canExec}
+                  tooltip="Insert Image"
+                  icon="i-lucide-image size-5 block"
+                ></lit-editor-image-upload-popover>
+              `
+            : nothing
+        }
       </div>
     `
   }
diff --git a/lit-full/src/components/editor/ui/user-menu/user-menu.ts b/lit-full/src/components/editor/ui/user-menu/user-menu.ts
index 10d97c2ef7..17b60b8298 100644
--- a/lit-full/src/components/editor/ui/user-menu/user-menu.ts
+++ b/lit-full/src/components/editor/ui/user-menu/user-menu.ts
@@ -66,8 +66,7 @@ class UserMenuElement extends LitElement {
 
   override render() {
     const editor = this.editorConsumer.value as
-      | Editor<Union<[MentionExtension, BasicExtension]>>
-      | undefined
+      Editor<Union<[MentionExtension, BasicExtension]>> | undefined
     if (!editor) {
       return nothing
     }
@@ -94,20 +93,19 @@ class UserMenuElement extends LitElement {
                 ${this.loading ? 'Loading...' : 'No results'}
               </prosekit-autocomplete-empty>
               ${repeat(
-                this.users,
-                (user) => user.id,
-                (user) => html`
-                  <prosekit-autocomplete-item
-                    class="relative flex items-center justify-between min-w-32 scroll-my-1 rounded-md px-3 py-1.5 text-sm box-border cursor-default select-none whitespace-nowrap outline-hidden data-highlighted:bg-gray-100 dark:data-highlighted:bg-gray-800"
-                    @select=${() =>
-                      this.handleUserInsert(editor, user.id, user.name)}
-                  >
-                    <span class=${this.loading ? 'opacity-50' : nothing}>
-                      ${user.name}
-                    </span>
-                  </prosekit-autocomplete-item>
-                `,
-              )}
+              this.users,
+              (user) => user.id,
+              (user) => html`
+                <prosekit-autocomplete-item
+                  class="relative flex items-center justify-between min-w-32 scroll-my-1 rounded-md px-3 py-1.5 text-sm box-border cursor-default select-none whitespace-nowrap outline-hidden data-highlighted:bg-gray-100 dark:data-highlighted:bg-gray-800"
+                  @select=${() => this.handleUserInsert(editor, user.id, user.name)}
+                >
+                  <span class=${this.loading ? 'opacity-50' : nothing}>
+                    ${user.name}
+                  </span>
+                </prosekit-autocomplete-item>
+              `,
+            )}
             </div>
           </prosekit-autocomplete-popup>
         </prosekit-autocomplete-positioner>
diff --git a/lit-inline-menu/src/components/editor/ui/button/button.ts b/lit-inline-menu/src/components/editor/ui/button/button.ts
index aef47e4e1f..e9979fb5c3 100644
--- a/lit-inline-menu/src/components/editor/ui/button/button.ts
+++ b/lit-inline-menu/src/components/editor/ui/button/button.ts
@@ -45,31 +45,37 @@ class LitButton extends LitElement {
             ?disabled=${this.disabled}
             @mousedown=${this.handleMouseDown}
           >
-            ${this.icon
-              ? html`
-                  <div class="${this.icon}"></div>
-                `
-              : nothing}
-            ${tooltip
-              ? html`
-                  <span class="sr-only">${tooltip}</span>
-                `
-              : nothing}
+            ${
+              this.icon
+                ? html`
+                    <div class="${this.icon}"></div>
+                  `
+                : nothing
+            }
+            ${
+              tooltip
+                ? html`
+                    <span class="sr-only">${tooltip}</span>
+                  `
+                : nothing
+            }
           </button>
         </prosekit-tooltip-trigger>
-        ${tooltip
-          ? html`
-              <prosekit-tooltip-positioner
-                class="block overflow-visible w-min h-min z-50 ease-out transition-transform duration-100 motion-reduce:transition-none"
-              >
-                <prosekit-tooltip-popup
-                  class="flex box-border origin-(--transform-origin) transition-[opacity,scale] transition-discrete motion-reduce:transition-none duration-100 data-[state=closed]:duration-150 data-[state=closed]:opacity-0 starting:opacity-0 data-[state=closed]:scale-95 starting:scale-95 overflow-hidden rounded-md border border-solid bg-gray-900 dark:bg-gray-50 px-3 py-1.5 text-xs text-gray-50 dark:text-gray-900 shadow-xs text-nowrap"
+        ${
+          tooltip
+            ? html`
+                <prosekit-tooltip-positioner
+                  class="block overflow-visible w-min h-min z-50 ease-out transition-transform duration-100 motion-reduce:transition-none"
                 >
-                  ${tooltip}
-                </prosekit-tooltip-popup>
-              </prosekit-tooltip-positioner>
-            `
-          : nothing}
+                  <prosekit-tooltip-popup
+                    class="flex box-border origin-(--transform-origin) transition-[opacity,scale] transition-discrete motion-reduce:transition-none duration-100 data-[state=closed]:duration-150 data-[state=closed]:opacity-0 starting:opacity-0 data-[state=closed]:scale-95 starting:scale-95 overflow-hidden rounded-md border border-solid bg-gray-900 dark:bg-gray-50 px-3 py-1.5 text-xs text-gray-50 dark:text-gray-900 shadow-xs text-nowrap"
+                  >
+                    ${tooltip}
+                  </prosekit-tooltip-popup>
+                </prosekit-tooltip-positioner>
+              `
+            : nothing
+        }
       </prosekit-tooltip-root>
     `
   }
diff --git a/lit-inline-menu/src/components/editor/ui/inline-menu/inline-menu.ts b/lit-inline-menu/src/components/editor/ui/inline-menu/inline-menu.ts
index efc7cc3a96..7cd3843f60 100644
--- a/lit-inline-menu/src/components/editor/ui/inline-menu/inline-menu.ts
+++ b/lit-inline-menu/src/components/editor/ui/inline-menu/inline-menu.ts
@@ -152,8 +152,7 @@ class LitInlineMenu extends LitElement {
 
   override render() {
     const editor = this.editorConsumer.value as
-      | Editor<BasicExtension>
-      | undefined
+      Editor<BasicExtension> | undefined
     if (!editor) {
       return nothing
     }
@@ -176,100 +175,114 @@ class LitInlineMenu extends LitElement {
             data-testid="inline-menu-main"
             class="box-border origin-(--transform-origin) transition-[opacity,scale] transition-discrete motion-reduce:transition-none data-[state=closed]:duration-150 data-[state=closed]:opacity-0 starting:opacity-0 data-[state=closed]:scale-95 starting:scale-95 duration-40 border border-gray-200 dark:border-gray-800 shadow-lg bg-[canvas] relative flex min-w-32 space-x-1 overflow-auto whitespace-nowrap rounded-lg p-1"
           >
-            ${items.bold
-              ? html`
-                  <lit-editor-button
-                    .pressed=${items.bold.isActive}
-                    .disabled=${!items.bold.canExec}
-                    tooltip="Bold"
-                    icon="i-lucide-bold size-5 block"
-                    @click=${items.bold.command}
-                  ></lit-editor-button>
-                `
-              : nothing}
-            ${items.italic
-              ? html`
-                  <lit-editor-button
-                    .pressed=${items.italic.isActive}
-                    .disabled=${!items.italic.canExec}
-                    tooltip="Italic"
-                    icon="i-lucide-italic size-5 block"
-                    @click=${items.italic.command}
-                  ></lit-editor-button>
-                `
-              : nothing}
-            ${items.underline
-              ? html`
-                  <lit-editor-button
-                    .pressed=${items.underline.isActive}
-                    .disabled=${!items.underline.canExec}
-                    tooltip="Underline"
-                    icon="i-lucide-underline size-5 block"
-                    @click=${items.underline.command}
-                  ></lit-editor-button>
-                `
-              : nothing}
-            ${items.strike
-              ? html`
-                  <lit-editor-button
-                    .pressed=${items.strike.isActive}
-                    .disabled=${!items.strike.canExec}
-                    tooltip="Strikethrough"
-                    icon="i-lucide-strikethrough size-5 block"
-                    @click=${items.strike.command}
-                  ></lit-editor-button>
-                `
-              : nothing}
-            ${items.code
-              ? html`
-                  <lit-editor-button
-                    .pressed=${items.code.isActive}
-                    .disabled=${!items.code.canExec}
-                    tooltip="Code"
-                    icon="i-lucide-code size-5 block"
-                    @click=${items.code.command}
-                  ></lit-editor-button>
-                `
-              : nothing}
-            ${items.link && items.link.canExec
-              ? html`
-                  <lit-editor-button
-                    .pressed=${items.link.isActive}
-                    tooltip="Link"
-                    icon="i-lucide-link size-5 block"
-                    @click=${() => {
+            ${
+              items.bold
+                ? html`
+                    <lit-editor-button
+                      .pressed=${items.bold.isActive}
+                      .disabled=${!items.bold.canExec}
+                      tooltip="Bold"
+                      icon="i-lucide-bold size-5 block"
+                      @click=${items.bold.command}
+                    ></lit-editor-button>
+                  `
+                : nothing
+            }
+            ${
+              items.italic
+                ? html`
+                    <lit-editor-button
+                      .pressed=${items.italic.isActive}
+                      .disabled=${!items.italic.canExec}
+                      tooltip="Italic"
+                      icon="i-lucide-italic size-5 block"
+                      @click=${items.italic.command}
+                    ></lit-editor-button>
+                  `
+                : nothing
+            }
+            ${
+              items.underline
+                ? html`
+                    <lit-editor-button
+                      .pressed=${items.underline.isActive}
+                      .disabled=${!items.underline.canExec}
+                      tooltip="Underline"
+                      icon="i-lucide-underline size-5 block"
+                      @click=${items.underline.command}
+                    ></lit-editor-button>
+                  `
+                : nothing
+            }
+            ${
+              items.strike
+                ? html`
+                    <lit-editor-button
+                      .pressed=${items.strike.isActive}
+                      .disabled=${!items.strike.canExec}
+                      tooltip="Strikethrough"
+                      icon="i-lucide-strikethrough size-5 block"
+                      @click=${items.strike.command}
+                    ></lit-editor-button>
+                  `
+                : nothing
+            }
+            ${
+              items.code
+                ? html`
+                    <lit-editor-button
+                      .pressed=${items.code.isActive}
+                      .disabled=${!items.code.canExec}
+                      tooltip="Code"
+                      icon="i-lucide-code size-5 block"
+                      @click=${items.code.command}
+                    ></lit-editor-button>
+                  `
+                : nothing
+            }
+            ${
+              items.link && items.link.canExec
+                ? html`
+                    <lit-editor-button
+                      .pressed=${items.link.isActive}
+                      tooltip="Link"
+                      icon="i-lucide-link size-5 block"
+                      @click=${() => {
                       items.link?.command?.()
                       this.linkMenuOpen = !this.linkMenuOpen
                     }}
-                  ></lit-editor-button>
-                `
-              : nothing}
+                    ></lit-editor-button>
+                  `
+                : nothing
+            }
           </prosekit-inline-popover-popup>
         </prosekit-inline-popover-positioner>
       </prosekit-inline-popover-root>
 
-      ${items.link
-        ? html`
-            <prosekit-inline-popover-root
-              .editor=${editor}
-              .defaultOpen=${false}
-              .open=${this.linkMenuOpen}
-              @openChange=${(event: OpenChangeEvent) => {
+      ${
+        items.link
+          ? html`
+              <prosekit-inline-popover-root
+                .editor=${editor}
+                .defaultOpen=${false}
+                .open=${this.linkMenuOpen}
+                @openChange=${(event: OpenChangeEvent) => {
                 this.linkMenuOpen = event.detail
               }}
-            >
-              <prosekit-inline-popover-positioner
-                placement="bottom"
-                class="block overflow-visible w-min h-min z-50 ease-out transition-transform duration-100 motion-reduce:transition-none"
               >
-                <prosekit-inline-popover-popup
-                  data-testid="inline-menu-link"
-                  class="box-border origin-(--transform-origin) transition-[opacity,scale] transition-discrete motion-reduce:transition-none data-[state=closed]:duration-150 data-[state=closed]:opacity-0 starting:opacity-0 data-[state=closed]:scale-95 starting:scale-95 duration-40 border border-gray-200 dark:border-gray-800 shadow-lg bg-[canvas] relative flex flex-col w-xs rounded-lg p-4 gap-y-2 items-stretch"
+                <prosekit-inline-popover-positioner
+                  placement="bottom"
+                  class="block overflow-visible w-min h-min z-50 ease-out transition-transform duration-100 motion-reduce:transition-none"
                 >
-                  ${this.linkMenuOpen
-                    ? html`
-                        <form
-                          @submit=${(event: SubmitEvent) => {
+                  <prosekit-inline-popover-popup
+                    data-testid="inline-menu-link"
+                    class="box-border origin-(--transform-origin) transition-[opacity,scale] transition-discrete motion-reduce:transition-none data-[state=closed]:duration-150 data-[state=closed]:opacity-0 starting:opacity-0 data-[state=closed]:scale-95 starting:scale-95 duration-40 border border-gray-200 dark:border-gray-800 shadow-lg bg-[canvas] relative flex flex-col w-xs rounded-lg p-4 gap-y-2 items-stretch"
+                  >
+                    ${
+                    this.linkMenuOpen
+                      ? html`
+                          <form
+                            @submit=${(event: SubmitEvent) => {
                             event.preventDefault()
                             const target =
                               event.target as HTMLFormElement | null
@@ -278,32 +291,35 @@ class LitInlineMenu extends LitElement {
                               ?.value?.trim()
                             this.handleLinkUpdate(editor, href)
                           }}
-                        >
-                          <input
-                            placeholder="Paste the link..."
-                            value=${items.link.currentLink}
-                            class="flex h-9 rounded-md w-full bg-[canvas] px-3 py-2 text-sm placeholder:text-gray-500 dark:placeholder:text-gray-500 transition border box-border border-gray-200 dark:border-gray-800 border-solid ring-0 ring-transparent focus-visible:ring-2 focus-visible:ring-gray-900 dark:focus-visible:ring-gray-300 focus-visible:ring-offset-0 outline-hidden focus-visible:outline-hidden file:border-0 file:bg-transparent file:text-sm file:font-medium disabled:cursor-not-allowed disabled:opacity-50"
-                          />
-                        </form>
-                      `
-                    : nothing}
-                  ${items.link.isActive
-                    ? html`
-                        <button
-                          @click=${() => this.handleLinkUpdate(editor)}
-                          @mousedown=${(event: MouseEvent) =>
-                            event.preventDefault()}
-                          class="inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium ring-offset-white dark:ring-offset-gray-950 transition-colors focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-gray-900 dark:focus-visible:ring-gray-300 focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 border-0 bg-gray-900 dark:bg-gray-50 text-gray-50 dark:text-gray-900 hover:bg-gray-900/90 dark:hover:bg-gray-50/90 h-9 px-3"
-                        >
-                          Remove link
-                        </button>
-                      `
-                    : nothing}
-                </prosekit-inline-popover-popup>
-              </prosekit-inline-popover-positioner>
-            </prosekit-inline-popover-root>
-          `
-        : nothing}
+                          >
+                            <input
+                              placeholder="Paste the link..."
+                              value=${items.link.currentLink}
+                              class="flex h-9 rounded-md w-full bg-[canvas] px-3 py-2 text-sm placeholder:text-gray-500 dark:placeholder:text-gray-500 transition border box-border border-gray-200 dark:border-gray-800 border-solid ring-0 ring-transparent focus-visible:ring-2 focus-visible:ring-gray-900 dark:focus-visible:ring-gray-300 focus-visible:ring-offset-0 outline-hidden focus-visible:outline-hidden file:border-0 file:bg-transparent file:text-sm file:font-medium disabled:cursor-not-allowed disabled:opacity-50"
+                            />
+                          </form>
+                        `
+                      : nothing
+                  }
+                    ${
+                    items.link.isActive
+                      ? html`
+                          <button
+                            @click=${() => this.handleLinkUpdate(editor)}
+                            @mousedown=${(event: MouseEvent) => event.preventDefault()}
+                            class="inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium ring-offset-white dark:ring-offset-gray-950 transition-colors focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-gray-900 dark:focus-visible:ring-gray-300 focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 border-0 bg-gray-900 dark:bg-gray-50 text-gray-50 dark:text-gray-900 hover:bg-gray-900/90 dark:hover:bg-gray-50/90 h-9 px-3"
+                          >
+                            Remove link
+                          </button>
+                        `
+                      : nothing
+                  }
+                  </prosekit-inline-popover-popup>
+                </prosekit-inline-popover-positioner>
+              </prosekit-inline-popover-root>
+            `
+          : nothing
+      }
     `
   }
 }
diff --git a/lit-slash-menu/src/components/editor/ui/slash-menu/slash-menu-item.ts b/lit-slash-menu/src/components/editor/ui/slash-menu/slash-menu-item.ts
index ad7bd23cf7..3cc7c0e4bb 100644
--- a/lit-slash-menu/src/components/editor/ui/slash-menu/slash-menu-item.ts
+++ b/lit-slash-menu/src/components/editor/ui/slash-menu/slash-menu-item.ts
@@ -31,13 +31,15 @@ export class SlashMenuItemElement extends LitElement {
         class="relative flex items-center justify-between min-w-32 scroll-my-1 rounded-md px-3 py-1.5 text-sm box-border cursor-default select-none whitespace-nowrap outline-hidden data-highlighted:bg-gray-100 dark:data-highlighted:bg-gray-800"
       >
         <span>${this.label}</span>
-        ${this.kbd
+        ${
+        this.kbd
           ? html`
               <kbd class="text-xs font-mono text-gray-400 dark:text-gray-500">
                 ${this.kbd}
               </kbd>
             `
-          : ''}
+          : ''
+      }
       </prosekit-autocomplete-item>
     `
   }
diff --git a/lit-slash-menu/src/components/editor/ui/slash-menu/slash-menu.ts b/lit-slash-menu/src/components/editor/ui/slash-menu/slash-menu.ts
index f4cc8b3ada..0b75c62abc 100644
--- a/lit-slash-menu/src/components/editor/ui/slash-menu/slash-menu.ts
+++ b/lit-slash-menu/src/components/editor/ui/slash-menu/slash-menu.ts
@@ -31,8 +31,7 @@ class SlashMenuElement extends LitElement {
 
   override render() {
     const editor = this.editorConsumer.value as
-      | Editor<BasicExtension>
-      | undefined
+      Editor<BasicExtension> | undefined
     if (!editor) {
       return html``
     }
diff --git a/lit-table/src/components/editor/ui/table-handle/table-handle.ts b/lit-table/src/components/editor/ui/table-handle/table-handle.ts
index 0cedbd8247..d314b1bb93 100644
--- a/lit-table/src/components/editor/ui/table-handle/table-handle.ts
+++ b/lit-table/src/components/editor/ui/table-handle/table-handle.ts
@@ -124,8 +124,7 @@ class LitTableHandle extends LitElement {
 
   override render() {
     const editor = this.editorConsumer.value as
-      | Editor<TableExtension>
-      | undefined
+      Editor<TableExtension> | undefined
     if (!editor) {
       return nothing
     }
@@ -163,7 +162,8 @@ class LitTableHandle extends LitElement {
                 <prosekit-menu-popup
                   class="box-border origin-(--transform-origin) transition-[opacity,scale] transition-discrete motion-reduce:transition-none data-[state=closed]:duration-150 data-[state=closed]:opacity-0 starting:opacity-0 data-[state=closed]:scale-95 starting:scale-95 duration-40 rounded-xl border border-gray-200 dark:border-gray-800 shadow-lg bg-[canvas] relative flex flex-col max-h-100 min-w-32 select-none overflow-auto whitespace-nowrap p-1 outline-none"
                 >
-                  ${state.addTableColumnBefore.canExec
+                  ${
+                  state.addTableColumnBefore.canExec
                     ? html`
                         <prosekit-menu-item
                           class="relative min-w-32 scroll-my-1 rounded-sm px-3 py-1.5 flex items-center justify-between gap-8 data-[disabled=true]:pointer-events-none data-[disabled=true]:opacity-50 hover:data-[disabled=true]:opacity-50 data-danger:text-red-500 box-border cursor-default select-none whitespace-nowrap outline-hidden data-highlighted:bg-gray-100 dark:data-highlighted:bg-gray-800"
@@ -172,8 +172,10 @@ class LitTableHandle extends LitElement {
                           <span>Insert Left</span>
                         </prosekit-menu-item>
                       `
-                    : nothing}
-                  ${state.addTableColumnAfter.canExec
+                    : nothing
+                }
+                  ${
+                  state.addTableColumnAfter.canExec
                     ? html`
                         <prosekit-menu-item
                           class="relative min-w-32 scroll-my-1 rounded-sm px-3 py-1.5 flex items-center justify-between gap-8 data-[disabled=true]:pointer-events-none data-[disabled=true]:opacity-50 hover:data-[disabled=true]:opacity-50 data-danger:text-red-500 box-border cursor-default select-none whitespace-nowrap outline-hidden data-highlighted:bg-gray-100 dark:data-highlighted:bg-gray-800"
@@ -182,8 +184,10 @@ class LitTableHandle extends LitElement {
                           <span>Insert Right</span>
                         </prosekit-menu-item>
                       `
-                    : nothing}
-                  ${state.deleteCellSelection.canExec
+                    : nothing
+                }
+                  ${
+                  state.deleteCellSelection.canExec
                     ? html`
                         <prosekit-menu-item
                           class="relative min-w-32 scroll-my-1 rounded-sm px-3 py-1.5 flex items-center justify-between gap-8 data-[disabled=true]:pointer-events-none data-[disabled=true]:opacity-50 hover:data-[disabled=true]:opacity-50 data-danger:text-red-500 box-border cursor-default select-none whitespace-nowrap outline-hidden data-highlighted:bg-gray-100 dark:data-highlighted:bg-gray-800"
@@ -197,8 +201,10 @@ class LitTableHandle extends LitElement {
                           </span>
                         </prosekit-menu-item>
                       `
-                    : nothing}
-                  ${state.deleteTableColumn.canExec
+                    : nothing
+                }
+                  ${
+                  state.deleteTableColumn.canExec
                     ? html`
                         <prosekit-menu-item
                           class="relative min-w-32 scroll-my-1 rounded-sm px-3 py-1.5 flex items-center justify-between gap-8 data-[disabled=true]:pointer-events-none data-[disabled=true]:opacity-50 hover:data-[disabled=true]:opacity-50 data-danger:text-red-500 box-border cursor-default select-none whitespace-nowrap outline-hidden data-highlighted:bg-gray-100 dark:data-highlighted:bg-gray-800"
@@ -207,8 +213,10 @@ class LitTableHandle extends LitElement {
                           <span>Delete Column</span>
                         </prosekit-menu-item>
                       `
-                    : nothing}
-                  ${state.deleteTable.canExec
+                    : nothing
+                }
+                  ${
+                  state.deleteTable.canExec
                     ? html`
                         <prosekit-menu-item
                           class="relative min-w-32 scroll-my-1 rounded-sm px-3 py-1.5 flex items-center justify-between gap-8 data-[disabled=true]:pointer-events-none data-[disabled=true]:opacity-50 hover:data-[disabled=true]:opacity-50 data-danger:text-red-500 box-border cursor-default select-none whitespace-nowrap outline-hidden data-highlighted:bg-gray-100 dark:data-highlighted:bg-gray-800"
@@ -218,7 +226,8 @@ class LitTableHandle extends LitElement {
                           <span>Delete Table</span>
                         </prosekit-menu-item>
                       `
-                    : nothing}
+                    : nothing
+                }
                 </prosekit-menu-popup>
               </prosekit-menu-positioner>
             </prosekit-table-handle-column-menu-root>
@@ -247,7 +256,8 @@ class LitTableHandle extends LitElement {
                 <prosekit-menu-popup
                   class="box-border origin-(--transform-origin) transition-[opacity,scale] transition-discrete motion-reduce:transition-none data-[state=closed]:duration-150 data-[state=closed]:opacity-0 starting:opacity-0 data-[state=closed]:scale-95 starting:scale-95 duration-40 rounded-xl border border-gray-200 dark:border-gray-800 shadow-lg bg-[canvas] relative flex flex-col max-h-100 min-w-32 select-none overflow-auto whitespace-nowrap p-1 outline-none"
                 >
-                  ${state.addTableRowAbove.canExec
+                  ${
+                  state.addTableRowAbove.canExec
                     ? html`
                         <prosekit-menu-item
                           class="relative min-w-32 scroll-my-1 rounded-sm px-3 py-1.5 flex items-center justify-between gap-8 data-[disabled=true]:pointer-events-none data-[disabled=true]:opacity-50 hover:data-[disabled=true]:opacity-50 data-danger:text-red-500 box-border cursor-default select-none whitespace-nowrap outline-hidden data-highlighted:bg-gray-100 dark:data-highlighted:bg-gray-800"
@@ -256,8 +266,10 @@ class LitTableHandle extends LitElement {
                           <span>Insert Above</span>
                         </prosekit-menu-item>
                       `
-                    : nothing}
-                  ${state.addTableRowBelow.canExec
+                    : nothing
+                }
+                  ${
+                  state.addTableRowBelow.canExec
                     ? html`
                         <prosekit-menu-item
                           class="relative min-w-32 scroll-my-1 rounded-sm px-3 py-1.5 flex items-center justify-between gap-8 data-[disabled=true]:pointer-events-none data-[disabled=true]:opacity-50 hover:data-[disabled=true]:opacity-50 data-danger:text-red-500 box-border cursor-default select-none whitespace-nowrap outline-hidden data-highlighted:bg-gray-100 dark:data-highlighted:bg-gray-800"
@@ -266,8 +278,10 @@ class LitTableHandle extends LitElement {
                           <span>Insert Below</span>
                         </prosekit-menu-item>
                       `
-                    : nothing}
-                  ${state.deleteCellSelection.canExec
+                    : nothing
+                }
+                  ${
+                  state.deleteCellSelection.canExec
                     ? html`
                         <prosekit-menu-item
                           class="relative min-w-32 scroll-my-1 rounded-sm px-3 py-1.5 flex items-center justify-between gap-8 data-[disabled=true]:pointer-events-none data-[disabled=true]:opacity-50 hover:data-[disabled=true]:opacity-50 data-danger:text-red-500 box-border cursor-default select-none whitespace-nowrap outline-hidden data-highlighted:bg-gray-100 dark:data-highlighted:bg-gray-800"
@@ -281,8 +295,10 @@ class LitTableHandle extends LitElement {
                           </span>
                         </prosekit-menu-item>
                       `
-                    : nothing}
-                  ${state.deleteTableRow.canExec
+                    : nothing
+                }
+                  ${
+                  state.deleteTableRow.canExec
                     ? html`
                         <prosekit-menu-item
                           class="relative min-w-32 scroll-my-1 rounded-sm px-3 py-1.5 flex items-center justify-between gap-8 data-[disabled=true]:pointer-events-none data-[disabled=true]:opacity-50 hover:data-[disabled=true]:opacity-50 data-danger:text-red-500 box-border cursor-default select-none whitespace-nowrap outline-hidden data-highlighted:bg-gray-100 dark:data-highlighted:bg-gray-800"
@@ -291,8 +307,10 @@ class LitTableHandle extends LitElement {
                           <span>Delete Row</span>
                         </prosekit-menu-item>
                       `
-                    : nothing}
-                  ${state.deleteTable.canExec
+                    : nothing
+                }
+                  ${
+                  state.deleteTable.canExec
                     ? html`
                         <prosekit-menu-item
                           class="relative min-w-32 scroll-my-1 rounded-sm px-3 py-1.5 flex items-center justify-between gap-8 data-[disabled=true]:pointer-events-none data-[disabled=true]:opacity-50 hover:data-[disabled=true]:opacity-50 data-danger:text-red-500 box-border cursor-default select-none whitespace-nowrap outline-hidden data-highlighted:bg-gray-100 dark:data-highlighted:bg-gray-800"
@@ -302,7 +320,8 @@ class LitTableHandle extends LitElement {
                           <span>Delete Table</span>
                         </prosekit-menu-item>
                       `
-                    : nothing}
+                    : nothing
+                }
                 </prosekit-menu-popup>
               </prosekit-menu-positioner>
             </prosekit-table-handle-row-menu-root>
diff --git a/lit-toolbar/src/components/editor/ui/button/button.ts b/lit-toolbar/src/components/editor/ui/button/button.ts
index aef47e4e1f..e9979fb5c3 100644
--- a/lit-toolbar/src/components/editor/ui/button/button.ts
+++ b/lit-toolbar/src/components/editor/ui/button/button.ts
@@ -45,31 +45,37 @@ class LitButton extends LitElement {
             ?disabled=${this.disabled}
             @mousedown=${this.handleMouseDown}
           >
-            ${this.icon
-              ? html`
-                  <div class="${this.icon}"></div>
-                `
-              : nothing}
-            ${tooltip
-              ? html`
-                  <span class="sr-only">${tooltip}</span>
-                `
-              : nothing}
+            ${
+              this.icon
+                ? html`
+                    <div class="${this.icon}"></div>
+                  `
+                : nothing
+            }
+            ${
+              tooltip
+                ? html`
+                    <span class="sr-only">${tooltip}</span>
+                  `
+                : nothing
+            }
           </button>
         </prosekit-tooltip-trigger>
-        ${tooltip
-          ? html`
-              <prosekit-tooltip-positioner
-                class="block overflow-visible w-min h-min z-50 ease-out transition-transform duration-100 motion-reduce:transition-none"
-              >
-                <prosekit-tooltip-popup
-                  class="flex box-border origin-(--transform-origin) transition-[opacity,scale] transition-discrete motion-reduce:transition-none duration-100 data-[state=closed]:duration-150 data-[state=closed]:opacity-0 starting:opacity-0 data-[state=closed]:scale-95 starting:scale-95 overflow-hidden rounded-md border border-solid bg-gray-900 dark:bg-gray-50 px-3 py-1.5 text-xs text-gray-50 dark:text-gray-900 shadow-xs text-nowrap"
+        ${
+          tooltip
+            ? html`
+                <prosekit-tooltip-positioner
+                  class="block overflow-visible w-min h-min z-50 ease-out transition-transform duration-100 motion-reduce:transition-none"
                 >
-                  ${tooltip}
-                </prosekit-tooltip-popup>
-              </prosekit-tooltip-positioner>
-            `
-          : nothing}
+                  <prosekit-tooltip-popup
+                    class="flex box-border origin-(--transform-origin) transition-[opacity,scale] transition-discrete motion-reduce:transition-none duration-100 data-[state=closed]:duration-150 data-[state=closed]:opacity-0 starting:opacity-0 data-[state=closed]:scale-95 starting:scale-95 overflow-hidden rounded-md border border-solid bg-gray-900 dark:bg-gray-50 px-3 py-1.5 text-xs text-gray-50 dark:text-gray-900 shadow-xs text-nowrap"
+                  >
+                    ${tooltip}
+                  </prosekit-tooltip-popup>
+                </prosekit-tooltip-positioner>
+              `
+            : nothing
+        }
       </prosekit-tooltip-root>
     `
   }
diff --git a/lit-toolbar/src/components/editor/ui/image-upload-popover/image-upload-popover.ts b/lit-toolbar/src/components/editor/ui/image-upload-popover/image-upload-popover.ts
index 4ddfdbce9a..6fae6c64ba 100644
--- a/lit-toolbar/src/components/editor/ui/image-upload-popover/image-upload-popover.ts
+++ b/lit-toolbar/src/components/editor/ui/image-upload-popover/image-upload-popover.ts
@@ -127,51 +127,59 @@ class LitImageUploadPopover extends LitElement {
           <prosekit-popover-popup
             class="box-border origin-(--transform-origin) transition-[opacity,scale] transition-discrete motion-reduce:transition-none data-[state=closed]:duration-150 data-[state=closed]:opacity-0 starting:opacity-0 data-[state=closed]:scale-95 starting:scale-95 duration-40 rounded-xl border border-gray-200 dark:border-gray-800 shadow-lg bg-[canvas] flex flex-col gap-y-4 p-6 text-sm w-sm"
           >
-            ${!this.file
-              ? html`
-                  <label for="id-link-${this.ariaId}">Embed Link</label>
-                  <input
-                    id="id-link-${this.ariaId}"
-                    class="flex h-9 rounded-md w-full bg-[canvas] px-3 py-2 text-sm placeholder:text-gray-500 dark:placeholder:text-gray-500 transition border box-border border-gray-200 dark:border-gray-800 border-solid ring-0 ring-transparent focus-visible:ring-2 focus-visible:ring-gray-900 dark:focus-visible:ring-gray-300 focus-visible:ring-offset-0 outline-hidden focus-visible:outline-hidden file:border-0 file:bg-transparent file:text-sm file:font-medium disabled:cursor-not-allowed disabled:opacity-50"
-                    placeholder="Paste the image link..."
-                    type="url"
-                    .value=${this.url}
-                    @input=${this.handleUrlChange}
-                  />
-                `
-              : nothing}
-            ${!this.url
-              ? html`
-                  <label for="id-upload-${this.ariaId}">Upload</label>
-                  <input
-                    id="id-upload-${this.ariaId}"
-                    class="flex h-9 rounded-md w-full bg-[canvas] px-3 py-2 text-sm placeholder:text-gray-500 dark:placeholder:text-gray-500 transition border box-border border-gray-200 dark:border-gray-800 border-solid ring-0 ring-transparent focus-visible:ring-2 focus-visible:ring-gray-900 dark:focus-visible:ring-gray-300 focus-visible:ring-offset-0 outline-hidden focus-visible:outline-hidden file:border-0 file:bg-transparent file:text-sm file:font-medium disabled:cursor-not-allowed disabled:opacity-50"
-                    accept="image/*"
-                    type="file"
-                    @change=${this.handleFileChange}
-                  />
-                `
-              : nothing}
-            ${this.url
-              ? html`
-                  <button
-                    class="inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium ring-offset-white dark:ring-offset-gray-950 transition-colors focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-gray-900 dark:focus-visible:ring-gray-300 focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 border-0 bg-gray-900 dark:bg-gray-50 text-gray-50 dark:text-gray-900 hover:bg-gray-900/90 dark:hover:bg-gray-50/90 h-10 px-4 py-2 w-full"
-                    @click=${this.handleSubmit}
-                  >
-                    Insert Image
-                  </button>
-                `
-              : nothing}
-            ${this.file
-              ? html`
-                  <button
-                    class="inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium ring-offset-white dark:ring-offset-gray-950 transition-colors focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-gray-900 dark:focus-visible:ring-gray-300 focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 border-0 bg-gray-900 dark:bg-gray-50 text-gray-50 dark:text-gray-900 hover:bg-gray-900/90 dark:hover:bg-gray-50/90 h-10 px-4 py-2 w-full"
-                    @click=${this.handleSubmit}
-                  >
-                    Upload Image
-                  </button>
-                `
-              : nothing}
+            ${
+              !this.file
+                ? html`
+                    <label for="id-link-${this.ariaId}">Embed Link</label>
+                    <input
+                      id="id-link-${this.ariaId}"
+                      class="flex h-9 rounded-md w-full bg-[canvas] px-3 py-2 text-sm placeholder:text-gray-500 dark:placeholder:text-gray-500 transition border box-border border-gray-200 dark:border-gray-800 border-solid ring-0 ring-transparent focus-visible:ring-2 focus-visible:ring-gray-900 dark:focus-visible:ring-gray-300 focus-visible:ring-offset-0 outline-hidden focus-visible:outline-hidden file:border-0 file:bg-transparent file:text-sm file:font-medium disabled:cursor-not-allowed disabled:opacity-50"
+                      placeholder="Paste the image link..."
+                      type="url"
+                      .value=${this.url}
+                      @input=${this.handleUrlChange}
+                    />
+                  `
+                : nothing
+            }
+            ${
+              !this.url
+                ? html`
+                    <label for="id-upload-${this.ariaId}">Upload</label>
+                    <input
+                      id="id-upload-${this.ariaId}"
+                      class="flex h-9 rounded-md w-full bg-[canvas] px-3 py-2 text-sm placeholder:text-gray-500 dark:placeholder:text-gray-500 transition border box-border border-gray-200 dark:border-gray-800 border-solid ring-0 ring-transparent focus-visible:ring-2 focus-visible:ring-gray-900 dark:focus-visible:ring-gray-300 focus-visible:ring-offset-0 outline-hidden focus-visible:outline-hidden file:border-0 file:bg-transparent file:text-sm file:font-medium disabled:cursor-not-allowed disabled:opacity-50"
+                      accept="image/*"
+                      type="file"
+                      @change=${this.handleFileChange}
+                    />
+                  `
+                : nothing
+            }
+            ${
+              this.url
+                ? html`
+                    <button
+                      class="inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium ring-offset-white dark:ring-offset-gray-950 transition-colors focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-gray-900 dark:focus-visible:ring-gray-300 focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 border-0 bg-gray-900 dark:bg-gray-50 text-gray-50 dark:text-gray-900 hover:bg-gray-900/90 dark:hover:bg-gray-50/90 h-10 px-4 py-2 w-full"
+                      @click=${this.handleSubmit}
+                    >
+                      Insert Image
+                    </button>
+                  `
+                : nothing
+            }
+            ${
+              this.file
+                ? html`
+                    <button
+                      class="inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium ring-offset-white dark:ring-offset-gray-950 transition-colors focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-gray-900 dark:focus-visible:ring-gray-300 focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 border-0 bg-gray-900 dark:bg-gray-50 text-gray-50 dark:text-gray-900 hover:bg-gray-900/90 dark:hover:bg-gray-50/90 h-10 px-4 py-2 w-full"
+                      @click=${this.handleSubmit}
+                    >
+                      Upload Image
+                    </button>
+                  `
+                : nothing
+            }
           </prosekit-popover-popup>
         </prosekit-popover-positioner>
       </prosekit-popover-root>
diff --git a/lit-toolbar/src/components/editor/ui/toolbar/toolbar.ts b/lit-toolbar/src/components/editor/ui/toolbar/toolbar.ts
index 11c3f99372..99762750ca 100644
--- a/lit-toolbar/src/components/editor/ui/toolbar/toolbar.ts
+++ b/lit-toolbar/src/components/editor/ui/toolbar/toolbar.ts
@@ -220,8 +220,7 @@ class LitToolbar extends LitElement {
 
   override render() {
     const editor = this.editorConsumer.value as
-      | Editor<BasicExtension>
-      | undefined
+      Editor<BasicExtension> | undefined
     if (!editor) {
       return nothing
     }
@@ -232,226 +231,266 @@ class LitToolbar extends LitElement {
       <div
         class="z-2 box-border border-gray-200 dark:border-gray-800 border-solid border-l-0 border-r-0 border-t-0 border-b flex flex-wrap gap-1 p-2 items-center"
       >
-        ${items.undo
-          ? html`
-              <lit-editor-button
-                .pressed=${items.undo.isActive}
-                .disabled=${!items.undo.canExec}
-                tooltip="Undo"
-                icon="i-lucide-undo-2 size-5 block"
-                @click=${items.undo.command}
-              ></lit-editor-button>
-            `
-          : nothing}
-        ${items.redo
-          ? html`
-              <lit-editor-button
-                .pressed=${items.redo.isActive}
-                .disabled=${!items.redo.canExec}
-                tooltip="Redo"
-                icon="i-lucide-redo-2 size-5 block"
-                @click=${items.redo.command}
-              ></lit-editor-button>
-            `
-          : nothing}
-        ${items.bold
-          ? html`
-              <lit-editor-button
-                .pressed=${items.bold.isActive}
-                .disabled=${!items.bold.canExec}
-                tooltip="Bold"
-                icon="i-lucide-bold size-5 block"
-                @click=${items.bold.command}
-              ></lit-editor-button>
-            `
-          : nothing}
-        ${items.italic
-          ? html`
-              <lit-editor-button
-                .pressed=${items.italic.isActive}
-                .disabled=${!items.italic.canExec}
-                tooltip="Italic"
-                icon="i-lucide-italic size-5 block"
-                @click=${items.italic.command}
-              ></lit-editor-button>
-            `
-          : nothing}
-        ${items.underline
-          ? html`
-              <lit-editor-button
-                .pressed=${items.underline.isActive}
-                .disabled=${!items.underline.canExec}
-                tooltip="Underline"
-                icon="i-lucide-underline size-5 block"
-                @click=${items.underline.command}
-              ></lit-editor-button>
-            `
-          : nothing}
-        ${items.strike
-          ? html`
-              <lit-editor-button
-                .pressed=${items.strike.isActive}
-                .disabled=${!items.strike.canExec}
-                tooltip="Strike"
-                icon="i-lucide-strikethrough size-5 block"
-                @click=${items.strike.command}
-              ></lit-editor-button>
-            `
-          : nothing}
-        ${items.code
-          ? html`
-              <lit-editor-button
-                .pressed=${items.code.isActive}
-                .disabled=${!items.code.canExec}
-                tooltip="Code"
-                icon="i-lucide-code size-5 block"
-                @click=${items.code.command}
-              ></lit-editor-button>
-            `
-          : nothing}
-        ${items.codeBlock
-          ? html`
-              <lit-editor-button
-                .pressed=${items.codeBlock.isActive}
-                .disabled=${!items.codeBlock.canExec}
-                tooltip="Code Block"
-                icon="i-lucide-square-code size-5 block"
-                @click=${items.codeBlock.command}
-              ></lit-editor-button>
-            `
-          : nothing}
-        ${items.heading1
-          ? html`
-              <lit-editor-button
-                .pressed=${items.heading1.isActive}
-                .disabled=${!items.heading1.canExec}
-                tooltip="Heading 1"
-                icon="i-lucide-heading-1 size-5 block"
-                @click=${items.heading1.command}
-              ></lit-editor-button>
-            `
-          : nothing}
-        ${items.heading2
-          ? html`
-              <lit-editor-button
-                .pressed=${items.heading2.isActive}
-                .disabled=${!items.heading2.canExec}
-                tooltip="Heading 2"
-                icon="i-lucide-heading-2 size-5 block"
-                @click=${items.heading2.command}
-              ></lit-editor-button>
-            `
-          : nothing}
-        ${items.heading3
-          ? html`
-              <lit-editor-button
-                .pressed=${items.heading3.isActive}
-                .disabled=${!items.heading3.canExec}
-                tooltip="Heading 3"
-                icon="i-lucide-heading-3 size-5 block"
-                @click=${items.heading3.command}
-              ></lit-editor-button>
-            `
-          : nothing}
-        ${items.horizontalRule
-          ? html`
-              <lit-editor-button
-                .pressed=${items.horizontalRule.isActive}
-                .disabled=${!items.horizontalRule.canExec}
-                tooltip="Divider"
-                icon="i-lucide-minus size-5 block"
-                @click=${items.horizontalRule.command}
-              ></lit-editor-button>
-            `
-          : nothing}
-        ${items.blockquote
-          ? html`
-              <lit-editor-button
-                .pressed=${items.blockquote.isActive}
-                .disabled=${!items.blockquote.canExec}
-                tooltip="Blockquote"
-                icon="i-lucide-text-quote size-5 block"
-                @click=${items.blockquote.command}
-              ></lit-editor-button>
-            `
-          : nothing}
-        ${items.bulletList
-          ? html`
-              <lit-editor-button
-                .pressed=${items.bulletList.isActive}
-                .disabled=${!items.bulletList.canExec}
-                tooltip="Bullet List"
-                icon="i-lucide-list size-5 block"
-                @click=${items.bulletList.command}
-              ></lit-editor-button>
-            `
-          : nothing}
-        ${items.orderedList
-          ? html`
-              <lit-editor-button
-                .pressed=${items.orderedList.isActive}
-                .disabled=${!items.orderedList.canExec}
-                tooltip="Ordered List"
-                icon="i-lucide-list-ordered size-5 block"
-                @click=${items.orderedList.command}
-              ></lit-editor-button>
-            `
-          : nothing}
-        ${items.taskList
-          ? html`
-              <lit-editor-button
-                .pressed=${items.taskList.isActive}
-                .disabled=${!items.taskList.canExec}
-                tooltip="Task List"
-                icon="i-lucide-list-checks size-5 block"
-                @click=${items.taskList.command}
-              ></lit-editor-button>
-            `
-          : nothing}
-        ${items.toggleList
-          ? html`
-              <lit-editor-button
-                .pressed=${items.toggleList.isActive}
-                .disabled=${!items.toggleList.canExec}
-                tooltip="Toggle List"
-                icon="i-lucide-list-collapse size-5 block"
-                @click=${items.toggleList.command}
-              ></lit-editor-button>
-            `
-          : nothing}
-        ${items.indentList
-          ? html`
-              <lit-editor-button
-                .pressed=${items.indentList.isActive}
-                .disabled=${!items.indentList.canExec}
-                tooltip="Increase indentation"
-                icon="i-lucide-indent-increase size-5 block"
-                @click=${items.indentList.command}
-              ></lit-editor-button>
-            `
-          : nothing}
-        ${items.dedentList
-          ? html`
-              <lit-editor-button
-                .pressed=${items.dedentList.isActive}
-                .disabled=${!items.dedentList.canExec}
-                tooltip="Decrease indentation"
-                icon="i-lucide-indent-decrease size-5 block"
-                @click=${items.dedentList.command}
-              ></lit-editor-button>
-            `
-          : nothing}
-        ${this.uploader && items.insertImage
-          ? html`
-              <lit-editor-image-upload-popover
-                .editor=${editor}
-                .uploader=${this.uploader}
-                .disabled=${!items.insertImage.canExec}
-                tooltip="Insert Image"
-                icon="i-lucide-image size-5 block"
-              ></lit-editor-image-upload-popover>
-            `
-          : nothing}
+        ${
+          items.undo
+            ? html`
+                <lit-editor-button
+                  .pressed=${items.undo.isActive}
+                  .disabled=${!items.undo.canExec}
+                  tooltip="Undo"
+                  icon="i-lucide-undo-2 size-5 block"
+                  @click=${items.undo.command}
+                ></lit-editor-button>
+              `
+            : nothing
+        }
+        ${
+          items.redo
+            ? html`
+                <lit-editor-button
+                  .pressed=${items.redo.isActive}
+                  .disabled=${!items.redo.canExec}
+                  tooltip="Redo"
+                  icon="i-lucide-redo-2 size-5 block"
+                  @click=${items.redo.command}
+                ></lit-editor-button>
+              `
+            : nothing
+        }
+        ${
+          items.bold
+            ? html`
+                <lit-editor-button
+                  .pressed=${items.bold.isActive}
+                  .disabled=${!items.bold.canExec}
+                  tooltip="Bold"
+                  icon="i-lucide-bold size-5 block"
+                  @click=${items.bold.command}
+                ></lit-editor-button>
+              `
+            : nothing
+        }
+        ${
+          items.italic
+            ? html`
+                <lit-editor-button
+                  .pressed=${items.italic.isActive}
+                  .disabled=${!items.italic.canExec}
+                  tooltip="Italic"
+                  icon="i-lucide-italic size-5 block"
+                  @click=${items.italic.command}
+                ></lit-editor-button>
+              `
+            : nothing
+        }
+        ${
+          items.underline
+            ? html`
+                <lit-editor-button
+                  .pressed=${items.underline.isActive}
+                  .disabled=${!items.underline.canExec}
+                  tooltip="Underline"
+                  icon="i-lucide-underline size-5 block"
+                  @click=${items.underline.command}
+                ></lit-editor-button>
+              `
+            : nothing
+        }
+        ${
+          items.strike
+            ? html`
+                <lit-editor-button
+                  .pressed=${items.strike.isActive}
+                  .disabled=${!items.strike.canExec}
+                  tooltip="Strike"
+                  icon="i-lucide-strikethrough size-5 block"
+                  @click=${items.strike.command}
+                ></lit-editor-button>
+              `
+            : nothing
+        }
+        ${
+          items.code
+            ? html`
+                <lit-editor-button
+                  .pressed=${items.code.isActive}
+                  .disabled=${!items.code.canExec}
+                  tooltip="Code"
+                  icon="i-lucide-code size-5 block"
+                  @click=${items.code.command}
+                ></lit-editor-button>
+              `
+            : nothing
+        }
+        ${
+          items.codeBlock
+            ? html`
+                <lit-editor-button
+                  .pressed=${items.codeBlock.isActive}
+                  .disabled=${!items.codeBlock.canExec}
+                  tooltip="Code Block"
+                  icon="i-lucide-square-code size-5 block"
+                  @click=${items.codeBlock.command}
+                ></lit-editor-button>
+              `
+            : nothing
+        }
+        ${
+          items.heading1
+            ? html`
+                <lit-editor-button
+                  .pressed=${items.heading1.isActive}
+                  .disabled=${!items.heading1.canExec}
+                  tooltip="Heading 1"
+                  icon="i-lucide-heading-1 size-5 block"
+                  @click=${items.heading1.command}
+                ></lit-editor-button>
+              `
+            : nothing
+        }
+        ${
+          items.heading2
+            ? html`
+                <lit-editor-button
+                  .pressed=${items.heading2.isActive}
+                  .disabled=${!items.heading2.canExec}
+                  tooltip="Heading 2"
+                  icon="i-lucide-heading-2 size-5 block"
+                  @click=${items.heading2.command}
+                ></lit-editor-button>
+              `
+            : nothing
+        }
+        ${
+          items.heading3
+            ? html`
+                <lit-editor-button
+                  .pressed=${items.heading3.isActive}
+                  .disabled=${!items.heading3.canExec}
+                  tooltip="Heading 3"
+                  icon="i-lucide-heading-3 size-5 block"
+                  @click=${items.heading3.command}
+                ></lit-editor-button>
+              `
+            : nothing
+        }
+        ${
+          items.horizontalRule
+            ? html`
+                <lit-editor-button
+                  .pressed=${items.horizontalRule.isActive}
+                  .disabled=${!items.horizontalRule.canExec}
+                  tooltip="Divider"
+                  icon="i-lucide-minus size-5 block"
+                  @click=${items.horizontalRule.command}
+                ></lit-editor-button>
+              `
+            : nothing
+        }
+        ${
+          items.blockquote
+            ? html`
+                <lit-editor-button
+                  .pressed=${items.blockquote.isActive}
+                  .disabled=${!items.blockquote.canExec}
+                  tooltip="Blockquote"
+                  icon="i-lucide-text-quote size-5 block"
+                  @click=${items.blockquote.command}
+                ></lit-editor-button>
+              `
+            : nothing
+        }
+        ${
+          items.bulletList
+            ? html`
+                <lit-editor-button
+                  .pressed=${items.bulletList.isActive}
+                  .disabled=${!items.bulletList.canExec}
+                  tooltip="Bullet List"
+                  icon="i-lucide-list size-5 block"
+                  @click=${items.bulletList.command}
+                ></lit-editor-button>
+              `
+            : nothing
+        }
+        ${
+          items.orderedList
+            ? html`
+                <lit-editor-button
+                  .pressed=${items.orderedList.isActive}
+                  .disabled=${!items.orderedList.canExec}
+                  tooltip="Ordered List"
+                  icon="i-lucide-list-ordered size-5 block"
+                  @click=${items.orderedList.command}
+                ></lit-editor-button>
+              `
+            : nothing
+        }
+        ${
+          items.taskList
+            ? html`
+                <lit-editor-button
+                  .pressed=${items.taskList.isActive}
+                  .disabled=${!items.taskList.canExec}
+                  tooltip="Task List"
+                  icon="i-lucide-list-checks size-5 block"
+                  @click=${items.taskList.command}
+                ></lit-editor-button>
+              `
+            : nothing
+        }
+        ${
+          items.toggleList
+            ? html`
+                <lit-editor-button
+                  .pressed=${items.toggleList.isActive}
+                  .disabled=${!items.toggleList.canExec}
+                  tooltip="Toggle List"
+                  icon="i-lucide-list-collapse size-5 block"
+                  @click=${items.toggleList.command}
+                ></lit-editor-button>
+              `
+            : nothing
+        }
+        ${
+          items.indentList
+            ? html`
+                <lit-editor-button
+                  .pressed=${items.indentList.isActive}
+                  .disabled=${!items.indentList.canExec}
+                  tooltip="Increase indentation"
+                  icon="i-lucide-indent-increase size-5 block"
+                  @click=${items.indentList.command}
+                ></lit-editor-button>
+              `
+            : nothing
+        }
+        ${
+          items.dedentList
+            ? html`
+                <lit-editor-button
+                  .pressed=${items.dedentList.isActive}
+                  .disabled=${!items.dedentList.canExec}
+                  tooltip="Decrease indentation"
+                  icon="i-lucide-indent-decrease size-5 block"
+                  @click=${items.dedentList.command}
+                ></lit-editor-button>
+              `
+            : nothing
+        }
+        ${
+          this.uploader && items.insertImage
+            ? html`
+                <lit-editor-image-upload-popover
+                  .editor=${editor}
+                  .uploader=${this.uploader}
+                  .disabled=${!items.insertImage.canExec}
+                  tooltip="Insert Image"
+                  icon="i-lucide-image size-5 block"
+                ></lit-editor-image-upload-popover>
+              `
+            : nothing
+        }
       </div>
     `
   }
diff --git a/package.json b/package.json
index 585197d27b..e93e1d5b87 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
   "dependencies": {
     "@types/bun": "1.3.14",
     "@types/node": "24.13.2",
-    "prettier": "3.8.5",
+    "prettier": "3.9.1",
     "prettier-plugin-packagejson": "3.0.2",
     "prosekit-registry": "0.0.20260601211356"
   }