diff --git a/apps/docs/docs.json b/apps/docs/docs.json
index adb6f5849e..0d6c76fff2 100644
--- a/apps/docs/docs.json
+++ b/apps/docs/docs.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://mintlify.com/docs.json",
-  "theme": "mint",
+  "theme": "almond",
   "name": "React Email",
   "colors": {
     "primary": "#06BCEE",
@@ -12,10 +12,10 @@
   },
   "favicon": "/favicon.png",
   "navigation": {
-    "anchors": [
+    "tabs": [
       {
-        "anchor": "Documentation",
-        "icon": "book-open",
+        "tab": "Primitives",
+        "icon": "cubes",
         "groups": [
           {
             "group": "Overview",
@@ -124,6 +124,57 @@
             ]
           }
         ]
+      },
+      {
+        "tab": "Editor",
+        "icon": "flask",
+        "tag": "Experimental",
+        "groups": [
+          {
+            "group": "Overview",
+            "pages": ["editor/overview", "editor/getting-started"]
+          },
+          {
+            "group": "Features",
+            "pages": [
+              "editor/features/bubble-menu",
+              "editor/features/slash-commands",
+              "editor/features/theming",
+              "editor/features/styling",
+              "editor/features/buttons",
+              "editor/features/column-layouts",
+              "editor/features/link-editing",
+              "editor/features/email-export"
+            ]
+          },
+          {
+            "group": "Advanced",
+            "pages": [
+              "editor/advanced/extensions",
+              "editor/advanced/event-bus",
+              "editor/advanced/custom-extensions"
+            ]
+          },
+          {
+            "group": "API Reference",
+            "pages": [
+              "editor/api-reference/use-editor",
+              "editor/api-reference/compose-react-email",
+              "editor/api-reference/email-node",
+              "editor/api-reference/email-mark",
+              "editor/api-reference/extensions-list",
+              "editor/api-reference/theming-api",
+              {
+                "group": "UI Components",
+                "icon": "window",
+                "pages": [
+                  "editor/api-reference/ui/bubble-menu",
+                  "editor/api-reference/ui/slash-command"
+                ]
+              }
+            ]
+          }
+        ]
       }
     ],
     "global": {
@@ -137,11 +188,6 @@
           "anchor": "Templates",
           "href": "https://demo.react.email/preview/notifications/vercel-invite-user",
           "icon": "arrow-pointer"
-        },
-        {
-          "anchor": "GitHub",
-          "href": "https://github.com/resend/react-email",
-          "icon": "github"
         }
       ]
     }
diff --git a/apps/docs/editor/api-reference/use-editor.mdx b/apps/docs/editor/api-reference/use-editor.mdx
index 3b015c91ce..50820107d4 100644
--- a/apps/docs/editor/api-reference/use-editor.mdx
+++ b/apps/docs/editor/api-reference/use-editor.mdx
@@ -2,7 +2,7 @@
 title: "useEditor"
 sidebarTitle: "useEditor"
 description: "Hook for creating and managing an editor instance."
-icon: "hook"
+icon: "code"
 ---
 
 ## Import
diff --git a/apps/docs/snippets/editor-install.mdx b/apps/docs/snippets/editor-install.mdx
index b549b90a19..3208f3728d 100644
--- a/apps/docs/snippets/editor-install.mdx
+++ b/apps/docs/snippets/editor-install.mdx
@@ -1,19 +1,19 @@
 <CodeGroup>
 
 ```sh npm
-npm install @react-email/editor @tiptap/react @radix-ui/react-popover
+npm install @react-email/editor@experimental @tiptap/react @radix-ui/react-popover
 ```
 
 ```sh yarn
-yarn add @react-email/editor @tiptap/react @radix-ui/react-popover
+yarn add @react-email/editor@experimental @tiptap/react @radix-ui/react-popover
 ```
 
 ```sh pnpm
-pnpm add @react-email/editor @tiptap/react @radix-ui/react-popover
+pnpm add @react-email/editor@experimental @tiptap/react @radix-ui/react-popover
 ```
 
 ```sh bun
-bun add @react-email/editor @tiptap/react @radix-ui/react-popover
+bun add @react-email/editor@experimental @tiptap/react @radix-ui/react-popover
 ```
 
 </CodeGroup>