diff --git a/Cargo.toml b/Cargo.toml
index 17833a1be..828076b23 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -46,7 +46,9 @@ edition         = "2024"
 license         = "Apache-2.0"
 repository      = "https://github.com/contextgeneric/cgp"
 authors         = ["Soares Chen <soares.chen@maybevoid.com>"]
-keywords        = ["cgp"]
+homepage        = "https://contextgeneric.dev"
+keywords        = ["cgp", "traits", "dsl", "dependency-injection", "macros"]
+categories      = ["rust-patterns", "no-std"]
 description     = "A language extension for Rust, with pluggable trait implementations at compile-time."
 
 [workspace.dependencies]
diff --git a/crates/core/cgp-base-types/Cargo.toml b/crates/core/cgp-base-types/Cargo.toml
index 25a5e53f1..8d8428e03 100644
--- a/crates/core/cgp-base-types/Cargo.toml
+++ b/crates/core/cgp-base-types/Cargo.toml
@@ -6,7 +6,9 @@ license      = { workspace = true }
 repository   = { workspace = true }
 authors      = { workspace = true }
 rust-version = { workspace = true }
+homepage     = { workspace = true }
 keywords     = { workspace = true }
+categories   = { workspace = true }
 description  = { workspace = true }
 
 [dependencies]
diff --git a/crates/core/cgp-component/Cargo.toml b/crates/core/cgp-component/Cargo.toml
index 32098b3f5..ac6546a68 100644
--- a/crates/core/cgp-component/Cargo.toml
+++ b/crates/core/cgp-component/Cargo.toml
@@ -6,7 +6,9 @@ license      = { workspace = true }
 repository   = { workspace = true }
 authors      = { workspace = true }
 rust-version = { workspace = true }
+homepage     = { workspace = true }
 keywords     = { workspace = true }
+categories   = { workspace = true }
 description  = { workspace = true }
 
 [dependencies]
diff --git a/crates/core/cgp-error/Cargo.toml b/crates/core/cgp-error/Cargo.toml
index e35d091f0..d35418b49 100644
--- a/crates/core/cgp-error/Cargo.toml
+++ b/crates/core/cgp-error/Cargo.toml
@@ -6,7 +6,9 @@ license      = { workspace = true }
 repository   = { workspace = true }
 authors      = { workspace = true }
 rust-version = { workspace = true }
+homepage     = { workspace = true }
 keywords     = { workspace = true }
+categories   = { workspace = true }
 description  = { workspace = true }
 
 [dependencies]
diff --git a/crates/core/cgp-field/Cargo.toml b/crates/core/cgp-field/Cargo.toml
index 295e2e48d..c7b6782eb 100644
--- a/crates/core/cgp-field/Cargo.toml
+++ b/crates/core/cgp-field/Cargo.toml
@@ -6,7 +6,9 @@ license      = { workspace = true }
 repository   = { workspace = true }
 authors      = { workspace = true }
 rust-version = { workspace = true }
+homepage     = { workspace = true }
 keywords     = { workspace = true }
+categories   = { workspace = true }
 description  = { workspace = true }
 
 [dependencies]
diff --git a/crates/core/cgp-type/Cargo.toml b/crates/core/cgp-type/Cargo.toml
index 952455eb1..1debbc201 100644
--- a/crates/core/cgp-type/Cargo.toml
+++ b/crates/core/cgp-type/Cargo.toml
@@ -6,7 +6,9 @@ license      = { workspace = true }
 repository   = { workspace = true }
 authors      = { workspace = true }
 rust-version = { workspace = true }
+homepage     = { workspace = true }
 keywords     = { workspace = true }
+categories   = { workspace = true }
 description  = { workspace = true }
 
 [dependencies]
diff --git a/crates/extra/cgp-dispatch/Cargo.toml b/crates/extra/cgp-dispatch/Cargo.toml
index 7b62513cc..890f3be37 100644
--- a/crates/extra/cgp-dispatch/Cargo.toml
+++ b/crates/extra/cgp-dispatch/Cargo.toml
@@ -6,7 +6,9 @@ license      = { workspace = true }
 repository   = { workspace = true }
 authors      = { workspace = true }
 rust-version = { workspace = true }
+homepage     = { workspace = true }
 keywords     = { workspace = true }
+categories   = { workspace = true }
 description  = { workspace = true }
 
 [dependencies]
