diff --git a/keyfork-derive-openpgp/Cargo.toml b/keyfork-derive-openpgp/Cargo.toml
index d9dbecb..411bb6e 100644
--- a/keyfork-derive-openpgp/Cargo.toml
+++ b/keyfork-derive-openpgp/Cargo.toml
@@ -7,9 +7,9 @@ license = "AGPL-3.0-only"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-anyhow = "1.0.75"
-ed25519-dalek = "2.0.0"
 keyfork-derive-util = { version = "0.1.0", path = "../keyfork-derive-util", default-features = false, features = ["ed25519"] }
 keyforkd-client = { version = "0.1.0", path = "../keyforkd-client", default-features = false, features = ["ed25519"] }
+ed25519-dalek = "2.0.0"
 sequoia-openpgp = { version = "1.16.1", features = ["ed25519"] }
+anyhow = "1.0.75"
 thiserror = "1.0.49"
diff --git a/keyfork-derive-util/Cargo.toml b/keyfork-derive-util/Cargo.toml
index ce0c309..e2484ff 100644
--- a/keyfork-derive-util/Cargo.toml
+++ b/keyfork-derive-util/Cargo.toml
@@ -12,6 +12,8 @@ secp256k1 = ["k256"]
 ed25519 = ["ed25519-dalek"]
 
 [dependencies]
+keyfork-mnemonic-util = { version = "0.1.0", path = "../keyfork-mnemonic-util" }
+
 # Included in Rust
 digest = "0.10.7"
 sha2 = "0.10.7"
@@ -28,9 +30,6 @@ thiserror = "1.0.47"
 k256 = { version = "0.13.1", default-features = false, features = ["std", "arithmetic"], optional = true }
 ed25519-dalek = { version = "2.0.0", optional = true }
 
-# Workspace
-keyfork-mnemonic-util = { version = "0.1.0", path = "../keyfork-mnemonic-util" }
-
 [dev-dependencies]
 hex-literal = "0.4.1"
 keyfork-slip10-test-data = { version = "0.1.0", path = "../keyfork-slip10-test-data" }
diff --git a/keyfork-mnemonic-util/Cargo.toml b/keyfork-mnemonic-util/Cargo.toml
index c7f06e9..cfc8c40 100644
--- a/keyfork-mnemonic-util/Cargo.toml
+++ b/keyfork-mnemonic-util/Cargo.toml
@@ -7,11 +7,12 @@ edition = "2021"
 license = "MIT"
 
 [dependencies]
-hmac = "0.12.1"
-pbkdf2 = "0.12.2"
 # Included in rust
 sha2 = "0.10.7"
 
+hmac = "0.12.1"
+pbkdf2 = "0.12.2"
+
 [dev-dependencies]
 bip39 = "2.0.0"
 hex = "0.4.3"
diff --git a/keyfork-shard/Cargo.toml b/keyfork-shard/Cargo.toml
index 1636ebf..ca96a7b 100644
--- a/keyfork-shard/Cargo.toml
+++ b/keyfork-shard/Cargo.toml
@@ -13,23 +13,24 @@ openpgp-card = ["openpgp-card-sequoia", "card-backend-pcsc", "card-backend", "de
 prompt = ["keyfork-prompt"]
 
 [dependencies]
-sharks = "0.5.0"
+keyfork-prompt = { version = "0.1.0", path = "../keyfork-prompt", optional = true }
 smex = { version = "0.1.0", path = "../smex" }
+
+sharks = "0.5.0"
 thiserror = "1.0.50"
 
 # Remote operator mode
 keyfork-mnemonic-util = { version = "0.1.0", path = "../keyfork-mnemonic-util" }
 x25519-dalek = { version = "2.0.0", features = ["getrandom"] }
 aes-gcm = { version = "0.10.3", features = ["std"] }
+hkdf = { version = "0.12.4", features = ["std"] }
+sha2 = "0.10.8"
 
 # OpenPGP
+keyfork-derive-openpgp = { version = "0.1.0", path = "../keyfork-derive-openpgp" }
 anyhow = { version = "1.0.79", optional = true }
 card-backend = { version = "0.2.0", optional = true }
 card-backend-pcsc = { version = "0.5.0", optional = true }
-keyfork-derive-openpgp = { version = "0.1.0", path = "../keyfork-derive-openpgp" }
 openpgp-card-sequoia = { version = "0.2.0", optional = true }
 openpgp-card = { version = "0.4.0", optional = true }
 sequoia-openpgp = { version = "1.16.1", optional = true }
-keyfork-prompt = { version = "0.1.0", path = "../keyfork-prompt", optional = true }
-hkdf = { version = "0.12.4", features = ["std"] }
-sha2 = "0.10.8"
diff --git a/keyforkd-client/Cargo.toml b/keyforkd-client/Cargo.toml
index 039aaac..4323b3a 100644
--- a/keyforkd-client/Cargo.toml
+++ b/keyforkd-client/Cargo.toml
@@ -12,10 +12,10 @@ ed25519 = ["keyfork-derive-util/ed25519"]
 secp256k1 = ["keyfork-derive-util/secp256k1"]
 
 [dependencies]
-bincode = "1.3.3"
 keyfork-derive-util = { version = "0.1.0", path = "../keyfork-derive-util", default-features = false }
 keyfork-frame = { version = "0.1.0", path = "../keyfork-frame" }
 keyforkd-models = { version = "0.1.0", path = "../keyforkd-models" }
+bincode = "1.3.3"
 thiserror = "1.0.49"
 
 [dev-dependencies]
diff --git a/keyforkd/Cargo.toml b/keyforkd/Cargo.toml
index 21950cd..8473a00 100644
--- a/keyforkd/Cargo.toml
+++ b/keyforkd/Cargo.toml
@@ -15,6 +15,8 @@ multithread = ["tokio/rt-multi-thread"]
 keyfork-derive-util = { version = "0.1.0", path = "../keyfork-derive-util" }
 keyfork-frame = { version = "0.1.0", path = "../keyfork-frame" }
 keyfork-mnemonic-util = { version = "0.1.0", path = "../keyfork-mnemonic-util" }
+keyfork-derive-path-data = { version = "0.1.0", path = "../keyfork-derive-path-data" }
+keyforkd-models = { version = "0.1.0", path = "../keyforkd-models" }
 
 # Not personally audited
 bincode = "1.3.3"
@@ -29,8 +31,6 @@ tower = { version = "0.4.13", features = ["tokio", "util"] }
 # Personally audited
 thiserror = "1.0.47"
 serde = { version = "1.0.186", features = ["derive"] }
-keyfork-derive-path-data = { version = "0.1.0", path = "../keyfork-derive-path-data" }
-keyforkd-models = { version = "0.1.0", path = "../keyforkd-models" }
 
 [dev-dependencies]
 hex-literal = "0.4.1"