diff --git a/README.md b/README.md
index 13c32ad..7a1e81e 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ family of SoCs.
 
 # List of crates
 
-This workspace contains the following released crates:
+This workspace contains the following crates:
 
 - The [`zynq7000-rt`](https://egit.irs.uni-stuttgart.de/rust/zynq7000-rs/src/branch/main/zynq7000-rt)
   run-time crate containing basic low-level startup code necessary to boot a Rust app on the
diff --git a/examples/embassy/Cargo.toml b/examples/embassy/Cargo.toml
index 3637002..18f65e8 100644
--- a/examples/embassy/Cargo.toml
+++ b/examples/embassy/Cargo.toml
@@ -11,13 +11,12 @@ keywords = ["no-std", "arm", "cortex-a", "amd", "zynq7000"]
 categories = ["embedded", "no-std", "hardware-support"]
 
 [dependencies]
-cortex-ar = { path = "/home/rmueller/Rust/cortex-ar/cortex-ar", features = ["critical-section-single-core"] }
+cortex-ar = { git = "https://github.com/rust-embedded/cortex-ar", branch = "main", features = ["critical-section-single-core"] }
 zynq7000-rt = { path = "../../zynq7000-rt" }
 zynq7000 = { path = "../../zynq7000" }
 zynq7000-hal = { path = "../../zynq7000-hal" }
 zynq7000-embassy = { path = "../../zynq7000-embassy" }
-# dht-sensor = { git = "https://github.com/robamu/dht-sensor.git", branch = "bump-embedded-hal-deps-update-async", features = ["async"] }
-dht-sensor = { path = "../../../../Rust/dht-sensor", features = ["async"] }
+dht-sensor = { git = "https://github.com/robamu/dht-sensor.git", branch = "bump-embedded-hal-deps-update-async", features = ["async"] }
 static_cell = "2"
 critical-section = "1"
 heapless = "0.8"
@@ -26,12 +25,12 @@ embedded-hal = "1"
 fugit = "0.3"
 log = "0.4"
 
-embassy-executor = { path = "/home/rmueller/Rust/embassy/embassy-executor", features = [
+embassy-executor = { git = "https://github.com/us-irs/embassy", branch = "add-cortex-ar-support", features = [
   "arch-cortex-ar",
   "executor-thread",
   "task-arena-size-65536"
 ]}
-embassy-time = { path = "/home/rmueller/Rust/embassy/embassy-time", version = "0.4", features = ["tick-hz-1_000_000"] }
+embassy-time = { git = "https://github.com/us-irs/embassy", branch = "add-cortex-ar-support", version = "0.4", features = ["tick-hz-1_000_000"] }
 
 [profile.release]
 codegen-units = 1
diff --git a/examples/simple/Cargo.toml b/examples/simple/Cargo.toml
index 1610faf..9bc4654 100644
--- a/examples/simple/Cargo.toml
+++ b/examples/simple/Cargo.toml
@@ -9,7 +9,7 @@ repository = "https://egit.irs.uni-stuttgart.de/rust/zynq7000-rs"
 license = "MIT OR Apache-2.0"
 
 [dependencies]
-cortex-ar = { git = "https://github.com/us-irs/cortex-ar.git", branch = "cortex-a-addition", features = ["critical-section-single-core"] }
+cortex-ar = { git = "https://github.com/rust-embedded/cortex-ar", branch = "main" }
 zynq7000-rt = { path = "../../zynq7000-rt" }
 zynq7000 = { path = "../../zynq7000" }
 zynq7000-hal = { path = "../../zynq7000-hal" }
diff --git a/examples/zedboard/Cargo.toml b/examples/zedboard/Cargo.toml
index 8b03a4a..db20ad7 100644
--- a/examples/zedboard/Cargo.toml
+++ b/examples/zedboard/Cargo.toml
@@ -28,14 +28,15 @@ embedded-hal-async = "1"
 fugit = "0.3"
 log = "0.4"
 
-embassy-executor = { path = "/home/rmueller/Rust/embassy/embassy-executor", features = [
+embassy-executor = { git = "https://github.com/us-irs/embassy", branch = "add-cortex-ar-support", features = [
   "arch-cortex-ar",
-  "executor-thread"
+  "executor-thread",
+  "task-arena-size-65536"
 ]}
-embassy-time = { path = "/home/rmueller/Rust/embassy/embassy-time", version = "0.4" }
+embassy-time = { git = "https://github.com/us-irs/embassy", branch = "add-cortex-ar-support", version = "0.4", features = ["tick-hz-1_000_000"] }
 heapless = "0.8"
-axi-uartlite = { path = "/home/rmueller/Rust/axi-uartlite-rs" }
-axi-uart16550 = { path = "/home/rmueller/Rust/axi-uart16550-rs" }
+axi-uartlite = { git = "https://egit.irs.uni-stuttgart.de/rust/axi-uartlite.git" }
+axi-uart16550 = { git = "https://egit.irs.uni-stuttgart.de/rust/axi-uart16550.git" }
 
 [profile.release]
 codegen-units = 1
diff --git a/experiments/.cargo/config.toml b/experiments/.cargo/config.toml
deleted file mode 100644
index a7b19c9..0000000
--- a/experiments/.cargo/config.toml
+++ /dev/null
@@ -1 +0,0 @@
-[build]
diff --git a/experiments/.gitignore b/experiments/.gitignore
deleted file mode 100644
index ea8c4bf..0000000
--- a/experiments/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/target
diff --git a/experiments/Cargo.lock b/experiments/Cargo.lock
deleted file mode 100644
index bc77523..0000000
--- a/experiments/Cargo.lock
+++ /dev/null
@@ -1,171 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 4
-
-[[package]]
-name = "arbitrary-int"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "825297538d77367557b912770ca3083f778a196054b3ee63b22673c4a3cae0a5"
-
-[[package]]
-name = "bitbybit"
-version = "1.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d317eeca82e7d88d606419a430590d83552bdceb899cb29904f63d694344b7fc"
-dependencies = [
- "arbitrary-int",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "critical-section"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "790eea4361631c5e7d22598ecd5723ff611904e3344ce8720784c93e3d83d40b"
-
-[[package]]
-name = "derive-mmio"
-version = "0.3.0"
-dependencies = [
- "derive-mmio-macro",
- "rustversion",
-]
-
-[[package]]
-name = "derive-mmio-macro"
-version = "0.3.0"
-dependencies = [
- "proc-macro-error2",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "experiments"
-version = "0.1.0"
-dependencies = [
- "derive-mmio",
- "static_assertions",
- "zynq7000",
-]
-
-[[package]]
-name = "once_cell"
-version = "1.20.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e"
-dependencies = [
- "critical-section",
- "portable-atomic",
-]
-
-[[package]]
-name = "portable-atomic"
-version = "1.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e"
-
-[[package]]
-name = "proc-macro-error-attr2"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5"
-dependencies = [
- "proc-macro2",
- "quote",
-]
-
-[[package]]
-name = "proc-macro-error2"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802"
-dependencies = [
- "proc-macro-error-attr2",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.93"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.38"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "rustversion"
-version = "1.0.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2"
-
-[[package]]
-name = "static_assertions"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
-
-[[package]]
-name = "syn"
-version = "2.0.98"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36147f1a48ae0ec2b5b3bc5b537d267457555a10dc06f3dbc8cb11ba3006d3b1"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "thiserror"
-version = "2.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc"
-dependencies = [
- "thiserror-impl",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "2.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "unicode-ident"
-version = "1.0.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00e2473a93778eb0bad35909dff6a10d28e63f792f16ed15e404fca9d5eeedbe"
-
-[[package]]
-name = "zynq7000"
-version = "0.1.0"
-dependencies = [
- "arbitrary-int",
- "bitbybit",
- "derive-mmio",
- "once_cell",
- "static_assertions",
- "thiserror",
-]
diff --git a/experiments/Cargo.toml b/experiments/Cargo.toml
deleted file mode 100644
index a19b1e7..0000000
--- a/experiments/Cargo.toml
+++ /dev/null
@@ -1,9 +0,0 @@
-[package]
-name = "experiments"
-version = "0.1.0"
-edition = "2024"
-
-[dependencies]
-static_assertions = "1.1"
-derive-mmio = { path = "../../derive-mmio", default-features = false }
-zynq7000 = { path = "../zynq7000", default-features = false }
diff --git a/experiments/src/main.rs b/experiments/src/main.rs
deleted file mode 100644
index 3249366..0000000
--- a/experiments/src/main.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-use zynq7000::slcr::{ClockControl, Slcr};
-
-
-fn main() {
-    let size = core::mem::size_of::<ClockControl>();
-    println!("Size of ClockControl: {}", size);
-    let size = core::mem::size_of::<Slcr>();
-    println!("Size of SLCR: {}", size);
-
-    println!("Hello, world!");
-}
diff --git a/zynq7000-embassy/Cargo.toml b/zynq7000-embassy/Cargo.toml
index 38a523d..b771b45 100644
--- a/zynq7000-embassy/Cargo.toml
+++ b/zynq7000-embassy/Cargo.toml
@@ -15,5 +15,5 @@ critical-section = "1"
 once_cell = { version = "1", default-features = false, features = ["critical-section"] }
 zynq7000-hal = { path = "../zynq7000-hal" }
 
-embassy-time-driver = { path = "/home/rmueller/Rust/embassy/embassy-time-driver", version = "0.2" }
-embassy-time-queue-utils = { path = "/home/rmueller/Rust/embassy/embassy-time-queue-utils", version = "0.1" }
+embassy-time-driver = { git = "https://github.com/us-irs/embassy", branch = "add-cortex-ar-support", version = "0.2" }
+embassy-time-queue-utils = { git = "https://github.com/us-irs/embassy", branch = "add-cortex-ar-support", version = "0.1" }
diff --git a/zynq7000-hal/Cargo.toml b/zynq7000-hal/Cargo.toml
index 8b31ae1..fda74ba 100644
--- a/zynq7000-hal/Cargo.toml
+++ b/zynq7000-hal/Cargo.toml
@@ -11,7 +11,7 @@ keywords = ["no-std", "hal", "amd", "zynq7000", "xilinx", "bare-metal"]
 categories = ["embedded", "no-std", "hardware-support"]
 
 [dependencies]
-cortex-ar = { git = "https://github.com/rust-embedded/cortex-ar", branch = "main", features = ["critical-section-single-core"] }
+cortex-ar = { git = "https://github.com/rust-embedded/cortex-ar", branch = "main" }
 zynq7000 = { path = "../zynq7000" }
 
 arbitrary-int = "1.3"
diff --git a/zynq7000-hal/src/spi/mod.rs b/zynq7000-hal/src/spi/mod.rs
index 26ef457..62449d1 100644
--- a/zynq7000-hal/src/spi/mod.rs
+++ b/zynq7000-hal/src/spi/mod.rs
@@ -83,34 +83,6 @@ pub trait SsPin: MioPinMarker {
 
 pub const SPI_MUX_CONF: MuxConf = MuxConf::new_with_l3(u3::new(0b101));
 
-/*
-macro_rules! impl_into_spi {
-    (($($Mio:ident),+)) => {
-        $(
-            impl From<Pin<$Mio>> for IoPeriphPin {
-                /// Convert the pin into SPI pins by configuring the pin routing via the
-                /// MIO multiplexer bits. Also disables pull-ups for the pins.
-                fn from(pin: Pin<$Mio>) -> Self {
-                    IoPeriphPin::new(pin, SPI_MUX_CONF, Some(false))
-                }
-
-            }
-        )+
-    };
-}
-
-#[cfg(not(feature = "7z010-7z007s-clg225"))]
-impl_into_spi!((
-    Mio16, Mio21, Mio17, Mio18, Mio19, Mio20, Mio40, Mio45, Mio41, Mio42, Mio43, Mio44, Mio24,
-    Mio22, Mio23, Mio25, Mio26, Mio27, Mio48, Mio46, Mio47, Mio49, Mio50, Mio51
-));
-
-impl_into_spi!((
-    Mio28, Mio33, Mio29, Mio30, Mio31, Mio32, Mio12, Mio10, Mio11, Mio13, Mio14, Mio15, Mio36,
-    Mio34, Mio35, Mio37, Mio38, Mio39
-));
-*/
-
 // SPI0, choice 1
 #[cfg(not(feature = "7z010-7z007s-clg225"))]
 impl SckPin for Pin<Mio16> {
diff --git a/zynq7000-rt/Cargo.toml b/zynq7000-rt/Cargo.toml
index 69fb582..50ca596 100644
--- a/zynq7000-rt/Cargo.toml
+++ b/zynq7000-rt/Cargo.toml
@@ -12,7 +12,7 @@ categories = ["embedded", "no-std", "hardware-support"]
 
 [dependencies]
 cortex-a-rt = { git = "https://github.com/rust-embedded/cortex-ar", branch = "main", optional = true, features = ["vfp-dp"] }
-cortex-ar = { git = "https://github.com/rust-embedded/cortex-ar", branch = "main", features = ["critical-section-single-core"] }
+cortex-ar = { git = "https://github.com/rust-embedded/cortex-ar", branch = "main" }
 
 [features]
 default = ["rt"]
diff --git a/zynq7000/Cargo.toml b/zynq7000/Cargo.toml
index bb0700e..406031a 100644
--- a/zynq7000/Cargo.toml
+++ b/zynq7000/Cargo.toml
@@ -12,7 +12,7 @@ categories = ["embedded", "no-std", "hardware-support"]
 
 [dependencies]
 static_assertions = "1.1"
-derive-mmio = { path = "../../derive-mmio", default-features = false }
+derive-mmio = { git = "https://github.com/us-irs/derive-mmio", branch = "inner-mmio-by-shared-ref", default-features = false }
 bitbybit = "1.3"
 arbitrary-int = "1.3"
 rustversion = "1"