diff --git a/Cargo.toml b/Cargo.toml
index f399a18..26e137c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -33,7 +33,7 @@ i18n-embed-fl = "0.10"
 rust-embed = "8"
 
 [dependencies.cosmic-files]
-git = "https://github.com/pop-os/cosmic-files.git"
+path = "../cosmic-files"
 default-features = false
 
 [dependencies.cosmic-syntax-theme]
@@ -43,11 +43,12 @@ git = "https://github.com/pop-os/cosmic-syntax-theme.git"
 version = "0.19"
 features = ["syntect", "vi"]
 
-[dependencies.libcosmic]
-git = "https://github.com/pop-os/libcosmic.git"
+# Yoda fork.
+[dependencies.libcosmic-yoda]
+path = "../libcosmic"
 default-features = false
 #TODO: a11y feature crashes file choser dialog
-features = ["about", "multi-window", "tokio", "winit", "surface-message"]
+features = ["about", "multi-window", "tokio", "wayland", "surface-message"]
 
 [target.'cfg(unix)'.dependencies]
 fork = "0.2"
@@ -57,10 +58,10 @@ xdgen = "0.1"
 
 [features]
 default = ["dbus-config", "gvfs", "wgpu", "wayland"]
-dbus-config = ["libcosmic/dbus-config"]
+dbus-config = ["libcosmic-yoda/dbus-config"]
 gvfs = ["cosmic-files/gvfs"]
-wgpu = ["libcosmic/wgpu", "cosmic-files/wgpu"]
-wayland = ["libcosmic/wayland", "cosmic-files/wayland"]
+wgpu = ["libcosmic-yoda/wgpu", "cosmic-files/wgpu"]
+wayland = ["libcosmic-yoda/wayland", "cosmic-files/wayland"]
 
 [profile.release-with-debug]
 inherits = "release"
@@ -70,9 +71,4 @@ debug = true
 onig = { git = "https://github.com/rust-onig/rust-onig.git", branch = "main" }
 onig_sys = { git = "https://github.com/rust-onig/rust-onig.git", branch = "main" }
 
-[patch.'https://github.com/pop-os/libcosmic']
-libcosmic = { path = "../libcosmic" }
-cosmic-config = { path = "../libcosmic/cosmic-config" }
-cosmic-theme = { path = "../libcosmic/cosmic-theme" }
-iced_futures = { path = "../libcosmic/iced/futures" }
-iced_winit = { path = "../libcosmic/iced/winit" }
+# Yoda: [patch] block for libcosmic removed — direct path deps now.