64 changed files with 752 additions and 982 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@ -10,7 +10,6 @@ members = [
    "cosmic-applet-minimize",
    "cosmic-applet-network",
    "cosmic-applet-notifications",
-    "cosmic-applet-osk",
    "cosmic-applet-power",
    "cosmic-applet-status-area",
    "cosmic-applet-tiling",
@ -28,7 +27,6 @@ resolver = "3"
 anyhow = "1.0.102"
 cctk = { package = "cosmic-client-toolkit", path = "../cosmic-protocols/client-toolkit" }
 cosmic-applets-config = { path = "cosmic-applets-config" }
-cosmic-osk-config = { git = "https://github.com/pop-os/cosmic-osk" }
 cosmic-protocols = { path = "../cosmic-protocols", default-features = false, features = [
    "client",
 ]}
@ -124,17 +122,7 @@ cosmic-settings-airplane-mode-subscription = { path = "/home/lionel/Projets/COSM
 [patch."https://github.com/pop-os/cosmic-text.git"]
 cosmic-text = { path = "../cosmic-text" }

-# Yoda: certaines crates amont 1.9 ecrivent l'URL avec "//" ; cargo la traite
-# comme une source distincte, il faut donc la patcher aussi.
-[patch."https://github.com/pop-os/cosmic-protocols//"]
-cosmic-protocols = { path = "/home/lionel/Projets/COSMIC/cosmic-protocols" }
-cosmic-client-toolkit = { path = "/home/lionel/Projets/COSMIC/cosmic-protocols/client-toolkit" }
-
 # [patch.'https://github.com/pop-os/dbus-settings-bindings']
 # cosmic-dbus-networkmanager = { path = "../dbus-settings-bindings/networkmanager" }
 # upower_dbus = { path = "../dbus-settings-bindings/upower" }
 # nm-secret-agent-manager = { path = "../dbus-settings-bindings/nm-secret-agent-manager" }
-
-# Yoda: cosmic-osk-config depuis le checkout local (meme source que le paquet cosmic-osk).
-[patch."https://github.com/pop-os/cosmic-osk"]
-cosmic-osk-config = { path = "../cosmic-osk/config" }
--- a/cosmic-app-list/Cargo.toml
+++ b/cosmic-app-list/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "cosmic-app-list"
-version = "1.9.0"
+version = "1.3.0"
 edition = "2024"
 license = "GPL-3.0-only"

--- a/cosmic-app-list/cosmic-app-list-config/Cargo.toml
+++ b/cosmic-app-list/cosmic-app-list-config/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "cosmic-app-list-config"
-version = "1.9.0"
+version = "1.3.0"
 edition = "2024"

 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
--- a/cosmic-app-list/i18n/kab/cosmic_app_list.ftl
+++ b/cosmic-app-list/i18n/kab/cosmic_app_list.ftl
@ -1,7 +1,7 @@
 run = Selkem
 run-on = Selkem ɣef { $gpu }
 run-on-default = (Amezwer)
-quit = Ffeɣ
+quit = Tuffɣa
 quit-all = Ffeɣ-iten akk
 new-window = Asfaylu Amaynut
 cosmic-app-list = Afeggag n yisnasen
--- a/cosmic-app-list/i18n/oc/cosmic_app_list.ftl
+++ b/cosmic-app-list/i18n/oc/cosmic_app_list.ftl
@ -1,3 +1 @@
 cosmic-app-list = Cinta d’aplicacions
-quit = Quitar
-run = Executar
--- a/cosmic-app-list/src/app.rs
+++ b/cosmic-app-list/src/app.rs
@ -518,7 +518,7 @@ enum Message {
    ConfigUpdated(AppListConfig),
    OpenFavorites,
    OpenActive,
-    Surface(surface::Action<Message>),
+    Surface(surface::Action),
 }

 fn index_in_list(
@ -2303,7 +2303,9 @@ impl cosmic::Application for CosmicAppList {
                }
            }
            Message::Surface(a) => {
-                return cosmic::task::message(cosmic::Action::Surface(a));
+                return cosmic::task::message(cosmic::Action::Cosmic(
+                    cosmic::app::Action::Surface(a),
+                ));
            }
        }

--- a/cosmic-applet-a11y/Cargo.toml
+++ b/cosmic-applet-a11y/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "cosmic-applet-a11y"
-version = "1.9.0"
+version = "1.3.0"
 edition = "2024"

 [dependencies]
--- a/cosmic-applet-a11y/src/app.rs
+++ b/cosmic-applet-a11y/src/app.rs
@ -64,7 +64,7 @@ enum Message {
    OpenSettings,
    DBusUpdate(accessibility::Response),
    WaylandUpdate(WaylandUpdate),
-    Surface(surface::Action<Message>),
+    Surface(surface::Action),
 }

 impl cosmic::Application for CosmicA11yApplet {
@ -288,7 +288,9 @@ impl cosmic::Application for CosmicA11yApplet {
                }
            },
            Message::Surface(a) => {
-                return cosmic::task::message(cosmic::Action::Surface(a));
+                return cosmic::task::message(cosmic::Action::Cosmic(
+                    cosmic::app::Action::Surface(a),
+                ));
            }
        }
        Task::none()
--- a/cosmic-applet-audio/Cargo.toml
+++ b/cosmic-applet-audio/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "cosmic-applet-audio"
-version = "1.9.0"
+version = "1.3.0"
 edition = "2024"
 license = "GPL-3.0-only"

