diff --git a/Cargo.toml b/Cargo.toml
index b02b6ca7..8aa2c74c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,11 @@
 [package]
-name = "libcosmic"
-version = "1.0.0"
+# Yoda fork: hard-renamed. Every consumer (leyoda/cosmic-files fork + each
+# leyoda/cosmic-* app) depends directly on `libcosmic-yoda` by path, bypassing
+# pop-os/libcosmic entirely. No [patch] shenanigans needed — transitive deps
+# that used to ask for `libcosmic` are replaced by deps on our forks that ask
+# for `libcosmic-yoda`.
+name = "libcosmic-yoda"
+version = "0.1.0-yoda.2"
 edition = "2024"
 rust-version = "1.93"
 
@@ -9,12 +14,10 @@ name = "cosmic"
 
 [features]
 default = [
-    "winit",
     "tokio",
     "a11y",
     "dbus-config",
-    "x11",
-    "iced-wayland",
+    "wayland",
     "multi-window",
 ]
 advanced-shaping = ["iced/advanced-shaping"]
@@ -35,7 +38,6 @@ animated-image = [
 autosize = []
 applet = [
     "autosize",
-    "winit",
     "wayland",
     "tokio",
     "cosmic-panel-config",
@@ -81,32 +83,34 @@ tokio = [
     "cosmic-config/tokio",
 ]
 # Tokio async runtime
-# Wayland window support
-iced-wayland = [
+# Wayland window support (yoda fork is Wayland-only; always active in default).
+# We still need iced/winit because pop-os/iced hosts the runtime dispatcher
+# (`iced_winit as shell`) there — the name is a misnomer, it's the same crate
+# that provides both the winit path AND the sctk/cctk wayland path.
+wayland = [
     "ashpd?/wayland",
     "autosize",
+    "iced/winit",
     "iced/wayland",
     "iced_winit/wayland",
-    "surface-message",
-]
-wayland = [
-    "iced-wayland",
     "iced_runtime/cctk",
     "iced_winit/cctk",
     "iced_wgpu/cctk",
     "iced/cctk",
+    "dep:iced_winit",
     "dep:cctk",
+    "surface-message",
 ]
 surface-message = []
 # multi-window support
 multi-window = []
 # Render with wgpu
 wgpu = ["iced/wgpu", "iced_wgpu"]
-# X11 window support via winit
-winit = ["iced/winit", "iced_winit"]
-winit_debug = ["winit", "debug"]
-winit_tokio = ["winit", "tokio"]
-winit_wgpu = ["winit", "wgpu"]
+# Compat stubs — kept empty so upstream deps (cosmic-files, cosmic-text, …)
+# that still ask for `winit` / `x11` features resolve cleanly against the
+# yoda fork. Activating them has no effect: no code is gated on these.
+winit = []
+x11 = []
 # Enables XDG portal integrations
 xdg-portal = ["ashpd"]
 qr_code = ["iced/qr_code"]
@@ -119,7 +123,6 @@ async-std = [
     "zbus?/async-io",
     "iced/async-std",
 ]
-x11 = ["iced/x11", "iced_winit/x11"]
 
 [dependencies]
 apply = "0.3.0"
@@ -225,10 +228,17 @@ optional = true
 
 [dependencies.iced_tiny_skia]
 path = "./iced/tiny_skia"
+# Yoda: drop the x11 default → softbuffer no longer pulls tiny-xlib/x11-dl/etc.
+default-features = false
+features = ["wayland"]
 
 [dependencies.iced_winit]
 path = "./iced/winit"
 optional = true
+# Yoda: drop the x11 default → winit won't pull winit-x11/tiny-xlib/x11-dl.
+# Keep wayland + wayland-dlopen (default behaviour minus x11).
+default-features = false
+features = ["wayland", "wayland-dlopen"]
 
 [dependencies.iced_wgpu]
 path = "./iced/wgpu"
@@ -244,9 +254,10 @@ members = [
     "cosmic-config",
     "cosmic-config-derive",
     "cosmic-theme",
-    "examples/*",
 ]
-exclude = ["iced"]
+# examples/* excluded — many depend on the removed winit/x11 features.
+# They will be revisited and adapted in a later phase.
+exclude = ["iced", "examples"]
 
 [workspace.dependencies]
 async-std = "1.13"
diff --git a/examples/about/Cargo.toml b/examples/about/Cargo.toml
index f980811c..b27b5134 100644
--- a/examples/about/Cargo.toml
+++ b/examples/about/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2021"
 [dependencies]
 open = "5.3.3"
 
-[dependencies.libcosmic]
+[dependencies.libcosmic-yoda]
 path = "../../"
 features = [
     "debug",
diff --git a/examples/applet/Cargo.toml b/examples/applet/Cargo.toml
index 13eff684..265fbe7f 100644
--- a/examples/applet/Cargo.toml
+++ b/examples/applet/Cargo.toml
@@ -12,7 +12,7 @@ tracing = "0.1"
 env_logger = "0.10.2"
 log = "0.4.29"
 
-[dependencies.libcosmic]
+[dependencies.libcosmic-yoda]
 path = "../../"
 default-features = false
 features = ["applet-token"]
diff --git a/examples/application/Cargo.toml b/examples/application/Cargo.toml
index 1fb2949b..b5968461 100644
--- a/examples/application/Cargo.toml
+++ b/examples/application/Cargo.toml
@@ -5,12 +5,12 @@ edition = "2021"
 
 [features]
 default = ["wayland"]
-wayland = ["libcosmic/wayland"]
+wayland = ["libcosmic-yoda/wayland"]
 
 [dependencies]
 env_logger = "0.11"
 
-[dependencies.libcosmic]
+[dependencies.libcosmic-yoda]
 path = "../../"
 features = [
     "debug",
diff --git a/examples/calendar/Cargo.toml b/examples/calendar/Cargo.toml
index b7286825..203f7c17 100644
--- a/examples/calendar/Cargo.toml
+++ b/examples/calendar/Cargo.toml
@@ -8,6 +8,6 @@ edition = "2024"
 [dependencies]
 jiff = "0.2"
 
-[dependencies.libcosmic]
+[dependencies.libcosmic-yoda]
 path = "../../"
 features = ["debug", "winit", "tokio", "xdg-portal", "wgpu"]
diff --git a/examples/context-menu/Cargo.toml b/examples/context-menu/Cargo.toml
index 39c550f4..4c1eed60 100644
--- a/examples/context-menu/Cargo.toml
+++ b/examples/context-menu/Cargo.toml
@@ -8,7 +8,7 @@ tracing = "0.1.44"
 tracing-subscriber = "0.3.22"
 tracing-log = "0.2.0"
 
-[dependencies.libcosmic]
+[dependencies.libcosmic-yoda]
 path = "../../"
 features = [
     "debug",
diff --git a/examples/cosmic/Cargo.toml b/examples/cosmic/Cargo.toml
index 8c2a3126..eebf6c31 100644
--- a/examples/cosmic/Cargo.toml
+++ b/examples/cosmic/Cargo.toml
@@ -8,7 +8,7 @@ publish = false
 [dependencies]
 apply = "0.3.0"
 fraction = "0.15.3"
-libcosmic = { path = "../..", features = [
+libcosmic-yoda = { path = "../..", features = [
     "debug",
     "winit",
     "tokio",
diff --git a/examples/image-button/Cargo.toml b/examples/image-button/Cargo.toml
index c219a53b..8bc521f7 100644
--- a/examples/image-button/Cargo.toml
+++ b/examples/image-button/Cargo.toml
@@ -7,6 +7,6 @@ edition = "2021"
 tracing = "0.1.44"
 tracing-subscriber = "0.3.22"
 
-[dependencies.libcosmic]
+[dependencies.libcosmic-yoda]
 path = "../../"
 features = ["debug", "winit", "wgpu", "tokio"]
diff --git a/examples/menu/Cargo.toml b/examples/menu/Cargo.toml
index 430b26ea..047055e5 100644
--- a/examples/menu/Cargo.toml
+++ b/examples/menu/Cargo.toml
@@ -8,6 +8,6 @@ tracing = "0.1.44"
 tracing-subscriber = "0.3.22"
 tracing-log = "0.2.0"
 
-[dependencies.libcosmic]
+[dependencies.libcosmic-yoda]
 path = "../../"
 features = ["debug", "winit", "tokio", "xdg-portal", "wgpu"]
diff --git a/examples/multi-window/Cargo.toml b/examples/multi-window/Cargo.toml
index 0b5440f8..c38595fa 100644
--- a/examples/multi-window/Cargo.toml
+++ b/examples/multi-window/Cargo.toml
@@ -6,4 +6,4 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-libcosmic = { path = "../..", features = ["debug", "winit", "tokio", "single-instance", "wgpu", "wayland"] }
+libcosmic-yoda = { path = "../..", features = ["debug", "winit", "tokio", "single-instance", "wgpu", "wayland"] }
diff --git a/examples/nav-context/Cargo.toml b/examples/nav-context/Cargo.toml
index d829df0f..ea2bc2b8 100644
--- a/examples/nav-context/Cargo.toml
+++ b/examples/nav-context/Cargo.toml
@@ -8,6 +8,6 @@ tracing = "0.1.44"
 tracing-subscriber = "0.3.22"
 tracing-log = "0.2.0"
 
-[dependencies.libcosmic]
+[dependencies.libcosmic-yoda]
 path = "../../"
 features = ["debug", "winit", "tokio", "xdg-portal", "wgpu"]
diff --git a/examples/open-dialog/Cargo.toml b/examples/open-dialog/Cargo.toml
index 94049270..b09b98ca 100644
--- a/examples/open-dialog/Cargo.toml
+++ b/examples/open-dialog/Cargo.toml
@@ -5,8 +5,8 @@ edition = "2021"
 
 [features]
 default = ["xdg-portal"]
-rfd = ["libcosmic/rfd"]
-xdg-portal = ["libcosmic/xdg-portal"]
+rfd = ["libcosmic-yoda/rfd"]
+xdg-portal = ["libcosmic-yoda/xdg-portal"]
 
 [dependencies]
 apply = "0.3.0"
@@ -15,6 +15,6 @@ tracing = "0.1.44"
 tracing-subscriber = "0.3.22"
 url = "2.5.8"
 
-[dependencies.libcosmic]
+[dependencies.libcosmic-yoda]
 features = ["debug", "winit", "wgpu", "wayland", "tokio"]
 path = "../../"
diff --git a/examples/spin-button/Cargo.toml b/examples/spin-button/Cargo.toml
index a522050b..082c0fd5 100644
--- a/examples/spin-button/Cargo.toml
+++ b/examples/spin-button/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2021"
 [dependencies]
 fraction = "0.15.3"
 
-[dependencies.libcosmic]
+[dependencies.libcosmic-yoda]
 features = ["debug", "wgpu", "winit", "desktop", "tokio"]
 path = "../.."
 default-features = false
diff --git a/examples/subscriptions/Cargo.toml b/examples/subscriptions/Cargo.toml
index 8eb69ff3..ae31a395 100644
--- a/examples/subscriptions/Cargo.toml
+++ b/examples/subscriptions/Cargo.toml
@@ -5,6 +5,6 @@ edition = "2024"
 
 [dependencies]
 
-[dependencies.libcosmic]
+[dependencies.libcosmic-yoda]
 path = "../../"
 features = ["debug", "winit", "wgpu", "tokio", "xdg-portal"]
diff --git a/examples/table-view/Cargo.toml b/examples/table-view/Cargo.toml
index 8ed45928..8f71e5b4 100644
--- a/examples/table-view/Cargo.toml
+++ b/examples/table-view/Cargo.toml
@@ -9,6 +9,6 @@ tracing-subscriber = "0.3.22"
 tracing-log = "0.2.0"
 chrono = "*"
 
-[dependencies.libcosmic]
+[dependencies.libcosmic-yoda]
 features = ["debug", "wgpu", "winit", "desktop", "tokio"]
 path = "../.."
diff --git a/examples/text-input/Cargo.toml b/examples/text-input/Cargo.toml
index fe6105c2..69bd2a19 100644
--- a/examples/text-input/Cargo.toml
+++ b/examples/text-input/Cargo.toml
@@ -8,6 +8,6 @@ tracing = "0.1.44"
 tracing-subscriber = "0.3.22"
 tracing-log = "0.2.0"
 
-[dependencies.libcosmic]
+[dependencies.libcosmic-yoda]
 path = "../../"
 features = ["debug", "winit", "wgpu", "tokio", "xdg-portal"]
diff --git a/i18n/af/libcosmic.ftl b/i18n/af/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/af/libcosmic.ftl
rename to i18n/af/libcosmic_yoda.ftl
diff --git a/i18n/ar/libcosmic.ftl b/i18n/ar/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/ar/libcosmic.ftl
rename to i18n/ar/libcosmic_yoda.ftl
diff --git a/i18n/be/libcosmic.ftl b/i18n/be/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/be/libcosmic.ftl
rename to i18n/be/libcosmic_yoda.ftl
diff --git a/i18n/bg/libcosmic.ftl b/i18n/bg/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/bg/libcosmic.ftl
rename to i18n/bg/libcosmic_yoda.ftl
diff --git a/i18n/bn/libcosmic.ftl b/i18n/bn/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/bn/libcosmic.ftl
rename to i18n/bn/libcosmic_yoda.ftl
diff --git a/i18n/ca/libcosmic.ftl b/i18n/ca/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/ca/libcosmic.ftl
rename to i18n/ca/libcosmic_yoda.ftl
diff --git a/i18n/cs/libcosmic.ftl b/i18n/cs/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/cs/libcosmic.ftl
rename to i18n/cs/libcosmic_yoda.ftl
diff --git a/i18n/da/libcosmic.ftl b/i18n/da/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/da/libcosmic.ftl
rename to i18n/da/libcosmic_yoda.ftl
diff --git a/i18n/de/libcosmic.ftl b/i18n/de/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/de/libcosmic.ftl
rename to i18n/de/libcosmic_yoda.ftl
diff --git a/i18n/el/libcosmic.ftl b/i18n/el/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/el/libcosmic.ftl
rename to i18n/el/libcosmic_yoda.ftl
diff --git a/i18n/en-GB/libcosmic.ftl b/i18n/en-GB/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/en-GB/libcosmic.ftl
rename to i18n/en-GB/libcosmic_yoda.ftl
diff --git a/i18n/en/libcosmic.ftl b/i18n/en/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/en/libcosmic.ftl
rename to i18n/en/libcosmic_yoda.ftl
diff --git a/i18n/eo/libcosmic.ftl b/i18n/eo/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/eo/libcosmic.ftl
rename to i18n/eo/libcosmic_yoda.ftl
diff --git a/i18n/es-419/libcosmic.ftl b/i18n/es-419/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/es-419/libcosmic.ftl
rename to i18n/es-419/libcosmic_yoda.ftl
diff --git a/i18n/es-MX/libcosmic.ftl b/i18n/es-MX/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/es-MX/libcosmic.ftl
rename to i18n/es-MX/libcosmic_yoda.ftl
diff --git a/i18n/es/libcosmic.ftl b/i18n/es/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/es/libcosmic.ftl
rename to i18n/es/libcosmic_yoda.ftl
diff --git a/i18n/et/libcosmic.ftl b/i18n/et/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/et/libcosmic.ftl
rename to i18n/et/libcosmic_yoda.ftl
diff --git a/i18n/eu/libcosmic.ftl b/i18n/eu/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/eu/libcosmic.ftl
rename to i18n/eu/libcosmic_yoda.ftl
diff --git a/i18n/fa/libcosmic.ftl b/i18n/fa/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/fa/libcosmic.ftl
rename to i18n/fa/libcosmic_yoda.ftl
diff --git a/i18n/fi/libcosmic.ftl b/i18n/fi/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/fi/libcosmic.ftl
rename to i18n/fi/libcosmic_yoda.ftl
diff --git a/i18n/fr/libcosmic.ftl b/i18n/fr/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/fr/libcosmic.ftl
rename to i18n/fr/libcosmic_yoda.ftl
diff --git a/i18n/fy/libcosmic.ftl b/i18n/fy/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/fy/libcosmic.ftl
rename to i18n/fy/libcosmic_yoda.ftl
diff --git a/i18n/ga/libcosmic.ftl b/i18n/ga/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/ga/libcosmic.ftl
rename to i18n/ga/libcosmic_yoda.ftl
diff --git a/i18n/gd/libcosmic.ftl b/i18n/gd/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/gd/libcosmic.ftl
rename to i18n/gd/libcosmic_yoda.ftl
diff --git a/i18n/gu/libcosmic.ftl b/i18n/gu/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/gu/libcosmic.ftl
rename to i18n/gu/libcosmic_yoda.ftl
diff --git a/i18n/he/libcosmic.ftl b/i18n/he/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/he/libcosmic.ftl
rename to i18n/he/libcosmic_yoda.ftl
diff --git a/i18n/hi/libcosmic.ftl b/i18n/hi/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/hi/libcosmic.ftl
rename to i18n/hi/libcosmic_yoda.ftl
diff --git a/i18n/hr/libcosmic.ftl b/i18n/hr/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/hr/libcosmic.ftl
rename to i18n/hr/libcosmic_yoda.ftl
diff --git a/i18n/hu/libcosmic.ftl b/i18n/hu/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/hu/libcosmic.ftl
rename to i18n/hu/libcosmic_yoda.ftl
diff --git a/i18n/id/libcosmic.ftl b/i18n/id/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/id/libcosmic.ftl
rename to i18n/id/libcosmic_yoda.ftl
diff --git a/i18n/ie/libcosmic.ftl b/i18n/ie/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/ie/libcosmic.ftl
rename to i18n/ie/libcosmic_yoda.ftl
diff --git a/i18n/is/libcosmic.ftl b/i18n/is/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/is/libcosmic.ftl
rename to i18n/is/libcosmic_yoda.ftl
diff --git a/i18n/it/libcosmic.ftl b/i18n/it/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/it/libcosmic.ftl
rename to i18n/it/libcosmic_yoda.ftl
diff --git a/i18n/ja/libcosmic.ftl b/i18n/ja/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/ja/libcosmic.ftl
rename to i18n/ja/libcosmic_yoda.ftl
diff --git a/i18n/jv/libcosmic.ftl b/i18n/jv/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/jv/libcosmic.ftl
rename to i18n/jv/libcosmic_yoda.ftl
diff --git a/i18n/ka/libcosmic.ftl b/i18n/ka/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/ka/libcosmic.ftl
rename to i18n/ka/libcosmic_yoda.ftl
diff --git a/i18n/kab/libcosmic.ftl b/i18n/kab/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/kab/libcosmic.ftl
rename to i18n/kab/libcosmic_yoda.ftl
diff --git a/i18n/kk/libcosmic.ftl b/i18n/kk/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/kk/libcosmic.ftl
rename to i18n/kk/libcosmic_yoda.ftl
diff --git a/i18n/kmr/libcosmic.ftl b/i18n/kmr/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/kmr/libcosmic.ftl
rename to i18n/kmr/libcosmic_yoda.ftl
diff --git a/i18n/kn/libcosmic.ftl b/i18n/kn/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/kn/libcosmic.ftl
rename to i18n/kn/libcosmic_yoda.ftl
diff --git a/i18n/ko/libcosmic.ftl b/i18n/ko/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/ko/libcosmic.ftl
rename to i18n/ko/libcosmic_yoda.ftl
diff --git a/i18n/li/libcosmic.ftl b/i18n/li/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/li/libcosmic.ftl
rename to i18n/li/libcosmic_yoda.ftl
diff --git a/i18n/lt/libcosmic.ftl b/i18n/lt/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/lt/libcosmic.ftl
rename to i18n/lt/libcosmic_yoda.ftl
diff --git a/i18n/ml/libcosmic.ftl b/i18n/ml/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/ml/libcosmic.ftl
rename to i18n/ml/libcosmic_yoda.ftl
diff --git a/i18n/ms/libcosmic.ftl b/i18n/ms/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/ms/libcosmic.ftl
rename to i18n/ms/libcosmic_yoda.ftl
diff --git a/i18n/nb-NO/libcosmic.ftl b/i18n/nb-NO/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/nb-NO/libcosmic.ftl
rename to i18n/nb-NO/libcosmic_yoda.ftl
diff --git a/i18n/nl/libcosmic.ftl b/i18n/nl/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/nl/libcosmic.ftl
rename to i18n/nl/libcosmic_yoda.ftl
diff --git a/i18n/nn/libcosmic.ftl b/i18n/nn/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/nn/libcosmic.ftl
rename to i18n/nn/libcosmic_yoda.ftl
diff --git a/i18n/oc/libcosmic.ftl b/i18n/oc/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/oc/libcosmic.ftl
rename to i18n/oc/libcosmic_yoda.ftl
diff --git a/i18n/pa/libcosmic.ftl b/i18n/pa/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/pa/libcosmic.ftl
rename to i18n/pa/libcosmic_yoda.ftl
diff --git a/i18n/pl/libcosmic.ftl b/i18n/pl/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/pl/libcosmic.ftl
rename to i18n/pl/libcosmic_yoda.ftl
diff --git a/i18n/pt-BR/libcosmic.ftl b/i18n/pt-BR/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/pt-BR/libcosmic.ftl
rename to i18n/pt-BR/libcosmic_yoda.ftl
diff --git a/i18n/pt/libcosmic.ftl b/i18n/pt/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/pt/libcosmic.ftl
rename to i18n/pt/libcosmic_yoda.ftl
diff --git a/i18n/ro/libcosmic.ftl b/i18n/ro/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/ro/libcosmic.ftl
rename to i18n/ro/libcosmic_yoda.ftl
diff --git a/i18n/ru/libcosmic.ftl b/i18n/ru/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/ru/libcosmic.ftl
rename to i18n/ru/libcosmic_yoda.ftl
diff --git a/i18n/sk/libcosmic.ftl b/i18n/sk/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/sk/libcosmic.ftl
rename to i18n/sk/libcosmic_yoda.ftl
diff --git a/i18n/sl/libcosmic.ftl b/i18n/sl/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/sl/libcosmic.ftl
rename to i18n/sl/libcosmic_yoda.ftl
diff --git a/i18n/sr-Cyrl/libcosmic.ftl b/i18n/sr-Cyrl/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/sr-Cyrl/libcosmic.ftl
rename to i18n/sr-Cyrl/libcosmic_yoda.ftl
diff --git a/i18n/sr-Latn/libcosmic.ftl b/i18n/sr-Latn/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/sr-Latn/libcosmic.ftl
rename to i18n/sr-Latn/libcosmic_yoda.ftl
diff --git a/i18n/sr/libcosmic.ftl b/i18n/sr/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/sr/libcosmic.ftl
rename to i18n/sr/libcosmic_yoda.ftl
diff --git a/i18n/sv/libcosmic.ftl b/i18n/sv/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/sv/libcosmic.ftl
rename to i18n/sv/libcosmic_yoda.ftl
diff --git a/i18n/ta/libcosmic.ftl b/i18n/ta/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/ta/libcosmic.ftl
rename to i18n/ta/libcosmic_yoda.ftl
diff --git a/i18n/th/libcosmic.ftl b/i18n/th/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/th/libcosmic.ftl
rename to i18n/th/libcosmic_yoda.ftl
diff --git a/i18n/ti/libcosmic.ftl b/i18n/ti/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/ti/libcosmic.ftl
rename to i18n/ti/libcosmic_yoda.ftl
diff --git a/i18n/tr/libcosmic.ftl b/i18n/tr/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/tr/libcosmic.ftl
rename to i18n/tr/libcosmic_yoda.ftl
diff --git a/i18n/uk/libcosmic.ftl b/i18n/uk/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/uk/libcosmic.ftl
rename to i18n/uk/libcosmic_yoda.ftl
diff --git a/i18n/uz/libcosmic.ftl b/i18n/uz/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/uz/libcosmic.ftl
rename to i18n/uz/libcosmic_yoda.ftl
diff --git a/i18n/vi/libcosmic.ftl b/i18n/vi/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/vi/libcosmic.ftl
rename to i18n/vi/libcosmic_yoda.ftl
diff --git a/i18n/yue-Hant/libcosmic.ftl b/i18n/yue-Hant/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/yue-Hant/libcosmic.ftl
rename to i18n/yue-Hant/libcosmic_yoda.ftl
diff --git a/i18n/zh-Hans/libcosmic.ftl b/i18n/zh-Hans/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/zh-Hans/libcosmic.ftl
rename to i18n/zh-Hans/libcosmic_yoda.ftl
diff --git a/i18n/zh-Hant/libcosmic.ftl b/i18n/zh-Hant/libcosmic_yoda.ftl
similarity index 100%
rename from i18n/zh-Hant/libcosmic.ftl
rename to i18n/zh-Hant/libcosmic_yoda.ftl
diff --git a/src/action.rs b/src/action.rs
index b7162896..19e228b8 100644
--- a/src/action.rs
+++ b/src/action.rs
@@ -1,7 +1,6 @@
 // Copyright 2023 System76 <info@system76.com>
 // SPDX-License-Identifier: MPL-2.0
 
-#[cfg(feature = "winit")]
 use crate::app;
 #[cfg(feature = "single-instance")]
 use crate::dbus_activation;
@@ -9,7 +8,6 @@ use crate::dbus_activation;
 pub const fn app<M>(message: M) -> Action<M> {
     Action::App(message)
 }
-#[cfg(feature = "winit")]
 pub const fn cosmic<M>(message: app::Action) -> Action<M> {
     Action::Cosmic(message)
 }
@@ -23,7 +21,6 @@ pub const fn none<M>() -> Action<M> {
 pub enum Action<M> {
     /// Messages from the application, for the application.
     App(M),
-    #[cfg(feature = "winit")]
     /// Internal messages to be handled by libcosmic.
     Cosmic(app::Action),
     #[cfg(feature = "single-instance")]
diff --git a/src/command.rs b/src/command.rs
index 6bb16e8d..fee60ec5 100644
--- a/src/command.rs
+++ b/src/command.rs
@@ -27,12 +27,10 @@ pub fn set_title<M>(id: window::Id, title: String) -> iced::Task<crate::Action<M
     iced::Task::none()
 }
 
-#[cfg(feature = "winit")]
 pub fn set_scaling_factor<M: Send + 'static>(factor: f32) -> iced::Task<crate::Action<M>> {
     iced::Task::done(crate::app::Action::ScaleFactor(factor)).map(crate::Action::Cosmic)
 }
 
-#[cfg(feature = "winit")]
 pub fn set_theme<M: Send + 'static>(theme: crate::Theme) -> iced::Task<crate::Action<M>> {
     iced::Task::done(crate::app::Action::AppThemeChange(theme)).map(crate::Action::Cosmic)
 }
diff --git a/src/core.rs b/src/core.rs
index 0ca555e3..fbb98fbe 100644
--- a/src/core.rs
+++ b/src/core.rs
@@ -461,7 +461,6 @@ impl Core {
         id
     }
 
-    #[cfg(feature = "winit")]
     pub fn drag<M: Send + 'static>(&self, id: Option<window::Id>) -> crate::app::Task<M> {
         let Some(id) = id.or(self.main_window) else {
             return iced::Task::none();
@@ -469,7 +468,6 @@ impl Core {
         crate::command::drag(id)
     }
 
-    #[cfg(feature = "winit")]
     pub fn maximize<M: Send + 'static>(
         &self,
         id: Option<window::Id>,
@@ -481,7 +479,6 @@ impl Core {
         crate::command::maximize(id, maximized)
     }
 
-    #[cfg(feature = "winit")]
     pub fn minimize<M: Send + 'static>(&self, id: Option<window::Id>) -> crate::app::Task<M> {
         let Some(id) = id.or(self.main_window) else {
             return iced::Task::none();
@@ -489,7 +486,6 @@ impl Core {
         crate::command::minimize(id)
     }
 
-    #[cfg(feature = "winit")]
     pub fn set_title<M: Send + 'static>(
         &self,
         id: Option<window::Id>,
@@ -501,7 +497,6 @@ impl Core {
         crate::command::set_title(id, title)
     }
 
-    #[cfg(feature = "winit")]
     pub fn set_windowed<M: Send + 'static>(&self, id: Option<window::Id>) -> crate::app::Task<M> {
         let Some(id) = id.or(self.main_window) else {
             return iced::Task::none();
@@ -509,7 +504,6 @@ impl Core {
         crate::command::set_windowed(id)
     }
 
-    #[cfg(feature = "winit")]
     pub fn toggle_maximize<M: Send + 'static>(
         &self,
         id: Option<window::Id>,
diff --git a/src/lib.rs b/src/lib.rs
index c1646e23..2dcbe67e 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -90,7 +90,6 @@
 
 /// Recommended default imports.
 pub mod prelude {
-    #[cfg(feature = "winit")]
     pub use crate::ApplicationExt;
     pub use crate::ext::*;
     pub use crate::{Also, Apply, Element, Renderer, Task, Theme};
@@ -104,9 +103,7 @@ pub use action::Action;
 
 pub mod anim;
 
-#[cfg(feature = "winit")]
 pub mod app;
-#[cfg(feature = "winit")]
 #[doc(inline)]
 pub use app::{Application, ApplicationExt};
 
diff --git a/src/surface/action.rs b/src/surface/action.rs
index 493c9ad0..6de5af71 100644
--- a/src/surface/action.rs
+++ b/src/surface/action.rs
@@ -2,13 +2,12 @@
 // SPDX-License-Identifier: MPL-2.0
 
 use super::Action;
-#[cfg(feature = "winit")]
 use crate::Application;
 
 use iced::{Rectangle, window};
-#[cfg(all(feature = "wayland", target_os = "linux", feature = "winit"))]
+#[cfg(all(feature = "wayland", target_os = "linux"))]
 use iced_runtime::platform_specific::wayland::CornerRadius;
-#[cfg(all(feature = "wayland", target_os = "linux", feature = "winit"))]
+#[cfg(all(feature = "wayland", target_os = "linux"))]
 use iced_runtime::platform_specific::wayland::layer_surface::IcedMargin;
 use std::any::Any;
 use std::sync::Arc;
@@ -40,17 +39,17 @@ pub fn destroy_layer_shell(id: iced_core::window::Id) -> Action {
 
 #[derive(Debug, Default, Copy, Clone)]
 pub struct LiveSettings {
-    #[cfg(all(feature = "wayland", target_os = "linux", feature = "winit"))]
+    #[cfg(all(feature = "wayland", target_os = "linux"))]
     /// Override the surface padding value for the surface type.
     pub padding: Option<IcedMargin>,
-    #[cfg(all(feature = "wayland", target_os = "linux", feature = "winit"))]
+    #[cfg(all(feature = "wayland", target_os = "linux"))]
     /// Override the default corner radius value for the surface type.
     pub corners: Option<CornerRadius>,
     /// Override the default blur setting for the surface type.
     pub blur: Option<bool>,
 }
 
-#[cfg(all(feature = "wayland", target_os = "linux", feature = "winit"))]
+#[cfg(all(feature = "wayland", target_os = "linux"))]
 type BoxedView<App> = Option<
     Box<
         dyn Fn(&App) -> crate::Element<'_, crate::Action<<App as Application>::Message>>
@@ -60,7 +59,7 @@ type BoxedView<App> = Option<
     >,
 >;
 
-#[cfg(all(feature = "wayland", target_os = "linux", feature = "winit"))]
+#[cfg(all(feature = "wayland", target_os = "linux"))]
 #[must_use]
 pub fn app_window<App: Application>(
     live_settings: impl Fn(&App) -> LiveSettings + Send + Sync + 'static,
@@ -92,7 +91,7 @@ pub fn app_window<App: Application>(
 }
 
 /// Used to create a window message from within a widget.
-#[cfg(all(feature = "wayland", target_os = "linux", feature = "winit"))]
+#[cfg(all(feature = "wayland", target_os = "linux"))]
 #[must_use]
 pub fn simple_window<Message: 'static>(
     live_settings: impl Fn() -> LiveSettings + Send + Sync + 'static,
@@ -129,7 +128,7 @@ pub fn simple_window<Message: 'static>(
     )
 }
 
-#[cfg(all(feature = "wayland", target_os = "linux", feature = "winit"))]
+#[cfg(all(feature = "wayland", target_os = "linux"))]
 #[must_use]
 pub fn app_popup<App: Application>(
     live_settings: impl Fn(&App) -> LiveSettings + Send + Sync + 'static,
@@ -162,7 +161,7 @@ pub fn app_popup<App: Application>(
 }
 
 /// Used to create a subsurface message from within a widget.
-#[cfg(all(feature = "wayland", target_os = "linux", feature = "winit"))]
+#[cfg(all(feature = "wayland", target_os = "linux"))]
 #[must_use]
 pub fn simple_subsurface<Message: 'static>(
     settings: impl Fn() -> iced_runtime::platform_specific::wayland::subsurface::SctkSubsurfaceSettings
@@ -192,7 +191,7 @@ pub fn simple_subsurface<Message: 'static>(
 }
 
 /// Used to create a popup message from within a widget.
-#[cfg(all(feature = "wayland", target_os = "linux", feature = "winit"))]
+#[cfg(all(feature = "wayland", target_os = "linux"))]
 #[must_use]
 pub fn simple_popup<Message: 'static>(
     live_settings: impl Fn() -> LiveSettings + Send + Sync + 'static,
@@ -228,7 +227,7 @@ pub fn simple_popup<Message: 'static>(
     )
 }
 
-#[cfg(all(feature = "wayland", target_os = "linux", feature = "winit"))]
+#[cfg(all(feature = "wayland", target_os = "linux"))]
 #[must_use]
 pub fn subsurface<App: Application>(
     settings: impl Fn(
diff --git a/src/theme/style/mod.rs b/src/theme/style/mod.rs
index bc648a73..cc489312 100644
--- a/src/theme/style/mod.rs
+++ b/src/theme/style/mod.rs
@@ -32,7 +32,7 @@ mod text_input;
 #[doc(inline)]
 pub use self::text_input::TextInput;
 
-#[cfg(all(feature = "wayland", target_os = "linux", feature = "winit"))]
+#[cfg(all(feature = "wayland", target_os = "linux"))]
 pub mod tooltip;
-#[cfg(all(feature = "wayland", target_os = "linux", feature = "winit"))]
+#[cfg(all(feature = "wayland", target_os = "linux"))]
 pub use tooltip::Tooltip;
diff --git a/src/widget/color_picker/mod.rs b/src/widget/color_picker/mod.rs
index 4f9249dd..3bebee35 100644
--- a/src/widget/color_picker/mod.rs
+++ b/src/widget/color_picker/mod.rs
@@ -597,8 +597,10 @@ where
         let bounds = canvas_layout.bounds();
         // Draw the handle on the saturation value canvas
 
-        let t = THEME.lock().unwrap().clone();
-        let t = t.cosmic();
+        // Yoda: use the Theme passed into draw() instead of locking the global
+        // THEME Mutex and cloning the whole Theme. Fires on every color-picker
+        // redraw, so saving the Mutex lock + full Theme clone adds up.
+        let t = theme.cosmic();
         let handle_radius = f32::from(t.space_xs()) / 2.0;
         let (x, y) = (
             self.active_color
diff --git a/src/widget/context_menu.rs b/src/widget/context_menu.rs
index 4b31fc01..7bc18250 100644
--- a/src/widget/context_menu.rs
+++ b/src/widget/context_menu.rs
@@ -6,7 +6,6 @@
 #[cfg(all(
     feature = "wayland",
     target_os = "linux",
-    feature = "winit",
     feature = "surface-message"
 ))]
 use crate::app::cosmic::{WINDOWING_SYSTEM, WindowingSystem};
@@ -67,7 +66,6 @@ impl<Message: Clone + 'static> ContextMenu<'_, Message> {
     #[cfg(all(
         feature = "wayland",
         target_os = "linux",
-        feature = "winit",
         feature = "surface-message"
     ))]
     #[allow(clippy::too_many_lines)]
@@ -394,7 +392,6 @@ impl<Message: 'static + Clone> Widget<Message, crate::Theme, crate::Renderer>
                 #[cfg(all(
                     feature = "wayland",
                     target_os = "linux",
-                    feature = "winit",
                     feature = "surface-message"
                 ))]
                 if matches!(WINDOWING_SYSTEM.get(), Some(WindowingSystem::Wayland))
@@ -438,7 +435,6 @@ impl<Message: 'static + Clone> Widget<Message, crate::Theme, crate::Renderer>
                 #[cfg(all(
                     feature = "wayland",
                     target_os = "linux",
-                    feature = "winit",
                     feature = "surface-message"
                 ))]
                 if matches!(WINDOWING_SYSTEM.get(), Some(WindowingSystem::Wayland)) {
@@ -460,7 +456,6 @@ impl<Message: 'static + Clone> Widget<Message, crate::Theme, crate::Renderer>
                     #[cfg(all(
                         feature = "wayland",
                         target_os = "linux",
-                        feature = "winit",
                         feature = "surface-message"
                     ))]
                     if matches!(WINDOWING_SYSTEM.get(), Some(WindowingSystem::Wayland))
@@ -499,7 +494,6 @@ impl<Message: 'static + Clone> Widget<Message, crate::Theme, crate::Renderer>
         #[cfg(all(
             feature = "wayland",
             target_os = "linux",
-            feature = "winit",
             feature = "surface-message"
         ))]
         if matches!(WINDOWING_SYSTEM.get(), Some(WindowingSystem::Wayland))