diff --git a/crates/extra/cgp-error-extra/Cargo.toml b/crates/extra/cgp-error-extra/Cargo.toml
index 3b3f75d86..0a7dd9478 100644
--- a/crates/extra/cgp-error-extra/Cargo.toml
+++ b/crates/extra/cgp-error-extra/Cargo.toml
@@ -6,7 +6,9 @@ license      = { workspace = true }
 repository   = { workspace = true }
 authors      = { workspace = true }
 rust-version = { workspace = true }
+homepage     = { workspace = true }
 keywords     = { workspace = true }
+categories   = { workspace = true }
 description  = { workspace = true }
 
 [features]
diff --git a/crates/extra/cgp-field-extra/Cargo.toml b/crates/extra/cgp-field-extra/Cargo.toml
index 0523a868b..63d3ab114 100644
--- a/crates/extra/cgp-field-extra/Cargo.toml
+++ b/crates/extra/cgp-field-extra/Cargo.toml
@@ -6,7 +6,9 @@ license      = { workspace = true }
 repository   = { workspace = true }
 authors      = { workspace = true }
 rust-version = { workspace = true }
+homepage     = { workspace = true }
 keywords     = { workspace = true }
+categories   = { workspace = true }
 description  = { workspace = true }
 
 [dependencies]
diff --git a/crates/extra/cgp-handler/Cargo.toml b/crates/extra/cgp-handler/Cargo.toml
index 3bcd9305c..996aac6af 100644
--- a/crates/extra/cgp-handler/Cargo.toml
+++ b/crates/extra/cgp-handler/Cargo.toml
@@ -6,7 +6,9 @@ license      = { workspace = true }
 repository   = { workspace = true }
 authors      = { workspace = true }
 rust-version = { workspace = true }
+homepage     = { workspace = true }
 keywords     = { workspace = true }
+categories   = { workspace = true }
 description  = { workspace = true }
 
 [dependencies]
diff --git a/crates/extra/cgp-monad/Cargo.toml b/crates/extra/cgp-monad/Cargo.toml
index 28de24b3e..6bc246afa 100644
--- a/crates/extra/cgp-monad/Cargo.toml
+++ b/crates/extra/cgp-monad/Cargo.toml
@@ -6,7 +6,9 @@ license      = { workspace = true }
 repository   = { workspace = true }
 authors      = { workspace = true }
 rust-version = { workspace = true }
+homepage     = { workspace = true }
 keywords     = { workspace = true }
+categories   = { workspace = true }
 description  = { workspace = true }
 
 [dependencies]
diff --git a/crates/extra/cgp-run/Cargo.toml b/crates/extra/cgp-run/Cargo.toml
index 497e16278..599ded25f 100644
--- a/crates/extra/cgp-run/Cargo.toml
+++ b/crates/extra/cgp-run/Cargo.toml
@@ -6,7 +6,9 @@ license      = { workspace = true }
 repository   = { workspace = true }
 authors      = { workspace = true }
 rust-version = { workspace = true }
+homepage     = { workspace = true }
 keywords     = { workspace = true }
+categories   = { workspace = true }
 description  = { workspace = true }
 
 [dependencies]
diff --git a/crates/extra/cgp-runtime/Cargo.toml b/crates/extra/cgp-runtime/Cargo.toml
index cf884b2f3..1af1a45f7 100644
--- a/crates/extra/cgp-runtime/Cargo.toml
+++ b/crates/extra/cgp-runtime/Cargo.toml
@@ -6,7 +6,9 @@ license      = { workspace = true }
 repository   = { workspace = true }
 authors      = { workspace = true }
 rust-version = { workspace = true }
+homepage     = { workspace = true }
 keywords     = { workspace = true }
+categories   = { workspace = true }
 description  = { workspace = true }
 
 [dependencies]
diff --git a/crates/macros/cgp-async-macro/Cargo.toml b/crates/macros/cgp-async-macro/Cargo.toml
index c538ab167..20331cdb0 100644
--- a/crates/macros/cgp-async-macro/Cargo.toml
+++ b/crates/macros/cgp-async-macro/Cargo.toml
@@ -6,7 +6,9 @@ license      = { workspace = true }
 repository   = { workspace = true }
 authors      = { workspace = true }
 rust-version = { workspace = true }
+homepage     = { workspace = true }
 keywords     = { workspace = true }
+categories   = { workspace = true }
 description  = { workspace = true }
 
 [lib]
