diff --git a/apps/www/public/r/styles/default/api-ai.json b/apps/www/public/r/styles/default/api-ai.json
index a54da9eaa..3b1d96186 100644
--- a/apps/www/public/r/styles/default/api-ai.json
+++ b/apps/www/public/r/styles/default/api-ai.json
@@ -18,8 +18,6 @@
     }
   ],
   "name": "api-ai",
-  "registryDependencies": [
-    "use-chat"
-  ],
+  "registryDependencies": [],
   "type": "registry:lib"
 }
\ No newline at end of file
diff --git a/apps/www/public/r/styles/default/list-demo.json b/apps/www/public/r/styles/default/list-demo.json
index 64abab6de..dc3b2c4a5 100644
--- a/apps/www/public/r/styles/default/list-demo.json
+++ b/apps/www/public/r/styles/default/list-demo.json
@@ -28,9 +28,9 @@
       "type": "registry:example"
     },
     {
-      "content": "'use client';\n\nimport type { Value } from '@udecode/plate-common';\n\nimport { withProps } from '@udecode/cn';\nimport { AIPlugin } from '@udecode/plate-ai/react';\nimport {\n  BoldPlugin,\n  CodePlugin,\n  ItalicPlugin,\n  StrikethroughPlugin,\n  SubscriptPlugin,\n  SuperscriptPlugin,\n  UnderlinePlugin,\n} from '@udecode/plate-basic-marks/react';\nimport { BlockquotePlugin } from '@udecode/plate-block-quote/react';\nimport {\n  CodeBlockPlugin,\n  CodeLinePlugin,\n  CodeSyntaxPlugin,\n} from '@udecode/plate-code-block/react';\nimport { CommentsPlugin } from '@udecode/plate-comments/react';\nimport {\n  type CreatePlateEditorOptions,\n  ParagraphPlugin,\n  PlateLeaf,\n  usePlateEditor,\n} from '@udecode/plate-common/react';\nimport { DatePlugin } from '@udecode/plate-date/react';\nimport { EmojiInputPlugin } from '@udecode/plate-emoji/react';\nimport { HEADING_KEYS } from '@udecode/plate-heading';\nimport { TocPlugin } from '@udecode/plate-heading/react';\nimport { HighlightPlugin } from '@udecode/plate-highlight/react';\nimport { HorizontalRulePlugin } from '@udecode/plate-horizontal-rule/react';\nimport { KbdPlugin } from '@udecode/plate-kbd/react';\nimport { ColumnItemPlugin, ColumnPlugin } from '@udecode/plate-layout/react';\nimport { LinkPlugin } from '@udecode/plate-link/react';\nimport {\n  AudioPlugin,\n  FilePlugin,\n  ImagePlugin,\n  MediaEmbedPlugin,\n  PlaceholderPlugin,\n  VideoPlugin,\n} from '@udecode/plate-media/react';\nimport {\n  MentionInputPlugin,\n  MentionPlugin,\n} from '@udecode/plate-mention/react';\nimport { SlashInputPlugin } from '@udecode/plate-slash-command/react';\nimport {\n  TableCellHeaderPlugin,\n  TableCellPlugin,\n  TablePlugin,\n  TableRowPlugin,\n} from '@udecode/plate-table/react';\nimport { TogglePlugin } from '@udecode/plate-toggle/react';\n\nimport { AILeaf } from '@/components/plate-ui/ai-leaf';\nimport { BlockquoteElement } from '@/components/plate-ui/blockquote-element';\nimport { CodeBlockElement } from '@/components/plate-ui/code-block-element';\nimport { CodeLeaf } from '@/components/plate-ui/code-leaf';\nimport { CodeLineElement } from '@/components/plate-ui/code-line-element';\nimport { CodeSyntaxLeaf } from '@/components/plate-ui/code-syntax-leaf';\nimport { ColumnElement } from '@/components/plate-ui/column-element';\nimport { ColumnGroupElement } from '@/components/plate-ui/column-group-element';\nimport { CommentLeaf } from '@/components/plate-ui/comment-leaf';\nimport { DateElement } from '@/components/plate-ui/date-element';\nimport { EmojiInputElement } from '@/components/plate-ui/emoji-input-element';\nimport { HeadingElement } from '@/components/plate-ui/heading-element';\nimport { HighlightLeaf } from '@/components/plate-ui/highlight-leaf';\nimport { HrElement } from '@/components/plate-ui/hr-element';\nimport { ImageElement } from '@/components/plate-ui/image-element';\nimport { KbdLeaf } from '@/components/plate-ui/kbd-leaf';\nimport { LinkElement } from '@/components/plate-ui/link-element';\nimport { MediaAudioElement } from '@/components/plate-ui/media-audio-element';\nimport { MediaEmbedElement } from '@/components/plate-ui/media-embed-element';\nimport { MediaFileElement } from '@/components/plate-ui/media-file-element';\nimport { MediaPlaceholderElement } from '@/components/plate-ui/media-placeholder-element';\nimport { MediaVideoElement } from '@/components/plate-ui/media-video-element';\nimport { MentionElement } from '@/components/plate-ui/mention-element';\nimport { MentionInputElement } from '@/components/plate-ui/mention-input-element';\nimport { ParagraphElement } from '@/components/plate-ui/paragraph-element';\nimport { withPlaceholders } from '@/components/plate-ui/placeholder';\nimport { SlashInputElement } from '@/components/plate-ui/slash-input-element';\nimport {\n  TableCellElement,\n  TableCellHeaderElement,\n} from '@/components/plate-ui/table-cell-element';\nimport { TableElement } from '@/components/plate-ui/table-element';\nimport { TableRowElement } from '@/components/plate-ui/table-row-element';\nimport { TocElement } from '@/components/plate-ui/toc-element';\nimport { ToggleElement } from '@/components/plate-ui/toggle-element';\nimport { withDraggables } from '@/components/plate-ui/with-draggables';\n\nimport { editorPlugins, viewPlugins } from './plugins/editor-plugins';\n\nexport const viewComponents = {\n  [AudioPlugin.key]: MediaAudioElement,\n  [BlockquotePlugin.key]: BlockquoteElement,\n  [BoldPlugin.key]: withProps(PlateLeaf, { as: 'strong' }),\n  [CodeBlockPlugin.key]: CodeBlockElement,\n  [CodeLinePlugin.key]: CodeLineElement,\n  [CodePlugin.key]: CodeLeaf,\n  [CodeSyntaxPlugin.key]: CodeSyntaxLeaf,\n  [ColumnItemPlugin.key]: ColumnElement,\n  [ColumnPlugin.key]: ColumnGroupElement,\n  [CommentsPlugin.key]: CommentLeaf,\n  [DatePlugin.key]: DateElement,\n  [FilePlugin.key]: MediaFileElement,\n  [HEADING_KEYS.h1]: withProps(HeadingElement, { variant: 'h1' }),\n  [HEADING_KEYS.h2]: withProps(HeadingElement, { variant: 'h2' }),\n  [HEADING_KEYS.h3]: withProps(HeadingElement, { variant: 'h3' }),\n  [HEADING_KEYS.h4]: withProps(HeadingElement, { variant: 'h4' }),\n  [HEADING_KEYS.h5]: withProps(HeadingElement, { variant: 'h5' }),\n  [HEADING_KEYS.h6]: withProps(HeadingElement, { variant: 'h6' }),\n  [HighlightPlugin.key]: HighlightLeaf,\n  [HorizontalRulePlugin.key]: HrElement,\n  [ImagePlugin.key]: ImageElement,\n  [ItalicPlugin.key]: withProps(PlateLeaf, { as: 'em' }),\n  [KbdPlugin.key]: KbdLeaf,\n  [LinkPlugin.key]: LinkElement,\n  [MediaEmbedPlugin.key]: MediaEmbedElement,\n  [MentionPlugin.key]: MentionElement,\n  [ParagraphPlugin.key]: ParagraphElement,\n  [PlaceholderPlugin.key]: MediaPlaceholderElement,\n  [StrikethroughPlugin.key]: withProps(PlateLeaf, { as: 's' }),\n  [SubscriptPlugin.key]: withProps(PlateLeaf, { as: 'sub' }),\n  [SuperscriptPlugin.key]: withProps(PlateLeaf, { as: 'sup' }),\n  [TableCellHeaderPlugin.key]: TableCellHeaderElement,\n  [TableCellPlugin.key]: TableCellElement,\n  [TablePlugin.key]: TableElement,\n  [TableRowPlugin.key]: TableRowElement,\n  [TocPlugin.key]: TocElement,\n  [TogglePlugin.key]: ToggleElement,\n  [UnderlinePlugin.key]: withProps(PlateLeaf, { as: 'u' }),\n  [VideoPlugin.key]: MediaVideoElement,\n};\n\nexport const editorComponents = {\n  ...viewComponents,\n  [AIPlugin.key]: AILeaf,\n  [EmojiInputPlugin.key]: EmojiInputElement,\n  [MentionInputPlugin.key]: MentionInputElement,\n  [SlashInputPlugin.key]: SlashInputElement,\n};\n\nexport const useCreateEditor = (\n  {\n    components,\n    override,\n    readOnly,\n    ...options\n  }: {\n    components?: Record<string, any>;\n    plugins?: any[];\n    readOnly?: boolean;\n  } & Omit<CreatePlateEditorOptions, 'plugins'> = {},\n  deps: any[] = []\n) => {\n  return usePlateEditor<Value, (typeof editorPlugins)[number]>(\n    {\n      override: {\n        components: {\n          ...(readOnly\n            ? viewComponents\n            : withPlaceholders(withDraggables(editorComponents))),\n          ...components,\n        },\n        ...override,\n      },\n      plugins: (readOnly ? viewPlugins : editorPlugins) as any,\n      ...options,\n    },\n    deps\n  );\n};\n",
-      "path": "components/editor/use-create-editor.ts",
-      "target": "components/use-create-editor.ts",
+      "content": "import { withProps } from '@udecode/cn';\nimport { AIPlugin } from '@udecode/plate-ai/react';\nimport {\n  BoldPlugin,\n  CodePlugin,\n  ItalicPlugin,\n  StrikethroughPlugin,\n  SubscriptPlugin,\n  SuperscriptPlugin,\n  UnderlinePlugin,\n} from '@udecode/plate-basic-marks/react';\nimport { BlockquotePlugin } from '@udecode/plate-block-quote/react';\nimport {\n  CodeBlockPlugin,\n  CodeLinePlugin,\n  CodeSyntaxPlugin,\n} from '@udecode/plate-code-block/react';\nimport { CommentsPlugin } from '@udecode/plate-comments/react';\nimport {\n  ParagraphPlugin,\n  PlateElement,\n  PlateLeaf,\n  usePlateEditor,\n} from '@udecode/plate-common/react';\nimport { DatePlugin } from '@udecode/plate-date/react';\nimport { EmojiInputPlugin } from '@udecode/plate-emoji/react';\nimport { ExcalidrawPlugin } from '@udecode/plate-excalidraw/react';\nimport { HEADING_KEYS } from '@udecode/plate-heading';\nimport { TocPlugin } from '@udecode/plate-heading/react';\nimport { HighlightPlugin } from '@udecode/plate-highlight/react';\nimport { HorizontalRulePlugin } from '@udecode/plate-horizontal-rule/react';\nimport { KbdPlugin } from '@udecode/plate-kbd/react';\nimport { ColumnItemPlugin, ColumnPlugin } from '@udecode/plate-layout/react';\nimport { LinkPlugin } from '@udecode/plate-link/react';\nimport {\n  BulletedListPlugin,\n  ListItemPlugin,\n  NumberedListPlugin,\n} from '@udecode/plate-list/react';\nimport { ImagePlugin, MediaEmbedPlugin } from '@udecode/plate-media/react';\nimport {\n  MentionInputPlugin,\n  MentionPlugin,\n} from '@udecode/plate-mention/react';\nimport { SlashInputPlugin } from '@udecode/plate-slash-command/react';\nimport {\n  TableCellHeaderPlugin,\n  TableCellPlugin,\n  TablePlugin,\n  TableRowPlugin,\n} from '@udecode/plate-table/react';\nimport { TogglePlugin } from '@udecode/plate-toggle/react';\n\nimport { copilotPlugins } from '@/components/editor/plugins/copilot-plugins';\nimport { editorPlugins } from '@/components/editor/plugins/editor-plugins';\nimport { FixedToolbarListPlugin } from '@/components/editor/plugins/fixed-toolbar-list-plugin';\nimport { FloatingToolbarPlugin } from '@/components/editor/plugins/floating-toolbar-plugin';\nimport { AILeaf } from '@/components/plate-ui/ai-leaf';\nimport { BlockquoteElement } from '@/components/plate-ui/blockquote-element';\nimport { CodeBlockElement } from '@/components/plate-ui/code-block-element';\nimport { CodeLeaf } from '@/components/plate-ui/code-leaf';\nimport { CodeLineElement } from '@/components/plate-ui/code-line-element';\nimport { CodeSyntaxLeaf } from '@/components/plate-ui/code-syntax-leaf';\nimport { ColumnElement } from '@/components/plate-ui/column-element';\nimport { ColumnGroupElement } from '@/components/plate-ui/column-group-element';\nimport { CommentLeaf } from '@/components/plate-ui/comment-leaf';\nimport { DateElement } from '@/components/plate-ui/date-element';\nimport { EmojiInputElement } from '@/components/plate-ui/emoji-input-element';\nimport { ExcalidrawElement } from '@/components/plate-ui/excalidraw-element';\nimport { HeadingElement } from '@/components/plate-ui/heading-element';\nimport { HighlightLeaf } from '@/components/plate-ui/highlight-leaf';\nimport { HrElement } from '@/components/plate-ui/hr-element';\nimport { ImageElement } from '@/components/plate-ui/image-element';\nimport { KbdLeaf } from '@/components/plate-ui/kbd-leaf';\nimport { LinkElement } from '@/components/plate-ui/link-element';\nimport { ListElement } from '@/components/plate-ui/list-element';\nimport { MediaEmbedElement } from '@/components/plate-ui/media-embed-element';\nimport { MentionElement } from '@/components/plate-ui/mention-element';\nimport { MentionInputElement } from '@/components/plate-ui/mention-input-element';\nimport { ParagraphElement } from '@/components/plate-ui/paragraph-element';\nimport { withPlaceholders } from '@/components/plate-ui/placeholder';\nimport { SlashInputElement } from '@/components/plate-ui/slash-input-element';\nimport {\n  TableCellElement,\n  TableCellHeaderElement,\n} from '@/components/plate-ui/table-cell-element';\nimport { TableElement } from '@/components/plate-ui/table-element';\nimport { TableRowElement } from '@/components/plate-ui/table-row-element';\nimport { TocElement } from '@/components/plate-ui/toc-element';\nimport { ToggleElement } from '@/components/plate-ui/toggle-element';\nimport { withDraggables } from '@/components/plate-ui/with-draggables';\n\nexport const useCreateEditor = () => {\n  return usePlateEditor({\n    override: {\n      components: withDraggables(\n        withPlaceholders({\n          [AIPlugin.key]: AILeaf,\n          [BlockquotePlugin.key]: BlockquoteElement,\n          [BoldPlugin.key]: withProps(PlateLeaf, { as: 'strong' }),\n          [BulletedListPlugin.key]: withProps(ListElement, { variant: 'ul' }),\n          [CodeBlockPlugin.key]: CodeBlockElement,\n          [CodeLinePlugin.key]: CodeLineElement,\n          [CodePlugin.key]: CodeLeaf,\n          [CodeSyntaxPlugin.key]: CodeSyntaxLeaf,\n          [ColumnItemPlugin.key]: ColumnElement,\n          [ColumnPlugin.key]: ColumnGroupElement,\n          [CommentsPlugin.key]: CommentLeaf,\n          [DatePlugin.key]: DateElement,\n          [EmojiInputPlugin.key]: EmojiInputElement,\n          [ExcalidrawPlugin.key]: ExcalidrawElement,\n          [HEADING_KEYS.h1]: withProps(HeadingElement, { variant: 'h1' }),\n          [HEADING_KEYS.h2]: withProps(HeadingElement, { variant: 'h2' }),\n          [HEADING_KEYS.h3]: withProps(HeadingElement, { variant: 'h3' }),\n          [HEADING_KEYS.h4]: withProps(HeadingElement, { variant: 'h4' }),\n          [HEADING_KEYS.h5]: withProps(HeadingElement, { variant: 'h5' }),\n          [HEADING_KEYS.h6]: withProps(HeadingElement, { variant: 'h6' }),\n          [HighlightPlugin.key]: HighlightLeaf,\n          [HorizontalRulePlugin.key]: HrElement,\n          [ImagePlugin.key]: ImageElement,\n          [ItalicPlugin.key]: withProps(PlateLeaf, { as: 'em' }),\n          [KbdPlugin.key]: KbdLeaf,\n          [LinkPlugin.key]: LinkElement,\n          [ListItemPlugin.key]: withProps(PlateElement, { as: 'li' }),\n          [MediaEmbedPlugin.key]: MediaEmbedElement,\n          [MentionInputPlugin.key]: MentionInputElement,\n          [MentionPlugin.key]: MentionElement,\n          [NumberedListPlugin.key]: withProps(ListElement, { variant: 'ol' }),\n          [ParagraphPlugin.key]: ParagraphElement,\n          [SlashInputPlugin.key]: SlashInputElement,\n          [StrikethroughPlugin.key]: withProps(PlateLeaf, { as: 's' }),\n          [SubscriptPlugin.key]: withProps(PlateLeaf, { as: 'sub' }),\n          [SuperscriptPlugin.key]: withProps(PlateLeaf, { as: 'sup' }),\n          [TableCellHeaderPlugin.key]: TableCellHeaderElement,\n          [TableCellPlugin.key]: TableCellElement,\n          [TablePlugin.key]: TableElement,\n          [TableRowPlugin.key]: TableRowElement,\n          [TocPlugin.key]: TocElement,\n          [TogglePlugin.key]: ToggleElement,\n          [UnderlinePlugin.key]: withProps(PlateLeaf, { as: 'u' }),\n        })\n      ),\n    },\n    plugins: [\n      ...copilotPlugins,\n      ...editorPlugins,\n      FixedToolbarListPlugin,\n      FloatingToolbarPlugin,\n    ],\n    value: [\n      {\n        children: [{ text: 'Playground' }],\n        type: 'h1',\n      },\n      {\n        children: [\n          { text: 'A rich-text editor with AI capabilities. Try the ' },\n          { bold: true, text: 'AI commands' },\n          { text: ' or use ' },\n          { kbd: true, text: 'Cmd+J' },\n          { text: ' to open the AI menu.' },\n        ],\n        type: ParagraphPlugin.key,\n      },\n    ],\n  });\n};\n",
+      "path": "components/editor/use-create-editor-list.ts",
+      "target": "components/use-create-editor-list.ts",
       "type": "registry:example"
     },
     {
diff --git a/apps/www/public/r/styles/default/use-chat.json b/apps/www/public/r/styles/default/use-chat.json
index 794ee4c25..1d44b4e77 100644
--- a/apps/www/public/r/styles/default/use-chat.json
+++ b/apps/www/public/r/styles/default/use-chat.json
@@ -1,6 +1,5 @@
 {
   "dependencies": [
-    "@udecode/plate-ai",
     "ai",
     "@faker-js/faker"
   ],
@@ -13,12 +12,6 @@
     }
   ],
   "name": "use-chat",