diff --git a/src/widget/dropdown/mod.rs b/src/widget/dropdown/mod.rs
index b5fd4c06..0ea3a212 100644
--- a/src/widget/dropdown/mod.rs
+++ b/src/widget/dropdown/mod.rs
@@ -50,7 +50,7 @@ pub fn popup_dropdown<
     let dropdown: Dropdown<'_, S, Message, AppMessage> =
         Dropdown::new(selections.into(), selected, on_selected);
 
-    #[cfg(all(feature = "winit", feature = "wayland", target_os = "linux"))]
+    #[cfg(all(feature = "wayland", target_os = "linux"))]
     let dropdown = dropdown.with_popup(_parent_id, _on_surface_action, _map_action);
 
     dropdown
diff --git a/src/widget/dropdown/widget.rs b/src/widget/dropdown/widget.rs
index 79f854fb..3aa4660b 100644
--- a/src/widget/dropdown/widget.rs
+++ b/src/widget/dropdown/widget.rs
@@ -60,7 +60,7 @@ where
     action_map: Option<Arc<dyn Fn(Message) -> AppMessage + 'static + Send + Sync>>,
     #[setters(strip_option)]
     window_id: Option<window::Id>,
-    #[cfg(all(feature = "winit", feature = "wayland", target_os = "linux"))]
+    #[cfg(all(feature = "wayland", target_os = "linux"))]
     positioner: iced_runtime::platform_specific::wayland::popup::SctkPositioner,
 }
 