--- a/cosmic-applet-audio/i18n/oc/cosmic_applet_audio.ftl
+++ b/cosmic-applet-audio/i18n/oc/cosmic_applet_audio.ftl
@ -1 +0,0 @@
-output = Sortida
--- a/cosmic-applet-audio/src/lib.rs
+++ b/cosmic-applet-audio/src/lib.rs
@ -164,7 +164,7 @@ pub enum Message {
    SetSinkVolume(u32),
    SetSourceVolume(u32),
    Subscription(audio_client::Event),
-    Surface(surface::Action<Message>),
+    Surface(surface::Action),
    ToggleMediaControlsInTopPanel(bool),
    TogglePopup,
    ToggleSinkMute,
@ -546,7 +546,9 @@ impl cosmic::Application for Audio {
                }
            },
            Message::Surface(a) => {
-                return cosmic::task::message(cosmic::Action::Surface(a));
+                return cosmic::task::message(cosmic::Action::Cosmic(
+                    cosmic::app::Action::Surface(a),
+                ));
            }
            Message::Client(client) => {
                if let Some(client) = Arc::into_inner(client) {
--- a/cosmic-applet-audio/src/model.rs
+++ b/cosmic-applet-audio/src/model.rs
@ -74,10 +74,8 @@ impl Nodes {
        self.id.remove(pos);
        self.volume.remove(pos);
        self.dropdown_sort();
-        match self.active {
-            Some(active) if active == pos => self.active = None,
-            Some(active) if active > pos => self.active = Some(active - 1),
-            _ => {}
+        if self.active == Some(pos) {
+            self.active = None;
        }
        true
    }
--- a/cosmic-applet-battery/Cargo.toml
+++ b/cosmic-applet-battery/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "cosmic-applet-battery"
-version = "1.9.0"
+version = "1.3.0"
 edition = "2024"
 license = "GPL-3.0-only"

--- a/cosmic-applet-battery/i18n/zh-TW/cosmic_applet_battery.ftl
+++ b/cosmic-applet-battery/i18n/zh-TW/cosmic_applet_battery.ftl
@ -1,4 +1,4 @@
-battery = 省電
+battery = 電池
 battery-desc = 降低效能與耗電量。
 balanced = 平衡
 balanced-desc = 標準效能與耗電量。
--- a/cosmic-applet-battery/src/app.rs
+++ b/cosmic-applet-battery/src/app.rs
@ -213,7 +213,7 @@ enum Message {
    OpenSettings,
    SettingsDaemon(settings_daemon::Event),
    ZbusConnection(zbus::Result<zbus::Connection>),
-    Surface(surface::Action<Message>),
+    Surface(surface::Action),
 }

 impl cosmic::Application for CosmicBatteryApplet {
@ -526,7 +526,9 @@ impl cosmic::Application for CosmicBatteryApplet {
                }
            },
            Message::Surface(a) => {
-                return cosmic::task::message(cosmic::Action::Surface(a));
+                return cosmic::task::message(cosmic::Action::Cosmic(
+                    cosmic::app::Action::Surface(a),
+                ));
            }
        }
        Task::none()
--- a/cosmic-applet-bluetooth/Cargo.toml
+++ b/cosmic-applet-bluetooth/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "cosmic-applet-bluetooth"
-version = "1.9.0"
+version = "1.3.0"
 edition = "2024"
 license = "GPL-3.0-only"

--- a/cosmic-applet-bluetooth/i18n/kab/cosmic_applet_bluetooth.ftl
+++ b/cosmic-applet-bluetooth/i18n/kab/cosmic_applet_bluetooth.ftl
@ -1,4 +1,4 @@
-cancel = Semmet
+cancel = Sefsex
 connected = Yettwaqqen
 confirm = Sentem
 other-devices = Ibenkan-nniḍen n Bluetooth
--- a/cosmic-applet-bluetooth/i18n/oc/cosmic_applet_bluetooth.ftl
+++ b/cosmic-applet-bluetooth/i18n/oc/cosmic_applet_bluetooth.ftl
@ -1,2 +1 @@
 connected = Connectat
-cancel = Anullar
--- a/cosmic-applet-bluetooth/i18n/th/cosmic_applet_bluetooth.ftl
+++ b/cosmic-applet-bluetooth/i18n/th/cosmic_applet_bluetooth.ftl
@ -1,3 +0,0 @@
-connected = เชื่อมต่อแล้ว
-confirm = ยืนยัน
-cancel = ยกเลิก
--- a/cosmic-applet-bluetooth/src/app.rs
+++ b/cosmic-applet-bluetooth/src/app.rs
@ -76,7 +76,7 @@ enum Message {
    Token(TokenUpdate),
    OpenSettings,
    ToggleBluetooth(bool),
-    Surface(surface::Action<Message>),
+    Surface(surface::Action),
 }

 impl cosmic::Application for CosmicBluetoothApplet {
@ -304,7 +304,9 @@ impl cosmic::Application for CosmicBluetoothApplet {
                }
            }
            Message::Surface(a) => {
-                return cosmic::task::message(cosmic::Action::Surface(a));
+                return cosmic::task::message(cosmic::Action::Cosmic(
+                    cosmic::app::Action::Surface(a),
+                ));
            }
        }
        self.update_icon();
--- a/cosmic-applet-input-sources/Cargo.toml
+++ b/cosmic-applet-input-sources/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "cosmic-applet-input-sources"
-version = "1.9.0"
+version = "1.3.0"
 edition = "2024"
 license = "GPL-3.0-only"

--- a/cosmic-applet-input-sources/src/lib.rs
+++ b/cosmic-applet-input-sources/src/lib.rs
@ -98,7 +98,7 @@ pub enum Message {
    CompConfig(Box<CosmicCompConfig>),
    SetActiveLayout(usize),
    KeyboardSettings,
-    Surface(surface::Action<Message>),
+    Surface(surface::Action),
    Rectangle(RectangleUpdate<u32>),
    WaylandConnection(Backend),
    Wayland(wayland::Event),
@ -190,7 +190,9 @@ impl cosmic::Application for Window {
                }
            }
            Message::Surface(a) => {
-                return cosmic::task::message(cosmic::Action::Surface(a));
+                return cosmic::task::message(cosmic::Action::Cosmic(
+                    cosmic::app::Action::Surface(a),
+                ));
            }
            Message::Rectangle(u) => match u {
                RectangleUpdate::Rectangle(r) => {
--- a/cosmic-applet-minimize/Cargo.toml
+++ b/cosmic-applet-minimize/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "cosmic-applet-minimize"
-version = "1.9.0"
+version = "1.3.0"
 edition = "2024"
 license = "GPL-3.0-only"

--- a/cosmic-applet-minimize/src/lib.rs
+++ b/cosmic-applet-minimize/src/lib.rs
@ -126,7 +126,7 @@ enum Message {
    Closed(window::Id),
    OpenOverflowPopup,
    CloseOverflowPopup,
-    Surface(surface::Action<Message>),
+    Surface(surface::Action),
 }

 impl cosmic::Application for Minimize {
@ -294,7 +294,9 @@ impl cosmic::Application for Minimize {
            }
            Message::CloseOverflowPopup => todo!(),
            Message::Surface(a) => {
-                return cosmic::task::message(cosmic::Action::Surface(a));
+                return cosmic::task::message(cosmic::Action::Cosmic(
+                    cosmic::app::Action::Surface(a),
+                ));
            }
        }
        Task::none()
--- a/cosmic-applet-network/Cargo.toml
+++ b/cosmic-applet-network/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "cosmic-applet-network"
-version = "1.9.0"
+version = "1.3.0"
 edition = "2024"
 license = "GPL-3.0-or-later"

--- a/cosmic-applet-network/i18n/kab/cosmic_applet_network.ftl
+++ b/cosmic-applet-network/i18n/kab/cosmic_applet_network.ftl
@ -1,4 +1,4 @@
-cancel = Semmet
+cancel = Sefsex
 connect = Qqen
 identity = Tamagit
 wifi = Wi-Fi
--- a/cosmic-applet-network/i18n/oc/cosmic_applet_network.ftl
+++ b/cosmic-applet-network/i18n/oc/cosmic_applet_network.ftl
@ -1,5 +1,3 @@
 identity = Identitat
 connected = Connectat
 connect = Connectar
-cancel = Anullar
-network = Ret
--- a/cosmic-applet-network/i18n/th/cosmic_applet_network.ftl
+++ b/cosmic-applet-network/i18n/th/cosmic_applet_network.ftl
@ -1,4 +0,0 @@
-connect = เชื่อมต่อ
-identity = ตัวตน
-connected = เชื่อมต่อแล้ว
-cancel = ยกเลิก
--- a/cosmic-applet-network/src/app.rs
+++ b/cosmic-applet-network/src/app.rs
@ -1028,7 +1028,7 @@ pub(crate) enum Message {
    FocusSecureInput,
    NoOp,
    #[allow(dead_code)] // required by `cosmic::applet` surface path; not always emitted
-    Surface(surface::Action<Message>),
+    Surface(surface::Action),
    ActivateVpn(Arc<str>),   // UUID of VPN to activate
    DeactivateVpn(Arc<str>), // UUID of VPN to deactivate
    VpnOperationFinished {
@ -1294,7 +1294,9 @@ impl cosmic::Application for CosmicNetworkApplet {
                return Task::batch(vec![forget_task, reconnect_task]);
            }
            Message::Surface(a) => {
-                return cosmic::task::message(cosmic::Action::Surface(a));
+                return cosmic::task::message(cosmic::Action::Cosmic(
+                    cosmic::app::Action::Surface(a),
+                ));
            }
            Message::ActivateVpn(uuid) => {
                self.nm_state.pending_vpn = Some(PendingVpn {
--- a/cosmic-applet-notifications/Cargo.toml
+++ b/cosmic-applet-notifications/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "cosmic-applet-notifications"
-version = "1.9.0"
+version = "1.3.0"
 edition = "2024"
 license = "GPL-3.0-only"

--- a/cosmic-applet-notifications/src/lib.rs
+++ b/cosmic-applet-notifications/src/lib.rs
@ -78,7 +78,7 @@ enum Message {
    CardsToggled(String, bool),
    Token(TokenUpdate),
    OpenSettings,
-    Surface(surface::Action<Message>),
+    Surface(surface::Action),
 }

 impl cosmic::Application for Notifications {
@ -367,7 +367,9 @@ impl cosmic::Application for Notifications {
                }
            }
            Message::Surface(a) => {
-                return cosmic::task::message(cosmic::Action::Surface(a));
+                return cosmic::task::message(cosmic::Action::Cosmic(
+                    cosmic::app::Action::Surface(a),
+                ));
            }
        }
        self.update_icon();
--- a/cosmic-applet-osk/Cargo.toml
+++ b/cosmic-applet-osk/Cargo.toml
@ -1,12 +0,0 @@
-[package]
-name = "cosmic-applet-osk"
-version = "1.9.0"
-edition = "2024"
-license = "GPL-3.0-only"
-
-[dependencies]
-cosmic-osk-config.workspace = true
-cosmic.workspace = true
-tracing.workspace = true
-tracing-subscriber.workspace = true
-tracing-log.workspace = true
--- a/cosmic-applet-osk/data/com.system76.CosmicAppletOsk.desktop
+++ b/cosmic-applet-osk/data/com.system76.CosmicAppletOsk.desktop
@ -1,13 +0,0 @@
-[Desktop Entry]
-Name=On-screen Keyboard Button
-Comment=Open the on-screen keyboard
-Type=Application
-Exec=cosmic-applet-osk
-Terminal=false
-Categories=COSMIC;
-Keywords=COSMIC;Applet;OSK;Keyboard;
-Icon=input-keyboard-symbolic
-StartupNotify=true
-NoDisplay=true
-X-CosmicApplet=true
-X-OverflowPriority=10
--- a/cosmic-applet-osk/src/lib.rs
+++ b/cosmic-applet-osk/src/lib.rs
@ -1,72 +0,0 @@
-// Copyright 2023 System76 <info@system76.com>
-// SPDX-License-Identifier: GPL-3.0-only
-
-use cosmic::{Task, app, cosmic_config::CosmicConfigEntry, iced};
-use cosmic_osk_config::Config;
-
-struct Button {
-    core: cosmic::app::Core,
-}
-
-#[derive(Debug, Clone)]
-enum Msg {
-    Press,
-}
-
-impl cosmic::Application for Button {
-    type Message = Msg;
-    type Executor = cosmic::SingleThreadExecutor;
-    type Flags = ();
-    const APP_ID: &'static str = "com.system76.CosmicAppletOsk";
-
-    fn init(core: cosmic::app::Core, _: ()) -> (Self, app::Task<Msg>) {
-        (Self { core }, Task::none())
-    }
-
-    fn core(&self) -> &cosmic::app::Core {
-        &self.core
-    }
-
-    fn core_mut(&mut self) -> &mut cosmic::app::Core {
-        &mut self.core
-    }
-
-    fn style(&self) -> Option<iced::theme::Style> {
-        Some(cosmic::applet::style())
-    }
-
-    fn update(&mut self, message: Msg) -> app::Task<Msg> {
-        match message {
-            Msg::Press => match Config::handler() {
-                Ok(handler) => {
-                    let mut config = match Config::get_entry(&handler) {
-                        Ok(config) => config,
-                        Err((errs, config)) => {
-                            tracing::warn!("failed to parse OSK config: {:?}", errs);
-                            config
-                        }
-                    };
-                    if let Err(err) = config.set_always_shown(&handler, !config.always_shown) {
-                        tracing::error!("failed to set OSK always_shown config: {}", err);
-                    }
-                }
-                Err(err) => {
-                    tracing::error!("failed to create OSK config handler: {}", err);
-                }
-            },
-        }
-        Task::none()
-    }
-
-    fn view(&self) -> cosmic::Element<'_, Msg> {
-        self.core
-            .applet
-            .icon_button("input-keyboard-symbolic")
-            .on_press_down(Msg::Press)
-            .into()
-    }
-}
-
-pub fn run() -> iced::Result {
-    cosmic::applet::run::<Button>(())
-}
--- a/cosmic-applet-osk/src/main.rs
+++ b/cosmic-applet-osk/src/main.rs
@ -1,13 +0,0 @@
-// Copyright 2023 System76 <info@system76.com>
-// SPDX-License-Identifier: GPL-3.0-only
-
-const VERSION: &str = env!("CARGO_PKG_VERSION");
-
-fn main() -> cosmic::iced::Result {
-    tracing_subscriber::fmt::init();
-    let _ = tracing_log::LogTracer::init();
-
-    tracing::info!("Starting OSK applet with version {VERSION}");
-
-    cosmic_applet_osk::run()
-}
--- a/cosmic-applet-power/Cargo.toml
+++ b/cosmic-applet-power/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "cosmic-applet-power"
-version = "1.9.0"
+version = "1.3.0"
 edition = "2024"
 license = "GPL-3.0-only"

--- a/cosmic-applet-power/src/lib.rs
+++ b/cosmic-applet-power/src/lib.rs
@ -78,7 +78,7 @@ enum Message {
    Zbus(Result<(), zbus::Error>),
    Closed(window::Id),
    Token(TokenUpdate),
-    Surface(surface::Action<Message>),
+    Surface(surface::Action),
 }

 impl cosmic::Application for Power {
@ -197,7 +197,9 @@ impl cosmic::Application for Power {
                }
            },
            Message::Surface(a) => {
-                return cosmic::task::message(cosmic::Action::Surface(a));
+                return cosmic::task::message(cosmic::Action::Cosmic(
+                    cosmic::app::Action::Surface(a),
+                ));
            }
        }
        Task::none()
--- a/cosmic-applet-status-area/Cargo.toml
+++ b/cosmic-applet-status-area/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "cosmic-applet-status-area"
-version = "1.9.0"
+version = "1.3.0"
 edition = "2024"
 license = "GPL-3.0-only"

--- a/cosmic-applet-status-area/src/components/app.rs
+++ b/cosmic-applet-status-area/src/components/app.rs
@ -39,7 +39,7 @@ pub enum Msg {
    TogglePopup(usize),
    Hovered(Option<usize>),
    WheelScrolled(ScrollDelta),
-    Surface(surface::Action<Msg>),
+    Surface(surface::Action),
    ToggleOverflow,
    HoveredOverflow,
    Token(TokenUpdate),
@ -409,7 +409,9 @@ impl cosmic::Application for App {
                scroll(id, menu.item.item_proxy().clone(), delta, orientation)
            }
            Msg::Surface(a) => {
-                return cosmic::task::message(cosmic::Action::Surface(a));
+                return cosmic::task::message(cosmic::Action::Cosmic(
+                    cosmic::app::Action::Surface(a),
+                ));
            }
            Msg::ToggleOverflow => {
                if let Some(popup_id) = self.overflow_popup.take() {
--- a/cosmic-applet-tiling/Cargo.toml
+++ b/cosmic-applet-tiling/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "cosmic-applet-tiling"
-version = "1.9.0"
+version = "1.3.0"
 edition = "2024"
 license = "GPL-3.0-only"

--- a/cosmic-applet-tiling/src/window.rs
+++ b/cosmic-applet-tiling/src/window.rs
@ -56,7 +56,7 @@ pub enum Message {
    WorkspaceUpdate(WorkspacesUpdate),
    NewWorkspace(Entity),
    OpenSettings,
-    Surface(surface::Action<Message>),
+    Surface(surface::Action),
 }

 impl cosmic::Application for Window {
@ -235,7 +235,9 @@ impl cosmic::Application for Window {
                tokio::spawn(cosmic::process::spawn(cmd));
            }
            Message::Surface(a) => {
-                return cosmic::task::message(cosmic::Action::Surface(a));
+                return cosmic::task::message(cosmic::Action::Cosmic(
+                    cosmic::app::Action::Surface(a),
+                ));
            }
        }
        Task::none()
--- a/cosmic-applet-time/Cargo.toml
+++ b/cosmic-applet-time/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "cosmic-applet-time"
-version = "1.9.0"
+version = "1.3.0"
 edition = "2024"
 license = "GPL-3.0-only"

--- a/cosmic-applet-time/i18n/cs/cosmic_applet_time.ftl
+++ b/cosmic-applet-time/i18n/cs/cosmic_applet_time.ftl
@ -1 +1 @@
-datetime-settings = Nastavení času, data a kalendáře...
+datetime-settings = Nastavení času, datumu a kalendáře...
--- a/cosmic-applet-time/i18n/en-GB/cosmic_applet_time.ftl
+++ b/cosmic-applet-time/i18n/en-GB/cosmic_applet_time.ftl
@ -1 +0,0 @@
-datetime-settings = Date, Time and Calendar Settings...
--- a/cosmic-applet-time/src/window.rs
+++ b/cosmic-applet-time/src/window.rs
@ -107,7 +107,7 @@ pub enum Message {
    Token(TokenUpdate),
    ConfigChanged(TimeAppletConfig),
    TimezoneUpdate(String),
-    Surface(surface::Action<Message>),
+    Surface(surface::Action),
 }

 impl Window {
@ -674,7 +674,9 @@ impl cosmic::Application for Window {
                self.update(Message::Tick)
            }
            Message::Surface(a) => {
-                return cosmic::task::message(cosmic::Action::Surface(a));
+                return cosmic::task::message(cosmic::Action::Cosmic(
+                    cosmic::app::Action::Surface(a),
+                ));
            }
        }
    }
--- a/cosmic-applet-workspaces/Cargo.toml
+++ b/cosmic-applet-workspaces/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "cosmic-applet-workspaces"
-version = "1.9.0"
+version = "1.3.0"
 authors = ["Ashley Wulber <ashley@system76.com>"]
 edition = "2024"
 license = "GPL-3.0-only"
--- a/cosmic-applet-workspaces/i18n/en-GB/cosmic_applet_workspaces.ftl
+++ b/cosmic-applet-workspaces/i18n/en-GB/cosmic_applet_workspaces.ftl
@ -1 +0,0 @@
-cosmic-applet-workspaces = COSMIC Workspaces
--- a/cosmic-applet-workspaces/src/components/app.rs
+++ b/cosmic-applet-workspaces/src/components/app.rs
@ -90,7 +90,7 @@ enum Message {
    WorkspacePressed(ExtWorkspaceHandleV1),
    WheelScrolled(ScrollDelta),
    WorkspaceOverview,
-    Surface(surface::Action<Message>),
+    Surface(surface::Action),
 }

 impl cosmic::Application for IcedWorkspacesApplet {
@ -167,7 +167,9 @@ impl cosmic::Application for IcedWorkspacesApplet {
                let _ = ShellCommand::new("cosmic-workspaces").spawn();
            }
            Message::Surface(a) => {
-                return cosmic::task::message(cosmic::Action::Surface(a));
+                return cosmic::task::message(cosmic::Action::Cosmic(
+                    cosmic::app::Action::Surface(a),
+                ));
            }
        }
        Task::none()
--- a/cosmic-applets-config/Cargo.toml
+++ b/cosmic-applets-config/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "cosmic-applets-config"
-version = "1.9.0"
+version = "1.3.0"
 edition = "2024"

 [dependencies]
--- a/cosmic-applets/Cargo.toml
+++ b/cosmic-applets/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "cosmic-applets"
-version = "1.9.0"
+version = "1.3.0"
 edition = "2024"
 license = "GPL-3.0-only"

@ -16,7 +16,6 @@ cosmic-applet-bluetooth = { path = "../cosmic-applet-bluetooth" }
 cosmic-applet-minimize = { path = "../cosmic-applet-minimize" }
 cosmic-applet-network = { path = "../cosmic-applet-network" }
 cosmic-applet-notifications = { path = "../cosmic-applet-notifications" }
-cosmic-applet-osk = { path = "../cosmic-applet-osk" }
 cosmic-applet-power = { path = "../cosmic-applet-power" }
 cosmic-applet-status-area = { path = "../cosmic-applet-status-area" }
 cosmic-applet-tiling = { path = "../cosmic-applet-tiling" }
--- a/cosmic-applets/build.rs
+++ b/cosmic-applets/build.rs
@ -59,12 +59,6 @@ fn main() {
            "cosmic-applet-notifications-comment",
            "cosmic-applet-notifications-keywords",
        ),
-        (
-            "com.system76.CosmicAppletOsk",
-            "cosmic-applet-osk",
-            "cosmic-applet-osk-comment",
-            "cosmic-applet-osk-keywords",
-        ),
        (
            "com.system76.CosmicAppletPower",
            "cosmic-applet-power",
--- a/cosmic-applets/src/main.rs
+++ b/cosmic-applets/src/main.rs
@ -27,7 +27,6 @@ fn main() -> cosmic::iced::Result {
            "cosmic-applet-minimize" => cosmic_applet_minimize::run(),
            "cosmic-applet-network" => cosmic_applet_network::run(),
            "cosmic-applet-notifications" => cosmic_applet_notifications::run(),
-            "cosmic-applet-osk" => cosmic_applet_osk::run(),
            "cosmic-applet-power" => cosmic_applet_power::run(),
            "cosmic-applet-status-area" => cosmic_applet_status_area::run(),
            "cosmic-applet-tiling" => cosmic_applet_tiling::run(),
--- a/cosmic-panel-button/Cargo.toml
+++ b/cosmic-panel-button/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "cosmic-panel-button"
-version = "1.9.0"
+version = "1.3.0"
 edition = "2024"
 license = "GPL-3.0-only"

--- a/cosmic-panel-button/src/lib.rs
+++ b/cosmic-panel-button/src/lib.rs
@ -39,7 +39,7 @@ struct Button {
 enum Msg {
    Press,
    ConfigUpdated(CosmicPanelButtonConfig),
-    Surface(surface::Action<Msg>),
+    Surface(surface::Action),
 }

 impl Button {
@ -141,7 +141,9 @@ impl cosmic::Application for Button {
                    .unwrap_or_default();
            }
            Msg::Surface(a) => {
-                return cosmic::task::message(cosmic::Action::Surface(a));
+                return cosmic::task::message(cosmic::Action::Cosmic(
+                    cosmic::app::Action::Surface(a),
+                ));
            }
        }
        Task::none()
--- a/data/com.system76.CosmicApplets.metainfo.xml
+++ b/data/com.system76.CosmicApplets.metainfo.xml
@ -55,7 +55,6 @@
  <launchable type="desktop-id">com.system76.CosmicAppletMinimize.desktop</launchable>
  <launchable type="desktop-id">com.system76.CosmicAppletNetwork.desktop</launchable>
  <launchable type="desktop-id">com.system76.CosmicAppletNotifications.desktop</launchable>
-  <launchable type="desktop-id">com.system76.CosmicAppletOsk.desktop</launchable>
  <launchable type="desktop-id">com.system76.CosmicAppletPower.desktop</launchable>
  <launchable type="desktop-id">com.system76.CosmicAppletStatusArea.desktop</launchable>
  <launchable type="desktop-id">com.system76.CosmicAppletTiling.desktop</launchable>
@ -84,7 +83,6 @@
      <binary>cosmic-applet-minimize</binary>
      <binary>cosmic-applet-network</binary>
      <binary>cosmic-applet-notifications</binary>
-      <binary>cosmic-applet-osk</binary>
      <binary>cosmic-applet-power</binary>
      <binary>cosmic-applet-status-area</binary>
      <binary>cosmic-applet-tiling</binary>
--- a/debian/changelog
+++ b/debian/changelog
@ -1,9 +1,3 @@
-cosmic-applets (1.9.0) noble; urgency=medium
-
-  * Epoch 1.9.0 version update
-
- -- Michael Murphy <michael@mmurphy.dev>  Mon, 14 Sep 2026 21:53:42 +0200
-
 cosmic-applets (1.0.15) noble; urgency=medium

  * Update changelog
--- a/debian/links
+++ b/debian/links
@ -5,7 +5,6 @@
 /usr/bin/cosmic-applets /usr/bin/cosmic-applet-minimize
 /usr/bin/cosmic-applets /usr/bin/cosmic-applet-network
 /usr/bin/cosmic-applets /usr/bin/cosmic-applet-notifications
-/usr/bin/cosmic-applets /usr/bin/cosmic-applet-osk
 /usr/bin/cosmic-applets /usr/bin/cosmic-applet-power
 /usr/bin/cosmic-applets /usr/bin/cosmic-applet-status-area
 /usr/bin/cosmic-applets /usr/bin/cosmic-applet-tiling
--- a/i18n/cs/desktop_entries.ftl
+++ b/i18n/cs/desktop_entries.ftl
@ -26,7 +26,7 @@ cosmic-applet-network-comment = Správa síťových připojení
 cosmic-applet-network-keywords = COSMIC;Applet;Síť;
 cosmic-applet-notifications-comment = Správa oznámení a režimu Nerušit
 cosmic-applet-notifications-keywords = COSMIC;Applet;Oznámení;
-cosmic-applet-status-area-keywords = COSMIC;Applet;Aplikace;Indikátory;Ikony;Oznámení;Notifikace;Oblast;Stav;
+cosmic-applet-status-area-keywords = COSMIC;Applet;Aplikace;Indikátory;Oznámení;Notifikace;Oblast;Status;Stav;
 cosmic-app-list-comment = Správa otevřených oken a spouštění připnutých aplikací
 cosmic-app-list-keywords = COSMIC;Applet;Aplikace;Oblast;Seznam;Úloha;Úlohy;Lišta;
 cosmic-applet-a11y-comment = Konfigurace nastavení přístupnosti z panelu
--- a/i18n/en/desktop_entries.ftl
+++ b/i18n/en/desktop_entries.ftl
@ -25,9 +25,6 @@ cosmic-applet-network-keywords = COSMIC;Applet;Network;
 cosmic-applet-notifications = Notifications Center
 cosmic-applet-notifications-comment = Manage notifications and Do Not Disturb
 cosmic-applet-notifications-keywords = COSMIC;Applet;Notification;
-cosmic-applet-osk = On-screen Keyboard Button
-cosmic-applet-osk-comment = Open the on-screen keyboard
-cosmic-applet-osk-keywords = COSMIC;Applet;OSK;Keyboard;
 cosmic-applet-power = User Session
 cosmic-applet-power-comment = Lock screen, log out, suspend, reboot, and shutdown
 cosmic-applet-power-keywords = COSMIC;Applet;User;Session;Lock;Log;Reboot;Shutdown;Suspend;
--- a/i18n/oc/desktop_entries.ftl
+++ b/i18n/oc/desktop_entries.ftl
@ -17,29 +17,3 @@ cosmic-applet-power = Session utilizaire
 cosmic-applet-status-area = Cinta de notificacions
 cosmic-applet-time = Data, ora e calendièr
 cosmic-applet-workspaces = Espacis de trabalha numerotats
-cosmic-applet-a11y-keywords = COSMIC;Applet;Microaplicacion;Miniaplicacion;Accessibilitat;A11y;Ecran;Lector;Lópia;Constraste;Color;
-cosmic-applet-audio-comment = Seleccion del periferic àudio, contraròtle del volum e contraròtle multimèdia MPRIS
-cosmic-applet-input-sources-keywords = COSMIC;Applet;Entrada;Dintrada;Font;
-cosmic-applet-minimize = Fenèstras minimizadas
-cosmic-applet-minimize-comment = Gerir las fenèstras minimizadas
-cosmic-applet-minimize-keywords = COSMIC;Applet;Minimizar;Reduire;Redusir;
-cosmic-applet-network-keywords = COSMIC;Applet;Ret;Malhum;
-cosmic-applet-notifications-keywords = COSMIC;Applet;Notificacions;
-cosmic-applet-power-comment = Verrolhar l’ecran, se desconnectar, metre en velha, reaviar e atudar l’ordenador
-cosmic-applet-power-keywords = COSMIC;Applet;Utilizaire;Session;Verrolhar;Desconnectar;Reaviar;Reamodar;Atudar;Velha;Suspendre;
-cosmic-applet-tiling = Mosaïc
-cosmic-applet-time-comment = Mostrar l’ora actuala al panèl amb una fenèstra surgissenta del calendièr
-cosmic-applet-time-keywords = COSMIC;Applet;Data;Ora;Temps;Calendièr;Calendari;
-cosmic-applet-workspaces-comment = Bascular entre los espacis de trabalh del panèl estant
-cosmic-applet-workspaces-keywords = COSMIC;Applet;Espaci de trabalh;
-cosmic-panel-app-button = Boton de la bibliotèca d’aplicacions
-cosmic-panel-app-button-comment = Dobrir la bibliotèca d’aplicacions per lançar las aplicacions installadas
-cosmic-panel-launcher-button = Boton de l’aviador
-cosmic-panel-launcher-button-comment = Dobrir l’aviador per recercar d’aplicacions e executar de comandas
-cosmic-panel-workspaces-button = Boton dels espacis de trabalh
-cosmic-applet-audio-keywords = COSMIC;Applet;Son,Àudio;MPRIS;
-cosmic-applet-battery-keywords = COSMIC;Applet;Alimentacion;Energia;Batariá;
-cosmic-applet-bluetooth-keywords = COSMIC;Applet;Bluetooth;
-cosmic-applet-input-sources-comment = Cambiar entre fonts d’entrada
-cosmic-applet-status-area-comment = Indicadors d’aplicacions que pòdon exportar de menús al panèl
-cosmic-applet-status-area-keywords = COSMIC;Applet;App;Indicador;Indicator;Notificacion;Panèl;Estatut;
--- a/i18n/th/desktop_entries.ftl
+++ b/i18n/th/desktop_entries.ftl
@ -1 +0,0 @@
-cosmic-applet-battery-keywords = COSMIC;Applet;Power;Battery;พลังงาน;แบตเตอรี่;
--- a/i18n/zh-Hant/desktop_entries.ftl
+++ b/i18n/zh-Hant/desktop_entries.ftl
@ -38,7 +38,7 @@ cosmic-applet-bluetooth = 藍牙
 cosmic-applet-audio = 音效
 cosmic-applet-minimize = 最小化視窗
 cosmic-app-list-comment = 啟動釘板的應用程式並管理開啟視窗
-cosmic-app-list-keywords = COSMIC;小程式;應用程式;拖盤;列表;任務;列;
+cosmic-app-list-keywords = COSMIC;小程式;應用程式;匣盤;列表;任務;列;
 cosmic-applet-a11y-comment = 從面板設定無障礙功能
 cosmic-applet-audio-comment = 音訊裝置選擇、音量控制及 MPRIS 媒體控制
 cosmic-applet-input-sources = 輸入來源
--- a/2
+++ b/2
@ -63,7 +63,7 @@ _install_secret_agent_policy:
    install -Dm0644 cosmic-applet-network/data/dbus-1/system.d/com.system76.CosmicSettings.Applet.NetworkManager.SecretAgent.conf {{ sharedir }}/dbus-1/system.d/com.system76.CosmicSettings.Applet.NetworkManager.SecretAgent.conf

 # Installs files into the system
-install: (_install_bin 'cosmic-applets') (_link_applet 'cosmic-panel-button') (_install_applet 'com.system76.CosmicAppList' 'cosmic-app-list') (_install_default_schema 'cosmic-app-list') (_install_applet 'com.system76.CosmicAppletA11y' 'cosmic-applet-a11y') (_install_applet 'com.system76.CosmicAppletAudio' 'cosmic-applet-audio') (_install_applet 'com.system76.CosmicAppletInputSources' 'cosmic-applet-input-sources') (_install_applet 'com.system76.CosmicAppletBattery' 'cosmic-applet-battery') (_install_applet 'com.system76.CosmicAppletBluetooth' 'cosmic-applet-bluetooth') (_install_applet 'com.system76.CosmicAppletMinimize' 'cosmic-applet-minimize') (_install_applet 'com.system76.CosmicAppletNetwork' 'cosmic-applet-network') (_install_applet 'com.system76.CosmicAppletNotifications' 'cosmic-applet-notifications') (_install_applet 'com.system76.CosmicAppletOsk' 'cosmic-applet-osk') (_install_applet 'com.system76.CosmicAppletPower' 'cosmic-applet-power') (_install_applet 'com.system76.CosmicAppletStatusArea' 'cosmic-applet-status-area') (_install_applet 'com.system76.CosmicAppletTiling' 'cosmic-applet-tiling') (_install_applet 'com.system76.CosmicAppletTime' 'cosmic-applet-time') (_install_applet 'com.system76.CosmicAppletWorkspaces' 'cosmic-applet-workspaces') (_install_button 'com.system76.CosmicPanelAppButton' 'cosmic-panel-app-button') (_install_button 'com.system76.CosmicPanelLauncherButton' 'cosmic-panel-launcher-button') (_install_button 'com.system76.CosmicPanelWorkspacesButton' 'cosmic-panel-workspaces-button') _install_metainfo _install_status_notifier_watcher _install_secret_agent_policy
+install: (_install_bin 'cosmic-applets') (_link_applet 'cosmic-panel-button') (_install_applet 'com.system76.CosmicAppList' 'cosmic-app-list') (_install_default_schema 'cosmic-app-list') (_install_applet 'com.system76.CosmicAppletA11y' 'cosmic-applet-a11y') (_install_applet 'com.system76.CosmicAppletAudio' 'cosmic-applet-audio') (_install_applet 'com.system76.CosmicAppletInputSources' 'cosmic-applet-input-sources') (_install_applet 'com.system76.CosmicAppletBattery' 'cosmic-applet-battery') (_install_applet 'com.system76.CosmicAppletBluetooth' 'cosmic-applet-bluetooth') (_install_applet 'com.system76.CosmicAppletMinimize' 'cosmic-applet-minimize') (_install_applet 'com.system76.CosmicAppletNetwork' 'cosmic-applet-network') (_install_applet 'com.system76.CosmicAppletNotifications' 'cosmic-applet-notifications') (_install_applet 'com.system76.CosmicAppletPower' 'cosmic-applet-power') (_install_applet 'com.system76.CosmicAppletStatusArea' 'cosmic-applet-status-area') (_install_applet 'com.system76.CosmicAppletTiling' 'cosmic-applet-tiling') (_install_applet 'com.system76.CosmicAppletTime' 'cosmic-applet-time') (_install_applet 'com.system76.CosmicAppletWorkspaces' 'cosmic-applet-workspaces') (_install_button 'com.system76.CosmicPanelAppButton' 'cosmic-panel-app-button') (_install_button 'com.system76.CosmicPanelLauncherButton' 'cosmic-panel-launcher-button') (_install_button 'com.system76.CosmicPanelWorkspacesButton' 'cosmic-panel-workspaces-button') _install_metainfo _install_status_notifier_watcher _install_secret_agent_policy

 # Vendor Cargo dependencies locally
 vendor:
				`@ -1 +0,0 @@`
				`datetime-settings = Date, Time and Calendar Settings...`
				`@ -1 +0,0 @@`
				`cosmic-applet-workspaces = COSMIC Workspaces`
				`@ -1 +0,0 @@`
				`cosmic-applet-battery-keywords = COSMIC;Applet;Power;Battery;พลังงาน;แบตเตอรี่;`