From dd880c5c480d35b5afe0f561ba5bd1cfd7ec636b Mon Sep 17 00:00:00 2001
From: Junior Garcia <jrgarciadev@gmail.com>
Date: Sat, 18 Jan 2025 17:08:16 -0300
Subject: [PATCH 1/2] chore: kapa-ai temporary disabled

---
 apps/docs/app/blog/layout.tsx                     | 2 +-
 apps/docs/app/docs/layout.tsx                     | 2 +-
 apps/docs/components/scripts/script-providers.tsx | 8 +++++---
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/apps/docs/app/blog/layout.tsx b/apps/docs/app/blog/layout.tsx
index b724bb9bae..7a77c92b7c 100644
--- a/apps/docs/app/blog/layout.tsx
+++ b/apps/docs/app/blog/layout.tsx
@@ -33,7 +33,7 @@ export default function DocsLayout({children}: DocsLayoutProps) {
         />
       </div>
 
-      <ScriptProviders />
+      <ScriptProviders isKapaEnabled={false} />
     </>
   );
 }
diff --git a/apps/docs/app/docs/layout.tsx b/apps/docs/app/docs/layout.tsx
index 90a29d8f1f..598ed96ce3 100644
--- a/apps/docs/app/docs/layout.tsx
+++ b/apps/docs/app/docs/layout.tsx
@@ -40,7 +40,7 @@ export default function DocsLayout({children}: DocsLayoutProps) {
         />
       </div>
 
-      <ScriptProviders />
+      <ScriptProviders isKapaEnabled={false} />
     </>
   );
 }
diff --git a/apps/docs/components/scripts/script-providers.tsx b/apps/docs/components/scripts/script-providers.tsx
index 102f4b006e..974fd82ed1 100644
--- a/apps/docs/components/scripts/script-providers.tsx
+++ b/apps/docs/components/scripts/script-providers.tsx
@@ -2,16 +2,18 @@ import * as React from "react";
 import Script from "next/script";
 
 