@@ -96,14 +96,14 @@ where
             text_line_height: text::LineHeight::Relative(1.2),
             font: None,
             window_id: None,
-            #[cfg(all(feature = "winit", feature = "wayland", target_os = "linux"))]
+            #[cfg(all(feature = "wayland", target_os = "linux"))]
             positioner: iced_runtime::platform_specific::wayland::popup::SctkPositioner::default(),
             on_surface_action: None,
             action_map: None,
         }
     }
 
-    #[cfg(all(feature = "winit", feature = "wayland", target_os = "linux"))]
+    #[cfg(all(feature = "wayland", target_os = "linux"))]
     /// Handle dropdown requests for popup creation.
     /// Intended to be used with [`crate::app::message::get_popup`]
     pub fn with_popup<NewAppMessage>(
@@ -154,7 +154,7 @@ where
         self
     }
 
-    #[cfg(all(feature = "winit", feature = "wayland", target_os = "linux"))]
+    #[cfg(all(feature = "wayland", target_os = "linux"))]
     pub fn with_positioner(
         mut self,
         positioner: iced_runtime::platform_specific::wayland::popup::SctkPositioner,
@@ -268,7 +268,7 @@ where
             layout,
             cursor,
             shell,
-            #[cfg(all(feature = "winit", feature = "wayland", target_os = "linux"))]
+            #[cfg(all(feature = "wayland", target_os = "linux"))]
             self.positioner.clone(),
             self.on_selected.clone(),
             self.selected,
@@ -346,7 +346,7 @@ where
         viewport: &Rectangle,
         translation: Vector,
     ) -> Option<overlay::Element<'b, Message, crate::Theme, crate::Renderer>> {