diff --git a/crates/macros/cgp-extra-macro-lib/Cargo.toml b/crates/macros/cgp-extra-macro-lib/Cargo.toml
index 14c3b75e4..412857a24 100644
--- a/crates/macros/cgp-extra-macro-lib/Cargo.toml
+++ b/crates/macros/cgp-extra-macro-lib/Cargo.toml
@@ -6,7 +6,9 @@ license      = { workspace = true }
 repository   = { workspace = true }
 authors      = { workspace = true }
 rust-version = { workspace = true }
+homepage     = { workspace = true }
 keywords     = { workspace = true }
+categories   = { workspace = true }
 description  = { workspace = true }
 
 [features]
diff --git a/crates/macros/cgp-extra-macro/Cargo.toml b/crates/macros/cgp-extra-macro/Cargo.toml
index 3f3cdda28..d72ee9e6c 100644
--- a/crates/macros/cgp-extra-macro/Cargo.toml
+++ b/crates/macros/cgp-extra-macro/Cargo.toml
@@ -6,7 +6,9 @@ license      = { workspace = true }
 repository   = { workspace = true }
 authors      = { workspace = true }
 rust-version = { workspace = true }
+homepage     = { workspace = true }
 keywords     = { workspace = true }
+categories   = { workspace = true }
 description  = { workspace = true }
 
 [lib]
diff --git a/crates/macros/cgp-macro-core/Cargo.toml b/crates/macros/cgp-macro-core/Cargo.toml
index d610e00f6..0a993aa3e 100644
--- a/crates/macros/cgp-macro-core/Cargo.toml
+++ b/crates/macros/cgp-macro-core/Cargo.toml
@@ -6,7 +6,9 @@ license      = { workspace = true }
 repository   = { workspace = true }
 authors      = { workspace = true }
 rust-version = { workspace = true }
+homepage     = { workspace = true }
 keywords     = { workspace = true }
+categories   = { workspace = true }
 description  = { workspace = true }
 
 [dependencies]
diff --git a/crates/macros/cgp-macro-lib/Cargo.toml b/crates/macros/cgp-macro-lib/Cargo.toml
index 1d3cde3aa..7bd7a4aae 100644
--- a/crates/macros/cgp-macro-lib/Cargo.toml
+++ b/crates/macros/cgp-macro-lib/Cargo.toml
@@ -6,7 +6,9 @@ license      = { workspace = true }
 repository   = { workspace = true }
 authors      = { workspace = true }
 rust-version = { workspace = true }
+homepage     = { workspace = true }
 keywords     = { workspace = true }
+categories   = { workspace = true }
 description  = { workspace = true }
 
 [dependencies]
diff --git a/crates/macros/cgp-macro-test-util-lib/Cargo.toml b/crates/macros/cgp-macro-test-util-lib/Cargo.toml
index 7510738de..ded4573b9 100644
--- a/crates/macros/cgp-macro-test-util-lib/Cargo.toml
+++ b/crates/macros/cgp-macro-test-util-lib/Cargo.toml
@@ -6,7 +6,9 @@ license      = { workspace = true }
 repository   = { workspace = true }
 authors      = { workspace = true }
 rust-version = { workspace = true }
+homepage     = { workspace = true }
 keywords     = { workspace = true }
+categories   = { workspace = true }
 description  = { workspace = true }
 
 [dependencies]
diff --git a/crates/macros/cgp-macro-test-util/Cargo.toml b/crates/macros/cgp-macro-test-util/Cargo.toml
index 1b845299b..d17deae3b 100644
--- a/crates/macros/cgp-macro-test-util/Cargo.toml
+++ b/crates/macros/cgp-macro-test-util/Cargo.toml
@@ -6,7 +6,9 @@ license      = { workspace = true }
 repository   = { workspace = true }
 authors      = { workspace = true }
 rust-version = { workspace = true }
+homepage     = { workspace = true }
 keywords     = { workspace = true }
+categories   = { workspace = true }
 description  = { workspace = true }
 
 [lib]
diff --git a/crates/macros/cgp-macro/Cargo.toml b/crates/macros/cgp-macro/Cargo.toml
index 6591ae01d..414b52f36 100644
--- a/crates/macros/cgp-macro/Cargo.toml
+++ b/crates/macros/cgp-macro/Cargo.toml
@@ -6,7 +6,9 @@ license      = { workspace = true }
 repository   = { workspace = true }
 authors      = { workspace = true }
 rust-version = { workspace = true }
+homepage     = { workspace = true }
 keywords     = { workspace = true }
