diff --git a/Cargo.toml b/Cargo.toml
index d7cee5fa..2d7c6ac4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -352,23 +352,6 @@ members = [
 	"pezbridges/modules/teyrchains",
 	"pezbridges/modules/xcm-bridge-hub",
 	"pezbridges/modules/xcm-bridge-hub-router",
-	"pezbridges/primitives/beefy",
-	"pezbridges/primitives/header-chain",
-	"pezbridges/primitives/messages",
-	"pezbridges/primitives/pezkuwi-core",
-	"pezbridges/primitives/relayers",
-	"pezbridges/primitives/runtime",
-	"pezbridges/primitives/test-utils",
-	"pezbridges/primitives/teyrchains",
-	"pezbridges/primitives/xcm-bridge-hub",
-	"pezbridges/primitives/xcm-bridge-hub-router",
-	"pezbridges/relays/client-bizinikiwi",
-	"pezbridges/relays/equivocation",
-	"pezbridges/relays/finality",
-	"pezbridges/relays/lib-bizinikiwi-relay",
-	"pezbridges/relays/messages",
-	"pezbridges/relays/teyrchains",
-	"pezbridges/relays/utils",
 	"pezbridges/pezsnowbridge/pezpallets/ethereum-client",
 	"pezbridges/pezsnowbridge/pezpallets/ethereum-client/fixtures",
 	"pezbridges/pezsnowbridge/pezpallets/inbound-queue",
@@ -394,6 +377,23 @@ members = [
 	"pezbridges/pezsnowbridge/runtime/runtime-common",
 	"pezbridges/pezsnowbridge/runtime/test-common",
 	"pezbridges/pezsnowbridge/test-utils",
+	"pezbridges/primitives/beefy",
+	"pezbridges/primitives/header-chain",
+	"pezbridges/primitives/messages",
+	"pezbridges/primitives/pezkuwi-core",
+	"pezbridges/primitives/relayers",
+	"pezbridges/primitives/runtime",
+	"pezbridges/primitives/test-utils",
+	"pezbridges/primitives/teyrchains",
+	"pezbridges/primitives/xcm-bridge-hub",
+	"pezbridges/primitives/xcm-bridge-hub-router",
+	"pezbridges/relays/client-bizinikiwi",
+	"pezbridges/relays/equivocation",
+	"pezbridges/relays/finality",
+	"pezbridges/relays/lib-bizinikiwi-relay",
+	"pezbridges/relays/messages",
+	"pezbridges/relays/teyrchains",
+	"pezbridges/relays/utils",
 	"pezcumulus/bin/pov-validator",
 	"pezcumulus/client/bootnodes",
 	"pezcumulus/client/cli",
@@ -1342,6 +1342,7 @@ pezsnowbridge-pezpallet-outbound-queue-v2 = { path = "pezbridges/pezsnowbridge/p
 pezsnowbridge-pezpallet-system = { path = "pezbridges/pezsnowbridge/pezpallets/system", default-features = false }
 pezsnowbridge-pezpallet-system-frontend = { path = "pezbridges/pezsnowbridge/pezpallets/system-frontend", default-features = false }
 pezsnowbridge-pezpallet-system-v2 = { path = "pezbridges/pezsnowbridge/pezpallets/system-v2", default-features = false }
+pezsnowbridge-runtime-common = { path = "pezbridges/pezsnowbridge/runtime/runtime-common", default-features = false }
 pezsnowbridge-runtime-test-common = { path = "pezbridges/pezsnowbridge/runtime/test-common", default-features = false }
 pezsnowbridge-system-runtime-api = { path = "pezbridges/pezsnowbridge/pezpallets/system/runtime-api", default-features = false }
 pezsnowbridge-system-v2-runtime-api = { path = "pezbridges/pezsnowbridge/pezpallets/system-v2/runtime-api", default-features = false }
@@ -1496,7 +1497,6 @@ slotmap = { version = "1.0" }
 smallvec = { version = "1.11.0", default-features = false }
 smoldot = { version = "0.20.0", default-features = false }
 smoldot-light = { version = "0.18.0", default-features = false }
-pezsnowbridge-runtime-common = { path = "pezbridges/pezsnowbridge/runtime/runtime-common", default-features = false }
 soketto = { version = "0.8.0" }
 sp-core = { version = "38.1.0" }
 spinners = { version = "4.1.1" }
diff --git a/bizinikiwi/pezframe/revive/fixtures/build.rs b/bizinikiwi/pezframe/revive/fixtures/build.rs
index a5390c64..0bb2b752 100644
--- a/bizinikiwi/pezframe/revive/fixtures/build.rs
+++ b/bizinikiwi/pezframe/revive/fixtures/build.rs
@@ -192,7 +192,12 @@ fn invoke_build(current_dir: &Path) -> Result<()> {
 		.env("RUSTUP_HOME", env::var("RUSTUP_HOME").unwrap_or_default())
 		// Support compilation on stable rust
 		.env("RUSTC_BOOTSTRAP", "1")
-		.args(["build", "--release", "-Zbuild-std=core", "-Zbuild-std-features=panic_immediate_abort"])
+		.args([
+			"build",
+			"--release",
+			"-Zbuild-std=core",
+			"-Zbuild-std-features=panic_immediate_abort",
+		])
 		.arg("--target")
 		.arg(polkavm_linker::target_json_path(args).unwrap());
 
diff --git a/pezcumulus/teyrchains/runtimes/assets/asset-hub-zagros/Cargo.toml b/pezcumulus/teyrchains/runtimes/assets/asset-hub-zagros/Cargo.toml
index 372c9879..9379a04f 100644
--- a/pezcumulus/teyrchains/runtimes/assets/asset-hub-zagros/Cargo.toml
+++ b/pezcumulus/teyrchains/runtimes/assets/asset-hub-zagros/Cargo.toml
@@ -233,6 +233,7 @@ runtime-benchmarks = [
 	"pezpallet-xcm/runtime-benchmarks",
 	"pezsnowbridge-outbound-queue-primitives/runtime-benchmarks",
 	"pezsnowbridge-pezpallet-system-frontend/runtime-benchmarks",
+	"pezsnowbridge-runtime-common/runtime-benchmarks",
 	"pezsp-api/runtime-benchmarks",
 	"pezsp-block-builder/runtime-benchmarks",
 	"pezsp-consensus-aura/runtime-benchmarks",
@@ -247,7 +248,6 @@ runtime-benchmarks = [
 	"pezsp-staking/runtime-benchmarks",
 	"pezsp-transaction-pool/runtime-benchmarks",
 	"pezsp-version/runtime-benchmarks",
-	"pezsnowbridge-runtime-common/runtime-benchmarks",
 	"testnet-teyrchains-constants/runtime-benchmarks",
 	"teyrchain-info/runtime-benchmarks",
 	"teyrchains-common/runtime-benchmarks",
@@ -319,8 +319,8 @@ try-runtime = [
 	"pezpallet-xcm-precompiles/try-runtime",
 	"pezpallet-xcm/try-runtime",
 	"pezsnowbridge-pezpallet-system-frontend/try-runtime",
-	"pezsp-runtime/try-runtime",
 	"pezsnowbridge-runtime-common/try-runtime",
+	"pezsp-runtime/try-runtime",
 	"teyrchain-info/try-runtime",
 	"teyrchains-common/try-runtime",
 ]
@@ -407,6 +407,7 @@ std = [
 	"pezpallet-xcm/std",
 	"pezsnowbridge-outbound-queue-primitives/std",
 	"pezsnowbridge-pezpallet-system-frontend/std",
+	"pezsnowbridge-runtime-common/std",
 	"pezsp-api/std",
 	"pezsp-arithmetic/std",
 	"pezsp-block-builder/std",
@@ -428,7 +429,6 @@ std = [
 	"primitive-types/std",
 	"scale-info/std",
 	"serde_json/std",
-	"pezsnowbridge-runtime-common/std",
 	"testnet-teyrchains-constants/std",
 	"teyrchain-info/std",
 	"teyrchains-common/std",
diff --git a/pezcumulus/teyrchains/runtimes/testing/yet-another-teyrchain/Cargo.toml b/pezcumulus/teyrchains/runtimes/testing/yet-another-teyrchain/Cargo.toml
index 79755463..7e9dfc3a 100644
--- a/pezcumulus/teyrchains/runtimes/testing/yet-another-teyrchain/Cargo.toml
+++ b/pezcumulus/teyrchains/runtimes/testing/yet-another-teyrchain/Cargo.toml
@@ -23,12 +23,12 @@ pezsp-runtime = { workspace = true }
 pezkuwi-sdk = { workspace = true, default-features = false, features = [
 	# Primitives needed for runtime
 	"pezsp-api",
-	"pezsp-io",
 	"pezsp-block-builder",
 	"pezsp-consensus-aura",
 	"pezsp-core",
 	"pezsp-genesis-builder",
 	"pezsp-inherents",
+	"pezsp-io",
 	"pezsp-keyring",
 	"pezsp-offchain",
 	"pezsp-session",
diff --git a/umbrella/Cargo.toml b/umbrella/Cargo.toml
index 49406ba4..6341f65c 100644
--- a/umbrella/Cargo.toml
+++ b/umbrella/Cargo.toml
@@ -1067,7 +1067,6 @@ node = [
 	"pezkuwi-statement-distribution",
 	"pezkuwi-statement-table",
 	"pezkuwi-subxt",
-	"pezkuwi-subxt?/native",
 	"pezkuwi-subxt-codegen",
 	"pezkuwi-subxt-core",
 	"pezkuwi-subxt-lightclient",
@@ -1079,6 +1078,7 @@ node = [
 	"pezkuwi-subxt-signer",
 	"pezkuwi-subxt-utils-fetchmetadata",
 	"pezkuwi-subxt-utils-stripmetadata",
+	"pezkuwi-subxt?/native",
 	"pezmmr-gadget",
 	"pezmmr-rpc",
 	"pezpallet-contracts-mock-network",
diff --git a/vendor/pezkuwi-subxt/lightclient/src/lib.rs b/vendor/pezkuwi-subxt/lightclient/src/lib.rs
index c6b2abdd..84cbb0ca 100644
--- a/vendor/pezkuwi-subxt/lightclient/src/lib.rs
+++ b/vendor/pezkuwi-subxt/lightclient/src/lib.rs
@@ -11,7 +11,9 @@
 // Note: When both 'web' and 'native' features are enabled (e.g., --all-features),
 // 'native' takes priority. This allows CI to run with --all-features.
 #[cfg(not(any(feature = "web", feature = "native")))]
-compile_error!("subxt-lightclient: at least one of the 'web' or 'native' features must be enabled.");
+compile_error!(
+	"subxt-lightclient: at least one of the 'web' or 'native' features must be enabled."
+);
 
 mod platform;
 mod shared_client;
diff --git a/vendor/pezkuwi-subxt/subxt/examples/block_decoding_static.rs b/vendor/pezkuwi-subxt/subxt/examples/block_decoding_static.rs
index 93d39f06..c5c1fe3b 100644
--- a/vendor/pezkuwi-subxt/subxt/examples/block_decoding_static.rs
+++ b/vendor/pezkuwi-subxt/subxt/examples/block_decoding_static.rs
@@ -10,8 +10,8 @@ use codec::Decode;
 pub mod pezkuwi {}
 
 use pezkuwi::balances::calls::types::TransferKeepAlive;
-use pezkuwi::runtime_types::sp_runtime::multiaddress::MultiAddress;
 use pezkuwi::runtime_types::sp_core::crypto::AccountId32;
+use pezkuwi::runtime_types::sp_runtime::multiaddress::MultiAddress;
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
diff --git a/vendor/pezkuwi-subxt/subxt/examples/rpc_legacy.rs b/vendor/pezkuwi-subxt/subxt/examples/rpc_legacy.rs
index 2d05f3f6..3f4bcc55 100644
--- a/vendor/pezkuwi-subxt/subxt/examples/rpc_legacy.rs
+++ b/vendor/pezkuwi-subxt/subxt/examples/rpc_legacy.rs
@@ -45,9 +45,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 		let dest = pezkuwi::runtime_types::sp_runtime::multiaddress::MultiAddress::Id(
 			pezkuwi::runtime_types::sp_core::crypto::AccountId32(bob.public_key().0),
 		);
-		let balance_transfer = pezkuwi::tx()
-			.balances()
-			.transfer_allow_death(dest, 1_000_000);
+		let balance_transfer = pezkuwi::tx().balances().transfer_allow_death(dest, 1_000_000);
 
 		let ext_hash = api
 			.tx()