-        #[cfg(all(feature = "winit", feature = "wayland", target_os = "linux"))]
+        #[cfg(all(feature = "wayland", target_os = "linux"))]
         if self.window_id.is_some() || self.on_surface_action.is_some() {
             return None;
         }
@@ -545,7 +545,7 @@ pub fn update<
     layout: Layout<'_>,
     cursor: mouse::Cursor,
     shell: &mut Shell<'_, Message>,
-    #[cfg(all(feature = "winit", feature = "wayland", target_os = "linux"))]
+    #[cfg(all(feature = "wayland", target_os = "linux"))]
     positioner: iced_runtime::platform_specific::wayland::popup::SctkPositioner,
     on_selected: Arc<dyn Fn(usize) -> Message + Send + Sync + 'static>,
     selected: Option<usize>,
@@ -571,7 +571,7 @@ pub fn update<
         *hovered_guard = selected;
         let id = window::Id::unique();
         state.popup_id = id;
-        #[cfg(all(feature = "winit", feature = "wayland", target_os = "linux"))]
+        #[cfg(all(feature = "wayland", target_os = "linux"))]
         if let Some(((on_surface_action, parent), action_map)) = on_surface_action
             .as_ref()
             .zip(_window_id)
@@ -661,7 +661,7 @@ pub fn update<
         state.close_operation = false;
         state.is_open.store(false, Ordering::SeqCst);
         if is_open {
-            #[cfg(all(feature = "winit", feature = "wayland", target_os = "linux"))]
+            #[cfg(all(feature = "wayland", target_os = "linux"))]
             if let Some(ref on_close) = on_surface_action {
                 shell.publish(on_close(surface::action::destroy_popup(state.popup_id)));
             }
@@ -684,7 +684,7 @@ pub fn update<
                 // Event wasn't processed by overlay, so cursor was clicked either outside it's
                 // bounds or on the drop-down, either way we close the overlay.
                 state.is_open.store(false, Ordering::Relaxed);
-                #[cfg(all(feature = "winit", feature = "wayland", target_os = "linux"))]
+                #[cfg(all(feature = "wayland", target_os = "linux"))]
                 if let Some(on_close) = on_surface_action {
                     shell.publish(on_close(surface::action::destroy_popup(state.popup_id)));
                 }
@@ -729,7 +729,7 @@ pub fn mouse_interaction(layout: Layout<'_>, cursor: mouse::Cursor) -> mouse::In
     }
 }
 
