diff --git a/Cargo.lock b/Cargo.lock
index 22fda11..26582fe 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -20,12 +20,6 @@ version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f"
 
-[[package]]
-name = "autocfg"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
-
 [[package]]
 name = "bitflags"
 version = "2.6.0"
@@ -74,30 +68,55 @@ dependencies = [
 ]
 
 [[package]]
-name = "crossterm"
-version = "0.28.1"
+name = "darling"
+version = "0.20.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "829d955a0bb380ef178a640b91779e3987da38c9aea133b20614cfed8cdea9c6"
+checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989"
 dependencies = [
- "bitflags",
- "crossterm_winapi",
- "mio",
- "parking_lot",
- "rustix",
- "signal-hook",
- "signal-hook-mio",
- "winapi",
+ "darling_core",
+ "darling_macro",
+]
+
+[[package]]
+name = "darling_core"
+version = "0.20.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5"
+dependencies = [
+ "fnv",
+ "ident_case",
+ "proc-macro2",
+ "quote",
+ "strsim",
+ "syn",
 ]
 
 [[package]]
-name = "crossterm_winapi"
-version = "0.9.1"
+name = "darling_macro"
+version = "0.20.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b"
+checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
 dependencies = [
- "winapi",
+ "darling_core",
+ "quote",
+ "syn",
 ]
 
+[[package]]
+name = "deranged"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
+dependencies = [
+ "powerfmt",
+]
+
+[[package]]
+name = "diff"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
+
 [[package]]
 name = "dissimilar"
 version = "1.0.9"
@@ -117,14 +136,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
-name = "errno"
-version = "0.3.9"
+name = "fnv"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
-dependencies = [
- "libc",
- "windows-sys 0.52.0",
-]
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
 [[package]]
 name = "glob"
@@ -149,10 +164,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
 [[package]]
-name = "hermit-abi"
-version = "0.3.9"
+name = "ident_case"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
+checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 
 [[package]]
 name = "indexmap"
@@ -172,10 +187,14 @@ checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5"
 
 [[package]]
 name = "instability"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b23a0c8dfe501baac4adf6ebbfa6eddf8f0c07f56b058cc1288017e32397846c"
+checksum = "b829f37dead9dc39df40c2d3376c179fdfd2ac771f53f55d3c30dc096a3c0c6e"
 dependencies = [
+ "darling",
+ "indoc",
+ "pretty_assertions",
+ "proc-macro2",
  "quote",
  "syn",
 ]
@@ -197,32 +216,19 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
 
 [[package]]
 name = "libc"
-version = "0.2.155"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
-
-[[package]]
-name = "linux-raw-sys"
-version = "0.4.14"
+version = "0.2.166"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
+checksum = "c2ccc108bbc0b1331bd061864e7cd823c0cab660bbe6970e66e2c0614decde36"
 
 [[package]]
-name = "lock_api"
-version = "0.4.12"
+name = "line-clipping"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
+checksum = "76364bf78d7ed059f98564fc5fb94c5a6eb2b6c9edd621cb1528febe1e918b29"
 dependencies = [
- "autocfg",
- "scopeguard",
+ "bitflags",
 ]
 
-[[package]]
-name = "log"
-version = "0.4.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
-
 [[package]]
 name = "lru"
 version = "0.12.4"
@@ -239,16 +245,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
 [[package]]