-export function ScriptProviders() {
+export function ScriptProviders({isKapaEnabled}: {isKapaEnabled?: boolean}) {
+  if (!isKapaEnabled) return null;
+
   return (
     <>
       <Script
         defer
-        data-modal-disclaimer="This is a custom LLM for NextUI with access to all developer docs (heroui.com/docs) and GitHub Issues and PRs (github.com/frontio-ai/heroui)."
+        data-modal-disclaimer="This is a custom LLM for HeroUI with access to all developer docs (heroui.com/docs) and GitHub Issues and PRs (github.com/frontio-ai/heroui)."
         data-modal-example-questions="How do I install for Next.js?,How do I customize primary color?"
         data-project-color="#000000"
         data-project-logo="https://avatars.githubusercontent.com/u/86160567?s=280&v=4"
-        data-project-name="NextUI"
+        data-project-name="HeroUI"
         data-website-id="e733a73f-980e-4f7d-9e8b-91867453f899"
         src="https://widget.kapa.ai/kapa-widget.bundle.js"
         strategy="afterInteractive"

From 127e40818d629286371952f425969b189722d2d3 Mon Sep 17 00:00:00 2001
From: Junior Garcia <jrgarciadev@gmail.com>
Date: Sat, 18 Jan 2025 17:11:14 -0300
Subject: [PATCH 2/2] chore: org renamed

---
 .changeset/calm-flies-serve.md                |  87 ++++++++++++
 .changeset/config.json                        |   2 +-
 .commitlintrc.cjs                             |   2 +-
 .github/ISSUE_TEMPLATE/bug_report.yml         |  10 +-
 .github/ISSUE_TEMPLATE/config.yml             |   2 +-
 .github/ISSUE_TEMPLATE/feature_request.yml    |   2 +-
 apps/docs/app/layout.tsx                      |   2 +-
 .../docs/components/blog/nextjs-templates.tsx |   4 +-
 .../components/scripts/script-providers.tsx   |   2 +-
 apps/docs/config/site.ts                      |   2 +-
 apps/docs/content/blog/introducing-heroui.mdx |   2 +-
 apps/docs/content/blog/nextui-v2.mdx          |   2 +-
 apps/docs/content/blog/v2.1.0.mdx             |   2 +-
 apps/docs/content/blog/v2.2.0.mdx             |   2 +-
 apps/docs/content/blog/v2.3.0.mdx             |  60 ++++----
 apps/docs/content/blog/v2.4.0.mdx             |  68 ++++-----
 apps/docs/content/blog/v2.6.0.mdx             | 134 +++++++++---------
 .../content/components/card/divider.raw.jsx   |   2 +-
 .../link/custom-anchor-icon.raw.jsx           |   2 +-
 .../content/components/link/external.raw.jsx  |   4 +-
 .../components/link/polymorphic.raw.jsx       |   2 +-
 .../content/docs/customization/dark-mode.mdx  |   2 +-
 apps/docs/content/docs/frameworks/laravel.mdx |   8 +-
 apps/docs/content/docs/frameworks/nextjs.mdx  |   8 +-
 apps/docs/content/docs/frameworks/remix.mdx   |   8 +-
 apps/docs/content/docs/frameworks/vite.mdx    |   8 +-
 apps/docs/content/docs/guide/introduction.mdx |   2 +-
 .../content/docs/guide/nextui-to-heroui.mdx   |   2 +-
 apps/docs/libs/github/constants.ts            |   2 +-
 apps/docs/scripts/update-github-info.ts       |   2 +-
 package.json                                  |   2 +-
 packages/components/accordion/package.json    |   4 +-
 packages/components/alert/package.json        |   4 +-
 packages/components/autocomplete/package.json |   4 +-
 .../autocomplete/src/use-autocomplete.ts      |   2 +-
 packages/components/avatar/package.json       |   4 +-
 packages/components/badge/package.json        |   4 +-
 packages/components/breadcrumbs/package.json  |   4 +-
 packages/components/button/package.json       |   4 +-
 packages/components/calendar/package.json     |   4 +-
 packages/components/card/package.json         |   4 +-
 .../components/card/stories/card.stories.tsx  |   2 +-
 packages/components/checkbox/package.json     |   4 +-
 packages/components/chip/package.json         |   4 +-
 packages/components/code/package.json         |   4 +-
 packages/components/date-input/package.json   |   4 +-
 packages/components/date-picker/package.json  |   4 +-
 packages/components/divider/package.json      |   4 +-
 packages/components/drawer/package.json       |   4 +-
 packages/components/dropdown/package.json     |   4 +-
 packages/components/form/package.json         |   4 +-
 packages/components/image/package.json        |   4 +-
 packages/components/input-otp/package.json    |   4 +-
 packages/components/input/package.json        |   4 +-
 packages/components/kbd/package.json          |   4 +-
 packages/components/link/package.json         |   4 +-
 packages/components/listbox/package.json      |   4 +-
 .../listbox/src/use-listbox-item.ts           |   2 +-
 packages/components/menu/package.json         |   4 +-
 packages/components/menu/src/use-menu-item.ts |   2 +-
 packages/components/modal/package.json        |   4 +-
 packages/components/navbar/package.json       |   4 +-
 packages/components/pagination/package.json   |   4 +-
 packages/components/popover/package.json      |   4 +-
 packages/components/progress/package.json     |   4 +-
 packages/components/radio/package.json        |   4 +-
 packages/components/ripple/package.json       |   4 +-
 .../components/scroll-shadow/package.json     |   4 +-
 packages/components/select/package.json       |   4 +-
 packages/components/skeleton/package.json     |   4 +-
 packages/components/slider/package.json       |   4 +-
 packages/components/snippet/package.json      |   4 +-
 packages/components/spacer/package.json       |   4 +-
 packages/components/spinner/package.json      |   4 +-
 packages/components/switch/package.json       |   4 +-
 packages/components/table/package.json        |   4 +-
 packages/components/tabs/package.json         |   4 +-
 packages/components/tooltip/package.json      |   4 +-
 packages/components/user/package.json         |   4 +-
 packages/core/react/package.json              |   4 +-
 packages/core/system-rsc/package.json         |   4 +-
 packages/core/system/package.json             |   4 +-
 packages/core/theme/package.json              |   4 +-
 .../use-aria-accordion-item/package.json      |   4 +-
 .../hooks/use-aria-accordion/package.json     |   4 +-
 .../use-aria-accordion/src/use-accordion.ts   |   2 +-
 packages/hooks/use-aria-button/package.json   |   4 +-
 packages/hooks/use-aria-button/src/index.ts   |   4 +-
 packages/hooks/use-aria-link/package.json     |   4 +-
 packages/hooks/use-aria-link/src/index.ts     |   4 +-
 .../hooks/use-aria-modal-overlay/package.json |   4 +-
 .../hooks/use-aria-multiselect/package.json   |   4 +-
 packages/hooks/use-callback-ref/package.json  |   4 +-
 packages/hooks/use-clipboard/package.json     |   4 +-
 .../use-data-scroll-overflow/package.json     |   4 +-
 packages/hooks/use-disclosure/package.json    |   4 +-
 packages/hooks/use-draggable/package.json     |   4 +-
 packages/hooks/use-image/package.json         |   4 +-
 .../hooks/use-infinite-scroll/package.json    |   4 +-
 .../use-intersection-observer/package.json    |   4 +-
 packages/hooks/use-is-mobile/package.json     |   4 +-
 packages/hooks/use-is-mounted/package.json    |   4 +-
 packages/hooks/use-measure/package.json       |   4 +-
 packages/hooks/use-pagination/package.json    |   4 +-
 packages/hooks/use-real-shape/package.json    |   4 +-
 packages/hooks/use-ref-state/package.json     |   4 +-
 packages/hooks/use-resize/package.json        |   4 +-
 .../hooks/use-safe-layout-effect/package.json |   4 +-
 .../hooks/use-scroll-position/package.json    |   4 +-
 packages/hooks/use-ssr/package.json           |   4 +-
 packages/hooks/use-theme/package.json         |   4 +-
 packages/hooks/use-update-effect/package.json |   4 +-
 packages/storybook/.storybook/welcome.mdx     |   2 +-
 packages/storybook/package.json               |   4 +-
 packages/utilities/aria-utils/package.json    |   4 +-
 packages/utilities/dom-animation/package.json |   4 +-
 packages/utilities/framer-utils/package.json  |   4 +-
 .../utilities/react-rsc-utils/package.json    |   4 +-
 packages/utilities/react-utils/package.json   |   4 +-
 packages/utilities/shared-icons/package.json  |   4 +-
 packages/utilities/shared-utils/package.json  |   4 +-
 packages/utilities/stories-utils/package.json |   4 +-
 packages/utilities/test-utils/package.json    |   4 +-
 plop/component/README.md.hbs                  |   4 +-
 plop/component/package.json.hbs               |   4 +-
 plop/hook/README.md.hbs                       |   4 +-
 plop/hook/package.json.hbs                    |   4 +-
 plop/package/README.md.hbs                    |   4 +-
 plop/package/package.json.hbs                 |   4 +-
 129 files changed, 453 insertions(+), 366 deletions(-)
 create mode 100644 .changeset/calm-flies-serve.md

diff --git a/.changeset/calm-flies-serve.md b/.changeset/calm-flies-serve.md
new file mode 100644
index 0000000000..a2620a0390
--- /dev/null
+++ b/.changeset/calm-flies-serve.md
@@ -0,0 +1,87 @@
+---
+"@heroui/use-intersection-observer": patch
+"@heroui/use-data-scroll-overflow": patch
+"@heroui/use-aria-accordion-item": patch
+"@heroui/use-aria-modal-overlay": patch
+"@heroui/use-safe-layout-effect": patch
+"@heroui/use-aria-multiselect": patch
+"@heroui/use-infinite-scroll": patch
+"@heroui/use-scroll-position": patch
+"@heroui/react-rsc-utils": patch
+"@heroui/scroll-shadow": patch
+"@heroui/use-aria-accordion": patch
+"@heroui/autocomplete": patch
+"@heroui/use-update-effect": patch
+"@heroui/dom-animation": patch
+"@heroui/stories-utils": patch
+"@heroui/breadcrumbs": patch
+"@heroui/date-picker": patch
+"@heroui/use-callback-ref": patch
+"@heroui/framer-utils": patch
+"@heroui/shared-icons": patch
+"@heroui/shared-utils": patch
+"@heroui/date-input": patch
+"@heroui/pagination": patch
+"@heroui/use-aria-button": patch
+"@heroui/react-utils": patch
+"@heroui/accordion": patch
+"@heroui/input-otp": patch
+"@heroui/use-disclosure": patch
+"@heroui/use-is-mounted": patch
+"@heroui/use-pagination": patch
+"@heroui/use-real-shape": patch
+"@heroui/aria-utils": patch
+"@heroui/test-utils": patch
+"@heroui/calendar": patch
+"@heroui/checkbox": patch
+"@heroui/dropdown": patch
+"@heroui/progress": patch
+"@heroui/skeleton": patch
+"@heroui/use-aria-link": patch
+"@heroui/use-clipboard": patch
+"@heroui/use-draggable": patch
+"@heroui/use-is-mobile": patch
+"@heroui/use-ref-state": patch
+"@heroui/divider": patch
+"@heroui/listbox": patch
+"@heroui/popover": patch
+"@heroui/snippet": patch
+"@heroui/spinner": patch
+"@heroui/tooltip": patch
+"@heroui/avatar": patch
+"@heroui/button": patch
+"@heroui/drawer": patch
+"@heroui/navbar": patch
+"@heroui/ripple": patch
+"@heroui/select": patch
+"@heroui/slider": patch
+"@heroui/spacer": patch
+"@heroui/switch": patch
+"@heroui/use-measure": patch
+"@heroui/alert": patch
+"@heroui/badge": patch
+"@heroui/image": patch
+"@heroui/input": patch
+"@heroui/modal": patch
+"@heroui/radio": patch
+"@heroui/table": patch
+"@heroui/use-resize": patch
+"@heroui/card": patch
+"@heroui/chip": patch
+"@heroui/code": patch
+"@heroui/form": patch
+"@heroui/link": patch
+"@heroui/menu": patch
+"@heroui/tabs": patch
+"@heroui/user": patch
+"@heroui/system-rsc": patch
+"@heroui/use-image": patch
+"@heroui/use-theme": patch
+"@heroui/kbd": patch
+"@heroui/use-ssr": patch
+"@heroui/system": patch
+"@heroui/react": patch
+"@heroui/theme": patch
+---
+
+Org name changed
diff --git a/.changeset/config.json b/.changeset/config.json
index 18e7fe8eb7..ee8b700ff3 100644
--- a/.changeset/config.json
+++ b/.changeset/config.json
@@ -2,7 +2,7 @@
   "$schema": "https://unpkg.com/@changesets/config@2.3.0/schema.json",
   "changelog": [
     "@changesets/changelog-github",
-    { "repo": "frontio-ai/heroui" }
+    { "repo": "heroui-inc/heroui" }
   ],
   "commit": false,
   "fixed": [],
diff --git a/.commitlintrc.cjs b/.commitlintrc.cjs
index b4c2778230..fe9bea922b 100644
--- a/.commitlintrc.cjs
+++ b/.commitlintrc.cjs
@@ -3,7 +3,7 @@ const conventional = require("@commitlint/config-conventional");
 module.exports = {
   extends: ["@commitlint/config-conventional"],
   plugins: ["commitlint-plugin-function-rules"],
-  helpUrl: "https://github.com/frontio-ai/heroui/blob/main/CONTRIBUTING.md#commit-convention",
+  helpUrl: "https://github.com/heroui-inc/heroui/blob/main/CONTRIBUTING.md#commit-convention",
   rules: {
     ...conventional.rules,
     "type-enum": [
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 9e51004e30..2ed9d53d05 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -8,17 +8,17 @@ body:
       value: |
         Thank you for reporting an issue :pray:.
 
-        This issue tracker is for reporting bugs found in [HeroUI github repository](https://github.com/frontio-ai/heroui/)
+        This issue tracker is for reporting bugs found in [HeroUI github repository](https://github.com/heroui-inc/heroui/)
         If you have a question about how to achieve something and are struggling, please post a question
         inside of either of the following places:
-          - HeroUI's [Discussion's tab](https://github.com/frontio-ai/heroui/discussions)
+          - HeroUI's [Discussion's tab](https://github.com/heroui-inc/heroui/discussions)
           - HeroUI's [Discord channel](https://discord.gg/9b6yyZKmH4)
 
 
         Before submitting a new bug/issue, please check the links below to see if there is a solution or question posted there already:
-         - HeroUI's [Issue's tab](https://github.com/frontio-ai/heroui/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc)
-         - HeroUI's [closed issues tab](https://github.com/frontio-ai/heroui/issues?q=is%3Aissue+sort%3Aupdated-desc+is%3Aclosed)
-         - HeroUI's [Discussions tab](https://github.com/frontio-ai/heroui/discussions)
+         - HeroUI's [Issue's tab](https://github.com/heroui-inc/heroui/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc)
+         - HeroUI's [closed issues tab](https://github.com/heroui-inc/heroui/issues?q=is%3Aissue+sort%3Aupdated-desc+is%3Aclosed)
+         - HeroUI's [Discussions tab](https://github.com/heroui-inc/heroui/discussions)
 
         The more information you fill in, the better the community can help you.
   - type: input
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index c62ee7df58..070ca3c27d 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,7 +1,7 @@
 blank_issues_enabled: true
 contact_links:
   - name: 🤔 Long question or ideas?
-    url: https://github.com/frontio-ai/heroui/discussions
+    url: https://github.com/heroui-inc/heroui/discussions
     about: Ask long-form questions and discuss ideas.
   - name: 💬 Discord Community Chat
     url: https://discord.gg/9b6yyZKmH4
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index 537ed47e6a..95513ada49 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -12,7 +12,7 @@ body:
     attributes:
       value: |
         This issue form is for requesting features only! For example, requesting a new component, behavior ... etc
-        If you want to report a bug, please use the [bug report form](https://github.com/frontio-ai/heroui/issues/new?assignees=&labels=&template=bug_report.yml).
+        If you want to report a bug, please use the [bug report form](https://github.com/heroui-inc/heroui/issues/new?assignees=&labels=&template=bug_report.yml).
   - type: textarea
     validations:
       required: true
diff --git a/apps/docs/app/layout.tsx b/apps/docs/app/layout.tsx
index 23f4a00a34..e31a5b79b4 100644
--- a/apps/docs/app/layout.tsx
+++ b/apps/docs/app/layout.tsx
@@ -49,7 +49,7 @@ export const metadata: Metadata = {
       url: "https://x.com/hero_ui",
     },
   ],
-  creator: "frontio-ai",
+  creator: "heroui-inc",
   alternates: {
     canonical: "https://heroui.com",
     types: {
diff --git a/apps/docs/components/blog/nextjs-templates.tsx b/apps/docs/components/blog/nextjs-templates.tsx
index cf0f358ffc..839a4c5c5f 100644
--- a/apps/docs/components/blog/nextjs-templates.tsx
+++ b/apps/docs/components/blog/nextjs-templates.tsx
@@ -8,7 +8,7 @@ const frameworks = [
     description:
       "A Next.js 13 with app directory template pre-configured with HeroUI (v2) and Tailwind CSS.",
     icon: <NewNextJSIcon height={40} width={40} />,
-    href: "https://github.com/frontio-ai/next-app-template",
+    href: "https://github.com/heroui-inc/next-app-template",
   },
   {
     title: "Next.js 13 (Pages) Template",
@@ -16,7 +16,7 @@ const frameworks = [
     description:
       "A Next.js 13 with pages directory template pre-configured with HeroUI (v2) and Tailwind CSS.",
     icon: <NewNextJSIcon height={40} width={40} />,
-    href: "https://github.com/frontio-ai/next-pages-template",
+    href: "https://github.com/heroui-inc/next-pages-template",
   },
 ];
 
diff --git a/apps/docs/components/scripts/script-providers.tsx b/apps/docs/components/scripts/script-providers.tsx
index 974fd82ed1..1c3e7b7a5b 100644
--- a/apps/docs/components/scripts/script-providers.tsx
+++ b/apps/docs/components/scripts/script-providers.tsx
@@ -9,7 +9,7 @@ export function ScriptProviders({isKapaEnabled}: {isKapaEnabled?: boolean}) {
     <>
       <Script
         defer
-        data-modal-disclaimer="This is a custom LLM for HeroUI with access to all developer docs (heroui.com/docs) and GitHub Issues and PRs (github.com/frontio-ai/heroui)."
+        data-modal-disclaimer="This is a custom LLM for HeroUI with access to all developer docs (heroui.com/docs) and GitHub Issues and PRs (github.com/heroui-inc/heroui)."
         data-modal-example-questions="How do I install for Next.js?,How do I customize primary color?"
         data-project-color="#000000"
         data-project-logo="https://avatars.githubusercontent.com/u/86160567?s=280&v=4"
diff --git a/apps/docs/config/site.ts b/apps/docs/config/site.ts
index 765cd077a8..4234975b36 100644
--- a/apps/docs/config/site.ts
+++ b/apps/docs/config/site.ts
@@ -31,7 +31,7 @@ export const siteConfig = {
     creator: "@hero_ui",
   },
   links: {
-    github: "https://github.com/frontio-ai/heroui",
+    github: "https://github.com/heroui-inc/heroui",
     twitter: "https://x.com/hero_ui",
     docs: "https://heroui.com",
     discord: "https://discord.gg/9b6yyZKmH4",
diff --git a/apps/docs/content/blog/introducing-heroui.mdx b/apps/docs/content/blog/introducing-heroui.mdx
index c7e90ecd89..aeba71dcfa 100644
--- a/apps/docs/content/blog/introducing-heroui.mdx
+++ b/apps/docs/content/blog/introducing-heroui.mdx
@@ -103,4 +103,4 @@ Whether it's a feature request, bug report, or a project to showcase, please get
 
 ## Contributing
 
-PR's on HeroUI are always welcome, please see our [contribution guidelines](https://github.com/frontio-ai/heroui/blob/main/CONTRIBUTING.md) to learn how you can contribute to this project.
+PR's on HeroUI are always welcome, please see our [contribution guidelines](https://github.com/heroui-inc/heroui/blob/main/CONTRIBUTING.md) to learn how you can contribute to this project.
diff --git a/apps/docs/content/blog/nextui-v2.mdx b/apps/docs/content/blog/nextui-v2.mdx
index c5fe819141..94a77bb842 100644
--- a/apps/docs/content/blog/nextui-v2.mdx
+++ b/apps/docs/content/blog/nextui-v2.mdx
@@ -327,4 +327,4 @@ Whether it's a feature request, bug report, or a project to showcase, please get
 
 ## Contributing
 
-PR's on HeroUI are always welcome, please see our [contribution guidelines](https://github.com/frontio-ai/heroui/blob/main/CONTRIBUTING.md) to learn how you can contribute to this project.
+PR's on HeroUI are always welcome, please see our [contribution guidelines](https://github.com/heroui-inc/heroui/blob/main/CONTRIBUTING.md) to learn how you can contribute to this project.
diff --git a/apps/docs/content/blog/v2.1.0.mdx b/apps/docs/content/blog/v2.1.0.mdx
index 3d785eee5b..651cd90d73 100644
--- a/apps/docs/content/blog/v2.1.0.mdx
+++ b/apps/docs/content/blog/v2.1.0.mdx
@@ -164,4 +164,4 @@ Whether it's a feature request, bug report, or a project to showcase, please get
 
 ## Contributing
 
-PR's on HeroUI are always welcome, please see our [contribution guidelines](https://github.com/frontio-ai/heroui/blob/main/CONTRIBUTING.md) to learn how you can contribute to this project.
+PR's on HeroUI are always welcome, please see our [contribution guidelines](https://github.com/heroui-inc/heroui/blob/main/CONTRIBUTING.md) to learn how you can contribute to this project.
diff --git a/apps/docs/content/blog/v2.2.0.mdx b/apps/docs/content/blog/v2.2.0.mdx
index 43665a938e..80e00de952 100644
--- a/apps/docs/content/blog/v2.2.0.mdx
+++ b/apps/docs/content/blog/v2.2.0.mdx
@@ -440,4 +440,4 @@ Whether it's a feature request, bug report, or a project to showcase, please get
 
 ## Contributing
 
-PR's on HeroUI are always welcome, please see our [contribution guidelines](https://github.com/frontio-ai/heroui/blob/main/CONTRIBUTING.md) to learn how you can contribute to this project.
+PR's on HeroUI are always welcome, please see our [contribution guidelines](https://github.com/heroui-inc/heroui/blob/main/CONTRIBUTING.md) to learn how you can contribute to this project.
diff --git a/apps/docs/content/blog/v2.3.0.mdx b/apps/docs/content/blog/v2.3.0.mdx
index 1a3687f3ee..b3c875bbd3 100644
--- a/apps/docs/content/blog/v2.3.0.mdx
+++ b/apps/docs/content/blog/v2.3.0.mdx
@@ -61,7 +61,7 @@ Upgrade today by running one of the following commands:
 
 ## NextUI CLI
 
-We are thrilled to introduce the [NextUI CLI](https://github.com/frontio-ai/heroui-cli), a command-line interface, It offers a comprehensive suite
+We are thrilled to introduce the [NextUI CLI](https://github.com/heroui-inc/heroui-cli), a command-line interface, It offers a comprehensive suite
 of commands to initialize, manage, and improve your NextUI projects. It enables you to `add`, `remove`, or
 `upgrade` individual components, assess the health of your project, and more.
 
@@ -144,7 +144,7 @@ nextui add --all
 
 <Spacer y={4} />
 
-> The CLI is currentl in `Alpha` stage, we're working on adding more features and improvements. If you find any issues or have any suggestions, please let us know by [opening an issue](https://github.com/frontio-ai/heroui-cli/issues/new).
+> The CLI is currentl in `Alpha` stage, we're working on adding more features and improvements. If you find any issues or have any suggestions, please let us know by [opening an issue](https://github.com/heroui-inc/heroui-cli/issues/new).
 
 To learn more about the CLI and its commands, please refer to the [CLI documentation](/docs/guide/cli) and the [CLI API reference](/docs/api-references/cli-api).
 
@@ -367,38 +367,38 @@ That's it! Your project should now be using the latest version of TailwindCSS an
 
 **Bug Fixes**:
 
-- Fixed an HSL color rounding issue in the theme settings to ensure accurate color representation. [PR](https://github.com/frontio-ai/heroui/pull/2702) - [@wingkwong](https://github.com/wingkwong)
-- Removed conflicting transition definitions affecting CSS classes. [PR](https://github.com/frontio-ai/heroui/pull/2677) - [@u3u](https://github.com/u3u)
-- Patched the "@heroui/autocomplete" package to fix an issue where empty items with `allowCustomValue` would not render properly due to a null node problem. [PR](https://github.com/frontio-ai/heroui/pull/2674) - [@wingkwong](https://github.com/wingkwong)
-- Implemented a fix in modal components to prevent carryover of IME (Input Method Editor) input when switching fields using the Tab key. [PR](https://github.com/frontio-ai/heroui/pull/2709) - [@ryo-manba](https://github.com/ryo-manba)
-- Enhanced accessibility by handling Tab key press event in the `ModalContent` component. [PR](https://github.com/frontio-ai/heroui/pull/2709) - [@ryo-manba](https://github.com/ryo-manba)
-- Fixed an issue where disabled select components could still be changed using blur and keyboard shortcuts. [PR](https://github.com/frontio-ai/heroui/pull/2649) - [@wingkwong](https://github.com/wingkwong)
-- Patched issues in "@heroui/use-aria-multiselect" and "@heroui/stories-utils" packages to fix a warning about `SELECT defaultSelectedKeys`. [PR](https://github.com/frontio-ai/heroui/pull/2648) - [@wingkwong](https://github.com/wingkwong)
-- Fixed an issue with incorrect `onChange` typing in Checkbox Group, ensuring it now correctly handles an array of strings as values. [PR](https://github.com/frontio-ai/heroui/pull/2595) - [@wingkwong](https://github.com/wingkwong)
-- Fixed the `label` placement issue in `Select` component if a `description` prop is used [PR](https://github.com/frontio-ai/heroui/pull/2553) - [@novsource](https://github.com/novsource)
-- Fixed the `originalProps` spread issue in the `Dropdown` component. [PR](https://github.com/frontio-ai/heroui/pull/2450) - [@wingkwong](https://github.com/wingkwong)
+- Fixed an HSL color rounding issue in the theme settings to ensure accurate color representation. [PR](https://github.com/heroui-inc/heroui/pull/2702) - [@wingkwong](https://github.com/wingkwong)
+- Removed conflicting transition definitions affecting CSS classes. [PR](https://github.com/heroui-inc/heroui/pull/2677) - [@u3u](https://github.com/u3u)
+- Patched the "@heroui/autocomplete" package to fix an issue where empty items with `allowCustomValue` would not render properly due to a null node problem. [PR](https://github.com/heroui-inc/heroui/pull/2674) - [@wingkwong](https://github.com/wingkwong)
+- Implemented a fix in modal components to prevent carryover of IME (Input Method Editor) input when switching fields using the Tab key. [PR](https://github.com/heroui-inc/heroui/pull/2709) - [@ryo-manba](https://github.com/ryo-manba)
+- Enhanced accessibility by handling Tab key press event in the `ModalContent` component. [PR](https://github.com/heroui-inc/heroui/pull/2709) - [@ryo-manba](https://github.com/ryo-manba)
+- Fixed an issue where disabled select components could still be changed using blur and keyboard shortcuts. [PR](https://github.com/heroui-inc/heroui/pull/2649) - [@wingkwong](https://github.com/wingkwong)
+- Patched issues in "@heroui/use-aria-multiselect" and "@heroui/stories-utils" packages to fix a warning about `SELECT defaultSelectedKeys`. [PR](https://github.com/heroui-inc/heroui/pull/2648) - [@wingkwong](https://github.com/wingkwong)
+- Fixed an issue with incorrect `onChange` typing in Checkbox Group, ensuring it now correctly handles an array of strings as values. [PR](https://github.com/heroui-inc/heroui/pull/2595) - [@wingkwong](https://github.com/wingkwong)
+- Fixed the `label` placement issue in `Select` component if a `description` prop is used [PR](https://github.com/heroui-inc/heroui/pull/2553) - [@novsource](https://github.com/novsource)
+- Fixed the `originalProps` spread issue in the `Dropdown` component. [PR](https://github.com/heroui-inc/heroui/pull/2450) - [@wingkwong](https://github.com/wingkwong)
 
 **Improvements**
-- Framer Motion was updated to the latest version, improving performance and reducing bundle size. [Docs](https://www.framer.com/motion/guide-reduce-bundle-size/) [PR](https://github.com/frontio-ai/heroui/pull/2464) - [@mezotv](https://github.com/mezotv)
+- Framer Motion was updated to the latest version, improving performance and reducing bundle size. [Docs](https://www.framer.com/motion/guide-reduce-bundle-size/) [PR](https://github.com/heroui-inc/heroui/pull/2464) - [@mezotv](https://github.com/mezotv)
 - `LazyMotion` was added to all components that use Framer Motion, improving performance by only loading the required motion components.
-- We removed the custom `units` creation from the `nextui` plugin, it is no longer needed with TailwindCSS v3.4 and above. [PR](https://github.com/frontio-ai/heroui/pull/2713) - [@jrgarciadev](https://github.com/jrgarciadev)
-- Updated `framer-motion` package across various components and utilities to version `11.0.22` for enhanced performance and consistency. [PR](https://github.com/frontio-ai/heroui/pull/2596) - [@wingkwong](https://github.com/wingkwong)
-- Ensured compatibility with `react@18.2.0` and `react-dom@18.2.0` across the board. [PR](https://github.com/frontio-ai/heroui/pull/2596) - [@wingkwong](https://github.com/wingkwong)
-- Introduced patches for NextUI components to improve animations, including support for keyframes with spring and inertia animations. [PR](https://github.com/frontio-ai/heroui/pull/2596) - [@wingkwong](https://github.com/wingkwong)
-- Improved handling of numeric keys in the multi-select component to ensure consistent behavior. [PR](https://github.com/frontio-ai/heroui/pull/2589) - [@wingkwong](https://github.com/wingkwong)
-- Updated the version of react-aria to include the latest changes as detailed in the [2024-02-13 release](https://react-spectrum.adobe.com/releases/2024-02-13.html). [PR](https://github.com/frontio-ai/heroui/pull/2561) - [@ryo-manba](https://github.com/ryo-manba)
-- Added support for custom class names in the `AvatarGroup` component, enhancing flexibility in styling. [PR](https://github.com/frontio-ai/heroui/pull/2669) - [@wingkwong](https://github.com/wingkwong)
-- Introduced a `count` slot to the `AvatarGroup` for more customized rendering. [PR](https://github.com/frontio-ai/heroui/pull/2669) - [@wingkwong](https://github.com/wingkwong)
-- Improved the `AvatarGroup` component's count rendering logic for better performance and flexibility. [PR](https://github.com/frontio-ai/heroui/pull/2669) - [@wingkwong](https://github.com/wingkwong)
-- Add RTL support to the kbd component. [PR](https://github.com/frontio-ai/heroui/pull/2482) - [@mrbadri](https://github.com/mrbadri)
-- Add RTL support to the Select component. [PR](https://github.com/frontio-ai/heroui/pull/2485) - [@mrbadri](https://github.com/mrbadri)
-- Add RTL support to the avatar group componen. [PR](https://github.com/frontio-ai/heroui/pull/2498) - [@mrbadri](https://github.com/mrbadri)
-- Add RTL support to the Table component. [PR](https://github.com/frontio-ai/heroui/pull/2472) - [@mrbadri](https://github.com/mrbadri)
+- We removed the custom `units` creation from the `nextui` plugin, it is no longer needed with TailwindCSS v3.4 and above. [PR](https://github.com/heroui-inc/heroui/pull/2713) - [@jrgarciadev](https://github.com/jrgarciadev)
+- Updated `framer-motion` package across various components and utilities to version `11.0.22` for enhanced performance and consistency. [PR](https://github.com/heroui-inc/heroui/pull/2596) - [@wingkwong](https://github.com/wingkwong)
+- Ensured compatibility with `react@18.2.0` and `react-dom@18.2.0` across the board. [PR](https://github.com/heroui-inc/heroui/pull/2596) - [@wingkwong](https://github.com/wingkwong)
+- Introduced patches for NextUI components to improve animations, including support for keyframes with spring and inertia animations. [PR](https://github.com/heroui-inc/heroui/pull/2596) - [@wingkwong](https://github.com/wingkwong)
+- Improved handling of numeric keys in the multi-select component to ensure consistent behavior. [PR](https://github.com/heroui-inc/heroui/pull/2589) - [@wingkwong](https://github.com/wingkwong)
+- Updated the version of react-aria to include the latest changes as detailed in the [2024-02-13 release](https://react-spectrum.adobe.com/releases/2024-02-13.html). [PR](https://github.com/heroui-inc/heroui/pull/2561) - [@ryo-manba](https://github.com/ryo-manba)
+- Added support for custom class names in the `AvatarGroup` component, enhancing flexibility in styling. [PR](https://github.com/heroui-inc/heroui/pull/2669) - [@wingkwong](https://github.com/wingkwong)
+- Introduced a `count` slot to the `AvatarGroup` for more customized rendering. [PR](https://github.com/heroui-inc/heroui/pull/2669) - [@wingkwong](https://github.com/wingkwong)
+- Improved the `AvatarGroup` component's count rendering logic for better performance and flexibility. [PR](https://github.com/heroui-inc/heroui/pull/2669) - [@wingkwong](https://github.com/wingkwong)
+- Add RTL support to the kbd component. [PR](https://github.com/heroui-inc/heroui/pull/2482) - [@mrbadri](https://github.com/mrbadri)
+- Add RTL support to the Select component. [PR](https://github.com/heroui-inc/heroui/pull/2485) - [@mrbadri](https://github.com/mrbadri)
+- Add RTL support to the avatar group componen. [PR](https://github.com/heroui-inc/heroui/pull/2498) - [@mrbadri](https://github.com/mrbadri)
+- Add RTL support to the Table component. [PR](https://github.com/heroui-inc/heroui/pull/2472) - [@mrbadri](https://github.com/mrbadri)
 
 **Documentation**:
 - Updated documentation to reflect the new features and changes in the `AvatarGroup` component.
-- Added support for the "bun" package manager across documentation and components. [PR](https://github.com/frontio-ai/heroui/pull/2625) - [@sudongyuer](https://github.com/sudongyuer)
-- [Kapa.ai](https://www.kapa.ai/) widget was added to the documentation to provide AI support for users. [PR](https://github.com/frontio-ai/heroui/pull/2428) - [@wingkwong](https://github.com/sudongyuer)
+- Added support for the "bun" package manager across documentation and components. [PR](https://github.com/heroui-inc/heroui/pull/2625) - [@sudongyuer](https://github.com/sudongyuer)
+- [Kapa.ai](https://www.kapa.ai/) widget was added to the documentation to provide AI support for users. [PR](https://github.com/heroui-inc/heroui/pull/2428) - [@wingkwong](https://github.com/sudongyuer)
 - Layout docs updated to remove the `units` configuration from the `tailwind.config.(js|ts)` file.
 
 
@@ -406,7 +406,7 @@ Special thanks to NextUI Team members [@kuri-sun](https://github.com/kuri-sun),
 [@sudongyuer](https://github.com/sudongyuer), [@winchesHe](https://github.com/winchesHe), [@wingkwong](https://github.com/wingkwong),
 [@tianenpang](https://github.com/tianenpang), [@smultar](https://github.com/smultar) and contributors for their contributions to this release.
 
-For a full list of changes, please refer to the [release notes](https://github.com/frontio-ai/heroui/releases/tag/%40nextui-org%2Freact%402.3.0).
+For a full list of changes, please refer to the [release notes](https://github.com/heroui-inc/heroui/releases/tag/%40nextui-org%2Freact%402.3.0).
 
 <Spacer y={6} />
 
@@ -425,4 +425,4 @@ Whether it's a feature request, bug report, or a project to showcase, please get
 
 ## Contributing
 
-PR's on HeroUI are always welcome, please see our [contribution guidelines](https://github.com/frontio-ai/heroui/blob/main/CONTRIBUTING.md) to learn how you can contribute to this project.
+PR's on HeroUI are always welcome, please see our [contribution guidelines](https://github.com/heroui-inc/heroui/blob/main/CONTRIBUTING.md) to learn how you can contribute to this project.
diff --git a/apps/docs/content/blog/v2.4.0.mdx b/apps/docs/content/blog/v2.4.0.mdx
index ad2abcdbd9..b769ae9127 100644
--- a/apps/docs/content/blog/v2.4.0.mdx
+++ b/apps/docs/content/blog/v2.4.0.mdx
@@ -220,17 +220,17 @@ nextui --no-cache upgrade
 
 You can now run the upgrade command and see the summary version of the package you are upgrading to.
 
-![image](https://github.com/frontio-ai/heroui-cli/assets/96854855/2a5945dd-5187-4e20-81b8-4136e9791dde)
+![image](https://github.com/heroui-inc/heroui-cli/assets/96854855/2a5945dd-5187-4e20-81b8-4136e9791dde)
 
 ### Upgrade And Remove Select View Optimization
 
 The disabled option(s) will be displayed in the bottom of the list.
 
-![image](https://github.com/frontio-ai/heroui-cli/assets/96854855/c7ddf9e4-3054-4bf1-b8e3-dc2f6226091a)
+![image](https://github.com/heroui-inc/heroui-cli/assets/96854855/c7ddf9e4-3054-4bf1-b8e3-dc2f6226091a)
 
 ### Doctor Command add peerDependencies check
 
-The `doctor` command now checks for peerDependencies and displays the incorrect peerDependencies. (See [frontio-ai/heroui#2954](https://github.com/frontio-ai/heroui/issues/2954) for more).
+The `doctor` command now checks for peerDependencies and displays the incorrect peerDependencies. (See [heroui-inc/heroui#2954](https://github.com/heroui-inc/heroui/issues/2954) for more).
 
 <Spacer y={4} />
 
@@ -287,38 +287,38 @@ For those who use `validationBehavior="aria"`, `validate` will be no longer appl
 
 **Bug Fixes**:
 
-- Fixed popover-based focus behaviours. [PR](https://github.com/frontio-ai/heroui/pull/2889) - [@wingkwong](https://github.com/wingkwong)
-- Fixed missing ref to input wrapper. [PR](https://github.com/frontio-ai/heroui/pull/3008) - [@wingkwong](https://github.com/wingkwong)
-- Fixed react-hook-form uncontrolled switch component. [PR](https://github.com/frontio-ai/heroui/pull/3008) - [@wingkwong](https://github.com/wingkwong)
-- Fixed focus on the first item when pressing Space / Enter key on dropdown menu open. [PR](https://github.com/frontio-ai/heroui/pull/2970) - [@wingkwong](https://github.com/wingkwong)
-- Fixed inputting spaces in textarea inside a Table row. [PR](https://github.com/frontio-ai/heroui/pull/3020) - [@wingkwong](https://github.com/wingkwong)
-- Fixed incorrect tailwind classnames. [PR](https://github.com/frontio-ai/heroui/pull/3018) - [@wingkwong](https://github.com/wingkwong)
-- Fixed onSelectionChange can handle number [PR](https://github.com/frontio-ai/heroui/pull/2937) - [@ryo-manba](https://github.com/ryo-manba)
-- Fixed update type definition to prevent primitive values as items [PR](https://github.com/frontio-ai/heroui/pull/2938) - [@ryo-manba](https://github.com/ryo-manba)
-- Fixed display placeholder text when unselected for controlled. [PR](https://github.com/frontio-ai/heroui/pull/3081) - [@ryo-manba](https://github.com/ryo-manba)
-- Fixed the inert attribute in `CalendarMonth` and `CalendarPicker`. [PR](https://github.com/frontio-ai/heroui/pull/3054) - [@ShrinidhiUpadhyaya](https://github.com/ShrinidhiUpadhyaya)
-- Fixed hiding of unavailable dates in RangeCalendar. [PR](https://github.com/frontio-ai/heroui/pull/3054) - [@ShrinidhiUpadhyaya](https://github.com/ShrinidhiUpadhyaya)
-- Fixed calendar header controlled state on DatePicker. [PR](https://github.com/frontio-ai/heroui/pull/2845) - [@chirokas](https://github.com/chirokas)
-- Fixed 'Tap to click' behavior on macOS for Accordion and Tab. [PR](https://github.com/frontio-ai/heroui/pull/2725) - [@ericfabreu](https://github.com/ericfabreu)
-- Fixed incorrect margin on labels for RTL required inputs. [PR](https://github.com/frontio-ai/heroui/pull/2781) - [@mrbadri](https://github.com/mrbadri)
-- Fixed a type error in the onKeyDown event handler for the menu component. [PR](https://github.com/frontio-ai/heroui/pull/3064) - [@Gaic4o](https://github.com/Gaic4o)
+- Fixed popover-based focus behaviours. [PR](https://github.com/heroui-inc/heroui/pull/2889) - [@wingkwong](https://github.com/wingkwong)
+- Fixed missing ref to input wrapper. [PR](https://github.com/heroui-inc/heroui/pull/3008) - [@wingkwong](https://github.com/wingkwong)
+- Fixed react-hook-form uncontrolled switch component. [PR](https://github.com/heroui-inc/heroui/pull/3008) - [@wingkwong](https://github.com/wingkwong)
+- Fixed focus on the first item when pressing Space / Enter key on dropdown menu open. [PR](https://github.com/heroui-inc/heroui/pull/2970) - [@wingkwong](https://github.com/wingkwong)
+- Fixed inputting spaces in textarea inside a Table row. [PR](https://github.com/heroui-inc/heroui/pull/3020) - [@wingkwong](https://github.com/wingkwong)
+- Fixed incorrect tailwind classnames. [PR](https://github.com/heroui-inc/heroui/pull/3018) - [@wingkwong](https://github.com/wingkwong)
+- Fixed onSelectionChange can handle number [PR](https://github.com/heroui-inc/heroui/pull/2937) - [@ryo-manba](https://github.com/ryo-manba)
+- Fixed update type definition to prevent primitive values as items [PR](https://github.com/heroui-inc/heroui/pull/2938) - [@ryo-manba](https://github.com/ryo-manba)
+- Fixed display placeholder text when unselected for controlled. [PR](https://github.com/heroui-inc/heroui/pull/3081) - [@ryo-manba](https://github.com/ryo-manba)
+- Fixed the inert attribute in `CalendarMonth` and `CalendarPicker`. [PR](https://github.com/heroui-inc/heroui/pull/3054) - [@ShrinidhiUpadhyaya](https://github.com/ShrinidhiUpadhyaya)
+- Fixed hiding of unavailable dates in RangeCalendar. [PR](https://github.com/heroui-inc/heroui/pull/3054) - [@ShrinidhiUpadhyaya](https://github.com/ShrinidhiUpadhyaya)
+- Fixed calendar header controlled state on DatePicker. [PR](https://github.com/heroui-inc/heroui/pull/2845) - [@chirokas](https://github.com/chirokas)
+- Fixed 'Tap to click' behavior on macOS for Accordion and Tab. [PR](https://github.com/heroui-inc/heroui/pull/2725) - [@ericfabreu](https://github.com/ericfabreu)
+- Fixed incorrect margin on labels for RTL required inputs. [PR](https://github.com/heroui-inc/heroui/pull/2781) - [@mrbadri](https://github.com/mrbadri)
+- Fixed a type error in the onKeyDown event handler for the menu component. [PR](https://github.com/heroui-inc/heroui/pull/3064) - [@Gaic4o](https://github.com/Gaic4o)
 
 **Improvements**
 
-- Added `destroyInactiveTabPanel` prop for Tabs component. [PR](https://github.com/frontio-ai/heroui/pull/2973) - [@wingkwong](https://github.com/wingkwong)
-- Added pointer-events-none to skeleton base. [PR](https://github.com/frontio-ai/heroui/pull/2972) - [@wingkwong](https://github.com/wingkwong)
-- Revised isInvalid input styles. [PR](https://github.com/frontio-ai/heroui/pull/3010) - [@wingkwong](https://github.com/wingkwong)
-- Revised slider styles. [PR](https://github.com/frontio-ai/heroui/pull/2883) - [@wingkwong](https://github.com/wingkwong)
-- Removed unnecessary origin-bottom in button. [PR](https://github.com/frontio-ai/heroui/pull/2990) - [@wingkwong](https://github.com/wingkwong)
-- Set overflow visible after skeleton loaded. [PR](https://github.com/frontio-ai/heroui/pull/2986) - [@wingkwong](https://github.com/wingkwong)
-- Kept date picker style consistent for different variants. [PR](https://github.com/frontio-ai/heroui/pull/2901) - [@wingkwong](https://github.com/wingkwong)
-- Calculated the correct value on mark click. [PR](https://github.com/frontio-ai/heroui/pull/3017) - [@wingkwong](https://github.com/wingkwong)
-- Removed scrolling display during month change animation. [PR](https://github.com/frontio-ai/heroui/pull/2949) - [@novsource](https://github.com/novsource)
-- Added the correct peerDep version [PR](https://github.com/frontio-ai/heroui/pull/3014) - [@winchesHe](https://github.com/winchesHe)
-- Added missing export of TableRowProps type. [PR](https://github.com/frontio-ai/heroui/pull/2866) - [@sapkra](https://github.com/sapkra)
-- Changed validationBehavior from native to aria by default, with the option to change via props. [PR](https://github.com/frontio-ai/heroui/pull/2987) - [@ryo-manba](https://github.com/ryo-manba)
-- Made the VisuallyHidden elementType as span when the default parent element accepts only phrasing elements. [PR](https://github.com/frontio-ai/heroui/pull/3013) - [@kosmotema](https://github.com/kosmotema)
-- Refactored the useScrollPosition hook to improve performance and stability by using useCallback for the handler function and useRef for throttleTimeout. [PR](https://github.com/frontio-ai/heroui/pull/3049) - [@Gaic4o](https://github.com/Gaic4o)
+- Added `destroyInactiveTabPanel` prop for Tabs component. [PR](https://github.com/heroui-inc/heroui/pull/2973) - [@wingkwong](https://github.com/wingkwong)
+- Added pointer-events-none to skeleton base. [PR](https://github.com/heroui-inc/heroui/pull/2972) - [@wingkwong](https://github.com/wingkwong)
+- Revised isInvalid input styles. [PR](https://github.com/heroui-inc/heroui/pull/3010) - [@wingkwong](https://github.com/wingkwong)
+- Revised slider styles. [PR](https://github.com/heroui-inc/heroui/pull/2883) - [@wingkwong](https://github.com/wingkwong)
+- Removed unnecessary origin-bottom in button. [PR](https://github.com/heroui-inc/heroui/pull/2990) - [@wingkwong](https://github.com/wingkwong)
+- Set overflow visible after skeleton loaded. [PR](https://github.com/heroui-inc/heroui/pull/2986) - [@wingkwong](https://github.com/wingkwong)
+- Kept date picker style consistent for different variants. [PR](https://github.com/heroui-inc/heroui/pull/2901) - [@wingkwong](https://github.com/wingkwong)
+- Calculated the correct value on mark click. [PR](https://github.com/heroui-inc/heroui/pull/3017) - [@wingkwong](https://github.com/wingkwong)
+- Removed scrolling display during month change animation. [PR](https://github.com/heroui-inc/heroui/pull/2949) - [@novsource](https://github.com/novsource)
+- Added the correct peerDep version [PR](https://github.com/heroui-inc/heroui/pull/3014) - [@winchesHe](https://github.com/winchesHe)
+- Added missing export of TableRowProps type. [PR](https://github.com/heroui-inc/heroui/pull/2866) - [@sapkra](https://github.com/sapkra)
+- Changed validationBehavior from native to aria by default, with the option to change via props. [PR](https://github.com/heroui-inc/heroui/pull/2987) - [@ryo-manba](https://github.com/ryo-manba)
+- Made the VisuallyHidden elementType as span when the default parent element accepts only phrasing elements. [PR](https://github.com/heroui-inc/heroui/pull/3013) - [@kosmotema](https://github.com/kosmotema)
+- Refactored the useScrollPosition hook to improve performance and stability by using useCallback for the handler function and useRef for throttleTimeout. [PR](https://github.com/heroui-inc/heroui/pull/3049) - [@Gaic4o](https://github.com/Gaic4o)
 
 **Documentation**:
 - Updated documentation to reflect the new features and changes in the components, API references, and CLI.
@@ -327,7 +327,7 @@ Special thanks to NextUI Team members [@kuri-sun](https://github.com/kuri-sun),
 [@sudongyuer](https://github.com/sudongyuer), [@winchesHe](https://github.com/winchesHe), [@wingkwong](https://github.com/wingkwong), 
 [@tianenpang](https://github.com/tianenpang), [@smultar](https://github.com/smultar) and contributors for their contributions to this release.
 
-For a full list of changes, please refer to the [release notes](https://github.com/frontio-ai/heroui/releases/tag/%40nextui-org%2Freact%402.4.0).
+For a full list of changes, please refer to the [release notes](https://github.com/heroui-inc/heroui/releases/tag/%40nextui-org%2Freact%402.4.0).
 
 <Spacer y={6} />
 
@@ -344,4 +344,4 @@ Whether it's a feature request, bug report, or a project to showcase, please get
 
 ## Contributing
 
-PR's on HeroUI are always welcome, please see our [contribution guidelines](https://github.com/frontio-ai/heroui/blob/main/CONTRIBUTING.md) to learn how you can contribute to this project.
+PR's on HeroUI are always welcome, please see our [contribution guidelines](https://github.com/heroui-inc/heroui/blob/main/CONTRIBUTING.md) to learn how you can contribute to this project.
diff --git a/apps/docs/content/blog/v2.6.0.mdx b/apps/docs/content/blog/v2.6.0.mdx
index 642c619cd0..6a1b3f00fe 100644
--- a/apps/docs/content/blog/v2.6.0.mdx
+++ b/apps/docs/content/blog/v2.6.0.mdx
@@ -665,20 +665,20 @@ The circular progress Tailwind variants have been moved from `circular-progress`
 
 **Features**:
 
-- Added Alert component by [@jrgarciadev](https://github.com/jrgarciadev) and [@abhinav700](https://github.com/abhinav700) in [PR #3982](https://github.com/frontio-ai/heroui/pull/3982), [PR #3680](https://github.com/frontio-ai/heroui/pull/3680), [PR #4071](https://github.com/frontio-ai/heroui/pull/4071), and [PR #4073](https://github.com/frontio-ai/heroui/pull/4073)
-- Added Draggable modal by [@jrgarciadev](https://github.com/jrgarciadev) and [@wzc520pyfm](https://github.com/wzc520pyfm) in [PR #3983](https://github.com/frontio-ai/heroui/pull/3983) and [PR #2818](https://github.com/frontio-ai/heroui/pull/2818)
-- Added Drawer component by [@jrgarciadev](https://github.com/jrgarciadev) and [@1111mp](https://github.com/1111mp) in [PR #3986](https://github.com/frontio-ai/heroui/pull/3986), [PR #2223](https://github.com/frontio-ai/heroui/pull/2223) and [PR #4057](https://github.com/frontio-ai/heroui/pull/4057)
-- Added InputOTP component by [@macci001](https://github.com/macci001) in [PR #4052](https://github.com/frontio-ai/heroui/pull/4052)
-- Added Form component by [@ryo-manba](https://github.com/ryo-manba) in [PR #3036](https://github.com/frontio-ai/heroui/pull/3036)
-- Added `selectorButtonPlacement` prop to date-picker by [@ryo-manba](https://github.com/ryo-manba) in [PR #3248](https://github.com/frontio-ai/heroui/pull/3248)
-- Added `tabRef` prop to tabs by [@winchesHe](https://github.com/winchesHe) in [PR #3974](https://github.com/frontio-ai/heroui/pull/3974)
-- Added `shouldCloseOnScroll` prop to popover by [@awesome-pro](https://github.com/awesome-pro) in [PR #3595](https://github.com/frontio-ai/heroui/pull/3595)
-- Added `showMonthAndYearPickers` prop to date-range-picker and range-calendar by [@ryo-manba](https://github.com/ryo-manba) in [PR #3302](https://github.com/frontio-ai/heroui/pull/3302)
-- Added `use-theme` hook by [@wingkwong](https://github.com/wingkwong) in [PR #3169](https://github.com/frontio-ai/heroui/pull/3169)
-- Added `isKeyboardNavigationDisabled` prop in Table by [@macci001](https://github.com/macci001) in [PR #3735](https://github.com/frontio-ai/heroui/pull/3735)
-- Added `reducedMotion` to Provider by [@ryo-manba](https://github.com/ryo-manba) in [PR #3470](https://github.com/frontio-ai/heroui/pull/3470)
-- Added `isClearable` to Textarea by [@jrgarciadev](https://github.com/jrgarciadev) and [@IsDyh01](https://github.com/IsDyh01) in [PR #4172](https://github.com/frontio-ai/heroui/pull/4172) and [PR #3477](https://github.com/frontio-ai/heroui/pull/3477)
-- Added `hideEmptyContent` to Select by [@Peterl561](https://github.com/Peterl561) in [PR #4219](https://github.com/frontio-ai/heroui/pull/4219)
+- Added Alert component by [@jrgarciadev](https://github.com/jrgarciadev) and [@abhinav700](https://github.com/abhinav700) in [PR #3982](https://github.com/heroui-inc/heroui/pull/3982), [PR #3680](https://github.com/heroui-inc/heroui/pull/3680), [PR #4071](https://github.com/heroui-inc/heroui/pull/4071), and [PR #4073](https://github.com/heroui-inc/heroui/pull/4073)
+- Added Draggable modal by [@jrgarciadev](https://github.com/jrgarciadev) and [@wzc520pyfm](https://github.com/wzc520pyfm) in [PR #3983](https://github.com/heroui-inc/heroui/pull/3983) and [PR #2818](https://github.com/heroui-inc/heroui/pull/2818)
+- Added Drawer component by [@jrgarciadev](https://github.com/jrgarciadev) and [@1111mp](https://github.com/1111mp) in [PR #3986](https://github.com/heroui-inc/heroui/pull/3986), [PR #2223](https://github.com/heroui-inc/heroui/pull/2223) and [PR #4057](https://github.com/heroui-inc/heroui/pull/4057)
+- Added InputOTP component by [@macci001](https://github.com/macci001) in [PR #4052](https://github.com/heroui-inc/heroui/pull/4052)
+- Added Form component by [@ryo-manba](https://github.com/ryo-manba) in [PR #3036](https://github.com/heroui-inc/heroui/pull/3036)
+- Added `selectorButtonPlacement` prop to date-picker by [@ryo-manba](https://github.com/ryo-manba) in [PR #3248](https://github.com/heroui-inc/heroui/pull/3248)
+- Added `tabRef` prop to tabs by [@winchesHe](https://github.com/winchesHe) in [PR #3974](https://github.com/heroui-inc/heroui/pull/3974)
+- Added `shouldCloseOnScroll` prop to popover by [@awesome-pro](https://github.com/awesome-pro) in [PR #3595](https://github.com/heroui-inc/heroui/pull/3595)
+- Added `showMonthAndYearPickers` prop to date-range-picker and range-calendar by [@ryo-manba](https://github.com/ryo-manba) in [PR #3302](https://github.com/heroui-inc/heroui/pull/3302)
+- Added `use-theme` hook by [@wingkwong](https://github.com/wingkwong) in [PR #3169](https://github.com/heroui-inc/heroui/pull/3169)
+- Added `isKeyboardNavigationDisabled` prop in Table by [@macci001](https://github.com/macci001) in [PR #3735](https://github.com/heroui-inc/heroui/pull/3735)
+- Added `reducedMotion` to Provider by [@ryo-manba](https://github.com/ryo-manba) in [PR #3470](https://github.com/heroui-inc/heroui/pull/3470)
+- Added `isClearable` to Textarea by [@jrgarciadev](https://github.com/jrgarciadev) and [@IsDyh01](https://github.com/IsDyh01) in [PR #4172](https://github.com/heroui-inc/heroui/pull/4172) and [PR #3477](https://github.com/heroui-inc/heroui/pull/3477)
+- Added `hideEmptyContent` to Select by [@Peterl561](https://github.com/Peterl561) in [PR #4219](https://github.com/heroui-inc/heroui/pull/4219)
 
 **Documentation**:
 
@@ -688,71 +688,71 @@ The circular progress Tailwind variants have been moved from `circular-progress`
   - Moved descriptions into tooltips that appear right after titles
   - Decreased font size for better scanning
   - Improved color scheme for better contrast
-- Fixed broken links by [@wingkwong](https://github.com/wingkwong) in [PR #3796](https://github.com/frontio-ai/heroui/pull/3796)
-- Fixed canary storybook links by [@wingkwong](https://github.com/wingkwong) in [PR #4030](https://github.com/frontio-ai/heroui/pull/4030)
-- Fixed typos in dark mode page by [@wingkwong](https://github.com/wingkwong) in [PR #3823](https://github.com/frontio-ai/heroui/pull/3823)
-- Fixed types for classNames and itemClasses by [@wingkwong](https://github.com/wingkwong) in [PR #4209](https://github.com/frontio-ai/heroui/pull/4209)
-- Fixed typos in landing page by [@PentSec](https://github.com/PentSec) in [PR #3928](https://github.com/frontio-ai/heroui/pull/3928)
-- Fixed typos in date picker page by [@dperconti](https://github.com/dperconti) in [PR #3516](https://github.com/frontio-ai/heroui/pull/3516)
-- Fixed incorrect highlighted line in Select page by [@Choneas](https://github.com/Choneas) in [PR #3838](https://github.com/frontio-ai/heroui/pull/3838)
-- Fixed unexpected translation in code block by [@nnmax](https://github.com/nnmax) in [PR #3878](https://github.com/frontio-ai/heroui/pull/3878)
-- Fixed yarn command in installation page by [@AzpektDev](https://github.com/AzpektDev) in [PR #4132](https://github.com/frontio-ai/heroui/pull/4132)
-- Added ethical ads by [@jrgarciadev](https://github.com/jrgarciadev) in [PR #3803](https://github.com/frontio-ai/heroui/pull/3803)
-- Added Form guide by [@ryo-manba](https://github.com/ryo-manba) in [PR #3882](https://github.com/frontio-ai/heroui/pull/3882)
-- Enhanced overall DX for all pages by [@wingkwong](https://github.com/wingkwong) in [PR #4055](https://github.com/frontio-ai/heroui/pull/4055)
-- Supported virtualization for Autocomplete by [@jrgarciadev](https://github.com/jrgarciadev) and [@vinroger](https://github.com/vinroger) in [PR #4094](https://github.com/frontio-ai/heroui/pull/4094) and [PR #3444](https://github.com/frontio-ai/heroui/pull/3444)
-- Supported virtualization for Select by [@vinroger](https://github.com/vinroger) in [PR #4203](https://github.com/frontio-ai/heroui/pull/4203)
-- Supported virtualization for Listbox by [@vinroger](https://github.com/vinroger) in [PR #4206](https://github.com/frontio-ai/heroui/pull/4206)
-- Optimized code fold by [@winchesHe](https://github.com/winchesHe) in [PR #4202](https://github.com/frontio-ai/heroui/pull/4202)
-- Synced API from heroui-cli v0.3.5 by [@winchesHe](https://github.com/winchesHe) in [PR #4173](https://github.com/frontio-ai/heroui/pull/4173)
+- Fixed broken links by [@wingkwong](https://github.com/wingkwong) in [PR #3796](https://github.com/heroui-inc/heroui/pull/3796)
+- Fixed canary storybook links by [@wingkwong](https://github.com/wingkwong) in [PR #4030](https://github.com/heroui-inc/heroui/pull/4030)
+- Fixed typos in dark mode page by [@wingkwong](https://github.com/wingkwong) in [PR #3823](https://github.com/heroui-inc/heroui/pull/3823)
+- Fixed types for classNames and itemClasses by [@wingkwong](https://github.com/wingkwong) in [PR #4209](https://github.com/heroui-inc/heroui/pull/4209)
+- Fixed typos in landing page by [@PentSec](https://github.com/PentSec) in [PR #3928](https://github.com/heroui-inc/heroui/pull/3928)
+- Fixed typos in date picker page by [@dperconti](https://github.com/dperconti) in [PR #3516](https://github.com/heroui-inc/heroui/pull/3516)
+- Fixed incorrect highlighted line in Select page by [@Choneas](https://github.com/Choneas) in [PR #3838](https://github.com/heroui-inc/heroui/pull/3838)
+- Fixed unexpected translation in code block by [@nnmax](https://github.com/nnmax) in [PR #3878](https://github.com/heroui-inc/heroui/pull/3878)
+- Fixed yarn command in installation page by [@AzpektDev](https://github.com/AzpektDev) in [PR #4132](https://github.com/heroui-inc/heroui/pull/4132)
+- Added ethical ads by [@jrgarciadev](https://github.com/jrgarciadev) in [PR #3803](https://github.com/heroui-inc/heroui/pull/3803)
+- Added Form guide by [@ryo-manba](https://github.com/ryo-manba) in [PR #3882](https://github.com/heroui-inc/heroui/pull/3882)
+- Enhanced overall DX for all pages by [@wingkwong](https://github.com/wingkwong) in [PR #4055](https://github.com/heroui-inc/heroui/pull/4055)
+- Supported virtualization for Autocomplete by [@jrgarciadev](https://github.com/jrgarciadev) and [@vinroger](https://github.com/vinroger) in [PR #4094](https://github.com/heroui-inc/heroui/pull/4094) and [PR #3444](https://github.com/heroui-inc/heroui/pull/3444)
+- Supported virtualization for Select by [@vinroger](https://github.com/vinroger) in [PR #4203](https://github.com/heroui-inc/heroui/pull/4203)
+- Supported virtualization for Listbox by [@vinroger](https://github.com/vinroger) in [PR #4206](https://github.com/heroui-inc/heroui/pull/4206)
+- Optimized code fold by [@winchesHe](https://github.com/winchesHe) in [PR #4202](https://github.com/heroui-inc/heroui/pull/4202)
+- Synced API from heroui-cli v0.3.5 by [@winchesHe](https://github.com/winchesHe) in [PR #4173](https://github.com/heroui-inc/heroui/pull/4173)
 
 **Bug Fixes**:
 
-- Fixed avatar flashing issues by [@jrgarciadev](https://github.com/jrgarciadev) and [@rkkautsar](https://github.com/rkkautsar) in [PR #3987](https://github.com/frontio-ai/heroui/pull/3987) and [PR #3444](https://github.com/frontio-ai/heroui/pull/3444)
-- Fixed image ReferenceError in SSR by [@wingkwong](https://github.com/wingkwong) in [PR #4122](https://github.com/frontio-ai/heroui/pull/4122)
-- Fixed navigate parameters by [@wingkwong](https://github.com/wingkwong) in [PR #4163](https://github.com/frontio-ai/heroui/pull/4163)
-- Fixed missing peer / dev dependency for framer-motion by [@wingkwong](https://github.com/wingkwong) in [PR #4161](https://github.com/frontio-ai/heroui/pull/4161)
-- Fixed menu item classNames by [@winchesHe](https://github.com/winchesHe) in [PR #4156](https://github.com/frontio-ai/heroui/pull/4156)
-- Fixed controlled IsInvalid prop by [@chirokas](https://github.com/chirokas) in [PR #4082](https://github.com/frontio-ai/heroui/pull/4082)
-- Fixed inert value with boolean type for React 19 by [@wingkwong](https://github.com/wingkwong) in [PR #4039](https://github.com/frontio-ai/heroui/pull/4039)
-- Fixed typecheck errors by [@wingkwong](https://github.com/wingkwong) in [PR #4171](https://github.com/frontio-ai/heroui/pull/4171)
-- Fixed tw nested group by [@wingkwong](https://github.com/wingkwong) in [PR #3909](https://github.com/frontio-ai/heroui/pull/3909)
-- Fixed select styles consistent with input by [@macci001](https://github.com/macci001) in [PR #3881](https://github.com/frontio-ai/heroui/pull/3881)
-- Fixed missing li tag when href is specified by [@macci001](https://github.com/macci001) in [PR #4168](https://github.com/frontio-ai/heroui/pull/4168)
-- Fixed sliding issue caused by the helper wrapper by [@mstfblci](https://github.com/mstfblci) in [PR #3966](https://github.com/frontio-ai/heroui/pull/3966)
-- Fixed element.ref warning in React 19 by [@jrgarciadev](https://github.com/jrgarciadev) in [PR #4003](https://github.com/frontio-ai/heroui/pull/4003)
-- Fixed image load on NextJS by [@jrgarciadev](https://github.com/jrgarciadev) in [PR #3998](https://github.com/frontio-ai/heroui/pull/3998)
-- Fixed squish textarea label by [@Peterl561](https://github.com/Peterl561) in [PR #4197](https://github.com/frontio-ai/heroui/pull/4197)
-- Fixed forwardRef render functions by [@winchesHe](https://github.com/winchesHe) in [PR #4198](https://github.com/frontio-ai/heroui/pull/4198)
-- Fixed collection based components ref by [@jrgarciadev](https://github.com/jrgarciadev) in [PR #4207](https://github.com/frontio-ai/heroui/pull/4207)
-- Fixed data-slot for select error message by [@jubar](https://github.com/jubar) in [PR #4214](https://github.com/frontio-ai/heroui/pull/4214)
-- Fixed selection functionality on touch by [@macci001](https://github.com/macci001) in [PR #4220](https://github.com/frontio-ai/heroui/pull/4220)
-- Fixed cursor position when hidden on init by [@Peterl561](https://github.com/Peterl561) in [PR #4222](https://github.com/frontio-ai/heroui/pull/4222)
+- Fixed avatar flashing issues by [@jrgarciadev](https://github.com/jrgarciadev) and [@rkkautsar](https://github.com/rkkautsar) in [PR #3987](https://github.com/heroui-inc/heroui/pull/3987) and [PR #3444](https://github.com/heroui-inc/heroui/pull/3444)
+- Fixed image ReferenceError in SSR by [@wingkwong](https://github.com/wingkwong) in [PR #4122](https://github.com/heroui-inc/heroui/pull/4122)
+- Fixed navigate parameters by [@wingkwong](https://github.com/wingkwong) in [PR #4163](https://github.com/heroui-inc/heroui/pull/4163)
+- Fixed missing peer / dev dependency for framer-motion by [@wingkwong](https://github.com/wingkwong) in [PR #4161](https://github.com/heroui-inc/heroui/pull/4161)
+- Fixed menu item classNames by [@winchesHe](https://github.com/winchesHe) in [PR #4156](https://github.com/heroui-inc/heroui/pull/4156)
+- Fixed controlled IsInvalid prop by [@chirokas](https://github.com/chirokas) in [PR #4082](https://github.com/heroui-inc/heroui/pull/4082)
+- Fixed inert value with boolean type for React 19 by [@wingkwong](https://github.com/wingkwong) in [PR #4039](https://github.com/heroui-inc/heroui/pull/4039)
+- Fixed typecheck errors by [@wingkwong](https://github.com/wingkwong) in [PR #4171](https://github.com/heroui-inc/heroui/pull/4171)
+- Fixed tw nested group by [@wingkwong](https://github.com/wingkwong) in [PR #3909](https://github.com/heroui-inc/heroui/pull/3909)
+- Fixed select styles consistent with input by [@macci001](https://github.com/macci001) in [PR #3881](https://github.com/heroui-inc/heroui/pull/3881)
+- Fixed missing li tag when href is specified by [@macci001](https://github.com/macci001) in [PR #4168](https://github.com/heroui-inc/heroui/pull/4168)
+- Fixed sliding issue caused by the helper wrapper by [@mstfblci](https://github.com/mstfblci) in [PR #3966](https://github.com/heroui-inc/heroui/pull/3966)
+- Fixed element.ref warning in React 19 by [@jrgarciadev](https://github.com/jrgarciadev) in [PR #4003](https://github.com/heroui-inc/heroui/pull/4003)
+- Fixed image load on NextJS by [@jrgarciadev](https://github.com/jrgarciadev) in [PR #3998](https://github.com/heroui-inc/heroui/pull/3998)
+- Fixed squish textarea label by [@Peterl561](https://github.com/Peterl561) in [PR #4197](https://github.com/heroui-inc/heroui/pull/4197)
+- Fixed forwardRef render functions by [@winchesHe](https://github.com/winchesHe) in [PR #4198](https://github.com/heroui-inc/heroui/pull/4198)
+- Fixed collection based components ref by [@jrgarciadev](https://github.com/jrgarciadev) in [PR #4207](https://github.com/heroui-inc/heroui/pull/4207)
+- Fixed data-slot for select error message by [@jubar](https://github.com/jubar) in [PR #4214](https://github.com/heroui-inc/heroui/pull/4214)
+- Fixed selection functionality on touch by [@macci001](https://github.com/macci001) in [PR #4220](https://github.com/heroui-inc/heroui/pull/4220)
+- Fixed cursor position when hidden on init by [@Peterl561](https://github.com/Peterl561) in [PR #4222](https://github.com/heroui-inc/heroui/pull/4222)
 
 **Enhancements**:
 
-- Automatically focus first non-disabled item by [@juliesaia](https://github.com/juliesaia) in [PR #2186](https://github.com/frontio-ai/heroui/pull/2186)
-- Refactored RTL-specific styles by [@macci001](https://github.com/macci001) in [PR #3868](https://github.com/frontio-ai/heroui/pull/3868)
-- Upgraded React Aria and Support NextJS 15 by [@ryo-manba](https://github.com/ryo-manba) in [PR #3732](https://github.com/frontio-ai/heroui/pull/3732)
-- Upgraded tailwind-merge version by [@wingkwong](https://github.com/wingkwong) in [PR #3657](https://github.com/frontio-ai/heroui/pull/3657)
-- Upgraded Storybook to v8 by [@winchesHe](https://github.com/winchesHe) in [PR #3946](https://github.com/frontio-ai/heroui/pull/3946)
-- Optimized performance by [@wingkwong](https://github.com/wingkwong) in [PR #3523](https://github.com/frontio-ai/heroui/pull/3523)
-- Applied `useMenu` and `useMenuItem` from `@react-aria` by [@wingkwong](https://github.com/wingkwong) in [PR #3261](https://github.com/frontio-ai/heroui/pull/3261)
-- Revised label font size for lg by [@wingkwong](https://github.com/wingkwong) in [PR #4141](https://github.com/frontio-ai/heroui/pull/4141)
-- Improved Form component by [@jrgarciadev](https://github.com/jrgarciadev) in [PR #4224](https://github.com/frontio-ai/heroui/pull/4224)
+- Automatically focus first non-disabled item by [@juliesaia](https://github.com/juliesaia) in [PR #2186](https://github.com/heroui-inc/heroui/pull/2186)
+- Refactored RTL-specific styles by [@macci001](https://github.com/macci001) in [PR #3868](https://github.com/heroui-inc/heroui/pull/3868)
+- Upgraded React Aria and Support NextJS 15 by [@ryo-manba](https://github.com/ryo-manba) in [PR #3732](https://github.com/heroui-inc/heroui/pull/3732)
+- Upgraded tailwind-merge version by [@wingkwong](https://github.com/wingkwong) in [PR #3657](https://github.com/heroui-inc/heroui/pull/3657)
+- Upgraded Storybook to v8 by [@winchesHe](https://github.com/winchesHe) in [PR #3946](https://github.com/heroui-inc/heroui/pull/3946)
+- Optimized performance by [@wingkwong](https://github.com/wingkwong) in [PR #3523](https://github.com/heroui-inc/heroui/pull/3523)
+- Applied `useMenu` and `useMenuItem` from `@react-aria` by [@wingkwong](https://github.com/wingkwong) in [PR #3261](https://github.com/heroui-inc/heroui/pull/3261)
+- Revised label font size for lg by [@wingkwong](https://github.com/wingkwong) in [PR #4141](https://github.com/heroui-inc/heroui/pull/4141)
+- Improved Form component by [@jrgarciadev](https://github.com/jrgarciadev) in [PR #4224](https://github.com/heroui-inc/heroui/pull/4224)
 
 **Chore**:
 
-- Added git hook to auto update dependencies by [@winchesHe](https://github.com/winchesHe) in [PR #3365](https://github.com/frontio-ai/heroui/pull/3365)
-- Added pre-release workflow by [@wingkwong](https://github.com/wingkwong) in [PR #2910](https://github.com/frontio-ai/heroui/pull/2910)
-- Updated testing libraries by [@ryo-manba](https://github.com/ryo-manba) in [PR #3886](https://github.com/frontio-ai/heroui/pull/3886)
-- Replaced VA by Posthog by [@wingkwong](https://github.com/wingkwong) in [PR #4123](https://github.com/frontio-ai/heroui/pull/4123)
-- Moved circular-progress tv to progress by [@winchesHe](https://github.com/winchesHe) in [PR #3321](https://github.com/frontio-ai/heroui/pull/3321)
+- Added git hook to auto update dependencies by [@winchesHe](https://github.com/winchesHe) in [PR #3365](https://github.com/heroui-inc/heroui/pull/3365)
+- Added pre-release workflow by [@wingkwong](https://github.com/wingkwong) in [PR #2910](https://github.com/heroui-inc/heroui/pull/2910)
+- Updated testing libraries by [@ryo-manba](https://github.com/ryo-manba) in [PR #3886](https://github.com/heroui-inc/heroui/pull/3886)
+- Replaced VA by Posthog by [@wingkwong](https://github.com/wingkwong) in [PR #4123](https://github.com/heroui-inc/heroui/pull/4123)
+- Moved circular-progress tv to progress by [@winchesHe](https://github.com/winchesHe) in [PR #3321](https://github.com/heroui-inc/heroui/pull/3321)
 
 Special thanks to NextUI Team members [@wingkwong](https://github.com/wingkwong), [@macci001](https://github.com/macci001), [@vinroger](https://github.com/vinroger),
 [@ryo-manba](https://github.com/ryo-manba), [@winchesHe](https://github.com/winchesHe), [@tianenpang](https://github.com/tianenpang) and contributors for their contributions to this release.
 
-For a full list of changes, please refer to the [release notes](https://github.com/frontio-ai/heroui/releases/tag/%40nextui-org%2Freact%402.6.2).
+For a full list of changes, please refer to the [release notes](https://github.com/heroui-inc/heroui/releases/tag/%40nextui-org%2Freact%402.6.2).
 
 <Spacer y={6} />
 
@@ -769,4 +769,4 @@ Whether it's a feature request, bug report, or a project to showcase, please get
 
 ## Contributing
 
-PR's on HeroUI are always welcome, please see our [contribution guidelines](https://github.com/frontio-ai/heroui/blob/main/CONTRIBUTING.md) to learn how you can contribute to this project.
+PR's on HeroUI are always welcome, please see our [contribution guidelines](https://github.com/heroui-inc/heroui/blob/main/CONTRIBUTING.md) to learn how you can contribute to this project.
diff --git a/apps/docs/content/components/card/divider.raw.jsx b/apps/docs/content/components/card/divider.raw.jsx
index 4105118892..ffe3977068 100644
--- a/apps/docs/content/components/card/divider.raw.jsx
+++ b/apps/docs/content/components/card/divider.raw.jsx
@@ -22,7 +22,7 @@ export default function App() {
       </CardBody>
       <Divider />
       <CardFooter>
-        <Link isExternal showAnchorIcon href="https://github.com/frontio-ai/heroui">
+        <Link isExternal showAnchorIcon href="https://github.com/heroui-inc/heroui">
           Visit source code on GitHub.
         </Link>
       </CardFooter>
diff --git a/apps/docs/content/components/link/custom-anchor-icon.raw.jsx b/apps/docs/content/components/link/custom-anchor-icon.raw.jsx
index 1a98176ea1..32309543e1 100644
--- a/apps/docs/content/components/link/custom-anchor-icon.raw.jsx
+++ b/apps/docs/content/components/link/custom-anchor-icon.raw.jsx
@@ -29,7 +29,7 @@ export default function App() {
       isExternal
       showAnchorIcon
       anchorIcon={<AnchorIcon />}
-      href="https://github.com/frontio-ai/heroui"
+      href="https://github.com/heroui-inc/heroui"
     >
       Custom Icon
     </Link>
diff --git a/apps/docs/content/components/link/external.raw.jsx b/apps/docs/content/components/link/external.raw.jsx
index f306e79599..853e140562 100644
--- a/apps/docs/content/components/link/external.raw.jsx
+++ b/apps/docs/content/components/link/external.raw.jsx
@@ -3,10 +3,10 @@ import {Link} from "@heroui/react";
 export default function App() {
   return (
     <div className="flex gap-4">
-      <Link isExternal href="https://github.com/frontio-ai/heroui">
+      <Link isExternal href="https://github.com/heroui-inc/heroui">
         External Link
       </Link>
-      <Link isExternal showAnchorIcon href="https://github.com/frontio-ai/heroui">
+      <Link isExternal showAnchorIcon href="https://github.com/heroui-inc/heroui">
         External Link Anchor
       </Link>
     </div>
diff --git a/apps/docs/content/components/link/polymorphic.raw.jsx b/apps/docs/content/components/link/polymorphic.raw.jsx
index 29aae7d071..eb665150e5 100644
--- a/apps/docs/content/components/link/polymorphic.raw.jsx
+++ b/apps/docs/content/components/link/polymorphic.raw.jsx
@@ -6,7 +6,7 @@ export default function App() {
       showAnchorIcon
       as={Link}
       color="primary"
-      href="https://github.com/frontio-ai/heroui"
+      href="https://github.com/heroui-inc/heroui"
       variant="solid"
     >
       Button Link
diff --git a/apps/docs/content/docs/customization/dark-mode.mdx b/apps/docs/content/docs/customization/dark-mode.mdx
index 6ef146816b..a2c3132249 100644
--- a/apps/docs/content/docs/customization/dark-mode.mdx
+++ b/apps/docs/content/docs/customization/dark-mode.mdx
@@ -188,7 +188,7 @@ export const ThemeSwitcher = () => {
 ## Using use-theme hook
 
 In case you're using plain React with [Vite](/docs/frameworks/vite) or [Create React App](https://create-react-app.dev/) 
-you can use the [@heroui/use-theme](https://github.com/frontio-ai/heroui/tree/canary/packages/hooks/use-theme) hook to switch between themes.
+you can use the [@heroui/use-theme](https://github.com/heroui-inc/heroui/tree/canary/packages/hooks/use-theme) hook to switch between themes.
 
 <Steps> 
 
diff --git a/apps/docs/content/docs/frameworks/laravel.mdx b/apps/docs/content/docs/frameworks/laravel.mdx
index d7613f320d..3cf163c88c 100644
--- a/apps/docs/content/docs/frameworks/laravel.mdx
+++ b/apps/docs/content/docs/frameworks/laravel.mdx
@@ -25,10 +25,10 @@ If you are starting a new project, you can run one of the following commands to
 
 <PackageManagers
   commands={{
-    npm: 'npx create-laravel@latest --template https://github.com/frontio-ai/laravel-template',
-    yarn: 'yarn create laravel --template https://github.com/frontio-ai/laravel-template',
-    pnpm: 'pnpm create laravel --template https://github.com/frontio-ai/laravel-template',
-    bun: 'bunx create-laravel@latest --template https://github.com/frontio-ai/laravel-template',
+    npm: 'npx create-laravel@latest --template https://github.com/heroui-inc/laravel-template',
+    yarn: 'yarn create laravel --template https://github.com/heroui-inc/laravel-template',
+    pnpm: 'pnpm create laravel --template https://github.com/heroui-inc/laravel-template',
+    bun: 'bunx create-laravel@latest --template https://github.com/heroui-inc/laravel-template',
   }}
 />
 
diff --git a/apps/docs/content/docs/frameworks/nextjs.mdx b/apps/docs/content/docs/frameworks/nextjs.mdx
index 4732f588e1..9b6fde3809 100644
--- a/apps/docs/content/docs/frameworks/nextjs.mdx
+++ b/apps/docs/content/docs/frameworks/nextjs.mdx
@@ -50,10 +50,10 @@ If you are starting a new project, you can run one of the following commands to
 
 <PackageManagers
   commands={{
-    npm: 'npx create-next-app -e https://github.com/frontio-ai/next-app-template',
-    yarn: 'yarn create next-app -e https://github.com/frontio-ai/next-app-template',
-    pnpm: 'pnpm create next-app -e https://github.com/frontio-ai/next-app-template',
-    bun: 'bunx create-next-app -e https://github.com/frontio-ai/next-app-template'
+    npm: 'npx create-next-app -e https://github.com/heroui-inc/next-app-template',
+    yarn: 'yarn create next-app -e https://github.com/heroui-inc/next-app-template',
+    pnpm: 'pnpm create next-app -e https://github.com/heroui-inc/next-app-template',
+    bun: 'bunx create-next-app -e https://github.com/heroui-inc/next-app-template'
   }}
 />
 
diff --git a/apps/docs/content/docs/frameworks/remix.mdx b/apps/docs/content/docs/frameworks/remix.mdx
index fc92e78830..0fe04b6618 100644
--- a/apps/docs/content/docs/frameworks/remix.mdx
+++ b/apps/docs/content/docs/frameworks/remix.mdx
@@ -23,10 +23,10 @@ If you are starting a new project, you can run one of the following commands to
 
 <PackageManagers
   commands={{
-    npm: 'npx create-remix@latest --template https://github.com/frontio-ai/remix-template',
-    yarn: 'yarn create remix --template https://github.com/frontio-ai/remix-template',
-    pnpm: 'pnpm create remix --template https://github.com/frontio-ai/remix-template',
-    bun: 'bunx create-remix@latest --template https://github.com/frontio-ai/remix-template',
+    npm: 'npx create-remix@latest --template https://github.com/heroui-inc/remix-template',
+    yarn: 'yarn create remix --template https://github.com/heroui-inc/remix-template',
+    pnpm: 'pnpm create remix --template https://github.com/heroui-inc/remix-template',
+    bun: 'bunx create-remix@latest --template https://github.com/heroui-inc/remix-template',
   }}
 />
 
diff --git a/apps/docs/content/docs/frameworks/vite.mdx b/apps/docs/content/docs/frameworks/vite.mdx
index 94a4a55605..002aaf7966 100644
--- a/apps/docs/content/docs/frameworks/vite.mdx
+++ b/apps/docs/content/docs/frameworks/vite.mdx
@@ -37,10 +37,10 @@ If you are starting a new project, you can run one of the following commands to
 
 <PackageManagers
   commands={{
-    npm: 'npx degit https://github.com/frontio-ai/vite-template my-vite-app',
-    yarn: 'yarn dlx degit https://github.com/frontio-ai/vite-template my-vite-app',
-    pnpm: 'pnpm dlx degit https://github.com/frontio-ai/vite-template my-vite-app',
-    bun: 'bunx degit https://github.com/frontio-ai/vite-template my-vite-app',
+    npm: 'npx degit https://github.com/heroui-inc/vite-template my-vite-app',
+    yarn: 'yarn dlx degit https://github.com/heroui-inc/vite-template my-vite-app',
+    pnpm: 'pnpm dlx degit https://github.com/heroui-inc/vite-template my-vite-app',
+    bun: 'bunx degit https://github.com/heroui-inc/vite-template my-vite-app',
   }}
 />
 
diff --git a/apps/docs/content/docs/guide/introduction.mdx b/apps/docs/content/docs/guide/introduction.mdx
index 8712610a4e..debb8fb0bc 100644
--- a/apps/docs/content/docs/guide/introduction.mdx
+++ b/apps/docs/content/docs/guide/introduction.mdx
@@ -109,7 +109,7 @@ Whether it's a feature request, bug report, or a project to showcase, please get
 
 ## Contributing
 
-PRs on **HeroUI** are always welcome, please see our [contribution guidelines](https://github.com/frontio-ai/heroui/blob/main/CONTRIBUTING.md) to learn how you can contribute to this project.
+PRs on **HeroUI** are always welcome, please see our [contribution guidelines](https://github.com/heroui-inc/heroui/blob/main/CONTRIBUTING.md) to learn how you can contribute to this project.
 
 <Spacer y={4}/>
 
diff --git a/apps/docs/content/docs/guide/nextui-to-heroui.mdx b/apps/docs/content/docs/guide/nextui-to-heroui.mdx
index d20585f931..da5c88e8d6 100644
--- a/apps/docs/content/docs/guide/nextui-to-heroui.mdx
+++ b/apps/docs/content/docs/guide/nextui-to-heroui.mdx
@@ -189,4 +189,4 @@ Join our Discord community in the **#nextui-to-heroui** channel [https://discord
 
 ---
 
-If you encounter any issues during migration, please [open an issue](https://github.com/frontio-ai/heroui/issues) on our GitHub repository.
+If you encounter any issues during migration, please [open an issue](https://github.com/heroui-inc/heroui/issues) on our GitHub repository.
diff --git a/apps/docs/libs/github/constants.ts b/apps/docs/libs/github/constants.ts
index d0302a9a04..7b0d89982f 100644
--- a/apps/docs/libs/github/constants.ts
+++ b/apps/docs/libs/github/constants.ts
@@ -6,7 +6,7 @@ export const GITHUB_API_URL = "https://api.github.com";
 
 export const RAW_GITHUB_URL = "https://raw.githubusercontent.com";
 
-export const REPO_NAME = "frontio-ai/heroui";
+export const REPO_NAME = "heroui-inc/heroui";
 
 export const ISSUE_REPORT_URL = `${GITHUB_URL}/${REPO_NAME}/issues/new?assignees=&labels=bug&template=bug_report.yml&title=%5BBUG%5D+-+`;
 
diff --git a/apps/docs/scripts/update-github-info.ts b/apps/docs/scripts/update-github-info.ts
index 3c882dac14..705c294f13 100644
--- a/apps/docs/scripts/update-github-info.ts
+++ b/apps/docs/scripts/update-github-info.ts
@@ -21,7 +21,7 @@ interface GithubInfo {
 
 async function getGithubInfo() {
   try {
-    const response = await fetch('https://api.github.com/repos/frontio-ai/heroui');
+    const response = await fetch('https://api.github.com/repos/heroui-inc/heroui');
     const data = await response.json() as any;
 
     const githubInfo: GithubInfo = {
diff --git a/package.json b/package.json
index 62144e1c00..397012039e 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/frontio-ai/heroui"
+    "url": "https://github.com/heroui-inc/heroui"
   },
   "scripts": {
     "dev": "pnpm sb",
diff --git a/packages/components/accordion/package.json b/packages/components/accordion/package.json
index 62aaab4db8..3d4ac81ad2 100644
--- a/packages/components/accordion/package.json
+++ b/packages/components/accordion/package.json
@@ -24,11 +24,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/components/accordion"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/components/alert/package.json b/packages/components/alert/package.json
index a65233be9d..f25d343b12 100644
--- a/packages/components/alert/package.json
+++ b/packages/components/alert/package.json
@@ -22,11 +22,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/components/alert"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/components/autocomplete/package.json b/packages/components/autocomplete/package.json
index 7e79275bf8..97666f9b6d 100644
--- a/packages/components/autocomplete/package.json
+++ b/packages/components/autocomplete/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/components/autocomplete"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/components/autocomplete/src/use-autocomplete.ts b/packages/components/autocomplete/src/use-autocomplete.ts
index 03a212a6d5..d014f18d51 100644
--- a/packages/components/autocomplete/src/use-autocomplete.ts
+++ b/packages/components/autocomplete/src/use-autocomplete.ts
@@ -430,7 +430,7 @@ export function useAutocomplete<T extends object>(originalProps: UseAutocomplete
     } as ButtonProps);
 
   // prevent use-input's useFormValidation hook from overwriting use-autocomplete's useFormValidation hook when there are uncommitted validation errors
-  // see https://github.com/frontio-ai/heroui/pull/4452
+  // see https://github.com/heroui-inc/heroui/pull/4452
   const hasUncommittedValidation =
     validationBehavior === "native" &&
     state.displayValidation.isInvalid === false &&
diff --git a/packages/components/avatar/package.json b/packages/components/avatar/package.json
index 961089dcb9..683ca509b3 100644
--- a/packages/components/avatar/package.json
+++ b/packages/components/avatar/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/components/avatar"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/components/badge/package.json b/packages/components/badge/package.json
index 90b2e1b904..fe7191af99 100644
--- a/packages/components/badge/package.json
+++ b/packages/components/badge/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/components/badge"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/components/breadcrumbs/package.json b/packages/components/breadcrumbs/package.json
index a56640fe91..0c65d23d28 100644
--- a/packages/components/breadcrumbs/package.json
+++ b/packages/components/breadcrumbs/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/components/breadcrumbs"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/components/button/package.json b/packages/components/button/package.json
index 11dbbf7f7e..5742addd9f 100644
--- a/packages/components/button/package.json
+++ b/packages/components/button/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/components/button"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/components/calendar/package.json b/packages/components/calendar/package.json
index 72bb5e1111..ee712fe3db 100644
--- a/packages/components/calendar/package.json
+++ b/packages/components/calendar/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/components/calendar"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/components/card/package.json b/packages/components/card/package.json
index cb14376a0b..a8f50f4534 100644
--- a/packages/components/card/package.json
+++ b/packages/components/card/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/components/card"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/components/card/stories/card.stories.tsx b/packages/components/card/stories/card.stories.tsx
index bd5e9b8c7a..be91f21300 100644
--- a/packages/components/card/stories/card.stories.tsx
+++ b/packages/components/card/stories/card.stories.tsx
@@ -118,7 +118,7 @@ const WithFooterTemplate = (args: CardProps) => (
       <p>Make beautiful websites regardless of your design experience.</p>
     </CardBody>
     <CardFooter>
-      <Link isExternal showAnchorIcon href="https://github.com/frontio-ai/heroui">
+      <Link isExternal showAnchorIcon href="https://github.com/heroui-inc/heroui">
         Visit source code on GitHub.
       </Link>
     </CardFooter>
diff --git a/packages/components/checkbox/package.json b/packages/components/checkbox/package.json
index 58a608c2ed..334a0a0c3f 100644
--- a/packages/components/checkbox/package.json
+++ b/packages/components/checkbox/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/components/checkbox"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/components/chip/package.json b/packages/components/chip/package.json
index 96f89f4cae..89a68cd19e 100644
--- a/packages/components/chip/package.json
+++ b/packages/components/chip/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/components/chip"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/components/code/package.json b/packages/components/code/package.json
index a2aa3d99ff..1b85f9206b 100644
--- a/packages/components/code/package.json
+++ b/packages/components/code/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/components/code"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/components/date-input/package.json b/packages/components/date-input/package.json
index bb176f7d82..00ed6bad1b 100644
--- a/packages/components/date-input/package.json
+++ b/packages/components/date-input/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/components/date-input"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/components/date-picker/package.json b/packages/components/date-picker/package.json
index 7ea9c9815e..55e742d3ab 100644
--- a/packages/components/date-picker/package.json
+++ b/packages/components/date-picker/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/components/date-picker"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/components/divider/package.json b/packages/components/divider/package.json
index 2ab549a9bd..780e8469a8 100644
--- a/packages/components/divider/package.json
+++ b/packages/components/divider/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/components/divider"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/components/drawer/package.json b/packages/components/drawer/package.json
index 4495741ae5..6c7d18ada9 100644
--- a/packages/components/drawer/package.json
+++ b/packages/components/drawer/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/components/drawer"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/components/dropdown/package.json b/packages/components/dropdown/package.json
index a903d7057a..029ea38605 100644
--- a/packages/components/dropdown/package.json
+++ b/packages/components/dropdown/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/components/dropdown"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/components/form/package.json b/packages/components/form/package.json
index 031fddf2de..af34851baa 100644
--- a/packages/components/form/package.json
+++ b/packages/components/form/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/components/form"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/components/image/package.json b/packages/components/image/package.json
index 588322b9af..28d6ae4576 100644
--- a/packages/components/image/package.json
+++ b/packages/components/image/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/components/image"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/components/input-otp/package.json b/packages/components/input-otp/package.json
index 57b614445d..ff51cc4c1c 100644
--- a/packages/components/input-otp/package.json
+++ b/packages/components/input-otp/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/components/input-otp"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/components/input/package.json b/packages/components/input/package.json
index b3793cdf03..91954afb9f 100644
--- a/packages/components/input/package.json
+++ b/packages/components/input/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/components/input"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/components/kbd/package.json b/packages/components/kbd/package.json
index 752714242f..da5b5de559 100644
--- a/packages/components/kbd/package.json
+++ b/packages/components/kbd/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/components/kbd"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/components/link/package.json b/packages/components/link/package.json
index 5617c1fca9..7cd4ac9303 100644
--- a/packages/components/link/package.json
+++ b/packages/components/link/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/components/link"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/components/listbox/package.json b/packages/components/listbox/package.json
index d6163418a5..4bb156f20b 100644
--- a/packages/components/listbox/package.json
+++ b/packages/components/listbox/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/components/listbox"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/components/listbox/src/use-listbox-item.ts b/packages/components/listbox/src/use-listbox-item.ts
index 5236981e68..cb9abd7237 100644
--- a/packages/components/listbox/src/use-listbox-item.ts
+++ b/packages/components/listbox/src/use-listbox-item.ts
@@ -65,7 +65,7 @@ export function useListboxItem<T extends object>(originalProps: UseListboxItemPr
 
   if (deprecatedOnClick && typeof deprecatedOnClick === "function") {
     warn(
-      "onClick is deprecated, please use onPress instead. See: https://github.com/frontio-ai/heroui/issues/4292",
+      "onClick is deprecated, please use onPress instead. See: https://github.com/heroui-inc/heroui/issues/4292",
       "ListboxItem",
     );
   }
diff --git a/packages/components/menu/package.json b/packages/components/menu/package.json
index 1affa74b37..80c6b085ce 100644
--- a/packages/components/menu/package.json
+++ b/packages/components/menu/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/components/menu"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/components/menu/src/use-menu-item.ts b/packages/components/menu/src/use-menu-item.ts
index dfdb65d2d3..5bba999ef0 100644
--- a/packages/components/menu/src/use-menu-item.ts
+++ b/packages/components/menu/src/use-menu-item.ts
@@ -79,7 +79,7 @@ export function useMenuItem<T extends object>(originalProps: UseMenuItemProps<T>
 
   if (deprecatedOnClick && typeof deprecatedOnClick === "function") {
     warn(
-      "onClick is deprecated, please use onPress instead. See: https://github.com/frontio-ai/heroui/issues/4292",
+      "onClick is deprecated, please use onPress instead. See: https://github.com/heroui-inc/heroui/issues/4292",
       "MenuItem",
     );
   }
diff --git a/packages/components/modal/package.json b/packages/components/modal/package.json
index 36edff9304..8288d84528 100644
--- a/packages/components/modal/package.json
+++ b/packages/components/modal/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/components/modal"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/components/navbar/package.json b/packages/components/navbar/package.json
index ff2741724e..22130f1254 100644
--- a/packages/components/navbar/package.json
+++ b/packages/components/navbar/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/components/navbar"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/components/pagination/package.json b/packages/components/pagination/package.json
index 36edc7df75..467b4dab5e 100644
--- a/packages/components/pagination/package.json
+++ b/packages/components/pagination/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/components/pagination"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/components/popover/package.json b/packages/components/popover/package.json
index 7c5910799a..f03e2a02f6 100644
--- a/packages/components/popover/package.json
+++ b/packages/components/popover/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/components/popover"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/components/progress/package.json b/packages/components/progress/package.json
index e1f59c72f1..92f0a25540 100644
--- a/packages/components/progress/package.json
+++ b/packages/components/progress/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/components/progress"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/components/radio/package.json b/packages/components/radio/package.json
index f4c61532f5..e77f2f5602 100644
--- a/packages/components/radio/package.json
+++ b/packages/components/radio/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/components/radio"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/components/ripple/package.json b/packages/components/ripple/package.json
index 6868b5e8ee..ddef262557 100644
--- a/packages/components/ripple/package.json
+++ b/packages/components/ripple/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/components/ripple"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/components/scroll-shadow/package.json b/packages/components/scroll-shadow/package.json
index c2f8b551de..911814bc10 100644
--- a/packages/components/scroll-shadow/package.json
+++ b/packages/components/scroll-shadow/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/components/scroll-shadow"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/components/select/package.json b/packages/components/select/package.json
index d0b2ff95ba..5dd86b9e9d 100644
--- a/packages/components/select/package.json
+++ b/packages/components/select/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/components/select"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/components/skeleton/package.json b/packages/components/skeleton/package.json
index a776cc6a59..6ceb812c55 100644
--- a/packages/components/skeleton/package.json
+++ b/packages/components/skeleton/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/components/skeleton"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/components/slider/package.json b/packages/components/slider/package.json
index abb650137e..8374de1ab6 100644
--- a/packages/components/slider/package.json
+++ b/packages/components/slider/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/components/slider"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/components/snippet/package.json b/packages/components/snippet/package.json
index 9c0947418c..d067be55c4 100644
--- a/packages/components/snippet/package.json
+++ b/packages/components/snippet/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/components/snippet"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/components/spacer/package.json b/packages/components/spacer/package.json
index 93e274632e..09e16032a9 100644
--- a/packages/components/spacer/package.json
+++ b/packages/components/spacer/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/components/spacer"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/components/spinner/package.json b/packages/components/spinner/package.json
index e5a8e0a5db..251af1c5d8 100644
--- a/packages/components/spinner/package.json
+++ b/packages/components/spinner/package.json
@@ -20,11 +20,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/components/loading"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/components/switch/package.json b/packages/components/switch/package.json
index e6be67505e..d366fc62a4 100644
--- a/packages/components/switch/package.json
+++ b/packages/components/switch/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/components/switch"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/components/table/package.json b/packages/components/table/package.json
index 2cf327fe90..ad2e5ffac2 100644
--- a/packages/components/table/package.json
+++ b/packages/components/table/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/components/table"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/components/tabs/package.json b/packages/components/tabs/package.json
index 26a3a57ecf..461bdd299f 100644
--- a/packages/components/tabs/package.json
+++ b/packages/components/tabs/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/components/tabs"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/components/tooltip/package.json b/packages/components/tooltip/package.json
index 4a825d0666..cb97c8af01 100644
--- a/packages/components/tooltip/package.json
+++ b/packages/components/tooltip/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/components/tooltip"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/components/user/package.json b/packages/components/user/package.json
index 266540d5dd..20b31a1de2 100644
--- a/packages/components/user/package.json
+++ b/packages/components/user/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/components/user"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/core/react/package.json b/packages/core/react/package.json
index d3b0e50703..3a0953689f 100644
--- a/packages/core/react/package.json
+++ b/packages/core/react/package.json
@@ -23,11 +23,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/core/react"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup --dts",
diff --git a/packages/core/system-rsc/package.json b/packages/core/system-rsc/package.json
index a4771ae129..7e3cc4b49c 100644
--- a/packages/core/system-rsc/package.json
+++ b/packages/core/system-rsc/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/core/system-rsc"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/core/system/package.json b/packages/core/system/package.json
index 588af8df18..b133e0d3d3 100644
--- a/packages/core/system/package.json
+++ b/packages/core/system/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/core/system"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src !src/extend-variants.d.ts --dts",
diff --git a/packages/core/theme/package.json b/packages/core/theme/package.json
index 209f61768f..c4d776db50 100644
--- a/packages/core/theme/package.json
+++ b/packages/core/theme/package.json
@@ -30,11 +30,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/core/theme"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/hooks/use-aria-accordion-item/package.json b/packages/hooks/use-aria-accordion-item/package.json
index 8989486a36..954bff545c 100644
--- a/packages/hooks/use-aria-accordion-item/package.json
+++ b/packages/hooks/use-aria-accordion-item/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/hooks/use-aria-accordion-item"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/hooks/use-aria-accordion/package.json b/packages/hooks/use-aria-accordion/package.json
index 4aae783b10..0918a018c2 100644
--- a/packages/hooks/use-aria-accordion/package.json
+++ b/packages/hooks/use-aria-accordion/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/hooks/use-aria-accordion"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/hooks/use-aria-accordion/src/use-accordion.ts b/packages/hooks/use-aria-accordion/src/use-accordion.ts
index 3ae43271c9..af420a6443 100644
--- a/packages/hooks/use-aria-accordion/src/use-accordion.ts
+++ b/packages/hooks/use-aria-accordion/src/use-accordion.ts
@@ -33,7 +33,7 @@ export function useReactAriaAccordion<T>(
     ref,
   });
 
-  // Fix: https://github.com/frontio-ai/heroui/issues/1608 & https://github.com/frontio-ai/heroui/issues/1405
+  // Fix: https://github.com/heroui-inc/heroui/issues/1608 & https://github.com/heroui-inc/heroui/issues/1405
   // Remove onKeyDownCapture from listProps to prevent it from removing spacebar support for
   // inner elements as the Input, this event provides typeahead support for the list, but we
   // don't need it for the accordion.
diff --git a/packages/hooks/use-aria-button/package.json b/packages/hooks/use-aria-button/package.json
index e630b04030..14423de374 100644
--- a/packages/hooks/use-aria-button/package.json
+++ b/packages/hooks/use-aria-button/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/hooks/use-aria-button"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/hooks/use-aria-button/src/index.ts b/packages/hooks/use-aria-button/src/index.ts
index b908724177..374b7b38f4 100644
--- a/packages/hooks/use-aria-button/src/index.ts
+++ b/packages/hooks/use-aria-button/src/index.ts
@@ -106,7 +106,7 @@ export function useAriaButton(
 
   if (deprecatedOnClick && typeof deprecatedOnClick === "function") {
     warn(
-      "onClick is deprecated, please use onPress instead. See: https://github.com/frontio-ai/heroui/issues/4292",
+      "onClick is deprecated, please use onPress instead. See: https://github.com/heroui-inc/heroui/issues/4292",
       "useButton",
     );
   }
@@ -115,7 +115,7 @@ export function useAriaButton(
     // On mobile devices, we need to call onClick directly since react-aria's usePress hook
     // only supports onPress events as of https://github.com/adobe/react-spectrum/commit/1d5def8a
     // This ensures backwards compatibility for onClick handlers on mobile
-    // See: https://github.com/frontio-ai/heroui/issues/4292
+    // See: https://github.com/heroui-inc/heroui/issues/4292
     if (isMobile) {
       deprecatedOnClick?.(e as unknown as React.MouseEvent<HTMLButtonElement>);
     }
diff --git a/packages/hooks/use-aria-link/package.json b/packages/hooks/use-aria-link/package.json
index acd9ac1482..3f9c23878b 100644
--- a/packages/hooks/use-aria-link/package.json
+++ b/packages/hooks/use-aria-link/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/hooks/use-aria-link"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/hooks/use-aria-link/src/index.ts b/packages/hooks/use-aria-link/src/index.ts
index 1bec675d8a..2d862bd6f1 100644
--- a/packages/hooks/use-aria-link/src/index.ts
+++ b/packages/hooks/use-aria-link/src/index.ts
@@ -66,7 +66,7 @@ export function useAriaLink(props: AriaLinkOptions, ref: RefObject<FocusableElem
 
   if (deprecatedOnClick && typeof deprecatedOnClick === "function" && role !== "button") {
     warn(
-      "onClick is deprecated, please use onPress instead. See: https://github.com/frontio-ai/heroui/issues/4292",
+      "onClick is deprecated, please use onPress instead. See: https://github.com/heroui-inc/heroui/issues/4292",
       "useLink",
     );
   }
@@ -75,7 +75,7 @@ export function useAriaLink(props: AriaLinkOptions, ref: RefObject<FocusableElem
     // On mobile devices, we need to call onClick directly since react-aria's usePress hook
     // only supports onPress events as of https://github.com/adobe/react-spectrum/commit/1d5def8a
     // This ensures backwards compatibility for onClick handlers on mobile
-    // See: https://github.com/frontio-ai/heroui/issues/4292
+    // See: https://github.com/heroui-inc/heroui/issues/4292
     if (isMobile) {
       deprecatedOnClick?.(e as unknown as React.MouseEvent<HTMLAnchorElement>);
     }
diff --git a/packages/hooks/use-aria-modal-overlay/package.json b/packages/hooks/use-aria-modal-overlay/package.json
index 27886438d6..fce27c93ba 100644
--- a/packages/hooks/use-aria-modal-overlay/package.json
+++ b/packages/hooks/use-aria-modal-overlay/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/hooks/use-aria-modal-overlay"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/hooks/use-aria-multiselect/package.json b/packages/hooks/use-aria-multiselect/package.json
index 06a6f45f0a..e98ab7114d 100644
--- a/packages/hooks/use-aria-multiselect/package.json
+++ b/packages/hooks/use-aria-multiselect/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/hooks/use-aria-multiselect"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/hooks/use-callback-ref/package.json b/packages/hooks/use-callback-ref/package.json
index 90bbcbde58..f3d323eb02 100644
--- a/packages/hooks/use-callback-ref/package.json
+++ b/packages/hooks/use-callback-ref/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/hooks/use-callback-ref"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/hooks/use-clipboard/package.json b/packages/hooks/use-clipboard/package.json
index 45dc1b3138..0eff3fc8dc 100644
--- a/packages/hooks/use-clipboard/package.json
+++ b/packages/hooks/use-clipboard/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/hooks/use-clipboard"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/hooks/use-data-scroll-overflow/package.json b/packages/hooks/use-data-scroll-overflow/package.json
index ee41a7aea0..2e0e6db10e 100644
--- a/packages/hooks/use-data-scroll-overflow/package.json
+++ b/packages/hooks/use-data-scroll-overflow/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/hooks/use-data-scroll-overflow"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/hooks/use-disclosure/package.json b/packages/hooks/use-disclosure/package.json
index f1532206a3..19f9fc9c30 100644
--- a/packages/hooks/use-disclosure/package.json
+++ b/packages/hooks/use-disclosure/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/hooks/use-disclosure"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/hooks/use-draggable/package.json b/packages/hooks/use-draggable/package.json
index d026894c98..7509670860 100644
--- a/packages/hooks/use-draggable/package.json
+++ b/packages/hooks/use-draggable/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/hooks/use-draggable"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/hooks/use-image/package.json b/packages/hooks/use-image/package.json
index 689fd8d1b1..95e888263a 100644
--- a/packages/hooks/use-image/package.json
+++ b/packages/hooks/use-image/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/hooks/use-image"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/hooks/use-infinite-scroll/package.json b/packages/hooks/use-infinite-scroll/package.json
index 48537b725c..da8b3aefce 100644
--- a/packages/hooks/use-infinite-scroll/package.json
+++ b/packages/hooks/use-infinite-scroll/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/hooks/use-infinite-scroll"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/hooks/use-intersection-observer/package.json b/packages/hooks/use-intersection-observer/package.json
index 0edf37b3a6..6a01e188ae 100644
--- a/packages/hooks/use-intersection-observer/package.json
+++ b/packages/hooks/use-intersection-observer/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/hooks/use-intersection-observer"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/hooks/use-is-mobile/package.json b/packages/hooks/use-is-mobile/package.json
index 3d0ca1315c..c117b7d8ef 100644
--- a/packages/hooks/use-is-mobile/package.json
+++ b/packages/hooks/use-is-mobile/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/hooks/use-is-mobile"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/hooks/use-is-mounted/package.json b/packages/hooks/use-is-mounted/package.json
index e0c06c7996..27f9046425 100644
--- a/packages/hooks/use-is-mounted/package.json
+++ b/packages/hooks/use-is-mounted/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/hooks/use-is-mounted"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/hooks/use-measure/package.json b/packages/hooks/use-measure/package.json
index f5a6e83aa5..1002120116 100644
--- a/packages/hooks/use-measure/package.json
+++ b/packages/hooks/use-measure/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/hooks/use-measure"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/hooks/use-pagination/package.json b/packages/hooks/use-pagination/package.json
index 1498fe9165..63a1384bf4 100644
--- a/packages/hooks/use-pagination/package.json
+++ b/packages/hooks/use-pagination/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/hooks/use-pagination"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/hooks/use-real-shape/package.json b/packages/hooks/use-real-shape/package.json
index 85911e4585..490059b17b 100644
--- a/packages/hooks/use-real-shape/package.json
+++ b/packages/hooks/use-real-shape/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/hooks/use-real-shape"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/hooks/use-ref-state/package.json b/packages/hooks/use-ref-state/package.json
index 046cde2ad4..182e7a2cf3 100644
--- a/packages/hooks/use-ref-state/package.json
+++ b/packages/hooks/use-ref-state/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/hooks/use-ref-state"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/hooks/use-resize/package.json b/packages/hooks/use-resize/package.json
index 7be550bad8..ec9bd48f84 100644
--- a/packages/hooks/use-resize/package.json
+++ b/packages/hooks/use-resize/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/hooks/use-resize"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/hooks/use-safe-layout-effect/package.json b/packages/hooks/use-safe-layout-effect/package.json
index afdde22504..b7248f619a 100644
--- a/packages/hooks/use-safe-layout-effect/package.json
+++ b/packages/hooks/use-safe-layout-effect/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/hooks/use-safe-layout-effect"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/hooks/use-scroll-position/package.json b/packages/hooks/use-scroll-position/package.json
index 3e8b193e15..8f240bbf87 100644
--- a/packages/hooks/use-scroll-position/package.json
+++ b/packages/hooks/use-scroll-position/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/hooks/use-scroll-position"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/hooks/use-ssr/package.json b/packages/hooks/use-ssr/package.json
index ee5bfa64c0..1dda8a31d7 100644
--- a/packages/hooks/use-ssr/package.json
+++ b/packages/hooks/use-ssr/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/hooks/use-ssr"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/hooks/use-theme/package.json b/packages/hooks/use-theme/package.json
index 01fd119a4c..fb27103009 100644
--- a/packages/hooks/use-theme/package.json
+++ b/packages/hooks/use-theme/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/hooks/use-theme"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/hooks/use-update-effect/package.json b/packages/hooks/use-update-effect/package.json
index 24911bc614..a931591900 100644
--- a/packages/hooks/use-update-effect/package.json
+++ b/packages/hooks/use-update-effect/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/hooks/use-update-effect"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/storybook/.storybook/welcome.mdx b/packages/storybook/.storybook/welcome.mdx
index 11bf9e03cb..c1adaa51bb 100644
--- a/packages/storybook/.storybook/welcome.mdx
+++ b/packages/storybook/.storybook/welcome.mdx
@@ -48,7 +48,7 @@ import {link, button} from "@heroui/theme";
       </svg>
     </a>
     <a
-      href="https://github.com/frontio-ai/heroui"
+      href="https://github.com/heroui-inc/heroui"
       target="_blank"
       className={button({
         color: "default",
diff --git a/packages/storybook/package.json b/packages/storybook/package.json
index e16dcce3d0..1554c3f34c 100644
--- a/packages/storybook/package.json
+++ b/packages/storybook/package.json
@@ -19,11 +19,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/components/storybook"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "dev": "pnpm storybook dev -p 6006",
diff --git a/packages/utilities/aria-utils/package.json b/packages/utilities/aria-utils/package.json
index d9a1a10ee0..14fb45938d 100644
--- a/packages/utilities/aria-utils/package.json
+++ b/packages/utilities/aria-utils/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/utilities/aria-utils"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/utilities/dom-animation/package.json b/packages/utilities/dom-animation/package.json
index 0c61a48b05..e0b4d00988 100644
--- a/packages/utilities/dom-animation/package.json
+++ b/packages/utilities/dom-animation/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/utilities/dom-animation"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/utilities/framer-utils/package.json b/packages/utilities/framer-utils/package.json
index f5e110639d..872100a258 100644
--- a/packages/utilities/framer-utils/package.json
+++ b/packages/utilities/framer-utils/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/utilities/framer-utils"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/utilities/react-rsc-utils/package.json b/packages/utilities/react-rsc-utils/package.json
index b6c460ab5c..f649899d92 100644
--- a/packages/utilities/react-rsc-utils/package.json
+++ b/packages/utilities/react-rsc-utils/package.json
@@ -22,11 +22,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/utilities/react-rsc-utils"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/utilities/react-utils/package.json b/packages/utilities/react-utils/package.json
index 75104925b0..a3678ee598 100644
--- a/packages/utilities/react-utils/package.json
+++ b/packages/utilities/react-utils/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/utilities/react-utils"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/utilities/shared-icons/package.json b/packages/utilities/shared-icons/package.json
index 7fe7fbde82..bf4618dc09 100644
--- a/packages/utilities/shared-icons/package.json
+++ b/packages/utilities/shared-icons/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/utilities/icons-utils"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/utilities/shared-utils/package.json b/packages/utilities/shared-utils/package.json
index 259fc987be..778049aa74 100644
--- a/packages/utilities/shared-utils/package.json
+++ b/packages/utilities/shared-utils/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/core/system"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/utilities/stories-utils/package.json b/packages/utilities/stories-utils/package.json
index ab1ac1922f..be881f6090 100644
--- a/packages/utilities/stories-utils/package.json
+++ b/packages/utilities/stories-utils/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/utilities/stories-utils"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/packages/utilities/test-utils/package.json b/packages/utilities/test-utils/package.json
index 0336cca590..feb64e7f9d 100644
--- a/packages/utilities/test-utils/package.json
+++ b/packages/utilities/test-utils/package.json
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/utilities/test-utils"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/plop/component/README.md.hbs b/plop/component/README.md.hbs
index f31cb89581..7abb83b69f 100644
--- a/plop/component/README.md.hbs
+++ b/plop/component/README.md.hbs
@@ -15,10 +15,10 @@ npm i @heroui/{{componentName}}
 ## Contribution
 
 Yes please! See the
-[contributing guidelines](https://github.com/frontio-ai/heroui/blob/master/CONTRIBUTING.md)
+[contributing guidelines](https://github.com/heroui-inc/heroui/blob/master/CONTRIBUTING.md)
 for details.
 
 ## License
 
 This project is licensed under the terms of the
-[MIT license](https://github.com/frontio-ai/heroui/blob/master/LICENSE).
+[MIT license](https://github.com/heroui-inc/heroui/blob/master/LICENSE).
diff --git a/plop/component/package.json.hbs b/plop/component/package.json.hbs
index ba88149c10..4e170b37f0 100644
--- a/plop/component/package.json.hbs
+++ b/plop/component/package.json.hbs
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/{{outDir}}/{{componentName}}"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/plop/hook/README.md.hbs b/plop/hook/README.md.hbs
index 805f4d850b..3399ea8ac0 100644
--- a/plop/hook/README.md.hbs
+++ b/plop/hook/README.md.hbs
@@ -15,10 +15,10 @@ npm i @heroui/{{hookName}}
 ## Contribution
 
 Yes please! See the
-[contributing guidelines](https://github.com/frontio-ai/heroui/blob/master/CONTRIBUTING.md)
+[contributing guidelines](https://github.com/heroui-inc/heroui/blob/master/CONTRIBUTING.md)
 for details.
 
 ## License
 
 This project is licensed under the terms of the
-[MIT license](https://github.com/frontio-ai/heroui/blob/master/LICENSE).
+[MIT license](https://github.com/heroui-inc/heroui/blob/master/LICENSE).
diff --git a/plop/hook/package.json.hbs b/plop/hook/package.json.hbs
index 162fa744fb..295c1f2c74 100644
--- a/plop/hook/package.json.hbs
+++ b/plop/hook/package.json.hbs
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/{{outDir}}/{{hookName}}"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",
diff --git a/plop/package/README.md.hbs b/plop/package/README.md.hbs
index c892cb9b7d..f83ae0a33e 100644
--- a/plop/package/README.md.hbs
+++ b/plop/package/README.md.hbs
@@ -15,10 +15,10 @@ npm i @heroui/{{packageName}}
 ## Contribution
 
 Yes please! See the
-[contributing guidelines](https://github.com/frontio-ai/heroui/blob/master/CONTRIBUTING.md)
+[contributing guidelines](https://github.com/heroui-inc/heroui/blob/master/CONTRIBUTING.md)
 for details.
 
 ## License
 
 This project is licensed under the terms of the
-[MIT license](https://github.com/frontio-ai/heroui/blob/master/LICENSE).
+[MIT license](https://github.com/heroui-inc/heroui/blob/master/LICENSE).
diff --git a/plop/package/package.json.hbs b/plop/package/package.json.hbs
index d13597d1ed..89dd8ff698 100644
--- a/plop/package/package.json.hbs
+++ b/plop/package/package.json.hbs
@@ -18,11 +18,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/frontio-ai/heroui.git",
+    "url": "git+https://github.com/heroui-inc/heroui.git",
     "directory": "packages/{{outDir}}/{{packageName}}"
   },
   "bugs": {
-    "url": "https://github.com/frontio-ai/heroui/issues"
+    "url": "https://github.com/heroui-inc/heroui/issues"
   },
   "scripts": {
     "build": "tsup src --dts",