-#[cfg(all(feature = "winit", feature = "wayland", target_os = "linux"))]
+#[cfg(all(feature = "wayland", target_os = "linux"))]
 /// Returns the current menu widget of a [`Dropdown`].
 #[allow(clippy::too_many_arguments)]
 pub fn menu_widget<
diff --git a/src/widget/menu/menu_bar.rs b/src/widget/menu/menu_bar.rs
index fce272e1..1715ae13 100644
--- a/src/widget/menu/menu_bar.rs
+++ b/src/widget/menu/menu_bar.rs
@@ -13,7 +13,6 @@ use crate::Renderer;
     feature = "multi-window",
     feature = "wayland",
     target_os = "linux",
-    feature = "winit",
     feature = "surface-message"
 ))]
 use crate::app::cosmic::{WINDOWING_SYSTEM, WindowingSystem};
@@ -194,7 +193,6 @@ pub struct MenuBar<Message> {
     #[cfg(all(
         feature = "multi-window",
         feature = "wayland",
-        feature = "winit",
         target_os = "linux"
     ))]
     positioner: iced_runtime::platform_specific::wayland::popup::SctkPositioner,
@@ -234,7 +232,6 @@ where
             #[cfg(all(
                 feature = "multi-window",
                 feature = "wayland",
-                feature = "winit",
                 target_os = "linux"
             ))]
             positioner: iced_runtime::platform_specific::wayland::popup::SctkPositioner::default(),
