diff --git a/Cargo.toml b/Cargo.toml
index 87cda49..975e680 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,6 +14,7 @@ members=[
 
 [workspace.package]
 version="2.0.0"
+edition="2024"
 repository="https://git.mcorangehq.xyz/XOR64/xmpd/"
 license="GPL-3.0"
 authors=[
diff --git a/xmpd-cache/Cargo.toml b/xmpd-cache/Cargo.toml
index 674ad3a..f694806 100644
--- a/xmpd-cache/Cargo.toml
+++ b/xmpd-cache/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "xmpd-cache"
-edition = "2021"
+edition.workspace = true
 readme="README.md"
 authors.workspace = true
 version.workspace = true
diff --git a/xmpd-cache/src/lib.rs b/xmpd-cache/src/lib.rs
index fb27cb9..346f82f 100644
--- a/xmpd-cache/src/lib.rs
+++ b/xmpd-cache/src/lib.rs
@@ -128,7 +128,7 @@ impl Cache {
 }
 
 macro_rules! he {
-    ($tx:expr, $val:expr) => {
+    ($tx:expr_2021, $val:expr_2021) => {
         match $val {
             Ok(v) => v,
             Err(e) => {
diff --git a/xmpd-cliargs/Cargo.toml b/xmpd-cliargs/Cargo.toml
index 8a48ecb..1db4533 100644
--- a/xmpd-cliargs/Cargo.toml
+++ b/xmpd-cliargs/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "xmpd-cliargs"
-edition = "2021"
+edition.workspace = true
 readme="README.md"
 version.workspace = true
 authors.workspace = true
diff --git a/xmpd-core/Cargo.toml b/xmpd-core/Cargo.toml
index b15e1d4..51e49e9 100644
--- a/xmpd-core/Cargo.toml
+++ b/xmpd-core/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "xmpd-core"
-edition = "2021"
+edition.workspace = true
 readme="README.md"
 version.workspace = true
 authors.workspace = true
diff --git a/xmpd-gui/Cargo.toml b/xmpd-gui/Cargo.toml
index 32617b9..0be7f93 100644
--- a/xmpd-gui/Cargo.toml
+++ b/xmpd-gui/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "xmpd-gui"
-edition = "2021"
+edition.workspace = true
 readme="README.md"
 authors.workspace = true
 version.workspace = true
diff --git a/xmpd-gui/src/macros.rs b/xmpd-gui/src/macros.rs
index 79d9668..58ccead 100644
--- a/xmpd-gui/src/macros.rs
+++ b/xmpd-gui/src/macros.rs
@@ -17,7 +17,7 @@ macro_rules! component_register {
 }
 
 macro_rules! handle_error_ui {
-    ($val:expr) => {
+    ($val:expr_2021) => {
         match $val {
             Ok(v) => v,
             Err(e) => {
@@ -37,7 +37,7 @@ macro_rules! handle_error_ui {
 }
 
 macro_rules! handle_option {
-    ($reason:expr, $val:expr) => {
+    ($reason:expr_2021, $val:expr_2021) => {
         if let Some(v) = $val {
             v
         } else {
diff --git a/xmpd-manifest/Cargo.toml b/xmpd-manifest/Cargo.toml
index 48a1fd6..0f8b70e 100644
--- a/xmpd-manifest/Cargo.toml
+++ b/xmpd-manifest/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "xmpd-manifest"
-edition = "2021"
+edition.workspace = true
 readme="README.md"
 authors.workspace = true
 version.workspace = true
diff --git a/xmpd-player/Cargo.toml b/xmpd-player/Cargo.toml
index e4164a8..8c6a814 100644
--- a/xmpd-player/Cargo.toml
+++ b/xmpd-player/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "xmpd-player"
-edition = "2021"
+edition.workspace = true
 version.workspace = true
 repository.workspace = true
 license.workspace = true
diff --git a/xmpd-settings/Cargo.toml b/xmpd-settings/Cargo.toml
index 41b4eb7..b7ece8a 100644
--- a/xmpd-settings/Cargo.toml
+++ b/xmpd-settings/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "xmpd-settings"
-edition = "2021"
+edition.workspace = true
 version.workspace = true
 repository.workspace = true
 license.workspace = true
diff --git a/xmpd-tooling/Cargo.toml b/xmpd-tooling/Cargo.toml
index e61380a..3e4d878 100644
--- a/xmpd-tooling/Cargo.toml
+++ b/xmpd-tooling/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "xmpd-tooling"
-edition = "2021"
+edition.workspace = true
 version.workspace = true
 repository.workspace = true
 license.workspace = true