From 8b9455465b00b8b00e52adb557b6c5e7007c0f31 Mon Sep 17 00:00:00 2001
From: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
Date: Wed, 23 Aug 2023 16:21:52 +0200
Subject: [PATCH] Format and Sort features in `Cargo.toml` files (#14803)

* CI: Add feature sorting check

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

* Sort all features

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

* Add some mistakes

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

* Revert "Add some mistakes"

This reverts commit b2b1099f979f6decb22d09b46689c1554bb72e81.

* CI job naming

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

* Add oneliner formatting

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

* Explain tool

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

* Use latest version

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

* Better erorr message

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

* Format after master merge

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

* Use --check option

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

* Messed up the merge commit...

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

---------

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
---
 substrate/bin/node-template/node/Cargo.toml   |  12 +-
 .../node-template/pallets/template/Cargo.toml |   8 +-
 .../bin/node-template/runtime/Cargo.toml      |  18 +-
 substrate/bin/node/cli/Cargo.toml             |  20 +-
 substrate/bin/node/primitives/Cargo.toml      |   7 +-
 substrate/bin/node/runtime/Cargo.toml         | 186 +++++++++---------
 substrate/client/cli/Cargo.toml               |   4 +-
 substrate/client/db/Cargo.toml                |   4 +-
 substrate/client/executor/Cargo.toml          |   6 +-
 .../client/executor/runtime-test/Cargo.toml   |   4 +-
 substrate/client/service/Cargo.toml           |   6 +-
 substrate/client/utils/Cargo.toml             |   2 +-
 substrate/docs/STYLE_GUIDE.md                 |  25 ++-
 substrate/frame/alliance/Cargo.toml           |  26 +--
 substrate/frame/asset-conversion/Cargo.toml   |  20 +-
 substrate/frame/asset-rate/Cargo.toml         |  14 +-
 substrate/frame/assets/Cargo.toml             |  22 +--
 substrate/frame/atomic-swap/Cargo.toml        |   6 +-
 substrate/frame/aura/Cargo.toml               |  10 +-
 .../frame/authority-discovery/Cargo.toml      |   8 +-
 substrate/frame/authorship/Cargo.toml         |   8 +-
 substrate/frame/babe/Cargo.toml               |  16 +-
 substrate/frame/bags-list/Cargo.toml          |  38 ++--
 substrate/frame/balances/Cargo.toml           |  12 +-
 substrate/frame/beefy-mmr/Cargo.toml          |  10 +-
 substrate/frame/beefy/Cargo.toml              |  24 +--
 substrate/frame/benchmarking/Cargo.toml       |  10 +-
 substrate/frame/benchmarking/pov/Cargo.toml   |   8 +-
 substrate/frame/bounties/Cargo.toml           |  10 +-
 substrate/frame/child-bounties/Cargo.toml     |  12 +-
 substrate/frame/collective/Cargo.toml         |   4 +-
 substrate/frame/contracts/Cargo.toml          |  38 ++--
 .../frame/contracts/primitives/Cargo.toml     |   6 +-
 substrate/frame/conviction-voting/Cargo.toml  |  16 +-
 substrate/frame/core-fellowship/Cargo.toml    |   4 +-
 substrate/frame/democracy/Cargo.toml          |  16 +-
 .../election-provider-multi-phase/Cargo.toml  |  41 ++--
 .../election-provider-support/Cargo.toml      |  12 +-
 .../benchmarking/Cargo.toml                   |   4 +-
 substrate/frame/elections-phragmen/Cargo.toml |  14 +-
 substrate/frame/examples/Cargo.toml           |  24 +--
 substrate/frame/examples/basic/Cargo.toml     |   8 +-
 .../frame/examples/default-config/Cargo.toml  |   4 +-
 substrate/frame/examples/dev-mode/Cargo.toml  |   6 +-
 .../frame/examples/kitchensink/Cargo.toml     |  20 +-
 .../frame/examples/offchain-worker/Cargo.toml |  10 +-
 substrate/frame/examples/split/Cargo.toml     |  20 +-
 substrate/frame/executive/Cargo.toml          |  20 +-
 substrate/frame/fast-unstake/Cargo.toml       |  34 ++--
 substrate/frame/glutton/Cargo.toml            |  10 +-
 substrate/frame/grandpa/Cargo.toml            |  20 +-
 substrate/frame/identity/Cargo.toml           |  10 +-
 substrate/frame/im-online/Cargo.toml          |  10 +-
 substrate/frame/indices/Cargo.toml            |  10 +-
 .../Cargo.toml                                |   8 +-
 substrate/frame/lottery/Cargo.toml            |  18 +-
 substrate/frame/membership/Cargo.toml         |   4 +-
 .../frame/merkle-mountain-range/Cargo.toml    |   8 +-
 substrate/frame/message-queue/Cargo.toml      |  16 +-
 substrate/frame/multisig/Cargo.toml           |  10 +-
 .../frame/nft-fractionalization/Cargo.toml    |  16 +-
 substrate/frame/nfts/Cargo.toml               |  12 +-
 substrate/frame/nfts/runtime-api/Cargo.toml   |   9 +-
 substrate/frame/nicks/Cargo.toml              |   8 +-
 substrate/frame/nis/Cargo.toml                |  10 +-
 substrate/frame/node-authorization/Cargo.toml |   4 +-
 substrate/frame/nomination-pools/Cargo.toml   |  24 +--
 .../nomination-pools/benchmarking/Cargo.toml  |  28 +--
 .../nomination-pools/runtime-api/Cargo.toml   |   9 +-
 substrate/frame/offences/Cargo.toml           |  10 +-
 .../frame/offences/benchmarking/Cargo.toml    |  14 +-
 substrate/frame/paged-list/Cargo.toml         |  17 +-
 substrate/frame/preimage/Cargo.toml           |  10 +-
 substrate/frame/proxy/Cargo.toml              |  14 +-
 substrate/frame/ranked-collective/Cargo.toml  |   4 +-
 substrate/frame/recovery/Cargo.toml           |  12 +-
 substrate/frame/referenda/Cargo.toml          |  22 +--
 substrate/frame/remark/Cargo.toml             |   8 +-
 substrate/frame/root-offences/Cargo.toml      |  19 +-
 substrate/frame/root-testing/Cargo.toml       |  10 +-
 substrate/frame/salary/Cargo.toml             |   4 +-
 substrate/frame/scheduler/Cargo.toml          |  12 +-
 substrate/frame/scored-pool/Cargo.toml        |   8 +-
 substrate/frame/session/Cargo.toml            |   8 +-
 .../frame/session/benchmarking/Cargo.toml     |  16 +-
 substrate/frame/society/Cargo.toml            |  22 +--
 substrate/frame/staking/Cargo.toml            |  36 ++--
 substrate/frame/staking/reward-fn/Cargo.toml  |   7 +-
 .../frame/staking/runtime-api/Cargo.toml      |   7 +-
 .../frame/state-trie-migration/Cargo.toml     |  19 +-
 substrate/frame/statement/Cargo.toml          |  12 +-
 substrate/frame/sudo/Cargo.toml               |   8 +-
 substrate/frame/support/Cargo.toml            |  49 ++---
 substrate/frame/support/procedural/Cargo.toml |   2 +-
 substrate/frame/support/test/Cargo.toml       |  16 +-
 .../support/test/compile_pass/Cargo.toml      |   4 +-
 .../frame/support/test/pallet/Cargo.toml      |   4 +-
 substrate/frame/system/Cargo.toml             |   9 +-
 .../frame/system/benchmarking/Cargo.toml      |  10 +-
 .../frame/system/rpc/runtime-api/Cargo.toml   |   7 +-
 substrate/frame/timestamp/Cargo.toml          |  12 +-
 substrate/frame/tips/Cargo.toml               |  12 +-
 .../frame/transaction-payment/Cargo.toml      |   6 +-
 .../asset-conversion-tx-payment/Cargo.toml    |  18 +-
 .../asset-tx-payment/Cargo.toml               |  28 +--
 .../rpc/runtime-api/Cargo.toml                |   2 +-
 .../frame/transaction-storage/Cargo.toml      |  12 +-
 substrate/frame/treasury/Cargo.toml           |  14 +-
 substrate/frame/try-runtime/Cargo.toml        |   5 +-
 substrate/frame/uniques/Cargo.toml            |  14 +-
 substrate/frame/utility/Cargo.toml            |  18 +-
 substrate/frame/vesting/Cargo.toml            |  14 +-
 substrate/frame/whitelist/Cargo.toml          |  18 +-
 substrate/primitives/api/Cargo.toml           |  27 ++-
 .../primitives/api/proc-macro/Cargo.toml      |   2 +-
 .../primitives/application-crypto/Cargo.toml  |  19 +-
 substrate/primitives/arithmetic/Cargo.toml    |   9 +-
 .../primitives/authority-discovery/Cargo.toml |   2 +-
 substrate/primitives/block-builder/Cargo.toml |   7 +-
 .../primitives/consensus/aura/Cargo.toml      |   2 +-
 .../primitives/consensus/babe/Cargo.toml      |   4 +-
 .../primitives/consensus/beefy/Cargo.toml     |   6 +-
 .../primitives/consensus/grandpa/Cargo.toml   |   8 +-
 substrate/primitives/consensus/pow/Cargo.toml |   2 +-
 .../primitives/consensus/slots/Cargo.toml     |   7 +-
 substrate/primitives/core/Cargo.toml          |  76 +++----
 substrate/primitives/core/hashing/Cargo.toml  |   4 +-
 .../primitives/crypto/ec-utils/Cargo.toml     |  26 +--
 substrate/primitives/externalities/Cargo.toml |   9 +-
 .../primitives/genesis-builder/Cargo.toml     |   7 +-
 substrate/primitives/io/Cargo.toml            |  32 ++-
 substrate/primitives/keyring/Cargo.toml       |   2 +-
 substrate/primitives/keystore/Cargo.toml      |  12 +-
 .../merkle-mountain-range/Cargo.toml          |   9 +-
 substrate/primitives/metadata-ir/Cargo.toml   |   9 +-
 .../primitives/npos-elections/Cargo.toml      |   2 +-
 substrate/primitives/offchain/Cargo.toml      |   4 +-
 .../primitives/runtime-interface/Cargo.toml   |  12 +-
 .../test-wasm-deprecated/Cargo.toml           |   8 +-
 .../runtime-interface/test-wasm/Cargo.toml    |  10 +-
 substrate/primitives/runtime/Cargo.toml       |   8 +-
 substrate/primitives/session/Cargo.toml       |   2 +-
 substrate/primitives/staking/Cargo.toml       |   8 +-
 substrate/primitives/state-machine/Cargo.toml |   6 +-
 .../primitives/statement-store/Cargo.toml     |  31 ++-
 substrate/primitives/std/Cargo.toml           |   2 +-
 substrate/primitives/storage/Cargo.toml       |   5 +-
 .../primitives/test-primitives/Cargo.toml     |   6 +-
 substrate/primitives/tracing/Cargo.toml       |  10 +-
 .../primitives/transaction-pool/Cargo.toml    |   5 +-
 .../transaction-storage-proof/Cargo.toml      |   2 +-
 substrate/primitives/trie/Cargo.toml          |   8 +-
 substrate/primitives/version/Cargo.toml       |   8 +-
 .../primitives/wasm-interface/Cargo.toml      |   6 +-
 substrate/primitives/weights/Cargo.toml       |   4 +-
 substrate/scripts/ci/gitlab/pipeline/test.yml |  11 ++
 substrate/test-utils/cli/Cargo.toml           |   2 +-
 substrate/test-utils/runtime/Cargo.toml       |  54 +++--
 substrate/utils/binary-merkle-tree/Cargo.toml |  13 +-
 .../utils/frame/benchmarking-cli/Cargo.toml   |   8 +-
 .../utils/frame/try-runtime/cli/Cargo.toml    |   4 +-
 161 files changed, 1058 insertions(+), 1136 deletions(-)

diff --git a/substrate/bin/node-template/node/Cargo.toml b/substrate/bin/node-template/node/Cargo.toml
index b05fed96bc8..6eb5b4df9c5 100644
--- a/substrate/bin/node-template/node/Cargo.toml
+++ b/substrate/bin/node-template/node/Cargo.toml
@@ -70,19 +70,19 @@ substrate-build-script-utils = { version = "3.0.0", path = "../../../utils/build
 default = []
 # Dependencies that are only required if runtime benchmarking should be build.
 runtime-benchmarks = [
-	"node-template-runtime/runtime-benchmarks",
-	"frame-benchmarking/runtime-benchmarks",
 	"frame-benchmarking-cli/runtime-benchmarks",
+	"frame-benchmarking/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
+	"node-template-runtime/runtime-benchmarks",
 	"sc-service/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks"
+	"sp-runtime/runtime-benchmarks",
 ]
 # Enable features that allow the runtime to be tried and debugged. Name might be subject to change
 # in the near future.
 try-runtime = [
-	"node-template-runtime/try-runtime",
-	"try-runtime-cli/try-runtime",
 	"frame-system/try-runtime",
+	"node-template-runtime/try-runtime",
 	"pallet-transaction-payment/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
+	"try-runtime-cli/try-runtime",
 ]
diff --git a/substrate/bin/node-template/pallets/template/Cargo.toml b/substrate/bin/node-template/pallets/template/Cargo.toml
index f468374c2ff..a5010346392 100644
--- a/substrate/bin/node-template/pallets/template/Cargo.toml
+++ b/substrate/bin/node-template/pallets/template/Cargo.toml
@@ -27,7 +27,7 @@ sp-io = { version = "23.0.0", path = "../../../../primitives/io" }
 sp-runtime = { version = "24.0.0", path = "../../../../primitives/runtime" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
@@ -36,16 +36,16 @@ std = [
 	"scale-info/std",
 	"sp-core/std",
 	"sp-io/std",
-	"sp-runtime/std"
+	"sp-runtime/std",
 ]
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks"
+	"sp-runtime/runtime-benchmarks",
 ]
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/bin/node-template/runtime/Cargo.toml b/substrate/bin/node-template/runtime/Cargo.toml
index 51e30187c9d..32cd9de6d68 100644
--- a/substrate/bin/node-template/runtime/Cargo.toml
+++ b/substrate/bin/node-template/runtime/Cargo.toml
@@ -54,18 +54,17 @@ pallet-template = { version = "4.0.0-dev", default-features = false, path = "../
 substrate-wasm-builder = { version = "5.0.0-dev", path = "../../../utils/wasm-builder", optional = true }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
-	"frame-try-runtime?/std",
-	"frame-system-benchmarking?/std",
-	"frame-benchmarking?/std",
 	"codec/std",
-	"scale-info/std",
+	"frame-benchmarking?/std",
 	"frame-executive/std",
 	"frame-support/std",
+	"frame-system-benchmarking?/std",
 	"frame-system-rpc-runtime-api/std",
 	"frame-system/std",
 	"frame-try-runtime/std",
+	"frame-try-runtime?/std",
 	"pallet-aura/std",
 	"pallet-balances/std",
 	"pallet-grandpa/std",
@@ -74,6 +73,7 @@ std = [
 	"pallet-timestamp/std",
 	"pallet-transaction-payment-rpc-runtime-api/std",
 	"pallet-transaction-payment/std",
+	"scale-info/std",
 	"sp-api/std",
 	"sp-block-builder/std",
 	"sp-consensus-aura/std",
@@ -101,10 +101,10 @@ runtime-benchmarks = [
 	"sp-runtime/runtime-benchmarks",
 ]
 try-runtime = [
-	"frame-try-runtime/try-runtime",
 	"frame-executive/try-runtime",
-	"frame-system/try-runtime",
 	"frame-support/try-runtime",
+	"frame-system/try-runtime",
+	"frame-try-runtime/try-runtime",
 	"pallet-aura/try-runtime",
 	"pallet-balances/try-runtime",
 	"pallet-grandpa/try-runtime",
@@ -112,6 +112,6 @@ try-runtime = [
 	"pallet-template/try-runtime",
 	"pallet-timestamp/try-runtime",
 	"pallet-transaction-payment/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
-experimental = ["pallet-aura/experimental"]
+experimental = [ "pallet-aura/experimental" ]
diff --git a/substrate/bin/node/cli/Cargo.toml b/substrate/bin/node/cli/Cargo.toml
index 37f03fbb0dd..fcab4cc6517 100644
--- a/substrate/bin/node/cli/Cargo.toml
+++ b/substrate/bin/node/cli/Cargo.toml
@@ -147,22 +147,22 @@ pallet-balances = { version = "4.0.0-dev", path = "../../../frame/balances" }
 sc-storage-monitor = { version = "0.1.0", path = "../../../client/storage-monitor" }
 
 [features]
-default = ["cli"]
+default = [ "cli" ]
 cli = [
+	"clap",
+	"clap_complete",
+	"frame-benchmarking-cli",
 	"node-inspect",
 	"sc-cli",
-	"frame-benchmarking-cli",
-	"substrate-frame-cli",
 	"sc-service/rocksdb",
-	"clap",
-	"clap_complete",
 	"substrate-build-script-utils",
+	"substrate-frame-cli",
 	"try-runtime-cli",
 ]
 runtime-benchmarks = [
-	"kitchensink-runtime/runtime-benchmarks",
 	"frame-benchmarking-cli/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
+	"kitchensink-runtime/runtime-benchmarks",
 	"pallet-asset-tx-payment/runtime-benchmarks",
 	"pallet-assets/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
@@ -170,14 +170,13 @@ runtime-benchmarks = [
 	"pallet-timestamp/runtime-benchmarks",
 	"sc-client-db/runtime-benchmarks",
 	"sc-service/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks"
+	"sp-runtime/runtime-benchmarks",
 ]
 # Enable features that allow the runtime to be tried and debugged. Name might be subject to change
 # in the near future.
 try-runtime = [
-	"kitchensink-runtime/try-runtime",
-	"try-runtime-cli/try-runtime",
 	"frame-system/try-runtime",
+	"kitchensink-runtime/try-runtime",
 	"pallet-asset-conversion-tx-payment/try-runtime",
 	"pallet-asset-tx-payment/try-runtime",
 	"pallet-assets/try-runtime",
@@ -185,7 +184,8 @@ try-runtime = [
 	"pallet-im-online/try-runtime",
 	"pallet-timestamp/try-runtime",
 	"sp-runtime/try-runtime",
-	"substrate-cli-test-utils/try-runtime"
+	"substrate-cli-test-utils/try-runtime",
+	"try-runtime-cli/try-runtime",
 ]
 
 [[bench]]
diff --git a/substrate/bin/node/primitives/Cargo.toml b/substrate/bin/node/primitives/Cargo.toml
index ac178c67f71..586d0bce2db 100644
--- a/substrate/bin/node/primitives/Cargo.toml
+++ b/substrate/bin/node/primitives/Cargo.toml
@@ -17,8 +17,5 @@ sp-core = { version = "21.0.0", default-features = false, path = "../../../primi
 sp-runtime = { version = "24.0.0", default-features = false, path = "../../../primitives/runtime" }
 
 [features]
-default = ["std"]
-std = [
-	"sp-core/std",
-	"sp-runtime/std",
-]
+default = [ "std" ]
+std = [ "sp-core/std", "sp-runtime/std" ]
diff --git a/substrate/bin/node/runtime/Cargo.toml b/substrate/bin/node/runtime/Cargo.toml
index de0ec1a5489..f8ecf656c65 100644
--- a/substrate/bin/node/runtime/Cargo.toml
+++ b/substrate/bin/node/runtime/Cargo.toml
@@ -132,118 +132,121 @@ pallet-whitelist = { version = "4.0.0-dev", default-features = false, path = "..
 substrate-wasm-builder = { version = "5.0.0-dev", path = "../../../utils/wasm-builder", optional = true }
 
 [features]
-default = ["std"]
-with-tracing = ["frame-executive/with-tracing"]
+default = [ "std" ]
+with-tracing = [ "frame-executive/with-tracing" ]
 std = [
-	"pallet-whitelist/std",
-	"pallet-offences-benchmarking?/std",
-	"pallet-election-provider-support-benchmarking?/std",
-	"pallet-asset-conversion-tx-payment/std",
-	"pallet-asset-tx-payment/std",
-	"frame-system-benchmarking?/std",
+	"codec/std",
+	"frame-benchmarking-pallet-pov/std",
+	"frame-benchmarking/std",
 	"frame-election-provider-support/std",
-	"sp-authority-discovery/std",
+	"frame-executive/std",
+	"frame-support/std",
+	"frame-system-benchmarking?/std",
+	"frame-system-rpc-runtime-api/std",
+	"frame-system/std",
+	"frame-try-runtime?/std",
+	"log/std",
+	"node-primitives/std",
+	"pallet-alliance/std",
+	"pallet-asset-conversion-tx-payment/std",
 	"pallet-asset-conversion/std",
+	"pallet-asset-rate/std",
+	"pallet-asset-tx-payment/std",
 	"pallet-assets/std",
 	"pallet-authority-discovery/std",
 	"pallet-authorship/std",
-	"sp-consensus-babe/std",
-	"sp-consensus-grandpa/std",
 	"pallet-babe/std",
 	"pallet-bags-list/std",
 	"pallet-balances/std",
 	"pallet-bounties/std",
-	"sp-block-builder/std",
-	"codec/std",
-	"scale-info/std",
+	"pallet-child-bounties/std",
 	"pallet-collective/std",
-	"pallet-contracts/std",
 	"pallet-contracts-primitives/std",
+	"pallet-contracts/std",
 	"pallet-conviction-voting/std",
 	"pallet-core-fellowship/std",
 	"pallet-democracy/std",
+	"pallet-election-provider-multi-phase/std",
+	"pallet-election-provider-support-benchmarking?/std",
 	"pallet-elections-phragmen/std",
 	"pallet-fast-unstake/std",
-	"frame-executive/std",
-	"pallet-nis/std",
+	"pallet-glutton/std",
 	"pallet-grandpa/std",
+	"pallet-identity/std",
 	"pallet-im-online/std",
 	"pallet-indices/std",
-	"sp-inherents/std",
+	"pallet-insecure-randomness-collective-flip/std",
 	"pallet-lottery/std",
 	"pallet-membership/std",
 	"pallet-message-queue/std",
 	"pallet-mmr/std",
 	"pallet-multisig/std",
-	"pallet-nomination-pools/std",
-	"pallet-nomination-pools-runtime-api/std",
+	"pallet-nft-fractionalization/std",
+	"pallet-nfts-runtime-api/std",
+	"pallet-nfts/std",
+	"pallet-nis/std",
 	"pallet-nomination-pools-benchmarking?/std",
-	"pallet-identity/std",
-	"pallet-scheduler/std",
-	"node-primitives/std",
-	"sp-offchain/std",
+	"pallet-nomination-pools-runtime-api/std",
+	"pallet-nomination-pools/std",
+	"pallet-offences-benchmarking?/std",
 	"pallet-offences/std",
-	"pallet-glutton/std",
 	"pallet-preimage/std",
 	"pallet-proxy/std",
-	"sp-core/std",
-	"pallet-insecure-randomness-collective-flip/std",
-	"sp-std/std",
-	"pallet-session/std",
+	"pallet-ranked-collective/std",
+	"pallet-recovery/std",
+	"pallet-referenda/std",
+	"pallet-remark/std",
+	"pallet-root-testing/std",
+	"pallet-salary/std",
+	"pallet-scheduler/std",
 	"pallet-session-benchmarking?/std",
-	"sp-api/std",
-	"sp-runtime/std",
-	"sp-staking/std",
-	"pallet-staking/std",
+	"pallet-session/std",
+	"pallet-society/std",
 	"pallet-staking-runtime-api/std",
+	"pallet-staking/std",
 	"pallet-state-trie-migration/std",
 	"pallet-statement/std",
-	"pallet-salary/std",
-	"sp-session/std",
 	"pallet-sudo/std",
-	"frame-support/std",
-	"frame-benchmarking/std",
-	"frame-benchmarking-pallet-pov/std",
-	"frame-system-rpc-runtime-api/std",
-	"frame-system/std",
-	"pallet-election-provider-multi-phase/std",
 	"pallet-timestamp/std",
 	"pallet-tips/std",
 	"pallet-transaction-payment-rpc-runtime-api/std",
 	"pallet-transaction-payment/std",
 	"pallet-transaction-storage/std",
 	"pallet-treasury/std",
-	"pallet-asset-rate/std",
-	"sp-transaction-pool/std",
-	"sp-statement-store/std",
-	"pallet-utility/std",
-	"sp-version/std",
-	"pallet-society/std",
-	"pallet-ranked-collective/std",
-	"pallet-referenda/std",
-	"pallet-remark/std",
-	"pallet-root-testing/std",
-	"pallet-recovery/std",
 	"pallet-uniques/std",
-	"pallet-nfts/std",
-	"pallet-nfts-runtime-api/std",
-	"pallet-nft-fractionalization/std",
+	"pallet-utility/std",
 	"pallet-vesting/std",
-	"log/std",
-	"frame-try-runtime?/std",
+	"pallet-whitelist/std",
+	"scale-info/std",
+	"sp-api/std",
+	"sp-authority-discovery/std",
+	"sp-block-builder/std",
+	"sp-consensus-babe/std",
+	"sp-consensus-grandpa/std",
+	"sp-core/std",
+	"sp-inherents/std",
 	"sp-io/std",
-	"pallet-child-bounties/std",
-	"pallet-alliance/std",
+	"sp-offchain/std",
+	"sp-runtime/std",
+	"sp-session/std",
+	"sp-staking/std",
+	"sp-statement-store/std",
+	"sp-std/std",
+	"sp-transaction-pool/std",
+	"sp-version/std",
 	"substrate-wasm-builder",
 ]
 runtime-benchmarks = [
-	"frame-benchmarking/runtime-benchmarks",
 	"frame-benchmarking-pallet-pov/runtime-benchmarks",
+	"frame-benchmarking/runtime-benchmarks",
+	"frame-election-provider-support/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
+	"frame-system-benchmarking/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks",
 	"pallet-alliance/runtime-benchmarks",
 	"pallet-asset-conversion/runtime-benchmarks",
+	"pallet-asset-rate/runtime-benchmarks",
+	"pallet-asset-tx-payment/runtime-benchmarks",
 	"pallet-assets/runtime-benchmarks",
 	"pallet-babe/runtime-benchmarks",
 	"pallet-bags-list/runtime-benchmarks",
@@ -259,7 +262,7 @@ runtime-benchmarks = [
 	"pallet-election-provider-support-benchmarking/runtime-benchmarks",
 	"pallet-elections-phragmen/runtime-benchmarks",
 	"pallet-fast-unstake/runtime-benchmarks",
-	"pallet-nis/runtime-benchmarks",
+	"pallet-glutton/runtime-benchmarks",
 	"pallet-grandpa/runtime-benchmarks",
 	"pallet-identity/runtime-benchmarks",
 	"pallet-im-online/runtime-benchmarks",
@@ -269,17 +272,21 @@ runtime-benchmarks = [
 	"pallet-message-queue/runtime-benchmarks",
 	"pallet-mmr/runtime-benchmarks",
 	"pallet-multisig/runtime-benchmarks",
+	"pallet-nft-fractionalization/runtime-benchmarks",
+	"pallet-nfts/runtime-benchmarks",
+	"pallet-nis/runtime-benchmarks",
 	"pallet-nomination-pools-benchmarking/runtime-benchmarks",
+	"pallet-nomination-pools/runtime-benchmarks",
 	"pallet-offences-benchmarking/runtime-benchmarks",
-	"pallet-glutton/runtime-benchmarks",
+	"pallet-offences/runtime-benchmarks",
 	"pallet-preimage/runtime-benchmarks",
 	"pallet-proxy/runtime-benchmarks",
-	"pallet-scheduler/runtime-benchmarks",
 	"pallet-ranked-collective/runtime-benchmarks",
-	"pallet-referenda/runtime-benchmarks",
 	"pallet-recovery/runtime-benchmarks",
+	"pallet-referenda/runtime-benchmarks",
 	"pallet-remark/runtime-benchmarks",
 	"pallet-salary/runtime-benchmarks",
+	"pallet-scheduler/runtime-benchmarks",
 	"pallet-session-benchmarking/runtime-benchmarks",
 	"pallet-society/runtime-benchmarks",
 	"pallet-staking/runtime-benchmarks",
@@ -289,28 +296,25 @@ runtime-benchmarks = [
 	"pallet-tips/runtime-benchmarks",
 	"pallet-transaction-storage/runtime-benchmarks",
 	"pallet-treasury/runtime-benchmarks",
-	"pallet-asset-rate/runtime-benchmarks",
-	"pallet-utility/runtime-benchmarks",
 	"pallet-uniques/runtime-benchmarks",
-	"pallet-nfts/runtime-benchmarks",
-	"pallet-nft-fractionalization/runtime-benchmarks",
+	"pallet-utility/runtime-benchmarks",
 	"pallet-vesting/runtime-benchmarks",
 	"pallet-whitelist/runtime-benchmarks",
-	"frame-system-benchmarking/runtime-benchmarks",
-	"frame-election-provider-support/runtime-benchmarks",
-	"pallet-asset-tx-payment/runtime-benchmarks",
-	"pallet-nomination-pools/runtime-benchmarks",
-	"pallet-offences/runtime-benchmarks",
-	"sp-staking/runtime-benchmarks"
+	"sp-runtime/runtime-benchmarks",
+	"sp-staking/runtime-benchmarks",
 ]
 try-runtime = [
-	"frame-try-runtime/try-runtime",
 	"frame-benchmarking-pallet-pov/try-runtime",
+	"frame-election-provider-support/try-runtime",
 	"frame-executive/try-runtime",
-	"frame-system/try-runtime",
 	"frame-support/try-runtime",
+	"frame-system/try-runtime",
+	"frame-try-runtime/try-runtime",
 	"pallet-alliance/try-runtime",
+	"pallet-asset-conversion-tx-payment/try-runtime",
 	"pallet-asset-conversion/try-runtime",
+	"pallet-asset-rate/try-runtime",
+	"pallet-asset-tx-payment/try-runtime",
 	"pallet-assets/try-runtime",
 	"pallet-authority-discovery/try-runtime",
 	"pallet-authorship/try-runtime",
@@ -327,50 +331,46 @@ try-runtime = [
 	"pallet-election-provider-multi-phase/try-runtime",
 	"pallet-elections-phragmen/try-runtime",
 	"pallet-fast-unstake/try-runtime",
-	"pallet-nis/try-runtime",
+	"pallet-glutton/try-runtime",
 	"pallet-grandpa/try-runtime",
+	"pallet-identity/try-runtime",
 	"pallet-im-online/try-runtime",
 	"pallet-indices/try-runtime",
-	"pallet-identity/try-runtime",
+	"pallet-insecure-randomness-collective-flip/try-runtime",
 	"pallet-lottery/try-runtime",
 	"pallet-membership/try-runtime",
 	"pallet-message-queue/try-runtime",
 	"pallet-mmr/try-runtime",
 	"pallet-multisig/try-runtime",
+	"pallet-nft-fractionalization/try-runtime",
+	"pallet-nfts/try-runtime",
+	"pallet-nis/try-runtime",
 	"pallet-nomination-pools/try-runtime",
 	"pallet-offences/try-runtime",
-	"pallet-glutton/try-runtime",
 	"pallet-preimage/try-runtime",
 	"pallet-proxy/try-runtime",
-	"pallet-insecure-randomness-collective-flip/try-runtime",
 	"pallet-ranked-collective/try-runtime",
 	"pallet-recovery/try-runtime",
 	"pallet-referenda/try-runtime",
 	"pallet-remark/try-runtime",
 	"pallet-root-testing/try-runtime",
 	"pallet-salary/try-runtime",
+	"pallet-scheduler/try-runtime",
 	"pallet-session/try-runtime",
+	"pallet-society/try-runtime",
 	"pallet-staking/try-runtime",
 	"pallet-state-trie-migration/try-runtime",
 	"pallet-statement/try-runtime",
-	"pallet-scheduler/try-runtime",
-	"pallet-society/try-runtime",
 	"pallet-sudo/try-runtime",
 	"pallet-timestamp/try-runtime",
 	"pallet-tips/try-runtime",
-	"pallet-treasury/try-runtime",
-	"pallet-asset-rate/try-runtime",
-	"pallet-utility/try-runtime",
 	"pallet-transaction-payment/try-runtime",
-	"pallet-asset-conversion-tx-payment/try-runtime",
-	"pallet-asset-tx-payment/try-runtime",
 	"pallet-transaction-storage/try-runtime",
+	"pallet-treasury/try-runtime",
 	"pallet-uniques/try-runtime",
-	"pallet-nfts/try-runtime",
-	"pallet-nft-fractionalization/try-runtime",
+	"pallet-utility/try-runtime",
 	"pallet-vesting/try-runtime",
 	"pallet-whitelist/try-runtime",
-	"frame-election-provider-support/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
-unsafe-debug = ["pallet-contracts/unsafe-debug"]
+unsafe-debug = [ "pallet-contracts/unsafe-debug" ]
diff --git a/substrate/client/cli/Cargo.toml b/substrate/client/cli/Cargo.toml
index 61750766fa3..92ddbe59fc5 100644
--- a/substrate/client/cli/Cargo.toml
+++ b/substrate/client/cli/Cargo.toml
@@ -52,5 +52,5 @@ futures-timer = "3.0.1"
 sp-tracing = { version = "10.0.0", path = "../../primitives/tracing" }
 
 [features]
-default = ["rocksdb"]
-rocksdb = ["sc-client-db/rocksdb"]
+default = [ "rocksdb" ]
+rocksdb = [ "sc-client-db/rocksdb" ]
diff --git a/substrate/client/db/Cargo.toml b/substrate/client/db/Cargo.toml
index 1845158dac1..e351798a026 100644
--- a/substrate/client/db/Cargo.toml
+++ b/substrate/client/db/Cargo.toml
@@ -51,9 +51,9 @@ default = []
 test-helpers = []
 runtime-benchmarks = [
 	"kitchensink-runtime/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks"
+	"sp-runtime/runtime-benchmarks",
 ]
-rocksdb = ["kvdb-rocksdb"]
+rocksdb = [ "kvdb-rocksdb" ]
 
 [[bench]]
 name = "state_access"
diff --git a/substrate/client/executor/Cargo.toml b/substrate/client/executor/Cargo.toml
index 6a056ce7dfa..e7252ef3f19 100644
--- a/substrate/client/executor/Cargo.toml
+++ b/substrate/client/executor/Cargo.toml
@@ -55,7 +55,7 @@ name = "bench"
 harness = false
 
 [features]
-default = ["std"]
+default = [ "std" ]
 # This crate does not have `no_std` support, we just require this for tests
 std = [
 	"sc-runtime-test/std",
@@ -63,13 +63,13 @@ std = [
 	"sp-core/std",
 	"sp-externalities/std",
 	"sp-io/std",
-	"sp-runtime/std",
 	"sp-runtime-interface/std",
+	"sp-runtime/std",
 	"sp-state-machine/std",
 	"sp-tracing/std",
 	"sp-trie/std",
 	"sp-version/std",
 	"sp-wasm-interface/std",
-	"substrate-test-runtime/std"
+	"substrate-test-runtime/std",
 ]
 wasm-extern-trace = []
diff --git a/substrate/client/executor/runtime-test/Cargo.toml b/substrate/client/executor/runtime-test/Cargo.toml
index abf2fb5c27a..628297ade6b 100644
--- a/substrate/client/executor/runtime-test/Cargo.toml
+++ b/substrate/client/executor/runtime-test/Cargo.toml
@@ -23,12 +23,12 @@ sp-std = { version = "8.0.0", default-features = false, path = "../../../primiti
 substrate-wasm-builder = { version = "5.0.0-dev", path = "../../../utils/wasm-builder", optional = true }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"sp-core/std",
 	"sp-io/std",
+	"sp-runtime-interface/std",
 	"sp-runtime/std",
 	"sp-std/std",
 	"substrate-wasm-builder",
-	"sp-runtime-interface/std"
 ]
diff --git a/substrate/client/service/Cargo.toml b/substrate/client/service/Cargo.toml
index 9ad2fcf778f..6dcd8b8e4ba 100644
--- a/substrate/client/service/Cargo.toml
+++ b/substrate/client/service/Cargo.toml
@@ -13,15 +13,15 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [features]
-default = ["rocksdb"]
+default = [ "rocksdb" ]
 # The RocksDB feature activates the RocksDB database backend. If it is not activated, and you pass
 # a path to a database, an error will be produced at runtime.
-rocksdb = ["sc-client-db/rocksdb"]
+rocksdb = [ "sc-client-db/rocksdb" ]
 # exposes the client type
 test-helpers = []
 runtime-benchmarks = [
 	"sc-client-db/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks"
+	"sp-runtime/runtime-benchmarks",
 ]
 
 [dependencies]
diff --git a/substrate/client/utils/Cargo.toml b/substrate/client/utils/Cargo.toml
index 40b742f3738..21b082a35fd 100644
--- a/substrate/client/utils/Cargo.toml
+++ b/substrate/client/utils/Cargo.toml
@@ -20,7 +20,7 @@ prometheus = { version = "0.13.0", default-features = false }
 sp-arithmetic = { version = "16.0.0", default-features = false, path = "../../primitives/arithmetic" }
 
 [features]
-default = ["metered"]
+default = [ "metered" ]
 metered = []
 
 [dev-dependencies]
diff --git a/substrate/docs/STYLE_GUIDE.md b/substrate/docs/STYLE_GUIDE.md
index 8854f885a4b..a89dcf52ffc 100644
--- a/substrate/docs/STYLE_GUIDE.md
+++ b/substrate/docs/STYLE_GUIDE.md
@@ -5,7 +5,7 @@ title: Style Guide for Rust in Substrate
 Where possible these styles are enforced by settings in `rustfmt.toml` so if you run `cargo fmt` 
 then you will adhere to most of these style guidelines automatically.
 
-# Formatting
+# Code Formatting
 
 -   Indent using tabs.
 -   Lines should be longer than 100 characters long only in exceptional circumstances and certainly
@@ -147,3 +147,26 @@ let mut target_path =
     -   how likely is it that invariants could be violated,
     -   are issues stemming from the use of unsafe code caught by existing tests/tooling,
     -   what are the consequences if the problems slip into production.
+
+# Manifest Formatting
+
+> **TLDR**
+> You can use the CLI tool [Zepter](https://crates.io/crates/zepter) to format the files: `zepter format features`
+
+Rust `Cargo.toml` files need to respect certain formatting rules. All entries need to be alphabetically sorted. This makes it easier to read them and insert new entries. The exhaustive list of rules is enforced by the CI. The general format looks like this:
+
+- The feature is written as a single line if it fits within 80 chars:
+```toml
+[features]
+default = [ "std" ]
+```
+
+- Otherwise the feature is broken down into multiple lines with one entry per line. Each line is padded with one tab and no trailing spaces but a trailing comma.
+```toml
+[features]
+default = [
+	"loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong",
+	# Comments go here as well ;)
+	"std",
+]
+```
diff --git a/substrate/frame/alliance/Cargo.toml b/substrate/frame/alliance/Cargo.toml
index d0330ddfd67..77703a7739d 100644
--- a/substrate/frame/alliance/Cargo.toml
+++ b/substrate/frame/alliance/Cargo.toml
@@ -39,33 +39,33 @@ pallet-balances = { version = "4.0.0-dev", path = "../balances" }
 pallet-collective = { version = "4.0.0-dev", path = "../collective" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
-	"sp-core-hashing?/std",
-	"pallet-collective?/std",
+	"codec/std",
 	"frame-benchmarking?/std",
+	"frame-support/std",
+	"frame-system/std",
 	"log/std",
-	"codec/std",
+	"pallet-balances/std",
+	"pallet-collective?/std",
+	"pallet-identity/std",
 	"scale-info/std",
-	"sp-std/std",
+	"sp-core-hashing?/std",
 	"sp-core/std",
 	"sp-io/std",
 	"sp-runtime/std",
-	"frame-support/std",
-	"frame-system/std",
-	"pallet-identity/std",
-	"pallet-balances/std"
+	"sp-std/std",
 ]
 runtime-benchmarks = [
 	"array-bytes",
-	"sp-core-hashing",
 	"frame-benchmarking/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
+	"pallet-balances/runtime-benchmarks",
 	"pallet-collective/runtime-benchmarks",
 	"pallet-identity/runtime-benchmarks",
-	"pallet-balances/runtime-benchmarks"
+	"sp-core-hashing",
+	"sp-runtime/runtime-benchmarks",
 ]
 try-runtime = [
 	"frame-support/try-runtime",
@@ -73,5 +73,5 @@ try-runtime = [
 	"pallet-balances/try-runtime",
 	"pallet-collective?/try-runtime",
 	"pallet-identity/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/asset-conversion/Cargo.toml b/substrate/frame/asset-conversion/Cargo.toml
index 77bfab48bbf..2ad8d9d473e 100644
--- a/substrate/frame/asset-conversion/Cargo.toml
+++ b/substrate/frame/asset-conversion/Cargo.toml
@@ -31,34 +31,34 @@ pallet-assets = { version = "4.0.0-dev", path = "../assets" }
 primitive-types = { version = "0.12.0", default-features = false, features = ["codec", "scale-info", "num-traits"] }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
 	"frame-support/std",
 	"frame-system/std",
-	"scale-info/std",
-	"sp-std/std",
-	"sp-runtime/std",
-	"sp-arithmetic/std",
 	"pallet-assets/std",
 	"pallet-balances/std",
+	"scale-info/std",
 	"sp-api/std",
+	"sp-arithmetic/std",
 	"sp-core/std",
-	"sp-io/std"
+	"sp-io/std",
+	"sp-runtime/std",
+	"sp-std/std",
 ]
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
-	"frame-system/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
+	"frame-system/runtime-benchmarks",
 	"pallet-assets/runtime-benchmarks",
-	"pallet-balances/runtime-benchmarks"
+	"pallet-balances/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
 ]
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"pallet-assets/try-runtime",
 	"pallet-balances/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/asset-rate/Cargo.toml b/substrate/frame/asset-rate/Cargo.toml
index ebea548d88c..4a37be8c452 100644
--- a/substrate/frame/asset-rate/Cargo.toml
+++ b/substrate/frame/asset-rate/Cargo.toml
@@ -30,30 +30,30 @@ sp-io = { version = "23.0.0", path = "../../primitives/io" }
 sp-core = { version = "21.0.0", default-features = false, path = "../../primitives/core" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
 	"frame-support/std",
 	"frame-system/std",
+	"pallet-balances/std",
 	"scale-info/std",
+	"sp-core?/std",
+	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
-	"sp-core?/std",
-	"pallet-balances/std",
-	"sp-io/std"
 ]
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
+	"pallet-balances/runtime-benchmarks",
+	"sp-core",
 	"sp-runtime/runtime-benchmarks",
- 	"sp-core",
-	"pallet-balances/runtime-benchmarks"
 ]
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
+	"pallet-balances/try-runtime",
 	"sp-runtime/try-runtime",
-	"pallet-balances/try-runtime"
 ]
diff --git a/substrate/frame/assets/Cargo.toml b/substrate/frame/assets/Cargo.toml
index adf78b118a0..5795bbb2286 100644
--- a/substrate/frame/assets/Cargo.toml
+++ b/substrate/frame/assets/Cargo.toml
@@ -32,30 +32,30 @@ sp-io = { version = "23.0.0", path = "../../primitives/io" }
 pallet-balances = { version = "4.0.0-dev", path = "../balances" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"codec/std",
+	"frame-benchmarking?/std",
+	"frame-support/std",
+	"frame-system/std",
 	"log/std",
+	"pallet-balances/std",
 	"scale-info/std",
 	"sp-core/std",
-	"sp-std/std",
+	"sp-io/std",
 	"sp-runtime/std",
-	"frame-support/std",
-	"frame-system/std",
-	"frame-benchmarking?/std",
-	"pallet-balances/std",
-	"sp-io/std"
+	"sp-std/std",
 ]
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks",
-	"frame-system/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
-	"pallet-balances/runtime-benchmarks"
+	"frame-system/runtime-benchmarks",
+	"pallet-balances/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
 ]
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"pallet-balances/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/atomic-swap/Cargo.toml b/substrate/frame/atomic-swap/Cargo.toml
index bf5018250d8..da154d4421f 100644
--- a/substrate/frame/atomic-swap/Cargo.toml
+++ b/substrate/frame/atomic-swap/Cargo.toml
@@ -26,21 +26,21 @@ sp-std = { version = "8.0.0", default-features = false, path = "../../primitives
 pallet-balances = { version = "4.0.0-dev", path = "../balances" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"codec/std",
 	"frame-support/std",
 	"frame-system/std",
+	"pallet-balances/std",
 	"scale-info/std",
 	"sp-core/std",
 	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
-	"pallet-balances/std"
 ]
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"pallet-balances/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/aura/Cargo.toml b/substrate/frame/aura/Cargo.toml
index 0c2b812c43d..67eb99fcd5f 100644
--- a/substrate/frame/aura/Cargo.toml
+++ b/substrate/frame/aura/Cargo.toml
@@ -29,25 +29,25 @@ sp-core = { version = "21.0.0", default-features = false, path = "../../primitiv
 sp-io = { version = "23.0.0", path = "../../primitives/io" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"codec/std",
-	"log/std",
 	"frame-support/std",
 	"frame-system/std",
+	"log/std",
 	"pallet-timestamp/std",
 	"scale-info/std",
 	"sp-application-crypto/std",
 	"sp-consensus-aura/std",
+	"sp-core/std",
+	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
-	"sp-core/std",
-	"sp-io/std"
 ]
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"pallet-timestamp/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
 experimental = []
diff --git a/substrate/frame/authority-discovery/Cargo.toml b/substrate/frame/authority-discovery/Cargo.toml
index 4e5025d7c77..4096e2bbd54 100644
--- a/substrate/frame/authority-discovery/Cargo.toml
+++ b/substrate/frame/authority-discovery/Cargo.toml
@@ -32,7 +32,7 @@ sp-core = { version = "21.0.0", path = "../../primitives/core" }
 sp-io = { version = "23.0.0", path = "../../primitives/io" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"codec/std",
 	"frame-support/std",
@@ -41,14 +41,14 @@ std = [
 	"scale-info/std",
 	"sp-application-crypto/std",
 	"sp-authority-discovery/std",
+	"sp-core/std",
+	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
-	"sp-core/std",
-	"sp-io/std"
 ]
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"pallet-session/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/authorship/Cargo.toml b/substrate/frame/authorship/Cargo.toml
index 14329367b09..3dadb1bed3c 100644
--- a/substrate/frame/authorship/Cargo.toml
+++ b/substrate/frame/authorship/Cargo.toml
@@ -28,19 +28,19 @@ sp-core = { version = "21.0.0", path = "../../primitives/core" }
 sp-io = { version = "23.0.0", path = "../../primitives/io" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"codec/std",
 	"frame-support/std",
 	"frame-system/std",
 	"scale-info/std",
+	"sp-core/std",
+	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
-	"sp-core/std",
-	"sp-io/std"
 ]
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/babe/Cargo.toml b/substrate/frame/babe/Cargo.toml
index 34cc6cc09ba..75032fd128d 100644
--- a/substrate/frame/babe/Cargo.toml
+++ b/substrate/frame/babe/Cargo.toml
@@ -40,15 +40,19 @@ pallet-staking-reward-curve = { version = "4.0.0-dev", path = "../staking/reward
 sp-core = { version = "21.0.0", path = "../../primitives/core" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
+	"frame-election-provider-support/std",
 	"frame-support/std",
 	"frame-system/std",
 	"log/std",
 	"pallet-authorship/std",
+	"pallet-balances/std",
+	"pallet-offences/std",
 	"pallet-session/std",
+	"pallet-staking/std",
 	"pallet-timestamp/std",
 	"scale-info/std",
 	"sp-application-crypto/std",
@@ -59,10 +63,6 @@ std = [
 	"sp-session/std",
 	"sp-staking/std",
 	"sp-std/std",
-	"frame-election-provider-support/std",
-	"pallet-balances/std",
-	"pallet-offences/std",
-	"pallet-staking/std"
 ]
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
@@ -74,11 +74,11 @@ runtime-benchmarks = [
 	"pallet-staking/runtime-benchmarks",
 	"pallet-timestamp/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
-	"sp-staking/runtime-benchmarks"
+	"sp-staking/runtime-benchmarks",
 ]
 try-runtime = [
-	"frame-support/try-runtime",
 	"frame-election-provider-support/try-runtime",
+	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"pallet-authorship/try-runtime",
 	"pallet-balances/try-runtime",
@@ -86,5 +86,5 @@ try-runtime = [
 	"pallet-session/try-runtime",
 	"pallet-staking/try-runtime",
 	"pallet-timestamp/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/bags-list/Cargo.toml b/substrate/frame/bags-list/Cargo.toml
index 222d64dc229..aeb0a6c50b9 100644
--- a/substrate/frame/bags-list/Cargo.toml
+++ b/substrate/frame/bags-list/Cargo.toml
@@ -46,44 +46,44 @@ frame-election-provider-support = { version = "4.0.0-dev", path = "../election-p
 frame-benchmarking = { version = "4.0.0-dev", path = "../benchmarking" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
-	"sp-tracing?/std",
-	"sp-io?/std",
-	"sp-core?/std",
-	"pallet-balances?/std",
-	"frame-benchmarking?/std",
-	"scale-info/std",
 	"codec/std",
-	"sp-runtime/std",
-	"sp-std/std",
+	"frame-benchmarking?/std",
+	"frame-election-provider-support/std",
 	"frame-support/std",
 	"frame-system/std",
-	"frame-election-provider-support/std",
 	"log/std",
+	"pallet-balances?/std",
+	"scale-info/std",
+	"sp-core?/std",
+	"sp-io?/std",
+	"sp-runtime/std",
+	"sp-std/std",
+	"sp-tracing?/std",
 ]
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
-	"sp-core",
-	"sp-io",
-	"pallet-balances/runtime-benchmarks",
-	"sp-tracing",
 	"frame-election-provider-support/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks"
+	"pallet-balances/runtime-benchmarks",
+	"sp-core",
+	"sp-io",
+	"sp-runtime/runtime-benchmarks",
+	"sp-tracing",
 ]
 fuzz = [
+	"frame-election-provider-support/fuzz",
+	"pallet-balances",
 	"sp-core",
 	"sp-io",
-	"pallet-balances",
 	"sp-tracing",
-	"frame-election-provider-support/fuzz",
 ]
 try-runtime = [
-	"frame-support/try-runtime",
 	"frame-election-provider-support/try-runtime",
+	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"pallet-balances?/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/balances/Cargo.toml b/substrate/frame/balances/Cargo.toml
index 549ed3936a9..861843b8894 100644
--- a/substrate/frame/balances/Cargo.toml
+++ b/substrate/frame/balances/Cargo.toml
@@ -29,19 +29,19 @@ sp-io = { version = "23.0.0", path = "../../primitives/io" }
 paste = "1.0.12"
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
 	"frame-support/std",
 	"frame-system/std",
 	"log/std",
+	"pallet-transaction-payment/std",
 	"scale-info/std",
+	"sp-core/std",
+	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
-	"pallet-transaction-payment/std",
-	"sp-core/std",
-	"sp-io/std"
 ]
 # Enable support for setting the existential deposit to zero.
 insecure_zero_ed = []
@@ -49,11 +49,11 @@ runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks"
+	"sp-runtime/runtime-benchmarks",
 ]
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"pallet-transaction-payment/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/beefy-mmr/Cargo.toml b/substrate/frame/beefy-mmr/Cargo.toml
index 97ad80fa7ac..af3ecf4d03b 100644
--- a/substrate/frame/beefy-mmr/Cargo.toml
+++ b/substrate/frame/beefy-mmr/Cargo.toml
@@ -33,7 +33,7 @@ array-bytes = "6.1"
 sp-staking = { version = "4.0.0-dev", path = "../../primitives/staking" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"array-bytes",
 	"binary-merkle-tree/std",
@@ -46,14 +46,14 @@ std = [
 	"pallet-session/std",
 	"scale-info/std",
 	"serde",
+	"sp-api/std",
 	"sp-consensus-beefy/std",
 	"sp-core/std",
 	"sp-io/std",
 	"sp-runtime/std",
-	"sp-std/std",
-	"sp-api/std",
 	"sp-staking/std",
-	"sp-state-machine/std"
+	"sp-state-machine/std",
+	"sp-std/std",
 ]
 try-runtime = [
 	"frame-support/try-runtime",
@@ -61,5 +61,5 @@ try-runtime = [
 	"pallet-beefy/try-runtime",
 	"pallet-mmr/try-runtime",
 	"pallet-session/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/beefy/Cargo.toml b/substrate/frame/beefy/Cargo.toml
index 91cb8e072ca..7196d8b7d55 100644
--- a/substrate/frame/beefy/Cargo.toml
+++ b/substrate/frame/beefy/Cargo.toml
@@ -36,33 +36,33 @@ sp-staking = { version = "4.0.0-dev", path = "../../primitives/staking" }
 sp-state-machine = { version = "0.28.0", default-features = false, path = "../../primitives/state-machine" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"codec/std",
-	"log/std",
+	"frame-election-provider-support/std",
 	"frame-support/std",
 	"frame-system/std",
+	"log/std",
 	"pallet-authorship/std",
+	"pallet-balances/std",
+	"pallet-offences/std",
 	"pallet-session/std",
+	"pallet-staking/std",
+	"pallet-timestamp/std",
 	"scale-info/std",
 	"serde/std",
 	"sp-consensus-beefy/std",
+	"sp-core/std",
+	"sp-io/std",
 	"sp-runtime/std",
 	"sp-session/std",
 	"sp-staking/std",
+	"sp-state-machine/std",
 	"sp-std/std",
-	"frame-election-provider-support/std",
-	"pallet-balances/std",
-	"pallet-offences/std",
-	"pallet-staking/std",
-	"pallet-timestamp/std",
-	"sp-core/std",
-	"sp-io/std",
-	"sp-state-machine/std"
 ]
 try-runtime = [
-	"frame-support/try-runtime",
 	"frame-election-provider-support/try-runtime",
+	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"pallet-authorship/try-runtime",
 	"pallet-balances/try-runtime",
@@ -70,5 +70,5 @@ try-runtime = [
 	"pallet-session/try-runtime",
 	"pallet-staking/try-runtime",
 	"pallet-timestamp/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/benchmarking/Cargo.toml b/substrate/frame/benchmarking/Cargo.toml
index 414b1b23014..6a089c230cf 100644
--- a/substrate/frame/benchmarking/Cargo.toml
+++ b/substrate/frame/benchmarking/Cargo.toml
@@ -38,9 +38,10 @@ rusty-fork = { version = "0.3.0", default-features = false }
 sp-keystore = { version = "0.27.0", path = "../../primitives/keystore" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"codec/std",
+	"frame-support-procedural/std",
 	"frame-support/std",
 	"frame-system/std",
 	"linregress",
@@ -51,15 +52,14 @@ std = [
 	"sp-application-crypto/std",
 	"sp-core/std",
 	"sp-io/std",
+	"sp-keystore/std",
 	"sp-runtime-interface/std",
 	"sp-runtime/std",
 	"sp-std/std",
 	"sp-storage/std",
-	"frame-support-procedural/std",
-	"sp-keystore/std"
 ]
 runtime-benchmarks = [
-	"frame-system/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks"
+	"frame-system/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
 ]
diff --git a/substrate/frame/benchmarking/pov/Cargo.toml b/substrate/frame/benchmarking/pov/Cargo.toml
index c0ba8285519..2329565893b 100644
--- a/substrate/frame/benchmarking/pov/Cargo.toml
+++ b/substrate/frame/benchmarking/pov/Cargo.toml
@@ -22,7 +22,7 @@ sp-runtime = { version = "24.0.0", default-features = false, path = "../../../pr
 sp-std = { version = "8.0.0", default-features = false, path = "../../../primitives/std" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"codec/std",
 	"frame-benchmarking/std",
@@ -34,13 +34,13 @@ std = [
 	"sp-std/std",
 ]
 runtime-benchmarks = [
-	"frame-system/runtime-benchmarks",
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks"
+	"frame-system/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
 ]
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/bounties/Cargo.toml b/substrate/frame/bounties/Cargo.toml
index 950284e2682..38a7216e8dd 100644
--- a/substrate/frame/bounties/Cargo.toml
+++ b/substrate/frame/bounties/Cargo.toml
@@ -31,20 +31,20 @@ sp-std = { version = "8.0.0", default-features = false, path = "../../primitives
 pallet-balances = { version = "4.0.0-dev", path = "../balances" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
-	"frame-benchmarking?/std",
 	"codec/std",
+	"frame-benchmarking?/std",
 	"frame-support/std",
 	"frame-system/std",
 	"log/std",
+	"pallet-balances/std",
 	"pallet-treasury/std",
 	"scale-info/std",
 	"sp-core/std",
 	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
-	"pallet-balances/std"
 ]
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
@@ -52,12 +52,12 @@ runtime-benchmarks = [
 	"frame-system/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
 	"pallet-treasury/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks"
+	"sp-runtime/runtime-benchmarks",
 ]
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"pallet-balances/try-runtime",
 	"pallet-treasury/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/child-bounties/Cargo.toml b/substrate/frame/child-bounties/Cargo.toml
index 7613c462eb0..2db68263a02 100644
--- a/substrate/frame/child-bounties/Cargo.toml
+++ b/substrate/frame/child-bounties/Cargo.toml
@@ -32,13 +32,14 @@ sp-std = { version = "8.0.0", default-features = false, path = "../../primitives
 pallet-balances = { version = "4.0.0-dev", path = "../balances" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
-	"frame-benchmarking?/std",
 	"codec/std",
+	"frame-benchmarking?/std",
 	"frame-support/std",
 	"frame-system/std",
 	"log/std",
+	"pallet-balances/std",
 	"pallet-bounties/std",
 	"pallet-treasury/std",
 	"scale-info/std",
@@ -46,17 +47,16 @@ std = [
 	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
-	"pallet-balances/std"
 ]
 runtime-benchmarks = [
 	"frame-benchmarking",
+	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
-	"frame-benchmarking/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
 	"pallet-bounties/runtime-benchmarks",
 	"pallet-treasury/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks"
+	"sp-runtime/runtime-benchmarks",
 ]
 try-runtime = [
 	"frame-support/try-runtime",
@@ -64,5 +64,5 @@ try-runtime = [
 	"pallet-balances/try-runtime",
 	"pallet-bounties/try-runtime",
 	"pallet-treasury/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/collective/Cargo.toml b/substrate/frame/collective/Cargo.toml
index 2ca447434f4..b80de34ecc2 100644
--- a/substrate/frame/collective/Cargo.toml
+++ b/substrate/frame/collective/Cargo.toml
@@ -25,7 +25,7 @@ sp-runtime = { version = "24.0.0", default-features = false, path = "../../primi
 sp-std = { version = "8.0.0", default-features = false, path = "../../primitives/std" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
@@ -47,5 +47,5 @@ runtime-benchmarks = [
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/contracts/Cargo.toml b/substrate/frame/contracts/Cargo.toml
index a5c309adc97..3ad5367678d 100644
--- a/substrate/frame/contracts/Cargo.toml
+++ b/substrate/frame/contracts/Cargo.toml
@@ -64,45 +64,45 @@ pallet-proxy = { version = "4.0.0-dev", path = "../proxy" }
 sp-keystore = { version = "0.27.0", path = "../../primitives/keystore" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
-	"serde",
 	"codec/std",
-	"scale-info/std",
-	"sp-core/std",
-	"sp-runtime/std",
-	"sp-io/std",
-	"sp-std/std",
+	"environmental/std",
 	"frame-benchmarking?/std",
 	"frame-support/std",
 	"frame-system/std",
-	"wasm-instrument/std",
-	"wasmi/std",
-	"pallet-contracts-primitives/std",
-	"pallet-contracts-proc-macro/full",
 	"log/std",
-	"rand/std",
-	"environmental/std",
 	"pallet-balances?/std",
+	"pallet-contracts-primitives/std",
+	"pallet-contracts-proc-macro/full",
 	"pallet-insecure-randomness-collective-flip/std",
 	"pallet-proxy/std",
 	"pallet-timestamp/std",
 	"pallet-utility/std",
+	"rand/std",
+	"scale-info/std",
+	"serde",
 	"sp-api/std",
-	"sp-keystore/std"
+	"sp-core/std",
+	"sp-io/std",
+	"sp-keystore/std",
+	"sp-runtime/std",
+	"sp-std/std",
+	"wasm-instrument/std",
+	"wasmi/std",
 ]
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
-	"rand",
-	"rand_pcg",
-	"wasm-instrument",
-	"pallet-balances/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
+	"pallet-balances/runtime-benchmarks",
 	"pallet-proxy/runtime-benchmarks",
 	"pallet-timestamp/runtime-benchmarks",
 	"pallet-utility/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks"
+	"rand",
+	"rand_pcg",
+	"sp-runtime/runtime-benchmarks",
+	"wasm-instrument",
 ]
 try-runtime = [
 	"frame-support/try-runtime",
diff --git a/substrate/frame/contracts/primitives/Cargo.toml b/substrate/frame/contracts/primitives/Cargo.toml
index facfe34e1bc..c868035c240 100644
--- a/substrate/frame/contracts/primitives/Cargo.toml
+++ b/substrate/frame/contracts/primitives/Cargo.toml
@@ -23,11 +23,11 @@ sp-runtime = { version = "24.0.0", default-features = false, path = "../../../pr
 sp-weights = { version = "20.0.0", default-features = false, path = "../../../primitives/weights" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"codec/std",
+	"scale-info/std",
 	"sp-runtime/std",
 	"sp-std/std",
-	"scale-info/std",
-	"sp-weights/std"
+	"sp-weights/std",
 ]
diff --git a/substrate/frame/conviction-voting/Cargo.toml b/substrate/frame/conviction-voting/Cargo.toml
index cdc50340f77..c5e1e5b9905 100644
--- a/substrate/frame/conviction-voting/Cargo.toml
+++ b/substrate/frame/conviction-voting/Cargo.toml
@@ -33,34 +33,34 @@ pallet-scheduler = { version = "4.0.0-dev", path = "../scheduler" }
 sp-core = { version = "21.0.0", path = "../../primitives/core" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
 	"frame-support/std",
 	"frame-system/std",
+	"pallet-balances/std",
+	"pallet-scheduler/std",
 	"scale-info/std",
 	"serde",
+	"sp-core/std",
 	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
-	"pallet-balances/std",
-	"pallet-scheduler/std",
-	"sp-core/std"
 ]
 runtime-benchmarks = [
-	"frame-support/runtime-benchmarks",
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
+	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
-	"pallet-scheduler/runtime-benchmarks"
+	"pallet-scheduler/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
 ]
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"pallet-balances/try-runtime",
 	"pallet-scheduler/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/core-fellowship/Cargo.toml b/substrate/frame/core-fellowship/Cargo.toml
index 0d2cb7904ef..981e71c6513 100644
--- a/substrate/frame/core-fellowship/Cargo.toml
+++ b/substrate/frame/core-fellowship/Cargo.toml
@@ -26,7 +26,7 @@ sp-runtime = { version = "24.0.0", default-features = false, path = "../../primi
 sp-std = { version = "8.0.0", default-features = false, path = "../../primitives/std" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
@@ -49,5 +49,5 @@ runtime-benchmarks = [
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/democracy/Cargo.toml b/substrate/frame/democracy/Cargo.toml
index f29af914295..71e52ed73be 100644
--- a/substrate/frame/democracy/Cargo.toml
+++ b/substrate/frame/democracy/Cargo.toml
@@ -33,30 +33,30 @@ pallet-scheduler = { version = "4.0.0-dev", path = "../scheduler" }
 pallet-preimage = { version = "4.0.0-dev", path = "../preimage" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
 	"frame-support/std",
 	"frame-system/std",
+	"pallet-balances/std",
+	"pallet-preimage/std",
+	"pallet-scheduler/std",
 	"scale-info/std",
 	"serde",
+	"sp-core/std",
 	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
-	"sp-core/std",
-	"pallet-balances/std",
-	"pallet-preimage/std",
-	"pallet-scheduler/std"
 ]
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
 	"pallet-preimage/runtime-benchmarks",
-	"pallet-scheduler/runtime-benchmarks"
+	"pallet-scheduler/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
 ]
 try-runtime = [
 	"frame-support/try-runtime",
@@ -64,5 +64,5 @@ try-runtime = [
 	"pallet-balances/try-runtime",
 	"pallet-preimage/try-runtime",
 	"pallet-scheduler/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/election-provider-multi-phase/Cargo.toml b/substrate/frame/election-provider-multi-phase/Cargo.toml
index a971897a751..0ccde14bc4c 100644
--- a/substrate/frame/election-provider-multi-phase/Cargo.toml
+++ b/substrate/frame/election-provider-multi-phase/Cargo.toml
@@ -48,46 +48,43 @@ pallet-balances = { version = "4.0.0-dev", path = "../balances" }
 frame-benchmarking = { version = "4.0.0-dev", path = "../benchmarking" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
-	"pallet-election-provider-support-benchmarking?/std",
 	"codec/std",
-	"scale-info/std",
-	"log/std",
-
+	"frame-benchmarking?/std",
+	"frame-election-provider-support/std",
 	"frame-support/std",
 	"frame-system/std",
-
-	"sp-io/std",
-	"sp-std/std",
-	"sp-core/std",
-	"sp-runtime/std",
-	"sp-npos-elections/std",
-	"sp-arithmetic/std",
-	"frame-election-provider-support/std",
 	"log/std",
-
-	"frame-benchmarking?/std",
+	"log/std",
+	"pallet-balances/std",
+	"pallet-election-provider-support-benchmarking?/std",
 	"rand/std",
+	"scale-info/std",
+	"sp-arithmetic/std",
+	"sp-core/std",
+	"sp-io/std",
+	"sp-npos-elections/std",
+	"sp-runtime/std",
+	"sp-std/std",
+	"sp-tracing/std",
 	"strum/std",
-	"pallet-balances/std",
-	"sp-tracing/std"
 ]
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-election-provider-support/runtime-benchmarks",
-	"rand",
-	"strum",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
 	"pallet-election-provider-support-benchmarking?/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks"
+	"rand",
+	"sp-runtime/runtime-benchmarks",
+	"strum",
 ]
 try-runtime = [
-	"frame-support/try-runtime",
 	"frame-election-provider-support/try-runtime",
+	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"pallet-balances/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/election-provider-support/Cargo.toml b/substrate/frame/election-provider-support/Cargo.toml
index 2aeb06b0442..975be4ee040 100644
--- a/substrate/frame/election-provider-support/Cargo.toml
+++ b/substrate/frame/election-provider-support/Cargo.toml
@@ -29,27 +29,27 @@ sp-io = { version = "23.0.0", path = "../../primitives/io" }
 sp-npos-elections = { version = "4.0.0-dev", path = "../../primitives/npos-elections" }
 
 [features]
-default = ["std"]
-fuzz = ["default"]
+default = [ "std" ]
+fuzz = [ "default" ]
 std = [
 	"codec/std",
 	"frame-support/std",
 	"frame-system/std",
 	"scale-info/std",
 	"sp-arithmetic/std",
-	"sp-npos-elections/std",
 	"sp-core/std",
+	"sp-io/std",
+	"sp-npos-elections/std",
 	"sp-runtime/std",
 	"sp-std/std",
-	"sp-io/std"
 ]
 runtime-benchmarks = [
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks"
+	"sp-runtime/runtime-benchmarks",
 ]
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/election-provider-support/benchmarking/Cargo.toml b/substrate/frame/election-provider-support/benchmarking/Cargo.toml
index 2614c61d435..28eef6ec6d6 100644
--- a/substrate/frame/election-provider-support/benchmarking/Cargo.toml
+++ b/substrate/frame/election-provider-support/benchmarking/Cargo.toml
@@ -22,7 +22,7 @@ sp-npos-elections = { version = "4.0.0-dev", default-features = false, path = ".
 sp-runtime = { version = "24.0.0", default-features = false, path = "../../../primitives/runtime" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
@@ -35,5 +35,5 @@ runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-election-provider-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks"
+	"sp-runtime/runtime-benchmarks",
 ]
diff --git a/substrate/frame/elections-phragmen/Cargo.toml b/substrate/frame/elections-phragmen/Cargo.toml
index ac4f2411dd2..b8c2efdc068 100644
--- a/substrate/frame/elections-phragmen/Cargo.toml
+++ b/substrate/frame/elections-phragmen/Cargo.toml
@@ -35,22 +35,22 @@ sp-tracing = { path = "../../primitives/tracing" }
 substrate-test-utils = { version = "4.0.0-dev", path = "../../test-utils" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
-	"frame-benchmarking?/std",
 	"codec/std",
+	"frame-benchmarking?/std",
 	"frame-support/std",
 	"frame-system/std",
 	"log/std",
+	"pallet-balances/std",
 	"scale-info/std",
 	"sp-core/std",
 	"sp-io/std",
 	"sp-npos-elections/std",
 	"sp-runtime/std",
-	"sp-std/std",
-	"pallet-balances/std",
 	"sp-staking/std",
-	"sp-tracing/std"
+	"sp-std/std",
+	"sp-tracing/std",
 ]
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
@@ -58,11 +58,11 @@ runtime-benchmarks = [
 	"frame-system/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
-	"sp-staking/runtime-benchmarks"
+	"sp-staking/runtime-benchmarks",
 ]
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"pallet-balances/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/examples/Cargo.toml b/substrate/frame/examples/Cargo.toml
index af67bef792b..e636bc67ea8 100644
--- a/substrate/frame/examples/Cargo.toml
+++ b/substrate/frame/examples/Cargo.toml
@@ -22,18 +22,18 @@ pallet-example-split = { default-features = false, path = "./split" }
 [features]
 default = [ "std" ]
 std = [
-    "pallet-example-basic/std",
-    "pallet-default-config-example/std",
-    "pallet-example-offchain-worker/std",
-    "pallet-example-kitchensink/std",
-    "pallet-dev-mode/std",
-    "pallet-example-split/std",
+	"pallet-default-config-example/std",
+	"pallet-dev-mode/std",
+	"pallet-example-basic/std",
+	"pallet-example-kitchensink/std",
+	"pallet-example-offchain-worker/std",
+	"pallet-example-split/std",
 ]
 try-runtime = [
-    "pallet-example-basic/try-runtime",
-    "pallet-default-config-example/try-runtime",
-    "pallet-example-offchain-worker/try-runtime",
-    "pallet-example-kitchensink/try-runtime",
-    "pallet-dev-mode/try-runtime",
-    "pallet-example-split/try-runtime",
+	"pallet-default-config-example/try-runtime",
+	"pallet-dev-mode/try-runtime",
+	"pallet-example-basic/try-runtime",
+	"pallet-example-kitchensink/try-runtime",
+	"pallet-example-offchain-worker/try-runtime",
+	"pallet-example-split/try-runtime",
 ]
diff --git a/substrate/frame/examples/basic/Cargo.toml b/substrate/frame/examples/basic/Cargo.toml
index 60bfa1352f4..667afb23c83 100644
--- a/substrate/frame/examples/basic/Cargo.toml
+++ b/substrate/frame/examples/basic/Cargo.toml
@@ -28,7 +28,7 @@ sp-std = { version = "8.0.0", default-features = false, path = "../../../primiti
 sp-core = { version = "21.0.0", default-features = false, path = "../../../primitives/core" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
@@ -37,21 +37,21 @@ std = [
 	"log/std",
 	"pallet-balances/std",
 	"scale-info/std",
+	"sp-core/std",
 	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
-	"sp-core/std"
 ]
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks"
+	"sp-runtime/runtime-benchmarks",
 ]
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"pallet-balances/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/examples/default-config/Cargo.toml b/substrate/frame/examples/default-config/Cargo.toml
index eac342b736f..fbb14730fe7 100644
--- a/substrate/frame/examples/default-config/Cargo.toml
+++ b/substrate/frame/examples/default-config/Cargo.toml
@@ -24,7 +24,7 @@ sp-runtime = { default-features = false, path = "../../../primitives/runtime" }
 sp-std = { default-features = false, path = "../../../primitives/std" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"codec/std",
 	"frame-support/std",
@@ -38,5 +38,5 @@ std = [
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/examples/dev-mode/Cargo.toml b/substrate/frame/examples/dev-mode/Cargo.toml
index 66b87a5b524..1dda112bf08 100644
--- a/substrate/frame/examples/dev-mode/Cargo.toml
+++ b/substrate/frame/examples/dev-mode/Cargo.toml
@@ -27,7 +27,7 @@ sp-std = { version = "8.0.0", default-features = false, path = "../../../primiti
 sp-core = { version = "21.0.0", default-features = false, path = "../../../primitives/core" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"codec/std",
 	"frame-support/std",
@@ -35,14 +35,14 @@ std = [
 	"log/std",
 	"pallet-balances/std",
 	"scale-info/std",
+	"sp-core/std",
 	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
-	"sp-core/std"
 ]
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"pallet-balances/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/examples/kitchensink/Cargo.toml b/substrate/frame/examples/kitchensink/Cargo.toml
index 0537f497b64..94226011571 100644
--- a/substrate/frame/examples/kitchensink/Cargo.toml
+++ b/substrate/frame/examples/kitchensink/Cargo.toml
@@ -31,34 +31,30 @@ pallet-balances = { version = "4.0.0-dev", default-features = false, path = "../
 sp-core = { version = "21.0.0", default-features = false, path = "../../../primitives/core" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"codec/std",
-	"log/std",
-	"scale-info/std",
-
+	"frame-benchmarking?/std",
 	"frame-support/std",
 	"frame-system/std",
-
+	"log/std",
+	"pallet-balances/std",
+	"scale-info/std",
+	"sp-core/std",
 	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
-
-	"frame-benchmarking?/std",
-
-	"pallet-balances/std",
-	"sp-core/std"
 ]
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks"
+	"sp-runtime/runtime-benchmarks",
 ]
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"pallet-balances/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/examples/offchain-worker/Cargo.toml b/substrate/frame/examples/offchain-worker/Cargo.toml
index dd3f8e070d5..f3359ee77e1 100644
--- a/substrate/frame/examples/offchain-worker/Cargo.toml
+++ b/substrate/frame/examples/offchain-worker/Cargo.toml
@@ -26,7 +26,7 @@ sp-runtime = { version = "24.0.0", default-features = false, path = "../../../pr
 sp-std = { version = "8.0.0", default-features = false, path = "../../../primitives/std" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"codec/std",
 	"frame-support/std",
@@ -36,12 +36,12 @@ std = [
 	"scale-info/std",
 	"sp-core/std",
 	"sp-io/std",
- 	"sp-keystore/std",
- 	"sp-runtime/std",
- 	"sp-std/std"
+	"sp-keystore/std",
+	"sp-runtime/std",
+	"sp-std/std",
 ]
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/examples/split/Cargo.toml b/substrate/frame/examples/split/Cargo.toml
index 3ef5b5a070b..f64d79855a1 100644
--- a/substrate/frame/examples/split/Cargo.toml
+++ b/substrate/frame/examples/split/Cargo.toml
@@ -29,27 +29,21 @@ frame-benchmarking = { version = "4.0.0-dev", default-features = false, optional
 sp-core = { version = "21.0.0", default-features = false, path = "../../../primitives/core" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"codec/std",
-	"log/std",
-	"scale-info/std",
-
+	"frame-benchmarking?/std",
 	"frame-support/std",
 	"frame-system/std",
-
+	"log/std",
+	"scale-info/std",
+	"sp-core/std",
 	"sp-io/std",
 	"sp-std/std",
-
-	"frame-benchmarking?/std",
-	"sp-core/std"
 ]
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
-	"frame-system/runtime-benchmarks"
-]
-try-runtime = [
-	"frame-support/try-runtime",
-	"frame-system/try-runtime"
+	"frame-system/runtime-benchmarks",
 ]
+try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime" ]
diff --git a/substrate/frame/executive/Cargo.toml b/substrate/frame/executive/Cargo.toml
index 71ec08472d6..48cbb47fe7d 100644
--- a/substrate/frame/executive/Cargo.toml
+++ b/substrate/frame/executive/Cargo.toml
@@ -37,30 +37,30 @@ sp-io = { version = "23.0.0", path = "../../primitives/io" }
 sp-version = { version = "22.0.0", path = "../../primitives/version" }
 
 [features]
-default = ["std"]
-with-tracing = ["sp-tracing/with-tracing"]
+default = [ "std" ]
+with-tracing = [ "sp-tracing/with-tracing" ]
 std = [
 	"codec/std",
-	"log/std",
 	"frame-support/std",
 	"frame-system/std",
 	"frame-try-runtime/std",
+	"log/std",
+	"pallet-balances/std",
+	"pallet-transaction-payment/std",
 	"scale-info/std",
 	"sp-core/std",
+	"sp-inherents/std",
 	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
 	"sp-tracing/std",
-	"pallet-balances/std",
-	"pallet-transaction-payment/std",
-	"sp-inherents/std",
-	"sp-version/std"
+	"sp-version/std",
 ]
 try-runtime = [
 	"frame-support/try-runtime",
-	"frame-try-runtime/try-runtime",
-	"sp-runtime/try-runtime",
 	"frame-system/try-runtime",
+	"frame-try-runtime/try-runtime",
 	"pallet-balances/try-runtime",
-	"pallet-transaction-payment/try-runtime"
+	"pallet-transaction-payment/try-runtime",
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/fast-unstake/Cargo.toml b/substrate/frame/fast-unstake/Cargo.toml
index 8b48537843d..6e67253f762 100644
--- a/substrate/frame/fast-unstake/Cargo.toml
+++ b/substrate/frame/fast-unstake/Cargo.toml
@@ -39,46 +39,42 @@ pallet-balances = { path = "../balances" }
 pallet-timestamp = { path = "../timestamp" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"codec/std",
-	"log/std",
-	"scale-info/std",
-
+	"frame-benchmarking/std",
+	"frame-election-provider-support/std",
 	"frame-support/std",
 	"frame-system/std",
-
-	"sp-io/std",
-	"sp-staking/std",
-	"sp-runtime/std",
-	"sp-std/std",
-
-	"frame-election-provider-support/std",
-
-	"frame-benchmarking/std",
+	"log/std",
 	"pallet-balances/std",
 	"pallet-staking/std",
 	"pallet-timestamp/std",
+	"scale-info/std",
 	"sp-core/std",
-	"sp-tracing/std"
+	"sp-io/std",
+	"sp-runtime/std",
+	"sp-staking/std",
+	"sp-std/std",
+	"sp-tracing/std",
 ]
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
-	"frame-system/runtime-benchmarks",
-	"sp-staking/runtime-benchmarks",
 	"frame-election-provider-support/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
+	"frame-system/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
 	"pallet-staking/runtime-benchmarks",
 	"pallet-timestamp/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks"
+	"sp-runtime/runtime-benchmarks",
+	"sp-staking/runtime-benchmarks",
 ]
 try-runtime = [
-	"frame-support/try-runtime",
 	"frame-election-provider-support/try-runtime",
+	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"pallet-balances/try-runtime",
 	"pallet-staking/try-runtime",
 	"pallet-timestamp/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/glutton/Cargo.toml b/substrate/frame/glutton/Cargo.toml
index afaa7fdcf97..65b01e8390b 100644
--- a/substrate/frame/glutton/Cargo.toml
+++ b/substrate/frame/glutton/Cargo.toml
@@ -29,31 +29,31 @@ sp-std = { version = "8.0.0", default-features = false, path = "../../primitives
 pallet-balances = { version = "4.0.0-dev", path = "../balances" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"blake2/std",
 	"codec/std",
 	"frame-benchmarking?/std",
 	"frame-support/std",
 	"frame-system/std",
+	"pallet-balances/std",
 	"scale-info/std",
 	"sp-core/std",
 	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
-	"pallet-balances/std"
 ]
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"pallet-balances/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
 
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
+	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
+	"pallet-balances/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
-	"frame-support/runtime-benchmarks",
-	"pallet-balances/runtime-benchmarks"
 ]
diff --git a/substrate/frame/grandpa/Cargo.toml b/substrate/frame/grandpa/Cargo.toml
index 1f0d86cc49c..b9f8cc5c2cb 100644
--- a/substrate/frame/grandpa/Cargo.toml
+++ b/substrate/frame/grandpa/Cargo.toml
@@ -42,29 +42,29 @@ pallet-timestamp = { version = "4.0.0-dev", path = "../timestamp" }
 sp-keyring = { version = "24.0.0", path = "../../primitives/keyring" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
+	"frame-election-provider-support/std",
 	"frame-support/std",
 	"frame-system/std",
 	"log/std",
 	"pallet-authorship/std",
+	"pallet-balances/std",
+	"pallet-offences/std",
 	"pallet-session/std",
+	"pallet-staking/std",
+	"pallet-timestamp/std",
 	"scale-info/std",
 	"sp-application-crypto/std",
-	"sp-core/std",
 	"sp-consensus-grandpa/std",
+	"sp-core/std",
 	"sp-io/std",
 	"sp-runtime/std",
 	"sp-session/std",
 	"sp-staking/std",
 	"sp-std/std",
-	"frame-election-provider-support/std",
-	"pallet-balances/std",
-	"pallet-offences/std",
-	"pallet-staking/std",
-	"pallet-timestamp/std"
 ]
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
@@ -76,11 +76,11 @@ runtime-benchmarks = [
 	"pallet-staking/runtime-benchmarks",
 	"pallet-timestamp/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
-	"sp-staking/runtime-benchmarks"
+	"sp-staking/runtime-benchmarks",
 ]
 try-runtime = [
-	"frame-support/try-runtime",
 	"frame-election-provider-support/try-runtime",
+	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"pallet-authorship/try-runtime",
 	"pallet-balances/try-runtime",
@@ -88,5 +88,5 @@ try-runtime = [
 	"pallet-session/try-runtime",
 	"pallet-staking/try-runtime",
 	"pallet-timestamp/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/identity/Cargo.toml b/substrate/frame/identity/Cargo.toml
index 942fba90532..fef4ed400a5 100644
--- a/substrate/frame/identity/Cargo.toml
+++ b/substrate/frame/identity/Cargo.toml
@@ -28,29 +28,29 @@ pallet-balances = { version = "4.0.0-dev", path = "../balances" }
 sp-core = { version = "21.0.0", path = "../../primitives/core" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
 	"frame-support/std",
 	"frame-system/std",
+	"pallet-balances/std",
 	"scale-info/std",
+	"sp-core/std",
 	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
-	"pallet-balances/std",
-	"sp-core/std"
 ]
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks"
+	"sp-runtime/runtime-benchmarks",
 ]
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"pallet-balances/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/im-online/Cargo.toml b/substrate/frame/im-online/Cargo.toml
index 076bf91962e..23e0563a190 100644
--- a/substrate/frame/im-online/Cargo.toml
+++ b/substrate/frame/im-online/Cargo.toml
@@ -31,14 +31,15 @@ sp-std = { version = "8.0.0", default-features = false, path = "../../primitives
 pallet-session = { version = "4.0.0-dev", path = "../session" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
-	"frame-benchmarking?/std",
 	"codec/std",
+	"frame-benchmarking?/std",
 	"frame-support/std",
 	"frame-system/std",
 	"log/std",
 	"pallet-authorship/std",
+	"pallet-session/std",
 	"scale-info/std",
 	"sp-application-crypto/std",
 	"sp-core/std",
@@ -46,19 +47,18 @@ std = [
 	"sp-runtime/std",
 	"sp-staking/std",
 	"sp-std/std",
-	"pallet-session/std"
 ]
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
-	"sp-staking/runtime-benchmarks"
+	"sp-staking/runtime-benchmarks",
 ]
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"pallet-authorship/try-runtime",
 	"pallet-session/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/indices/Cargo.toml b/substrate/frame/indices/Cargo.toml
index 52fe97cc7e0..84e41a0cbed 100644
--- a/substrate/frame/indices/Cargo.toml
+++ b/substrate/frame/indices/Cargo.toml
@@ -28,30 +28,30 @@ sp-std = { version = "8.0.0", default-features = false, path = "../../primitives
 pallet-balances = { version = "4.0.0-dev", path = "../balances" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
-	"frame-benchmarking?/std",
 	"codec/std",
+	"frame-benchmarking?/std",
 	"frame-support/std",
 	"frame-system/std",
+	"pallet-balances/std",
 	"scale-info/std",
 	"sp-core/std",
 	"sp-io/std",
 	"sp-keyring",
 	"sp-runtime/std",
 	"sp-std/std",
-	"pallet-balances/std"
 ]
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks"
+	"sp-runtime/runtime-benchmarks",
 ]
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"pallet-balances/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/insecure-randomness-collective-flip/Cargo.toml b/substrate/frame/insecure-randomness-collective-flip/Cargo.toml
index d078eafacff..6676dac9152 100644
--- a/substrate/frame/insecure-randomness-collective-flip/Cargo.toml
+++ b/substrate/frame/insecure-randomness-collective-flip/Cargo.toml
@@ -26,20 +26,20 @@ sp-core = { version = "21.0.0", path = "../../primitives/core" }
 sp-io = { version = "23.0.0", path = "../../primitives/io" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"codec/std",
 	"frame-support/std",
 	"frame-system/std",
 	"safe-mix/std",
 	"scale-info/std",
+	"sp-core/std",
+	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
-	"sp-core/std",
-	"sp-io/std"
 ]
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/lottery/Cargo.toml b/substrate/frame/lottery/Cargo.toml
index a46bf7feff6..85503edaee4 100644
--- a/substrate/frame/lottery/Cargo.toml
+++ b/substrate/frame/lottery/Cargo.toml
@@ -29,31 +29,31 @@ sp-core = { version = "21.0.0", path = "../../primitives/core" }
 sp-io = { version = "23.0.0", path = "../../primitives/io" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
-	"frame-benchmarking?/std",
 	"codec/std",
+	"frame-benchmarking?/std",
+	"frame-support-test/std",
 	"frame-support/std",
 	"frame-system/std",
+	"pallet-balances/std",
 	"scale-info/std",
+	"sp-core/std",
+	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
-	"frame-support-test/std",
-	"pallet-balances/std",
-	"sp-core/std",
-	"sp-io/std"
 ]
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks"
+	"sp-runtime/runtime-benchmarks",
 ]
 try-runtime = [
-	"frame-support/try-runtime",
 	"frame-support-test/try-runtime",
+	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"pallet-balances/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/membership/Cargo.toml b/substrate/frame/membership/Cargo.toml
index e41a1e09196..e2674cb6405 100644
--- a/substrate/frame/membership/Cargo.toml
+++ b/substrate/frame/membership/Cargo.toml
@@ -25,7 +25,7 @@ sp-runtime = { version = "24.0.0", default-features = false, path = "../../primi
 sp-std = { version = "8.0.0", default-features = false, path = "../../primitives/std" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
@@ -47,5 +47,5 @@ runtime-benchmarks = [
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/merkle-mountain-range/Cargo.toml b/substrate/frame/merkle-mountain-range/Cargo.toml
index 82a24904cc9..3496b84350d 100644
--- a/substrate/frame/merkle-mountain-range/Cargo.toml
+++ b/substrate/frame/merkle-mountain-range/Cargo.toml
@@ -30,13 +30,13 @@ env_logger = "0.9"
 itertools = "0.10.3"
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"codec/std",
-	"log/std",
 	"frame-benchmarking?/std",
 	"frame-support/std",
 	"frame-system/std",
+	"log/std",
 	"scale-info/std",
 	"sp-core/std",
 	"sp-io/std",
@@ -48,10 +48,10 @@ runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks"
+	"sp-runtime/runtime-benchmarks",
 ]
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/message-queue/Cargo.toml b/substrate/frame/message-queue/Cargo.toml
index 929b713b7eb..4fe2b463666 100644
--- a/substrate/frame/message-queue/Cargo.toml
+++ b/substrate/frame/message-queue/Cargo.toml
@@ -31,29 +31,29 @@ rand = "0.8.5"
 rand_distr = "0.4.3"
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"codec/std",
+	"frame-benchmarking?/std",
+	"frame-support/std",
+	"frame-system/std",
 	"scale-info/std",
+	"sp-arithmetic/std",
 	"sp-core/std",
 	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
-	"sp-arithmetic/std",
+	"sp-tracing/std",
 	"sp-weights/std",
-	"frame-benchmarking?/std",
-	"frame-support/std",
-	"frame-system/std",
-	"sp-tracing/std"
 ]
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks"
+	"sp-runtime/runtime-benchmarks",
 ]
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/multisig/Cargo.toml b/substrate/frame/multisig/Cargo.toml
index 07e13e22386..7927fea6207 100644
--- a/substrate/frame/multisig/Cargo.toml
+++ b/substrate/frame/multisig/Cargo.toml
@@ -29,28 +29,28 @@ log = { version = "0.4.17", default-features = false }
 pallet-balances = { version = "4.0.0-dev", path = "../balances" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
-	"frame-benchmarking?/std",
 	"codec/std",
+	"frame-benchmarking?/std",
 	"frame-support/std",
 	"frame-system/std",
+	"pallet-balances/std",
 	"scale-info/std",
 	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
-	"pallet-balances/std"
 ]
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks"
+	"sp-runtime/runtime-benchmarks",
 ]
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"pallet-balances/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/nft-fractionalization/Cargo.toml b/substrate/frame/nft-fractionalization/Cargo.toml
index 8f706a1e00a..b75f3262c2d 100644
--- a/substrate/frame/nft-fractionalization/Cargo.toml
+++ b/substrate/frame/nft-fractionalization/Cargo.toml
@@ -31,7 +31,7 @@ sp-io = { version = "23.0.0", path = "../../primitives/io" }
 sp-std = { version = "8.0.0", path = "../../primitives/std" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"codec/std",
 	"frame-benchmarking/std",
@@ -39,22 +39,22 @@ std = [
 	"frame-system/std",
 	"log/std",
 	"pallet-assets/std",
+	"pallet-balances/std",
 	"pallet-nfts/std",
 	"scale-info/std",
+	"sp-core/std",
+	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
-	"pallet-balances/std",
-	"sp-core/std",
-	"sp-io/std"
 ]
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
-	"frame-system/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
+	"frame-system/runtime-benchmarks",
 	"pallet-assets/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
-	"pallet-nfts/runtime-benchmarks"
+	"pallet-nfts/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
 ]
 try-runtime = [
 	"frame-support/try-runtime",
@@ -62,5 +62,5 @@ try-runtime = [
 	"pallet-assets/try-runtime",
 	"pallet-balances/try-runtime",
 	"pallet-nfts/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/nfts/Cargo.toml b/substrate/frame/nfts/Cargo.toml
index d378803f5de..126e4439b50 100644
--- a/substrate/frame/nfts/Cargo.toml
+++ b/substrate/frame/nfts/Cargo.toml
@@ -30,31 +30,31 @@ pallet-balances = { version = "4.0.0-dev", path = "../balances" }
 sp-keystore = { version = "0.27.0", path = "../../primitives/keystore" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
 	"frame-support/std",
 	"frame-system/std",
 	"log/std",
+	"pallet-balances/std",
 	"scale-info/std",
 	"sp-core/std",
 	"sp-io/std",
+	"sp-keystore/std",
 	"sp-runtime/std",
 	"sp-std/std",
-	"pallet-balances/std",
-	"sp-keystore/std"
 ]
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
+	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
+	"pallet-balances/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
-	"frame-support/runtime-benchmarks",
-	"pallet-balances/runtime-benchmarks"
 ]
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"pallet-balances/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/nfts/runtime-api/Cargo.toml b/substrate/frame/nfts/runtime-api/Cargo.toml
index bf5f9f0ec00..a3e08708ae1 100644
--- a/substrate/frame/nfts/runtime-api/Cargo.toml
+++ b/substrate/frame/nfts/runtime-api/Cargo.toml
@@ -19,10 +19,5 @@ pallet-nfts = { version = "4.0.0-dev", default-features = false, path = "../../n
 sp-api = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/api" }
 
 [features]
-default = ["std"]
-std = [
-	"codec/std",
-    "frame-support/std",
-	"pallet-nfts/std",
-	"sp-api/std",
-]
+default = [ "std" ]
+std = [ "codec/std", "frame-support/std", "pallet-nfts/std", "sp-api/std" ]
diff --git a/substrate/frame/nicks/Cargo.toml b/substrate/frame/nicks/Cargo.toml
index 450fee2abcc..129c99d310d 100644
--- a/substrate/frame/nicks/Cargo.toml
+++ b/substrate/frame/nicks/Cargo.toml
@@ -26,21 +26,21 @@ pallet-balances = { version = "4.0.0-dev", path = "../balances" }
 sp-core = { version = "21.0.0", path = "../../primitives/core" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"codec/std",
 	"frame-support/std",
 	"frame-system/std",
+	"pallet-balances/std",
 	"scale-info/std",
+	"sp-core/std",
 	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
-	"pallet-balances/std",
-	"sp-core/std"
 ]
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"pallet-balances/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/nis/Cargo.toml b/substrate/frame/nis/Cargo.toml
index bad1bed8f90..2b012bbe91a 100644
--- a/substrate/frame/nis/Cargo.toml
+++ b/substrate/frame/nis/Cargo.toml
@@ -28,30 +28,30 @@ pallet-balances = { version = "4.0.0-dev", path = "../balances" }
 sp-io = { version = "23.0.0", path = "../../primitives/io" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
 	"frame-support/std",
 	"frame-system/std",
+	"pallet-balances/std",
 	"scale-info/std",
 	"sp-arithmetic/std",
 	"sp-core/std",
+	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
-	"pallet-balances/std",
-	"sp-io/std"
 ]
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks"
+	"sp-runtime/runtime-benchmarks",
 ]
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"pallet-balances/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/node-authorization/Cargo.toml b/substrate/frame/node-authorization/Cargo.toml
index 24155841271..b801d736498 100644
--- a/substrate/frame/node-authorization/Cargo.toml
+++ b/substrate/frame/node-authorization/Cargo.toml
@@ -23,7 +23,7 @@ sp-runtime = { version = "24.0.0", default-features = false, path = "../../primi
 sp-std = { version = "8.0.0", default-features = false, path = "../../primitives/std" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"codec/std",
 	"frame-support/std",
@@ -38,5 +38,5 @@ std = [
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/nomination-pools/Cargo.toml b/substrate/frame/nomination-pools/Cargo.toml
index f3b9a025ecf..e0158215e79 100644
--- a/substrate/frame/nomination-pools/Cargo.toml
+++ b/substrate/frame/nomination-pools/Cargo.toml
@@ -35,32 +35,32 @@ pallet-balances = { version = "4.0.0-dev", path = "../balances" }
 sp-tracing = { version = "10.0.0", path = "../../primitives/tracing" }
 
 [features]
-default = ["std"]
-fuzzing = ["pallet-balances", "sp-tracing"]
+default = [ "std" ]
+fuzzing = [ "pallet-balances", "sp-tracing" ]
 std = [
 	"codec/std",
-	"scale-info/std",
 	"frame-support/std",
 	"frame-system/std",
-	"sp-runtime/std",
-	"sp-std/std",
-	"sp-io/std",
-	"sp-staking/std",
-	"sp-core/std",
 	"log/std",
 	"pallet-balances?/std",
-	"sp-tracing?/std"
+	"scale-info/std",
+	"sp-core/std",
+	"sp-io/std",
+	"sp-runtime/std",
+	"sp-staking/std",
+	"sp-std/std",
+	"sp-tracing?/std",
 ]
 runtime-benchmarks = [
-	"sp-staking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"pallet-balances?/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks"
+	"sp-runtime/runtime-benchmarks",
+	"sp-staking/runtime-benchmarks",
 ]
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"pallet-balances?/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/nomination-pools/benchmarking/Cargo.toml b/substrate/frame/nomination-pools/benchmarking/Cargo.toml
index 38b79d2dabc..836f65e849f 100644
--- a/substrate/frame/nomination-pools/benchmarking/Cargo.toml
+++ b/substrate/frame/nomination-pools/benchmarking/Cargo.toml
@@ -40,7 +40,7 @@ sp-core = { version = "21.0.0", path = "../../../primitives/core" }
 sp-io = { version = "23.0.0", path = "../../../primitives/io" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 
 std = [
 	"frame-benchmarking/std",
@@ -48,28 +48,28 @@ std = [
 	"frame-support/std",
 	"frame-system/std",
 	"pallet-bags-list/std",
-	"pallet-staking/std",
+	"pallet-balances/std",
 	"pallet-nomination-pools/std",
-	"sp-runtime/std",
+	"pallet-staking/std",
+	"pallet-timestamp/std",
+	"sp-core/std",
+	"sp-io/std",
 	"sp-runtime-interface/std",
+	"sp-runtime/std",
 	"sp-staking/std",
 	"sp-std/std",
-	"pallet-balances/std",
-	"pallet-timestamp/std",
-	"sp-core/std",
-	"sp-io/std"
 ]
 
 runtime-benchmarks = [
-	"frame-election-provider-support/runtime-benchmarks",
-	"frame-system/runtime-benchmarks",
 	"frame-benchmarking/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks",
-	"sp-staking/runtime-benchmarks",
+	"frame-election-provider-support/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
-	"pallet-staking/runtime-benchmarks",
-	"pallet-nomination-pools/runtime-benchmarks",
+	"frame-system/runtime-benchmarks",
 	"pallet-bags-list/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
-	"pallet-timestamp/runtime-benchmarks"
+	"pallet-nomination-pools/runtime-benchmarks",
+	"pallet-staking/runtime-benchmarks",
+	"pallet-timestamp/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
+	"sp-staking/runtime-benchmarks",
 ]
diff --git a/substrate/frame/nomination-pools/runtime-api/Cargo.toml b/substrate/frame/nomination-pools/runtime-api/Cargo.toml
index f92a303e9bb..eef1d42d433 100644
--- a/substrate/frame/nomination-pools/runtime-api/Cargo.toml
+++ b/substrate/frame/nomination-pools/runtime-api/Cargo.toml
@@ -19,10 +19,5 @@ sp-std = { version = "8.0.0", default-features = false, path = "../../../primiti
 pallet-nomination-pools = { version = "1.0.0", default-features = false, path = "../" }
 
 [features]
-default = ["std"]
-std = [
-	"codec/std",
-	"sp-api/std",
-	"sp-std/std",
-	"pallet-nomination-pools/std",
-]
+default = [ "std" ]
+std = [ "codec/std", "pallet-nomination-pools/std", "sp-api/std", "sp-std/std" ]
diff --git a/substrate/frame/offences/Cargo.toml b/substrate/frame/offences/Cargo.toml
index f2542b125d8..fb92f102940 100644
--- a/substrate/frame/offences/Cargo.toml
+++ b/substrate/frame/offences/Cargo.toml
@@ -29,7 +29,7 @@ sp-core = { version = "21.0.0", path = "../../primitives/core" }
 sp-io = { version = "23.0.0", path = "../../primitives/io" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"codec/std",
 	"frame-support/std",
@@ -38,22 +38,22 @@ std = [
 	"pallet-balances/std",
 	"scale-info/std",
 	"serde",
+	"sp-core/std",
+	"sp-io/std",
 	"sp-runtime/std",
 	"sp-staking/std",
 	"sp-std/std",
-	"sp-core/std",
-	"sp-io/std"
 ]
 runtime-benchmarks = [
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
-	"sp-staking/runtime-benchmarks"
+	"sp-staking/runtime-benchmarks",
 ]
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"pallet-balances/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/offences/benchmarking/Cargo.toml b/substrate/frame/offences/benchmarking/Cargo.toml
index 3483ad743a4..17309478d62 100644
--- a/substrate/frame/offences/benchmarking/Cargo.toml
+++ b/substrate/frame/offences/benchmarking/Cargo.toml
@@ -38,13 +38,14 @@ sp-core = { version = "21.0.0", path = "../../../primitives/core" }
 sp-io = { version = "23.0.0", path = "../../../primitives/io" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"codec/std",
 	"frame-benchmarking/std",
 	"frame-election-provider-support/std",
 	"frame-support/std",
 	"frame-system/std",
+	"log/std",
 	"pallet-babe/std",
 	"pallet-balances/std",
 	"pallet-grandpa/std",
@@ -52,18 +53,16 @@ std = [
 	"pallet-offences/std",
 	"pallet-session/std",
 	"pallet-staking/std",
+	"pallet-timestamp/std",
 	"scale-info/std",
+	"sp-core/std",
+	"sp-io/std",
 	"sp-runtime/std",
 	"sp-staking/std",
 	"sp-std/std",
-	"log/std",
-	"pallet-timestamp/std",
-	"sp-core/std",
-	"sp-io/std"
 ]
 
 runtime-benchmarks = [
-	"pallet-staking/runtime-benchmarks",
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-election-provider-support/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
@@ -73,7 +72,8 @@ runtime-benchmarks = [
 	"pallet-grandpa/runtime-benchmarks",
 	"pallet-im-online/runtime-benchmarks",
 	"pallet-offences/runtime-benchmarks",
+	"pallet-staking/runtime-benchmarks",
 	"pallet-timestamp/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
-	"sp-staking/runtime-benchmarks"
+	"sp-staking/runtime-benchmarks",
 ]
diff --git a/substrate/frame/paged-list/Cargo.toml b/substrate/frame/paged-list/Cargo.toml
index d2b3db0080c..4f697b6333c 100644
--- a/substrate/frame/paged-list/Cargo.toml
+++ b/substrate/frame/paged-list/Cargo.toml
@@ -27,7 +27,7 @@ sp-io = { version = "23.0.0", path = "../../primitives/io", default-features = f
 sp-metadata-ir = { version = "0.1.0", default-features = false, optional = true, path = "../../primitives/metadata-ir" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 
 std = [
 	"codec/std",
@@ -37,19 +37,22 @@ std = [
 	"scale-info/std",
 	"sp-core/std",
 	"sp-io/std",
+	"sp-metadata-ir/std",
 	"sp-runtime/std",
 	"sp-std/std",
-	"sp-metadata-ir/std"
 ]
 
-runtime-benchmarks = ["frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", "sp-runtime/runtime-benchmarks"]
+runtime-benchmarks = [
+	"frame-benchmarking/runtime-benchmarks",
+	"frame-support/runtime-benchmarks",
+	"frame-system/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
+]
 
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
 
-frame-metadata = [
-	"sp-metadata-ir"
-]
+frame-metadata = [ "sp-metadata-ir" ]
diff --git a/substrate/frame/preimage/Cargo.toml b/substrate/frame/preimage/Cargo.toml
index b942823a2d2..f9ba45cedab 100644
--- a/substrate/frame/preimage/Cargo.toml
+++ b/substrate/frame/preimage/Cargo.toml
@@ -25,14 +25,14 @@ pallet-balances = { version = "4.0.0-dev", path = "../balances" }
 sp-core = { version = "21.0.0", default-features = false, path = "../../primitives/core" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 runtime-benchmarks = [
 	"frame-benchmarking",
+	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
-	"frame-benchmarking/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks"
+	"sp-runtime/runtime-benchmarks",
 ]
 std = [
 	"codec/std",
@@ -40,16 +40,16 @@ std = [
 	"frame-support/std",
 	"frame-system/std",
 	"log/std",
+	"pallet-balances/std",
 	"scale-info/std",
 	"sp-core/std",
 	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
-	"pallet-balances/std"
 ]
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"pallet-balances/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/proxy/Cargo.toml b/substrate/frame/proxy/Cargo.toml
index a32a31ce41a..734926c4a2f 100644
--- a/substrate/frame/proxy/Cargo.toml
+++ b/substrate/frame/proxy/Cargo.toml
@@ -28,19 +28,19 @@ pallet-utility = { version = "4.0.0-dev", path = "../utility" }
 sp-core = { version = "21.0.0", path = "../../primitives/core" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
-	"frame-benchmarking?/std",
 	"codec/std",
+	"frame-benchmarking?/std",
 	"frame-support/std",
 	"frame-system/std",
+	"pallet-balances/std",
+	"pallet-utility/std",
 	"scale-info/std",
+	"sp-core/std",
 	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
-	"pallet-balances/std",
-	"pallet-utility/std",
-	"sp-core/std"
 ]
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
@@ -48,12 +48,12 @@ runtime-benchmarks = [
 	"frame-system/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
 	"pallet-utility/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks"
+	"sp-runtime/runtime-benchmarks",
 ]
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"pallet-balances/try-runtime",
 	"pallet-utility/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/ranked-collective/Cargo.toml b/substrate/frame/ranked-collective/Cargo.toml
index 0a20b4eb97c..1152aeea4fa 100644
--- a/substrate/frame/ranked-collective/Cargo.toml
+++ b/substrate/frame/ranked-collective/Cargo.toml
@@ -26,7 +26,7 @@ sp-runtime = { version = "24.0.0", default-features = false, path = "../../primi
 sp-std = { version = "8.0.0", default-features = false, path = "../../primitives/std" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
@@ -49,5 +49,5 @@ runtime-benchmarks = [
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/recovery/Cargo.toml b/substrate/frame/recovery/Cargo.toml
index 14d32866e01..9e86728bc89 100644
--- a/substrate/frame/recovery/Cargo.toml
+++ b/substrate/frame/recovery/Cargo.toml
@@ -27,30 +27,30 @@ pallet-balances = { version = "4.0.0-dev", path = "../balances" }
 sp-core = { version = "21.0.0", path = "../../primitives/core" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 runtime-benchmarks = [
 	'frame-benchmarking',
+	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
+	"pallet-balances/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
-	"frame-benchmarking/runtime-benchmarks",
-	"pallet-balances/runtime-benchmarks"
 ]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
 	"frame-support/std",
 	"frame-system/std",
+	"pallet-balances/std",
 	"scale-info/std",
+	"sp-core/std",
 	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
-	"pallet-balances/std",
-	"sp-core/std"
 ]
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"pallet-balances/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/referenda/Cargo.toml b/substrate/frame/referenda/Cargo.toml
index a52d9878064..abaed893ee5 100644
--- a/substrate/frame/referenda/Cargo.toml
+++ b/substrate/frame/referenda/Cargo.toml
@@ -36,34 +36,34 @@ pallet-scheduler = { version = "4.0.0-dev", path = "../scheduler" }
 sp-core = { version = "21.0.0", path = "../../primitives/core" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
 	"frame-support/std",
-	"sp-runtime/std",
-	"sp-arithmetic/std",
 	"frame-system/std",
+	"pallet-balances/std",
+	"pallet-preimage/std",
+	"pallet-scheduler/std",
 	"scale-info/std",
 	"serde",
+	"sp-arithmetic/std",
+	"sp-core/std",
 	"sp-io/std",
 	"sp-runtime/std",
+	"sp-runtime/std",
 	"sp-std/std",
-	"pallet-balances/std",
-	"pallet-preimage/std",
-	"pallet-scheduler/std",
-	"sp-core/std"
 ]
 runtime-benchmarks = [
 	"assert_matches",
 	"frame-benchmarking",
+	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks",
-	"frame-benchmarking/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
 	"pallet-preimage/runtime-benchmarks",
-	"pallet-scheduler/runtime-benchmarks"
+	"pallet-scheduler/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
 ]
 try-runtime = [
 	"frame-support/try-runtime",
@@ -71,5 +71,5 @@ try-runtime = [
 	"pallet-balances/try-runtime",
 	"pallet-preimage/try-runtime",
 	"pallet-scheduler/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/remark/Cargo.toml b/substrate/frame/remark/Cargo.toml
index df77770c3a8..47078bddeb5 100644
--- a/substrate/frame/remark/Cargo.toml
+++ b/substrate/frame/remark/Cargo.toml
@@ -28,16 +28,16 @@ sp-std = { version = "8.0.0", default-features = false, path = "../../primitives
 sp-core = { version = "21.0.0", default-features = false, path = "../../primitives/core" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks"
+	"sp-runtime/runtime-benchmarks",
 ]
 std = [
-	"frame-benchmarking?/std",
 	"codec/std",
+	"frame-benchmarking?/std",
 	"frame-support/std",
 	"frame-system/std",
 	"scale-info/std",
@@ -50,5 +50,5 @@ std = [
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/root-offences/Cargo.toml b/substrate/frame/root-offences/Cargo.toml
index 6b7623b9af0..e8f38f8aca3 100644
--- a/substrate/frame/root-offences/Cargo.toml
+++ b/substrate/frame/root-offences/Cargo.toml
@@ -44,33 +44,32 @@ runtime-benchmarks = [
 	"pallet-staking/runtime-benchmarks",
 	"pallet-timestamp/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
-	"sp-staking/runtime-benchmarks"
+	"sp-staking/runtime-benchmarks",
 ]
 try-runtime = [
-	"frame-support/try-runtime",
 	"frame-election-provider-support/try-runtime",
+	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"pallet-balances/try-runtime",
 	"pallet-session/try-runtime",
 	"pallet-staking/try-runtime",
 	"pallet-timestamp/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"codec/std",
+	"frame-election-provider-support/std",
 	"frame-support/std",
-    
 	"frame-system/std",
+	"pallet-balances/std",
 	"pallet-session/std",
 	"pallet-staking/std",
-	"scale-info/std",
-	"sp-runtime/std",
-	"frame-election-provider-support/std",
-	"pallet-balances/std",
 	"pallet-timestamp/std",
+	"scale-info/std",
 	"sp-core/std",
 	"sp-io/std",
+	"sp-runtime/std",
 	"sp-staking/std",
-	"sp-std/std"
+	"sp-std/std",
 ]
diff --git a/substrate/frame/root-testing/Cargo.toml b/substrate/frame/root-testing/Cargo.toml
index e6f32587d45..b76cb5a059a 100644
--- a/substrate/frame/root-testing/Cargo.toml
+++ b/substrate/frame/root-testing/Cargo.toml
@@ -27,18 +27,16 @@ sp-std = { version = "8.0.0", default-features = false, path = "../../primitives
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"codec/std",
 	"frame-support/std",
-    
 	"frame-system/std",
 	"scale-info/std",
-    
-	"sp-runtime/std",
 	"sp-core/std",
 	"sp-io/std",
-	"sp-std/std"
+	"sp-runtime/std",
+	"sp-std/std",
 ]
diff --git a/substrate/frame/salary/Cargo.toml b/substrate/frame/salary/Cargo.toml
index 8fedecf4cec..330b746fc1e 100644
--- a/substrate/frame/salary/Cargo.toml
+++ b/substrate/frame/salary/Cargo.toml
@@ -26,7 +26,7 @@ sp-runtime = { version = "24.0.0", default-features = false, path = "../../primi
 sp-std = { version = "8.0.0", default-features = false, path = "../../primitives/std" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
@@ -49,5 +49,5 @@ runtime-benchmarks = [
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/scheduler/Cargo.toml b/substrate/frame/scheduler/Cargo.toml
index 1d583d0892f..edc39924319 100644
--- a/substrate/frame/scheduler/Cargo.toml
+++ b/substrate/frame/scheduler/Cargo.toml
@@ -28,14 +28,14 @@ sp-core = { version = "21.0.0", default-features = false, path = "../../primitiv
 substrate-test-utils = { version = "4.0.0-dev", path = "../../test-utils" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 runtime-benchmarks = [
 	"frame-benchmarking",
+	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
-	"frame-benchmarking/runtime-benchmarks",
 	"pallet-preimage/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks"
+	"sp-runtime/runtime-benchmarks",
 ]
 std = [
 	"codec/std",
@@ -43,17 +43,17 @@ std = [
 	"frame-support/std",
 	"frame-system/std",
 	"log/std",
+	"pallet-preimage/std",
 	"scale-info/std",
+	"sp-core/std",
 	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
 	"sp-weights/std",
-	"pallet-preimage/std",
-	"sp-core/std"
 ]
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"pallet-preimage/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/scored-pool/Cargo.toml b/substrate/frame/scored-pool/Cargo.toml
index 58dd23d241c..6bed5b04aef 100644
--- a/substrate/frame/scored-pool/Cargo.toml
+++ b/substrate/frame/scored-pool/Cargo.toml
@@ -26,21 +26,21 @@ pallet-balances = { version = "4.0.0-dev", path = "../balances" }
 sp-core = { version = "21.0.0", path = "../../primitives/core" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"codec/std",
 	"frame-support/std",
 	"frame-system/std",
+	"pallet-balances/std",
 	"scale-info/std",
+	"sp-core/std",
 	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
-	"pallet-balances/std",
-	"sp-core/std"
 ]
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"pallet-balances/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/session/Cargo.toml b/substrate/frame/session/Cargo.toml
index a2a04e76a9f..1fc5f4c1ab8 100644
--- a/substrate/frame/session/Cargo.toml
+++ b/substrate/frame/session/Cargo.toml
@@ -30,8 +30,8 @@ sp-trie = { version = "22.0.0", default-features = false, optional = true, path
 sp-state-machine = { version = "0.28.0", default-features = false, path = "../../primitives/state-machine" }
 
 [features]
-default = ["historical", "std"]
-historical = ["sp-trie"]
+default = [ "historical", "std" ]
+historical = [ "sp-trie" ]
 std = [
 	"codec/std",
 	"frame-support/std",
@@ -44,13 +44,13 @@ std = [
 	"sp-runtime/std",
 	"sp-session/std",
 	"sp-staking/std",
+	"sp-state-machine/std",
 	"sp-std/std",
 	"sp-trie/std",
-	"sp-state-machine/std",
 ]
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"pallet-timestamp/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/session/benchmarking/Cargo.toml b/substrate/frame/session/benchmarking/Cargo.toml
index 81e4c2ff590..5db6821da1f 100644
--- a/substrate/frame/session/benchmarking/Cargo.toml
+++ b/substrate/frame/session/benchmarking/Cargo.toml
@@ -35,31 +35,31 @@ sp-core = { version = "21.0.0", path = "../../../primitives/core" }
 sp-io = { version = "23.0.0", path = "../../../primitives/io" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"frame-benchmarking/std",
+	"frame-election-provider-support/std",
 	"frame-support/std",
 	"frame-system/std",
+	"pallet-balances/std",
 	"pallet-session/std",
 	"pallet-staking/std",
+	"pallet-timestamp/std",
 	"rand/std",
+	"sp-core/std",
+	"sp-io/std",
 	"sp-runtime/std",
 	"sp-session/std",
 	"sp-std/std",
-	"frame-election-provider-support/std",
-	"pallet-balances/std",
-	"pallet-timestamp/std",
-	"sp-core/std",
-	"sp-io/std"
 ]
 
 runtime-benchmarks = [
-	"pallet-staking/runtime-benchmarks",
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-election-provider-support/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
+	"pallet-staking/runtime-benchmarks",
 	"pallet-timestamp/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks"
+	"sp-runtime/runtime-benchmarks",
 ]
diff --git a/substrate/frame/society/Cargo.toml b/substrate/frame/society/Cargo.toml
index 38f2ca66bd1..55e5c1e01cb 100644
--- a/substrate/frame/society/Cargo.toml
+++ b/substrate/frame/society/Cargo.toml
@@ -33,38 +33,36 @@ sp-core = { version = "21.0.0", path = "../../primitives/core" }
 sp-io = { version = "23.0.0", path = "../../primitives/io" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 # Enable `VersionedRuntimeUpgrade` for the migrations that is currently still experimental.
-experimental = [
-	"frame-support/experimental"
-]
+experimental = [ "frame-support/experimental" ]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
+	"frame-support-test/std",
 	"frame-support/std",
 	"frame-system/std",
+	"pallet-balances/std",
 	"rand_chacha/std",
 	"scale-info/std",
+	"sp-arithmetic/std",
+	"sp-core/std",
+	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
-	"sp-io/std",
-	"frame-support-test/std",
-	"pallet-balances/std",
-	"sp-arithmetic/std",
-	"sp-core/std"
 ]
 runtime-benchmarks = [
 	"frame-benchmarking",
-	"sp-runtime/runtime-benchmarks",
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
 ]
 try-runtime = [
-	"frame-support/try-runtime",
 	"frame-support-test/try-runtime",
+	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"pallet-balances/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/staking/Cargo.toml b/substrate/frame/staking/Cargo.toml
index 19a437ce4cc..2ad9b44d7b4 100644
--- a/substrate/frame/staking/Cargo.toml
+++ b/substrate/frame/staking/Cargo.toml
@@ -50,50 +50,50 @@ frame-election-provider-support = { version = "4.0.0-dev", path = "../election-p
 rand_chacha = { version = "0.2" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
-	"frame-benchmarking?/std",
-	"serde/std",
 	"codec/std",
-	"scale-info/std",
-	"sp-std/std",
-	"sp-io/std",
+	"frame-benchmarking?/std",
+	"frame-election-provider-support/std",
 	"frame-support/std",
-	"sp-runtime/std",
-	"sp-staking/std",
-	"pallet-session/std",
 	"frame-system/std",
-	"pallet-authorship/std",
-	"sp-application-crypto/std",
 	"log/std",
-	"frame-election-provider-support/std",
+	"pallet-authorship/std",
 	"pallet-bags-list/std",
 	"pallet-balances/std",
+	"pallet-session/std",
 	"pallet-timestamp/std",
+	"scale-info/std",
+	"serde/std",
+	"sp-application-crypto/std",
 	"sp-core/std",
+	"sp-io/std",
 	"sp-npos-elections/std",
-	"sp-tracing/std"
+	"sp-runtime/std",
+	"sp-staking/std",
+	"sp-std/std",
+	"sp-tracing/std",
 ]
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-election-provider-support/runtime-benchmarks",
-	"rand_chacha",
-	"sp-staking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"pallet-bags-list/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
 	"pallet-timestamp/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks"
+	"rand_chacha",
+	"sp-runtime/runtime-benchmarks",
+	"sp-staking/runtime-benchmarks",
 ]
 try-runtime = [
-	"frame-support/try-runtime",
 	"frame-election-provider-support/try-runtime",
+	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"pallet-authorship/try-runtime",
 	"pallet-bags-list/try-runtime",
 	"pallet-balances/try-runtime",
 	"pallet-session/try-runtime",
 	"pallet-timestamp/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/staking/reward-fn/Cargo.toml b/substrate/frame/staking/reward-fn/Cargo.toml
index 3561eeb8a90..a80210f7d9f 100644
--- a/substrate/frame/staking/reward-fn/Cargo.toml
+++ b/substrate/frame/staking/reward-fn/Cargo.toml
@@ -18,8 +18,5 @@ log = { version = "0.4.17", default-features = false }
 sp-arithmetic = { version = "16.0.0", default-features = false, path = "../../../primitives/arithmetic" }
 
 [features]
-default = ["std"]
-std = [
-	"log/std",
-	"sp-arithmetic/std",
-]
+default = [ "std" ]
+std = [ "log/std", "sp-arithmetic/std" ]
diff --git a/substrate/frame/staking/runtime-api/Cargo.toml b/substrate/frame/staking/runtime-api/Cargo.toml
index 5c9af0ad3cb..afb7ce721cd 100644
--- a/substrate/frame/staking/runtime-api/Cargo.toml
+++ b/substrate/frame/staking/runtime-api/Cargo.toml
@@ -17,8 +17,5 @@ codec = { package = "parity-scale-codec", version = "3.6.1", default-features =
 sp-api = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/api" }
 
 [features]
-default = ["std"]
-std = [
-	"codec/std",
-	"sp-api/std",
-]
+default = [ "std" ]
+std = [ "codec/std", "sp-api/std" ]
diff --git a/substrate/frame/state-trie-migration/Cargo.toml b/substrate/frame/state-trie-migration/Cargo.toml
index dd2693f10a8..d1bed941d4c 100644
--- a/substrate/frame/state-trie-migration/Cargo.toml
+++ b/substrate/frame/state-trie-migration/Cargo.toml
@@ -35,20 +35,20 @@ pallet-balances = { path = "../balances" }
 sp-tracing = { path = "../../primitives/tracing" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
 	"frame-support/std",
 	"frame-system/std",
 	"log/std",
+	"pallet-balances/std",
 	"scale-info/std",
 	"sp-core/std",
 	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
-	"pallet-balances/std",
-	"sp-tracing/std"
+	"sp-tracing/std",
 ]
 runtime-benchmarks = [
 	"frame-benchmarking",
@@ -56,12 +56,19 @@ runtime-benchmarks = [
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks"
+	"sp-runtime/runtime-benchmarks",
 ]
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"pallet-balances/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
+]
+remote-test = [
+	"remote-externalities",
+	"serde",
+	"std",
+	"substrate-state-trie-migration-rpc",
+	"thousands",
+	"zstd",
 ]
-remote-test = [ "remote-externalities", "serde", "std", "substrate-state-trie-migration-rpc", "thousands", "zstd" ]
diff --git a/substrate/frame/statement/Cargo.toml b/substrate/frame/statement/Cargo.toml
index cc51258165c..4740c421d7f 100644
--- a/substrate/frame/statement/Cargo.toml
+++ b/substrate/frame/statement/Cargo.toml
@@ -31,20 +31,20 @@ pallet-balances = { version = "4.0.0-dev", path = "../balances" }
 default = [ "std" ]
 std = [
 	"codec/std",
-	"scale-info/std",
 	"frame-support/std",
 	"frame-system/std",
+	"pallet-balances/std",
+	"scale-info/std",
 	"sp-api/std",
-	"sp-runtime/std",
-	"sp-std/std",
-	"sp-io/std",
 	"sp-core/std",
+	"sp-io/std",
+	"sp-runtime/std",
 	"sp-statement-store/std",
-	"pallet-balances/std"
+	"sp-std/std",
 ]
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"pallet-balances/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/sudo/Cargo.toml b/substrate/frame/sudo/Cargo.toml
index 9f3851d91ef..ed46ad53c2f 100644
--- a/substrate/frame/sudo/Cargo.toml
+++ b/substrate/frame/sudo/Cargo.toml
@@ -26,26 +26,26 @@ sp-std = { version = "8.0.0", default-features = false, path = "../../primitives
 sp-core = { version = "21.0.0", path = "../../primitives/core" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
 	"frame-support/std",
 	"frame-system/std",
 	"scale-info/std",
+	"sp-core/std",
 	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
-	"sp-core/std"
 ]
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
+	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
-	"frame-support/runtime-benchmarks"
 ]
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/support/Cargo.toml b/substrate/frame/support/Cargo.toml
index 5d1dbd71022..2b3d15e2ec0 100644
--- a/substrate/frame/support/Cargo.toml
+++ b/substrate/frame/support/Cargo.toml
@@ -54,50 +54,53 @@ frame-system = { version = "4.0.0-dev", path = "../system" }
 array-bytes = "6.1"
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
-	"sp-core/std",
+	"codec/std",
+	"environmental/std",
+	"frame-metadata/std",
+	"frame-support-procedural/std",
+	"frame-system/std",
 	"k256/std",
+	"log/std",
+	"scale-info/std",
 	"serde/std",
 	"sp-api/std",
-	"sp-io/std",
-	"codec/std",
-	"scale-info/std",
-	"sp-std/std",
-	"sp-runtime/std",
-	"sp-tracing/std",
 	"sp-arithmetic/std",
-	"frame-metadata/std",
+	"sp-core/std",
+	"sp-debug-derive/std",
+	"sp-genesis-builder/std",
 	"sp-inherents/std",
+	"sp-io/std",
+	"sp-metadata-ir/std",
+	"sp-runtime/std",
 	"sp-staking/std",
 	"sp-state-machine/std",
+	"sp-std/std",
+	"sp-tracing/std",
 	"sp-weights/std",
-	"frame-support-procedural/std",
-	"log/std",
-	"environmental/std",
-	"sp-genesis-builder/std",
-	"frame-system/std",
-	"sp-debug-derive/std",
-	"sp-metadata-ir/std"
 ]
 runtime-benchmarks = [
 	"frame-system/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
-	"sp-staking/runtime-benchmarks"
+	"sp-staking/runtime-benchmarks",
 ]
 try-runtime = [
-	"sp-debug-derive/force-debug",
 	"frame-system/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-debug-derive/force-debug",
+	"sp-runtime/try-runtime",
 ]
 experimental = []
 # By default some types have documentation, `no-metadata-docs` allows to reduce the documentation
 # in the metadata.
-no-metadata-docs = ["frame-support-procedural/no-metadata-docs", "sp-api/no-metadata-docs"]
+no-metadata-docs = [
+	"frame-support-procedural/no-metadata-docs",
+	"sp-api/no-metadata-docs",
+]
 # By default some types have documentation, `full-metadata-docs` allows to add documentation to
 # more types in the metadata.
-full-metadata-docs = ["scale-info/docs"]
+full-metadata-docs = [ "scale-info/docs" ]
 # Generate impl-trait for tuples with the given number of tuples. Will be needed as the number of
 # pallets in a runtime grows. Does increase the compile time!
-tuples-96 = ["frame-support-procedural/tuples-96"]
-tuples-128 = ["frame-support-procedural/tuples-128"]
+tuples-96 = [ "frame-support-procedural/tuples-96" ]
+tuples-128 = [ "frame-support-procedural/tuples-128" ]
diff --git a/substrate/frame/support/procedural/Cargo.toml b/substrate/frame/support/procedural/Cargo.toml
index f596713e5f1..a5d4e9e2e80 100644
--- a/substrate/frame/support/procedural/Cargo.toml
+++ b/substrate/frame/support/procedural/Cargo.toml
@@ -28,7 +28,7 @@ macro_magic = { version = "0.4.2", features = ["proc_support"] }
 expander = "2.0.0"
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = []
 no-metadata-docs = []
 # Generate impl-trait for tuples with the given number of tuples. Will be needed as the number of
diff --git a/substrate/frame/support/test/Cargo.toml b/substrate/frame/support/test/Cargo.toml
index f6b665b1c7b..ecb17124429 100644
--- a/substrate/frame/support/test/Cargo.toml
+++ b/substrate/frame/support/test/Cargo.toml
@@ -37,33 +37,33 @@ frame-executive = { version = "4.0.0-dev", default-features = false, path = "../
 test-pallet = { package = "frame-support-test-pallet", default-features = false, path = "pallet" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"codec/std",
 	"frame-benchmarking/std",
 	"frame-executive/std",
+	"frame-metadata/std",
 	"frame-support/std",
 	"frame-system/std",
 	"scale-info/std",
 	"serde/std",
 	"sp-api/std",
 	"sp-arithmetic/std",
-	"frame-metadata/std",
 	"sp-core/std",
 	"sp-io/std",
+	"sp-metadata-ir/std",
 	"sp-runtime/std",
+	"sp-state-machine/std",
 	"sp-std/std",
 	"sp-version/std",
 	"test-pallet/std",
-	"sp-state-machine/std",
-	"sp-metadata-ir/std"
 ]
-experimental = ["frame-support/experimental"]
+experimental = [ "frame-support/experimental" ]
 try-runtime = [
+	"frame-executive/try-runtime",
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
-	"frame-executive/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
 # WARNING:
 # Only CI runs with this feature enabled. This feature is for testing stuff related to the FRAME macros
@@ -72,4 +72,4 @@ frame-feature-testing = []
 frame-feature-testing-2 = []
 # Disable ui tests
 disable-ui-tests = []
-no-metadata-docs = ["frame-support/no-metadata-docs"]
+no-metadata-docs = [ "frame-support/no-metadata-docs" ]
diff --git a/substrate/frame/support/test/compile_pass/Cargo.toml b/substrate/frame/support/test/compile_pass/Cargo.toml
index 5d6caa002b3..151f7d8a5be 100644
--- a/substrate/frame/support/test/compile_pass/Cargo.toml
+++ b/substrate/frame/support/test/compile_pass/Cargo.toml
@@ -21,11 +21,11 @@ sp-runtime = { version = "24.0.0", default-features = false, path = "../../../..
 sp-version = { version = "22.0.0", default-features = false, path = "../../../../primitives/version" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"codec/std",
-	"renamed-frame-support/std",
 	"frame-system/std",
+	"renamed-frame-support/std",
 	"scale-info/std",
 	"sp-core/std",
 	"sp-runtime/std",
diff --git a/substrate/frame/support/test/pallet/Cargo.toml b/substrate/frame/support/test/pallet/Cargo.toml
index 6edfcd78968..073b7510701 100644
--- a/substrate/frame/support/test/pallet/Cargo.toml
+++ b/substrate/frame/support/test/pallet/Cargo.toml
@@ -20,12 +20,12 @@ frame-system = { version = "4.0.0-dev", default-features = false, path = "../../
 sp-runtime = { version = "24.0.0", default-features = false, path = "../../../../primitives/runtime" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"codec/std",
 	"frame-support/std",
 	"frame-system/std",
 	"scale-info/std",
 	"serde/std",
-	"sp-runtime/std"
+	"sp-runtime/std",
 ]
diff --git a/substrate/frame/system/Cargo.toml b/substrate/frame/system/Cargo.toml
index d1a0124d992..6530862832c 100644
--- a/substrate/frame/system/Cargo.toml
+++ b/substrate/frame/system/Cargo.toml
@@ -32,7 +32,7 @@ sp-externalities = { version = "0.19.0", path = "../../primitives/externalities"
 substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"codec/std",
 	"frame-support/std",
@@ -40,21 +40,18 @@ std = [
 	"scale-info/std",
 	"serde/std",
 	"sp-core/std",
+	"sp-externalities/std",
 	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
 	"sp-version/std",
 	"sp-weights/std",
-	"sp-externalities/std"
 ]
 runtime-benchmarks = [
 	"frame-support/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
 ]
-try-runtime = [
-	"frame-support/try-runtime",
-	"sp-runtime/try-runtime"
-]
+try-runtime = [ "frame-support/try-runtime", "sp-runtime/try-runtime" ]
 
 [[bench]]
 name = "bench"
diff --git a/substrate/frame/system/benchmarking/Cargo.toml b/substrate/frame/system/benchmarking/Cargo.toml
index 0d8165a3a44..098edbaa8bc 100644
--- a/substrate/frame/system/benchmarking/Cargo.toml
+++ b/substrate/frame/system/benchmarking/Cargo.toml
@@ -28,7 +28,7 @@ sp-externalities = { version = "0.19.0", path = "../../../primitives/externaliti
 sp-version = { version = "22.0.0", path = "../../../primitives/version" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"codec/std",
 	"frame-benchmarking/std",
@@ -36,16 +36,16 @@ std = [
 	"frame-system/std",
 	"scale-info/std",
 	"sp-core/std",
-	"sp-runtime/std",
-	"sp-std/std",
 	"sp-externalities/std",
 	"sp-io/std",
-	"sp-version/std"
+	"sp-runtime/std",
+	"sp-std/std",
+	"sp-version/std",
 ]
 
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks"
+	"sp-runtime/runtime-benchmarks",
 ]
diff --git a/substrate/frame/system/rpc/runtime-api/Cargo.toml b/substrate/frame/system/rpc/runtime-api/Cargo.toml
index aef2cfc6e25..ec8348123cb 100644
--- a/substrate/frame/system/rpc/runtime-api/Cargo.toml
+++ b/substrate/frame/system/rpc/runtime-api/Cargo.toml
@@ -17,8 +17,5 @@ codec = { package = "parity-scale-codec", version = "3.6.1", default-features =
 sp-api = { version = "4.0.0-dev", default-features = false, path = "../../../../primitives/api" }
 
 [features]
-default = ["std"]
-std = [
-	"codec/std",
-	"sp-api/std",
-]
+default = [ "std" ]
+std = [ "codec/std", "sp-api/std" ]
diff --git a/substrate/frame/timestamp/Cargo.toml b/substrate/frame/timestamp/Cargo.toml
index c92fb6b75b1..6a5c9f9a0c0 100644
--- a/substrate/frame/timestamp/Cargo.toml
+++ b/substrate/frame/timestamp/Cargo.toml
@@ -31,30 +31,30 @@ sp-core = { version = "21.0.0", path = "../../primitives/core" }
 sp-io = { version = "23.0.0", path = "../../primitives/io" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
-	"sp-io?/std",
 	"codec/std",
 	"frame-benchmarking?/std",
 	"frame-support/std",
 	"frame-system/std",
 	"log/std",
 	"scale-info/std",
+	"sp-core/std",
 	"sp-inherents/std",
+	"sp-io?/std",
 	"sp-runtime/std",
 	"sp-std/std",
 	"sp-timestamp/std",
-	"sp-core/std"
 ]
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
-	"sp-io",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks"
+	"sp-io",
+	"sp-runtime/runtime-benchmarks",
 ]
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/tips/Cargo.toml b/substrate/frame/tips/Cargo.toml
index aed4f6f9617..61ecc681ec5 100644
--- a/substrate/frame/tips/Cargo.toml
+++ b/substrate/frame/tips/Cargo.toml
@@ -31,13 +31,14 @@ pallet-balances = { version = "4.0.0-dev", path = "../balances" }
 sp-storage = { version = "13.0.0", path = "../../primitives/storage" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
-	"frame-benchmarking?/std",
 	"codec/std",
+	"frame-benchmarking?/std",
 	"frame-support/std",
 	"frame-system/std",
 	"log/std",
+	"pallet-balances/std",
 	"pallet-treasury/std",
 	"scale-info/std",
 	"serde",
@@ -45,8 +46,7 @@ std = [
 	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
-	"pallet-balances/std",
-	"sp-storage/std"
+	"sp-storage/std",
 ]
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
@@ -54,12 +54,12 @@ runtime-benchmarks = [
 	"frame-system/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
 	"pallet-treasury/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks"
+	"sp-runtime/runtime-benchmarks",
 ]
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"pallet-balances/try-runtime",
 	"pallet-treasury/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/transaction-payment/Cargo.toml b/substrate/frame/transaction-payment/Cargo.toml
index 3f953d4eefe..8d4c0e55f79 100644
--- a/substrate/frame/transaction-payment/Cargo.toml
+++ b/substrate/frame/transaction-payment/Cargo.toml
@@ -30,22 +30,22 @@ serde_json = "1.0.85"
 pallet-balances = { version = "4.0.0-dev", path = "../balances" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"codec/std",
 	"frame-support/std",
 	"frame-system/std",
+	"pallet-balances/std",
 	"scale-info/std",
 	"serde",
 	"sp-core/std",
 	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
-	"pallet-balances/std"
 ]
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"pallet-balances/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/transaction-payment/asset-conversion-tx-payment/Cargo.toml b/substrate/frame/transaction-payment/asset-conversion-tx-payment/Cargo.toml
index 69118cec04b..51ff136d8ae 100644
--- a/substrate/frame/transaction-payment/asset-conversion-tx-payment/Cargo.toml
+++ b/substrate/frame/transaction-payment/asset-conversion-tx-payment/Cargo.toml
@@ -31,21 +31,21 @@ pallet-assets = { version = "4.0.0-dev", path = "../../assets" }
 pallet-balances = { version = "4.0.0-dev", path = "../../balances" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
-	"scale-info/std",
 	"codec/std",
-	"sp-std/std",
-	"sp-runtime/std",
 	"frame-support/std",
 	"frame-system/std",
-	"sp-io/std",
-	"sp-core/std",
 	"pallet-asset-conversion/std",
-	"pallet-transaction-payment/std",
 	"pallet-assets/std",
 	"pallet-balances/std",
-	"sp-storage/std"
+	"pallet-transaction-payment/std",
+	"scale-info/std",
+	"sp-core/std",
+	"sp-io/std",
+	"sp-runtime/std",
+	"sp-std/std",
+	"sp-storage/std",
 ]
 try-runtime = [
 	"frame-support/try-runtime",
@@ -54,5 +54,5 @@ try-runtime = [
 	"pallet-assets/try-runtime",
 	"pallet-balances/try-runtime",
 	"pallet-transaction-payment/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/transaction-payment/asset-tx-payment/Cargo.toml b/substrate/frame/transaction-payment/asset-tx-payment/Cargo.toml
index 056880423f2..42dd65beddb 100644
--- a/substrate/frame/transaction-payment/asset-tx-payment/Cargo.toml
+++ b/substrate/frame/transaction-payment/asset-tx-payment/Cargo.toml
@@ -39,31 +39,31 @@ pallet-authorship = { version = "4.0.0-dev", path = "../../authorship" }
 pallet-balances = { version = "4.0.0-dev", path = "../../balances" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
-	"scale-info/std",
-	"serde",
 	"codec/std",
-	"sp-std/std",
-	"sp-runtime/std",
+	"frame-benchmarking?/std",
 	"frame-support/std",
 	"frame-system/std",
-	"sp-io/std",
-	"sp-core/std",
-	"pallet-transaction-payment/std",
-	"frame-benchmarking?/std",
 	"pallet-assets/std",
 	"pallet-authorship/std",
 	"pallet-balances/std",
-	"sp-storage/std"
+	"pallet-transaction-payment/std",
+	"scale-info/std",
+	"serde",
+	"sp-core/std",
+	"sp-io/std",
+	"sp-runtime/std",
+	"sp-std/std",
+	"sp-storage/std",
 ]
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks",
-	"frame-system/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
+	"frame-system/runtime-benchmarks",
 	"pallet-assets/runtime-benchmarks",
-	"pallet-balances/runtime-benchmarks"
+	"pallet-balances/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
 ]
 try-runtime = [
 	"frame-support/try-runtime",
@@ -72,5 +72,5 @@ try-runtime = [
 	"pallet-authorship/try-runtime",
 	"pallet-balances/try-runtime",
 	"pallet-transaction-payment/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/transaction-payment/rpc/runtime-api/Cargo.toml b/substrate/frame/transaction-payment/rpc/runtime-api/Cargo.toml
index 5cb7ebd7a2b..27b8417b1f3 100644
--- a/substrate/frame/transaction-payment/rpc/runtime-api/Cargo.toml
+++ b/substrate/frame/transaction-payment/rpc/runtime-api/Cargo.toml
@@ -20,7 +20,7 @@ sp-runtime = { version = "24.0.0", default-features = false, path = "../../../..
 sp-weights = { version = "20.0.0", default-features = false, path = "../../../../primitives/weights" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"codec/std",
 	"pallet-transaction-payment/std",
diff --git a/substrate/frame/transaction-storage/Cargo.toml b/substrate/frame/transaction-storage/Cargo.toml
index ae94e4a9bf0..6456e300286 100644
--- a/substrate/frame/transaction-storage/Cargo.toml
+++ b/substrate/frame/transaction-storage/Cargo.toml
@@ -33,34 +33,34 @@ sp-core = { version = "21.0.0", default-features = false, path = "../../primitiv
 sp-transaction-storage-proof = { version = "4.0.0-dev", default-features = true, path = "../../primitives/transaction-storage-proof" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 runtime-benchmarks = [
 	"array-bytes",
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks"
+	"sp-runtime/runtime-benchmarks",
 ]
 std = [
-	"log/std",
-	"frame-benchmarking?/std",
 	"codec/std",
+	"frame-benchmarking?/std",
 	"frame-support/std",
 	"frame-system/std",
+	"log/std",
 	"pallet-balances/std",
 	"scale-info/std",
 	"serde",
+	"sp-core/std",
 	"sp-inherents/std",
 	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
 	"sp-transaction-storage-proof/std",
-	"sp-core/std"
 ]
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"pallet-balances/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/treasury/Cargo.toml b/substrate/frame/treasury/Cargo.toml
index f692f204b9b..f49f3ccf756 100644
--- a/substrate/frame/treasury/Cargo.toml
+++ b/substrate/frame/treasury/Cargo.toml
@@ -33,20 +33,20 @@ sp-io = { version = "23.0.0", path = "../../primitives/io" }
 pallet-utility = { version = "4.0.0-dev", path = "../utility" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
-	"frame-benchmarking?/std",
 	"codec/std",
+	"frame-benchmarking?/std",
 	"frame-support/std",
 	"frame-system/std",
 	"pallet-balances/std",
+	"pallet-utility/std",
 	"scale-info/std",
 	"serde",
+	"sp-core/std",
+	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
-	"pallet-utility/std",
-	"sp-core/std",
-	"sp-io/std"
 ]
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
@@ -54,12 +54,12 @@ runtime-benchmarks = [
 	"frame-system/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
 	"pallet-utility/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks"
+	"sp-runtime/runtime-benchmarks",
 ]
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"pallet-balances/try-runtime",
 	"pallet-utility/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/try-runtime/Cargo.toml b/substrate/frame/try-runtime/Cargo.toml
index f9b99ba5989..afd97632b32 100644
--- a/substrate/frame/try-runtime/Cargo.toml
+++ b/substrate/frame/try-runtime/Cargo.toml
@@ -27,7 +27,4 @@ std = [
 	"sp-runtime/std",
 	"sp-std/std",
 ]
-try-runtime = [
-	"frame-support/try-runtime",
-	"sp-runtime/try-runtime"
-]
+try-runtime = [ "frame-support/try-runtime", "sp-runtime/try-runtime" ]
diff --git a/substrate/frame/uniques/Cargo.toml b/substrate/frame/uniques/Cargo.toml
index 9ddcef1e7b1..28ebc1ff50f 100644
--- a/substrate/frame/uniques/Cargo.toml
+++ b/substrate/frame/uniques/Cargo.toml
@@ -29,30 +29,30 @@ sp-io = { version = "23.0.0", path = "../../primitives/io" }
 sp-std = { version = "8.0.0", path = "../../primitives/std" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"codec/std",
 	"frame-benchmarking?/std",
 	"frame-support/std",
 	"frame-system/std",
 	"log/std",
+	"pallet-balances/std",
 	"scale-info/std",
+	"sp-core/std",
+	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
-	"pallet-balances/std",
-	"sp-core/std",
-	"sp-io/std"
 ]
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
+	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
+	"pallet-balances/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
-	"frame-support/runtime-benchmarks",
-	"pallet-balances/runtime-benchmarks"
 ]
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"pallet-balances/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/utility/Cargo.toml b/substrate/frame/utility/Cargo.toml
index 87281f0abdf..76eafeb2db5 100644
--- a/substrate/frame/utility/Cargo.toml
+++ b/substrate/frame/utility/Cargo.toml
@@ -31,30 +31,30 @@ pallet-timestamp = { version = "4.0.0-dev", path = "../timestamp" }
 sp-core = { version = "21.0.0", path = "../../primitives/core" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
-	"frame-benchmarking?/std",
 	"codec/std",
+	"frame-benchmarking?/std",
 	"frame-support/std",
 	"frame-system/std",
+	"pallet-balances/std",
+	"pallet-collective/std",
+	"pallet-root-testing/std",
+	"pallet-timestamp/std",
 	"scale-info/std",
 	"sp-core/std",
 	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
-	"pallet-balances/std",
-	"pallet-collective/std",
-	"pallet-root-testing/std",
-	"pallet-timestamp/std"
 ]
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
-	"pallet-collective/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
+	"pallet-collective/runtime-benchmarks",
 	"pallet-timestamp/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks"
+	"sp-runtime/runtime-benchmarks",
 ]
 try-runtime = [
 	"frame-support/try-runtime",
@@ -63,5 +63,5 @@ try-runtime = [
 	"pallet-collective/try-runtime",
 	"pallet-root-testing/try-runtime",
 	"pallet-timestamp/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/vesting/Cargo.toml b/substrate/frame/vesting/Cargo.toml
index 1bf4491f349..e6826903c9d 100644
--- a/substrate/frame/vesting/Cargo.toml
+++ b/substrate/frame/vesting/Cargo.toml
@@ -30,30 +30,30 @@ sp-core = { version = "21.0.0", path = "../../primitives/core" }
 sp-io = { version = "23.0.0", default-features = false, path = "../../primitives/io" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
-	"frame-benchmarking?/std",
 	"codec/std",
+	"frame-benchmarking?/std",
 	"frame-support/std",
 	"frame-system/std",
 	"log/std",
+	"pallet-balances/std",
 	"scale-info/std",
+	"sp-core/std",
+	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
-	"pallet-balances/std",
-	"sp-core/std",
-	"sp-io/std"
 ]
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks"
+	"sp-runtime/runtime-benchmarks",
 ]
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"pallet-balances/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/whitelist/Cargo.toml b/substrate/frame/whitelist/Cargo.toml
index ba05859df29..f82900340f3 100644
--- a/substrate/frame/whitelist/Cargo.toml
+++ b/substrate/frame/whitelist/Cargo.toml
@@ -28,34 +28,34 @@ sp-core = { version = "21.0.0", path = "../../primitives/core" }
 sp-io = { version = "23.0.0", path = "../../primitives/io" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
-	"frame-benchmarking?/std",
 	"codec/std",
+	"frame-benchmarking?/std",
 	"frame-support/std",
 	"frame-system/std",
+	"pallet-balances/std",
+	"pallet-preimage/std",
 	"scale-info/std",
 	"sp-api/std",
+	"sp-core/std",
+	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
-	"pallet-balances/std",
-	"pallet-preimage/std",
-	"sp-core/std",
-	"sp-io/std"
 ]
 runtime-benchmarks = [
 	"frame-benchmarking",
+	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
-	"frame-benchmarking/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
 	"pallet-preimage/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks"
+	"sp-runtime/runtime-benchmarks",
 ]
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"pallet-balances/try-runtime",
 	"pallet-preimage/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/primitives/api/Cargo.toml b/substrate/primitives/api/Cargo.toml
index 2f0fe5d5d93..544afe6980f 100644
--- a/substrate/primitives/api/Cargo.toml
+++ b/substrate/primitives/api/Cargo.toml
@@ -32,24 +32,24 @@ log = { version = "0.4.17", default-features = false }
 sp-test-primitives = { version = "2.0.0", path = "../test-primitives" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"codec/std",
+	"hash-db",
+	"log/std",
+	"scale-info/std",
+	"sp-api-proc-macro/std",
 	"sp-core/std",
 	"sp-externalities",
-	"sp-std/std",
+	"sp-externalities?/std",
+	"sp-metadata-ir?/std",
 	"sp-runtime/std",
 	"sp-state-machine/std",
+	"sp-std/std",
+	"sp-test-primitives/std",
 	"sp-trie/std",
 	"sp-version/std",
-	"hash-db",
 	"thiserror",
-	"log/std",
-	"scale-info/std",
-	"sp-metadata-ir?/std",
-	"sp-api-proc-macro/std",
-	"sp-externalities?/std",
-	"sp-test-primitives/std"
 ]
 # Special feature to disable logging completely.
 #
@@ -58,10 +58,7 @@ std = [
 # building a runtime for registering it on chain.
 #
 # This sets the max logging level to `off` for `log`.
-disable-logging = ["log/max_level_off"]
+disable-logging = [ "log/max_level_off" ]
 # Do not report the documentation in the metadata.
-no-metadata-docs = ["sp-api-proc-macro/no-metadata-docs"]
-frame-metadata = [
-	"sp-metadata-ir",
-	"sp-api-proc-macro/frame-metadata"
-]
+no-metadata-docs = [ "sp-api-proc-macro/no-metadata-docs" ]
+frame-metadata = [ "sp-api-proc-macro/frame-metadata", "sp-metadata-ir" ]
diff --git a/substrate/primitives/api/proc-macro/Cargo.toml b/substrate/primitives/api/proc-macro/Cargo.toml
index fb6513806c8..862cf00fdd6 100644
--- a/substrate/primitives/api/proc-macro/Cargo.toml
+++ b/substrate/primitives/api/proc-macro/Cargo.toml
@@ -29,7 +29,7 @@ assert_matches = "1.3.0"
 
 [features]
 # Required for the doc tests
-default = ["std"]
+default = [ "std" ]
 std = []
 no-metadata-docs = []
 frame-metadata = []
diff --git a/substrate/primitives/application-crypto/Cargo.toml b/substrate/primitives/application-crypto/Cargo.toml
index f27ec881e19..e4daebd51c1 100644
--- a/substrate/primitives/application-crypto/Cargo.toml
+++ b/substrate/primitives/application-crypto/Cargo.toml
@@ -25,40 +25,33 @@ sp-io = { version = "23.0.0", default-features = false, path = "../io" }
 [features]
 default = [ "std" ]
 std = [
-	"full_crypto",
-	"sp-core/std",
 	"codec/std",
+	"full_crypto",
 	"scale-info/std",
 	"serde/std",
-	"sp-std/std",
+	"sp-core/std",
 	"sp-io/std",
+	"sp-std/std",
 ]
 
 # Serde support without relying on std features.
-serde = [
-	"dep:serde",
-	"sp-core/serde",
-	"scale-info/serde",
-]
+serde = [ "dep:serde", "scale-info/serde", "sp-core/serde" ]
 
 # This feature enables all crypto primitives for `no_std` builds like microcontrollers
 # or Intel SGX.
 # For the regular wasm runtime builds this should not be used.
 full_crypto = [
 	"sp-core/full_crypto",
+	"sp-io/disable_oom",
 	# Don't add `panic_handler` and `alloc_error_handler` since they are expected to be provided
 	# by the user anyway.
 	"sp-io/disable_panic_handler",
-	"sp-io/disable_oom",
 ]
 
 # This feature adds BLS crypto primitives.
 # It should not be used in production since the implementation and interface may still
 # be subject to significant changes.
-bls-experimental = [
-	 "sp-core/bls-experimental",
-	 "sp-io/bls-experimental",
-]
+bls-experimental = [ "sp-core/bls-experimental", "sp-io/bls-experimental" ]
 
 # This feature adds Bandersnatch crypto primitives.
 # It should not be used in production since the implementation and interface may still
diff --git a/substrate/primitives/arithmetic/Cargo.toml b/substrate/primitives/arithmetic/Cargo.toml
index 972dfee29d1..d7b9b2bf747 100644
--- a/substrate/primitives/arithmetic/Cargo.toml
+++ b/substrate/primitives/arithmetic/Cargo.toml
@@ -32,20 +32,17 @@ sp-core = { version = "21.0.0", features = ["full_crypto"], path = "../core" }
 rand = "0.8.5"
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"codec/std",
 	"num-traits/std",
 	"scale-info/std",
 	"serde/std",
+	"sp-core/std",
 	"sp-std/std",
-	"sp-core/std"
 ]
 # Serde support without relying on std features.
-serde = [
-	"dep:serde",
-	"scale-info/serde",
-]
+serde = [ "dep:serde", "scale-info/serde" ]
 
 [[bench]]
 name = "bench"
diff --git a/substrate/primitives/authority-discovery/Cargo.toml b/substrate/primitives/authority-discovery/Cargo.toml
index 03c9ef2c7d2..8e47208238a 100644
--- a/substrate/primitives/authority-discovery/Cargo.toml
+++ b/substrate/primitives/authority-discovery/Cargo.toml
@@ -21,7 +21,7 @@ sp-runtime = { version = "24.0.0", default-features = false, path = "../runtime"
 sp-std = { version = "8.0.0", default-features = false, path = "../std" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"codec/std",
 	"scale-info/std",
diff --git a/substrate/primitives/block-builder/Cargo.toml b/substrate/primitives/block-builder/Cargo.toml
index ba0e1f041e0..1b62747770a 100644
--- a/substrate/primitives/block-builder/Cargo.toml
+++ b/substrate/primitives/block-builder/Cargo.toml
@@ -20,9 +20,4 @@ sp-std = { version = "8.0.0", default-features = false, path = "../std" }
 
 [features]
 default = [ "std" ]
-std = [
-	"sp-api/std",
-	"sp-inherents/std",
-	"sp-runtime/std",
-	"sp-std/std",
-]
+std = [ "sp-api/std", "sp-inherents/std", "sp-runtime/std", "sp-std/std" ]
diff --git a/substrate/primitives/consensus/aura/Cargo.toml b/substrate/primitives/consensus/aura/Cargo.toml
index b50e43acfd6..f841a65a7d6 100644
--- a/substrate/primitives/consensus/aura/Cargo.toml
+++ b/substrate/primitives/consensus/aura/Cargo.toml
@@ -25,7 +25,7 @@ sp-std = { version = "8.0.0", default-features = false, path = "../../std" }
 sp-timestamp = { version = "4.0.0-dev", default-features = false, path = "../../timestamp" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"async-trait",
 	"codec/std",
diff --git a/substrate/primitives/consensus/babe/Cargo.toml b/substrate/primitives/consensus/babe/Cargo.toml
index 3e22c89a29d..ca502c2c6dd 100644
--- a/substrate/primitives/consensus/babe/Cargo.toml
+++ b/substrate/primitives/consensus/babe/Cargo.toml
@@ -27,7 +27,7 @@ sp-std = { version = "8.0.0", default-features = false, path = "../../std" }
 sp-timestamp = { version = "4.0.0-dev", optional = true, path = "../../timestamp" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"async-trait",
 	"codec/std",
@@ -40,7 +40,7 @@ std = [
 	"sp-inherents/std",
 	"sp-runtime/std",
 	"sp-std/std",
- 	"sp-timestamp/std",
+	"sp-timestamp/std",
 ]
 
 # Serde support without relying on std features.
diff --git a/substrate/primitives/consensus/beefy/Cargo.toml b/substrate/primitives/consensus/beefy/Cargo.toml
index e6445919e2a..bbc69cef746 100644
--- a/substrate/primitives/consensus/beefy/Cargo.toml
+++ b/substrate/primitives/consensus/beefy/Cargo.toml
@@ -30,7 +30,7 @@ array-bytes = "6.1"
 w3f-bls = { version = "0.1.3", features = ["std"]} 
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"codec/std",
 	"scale-info/std",
@@ -56,6 +56,6 @@ serde = [
 # This feature adds BLS crypto primitives. It should not be used in production since
 # the BLS implementation and interface may still be subject to significant change.
 bls-experimental = [
- 	 "sp-core/bls-experimental",
- 	 "sp-application-crypto/bls-experimental",	 
+	"sp-application-crypto/bls-experimental",
+	"sp-core/bls-experimental",
 ]
diff --git a/substrate/primitives/consensus/grandpa/Cargo.toml b/substrate/primitives/consensus/grandpa/Cargo.toml
index 2d0ff26f897..1bbbbe61bb5 100644
--- a/substrate/primitives/consensus/grandpa/Cargo.toml
+++ b/substrate/primitives/consensus/grandpa/Cargo.toml
@@ -27,7 +27,7 @@ sp-runtime = { version = "24.0.0", default-features = false, path = "../../runti
 sp-std = { version = "8.0.0", default-features = false, path = "../../std" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"codec/std",
 	"grandpa/std",
@@ -37,9 +37,9 @@ std = [
 	"sp-api/std",
 	"sp-application-crypto/std",
 	"sp-core/std",
- 	"sp-keystore/std",
- 	"sp-runtime/std",
- 	"sp-std/std"
+	"sp-keystore/std",
+	"sp-runtime/std",
+	"sp-std/std",
 ]
 
 # Serde support without relying on std features.
diff --git a/substrate/primitives/consensus/pow/Cargo.toml b/substrate/primitives/consensus/pow/Cargo.toml
index 1c8c75c4b19..491486fe0c3 100644
--- a/substrate/primitives/consensus/pow/Cargo.toml
+++ b/substrate/primitives/consensus/pow/Cargo.toml
@@ -20,7 +20,7 @@ sp-runtime = { version = "24.0.0", default-features = false, path = "../../runti
 sp-std = { version = "8.0.0", default-features = false, path = "../../std" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"codec/std",
 	"sp-api/std",
diff --git a/substrate/primitives/consensus/slots/Cargo.toml b/substrate/primitives/consensus/slots/Cargo.toml
index a0404f46abf..ffc347a7869 100644
--- a/substrate/primitives/consensus/slots/Cargo.toml
+++ b/substrate/primitives/consensus/slots/Cargo.toml
@@ -20,7 +20,7 @@ sp-std = { version = "8.0.0", default-features = false, path = "../../std" }
 sp-timestamp = { version = "4.0.0-dev", default-features = false, path = "../../timestamp" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"codec/std",
 	"scale-info/std",
@@ -30,7 +30,4 @@ std = [
 ]
 
 # Serde support without relying on std features.
-serde = [
-	"dep:serde",
-	"scale-info/serde",
-]
+serde = [ "dep:serde", "scale-info/serde" ]
diff --git a/substrate/primitives/core/Cargo.toml b/substrate/primitives/core/Cargo.toml
index ee4bf892418..85952b35546 100644
--- a/substrate/primitives/core/Cargo.toml
+++ b/substrate/primitives/core/Cargo.toml
@@ -73,67 +73,67 @@ harness = false
 bench = false
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
+	"array-bytes",
 	"arrayvec/std",
-	"merlin/std",
+	"bandersnatch_vrfs/getrandom",
+	"blake2/std",
+	"bounded-collections/std",
+	"bs58/std",
+	"codec/std",
+	"dyn-clonable",
+	"ed25519-zebra/std",
 	"full_crypto",
-	"log/std",
-	"thiserror",
+	"futures",
+	"futures/thread-pool",
+	"hash-db/std",
+	"hash256-std-hasher/std",
+	"impl-serde/std",
 	"lazy_static",
+	"libsecp256k1/std",
+	"log/std",
+	"merlin/std",
 	"parking_lot",
-	"bandersnatch_vrfs/getrandom",
-	"bounded-collections/std",
-	"primitive-types/std",
-	"primitive-types/serde",
 	"primitive-types/byteorder",
 	"primitive-types/rustc-hex",
-	"impl-serde/std",
-	"codec/std",
-	"scale-info/std",
-	"hash256-std-hasher/std",
-	"hash-db/std",
-	"sp-std/std",
-	"serde/std",
-	"blake2/std",
-	"array-bytes",
-	"ed25519-zebra/std",
-	"bs58/std",
-	"substrate-bip39",
-	"tiny-bip39",
+	"primitive-types/serde",
+	"primitive-types/std",
 	"rand",
-	"schnorrkel/std",
 	"regex",
-	"secp256k1/std",
+	"scale-info/std",
+	"schnorrkel/std",
 	"secp256k1/global-context",
+	"secp256k1/std",
+	"secrecy/alloc",
+	"serde/std",
 	"sp-core-hashing/std",
 	"sp-debug-derive/std",
-	"sp-storage/std",
+	"sp-externalities/std",
 	"sp-runtime-interface/std",
+	"sp-std/std",
+	"sp-storage/std",
 	"ss58-registry/std",
-	"zeroize/alloc",
-	"secrecy/alloc",
-	"futures",
-	"futures/thread-pool",
-	"libsecp256k1/std",
-	"dyn-clonable",
+	"substrate-bip39",
+	"thiserror",
+	"tiny-bip39",
 	"tracing",
-	"sp-externalities/std"
+	"zeroize/alloc",
 ]
 
 # Serde support without relying on std features.
 serde = [
-	"dep:serde",
 	"array-bytes",
 	"blake2",
 	"bounded-collections/serde",
 	"bs58/alloc",
-	"scale-info/serde",
-	"secrecy/alloc",
+	"dep:serde",
 	"impl-serde",
 	"primitive-types/serde_no_std",
-	"sp-storage/serde",
+	"scale-info/serde",
+	"secrecy/alloc",
 	"sp-core-hashing",
+	"sp-storage/serde",
 ]
 
 # This feature enables all crypto primitives for `no_std` builds like microcontrollers
@@ -141,8 +141,8 @@ serde = [
 # For the regular wasm runtime builds this should not be used.
 full_crypto = [
 	"array-bytes",
-	"ed25519-zebra",
 	"blake2",
+	"ed25519-zebra",
 	"libsecp256k1",
 	"secp256k1",
 	"sp-core-hashing",
@@ -152,9 +152,9 @@ full_crypto = [
 # This feature adds BLS crypto primitives.
 # It should not be used in production since the implementation and interface may still
 # be subject to significant changes.
-bls-experimental = ["w3f-bls"]
+bls-experimental = [ "w3f-bls" ]
 
 # This feature adds Bandersnatch crypto primitives.
 # It should not be used in production since the implementation and interface may still
 # be subject to significant changes.
-bandersnatch-experimental = ["bandersnatch_vrfs"]
+bandersnatch-experimental = [ "bandersnatch_vrfs" ]
diff --git a/substrate/primitives/core/hashing/Cargo.toml b/substrate/primitives/core/hashing/Cargo.toml
index 43a13883358..a4ddb6363f7 100644
--- a/substrate/primitives/core/hashing/Cargo.toml
+++ b/substrate/primitives/core/hashing/Cargo.toml
@@ -21,11 +21,11 @@ sha3 = { version = "0.10.0", default-features = false }
 twox-hash = { version = "1.6.3", default-features = false, features = ["digest_0_10"] }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
-	"digest/std",
 	"blake2b_simd/std",
 	"byteorder/std",
+	"digest/std",
 	"sha2/std",
 	"sha3/std",
 	"twox-hash/std",
diff --git a/substrate/primitives/crypto/ec-utils/Cargo.toml b/substrate/primitives/crypto/ec-utils/Cargo.toml
index 9c28c9af9f3..90cd38722e0 100644
--- a/substrate/primitives/crypto/ec-utils/Cargo.toml
+++ b/substrate/primitives/crypto/ec-utils/Cargo.toml
@@ -39,24 +39,24 @@ sp-ark-ed-on-bls12-381-bandersnatch = { version = "0.4.0-beta", default-features
 [features]
 default = [ "std" ]
 std = [
-	"ark-serialize/std",
-	"ark-ff/std",
-	"ark-ec/std",
-	"ark-std/std",
+	"ark-algebra-test-templates/std",
 	"ark-bls12-377/std",
 	"ark-bls12-381/std",
 	"ark-bw6-761/std",
-	"ark-ed-on-bls12-381-bandersnatch/std",
+	"ark-ec/std",
 	"ark-ed-on-bls12-377/std",
-	"sp-std/std",
-	"codec/std",
+	"ark-ed-on-bls12-381-bandersnatch/std",
+	"ark-ff/std",
 	"ark-scale/std",
-	"sp-runtime-interface/std",
-	"sp-io/std",
-	"ark-algebra-test-templates/std",
+	"ark-serialize/std",
+	"ark-std/std",
+	"codec/std",
 	"sp-ark-bls12-377/std",
 	"sp-ark-bls12-381/std",
-    "sp-ark-bw6-761/std",
-    "sp-ark-ed-on-bls12-377/std",
-    "sp-ark-ed-on-bls12-381-bandersnatch/std",
+	"sp-ark-bw6-761/std",
+	"sp-ark-ed-on-bls12-377/std",
+	"sp-ark-ed-on-bls12-381-bandersnatch/std",
+	"sp-io/std",
+	"sp-runtime-interface/std",
+	"sp-std/std",
 ]
diff --git a/substrate/primitives/externalities/Cargo.toml b/substrate/primitives/externalities/Cargo.toml
index 71dbd122beb..58edbf83a3c 100644
--- a/substrate/primitives/externalities/Cargo.toml
+++ b/substrate/primitives/externalities/Cargo.toml
@@ -20,10 +20,5 @@ sp-std = { version = "8.0.0", default-features = false, path = "../std" }
 sp-storage = { version = "13.0.0", default-features = false, path = "../storage" }
 
 [features]
-default = ["std"]
-std = [
-	"codec/std",
-	"environmental/std",
-	"sp-std/std",
-	"sp-storage/std",
-]
+default = [ "std" ]
+std = [ "codec/std", "environmental/std", "sp-std/std", "sp-storage/std" ]
diff --git a/substrate/primitives/genesis-builder/Cargo.toml b/substrate/primitives/genesis-builder/Cargo.toml
index d17c6b5da80..7760ceb3b6d 100644
--- a/substrate/primitives/genesis-builder/Cargo.toml
+++ b/substrate/primitives/genesis-builder/Cargo.toml
@@ -20,9 +20,4 @@ serde_json = { version = "1.0.85", default-features = false, features = ["alloc"
 
 [features]
 default = [ "std" ]
-std = [
-	"sp-api/std",
-	"sp-std/std",
-	"serde_json/std",
-	"sp-runtime/std"
-]
+std = [ "serde_json/std", "sp-api/std", "sp-runtime/std", "sp-std/std" ]
diff --git a/substrate/primitives/io/Cargo.toml b/substrate/primitives/io/Cargo.toml
index 3a9a5734566..8ff06596efb 100644
--- a/substrate/primitives/io/Cargo.toml
+++ b/substrate/primitives/io/Cargo.toml
@@ -39,29 +39,27 @@ ed25519-dalek = { version = "2.0.0", default-features = false, optional = true }
 rustversion = "1.0.6"
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"bytes/std",
-	"sp-externalities/std",
-	"sp-core/std",
 	"codec/std",
-	"sp-std/std",
-	"sp-trie/std",
-	"sp-state-machine/std",
+	"ed25519-dalek",
 	"libsecp256k1",
+	"log",
 	"secp256k1",
+	"sp-core/std",
+	"sp-externalities/std",
+	"sp-keystore/std",
 	"sp-runtime-interface/std",
+	"sp-state-machine/std",
+	"sp-std/std",
 	"sp-tracing/std",
-	"tracing/std",
+	"sp-trie/std",
 	"tracing-core/std",
-	"log",
-	"ed25519-dalek",
-	"sp-keystore/std"
+	"tracing/std",
 ]
 
-with-tracing = [
-	"sp-tracing/with-tracing"
-]
+with-tracing = [ "sp-tracing/with-tracing" ]
 
 # These two features are used for `no_std` builds for the environments which already provides
 # `#[panic_handler]`, `#[alloc_error_handler]` and `#[global_allocator]`.
@@ -93,13 +91,9 @@ improved_panic_error_reporting = []
 # This feature adds BLS crypto primitives.
 # It should not be used in production since the implementation and interface may still
 # be subject to significant changes.
-bls-experimental = [
-	 "sp-keystore/bls-experimental",
-]
+bls-experimental = [ "sp-keystore/bls-experimental" ]
 
 # This feature adds Bandersnatch crypto primitives.
 # It should not be used in production since the implementation and interface may still
 # be subject to significant changes.
-bandersnatch-experimental = [
-	"sp-keystore/bandersnatch-experimental",
-]
+bandersnatch-experimental = [ "sp-keystore/bandersnatch-experimental" ]
diff --git a/substrate/primitives/keyring/Cargo.toml b/substrate/primitives/keyring/Cargo.toml
index 8e9f7936360..c2d20dba490 100644
--- a/substrate/primitives/keyring/Cargo.toml
+++ b/substrate/primitives/keyring/Cargo.toml
@@ -23,4 +23,4 @@ sp-runtime = { version = "24.0.0", path = "../runtime" }
 # This feature adds Bandersnatch crypto primitives.
 # It should not be used in production since the implementation and interface may still
 # be subject to significant changes.
-bandersnatch-experimental = ["sp-core/bandersnatch-experimental"]
+bandersnatch-experimental = [ "sp-core/bandersnatch-experimental" ]
diff --git a/substrate/primitives/keystore/Cargo.toml b/substrate/primitives/keystore/Cargo.toml
index 7e551b7cbf2..e9e699f4cc6 100644
--- a/substrate/primitives/keystore/Cargo.toml
+++ b/substrate/primitives/keystore/Cargo.toml
@@ -24,19 +24,15 @@ rand = "0.7.2"
 rand_chacha = "0.2.2"
 
 [features]
-default = ["std"]
-std = [
-	"codec/std",
-	"sp-core/std",
-	"sp-externalities/std",
-]
+default = [ "std" ]
+std = [ "codec/std", "sp-core/std", "sp-externalities/std" ]
 
 # This feature adds BLS crypto primitives.
 # It should not be used in production since the implementation and interface may still
 # be subject to significant changes.
-bls-experimental = ["sp-core/bls-experimental"]
+bls-experimental = [ "sp-core/bls-experimental" ]
 
 # This feature adds Bandersnatch crypto primitives.
 # It should not be used in production since the implementation and interface may still
 # be subject to significant changes.
-bandersnatch-experimental = ["sp-core/bandersnatch-experimental"]
+bandersnatch-experimental = [ "sp-core/bandersnatch-experimental" ]
diff --git a/substrate/primitives/merkle-mountain-range/Cargo.toml b/substrate/primitives/merkle-mountain-range/Cargo.toml
index 9ede77ba40b..606774d12d5 100644
--- a/substrate/primitives/merkle-mountain-range/Cargo.toml
+++ b/substrate/primitives/merkle-mountain-range/Cargo.toml
@@ -28,7 +28,7 @@ thiserror = "1.0"
 array-bytes = "6.1"
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"codec/std",
 	"log/std",
@@ -42,9 +42,4 @@ std = [
 ]
 
 # Serde support without relying on std features.
-serde = [
-	"dep:serde",
-	"scale-info/serde",
-	"sp-core/serde",
-	"sp-runtime/serde",
-]
+serde = [ "dep:serde", "scale-info/serde", "sp-core/serde", "sp-runtime/serde" ]
diff --git a/substrate/primitives/metadata-ir/Cargo.toml b/substrate/primitives/metadata-ir/Cargo.toml
index 49fd23e208e..c06aaa5c48b 100644
--- a/substrate/primitives/metadata-ir/Cargo.toml
+++ b/substrate/primitives/metadata-ir/Cargo.toml
@@ -19,10 +19,5 @@ scale-info = { version = "2.1.1", default-features = false, features = ["derive"
 sp-std = { version = "8.0.0", default-features = false, path = "../std" }
 
 [features]
-default = ["std"]
-std = [
-	"codec/std",
-	"frame-metadata/std",
-	"scale-info/std",
-	"sp-std/std",
-]
+default = [ "std" ]
+std = [ "codec/std", "frame-metadata/std", "scale-info/std", "sp-std/std" ]
diff --git a/substrate/primitives/npos-elections/Cargo.toml b/substrate/primitives/npos-elections/Cargo.toml
index cd704082f57..7faab23b04f 100644
--- a/substrate/primitives/npos-elections/Cargo.toml
+++ b/substrate/primitives/npos-elections/Cargo.toml
@@ -26,7 +26,7 @@ rand = "0.8.5"
 substrate-test-utils = { version = "4.0.0-dev", path = "../../test-utils" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 bench = []
 std = [
 	"codec/std",
diff --git a/substrate/primitives/offchain/Cargo.toml b/substrate/primitives/offchain/Cargo.toml
index 6d73bf92121..0e1c98fb1cf 100644
--- a/substrate/primitives/offchain/Cargo.toml
+++ b/substrate/primitives/offchain/Cargo.toml
@@ -18,5 +18,5 @@ sp-core = { version = "21.0.0", default-features = false, path = "../core" }
 sp-runtime = { version = "24.0.0", default-features = false, path = "../runtime" }
 
 [features]
-default = ["std"]
-std = ["sp-api/std", "sp-core/std", "sp-runtime/std"]
+default = [ "std" ]
+std = [ "sp-api/std", "sp-core/std", "sp-runtime/std" ]
diff --git a/substrate/primitives/runtime-interface/Cargo.toml b/substrate/primitives/runtime-interface/Cargo.toml
index e0d6d9d89bd..49ed49e1b41 100644
--- a/substrate/primitives/runtime-interface/Cargo.toml
+++ b/substrate/primitives/runtime-interface/Cargo.toml
@@ -37,18 +37,18 @@ trybuild = "1.0.74"
 [features]
 default = [ "std" ]
 std = [
-	"sp-storage/std",
 	"bytes/std",
-	"sp-wasm-interface/std",
-	"sp-std/std",
-	"sp-tracing/std",
 	"codec/std",
-	"sp-externalities/std",
 	"primitive-types/std",
 	"sp-core/std",
+	"sp-externalities/std",
 	"sp-io/std",
 	"sp-runtime-interface-test-wasm/std",
-	"sp-state-machine/std"
+	"sp-state-machine/std",
+	"sp-std/std",
+	"sp-storage/std",
+	"sp-tracing/std",
+	"sp-wasm-interface/std",
 ]
 
 # ATTENTION
diff --git a/substrate/primitives/runtime-interface/test-wasm-deprecated/Cargo.toml b/substrate/primitives/runtime-interface/test-wasm-deprecated/Cargo.toml
index 2ff86086a89..d2fd8a2f2c5 100644
--- a/substrate/primitives/runtime-interface/test-wasm-deprecated/Cargo.toml
+++ b/substrate/primitives/runtime-interface/test-wasm-deprecated/Cargo.toml
@@ -23,8 +23,8 @@ substrate-wasm-builder = { version = "5.0.0-dev", path = "../../../utils/wasm-bu
 [features]
 default = [ "std" ]
 std = [
-    "sp-core/std",
-    "sp-io/std",
-    "sp-runtime-interface/std",
-    "substrate-wasm-builder",
+	"sp-core/std",
+	"sp-io/std",
+	"sp-runtime-interface/std",
+	"substrate-wasm-builder",
 ]
diff --git a/substrate/primitives/runtime-interface/test-wasm/Cargo.toml b/substrate/primitives/runtime-interface/test-wasm/Cargo.toml
index 82fa35267cf..b1ab8531b0e 100644
--- a/substrate/primitives/runtime-interface/test-wasm/Cargo.toml
+++ b/substrate/primitives/runtime-interface/test-wasm/Cargo.toml
@@ -25,9 +25,9 @@ substrate-wasm-builder = { version = "5.0.0-dev", path = "../../../utils/wasm-bu
 [features]
 default = [ "std" ]
 std = [
-    "sp-core/std",
-    "sp-io/std",
-    "sp-runtime-interface/std",
-    "sp-std/std",
-    "substrate-wasm-builder",
+	"sp-core/std",
+	"sp-io/std",
+	"sp-runtime-interface/std",
+	"sp-std/std",
+	"substrate-wasm-builder",
 ]
diff --git a/substrate/primitives/runtime/Cargo.toml b/substrate/primitives/runtime/Cargo.toml
index 246b2a2ed2e..52affa6aa70 100644
--- a/substrate/primitives/runtime/Cargo.toml
+++ b/substrate/primitives/runtime/Cargo.toml
@@ -42,7 +42,7 @@ substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/ru
 [features]
 runtime-benchmarks = []
 try-runtime = []
-default = ["std"]
+default = [ "std" ]
 std = [
 	"codec/std",
 	"either/use_std",
@@ -51,15 +51,15 @@ std = [
 	"rand",
 	"scale-info/std",
 	"serde/std",
+	"sp-api/std",
 	"sp-application-crypto/std",
 	"sp-arithmetic/std",
 	"sp-core/std",
 	"sp-io/std",
+	"sp-state-machine/std",
 	"sp-std/std",
+	"sp-tracing/std",
 	"sp-weights/std",
-	"sp-api/std",
-	"sp-state-machine/std",
-	"sp-tracing/std"
 ]
 
 # Serde support without relying on std features.
diff --git a/substrate/primitives/session/Cargo.toml b/substrate/primitives/session/Cargo.toml
index f547608fe51..79ccc110aa7 100644
--- a/substrate/primitives/session/Cargo.toml
+++ b/substrate/primitives/session/Cargo.toml
@@ -29,8 +29,8 @@ std = [
 	"scale-info/std",
 	"sp-api/std",
 	"sp-core/std",
+	"sp-keystore/std",
 	"sp-runtime/std",
 	"sp-staking/std",
 	"sp-std/std",
- 	"sp-keystore/std"
 ]
diff --git a/substrate/primitives/staking/Cargo.toml b/substrate/primitives/staking/Cargo.toml
index 43ee307aa10..8fe2f19ad19 100644
--- a/substrate/primitives/staking/Cargo.toml
+++ b/substrate/primitives/staking/Cargo.toml
@@ -23,15 +23,13 @@ sp-runtime = { default-features = false, path = "../runtime" }
 sp-std = { default-features = false, path = "../std" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
-	"serde/std",
 	"codec/std",
 	"scale-info/std",
+	"serde/std",
 	"sp-core/std",
 	"sp-runtime/std",
 	"sp-std/std",
 ]
-runtime-benchmarks = [
-	"sp-runtime/runtime-benchmarks"
-]
+runtime-benchmarks = [ "sp-runtime/runtime-benchmarks" ]
diff --git a/substrate/primitives/state-machine/Cargo.toml b/substrate/primitives/state-machine/Cargo.toml
index 32be8e518f4..0f5613545b5 100644
--- a/substrate/primitives/state-machine/Cargo.toml
+++ b/substrate/primitives/state-machine/Cargo.toml
@@ -37,7 +37,7 @@ sp-runtime = { version = "24.0.0", path = "../runtime" }
 assert_matches = "1.5"
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"codec/std",
 	"hash-db/std",
@@ -47,10 +47,10 @@ std = [
 	"sp-core/std",
 	"sp-externalities/std",
 	"sp-panic-handler",
+	"sp-runtime/std",
 	"sp-std/std",
 	"sp-trie/std",
-	"trie-db/std",
 	"thiserror",
 	"tracing",
-	"sp-runtime/std"
+	"trie-db/std",
 ]
diff --git a/substrate/primitives/statement-store/Cargo.toml b/substrate/primitives/statement-store/Cargo.toml
index d5612eaca8c..fffb110195d 100644
--- a/substrate/primitives/statement-store/Cargo.toml
+++ b/substrate/primitives/statement-store/Cargo.toml
@@ -34,30 +34,29 @@ sha2 = { version = "0.10.7", optional = true }
 rand = { version = "0.8.5", features = ["small_rng"],  optional = true }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
+	"aes-gcm",
 	"codec/std",
+	"curve25519-dalek",
+	"ed25519-dalek",
+	"hkdf",
+	"rand",
 	"scale-info/std",
+	"sha2",
+	"sp-api/std",
+	"sp-application-crypto/std",
 	"sp-core/std",
-	"sp-runtime/std",
+	"sp-externalities/std",
 	"sp-runtime-interface/std",
+	"sp-runtime/std",
 	"sp-std/std",
-	"sp-api/std",
-	"sp-application-crypto/std",
 	"thiserror",
-
-	"ed25519-dalek",
 	"x25519-dalek",
-	"curve25519-dalek",
-	"aes-gcm",
-	"hkdf",
-	"sha2",
-	"rand",
-	"sp-externalities/std"
 ]
 serde = [
-        "scale-info/serde",
-        "sp-application-crypto/serde",
-        "sp-core/serde",
-        "sp-runtime/serde",
+	"scale-info/serde",
+	"sp-application-crypto/serde",
+	"sp-core/serde",
+	"sp-runtime/serde",
 ]
diff --git a/substrate/primitives/std/Cargo.toml b/substrate/primitives/std/Cargo.toml
index d16b15f0e61..4c58d147c7a 100644
--- a/substrate/primitives/std/Cargo.toml
+++ b/substrate/primitives/std/Cargo.toml
@@ -14,5 +14,5 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = []
diff --git a/substrate/primitives/storage/Cargo.toml b/substrate/primitives/storage/Cargo.toml
index 412a2b15e05..42fa01184ff 100644
--- a/substrate/primitives/storage/Cargo.toml
+++ b/substrate/primitives/storage/Cargo.toml
@@ -32,7 +32,4 @@ std = [
 ]
 
 # Serde support without relying on std features.
-serde = [
-	"dep:serde",
-	"impl-serde",
-]
+serde = [ "dep:serde", "impl-serde" ]
diff --git a/substrate/primitives/test-primitives/Cargo.toml b/substrate/primitives/test-primitives/Cargo.toml
index 8a1ae4d01e4..a14f3fb9b8a 100644
--- a/substrate/primitives/test-primitives/Cargo.toml
+++ b/substrate/primitives/test-primitives/Cargo.toml
@@ -21,17 +21,15 @@ sp-runtime = { version = "24.0.0", default-features = false, path = "../runtime"
 sp-std = { version = "8.0.0", default-features = false, path = "../std" }
 
 [features]
-default = [
-	"std",
-]
+default = [ "std" ]
 std = [
 	"codec/std",
+	"scale-info/std",
 	"serde/std",
 	"sp-application-crypto/std",
 	"sp-core/std",
 	"sp-runtime/std",
 	"sp-std/std",
-	"scale-info/std",
 ]
 
 # Serde support without relying on std features.
diff --git a/substrate/primitives/tracing/Cargo.toml b/substrate/primitives/tracing/Cargo.toml
index 1ef0a0e73ac..106e3a725cd 100644
--- a/substrate/primitives/tracing/Cargo.toml
+++ b/substrate/primitives/tracing/Cargo.toml
@@ -29,13 +29,13 @@ tracing-subscriber = { version = "0.2.25", optional = true, features = [
 ] }
 
 [features]
-default = ["std"]
-with-tracing = ["codec/derive", "codec/full"]
+default = [ "std" ]
+with-tracing = [ "codec/derive", "codec/full" ]
 std = [
-	"with-tracing",
-	"tracing/std",
-	"tracing-core/std",
 	"codec/std",
 	"sp-std/std",
+	"tracing-core/std",
 	"tracing-subscriber",
+	"tracing/std",
+	"with-tracing",
 ]
diff --git a/substrate/primitives/transaction-pool/Cargo.toml b/substrate/primitives/transaction-pool/Cargo.toml
index d65db6a1d32..cef4a908cc3 100644
--- a/substrate/primitives/transaction-pool/Cargo.toml
+++ b/substrate/primitives/transaction-pool/Cargo.toml
@@ -19,7 +19,4 @@ sp-runtime = { version = "24.0.0", default-features = false, path = "../runtime"
 
 [features]
 default = [ "std" ]
-std = [
-	"sp-api/std",
-	"sp-runtime/std",
-]
+std = [ "sp-api/std", "sp-runtime/std" ]
diff --git a/substrate/primitives/transaction-storage-proof/Cargo.toml b/substrate/primitives/transaction-storage-proof/Cargo.toml
index b687f63c2fe..5854eb78a4b 100644
--- a/substrate/primitives/transaction-storage-proof/Cargo.toml
+++ b/substrate/primitives/transaction-storage-proof/Cargo.toml
@@ -28,9 +28,9 @@ std = [
 	"async-trait",
 	"codec/std",
 	"scale-info/std",
+	"sp-core/std",
 	"sp-inherents/std",
 	"sp-runtime/std",
 	"sp-std/std",
 	"sp-trie/std",
-	"sp-core/std"
 ]
diff --git a/substrate/primitives/trie/Cargo.toml b/substrate/primitives/trie/Cargo.toml
index 546d6786fc6..5b6877592c3 100644
--- a/substrate/primitives/trie/Cargo.toml
+++ b/substrate/primitives/trie/Cargo.toml
@@ -43,23 +43,23 @@ trie-standardmap = "0.16.0"
 sp-runtime = { version = "24.0.0", path = "../runtime" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"ahash",
 	"codec/std",
-	"hashbrown",
 	"hash-db/std",
+	"hashbrown",
 	"lazy_static",
-	"schnellru",
 	"memory-db/std",
 	"nohash-hasher",
 	"parking_lot",
 	"scale-info/std",
+	"schnellru",
 	"sp-core/std",
+	"sp-runtime/std",
 	"sp-std/std",
 	"thiserror",
 	"tracing",
 	"trie-db/std",
 	"trie-root/std",
-	"sp-runtime/std"
 ]
diff --git a/substrate/primitives/version/Cargo.toml b/substrate/primitives/version/Cargo.toml
index fc59a367ba3..f53a1e2e0c1 100644
--- a/substrate/primitives/version/Cargo.toml
+++ b/substrate/primitives/version/Cargo.toml
@@ -26,7 +26,7 @@ sp-std = { version = "8.0.0", default-features = false, path = "../std" }
 sp-version-proc-macro = { version = "8.0.0", default-features = false, path = "proc-macro" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"codec/std",
 	"impl-serde/std",
@@ -39,8 +39,4 @@ std = [
 ]
 
 # Serde support without relying on std features.
-serde = [
-	"dep:serde",
-	"impl-serde",
-	"sp-runtime/serde",
-]
+serde = [ "dep:serde", "impl-serde", "sp-runtime/serde" ]
diff --git a/substrate/primitives/wasm-interface/Cargo.toml b/substrate/primitives/wasm-interface/Cargo.toml
index 50efd6d9d22..cac78fc2521 100644
--- a/substrate/primitives/wasm-interface/Cargo.toml
+++ b/substrate/primitives/wasm-interface/Cargo.toml
@@ -22,6 +22,6 @@ anyhow = { version = "1.0.68", optional = true }
 sp-std = { version = "8.0.0", default-features = false, path = "../std" }
 
 [features]
-default = ["std"]
-std = ["codec/std", "log", "sp-std/std", "wasmtime"]
-wasmtime = ["dep:wasmtime", "anyhow"]
+default = [ "std" ]
+std = [ "codec/std", "log", "sp-std/std", "wasmtime" ]
+wasmtime = [ "anyhow", "dep:wasmtime" ]
diff --git a/substrate/primitives/weights/Cargo.toml b/substrate/primitives/weights/Cargo.toml
index 05fc58a10e1..0ee32fbd8d6 100644
--- a/substrate/primitives/weights/Cargo.toml
+++ b/substrate/primitives/weights/Cargo.toml
@@ -31,11 +31,11 @@ std = [
 	"sp-arithmetic/std",
 	"sp-core/std",
 	"sp-debug-derive/std",
-	"sp-std/std"
+	"sp-std/std",
 ]
 # By default some types have documentation, `full-metadata-docs` allows to add documentation to
 # more types in the metadata.
-full-metadata-docs = ["scale-info/docs"]
+full-metadata-docs = [ "scale-info/docs" ]
 
 # Serde support without relying on std features.
 serde = [
diff --git a/substrate/scripts/ci/gitlab/pipeline/test.yml b/substrate/scripts/ci/gitlab/pipeline/test.yml
index 61c1aa876f3..71ae5105a61 100644
--- a/substrate/scripts/ci/gitlab/pipeline/test.yml
+++ b/substrate/scripts/ci/gitlab/pipeline/test.yml
@@ -58,6 +58,17 @@ cargo-fmt:
     - cargo +nightly fmt --all -- --check
     - rusty-cachier cache upload
 
+cargo-fmt-manifest:
+  stage: test
+  extends:
+    - .docker-env
+    - .test-refs
+  script:
+    - cargo install zepter --locked --version 0.10.0 -q -f --no-default-features && zepter --version
+    - echo "👉 Hello developer! If you see this CI check failing then it means that one of the your changes in a Cargo.toml file introduced ill-formatted or unsorted features. Please take a look at 'docs/STYLE_GUIDE.md#manifest-formatting' to find out more."
+    - zepter format features --check
+  allow_failure: true # Experimental
+
 cargo-clippy:
   stage: test
   # this is an artificial job dependency, for pipeline optimization using GitLab's DAGs
diff --git a/substrate/test-utils/cli/Cargo.toml b/substrate/test-utils/cli/Cargo.toml
index 314fe7ad568..20418d60288 100644
--- a/substrate/test-utils/cli/Cargo.toml
+++ b/substrate/test-utils/cli/Cargo.toml
@@ -26,4 +26,4 @@ sc-service = { path = "../../client/service" }
 futures = "0.3.28"
 
 [features]
-try-runtime = ["node-cli/try-runtime"]
+try-runtime = [ "node-cli/try-runtime" ]
diff --git a/substrate/test-utils/runtime/Cargo.toml b/substrate/test-utils/runtime/Cargo.toml
index 43ab0da98bd..fe517843aff 100644
--- a/substrate/test-utils/runtime/Cargo.toml
+++ b/substrate/test-utils/runtime/Cargo.toml
@@ -65,47 +65,45 @@ json-patch = { version = "1.0.0", default-features = false }
 substrate-wasm-builder = { version = "5.0.0-dev", path = "../../utils/wasm-builder", optional = true }
 
 [features]
-default = [
-	"std",
-]
+default = [ "std" ]
 
 std = [
 	"array-bytes",
-	"sp-genesis-builder/std",
+	"codec/std",
+	"frame-executive/std",
+	"frame-support/std",
+	"frame-system-rpc-runtime-api/std",
+	"frame-system/std",
+	"log/std",
+	"pallet-babe/std",
+	"pallet-balances/std",
+	"pallet-timestamp/std",
+	"sc-executor/std",
+	"sc-service",
+	"scale-info/std",
+	"sp-api/std",
 	"sp-application-crypto/std",
+	"sp-block-builder/std",
 	"sp-consensus-aura/std",
 	"sp-consensus-babe/std",
-	"sp-block-builder/std",
-	"codec/std",
-	"scale-info/std",
+	"sp-consensus-grandpa/std",
+	"sp-core/std",
+	"sp-externalities/std",
+	"sp-genesis-builder/std",
 	"sp-inherents/std",
+	"sp-io/std",
 	"sp-keyring",
-	"log/std",
 	"sp-offchain/std",
-	"sp-core/std",
-	"sp-std/std",
-	"sp-io/std",
-	"frame-support/std",
-	"sp-version/std",
-	"sp-session/std",
-	"sp-api/std",
 	"sp-runtime/std",
-	"sp-externalities/std",
+	"sp-session/std",
 	"sp-state-machine/std",
-	"pallet-babe/std",
-	"pallet-timestamp/std",
-	"pallet-balances/std",
-	"frame-system-rpc-runtime-api/std",
-	"frame-system/std",
-	"sc-service",
-	"sp-consensus-grandpa/std",
-	"sp-trie/std",
+	"sp-std/std",
+	"sp-tracing/std",
 	"sp-transaction-pool/std",
-	"trie-db/std",
+	"sp-trie/std",
+	"sp-version/std",
 	"substrate-wasm-builder",
-	"frame-executive/std",
-	"sc-executor/std",
-	"sp-tracing/std"
+	"trie-db/std",
 ]
 # Special feature to disable logging
 disable-logging = [ "sp-api/disable-logging" ]
diff --git a/substrate/utils/binary-merkle-tree/Cargo.toml b/substrate/utils/binary-merkle-tree/Cargo.toml
index 4b7b9e53ef8..f619a5ab550 100644
--- a/substrate/utils/binary-merkle-tree/Cargo.toml
+++ b/substrate/utils/binary-merkle-tree/Cargo.toml
@@ -20,13 +20,6 @@ sp-core = { version = "21.0.0", path = "../../primitives/core" }
 sp-runtime = { version = "24.0.0", path = "../../primitives/runtime" }
 
 [features]
-debug = ["array-bytes", "log"]
-default = ["debug", "std"]
-std = [
-    
-	"log/std",
-    
-	"hash-db/std",
-	"sp-core/std",
-	"sp-runtime/std"
-]
+debug = [ "array-bytes", "log" ]
+default = [ "debug", "std" ]
+std = [ "hash-db/std", "log/std", "sp-core/std", "sp-runtime/std" ]
diff --git a/substrate/utils/frame/benchmarking-cli/Cargo.toml b/substrate/utils/frame/benchmarking-cli/Cargo.toml
index 0ebfbc3cdaf..4b142c205c4 100644
--- a/substrate/utils/frame/benchmarking-cli/Cargo.toml
+++ b/substrate/utils/frame/benchmarking-cli/Cargo.toml
@@ -56,13 +56,13 @@ sp-wasm-interface = { version = "14.0.0", path = "../../../primitives/wasm-inter
 gethostname = "0.2.3"
 
 [features]
-default = ["rocksdb"]
+default = [ "rocksdb" ]
 runtime-benchmarks = [
-	"sc-client-db/runtime-benchmarks",
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
+	"sc-client-db/runtime-benchmarks",
 	"sc-service/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks"
+	"sp-runtime/runtime-benchmarks",
 ]
-rocksdb = ["sc-cli/rocksdb", "sc-client-db/rocksdb"]
+rocksdb = [ "sc-cli/rocksdb", "sc-client-db/rocksdb" ]
diff --git a/substrate/utils/frame/try-runtime/cli/Cargo.toml b/substrate/utils/frame/try-runtime/cli/Cargo.toml
index 84b9460d137..2d8d9b476a4 100644
--- a/substrate/utils/frame/try-runtime/cli/Cargo.toml
+++ b/substrate/utils/frame/try-runtime/cli/Cargo.toml
@@ -53,8 +53,8 @@ tokio = "1.27.0"
 
 [features]
 try-runtime = [
-	"sp-debug-derive/force-debug",
 	"frame-try-runtime/try-runtime",
+	"sp-debug-derive/force-debug",
 	"sp-runtime/try-runtime",
-	"substrate-cli-test-utils/try-runtime"
+	"substrate-cli-test-utils/try-runtime",
 ]
-- 
GitLab