-name = "mio"
-version = "1.0.1"
+name = "num-conv"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+
+[[package]]
+name = "num_threads"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4"
+checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9"
 dependencies = [
- "hermit-abi",
  "libc",
- "log",
- "wasi",
- "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -258,39 +266,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
-name = "parking_lot"
-version = "0.12.3"
+name = "paste"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
-dependencies = [
- "lock_api",
- "parking_lot_core",
-]
+checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
 
 [[package]]
-name = "parking_lot_core"
-version = "0.9.10"
+name = "powerfmt"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
-dependencies = [
- "cfg-if",
- "libc",
- "redox_syscall",
- "smallvec",
- "windows-targets",
-]
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
 
 [[package]]
-name = "paste"
-version = "1.0.15"
+name = "pretty_assertions"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
+checksum = "3ae130e2f271fbc2ac3a40fb1d07180839cdbbe443c7a27e1e3c13c5cac0116d"
+dependencies = [
+ "diff",
+ "yansi",
+]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.86"
+version = "1.0.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
 dependencies = [
  "unicode-ident",
 ]
@@ -305,55 +306,50 @@ dependencies = [
 ]
 
 [[package]]
-name = "ratatui"
-version = "0.29.0"
+name = "ratatui-core"
+version = "0.1.0-alpha.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eabd94c2f37801c20583fc49dd5cd6b0ba68c716787c2dd6ed18571e1e63117b"
+checksum = "e2425e6b9033821bed6d286418dfa5d455f7986726b68ed20212fd985f4c1958"
 dependencies = [
  "bitflags",
  "cassowary",
  "compact_str",
- "crossterm",
  "indoc",
- "instability",
  "itertools",
  "lru",
  "paste",
  "strum",
  "unicode-segmentation",
  "unicode-truncate",
- "unicode-width 0.2.0",
+ "unicode-width",
 ]
 
 [[package]]
 name = "ratatui-macros"
-version = "0.6.0"
+version = "0.7.0-alpha.0"
 dependencies = [
  "cargo-husky",
- "ratatui",
+ "ratatui-core",
+ "ratatui-widgets",
  "trybuild",
 ]
 
 [[package]]
-name = "redox_syscall"
-version = "0.5.3"
+name = "ratatui-widgets"
+version = "0.3.0-alpha.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
+checksum = "9457a5e5f4016f191c572b9a24a326215e0fbfb004c01223bbfd14d298e6496a"
 dependencies = [
  "bitflags",
-]
-
-[[package]]
-name = "rustix"
-version = "0.38.34"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
-dependencies = [
- "bitflags",
- "errno",
- "libc",
- "linux-raw-sys",
- "windows-sys 0.52.0",
+ "indoc",
+ "instability",
+ "itertools",
+ "line-clipping",
+ "ratatui-core",
+ "strum",
+ "time",
+ "unicode-segmentation",
+ "unicode-width",
 ]
 
 [[package]]
@@ -368,12 +364,6 @@ version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
 
-[[package]]
-name = "scopeguard"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
-
 [[package]]
 name = "serde"
 version = "1.0.205"
@@ -415,48 +405,18 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "signal-hook"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801"
-dependencies = [
- "libc",
- "signal-hook-registry",
-]
-
-[[package]]
-name = "signal-hook-mio"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd"
-dependencies = [
- "libc",
- "mio",
- "signal-hook",
-]
-
-[[package]]
-name = "signal-hook-registry"
-version = "1.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "smallvec"
-version = "1.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
-
 [[package]]
 name = "static_assertions"
 version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
+[[package]]
+name = "strsim"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+
 [[package]]
 name = "strum"
 version = "0.26.3"
@@ -505,6 +465,27 @@ dependencies = [
  "winapi-util",
 ]
 
+[[package]]
+name = "time"
+version = "0.3.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
+dependencies = [
+ "deranged",
+ "libc",
+ "num-conv",
+ "num_threads",
+ "powerfmt",
+ "serde",
+ "time-core",
+]
+
+[[package]]
+name = "time-core"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+
 [[package]]
 name = "toml"
 version = "0.8.19"
@@ -563,27 +544,21 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
 [[package]]
 name = "unicode-segmentation"
-version = "1.11.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
+checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
 
 [[package]]
 name = "unicode-truncate"
-version = "1.1.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3644627a5af5fa321c95b9b235a72fd24cd29c648c2c379431e6628655627bf"
+checksum = "8fbf03860ff438702f3910ca5f28f8dac63c1c11e7efb5012b8b175493606330"
 dependencies = [
  "itertools",
  "unicode-segmentation",
- "unicode-width 0.1.13",
+ "unicode-width",
 ]
 
-[[package]]
-name = "unicode-width"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
-
 [[package]]
 name = "unicode-width"
 version = "0.2.0"
@@ -596,50 +571,13 @@ version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 
-[[package]]
-name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
-
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
 [[package]]
 name = "winapi-util"
 version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
-[[package]]
-name = "windows-sys"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
-dependencies = [
- "windows-targets",
+ "windows-sys",
 ]
 
 [[package]]
@@ -724,6 +662,12 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "yansi"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"
+
 [[package]]
 name = "zerocopy"
 version = "0.7.35"
diff --git a/Cargo.toml b/Cargo.toml
index c16b203..59085ca 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ratatui-macros"
-version = "0.6.0"
+version = "0.7.0-alpha.0"
 edition = "2021"
 authors = ["The Ratatui Developers"]
 description = "Macros for Ratatui"
@@ -13,8 +13,8 @@ categories = ["command-line-interface"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-# requires alpha version of ratatui for the Into<Style> changes
-ratatui = "0.29.0"
+ratatui-core = "0.1.0-alpha.0"
+ratatui-widgets = "0.3.0-alpha.0"
 
 [dev-dependencies]
 trybuild = { version = "1.0.101", features = ["diff"] }
diff --git a/README.md b/README.md
index 47c50e4..c675cb2 100644
--- a/README.md
+++ b/README.md
@@ -45,7 +45,7 @@ If you are new to Ratatui, check out the [Layout concepts] article on the Ratatu
 Use the `constraints!` macro to define layout constraints:
 
 ```rust
-use ratatui::prelude::*;
+# use ratatui_core::layout::Constraint;
 use ratatui_macros::constraints;
 
 assert_eq!(
@@ -62,7 +62,7 @@ assert_eq!(
 ```
 
 ```rust
-use ratatui::prelude::*;
+# use ratatui_core::layout::Constraint;
 use ratatui_macros::constraints;
 
 assert_eq!(
@@ -79,7 +79,7 @@ assert_eq!(
 Use the `constraint!` macro to define individual constraints:
 
 ```rust
-use ratatui::prelude::*;
+# use ratatui_core::layout::Constraint;
 use ratatui_macros::constraint;
 
 assert_eq!(
@@ -91,7 +91,7 @@ assert_eq!(
 Create vertical and horizontal layouts using the `vertical!` and `horizontal!` macros:
 
 ```rust
-use ratatui::prelude::*;
+# use ratatui_core::layout::Rect;
 use ratatui_macros::{vertical, horizontal};
 
 let area = Rect { x: 0, y: 0, width: 10, height: 10 };
@@ -114,7 +114,7 @@ The `span!` macro create raw and styled `Span`s. They each take a format string
 `;` followed by the format string and arguments.
 
 ```rust
-use ratatui::prelude::*;
+# use ratatui_core::style::{Color, Modifier, Style, Stylize};
 use ratatui_macros::span;
 
 let name = "world!";
@@ -130,7 +130,6 @@ The `line!` macro creates a `Line` that contains a sequence of spans. It is simi
 macro.
 
 ```rust
-use ratatui::prelude::*;
 use ratatui_macros::line;
 
 let name = "world!";
@@ -144,7 +143,6 @@ The `text!` macro creates a `Text` that contains a sequence of lines. It is simi
 macro.
 
 ```rust
-use ratatui::prelude::*;
 use ratatui_macros::{span, line, text};
 
 let name = "world!";
@@ -155,7 +153,7 @@ let text = text!["bye"; 2];
 It is even possible to use `span!` and `line!` in the `text!` macro:
 
 ```rust
-use ratatui::prelude::*;
+# use ratatui_core::style::{Modifier, Stylize};
 use ratatui_macros::{span, line, text};
 let name = "Bye!!!";
 let text = text![line!["hello", "world".bold()], span!(Modifier::BOLD; "{name}")];
@@ -167,7 +165,6 @@ The `row!` macro creates a `Row` that contains a sequence of `Cell`. It is simil
 macro. A `Row` represents a sequence of `Cell`s in a single row of a table.
 
 ```rust
-use ratatui::prelude::*;
 use ratatui_macros::row;
 
 let rows = [
@@ -179,7 +176,7 @@ let rows = [
 It is even possible to use `span!`, `line!` and `text!` in the `row!` macro:
 
 ```rust
-use ratatui::prelude::*;
+# use ratatui_core::style::{Modifier, Stylize};
 use ratatui_macros::{span, line, text, row};
 let name = "Bye!!!";
 let text = row![text![line!["hello", "world".bold()]], span!(Modifier::BOLD; "{name}")];
diff --git a/src/layout.rs b/src/layout.rs
index 8087331..d543531 100644
--- a/src/layout.rs
+++ b/src/layout.rs
@@ -6,7 +6,7 @@
 /// # Examples
 ///
 /// ```
-/// # use ratatui::prelude::*;
+/// # use ratatui_core::layout::Constraint;
 /// use ratatui_macros::constraint;
 /// assert_eq!(constraint!(>= 3 + 4), Constraint::Min(7));
 /// assert_eq!(constraint!(<= 3 + 4), Constraint::Max(7));
@@ -18,22 +18,22 @@
 #[macro_export]
 macro_rules! constraint {
     (== $token:tt %) => {
-        ::ratatui::layout::Constraint::Percentage($token)
+        $crate::ratatui_core::layout::Constraint::Percentage($token)
     };
     (>= $expr:expr) => {
-        ::ratatui::layout::Constraint::Min($expr)
+        $crate::ratatui_core::layout::Constraint::Min($expr)
     };
     (<= $expr:expr) => {
-        ::ratatui::layout::Constraint::Max($expr)
+        $crate::ratatui_core::layout::Constraint::Max($expr)
     };
     (== $num:tt / $denom:tt) => {
-        ::ratatui::layout::Constraint::Ratio($num as u32, $denom as u32)
+        $crate::ratatui_core::layout::Constraint::Ratio($num as u32, $denom as u32)
     };
     (== $expr:expr) => {
-        ::ratatui::layout::Constraint::Length($expr)
+        $crate::ratatui_core::layout::Constraint::Length($expr)
     };
     (*= $expr:expr) => {
-        ::ratatui::layout::Constraint::Fill($expr)
+        $crate::ratatui_core::layout::Constraint::Fill($expr)
     };
 }
 
@@ -53,7 +53,7 @@ macro_rules! constraint {
 /// ```
 ///
 /// ```rust
-/// # use ratatui::prelude::*;
+/// # use ratatui_core::layout::Constraint;
 /// # use ratatui_macros::constraints;
 /// assert_eq!(
 ///     constraints![==50, ==30%, >=3, <=1, ==1/2, *=1],
@@ -171,7 +171,7 @@ macro_rules! constraints {
 #[macro_export]
 macro_rules! vertical {
     ($( $constraint:tt )+) => {
-        ::ratatui::layout::Layout::vertical($crate::constraints!( $($constraint)+ ))
+        $crate::ratatui_core::layout::Layout::vertical($crate::constraints!( $($constraint)+ ))
     };
 }
 
@@ -192,6 +192,6 @@ macro_rules! vertical {
 #[macro_export]
 macro_rules! horizontal {
     ($( $constraint:tt )+) => {
-        ::ratatui::layout::Layout::horizontal($crate::constraints!( $($constraint)+ ))
+        $crate::ratatui_core::layout::Layout::horizontal($crate::constraints!( $($constraint)+ ))
     };
 }
diff --git a/src/lib.rs b/src/lib.rs
index 827a822..fdf88ea 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -5,3 +5,6 @@ mod line;
 mod row;
 mod span;
 mod text;
+
+// Re-export the core crate to use the types in macros
+pub use ratatui_core;
diff --git a/src/line.rs b/src/line.rs
index 6dbe71f..c326c4a 100644
--- a/src/line.rs
+++ b/src/line.rs
@@ -7,7 +7,7 @@
 /// * Create a [`Line`] containing a vector of [`Span`]s:
 ///
 /// ```rust
-/// # use ratatui::prelude::*;
+/// # use ratatui_core::style::Stylize;
 /// use ratatui_macros::line;
 ///
 /// let line = line!["hello", "world"];
@@ -17,7 +17,6 @@
 /// * Create a [`Line`] from a given [`Span`] repeated some amount of times:
 ///
 /// ```rust
-/// # use ratatui::prelude::*;
 /// # use ratatui_macros::line;
 /// let line = line!["hello"; 2];
 /// ```
@@ -25,7 +24,7 @@
 /// * Use [`span!`] macro inside [`line!`] macro for formatting.
 ///
 /// ```rust
-/// # use ratatui::prelude::*;
+/// # use ratatui_core::style::Modifier;
 /// use ratatui_macros::{line, span};
 ///
 /// let line = line![span!("hello {}", "world"), span!(Modifier::BOLD; "goodbye {}", "world")];
@@ -36,13 +35,13 @@
 #[macro_export]
 macro_rules! line {
     () => {
-        ::ratatui::text::Line::default()
+        $crate::ratatui_core::text::Line::default()
     };
     ($span:expr; $n:expr) => {
-      ::ratatui::text::Line::from(vec![$span.into(); $n])
+      $crate::ratatui_core::text::Line::from(vec![$span.into(); $n])
     };
     ($($span:expr),+ $(,)?) => {{
-        ::ratatui::text::Line::from(vec![
+        $crate::ratatui_core::text::Line::from(vec![
         $(
             $span.into(),
         )+
@@ -52,7 +51,7 @@ macro_rules! line {
 
 #[cfg(test)]
 mod tests {
-    use ratatui::prelude::*;
+    use ratatui_core::text::{Line, Span};
 
     #[test]
     fn line_literal() {
diff --git a/src/row.rs b/src/row.rs
index c59a816..feb80c5 100644
--- a/src/row.rs
+++ b/src/row.rs
@@ -7,7 +7,7 @@
 /// * Create a [`Row`] containing a vector of [`Cell`]s:
 ///
 /// ```rust
-/// # use ratatui::prelude::*;
+/// # use ratatui_core::style::Stylize;
 /// use ratatui_macros::row;
 ///
 /// let row = row!["hello", "world"];
@@ -17,7 +17,6 @@
 /// * Create an empty [`Row`]:
 ///
 /// ```rust
-/// # use ratatui::prelude::*;
 /// # use ratatui_macros::row;
 /// let empty_row = row![];
 /// ```
@@ -25,7 +24,6 @@
 /// * Create a [`Row`] from a given [`Cell`] repeated some amount of times:
 ///
 /// ```rust
-/// # use ratatui::prelude::*;
 /// # use ratatui_macros::row;
 /// let row = row!["hello"; 2];
 /// ```
@@ -33,7 +31,7 @@
 /// * Use [`text!`], [`line!`] or [`span!`] macro inside [`row!`] macro.
 ///
 /// ```rust
-/// # use ratatui::prelude::*;
+/// # use ratatui_core::style::{Modifier};
 /// use ratatui_macros::{row, line, text, span};
 ///
 /// let row = row![
@@ -47,15 +45,15 @@
 #[macro_export]
 macro_rules! row {
     () => {
-        ::ratatui::widgets::Row::default()
+        ::ratatui_widgets::table::Row::default()
     };
     ($cell:expr; $n:expr) => {
-        ::ratatui::widgets::Row::new(vec![::ratatui::widgets::Cell::from($cell); $n])
+        ::ratatui_widgets::table::Row::new(vec![::ratatui_widgets::table::Cell::from($cell); $n])
     };
     ($($cell:expr),+ $(,)?) => {{
-        ::ratatui::widgets::Row::new(vec![
+        ::ratatui_widgets::table::Row::new(vec![
         $(
-            ::ratatui::widgets::Cell::from($cell),
+            ::ratatui_widgets::table::Cell::from($cell),
         )+
         ])
     }};
@@ -64,10 +62,8 @@ macro_rules! row {
 #[cfg(test)]
 mod tests {
 
-    use ratatui::{
-        text::Text,
-        widgets::{Cell, Row},
-    };
+    use ratatui_core::text::Text;
+    use ratatui_widgets::table::{Cell, Row};
 
     #[test]
     fn row_literal() {
@@ -127,15 +123,15 @@ mod tests {
             [
                 Row::new([
                     Cell::from("Find File"),
-                    Cell::from(Text::raw("ctrl+f").alignment(ratatui::layout::Alignment::Right)),
+                    Cell::from(Text::raw("ctrl+f").right_aligned()),
                 ]),
                 Row::new([
                     Cell::from("Open recent"),
-                    Cell::from(Text::raw("ctrl+r").alignment(ratatui::layout::Alignment::Right)),
+                    Cell::from(Text::raw("ctrl+r").right_aligned()),
                 ]),
                 Row::new([
                     Cell::from("Open config"),
-                    Cell::from(Text::raw("ctrl+k").alignment(ratatui::layout::Alignment::Right)),
+                    Cell::from(Text::raw("ctrl+k").right_aligned()),
                 ]),
             ]
         );
diff --git a/src/span.rs b/src/span.rs
index c69db94..1d25c9f 100644
--- a/src/span.rs
+++ b/src/span.rs
@@ -11,7 +11,7 @@
 /// # Examples
 ///
 /// ```rust
-/// # use ratatui::prelude::*;
+/// # use ratatui_core::style::{Color, Modifier, Style, Stylize};
 /// use ratatui_macros::span;
 ///
 /// let content = "content";
@@ -68,7 +68,7 @@
 /// But this will work:
 ///
 /// ```rust
-/// # use ratatui::prelude::*;
+/// # use ratatui_core::style::{Modifier};
 /// # use ratatui_macros::span;
 /// let span = span!(Modifier::BOLD; "hello world");
 /// ```
@@ -84,7 +84,6 @@
 /// But this will work:
 ///
 /// ```rust
-/// # use ratatui::prelude::*;
 /// # use ratatui_macros::span;
 /// let span = span!("hello {}", "world");
 /// ```
@@ -96,31 +95,34 @@
 #[macro_export]
 macro_rules! span {
     ($string:literal) => {
-        ::ratatui::text::Span::raw(format!($string))
+        $crate::ratatui_core::text::Span::raw(format!($string))
     };
     ($string:literal, $($arg:tt)*) => {
-        ::ratatui::text::Span::raw(format!($string, $($arg)*))
+        $crate::ratatui_core::text::Span::raw(format!($string, $($arg)*))
     };
     ($expr:expr) => {
-        ::ratatui::text::Span::raw(format!("{}", $expr))
+        $crate::ratatui_core::text::Span::raw(format!("{}", $expr))
     };
     ($style:expr, $($arg:tt)*) => {
         compile_error!("first parameter must be a formatting specifier followed by a comma OR a `Style` followed by a semicolon")
     };
     ($style:expr; $string:literal) => {
-        ::ratatui::text::Span::styled(format!($string), $style)
+        $crate::ratatui_core::text::Span::styled(format!($string), $style)
     };
     ($style:expr; $string:literal, $($arg:tt)*) => {
-        ::ratatui::text::Span::styled(format!($string, $($arg)*), $style)
+        $crate::ratatui_core::text::Span::styled(format!($string, $($arg)*), $style)
     };
     ($style:expr; $expr:expr) => {
-        ::ratatui::text::Span::styled(format!("{}", $expr), $style)
+        $crate::ratatui_core::text::Span::styled(format!("{}", $expr), $style)
     };
 }
 
 #[cfg(test)]
 mod tests {
-    use ratatui::prelude::*;
+    use ratatui_core::{
+        style::{Color, Modifier, Style, Stylize},
+        text::Span,
+    };
 
     #[test]
     fn raw() {
diff --git a/src/text.rs b/src/text.rs
index c6ab6bc..b206ecb 100644
--- a/src/text.rs
+++ b/src/text.rs
@@ -7,7 +7,7 @@
 /// * Create a [`Text`] containing a vector of [`Line`]s:
 ///
 /// ```rust
-/// # use ratatui::prelude::*;
+/// # use ratatui_core::style::Stylize;
 /// use ratatui_macros::text;
 ///
 /// let text = text!["hello", "world"];
@@ -17,7 +17,6 @@
 /// * Create a [`text`] from a given [`Line`] repeated some amount of times:
 ///
 /// ```rust
-/// # use ratatui::prelude::*;
 /// # use ratatui_macros::text;
 /// let text = text!["hello"; 2];
 /// ```
@@ -25,7 +24,7 @@
 /// * Use [`line!`] or [`span!`] macro inside [`text!`] macro.
 ///
 /// ```rust
-/// # use ratatui::prelude::*;
+/// # use ratatui_core::style::{Modifier};
 /// use ratatui_macros::{line, text, span};
 ///
 /// let text = text![line!["hello", "world"], span!(Modifier::BOLD; "goodbye {}", "world")];
@@ -37,13 +36,13 @@
 #[macro_export]
 macro_rules! text {
     () => {
-        ratatui::text::Text::default()
+        ratatui_core::text::Text::default()
     };
     ($line:expr; $n:expr) => {
-        ratatui::text::Text::from(vec![$line.into(); $n])
+        ratatui_core::text::Text::from(vec![$line.into(); $n])
     };
     ($($line:expr),+ $(,)?) => {{
-        ratatui::text::Text::from(vec![
+        ratatui_core::text::Text::from(vec![
         $(
             $line.into(),
         )+
@@ -53,7 +52,7 @@ macro_rules! text {
 
 #[cfg(test)]
 mod tests {
-    use ratatui::prelude::*;
+    use ratatui_core::text::Text;
 
     #[test]
     fn text() {
diff --git a/tests/macros.rs b/tests/macros.rs
index ab3ddcb..814242b 100644
--- a/tests/macros.rs
+++ b/tests/macros.rs
@@ -1,4 +1,4 @@
-use ratatui::prelude::*;
+use ratatui_core::layout::{Constraint, Rect};
 use ratatui_macros::{constraints, horizontal, vertical};
 
 #[test]
diff --git a/tests/ui/fails.rs b/tests/ui/fails.rs
index a7d734b..987e431 100644
--- a/tests/ui/fails.rs
+++ b/tests/ui/fails.rs
@@ -1,4 +1,4 @@
-use ratatui::prelude::*;
+use ratatui_core::layout::Constraint;
 use ratatui_macros::{constraints, span};
 
 fn main() {