diff --git a/crates/eww/Cargo.toml b/crates/eww/Cargo.toml
index 6a20701..dcc49ff 100644
--- a/crates/eww/Cargo.toml
+++ b/crates/eww/Cargo.toml
@@ -1,13 +1,12 @@
-cargo-features = ["edition2021"]
 [package]
 name = "eww"
 version = "0.2.0"
 authors = ["elkowar <5300871+elkowar@users.noreply.github.com>"]
-edition = "2021"
 description = "Widget system for everyone!"
 license = "MIT"
 repository = "https://github.com/elkowar/eww"
 homepage = "https://github.com/elkowar/eww"
+edition = "2021"
 
 
 
diff --git a/crates/eww/src/main.rs b/crates/eww/src/main.rs
index 1c58d15..e89fda9 100644
--- a/crates/eww/src/main.rs
+++ b/crates/eww/src/main.rs
@@ -3,7 +3,6 @@
 #![feature(box_syntax)]
 #![feature(box_patterns)]
 #![feature(slice_concat_trait)]
-#![feature(result_cloned)]
 #![feature(try_blocks)]
 #![feature(nll)]
 #![allow(rustdoc::private_intra_doc_links)]
diff --git a/crates/eww_shared_util/Cargo.toml b/crates/eww_shared_util/Cargo.toml
index d46137b..187e12b 100644
--- a/crates/eww_shared_util/Cargo.toml
+++ b/crates/eww_shared_util/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "eww_shared_util"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 serde = {version = "1.0", features = ["derive"]}
diff --git a/crates/simplexpr/Cargo.toml b/crates/simplexpr/Cargo.toml
index 37a8338..950d5f7 100644
--- a/crates/simplexpr/Cargo.toml
+++ b/crates/simplexpr/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "simplexpr"
 version = "0.1.0"
-edition = "2018"
 authors = ["elkowar <5300871+elkowar@users.noreply.github.com>"]
+edition = "2021"
 
 
 build = "build.rs"
diff --git a/crates/simplexpr/src/lib.rs b/crates/simplexpr/src/lib.rs
index 6aee794..205b298 100644
--- a/crates/simplexpr/src/lib.rs
+++ b/crates/simplexpr/src/lib.rs
@@ -1,10 +1,10 @@
 #![feature(box_patterns)]
-#![feature(format_args_capture)]
 #![feature(pattern)]
 #![feature(box_syntax)]
 #![feature(try_blocks)]
 #![feature(unwrap_infallible)]
 #![feature(never_type)]
+#![feature(once_cell)]
 
 pub mod ast;
 pub mod dynval;
diff --git a/crates/yuck/Cargo.toml b/crates/yuck/Cargo.toml
index f918df5..0705115 100644
--- a/crates/yuck/Cargo.toml
+++ b/crates/yuck/Cargo.toml
@@ -2,7 +2,7 @@
 name = "yuck"
 version = "0.1.0"
 authors = ["elkowar <5300871+elkowar@users.noreply.github.com>"]
-edition = "2018"
+edition = "2021"
 
 build = "build.rs"
 
diff --git a/rust-toolchain b/rust-toolchain
index 8b49edf..d6298cb 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1 +1 @@
-nightly-2021-08-10
+nightly-2022-04-13