-  "registryDependencies": [
-    "button",
-    "dialog",
-    "input",
-    "command",
-    "popover"
-  ],
+  "registryDependencies": [],
   "type": "registry:component"
 }
\ No newline at end of file
diff --git a/apps/www/src/__registry__/index.tsx b/apps/www/src/__registry__/index.tsx
index c09c63d89..911bd6352 100644
--- a/apps/www/src/__registry__/index.tsx
+++ b/apps/www/src/__registry__/index.tsx
@@ -2157,7 +2157,7 @@ export const Index: Record<string, any> = {
       name: "use-chat",
       description: "",
       type: "registry:component",
-      registryDependencies: ["button","dialog","input","command","popover"],
+      registryDependencies: [],
       files: [{
         path: "src/registry/default/components/editor/use-chat.ts",
         type: "registry:component",
@@ -3007,7 +3007,7 @@ export const Index: Record<string, any> = {
         type: "registry:example",
         target: ""
       },{
-        path: "src/registry/default/components/editor/use-create-editor.ts",
+        path: "src/registry/default/components/editor/use-create-editor-list.ts",
         type: "registry:example",
         target: ""
       },{
@@ -3841,7 +3841,7 @@ export const Index: Record<string, any> = {
       name: "api-ai",
       description: "",
       type: "registry:lib",
-      registryDependencies: ["use-chat"],
+      registryDependencies: [],
       files: [{
         path: "src/registry/default/app/api/ai/command/route.ts",
         type: "registry:lib",
diff --git a/apps/www/src/app/(app)/docs/[[...slug]]/page.tsx b/apps/www/src/app/(app)/docs/[[...slug]]/page.tsx
index 84f16ec08..7954f64b2 100644
--- a/apps/www/src/app/(app)/docs/[[...slug]]/page.tsx
+++ b/apps/www/src/app/(app)/docs/[[...slug]]/page.tsx
@@ -11,7 +11,6 @@ import { Mdx } from '@/components/mdx-components';
 import { docsMap } from '@/config/docs';
 import { slugToCategory } from '@/config/docs-utils';
 import { siteConfig } from '@/config/site';
-import { getRegistryItem } from '@/lib/registry';
 import {
   getCachedDependencies,
   getCachedFileTree,
@@ -130,7 +129,7 @@ export default async function DocPage(props: DocPageProps) {
       registryNames,
     });
 
-    const item = await getRegistryItem(docName, true);
+    const item = await getCachedRegistryItem(docName, true);
 
     if (!item?.files) {
       notFound();
diff --git a/apps/www/src/app/(app)/docs/layout.tsx b/apps/www/src/app/(app)/docs/layout.tsx
index 108e5047a..4b142ef76 100644
--- a/apps/www/src/app/(app)/docs/layout.tsx
+++ b/apps/www/src/app/(app)/docs/layout.tsx
@@ -9,7 +9,7 @@ interface DocsLayoutProps {
 
 export default function DocsLayout({ children }: DocsLayoutProps) {
   return (
-    <div className="container flex-1 items-start md:grid md:grid-cols-[220px_minmax(0,1fr)] md:gap-2 lg:grid-cols-[240px_minmax(0,1fr)] lg:gap-6 xl:gap-10">
+    <div className="container flex-1 items-start md:grid md:grid-cols-[220px_minmax(0,1fr)] md:gap-4 lg:grid-cols-[240px_minmax(0,1fr)] lg:gap-6 xl:gap-10">
       {/* <aside className="fixed top-14 z-30 -ml-2 hidden h-[calc(100vh-3.5rem)] w-full shrink-0 md:sticky md:block"> */}
       <aside className="fixed top-14 z-30 hidden h-[calc(100vh-3.5rem)] w-full shrink-0 border-r border-border/40 dark:border-border md:sticky md:block">
         <div className="h-full overflow-auto pb-4 scrollbar-hide">
diff --git a/apps/www/src/components/block-viewer.tsx b/apps/www/src/components/block-viewer.tsx
index 2992db8d7..dfda1b395 100644
--- a/apps/www/src/components/block-viewer.tsx
+++ b/apps/www/src/components/block-viewer.tsx
@@ -216,7 +216,7 @@ function BlockViewerToolbar({
   return (
     <div className="flex w-full items-center gap-2 md:pr-[14px]">
       <Tabs
-        className="hidden lg:flex"
+        className="hidden sm:flex"
         defaultValue="preview"
         onValueChange={(value) => setView(value as 'code' | 'preview')}
       >
@@ -240,7 +240,7 @@ function BlockViewerToolbar({
       </Tabs>
 
       {item.description && (
-        <Separator orientation="vertical" className="mx-2 hidden h-4 lg:flex" />
+        <Separator orientation="vertical" className="mx-2 hidden h-4 sm:flex" />
       )}
 
       <Link
@@ -274,7 +274,7 @@ function BlockViewerToolbar({
             {block && (
               <Separator
                 orientation="vertical"
-                className="mx-2 hidden h-4 lg:flex"
+                className="mx-2 hidden h-4 sm:flex"
               />
             )}
           </>
diff --git a/apps/www/src/components/component-installation.tsx b/apps/www/src/components/component-installation.tsx
index 18e909622..685770577 100644
--- a/apps/www/src/components/component-installation.tsx
+++ b/apps/www/src/components/component-installation.tsx
@@ -62,7 +62,7 @@ export function ComponentInstallation({
   const dependenciesString = dependencies.join(' ');
 
   return (
-    <div className="my-4">
+    <div className="mb-12 mt-4">
       {!inline && <H2>Installation</H2>}
 
       <Tabs className="relative mt-6 w-full" defaultValue="cli">
@@ -141,18 +141,18 @@ export function ComponentInstallation({
               }
 
               return (
-                <React.Fragment key={example.name}>
-                  <H3>{getRegistryTitle(example as any)}</H3>
-
-                  <ComponentPreview
-                    id={example.name.replace('-demo', '')}
-                    name={example.name}
-                    dependencies={example.dependencies}
-                    highlightedFiles={(example as any).highlightedFiles}
-                    item={(example as any).item}
-                    tree={(example as any).tree}
-                  />
-                </React.Fragment>
+                <ComponentPreview
+                  id={example.name.replace('-demo', '')}
+                  name={example.name}
+                  key={example.name}
+                  dependencies={example.dependencies}
+                  highlightedFiles={(example as any).highlightedFiles}
+                  item={{
+                    ...(example as any).item,
+                    description: getRegistryTitle(example as any),
+                  }}
+                  tree={(example as any).tree}
+                />
               );
             })}
           </div>
diff --git a/apps/www/src/components/component-preview-pro.tsx b/apps/www/src/components/component-preview-pro.tsx
index e128ad96f..397ff1551 100644
--- a/apps/www/src/components/component-preview-pro.tsx
+++ b/apps/www/src/components/component-preview-pro.tsx
@@ -28,7 +28,7 @@ export function ComponentPreviewPro({
 
   return (
     <div
-      className={cn('relative my-4 flex flex-col space-y-2', className)}
+      className={cn('relative mb-12 mt-4 flex flex-col space-y-2', className)}
       {...props}
     >
       {description && <Markdown>{description}</Markdown>}
diff --git a/apps/www/src/components/component-preview.tsx b/apps/www/src/components/component-preview.tsx
index 591a793f7..7813c41e5 100644
--- a/apps/www/src/components/component-preview.tsx
+++ b/apps/www/src/components/component-preview.tsx
@@ -73,7 +73,7 @@ export function ComponentPreview({
   );
 
   return (
-    <div className="my-4">
+    <div className="mb-12 mt-4">
       <BlockViewer
         block={false}
         dependencies={
diff --git a/apps/www/src/components/link.tsx b/apps/www/src/components/link.tsx
index a6e92c4a6..12304b7f7 100644
--- a/apps/www/src/components/link.tsx
+++ b/apps/www/src/components/link.tsx
@@ -14,7 +14,7 @@ export function Link({
   return (
     <LinkPrimitive
       className={cn(
-        'relative font-medium',
+        'relative inline-block font-medium',
         !isExternal && 'underline underline-offset-4',
         isExternal &&
           'no-underline hover:after:absolute hover:after:bottom-0 hover:after:left-0 hover:after:h-[1.5px] hover:after:w-[calc(100%-2px)] hover:after:bg-primary',
diff --git a/apps/www/src/registry/default/block/editor-ai/components/editor/use-create-editor-list.ts b/apps/www/src/registry/default/components/editor/use-create-editor-list.ts
similarity index 98%
rename from apps/www/src/registry/default/block/editor-ai/components/editor/use-create-editor-list.ts
rename to apps/www/src/registry/default/components/editor/use-create-editor-list.ts
index 58a80b0c2..1b90c1431 100644
--- a/apps/www/src/registry/default/block/editor-ai/components/editor/use-create-editor-list.ts
+++ b/apps/www/src/registry/default/components/editor/use-create-editor-list.ts
@@ -53,7 +53,7 @@ import { TogglePlugin } from '@udecode/plate-toggle/react';
 
 import { copilotPlugins } from '@/registry/default/components/editor/plugins/copilot-plugins';
 import { editorPlugins } from '@/registry/default/components/editor/plugins/editor-plugins';
-import { FixedToolbarPlugin } from '@/registry/default/components/editor/plugins/fixed-toolbar-plugin';
+import { FixedToolbarListPlugin } from '@/registry/default/components/editor/plugins/fixed-toolbar-list-plugin';
 import { FloatingToolbarPlugin } from '@/registry/default/components/editor/plugins/floating-toolbar-plugin';
 import { AILeaf } from '@/registry/default/plate-ui/ai-leaf';
 import { BlockquoteElement } from '@/registry/default/plate-ui/blockquote-element';
@@ -144,7 +144,7 @@ export const useCreateEditor = () => {
     plugins: [
       ...copilotPlugins,
       ...editorPlugins,
-      FixedToolbarPlugin,
+      FixedToolbarListPlugin,
       FloatingToolbarPlugin,
     ],
     value: [
diff --git a/apps/www/src/registry/registry-app.ts b/apps/www/src/registry/registry-app.ts
index 7efdf7196..59d8eb607 100644
--- a/apps/www/src/registry/registry-app.ts
+++ b/apps/www/src/registry/registry-app.ts
@@ -16,7 +16,7 @@ export const registryApp: Registry = [
       },
     ],
     name: 'api-ai',
-    registryDependencies: ['use-chat'],
+    registryDependencies: [],
     type: 'registry:lib',
   },
   {
diff --git a/apps/www/src/registry/registry-components.ts b/apps/www/src/registry/registry-components.ts
index a9eca7369..9770123e7 100644
--- a/apps/www/src/registry/registry-components.ts
+++ b/apps/www/src/registry/registry-components.ts
@@ -443,7 +443,7 @@ const plugins: Registry = [
 export const components: Registry = [
   ...plugins,
   {
-    dependencies: ['@udecode/plate-ai', 'ai', '@faker-js/faker'],
+    dependencies: ['ai', '@faker-js/faker'],
     files: [
       {
         path: 'components/editor/use-chat.ts',
@@ -451,7 +451,7 @@ export const components: Registry = [
       },
     ],
     name: 'use-chat',
-    registryDependencies: ['button', 'dialog', 'input', 'command', 'popover'],
+    registryDependencies: [],
     type: 'registry:component',
   },
   {
diff --git a/apps/www/src/registry/registry-examples.ts b/apps/www/src/registry/registry-examples.ts
index 7c1a6af6e..69d005fac 100644
--- a/apps/www/src/registry/registry-examples.ts
+++ b/apps/www/src/registry/registry-examples.ts
@@ -992,7 +992,7 @@ export const docExamples: Registry = [
         type: 'registry:example',
       },
       {
-        path: 'components/editor/use-create-editor.ts',
+        path: 'components/editor/use-create-editor-list.ts',
         type: 'registry:example',
       },
       {