diff --git a/bindings/Cargo.toml b/bindings/Cargo.toml
index 9d69dfd0..0fe5cc10 100644
--- a/bindings/Cargo.toml
+++ b/bindings/Cargo.toml
@@ -2,7 +2,7 @@
 name = "bindings"
 version = "0.1.0"
 authors = ["Jade Iqbal"]
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
diff --git a/derive-ahk/Cargo.toml b/derive-ahk/Cargo.toml
index 5fa626de..7618dc06 100644
--- a/derive-ahk/Cargo.toml
+++ b/derive-ahk/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "derive-ahk"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 
 [lib]
 proc-macro = true
diff --git a/komorebi-core/Cargo.toml b/komorebi-core/Cargo.toml
index 26620628..efa83547 100644
--- a/komorebi-core/Cargo.toml
+++ b/komorebi-core/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "komorebi-core"
 version = "0.1.6"
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
diff --git a/komorebi/Cargo.toml b/komorebi/Cargo.toml
index b5b0d6c1..fdd745cc 100644
--- a/komorebi/Cargo.toml
+++ b/komorebi/Cargo.toml
@@ -6,7 +6,7 @@ description = "A tiling window manager for Windows"
 categories = ["tiling-window-manager", "windows"]
 repository = "https://github.com/LGUG2Z/komorebi"
 license = "MIT"
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
diff --git a/komorebic/Cargo.toml b/komorebic/Cargo.toml
index 952995f3..ecffff92 100644
--- a/komorebic/Cargo.toml
+++ b/komorebic/Cargo.toml
@@ -6,7 +6,7 @@ description = "The command-line interface for Komorebi, a tiling window manager
 categories = ["cli", "tiling-window-manager", "windows"]
 repository = "https://github.com/LGUG2Z/komorebi"
 license = "MIT"
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
diff --git a/komorebic/src/main.rs b/komorebic/src/main.rs
index 31dd3f11..90d71e6e 100644
--- a/komorebic/src/main.rs
+++ b/komorebic/src/main.rs
@@ -132,7 +132,7 @@ macro_rules! gen_workspace_subcommand_args {
                     $(#[clap(arg_enum)] $($arg_enum)?)?
                     #[cfg_attr(
                         all($(FALSE $($arg_enum)?)?),
-                        doc = ""$name" of the workspace as a "$value""
+                        doc = ""$name " of the workspace as a "$value ""
                     )]
                     value: $value,
                 }
diff --git a/rustfmt.toml b/rustfmt.toml
new file mode 100644
index 00000000..74c8af67
--- /dev/null
+++ b/rustfmt.toml
@@ -0,0 +1 @@
+imports_granularity = "Item"
\ No newline at end of file