+categories   = { workspace = true }
 description  = { workspace = true }
 
 [lib]
diff --git a/crates/main/cgp-base-extra/Cargo.toml b/crates/main/cgp-base-extra/Cargo.toml
index 665635ed7..3dbdd7974 100644
--- a/crates/main/cgp-base-extra/Cargo.toml
+++ b/crates/main/cgp-base-extra/Cargo.toml
@@ -6,7 +6,9 @@ license      = { workspace = true }
 repository   = { workspace = true }
 authors      = { workspace = true }
 rust-version = { workspace = true }
+homepage     = { workspace = true }
 keywords     = { workspace = true }
+categories   = { workspace = true }
 description  = { workspace = true }
 
 [dependencies]
diff --git a/crates/main/cgp-base/Cargo.toml b/crates/main/cgp-base/Cargo.toml
index ba06d9ff9..1ecf3dbab 100644
--- a/crates/main/cgp-base/Cargo.toml
+++ b/crates/main/cgp-base/Cargo.toml
@@ -6,7 +6,9 @@ license      = { workspace = true }
 repository   = { workspace = true }
 authors      = { workspace = true }
 rust-version = { workspace = true }
+homepage     = { workspace = true }
 keywords     = { workspace = true }
+categories   = { workspace = true }
 description  = { workspace = true }
 
 [dependencies]
diff --git a/crates/main/cgp-core/Cargo.toml b/crates/main/cgp-core/Cargo.toml
index 781befd42..a4ba1e8f2 100644
--- a/crates/main/cgp-core/Cargo.toml
+++ b/crates/main/cgp-core/Cargo.toml
@@ -6,7 +6,9 @@ license      = { workspace = true }
 repository   = { workspace = true }
 authors      = { workspace = true }
 rust-version = { workspace = true }
+homepage     = { workspace = true }
 keywords     = { workspace = true }
+categories   = { workspace = true }
 description  = { workspace = true }
 
 [dependencies]
diff --git a/crates/main/cgp-extra/Cargo.toml b/crates/main/cgp-extra/Cargo.toml
index 6c944a85b..911520391 100644
--- a/crates/main/cgp-extra/Cargo.toml
+++ b/crates/main/cgp-extra/Cargo.toml
@@ -6,7 +6,9 @@ license      = { workspace = true }
 repository   = { workspace = true }
 authors      = { workspace = true }
 rust-version = { workspace = true }
+homepage     = { workspace = true }
 keywords     = { workspace = true }
+categories   = { workspace = true }
 description  = { workspace = true }
 
 [features]
diff --git a/crates/main/cgp/Cargo.toml b/crates/main/cgp/Cargo.toml
index d5951418a..9372a7260 100644
--- a/crates/main/cgp/Cargo.toml
+++ b/crates/main/cgp/Cargo.toml
@@ -7,7 +7,9 @@ license      = { workspace = true }
 repository   = { workspace = true }
 authors      = { workspace = true }
 rust-version = { workspace = true }
+homepage     = { workspace = true }
 keywords     = { workspace = true }
+categories   = { workspace = true }
 description  = { workspace = true }
 
 [dependencies]
diff --git a/crates/tests/cgp-macro-tests/Cargo.toml b/crates/tests/cgp-macro-tests/Cargo.toml
index 3e0675455..5b95bbc9d 100644
--- a/crates/tests/cgp-macro-tests/Cargo.toml
+++ b/crates/tests/cgp-macro-tests/Cargo.toml
@@ -7,7 +7,9 @@ license      = { workspace = true }
 repository   = { workspace = true }
 authors      = { workspace = true }
 rust-version = { workspace = true }
+homepage     = { workspace = true }
 keywords     = { workspace = true }
+categories   = { workspace = true }
 description  = { workspace = true }
 
 [dependencies]
diff --git a/crates/tests/cgp-tests/Cargo.toml b/crates/tests/cgp-tests/Cargo.toml
index 2523341e9..d1fe9fe49 100644
--- a/crates/tests/cgp-tests/Cargo.toml
+++ b/crates/tests/cgp-tests/Cargo.toml
@@ -7,7 +7,9 @@ license      = { workspace = true }
 repository   = { workspace = true }
 authors      = { workspace = true }
 rust-version = { workspace = true }
+homepage     = { workspace = true }
 keywords     = { workspace = true }
+categories   = { workspace = true }
 description  = { workspace = true }
 
 [dependencies]