diff --git a/.changeset/fair-worms-reflect.md b/.changeset/fair-worms-reflect.md
deleted file mode 100644
index a67ced2cc0..0000000000
--- a/.changeset/fair-worms-reflect.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-"@nextui-org/popover": patch
-"@nextui-org/tooltip": patch
----
-
-rollback PR3307. rescheduled to v2.5.0.
diff --git a/.changeset/silent-ads-mix.md b/.changeset/silent-ads-mix.md
deleted file mode 100644
index c63ff68c00..0000000000
--- a/.changeset/silent-ads-mix.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@nextui-org/theme": patch
----
-
-remove tw nested group (rollback PR3658)
diff --git a/packages/components/autocomplete/CHANGELOG.md b/packages/components/autocomplete/CHANGELOG.md
index d2d3df93c5..57b721261f 100644
--- a/packages/components/autocomplete/CHANGELOG.md
+++ b/packages/components/autocomplete/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @nextui-org/autocomplete
 
+## 2.1.7
+
+### Patch Changes
+
+- Updated dependencies [[`4c01d1824`](https://github.com/nextui-org/nextui/commit/4c01d1824d4dde22d89232968a3a4c48fe04678f)]:
+  - @nextui-org/popover@2.1.29
+  - @nextui-org/button@2.0.38
+  - @nextui-org/input@2.2.5
+  - @nextui-org/listbox@2.1.26
+  - @nextui-org/scroll-shadow@2.1.20
+  - @nextui-org/spinner@2.0.34
+
 ## 2.1.6
 
 ### Patch Changes
diff --git a/packages/components/autocomplete/package.json b/packages/components/autocomplete/package.json
index aaf4d9b426..46d32ae394 100644
--- a/packages/components/autocomplete/package.json
+++ b/packages/components/autocomplete/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nextui-org/autocomplete",
-  "version": "2.1.6",
+  "version": "2.1.7",
   "description": "An autocomplete combines a text input with a listbox, allowing users to filter a list of options to items matching a query.",
   "keywords": [
     "autocomplete"
diff --git a/packages/components/date-picker/CHANGELOG.md b/packages/components/date-picker/CHANGELOG.md
index e375bc6c93..b9bc00fd4d 100644
--- a/packages/components/date-picker/CHANGELOG.md
+++ b/packages/components/date-picker/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @nextui-org/date-picker
 
+## 2.1.8
+
+### Patch Changes
+
+- Updated dependencies [[`4c01d1824`](https://github.com/nextui-org/nextui/commit/4c01d1824d4dde22d89232968a3a4c48fe04678f)]:
+  - @nextui-org/popover@2.1.29
+  - @nextui-org/button@2.0.38
+  - @nextui-org/calendar@2.0.12
+  - @nextui-org/date-input@2.1.4
+
 ## 2.1.7
 
 ### Patch Changes
diff --git a/packages/components/date-picker/package.json b/packages/components/date-picker/package.json
index a4ebcb8f4f..d2a4d6918e 100644
--- a/packages/components/date-picker/package.json
+++ b/packages/components/date-picker/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nextui-org/date-picker",
-  "version": "2.1.7",
+  "version": "2.1.8",
   "description": "A date picker combines a DateInput and a Calendar popover to allow users to enter or select a date and time value.",
   "keywords": [
     "date-picker"
diff --git a/packages/components/dropdown/CHANGELOG.md b/packages/components/dropdown/CHANGELOG.md
index 7c117d8ff8..483dcfde85 100644
--- a/packages/components/dropdown/CHANGELOG.md
+++ b/packages/components/dropdown/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @nextui-org/dropdown
 
+## 2.1.31
+
+### Patch Changes
+
+- Updated dependencies [[`4c01d1824`](https://github.com/nextui-org/nextui/commit/4c01d1824d4dde22d89232968a3a4c48fe04678f)]:
+  - @nextui-org/popover@2.1.29
+  - @nextui-org/menu@2.0.29
+
 ## 2.1.30
 
 ### Patch Changes
diff --git a/packages/components/dropdown/package.json b/packages/components/dropdown/package.json
index c31c63efb2..54bb6918a5 100644
--- a/packages/components/dropdown/package.json
+++ b/packages/components/dropdown/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nextui-org/dropdown",
-  "version": "2.1.30",
+  "version": "2.1.31",
   "description": "A dropdown displays a list of actions or options that a user can choose.",
   "keywords": [
     "dropdown"
diff --git a/packages/components/popover/CHANGELOG.md b/packages/components/popover/CHANGELOG.md
index 74b4dec1a9..1235d3f28f 100644
--- a/packages/components/popover/CHANGELOG.md
+++ b/packages/components/popover/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @nextui-org/popover
 
+## 2.1.29
+
+### Patch Changes
+
+- [#3756](https://github.com/nextui-org/nextui/pull/3756) [`4c01d1824`](https://github.com/nextui-org/nextui/commit/4c01d1824d4dde22d89232968a3a4c48fe04678f) Thanks [@wingkwong](https://github.com/wingkwong)! - rollback PR3307. rescheduled to v2.5.0.
+
+- Updated dependencies []:
+  - @nextui-org/button@2.0.38
+
 ## 2.1.28
 
 ### Patch Changes
diff --git a/packages/components/popover/package.json b/packages/components/popover/package.json
index 7879ca258b..69d0d43b43 100644
--- a/packages/components/popover/package.json
+++ b/packages/components/popover/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nextui-org/popover",
-  "version": "2.1.28",
+  "version": "2.1.29",
   "description": "A popover is an overlay element positioned relative to a trigger.",
   "keywords": [
     "popover"
diff --git a/packages/components/select/CHANGELOG.md b/packages/components/select/CHANGELOG.md
index a11f0be9e1..deeb5530ee 100644
--- a/packages/components/select/CHANGELOG.md
+++ b/packages/components/select/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @nextui-org/select
 
+## 2.2.7
+
+### Patch Changes
+
+- Updated dependencies [[`4c01d1824`](https://github.com/nextui-org/nextui/commit/4c01d1824d4dde22d89232968a3a4c48fe04678f)]:
+  - @nextui-org/popover@2.1.29
+  - @nextui-org/listbox@2.1.26
+  - @nextui-org/scroll-shadow@2.1.20
+  - @nextui-org/spinner@2.0.34
+
 ## 2.2.6
 
 ### Patch Changes
diff --git a/packages/components/select/package.json b/packages/components/select/package.json
index adddba9fe2..455c4748d6 100644
--- a/packages/components/select/package.json
+++ b/packages/components/select/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nextui-org/select",
-  "version": "2.2.6",
+  "version": "2.2.7",
   "description": "A select displays a collapsible list of options and allows a user to select one of them.",
   "keywords": [
     "select"
diff --git a/packages/components/slider/CHANGELOG.md b/packages/components/slider/CHANGELOG.md
index 002611db54..e8555a3ffc 100644
--- a/packages/components/slider/CHANGELOG.md
+++ b/packages/components/slider/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @nextui-org/slider
 
+## 2.2.17
+
+### Patch Changes
+
+- Updated dependencies [[`4c01d1824`](https://github.com/nextui-org/nextui/commit/4c01d1824d4dde22d89232968a3a4c48fe04678f)]:
+  - @nextui-org/tooltip@2.0.41
+
 ## 2.2.16
 
 ### Patch Changes
diff --git a/packages/components/slider/package.json b/packages/components/slider/package.json
index b2c25dfa52..82c4ae4273 100644
--- a/packages/components/slider/package.json
+++ b/packages/components/slider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nextui-org/slider",
-  "version": "2.2.16",
+  "version": "2.2.17",
   "description": "A slider allows a user to select one or more values within a range.",
   "keywords": [
     "slider"
diff --git a/packages/components/snippet/CHANGELOG.md b/packages/components/snippet/CHANGELOG.md
index 3932c235b6..578e8e8aba 100644
--- a/packages/components/snippet/CHANGELOG.md
+++ b/packages/components/snippet/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @nextui-org/snippet
 
+## 2.0.43
+
+### Patch Changes
+
+- Updated dependencies [[`4c01d1824`](https://github.com/nextui-org/nextui/commit/4c01d1824d4dde22d89232968a3a4c48fe04678f)]:
+  - @nextui-org/tooltip@2.0.41
+  - @nextui-org/button@2.0.38
+
 ## 2.0.42
 
 ### Patch Changes
diff --git a/packages/components/snippet/package.json b/packages/components/snippet/package.json
index 0ed0e24c94..3c1c876133 100644
--- a/packages/components/snippet/package.json
+++ b/packages/components/snippet/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nextui-org/snippet",
-  "version": "2.0.42",
+  "version": "2.0.43",
   "description": "Display a snippet of copyable code for the command line.",
   "keywords": [
     "snippet"
diff --git a/packages/components/tooltip/CHANGELOG.md b/packages/components/tooltip/CHANGELOG.md
index bbcd9e4268..afd04e6deb 100644
--- a/packages/components/tooltip/CHANGELOG.md
+++ b/packages/components/tooltip/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @nextui-org/tooltip
 
+## 2.0.41
+
+### Patch Changes
+
+- [#3756](https://github.com/nextui-org/nextui/pull/3756) [`4c01d1824`](https://github.com/nextui-org/nextui/commit/4c01d1824d4dde22d89232968a3a4c48fe04678f) Thanks [@wingkwong](https://github.com/wingkwong)! - rollback PR3307. rescheduled to v2.5.0.
+
 ## 2.0.40
 
 ### Patch Changes
diff --git a/packages/components/tooltip/package.json b/packages/components/tooltip/package.json
index 7c65b3ffbf..26c1ac2b93 100644
--- a/packages/components/tooltip/package.json
+++ b/packages/components/tooltip/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nextui-org/tooltip",
-  "version": "2.0.40",
+  "version": "2.0.41",
   "description": "A React Component for rendering dynamically positioned Tooltips",
   "keywords": [
     "tooltip"
diff --git a/packages/core/react/CHANGELOG.md b/packages/core/react/CHANGELOG.md
index ee0d96028b..062447cdd2 100644
--- a/packages/core/react/CHANGELOG.md
+++ b/packages/core/react/CHANGELOG.md
@@ -1,5 +1,52 @@
 # @nextui-org/react
 
+## 2.4.8
+
+### Patch Changes
+
+- Updated dependencies [[`4c01d1824`](https://github.com/nextui-org/nextui/commit/4c01d1824d4dde22d89232968a3a4c48fe04678f), [`5517a0578`](https://github.com/nextui-org/nextui/commit/5517a0578b5514cf2a4ddec53528d25d7f616cd0)]:
+  - @nextui-org/popover@2.1.29
+  - @nextui-org/tooltip@2.0.41
+  - @nextui-org/theme@2.2.11
+  - @nextui-org/autocomplete@2.1.7
+  - @nextui-org/date-picker@2.1.8
+  - @nextui-org/dropdown@2.1.31
+  - @nextui-org/select@2.2.7
+  - @nextui-org/breadcrumbs@2.0.13
+  - @nextui-org/slider@2.2.17
+  - @nextui-org/snippet@2.0.43
+  - @nextui-org/table@2.0.40
+  - @nextui-org/accordion@2.0.39
+  - @nextui-org/avatar@2.0.33
+  - @nextui-org/badge@2.0.32
+  - @nextui-org/button@2.0.38
+  - @nextui-org/calendar@2.0.12
+  - @nextui-org/card@2.0.34
+  - @nextui-org/checkbox@2.1.5
+  - @nextui-org/chip@2.0.33
+  - @nextui-org/code@2.0.33
+  - @nextui-org/date-input@2.1.4
+  - @nextui-org/divider@2.0.32
+  - @nextui-org/image@2.0.32
+  - @nextui-org/input@2.2.5
+  - @nextui-org/kbd@2.0.34
+  - @nextui-org/link@2.0.35
+  - @nextui-org/listbox@2.1.26
+  - @nextui-org/menu@2.0.29
+  - @nextui-org/modal@2.0.40
+  - @nextui-org/navbar@2.0.37
+  - @nextui-org/pagination@2.0.36
+  - @nextui-org/progress@2.0.34
+  - @nextui-org/radio@2.1.5
+  - @nextui-org/ripple@2.0.33
+  - @nextui-org/scroll-shadow@2.1.20
+  - @nextui-org/skeleton@2.0.32
+  - @nextui-org/spacer@2.0.33
+  - @nextui-org/spinner@2.0.34
+  - @nextui-org/switch@2.0.34
+  - @nextui-org/tabs@2.0.36
+  - @nextui-org/user@2.0.34
+
 ## 2.4.7
 
 ### Patch Changes
diff --git a/packages/core/react/package.json b/packages/core/react/package.json
index 0167e80eb3..1dbd682fd3 100644
--- a/packages/core/react/package.json
+++ b/packages/core/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nextui-org/react",
-  "version": "2.4.7",
+  "version": "2.4.8",
   "description": "🚀 Beautiful and modern React UI library.",
   "author": "Junior Garcia <jrgarciadev@gmail.com>",
   "homepage": "https://nextui.org",
diff --git a/packages/core/theme/CHANGELOG.md b/packages/core/theme/CHANGELOG.md
index 323daf8982..d165e2b5a3 100644
--- a/packages/core/theme/CHANGELOG.md
+++ b/packages/core/theme/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @nextui-org/theme
 
+## 2.2.11
+
+### Patch Changes
+
+- [#3754](https://github.com/nextui-org/nextui/pull/3754) [`5517a0578`](https://github.com/nextui-org/nextui/commit/5517a0578b5514cf2a4ddec53528d25d7f616cd0) Thanks [@wingkwong](https://github.com/wingkwong)! - remove tw nested group (rollback PR3658)
+
 ## 2.2.10
 
 ### Patch Changes
diff --git a/packages/core/theme/package.json b/packages/core/theme/package.json
index d667901d0a..316a7accbb 100644
--- a/packages/core/theme/package.json
+++ b/packages/core/theme/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nextui-org/theme",
-  "version": "2.2.10",
+  "version": "2.2.11",
   "description": "The default theme for NextUI components",
   "keywords": [
     "theme",