@@ -333,7 +330,6 @@ where
     #[cfg(all(
         feature = "multi-window",
         feature = "wayland",
-        feature = "winit",
         target_os = "linux"
     ))]
     pub fn with_positioner(
@@ -371,7 +367,6 @@ where
         feature = "multi-window",
         feature = "wayland",
         target_os = "linux",
-        feature = "winit",
         feature = "surface-message"
     ))]
     #[allow(clippy::too_many_lines)]
@@ -660,7 +655,6 @@ where
                         #[cfg(all(
                             feature = "wayland",
                             target_os = "linux",
-                            feature = "winit",
                             feature = "surface-message"
                         ))]
                         {
@@ -684,7 +678,6 @@ where
                     feature = "multi-window",
                     feature = "wayland",
                     target_os = "linux",
-                    feature = "winit",
                     feature = "surface-message"
                 ))]
                 if matches!(WINDOWING_SYSTEM.get(), Some(WindowingSystem::Wayland)) {
@@ -699,7 +692,6 @@ where
                     feature = "multi-window",
                     feature = "wayland",
                     target_os = "linux",
-                    feature = "winit",
                     feature = "surface-message"
                 ))]
                 if matches!(WINDOWING_SYSTEM.get(), Some(WindowingSystem::Wayland)) {
@@ -796,7 +788,6 @@ where
             feature = "multi-window",
             feature = "wayland",
             target_os = "linux",
-            feature = "winit",
             feature = "surface-message"
         ))]
         if matches!(WINDOWING_SYSTEM.get(), Some(WindowingSystem::Wayland))
diff --git a/src/widget/menu/menu_inner.rs b/src/widget/menu/menu_inner.rs
index 53c87415..6e17df52 100644
--- a/src/widget/menu/menu_inner.rs
+++ b/src/widget/menu/menu_inner.rs
@@ -10,7 +10,6 @@ use super::menu_tree::MenuTree;
     feature = "multi-window",
     feature = "wayland",
     target_os = "linux",
-    feature = "winit",
     feature = "surface-message"
 ))]
 use crate::app::cosmic::{WINDOWING_SYSTEM, WindowingSystem};
@@ -681,7 +680,6 @@ impl<'b, Message: Clone + 'static> Menu<'b, Message> {
                                 feature = "multi-window",
                                 feature = "wayland",
                                 target_os = "linux",
-                                feature = "winit",
                                 feature = "surface-message"
                             ))]
                             if matches!(WINDOWING_SYSTEM.get(), Some(WindowingSystem::Wayland))
@@ -993,7 +991,6 @@ impl<Message: std::clone::Clone + 'static> Widget<Message, crate::Theme, crate::
         #[cfg(all(
             feature = "multi-window",
             feature = "wayland",
-            feature = "winit",
             feature = "surface-message",
             target_os = "linux"
         ))]
@@ -1275,7 +1272,6 @@ pub(crate) fn init_root_menu<Message: Clone>(
     feature = "multi-window",
     feature = "wayland",
     target_os = "linux",
-    feature = "winit",
     feature = "surface-message"
 ))]
 pub(super) fn init_root_popup_menu<Message>(
@@ -1572,7 +1568,7 @@ where
             .as_ref()
             .is_some_and(|i| *i != new_index && !active_menu[*i].children.is_empty());
 
-        #[cfg(all(feature = "multi-window", feature = "wayland",target_os = "linux", feature = "winit", feature = "surface-message"))]
+        #[cfg(all(feature = "multi-window", feature = "wayland", target_os = "linux", feature = "surface-message"))]
         if matches!(WINDOWING_SYSTEM.get(), Some(WindowingSystem::Wayland)) && remove {
             if let Some(id) = state.popup_id.remove(&menu.window_id) {
                 state.active_root.truncate(menu.depth + 1);
diff --git a/src/widget/mod.rs b/src/widget/mod.rs
index 331d6c21..e68e7477 100644
--- a/src/widget/mod.rs
+++ b/src/widget/mod.rs
@@ -312,7 +312,7 @@ pub use toggler::{Toggler, toggler};
 #[doc(inline)]
 pub use tooltip::{Tooltip, tooltip};
 
-#[cfg(all(feature = "wayland", target_os = "linux", feature = "winit"))]
+#[cfg(all(feature = "wayland", target_os = "linux"))]
 pub mod wayland;
 
 pub mod tooltip {
diff --git a/src/widget/responsive_menu_bar.rs b/src/widget/responsive_menu_bar.rs
index 2cae68d8..de323c13 100644
--- a/src/widget/responsive_menu_bar.rs
+++ b/src/widget/responsive_menu_bar.rs
@@ -23,7 +23,7 @@ impl Default for ResponsiveMenuBar {
     fn default() -> ResponsiveMenuBar {
         ResponsiveMenuBar {
             collapsed_item_width: {
-                #[cfg(all(feature = "winit", feature = "wayland", target_os = "linux"))]
+                #[cfg(all(feature = "wayland", target_os = "linux"))]
                 if matches!(
                     crate::app::cosmic::WINDOWING_SYSTEM.get(),
                     Some(crate::app::cosmic::WindowingSystem::Wayland)
@@ -32,7 +32,7 @@ impl Default for ResponsiveMenuBar {
                 } else {
                     ItemWidth::Static(84)
                 }
-                #[cfg(not(all(feature = "winit", feature = "wayland", target_os = "linux")))]
+                #[cfg(not(all(feature = "wayland", target_os = "linux")))]
                 {
                     ItemWidth::Static(84)
                 }