Merge branch 'main' into 'main'

feat(rog-control-center): Major UI/UX improvements and new features

See merge request asus-linux/asusctl!243

.cargo-husky/hooks/pre-commit

@@ -1,6 +1,6 @@
 #!/bin/sh
 set -e
 
-echo '+cargo +nightly fmt --all -- --check'
-cargo +nightly fmt --all -- --check
+echo '+cargo fmt --all -- --check'
+cargo fmt --all -- --check
 git add -u

.cargo-husky/hooks/pre-push

@@ -2,8 +2,8 @@
 
 set -e
 
-echo '+cargo +nightly fmt --all -- --check'
-cargo +nightly fmt --all -- --check
+echo '+cargo fmt --all -- --check'
+cargo fmt --all -- --check
 echo '+cargo clippy --all -- -D warnings'
 cargo clippy --all -- -D warnings
 echo '+cargo cranky'

.gitignore

@@ -10,6 +10,7 @@ vendor_*
 .~lock.*
 *.ods#
 *.patch
+*.log
 
 # gnome extension
 node-modules

.gitlab-ci.yml

@@ -1,22 +1,26 @@
 image: rust:latest
 
+# Use shallow clone to reduce checkout size
+variables:
+  GIT_DEPTH: "1"
+  # Put cargo home and target under project dir so we can clean them easily
+  CARGO_HOME: "$CI_PROJECT_DIR/.cargo"
+  CARGO_TARGET_DIR: "$CI_PROJECT_DIR/ci-target"
+  GIT_SUBMODULE_STRATEGY: normal
+
+# Cache only cargo registries/git metadata to speed dependency fetches.
+# Avoid caching compiled `target` artifacts which are large and easily fill disk.
 .rust_cache: &rust_cache
   cache:
-    # key: $CI_COMMIT_REF_SLUG
+    key: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
     paths:
-      # Don't include `incremental` to save space
-      # Debug
-      - target/debug/build/
-      - target/debug/deps/
-      - target/debug/.fingerprint/
-      - target/debug/.cargo-lock
-      # Release
-      - target/release/build/
-      - target/release/deps/
-      - target/release/.fingerprint/
-      - target/release/.cargo-lock
+      - .cargo/registry
+      - .cargo/git
 
 before_script:
+  - df -h
+  - echo "Cleaning stale targets to free space if present"
+  - rm -rf "$CI_PROJECT_DIR/target" "$CI_PROJECT_DIR/ci-target" || true
   - apt-get update -qq && apt-get install -y -qq libudev-dev libgtk-3-dev grep llvm clang libclang-dev libsdl2-dev libsdl2-gfx-dev
 
 stages:
@@ -31,20 +35,24 @@ format:
     - tags
   <<: *rust_cache
   script:
-    - echo "nightly" > rust-toolchain
-    - rustup component add rustfmt
+    - rustup component add rustfmt || true
     - cargo fmt --check
+  after_script:
+    - du -sh "$CI_PROJECT_DIR/ci-target" || true
+    - rm -rf "$CI_PROJECT_DIR/ci-target" || true
 
 check:
   except:
     - tags
   <<: *rust_cache
   script:
-    - rustup component add clippy
-    - cargo check
+    - rustup component add clippy || true
+    - cargo check --locked --workspace
     # deny currently catches too much
     #- cargo install cargo-deny && cargo deny
     - cargo install cargo-cranky && cargo cranky
+  after_script:
+    - rm -rf "$CI_PROJECT_DIR/ci-target" || true
 
 test:
   except:
@@ -52,7 +60,9 @@ test:
   <<: *rust_cache
   script:
     - mkdir -p .git/hooks > /dev/null
-    - cargo test --all -- --test-threads=1
+    - cargo test --locked --all
+  after_script:
+    - rm -rf "$CI_PROJECT_DIR/ci-target" || true
 
 release:
   only:
@@ -60,11 +70,15 @@ release:
   <<: *rust_cache
   script:
     - cargo install cargo-vendor-filterer
-    - make && make vendor
+    - cargo fetch
+    - make FROZEN=1 && make vendor
   artifacts:
     paths:
       - vendor_asusctl*.tar.xz
       - cargo-config
+    expire_in: 1 week
+  after_script:
+    - rm -rf vendor vendor_asusctl*.tar.xz "$CI_PROJECT_DIR/ci-target" || true
 
 pages:
   stage: deploy
@@ -72,14 +86,14 @@ pages:
     - tags
   <<: *rust_cache
   script:
-    - cargo doc --document-private-items --no-deps --workspace
+    - cargo doc --locked --document-private-items --no-deps --workspace
     - rm -rf public
     - mkdir public
-    - cp -R target/doc/* public
+    - cp -R ci-target/doc/* public
     - cp extra/index.html public
   artifacts:
     paths:
       - public
-
-variables:
-  GIT_SUBMODULE_STRATEGY: normal
+    expire_in: 1 week
+  after_script:
+    - rm -rf "$CI_PROJECT_DIR/ci-target" || true

CHANGELOG.md

@@ -1,6 +1,62 @@
 # Changelog
 
-## [Unreleased]
+## [6.3.0]
+
+### Changed
+- Added support for TUF keyboard powerstate control
+- Improved AniMe Matrix support thanks to @Seom1177 !
+- Fixed a bug with one-shot battery change, thanks @bitr8 !
+- Changed the CLI interface of asusctl to be less confusing
+- Added support for G835L, thanks to @shevchenko0013 !
+
+## [6.2.0]
+
+### Changed
+- Added aura support for FX607V: thanks @jomp16
+- Added testing support for G835LW
+- Added support for GU605C models slash lighting: thanks @Otters
+- Restore fedora: thanks @ali205412
+- Add support to G614F models slash lighting
+
+## [6.1.22]
+
+### Changed
+- Allow configuration of nv_tgp
+- Treat dGPU attributes as power profiles
+- Add EXPERTBOOK DMI match to ensure the service is loaded
+- Support G815L thanks to @solost !
+
+## [6.1.21]
+
+### Changed
+- Kill Fedora: screw your cursed cargo bullshit
+- Restore CI building
+
+## [6.1.20]
+
+### Changed
+- Addded support for G635L: thanks @luca_pisl !
+- Suppress verbose output in applications too, not just daemon
+
+## [6.1.18]
+
+### Changed
+- Add aura support for G614FR (ROG Strix G16 2025)
+- all notifications now respects the timeout 
+- improve udev daemon-starting rule
+- reduce log noise
+
+## [v6.1.17]
+
+### Changed
+- Fix Makefile
+- Share a single HID device
+
+## [v6.1.16]
+
+### Changed
+- Expose more properties via rog-control-center
+- Add support for a few more models
 
 ## [v6.1.15]
 

Cargo.toml

@@ -1,9 +1,12 @@
 [workspace.package]
-version = "6.1.15"
+version = "6.3.0"
 rust-version = "1.82"
 license = "MPL-2.0"
 readme = "README.md"
-authors = ["Luke <luke@ljones.dev>"]
+authors = [
+  "Luke <luke@ljones.dev>",
+  "Denis Benato <benato.denis96@gmail.com>"
+]
 repository = "https://gitlab.com/asus-linux/asusctl"
 homepage = "https://gitlab.com/asus-linux/asusctl"
 description = "Laptop feature control for ASUS ROG laptops and others"
@@ -37,6 +40,9 @@ tokio = { version = "^1.39.0", default-features = false, features = [
   "time",
   "rt",
   "rt-multi-thread",
+  "fs",
+  "io-util",
+  "io-util",
 ] }
 concat-idents = "^1.1"
 dirs = "^4.0"
@@ -44,7 +50,7 @@ smol = "^2.0"
 mio = "0.8.11"
 
 futures-util = "0.3.31"
-zbus = "5.5.0"
+zbus = "5.13.1"
 logind-zbus = { version = "5.2.0" } #, default-features = false, features = ["non_blocking"] }
 
 serde = { version = "^1.0", features = ["serde_derive"] }
@@ -57,12 +63,12 @@ glam = { version = "^0.22", features = ["serde"] }
 gumdrop = "^0.8"
 udev = { version = "^0.8", features = ["mio"] }
 rusb = "^0.9"
-inotify = "^0.10.0"
+inotify = "^0.10"
 
 png_pong = "^0.8"
 pix = "^0.13"
-tinybmp = "^0.4.0"
-gif = "^0.12.0"
+tinybmp = "^0.4"
+gif = "^0.12"
 
 versions = "6.2"
 

Makefile

@@ -37,6 +37,15 @@ ifeq ($(X11),1)
 	ARGS += --features "rog-control-center/x11"
 endif
 
+# Always use the versions in Cargo.lock by default
+ARGS += --locked
+
+# Allow optionally freezing the build to avoid any network access and enforce Cargo.lock strictly
+FROZEN ?= 0
+ifeq ($(FROZEN),1)
+	ARGS += --frozen
+endif
+
 VENDORED ?= 0
 ifeq ($(VENDORED),1)
 	ARGS += --frozen
@@ -50,10 +59,17 @@ clean:
 distclean:
 	rm -rf .cargo vendor vendor.tar.xz
 
-target/$(TARGET)/$(BIN_D): build
-target/$(TARGET)/$(BIN_C): build
-target/$(TARGET)/$(BIN_U): build
-target/$(TARGET)/$(BIN_ROG): build
+target/$(TARGET)/$(BIN_D): $(SRC)
+	$(MAKE) build
+
+target/$(TARGET)/$(BIN_C): $(SRC)
+	$(MAKE) build
+
+target/$(TARGET)/$(BIN_U): $(SRC)
+	$(MAKE) build
+
+target/$(TARGET)/$(BIN_ROG): $(SRC)
+	$(MAKE) build
 
 install-asusd: target/$(TARGET)/$(BIN_D)
 	$(INSTALL_PROGRAM) "./target/$(TARGET)/$(BIN_D)" "$(DESTDIR)$(bindir)/$(BIN_D)"
@@ -104,7 +120,7 @@ install-data-asusd_user:
 
 .PHONY: install-data-asusd install-data-asusd_user
 
-install-data: install-data-asusd install-data-rog_gui
+install-data: install-data-asusd install-data-asusd_user install-data-rog_gui
 
 install: install-program install-data
 	$(INSTALL_DATA) "./LICENSE" "$(DESTDIR)$(datarootdir)/asusctl/LICENSE"
@@ -142,6 +158,8 @@ vendor:
 	mv .cargo/config ./cargo-config
 	rm -rf .cargo
 	rm -rf vendor
+	# Ensure cargo-vendor-filterer is installed (CI installs it already)
+	command -v cargo-vendor-filterer >/dev/null 2>&1 || cargo install --locked cargo-vendor-filterer
 	cargo vendor-filterer --all-features --platform x86_64-unknown-linux-gnu vendor
 	tar pcfJ vendor_asusctl_$(VERSION).tar.xz vendor
 	rm -rf vendor

README.md

@@ -46,13 +46,13 @@ See the [rog-aura readme](./rog-aura/README.md) for more details.
 Most ASUS gaming laptops that have a USB keyboard. If `lsusb` shows something similar
 to this:
 
-```
+```plain
 Bus 001 Device 002: ID 0b05:1866 ASUSTek Computer, Inc. N-KEY Device
 ```
 
 or
 
-```
+```plain
 Bus 003 Device 002: ID 0b05:19b6 ASUSTek Computer, Inc. [unknown]
 ```
 
@@ -74,39 +74,47 @@ The list is a bit outdated as many features have been enabled in the Linux kerne
 - [x] Toggle bios setting for boot/POST sound
 - [x] Toggle GPU MUX (g-sync, or called MUX on 2022+ laptops)
 
-# GUI
+## GUI
 
 A gui is now in the repo - ROG Control Center. At this time it is still a WIP, but it has almost all features in place already.
 
 **NOTE**: Xorg is not supported.
 
-# BUILDING
+## BUILDING
 
-Rust and cargo are required, they can be installed from [rustup.rs](https://rustup.rs/) or from the distro repos if newer than 1.75.
+Rust and cargo are required, they can be installed from [rustup.rs](https://rustup.rs/).
+
+Distro packaging should work with the stable toolchain. If your distro does not provide a recent Rust toolchain, install rustup and use the stable toolchain.
 
 **fedora:**
 
-    dnf install cmake clang-devel  libxkbcommon-devel systemd-devel expat-devel pcre2-devel libzstd-devel gtk3-devel
-    make
-    sudo make install
+```sh
+dnf install cmake clang-devel  libxkbcommon-devel systemd-devel expat-devel pcre2-devel libzstd-devel gtk3-devel
+make
+sudo make install
+```
 
 **openSUSE:**
 
 Works with KDE Plasma (without GTK packages)
 
-    zypper in -t pattern devel_basis
-    zypper in rustup make cmake clang-devel libxkbcommon-devel systemd-devel expat-devel pcre2-devel libzstd-devel gtk3-devel
-    make
-    sudo make install
+```sh
+zypper in -t pattern devel_basis
+zypper in rustup make cmake clang-devel libxkbcommon-devel systemd-devel expat-devel pcre2-devel libzstd-devel gtk3-devel
+make
+sudo make install
+```
 
 **Debian(unsuported):**
 
 officially unsuported,but you can still try and test it by yourself(some features may not be available).
 
-    sudo apt install libclang-dev libudev-dev libfontconfig-dev build-essential cmake libxkbcommon-dev
-    curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
-    make
-    sudo make install
+```sh
+sudo apt install libclang-dev libudev-dev libfontconfig-dev build-essential cmake libxkbcommon-dev
+curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
+make
+sudo make install
+```
 
 **Ubuntu, Popos (unsuported):**
 
@@ -133,15 +141,15 @@ You may also need to activate the service for debian install. If running Pop!\_O
 
 If you are upgrading from a previous installed version, you will need to restart the service or reboot.
 
-```
-$ systemctl daemon-reload && systemctl restart asusd
+```sh
+systemctl daemon-reload && systemctl restart asusd
 ```
 
 ## Uninstalling
 
 Run `sudo make uninstall` in the source repo, and remove `/etc/asusd/`.
 
-# Contributing
+## Contributing
 
 See `CONTRIBUTING.md`. Additionally, also do `cargo clean` and `cargo test` on first checkout to ensure the commit hooks are used (via `cargo-husky`).
 
@@ -149,17 +157,17 @@ Generation of the bindings with `make bindings` requires `typeshare` to be insta
 
 Dbus introsepction XML requires with `make introspection` requires `anime_sim` to be running before starting `asusd`.
 
-# OTHER
+## OTHER
 
-## AniMe Matrix simulator
+### AniMe Matrix simulator
 
 A simulator using SDL2 can be built using `cargo build --package rog_simulators` and run with `./target/debug/anime_sim`. Once started `asusd` will need restarting to pick it up. If running this sim on a laptop _with_ the display, the simulated display will be used instead of the physical display.
 
-## Supporting more laptops
+### Supporting more laptops
 
 Please file a support request.
 
-# License & Trademarks
+## License & Trademarks
 
 Mozilla Public License 2 (MPL-2.0)
 

asusctl/Cargo.toml

@@ -24,6 +24,7 @@ env_logger.workspace = true
 ron.workspace = true
 gumdrop.workspace = true
 zbus.workspace = true
+argh = "0.1"
 
 [dev-dependencies]
 rog_dbus = { path = "../rog-dbus" }

asusctl/examples/anime-gif.rs

@@ -21,11 +21,14 @@ fn main() {
     let brightness = args[2].parse::<f32>().unwrap();
     let anime_type = get_anime_type();
     let mut seq = Sequences::new(anime_type);
-    seq.insert(0, &ActionLoader::AsusAnimation {
-        file: path.into(),
-        time: rog_anime::AnimTime::Infinite,
-        brightness,
-    })
+    seq.insert(
+        0,
+        &ActionLoader::AsusAnimation {
+            file: path.into(),
+            time: rog_anime::AnimTime::Infinite,
+            brightness,
+        },
+    )
     .unwrap();
 
     loop {

asusctl/src/anime_cli.rs

@@ -1,154 +1,151 @@
-use gumdrop::Options;
-use rog_anime::usb::{AnimAwake, AnimBooting, AnimShutdown, AnimSleeping, Brightness};
+use argh::FromArgs;
+use rog_anime::usb::{AnimAwake, AnimBooting, AnimShutdown, AnimSleeping};
 use rog_anime::AnimeType;
 
-#[derive(Options)]
+#[derive(FromArgs, Debug)]
+#[argh(subcommand, name = "anime", description = "anime commands")]
 pub struct AnimeCommand {
-    #[options(help = "print help message")]
-    pub help: bool,
-    #[options(meta = "", help = "override the display type")]
+    #[argh(option, description = "override the display type")]
     pub override_type: Option<AnimeType>,
-    #[options(meta = "", help = "enable/disable the display")]
+    #[argh(option, description = "enable/disable the display")]
     pub enable_display: Option<bool>,
-    #[options(meta = "", help = "enable/disable the builtin run/powersave animation")]
-    pub enable_powersave_anim: Option<bool>,
-    #[options(
-        meta = "",
-        help = "set global base brightness value <Off, Low, Med, High>"
+    #[argh(
+        option,
+        description = "enable/disable the builtin run/powersave animation"
     )]
-    pub brightness: Option<Brightness>,
-    #[options(help = "clear the display")]
+    pub enable_powersave_anim: Option<bool>,
+    #[argh(
+        option,
+        description = "set global base brightness value <off, low, med, high>"
+    )]
+    pub brightness: Option<rog_anime::usb::Brightness>,
+    #[argh(switch, description = "clear the display")]
     pub clear: bool,
-    #[options(
-        no_short,
-        meta = "",
-        help = "turn the anime off when external power is unplugged"
+    #[argh(
+        option,
+        description = "turn the anime off when external power is unplugged"
     )]
     pub off_when_unplugged: Option<bool>,
-    #[options(
-        no_short,
-        meta = "",
-        help = "turn the anime off when the laptop suspends"
-    )]
+    #[argh(option, description = "turn the anime off when the laptop suspends")]
     pub off_when_suspended: Option<bool>,
-    #[options(
-        no_short,
-        meta = "",
-        help = "turn the anime off when the lid is closed"
-    )]
+    #[argh(option, description = "turn the anime off when the lid is closed")]
     pub off_when_lid_closed: Option<bool>,
-    #[options(no_short, meta = "", help = "Off with his head!!!")]
+    #[argh(option, description = "off with his head!!!")]
     pub off_with_his_head: Option<bool>,
-    #[options(command)]
+    #[argh(subcommand)]
     pub command: Option<AnimeActions>,
 }
 
-#[derive(Options)]
+/// Anime subcommands (image, gif, builtins, etc.)
+#[derive(FromArgs, Debug)]
+#[argh(subcommand)]
 pub enum AnimeActions {
-    #[options(help = "display a PNG image")]
     Image(AnimeImage),
-    #[options(help = "display a diagonal/pixel-perfect PNG")]
     PixelImage(AnimeImageDiagonal),
-    #[options(help = "display an animated GIF")]
     Gif(AnimeGif),
-    #[options(help = "display an animated diagonal/pixel-perfect GIF")]
     PixelGif(AnimeGifDiagonal),
-    #[options(help = "change which builtin animations are shown")]
     SetBuiltins(Builtins),
 }
 
-#[derive(Options)]
+#[derive(FromArgs, Debug)]
+#[argh(
+    subcommand,
+    name = "set-builtins",
+    description = "change which builtin animations are shown"
+)]
 pub struct Builtins {
-    #[options(help = "print help message")]
-    pub help: bool,
-    #[options(
-        meta = "",
-        help = "Default is used if unspecified, <default:GlitchConstruction, StaticEmergence>"
+    #[argh(
+        option,
+        description = "default is used if unspecified, <default:GlitchConstruction, StaticEmergence>"
     )]
     pub boot: AnimBooting,
-    #[options(
-        meta = "",
-        help = "Default is used if unspecified, <default:BinaryBannerScroll, RogLogoGlitch>"
+    #[argh(
+        option,
+        description = "default is used if unspecified, <default:BinaryBannerScroll, RogLogoGlitch>"
     )]
     pub awake: AnimAwake,
-    #[options(
-        meta = "",
-        help = "Default is used if unspecified, <default:BannerSwipe, Starfield>"
+    #[argh(
+        option,
+        description = "default is used if unspecified, <default:BannerSwipe, Starfield>"
     )]
     pub sleep: AnimSleeping,
-    #[options(
-        meta = "",
-        help = "Default is used if unspecified, <default:GlitchOut, SeeYa>"
+    #[argh(
+        option,
+        description = "default is used if unspecified, <default:GlitchOut, SeeYa>"
     )]
     pub shutdown: AnimShutdown,
-    #[options(meta = "", help = "set/apply the animations <true/false>")]
+    #[argh(option, description = "set/apply the animations <true/false>")]
     pub set: Option<bool>,
 }
 
-#[derive(Options)]
+#[derive(FromArgs, Debug)]
+#[argh(subcommand, name = "image", description = "display a PNG image")]
 pub struct AnimeImage {
-    #[options(help = "print help message")]
-    pub help: bool,
-    #[options(meta = "", help = "full path to the png to display")]
+    #[argh(option, description = "full path to the png to display")]
     pub path: String,
-    #[options(meta = "", default = "1.0", help = "scale 1.0 == normal")]
+    #[argh(option, default = "1.0", description = "scale 1.0 == normal")]
     pub scale: f32,
-    #[options(meta = "", default = "0.0", help = "x position (float)")]
+    #[argh(option, default = "0.0", description = "x position (float)")]
     pub x_pos: f32,
-    #[options(meta = "", default = "0.0", help = "y position (float)")]
+    #[argh(option, default = "0.0", description = "y position (float)")]
     pub y_pos: f32,
-    #[options(meta = "", default = "0.0", help = "the angle in radians")]
+    #[argh(option, default = "0.0", description = "the angle in radians")]
     pub angle: f32,
-    #[options(meta = "", default = "1.0", help = "brightness 0.0-1.0")]
+    #[argh(option, default = "1.0", description = "brightness 0.0-1.0")]
     pub bright: f32,
 }
 
-#[derive(Options)]
+#[derive(FromArgs, Debug)]
+#[argh(
+    subcommand,
+    name = "pixel-image",
+    description = "display a diagonal/pixel-perfect PNG"
+)]
 pub struct AnimeImageDiagonal {
-    #[options(help = "print help message")]
-    pub help: bool,
-    #[options(meta = "", help = "full path to the png to display")]
+    #[argh(option, description = "full path to the png to display")]
     pub path: String,
-    #[options(meta = "", default = "1.0", help = "brightness 0.0-1.0")]
+    #[argh(option, default = "1.0", description = "brightness 0.0-1.0")]
     pub bright: f32,
 }
 
-#[derive(Options)]
+#[derive(FromArgs, Debug)]
+#[argh(subcommand, name = "gif", description = "display an animated GIF")]
 pub struct AnimeGif {
-    #[options(help = "print help message")]
-    pub help: bool,
-    #[options(meta = "", help = "full path to the png to display")]
+    #[argh(option, description = "full path to the gif to display")]
     pub path: String,
-    #[options(meta = "", default = "1.0", help = "scale 1.0 == normal")]
+    #[argh(option, default = "1.0", description = "scale 1.0 == normal")]
     pub scale: f32,
-    #[options(meta = "", default = "0.0", help = "x position (float)")]
+    #[argh(option, default = "0.0", description = "x position (float)")]
     pub x_pos: f32,
-    #[options(meta = "", default = "0.0", help = "y position (float)")]
+    #[argh(option, default = "0.0", description = "y position (float)")]
     pub y_pos: f32,
-    #[options(meta = "", default = "0.0", help = "the angle in radians")]
+    #[argh(option, default = "0.0", description = "the angle in radians")]
     pub angle: f32,
-    #[options(meta = "", default = "1.0", help = "brightness 0.0-1.0")]
+    #[argh(option, default = "1.0", description = "brightness 0.0-1.0")]
     pub bright: f32,
-    #[options(
-        meta = "",
+    #[argh(
+        option,
         default = "1",
-        help = "how many loops to play - 0 is infinite"
+        description = "how many loops to play - 0 is infinite"
     )]
     pub loops: u32,
 }
 
-#[derive(Options)]
+#[derive(FromArgs, Debug)]
+#[argh(
+    subcommand,
+    name = "pixel-gif",
+    description = "display an animated diagonal/pixel-perfect GIF"
+)]
 pub struct AnimeGifDiagonal {
-    #[options(help = "print help message")]
-    pub help: bool,
-    #[options(meta = "", help = "full path to the png to display")]
+    #[argh(option, description = "full path to the gif to display")]
     pub path: String,
-    #[options(meta = "", default = "1.0", help = "brightness 0.0-1.0")]
+    #[argh(option, default = "1.0", description = "brightness 0.0-1.0")]
     pub bright: f32,
-    #[options(
-        meta = "",
+    #[argh(
+        option,
         default = "1",
-        help = "how many loops to play - 0 is infinite"
+        description = "how many loops to play - 0 is infinite"
     )]
     pub loops: u32,
 }

asusctl/src/aura_cli.rs

@@ -1,68 +1,67 @@
+use std::fmt;
 use std::str::FromStr;
 
-use gumdrop::Options;
+use argh::FromArgs;
 use rog_aura::error::Error;
 use rog_aura::{AuraEffect, AuraModeNum, AuraZone, Colour, Direction, Speed};
 
-#[derive(Options, Debug)]
+#[derive(FromArgs, Debug, Clone)]
+#[argh(
+    subcommand,
+    name = "aura-power-old",
+    description = "aura power (old ROGs and TUF laptops)"
+)]
 pub struct LedPowerCommand1 {
-    #[options(help = "print help message")]
-    pub help: bool,
-    #[options(meta = "", help = "Control if LEDs enabled while awake <true/false>")]
+    #[argh(
+        option,
+        description = "control if LEDs enabled while awake <true/false>"
+    )]
     pub awake: Option<bool>,
-    #[options(help = "Use with awake option, if excluded defaults to false")]
+
+    #[argh(
+        switch,
+        description = "use with awake option; if excluded defaults to false"
+    )]
     pub keyboard: bool,
-    #[options(help = "Use with awake option, if excluded defaults to false")]
+
+    #[argh(
+        switch,
+        description = "use with awake option; if excluded defaults to false"
+    )]
     pub lightbar: bool,
-    #[options(meta = "", help = "Control boot animations <true/false>")]
+
+    #[argh(option, description = "control boot animations <true/false>")]
     pub boot: Option<bool>,
-    #[options(meta = "", help = "Control suspend animations <true/false>")]
+
+    #[argh(option, description = "control suspend animations <true/false>")]
     pub sleep: Option<bool>,
 }
 
-#[derive(Options, Debug)]
+#[derive(FromArgs, Debug, Clone)]
+#[argh(subcommand, name = "aura-power", description = "aura power")]
 pub struct LedPowerCommand2 {
-    #[options(help = "print help message")]
-    pub help: bool,
-    #[options(command)]
+    #[argh(subcommand)]
     pub command: Option<SetAuraZoneEnabled>,
 }
 
-#[derive(Options, Debug)]
+/// Subcommands to enable/disable specific aura zones
+#[derive(FromArgs, Debug, Clone)]
+#[argh(subcommand)]
 pub enum SetAuraZoneEnabled {
-    /// Applies to both old and new models
-    #[options(help = "")]
-    Keyboard(AuraPowerStates),
-    #[options(help = "")]
-    Logo(AuraPowerStates),
-    #[options(help = "")]
-    Lightbar(AuraPowerStates),
-    #[options(help = "")]
-    Lid(AuraPowerStates),
-    #[options(help = "")]
-    RearGlow(AuraPowerStates),
-    #[options(help = "")]
-    Ally(AuraPowerStates),
+    Keyboard(KeyboardPower),
+    Logo(LogoPower),
+    Lightbar(LightbarPower),
+    Lid(LidPower),
+    RearGlow(RearGlowPower),
+    Ally(AllyPower),
 }
 
-#[derive(Debug, Clone, Options)]
-pub struct AuraPowerStates {
-    #[options(help = "print help message")]
-    pub help: bool,
-    #[options(help = "defaults to false if option unused")]
-    pub boot: bool,
-    #[options(help = "defaults to false if option unused")]
-    pub awake: bool,
-    #[options(help = "defaults to false if option unused")]
-    pub sleep: bool,
-    #[options(help = "defaults to false if option unused")]
-    pub shutdown: bool,
-}
-
-#[derive(Options)]
+/// Keyboard brightness argument helper
+#[derive(Debug, Clone)]
 pub struct LedBrightness {
     level: Option<u8>,
 }
+
 impl LedBrightness {
     pub fn new(level: Option<u8>) -> Self {
         LedBrightness { level }
@@ -72,174 +71,302 @@ impl LedBrightness {
         self.level
     }
 }
+
 impl FromStr for LedBrightness {
     type Err = Error;
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         let s = s.to_lowercase();
         match s.as_str() {
-            "off" => Ok(LedBrightness { level: Some(0x00) }),
-            "low" => Ok(LedBrightness { level: Some(0x01) }),
-            "med" => Ok(LedBrightness { level: Some(0x02) }),
-            "high" => Ok(LedBrightness { level: Some(0x03) }),
-            _ => {
-                print!("Invalid argument, must be one of: off, low, med, high");
-                Err(Error::ParseBrightness)
-            }
+            "off" => Ok(Self::new(Some(0x00))),
+            "low" => Ok(Self::new(Some(0x01))),
+            "med" => Ok(Self::new(Some(0x02))),
+            "high" => Ok(Self::new(Some(0x03))),
+            _ => Err(Error::ParseBrightness),
         }
     }
 }
-#[allow(clippy::to_string_trait_impl)]
-impl ToString for LedBrightness {
-    fn to_string(&self) -> String {
+
+impl fmt::Display for LedBrightness {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         let s = match self.level {
-            Some(0x00) => "low",
-            Some(0x01) => "med",
-            Some(0x02) => "high",
+            Some(0x00) => "off",
+            Some(0x01) => "low",
+            Some(0x02) => "med",
+            Some(0x03) => "high",
             _ => "unknown",
         };
-        s.to_owned()
+        write!(f, "{}", s)
     }
 }
 
-#[derive(Debug, Clone, Options, Default)]
+#[derive(FromArgs, Debug, Clone, Default)]
+#[argh(
+    subcommand,
+    name = "keyboard",
+    description = "set power states for keyboard zone"
+)]
+pub struct KeyboardPower {
+    #[argh(switch, description = "defaults to false if option unused")]
+    pub boot: bool,
+    #[argh(switch, description = "defaults to false if option unused")]
+    pub awake: bool,
+    #[argh(switch, description = "defaults to false if option unused")]
+    pub sleep: bool,
+    #[argh(switch, description = "defaults to false if option unused")]
+    pub shutdown: bool,
+}
+
+#[derive(FromArgs, Debug, Clone, Default)]
+#[argh(
+    subcommand,
+    name = "logo",
+    description = "set power states for logo zone"
+)]
+pub struct LogoPower {
+    #[argh(switch, description = "defaults to false if option unused")]
+    pub boot: bool,
+    #[argh(switch, description = "defaults to false if option unused")]
+    pub awake: bool,
+    #[argh(switch, description = "defaults to false if option unused")]
+    pub sleep: bool,
+    #[argh(switch, description = "defaults to false if option unused")]
+    pub shutdown: bool,
+}
+
+#[derive(FromArgs, Debug, Clone, Default)]
+#[argh(
+    subcommand,
+    name = "lightbar",
+    description = "set power states for lightbar zone"
+)]
+pub struct LightbarPower {
+    #[argh(switch, description = "enable power while device is booting")]
+    pub boot: bool,
+    #[argh(switch, description = "enable power while device is awake")]
+    pub awake: bool,
+    #[argh(switch, description = "enable power while device is sleeping")]
+    pub sleep: bool,
+    #[argh(
+        switch,
+        description = "enable power while device is shutting down or hibernating"
+    )]
+    pub shutdown: bool,
+}
+
+#[derive(FromArgs, Debug, Clone, Default)]
+#[argh(
+    subcommand,
+    name = "lid",
+    description = "set power states for lid zone"
+)]
+pub struct LidPower {
+    #[argh(switch, description = "defaults to false if option unused")]
+    pub boot: bool,
+    #[argh(switch, description = "defaults to false if option unused")]
+    pub awake: bool,
+    #[argh(switch, description = "defaults to false if option unused")]
+    pub sleep: bool,
+    #[argh(switch, description = "defaults to false if option unused")]
+    pub shutdown: bool,
+}
+
+#[derive(FromArgs, Debug, Clone, Default)]
+#[argh(
+    subcommand,
+    name = "rear-glow",
+    description = "set power states for rear glow zone"
+)]
+pub struct RearGlowPower {
+    #[argh(switch, description = "defaults to false if option unused")]
+    pub boot: bool,
+    #[argh(switch, description = "defaults to false if option unused")]
+    pub awake: bool,
+    #[argh(switch, description = "defaults to false if option unused")]
+    pub sleep: bool,
+    #[argh(switch, description = "defaults to false if option unused")]
+    pub shutdown: bool,
+}
+
+#[derive(FromArgs, Debug, Clone, Default)]
+#[argh(
+    subcommand,
+    name = "ally",
+    description = "set power states for ally zone"
+)]
+pub struct AllyPower {
+    #[argh(switch, description = "defaults to false if option unused")]
+    pub boot: bool,
+    #[argh(switch, description = "defaults to false if option unused")]
+    pub awake: bool,
+    #[argh(switch, description = "defaults to false if option unused")]
+    pub sleep: bool,
+    #[argh(switch, description = "defaults to false if option unused")]
+    pub shutdown: bool,
+}
+
+/// Single speed-based effect
+#[derive(FromArgs, Debug, Clone, Default)]
+#[argh(
+    subcommand,
+    name = "rainbow-cycle",
+    description = "single speed-based effect"
+)]
 pub struct SingleSpeed {
-    #[options(help = "print help message")]
-    help: bool,
-    #[options(no_long, meta = "WORD", help = "set the speed: low, med, high")]
+    #[argh(option, description = "set the speed: low, med, high")]
     pub speed: Speed,
-    #[options(
-        no_long,
-        meta = "",
-        help = "set the zone for this effect e.g, 0, 1, one, logo, lightbar-left"
+
+    #[argh(
+        option,
+        default = "AuraZone::None",
+        description = "set the zone for this effect e.g. 0, 1, one, logo, lightbar-left"
     )]
     pub zone: AuraZone,
 }
 
-#[derive(Debug, Clone, Options, Default)]
+/// Single speed effect with direction
+#[derive(FromArgs, Debug, Clone, Default)]
+#[argh(
+    subcommand,
+    name = "rainbow-wave",
+    description = "single speed effect with direction"
+)]
 pub struct SingleSpeedDirection {
-    #[options(help = "print help message")]
-    help: bool,
-    #[options(no_long, meta = "", help = "set the direction: up, down, left, right")]
+    #[argh(option, description = "set the direction: up, down, left, right")]
     pub direction: Direction,
-    #[options(no_long, meta = "", help = "set the speed: low, med, high")]
+
+    #[argh(option, description = "set the speed: low, med, high")]
     pub speed: Speed,
-    #[options(
-        no_long,
-        meta = "",
-        help = "set the zone for this effect e.g, 0, 1, one, logo, lightbar-left"
+
+    #[argh(
+        option,
+        default = "AuraZone::None",
+        description = "set the zone for this effect e.g. 0, 1, one, logo, lightbar-left"
     )]
     pub zone: AuraZone,
 }
 
-#[derive(Debug, Clone, Default, Options)]
+/// Static single-colour effect
+#[derive(FromArgs, Debug, Clone, Default)]
+#[argh(
+    subcommand,
+    name = "static",
+    description = "static single-colour effect"
+)]
 pub struct SingleColour {
-    #[options(help = "print help message")]
-    help: bool,
-    #[options(no_long, meta = "", help = "set the RGB value e.g, ff00ff")]
+    #[argh(option, short = 'c', description = "set the RGB value e.g. ff00ff")]
     pub colour: Colour,
-    #[options(
-        no_long,
-        meta = "",
-        help = "set the zone for this effect e.g, 0, 1, one, logo, lightbar-left"
+
+    #[argh(
+        option,
+        default = "AuraZone::None",
+        description = "set the zone for this effect e.g. 0, 1, one, logo, lightbar-left"
     )]
     pub zone: AuraZone,
 }
 
-#[derive(Debug, Clone, Default, Options)]
+/// Single-colour effect with speed
+#[derive(FromArgs, Debug, Clone, Default)]
+#[argh(
+    subcommand,
+    name = "highlight",
+    description = "single-colour effect with speed"
+)]
 pub struct SingleColourSpeed {
-    #[options(help = "print help message")]
-    help: bool,
-    #[options(no_long, meta = "", help = "set the RGB value e.g, ff00ff")]
+    #[argh(option, short = 'c', description = "set the RGB value e.g. ff00ff")]
     pub colour: Colour,
-    #[options(no_long, meta = "", help = "set the speed: low, med, high")]
+
+    #[argh(option, description = "set the speed: low, med, high")]
     pub speed: Speed,
-    #[options(
-        no_long,
-        meta = "",
-        help = "set the zone for this effect e.g, 0, 1, one, logo, lightbar-left"
+
+    #[argh(
+        option,
+        default = "AuraZone::None",
+        description = "set the zone for this effect e.g. 0, 1, one, logo, lightbar-left"
     )]
     pub zone: AuraZone,
 }
 
-#[derive(Debug, Clone, Options, Default)]
+/// Two-colour breathing effect
+#[derive(FromArgs, Debug, Clone, Default)]
+#[argh(
+    subcommand,
+    name = "breathe",
+    description = "two-colour breathing effect"
+)]
 pub struct TwoColourSpeed {
-    #[options(help = "print help message")]
-    help: bool,
-    #[options(no_long, meta = "", help = "set the first RGB value e.g, ff00ff")]
+    #[argh(option, description = "set the first RGB value e.g. ff00ff")]
     pub colour: Colour,
-    #[options(no_long, meta = "", help = "set the second RGB value e.g, ff00ff")]
+
+    #[argh(option, description = "set the second RGB value e.g. ff00ff")]
     pub colour2: Colour,
-    #[options(no_long, meta = "", help = "set the speed: low, med, high")]
+
+    #[argh(option, description = "set the speed: low, med, high")]
     pub speed: Speed,
-    #[options(
-        no_long,
-        meta = "",
-        help = "set the zone for this effect e.g, 0, 1, one, logo, lightbar-left"
+
+    #[argh(
+        option,
+        default = "AuraZone::None",
+        description = "set the zone for this effect e.g. 0, 1, one, logo, lightbar-left"
     )]
     pub zone: AuraZone,
 }
 
-#[derive(Debug, Clone, Default, Options)]
+/// Multi-zone colour settings
+#[derive(FromArgs, Debug, Clone, Default)]
+#[allow(dead_code)]
+#[argh(description = "multi-zone colour settings")]
 pub struct MultiZone {
-    #[options(help = "print help message")]
-    help: bool,
-    #[options(short = "a", meta = "", help = "set the RGB value e.g, ff00ff")]
+    #[argh(option, short = 'a', description = "set the RGB value e.g. ff00ff")]
     pub colour1: Colour,
-    #[options(short = "b", meta = "", help = "set the RGB value e.g, ff00ff")]
+
+    #[argh(option, short = 'b', description = "set the RGB value e.g. ff00ff")]
     pub colour2: Colour,
-    #[options(short = "c", meta = "", help = "set the RGB value e.g, ff00ff")]
+
+    #[argh(option, short = 'c', description = "set the RGB value e.g. ff00ff")]
     pub colour3: Colour,
-    #[options(short = "d", meta = "", help = "set the RGB value e.g, ff00ff")]
+
+    #[argh(option, short = 'd', description = "set the RGB value e.g. ff00ff")]
     pub colour4: Colour,
 }
 
-#[derive(Debug, Clone, Default, Options)]
+/// Multi-colour with speed
+#[derive(FromArgs, Debug, Clone, Default)]
+#[allow(dead_code)]
+#[argh(description = "multi-colour with speed")]
 pub struct MultiColourSpeed {
-    #[options(help = "print help message")]
-    help: bool,
-    #[options(short = "a", meta = "", help = "set the RGB value e.g, ff00ff")]
+    #[argh(option, short = 'a', description = "set the RGB value e.g. ff00ff")]
     pub colour1: Colour,
-    #[options(short = "b", meta = "", help = "set the RGB value e.g, ff00ff")]
+
+    #[argh(option, short = 'b', description = "set the RGB value e.g. ff00ff")]
     pub colour2: Colour,
-    #[options(short = "c", meta = "", help = "set the RGB value e.g, ff00ff")]
+
+    #[argh(option, short = 'c', description = "set the RGB value e.g. ff00ff")]
     pub colour3: Colour,
-    #[options(short = "d", meta = "", help = "set the RGB value e.g, ff00ff")]
+
+    #[argh(option, short = 'd', description = "set the RGB value e.g. ff00ff")]
     pub colour4: Colour,
-    #[options(no_long, meta = "", help = "set the speed: low, med, high")]
+
+    #[argh(option, description = "set the speed: low, med, high")]
     pub speed: Speed,
 }
 
-/// Byte value for setting the built-in mode.
-///
-/// Enum corresponds to the required integer value
-// NOTE: The option names here must match those in rog-aura crate
-#[derive(Options)]
+/// Builtin aura effects
+#[derive(FromArgs, Debug)]
+#[argh(subcommand)]
 pub enum SetAuraBuiltin {
-    #[options(help = "set a single static colour")]
-    Static(SingleColour), // 0
-    #[options(help = "pulse between one or two colours")]
-    Breathe(TwoColourSpeed), // 1
-    #[options(help = "strobe through all colours")]
-    RainbowCycle(SingleSpeed), // 2
-    #[options(help = "rainbow cycling in one of four directions")]
+    Static(SingleColour),              // 0
+    Breathe(TwoColourSpeed),           // 1
+    RainbowCycle(SingleSpeed),         // 2
     RainbowWave(SingleSpeedDirection), // 3
-    #[options(help = "rain pattern mimicking raindrops")]
-    Stars(TwoColourSpeed), // 4
-    #[options(help = "rain pattern of three preset colours")]
-    Rain(SingleSpeed), // 5
-    #[options(help = "pressed keys are highlighted to fade")]
-    Highlight(SingleColourSpeed), // 6
-    #[options(help = "pressed keys generate horizontal laser")]
-    Laser(SingleColourSpeed), // 7
-    #[options(help = "pressed keys ripple outwards like a splash")]
-    Ripple(SingleColourSpeed), // 8
-    #[options(help = "set a rapid pulse")]
-    Pulse(SingleColour), // 10
-    #[options(help = "set a vertical line zooming from left")]
-    Comet(SingleColour), // 11
-    #[options(help = "set a wide vertical line zooming from left")]
-    Flash(SingleColour), // 12
+    Stars(TwoColourSpeed),             // 4
+    Rain(SingleSpeed),                 // 5
+    Highlight(SingleColourSpeed),      // 6
+    Laser(SingleColourSpeed),          // 7
+    Ripple(SingleColourSpeed),         // 8
+    Pulse(SingleColour),               // 10
+    Comet(SingleColour),               // 11
+    Flash(SingleColour),               // 12
 }
 
 impl Default for SetAuraBuiltin {

asusctl/src/cli_opts.rs

@@ -1,4 +1,4 @@
-use gumdrop::Options;
+use argh::FromArgs;
 use rog_platform::platform::PlatformProfile;
 
 use crate::anime_cli::AnimeCommand;
@@ -7,118 +7,308 @@ use crate::fan_curve_cli::FanCurveCommand;
 use crate::scsi_cli::ScsiCommand;
 use crate::slash_cli::SlashCommand;
 
-#[derive(Default, Options)]
+#[derive(FromArgs, Default, Debug)]
+/// asusctl command-line options
 pub struct CliStart {
-    #[options(help_flag, help = "print help message")]
-    pub help: bool,
-    #[options(help = "show program version number")]
-    pub version: bool,
-    #[options(help = "show supported functions of this laptop")]
-    pub show_supported: bool,
-    #[options(meta = "", help = "<off, low, med, high>")]
-    pub kbd_bright: Option<LedBrightness>,
-    #[options(help = "Toggle to next keyboard brightness")]
-    pub next_kbd_bright: bool,
-    #[options(help = "Toggle to previous keyboard brightness")]
-    pub prev_kbd_bright: bool,
-    #[options(meta = "", help = "Set your battery charge limit <20-100>")]
-    pub chg_limit: Option<u8>,
-    #[options(help = "Toggle one-shot battery charge to 100%")]
-    pub one_shot_chg: bool,
-    #[options(command)]
-    pub command: Option<CliCommand>,
+    #[argh(subcommand)]
+    pub command: CliCommand,
 }
 
-#[derive(Options)]
+/// Top-level subcommands for asusctl
+#[derive(FromArgs, Debug)]
+#[argh(subcommand)]
 pub enum CliCommand {
-    #[options(help = "Set the keyboard lighting from built-in modes")]
     Aura(LedModeCommand),
-    #[options(help = "Set the LED power states")]
     AuraPowerOld(LedPowerCommand1),
-    #[options(help = "Set the LED power states")]
     AuraPower(LedPowerCommand2),
-    #[options(help = "Set or select platform_profile")]
+    Brightness(BrightnessCommand),
     Profile(ProfileCommand),
-    #[options(help = "Set, select, or modify fan curves if supported")]
     FanCurve(FanCurveCommand),
-    #[options(help = "Set the graphics mode (obsoleted by supergfxctl)")]
-    Graphics(GraphicsCommand),
-    #[options(name = "anime", help = "Manage AniMe Matrix")]
     Anime(AnimeCommand),
-    #[options(name = "slash", help = "Manage Slash Ledbar")]
     Slash(SlashCommand),
-    #[options(name = "scsi", help = "Manage SCSI external drive")]
     Scsi(ScsiCommand),
-    #[options(
-        help = "Change platform settings. This is a new interface exposed by the asus-armoury \
-                driver, some of the settings will be the same as the older platform interface"
-    )]
     Armoury(ArmouryCommand),
-    #[options(name = "backlight", help = "Set screen backlight levels")]
     Backlight(BacklightCommand),
+    Battery(BatteryCommand),
+    Info(InfoCommand),
 }
 
-#[derive(Debug, Clone, Options)]
+impl Default for CliCommand {
+    fn default() -> Self {
+        CliCommand::Info(InfoCommand::default())
+    }
+}
+
+#[derive(FromArgs, Debug)]
+#[argh(subcommand, name = "profile", description = "profile management")]
 pub struct ProfileCommand {
-    #[options(help = "print help message")]
-    pub help: bool,
-
-    #[options(help = "toggle to next profile in list")]
-    pub next: bool,
-
-    #[options(help = "list available profiles")]
-    pub list: bool,
-
-    #[options(help = "get profile")]
-    pub profile_get: bool,
-
-    #[options(meta = "", help = "set the active profile")]
-    pub profile_set: Option<PlatformProfile>,
+    #[argh(subcommand)]
+    pub command: ProfileSubCommand,
 }
 
-#[derive(Options)]
+#[derive(FromArgs, Debug)]
+#[argh(subcommand)]
+pub enum ProfileSubCommand {
+    Next(ProfileNextCommand),
+    List(ProfileListCommand),
+    Get(ProfileGetCommand),
+    Set(ProfileSetCommand),
+}
+
+impl Default for ProfileSubCommand {
+    fn default() -> Self {
+        ProfileSubCommand::List(ProfileListCommand::default())
+    }
+}
+
+#[derive(FromArgs, Debug, Default)]
+#[argh(
+    subcommand,
+    name = "next",
+    description = "toggle to next profile in list"
+)]
+pub struct ProfileNextCommand {}
+
+#[derive(FromArgs, Debug, Default)]
+#[argh(subcommand, name = "list", description = "list available profiles")]
+pub struct ProfileListCommand {}
+
+#[derive(FromArgs, Debug, Default)]
+#[argh(subcommand, name = "get", description = "get profile")]
+pub struct ProfileGetCommand {}
+
+#[derive(FromArgs, Debug, Default)]
+#[argh(subcommand, name = "set", description = "set profile")]
+pub struct ProfileSetCommand {
+    #[argh(positional, description = "profile to set")]
+    pub profile: PlatformProfile,
+
+    #[argh(
+        switch,
+        short = 'a',
+        description = "set the profile to use on AC power"
+    )]
+    pub ac: bool,
+
+    #[argh(
+        switch,
+        short = 'b',
+        description = "set the profile to use on battery power"
+    )]
+    pub battery: bool,
+}
+
+#[derive(FromArgs, Debug, Default)]
+#[argh(subcommand, name = "aura", description = "led mode commands")]
 pub struct LedModeCommand {
-    #[options(help = "print help message")]
-    pub help: bool,
-    #[options(help = "switch to next aura mode")]
+    #[argh(switch, description = "switch to next aura mode")]
     pub next_mode: bool,
-    #[options(help = "switch to previous aura mode")]
+
+    #[argh(switch, description = "switch to previous aura mode")]
     pub prev_mode: bool,
-    #[options(command)]
+
+    #[argh(subcommand)]
     pub command: Option<SetAuraBuiltin>,
 }
 
-#[derive(Options)]
-pub struct GraphicsCommand {
-    #[options(help = "print help message")]
-    pub help: bool,
-}
-
-#[derive(Options, Debug)]
+#[derive(FromArgs, Debug, Default)]
+#[argh(
+    subcommand,
+    name = "armoury",
+    description = "armoury / firmware attributes"
+)]
 pub struct ArmouryCommand {
-    #[options(help = "print help message")]
-    pub help: bool,
-    #[options(
-        free,
-        help = "append each value name followed by the value to set. `-1` sets to default"
-    )]
-    pub free: Vec<String>,
+    #[argh(subcommand)]
+    pub command: ArmourySubCommand,
 }
 
-#[derive(Options)]
+#[derive(FromArgs, Debug)]
+#[argh(subcommand)]
+pub enum ArmourySubCommand {
+    Set(ArmouryPropertySetCommand),
+    Get(ArmouryPropertyGetCommand),
+    List(ArmouryPropertyListCommand),
+}
+
+impl Default for ArmourySubCommand {
+    fn default() -> Self {
+        ArmourySubCommand::List(ArmouryPropertyListCommand::default())
+    }
+}
+
+#[derive(FromArgs, Debug, Default)]
+#[argh(
+    subcommand,
+    name = "set",
+    description = "set an asus-armoury firmware-attribute"
+)]
+pub struct ArmouryPropertySetCommand {
+    #[argh(
+        positional,
+        description = "name of the attribute to set (see asus-armoury list for available properties)"
+    )]
+    pub property: String,
+
+    #[argh(positional, description = "value to set for the given attribute")]
+    pub value: i32,
+}
+
+#[derive(FromArgs, Debug, Default)]
+#[argh(
+    subcommand,
+    name = "list",
+    description = "list all firmware-attributes supported by asus-armoury"
+)]
+pub struct ArmouryPropertyListCommand {}
+
+#[derive(FromArgs, Debug, Default)]
+#[argh(
+    subcommand,
+    name = "get",
+    description = "get a firmware-attribute from asus-armoury"
+)]
+pub struct ArmouryPropertyGetCommand {
+    #[argh(
+        positional,
+        description = "name of the property to get (see asus-armoury list for available properties)"
+    )]
+    pub property: String,
+}
+
+#[derive(FromArgs, Debug, Default)]
+#[argh(subcommand, name = "backlight", description = "backlight options")]
 pub struct BacklightCommand {
-    #[options(help = "print help message")]
-    pub help: bool,
-    #[options(meta = "", help = "Set screen brightness <0-100>")]
+    #[argh(option, description = "set screen brightness <0-100>")]
     pub screenpad_brightness: Option<i32>,
-    #[options(
-        meta = "",
-        help = "Set screenpad gamma brightness 0.5 - 2.2, 1.0 == linear"
+
+    #[argh(
+        option,
+        description = "set screenpad gamma brightness 0.5 - 2.2, 1.0 == linear"
     )]
     pub screenpad_gamma: Option<f32>,
-    #[options(
-        meta = "",
-        help = "Set screenpad brightness to sync with primary display"
+
+    #[argh(
+        option,
+        description = "set screenpad brightness to sync with primary display"
     )]
     pub sync_screenpad_brightness: Option<bool>,
 }
+
+#[derive(FromArgs, Debug)]
+#[argh(subcommand, name = "battery", description = "battery options")]
+pub struct BatteryCommand {
+    #[argh(subcommand)]
+    pub command: BatterySubCommand,
+}
+
+#[derive(FromArgs, Debug)]
+#[argh(subcommand)]
+pub enum BatterySubCommand {
+    Limit(BatteryLimitCommand),
+    OneShot(BatteryOneShotCommand),
+    Info(BatteryInfoCommand),
+}
+
+impl Default for BatterySubCommand {
+    fn default() -> Self {
+        BatterySubCommand::OneShot(BatteryOneShotCommand::default())
+    }
+}
+
+#[derive(FromArgs, Debug)]
+#[argh(
+    subcommand,
+    name = "limit",
+    description = "set battery charge limit <20-100>"
+)]
+pub struct BatteryLimitCommand {
+    #[argh(positional, description = "charge limit percentage 20-100")]
+    pub limit: u8,
+}
+
+#[derive(FromArgs, Debug, Default)]
+#[argh(
+    subcommand,
+    name = "oneshot",
+    description = "one-shot full charge (optional percent)"
+)]
+pub struct BatteryOneShotCommand {
+    #[argh(positional, description = "optional target percent (defaults to 100)")]
+    pub percent: Option<u8>,
+}
+
+#[derive(FromArgs, Debug, Default)]
+#[argh(
+    subcommand,
+    name = "info",
+    description = "show current battery charge limit"
+)]
+pub struct BatteryInfoCommand {}
+
+#[derive(FromArgs, Debug, Default)]
+#[argh(
+    subcommand,
+    name = "info",
+    description = "show program version and system info"
+)]
+pub struct InfoCommand {
+    #[argh(switch, description = "show supported functions of this laptop")]
+    pub show_supported: bool,
+}
+
+#[derive(FromArgs, Debug)]
+#[argh(subcommand, name = "leds", description = "keyboard brightness control")]
+pub struct BrightnessCommand {
+    #[argh(subcommand)]
+    pub command: BrightnessSubCommand,
+}
+
+#[derive(FromArgs, Debug)]
+#[argh(subcommand)]
+pub enum BrightnessSubCommand {
+    Set(BrightnessSetCommand),
+    Get(BrightnessGetCommand),
+    Next(BrightnessNextCommand),
+    Prev(BrightnessPrevCommand),
+}
+
+impl Default for BrightnessSubCommand {
+    fn default() -> Self {
+        BrightnessSubCommand::Get(BrightnessGetCommand::default())
+    }
+}
+
+#[derive(FromArgs, Debug)]
+#[argh(
+    subcommand,
+    name = "set",
+    description = "set keyboard brightness <off, low, med, high>"
+)]
+pub struct BrightnessSetCommand {
+    #[argh(positional, description = "brightness level: off, low, med, high")]
+    pub level: LedBrightness,
+}
+
+#[derive(FromArgs, Debug, Default)]
+#[argh(
+    subcommand,
+    name = "get",
+    description = "get current keyboard brightness"
+)]
+pub struct BrightnessGetCommand {}
+
+#[derive(FromArgs, Debug, Default)]
+#[argh(
+    subcommand,
+    name = "next",
+    description = "toggle to next keyboard brightness"
+)]
+pub struct BrightnessNextCommand {}
+
+#[derive(FromArgs, Debug, Default)]
+#[argh(
+    subcommand,
+    name = "prev",
+    description = "toggle to previous keyboard brightness"
+)]
+pub struct BrightnessPrevCommand {}

asusctl/src/fan_curve_cli.rs

@@ -1,49 +1,44 @@
-use gumdrop::Options;
+use argh::FromArgs;
 use rog_platform::platform::PlatformProfile;
 use rog_profiles::fan_curve_set::CurveData;
 use rog_profiles::FanCurvePU;
 
-#[derive(Debug, Clone, Options)]
+#[derive(FromArgs, Debug, Clone)]
+#[argh(subcommand, name = "fan-curve", description = "fan curve commands")]
 pub struct FanCurveCommand {
-    #[options(help = "print help message")]
-    pub help: bool,
-
-    #[options(help = "get enabled fan profiles")]
+    #[argh(switch, description = "get enabled fan profiles")]
     pub get_enabled: bool,
 
-    #[options(help = "set the active profile's fan curve to default")]
+    #[argh(switch, description = "set the active profile's fan curve to default")]
     pub default: bool,
 
-    #[options(
-        meta = "",
-        help = "profile to modify fan-curve for. Shows data if no options provided"
+    #[argh(
+        option,
+        description = "profile to modify fan-curve for. shows data if no options provided"
     )]
     pub mod_profile: Option<PlatformProfile>,
 
-    #[options(
-        meta = "",
-        help = "enable or disable <true/false> fan all curves for a profile. `--mod_profile` \
-                required"
+    #[argh(
+        option,
+        description = "enable or disable <true/false> fan all curves for a profile; --mod_profile required"
     )]
     pub enable_fan_curves: Option<bool>,
 
-    #[options(
-        meta = "",
-        help = "enable or disable <true/false> a single fan curve for a profile. `--mod_profile` \
-                and `--fan` required"
+    #[argh(
+        option,
+        description = "enable or disable <true/false> a single fan curve for a profile; --mod_profile and --fan required"
     )]
     pub enable_fan_curve: Option<bool>,
 
-    #[options(
-        meta = "",
-        help = "select fan <cpu/gpu/mid> to modify. `--mod_profile` required"
+    #[argh(
+        option,
+        description = "select fan <cpu/gpu/mid> to modify; --mod_profile required"
     )]
     pub fan: Option<FanCurvePU>,
 
-    #[options(
-        meta = "",
-        help = "data format = 30c:1%,49c:2%,59c:3%,69c:4%,79c:31%,89c:49%,99c:56%,109c:58%. \
-                `--mod-profile` required. If '%' is omitted the fan range is 0-255"
+    #[argh(
+        option,
+        description = "data format = 30c:1%,49c:2%,...; --mod-profile required. If '%' is omitted the fan range is 0-255"
     )]
     pub data: Option<CurveData>,
 }

asusctl/src/main.rs

@@ -1,5 +1,4 @@
 use std::convert::TryFrom;
-use std::env::args;
 use std::path::Path;
 use std::process::Command;
 use std::thread::sleep;
@@ -8,12 +7,11 @@ use anime_cli::{AnimeActions, AnimeCommand};
 use aura_cli::{LedPowerCommand1, LedPowerCommand2};
 use dmi_id::DMIID;
 use fan_curve_cli::FanCurveCommand;
-use gumdrop::{Opt, Options};
-use log::{error, info};
+use log::{error, info, LevelFilter};
 use rog_anime::usb::get_anime_type;
 use rog_anime::{AnimTime, AnimeDataBuffer, AnimeDiagonal, AnimeGif, AnimeImage, AnimeType, Vec2};
 use rog_aura::keyboard::{AuraPowerState, LaptopAuraPower};
-use rog_aura::{self, AuraDeviceType, AuraEffect, PowerZones};
+use rog_aura::{self, AuraEffect, PowerZones};
 use rog_dbus::asus_armoury::AsusArmouryProxyBlocking;
 use rog_dbus::list_iface_blocking;
 use rog_dbus::scsi_aura::ScsiAuraProxyBlocking;
@@ -32,7 +30,6 @@ use scsi_cli::ScsiCommand;
 use zbus::blocking::proxy::ProxyImpl;
 use zbus::blocking::Connection;
 
-use crate::aura_cli::{AuraPowerStates, LedBrightness};
 use crate::cli_opts::*;
 use crate::slash_cli::SlashCommand;
 
@@ -44,30 +41,19 @@ mod scsi_cli;
 mod slash_cli;
 
 fn main() {
+    // Ensure tracing spans are quiet by default unless user overrides
+    if std::env::var_os("RUST_LOG").is_none() {
+        std::env::set_var("RUST_LOG", "warn,tracing=error,zbus=error");
+    }
     let mut logger = env_logger::Builder::new();
     logger
         .parse_default_env()
-        .target(env_logger::Target::Stdout)
+        .filter_level(LevelFilter::Info)
+        .target(env_logger::Target::Stderr)
         .format_timestamp(None)
-        .filter_level(log::LevelFilter::Debug)
         .init();
 
-    let self_version = env!("CARGO_PKG_VERSION");
-    println!("Starting version {self_version}");
-    let args: Vec<String> = args().skip(1).collect();
-
-    let missing_argument_k = gumdrop::Error::missing_argument(Opt::Short('k'));
-    let parsed = match CliStart::parse_args_default(&args) {
-        Ok(p) => p,
-        Err(err) if err.to_string() == missing_argument_k.to_string() => CliStart {
-            kbd_bright: Some(LedBrightness::new(None)),
-            ..Default::default()
-        },
-        Err(err) => {
-            println!("Error: {}", err);
-            return;
-        }
-    };
+    let parsed: CliStart = argh::from_env();
 
     let conn = Connection::system().unwrap();
     if let Ok(platform_proxy) = PlatformProxyBlocking::new(&conn).map_err(|e| {
@@ -86,6 +72,7 @@ fn main() {
             }
         };
 
+        let self_version = env!("CARGO_PKG_VERSION");
         if asusd_version != self_version {
             println!("Version mismatch: asusctl = {self_version}, asusd = {asusd_version}");
             return;
@@ -106,12 +93,6 @@ fn main() {
             }
         };
 
-        if parsed.version {
-            println!("asusctl v{}", env!("CARGO_PKG_VERSION"));
-            println!();
-            print_info();
-        }
-
         if let Err(err) = do_parsed(&parsed, &supported_interfaces, &supported_properties, conn) {
             print_error_help(&*err, &supported_interfaces, &supported_properties);
         }
@@ -138,9 +119,9 @@ fn print_info() {
     let dmi = DMIID::new().unwrap_or_default();
     let board_name = dmi.board_name;
     let prod_family = dmi.product_family;
-    println!("asusctl version: {}", env!("CARGO_PKG_VERSION"));
-    println!(" Product family: {}", prod_family.trim());
-    println!("     Board name: {}", board_name.trim());
+    println!("Software version: {}", env!("CARGO_PKG_VERSION"));
+    println!("  Product family: {}", prod_family.trim());
+    println!("      Board name: {}", board_name.trim());
 }
 
 fn check_service(name: &str) -> bool {
@@ -205,149 +186,63 @@ fn do_parsed(
     conn: Connection,
 ) -> Result<(), Box<dyn std::error::Error>> {
     match &parsed.command {
-        Some(CliCommand::Aura(mode)) => handle_led_mode(mode)?,
-        Some(CliCommand::AuraPowerOld(pow)) => handle_led_power1(pow)?,
-        Some(CliCommand::AuraPower(pow)) => handle_led_power2(pow)?,
-        Some(CliCommand::Profile(cmd)) => {
-            handle_throttle_profile(&conn, supported_properties, cmd)?
-        }
-        Some(CliCommand::FanCurve(cmd)) => {
-            handle_fan_curve(&conn, cmd)?;
-        }
-        Some(CliCommand::Graphics(_)) => do_gfx(),
-        Some(CliCommand::Anime(cmd)) => handle_anime(cmd)?,
-        Some(CliCommand::Slash(cmd)) => handle_slash(cmd)?,
-        Some(CliCommand::Scsi(cmd)) => handle_scsi(cmd)?,
-        Some(CliCommand::Armoury(cmd)) => handle_armoury_command(cmd)?,
-        Some(CliCommand::Backlight(cmd)) => handle_backlight(cmd)?,
-        None => {
-            if (!parsed.show_supported
-                && parsed.kbd_bright.is_none()
-                && parsed.chg_limit.is_none()
-                && !parsed.next_kbd_bright
-                && !parsed.prev_kbd_bright
-                && !parsed.one_shot_chg)
-                || parsed.help
-            {
-                println!("{}", CliStart::usage());
-                println!();
-                if let Some(cmdlist) = CliStart::command_list() {
-                    let dev_type =
-                        if let Ok(proxy) = find_iface::<AuraProxyBlocking>("xyz.ljones.Aura") {
-                            // TODO: commands on all?
-                            proxy
-                                .first()
-                                .unwrap()
-                                .device_type()
-                                .unwrap_or(AuraDeviceType::Unknown)
-                        } else {
-                            AuraDeviceType::Unknown
-                        };
-                    let commands: Vec<String> = cmdlist.lines().map(|s| s.to_owned()).collect();
-                    for command in commands.iter().filter(|command| {
-                        if command.trim().starts_with("fan-curve")
-                            && !supported_interfaces.contains(&"xyz.ljones.FanCurves".to_string())
-                        {
-                            return false;
-                        }
-
-                        if command.trim().starts_with("aura")
-                            && !supported_interfaces.contains(&"xyz.ljones.Aura".to_string())
-                        {
-                            return false;
-                        }
-
-                        if command.trim().starts_with("anime")
-                            && !supported_interfaces.contains(&"xyz.ljones.Anime".to_string())
-                        {
-                            return false;
-                        }
-
-                        if command.trim().starts_with("slash")
-                            && !supported_interfaces.contains(&"xyz.ljones.Slash".to_string())
-                        {
-                            return false;
-                        }
-
-                        if command.trim().starts_with("platform")
-                            && !supported_interfaces.contains(&"xyz.ljones.Platform".to_string())
-                        {
-                            return false;
-                        }
-
-                        if command.trim().starts_with("armoury")
-                            && !supported_interfaces.contains(&"xyz.ljones.AsusArmoury".to_string())
-                        {
-                            return false;
-                        }
-
-                        if command.trim().starts_with("backlight")
-                            && !supported_interfaces.contains(&"xyz.ljones.Backlight".to_string())
-                        {
-                            return false;
-                        }
-
-                        if !dev_type.is_old_laptop()
-                            && !dev_type.is_tuf_laptop()
-                            && command.trim().starts_with("aura-power-old")
-                        {
-                            return false;
-                        }
-                        if !dev_type.is_new_laptop() && command.trim().starts_with("aura-power") {
-                            return false;
-                        }
-                        true
-                    }) {
-                        println!("{}", command);
-                    }
-                }
-
-                println!("\nExtra help can be requested on any command or subcommand:");
-                println!(" asusctl aura --help");
-                println!(" asusctl aura static --help");
-            }
+        CliCommand::Aura(mode) => handle_led_mode(mode)?,
+        CliCommand::AuraPowerOld(pow) => handle_led_power1(pow)?,
+        CliCommand::AuraPower(pow) => handle_led_power2(pow)?,
+        CliCommand::Brightness(cmd) => handle_brightness(cmd)?,
+        CliCommand::Profile(cmd) => handle_throttle_profile(&conn, supported_properties, cmd)?,
+        CliCommand::FanCurve(cmd) => handle_fan_curve(&conn, cmd)?,
+        CliCommand::Anime(cmd) => handle_anime(cmd)?,
+        CliCommand::Slash(cmd) => handle_slash(cmd)?,
+        CliCommand::Scsi(cmd) => handle_scsi(cmd)?,
+        CliCommand::Armoury(cmd) => handle_armoury_command(cmd)?,
+        CliCommand::Backlight(cmd) => handle_backlight(cmd)?,
+        CliCommand::Battery(cmd) => handle_battery(cmd, &conn)?,
+        CliCommand::Info(info_opt) => {
+            handle_info(info_opt, supported_interfaces, supported_properties)?
         }
     }
 
-    if let Some(brightness) = &parsed.kbd_bright {
-        if let Ok(aura) = find_iface::<AuraProxyBlocking>("xyz.ljones.Aura") {
-            for aura in aura.iter() {
-                match brightness.level() {
-                    None => {
-                        let level = aura.brightness()?;
-                        println!("Current keyboard led brightness: {level:?}");
-                    }
-                    Some(level) => aura.set_brightness(rog_aura::LedBrightness::from(level))?,
-                }
+    Ok(())
+}
+
+fn handle_battery(
+    cmd: &BatteryCommand,
+    conn: &Connection,
+) -> Result<(), Box<dyn std::error::Error>> {
+    match &cmd.command {
+        BatterySubCommand::Limit(l) => {
+            let proxy = PlatformProxyBlocking::new(conn)?;
+            proxy.set_charge_control_end_threshold(l.limit)?;
+        }
+        BatterySubCommand::OneShot(o) => {
+            let proxy = PlatformProxyBlocking::new(conn)?;
+            if let Some(p) = o.percent {
+                proxy.set_charge_control_end_threshold(p)?;
             }
-        } else {
-            println!("No aura interface found");
+            proxy.one_shot_full_charge()?;
+        }
+        BatterySubCommand::Info(_) => {
+            let proxy = PlatformProxyBlocking::new(conn)?;
+            let limit = proxy.charge_control_end_threshold()?;
+            println!("Current battery charge limit: {}%", limit);
         }
     }
 
-    if parsed.next_kbd_bright {
-        if let Ok(aura) = find_iface::<AuraProxyBlocking>("xyz.ljones.Aura") {
-            for aura in aura.iter() {
-                let brightness = aura.brightness()?;
-                aura.set_brightness(brightness.next())?;
-            }
-        } else {
-            println!("No aura interface found");
-        }
-    }
+    Ok(())
+}
 
-    if parsed.prev_kbd_bright {
-        if let Ok(aura) = find_iface::<AuraProxyBlocking>("xyz.ljones.Aura") {
-            for aura in aura.iter() {
-                let brightness = aura.brightness()?;
-                aura.set_brightness(brightness.prev())?;
-            }
-        } else {
-            println!("No aura interface found");
-        }
-    }
+fn handle_info(
+    info_opt: &InfoCommand,
+    supported_interfaces: &[String],
+    supported_properties: &[Properties],
+) -> Result<(), Box<dyn std::error::Error>> {
+    println!("asusctl v{}", env!("CARGO_PKG_VERSION"));
+    println!();
+    print_info();
+    println!();
 
-    if parsed.show_supported {
+    if info_opt.show_supported {
         println!("Supported Core Functions:\n{:#?}", supported_interfaces);
         println!(
             "Supported Platform Properties:\n{:#?}",
@@ -368,35 +263,14 @@ fn do_parsed(
         }
     }
 
-    if let Some(chg_limit) = parsed.chg_limit {
-        let proxy = PlatformProxyBlocking::new(&conn)?;
-        proxy.set_charge_control_end_threshold(chg_limit)?;
-    }
-
-    if parsed.one_shot_chg {
-        let proxy = PlatformProxyBlocking::new(&conn)?;
-        proxy.one_shot_full_charge()?;
-    }
-
     Ok(())
 }
 
-fn do_gfx() {
-    println!(
-        "Please use supergfxctl for graphics switching. supergfxctl is the result of making \
-         asusctl graphics switching generic so all laptops can use it"
-    );
-    println!("This command will be removed in future");
-}
-
 fn handle_backlight(cmd: &BacklightCommand) -> Result<(), Box<dyn std::error::Error>> {
-    if (cmd.screenpad_brightness.is_none()
+    if cmd.screenpad_brightness.is_none()
         && cmd.screenpad_gamma.is_none()
-        && cmd.sync_screenpad_brightness.is_none())
-        || cmd.help
+        && cmd.sync_screenpad_brightness.is_none()
     {
-        println!("Missing arg or command\n\n{}", cmd.self_usage());
-
         let backlights = find_iface::<BacklightProxyBlocking>("xyz.ljones.Backlight")?;
         for backlight in backlights {
             println!("Current screenpad settings:");
@@ -429,8 +303,50 @@ fn handle_backlight(cmd: &BacklightCommand) -> Result<(), Box<dyn std::error::Er
     Ok(())
 }
 
+fn handle_brightness(cmd: &BrightnessCommand) -> Result<(), Box<dyn std::error::Error>> {
+    let Ok(aura_proxies) = find_iface::<AuraProxyBlocking>("xyz.ljones.Aura") else {
+        println!("No aura interface found");
+        return Ok(());
+    };
+
+    match &cmd.command {
+        BrightnessSubCommand::Set(s) => {
+            for aura in aura_proxies.iter() {
+                if let Some(level) = s.level.level() {
+                    aura.set_brightness(rog_aura::LedBrightness::from(level))?;
+                } else {
+                    let current = aura.brightness()?;
+                    println!("Current keyboard led brightness: {current:?}");
+                }
+            }
+        }
+        BrightnessSubCommand::Get(_) => {
+            for aura in aura_proxies.iter() {
+                let level = aura.brightness()?;
+                println!("Current keyboard led brightness: {level:?}");
+            }
+
+            return Ok(());
+        }
+        BrightnessSubCommand::Next(_) => {
+            for aura in aura_proxies.iter() {
+                let brightness = aura.brightness()?;
+                aura.set_brightness(brightness.next())?;
+            }
+        }
+        BrightnessSubCommand::Prev(_) => {
+            for aura in aura_proxies.iter() {
+                let brightness = aura.brightness()?;
+                aura.set_brightness(brightness.prev())?;
+            }
+        }
+    }
+
+    Ok(())
+}
+
 fn handle_anime(cmd: &AnimeCommand) -> Result<(), Box<dyn std::error::Error>> {
-    if (cmd.command.is_none()
+    if cmd.command.is_none()
         && cmd.enable_display.is_none()
         && cmd.enable_powersave_anim.is_none()
         && cmd.brightness.is_none()
@@ -438,13 +354,9 @@ fn handle_anime(cmd: &AnimeCommand) -> Result<(), Box<dyn std::error::Error>> {
         && cmd.off_when_suspended.is_none()
         && cmd.off_when_unplugged.is_none()
         && cmd.off_with_his_head.is_none()
-        && !cmd.clear)
-        || cmd.help
+        && !cmd.clear
     {
-        println!("Missing arg or command\n\n{}", cmd.self_usage());
-        if let Some(lst) = cmd.self_command_list() {
-            println!("\n{}", lst);
-        }
+        println!("Missing arg or command; run 'asusctl anime --help' for usage");
     }
 
     let animes = find_iface::<AnimeProxyBlocking>("xyz.ljones.Anime").map_err(|e| {
@@ -491,11 +403,10 @@ fn handle_anime(cmd: &AnimeCommand) -> Result<(), Box<dyn std::error::Error>> {
         if let Some(action) = cmd.command.as_ref() {
             match action {
                 AnimeActions::Image(image) => {
-                    if image.help_requested() || image.path.is_empty() {
-                        println!("Missing arg or command\n\n{}", image.self_usage());
-                        if let Some(lst) = image.self_command_list() {
-                            println!("\n{}", lst);
-                        }
+                    if image.path.is_empty() {
+                        println!(
+                            "Missing arg or command; run 'asusctl anime image --help' for usage"
+                        );
                         return Ok(());
                     }
                     verify_brightness(image.bright);
@@ -512,11 +423,8 @@ fn handle_anime(cmd: &AnimeCommand) -> Result<(), Box<dyn std::error::Error>> {
                     proxy.write(<AnimeDataBuffer>::try_from(&matrix)?)?;
                 }
                 AnimeActions::PixelImage(image) => {
-                    if image.help_requested() || image.path.is_empty() {
-                        println!("Missing arg or command\n\n{}", image.self_usage());
-                        if let Some(lst) = image.self_command_list() {
-                            println!("\n{}", lst);
-                        }
+                    if image.path.is_empty() {
+                        println!("Missing arg or command; run 'asusctl anime pixel-image --help' for usage");
                         return Ok(());
                     }
                     verify_brightness(image.bright);
@@ -531,11 +439,10 @@ fn handle_anime(cmd: &AnimeCommand) -> Result<(), Box<dyn std::error::Error>> {
                     proxy.write(matrix.into_data_buffer(anime_type)?)?;
                 }
                 AnimeActions::Gif(gif) => {
-                    if gif.help_requested() || gif.path.is_empty() {
-                        println!("Missing arg or command\n\n{}", gif.self_usage());
-                        if let Some(lst) = gif.self_command_list() {
-                            println!("\n{}", lst);
-                        }
+                    if gif.path.is_empty() {
+                        println!(
+                            "Missing arg or command; run 'asusctl anime gif --help' for usage"
+                        );
                         return Ok(());
                     }
                     verify_brightness(gif.bright);
@@ -565,11 +472,8 @@ fn handle_anime(cmd: &AnimeCommand) -> Result<(), Box<dyn std::error::Error>> {
                     }
                 }
                 AnimeActions::PixelGif(gif) => {
-                    if gif.help_requested() || gif.path.is_empty() {
-                        println!("Missing arg or command\n\n{}", gif.self_usage());
-                        if let Some(lst) = gif.self_command_list() {
-                            println!("\n{}", lst);
-                        }
+                    if gif.path.is_empty() {
+                        println!("Missing arg or command; run 'asusctl anime pixel-gif --help' for usage");
                         return Ok(());
                     }
                     verify_brightness(gif.bright);
@@ -596,14 +500,8 @@ fn handle_anime(cmd: &AnimeCommand) -> Result<(), Box<dyn std::error::Error>> {
                     }
                 }
                 AnimeActions::SetBuiltins(builtins) => {
-                    if builtins.help_requested() || builtins.set.is_none() {
-                        println!(
-                            "\nAny unspecified args will be set to default (first shown var)\n"
-                        );
-                        println!("\n{}", builtins.self_usage());
-                        if let Some(lst) = builtins.self_command_list() {
-                            println!("\n{}", lst);
-                        }
+                    if builtins.set.is_none() {
+                        println!("Missing arg; run 'asusctl anime set-builtins --help' for usage");
                         return Ok(());
                     }
 
@@ -630,24 +528,19 @@ fn verify_brightness(brightness: f32) {
 }
 
 fn handle_slash(cmd: &SlashCommand) -> Result<(), Box<dyn std::error::Error>> {
-    if (cmd.brightness.is_none()
+    if cmd.brightness.is_none()
         && cmd.interval.is_none()
         && cmd.show_on_boot.is_none()
         && cmd.show_on_shutdown.is_none()
         && cmd.show_on_sleep.is_none()
         && cmd.show_on_battery.is_none()
         && cmd.show_battery_warning.is_none()
-        // && cmd.show_on_lid_closed.is_none()
         && cmd.mode.is_none()
         && !cmd.list
         && !cmd.enable
-        && !cmd.disable)
-        || cmd.help
+        && !cmd.disable
     {
-        println!("Missing arg or command\n\n{}", cmd.self_usage());
-        if let Some(lst) = cmd.self_command_list() {
-            println!("\n{}", lst);
-        }
+        println!("Missing arg or command; run 'asusctl slash --help' for usage");
     }
 
     let slashes = find_iface::<SlashProxyBlocking>("xyz.ljones.Slash")?;
@@ -698,13 +591,8 @@ fn handle_slash(cmd: &SlashCommand) -> Result<(), Box<dyn std::error::Error>> {
 }
 
 fn handle_scsi(cmd: &ScsiCommand) -> Result<(), Box<dyn std::error::Error>> {
-    if (!cmd.list && cmd.enable.is_none() && cmd.mode.is_none() && cmd.colours.is_empty())
-        || cmd.help
-    {
-        println!("Missing arg or command\n\n{}", cmd.self_usage());
-        if let Some(lst) = cmd.self_command_list() {
-            println!("\n{}", lst);
-        }
+    if !cmd.list && cmd.enable.is_none() && cmd.mode.is_none() && cmd.colours.is_empty() {
+        println!("Missing arg or command; run 'asusctl scsi --help' for usage");
     }
 
     let scsis = find_iface::<ScsiAuraProxyBlocking>("xyz.ljones.ScsiAura")?;
@@ -770,38 +658,15 @@ fn handle_scsi(cmd: &ScsiCommand) -> Result<(), Box<dyn std::error::Error>> {
 
 fn handle_led_mode(mode: &LedModeCommand) -> Result<(), Box<dyn std::error::Error>> {
     if mode.command.is_none() && !mode.prev_mode && !mode.next_mode {
-        if !mode.help {
-            println!("Missing arg or command\n");
-        }
-        println!("{}\n", mode.self_usage());
-        println!("Commands available");
-
-        if let Some(cmdlist) = LedModeCommand::command_list() {
-            let commands: Vec<String> = cmdlist.lines().map(|s| s.to_owned()).collect();
-            // TODO: multiple rgb check
-            let aura = find_iface::<AuraProxyBlocking>("xyz.ljones.Aura")?;
+        println!("Missing arg or command; run 'asusctl aura --help' for usage");
+        // print available modes when possible
+        if let Ok(aura) = find_iface::<AuraProxyBlocking>("xyz.ljones.Aura") {
             let modes = aura.first().unwrap().supported_basic_modes()?;
-            for command in commands.iter().filter(|command| {
-                for mode in &modes {
-                    let mut mode = <&str>::from(mode).to_string();
-                    if let Some(pos) = mode.chars().skip(1).position(|c| c.is_uppercase()) {
-                        mode.insert(pos + 1, '-');
-                    }
-                    if command.trim().starts_with(&mode.to_lowercase()) {
-                        return true;
-                    }
-                }
-                // TODO
-                // if !supported.basic_zones.is_empty() && command.trim().starts_with("multi") {
-                //     return true;
-                // }
-                false
-            }) {
-                println!("{}", command);
+            println!("Available modes:");
+            for m in modes {
+                println!("  {:?}", m);
             }
         }
-
-        println!("\nHelp can also be requested on modes, e.g: static --help");
         return Ok(());
     }
 
@@ -833,10 +698,6 @@ fn handle_led_mode(mode: &LedModeCommand) -> Result<(), Box<dyn std::error::Erro
             aura.set_led_mode(modes[pos])?;
         }
     } else if let Some(mode) = mode.command.as_ref() {
-        if mode.help_requested() {
-            println!("{}", mode.self_usage());
-            return Ok(());
-        }
         for aura in aura {
             aura.set_led_mode_data(<AuraEffect>::from(mode))?;
         }
@@ -859,10 +720,7 @@ fn handle_led_power1(power: &LedPowerCommand1) -> Result<(), Box<dyn std::error:
             && !power.keyboard
             && !power.lightbar
         {
-            if !power.help {
-                println!("Missing arg or command\n");
-            }
-            println!("{}\n", power.self_usage());
+            println!("Missing arg or command; run 'asusctl aura-power-old --help' for usage");
             return Ok(());
         }
 
@@ -914,51 +772,47 @@ fn handle_led_power2(power: &LedPowerCommand2) -> Result<(), Box<dyn std::error:
             continue;
         }
 
-        if power.command().is_none() {
-            if !power.help {
-                println!("Missing arg or command\n");
-            }
-            println!("{}\n", power.self_usage());
+        if power.command.is_none() {
+            println!("Missing arg or command; run 'asusctl aura-power --help' for usage");
             println!("Commands available");
-
-            if let Some(cmdlist) = LedPowerCommand2::command_list() {
-                let commands: Vec<String> = cmdlist.lines().map(|s| s.to_owned()).collect();
-                for command in &commands {
-                    println!("{}", command);
-                }
-            }
-
-            println!("\nHelp can also be requested on commands, e.g: boot --help");
             return Ok(());
         }
 
-        if let Some(pow) = power.command.as_ref() {
-            if pow.help_requested() {
-                println!("{}", pow.self_usage());
-                return Ok(());
-            }
-
+        if let Some(_pow) = power.command.as_ref() {
             let mut states = aura.led_power()?;
-            let mut set = |zone: PowerZones, set_to: &AuraPowerStates| {
-                for state in states.states.iter_mut() {
-                    if state.zone == zone {
-                        state.boot = set_to.boot;
-                        state.awake = set_to.awake;
-                        state.sleep = set_to.sleep;
-                        state.shutdown = set_to.shutdown;
-                        break;
+            let mut set =
+                |zone: PowerZones, boot_v: bool, awake_v: bool, sleep_v: bool, shutdown_v: bool| {
+                    for state in states.states.iter_mut() {
+                        if state.zone == zone {
+                            state.boot = boot_v;
+                            state.awake = awake_v;
+                            state.sleep = sleep_v;
+                            state.shutdown = shutdown_v;
+                            break;
+                        }
                     }
-                }
-            };
+                };
 
             if let Some(cmd) = &power.command {
                 match cmd {
-                    aura_cli::SetAuraZoneEnabled::Keyboard(k) => set(PowerZones::Keyboard, k),
-                    aura_cli::SetAuraZoneEnabled::Logo(l) => set(PowerZones::Logo, l),
-                    aura_cli::SetAuraZoneEnabled::Lightbar(l) => set(PowerZones::Lightbar, l),
-                    aura_cli::SetAuraZoneEnabled::Lid(l) => set(PowerZones::Lid, l),
-                    aura_cli::SetAuraZoneEnabled::RearGlow(r) => set(PowerZones::RearGlow, r),
-                    aura_cli::SetAuraZoneEnabled::Ally(r) => set(PowerZones::Ally, r),
+                    aura_cli::SetAuraZoneEnabled::Keyboard(k) => {
+                        set(PowerZones::Keyboard, k.boot, k.awake, k.sleep, k.shutdown)
+                    }
+                    aura_cli::SetAuraZoneEnabled::Logo(l) => {
+                        set(PowerZones::Logo, l.boot, l.awake, l.sleep, l.shutdown)
+                    }
+                    aura_cli::SetAuraZoneEnabled::Lightbar(l) => {
+                        set(PowerZones::Lightbar, l.boot, l.awake, l.sleep, l.shutdown)
+                    }
+                    aura_cli::SetAuraZoneEnabled::Lid(l) => {
+                        set(PowerZones::Lid, l.boot, l.awake, l.sleep, l.shutdown)
+                    }
+                    aura_cli::SetAuraZoneEnabled::RearGlow(r) => {
+                        set(PowerZones::RearGlow, r.boot, r.awake, r.sleep, r.shutdown)
+                    }
+                    aura_cli::SetAuraZoneEnabled::Ally(r) => {
+                        set(PowerZones::Ally, r.boot, r.awake, r.sleep, r.shutdown)
+                    }
                 }
             }
 
@@ -979,36 +833,37 @@ fn handle_throttle_profile(
         return Err(ProfileError::NotSupported.into());
     }
 
-    if !cmd.next && !cmd.list && cmd.profile_set.is_none() && !cmd.profile_get {
-        if !cmd.help {
-            println!("Missing arg or command\n");
-        }
-        println!("{}", ProfileCommand::usage());
-
-        if let Some(lst) = cmd.self_command_list() {
-            println!("\n{}", lst);
-        }
-        return Ok(());
-    }
-
     let proxy = PlatformProxyBlocking::new(conn)?;
     let current = proxy.platform_profile()?;
     let choices = proxy.platform_profile_choices()?;
 
-    if cmd.next {
-        proxy.set_platform_profile(PlatformProfile::next(current, &choices))?;
-    } else if let Some(profile) = cmd.profile_set {
-        proxy.set_platform_profile(profile)?;
-    }
-
-    if cmd.list {
-        for p in &choices {
-            println!("{:?}", p);
+    match &cmd.command {
+        crate::cli_opts::ProfileSubCommand::Next(_) => {
+            proxy.set_platform_profile(PlatformProfile::next(current, &choices))?;
+        }
+        crate::cli_opts::ProfileSubCommand::Set(s) => {
+            if !s.ac && !s.battery {
+                proxy.set_platform_profile(s.profile)?;
+            } else {
+                if s.ac {
+                    proxy.set_platform_profile_on_ac(s.profile)?;
+                }
+                if s.battery {
+                    proxy.set_platform_profile_on_battery(s.profile)?;
+                }
+            }
+        }
+        crate::cli_opts::ProfileSubCommand::List(_) => {
+            for p in &choices {
+                println!("{:?}", p);
+            }
+        }
+        crate::cli_opts::ProfileSubCommand::Get(_) => {
+            println!("Active profile: {current:?}");
+            println!();
+            println!("AC profile {:?}", proxy.platform_profile_on_ac()?);
+            println!("Battery profile {:?}", proxy.platform_profile_on_battery()?);
         }
-    }
-
-    if cmd.profile_get {
-        println!("Active profile is {current:?}");
     }
 
     Ok(())
@@ -1025,14 +880,7 @@ fn handle_fan_curve(
     };
 
     if !cmd.get_enabled && !cmd.default && cmd.mod_profile.is_none() {
-        if !cmd.help {
-            println!("Missing arg or command\n");
-        }
-        println!("{}", FanCurveCommand::usage());
-
-        if let Some(lst) = cmd.self_command_list() {
-            println!("\n{}", lst);
-        }
+        println!("Missing arg or command; run 'asusctl fan-curve --help' for usage");
         return Ok(());
     }
 
@@ -1169,34 +1017,35 @@ fn print_firmware_attr(attr: &AsusArmouryProxyBlocking) -> Result<(), Box<dyn st
     Ok(())
 }
 
+#[allow(clippy::manual_is_multiple_of, clippy::nonminimal_bool)]
 fn handle_armoury_command(cmd: &ArmouryCommand) -> Result<(), Box<dyn std::error::Error>> {
-    {
-        if cmd.free.is_empty() || !cmd.free.len().is_multiple_of(2) || cmd.help {
-            const USAGE: &str = "Usage: asusctl platform panel_overdrive 1 nv_dynamic_boost 5";
-            if !cmd.free.len().is_multiple_of(2) {
-                println!(
-                    "Incorrect number of args, each attribute label must be paired with a setting:"
-                );
-                println!("{USAGE}");
-                return Ok(());
-            }
-
-            if let Ok(attr) = find_iface::<AsusArmouryProxyBlocking>("xyz.ljones.AsusArmoury") {
-                println!("\n{USAGE}\n");
-                println!("Available firmware attributes: ");
-                for attr in attr.iter() {
+    // If nested subcommand provided, handle set/get/list.
+    match &cmd.command {
+        ArmourySubCommand::List(_) => {
+            if let Ok(attrs) = find_iface::<AsusArmouryProxyBlocking>("xyz.ljones.AsusArmoury") {
+                for attr in attrs.iter() {
                     print_firmware_attr(attr)?;
                 }
             }
-            return Ok(());
+            Ok(())
         }
-
-        if let Ok(attr) = find_iface::<AsusArmouryProxyBlocking>("xyz.ljones.AsusArmoury") {
-            for cmd in cmd.free.chunks(2) {
-                for attr in attr.iter() {
+        ArmourySubCommand::Get(g) => {
+            if let Ok(attrs) = find_iface::<AsusArmouryProxyBlocking>("xyz.ljones.AsusArmoury") {
+                for attr in attrs.iter() {
                     let name = attr.name()?;
-                    if <&str>::from(name) == cmd[0] {
-                        let mut value: i32 = cmd[1].parse()?;
+                    if <&str>::from(name) == g.property {
+                        print_firmware_attr(attr)?;
+                    }
+                }
+            }
+            Ok(())
+        }
+        ArmourySubCommand::Set(s) => {
+            if let Ok(attrs) = find_iface::<AsusArmouryProxyBlocking>("xyz.ljones.AsusArmoury") {
+                for attr in attrs.iter() {
+                    let name = attr.name()?;
+                    if <&str>::from(name) == s.property {
+                        let mut value: i32 = s.value;
                         if value == -1 {
                             info!("Setting to default");
                             value = attr.default_value()?;
@@ -1206,7 +1055,7 @@ fn handle_armoury_command(cmd: &ArmouryCommand) -> Result<(), Box<dyn std::error
                     }
                 }
             }
+            Ok(())
         }
     }
-    Ok(())
 }

asusctl/src/scsi_cli.rs

@@ -1,35 +1,30 @@
-use gumdrop::Options;
+use argh::FromArgs;
 use rog_scsi::{AuraMode, Colour, Direction, Speed};
 
-#[derive(Options)]
+#[derive(FromArgs, Debug)]
+#[argh(subcommand, name = "scsi", description = "scsi LED commands")]
 pub struct ScsiCommand {
-    #[options(help = "print help message")]
-    pub help: bool,
-
-    #[options(help = "Enable the SCSI drive LEDs")]
+    #[argh(option, description = "enable the SCSI drive LEDs")]
     pub enable: Option<bool>,
 
-    #[options(meta = "", help = "Set LED mode (so 'list' for all options)")]
+    #[argh(option, description = "set LED mode (use 'list' for all options)")]
     pub mode: Option<AuraMode>,
 
-    #[options(
-        meta = "",
-        help = "Set LED mode speed <slowest, slow, med, fast, fastest> (does not apply to all)"
+    #[argh(
+        option,
+        description = "set LED mode speed <slowest, slow, med, fast, fastest>"
     )]
     pub speed: Option<Speed>,
 
-    #[options(
-        meta = "",
-        help = "Set LED mode direction <forward, reverse> (does not apply to all)"
-    )]
+    #[argh(option, description = "set LED mode direction <forward, reverse>")]
     pub direction: Option<Direction>,
 
-    #[options(
-        meta = "",
-        help = "Set LED colours <hex>, specify up to 4 with repeated arg"
+    #[argh(
+        option,
+        description = "set LED colours <hex>, specify up to 4 with repeated arg"
     )]
     pub colours: Vec<Colour>,
 
-    #[options(help = "list available animations")]
+    #[argh(switch, description = "list available animations")]
     pub list: bool,
 }

asusctl/src/slash_cli.rs

@@ -1,37 +1,34 @@
-use gumdrop::Options;
+use argh::FromArgs;
 use rog_slash::SlashMode;
 
-#[derive(Options)]
+#[derive(FromArgs, Debug)]
+#[argh(subcommand, name = "slash", description = "slash ledbar commands")]
 pub struct SlashCommand {
-    #[options(help = "print help message")]
-    pub help: bool,
-    #[options(help = "Enable the Slash Ledbar")]
+    #[argh(switch, description = "enable the Slash Ledbar")]
     pub enable: bool,
-    #[options(help = "Disable the Slash Ledbar")]
+    #[argh(switch, description = "disable the Slash Ledbar")]
     pub disable: bool,
-    #[options(short = "l", meta = "", help = "Set brightness value <0-255>")]
+    #[argh(option, short = 'l', description = "set brightness value <0-255>")]
     pub brightness: Option<u8>,
-    #[options(meta = "", help = "Set interval value <0-5>")]
+    #[argh(option, description = "set interval value <0-5>")]
     pub interval: Option<u8>,
-    #[options(meta = "", help = "Set SlashMode (so 'list' for all options)")]
+    #[argh(option, description = "set SlashMode (use 'list' for options)")]
     pub mode: Option<SlashMode>,
-    #[options(help = "list available animations")]
+    #[argh(switch, description = "list available animations")]
     pub list: bool,
 
-    #[options(short = "B", meta = "", help = "Show the animation on boot")]
+    #[argh(option, short = 'B', description = "show the animation on boot")]
     pub show_on_boot: Option<bool>,
-    #[options(short = "S", meta = "", help = "Show the animation on shutdown")]
+    #[argh(option, short = 'S', description = "show the animation on shutdown")]
     pub show_on_shutdown: Option<bool>,
-    #[options(short = "s", meta = "", help = "Show the animation on sleep")]
+    #[argh(option, short = 's', description = "show the animation on sleep")]
     pub show_on_sleep: Option<bool>,
-    #[options(short = "b", meta = "", help = "Show the animation on battery")]
+    #[argh(option, short = 'b', description = "show the animation on battery")]
     pub show_on_battery: Option<bool>,
-    // #[options(short = "L", meta = "", help = "Show the animation on lid closed")]
-    // pub show_on_lid_closed: Option<bool>,
-    #[options(
-        short = "w",
-        meta = "",
-        help = "Show the low-battery warning animation"
+    #[argh(
+        option,
+        short = 'w',
+        description = "show the low-battery warning animation"
     )]
     pub show_battery_warning: Option<bool>,
 }

asusd/src/asus_armoury.rs

@@ -1,12 +1,12 @@
 use std::sync::Arc;
 
 use config_traits::StdConfig;
-use futures_util::lock::Mutex;
-use log::{debug, error, info};
+use log::{debug, error, info, warn};
 use rog_platform::asus_armoury::{AttrValue, Attribute, FirmwareAttribute, FirmwareAttributes};
 use rog_platform::platform::{PlatformProfile, RogPlatform};
 use rog_platform::power::AsusPower;
 use serde::{Deserialize, Serialize};
+use tokio::sync::Mutex;
 use zbus::object_server::SignalEmitter;
 use zbus::zvariant::{ObjectPath, OwnedObjectPath, OwnedValue, Type, Value};
 use zbus::{fdo, interface, Connection};
@@ -170,7 +170,9 @@ impl crate::Reloadable for AsusArmouryAttribute {
         info!("Reloading {}", self.attr.name());
         let name: FirmwareAttribute = self.attr.name().into();
 
-        if name.is_ppt() {
+        // Treat dGPU attributes the same as PPT attributes for power-profile
+        // behaviour so they follow AC/DC tuning groups.
+        if name.is_ppt() || name.is_dgpu() {
             let profile: PlatformProfile = self.platform.get_platform_profile()?.into();
             let power_plugged = self
                 .power
@@ -203,7 +205,13 @@ impl crate::Reloadable for AsusArmouryAttribute {
                         self.attr.base_path_exists();
                         e
                     })?;
-                info!("Set {} to {:?}", self.attr.name(), tune);
+                info!(
+                    "Restored PPT armoury setting {} to {:?}",
+                    self.attr.name(),
+                    tune
+                );
+            } else {
+                info!("Ignored restoring PPT armoury setting {} as tuning group is disabled or no saved value", self.attr.name());
             }
         } else {
             // Handle non-PPT attributes (boolean and other settings)
@@ -211,7 +219,10 @@ impl crate::Reloadable for AsusArmouryAttribute {
                 self.attr
                     .set_current_value(&AttrValue::Integer(*saved_value))
                     .map_err(|e| {
-                        error!("Could not set {} value: {e:?}", self.attr.name());
+                        error!(
+                            "Error restoring armoury setting {}: {e:?}",
+                            self.attr.name()
+                        );
                         self.attr.base_path_exists();
                         e
                     })?;
@@ -220,6 +231,11 @@ impl crate::Reloadable for AsusArmouryAttribute {
                     self.attr.name(),
                     saved_value
                 );
+            } else {
+                info!(
+                    "No saved armoury setting for {}: skipping restore",
+                    self.attr.name()
+                );
             }
         }
 
@@ -277,7 +293,7 @@ impl AsusArmouryAttribute {
 
     async fn restore_default(&self) -> fdo::Result<()> {
         self.attr.restore_default()?;
-        if self.name().is_ppt() {
+        if self.name().is_ppt() || self.name().is_dgpu() {
             let profile: PlatformProfile = self.platform.get_platform_profile()?.into();
             let power_plugged = self
                 .power
@@ -336,7 +352,7 @@ impl AsusArmouryAttribute {
 
     #[zbus(property)]
     async fn current_value(&self) -> fdo::Result<i32> {
-        if self.name().is_ppt() {
+        if self.name().is_ppt() || self.name().is_dgpu() {
             let profile: PlatformProfile = self.platform.get_platform_profile()?.into();
             let power_plugged = self
                 .power
@@ -369,86 +385,9 @@ impl AsusArmouryAttribute {
         ))
     }
 
-    async fn stored_value_for_power(&self, on_ac: bool) -> fdo::Result<i32> {
-        if !self.name().is_ppt() {
-            return Err(fdo::Error::NotSupported(
-                "Stored values are only available for PPT attributes".to_string(),
-            ));
-        }
-
-        let profile: PlatformProfile = self.platform.get_platform_profile()?.into();
-        let config = self.config.lock().await;
-        if let Some(tuning) = config.select_tunings_ref(on_ac, profile) {
-            if let Some(tune) = tuning.group.get(&self.name()) {
-                return Ok(*tune);
-            }
-        }
-
-        if let AttrValue::Integer(i) = self.attr.default_value() {
-            return Ok(*i);
-        }
-        Err(fdo::Error::Failed(
-            "Could not read stored value".to_string(),
-        ))
-    }
-
-    async fn set_value_for_power(&mut self, on_ac: bool, value: i32) -> fdo::Result<()> {
-        if !self.name().is_ppt() {
-            return Err(fdo::Error::NotSupported(
-                "Setting stored values is only supported for PPT attributes".to_string(),
-            ));
-        }
-
-        let profile: PlatformProfile = self.platform.get_platform_profile()?.into();
-        let apply_now;
-
-        {
-            let mut config = self.config.lock().await;
-            let tuning = config.select_tunings(on_ac, profile);
-
-            if let Some(tune) = tuning.group.get_mut(&self.name()) {
-                *tune = value;
-            } else {
-                tuning.group.insert(self.name(), value);
-                debug!(
-                    "Store {} value for {} power = {}",
-                    self.attr.name(),
-                    if on_ac { "AC" } else { "DC" },
-                    value
-                );
-            }
-
-            apply_now = tuning.enabled;
-            config.write();
-        }
-
-        if apply_now {
-            let power_plugged = self
-                .power
-                .get_online()
-                .map_err(|e| {
-                    error!("Could not get power status: {e:?}");
-                    e
-                })
-                .unwrap_or_default()
-                != 0;
-
-            if power_plugged == on_ac {
-                self.attr
-                    .set_current_value(&AttrValue::Integer(value))
-                    .map_err(|e| {
-                        error!("Could not set value: {e:?}");
-                        e
-                    })?;
-            }
-        }
-
-        Ok(())
-    }
-
     #[zbus(property)]
     async fn set_current_value(&mut self, value: i32) -> fdo::Result<()> {
-        if self.name().is_ppt() {
+        if self.name().is_ppt() || self.name().is_dgpu() {
             let profile: PlatformProfile = self.platform.get_platform_profile()?.into();
             let power_plugged = self
                 .power
@@ -472,44 +411,44 @@ impl AsusArmouryAttribute {
                 self.attr
                     .set_current_value(&AttrValue::Integer(value))
                     .map_err(|e| {
-                        error!("Could not set value: {e:?}");
+                        error!(
+                            "Could not set value to PPT property {}: {e:?}",
+                            self.attr.name()
+                        );
                         e
                     })?;
+            } else {
+                warn!(
+                    "Tuning group is disabled: skipping setting value to PPT property {}",
+                    self.attr.name()
+                );
             }
         } else {
             self.attr
                 .set_current_value(&AttrValue::Integer(value))
                 .map_err(|e| {
-                    error!("Could not set value: {e:?}");
+                    error!(
+                        "Could not set value {value} to attribute {}: {e:?}",
+                        self.attr.name()
+                    );
                     e
                 })?;
 
-            let has_attr = self
-                .config
-                .lock()
-                .await
+            let mut settings = self.config.lock().await;
+            settings
                 .armoury_settings
-                .contains_key(&self.name());
-            if has_attr {
-                if let Some(setting) = self
-                    .config
-                    .lock()
-                    .await
-                    .armoury_settings
-                    .get_mut(&self.name())
-                {
-                    *setting = value
-                }
-            } else {
-                debug!("Adding config for {}", self.attr.name());
-                self.config
-                    .lock()
-                    .await
-                    .armoury_settings
-                    .insert(self.name(), value);
-                debug!("Set config for {} = {:?}", self.attr.name(), value);
-            }
+                .entry(self.name())
+                .and_modify(|setting| {
+                    debug!("Set config for {} = {value}", self.attr.name());
+                    *setting = value;
+                })
+                .or_insert_with(|| {
+                    debug!("Adding config for {} = {value}", self.attr.name());
+                    value
+                });
         }
+
+        // write config after setting value
         self.config.lock().await.write();
         Ok(())
     }
@@ -538,8 +477,7 @@ pub async fn start_attributes_zbus(
                 "Skipping attribute '{}' due to reload error: {e:?}",
                 attr.attr.name()
             );
-            // continue with others
-            continue;
+            break;
         }
 
         let attr_name = attr.attribute_name();
@@ -577,7 +515,7 @@ pub async fn set_config_or_default(
 ) {
     for attr in attrs.attributes().iter() {
         let name: FirmwareAttribute = attr.name().into();
-        if name.is_ppt() {
+        if name.is_ppt() || name.is_dgpu() {
             let tuning = config.select_tunings(power_plugged, profile);
             if !tuning.enabled {
                 debug!("Tuning group is not enabled, skipping");

asusd/src/aura_anime/mod.rs

@@ -8,7 +8,6 @@ use std::sync::Arc;
 use std::thread::sleep;
 
 use config_traits::StdConfig;
-use futures_util::lock::Mutex;
 use log::{debug, error, info, warn};
 use rog_anime::usb::{
     pkt_flush, pkt_set_brightness, pkt_set_enable_display, pkt_set_enable_powersave_anim,
@@ -17,6 +16,7 @@ use rog_anime::usb::{
 use rog_anime::{ActionData, AnimeDataBuffer, AnimePacketType};
 use rog_platform::hid_raw::HidRaw;
 use rog_platform::usb_raw::USBRaw;
+use tokio::sync::Mutex;
 
 use self::config::{AniMeConfig, AniMeConfigCached};
 use crate::error::RogError;
@@ -51,7 +51,7 @@ impl AniMe {
 
     /// Will fail if something is already holding the config lock
     async fn do_init_cache(&mut self) {
-        if let Some(mut config) = self.config.try_lock() {
+        if let Ok(mut config) = self.config.try_lock() {
             if let Err(e) = self.cache.init_from_config(&config, config.anime_type) {
                 error!(
                     "Trying to cache the Anime Config failed, will reset to default config: {e:?}"

asusd/src/aura_anime/trait_impls.rs

@@ -85,7 +85,7 @@ impl AniMeZbus {
     /// Set base brightness level
     #[zbus(property)]
     async fn brightness(&self) -> Brightness {
-        if let Some(config) = self.0.config.try_lock() {
+        if let Ok(config) = self.0.config.try_lock() {
             return config.display_brightness;
         }
         Brightness::Off
@@ -117,7 +117,7 @@ impl AniMeZbus {
 
     #[zbus(property)]
     async fn builtins_enabled(&self) -> bool {
-        if let Some(config) = self.0.config.try_lock() {
+        if let Ok(config) = self.0.config.try_lock() {
             return config.builtin_anims_enabled;
         }
         false
@@ -162,7 +162,7 @@ impl AniMeZbus {
 
     #[zbus(property)]
     async fn builtin_animations(&self) -> Animations {
-        if let Some(config) = self.0.config.try_lock() {
+        if let Ok(config) = self.0.config.try_lock() {
             return config.builtin_anims;
         }
         Animations::default()
@@ -195,7 +195,7 @@ impl AniMeZbus {
 
     #[zbus(property)]
     async fn enable_display(&self) -> bool {
-        if let Some(config) = self.0.config.try_lock() {
+        if let Ok(config) = self.0.config.try_lock() {
             return config.display_enabled;
         }
         false
@@ -218,7 +218,7 @@ impl AniMeZbus {
 
     #[zbus(property)]
     async fn off_when_unplugged(&self) -> bool {
-        if let Some(config) = self.0.config.try_lock() {
+        if let Ok(config) = self.0.config.try_lock() {
             return config.off_when_unplugged;
         }
         false
@@ -245,7 +245,7 @@ impl AniMeZbus {
 
     #[zbus(property)]
     async fn off_when_suspended(&self) -> bool {
-        if let Some(config) = self.0.config.try_lock() {
+        if let Ok(config) = self.0.config.try_lock() {
             return config.off_when_suspended;
         }
         false
@@ -261,7 +261,7 @@ impl AniMeZbus {
 
     #[zbus(property)]
     async fn off_when_lid_closed(&self) -> bool {
-        if let Some(config) = self.0.config.try_lock() {
+        if let Ok(config) = self.0.config.try_lock() {
             return config.off_when_lid_closed;
         }
         false

asusd/src/aura_laptop/config.rs

@@ -231,6 +231,8 @@ impl AuraConfig {
 
 #[cfg(test)]
 mod tests {
+    use std::sync::{Mutex, MutexGuard, OnceLock};
+
     use rog_aura::keyboard::AuraPowerState;
     use rog_aura::{
         AuraEffect, AuraModeNum, AuraZone, Colour, Direction, LedBrightness, PowerZones, Speed,
@@ -238,8 +240,20 @@ mod tests {
 
     use super::AuraConfig;
 
+    // Global mutex to serialize tests that rely on process-wide environment
+    // variables
+    static TEST_MUTEX: OnceLock<Mutex<()>> = OnceLock::new();
+
+    fn test_lock() -> MutexGuard<'static, ()> {
+        TEST_MUTEX
+            .get_or_init(|| Mutex::new(()))
+            .lock()
+            .expect("TEST_MUTEX poisoned")
+    }
+
     #[test]
     fn set_multizone_4key_config() {
+        let _guard = test_lock();
         std::env::set_var("BOARD_NAME", "");
         let mut config = AuraConfig::new("19b6");
 
@@ -295,30 +309,43 @@ mod tests {
         let res = config.multizone.unwrap();
         let sta = res.get(&AuraModeNum::Static).unwrap();
         assert_eq!(sta.len(), 4);
-        assert_eq!(sta[0].colour1, Colour {
-            r: 0xff,
-            g: 0x00,
-            b: 0xff
-        });
-        assert_eq!(sta[1].colour1, Colour {
-            r: 0x00,
-            g: 0xff,
-            b: 0xff
-        });
-        assert_eq!(sta[2].colour1, Colour {
-            r: 0xff,
-            g: 0xff,
-            b: 0x00
-        });
-        assert_eq!(sta[3].colour1, Colour {
-            r: 0x00,
-            g: 0xff,
-            b: 0x00
-        });
+        assert_eq!(
+            sta[0].colour1,
+            Colour {
+                r: 0xff,
+                g: 0x00,
+                b: 0xff
+            }
+        );
+        assert_eq!(
+            sta[1].colour1,
+            Colour {
+                r: 0x00,
+                g: 0xff,
+                b: 0xff
+            }
+        );
+        assert_eq!(
+            sta[2].colour1,
+            Colour {
+                r: 0xff,
+                g: 0xff,
+                b: 0x00
+            }
+        );
+        assert_eq!(
+            sta[3].colour1,
+            Colour {
+                r: 0x00,
+                g: 0xff,
+                b: 0x00
+            }
+        );
     }
 
     #[test]
     fn set_multizone_multimode_config() {
+        let _guard = test_lock();
         std::env::set_var("BOARD_NAME", "");
         let mut config = AuraConfig::new("19b6");
 
@@ -367,51 +394,65 @@ mod tests {
 
     #[test]
     fn verify_0x1866_g531i() {
+        let _guard = test_lock();
         std::env::set_var("BOARD_NAME", "G513I");
         let mut config = AuraConfig::new("1866");
 
         assert_eq!(config.brightness, LedBrightness::Med);
         assert_eq!(config.builtins.len(), 5);
-        assert_eq!(config.builtins.first_entry().unwrap().get(), &AuraEffect {
-            mode: AuraModeNum::Static,
-            zone: AuraZone::None,
-            colour1: Colour { r: 166, g: 0, b: 0 },
-            colour2: Colour { r: 0, g: 0, b: 0 },
-            speed: Speed::Med,
-            direction: Direction::Right
-        });
+        assert_eq!(
+            config.builtins.first_entry().unwrap().get(),
+            &AuraEffect {
+                mode: AuraModeNum::Static,
+                zone: AuraZone::None,
+                colour1: Colour { r: 166, g: 0, b: 0 },
+                colour2: Colour { r: 0, g: 0, b: 0 },
+                speed: Speed::Med,
+                direction: Direction::Right
+            }
+        );
         assert_eq!(config.enabled.states.len(), 1);
-        assert_eq!(config.enabled.states[0], AuraPowerState {
-            zone: PowerZones::KeyboardAndLightbar,
-            boot: true,
-            awake: true,
-            sleep: true,
-            shutdown: true
-        });
+        assert_eq!(
+            config.enabled.states[0],
+            AuraPowerState {
+                zone: PowerZones::KeyboardAndLightbar,
+                boot: true,
+                awake: true,
+                sleep: true,
+                shutdown: true
+            }
+        );
     }
 
     #[test]
     fn verify_0x19b6_g634j() {
+        let _guard = test_lock();
         std::env::set_var("BOARD_NAME", "G634J");
         let mut config = AuraConfig::new("19b6");
 
         assert_eq!(config.brightness, LedBrightness::Med);
         assert_eq!(config.builtins.len(), 12);
-        assert_eq!(config.builtins.first_entry().unwrap().get(), &AuraEffect {
-            mode: AuraModeNum::Static,
-            zone: AuraZone::None,
-            colour1: Colour { r: 166, g: 0, b: 0 },
-            colour2: Colour { r: 0, g: 0, b: 0 },
-            speed: Speed::Med,
-            direction: Direction::Right
-        });
+        assert_eq!(
+            config.builtins.first_entry().unwrap().get(),
+            &AuraEffect {
+                mode: AuraModeNum::Static,
+                zone: AuraZone::None,
+                colour1: Colour { r: 166, g: 0, b: 0 },
+                colour2: Colour { r: 0, g: 0, b: 0 },
+                speed: Speed::Med,
+                direction: Direction::Right
+            }
+        );
         assert_eq!(config.enabled.states.len(), 4);
-        assert_eq!(config.enabled.states[0], AuraPowerState {
-            zone: PowerZones::Keyboard,
-            boot: true,
-            awake: true,
-            sleep: true,
-            shutdown: true
-        });
+        assert_eq!(
+            config.enabled.states[0],
+            AuraPowerState {
+                zone: PowerZones::Keyboard,
+                boot: true,
+                awake: true,
+                sleep: true,
+                shutdown: true
+            }
+        );
     }
 }

asusd/src/aura_laptop/mod.rs

@@ -2,13 +2,13 @@ use std::sync::Arc;
 
 use config::AuraConfig;
 use config_traits::StdConfig;
-use futures_util::lock::{Mutex, MutexGuard};
 use log::info;
 use rog_aura::keyboard::{AuraLaptopUsbPackets, LedUsbPackets};
 use rog_aura::usb::{AURA_LAPTOP_LED_APPLY, AURA_LAPTOP_LED_SET};
 use rog_aura::{AuraDeviceType, AuraEffect, LedBrightness, PowerZones, AURA_LAPTOP_LED_MSG_LEN};
 use rog_platform::hid_raw::HidRaw;
 use rog_platform::keyboard_led::KeyboardBacklight;
+use tokio::sync::{Mutex, MutexGuard};
 
 use crate::error::RogError;
 

asusd/src/aura_laptop/trait_impls.rs

@@ -71,7 +71,13 @@ impl AuraZbus {
     #[zbus(property)]
     async fn set_brightness(&mut self, brightness: LedBrightness) -> Result<(), ZbErr> {
         if let Some(bl) = self.0.backlight.as_ref() {
-            return Ok(bl.lock().await.set_brightness(brightness.into())?);
+            let res = bl.lock().await.set_brightness(brightness.into());
+            if res.is_ok() {
+                let mut config = self.0.config.lock().await;
+                config.brightness = brightness;
+                config.write();
+            }
+            return Ok(res?);
         }
         Err(ZbErr::Failed("No sysfs brightness control".to_string()))
     }
@@ -112,7 +118,7 @@ impl AuraZbus {
         // entirely possible to deadlock here, so use try instead of lock()
         // let ctrl = self.0.lock().await;
         // Ok(config.current_mode)
-        if let Some(config) = self.0.config.try_lock() {
+        if let Ok(config) = self.0.config.try_lock() {
             Ok(config.current_mode)
         } else {
             Err(ZbErr::Failed("Aura control couldn't lock self".to_string()))
@@ -140,7 +146,7 @@ impl AuraZbus {
     #[zbus(property)]
     async fn led_mode_data(&self) -> Result<AuraEffect, ZbErr> {
         // entirely possible to deadlock here, so use try instead of lock()
-        if let Some(config) = self.0.config.try_lock() {
+        if let Ok(config) = self.0.config.try_lock() {
             let mode = config.current_mode;
             match config.builtins.get(&mode) {
                 Some(effect) => Ok(effect.clone()),

asusd/src/aura_manager.rs

@@ -4,15 +4,16 @@
 // - Add it to Zbus server
 // - If udev sees device removed then remove the zbus path
 
+use std::collections::HashMap;
 use std::sync::Arc;
 
 use dmi_id::DMIID;
 use futures_lite::future::block_on;
-use futures_util::lock::Mutex;
 use log::{debug, error, info, warn};
 use mio::{Events, Interest, Poll, Token};
 use rog_platform::error::PlatformError;
 use rog_platform::hid_raw::HidRaw;
+use tokio::sync::Mutex;
 use udev::{Device, MonitorBuilder};
 use zbus::zvariant::{ObjectPath, OwnedObjectPath};
 use zbus::Connection;
@@ -92,23 +93,46 @@ fn dev_prop_matches(dev: &Device, prop: &str, value: &str) -> bool {
 pub struct AsusDevice {
     device: DeviceHandle,
     dbus_path: OwnedObjectPath,
+    hid_key: Option<String>,
 }
 
 pub struct DeviceManager {
     _dbus_connection: Connection,
+    _hid_handles: Arc<Mutex<HashMap<String, Arc<Mutex<HidRaw>>>>>,
 }
 
 impl DeviceManager {
+    #[allow(clippy::type_complexity)]
+    async fn get_or_create_hid_handle(
+        handles: &Arc<Mutex<HashMap<String, Arc<Mutex<HidRaw>>>>>,
+        endpoint: &Device,
+    ) -> Result<(Arc<Mutex<HidRaw>>, String), RogError> {
+        let dev_node = endpoint
+            .devnode()
+            .ok_or_else(|| RogError::MissingFunction("hidraw devnode missing".to_string()))?;
+        let key = dev_node.to_string_lossy().to_string();
+
+        if let Some(existing) = handles.lock().await.get(&key).cloned() {
+            return Ok((existing, key));
+        }
+
+        let hidraw = HidRaw::from_device(endpoint.clone())?;
+        let handle = Arc::new(Mutex::new(hidraw));
+        handles.lock().await.insert(key.clone(), handle.clone());
+        Ok((handle, key))
+    }
+
     async fn init_hid_devices(
         connection: &Connection,
         device: Device,
+        handles: Arc<Mutex<HashMap<String, Arc<Mutex<HidRaw>>>>>,
     ) -> Result<Vec<AsusDevice>, RogError> {
         let mut devices = Vec::new();
         if let Some(usb_device) = device.parent_with_subsystem_devtype("usb", "usb_device")? {
             if let Some(usb_id) = usb_device.attribute_value("idProduct") {
                 if let Some(vendor_id) = usb_device.attribute_value("idVendor") {
                     if vendor_id != "0b05" {
-                        debug!("Not ASUS vendor ID");
+                        debug!("Not ASUS vendor ID: {}", vendor_id.to_string_lossy());
                         return Ok(devices);
                     }
                     // Almost all devices are identified by the productId.
@@ -116,9 +140,10 @@ impl DeviceManager {
                     // 1. Generate an interface path
                     // 2. Create the device
                     // Use the top-level endpoint, not the parent
-                    if let Ok(hidraw) = HidRaw::from_device(device) {
+                    if let Ok((dev, hid_key)) =
+                        Self::get_or_create_hid_handle(&handles, &device).await
+                    {
                         debug!("Testing device {usb_id:?}");
-                        let dev = Arc::new(Mutex::new(hidraw));
                         // SLASH DEVICE
                         if let Ok(dev_type) = DeviceHandle::new_slash_hid(
                             dev.clone(),
@@ -134,6 +159,7 @@ impl DeviceManager {
                                 devices.push(AsusDevice {
                                     device: dev_type,
                                     dbus_path: path,
+                                    hid_key: Some(hid_key.clone()),
                                 });
                             }
                         }
@@ -152,6 +178,7 @@ impl DeviceManager {
                                 devices.push(AsusDevice {
                                     device: dev_type,
                                     dbus_path: path,
+                                    hid_key: Some(hid_key.clone()),
                                 });
                             }
                         }
@@ -170,9 +197,12 @@ impl DeviceManager {
                                 devices.push(AsusDevice {
                                     device: dev_type,
                                     dbus_path: path,
+                                    hid_key: Some(hid_key),
                                 });
                             }
                         }
+                    } else {
+                        warn!("Failed to initialise shared hid handle for {usb_id:?}");
                     }
                 }
             }
@@ -181,7 +211,10 @@ impl DeviceManager {
     }
 
     /// To be called on daemon startup
-    async fn init_all_hid(connection: &Connection) -> Result<Vec<AsusDevice>, RogError> {
+    async fn init_all_hid(
+        connection: &Connection,
+        handles: Arc<Mutex<HashMap<String, Arc<Mutex<HidRaw>>>>>,
+    ) -> Result<Vec<AsusDevice>, RogError> {
         // track and ensure we use only one hidraw per prod_id
         // let mut interfaces = HashSet::new();
         let mut devices: Vec<AsusDevice> = Vec::new();
@@ -200,7 +233,7 @@ impl DeviceManager {
             .scan_devices()
             .map_err(|e| PlatformError::IoPath("enumerator".to_owned(), e))?
         {
-            devices.append(&mut Self::init_hid_devices(connection, device).await?);
+            devices.append(&mut Self::init_hid_devices(connection, device, handles.clone()).await?);
         }
 
         Ok(devices)
@@ -228,6 +261,7 @@ impl DeviceManager {
                         return Some(AsusDevice {
                             device: dev_type,
                             dbus_path: path,
+                            hid_key: None,
                         });
                     }
                 }
@@ -275,10 +309,13 @@ impl DeviceManager {
         Ok(devices)
     }
 
-    pub async fn find_all_devices(connection: &Connection) -> Vec<AsusDevice> {
+    pub async fn find_all_devices(
+        connection: &Connection,
+        handles: Arc<Mutex<HashMap<String, Arc<Mutex<HidRaw>>>>>,
+    ) -> Vec<AsusDevice> {
         let mut devices: Vec<AsusDevice> = Vec::new();
         // HID first, always
-        if let Ok(devs) = &mut Self::init_all_hid(connection).await {
+        if let Ok(devs) = &mut Self::init_all_hid(connection, handles.clone()).await {
             devices.append(devs);
         }
         // USB after, need to check if HID picked something up and if so, skip it
@@ -306,6 +343,7 @@ impl DeviceManager {
                     devices.push(AsusDevice {
                         device: dev_type,
                         dbus_path: path,
+                        hid_key: None,
                     });
                 }
             } else {
@@ -328,6 +366,7 @@ impl DeviceManager {
                         devices.push(AsusDevice {
                             device: dev_type,
                             dbus_path: path,
+                            hid_key: None,
                         });
                     }
                 }
@@ -355,6 +394,7 @@ impl DeviceManager {
                         devices.push(AsusDevice {
                             device: dev_type,
                             dbus_path: path,
+                            hid_key: None,
                         });
                     }
                 }
@@ -370,16 +410,19 @@ impl DeviceManager {
 
     pub async fn new(connection: Connection) -> Result<Self, RogError> {
         let conn_copy = connection.clone();
-        let devices = Self::find_all_devices(&conn_copy).await;
+        let hid_handles = Arc::new(Mutex::new(HashMap::new()));
+        let devices = Self::find_all_devices(&conn_copy, hid_handles.clone()).await;
         info!("Found {} valid devices on startup", devices.len());
         let devices = Arc::new(Mutex::new(devices));
         let manager = Self {
             _dbus_connection: connection,
+            _hid_handles: hid_handles.clone(),
         };
 
         // TODO: The /sysfs/ LEDs don't cause events, so they need to be manually
         // checked for and added
 
+        let hid_handles_thread = hid_handles.clone();
         std::thread::spawn(move || {
             let mut monitor = MonitorBuilder::new()?.listen()?;
             let mut poll = Poll::new()?;
@@ -408,6 +451,7 @@ impl DeviceManager {
 
                     let devices = devices.clone();
                     let conn_copy = conn_copy.clone();
+                    let hid_handles = hid_handles_thread.clone();
                     block_on(async move {
                         // SCSCI devs
                         if subsys == "block" {
@@ -483,6 +527,7 @@ impl DeviceManager {
                                         // Iter in reverse so as to not screw up indexing
                                         for index in removals.iter().rev() {
                                             let dev = devices.lock().await.remove(*index);
+                                            let hid_key = dev.hid_key.clone();
                                             let path = path.clone();
                                             let res = match dev.device {
                                                 DeviceHandle::Aura(_) => {
@@ -512,14 +557,20 @@ impl DeviceManager {
                                                 _ => todo!(),
                                             };
                                             info!("AuraManager removed: {path:?}, {res}");
+                                            if let Some(key) = hid_key {
+                                                hid_handles.lock().await.remove(&key);
+                                            }
                                         }
                                     }
                                 } else if action == "add" {
                                     let evdev = event.device();
-                                    if let Ok(mut new_devs) =
-                                        Self::init_hid_devices(&conn_copy, evdev)
-                                            .await
-                                            .map_err(|e| error!("Couldn't add new device: {e:?}"))
+                                    if let Ok(mut new_devs) = Self::init_hid_devices(
+                                        &conn_copy,
+                                        evdev,
+                                        hid_handles.clone(),
+                                    )
+                                    .await
+                                    .map_err(|e| error!("Couldn't add new device: {e:?}"))
                                     {
                                         devices.lock().await.append(&mut new_devs);
                                     }

asusd/src/aura_scsi/mod.rs

@@ -1,8 +1,8 @@
 use std::sync::Arc;
 
 use config::ScsiConfig;
-use futures_util::lock::{Mutex, MutexGuard};
 use rog_scsi::{AuraEffect, Device, Task};
+use tokio::sync::{Mutex, MutexGuard};
 
 use crate::error::RogError;
 

asusd/src/aura_scsi/trait_impls.rs

@@ -83,7 +83,7 @@ impl ScsiZbus {
     #[zbus(property)]
     async fn led_mode_data(&self) -> Result<AuraEffect, ZbErr> {
         // entirely possible to deadlock here, so use try instead of lock()
-        if let Some(config) = self.0.config.try_lock() {
+        if let Ok(config) = self.0.config.try_lock() {
             let mode = config.current_mode;
             match config.modes.get(&mode) {
                 Some(effect) => Ok(effect.clone()),

asusd/src/aura_slash/mod.rs

@@ -1,10 +1,10 @@
 use std::sync::Arc;
 
 use config::SlashConfig;
-use futures_util::lock::{Mutex, MutexGuard};
 use rog_platform::hid_raw::HidRaw;
 use rog_platform::usb_raw::USBRaw;
 use rog_slash::usb::{slash_pkt_enable, slash_pkt_init, slash_pkt_options, slash_pkt_set_mode};
+use tokio::sync::{Mutex, MutexGuard};
 
 use crate::error::RogError;
 

asusd/src/aura_types.rs

@@ -1,7 +1,6 @@
 use std::sync::Arc;
 
 use config_traits::{StdConfig, StdConfigLoad};
-use futures_util::lock::Mutex;
 use log::{debug, error, info};
 use rog_anime::error::AnimeError;
 use rog_anime::usb::get_anime_type;
@@ -13,6 +12,7 @@ use rog_platform::usb_raw::USBRaw;
 use rog_scsi::{open_device, ScsiType};
 use rog_slash::error::SlashError;
 use rog_slash::SlashType;
+use tokio::sync::Mutex;
 
 use crate::aura_anime::config::AniMeConfig;
 use crate::aura_anime::AniMe;

asusd/src/config.rs

@@ -8,6 +8,12 @@ use serde::{Deserialize, Serialize};
 
 const CONFIG_FILE: &str = "asusd.ron";
 
+/// Default value for base_charge_control_end_threshold when not present in config.
+/// Returns 0 so restore_charge_limit() skips restoration for upgraded configs.
+fn default_base_charge_limit() -> u8 {
+    0
+}
+
 #[derive(Default, Clone, Deserialize, Serialize, PartialEq)]
 pub struct Tuning {
     pub enabled: bool,
@@ -19,8 +25,8 @@ type Tunings = HashMap<PlatformProfile, Tuning>;
 pub struct Config {
     // The current charge limit applied
     pub charge_control_end_threshold: u8,
-    /// Save charge limit for restoring
-    #[serde(skip)]
+    /// Save charge limit for restoring after one-shot full charge
+    #[serde(default = "default_base_charge_limit")]
     pub base_charge_control_end_threshold: u8,
     pub disable_nvidia_powerd_on_battery: bool,
     /// An optional command/script to run when power is changed to AC
@@ -86,6 +92,9 @@ impl Default for Config {
     fn default() -> Self {
         Self {
             charge_control_end_threshold: 100,
+            // NOTE: This is intentionally 100 (not 0 like the serde default).
+            // New installs get 100 (no limit). Upgraded configs missing this
+            // field get 0 via serde, which skips restore_charge_limit().
             base_charge_control_end_threshold: 100,
             disable_nvidia_powerd_on_battery: true,
             ac_command: Default::default(),

asusd/src/ctrl_backlight.rs

@@ -2,9 +2,9 @@ use std::sync::Arc;
 use std::time::Duration;
 
 use config_traits::StdConfig;
-use futures_util::lock::Mutex;
 use log::{info, warn};
 use rog_platform::backlight::{Backlight, BacklightType};
+use tokio::sync::Mutex;
 use zbus::fdo::Error as FdoErr;
 use zbus::object_server::SignalEmitter;
 use zbus::{interface, Connection};
@@ -13,7 +13,7 @@ use crate::config::Config;
 use crate::error::RogError;
 use crate::ASUS_ZBUS_PATH;
 
-#[derive(Debug, Clone)]
+#[derive(Clone)]
 pub struct CtrlBacklight {
     backlights: Vec<Backlight>,
     config: Arc<Mutex<Config>>,

asusd/src/ctrl_fancurves.rs

@@ -3,13 +3,13 @@ use std::sync::Arc;
 
 use config_traits::{StdConfig, StdConfigLoad};
 use futures_lite::StreamExt;
-use futures_util::lock::Mutex;
 use log::{debug, error, info, warn};
 use rog_platform::platform::{PlatformProfile, RogPlatform};
 use rog_profiles::error::ProfileError;
 use rog_profiles::fan_curve_set::CurveData;
 use rog_profiles::{find_fan_curve_node, FanCurvePU, FanCurveProfiles};
 use serde::{Deserialize, Serialize};
+use tokio::sync::Mutex;
 use zbus::object_server::SignalEmitter;
 use zbus::{interface, Connection};
 

asusd/src/ctrl_platform.rs

@@ -3,12 +3,12 @@ use std::process::Command;
 use std::sync::Arc;
 
 use config_traits::StdConfig;
-use futures_util::lock::Mutex;
 use log::{debug, error, info, warn};
 use rog_platform::asus_armoury::{AttrValue, FirmwareAttribute, FirmwareAttributes};
 use rog_platform::cpu::{CPUControl, CPUGovernor, CPUEPP};
 use rog_platform::platform::{PlatformProfile, Properties, RogPlatform};
 use rog_platform::power::AsusPower;
+use tokio::sync::Mutex;
 use zbus::fdo::Error as FdoErr;
 use zbus::object_server::SignalEmitter;
 use zbus::{interface, Connection};
@@ -51,6 +51,7 @@ pub struct CtrlPlatform {
 }
 
 impl CtrlPlatform {
+    #[allow(clippy::too_many_arguments)]
     pub fn new(
         platform: RogPlatform,
         power: AsusPower,
@@ -167,7 +168,7 @@ impl CtrlPlatform {
                 .map(|s| s.to_string())
                 .collect()
         };
-        if prog.len() > 1 {
+        if (!prog.is_empty()) && (!prog[0].is_empty()) {
             let mut cmd = Command::new(&prog[0]);
             for arg in prog.iter().skip(1) {
                 cmd.arg(arg);
@@ -294,16 +295,39 @@ impl CtrlPlatform {
 
     #[zbus(property)]
     fn charge_control_end_threshold(&self) -> Result<u8, FdoErr> {
-        let limit = self.power.get_charge_control_end_threshold()?;
+        if !self.power.has_charge_control_end_threshold() {
+            return Err(FdoErr::NotSupported(
+                "RogPlatform: charge_control_end_threshold not supported".to_owned(),
+            ));
+        }
+
+        let limit = self.power.get_charge_control_end_threshold().map_err(|e| {
+            FdoErr::Failed(format!(
+                "Could not read charge_control_end_threshold: {e:?}"
+            ))
+        })?;
+
         Ok(limit)
     }
 
     #[zbus(property)]
     async fn set_charge_control_end_threshold(&mut self, limit: u8) -> Result<(), FdoErr> {
+        if !self.power.has_charge_control_end_threshold() {
+            return Err(FdoErr::NotSupported(
+                "RogPlatform: charge_control_end_threshold not supported".to_owned(),
+            ));
+        }
+
         if !(20..=100).contains(&limit) {
             return Err(RogError::ChargeLimit(limit))?;
         }
-        self.power.set_charge_control_end_threshold(limit)?;
+
+        self.power
+            .set_charge_control_end_threshold(limit)
+            .map_err(|e| {
+                FdoErr::Failed(format!("Could not set charge_control_end_threshold: {e:?}"))
+            })?;
+
         self.config.lock().await.charge_control_end_threshold = limit;
         self.config.lock().await.base_charge_control_end_threshold = limit;
         self.config.lock().await.write();
@@ -311,12 +335,22 @@ impl CtrlPlatform {
     }
 
     async fn one_shot_full_charge(&self) -> Result<(), FdoErr> {
+        if !self.power.has_charge_control_end_threshold() {
+            return Err(FdoErr::NotSupported(
+                "RogPlatform: charge_control_end_threshold not supported".to_owned(),
+            ));
+        }
+
         let base_limit = std::mem::replace(
             &mut self.config.lock().await.charge_control_end_threshold,
             100,
         );
         if base_limit != 100 {
-            self.power.set_charge_control_end_threshold(100)?;
+            self.power
+                .set_charge_control_end_threshold(100)
+                .map_err(|e| {
+                    FdoErr::Failed(format!("Could not set one_shot_full_charge: {e:?}"))
+                })?;
             self.config.lock().await.base_charge_control_end_threshold = base_limit;
             self.config.lock().await.write();
         }

asusd/src/daemon.rs

@@ -11,15 +11,17 @@ use asusd::ctrl_fancurves::CtrlFanCurveZbus;
 use asusd::ctrl_platform::CtrlPlatform;
 use asusd::{print_board_info, start_tasks, CtrlTask, ZbusRun, DBUS_NAME};
 use config_traits::{StdConfig, StdConfigLoad2};
-use futures_util::lock::Mutex;
 use log::{error, info};
 use rog_platform::asus_armoury::FirmwareAttributes;
 use rog_platform::platform::RogPlatform;
 use rog_platform::power::AsusPower;
+use tokio::sync::Mutex;
 use zbus::fdo::ObjectManager;
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
+    println!("Starting asusd daemon...");
+
     // console_subscriber::init();
     let mut logger = env_logger::Builder::new();
     logger
@@ -83,7 +85,10 @@ async fn start_daemon() -> Result<(), Box<dyn Error>> {
     )
     .await
     {
-        Ok(registry) => registry,
+        Ok(registry) => {
+            info!("attribute on zbus initialized");
+            registry
+        }
         Err(e) => {
             error!("Failed to initialize firmware attributes over zbus: {e:?}");
             ArmouryAttributeRegistry::default()
@@ -92,8 +97,10 @@ async fn start_daemon() -> Result<(), Box<dyn Error>> {
 
     match CtrlFanCurveZbus::new() {
         Ok(ctrl) => {
+            info!("FanCurves: found supported fancurves");
             let sig_ctx = CtrlFanCurveZbus::signal_context(&server)?;
             start_tasks(ctrl, &mut server, sig_ctx).await?;
+            info!("FanCurves: initialized");
         }
         Err(err) => {
             error!("FanCurves: {}", err);
@@ -102,8 +109,10 @@ async fn start_daemon() -> Result<(), Box<dyn Error>> {
 
     match CtrlBacklight::new(config.clone()) {
         Ok(backlight) => {
+            info!("Backlight: found supported backlight");
             backlight.start_watch_primary().await?;
             backlight.add_to_server(&mut server).await;
+            info!("Backlight: initialized");
         }
         Err(err) => {
             error!("Backlight: {}", err);
@@ -121,8 +130,10 @@ async fn start_daemon() -> Result<(), Box<dyn Error>> {
         armoury_registry,
     ) {
         Ok(ctrl) => {
+            info!("CtrlPlatform: initialized");
             let sig_ctx = CtrlPlatform::signal_context(&server)?;
             start_tasks(ctrl, &mut server, sig_ctx).await?;
+            info!("CtrlPlatform: tasks started");
         }
         Err(err) => {
             error!("CtrlPlatform: {}", err);
@@ -131,10 +142,12 @@ async fn start_daemon() -> Result<(), Box<dyn Error>> {
 
     let _ = DeviceManager::new(server.clone()).await?;
 
+    info!("DeviceManager initialized");
+
     // Request dbus name after finishing initalizing all functions
     server.request_name(DBUS_NAME).await?;
 
-    info!("Startup success, begining dbus server loop");
+    info!("Startup success on dbus name {DBUS_NAME}: begining dbus server loop");
     loop {
         // This is just a blocker to idle and ensure the reator reacts
         server.executor().tick().await;

data/asusd.rules

@@ -11,11 +11,19 @@ ENV{DMI_FAMILY}=="*Zenbook*", GOTO="asusd_start"
 ENV{DMI_FAMILY}=="*ProArt*", GOTO="asusd_start"
 ENV{DMI_FAMILY}=="*TX Air*", GOTO="asusd_start"
 ENV{DMI_FAMILY}=="*TX Gaming*", GOTO="asusd_start"
+ENV{DMI_FAMILY}=="*EXPERTBOOK*", GOTO="asusd_start"
 # No match so
 GOTO="asusd_end"
 
 LABEL="asusd_start"
-ACTION=="add|change", DRIVER=="asus-nb-wmi", TAG+="systemd", ENV{SYSTEMD_WANTS}="asusd.service"
-ACTION=="add|remove", DRIVER=="asus-nb-wmi", TAG+="systemd", RUN+="/usr/bin/systemctl restart asusd.service"
+ACTION=="add|change", DRIVER=="asus-nb-wmi", TAG+="systemd", ENV{SYSTEMD_WANTS}+="asusd.service"
+ACTION=="add|remove", DRIVER=="asus-nb-wmi", TAG+="systemd", ENV{SYSTEMD_WANTS}+="asusd.service"
+
+# ASUS Custom Fan Curve Control - Grant user write access
+# This allows rog-control-center to adjust fan curves without sudo
+SUBSYSTEM=="hwmon", ATTR{name}=="asus_custom_fan_curve", \
+    RUN+="/bin/sh -c 'chmod 0666 /sys%p/pwm*'", \
+    RUN+="/bin/sh -c 'chmod 0666 /sys%p/temp*_auto_point*_pwm'", \
+    RUN+="/bin/sh -c 'chmod 0666 /sys%p/temp*_auto_point*_temp'"
 
 LABEL="asusd_end"

data/asusd.service

@@ -6,7 +6,10 @@ After=nvidia-powerd.service systemd-udevd.service
 
 [Service]
 Environment=IS_SERVICE=1
-Environment=RUST_LOG="debug"
+# Reduce noisy span logs while keeping useful debug info for asusd and related crates.
+# Keep global level at info but allow debug for our crates; silence tracing::span (very noisy)
+# RUST_LOG format: <module>=<level>,...  (levels: error,warn,info,debug,trace)
+Environment=RUST_LOG="info,asusd=debug,rog_platform=debug,tracing::span=error,zbus::object_server=error,zbus::connection::handshake::common=error,zbus::connection::handshake::client=error"
 # required to prevent init issues with hid_asus and MCU
 ExecStartPre=/bin/sleep 1
 ExecStart=/usr/bin/asusd

distro-packaging/asusctl.spec

@@ -20,9 +20,9 @@
 %global debug_package %{nil}
 %endif
 
-%define version 6.1.15
+%define version 6.3.0
 %define specrelease %{?dist}
-%define pkg_release 9%{specrelease}
+%define pkg_release 1%{specrelease}
 
 # Use hardening ldflags.
 %global rustflags -Clink-arg=-Wl,-z,relro,-z,now
@@ -31,7 +31,6 @@ Version: %{version}
 Release: %{pkg_release}
 Summary: Control fan speeds, LEDs, graphics modes, and charge levels for ASUS notebooks
 License: MPLv2
-Requires: power-profiles-daemon
 
 Group:   System Environment/Kernel
 
@@ -56,6 +55,7 @@ BuildRequires:  pkgconfig(libseat)
 BuildRequires:  pkgconfig(libudev)
 BuildRequires:  pkgconfig(xkbcommon)
 BuildRequires:  pkgconfig(libzstd)
+BuildRequires:  pkgconfig(fontconfig)
 BuildRequires:  desktop-file-utils
 
 %description
@@ -68,6 +68,7 @@ asus-nb-ctrl enables third-party apps to use the above with dbus methods.
 
 %package rog-gui
 Summary: An experimental GUI for %{name}
+Requires: %{name} = %{version}-%{release}
 
 %description rog-gui
 A one-stop-shop GUI tool for asusd/asusctl. It aims to provide most controls,
@@ -75,11 +76,6 @@ a notification service, and ability to run in the background.
 
 %prep
 %autosetup
-%if %{defined fedora}
-%cargo_prep
-sed -i 's|offline = true|offline = false|' .cargo/config.toml
-sed -i 's|source.crates-io|source.ignore_this|' .cargo/config.toml
-%else
 mkdir -p .cargo
 cat > .cargo/config.toml << 'EOF'
 [term]
@@ -87,26 +83,78 @@ verbose = true
 [net]
 offline = false
 EOF
-%endif
 
 %build
 export RUSTFLAGS="%{rustflags}"
 %if %{defined fedora}
-%cargo_build
+/usr/bin/cargo build --release --locked
 %else
-/usr/bin/cargo auditable build --release
+/usr/bin/cargo auditable build --release --locked
 %endif
 
 %install
 export RUSTFLAGS="%{rustflags}"
-mkdir -p "%{buildroot}/%{_bindir}" "%{buildroot}%{_docdir}"
-%make_install
 
-install -D -m 0644 README.md %{buildroot}/%{_docdir}/%{name}/README.md
-install -D -m 0644 rog-anime/README.md %{buildroot}/%{_docdir}/%{name}/README-anime.md
-install -D -m 0644 rog-anime/data/diagonal-template.png %{buildroot}/%{_docdir}/%{name}/diagonal-template.png
+%define _target_dir target/release
 
-desktop-file-validate %{buildroot}/%{_datadir}/applications/rog-control-center.desktop
+# Install binaries
+install -D -m 0755 %{_target_dir}/asusd %{buildroot}%{_bindir}/asusd
+install -D -m 0755 %{_target_dir}/asusd-user %{buildroot}%{_bindir}/asusd-user
+install -D -m 0755 %{_target_dir}/asusctl %{buildroot}%{_bindir}/asusctl
+install -D -m 0755 %{_target_dir}/rog-control-center %{buildroot}%{_bindir}/rog-control-center
+
+# Install systemd units
+install -D -m 0644 data/asusd.service %{buildroot}%{_unitdir}/asusd.service
+install -D -m 0644 data/asusd-user.service %{buildroot}%{_userunitdir}/asusd-user.service
+
+# Install udev rules
+install -D -m 0644 data/asusd.rules %{buildroot}%{_udevrulesdir}/99-asusd.rules
+
+# Install dbus config
+install -D -m 0644 data/asusd.conf %{buildroot}%{_datadir}/dbus-1/system.d/asusd.conf
+
+# Install asusd data
+install -D -m 0644 rog-aura/data/aura_support.ron %{buildroot}%{_datadir}/asusd/aura_support.ron
+cp -r rog-anime/data/anime %{buildroot}%{_datadir}/asusd/
+
+# Install rog-gui data
+install -D -m 0644 rog-control-center/data/rog-control-center.desktop %{buildroot}%{_datadir}/applications/rog-control-center.desktop
+install -D -m 0644 rog-control-center/data/rog-control-center.png %{buildroot}%{_datadir}/icons/hicolor/512x512/apps/rog-control-center.png
+mkdir -p %{buildroot}%{_datadir}/rog-gui/layouts
+cp -r rog-aura/data/layouts/*.ron %{buildroot}%{_datadir}/rog-gui/layouts/
+
+# Install icons
+install -D -m 0644 data/icons/asus_notif_yellow.png %{buildroot}%{_datadir}/icons/hicolor/512x512/apps/asus_notif_yellow.png
+install -D -m 0644 data/icons/asus_notif_green.png %{buildroot}%{_datadir}/icons/hicolor/512x512/apps/asus_notif_green.png
+install -D -m 0644 data/icons/asus_notif_blue.png %{buildroot}%{_datadir}/icons/hicolor/512x512/apps/asus_notif_blue.png
+install -D -m 0644 data/icons/asus_notif_red.png %{buildroot}%{_datadir}/icons/hicolor/512x512/apps/asus_notif_red.png
+install -D -m 0644 data/icons/asus_notif_orange.png %{buildroot}%{_datadir}/icons/hicolor/512x512/apps/asus_notif_orange.png
+install -D -m 0644 data/icons/asus_notif_white.png %{buildroot}%{_datadir}/icons/hicolor/512x512/apps/asus_notif_white.png
+install -D -m 0644 data/icons/scalable/gpu-compute.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/status/gpu-compute.svg
+install -D -m 0644 data/icons/scalable/gpu-hybrid.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/status/gpu-hybrid.svg
+install -D -m 0644 data/icons/scalable/gpu-integrated.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/status/gpu-integrated.svg
+install -D -m 0644 data/icons/scalable/gpu-nvidia.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/status/gpu-nvidia.svg
+install -D -m 0644 data/icons/scalable/gpu-vfio.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/status/gpu-vfio.svg
+install -D -m 0644 data/icons/scalable/notification-reboot.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/status/notification-reboot.svg
+
+# Install docs
+install -D -m 0644 README.md %{buildroot}%{_docdir}/%{name}/README.md
+install -D -m 0644 rog-anime/README.md %{buildroot}%{_docdir}/%{name}/README-anime.md
+install -D -m 0644 rog-anime/data/diagonal-template.png %{buildroot}%{_docdir}/%{name}/diagonal-template.png
+
+# Install LICENSE to asusctl datadir
+install -D -m 0644 LICENSE %{buildroot}%{_datadir}/asusctl/LICENSE
+
+desktop-file-validate %{buildroot}%{_datadir}/applications/rog-control-center.desktop
+
+%post
+%systemd_post asusd.service
+
+%preun
+%systemd_preun asusd.service
+
+%postun
+%systemd_postun_with_restart asusd.service
 
 %files
 %license LICENSE
@@ -116,8 +164,6 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/rog-control-center.d
 %{_unitdir}/asusd.service
 %{_userunitdir}/asusd-user.service
 %{_udevrulesdir}/99-asusd.rules
-#%dir %{_sysconfdir}/asusd/
-%{_datadir}/asusd/aura_support.ron
 %{_datadir}/dbus-1/system.d/asusd.conf
 %{_datadir}/icons/hicolor/512x512/apps/asus_notif_yellow.png
 %{_datadir}/icons/hicolor/512x512/apps/asus_notif_green.png
@@ -132,6 +178,7 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/rog-control-center.d
 %{_datadir}/icons/hicolor/scalable/status/gpu-vfio.svg
 %{_datadir}/icons/hicolor/scalable/status/notification-reboot.svg
 %{_docdir}/%{name}/
+%{_datadir}/asusctl/
 %{_datadir}/asusd/
 
 %files rog-gui

rog-anime/src/data.rs

@@ -63,6 +63,8 @@ pub enum AnimeType {
     GA401,
     GA402,
     GU604,
+    G635L,
+    G835L,
     #[default]
     Unsupported,
 }
@@ -71,12 +73,21 @@ impl FromStr for AnimeType {
     type Err = AnimeError;
 
     fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {
-        Ok(match s {
-            "ga401" | "GA401" => Self::GA401,
-            "ga402" | "GA402" => Self::GA402,
-            "gu604" | "GU604" => Self::GU604,
-            _ => Self::Unsupported,
-        })
+        let dmi = s.to_uppercase();
+
+        if dmi.contains("GA401") {
+            return Ok(Self::GA401);
+        } else if dmi.contains("GA402") {
+            return Ok(Self::GA402);
+        } else if dmi.contains("GU604") {
+            return Ok(Self::GU604);
+        } else if dmi.contains("G635L") {
+            return Ok(Self::G635L);
+        } else if dmi.contains("G835L") {
+            return Ok(Self::G835L);
+        }
+
+        Ok(Self::Unsupported)
     }
 }
 
@@ -89,6 +100,8 @@ impl AnimeType {
             AnimeType::GA402
         } else if board_name.contains("GU604V") {
             AnimeType::GU604
+        } else if board_name.contains("G635L") || board_name.contains("G635L") {
+            AnimeType::G635L
         } else {
             AnimeType::Unsupported
         }
@@ -98,6 +111,7 @@ impl AnimeType {
     pub fn width(&self) -> usize {
         match self {
             AnimeType::GU604 => 70,
+            AnimeType::G835L => 74,
             _ => 74,
         }
     }
@@ -107,6 +121,7 @@ impl AnimeType {
         match self {
             AnimeType::GA401 => 36,
             AnimeType::GU604 => 43,
+            AnimeType::G835L => 39,
             _ => 39,
         }
     }
@@ -116,6 +131,7 @@ impl AnimeType {
         match self {
             AnimeType::GA401 => PANE_LEN * 2,
             AnimeType::GU604 => PANE_LEN * 3,
+            AnimeType::G835L => PANE_LEN * 3,
             _ => PANE_LEN * 3,
         }
     }
@@ -180,7 +196,13 @@ impl TryFrom<AnimeDataBuffer> for AnimePacketType {
 
         let mut buffers = match anime.anime {
             AnimeType::GA401 => vec![[0; 640]; 2],
-            AnimeType::GA402 | AnimeType::GU604 | AnimeType::Unsupported => vec![[0; 640]; 3],
+            AnimeType::GA402
+            | AnimeType::GU604
+            | AnimeType::G635L
+            | AnimeType::G835L
+            | AnimeType::Unsupported => {
+                vec![[0; 640]; 3]
+            }
         };
 
         for (idx, chunk) in anime.data.as_slice().chunks(PANE_LEN).enumerate() {
@@ -191,7 +213,11 @@ impl TryFrom<AnimeDataBuffer> for AnimePacketType {
 
         if matches!(
             anime.anime,
-            AnimeType::GA402 | AnimeType::GU604 | AnimeType::Unsupported
+            AnimeType::GA402
+                | AnimeType::GU604
+                | AnimeType::G635L
+                | AnimeType::G835L
+                | AnimeType::Unsupported
         ) {
             buffers[2][..7].copy_from_slice(&USB_PREFIX3);
         }

rog-anime/src/usb.rs

@@ -243,7 +243,7 @@ impl From<AnimShutdown> for i32 {
 #[inline]
 pub fn get_anime_type() -> AnimeType {
     let dmi = DMIID::new().unwrap_or_default();
-    let board_name = dmi.board_name;
+    let board_name = dmi.board_name.to_uppercase();
 
     if board_name.contains("GA401I") || board_name.contains("GA401Q") {
         AnimeType::GA401
@@ -251,6 +251,10 @@ pub fn get_anime_type() -> AnimeType {
         AnimeType::GA402
     } else if board_name.contains("GU604V") {
         AnimeType::GU604
+    } else if board_name.contains("G635L") {
+        AnimeType::G635L
+    } else if board_name.contains("G835L") {
+        AnimeType::G835L
     } else {
         AnimeType::Unsupported
     }

rog-aura/data/aura_support.ron

@@ -5,7 +5,7 @@
         layout_name: "fa506i",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -14,7 +14,7 @@
         layout_name: "fa506i",
         basic_modes: [Static, Breathe, RainbowCycle],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -23,7 +23,7 @@
         layout_name: "fa506i",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -32,16 +32,43 @@
         layout_name: "fa507",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
         device_name: "FA617NS",
         product_id: "",
-        layout_name: "fx505d",
+        layout_name: "fa507",
         basic_modes: [Static, Breathe, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
+        power_zones: [Keyboard],
+    ),
+    (
+        device_name: "FA617NT",
+        product_id: "",
+        layout_name: "fa507",
+        basic_modes: [Static, Breathe, Pulse],
+        basic_zones: [],
+        advanced_type: r#None,
+        power_zones: [Keyboard],
+    ),
+    (
+        device_name: "FA617XS",
+        product_id: "",
+        layout_name: "fa507",
+        basic_modes: [Static, Breathe, Pulse],
+        basic_zones: [],
+        advanced_type: r#None,
+        power_zones: [Keyboard],
+    ),
+    (
+        device_name: "FA617XT",
+        product_id: "",
+        layout_name: "fa507",
+        basic_modes: [Static, Breathe, Pulse],
+        basic_zones: [],
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -50,7 +77,7 @@
         layout_name: "fx505d",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -59,7 +86,7 @@
         layout_name: "fa506i",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -68,7 +95,7 @@
         layout_name: "fa506i",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -77,7 +104,7 @@
         layout_name: "fa506i",
         basic_modes: [Static, Breathe, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -86,7 +113,25 @@
         layout_name: "fa506i",
         basic_modes: [Static, Breathe, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
+        power_zones: [Keyboard],
+    ),
+    (
+        device_name: "FX607J",
+        product_id: "",
+        layout_name: "fa506i",
+        basic_modes: [Static, Breathe, Pulse],
+        basic_zones: [],
+        advanced_type: r#None,
+        power_zones: [Keyboard],
+    ),
+    ( 
+        device_name: "FX607V",
+        product_id: "",
+        layout_name: "fa506i",
+        basic_modes: [Static, Breathe, RainbowCycle, Pulse],
+        basic_zones: [],
+        advanced_type: Zoned([SingleZone]),
         power_zones: [Keyboard],
     ),
     (
@@ -95,7 +140,7 @@
         layout_name: "fa506i",
         basic_modes: [Static, Breathe, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -104,16 +149,16 @@
         layout_name: "fx505d",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
-    ( 
+    (
         device_name: "FX706H",
         product_id: "",
         layout_name: "fx505d",
         basic_modes: [Static, Breathe, RainbowCycle],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -122,7 +167,7 @@
         layout_name: "g512",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [Key1, Key2, Key3, Key4],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard, Lightbar],
     ),
     (
@@ -140,7 +185,7 @@
         layout_name: "g513i",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [Key1, Key2, Key3, Key4],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard, Lightbar],
     ),
     (
@@ -185,7 +230,7 @@
         layout_name: "gx502",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [Key1, Key2, Key3, Key4],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -194,7 +239,7 @@
         layout_name: "gx502",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Star, Rain, Highlight, Laser, Ripple, Pulse, Comet, Flash],
         basic_zones: [Key1, Key2, Key3, Key4],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -233,13 +278,31 @@
         advanced_type: PerKey,
         power_zones: [Keyboard],
     ),
+    (
+        device_name: "G614FR",
+        product_id: "",
+        layout_name: "g634j-per-key",
+        basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Star, Rain, Highlight, Laser, Ripple, Pulse, Comet, Flash],
+        basic_zones: [],
+        advanced_type: PerKey,
+        power_zones: [Keyboard, Lightbar, Logo],
+    ),
     (
         device_name: "G614J",
         product_id: "",
         layout_name: "g634j-per-key",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
+        power_zones: [Keyboard, Lightbar],
+    ),
+    (
+        device_name: "G614JIR",
+        product_id: "",
+        layout_name: "g513i-per-key",
+        basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Star, Rain, Highlight, Laser, Ripple, Pulse, Comet, Flash],
+        basic_zones: [],
+        advanced_type: PerKey,
         power_zones: [Keyboard, Lightbar],
     ),
     (
@@ -248,16 +311,25 @@
         layout_name: "g634j-per-key",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [Key1, Key2, Key3, Key4],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard, Lightbar],
     ),
+    (
+        device_name: "G614JU",
+        product_id: "",
+        layout_name: "g634j-per-key",
+        basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Star, Rain, Highlight, Laser, Ripple, Pulse, Comet, Flash],
+        basic_zones: [],
+        advanced_type: PerKey,
+        power_zones: [Keyboard, Lightbar, Logo],
+    ),
     (
         device_name: "G614JZ",
         product_id: "",
         layout_name: "g634j-per-key",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [Key1, Key2, Key3, Key4],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard, Lightbar],
     ),
     (
@@ -269,13 +341,22 @@
         advanced_type: PerKey,
         power_zones: [Keyboard, Lightbar, Logo, RearGlow],
     ),
+    (
+            device_name: "G635L",
+            product_id: "",
+            layout_name: "g635l-per-key",
+            basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Star, Rain, Highlight, Laser, Ripple, Pulse, Comet, Flash],
+            basic_zones: [],
+            advanced_type: PerKey,
+            power_zones: [Keyboard, Lightbar, Logo],
+    ),
     (
         device_name: "G712LI",
         product_id: "",
         layout_name: "gl503",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -284,7 +365,7 @@
         layout_name: "ga401q",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [Key1, Key2, Key3, Key4],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -293,7 +374,7 @@
         layout_name: "ga401q",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [Key1, Key2, Key3, Key4],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -302,7 +383,7 @@
         layout_name: "gx502",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [Key1, Key2, Key3, Key4],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard, Lightbar],
     ),
     (
@@ -311,7 +392,7 @@
         layout_name: "ga401q",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [Key1, Key2, Key3, Key4],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard, Lightbar],
     ),
     (
@@ -320,7 +401,7 @@
         layout_name: "gx502",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [Key1, Key2, Key3, Key4],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard, Lightbar],
     ),
     (
@@ -329,7 +410,7 @@
         layout_name: "gx502",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [Key1, Key2, Key3, Key4],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard, Lightbar],
     ),
     (
@@ -365,7 +446,7 @@
         layout_name: "ga401q",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [Key1, Key2, Key3, Key4],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -383,7 +464,7 @@
         layout_name: "ga401q",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [Key1, Key2, Key3, Key4, BarLeft, BarRight],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard, Lightbar],
     ),
     (
@@ -401,7 +482,7 @@
         layout_name: "g533q",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -410,7 +491,7 @@
         layout_name: "g533q",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [Key1, Key2, Key3, Key4],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -419,7 +500,7 @@
         layout_name: "g533q",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [Key1, Key2, Key3, Key4],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -467,6 +548,15 @@
         advanced_type: PerKey,
         power_zones: [Keyboard, Lightbar],
     ),
+    (
+        device_name: "G815L",
+        product_id: "",
+        layout_name: "g814ji-per-key",
+        basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Star, Rain, Highlight, Laser, Ripple, Pulse, Comet, Flash],
+        basic_zones: [],
+        advanced_type: PerKey,
+        power_zones: [Keyboard, Lightbar],
+    ),
     (
         device_name: "G834J",
         product_id: "",
@@ -476,13 +566,22 @@
         advanced_type: PerKey,
         power_zones: [Keyboard, Lightbar, Logo, RearGlow],
     ),
+    (
+        device_name: "G835L",
+        product_id: "",
+        layout_name: "g814ji-per-key",
+        basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Star, Rain, Highlight, Laser, Ripple, Pulse, Comet, Flash],
+        basic_zones: [],
+        advanced_type: PerKey,
+        power_zones: [Keyboard, Lightbar, Logo],
+    ),
     (
         device_name: "GA401I",
         product_id: "",
         layout_name: "ga401q",
         basic_modes: [Static, Breathe, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -491,7 +590,7 @@
         layout_name: "ga401q",
         basic_modes: [Static, Breathe, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -500,7 +599,7 @@
         layout_name: "ga401q",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -509,7 +608,7 @@
         layout_name: "ga401q",
         basic_modes: [Static, Breathe, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -518,7 +617,7 @@
         layout_name: "ga401q",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -527,7 +626,7 @@
         layout_name: "ga401q",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -536,7 +635,7 @@
         layout_name: "ga401q",
         basic_modes: [Static, Breathe, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -545,7 +644,7 @@
         layout_name: "ga401q",
         basic_modes: [Static, Breathe, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -554,7 +653,7 @@
         layout_name: "ga401q",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -563,7 +662,7 @@
         layout_name: "ga401q",
         basic_modes: [Static, Breathe, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -572,7 +671,7 @@
         layout_name: "ga401q",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -590,7 +689,7 @@
         layout_name: "gl503",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [Key1, Key2, Key3, Key4],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -599,7 +698,7 @@
         layout_name: "gl503",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [Key1, Key2, Key3, Key4],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -608,7 +707,7 @@
         layout_name: "gl503",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [Key1, Key2, Key3, Key4, Logo, BarLeft, BarRight],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -626,7 +725,7 @@
         layout_name: "g533q",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [Key1, Key2, Key3, Key4],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -635,7 +734,7 @@
         layout_name: "gl503",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -644,7 +743,7 @@
         layout_name: "fa507",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [Key1, Key2, Key3, Key4],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -692,6 +791,15 @@
         advanced_type: Zoned([SingleZone]),
         power_zones: [Keyboard],
     ),
+    (
+        device_name: "GU605C",
+        product_id: "",
+        layout_name: "ga401q",
+        basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
+        basic_zones: [],
+        advanced_type: Zoned([SingleZone]),
+        power_zones: [Keyboard],
+    ),
     (
         device_name: "GU605M",
         product_id: "",
@@ -707,7 +815,7 @@
         layout_name: "ga401q",
         basic_modes: [Static, Breathe, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -716,7 +824,7 @@
         layout_name: "ga401q",
         basic_modes: [Static, Breathe, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -725,7 +833,7 @@
         layout_name: "ga401q",
         basic_modes: [Static, Breathe, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -734,7 +842,7 @@
         layout_name: "ga401q",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -752,7 +860,7 @@
         layout_name: "ga401q",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -770,7 +878,7 @@
         layout_name: "gx531-per-key",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [Key1, Key2, Key3, Key4],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -824,7 +932,7 @@
         layout_name: "gx531-per-key",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Star, Rain, Highlight, Laser, Ripple, Pulse, Comet, Flash],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -833,7 +941,7 @@
         layout_name: "ga401q",
         basic_modes: [Static, Breathe, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -842,7 +950,7 @@
         layout_name: "ga401q",
         basic_modes: [Static, Breathe, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -851,8 +959,8 @@
         layout_name: "",
         basic_modes: [Static, Breathe, Pulse],
         basic_zones: [],
-        advanced_type: None,
-        power_zones: [None],
+        advanced_type: r#None,
+        power_zones: [r#None],
     ),
     (
         device_name: "GZ301Z",
@@ -860,7 +968,7 @@
         layout_name: "ga401q",
         basic_modes: [Static, Breathe, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -869,7 +977,7 @@
         layout_name: "ga401q",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Ally],
     ),
     (
@@ -878,7 +986,7 @@
         layout_name: "ga401q",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Ally],
     ),
 ])

rog-aura/data/layouts/g635l-per-key_US.ron

@@ -0,0 +1,375 @@
+(
+    locale: "US",
+    key_shapes: {
+        "regular": Led(
+            width: 1.0,
+            height: 1.0,
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: 0.1,
+            pad_bottom: 0.1,
+        ),
+        "regular_spacing": Blank(
+            width: 1.2,
+            height: 0.0,
+        ),
+        "rog_row": Led(
+            width: 1.0,
+            height: 0.7,
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: 0.1,
+            pad_bottom: 0.6,
+        ),
+        "rog_row_blocking": Blank(
+            width: 1.2,
+            height: 0.0,
+        ),
+        "func_space": Blank(
+            width: 0.6,
+            height: 0.0,
+        ),
+        "backspace": Led(
+            width: 2.2,
+            height: 1.0,
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: 0.1,
+            pad_bottom: 0.1,
+        ),
+        "tab": Led(
+            width: 1.6,
+            height: 1.0,
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: 0.1,
+            pad_bottom: 0.1,
+        ),
+        "backslash": Led(
+            width: 1.6,
+            height: 1.0,
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: 0.1,
+            pad_bottom: 0.1,
+        ),
+        "capsplonk": Led(
+            width: 2.0,
+            height: 1.0,
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: 0.1,
+            pad_bottom: 0.1,
+        ),
+        "return": Led(
+            width: 2.4,
+            height: 1.0,
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: 0.1,
+            pad_bottom: 0.1,
+        ),
+        "lshift": Led(
+            width: 2.6,
+            height: 1.0,
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: 0.1,
+            pad_bottom: 0.1,
+        ),
+        "rshift": Led(
+            width: 3.0,
+            height: 1.0,
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: 0.1,
+            pad_bottom: 0.1,
+        ),
+        "lctrl": Led(
+            width: 1.4,
+            height: 1.0,
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: 0.1,
+            pad_bottom: 0.1,
+        ),
+        "spacebar": Led(
+            width: 5.8,
+            height: 1.0,
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: 0.1,
+            pad_bottom: 0.1,
+        ),
+        "rctrl": Led(
+            width: 1.2,
+            height: 1.0,
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: 0.1,
+            pad_bottom: 0.1,
+        ),
+        "up_arrow": Led(
+            width: 0.8,
+            height: 0.8,
+            pad_left: 1.1,
+            pad_right: 1.1,
+            pad_top: 0.1,
+            pad_bottom: 0.1,
+        ),
+        "arrows_spacer": Blank(
+            width: 15.0,
+            height: 0.0,
+        ),
+        "arrows": Led(
+            width: 0.8,
+            height: 0.8,
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: -0.1,
+            pad_bottom: 0.1,
+        ),
+        "row_end_spacing": Blank(
+            width: 0.4,
+            height: 0.0,
+        ),
+        "lid_logo": Led(
+            width: 2.6,
+            height: 1.2,
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: 0.8,
+            pad_bottom: 0.0,
+        ),
+        "lightbar_left": Led(
+            width: 0.6,
+            height: 3.6,
+            pad_left: -1.2,
+            pad_right: 0.2,
+            pad_top: -3.0,
+            pad_bottom: 0.3,
+        ),
+        "lightbar_corner_left": Led(
+            width: 0.8,
+            height: 0.6,
+            pad_left: -0.6,
+            pad_right: 0.2,
+            pad_top: 0.8,
+            pad_bottom: 0.0,
+        ),
+        "lightbar_bottom": Led(
+            width: 12.6,
+            height: 0.5,
+            pad_left: -0.1,
+            pad_right: -0.1,
+            pad_top: 0.8,
+            pad_bottom: 0.0,
+        ),
+        "lightbar_corner_right": Led(
+            width: 0.8,
+            height: 0.6,
+            pad_left: 0.0,
+            pad_right: 0.2,
+            pad_top: 0.8,
+            pad_bottom: 0.0,
+        ),
+        "lightbar_right": Led(
+            width: 0.6,
+            height: 3.6,
+            pad_left: -0.8,
+            pad_right: 0.2,
+            pad_top: -3.0,
+            pad_bottom: 0.3,
+        ),
+    },
+    key_rows: [
+        (
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: 0.1,
+            pad_bottom: 0.1,
+            row: [
+                (Blocking, "rog_row_blocking"),
+                (Blocking, "rog_row_blocking"),
+                (VolDown, "rog_row"),
+                (VolUp, "rog_row"),
+                (MicMute, "rog_row"),
+                (RogFan, "rog_row"),
+                (RogApp, "rog_row"),
+            ],
+        ),
+        (
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: 0.1,
+            pad_bottom: 0.1,
+            row: [
+                (Esc, "regular"),
+                (Spacing, "regular_spacing"),
+                (F1, "regular"),
+                (F2, "regular"),
+                (F3, "regular"),
+                (F4, "regular"),
+                (Spacing, "func_space"),
+                (F5, "regular"),
+                (F6, "regular"),
+                (F7, "regular"),
+                (F8, "regular"),
+                (Spacing, "func_space"),
+                (F9, "regular"),
+                (F10, "regular"),
+                (F11, "regular"),
+                (F12, "regular"),
+                (Spacing, "row_end_spacing"),
+                (Del, "regular"), // Should be super/insert
+            ],
+        ),
+        (
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: 0.1,
+            pad_bottom: 0.1,
+            row: [
+                (Tilde, "regular"),
+                (N1, "regular"),
+                (N2, "regular"),
+                (N3, "regular"),
+                (N4, "regular"),
+                (N5, "regular"),
+                (N6, "regular"),
+                (N7, "regular"),
+                (N8, "regular"),
+                (N9, "regular"),
+                (N0, "regular"),
+                (Hyphen, "regular"),
+                (Equals, "regular"),
+                (Backspace, "backspace"),
+                (Spacing, "row_end_spacing"),
+                (MediaPlay, "regular"),
+            ],
+        ),
+        (
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: 0.1,
+            pad_bottom: 0.1,
+            row: [
+                (Tab, "tab"),
+                (Q, "regular"),
+                (W, "regular"),
+                (E, "regular"),
+                (R, "regular"),
+                (T, "regular"),
+                (Y, "regular"),
+                (U, "regular"),
+                (I, "regular"),
+                (O, "regular"),
+                (P, "regular"),
+                (LBracket, "regular"),
+                (RBracket, "regular"),
+                (BackSlash, "backslash"),
+                (Spacing, "row_end_spacing"),
+                (MediaStop, "regular"),
+            ],
+        ),
+        (
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: 0.1,
+            pad_bottom: 0.1,
+            row: [
+                (Caps, "capsplonk"),
+                (A, "regular"),
+                (S, "regular"),
+                (D, "regular"),
+                (F, "regular"),
+                (G, "regular"),
+                (H, "regular"),
+                (J, "regular"),
+                (K, "regular"),
+                (L, "regular"),
+                (SemiColon, "regular"),
+                (Quote, "regular"),
+                (Return, "return"),
+                (Spacing, "row_end_spacing"),
+                (MediaNext, "regular"),
+            ],
+        ),
+        (
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: 0.1,
+            pad_bottom: 0.1,
+            row: [
+                (LShift, "lshift"),
+                (Z, "regular"),
+                (X, "regular"),
+                (C, "regular"),
+                (V, "regular"),
+                (B, "regular"),
+                (N, "regular"),
+                (M, "regular"),
+                (Comma, "regular"),
+                (Period, "regular"),
+                (FwdSlash, "regular"),
+                (Rshift, "rshift"),
+                (Spacing, "row_end_spacing"),
+                (MediaPrev, "regular"),
+            ],
+        ),
+        (
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: 0.1,
+            pad_bottom: 0.1,
+            row: [
+                (LCtrl, "lctrl"),
+                (LFn, "regular"),
+                (Meta, "regular"),
+                (LAlt, "regular"),
+                (Spacebar, "spacebar"),
+                (RAlt, "regular"),
+                (PrtSc, "regular"),
+                (RCtrl, "rctrl"),
+                (Up, "up_arrow"),
+                (Spacing, "row_end_spacing"),
+                (PrtSc, "regular"),
+            ],
+        ),
+        (
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: 0.1,
+            pad_bottom: 0.1,
+            row: [
+                (Spacing, "arrows_spacer"),
+                (Left, "arrows"),
+                (Down, "arrows"),
+                (Right, "arrows"),
+            ],
+        ),
+        (
+            pad_left: 6.5,
+            pad_right: 6.5,
+            pad_top: 0.2,
+            pad_bottom: 0.1,
+            row: [
+                (LidLogo, "lid_logo"),
+            ],
+        ),
+        (
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: 0.1,
+            pad_bottom: 0.1,
+            row: [
+                (LightbarLeft, "lightbar_left"),
+                (LightbarLeftCorner, "lightbar_corner_left"),
+                (LightbarLeftBottom, "lightbar_bottom"),
+                (LightbarRightBottom, "lightbar_bottom"),
+                (LightbarRightCorner, "lightbar_corner_right"),
+                (LightbarRight, "lightbar_right"),
+            ],
+        ),
+    ],
+)

rog-aura/src/aura_detection.rs

@@ -164,6 +164,25 @@ impl LedSupportFile {
             return Some(data);
         }
 
+        // If the system-wide files were not found (typical in CI or
+        // development environments), attempt to load the bundled
+        // `data/aura_support.ron` from the crate so tests and local runs
+        // behave the same as when the package is installed.
+        // Attempt to load a bundled `aura_support.ron` included at compile time.
+        // Using `include_str!` ensures the data is available regardless of
+        // runtime `CARGO_MANIFEST_DIR` or CI environment differences.
+        let bundled_buf = include_str!("../data/aura_support.ron");
+        if !bundled_buf.is_empty() {
+            if let Ok(tmp) = ron::from_str::<LedSupportFile>(bundled_buf) {
+                data.0.append(&mut tmp.0.clone());
+                data.0.sort_by(|a, b| a.device_name.cmp(&b.device_name));
+                info!("Loaded bundled LED support data (embedded)");
+                return Some(data);
+            } else {
+                warn!("Could not parse embedded bundled data file");
+            }
+        }
+
         warn!("Does {} exist?", ASUS_LED_MODE_USER_CONF);
         None
     }

rog-aura/src/builtin_modes.rs

@@ -359,6 +359,12 @@ impl From<AuraEffect> for AuraModeNum {
     }
 }
 
+#[cfg(feature = "dbus")]
+impl zbus::zvariant::Basic for AuraModeNum {
+    const SIGNATURE_CHAR: char = 'u';
+    const SIGNATURE_STR: &'static str = "u";
+}
+
 /// Base effects have no zoning, while multizone is 1-4
 #[cfg_attr(
     feature = "dbus",

rog-aura/src/effects/mod.rs

@@ -207,12 +207,14 @@ mod tests {
     fn single_key_next_state_then_create() {
         let layout = KeyLayout::default_layout();
         let mut seq = AdvancedEffects::new(false);
-        seq.effects
-            .push(Effect::Static(Static::new(LedCode::F, Colour {
+        seq.effects.push(Effect::Static(Static::new(
+            LedCode::F,
+            Colour {
                 r: 255,
                 g: 127,
                 b: 0,
-            })));
+            },
+        )));
 
         seq.next_state(&layout);
         let packets = seq.create_packets();

rog-aura/src/keyboard/layouts.rs

@@ -335,93 +335,117 @@ impl KeyLayout {
                 KeyShape::new_led(1.0, 1.0, 0.1, 0.1, 0.1, 0.1),
             )]),
             key_rows: vec![
-                KeyRow::new(0.1, 0.1, vec![
-                    (LedCode::Esc, "regular".to_owned()),
-                    (LedCode::F1, "regular".to_owned()),
-                    (LedCode::F2, "regular".to_owned()),
-                    (LedCode::F3, "regular".to_owned()),
-                    (LedCode::F4, "regular".to_owned()),
-                    // not sure which key to put here
-                    (LedCode::F5, "regular".to_owned()),
-                    (LedCode::F6, "regular".to_owned()),
-                    (LedCode::F7, "regular".to_owned()),
-                    (LedCode::F8, "regular".to_owned()),
-                    (LedCode::F9, "regular".to_owned()),
-                    (LedCode::F10, "regular".to_owned()),
-                    (LedCode::F11, "regular".to_owned()),
-                    (LedCode::F12, "regular".to_owned()),
-                ]),
-                KeyRow::new(0.1, 0.1, vec![
-                    (LedCode::Tilde, "regular".to_owned()),
-                    (LedCode::N1, "regular".to_owned()),
-                    (LedCode::N2, "regular".to_owned()),
-                    (LedCode::N3, "regular".to_owned()),
-                    (LedCode::N4, "regular".to_owned()),
-                    (LedCode::N5, "regular".to_owned()),
-                    (LedCode::N6, "regular".to_owned()),
-                    (LedCode::N7, "regular".to_owned()),
-                    (LedCode::N8, "regular".to_owned()),
-                    (LedCode::N9, "regular".to_owned()),
-                    (LedCode::N0, "regular".to_owned()),
-                    (LedCode::Hyphen, "regular".to_owned()),
-                    (LedCode::Equals, "regular".to_owned()),
-                    (LedCode::Backspace, "regular".to_owned()),
-                ]),
-                KeyRow::new(0.1, 0.1, vec![
-                    (LedCode::Tab, "regular".to_owned()),
-                    (LedCode::Q, "regular".to_owned()),
-                    (LedCode::W, "regular".to_owned()),
-                    (LedCode::E, "regular".to_owned()),
-                    (LedCode::R, "regular".to_owned()),
-                    (LedCode::T, "regular".to_owned()),
-                    (LedCode::Y, "regular".to_owned()),
-                    (LedCode::U, "regular".to_owned()),
-                    (LedCode::I, "regular".to_owned()),
-                    (LedCode::O, "regular".to_owned()),
-                    (LedCode::P, "regular".to_owned()),
-                    (LedCode::LBracket, "regular".to_owned()),
-                    (LedCode::RBracket, "regular".to_owned()),
-                    (LedCode::BackSlash, "regular".to_owned()),
-                ]),
-                KeyRow::new(0.1, 0.1, vec![
-                    (LedCode::Caps, "regular".to_owned()),
-                    (LedCode::A, "regular".to_owned()),
-                    (LedCode::S, "regular".to_owned()),
-                    (LedCode::D, "regular".to_owned()),
-                    (LedCode::F, "regular".to_owned()),
-                    (LedCode::G, "regular".to_owned()),
-                    (LedCode::H, "regular".to_owned()),
-                    (LedCode::J, "regular".to_owned()),
-                    (LedCode::K, "regular".to_owned()),
-                    (LedCode::L, "regular".to_owned()),
-                    (LedCode::SemiColon, "regular".to_owned()),
-                    (LedCode::Quote, "regular".to_owned()),
-                    (LedCode::Return, "regular".to_owned()),
-                ]),
-                KeyRow::new(0.1, 0.1, vec![
-                    (LedCode::LShift, "regular".to_owned()),
-                    (LedCode::Z, "regular".to_owned()),
-                    (LedCode::X, "regular".to_owned()),
-                    (LedCode::C, "regular".to_owned()),
-                    (LedCode::V, "regular".to_owned()),
-                    (LedCode::B, "regular".to_owned()),
-                    (LedCode::N, "regular".to_owned()),
-                    (LedCode::M, "regular".to_owned()),
-                    (LedCode::Comma, "regular".to_owned()),
-                    (LedCode::Period, "regular".to_owned()),
-                    (LedCode::FwdSlash, "regular".to_owned()),
-                    (LedCode::Rshift, "regular".to_owned()),
-                ]),
-                KeyRow::new(0.1, 0.1, vec![
-                    (LedCode::LCtrl, "regular".to_owned()),
-                    (LedCode::LFn, "regular".to_owned()),
-                    (LedCode::Meta, "regular".to_owned()),
-                    (LedCode::LAlt, "regular".to_owned()),
-                    (LedCode::Spacebar, "regular".to_owned()),
-                    (LedCode::RAlt, "regular".to_owned()),
-                    (LedCode::PrtSc, "regular".to_owned()),
-                    (LedCode::RCtrl, "regular".to_owned()),
-                ]),
+                KeyRow::new(
+                    0.1,
+                    0.1,
+                    vec![
+                        (LedCode::Esc, "regular".to_owned()),
+                        (LedCode::F1, "regular".to_owned()),
+                        (LedCode::F2, "regular".to_owned()),
+                        (LedCode::F3, "regular".to_owned()),
+                        (LedCode::F4, "regular".to_owned()),
+                        // not sure which key to put here
+                        (LedCode::F5, "regular".to_owned()),
+                        (LedCode::F6, "regular".to_owned()),
+                        (LedCode::F7, "regular".to_owned()),
+                        (LedCode::F8, "regular".to_owned()),
+                        (LedCode::F9, "regular".to_owned()),
+                        (LedCode::F10, "regular".to_owned()),
+                        (LedCode::F11, "regular".to_owned()),
+                        (LedCode::F12, "regular".to_owned()),
+                    ],
+                ),
+                KeyRow::new(
+                    0.1,
+                    0.1,
+                    vec![
+                        (LedCode::Tilde, "regular".to_owned()),
+                        (LedCode::N1, "regular".to_owned()),
+                        (LedCode::N2, "regular".to_owned()),
+                        (LedCode::N3, "regular".to_owned()),
+                        (LedCode::N4, "regular".to_owned()),
+                        (LedCode::N5, "regular".to_owned()),
+                        (LedCode::N6, "regular".to_owned()),
+                        (LedCode::N7, "regular".to_owned()),
+                        (LedCode::N8, "regular".to_owned()),
+                        (LedCode::N9, "regular".to_owned()),
+                        (LedCode::N0, "regular".to_owned()),
+                        (LedCode::Hyphen, "regular".to_owned()),
+                        (LedCode::Equals, "regular".to_owned()),
+                        (LedCode::Backspace, "regular".to_owned()),
+                    ],
+                ),
+                KeyRow::new(
+                    0.1,
+                    0.1,
+                    vec![
+                        (LedCode::Tab, "regular".to_owned()),
+                        (LedCode::Q, "regular".to_owned()),
+                        (LedCode::W, "regular".to_owned()),
+                        (LedCode::E, "regular".to_owned()),
+                        (LedCode::R, "regular".to_owned()),
+                        (LedCode::T, "regular".to_owned()),
+                        (LedCode::Y, "regular".to_owned()),
+                        (LedCode::U, "regular".to_owned()),
+                        (LedCode::I, "regular".to_owned()),
+                        (LedCode::O, "regular".to_owned()),
+                        (LedCode::P, "regular".to_owned()),
+                        (LedCode::LBracket, "regular".to_owned()),
+                        (LedCode::RBracket, "regular".to_owned()),
+                        (LedCode::BackSlash, "regular".to_owned()),
+                    ],
+                ),
+                KeyRow::new(
+                    0.1,
+                    0.1,
+                    vec![
+                        (LedCode::Caps, "regular".to_owned()),
+                        (LedCode::A, "regular".to_owned()),
+                        (LedCode::S, "regular".to_owned()),
+                        (LedCode::D, "regular".to_owned()),
+                        (LedCode::F, "regular".to_owned()),
+                        (LedCode::G, "regular".to_owned()),
+                        (LedCode::H, "regular".to_owned()),
+                        (LedCode::J, "regular".to_owned()),
+                        (LedCode::K, "regular".to_owned()),
+                        (LedCode::L, "regular".to_owned()),
+                        (LedCode::SemiColon, "regular".to_owned()),
+                        (LedCode::Quote, "regular".to_owned()),
+                        (LedCode::Return, "regular".to_owned()),
+                    ],
+                ),
+                KeyRow::new(
+                    0.1,
+                    0.1,
+                    vec![
+                        (LedCode::LShift, "regular".to_owned()),
+                        (LedCode::Z, "regular".to_owned()),
+                        (LedCode::X, "regular".to_owned()),
+                        (LedCode::C, "regular".to_owned()),
+                        (LedCode::V, "regular".to_owned()),
+                        (LedCode::B, "regular".to_owned()),
+                        (LedCode::N, "regular".to_owned()),
+                        (LedCode::M, "regular".to_owned()),
+                        (LedCode::Comma, "regular".to_owned()),
+                        (LedCode::Period, "regular".to_owned()),
+                        (LedCode::FwdSlash, "regular".to_owned()),
+                        (LedCode::Rshift, "regular".to_owned()),
+                    ],
+                ),
+                KeyRow::new(
+                    0.1,
+                    0.1,
+                    vec![
+                        (LedCode::LCtrl, "regular".to_owned()),
+                        (LedCode::LFn, "regular".to_owned()),
+                        (LedCode::Meta, "regular".to_owned()),
+                        (LedCode::LAlt, "regular".to_owned()),
+                        (LedCode::Spacebar, "regular".to_owned()),
+                        (LedCode::RAlt, "regular".to_owned()),
+                        (LedCode::PrtSc, "regular".to_owned()),
+                        (LedCode::RCtrl, "regular".to_owned()),
+                    ],
+                ),
             ],
         }
     }

rog-control-center/Cargo.toml

@@ -12,8 +12,9 @@ edition.workspace = true
 default = []
 mocking = []
 x11 = ["slint/backend-winit-x11"]
-# Requires RUSTFLAGS="--cfg tokio_unstable"
+# Optional tokio debug feature does not require nightly; remove RUSTFLAGS note.
 tokio-debug = ["console-subscriber"]
+rog_ally = []
 
 [dependencies]
 console-subscriber = { version = "^0.4", optional = true }
@@ -28,6 +29,7 @@ rog_dbus = { path = "../rog-dbus" }
 rog_aura = { path = "../rog-aura" }
 rog_profiles = { path = "../rog-profiles" }
 rog_platform = { path = "../rog-platform" }
+rog_slash = { path = "../rog-slash" }
 supergfxctl = { git = "https://gitlab.com/asus-linux/supergfxctl.git", default-features = false }
 dmi_id = { path = "../dmi-id" }
 
@@ -38,6 +40,7 @@ env_logger.workspace = true
 tokio.workspace = true
 serde.workspace = true
 zbus.workspace = true
+ron.workspace = true
 dirs.workspace = true
 notify-rust.workspace = true
 concat-idents.workspace = true

rog-control-center/src/main.rs

@@ -11,24 +11,34 @@ use gumdrop::Options;
 use log::{debug, info, warn, LevelFilter};
 use rog_control_center::cli_options::CliStart;
 use rog_control_center::config::Config;
+use tokio::runtime::Runtime;
+
+thread_local! {
+    pub static UI: std::cell::RefCell<Option<MainWindow>> = Default::default();
+    pub static TRAY_TOOLTIP: std::cell::RefCell<Option<TrayTooltip>> = Default::default();
+}
 use rog_control_center::error::Result;
 use rog_control_center::notify::start_notifications;
 use rog_control_center::slint::ComponentHandle;
-use rog_control_center::tray::init_tray;
+use rog_control_center::tray::{init_tray, TrayEvent, TrayStats};
 use rog_control_center::ui::setup_window;
 use rog_control_center::zbus_proxies::{
     AppState, ROGCCZbus, ROGCCZbusProxyBlocking, ZBUS_IFACE, ZBUS_PATH,
 };
-use rog_control_center::{print_versions, MainWindow};
-use tokio::runtime::Runtime;
+use rog_control_center::{print_versions, MainWindow, TrayTooltip};
 
 #[tokio::main]
 async fn main() -> Result<()> {
+    // Ensure tracing spans are quiet by default unless user overrides
+    if std::env::var_os("RUST_LOG").is_none() {
+        std::env::set_var("RUST_LOG", "warn,tracing=error,zbus=error");
+    }
     let mut logger = env_logger::Builder::new();
     logger
-        .filter_level(LevelFilter::Warn)
         .parse_default_env()
-        .target(env_logger::Target::Stdout)
+        .filter_level(LevelFilter::Info)
+        .parse_default_env()
+        .target(env_logger::Target::Stderr)
         .format_timestamp(None)
         .init();
 
@@ -102,7 +112,6 @@ async fn main() -> Result<()> {
     let board_name = dmi.board_name;
     let prod_family = dmi.product_family;
     info!("Running on {board_name}, product: {prod_family}");
-    let is_rog_ally = board_name == "RC71L" || board_name == "RC72L" || prod_family == "ROG Ally";
 
     let args: Vec<String> = args().skip(1).collect();
 
@@ -133,6 +142,18 @@ async fn main() -> Result<()> {
         config.start_fullscreen = false;
     }
 
+    let is_rog_ally = {
+        #[cfg(feature = "rog_ally")]
+        {
+            board_name == "RC71L" || board_name == "RC72L" || prod_family == "ROG Ally"
+        }
+        #[cfg(not(feature = "rog_ally"))]
+        {
+            false
+        }
+    };
+
+    #[cfg(feature = "rog_ally")]
     if is_rog_ally {
         config.notifications.enabled = false;
         config.enable_tray_icon = false;
@@ -140,6 +161,7 @@ async fn main() -> Result<()> {
         config.startup_in_background = false;
         config.start_fullscreen = true;
     }
+
     config.write();
 
     let enable_tray_icon = config.enable_tray_icon;
@@ -148,17 +170,33 @@ async fn main() -> Result<()> {
 
     start_notifications(config.clone(), &rt)?;
 
-    if enable_tray_icon {
-        init_tray(supported_properties, config.clone());
-    }
+    let (tray_tx, mut tray_rx) = tokio::sync::mpsc::unbounded_channel();
+    // Channel for broadcasting system stats to the tray tooltip
+    let (stats_tx, stats_rx) = tokio::sync::watch::channel(TrayStats::default());
 
-    thread_local! { pub static UI: std::cell::RefCell<Option<MainWindow>> = Default::default()};
+    if enable_tray_icon {
+        init_tray(supported_properties, config.clone(), tray_tx, stats_rx);
+    }
     // i_slint_backend_selector::with_platform(|_| Ok(())).unwrap();
 
     if !startup_in_background {
         if let Ok(mut app_state) = app_state.lock() {
             *app_state = AppState::MainWindowShouldOpen;
         }
+    } else {
+        // Even in background, we need the UI handle for status polling and tray sync
+        let config_copy = config.clone();
+        let stats_tx_copy = stats_tx.clone();
+        slint::invoke_from_event_loop(move || {
+            UI.with(|ui_cell| {
+                let mut ui = ui_cell.borrow_mut();
+                if ui.is_none() {
+                    let newui = setup_window(config_copy, stats_tx_copy.clone());
+                    ui.replace(newui);
+                }
+            });
+        })
+        .ok();
     }
 
     if std::env::var("RUST_TRANSLATIONS").is_ok() {
@@ -173,9 +211,18 @@ async fn main() -> Result<()> {
     thread::spawn(move || {
         let mut state = AppState::StartingUp;
         loop {
+            // Handle tray events
+            while let Ok(event) = tray_rx.try_recv() {
+                match event {
+                    TrayEvent::ToggleTooltip(_, _) => {
+                        // Native tooltip handled by ksni, no custom window needed
+                    }
+                }
+            }
+
             if is_rog_ally {
                 let config_copy_2 = config.clone();
-                let newui = setup_window(config.clone());
+                let newui = setup_window(config.clone(), stats_tx.clone());
                 newui.window().on_close_requested(move || {
                     exit(0);
                 });
@@ -198,76 +245,78 @@ async fn main() -> Result<()> {
                         }
                     })
                     .ok();
-            } else {
-                // save as a var, don't hold the lock the entire time or deadlocks happen
-                if let Ok(app_state) = app_state.lock() {
-                    state = *app_state;
+
+                continue;
+            }
+
+            // save as a var, don't hold the lock the entire time or deadlocks happen
+            if let Ok(app_state) = app_state.lock() {
+                state = *app_state;
+            }
+
+            // This sleep is required to give the event loop time to react
+            sleep(Duration::from_millis(300));
+            if state == AppState::MainWindowShouldOpen {
+                if let Ok(mut app_state) = app_state.lock() {
+                    *app_state = AppState::MainWindowOpen;
                 }
 
-                // This sleep is required to give the event loop time to react
-                sleep(Duration::from_millis(300));
-                if state == AppState::MainWindowShouldOpen {
-                    if let Ok(mut app_state) = app_state.lock() {
-                        *app_state = AppState::MainWindowOpen;
-                    }
+                let config_copy = config.clone();
+                let app_state_copy = app_state.clone();
+                let stats_tx_loop = stats_tx.clone();
+                slint::invoke_from_event_loop(move || {
+                    UI.with(|ui| {
+                        let app_state_copy = app_state_copy.clone();
+                        let mut ui = ui.borrow_mut();
+                        if let Some(ui) = ui.as_mut() {
+                            ui.window().show().unwrap();
+                            ui.window().on_close_requested(move || {
+                                if let Ok(mut app_state) = app_state_copy.lock() {
+                                    *app_state = AppState::MainWindowClosed;
+                                }
+                                slint::CloseRequestResponse::HideWindow
+                            });
+                        } else {
+                            let config_copy_2 = config_copy.clone();
+                            let newui = setup_window(config_copy, stats_tx_loop.clone());
+                            newui.window().on_close_requested(move || {
+                                if let Ok(mut app_state) = app_state_copy.lock() {
+                                    *app_state = AppState::MainWindowClosed;
+                                }
+                                slint::CloseRequestResponse::HideWindow
+                            });
 
-                    let config_copy = config.clone();
-                    let app_state_copy = app_state.clone();
-                    slint::invoke_from_event_loop(move || {
-                        UI.with(|ui| {
-                            let app_state_copy = app_state_copy.clone();
-                            let mut ui = ui.borrow_mut();
-                            if let Some(ui) = ui.as_mut() {
-                                ui.window().show().unwrap();
-                                ui.window().on_close_requested(move || {
-                                    if let Ok(mut app_state) = app_state_copy.lock() {
-                                        *app_state = AppState::MainWindowClosed;
+                            let ui_copy = newui.as_weak();
+                            newui
+                                .window()
+                                .set_rendering_notifier(move |s, _| {
+                                    if let slint::RenderingState::RenderingSetup = s {
+                                        let config = config_copy_2.clone();
+                                        ui_copy
+                                            .upgrade_in_event_loop(move |w| {
+                                                let fullscreen =
+                                                    config.lock().is_ok_and(|c| c.start_fullscreen);
+                                                if fullscreen && !w.window().is_fullscreen() {
+                                                    w.window().set_fullscreen(fullscreen);
+                                                }
+                                            })
+                                            .ok();
                                     }
-                                    slint::CloseRequestResponse::HideWindow
-                                });
-                            } else {
-                                let config_copy_2 = config_copy.clone();
-                                let newui = setup_window(config_copy);
-                                newui.window().on_close_requested(move || {
-                                    if let Ok(mut app_state) = app_state_copy.lock() {
-                                        *app_state = AppState::MainWindowClosed;
-                                    }
-                                    slint::CloseRequestResponse::HideWindow
-                                });
-
-                                let ui_copy = newui.as_weak();
-                                newui
-                                    .window()
-                                    .set_rendering_notifier(move |s, _| {
-                                        if let slint::RenderingState::RenderingSetup = s {
-                                            let config = config_copy_2.clone();
-                                            ui_copy
-                                                .upgrade_in_event_loop(move |w| {
-                                                    let fullscreen = config
-                                                        .lock()
-                                                        .is_ok_and(|c| c.start_fullscreen);
-                                                    if fullscreen && !w.window().is_fullscreen() {
-                                                        w.window().set_fullscreen(fullscreen);
-                                                    }
-                                                })
-                                                .ok();
-                                        }
-                                    })
-                                    .ok();
-                                ui.replace(newui);
-                            }
-                        });
-                    })
-                    .unwrap();
-                } else if state == AppState::QuitApp {
-                    slint::quit_event_loop().unwrap();
-                    exit(0);
-                } else if state != AppState::MainWindowOpen {
-                    if let Ok(config) = config.lock() {
-                        if !config.run_in_background {
-                            slint::quit_event_loop().unwrap();
-                            exit(0);
+                                })
+                                .ok();
+                            ui.replace(newui);
                         }
+                    });
+                })
+                .unwrap();
+            } else if state == AppState::QuitApp {
+                slint::quit_event_loop().unwrap();
+                exit(0);
+            } else if state != AppState::MainWindowOpen {
+                if let Ok(config) = config.lock() {
+                    if !config.run_in_background {
+                        slint::quit_event_loop().unwrap();
+                        exit(0);
                     }
                 }
             }

rog-control-center/src/notify.rs

@@ -9,15 +9,13 @@ use std::process::Command;
 use std::sync::{Arc, Mutex};
 use std::time::Duration;
 
-use futures_util::StreamExt;
 use log::{debug, error, info, warn};
-use notify_rust::{Hint, Notification, Timeout, Urgency};
-use rog_platform::platform::GpuMode;
+use notify_rust::{Hint, Notification, Timeout};
+use rog_dbus::zbus_platform::PlatformProxy;
+use rog_platform::platform::PlatformProfile;
 use rog_platform::power::AsusPower;
 use serde::{Deserialize, Serialize};
-use supergfxctl::actions::UserActionRequired as GfxUserAction;
-use supergfxctl::pci_device::{GfxMode, GfxPower};
-use supergfxctl::zbus_proxy::DaemonProxy as SuperProxy;
+use supergfxctl::pci_device::GfxPower;
 use tokio::runtime::Runtime;
 use tokio::task::JoinHandle;
 
@@ -32,6 +30,7 @@ pub struct EnabledNotifications {
     pub enabled: bool,
     pub receive_notify_gfx: bool,
     pub receive_notify_gfx_status: bool,
+    pub receive_notify_platform_profile: bool,
 }
 
 impl Default for EnabledNotifications {
@@ -40,6 +39,7 @@ impl Default for EnabledNotifications {
             enabled: true,
             receive_notify_gfx: true,
             receive_notify_gfx_status: true,
+            receive_notify_platform_profile: true,
         }
     }
 }
@@ -90,6 +90,57 @@ fn start_dpu_status_mon(config: Arc<Mutex<Config>>) {
     }
 }
 
+/// Start monitoring for platform profile changes (triggered by Fn+F5 or software)
+/// and display an OSD notification when the profile changes.
+fn start_platform_profile_mon(config: Arc<Mutex<Config>>, rt: &Runtime) {
+    let enabled_notifications_copy = config.clone();
+    rt.spawn(async move {
+        let conn = match zbus::Connection::system().await {
+            Ok(c) => c,
+            Err(e) => {
+                error!("zbus signal: platform_profile_mon: {e}");
+                return;
+            }
+        };
+        let proxy = match PlatformProxy::builder(&conn).build().await {
+            Ok(p) => p,
+            Err(e) => {
+                error!("zbus signal: platform_profile_mon proxy: {e}");
+                return;
+            }
+        };
+
+        // Get initial profile to avoid notification on startup
+        let mut last_profile = proxy.platform_profile().await.ok();
+
+        info!("Started platform profile change monitor");
+        use futures_util::StreamExt;
+        let mut stream = proxy.receive_platform_profile_changed().await;
+        while let Some(e) = stream.next().await {
+            if let Ok(config) = enabled_notifications_copy.lock() {
+                if !config.notifications.enabled
+                    || !config.notifications.receive_notify_platform_profile
+                {
+                    continue;
+                }
+            }
+            if let Ok(new_profile) = e.get().await {
+                // Only show notification if profile actually changed
+                if last_profile != Some(new_profile) {
+                    debug!("Platform profile changed to: {:?}", new_profile);
+                    if let Err(e) = do_platform_profile_notif("Power Profile:", &new_profile)
+                        .show()
+                        .map(|n| n.on_close(|_| ()))
+                    {
+                        warn!("Failed to show platform profile notification: {e}");
+                    }
+                    last_profile = Some(new_profile);
+                }
+            }
+        }
+    });
+}
+
 pub fn start_notifications(
     config: Arc<Mutex<Config>>,
     rt: &Runtime,
@@ -116,26 +167,26 @@ pub fn start_notifications(
 
                 if p == 0 && p != last_state {
                     let prog: Vec<&str> = bat.split_whitespace().collect();
-                    if prog.len() > 1 {
+                    if (!prog.is_empty()) && (!prog[0].is_empty()) {
                         let mut cmd = Command::new(prog[0]);
 
                         for arg in prog.iter().skip(1) {
                             cmd.arg(*arg);
                         }
                         cmd.spawn()
-                            .map_err(|e| error!("AC command error: {e:?}"))
+                            .map_err(|e| error!("Battery power command error: {e:?}"))
                             .ok();
                     }
                 } else if p != last_state {
                     let prog: Vec<&str> = ac.split_whitespace().collect();
-                    if prog.len() > 1 {
+                    if (!prog.is_empty()) && (!prog[0].is_empty()) {
                         let mut cmd = Command::new(prog[0]);
 
                         for arg in prog.iter().skip(1) {
                             cmd.arg(*arg);
                         }
                         cmd.spawn()
-                            .map_err(|e| error!("AC command error: {e:?}"))
+                            .map_err(|e| error!("AC power command error: {e:?}"))
                             .ok();
                     }
                 }
@@ -145,12 +196,11 @@ pub fn start_notifications(
         }
     });
 
-    let enabled_notifications_copy = config.clone();
-    let no_supergfx = move |e: &zbus::Error| {
-        error!("zbus signal: receive_notify_gfx_status: {e}");
-        warn!("Attempting to start plain dgpu status monitor");
-        start_dpu_status_mon(enabled_notifications_copy.clone());
-    };
+    info!("Attempting to start plain dgpu status monitor");
+    start_dpu_status_mon(config.clone());
+
+    info!("Starting platform profile change monitor");
+    start_platform_profile_mon(config.clone(), rt);
 
     // GPU MUX Mode notif
     // TODO: need to get armoury attrs and iter to find
@@ -189,87 +239,9 @@ pub fn start_notifications(
     //     Ok::<(), zbus::Error>(())
     // });
 
-    let enabled_notifications_copy = config.clone();
-    // GPU Mode change/action notif
-    tokio::spawn(async move {
-        let conn = zbus::Connection::system().await.inspect_err(|e| {
-            no_supergfx(e);
-        })?;
-        let proxy = SuperProxy::builder(&conn).build().await.inspect_err(|e| {
-            no_supergfx(e);
-        })?;
-        let _ = proxy.mode().await.inspect_err(|e| {
-            no_supergfx(e);
-        })?;
-
-        let proxy_copy = proxy.clone();
-        let mut p = proxy.receive_notify_action().await?;
-        tokio::spawn(async move {
-            info!("Started zbus signal thread: receive_notify_action");
-            while let Some(e) = p.next().await {
-                if let Ok(out) = e.args() {
-                    let action = out.action();
-                    let mode = convert_gfx_mode(proxy.mode().await.unwrap_or_default());
-                    match action {
-                        supergfxctl::actions::UserActionRequired::Reboot => {
-                            do_mux_notification("Graphics mode change requires reboot", &mode)
-                        }
-                        _ => do_gfx_action_notif(<&str>::from(action), *action, mode),
-                    }
-                    .map_err(|e| {
-                        error!("zbus signal: do_gfx_action_notif: {e}");
-                        e
-                    })
-                    .ok();
-                }
-            }
-        });
-
-        let mut p = proxy_copy.receive_notify_gfx_status().await?;
-        tokio::spawn(async move {
-            info!("Started zbus signal thread: receive_notify_gfx_status");
-            let mut last_status = GfxPower::Unknown;
-            while let Some(e) = p.next().await {
-                if let Ok(out) = e.args() {
-                    let status = out.status;
-                    if status != GfxPower::Unknown && status != last_status {
-                        if let Ok(config) = enabled_notifications_copy.lock() {
-                            if !config.notifications.receive_notify_gfx_status
-                                || !config.notifications.enabled
-                            {
-                                continue;
-                            }
-                        }
-                        // Required check because status cycles through
-                        // active/unknown/suspended
-                        do_gpu_status_notif("dGPU status changed:", &status)
-                            .show_async()
-                            .await
-                            .unwrap()
-                            .on_close(|_| ());
-                    }
-                    last_status = status;
-                }
-            }
-        });
-        Ok::<(), zbus::Error>(())
-    });
-
     Ok(vec![blocking])
 }
 
-fn convert_gfx_mode(gfx: GfxMode) -> GpuMode {
-    match gfx {
-        GfxMode::Hybrid => GpuMode::Optimus,
-        GfxMode::Integrated => GpuMode::Integrated,
-        GfxMode::NvidiaNoModeset => GpuMode::Optimus,
-        GfxMode::Vfio => GpuMode::Vfio,
-        GfxMode::AsusEgpu => GpuMode::Egpu,
-        GfxMode::AsusMuxDgpu => GpuMode::Ultimate,
-        GfxMode::None => GpuMode::Error,
-    }
-}
-
 fn base_notification<T>(message: &str, data: &T) -> Notification
 where
     T: Display,
@@ -296,94 +268,27 @@ fn do_gpu_status_notif(message: &str, data: &GfxPower) -> Notification {
     notif
 }
 
-fn do_gfx_action_notif(message: &str, action: GfxUserAction, mode: GpuMode) -> Result<()> {
-    if matches!(action, GfxUserAction::Reboot) {
-        do_mux_notification("Graphics mode change requires reboot", &mode).ok();
-        return Ok(());
-    }
+/// Create a notification for platform profile (power mode) changes.
+/// Uses profile-specific icons and user-friendly names.
+fn do_platform_profile_notif(message: &str, profile: &PlatformProfile) -> Notification {
+    let profile_name = match profile {
+        PlatformProfile::Balanced => "Balanced",
+        PlatformProfile::Performance => "Performance",
+        PlatformProfile::Quiet => "Quiet",
+        PlatformProfile::LowPower => "Low Power",
+        PlatformProfile::Custom => "Custom",
+    };
+    let mut notif = base_notification(message, &profile_name.to_owned());
 
-    let mut notif = Notification::new();
+    // Use appropriate icons for each profile
+    // These icons should be available in the system or ROG icon pack
+    let icon = match profile {
+        PlatformProfile::Balanced => "asus_notif_blue", // Blue for balanced
+        PlatformProfile::Performance => "asus_notif_red", // Red for performance
+        PlatformProfile::Quiet => "asus_notif_green",   // Green for quiet/power saving
+        PlatformProfile::LowPower => "asus_notif_green", // Green for low power
+        PlatformProfile::Custom => "asus_notif_white",  // White for custom
+    };
+    notif.icon(icon);
     notif
-        .appname(NOTIF_HEADER)
-        .summary(&format!("Changing to {mode}. {message}"))
-        //.hint(Hint::Resident(true))
-        .hint(Hint::Category("device".into()))
-        .urgency(Urgency::Critical)
-        .timeout(Timeout::Never)
-        .icon("dialog-warning")
-        .hint(Hint::Transient(true));
-
-    if matches!(action, GfxUserAction::Logout) {
-        notif.action("gfx-mode-session-action", "Logout");
-        let handle = notif.show()?;
-        if let Ok(desktop) = std::env::var("XDG_CURRENT_DESKTOP") {
-            if desktop.to_lowercase() == "gnome" {
-                handle.wait_for_action(|id| {
-                    if id == "gfx-mode-session-action" {
-                        let mut cmd = Command::new("gnome-session-quit");
-                        cmd.spawn().ok();
-                    } else if id == "__closed" {
-                        // TODO: cancel the switching
-                    }
-                });
-            } else if desktop.to_lowercase() == "kde" {
-                handle.wait_for_action(|id| {
-                    if id == "gfx-mode-session-action" {
-                        let mut cmd = Command::new("qdbus");
-                        cmd.args([
-                            "org.kde.ksmserver", "/KSMServer", "logout", "1", "0", "0",
-                        ]);
-                        cmd.spawn().ok();
-                    } else if id == "__closed" {
-                        // TODO: cancel the switching
-                    }
-                });
-            } else {
-                // todo: handle alternatives
-            }
-        }
-    } else {
-        notif.show()?;
-    }
-    Ok(())
-}
-
-/// Actual `GpuMode` unused as data is never correct until switched by reboot
-fn do_mux_notification(message: &str, m: &GpuMode) -> Result<()> {
-    let mut notif = base_notification(message, &m.to_string());
-    notif
-        .action("gfx-mode-session-action", "Reboot")
-        .urgency(Urgency::Critical)
-        .icon("system-reboot-symbolic")
-        .hint(Hint::Transient(true));
-    let handle = notif.show()?;
-
-    std::thread::spawn(|| {
-        if let Ok(desktop) = std::env::var("XDG_CURRENT_DESKTOP") {
-            if desktop.to_lowercase() == "gnome" {
-                handle.wait_for_action(|id| {
-                    if id == "gfx-mode-session-action" {
-                        let mut cmd = Command::new("gnome-session-quit");
-                        cmd.arg("--reboot");
-                        cmd.spawn().ok();
-                    } else if id == "__closed" {
-                        // TODO: cancel the switching
-                    }
-                });
-            } else if desktop.to_lowercase() == "kde" {
-                handle.wait_for_action(|id| {
-                    if id == "gfx-mode-session-action" {
-                        let mut cmd = Command::new("qdbus");
-                        cmd.args([
-                            "org.kde.ksmserver", "/KSMServer", "logout", "1", "1", "0",
-                        ]);
-                        cmd.spawn().ok();
-                    } else if id == "__closed" {
-                        // TODO: cancel the switching
-                    }
-                });
-            }
-        }
-    });
-    Ok(())
 }

rog-control-center/src/tray.rs

@@ -59,6 +59,29 @@ struct AsusTray {
     current_title: String,
     current_icon: Icon,
     proxy: ROGCCZbusProxyBlocking<'static>,
+    tray_channel: Option<tokio::sync::mpsc::UnboundedSender<TrayEvent>>,
+    // System stats for native tooltip
+    cpu_temp: String,
+    gpu_temp: String,
+    cpu_fan: String,
+    gpu_fan: String,
+    power_w: String,
+    power_profile: String,
+}
+
+#[derive(Debug, Clone, Copy)]
+pub enum TrayEvent {
+    ToggleTooltip(i32, i32),
+}
+
+#[derive(Debug, Clone, Default)]
+pub struct TrayStats {
+    pub cpu_temp: String,
+    pub gpu_temp: String,
+    pub cpu_fan: String,
+    pub gpu_fan: String,
+    pub power_w: String,
+    pub power_profile: String,
 }
 
 impl ksni::Tray for AsusTray {
@@ -78,6 +101,26 @@ impl ksni::Tray for AsusTray {
         ksni::Status::Active
     }
 
+    fn activate(&mut self, x: i32, y: i32) {
+        if let Some(tx) = &self.tray_channel {
+            let _ = tx.send(TrayEvent::ToggleTooltip(x, y));
+        }
+    }
+
+    fn tool_tip(&self) -> ksni::ToolTip {
+        ksni::ToolTip {
+            title: "ROG Control Center".into(),
+            description: format!(
+                "<b>Profile:</b> {}\n<b>CPU:</b> {}°C | <b>GPU:</b> {}°C\n<b>Fans:</b> {} / {} RPM\n<b>Power:</b> {} W",
+                self.power_profile,
+                self.cpu_temp, self.gpu_temp,
+                self.cpu_fan, self.gpu_fan,
+                self.power_w
+            ),
+            ..Default::default()
+        }
+    }
+
     fn menu(&self) -> Vec<ksni::MenuItem<Self>> {
         use ksni::menu::*;
         vec![
@@ -155,7 +198,12 @@ fn find_dgpu() -> Option<Device> {
 }
 
 /// The tray is controlled somewhat by `Arc<Mutex<SystemState>>`
-pub fn init_tray(_supported_properties: Vec<Properties>, config: Arc<Mutex<Config>>) {
+pub fn init_tray(
+    _supported_properties: Vec<Properties>,
+    config: Arc<Mutex<Config>>,
+    tray_channel: tokio::sync::mpsc::UnboundedSender<TrayEvent>,
+    mut stats_rx: tokio::sync::watch::Receiver<TrayStats>,
+) {
     tokio::spawn(async move {
         let user_con = zbus::blocking::Connection::session().unwrap();
         let proxy = ROGCCZbusProxyBlocking::new(&user_con).unwrap();
@@ -166,11 +214,19 @@ pub fn init_tray(_supported_properties: Vec<Properties>, config: Arc<Mutex<Confi
             current_title: TRAY_LABEL.to_string(),
             current_icon: rog_red.clone(),
             proxy,
+            tray_channel: Some(tray_channel),
+            // Initialize stats fields
+            cpu_temp: "--".into(),
+            gpu_temp: "--".into(),
+            cpu_fan: "--".into(),
+            gpu_fan: "--".into(),
+            power_w: "--".into(),
+            power_profile: "Unknown".into(),
         };
 
         // TODO: return an error to the UI
         let mut tray;
-        match tray_init.spawn_without_dbus_name().await {
+        match tray_init.disable_dbus_name(true).spawn().await {
             Ok(t) => tray = t,
             Err(e) => {
                 log::error!(
@@ -225,28 +281,45 @@ pub fn init_tray(_supported_properties: Vec<Properties>, config: Arc<Mutex<Confi
             info!("Started ROGTray");
             let mut last_power = GfxPower::Unknown;
             let dev = find_dgpu();
+
+            // Loop with select! to handle both periodic checks and stats updates
             loop {
-                tokio::time::sleep(Duration::from_millis(1000)).await;
-                if let Ok(lock) = config.try_lock() {
-                    if !lock.enable_tray_icon {
-                        return;
+                tokio::select! {
+                    _ = stats_rx.changed() => {
+                        let stats = stats_rx.borrow().clone();
+                        tray.update(move |t| {
+                            t.cpu_temp = stats.cpu_temp;
+                            t.gpu_temp = stats.gpu_temp;
+                            t.cpu_fan = stats.cpu_fan;
+                            t.gpu_fan = stats.gpu_fan;
+                            t.power_w = stats.power_w;
+                            t.power_profile = stats.power_profile;
+                        }).await;
                     }
-                }
-                if has_supergfx {
-                    if let Ok(mode) = gfx_proxy.mode().await {
-                        if let Ok(power) = gfx_proxy.power().await {
-                            if last_power != power {
-                                set_tray_icon_and_tip(mode, power, &mut tray, has_supergfx).await;
-                                last_power = power;
+                    _ = tokio::time::sleep(Duration::from_millis(1000)) => {
+                        if let Ok(lock) = config.try_lock() {
+                            if !lock.enable_tray_icon {
+                                return;
                             }
                         }
-                    }
-                } else if let Some(dev) = dev.as_ref() {
-                    if let Ok(power) = dev.get_runtime_status() {
-                        if last_power != power {
-                            set_tray_icon_and_tip(GfxMode::Hybrid, power, &mut tray, has_supergfx)
-                                .await;
-                            last_power = power;
+                        // Handle GPU icon updates
+                        if has_supergfx {
+                            if let Ok(mode) = gfx_proxy.mode().await {
+                                if let Ok(power) = gfx_proxy.power().await {
+                                    if last_power != power {
+                                        set_tray_icon_and_tip(mode, power, &mut tray, has_supergfx).await;
+                                        last_power = power;
+                                    }
+                                }
+                            }
+                        } else if let Some(dev) = dev.as_ref() {
+                            if let Ok(power) = dev.get_runtime_status() {
+                                if last_power != power {
+                                    set_tray_icon_and_tip(GfxMode::Hybrid, power, &mut tray, has_supergfx)
+                                        .await;
+                                    last_power = power;
+                                }
+                            }
                         }
                     }
                 }

rog-control-center/src/ui/aura_animator.rs

@@ -0,0 +1,200 @@
+//! Software-based keyboard animation for keyboards that only support Static mode.
+//! Provides Rainbow and Color Cycle animations via timer-based color updates.
+
+use log::{info, warn};
+use slint::Weak;
+use std::process::Command;
+use std::sync::atomic::{AtomicBool, AtomicU32, Ordering};
+use std::sync::Arc;
+use std::time::Duration;
+
+use crate::MainWindow;
+
+/// Animation mode enum matching the UI
+#[derive(Clone, Copy, Debug, PartialEq, Default)]
+pub enum AnimationMode {
+    #[default]
+    None,
+    Rainbow,
+    ColorCycle,
+}
+
+impl From<i32> for AnimationMode {
+    fn from(v: i32) -> Self {
+        match v {
+            1 => AnimationMode::Rainbow,
+            2 => AnimationMode::ColorCycle,
+            _ => AnimationMode::None,
+        }
+    }
+}
+
+/// Shared state for the animator
+pub struct AnimatorState {
+    /// Current animation mode
+    pub mode: AtomicU32,
+    /// Animation speed in milliseconds (update interval)
+    pub speed_ms: AtomicU32,
+    /// Stop signal
+    pub stop: AtomicBool,
+    /// Current hue for rainbow mode (0-360)
+    hue: AtomicU32,
+}
+
+impl Default for AnimatorState {
+    fn default() -> Self {
+        Self {
+            mode: AtomicU32::new(0),
+            speed_ms: AtomicU32::new(200),
+            stop: AtomicBool::new(false),
+            hue: AtomicU32::new(0),
+        }
+    }
+}
+
+/// Convert HSV to RGB (H: 0-360, S: 0-100, V: 0-100)
+fn hsv_to_rgb(h: u32, s: u32, v: u32) -> (u8, u8, u8) {
+    let s = s as f32 / 100.0;
+    let v = v as f32 / 100.0;
+    let c = v * s;
+    let h_prime = (h as f32 / 60.0) % 6.0;
+    let x = c * (1.0 - ((h_prime % 2.0) - 1.0).abs());
+    let m = v - c;
+
+    let (r, g, b) = match h_prime as u32 {
+        0 => (c, x, 0.0),
+        1 => (x, c, 0.0),
+        2 => (0.0, c, x),
+        3 => (0.0, x, c),
+        4 => (x, 0.0, c),
+        _ => (c, 0.0, x),
+    };
+
+    (
+        ((r + m) * 255.0) as u8,
+        ((g + m) * 255.0) as u8,
+        ((b + m) * 255.0) as u8,
+    )
+}
+
+/// Format RGB as hex color string for asusctl
+fn rgb_to_hex(r: u8, g: u8, b: u8) -> String {
+    format!("{:02x}{:02x}{:02x}", r, g, b)
+}
+
+// Simple LCG for random numbers to avoid pulling in rand crate
+fn next_random(seed: &mut u64) -> u32 {
+    *seed = seed.wrapping_mul(6364136223846793005).wrapping_add(1);
+    (*seed >> 32) as u32
+}
+
+/// Start the animation loop (runs in tokio task)
+pub fn start_animator(state: Arc<AnimatorState>, _ui_weak: Weak<MainWindow>) {
+    info!("Starting keyboard animator");
+
+    tokio::spawn(async move {
+        // Local state for Color Cycle (RGB)
+        let mut current_r: f32 = 255.0;
+        let mut current_g: f32 = 0.0;
+        let mut current_b: f32 = 0.0;
+        let mut target_r: f32 = 0.0;
+        let mut target_g: f32 = 255.0;
+        let mut target_b: f32 = 0.0;
+        let mut seed = std::time::SystemTime::now()
+            .duration_since(std::time::UNIX_EPOCH)
+            .map(|d| d.as_nanos() as u64)
+            .unwrap_or(12345);
+
+        loop {
+            // Check for stop signal
+            if state.stop.load(Ordering::Relaxed) {
+                info!("Animator stopping");
+                break;
+            }
+
+            let mode = AnimationMode::from(state.mode.load(Ordering::Relaxed) as i32);
+            // Cap speed at 150ms for stability
+            let raw_speed = state.speed_ms.load(Ordering::Relaxed);
+            let effective_speed = raw_speed.max(150) as u64;
+
+            if mode == AnimationMode::None {
+                // No animation, sleep longer
+                tokio::time::sleep(Duration::from_millis(500)).await;
+                continue;
+            }
+
+            // Calculate next color
+            let hex_color = match mode {
+                AnimationMode::Rainbow => {
+                    // Hue step 1 for smooth, granular transitions
+                    let hue = state.hue.fetch_add(1, Ordering::Relaxed) % 360;
+                    let (r, g, b) = hsv_to_rgb(hue, 100, 100);
+                    rgb_to_hex(r, g, b)
+                }
+                AnimationMode::ColorCycle => {
+                    // RGB Linear Interpolation (Fading) - NOT Rainbow
+
+                    // 1. Check distance to target
+                    let dist_sq = (target_r - current_r).powi(2)
+                        + (target_g - current_g).powi(2)
+                        + (target_b - current_b).powi(2);
+
+                    // If close, pick new random target color
+                    if dist_sq < 100.0 {
+                        let next_h = next_random(&mut seed) % 360;
+                        let (r, g, b) = hsv_to_rgb(next_h, 100, 100);
+                        target_r = r as f32;
+                        target_g = g as f32;
+                        target_b = b as f32;
+                    }
+
+                    // 2. Lerp towards target (5% per frame for smooth ease-out)
+                    let factor = 0.05;
+                    current_r += (target_r - current_r) * factor;
+                    current_g += (target_g - current_g) * factor;
+                    current_b += (target_b - current_b) * factor;
+
+                    rgb_to_hex(current_r as u8, current_g as u8, current_b as u8)
+                }
+                AnimationMode::None => continue,
+            };
+
+            // Send color update via asusctl command (blocking, AWAITED to prevent races)
+            let hex = hex_color.clone();
+            let _ = tokio::task::spawn_blocking(move || {
+                let result = Command::new("asusctl")
+                    .args([
+                        "aura", "static", "-c", &hex,
+                    ])
+                    .output();
+
+                if let Err(e) = result {
+                    warn!("Failed to set aura color: {}", e);
+                }
+            })
+            .await;
+
+            // Sleep for the animation speed interval
+            tokio::time::sleep(Duration::from_millis(effective_speed)).await;
+        }
+    });
+}
+
+/// Stop the animator
+pub fn stop_animator(state: &Arc<AnimatorState>) {
+    state.stop.store(true, Ordering::Relaxed);
+    state.mode.store(0, Ordering::Relaxed);
+}
+
+/// Set animation mode
+pub fn set_animation_mode(state: &Arc<AnimatorState>, mode: AnimationMode) {
+    state.mode.store(mode as u32, Ordering::Relaxed);
+    // Reset stop flag in case we're restarting
+    state.stop.store(false, Ordering::Relaxed);
+}
+
+/// Set animation speed
+pub fn set_animation_speed(state: &Arc<AnimatorState>, speed_ms: u32) {
+    let clamped = speed_ms.clamp(50, 2000);
+    state.speed_ms.store(clamped, Ordering::Relaxed);
+}

rog-control-center/src/ui/mod.rs

@@ -1,6 +1,12 @@
+pub mod aura_animator;
 pub mod setup_anime;
 pub mod setup_aura;
+pub mod setup_fan_curve_custom;
 pub mod setup_fans;
+pub mod setup_screenpad;
+pub mod setup_slash;
+pub mod setup_status;
+pub mod setup_supergfx;
 pub mod setup_system;
 
 use std::sync::{Arc, Mutex};
@@ -11,9 +17,14 @@ use rog_dbus::list_iface_blocking;
 use slint::{ComponentHandle, SharedString, Weak};
 
 use crate::config::Config;
+use crate::tray::TrayStats;
 use crate::ui::setup_anime::setup_anime_page;
 use crate::ui::setup_aura::setup_aura_page;
 use crate::ui::setup_fans::setup_fan_curve_page;
+use crate::ui::setup_screenpad::setup_screenpad;
+use crate::ui::setup_slash::setup_slash;
+use crate::ui::setup_status::setup_status;
+use crate::ui::setup_supergfx::setup_supergfx;
 use crate::ui::setup_system::{setup_system_page, setup_system_page_callbacks};
 use crate::{AppSettingsPageData, MainWindow};
 
@@ -82,7 +93,10 @@ pub fn show_toast(
     };
 }
 
-pub fn setup_window(config: Arc<Mutex<Config>>) -> MainWindow {
+pub fn setup_window(
+    config: Arc<Mutex<Config>>,
+    stats_tx: tokio::sync::watch::Sender<TrayStats>,
+) -> MainWindow {
     slint::set_xdg_app_id("rog-control-center")
         .map_err(|e| warn!("Couldn't set application ID: {e:?}"))
         .ok();
@@ -101,9 +115,27 @@ pub fn setup_window(config: Arc<Mutex<Config>>) -> MainWindow {
             available.contains(&"xyz.ljones.Platform".to_string()),
             available.contains(&"xyz.ljones.Aura".to_string()),
             available.contains(&"xyz.ljones.Anime".to_string()),
+            available.contains(&"xyz.ljones.Slash".to_string()),
+            // Supergfx check
+            {
+                if let Ok(conn) = zbus::blocking::Connection::system() {
+                    zbus::blocking::fdo::DBusProxy::new(&conn)
+                        .ok()
+                        .and_then(|p| {
+                            p.name_has_owner("org.supergfxctl.Daemon".try_into().ok()?)
+                                .ok()
+                        })
+                        .unwrap_or(false)
+                } else {
+                    false
+                }
+            },
+            // Screenpad check (Backlight interface)
+            available.contains(&"xyz.ljones.Backlight".to_string()),
             available.contains(&"xyz.ljones.FanCurves".to_string()),
             true,
             true,
+            true,
         ]
         .into(),
     );
@@ -112,6 +144,33 @@ pub fn setup_window(config: Arc<Mutex<Config>>) -> MainWindow {
         slint::quit_event_loop().unwrap();
     });
 
+    // Auto-hide toast logic
+    let toast_gen = Arc::new(Mutex::new(0u64));
+    let ui_weak = ui.as_weak();
+    ui.on_start_toast_timer(move || {
+        let toast_gen_clone = toast_gen.clone();
+        let ui_weak_clone = ui_weak.clone();
+        let my_gen = {
+            if let Ok(mut g) = toast_gen.lock() {
+                *g += 1;
+                *g
+            } else {
+                0
+            }
+        };
+        if my_gen > 0 {
+            tokio::spawn(async move {
+                tokio::time::sleep(tokio::time::Duration::from_secs(4)).await;
+                if let Ok(g) = toast_gen_clone.lock() {
+                    if *g == my_gen {
+                        let _ =
+                            ui_weak_clone.upgrade_in_event_loop(move |ui| ui.invoke_hide_toast());
+                    }
+                }
+            });
+        }
+    });
+
     setup_app_settings_page(&ui, config.clone());
     if available.contains(&"xyz.ljones.Platform".to_string()) {
         setup_system_page(&ui, config.clone());
@@ -123,10 +182,24 @@ pub fn setup_window(config: Arc<Mutex<Config>>) -> MainWindow {
     if available.contains(&"xyz.ljones.Anime".to_string()) {
         setup_anime_page(&ui, config.clone());
     }
-    if available.contains(&"xyz.ljones.FanCurves".to_string()) {
-        setup_fan_curve_page(&ui, config);
+    if available.contains(&"xyz.ljones.Slash".to_string()) {
+        setup_slash(&ui, config.clone());
     }
 
+    // Always try to setup supergfx if detected above, but for simplicity here we assume if sidebar has it (re-check or just run)
+    // We didn't capture the boolean above. Let's just run it, it handles its own availability check internally via async proxy creation.
+    setup_supergfx(&ui, config.clone());
+
+    if available.contains(&"xyz.ljones.Backlight".to_string()) {
+        setup_screenpad(&ui, config.clone());
+    }
+
+    if available.contains(&"xyz.ljones.FanCurves".to_string()) {
+        setup_fan_curve_page(&ui, config.clone());
+    }
+
+    setup_status(&ui, config, stats_tx);
+
     ui
 }
 
@@ -153,18 +226,49 @@ pub fn setup_app_settings_page(ui: &MainWindow, config: Arc<Mutex<Config>>) {
             lock.write();
         }
     });
+
+    // Master notifications toggle
     let config_copy = config.clone();
-    global.on_set_enable_dgpu_notifications(move |enable| {
+    global.on_set_notifications_enabled(move |enable| {
         if let Ok(mut lock) = config_copy.try_lock() {
             lock.notifications.enabled = enable;
             lock.write();
         }
     });
 
+    // Granular notification toggles
+    let config_copy = config.clone();
+    global.on_set_notify_gfx_switch(move |enable| {
+        if let Ok(mut lock) = config_copy.try_lock() {
+            lock.notifications.receive_notify_gfx = enable;
+            lock.write();
+        }
+    });
+
+    let config_copy = config.clone();
+    global.on_set_notify_gfx_status(move |enable| {
+        if let Ok(mut lock) = config_copy.try_lock() {
+            lock.notifications.receive_notify_gfx_status = enable;
+            lock.write();
+        }
+    });
+
+    let config_copy = config.clone();
+    global.on_set_notify_platform_profile(move |enable| {
+        if let Ok(mut lock) = config_copy.try_lock() {
+            lock.notifications.receive_notify_platform_profile = enable;
+            lock.write();
+        }
+    });
+
+    // Initialize UI values from config
     if let Ok(lock) = config.try_lock() {
         global.set_run_in_background(lock.run_in_background);
         global.set_startup_in_background(lock.startup_in_background);
         global.set_enable_tray_icon(lock.enable_tray_icon);
-        global.set_enable_dgpu_notifications(lock.notifications.enabled);
+        global.set_notifications_enabled(lock.notifications.enabled);
+        global.set_notify_gfx_switch(lock.notifications.receive_notify_gfx);
+        global.set_notify_gfx_status(lock.notifications.receive_notify_gfx_status);
+        global.set_notify_platform_profile(lock.notifications.receive_notify_platform_profile);
     }
 }

rog-control-center/src/ui/setup_aura.rs

@@ -7,6 +7,9 @@ use rog_dbus::zbus_aura::AuraProxy;
 use slint::{ComponentHandle, Model, RgbaColor, SharedString};
 
 use crate::config::Config;
+use crate::ui::aura_animator::{
+    set_animation_mode, set_animation_speed, start_animator, AnimationMode, AnimatorState,
+};
 use crate::ui::show_toast;
 use crate::{
     set_ui_callbacks, set_ui_props_async, AuraPageData, MainWindow, PowerZones as SlintPowerZones,
@@ -123,8 +126,17 @@ pub fn setup_aura_page(ui: &MainWindow, _states: Arc<Mutex<Config>>) {
                 .ok();
         }
 
+        // Create animator state (shared across callbacks)
+        let animator_state = Arc::new(AnimatorState::default());
+
         if let Ok(modes) = aura.supported_basic_modes().await {
             log::debug!("Available LED modes {modes:?}");
+
+            // Check if only Static mode is available (enable software animation)
+            let static_only = modes.len() == 1 && modes.iter().any(|m| *m == 0.into());
+
+            let handle_for_anim = handle.clone();
+            let animator_state_clone = animator_state.clone();
             handle
                 .upgrade_in_event_loop(move |handle| {
                     let m: Vec<i32> = modes.iter().map(|n| (*n).into()).collect();
@@ -143,6 +155,33 @@ pub fn setup_aura_page(ui: &MainWindow, _states: Arc<Mutex<Config>>) {
                     handle
                         .global::<AuraPageData>()
                         .set_available_mode_names(res.as_slice().into());
+
+                    // Enable software animation if only Static mode is available
+                    if static_only {
+                        info!("Only Static mode available - enabling software animation controls");
+                        handle
+                            .global::<AuraPageData>()
+                            .set_soft_animation_available(true);
+
+                        // Start the animator thread
+                        start_animator(animator_state_clone.clone(), handle_for_anim.clone());
+
+                        // Connect mode callback
+                        let state_for_mode = animator_state_clone.clone();
+                        handle
+                            .global::<AuraPageData>()
+                            .on_cb_soft_animation_mode(move |mode| {
+                                set_animation_mode(&state_for_mode, AnimationMode::from(mode));
+                            });
+
+                        // Connect speed callback
+                        let state_for_speed = animator_state_clone.clone();
+                        handle
+                            .global::<AuraPageData>()
+                            .on_cb_soft_animation_speed(move |speed| {
+                                set_animation_speed(&state_for_speed, speed as u32);
+                            });
+                    }
                 })
                 .map_err(|e| error!("{e:}"))
                 .ok();

rog-control-center/src/ui/setup_fan_curve_custom.rs

@@ -0,0 +1,241 @@
+use std::fs;
+use std::path::{Path, PathBuf};
+
+use log::{error, info};
+use serde::{Deserialize, Serialize};
+
+use crate::{FanType, MainWindow, Node};
+
+const ASUS_CUSTOM_FAN_NAME: &str = "asus_custom_fan_curve";
+const CONFIG_FILE_NAME: &str = "custom_fans.ron";
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct CustomCurvePoint {
+    pub temp: u8,
+    pub pwm: u8,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, Default)]
+pub struct CustomFanConfig {
+    pub cpu_curve: Vec<CustomCurvePoint>,
+    pub gpu_curve: Vec<CustomCurvePoint>,
+    pub enabled: bool,
+}
+
+#[derive(Clone)]
+struct SysfsPaths {
+    root: PathBuf,
+}
+
+impl SysfsPaths {
+    fn new() -> Option<Self> {
+        let hwmon = Path::new("/sys/class/hwmon");
+        if let Ok(entries) = fs::read_dir(hwmon) {
+            for entry in entries.flatten() {
+                let path = entry.path();
+                let name_path = path.join("name");
+                if let Ok(name) = fs::read_to_string(&name_path) {
+                    if name.trim() == ASUS_CUSTOM_FAN_NAME {
+                        info!("Found ASUS Custom Fan Control at {:?}", path);
+                        return Some(Self { root: path });
+                    }
+                }
+            }
+        }
+        None
+    }
+
+    fn enable_path(&self, index: u8) -> PathBuf {
+        self.root.join(format!("pwm{}_enable", index))
+    }
+
+    fn point_pwm_path(&self, fan_idx: u8, point_idx: u8) -> PathBuf {
+        self.root
+            .join(format!("pwm{}_auto_point{}_pwm", fan_idx, point_idx))
+    }
+
+    fn point_temp_path(&self, fan_idx: u8, point_idx: u8) -> PathBuf {
+        self.root
+            .join(format!("pwm{}_auto_point{}_temp", fan_idx, point_idx))
+    }
+}
+
+// Helper to write with logging
+fn write_sysfs(path: &Path, value: &str) -> std::io::Result<()> {
+    // debug!("Writing {} to {:?}", value, path);
+    fs::write(path, value)
+}
+
+fn _read_sysfs_u8(path: &Path) -> std::io::Result<u8> {
+    let s = fs::read_to_string(path)?;
+    s.trim()
+        .parse::<u8>()
+        .map_err(|e| std::io::Error::new(std::io::ErrorKind::InvalidData, e))
+}
+
+pub fn is_custom_fan_supported() -> bool {
+    SysfsPaths::new().is_some()
+}
+
+// Logic to apply a full curve to a specific fan (1=CPU, 2=GPU usually)
+// Implements the "Gradual Descent" algorithm
+fn apply_curve_to_fan(
+    paths: &SysfsPaths,
+    fan_idx: u8,
+    points: &[CustomCurvePoint],
+) -> std::io::Result<()> {
+    // Sort target points by temp (Hardware Requirement)
+    let mut sorted_target = points.to_vec();
+    sorted_target.sort_by_key(|p| p.temp);
+
+    // Ensure we have 8 points (fill with last if needed, or sensible default)
+    while sorted_target.len() < 8 {
+        if let Some(last) = sorted_target.last() {
+            sorted_target.push(last.clone());
+        } else {
+            sorted_target.push(CustomCurvePoint {
+                temp: 100,
+                pwm: 255,
+            });
+        }
+    }
+    sorted_target.truncate(8);
+
+    // Validate Temp Order (Synchronous Check)
+    for (i, p) in sorted_target.iter().enumerate() {
+        if i > 0 {
+            let prev_temp = sorted_target[i - 1].temp;
+            if p.temp < prev_temp {
+                error!("Invalid temp order");
+                return Err(std::io::Error::new(
+                    std::io::ErrorKind::InvalidInput,
+                    "Temp disorder",
+                ));
+            }
+        }
+    }
+
+    // Spawn completely detached thread for ALL I/O
+    let paths_clone = paths.clone();
+    let sorted_target = sorted_target.clone();
+
+    std::thread::spawn(move || {
+        let paths = paths_clone;
+
+        // 1. Enable custom mode
+        if let Err(e) = write_sysfs(&paths.enable_path(fan_idx), "1") {
+            error!("Failed to enable custom fan mode: {}", e);
+            return;
+        }
+
+        // 2. Write Temps
+        for (i, p) in sorted_target.iter().enumerate() {
+            let point_idx = (i + 1) as u8;
+            if let Err(e) = write_sysfs(
+                &paths.point_temp_path(fan_idx, point_idx),
+                &p.temp.to_string(),
+            ) {
+                error!("Failed to write temp point {}: {}", point_idx, e);
+            }
+        }
+
+        // 3. Write PWMs directly (hardware handles gradual transition)
+        for (i, target_p) in sorted_target.iter().enumerate() {
+            let point_idx = (i + 1) as u8;
+            if let Err(e) = write_sysfs(
+                &paths.point_pwm_path(fan_idx, point_idx),
+                &target_p.pwm.to_string(),
+            ) {
+                error!("Failed to write PWM point {}: {}", point_idx, e);
+            }
+        }
+
+        // 4. Ensure enable is set
+        let _ = write_sysfs(&paths.enable_path(fan_idx), "1");
+    });
+
+    Ok(())
+}
+
+fn set_fan_auto(paths: &SysfsPaths, fan_idx: u8) -> std::io::Result<()> {
+    // 2 = Auto (usually)
+    write_sysfs(&paths.enable_path(fan_idx), "2")
+}
+
+fn load_config() -> CustomFanConfig {
+    if let Some(config_dir) = dirs::config_dir() {
+        let path = config_dir.join("rog").join(CONFIG_FILE_NAME);
+        if let Ok(content) = fs::read_to_string(path) {
+            if let Ok(cfg) = ron::from_str(&content) {
+                return cfg;
+            }
+        }
+    }
+    CustomFanConfig::default()
+}
+
+fn save_config(config: &CustomFanConfig) {
+    if let Some(config_dir) = dirs::config_dir() {
+        let rog_dir = config_dir.join("rog");
+        let _ = fs::create_dir_all(&rog_dir);
+        let path = rog_dir.join(CONFIG_FILE_NAME);
+        if let Ok(s) = ron::ser::to_string_pretty(config, ron::ser::PrettyConfig::default()) {
+            let _ = fs::write(path, s);
+        }
+    }
+}
+
+// Public entry point called from setup_fans.rs or similar
+// Returns immediately - all work is done in a detached thread
+pub fn apply_custom_fan_curve(
+    _handle_weak: slint::Weak<MainWindow>,
+    fan_type: FanType,
+    enabled: bool,
+    nodes: Vec<Node>,
+) {
+    // Fan Index: 1=CPU, 2=GPU usually.
+    let fan_idx = match fan_type {
+        FanType::CPU => 1,
+        FanType::GPU => 2,
+        _ => return, // Ignore others
+    };
+
+    // Convert nodes to points (fast, CPU-only)
+    let points: Vec<CustomCurvePoint> = nodes
+        .iter()
+        .map(|n| CustomCurvePoint {
+            temp: n.x as u8,
+            pwm: n.y as u8,
+        })
+        .collect();
+
+    // Spawn a completely detached thread for ALL I/O
+    std::thread::spawn(move || {
+        // Get paths (blocking FS operation)
+        let Some(paths) = SysfsPaths::new() else {
+            error!("No custom fan support found");
+            return;
+        };
+
+        // Save config
+        let mut cfg = load_config();
+        if enabled {
+            match fan_type {
+                FanType::CPU => cfg.cpu_curve = points.clone(),
+                FanType::GPU => cfg.gpu_curve = points.clone(),
+                _ => {}
+            }
+        }
+        cfg.enabled = enabled;
+        save_config(&cfg);
+
+        // Apply curve or set auto
+        if enabled {
+            if let Err(e) = apply_curve_to_fan(&paths, fan_idx, &points) {
+                error!("Failed to apply fan curve: {}", e);
+            }
+        } else if let Err(e) = set_fan_auto(&paths, fan_idx) {
+            error!("Failed to set fan auto: {}", e);
+        }
+    });
+}

rog-control-center/src/ui/setup_fans.rs

@@ -1,4 +1,6 @@
-use std::sync::{Arc, Mutex};
+use crate::ui::show_toast;
+use std::collections::HashMap;
+use std::sync::{Arc, Mutex, OnceLock};
 
 use log::error;
 use rog_dbus::zbus_fan_curves::FanCurvesProxy;
@@ -8,7 +10,25 @@ use rog_profiles::fan_curve_set::CurveData;
 use slint::{ComponentHandle, Model, Weak};
 
 use crate::config::Config;
-use crate::{FanPageData, FanType, MainWindow, Node};
+use crate::{FanPageData, FanType, MainWindow, Node, Profile};
+
+// Isolated Rust-side cache for fan curves (not affected by Slint reactivity)
+type FanCacheKey = (i32, i32); // (Profile as i32, FanType as i32)
+static FAN_CACHE: OnceLock<Mutex<HashMap<FanCacheKey, Vec<Node>>>> = OnceLock::new();
+
+fn fan_cache() -> &'static Mutex<HashMap<FanCacheKey, Vec<Node>>> {
+    FAN_CACHE.get_or_init(|| Mutex::new(HashMap::new()))
+}
+
+fn cache_fan_curve(profile: Profile, fan_type: FanType, nodes: Vec<Node>) {
+    let key = (profile as i32, fan_type as i32);
+    fan_cache().lock().unwrap().insert(key, nodes);
+}
+
+fn get_cached_fan_curve(profile: Profile, fan_type: FanType) -> Option<Vec<Node>> {
+    let key = (profile as i32, fan_type as i32);
+    fan_cache().lock().unwrap().get(&key).cloned()
+}
 
 pub fn update_fan_data(
     handle: Weak<MainWindow>,
@@ -19,7 +39,7 @@ pub fn update_fan_data(
     handle
         .upgrade_in_event_loop(move |handle| {
             let global = handle.global::<FanPageData>();
-            let collect = |temp: &[u8], pwm: &[u8]| -> slint::ModelRc<Node> {
+            let _collect = |temp: &[u8], pwm: &[u8]| -> slint::ModelRc<Node> {
                 let tmp: Vec<Node> = temp
                     .iter()
                     .zip(pwm.iter())
@@ -33,61 +53,100 @@ pub fn update_fan_data(
 
             for fan in bal {
                 global.set_balanced_available(true);
+                let nodes_vec: Vec<Node> = fan
+                    .temp
+                    .iter()
+                    .zip(fan.pwm.iter())
+                    .map(|(x, y)| Node {
+                        x: *x as f32,
+                        y: *y as f32,
+                    })
+                    .collect();
+                let nodes: slint::ModelRc<Node> = nodes_vec.as_slice().into();
                 match fan.fan {
                     rog_profiles::FanCurvePU::CPU => {
                         global.set_cpu_fan_available(true);
                         global.set_balanced_cpu_enabled(fan.enabled);
-                        global.set_balanced_cpu(collect(&fan.temp, &fan.pwm))
+                        global.set_balanced_cpu(nodes.clone());
+                        cache_fan_curve(Profile::Balanced, FanType::CPU, nodes_vec);
                     }
                     rog_profiles::FanCurvePU::GPU => {
                         global.set_gpu_fan_available(true);
                         global.set_balanced_gpu_enabled(fan.enabled);
-                        global.set_balanced_gpu(collect(&fan.temp, &fan.pwm))
+                        global.set_balanced_gpu(nodes.clone());
+                        cache_fan_curve(Profile::Balanced, FanType::GPU, nodes_vec);
                     }
                     rog_profiles::FanCurvePU::MID => {
                         global.set_mid_fan_available(true);
                         global.set_balanced_mid_enabled(fan.enabled);
-                        global.set_balanced_mid(collect(&fan.temp, &fan.pwm))
+                        global.set_balanced_mid(nodes.clone());
+                        cache_fan_curve(Profile::Balanced, FanType::Middle, nodes_vec);
                     }
                 }
             }
             for fan in perf {
                 global.set_performance_available(true);
+                let nodes_vec: Vec<Node> = fan
+                    .temp
+                    .iter()
+                    .zip(fan.pwm.iter())
+                    .map(|(x, y)| Node {
+                        x: *x as f32,
+                        y: *y as f32,
+                    })
+                    .collect();
+                let nodes: slint::ModelRc<Node> = nodes_vec.as_slice().into();
                 match fan.fan {
                     rog_profiles::FanCurvePU::CPU => {
                         global.set_cpu_fan_available(true);
                         global.set_performance_cpu_enabled(fan.enabled);
-                        global.set_performance_cpu(collect(&fan.temp, &fan.pwm))
+                        global.set_performance_cpu(nodes.clone());
+                        cache_fan_curve(Profile::Performance, FanType::CPU, nodes_vec);
                     }
                     rog_profiles::FanCurvePU::GPU => {
                         global.set_gpu_fan_available(true);
                         global.set_performance_gpu_enabled(fan.enabled);
-                        global.set_performance_gpu(collect(&fan.temp, &fan.pwm))
+                        global.set_performance_gpu(nodes.clone());
+                        cache_fan_curve(Profile::Performance, FanType::GPU, nodes_vec);
                     }
                     rog_profiles::FanCurvePU::MID => {
                         global.set_mid_fan_available(true);
                         global.set_performance_mid_enabled(fan.enabled);
-                        global.set_performance_mid(collect(&fan.temp, &fan.pwm))
+                        global.set_performance_mid(nodes.clone());
+                        cache_fan_curve(Profile::Performance, FanType::Middle, nodes_vec);
                     }
                 }
             }
             for fan in quiet {
                 global.set_quiet_available(true);
+                let nodes_vec: Vec<Node> = fan
+                    .temp
+                    .iter()
+                    .zip(fan.pwm.iter())
+                    .map(|(x, y)| Node {
+                        x: *x as f32,
+                        y: *y as f32,
+                    })
+                    .collect();
+                let nodes: slint::ModelRc<Node> = nodes_vec.as_slice().into();
                 match fan.fan {
                     rog_profiles::FanCurvePU::CPU => {
                         global.set_cpu_fan_available(true);
                         global.set_quiet_cpu_enabled(fan.enabled);
-                        global.set_quiet_cpu(collect(&fan.temp, &fan.pwm))
+                        global.set_quiet_cpu(nodes.clone());
+                        cache_fan_curve(Profile::Quiet, FanType::CPU, nodes_vec);
                     }
                     rog_profiles::FanCurvePU::GPU => {
                         global.set_gpu_fan_available(true);
                         global.set_quiet_gpu_enabled(fan.enabled);
-                        global.set_quiet_gpu(collect(&fan.temp, &fan.pwm))
+                        global.set_quiet_gpu(nodes.clone());
+                        cache_fan_curve(Profile::Quiet, FanType::GPU, nodes_vec);
                     }
                     rog_profiles::FanCurvePU::MID => {
                         global.set_mid_fan_available(true);
                         global.set_quiet_mid_enabled(fan.enabled);
-                        global.set_quiet_mid(collect(&fan.temp, &fan.pwm))
+                        global.set_quiet_mid(nodes.clone());
+                        cache_fan_curve(Profile::Quiet, FanType::Middle, nodes_vec);
                     }
                 }
             }
@@ -168,15 +227,25 @@ pub fn setup_fan_curve_page(ui: &MainWindow, _config: Arc<Mutex<Config>>) {
 
         update_fan_data(handle, balanced, perf, quiet);
 
+        let choices_for_ui = platform_profile_choices.clone();
         let handle_next1 = handle_copy.clone();
         if let Err(e) = handle_copy.upgrade_in_event_loop(move |handle| {
+            let handle_weak_for_fans = handle.as_weak();
             let global = handle.global::<FanPageData>();
             let fans1 = fans.clone();
+            let choices = choices_for_ui.clone();
             global.on_set_profile_default(move |profile| {
                 let fans = fans1.clone();
                 let handle_next = handle_next1.clone();
+                let choices = choices.clone();
                 tokio::spawn(async move {
-                    if fans.set_curves_to_defaults(profile.into()).await.is_err() {
+                    let mut target: PlatformProfile = profile.into();
+                    if target == PlatformProfile::Quiet
+                        && !choices.contains(&PlatformProfile::Quiet)
+                    {
+                        target = PlatformProfile::LowPower;
+                    }
+                    if fans.set_curves_to_defaults(target).await.is_err() {
                         return;
                     }
                     let Ok(balanced) = fans
@@ -203,17 +272,103 @@ pub fn setup_fan_curve_page(ui: &MainWindow, _config: Arc<Mutex<Config>>) {
                     update_fan_data(handle_next, balanced, perf, quiet);
                 });
             });
+
+            let handle_weak_for_cancel = handle_weak_for_fans.clone();
             global.on_set_fan_data(move |fan, profile, enabled, data| {
+                if crate::ui::setup_fan_curve_custom::is_custom_fan_supported() {
+                    let handle_weak = handle_weak_for_fans.clone();
+                    let data: Vec<Node> = data.iter().collect();
+
+                    use log::info;
+                    info!("MainThread: Request to apply custom curve for {:?}", fan);
+
+                    // Explicitly spawn a thread to handle this, preventing ANY main thread blocking
+                    std::thread::spawn(move || {
+                        info!("WorkerThread: applying curve for {:?}", fan);
+                        crate::ui::setup_fan_curve_custom::apply_custom_fan_curve(
+                            handle_weak.clone(),
+                            fan,
+                            enabled,
+                            data,
+                        );
+                        info!("WorkerThread: returned from apply (async), clearing busy flag for {:?}", fan);
+
+                        // Clear busy flag
+                        let _ = handle_weak.upgrade_in_event_loop(move |h| {
+                            let g = h.global::<FanPageData>();
+                            match fan {
+                                FanType::CPU => g.set_is_busy_cpu(false),
+                                FanType::GPU => g.set_is_busy_gpu(false),
+                                FanType::Middle => g.set_is_busy_mid(false),
+                            }
+                            info!("MainThread: cleared busy flag for {:?}", fan);
+                        });
+                    });
+
+                    return;
+                }
+
                 let fans = fans.clone();
-                let data: Vec<Node> = data.iter().collect();
-                let data = fan_data_for(fan, enabled, data);
+                let handle_weak = handle_weak_for_fans.clone();
+                let nodes_vec: Vec<Node> = data.iter().collect();
+                let _data_copy = nodes_vec.clone();
+                let cache_copy = nodes_vec.clone(); // Clone for cache update
+                let fan_data = fan_data_for(fan, enabled, nodes_vec);
                 tokio::spawn(async move {
-                    fans.set_fan_curve(profile.into(), data)
-                        .await
-                        .map_err(|e| error!("{e:}"))
-                        .ok()
+                    show_toast(
+                        "Fan curve applied".into(),
+                        "Failed to apply fan curve".into(),
+                        handle_weak.clone(),
+                        fans.set_fan_curve(profile.into(), fan_data).await,
+                    );
+                    let _ = handle_weak.upgrade_in_event_loop(move |h| {
+                        let g = h.global::<FanPageData>();
+                        // Update Rust-side cache (isolated from Slint properties)
+                        cache_fan_curve(profile, fan, cache_copy);
+
+                        match fan {
+                            FanType::CPU => g.set_is_busy_cpu(false),
+                            FanType::GPU => g.set_is_busy_gpu(false),
+                            FanType::Middle => g.set_is_busy_mid(false),
+                        }
+                    });
                 });
             });
+            global.on_cancel(move |fan_type, profile| {
+                let handle_weak = handle_weak_for_cancel.clone();
+                let _ = handle_weak.upgrade_in_event_loop(move |h: MainWindow| {
+                    let global = h.global::<FanPageData>();
+
+                    // Retrieve from isolated Rust cache
+                    let nodes_opt = get_cached_fan_curve(profile, fan_type);
+
+                    if let Some(nodes_vec) = nodes_opt {
+                        use log::info;
+                        info!("Canceling {:?} {:?} - restoring {} nodes from isolated cache", fan_type, profile, nodes_vec.len());
+
+                        let new_model: slint::ModelRc<Node> = nodes_vec.as_slice().into();
+
+                        match (profile, fan_type) {
+                            (crate::Profile::Balanced, FanType::CPU) => global.set_balanced_cpu(new_model),
+                            (crate::Profile::Balanced, FanType::GPU) => global.set_balanced_gpu(new_model),
+                            (crate::Profile::Balanced, FanType::Middle) => global.set_balanced_mid(new_model),
+                            (crate::Profile::Performance, FanType::CPU) => global.set_performance_cpu(new_model),
+                            (crate::Profile::Performance, FanType::GPU) => global.set_performance_gpu(new_model),
+                            (crate::Profile::Performance, FanType::Middle) => global.set_performance_mid(new_model),
+                            (crate::Profile::Quiet, FanType::CPU) => global.set_quiet_cpu(new_model),
+                            (crate::Profile::Quiet, FanType::GPU) => global.set_quiet_gpu(new_model),
+                            (crate::Profile::Quiet, FanType::Middle) => global.set_quiet_mid(new_model),
+                            _ => {}
+                        }
+                    } else {
+                        log::warn!("Cancel failed: No cached data for {:?} {:?}", fan_type, profile);
+                    }
+                });
+            });
+            // Initialize warning
+            if crate::ui::setup_fan_curve_custom::is_custom_fan_supported() {
+                global.set_show_custom_warning(true);
+            }
         }) {
             error!("setup_fan_curve_page: upgrade_in_event_loop: {e:?}");
         }

rog-control-center/src/ui/setup_screenpad.rs

@@ -0,0 +1,143 @@
+use log::{debug, error};
+use rog_dbus::zbus_backlight::BacklightProxy;
+use slint::ComponentHandle;
+use std::sync::{Arc, Mutex};
+
+use crate::config::Config;
+use crate::ui::show_toast;
+use crate::{MainWindow, ScreenpadPageData};
+
+pub fn setup_screenpad(ui: &MainWindow, _config: Arc<Mutex<Config>>) {
+    let handle = ui.as_weak();
+
+    tokio::spawn(async move {
+        // Create the connections/proxies here
+        let conn = match zbus::Connection::system().await {
+            Ok(conn) => conn,
+            Err(e) => {
+                error!("Failed to connect to system bus for Screenpad: {e:}");
+                return;
+            }
+        };
+
+        let backlight = match BacklightProxy::builder(&conn).build().await {
+            Ok(backlight) => backlight,
+            Err(e) => {
+                error!("Failed to create backlight proxy for Screenpad: {e:}");
+                return;
+            }
+        };
+
+        // Initialize state
+        debug!("Initializing Screenpad page data");
+
+        // Use helper to set initial properties
+        if let Ok(val) = backlight.screenpad_brightness().await {
+            handle
+                .upgrade_in_event_loop(move |h| {
+                    h.global::<ScreenpadPageData>().set_brightness(val);
+                    // Assume power is on if brightness > 0
+                    h.global::<ScreenpadPageData>().set_power(val > 0);
+                })
+                .ok();
+        }
+
+        if let Ok(gamma_str) = backlight.screenpad_gamma().await {
+            if let Ok(gamma) = gamma_str.parse::<f32>() {
+                handle
+                    .upgrade_in_event_loop(move |h| {
+                        h.global::<ScreenpadPageData>().set_gamma(gamma);
+                    })
+                    .ok();
+            }
+        }
+
+        if let Ok(sync) = backlight.screenpad_sync_with_primary().await {
+            handle
+                .upgrade_in_event_loop(move |h| {
+                    h.global::<ScreenpadPageData>().set_sync_with_primary(sync);
+                })
+                .ok();
+        }
+
+        // Set up callbacks
+        let handle_copy = handle.clone();
+        let backlight_copy = backlight.clone();
+        handle
+            .upgrade_in_event_loop(move |h| {
+                let global = h.global::<ScreenpadPageData>();
+
+                // Brightness Callback
+                let hl = handle_copy.clone();
+                let bl = backlight_copy.clone();
+                global.on_cb_brightness(move |val| {
+                    let bl = bl.clone();
+                    let hl = hl.clone();
+                    tokio::spawn(async move {
+                        show_toast(
+                            format!("Screenpad brightness set to {}", val).into(),
+                            "Failed to set Screenpad brightness".into(),
+                            hl,
+                            bl.set_screenpad_brightness(val).await,
+                        );
+                    });
+                });
+
+                // Gamma Callback
+                let hl = handle_copy.clone();
+                let bl = backlight_copy.clone();
+                global.on_cb_gamma(move |val| {
+                    let bl = bl.clone();
+                    let hl = hl.clone();
+                    tokio::spawn(async move {
+                        show_toast(
+                            format!("Screenpad gamma set to {:.2}", val).into(),
+                            "Failed to set Screenpad gamma".into(),
+                            hl,
+                            bl.set_screenpad_gamma(&val.to_string()).await,
+                        );
+                    });
+                });
+
+                // Sync Callback
+                let hl = handle_copy.clone();
+                let bl = backlight_copy.clone();
+                global.on_cb_sync_with_primary(move |val| {
+                    let bl = bl.clone();
+                    let hl = hl.clone();
+                    tokio::spawn(async move {
+                        show_toast(
+                            format!(
+                                "Screenpad sync {}",
+                                if val { "enabled" } else { "disabled" }
+                            )
+                            .into(),
+                            "Failed to toggle Screenpad sync".into(),
+                            hl,
+                            bl.set_screenpad_sync_with_primary(val).await,
+                        );
+                    });
+                });
+
+                // Power Callback (Toggle brightness to 0/last or 100)
+                let hl = handle_copy.clone();
+                let bl = backlight_copy.clone();
+                global.on_cb_power(move |val| {
+                    let bl = bl.clone();
+                    let hl = hl.clone();
+                    tokio::spawn(async move {
+                        let target = if val { 100 } else { 0 };
+                        let _ = bl.set_screenpad_brightness(target).await;
+                        hl.upgrade_in_event_loop(move |h| {
+                            h.global::<ScreenpadPageData>().set_brightness(target);
+                        })
+                        .ok();
+                    });
+                });
+            })
+            .ok();
+
+        // Optional: Value watches for external changes
+        // (Similar to setup_system.rs if needed)
+    });
+}

rog-control-center/src/ui/setup_slash.rs

@@ -0,0 +1,132 @@
+use crate::config::Config;
+use crate::set_ui_callbacks;
+use crate::ui::show_toast;
+use crate::{MainWindow, SlashPageData};
+use rog_dbus::{find_iface_async, zbus_slash::SlashProxy};
+use rog_slash::SlashMode;
+use slint::{ComponentHandle, Model};
+use std::str::FromStr;
+use std::sync::{Arc, Mutex};
+
+pub fn setup_slash(ui: &MainWindow, _config: Arc<Mutex<Config>>) {
+    let ui_weak = ui.as_weak();
+
+    tokio::spawn(async move {
+        // Find the Slash interface proxy
+        let proxies = match find_iface_async::<SlashProxy>("xyz.ljones.Slash").await {
+            Ok(p) => p,
+            Err(e) => {
+                log::warn!("Failed to find Slash interface: {}", e);
+                return;
+            }
+        };
+
+        let proxy = match proxies.first() {
+            Some(p) => p.clone(),
+            None => return,
+        };
+
+        // UI Callbacks (MUST be done on UI thread to access global state)
+        {
+            let proxy_copy = proxy.clone();
+
+            let _ = ui_weak.upgrade_in_event_loop(move |ui| {
+                let proxy = proxy_copy.clone();
+                let ui_handle = ui;
+
+                set_ui_callbacks!(ui_handle, SlashPageData(), proxy.enabled(), "Slash enabled {}", "Failed to enable slash");
+
+                // Fix: Cast f32 (UI) to u8 (DBus)
+                set_ui_callbacks!(ui_handle, SlashPageData(as f32), proxy.brightness(as u8), "Slash brightness set to {}", "Failed to set slash brightness");
+                set_ui_callbacks!(ui_handle, SlashPageData(as f32), proxy.interval(as u8), "Slash interval set to {}", "Failed to set slash interval");
+
+                set_ui_callbacks!(ui_handle, SlashPageData(), proxy.show_battery_warning(), "Battery warning set to {}", "Failed to set battery warning");
+                set_ui_callbacks!(ui_handle, SlashPageData(), proxy.show_on_battery(), "Show on battery set to {}", "Failed to set show on battery");
+                set_ui_callbacks!(ui_handle, SlashPageData(), proxy.show_on_boot(), "Show on boot set to {}", "Failed to set show on boot");
+                set_ui_callbacks!(ui_handle, SlashPageData(), proxy.show_on_shutdown(), "Show on shutdown set to {}", "Failed to set show on shutdown");
+                set_ui_callbacks!(ui_handle, SlashPageData(), proxy.show_on_sleep(), "Show on sleep set to {}", "Failed to set show on sleep");
+                set_ui_callbacks!(ui_handle, SlashPageData(), proxy.show_on_lid_closed(), "Show on lid closed set to {}", "Failed to set show on lid closed");
+            });
+        }
+
+        // Custom Mode Logic - Callback setup
+        {
+            let proxy_copy = proxy.clone();
+            let ui_weak_copy = ui_weak.clone();
+            let _ = ui_weak.upgrade_in_event_loop(move |ui| {
+                let data = ui.global::<SlashPageData>();
+
+                data.on_cb_mode_index(move |idx| {
+                    let proxy_copy = proxy_copy.clone();
+                    let handle_weak = ui_weak_copy.clone();
+
+                    let mode_str_opt = if let Some(h) = handle_weak.upgrade() {
+                        let d = h.global::<SlashPageData>();
+                        if idx >= 0 && (idx as usize) < d.get_modes().row_count() {
+                            Some(d.get_modes().row_data(idx as usize).unwrap_or_default())
+                        } else {
+                            None
+                        }
+                    } else {
+                        None
+                    };
+
+                    if let Some(mode_str) = mode_str_opt {
+                        if let Ok(mode) = SlashMode::from_str(&mode_str) {
+                            tokio::spawn(async move {
+                                show_toast(
+                                    format!("Slash mode set to {}", mode).into(),
+                                    "Failed to set slash mode".into(),
+                                    handle_weak,
+                                    proxy_copy.set_mode(mode).await,
+                                );
+                            });
+                        }
+                    }
+                });
+            });
+        }
+
+        // D-Bus Signal -> UI
+        let proxy_copy = proxy.clone();
+        let handle_copy = ui_weak.clone();
+        tokio::spawn(async move {
+            let mut changes = proxy_copy.receive_mode_changed().await;
+            use futures_util::StreamExt;
+            while let Some(change) = changes.next().await {
+                if let Ok(mode) = change.get().await {
+                    let mode_str = mode.to_string();
+                    let handle_copy = handle_copy.clone();
+                    let _ = slint::invoke_from_event_loop(move || {
+                        if let Some(h) = handle_copy.upgrade() {
+                            let d = h.global::<SlashPageData>();
+                            let model = d.get_modes();
+                            for (i, m) in model.iter().enumerate() {
+                                if m == mode_str {
+                                    d.set_mode_index(i as i32);
+                                    break;
+                                }
+                            }
+                        }
+                    });
+                }
+            }
+        });
+
+        if let Ok(m) = proxy.mode().await {
+            let mode_str = m.to_string();
+            let _ = slint::invoke_from_event_loop(move || {
+                if let Some(h) = ui_weak.upgrade() {
+                    let d = h.global::<SlashPageData>();
+                    let model = d.get_modes();
+                    for (i, m) in model.iter().enumerate() {
+                        if m == mode_str {
+                            d.set_mode_index(i as i32);
+                            break;
+                        }
+                    }
+                }
+            });
+        }
+    });
+}

rog-control-center/src/ui/setup_status.rs

@@ -0,0 +1,150 @@
+use crate::config::Config;
+use crate::tray::TrayStats;
+use crate::{MainWindow, SystemStatus};
+use rog_dbus::zbus_platform::PlatformProxy;
+use slint::ComponentHandle;
+use std::collections::VecDeque;
+use std::path::PathBuf;
+use std::sync::{Arc, Mutex};
+use tokio::fs;
+use tokio::time::Duration;
+use zbus::Connection;
+
+pub fn setup_status(
+    ui: &MainWindow,
+    _config: Arc<Mutex<Config>>,
+    stats_tx: tokio::sync::watch::Sender<TrayStats>,
+) {
+    let ui_weak = ui.as_weak();
+
+    tokio::spawn(async move {
+        let mut power_history: VecDeque<i32> = VecDeque::with_capacity(150); // 300s window at 2s poll
+                                                                             // DBus connection for profile
+        let conn = Connection::system().await.ok();
+        let platform = if let Some(c) = &conn {
+            PlatformProxy::new(c).await.ok()
+        } else {
+            None
+        };
+
+        loop {
+            let (cpu_temp, gpu_temp, cpu_fan, gpu_fan) = read_hwmon().await;
+            let power_microwatts = read_power().await;
+
+            // Rolling average logic
+            if power_history.len() >= 150 {
+                power_history.pop_front();
+            }
+            power_history.push_back(power_microwatts);
+
+            let sum: i64 = power_history.iter().map(|&x| x as i64).sum();
+            let avg_microwatts = if !power_history.is_empty() {
+                sum / power_history.len() as i64
+            } else {
+                0
+            };
+
+            // Convert to Watts
+            let power_w = power_microwatts as f64 / 1_000_000.0;
+            let avg_w = avg_microwatts as f64 / 1_000_000.0;
+
+            // Fetch profile
+            let mut profile_str = "Unknown".to_string();
+            if let Some(p) = &platform {
+                if let Ok(prof) = p.platform_profile().await {
+                    profile_str = format!("{:?}", prof);
+                }
+            }
+            let ui_weak_loop = ui_weak.clone(); // Clone ui_weak for this iteration
+
+            // Send to Tray
+            let _ = stats_tx.send(TrayStats {
+                cpu_temp: format!("{}", cpu_temp),
+                gpu_temp: format!("{}", gpu_temp),
+                cpu_fan: format!("{}", cpu_fan),
+                gpu_fan: format!("{}", gpu_fan),
+                power_w: format!("{:.1}", power_w),
+                power_profile: profile_str,
+            });
+
+            let _ = slint::invoke_from_event_loop(move || {
+                if let Some(ui) = ui_weak_loop.upgrade() {
+                    let global = ui.global::<SystemStatus>();
+                    global.set_cpu_temp(cpu_temp);
+                    global.set_gpu_temp(gpu_temp);
+                    global.set_cpu_fan(cpu_fan);
+                    global.set_gpu_fan(gpu_fan);
+
+                    global.set_power_w(slint::SharedString::from(format!("{:.1}", power_w)));
+                    global.set_power_avg_w(slint::SharedString::from(format!("{:.1}", avg_w)));
+                }
+            });
+
+            tokio::time::sleep(Duration::from_secs(2)).await;
+        }
+    });
+}
+
+async fn read_hwmon() -> (i32, i32, i32, i32) {
+    let mut cpu_temp = 0;
+    let mut gpu_temp = 0;
+    let mut cpu_fan = 0;
+    let mut gpu_fan = 0;
+
+    let mut entries = match fs::read_dir("/sys/class/hwmon").await {
+        Ok(e) => e,
+        Err(_) => return (0, 0, 0, 0),
+    };
+
+    while let Ok(Some(entry)) = entries.next_entry().await {
+        let path = entry.path();
+        let name_path = path.join("name");
+
+        if let Ok(name_str) = fs::read_to_string(&name_path).await {
+            let name = name_str.trim();
+
+            if name == "k10temp" || name == "coretemp" || name == "zenpower" {
+                // Try temp1_input (TCtl/Package)
+                if let Ok(temp) = read_val(&path.join("temp1_input")).await {
+                    cpu_temp = temp / 1000;
+                }
+            } else if name == "amdgpu" || name == "nvidia" {
+                if let Ok(temp) = read_val(&path.join("temp1_input")).await {
+                    gpu_temp = temp / 1000;
+                }
+            } else if name == "asus" || name == "asus_custom_fan_curve" {
+                if let Ok(fan) = read_val(&path.join("fan1_input")).await {
+                    cpu_fan = fan;
+                }
+                if let Ok(fan) = read_val(&path.join("fan2_input")).await {
+                    gpu_fan = fan;
+                }
+            }
+        }
+    }
+
+    (cpu_temp, gpu_temp, cpu_fan, gpu_fan)
+}
+
+async fn read_val(path: &PathBuf) -> Result<i32, ()> {
+    let s = fs::read_to_string(path).await.map_err(|_| ())?;
+    s.trim().parse::<i32>().map_err(|_| ())
+}
+
+async fn read_power() -> i32 {
+    let mut p = 0;
+    // Try BAT0 then BAT1
+    if let Ok(v) = read_val(&PathBuf::from("/sys/class/power_supply/BAT0/power_now")).await {
+        p = v.abs();
+    } else if let Ok(v) = read_val(&PathBuf::from("/sys/class/power_supply/BAT1/power_now")).await {
+        p = v.abs();
+    }
+
+    // Check status
+    if let Ok(s) = fs::read_to_string("/sys/class/power_supply/BAT0/status").await {
+        if s.trim() == "Discharging" {
+            return -p;
+        }
+    }
+    p
+}

rog-control-center/src/ui/setup_supergfx.rs

@@ -0,0 +1,102 @@
+use crate::config::Config;
+use crate::ui::show_toast;
+use crate::{MainWindow, SupergfxPageData};
+use slint::{ComponentHandle, Model, SharedString, VecModel};
+use std::rc::Rc;
+use std::sync::{Arc, Mutex};
+use zbus::proxy;
+
+#[proxy(
+    interface = "org.supergfxctl.Daemon",
+    default_service = "org.supergfxctl.Daemon",
+    default_path = "/org/supergfxctl/Gfx"
+)]
+trait Supergfx {
+    fn supported(&self) -> zbus::Result<Vec<String>>;
+    fn mode(&self) -> zbus::Result<String>;
+    fn set_mode(&self, mode: &str) -> zbus::Result<()>;
+    fn vendor(&self) -> zbus::Result<String>;
+}
+
+pub fn setup_supergfx(ui: &MainWindow, _config: Arc<Mutex<Config>>) {
+    let ui_weak = ui.as_weak();
+
+    tokio::spawn(async move {
+        let conn = match zbus::Connection::system().await {
+            Ok(c) => c,
+            Err(e) => {
+                log::warn!("Failed to connect to system bus: {}", e);
+                return;
+            }
+        };
+
+        let proxy = match SupergfxProxy::new(&conn).await {
+            Ok(p) => p,
+            Err(e) => {
+                log::warn!("Failed to create Supergfx proxy: {}", e);
+                return;
+            }
+        };
+
+        // Register Callbacks on UI Thread
+        {
+            let proxy_copy = proxy.clone();
+            let ui_weak_copy = ui_weak.clone();
+            let _ = ui_weak.upgrade_in_event_loop(move |ui| {
+                let handle_copy = ui_weak_copy.clone();
+                ui.global::<SupergfxPageData>()
+                    .on_set_mode(move |mode_str| {
+                        let proxy = proxy_copy.clone();
+                        let handle = handle_copy.clone();
+                        tokio::spawn(async move {
+                            show_toast(
+                                format!("Switching to {}. Logout required.", mode_str).into(),
+                                "Failed to set mode".into(),
+                                handle,
+                                proxy.set_mode(&mode_str).await,
+                            );
+                        });
+                    });
+            });
+        }
+
+        // Fetch Initial State
+        // Vendor
+        if let Ok(vendor) = proxy.vendor().await {
+            let _ = ui_weak.upgrade_in_event_loop(move |ui| {
+                ui.global::<SupergfxPageData>().set_vendor(vendor.into())
+            });
+        }
+
+        // Supported Modes
+        if let Ok(supported) = proxy.supported().await {
+            let modes: Vec<SharedString> = supported
+                .iter()
+                .map(|s| SharedString::from(s.as_str()))
+                .collect();
+            let _ = ui_weak.upgrade_in_event_loop(move |ui| {
+                let mode_model = Rc::new(VecModel::from(modes));
+                ui.global::<SupergfxPageData>()
+                    .set_supported_modes(mode_model.into())
+            });
+        }
+
+        // Current Mode
+        if let Ok(mode) = proxy.mode().await {
+            let _ = ui_weak.upgrade_in_event_loop(move |ui| {
+                let g = ui.global::<SupergfxPageData>();
+                g.set_current_mode(mode.clone().into());
+                // Update selection index
+                let model = g.get_supported_modes();
+                for (i, m) in model.iter().enumerate() {
+                    if m == mode.as_str() {
+                        g.set_selected_index(i as i32);
+                        break;
+                    }
+                }
+            });
+        }
+
+        // No signal monitoring implemented as supergfxctl state changes usually require user action/logout
+    });
+}

rog-control-center/src/ui/setup_system.rs

@@ -40,8 +40,13 @@ pub fn setup_system_page(ui: &MainWindow, _config: Arc<Mutex<Config>>) {
     ui.global::<SystemPageData>().set_platform_profile(-1);
     ui.global::<SystemPageData>().set_panel_overdrive(-1);
     ui.global::<SystemPageData>().set_boot_sound(-1);
+    ui.global::<SystemPageData>().set_kbd_leds_awake(-1);
+    ui.global::<SystemPageData>().set_kbd_leds_sleep(-1);
+    ui.global::<SystemPageData>().set_kbd_leds_boot(-1);
+    ui.global::<SystemPageData>().set_kbd_leds_shutdown(-1);
+    ui.global::<SystemPageData>().set_screen_auto_brightness(-1);
+    ui.global::<SystemPageData>().set_mcu_powersave(-1);
     ui.global::<SystemPageData>().set_mini_led_mode(-1);
-    ui.global::<SystemPageData>().set_screenpad_brightness(-1);
     ui.global::<SystemPageData>().set_ppt_pl1_spl(MINMAX);
     ui.global::<SystemPageData>().set_ppt_pl2_sppt(MINMAX);
     ui.global::<SystemPageData>().set_ppt_pl3_fppt(MINMAX);
@@ -290,7 +295,7 @@ pub fn setup_system_page_callbacks(ui: &MainWindow, _states: Arc<Mutex<Config>>)
                 log::error!("Failed to create platform proxy: {}", e);
             })
             .unwrap();
-        let backlight = BacklightProxy::builder(&conn)
+        let _backlight = BacklightProxy::builder(&conn)
             .build()
             .await
             .map_err(|e| {
@@ -308,6 +313,7 @@ pub fn setup_system_page_callbacks(ui: &MainWindow, _states: Arc<Mutex<Config>>)
 
         let platform_copy = platform.clone();
         if let Ok(mut value) = platform.platform_profile_choices().await {
+            debug!("Available platform profile choices: {:?}", value);
             handle
                 .upgrade_in_event_loop(move |handle| {
                     value.sort();
@@ -390,23 +396,7 @@ pub fn setup_system_page_callbacks(ui: &MainWindow, _states: Arc<Mutex<Config>>)
 
         set_ui_props_async!(handle, platform, SystemPageData, enable_ppt_group);
 
-        set_ui_props_async!(handle, backlight, SystemPageData, screenpad_brightness);
-        if let Ok(value) = backlight.screenpad_gamma().await {
-            handle
-                .upgrade_in_event_loop(move |handle| {
-                    handle
-                        .global::<SystemPageData>()
-                        .set_screenpad_gamma(value.parse().unwrap_or(1.0));
-                })
-                .ok();
-        }
-
-        set_ui_props_async!(
-            handle,
-            backlight,
-            SystemPageData,
-            screenpad_sync_with_primary
-        );
+        set_ui_props_async!(handle, platform, SystemPageData, enable_ppt_group);
 
         let platform_copy = platform.clone();
         handle
@@ -519,7 +509,7 @@ pub fn setup_system_page_callbacks(ui: &MainWindow, _states: Arc<Mutex<Config>>)
                 set_ui_callbacks!(handle,
                     SystemPageData(as i32),
                     platform_copy.platform_profile_on_battery(.into()),
-                    "Throttle policy on abttery set to {}",
+                    "Throttle policy on battery set to {}",
                     "Setting Throttle policy on battery failed"
                 );
                 set_ui_callbacks!(handle,
@@ -529,25 +519,11 @@ pub fn setup_system_page_callbacks(ui: &MainWindow, _states: Arc<Mutex<Config>>)
                     "Setting Throttle policy on AC failed"
                 );
 
-                set_ui_callbacks!(handle,
-                    SystemPageData(as i32),
-                    backlight.screenpad_brightness(as i32),
-                    "Screenpad successfully set to {}",
-                    "Setting screenpad brightness failed"
-                );
-
                 set_ui_callbacks!(handle,
                     SystemPageData(as bool),
-                    backlight.screenpad_sync_with_primary(as bool),
-                    "Screenpad successfully set to {}",
-                    "Setting screenpad brightness failed"
-                );
-
-                set_ui_callbacks!(handle,
-                    SystemPageData(.parse().unwrap_or(1.0)),
-                    backlight.screenpad_gamma(.to_string().as_str()),
-                    "Screenpad successfully set to {}",
-                    "Setting screenpad brightness failed"
+                    platform_copy.change_platform_profile_on_battery(.into()),
+                    "Throttle policy on battery enabled: {}",
+                    "Setting Throttle policy on AC failed"
                 );
             })
             .ok();
@@ -666,7 +642,36 @@ pub fn setup_system_page_callbacks(ui: &MainWindow, _states: Arc<Mutex<Config>>)
                                 setup_callback!(boot_sound, handle, attr, i32);
                                 setup_external!(boot_sound, i32, handle, attr, value)
                             }
-                            FirmwareAttribute::McuPowersave => {}
+                            FirmwareAttribute::KbdLedsAwake => {
+                                init_property!(kbd_leds_awake, handle, value, i32);
+                                setup_callback!(kbd_leds_awake, handle, attr, i32);
+                                setup_external!(kbd_leds_awake, i32, handle, attr, value)
+                            }
+                            FirmwareAttribute::KbdLedsSleep => {
+                                init_property!(kbd_leds_sleep, handle, value, i32);
+                                setup_callback!(kbd_leds_sleep, handle, attr, i32);
+                                setup_external!(kbd_leds_sleep, i32, handle, attr, value)
+                            }
+                            FirmwareAttribute::KbdLedsBoot => {
+                                init_property!(kbd_leds_boot, handle, value, i32);
+                                setup_callback!(kbd_leds_boot, handle, attr, i32);
+                                setup_external!(kbd_leds_boot, i32, handle, attr, value)
+                            }
+                            FirmwareAttribute::KbdLedsShutdown => {
+                                init_property!(kbd_leds_shutdown, handle, value, i32);
+                                setup_callback!(kbd_leds_shutdown, handle, attr, i32);
+                                setup_external!(kbd_leds_shutdown, i32, handle, attr, value)
+                            }
+                            FirmwareAttribute::ScreenAutoBrightness => {
+                                init_property!(screen_auto_brightness, handle, value, i32);
+                                setup_callback!(screen_auto_brightness, handle, attr, i32);
+                                setup_external!(screen_auto_brightness, i32, handle, attr, value)
+                            }
+                            FirmwareAttribute::McuPowersave => {
+                                init_property!(mcu_powersave, handle, value, i32);
+                                setup_callback!(mcu_powersave, handle, attr, i32);
+                                setup_external!(mcu_powersave, i32, handle, attr, value)
+                            }
                             FirmwareAttribute::PanelOverdrive => {
                                 init_property!(panel_overdrive, handle, value, i32);
                                 setup_callback!(panel_overdrive, handle, attr, i32);

rog-control-center/src/zbus_proxies.rs

@@ -89,7 +89,7 @@ where
         }
     }
     if paths.len() > 1 {
-        println!("Multiple asusd interfaces devices found");
+        log::warn!("Multiple asusd interfaces devices found");
     }
     if !paths.is_empty() {
         let mut ctrl = Vec::new();
@@ -129,7 +129,7 @@ where
         }
     }
     if paths.len() > 1 {
-        println!("Multiple asusd interfaces devices found");
+        log::warn!("Multiple asusd interfaces devices found");
     }
     if !paths.is_empty() {
         let mut ctrl = Vec::new();

rog-control-center/ui/main_window.slint

@@ -1,9 +1,12 @@
-import { Palette, Button, VerticalBox } from "std-widgets.slint";
+import { Button, VerticalBox } from "std-widgets.slint";
 import { AppSize } from "globals.slint";
 import { PageSystem, SystemPageData, AttrMinMax } from "pages/system.slint";
 import { SideBar } from "widgets/sidebar.slint";
 import { PageAbout } from "pages/about.slint";
 import { PageFans } from "pages/fans.slint";
+import { PageSlash, SlashPageData } from "pages/slash.slint";
+import { PageSupergfx, SupergfxPageData } from "pages/supergfx.slint";
+import { PageScreenpad, ScreenpadPageData } from "pages/screenpad.slint";
 import { PageAnime, AnimePageData } from "pages/anime.slint";
 import { RogItem } from "widgets/common.slint";
 import { PageAura } from "pages/aura.slint";
@@ -14,8 +17,18 @@ export { FanPageData, FanType, Profile }
 import { AuraPageData, AuraDevType, LaptopAuraPower, AuraPowerState, PowerZones, AuraEffect } from "types/aura_types.slint";
 export { AuraPageData, AuraDevType, LaptopAuraPower, AuraPowerState, PowerZones, AuraEffect }
 import { PageAppSettings, AppSettingsPageData } from "pages/app_settings.slint";
+import { StatusBar, SystemStatus } from "widgets/status_bar.slint";
+import { TrayTooltip } from "windows/tray_tooltip.slint";
+export { TrayTooltip }
 
-export { AppSize, AttrMinMax, SystemPageData, AnimePageData, AppSettingsPageData }
+import { RogPalette } from "themes/rog_theme.slint";
+
+export { AppSize, AttrMinMax, SystemPageData, AnimePageData, AppSettingsPageData, SystemStatus, SlashPageData, SupergfxPageData, ScreenpadPageData }
+
+export global SomeError {
+    in property <string> error_message: "";
+    in property <string> error_help: "";
+}
 
 export component MainWindow inherits Window {
     title: "ROG Control";
@@ -24,93 +37,133 @@ export component MainWindow inherits Window {
     default-font-size: 14px;
     default-font-weight: 400;
     icon: @image-url("../data/rog-control-center.png");
-    in property <[bool]> sidebar_items_avilable: [true, true, true, true, true, true];
+    in property <[bool]> sidebar_items_avilable: [true, true, true, true, true, true, true, true, true];
     private property <bool> show_notif;
     private property <bool> fade_cover;
     private property <bool> toast: false;
     private property <string> toast_text: "I show when something is waiting";
+    
     callback show_toast(string);
+    callback start_toast_timer();
+    callback hide_toast();
+    
+    hide_toast() => {
+        toast = false;
+    }
+    
     show_toast(text) => {
         toast = text != "";
         toast_text = text;
+        if (toast) {
+            start_toast_timer();
+        }
     }
+    
     callback exit-app();
     callback show_notification(bool);
+    
     show_notification(yes) => {
         show_notif = yes;
         fade_cover = yes;
     }
+    
     callback external_colour_change();
     external_colour_change() => {
         aura.external_colour_change();
         aura.external_colour_change();
     }
+    
     min-height: AppSize.height;
     min-width: AppSize.width;
-    background: Colors.black;
-    HorizontalLayout {
-        padding: 0px;
-        VerticalLayout {
-            side-bar := SideBar {
-                title: @tr("ROG");
-                model: [
-                    @tr("Menu1" => "System Control"),
-                    @tr("Menu2" => "Keyboard Aura"),
-                    @tr("Menu3" => "AniMe Matrix"),
-                    @tr("Menu4" => "Fan Curves"),
-                    @tr("Menu5" => "App Settings"),
-                    @tr("Menu6" => "About"),
-                ];
-                available: root.sidebar_items_avilable;
-            }
+    background: RogPalette.background;
 
-            Rectangle {
-                max-height: 40px;
-                width: side-bar.width;
-                background: Palette.control-background;
-                Text {
-                    vertical-alignment: center;
-                    horizontal-alignment: center;
-                    text: @tr("Quit App");
+    VerticalLayout {
+        HorizontalLayout {
+            padding: 0px;
+            
+            // Left Column: Sidebar + Quit Button
+            VerticalLayout {
+                side-bar := SideBar {
+                    title: @tr("ROG");
+                    model: [
+                        @tr("Menu1" => "System Control"),
+                        @tr("Menu2" => "Keyboard Aura"),
+                        @tr("Menu3" => "AniMe Matrix"),
+                        @tr("Menu7" => "Slash Lighting"),
+                        @tr("Menu8" => "Graphics Control"),
+                        @tr("Menu9" => "Screenpad Control"),
+                        @tr("Menu4" => "Fan Curves"),
+                        @tr("Menu5" => "App Settings"),
+                        @tr("Menu6" => "About"),
+                    ];
+                    available: root.sidebar_items_avilable;
                 }
 
-                TouchArea {
-                    clicked => {
-                        root.exit-app();
+                Rectangle {
+                    max-height: 40px;
+                    width: side-bar.width;
+                    background: RogPalette.control-background;
+                    Text {
+                        vertical-alignment: center;
+                        horizontal-alignment: center;
+                        text: @tr("Quit App");
+                        color: RogPalette.text-primary;
+                    }
+
+                    TouchArea {
+                        clicked => {
+                            root.exit-app();
+                        }
                     }
                 }
             }
-        }
 
-        Rectangle {
-            background: Palette.background;
-            if(side-bar.current-item == 0): page := PageSystem {
-                width: root.width - side-bar.width;
-                height: root.height + 12px;
-            }
+            // Right Column: Content Pages
+            Rectangle {
+                background: RogPalette.background;
+                if(side-bar.current-item == 0): page := PageSystem {
+                    width: root.width - side-bar.width;
+                    height: root.height + 12px;
+                }
 
-            aura := PageAura {
-                width: root.width - side-bar.width;
-                visible: side-bar.current-item == 1;
-            }
+                aura := PageAura {
+                    width: root.width - side-bar.width;
+                    visible: side-bar.current-item == 1;
+                }
 
-            if(side-bar.current-item == 2): PageAnime {
-                width: root.width - side-bar.width;
-            }
+                if(side-bar.current-item == 2): PageAnime {
+                    width: root.width - side-bar.width;
+                }
 
-            fans := PageFans {
-                width: root.width - side-bar.width;
-                visible: side-bar.current-item == 3;
-            }
+                if(side-bar.current-item == 3): PageSlash {
+                    width: root.width - side-bar.width;
+                }
 
-            if(side-bar.current-item == 4): PageAppSettings {
-                width: root.width - side-bar.width;
-            }
+                if(side-bar.current-item == 4): PageSupergfx {
+                    width: root.width - side-bar.width;
+                }
 
-            if(side-bar.current-item == 5): PageAbout {
-                width: root.width - side-bar.width;
+                if(side-bar.current-item == 5): PageScreenpad {
+                    width: root.width - side-bar.width;
+                }
+
+                fans := PageFans {
+                    width: root.width - side-bar.width;
+                    visible: side-bar.current-item == 6;
+                }
+
+                if(side-bar.current-item == 7): PageAppSettings {
+                    width: root.width - side-bar.width;
+                }
+
+                if(side-bar.current-item == 8): PageAbout {
+                    width: root.width - side-bar.width;
+                }
             }
         }
+        
+        // Bottom: Status Bar
+        StatusBar {}
     }
 
     if fade_cover: Rectangle {
@@ -118,7 +171,7 @@ export component MainWindow inherits Window {
         y: 0px;
         width: root.width;
         height: root.height;
-        background: Colors.rgba(25,33,23,20);
+        background: Colors.rgba(0,0,0,0.7);
         opacity: 0.7;
         TouchArea {
             height: 100%;
@@ -133,13 +186,24 @@ export component MainWindow inherits Window {
         }
     }
 
-    if toast: Rectangle {
-        x: 0px;
-        y: 0px;
-        width: root.width;
-        height: 32px;
-        opacity: 1.0;
-        background: Colors.grey;
+    // Modern floating toast/snackbar notification
+    // Shows at the bottom center, non-intrusive
+    Rectangle {
+        visible: self.opacity > 0;
+        opacity: root.toast ? 1 : 0;
+        animate opacity { duration: 300ms; }
+        
+        x: (root.width - 400px) / 2; // Center horizontally
+        y: root.height - 80px;       // Bottom padding
+        width: 400px;
+        height: 48px;
+        border-radius: RogPalette.border-radius;
+        border-width: 1px;
+        border-color: RogPalette.accent;
+        background: RogPalette.control-background;
+        drop-shadow-blur: 10px;
+        drop-shadow-color: Colors.black;
+
         TouchArea {
             height: 100%;
             width: 100%;
@@ -148,13 +212,23 @@ export component MainWindow inherits Window {
             }
         }
 
-        Rectangle {
-            height: 100%;
-            width: 100%;
-            background: Palette.control-background;
+        HorizontalLayout {
+            padding-left: 16px;
+            padding-right: 16px;
+            alignment: space-between;
+            
             Text {
-                color: Palette.control-foreground;
+                vertical-alignment: center;
+                color: RogPalette.text-primary;
                 text: root.toast_text;
+                overflow: elide;
+            }
+            
+            Text {
+                vertical-alignment: center;
+                text: "Dismiss";
+                color: RogPalette.text-secondary;
+                font-size: 12px;
             }
         }
     }
@@ -174,13 +248,20 @@ export component MainWindow inherits Window {
             }
         }
 
-        // TODO: add properties to display
         Rectangle {
             height: 100%;
             width: 100%;
-            background: Palette.background;
-            Text {
-                text: "Click here to exit";
+            background: RogPalette.control-background;
+            border-radius: 8px;
+
+            VerticalLayout {
+                alignment: center;
+                Text {
+                    horizontal-alignment: center;
+                    text: "Click here to exit";
+                    color: RogPalette.text-primary;
+                    font-size: 16px;
+                }
             }
         }
     }
@@ -190,35 +271,45 @@ export component MainWindow inherits Window {
         y: 0px;
         width: root.width;
         height: root.height;
-        
-        //padding only has effect on layout elements
-        //padding: 10px;
 
-        background: Palette.background;
-        border-color: Palette.border;
-        border-width: 3px;
-        border-radius: 10px;
+        background: RogPalette.background;
+        border-color: RogPalette.accent;
+        border-width: 2px;
+        border-radius: 8px;
 
         VerticalBox {
-            RogItem {
-                min-height: 50px;
-                max-height: 100px;
+            padding: 20px;
+            spacing: 15px;
+            alignment: center;
+
+            Text {
+                text: "Error";
+                font-size: 22px;
+                font-weight: 700;
+                color: RogPalette.accent;
+                horizontal-alignment: center;
+            }
+
+            Rectangle {
+                background: RogPalette.control-background;
+                border-radius: 8px;
+                min-height: 60px;
+
                 Text {
                     text <=> SomeError.error_message;
-                    font-size: 18px;
+                    font-size: 16px;
+                    color: RogPalette.text-primary;
+                    horizontal-alignment: center;
+                    vertical-alignment: center;
                 }
             }
 
             Text {
                 text <=> SomeError.error_help;
-                horizontal-alignment: TextHorizontalAlignment.center;
-                vertical-alignment: TextVerticalAlignment.center;
+                color: RogPalette.text-secondary;
+                horizontal-alignment: center;
+                vertical-alignment: center;
             }
         }
     }
 }
-
-export global SomeError {
-    in property <string> error_message: "";
-    in property <string> error_help: "";
-}

rog-control-center/ui/pages/about.slint

@@ -1,66 +1,128 @@
-import { AboutSlint, VerticalBox, HorizontalBox } from "std-widgets.slint";
+import { VerticalBox, HorizontalBox, ScrollView } from "std-widgets.slint";
+import { RogPalette } from "../themes/rog_theme.slint";
 
-export component PageAbout inherits VerticalLayout {
-    padding: 10px;
-    spacing: 10px;
-    Text {
-        vertical-alignment: TextVerticalAlignment.center;
-        horizontal-alignment: TextHorizontalAlignment.center;
-        text: "A UI for asusctl made with slint";
-        font-size: 22px;
-    }
+export component PageAbout inherits Rectangle {
+    background: RogPalette.background;
 
-    HorizontalBox {
-        alignment: LayoutAlignment.center;
+    ScrollView {
         VerticalBox {
-            alignment: LayoutAlignment.center;
+            padding: 30px;
+            spacing: 20px;
+            alignment: center;
 
+            // Title
             Text {
-                wrap: TextWrap.word-wrap;
-                text: "You will require a kernel built with my work from here: https://github.com/flukejones/linux";
+                horizontal-alignment: center;
+                text: "ROG Control Center";
+                font-size: 28px;
+                font-weight: 800;
+                color: RogPalette.accent;
             }
 
             Text {
-                vertical-alignment: TextVerticalAlignment.center;
-                horizontal-alignment: TextHorizontalAlignment.center;
-                text: "Todo:";
-                font-size: 22px;
+                horizontal-alignment: center;
+                text: "A modern UI for asusctl built with Slint";
+                font-size: 16px;
+                color: RogPalette.text-secondary;
             }
 
-            Text {
-                text: "- [ ] Theme the widgets";
+            // Version info
+            Rectangle {
+                height: 60px;
+                background: RogPalette.control-background;
+                border-radius: 8px;
+                border-width: 1px;
+                border-color: RogPalette.control-border;
+
+                HorizontalBox {
+                    padding: 15px;
+                    alignment: center;
+                    Text {
+                        text: "Version 6.3.0";
+                        font-size: 14px;
+                        color: RogPalette.text-primary;
+                    }
+                    Text {
+                        text: "  |  ";
+                        color: RogPalette.text-secondary;
+                    }
+                    Text {
+                        text: "Requires kernel 6.10+";
+                        font-size: 14px;
+                        color: RogPalette.text-secondary;
+                    }
+                }
             }
 
-            Text {
-                text: "- [ ] Add a cpu/gpu temp/fan speed info bar";
+            // Features section
+            Rectangle {
+                background: RogPalette.control-background;
+                border-radius: 8px;
+                border-width: 1px;
+                border-color: RogPalette.control-border;
+
+                VerticalBox {
+                    padding: 20px;
+                    spacing: 12px;
+
+                    Text {
+                        text: "Features";
+                        font-size: 18px;
+                        font-weight: 700;
+                        color: RogPalette.accent;
+                    }
+
+                    // Completed features
+                    Text { text: "[x] ROG-themed dark UI"; color: RogPalette.text-primary; font-size: 13px; }
+                    Text { text: "[x] System status bar (CPU/GPU temps & fan speeds)"; color: RogPalette.text-primary; font-size: 13px; }
+                    Text { text: "[x] Power profile management"; color: RogPalette.text-primary; font-size: 13px; }
+                    Text { text: "[x] Aura RGB keyboard lighting"; color: RogPalette.text-primary; font-size: 13px; }
+                    Text { text: "[x] AniMe Matrix display"; color: RogPalette.text-primary; font-size: 13px; }
+                    Text { text: "[x] Slash LED control"; color: RogPalette.text-primary; font-size: 13px; }
+                    Text { text: "[x] Supergfx graphics switching"; color: RogPalette.text-primary; font-size: 13px; }
+                    Text { text: "[x] Screenpad brightness & gamma"; color: RogPalette.text-primary; font-size: 13px; }
+                    Text { text: "[x] Custom fan curves"; color: RogPalette.text-primary; font-size: 13px; }
+                    Text { text: "[x] Desktop notifications (KDE OSD)"; color: RogPalette.text-primary; font-size: 13px; }
+                    Text { text: "[x] System tray integration"; color: RogPalette.text-primary; font-size: 13px; }
+
+                    // Pending features
+                    Rectangle { height: 10px; }
+                    Text { text: "Planned:"; font-size: 14px; font-weight: 600; color: RogPalette.text-secondary; }
+                    Text { text: "[ ] ROG Ally specific settings"; color: RogPalette.text-secondary; font-size: 13px; }
+                    Text { text: "[ ] Advanced Aura zone editing"; color: RogPalette.text-secondary; font-size: 13px; }
+                }
             }
 
-            Text {
-                text: "- [ ] Include fan speeds, temps in a bottom bar";
-            }
+            // Credits
+            Rectangle {
+                background: RogPalette.control-background;
+                border-radius: 8px;
+                border-width: 1px;
+                border-color: RogPalette.control-border;
 
-            Text {
-                text: "- [ ] Slash control";
-            }
+                VerticalBox {
+                    padding: 20px;
+                    spacing: 8px;
 
-            Text {
-                text: "- [ ] Supergfx control";
-            }
+                    Text {
+                        text: "Credits";
+                        font-size: 18px;
+                        font-weight: 700;
+                        color: RogPalette.accent;
+                    }
 
-            Text {
-                text: "- [ ] Screenpad controls";
-            }
-
-            Text {
-                text: "- [ ] ROG Ally specific settings";
+                    Text {
+                        text: "asusctl & asusd by Luke Jones";
+                        font-size: 13px;
+                        color: RogPalette.text-primary;
+                    }
+                    Text {
+                        text: "UI built with Slint";
+                        font-size: 13px;
+                        color: RogPalette.text-secondary;
+                    }
+                }
             }
         }
     }
-
-    Text {
-        vertical-alignment: TextVerticalAlignment.center;
-        horizontal-alignment: TextHorizontalAlignment.center;
-        text: "Work in progress";
-        font-size: 22px;
-    }
 }

rog-control-center/ui/pages/anime.slint

@@ -1,5 +1,6 @@
 import { SystemDropdown, SystemToggle } from "../widgets/common.slint";
 import { Palette, GroupBox, VerticalBox, Button, HorizontalBox } from "std-widgets.slint";
+import { RogPalette } from "../themes/rog_theme.slint";
 
 export global AnimePageData {
     in-out property <[string]> brightness_names: [
@@ -109,7 +110,7 @@ export component PageAnime inherits Rectangle {
     if root.show_fade_cover: Rectangle {
         width: 100%;
         height: 100%;
-        background: Palette.background;
+        background: RogPalette.background;
         opacity: 0.8;
         TouchArea {
             height: 100%;
@@ -142,7 +143,7 @@ export component PageAnime inherits Rectangle {
                     alignment: LayoutAlignment.start;
                     Text {
                         font-size: 18px;
-                        color: Palette.control-foreground;
+                        color: RogPalette.text-primary;
                         horizontal-alignment: TextHorizontalAlignment.center;
                         text: @tr("Set which builtin animations are played");
                     }
@@ -216,7 +217,7 @@ export component PageAnime inherits Rectangle {
                     alignment: LayoutAlignment.start;
                     Text {
                         font-size: 18px;
-                        color: Palette.control-foreground;
+                        color: RogPalette.text-primary;
                         horizontal-alignment: TextHorizontalAlignment.center;
                         text: @tr("Advanced Display Settings");
                     }

rog-control-center/ui/pages/app_settings.slint

@@ -1,5 +1,6 @@
-import { Palette } from "std-widgets.slint";
-import { SystemToggle } from "../widgets/common.slint";
+import { VerticalBox, ScrollView, HorizontalBox, Button } from "std-widgets.slint";
+import { SystemToggle, RogItem } from "../widgets/common.slint";
+import { RogPalette } from "../themes/rog_theme.slint";
 
 export global AppSettingsPageData {
     in-out property <bool> run_in_background;
@@ -8,56 +9,134 @@ export global AppSettingsPageData {
     callback set_startup_in_background(bool);
     in-out property <bool> enable_tray_icon;
     callback set_enable_tray_icon(bool);
-    in-out property <bool> enable_dgpu_notifications;
-    callback set_enable_dgpu_notifications(bool);
+    
+    // Master notification toggle
+    in-out property <bool> notifications_enabled;
+    callback set_notifications_enabled(bool);
+    
+    // Granular notification toggles
+    in-out property <bool> notify_gfx_switch;
+    callback set_notify_gfx_switch(bool);
+    in-out property <bool> notify_gfx_status;
+    callback set_notify_gfx_status(bool);
+    in-out property <bool> notify_platform_profile;
+    callback set_notify_platform_profile(bool);
 }
 
-export component PageAppSettings inherits VerticalLayout {
-    Rectangle {
-        clip: true;
-        // TODO: slow with border-radius
-        //padding only has effect on layout elements
-        //padding: 8px;
+export component PageAppSettings inherits Rectangle {
+    background: RogPalette.background;
+    
+    ScrollView {
+        VerticalBox {
+            padding: 20px;
+            spacing: 20px;
+            alignment: start;
 
-        // height: parent.height - infobar.height - mainview.padding - self.padding * 2;
-        // TODO: border-radius: 8px;
-        mainview := VerticalLayout {
-            padding: 10px;
-            spacing: 10px;
-            SystemToggle {
-                text: @tr("Run in background after closing");
-                checked <=> AppSettingsPageData.run_in_background;
-                toggled => {
-                    AppSettingsPageData.set_run_in_background(AppSettingsPageData.run_in_background)
+            // General Section
+            VerticalBox {
+                spacing: 10px;
+                padding: 0px;
+                
+                Rectangle {
+                    height: 30px;
+                    background: RogPalette.control-background;
+                    border-radius: 4px;
+                    border-width: 1px;
+                    border-color: RogPalette.control-border;
+                    
+                    Text {
+                        x: 10px;
+                        vertical-alignment: center;
+                        text: "General Settings";
+                        color: RogPalette.accent;
+                        font-weight: 700;
+                    }
+                }
+
+                SystemToggle {
+                    text: @tr("Run in background after closing");
+                    checked <=> AppSettingsPageData.run_in_background;
+                    toggled => {
+                        AppSettingsPageData.set_run_in_background(AppSettingsPageData.run_in_background)
+                    }
+                }
+    
+                SystemToggle {
+                    text: @tr("Start app in background (UI closed)");
+                    checked <=> AppSettingsPageData.startup_in_background;
+                    toggled => {
+                        AppSettingsPageData.set_startup_in_background(AppSettingsPageData.startup_in_background)
+                    }
+                }
+    
+                SystemToggle {
+                    text: @tr("Enable system tray icon");
+                    checked <=> AppSettingsPageData.enable_tray_icon;
+                    toggled => {
+                        AppSettingsPageData.set_enable_tray_icon(AppSettingsPageData.enable_tray_icon)
+                    }
                 }
             }
 
-            SystemToggle {
-                text: @tr("Start app in background (UI closed)");
-                checked <=> AppSettingsPageData.startup_in_background;
-                toggled => {
-                    AppSettingsPageData.set_startup_in_background(AppSettingsPageData.startup_in_background)
-                }
-            }
+            // Notifications Section
+            VerticalBox {
+                spacing: 10px;
+                padding: 0px;
 
-            SystemToggle {
-                text: @tr("Enable system tray icon");
-                checked <=> AppSettingsPageData.enable_tray_icon;
-                toggled => {
-                    AppSettingsPageData.set_enable_tray_icon(AppSettingsPageData.enable_tray_icon)
-                }
-            }
+                Rectangle {
+                    height: 30px;
+                    background: RogPalette.control-background;
+                    border-radius: 4px;
+                    border-width: 1px;
+                    border-color: RogPalette.control-border;
 
-            SystemToggle {
-                text: @tr("Enable dGPU notifications");
-                checked <=> AppSettingsPageData.enable_dgpu_notifications;
-                toggled => {
-                    AppSettingsPageData.set_enable_dgpu_notifications(AppSettingsPageData.enable_dgpu_notifications)
+                    Text {
+                        x: 10px;
+                        vertical-alignment: center;
+                        text: "Notifications";
+                        color: RogPalette.accent;
+                        font-weight: 700;
+                    }
+                }
+                
+                SystemToggle {
+                    text: @tr("Enable Notifications");
+                    checked <=> AppSettingsPageData.notifications_enabled;
+                    toggled => {
+                        AppSettingsPageData.set_notifications_enabled(AppSettingsPageData.notifications_enabled)
+                    }
+                }
+                
+                // Sub-toggles container
+                VerticalBox {
+                    padding-left: 30px; // Indent
+                    spacing: 10px;
+                    visible: AppSettingsPageData.notifications_enabled;
+                    
+                    SystemToggle {
+                        text: @tr("Notify on Graphics Switch");
+                        checked <=> AppSettingsPageData.notify_gfx_switch;
+                        toggled => {
+                            AppSettingsPageData.set_notify_gfx_switch(AppSettingsPageData.notify_gfx_switch)
+                        }
+                    }
+                    
+                    SystemToggle {
+                        text: @tr("Notify on GPU Status Change");
+                        checked <=> AppSettingsPageData.notify_gfx_status;
+                        toggled => {
+                            AppSettingsPageData.set_notify_gfx_status(AppSettingsPageData.notify_gfx_status)
+                        }
+                    }
+                    
+                    SystemToggle {
+                        text: @tr("Notify on Power Profile Change");
+                        checked <=> AppSettingsPageData.notify_platform_profile;
+                        toggled => {
+                            AppSettingsPageData.set_notify_platform_profile(AppSettingsPageData.notify_platform_profile)
+                        }
+                    }
                 }
-            }
-
-            Text {
-                text: "WIP: some features like notifications are not complete";
             }
         }
     }

rog-control-center/ui/pages/aura.slint

@@ -1,5 +1,6 @@
 import { SystemDropdown, RogItem, SystemToggle, SystemToggleVert } from "../widgets/common.slint";
-import { Palette, Button, ComboBox, VerticalBox, GroupBox } from "std-widgets.slint";
+import { Button, ComboBox, VerticalBox, GroupBox } from "std-widgets.slint";
+import { RogPalette } from "../themes/rog_theme.slint";
 import { StyleMetrics, Slider, HorizontalBox, TextEdit, SpinBox, LineEdit, ScrollView } from "std-widgets.slint";
 import { ColourSlider } from "../widgets/colour_picker.slint";
 import { AuraPageData, AuraDevType, PowerZones, LaptopAuraPower, AuraEffect } from "../types/aura_types.slint";
@@ -183,6 +184,57 @@ export component PageAura inherits Rectangle {
                 }
             }
 
+            // Software Animation Controls (for Static-only keyboards)
+            if AuraPageData.soft_animation_available: RogItem {
+                min-height: 100px;
+                VerticalLayout {
+                    padding: 10px;
+                    spacing: 8px;
+                    
+                    Text {
+                        text: @tr("Software Animation (Static-only keyboards)");
+                        font-size: 14px;
+                        font-weight: 600;
+                        color: RogPalette.accent;
+                    }
+                    
+                    HorizontalLayout {
+                        spacing: 20px;
+                        
+                        VerticalLayout {
+                            Text {
+                                text: @tr("Animation Mode");
+                                color: RogPalette.text-secondary;
+                            }
+                            ComboBox {
+                                current_index <=> AuraPageData.soft_animation_mode;
+                                current_value: AuraPageData.soft_animation_modes[self.current-index];
+                                model <=> AuraPageData.soft_animation_modes;
+                                selected => {
+                                    AuraPageData.cb_soft_animation_mode(AuraPageData.soft_animation_mode);
+                                }
+                            }
+                        }
+                        
+                        VerticalLayout {
+                            horizontal-stretch: 1;
+                            Text {
+                                text: @tr("Speed: ") + Math.round(AuraPageData.soft_animation_speed) + "ms";
+                                color: RogPalette.text-secondary;
+                            }
+                            Slider {
+                                minimum: 150;
+                                maximum: 1000;
+                                value <=> AuraPageData.soft_animation_speed;
+                                released => {
+                                    AuraPageData.cb_soft_animation_speed(Math.round(AuraPageData.soft_animation_speed));
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
             HorizontalLayout {
                 Button {
                     text: @tr("Power Settings");
@@ -195,11 +247,15 @@ export component PageAura inherits Rectangle {
         }
 
         if root.show_fade_cover: Rectangle {
-            background: Palette.background;
+            background: RogPalette.background;
             opacity: 0.8;
             TouchArea {
                 height: 100%;
                 width: 100%;
+                clicked => {
+                    root.show_fade_cover = false;
+                    root.show_aura_power = false;
+                }
             }
         }
     }
@@ -266,7 +322,10 @@ export component PageAura inherits Rectangle {
                 alignment: LayoutAlignment.start;
 
                 Text {
-                    text: "TODO: In progress";
+                    text: "LED Power Zones (Legacy)";
+                    font-size: 16px;
+                    font-weight: 600;
+                    color: #ff0033;
                 }
 
                 for state[idx] in AuraPageData.led_power.states: old_zone := AuraPowerGroupOld {

rog-control-center/ui/pages/fans.slint

@@ -1,7 +1,10 @@
-import { Palette, TabWidget, Button, CheckBox } from "std-widgets.slint";
+import { Palette, TabWidget, Button, CheckBox, Slider } from "std-widgets.slint";
 import { Graph, Node } from "../widgets/graph.slint";
 import { SystemToggle } from "../widgets/common.slint";
 import { Profile, FanType, FanPageData } from "../types/fan_types.slint";
+import { RogPalette } from "../themes/rog_theme.slint";
+
+
 
 component FanTab inherits Rectangle {
     in-out property <bool> enabled: false;
@@ -16,10 +19,81 @@ component FanTab inherits Rectangle {
     in-out property <[Node]> nodes;
 
     VerticalLayout {
+        private property <bool> local_busy: 
+            (root.fan_type == FanType.CPU && FanPageData.is_busy_cpu) ||
+            (root.fan_type == FanType.GPU && FanPageData.is_busy_gpu) ||
+            (root.fan_type == FanType.Middle && FanPageData.is_busy_mid);
+        
+        if FanPageData.show_custom_warning: Rectangle {
+            background: RogPalette.control-background;
+            border-radius: 4px;
+            height: 48px;
+            HorizontalLayout {
+                padding: 10px;
+                Text {
+                    color: #ffd700; // Gold/Yellow
+                    text: @tr("Zero RPM Mode Enabled: Fans will take ~25s to spin down entirely.");
+                    vertical-alignment: TextVerticalAlignment.center;
+                    horizontal-alignment: TextHorizontalAlignment.center;
+                    wrap: word-wrap;
+                }
+            }
+        }
+
         HorizontalLayout {
+            spacing: 10px;
             if root.tab_enabled: Graph {
                 nodes <=> root.nodes;
             }
+            if root.tab_enabled: VerticalLayout {
+                width: 40px;
+                alignment: center;
+                spacing: 10px;
+                
+                Button {
+                    text: "+";
+                    height: 40px;
+                    width: 40px;
+                    clicked => {
+                        root.nodes = [
+                            { x: root.nodes[0].x, y: min(255px, root.nodes[0].y + 13px) },
+                            { x: root.nodes[1].x, y: min(255px, root.nodes[1].y + 13px) },
+                            { x: root.nodes[2].x, y: min(255px, root.nodes[2].y + 13px) },
+                            { x: root.nodes[3].x, y: min(255px, root.nodes[3].y + 13px) },
+                            { x: root.nodes[4].x, y: min(255px, root.nodes[4].y + 13px) },
+                            { x: root.nodes[5].x, y: min(255px, root.nodes[5].y + 13px) },
+                            { x: root.nodes[6].x, y: min(255px, root.nodes[6].y + 13px) },
+                            { x: root.nodes[7].x, y: min(255px, root.nodes[7].y + 13px) }
+                        ];
+                    }
+                }
+                
+                Text { 
+                    text: "All"; 
+                    font-size: 10px; 
+                    horizontal-alignment: center; 
+                    color: white;
+                }
+
+                Button {
+                    text: "-";
+                    height: 40px;
+                    width: 40px;
+                    clicked => {
+                        root.nodes = [
+                            { x: root.nodes[0].x, y: max(0px, root.nodes[0].y - 13px) },
+                            { x: root.nodes[1].x, y: max(0px, root.nodes[1].y - 13px) },
+                            { x: root.nodes[2].x, y: max(0px, root.nodes[2].y - 13px) },
+                            { x: root.nodes[3].x, y: max(0px, root.nodes[3].y - 13px) },
+                            { x: root.nodes[4].x, y: max(0px, root.nodes[4].y - 13px) },
+                            { x: root.nodes[5].x, y: max(0px, root.nodes[5].y - 13px) },
+                            { x: root.nodes[6].x, y: max(0px, root.nodes[6].y - 13px) },
+                            { x: root.nodes[7].x, y: max(0px, root.nodes[7].y - 13px) }
+                        ];
+                    }
+                }
+            }
+
             if !root.tab_enabled: Rectangle {
                 Text {
                     font-size: 24px;
@@ -29,19 +103,20 @@ component FanTab inherits Rectangle {
         }
 
         HorizontalLayout {
+            spacing: 20px;
             alignment: LayoutAlignment.end;
             CheckBox {
-                text: @tr("Enabled");
+                text: @tr("Enable Manual Control");
                 checked <=> root.enabled;
-                enabled <=> root.tab_enabled;
+                enabled: root.tab_enabled && !local_busy;
                 toggled => {
                     root.toggled();
                 }
             }
 
             Button {
-                text: @tr("Apply");
-                enabled <=> root.tab_enabled;
+                text: local_busy ? @tr("Applying...") : @tr("Apply Curve");
+                enabled: root.tab_enabled && root.enabled && !local_busy;
                 clicked => {
                     root.apply();
                 }
@@ -49,7 +124,7 @@ component FanTab inherits Rectangle {
 
             Button {
                 text: @tr("Cancel");
-                enabled <=> root.tab_enabled;
+                enabled: root.tab_enabled && !local_busy;
                 clicked => {
                     root.cancel()
                 }
@@ -57,7 +132,7 @@ component FanTab inherits Rectangle {
 
             Button {
                 text: @tr("Factory Default (all fans)");
-                enabled <=> root.tab_enabled;
+                enabled: root.tab_enabled && !local_busy;
                 clicked => {
                     root.default();
                 }
@@ -86,6 +161,9 @@ export component PageFans inherits VerticalLayout {
                         default => {
                             FanPageData.set_profile_default(Profile.Balanced);
                         }
+                        cancel => {
+                            FanPageData.cancel(FanType.CPU, Profile.Balanced);
+                        }
                     }
                 }
 
@@ -104,6 +182,9 @@ export component PageFans inherits VerticalLayout {
                         default => {
                             FanPageData.set_profile_default(Profile.Balanced);
                         }
+                        cancel => {
+                            FanPageData.cancel(FanType.Middle, Profile.Balanced);
+                        }
                     }
                 }
 
@@ -122,6 +203,9 @@ export component PageFans inherits VerticalLayout {
                         default => {
                             FanPageData.set_profile_default(Profile.Balanced);
                         }
+                        cancel => {
+                            FanPageData.cancel(FanType.GPU, Profile.Balanced);
+                        }
                     }
                 }
             }
@@ -145,6 +229,9 @@ export component PageFans inherits VerticalLayout {
                         default => {
                             FanPageData.set_profile_default(Profile.Performance);
                         }
+                        cancel => {
+                            FanPageData.cancel(FanType.CPU, Profile.Performance);
+                        }
                     }
                 }
 
@@ -163,6 +250,9 @@ export component PageFans inherits VerticalLayout {
                         default => {
                             FanPageData.set_profile_default(Profile.Performance);
                         }
+                        cancel => {
+                            FanPageData.cancel(FanType.Middle, Profile.Performance);
+                        }
                     }
                 }
 
@@ -181,6 +271,9 @@ export component PageFans inherits VerticalLayout {
                         default => {
                             FanPageData.set_profile_default(Profile.Performance);
                         }
+                        cancel => {
+                            FanPageData.cancel(FanType.GPU, Profile.Performance);
+                        }
                     }
                 }
             }
@@ -204,6 +297,9 @@ export component PageFans inherits VerticalLayout {
                         default => {
                             FanPageData.set_profile_default(Profile.Quiet);
                         }
+                        cancel => {
+                            FanPageData.cancel(FanType.CPU, Profile.Quiet);
+                        }
                     }
                 }
 
@@ -222,6 +318,9 @@ export component PageFans inherits VerticalLayout {
                         default => {
                             FanPageData.set_profile_default(Profile.Quiet);
                         }
+                        cancel => {
+                            FanPageData.cancel(FanType.Middle, Profile.Quiet);
+                        }
                     }
                 }
 
@@ -240,6 +339,9 @@ export component PageFans inherits VerticalLayout {
                         default => {
                             FanPageData.set_profile_default(Profile.Quiet);
                         }
+                        cancel => {
+                            FanPageData.cancel(FanType.GPU, Profile.Quiet);
+                        }
                     }
                 }
             }

rog-control-center/ui/pages/screenpad.slint

@@ -0,0 +1,102 @@
+import { Button, VerticalBox, Slider, Switch } from "std-widgets.slint";
+import { ScreenpadPageData } from "../types/screenpad_types.slint";
+import { RogPalette } from "../themes/rog_theme.slint";
+import { RogItem, SystemSlider } from "../widgets/common.slint";
+
+export { ScreenpadPageData }
+
+export component PageScreenpad inherits Rectangle {
+    background: RogPalette.background;
+
+    VerticalBox {
+        alignment: LayoutAlignment.start;
+        padding: 20px;
+        spacing: 20px;
+
+        Text {
+            text: @tr("Screenpad Controls");
+            font-size: 24px;
+            font-weight: 700;
+            color: RogPalette.accent;
+        }
+
+        RogItem {
+            HorizontalLayout {
+                padding: 15px;
+                spacing: 20px;
+                alignment: LayoutAlignment.space-between;
+                
+                Text {
+                    text: @tr("Enable Screenpad");
+                    font-size: 16px;
+                    vertical-alignment: TextVerticalAlignment.center;
+                    color: RogPalette.text-primary;
+                }
+
+                Switch {
+                    checked <=> ScreenpadPageData.power;
+                    toggled => {
+                        ScreenpadPageData.cb_power(self.checked);
+                    }
+                }
+            }
+        }
+
+        VerticalLayout {
+            spacing: 15px;
+            
+            // Brightness Slider
+            SystemSlider {
+                enabled: ScreenpadPageData.power;
+                text: @tr("Brightness");
+                minimum: 0;
+                maximum: 255;
+                value: ScreenpadPageData.brightness;
+                help_text: ScreenpadPageData.brightness == -1 ? @tr("Not available") : "";
+                released => {
+                    ScreenpadPageData.cb_brightness(Math.round(self.value));
+                }
+            }
+
+            // Gamma Slider (New)
+            SystemSlider {
+                enabled: ScreenpadPageData.power;
+                text: @tr("Gamma");
+                minimum: 0.1;
+                maximum: 2.5;
+                value: ScreenpadPageData.gamma;
+                help_text: @tr("Adjust color intensity");
+                released => {
+                    ScreenpadPageData.cb_gamma(self.value);
+                }
+            }
+
+            RogItem {
+                enabled: ScreenpadPageData.power;
+                HorizontalLayout {
+                    padding: 15px;
+                    spacing: 20px;
+                    alignment: LayoutAlignment.space-between;
+                    
+                    Text {
+                        text: @tr("Sync with Primary Display");
+                        font-size: 16px;
+                        vertical-alignment: TextVerticalAlignment.center;
+                        color: RogPalette.text-primary;
+                    }
+
+                    Switch {
+                        enabled: ScreenpadPageData.power;
+                        checked <=> ScreenpadPageData.sync_with_primary;
+                        toggled => {
+                            ScreenpadPageData.cb_sync_with_primary(self.checked);
+                        }
+                    }
+                }
+            }
+        }
+
+        // Spacer
+        Rectangle {}
+    }
+}

rog-control-center/ui/pages/slash.slint

@@ -0,0 +1,114 @@
+import { SystemToggle, SystemSlider, SystemDropdown, RogItem } from "../widgets/common.slint";
+import { VerticalBox, ScrollView, GroupBox } from "std-widgets.slint";
+import { RogPalette } from "../themes/rog_theme.slint";
+import { SlashPageData } from "../types/slash_types.slint";
+
+export { SlashPageData }
+
+export component PageSlash inherits Rectangle {
+    background: RogPalette.background;
+    
+    ScrollView {
+        VerticalBox {
+            padding: 20px;
+            spacing: 20px;
+            alignment: start;
+
+            // Header
+            Rectangle {
+                height: 40px;
+                background: RogPalette.control-background;
+                border-radius: RogPalette.border-radius;
+                border-width: 1px;
+                border-color: RogPalette.control-border;
+                
+                Text {
+                    text: @tr("Slash Lighting Control");
+                    color: RogPalette.accent;
+                    font-size: 18px;
+                    font-weight: 700;
+                    horizontal-alignment: center;
+                    vertical-alignment: center;
+                }
+            }
+
+            // Main Control
+            RogItem {
+                VerticalBox {
+                    SystemToggle {
+                        text: @tr("Enable Slash Lighting");
+                        checked <=> SlashPageData.enabled;
+                        toggled => { SlashPageData.cb_enabled(self.checked); }
+                    }
+
+                    SystemDropdown {
+                        text: @tr("Lighting Mode");
+                        model <=> SlashPageData.modes;
+                        current_index <=> SlashPageData.mode_index;
+                        current_value: SlashPageData.modes[SlashPageData.mode_index];
+                        selected => {
+                            SlashPageData.cb_mode_index(self.current_index);
+                        }
+                    }
+
+                    SystemSlider {
+                        title: @tr("Brightness");
+                        text: @tr("Brightness");
+                        value <=> SlashPageData.brightness;
+                        minimum: 0;
+                        maximum: 255;
+                        help_text: "";
+                        released(val) => { SlashPageData.cb_brightness(val); }
+                    }
+
+                    SystemSlider {
+                        title: @tr("Interval / Speed");
+                        text: @tr("Interval / Speed");
+                        value <=> SlashPageData.interval;
+                        minimum: 0;
+                        maximum: 255;
+                        help_text: "";
+                        released(val) => { SlashPageData.cb_interval(val); }
+                    }
+                }
+            }
+
+            // Behaviors
+            GroupBox {
+                title: @tr("Behavior Settings");
+                VerticalBox {
+                    SystemToggle {
+                        text: @tr("Show Battery Warning");
+                        checked <=> SlashPageData.show_battery_warning;
+                        toggled => { SlashPageData.cb_show_battery_warning(self.checked); }
+                    }
+                    SystemToggle {
+                        text: @tr("Active on Battery");
+                        checked <=> SlashPageData.show_on_battery;
+                        toggled => { SlashPageData.cb_show_on_battery(self.checked); }
+                    }
+                    SystemToggle {
+                        text: @tr("Active on Boot");
+                        checked <=> SlashPageData.show_on_boot;
+                        toggled => { SlashPageData.cb_show_on_boot(self.checked); }
+                    }
+                    SystemToggle {
+                        text: @tr("Active on Shutdown");
+                        checked <=> SlashPageData.show_on_shutdown;
+                        toggled => { SlashPageData.cb_show_on_shutdown(self.checked); }
+                    }
+                    SystemToggle {
+                        text: @tr("Active on Sleep");
+                        checked <=> SlashPageData.show_on_sleep;
+                        toggled => { SlashPageData.cb_show_on_sleep(self.checked); }
+                    }
+                    SystemToggle {
+                        text: @tr("Active when Lid Closed");
+                        checked <=> SlashPageData.show_on_lid_closed;
+                        toggled => { SlashPageData.cb_show_on_lid_closed(self.checked); }
+                    }
+                }
+            }
+        }
+    }
+}

rog-control-center/ui/pages/supergfx.slint

@@ -0,0 +1,73 @@
+import { SystemDropdown, RogItem } from "../widgets/common.slint";
+import { VerticalBox, ScrollView, HorizontalBox } from "std-widgets.slint";
+import { RogPalette } from "../themes/rog_theme.slint";
+import { SupergfxPageData } from "../types/supergfx_types.slint";
+
+export { SupergfxPageData }
+
+export component PageSupergfx inherits Rectangle {
+    background: RogPalette.background;
+    
+    ScrollView {
+        VerticalBox {
+            padding: 20px;
+            spacing: 20px;
+            alignment: start;
+
+            // Header
+            Rectangle {
+                height: 40px;
+                background: RogPalette.control-background;
+                border-radius: RogPalette.border-radius;
+                border-width: 1px;
+                border-color: RogPalette.control-border;
+                
+                Text {
+                    text: @tr("Graphics Control (supergfx)");
+                    color: RogPalette.accent;
+                    font-size: 18px;
+                    font-weight: 700;
+                    horizontal-alignment: center;
+                    vertical-alignment: center;
+                }
+            }
+            
+            RogItem {
+                HorizontalBox {
+                    Text {
+                        text: @tr("Vendor: ") + SupergfxPageData.vendor;
+                        color: RogPalette.text-secondary;
+                        vertical-alignment: center;
+                    }
+                }
+            }
+
+            // Main Control
+            RogItem {
+                VerticalBox {
+                    Text {
+                        text: @tr("Current Mode: ") + SupergfxPageData.current_mode;
+                        color: RogPalette.text-primary;
+                    }
+                    
+                    SystemDropdown {
+                        text: @tr("Graphics Mode");
+                        model <=> SupergfxPageData.supported_modes;
+                        current_index <=> SupergfxPageData.selected_index;
+                        current_value: SupergfxPageData.supported_modes[SupergfxPageData.selected_index];
+                        selected => {
+                            SupergfxPageData.set_mode(self.current_value);
+                        }
+                    }
+                    
+                    Text {
+                        text: @tr("Note: Changing modes requires a logout.");
+                        color: RogPalette.text-secondary;
+                        font-size: 12px;
+                        wrap: word-wrap;
+                    }
+                }
+            }
+        }
+    }
+}

rog-control-center/ui/pages/system.slint

@@ -1,5 +1,6 @@
 import { SystemSlider, SystemDropdown, SystemToggle, SystemToggleInt, RogItem } from "../widgets/common.slint";
 import { Palette, HorizontalBox , VerticalBox, ScrollView, Slider, Button, Switch, ComboBox, GroupBox, StandardButton} from "std-widgets.slint";
+import { RogPalette } from "../themes/rog_theme.slint";
 
 export struct AttrMinMax {
   min: int,
@@ -51,16 +52,21 @@ export global SystemPageData {
     callback cb_panel_overdrive(int);
     in-out property <int> boot_sound;
     callback cb_boot_sound(int);
+    in-out property <int> kbd_leds_awake;
+    callback cb_kbd_leds_awake(int);
+    in-out property <int> kbd_leds_sleep;
+    callback cb_kbd_leds_sleep(int);
+    in-out property <int> kbd_leds_boot;
+    callback cb_kbd_leds_boot(int);
+    in-out property <int> kbd_leds_shutdown;
+    callback cb_kbd_leds_shutdown(int);
+    in-out property <int> screen_auto_brightness;
+    callback cb_screen_auto_brightness(int);
+    in-out property <int> mcu_powersave;
+    callback cb_mcu_powersave(int);
     in-out property <int> mini_led_mode;
     callback cb_mini_led_mode(int);
 
-    in-out property <float> screenpad_gamma;
-    callback cb_screenpad_gamma(float);
-    // percentage
-    in-out property <int> screenpad_brightness: 50;
-    callback cb_screenpad_brightness(int);
-    in-out property <bool> screenpad_sync_with_primary: false;
-    callback cb_screenpad_sync_with_primary(bool);
 
     in-out property <bool> asus_armoury_loaded: false;
 
@@ -145,18 +151,22 @@ export component PageSystem inherits Rectangle {
     ScrollView {
         VerticalLayout {
             padding: 10px;
+            padding-top: 40px;
+            padding-bottom: 40px;
             spacing: 10px;
             alignment: LayoutAlignment.start;
             Rectangle {
-                background: Palette.alternate-background;
-                border-color: Palette.accent-background;
-                border-width: 3px;
-                border-radius: 10px;
-                height: 40px;
+                background: RogPalette.control-background;
+                border-color: RogPalette.control-border;
+                border-width: 1px;
+                border-radius: 8px;
+                height: 46px;
                 Text {
                     font-size: 18px;
-                    color: Palette.control-foreground;
+                    color: RogPalette.accent;
                     horizontal-alignment: TextHorizontalAlignment.center;
+                    vertical-alignment: TextVerticalAlignment.center;
+                    font-weight: 700;
                     text: @tr("Power settings");
                 }
             }
@@ -195,62 +205,18 @@ export component PageSystem inherits Rectangle {
                 }
             }
 
-            if SystemPageData.screenpad_brightness != -1: RogItem {
-                HorizontalLayout {
-                    padding-left: 10px;
-                    padding-right: 20px;
-                    HorizontalLayout {
-                        width: 38%;
-                        alignment: LayoutAlignment.space-between;
-                        padding-right: 15px;
-                        Text {
-                            font-size: 16px;
-                            vertical-alignment: TextVerticalAlignment.center;
-                            color: Palette.control-foreground;
-                            text: @tr("Screenpad brightness");
-                        }
-                    }
-
-                    HorizontalLayout {
-                        width: 38%;
-                        alignment: LayoutAlignment.stretch;
-                        screen_bright := Slider {
-                            enabled: true;
-                            minimum: 0;
-                            maximum: 100;
-                            value: SystemPageData.screenpad_brightness;
-                            released(value) => {
-                                // SystemPageData.screenpad_brightness = self.value;
-                                SystemPageData.cb_screenpad_brightness(Math.floor(self.value));
-                            }
-                        }
-                    }
-
-                    HorizontalLayout {
-                    width: 20%;
-                    padding-left: 10px;
-                        alignment: LayoutAlignment.stretch;
-                        Switch {
-                            text: @tr("Sync with primary");
-                            checked <=> SystemPageData.screenpad_sync_with_primary;
-                            toggled => {
-                                SystemPageData.cb_screenpad_sync_with_primary(self.checked);
-                            }
-                        }
-                    }
-                }
-            }
-
             Rectangle {
-                background: Palette.alternate-background;
-                border-color: Palette.accent-background;
-                border-width: 3px;
-                border-radius: 10px;
-                height: 40px;
+                background: RogPalette.control-background;
+                border-color: RogPalette.control-border;
+                border-width: 1px;
+                border-radius: 8px;
+                height: 46px;
                 Text {
                     font-size: 18px;
-                    color: Palette.control-foreground;
+                    color: RogPalette.accent;
                     horizontal-alignment: TextHorizontalAlignment.center;
+                    vertical-alignment: TextVerticalAlignment.center;
+                    font-weight: 700;
                     text: @tr("Armoury settings");
                 }
             }
@@ -274,6 +240,44 @@ export component PageSystem inherits Rectangle {
                 }
             }
 
+            GroupBox {
+                title: @tr("Keyboard Power Management");
+                HorizontalLayout {
+                    spacing: 10px;
+                    if SystemPageData.kbd_leds_awake != -1: SystemToggleInt {
+                        text: @tr("Keyboard Awake Effect");
+                        checked_int <=> SystemPageData.kbd_leds_awake;
+                        toggled => {
+                            SystemPageData.cb_kbd_leds_awake(SystemPageData.kbd_leds_awake)
+                        }
+                    }
+
+                    if SystemPageData.kbd_leds_sleep != -1: SystemToggleInt {
+                        text: @tr("Keyboard Sleep Effect");
+                        checked_int <=> SystemPageData.kbd_leds_sleep;
+                        toggled => {
+                            SystemPageData.cb_kbd_leds_sleep(SystemPageData.kbd_leds_sleep)
+                        }
+                    }
+
+                    if SystemPageData.kbd_leds_boot != -1: SystemToggleInt {
+                        text: @tr("Keyboard Boot Effect");
+                        checked_int <=> SystemPageData.kbd_leds_boot;
+                        toggled => {
+                            SystemPageData.cb_kbd_leds_boot(SystemPageData.kbd_leds_boot)
+                        }
+                    }
+
+                    if SystemPageData.kbd_leds_shutdown != -1: SystemToggleInt {
+                        text: @tr("Keyboard Shutdown Effect");
+                        checked_int <=> SystemPageData.kbd_leds_shutdown;
+                        toggled => {
+                            SystemPageData.cb_kbd_leds_shutdown(SystemPageData.kbd_leds_shutdown)
+                        }
+                    }
+                }
+            }
+
             HorizontalBox {
                 padding: 0px;
                 spacing: 10px;
@@ -300,6 +304,22 @@ export component PageSystem inherits Rectangle {
                         SystemPageData.cb_boot_sound(SystemPageData.boot_sound)
                     }
                 }
+
+                if SystemPageData.screen_auto_brightness != -1: SystemToggleInt {
+                    text: @tr("Screen Auto Brightness");
+                    checked_int <=> SystemPageData.screen_auto_brightness;
+                    toggled => {
+                        SystemPageData.cb_screen_auto_brightness(SystemPageData.screen_auto_brightness)
+                    }
+                }
+
+                if SystemPageData.mcu_powersave != -1: SystemToggleInt {
+                    text: @tr("MCU Powersave");
+                    checked_int <=> SystemPageData.mcu_powersave;
+                    toggled => {
+                        SystemPageData.cb_mcu_powersave(SystemPageData.mcu_powersave)
+                    }
+                }
             }
 
             if (SystemPageData.ppt_pl1_spl.max > 0 && SystemPageData.ppt_pl1_spl.current != -1) || (SystemPageData.ppt_pl2_sppt.max > 0 && SystemPageData.ppt_pl2_sppt.current != -1) || (SystemPageData.ppt_pl3_fppt.max > 0 && SystemPageData.ppt_pl3_fppt.current != -1) || (SystemPageData.ppt_fppt.max > 0 && SystemPageData.ppt_fppt.current != -1) || (SystemPageData.ppt_apu_sppt.max > 0 && SystemPageData.ppt_apu_sppt.current != -1) || (SystemPageData.nv_temp_target.max > 0 && SystemPageData.nv_temp_target.current != -1) || (SystemPageData.nv_dynamic_boost.max > 0 && SystemPageData.nv_dynamic_boost.current != -1): HorizontalLayout {
@@ -311,6 +331,7 @@ export component PageSystem inherits Rectangle {
                     Text {
                         font-size: 16px;
                         text: @tr("ppt_warning" => "The following settings are not applied until the toggle is enabled.");
+                        color: RogPalette.text-primary;
                     }
                 }
 
@@ -479,7 +500,7 @@ export component PageSystem inherits Rectangle {
     if root.show_fade_cover: Rectangle {
         width: 100%;
         height: 100%;
-        background: Palette.background;
+        background: RogPalette.background;
         opacity: 0.9;
         TouchArea {
             height: 100%;
@@ -512,6 +533,7 @@ export component PageSystem inherits Rectangle {
                             horizontal-alignment: TextHorizontalAlignment.center;
                             vertical-alignment: TextVerticalAlignment.center;
                             text: @tr("Energy Performance Preference linked to Throttle Policy");
+                            color: RogPalette.text-primary;
                         }
 
                         SystemToggle {
@@ -562,6 +584,7 @@ export component PageSystem inherits Rectangle {
                             horizontal-alignment: TextHorizontalAlignment.center;
                             vertical-alignment: TextVerticalAlignment.center;
                             text: @tr("Throttle Policy for power state");
+                            color: RogPalette.text-primary;
                         }
 
                         HorizontalLayout {

rog-control-center/ui/themes/rog_theme.slint

@@ -0,0 +1,13 @@
+export global RogPalette {
+    out property <brush> background: #0a0a0a;
+    out property <brush> alternate-background: #111111;
+    out property <brush> control-background: #1e1e1e;
+    out property <brush> control-border: #333333;
+    out property <brush> control-border-hover: #555555;
+    out property <brush> control-border-checked: #ff0033; // ROG Red
+    out property <brush> text-primary: #ffffff;
+    out property <brush> text-secondary: #aaaaaa;
+    out property <brush> accent: #ff0033;
+    out property <brush> accent-hover: #d60000;
+    out property <length> border-radius: 4px;
+}

rog-control-center/ui/types/aura_types.slint

@@ -8,6 +8,13 @@ export enum AuraDevType {
     AnimeOrSlash,
 }
 
+// Software animation modes for keyboards that only support Static
+export enum SoftAnimationMode {
+    None,
+    Rainbow,
+    ColorCycle,
+}
+
 export struct AuraEffect {
     /// The effect type
     mode: int,
@@ -166,4 +173,16 @@ export global AuraPageData {
         }]
     };
     callback cb_led_power(LaptopAuraPower);
+
+    // Software animation properties (for Static-only keyboards)
+    in-out property <[string]> soft_animation_modes: [
+        @tr("Animation mode" => "None"),
+        @tr("Animation mode" => "Rainbow"),
+        @tr("Animation mode" => "Color Cycle"),
+    ];
+    in-out property <int> soft_animation_mode: 0;
+    in-out property <float> soft_animation_speed: 200; // ms between updates
+    in-out property <bool> soft_animation_available: false; // Set true when only Static mode is supported
+    callback cb_soft_animation_mode(int);
+    callback cb_soft_animation_speed(int);
 }

rog-control-center/ui/types/fan_types.slint

@@ -35,314 +35,64 @@ export global FanPageData {
     in-out property <bool> quiet_gpu_enabled: true;
     in-out property <bool> quiet_mid_enabled: false;
 
+    in-out property <bool> is_busy_cpu: false;
+    in-out property <bool> is_busy_gpu: false;
+    in-out property <bool> is_busy_mid: false;
+    in-out property <bool> show_custom_warning: false;
+
     callback set_fan_data(FanType, Profile, bool, [Node]);
     callback set_profile_default(Profile);
+    callback set_is_busy(FanType, bool);
+    // Last applied cache for Cancel button
+    in-out property <[Node]> last_applied_cpu_balanced: [];
+    in-out property <[Node]> last_applied_gpu_balanced: [];
+    in-out property <[Node]> last_applied_mid_balanced: [];
+    in-out property <[Node]> last_applied_cpu_performance: [];
+    in-out property <[Node]> last_applied_gpu_performance: [];
+    in-out property <[Node]> last_applied_mid_performance: [];
+    in-out property <[Node]> last_applied_cpu_quiet: [];
+    in-out property <[Node]> last_applied_gpu_quiet: [];
+    in-out property <[Node]> last_applied_mid_quiet: [];
+
+    callback cancel(FanType, Profile);
 
     in-out property <[Node]> balanced_cpu: [
-        {
-            x: 10px,
-            y: 10px,
-        },
-        {
-            x: 40px,
-            y: 30px,
-        },
-        {
-            x: 50px,
-            y: 50px,
-        },
-        {
-            x: 55px,
-            y: 50px,
-        },
-        {
-            x: 60px,
-            y: 60px,
-        },
-        {
-            x: 65px,
-            y: 70px,
-        },
-        {
-            x: 70px,
-            y: 80px,
-        },
-        {
-            x: 90px,
-            y: 100px,
-        },
+        { x: 30px, y: 0px }, { x: 40px, y: 0px }, { x: 50px, y: 0px }, { x: 60px, y: 0px },
+        { x: 70px, y: 25px }, { x: 80px, y: 55px }, { x: 90px, y: 85px }, { x: 98px, y: 100px },
     ];
     in-out property <[Node]> balanced_mid: [
-        {
-            x: 10px,
-            y: 10px,
-        },
-        {
-            x: 40px,
-            y: 30px,
-        },
-        {
-            x: 50px,
-            y: 50px,
-        },
-        {
-            x: 55px,
-            y: 50px,
-        },
-        {
-            x: 60px,
-            y: 60px,
-        },
-        {
-            x: 65px,
-            y: 70px,
-        },
-        {
-            x: 70px,
-            y: 80px,
-        },
-        {
-            x: 90px,
-            y: 100px,
-        },
+        { x: 30px, y: 0px }, { x: 40px, y: 0px }, { x: 50px, y: 0px }, { x: 60px, y: 0px },
+        { x: 70px, y: 25px }, { x: 80px, y: 55px }, { x: 90px, y: 85px }, { x: 98px, y: 100px },
     ];
     in-out property <[Node]> balanced_gpu: [
-        {
-            x: 10px,
-            y: 10px,
-        },
-        {
-            x: 40px,
-            y: 30px,
-        },
-        {
-            x: 50px,
-            y: 50px,
-        },
-        {
-            x: 55px,
-            y: 50px,
-        },
-        {
-            x: 60px,
-            y: 60px,
-        },
-        {
-            x: 65px,
-            y: 70px,
-        },
-        {
-            x: 70px,
-            y: 80px,
-        },
-        {
-            x: 90px,
-            y: 100px,
-        },
+        { x: 30px, y: 0px }, { x: 40px, y: 0px }, { x: 50px, y: 0px }, { x: 60px, y: 0px },
+        { x: 70px, y: 25px }, { x: 80px, y: 55px }, { x: 90px, y: 85px }, { x: 98px, y: 100px },
     ];
+
     in-out property <[Node]> performance_cpu: [
-        {
-            x: 10px,
-            y: 10px,
-        },
-        {
-            x: 40px,
-            y: 30px,
-        },
-        {
-            x: 50px,
-            y: 50px,
-        },
-        {
-            x: 55px,
-            y: 50px,
-        },
-        {
-            x: 60px,
-            y: 60px,
-        },
-        {
-            x: 65px,
-            y: 70px,
-        },
-        {
-            x: 70px,
-            y: 80px,
-        },
-        {
-            x: 90px,
-            y: 100px,
-        },
+        { x: 30px, y: 0px }, { x: 40px, y: 10px }, { x: 50px, y: 30px }, { x: 60px, y: 50px },
+        { x: 70px, y: 70px }, { x: 80px, y: 85px }, { x: 90px, y: 95px }, { x: 98px, y: 100px },
     ];
     in-out property <[Node]> performance_mid: [
-        {
-            x: 10px,
-            y: 10px,
-        },
-        {
-            x: 40px,
-            y: 30px,
-        },
-        {
-            x: 50px,
-            y: 50px,
-        },
-        {
-            x: 55px,
-            y: 50px,
-        },
-        {
-            x: 60px,
-            y: 60px,
-        },
-        {
-            x: 65px,
-            y: 70px,
-        },
-        {
-            x: 70px,
-            y: 80px,
-        },
-        {
-            x: 90px,
-            y: 100px,
-        },
+        { x: 30px, y: 0px }, { x: 40px, y: 10px }, { x: 50px, y: 30px }, { x: 60px, y: 50px },
+        { x: 70px, y: 70px }, { x: 80px, y: 85px }, { x: 90px, y: 95px }, { x: 98px, y: 100px },
     ];
     in-out property <[Node]> performance_gpu: [
-        {
-            x: 10px,
-            y: 10px,
-        },
-        {
-            x: 40px,
-            y: 30px,
-        },
-        {
-            x: 50px,
-            y: 50px,
-        },
-        {
-            x: 55px,
-            y: 50px,
-        },
-        {
-            x: 60px,
-            y: 60px,
-        },
-        {
-            x: 65px,
-            y: 70px,
-        },
-        {
-            x: 70px,
-            y: 80px,
-        },
-        {
-            x: 90px,
-            y: 100px,
-        },
+        { x: 30px, y: 0px }, { x: 40px, y: 10px }, { x: 50px, y: 30px }, { x: 60px, y: 50px },
+        { x: 70px, y: 70px }, { x: 80px, y: 85px }, { x: 90px, y: 95px }, { x: 98px, y: 100px },
     ];
+
     in-out property <[Node]> quiet_cpu: [
-        {
-            x: 10px,
-            y: 10px,
-        },
-        {
-            x: 40px,
-            y: 30px,
-        },
-        {
-            x: 50px,
-            y: 50px,
-        },
-        {
-            x: 55px,
-            y: 50px,
-        },
-        {
-            x: 60px,
-            y: 60px,
-        },
-        {
-            x: 65px,
-            y: 70px,
-        },
-        {
-            x: 70px,
-            y: 80px,
-        },
-        {
-            x: 90px,
-            y: 100px,
-        },
+        { x: 30px, y: 0px }, { x: 40px, y: 0px }, { x: 50px, y: 0px }, { x: 60px, y: 0px },
+        { x: 70px, y: 20px }, { x: 80px, y: 40px }, { x: 90px, y: 70px }, { x: 98px, y: 90px },
     ];
     in-out property <[Node]> quiet_mid: [
-        {
-            x: 10px,
-            y: 10px,
-        },
-        {
-            x: 40px,
-            y: 30px,
-        },
-        {
-            x: 50px,
-            y: 50px,
-        },
-        {
-            x: 55px,
-            y: 50px,
-        },
-        {
-            x: 60px,
-            y: 60px,
-        },
-        {
-            x: 65px,
-            y: 70px,
-        },
-        {
-            x: 70px,
-            y: 80px,
-        },
-        {
-            x: 90px,
-            y: 100px,
-        },
+        { x: 30px, y: 0px }, { x: 40px, y: 0px }, { x: 50px, y: 0px }, { x: 60px, y: 0px },
+        { x: 70px, y: 20px }, { x: 80px, y: 40px }, { x: 90px, y: 70px }, { x: 98px, y: 90px },
     ];
     in-out property <[Node]> quiet_gpu: [
-        {
-            x: 10px,
-            y: 10px,
-        },
-        {
-            x: 40px,
-            y: 30px,
-        },
-        {
-            x: 50px,
-            y: 50px,
-        },
-        {
-            x: 55px,
-            y: 50px,
-        },
-        {
-            x: 60px,
-            y: 60px,
-        },
-        {
-            x: 65px,
-            y: 70px,
-        },
-        {
-            x: 70px,
-            y: 80px,
-        },
-        {
-            x: 90px,
-            y: 100px,
-        },
+        { x: 30px, y: 0px }, { x: 40px, y: 0px }, { x: 50px, y: 0px }, { x: 60px, y: 0px },
+        { x: 70px, y: 20px }, { x: 80px, y: 40px }, { x: 90px, y: 70px }, { x: 98px, y: 90px },
     ];
 
     function set_fan(profile: Profile, fan: FanType, data: [Node]) {

rog-control-center/ui/types/screenpad_types.slint

@@ -0,0 +1,13 @@
+import { RogPalette } from "../themes/rog_theme.slint";
+
+export global ScreenpadPageData {
+    in-out property <int> brightness: -1;
+    in-out property <float> gamma: 1.0;
+    in-out property <bool> sync_with_primary: false;
+    in-out property <bool> power: true;
+
+    callback cb_brightness(int);
+    callback cb_gamma(float);
+    callback cb_sync_with_primary(bool);
+    callback cb_power(bool);
+}

rog-control-center/ui/types/slash_types.slint

@@ -0,0 +1,49 @@
+export global SlashPageData {
+    in-out property <bool> enabled;
+    callback cb_enabled(bool);
+    
+    in-out property <float> brightness;
+    callback cb_brightness(float);
+    
+    in-out property <float> interval;
+    callback cb_interval(float);
+    
+    in-out property <[string]> modes: [
+        @tr("Static"),
+        @tr("Bounce"),
+        @tr("Slash"),
+        @tr("Loading"),
+        @tr("BitStream"),
+        @tr("Transmission"),
+        @tr("Flow"),
+        @tr("Flux"),
+        @tr("Phantom"),
+        @tr("Spectrum"),
+        @tr("Hazard"),
+        @tr("Interfacing"),
+        @tr("Ramp"),
+        @tr("GameOver"),
+        @tr("Start"),
+        @tr("Buzzer"),
+    ];
+    in-out property <int> mode_index;
+    callback cb_mode_index(int);
+
+    in-out property <bool> show_battery_warning;
+    callback cb_show_battery_warning(bool);
+
+    in-out property <bool> show_on_battery;
+    callback cb_show_on_battery(bool);
+
+    in-out property <bool> show_on_boot;
+    callback cb_show_on_boot(bool);
+
+    in-out property <bool> show_on_shutdown;
+    callback cb_show_on_shutdown(bool);
+
+    in-out property <bool> show_on_sleep;
+    callback cb_show_on_sleep(bool);
+
+    in-out property <bool> show_on_lid_closed;
+    callback cb_show_on_lid_closed(bool);
+}

rog-control-center/ui/types/supergfx_types.slint

@@ -0,0 +1,10 @@
+export global SupergfxPageData {
+    in-out property <string> current_mode: "Hybrid";
+    in-out property <[string]> supported_modes: ["Hybrid", "Integrated"];
+    in-out property <int> selected_index: 0;
+    
+    in-out property <string> vendor: "Unknown";
+    
+    callback set_mode(string);
+    callback refresh();
+}

rog-control-center/ui/widgets/aura_power.slint

@@ -1,12 +1,14 @@
-import { Palette, VerticalBox, HorizontalBox, GroupBox } from "std-widgets.slint";
+import { VerticalBox, HorizontalBox, GroupBox } from "std-widgets.slint";
 import { SystemToggleVert, SystemDropdown } from "common.slint";
 import { PowerZones } from "../types/aura_types.slint";
+import { RogPalette } from "../themes/rog_theme.slint";
 
 export component AuraPowerGroup inherits Rectangle {
     min-width: row.min-width;
-    border-radius: 20px;
-    background: Palette.alternate-background;
-    opacity: 0.9;
+    border-radius: 8px;
+    background: RogPalette.control-background;
+    border-width: 1px;
+    border-color: RogPalette.control-border;
     in-out property <string> group-title;
     in-out property <bool> boot_checked;
     in-out property <bool> awake_checked;
@@ -20,7 +22,7 @@ export component AuraPowerGroup inherits Rectangle {
         spacing: 10px;
         Text {
             font-size: 18px;
-            color: Palette.alternate-foreground;
+            color: RogPalette.text-primary;
             horizontal-alignment: TextHorizontalAlignment.center;
             text <=> root.group-title;
         }
@@ -72,9 +74,10 @@ export component AuraPowerGroup inherits Rectangle {
 
 export component AuraPowerGroupOld inherits Rectangle {
     min-width: row.min-width;
-    border-radius: 20px;
-    background: Palette.alternate-background;
-    opacity: 0.9;
+    border-radius: 8px;
+    background: RogPalette.control-background;
+    border-width: 1px;
+    border-color: RogPalette.control-border;
     in-out property <int> current_zone;
     in-out property <[int]> zones;
     in-out property <[string]> zone_strings;
@@ -90,7 +93,7 @@ export component AuraPowerGroupOld inherits Rectangle {
         spacing: 10px;
         Text {
             font-size: 18px;
-            color: Palette.alternate-foreground;
+            color: RogPalette.text-primary;
             horizontal-alignment: TextHorizontalAlignment.center;
             text <=> root.group-title;
         }

rog-control-center/ui/widgets/common.slint

@@ -1,12 +1,15 @@
-import { Palette, VerticalBox , StandardButton, Button, HorizontalBox, ComboBox, Switch, Slider} from "std-widgets.slint";
+import { VerticalBox , StandardButton, Button, HorizontalBox, ComboBox, Switch, Slider} from "std-widgets.slint";
+import { RogPalette } from "../themes/rog_theme.slint";
 
 export component RogItem inherits Rectangle {
-    background: Palette.control-background;
-    border-color: Palette.border;
-    border-width: 3px;
-    border-radius: 10px;
+    in property <bool> enabled: true;
+    background: root.enabled ? RogPalette.control-background : RogPalette.control-background.darker(0.5);
+    border-color: root.enabled ? RogPalette.control-border : RogPalette.control-border.darker(0.3);
+    border-width: 1px; // Thinner border for modern look
+    border-radius: RogPalette.border-radius;
     min-height: 48px;
     max-height: 56px;
+    opacity: root.enabled ? 1.0 : 0.6;
 }
 
 export component SystemSlider inherits RogItem {
@@ -18,7 +21,6 @@ export component SystemSlider inherits RogItem {
     callback released(float);
 
     in property <string> help_text;
-    in property <bool> enabled: true;
     in property <bool> has_reset: false;
     callback cb_do_reset();
 
@@ -32,7 +34,7 @@ export component SystemSlider inherits RogItem {
                 Text {
                     font-size: 16px;
                     vertical-alignment: TextVerticalAlignment.center;
-                    color: Palette.control-foreground;
+                    color: RogPalette.text-primary;
                     text: root.text;
                 }
 
@@ -40,7 +42,7 @@ export component SystemSlider inherits RogItem {
                     font-size: 16px;
                     horizontal-alignment: TextHorizontalAlignment.right;
                     vertical-alignment: TextVerticalAlignment.center;
-                    color: Palette.control-foreground;
+                    color: RogPalette.accent;
                     text: "\{Math.round(root.value)}";
                 }
             }
@@ -64,10 +66,11 @@ export component SystemSlider inherits RogItem {
             y: help.y - self.height + help.height - 10px;
             Rectangle {
                 drop-shadow-blur: 10px;
-                drop-shadow-color: black;
-                border-radius: 10px;
-                border-color: Palette.accent-background;
-                background: Palette.background;
+                drop-shadow-color: Colors.black;
+                border-radius: RogPalette.border-radius;
+                border-width: 1px;
+                border-color: RogPalette.accent;
+                background: RogPalette.control-background;
                 Dialog {
                     title: root.title;
                     VerticalBox {
@@ -77,12 +80,12 @@ export component SystemSlider inherits RogItem {
                             wrap: TextWrap.word-wrap;
                             horizontal-alignment: TextHorizontalAlignment.center;
                             text: root.title;
+                            color: RogPalette.text-primary;
                         }
 
                         Rectangle {
                             height: 1px;
-                            border-color: black;
-                            border-width: 1px;
+                            background: RogPalette.control-border;
                         }
 
                         Text {
@@ -90,6 +93,7 @@ export component SystemSlider inherits RogItem {
                             font-size: 16px;
                             wrap: TextWrap.word-wrap;
                             text: root.help_text;
+                            color: RogPalette.text-secondary;
                         }
                     }
 
@@ -114,16 +118,18 @@ export component SystemSlider inherits RogItem {
             y: reset.y - self.height + reset.height;
             Rectangle {
                 drop-shadow-blur: 10px;
-                drop-shadow-color: black;
-                border-radius: 10px;
-                border-color: Palette.accent-background;
-                background: Palette.background;
+                drop-shadow-color: Colors.black;
+                border-radius: RogPalette.border-radius;
+                border-width: 1px;
+                border-color: RogPalette.accent;
+                background: RogPalette.control-background;
                 Dialog {
                     Text {
                         max-width: 420px;
                         font-size: 16px;
                         wrap: TextWrap.word-wrap;
                         text: @tr("confirm_reset" => "Are you sure you want to reset this?");
+                        color: RogPalette.text-primary;
                     }
 
                     StandardButton {
@@ -164,7 +170,7 @@ export component SystemToggle inherits RogItem {
             Text {
                 font-size: 16px;
                 vertical-alignment: TextVerticalAlignment.center;
-                color: Palette.control-foreground;
+                color: RogPalette.text-primary;
                 text: root.text;
             }
         }
@@ -195,7 +201,7 @@ export component SystemToggleInt inherits RogItem {
             Text {
                 font-size: 16px;
                 vertical-alignment: TextVerticalAlignment.center;
-                color: Palette.control-foreground;
+                color: RogPalette.text-primary;
                 text: root.text;
             }
         }
@@ -226,7 +232,7 @@ export component SystemToggleVert inherits RogItem {
             font-size: 16px;
             vertical-alignment: TextVerticalAlignment.bottom;
             horizontal-alignment: TextHorizontalAlignment.center;
-            color: Palette.control-foreground;
+            color: RogPalette.text-primary;
             text: root.text;
         }
 
@@ -256,7 +262,7 @@ export component SystemDropdown inherits RogItem {
             Text {
                 font-size: 16px;
                 vertical-alignment: TextVerticalAlignment.center;
-                color: Palette.control-foreground;
+                color: RogPalette.text-primary;
                 text: root.text;
             }
         }
@@ -288,9 +294,9 @@ export component PopupNotification {
         height: root.height;
         // TODO: add properties to display
         Rectangle {
-            border-width: 2px;
-            border-color: Palette.accent-background;
-            background: Palette.background;
+            border-width: 1px;
+            border-color: RogPalette.accent;
+            background: RogPalette.background;
             // TODO: drop shadows slow
             // drop-shadow-offset-x: 7px;
             // drop-shadow-offset-y: 7px;
@@ -302,14 +308,14 @@ export component PopupNotification {
                         alignment: start;
                         Text {
                             text: heading;
-                            color: Palette.control-foreground;
+                            color: RogPalette.text-primary;
                             font-size: 32px;
                             font-weight: 900;
                         }
 
                         Text {
                             text: content;
-                            color: Palette.control-foreground;
+                            color: RogPalette.text-secondary;
                             font-size: 18px;
                         }
                     }

rog-control-center/ui/widgets/graph.slint

@@ -1,4 +1,5 @@
 import { Palette } from "std-widgets.slint";
+import { RogPalette } from "../themes/rog_theme.slint";
 
 export struct Node { x: length, y: length}
 
@@ -44,7 +45,7 @@ export component Graph inherits Rectangle {
         for n in 11: Path {
             viewbox-width: self.width / 1px;
             viewbox-height: self.height / 1px;
-            stroke: Palette.alternate-foreground.darker(200%);
+            stroke: RogPalette.control-border;
             stroke-width: 1px;
             MoveTo {
                 x: scale_x_to_graph(n * 10px) / 1px;
@@ -60,7 +61,7 @@ export component Graph inherits Rectangle {
         }
 
         for n in 11: Text {
-            color: Palette.accent-background;
+            color: RogPalette.text-secondary;
             font-size <=> root.axis_font_size;
             text: "\{n * 10}c";
             x: scale_x_to_graph(n * 10px) - self.width / 3;
@@ -70,7 +71,7 @@ export component Graph inherits Rectangle {
         for n in 11: Path {
             viewbox-width: self.width / 1px;
             viewbox-height: self.height / 1px;
-            stroke: Palette.alternate-foreground.darker(200%);
+            stroke: RogPalette.control-border;
             stroke-width: 1px;
             MoveTo {
                 x: 0;
@@ -86,7 +87,7 @@ export component Graph inherits Rectangle {
         }
 
         for n in 11: Text {
-            color: Palette.accent-background;
+            color: RogPalette.text-secondary;
             font-size <=> root.axis_font_size;
             text: "\{n * 10}%";
             x: - self.width;
@@ -97,7 +98,7 @@ export component Graph inherits Rectangle {
             if idx + 1 != nodes.length: Path {
                 viewbox-width: self.width / 1px;
                 viewbox-height: self.height / 1px;
-                stroke: Palette.control-foreground;
+                stroke: RogPalette.accent;
                 stroke-width: 2px;
                 MoveTo {
                     x: scale_x_to_graph(nodes[idx].x) / 1px;
@@ -114,19 +115,19 @@ export component Graph inherits Rectangle {
         for n[idx] in nodes: Rectangle {
             states [
                 pressed when touch.pressed: {
-                    point.background: Palette.selection-background;
-                    tip.background: Palette.selection-background;
+                    point.background: RogPalette.accent;
+                    tip.background: RogPalette.accent;
                     tip.opacity: 1.0;
                 }
                 hover when touch.has-hover: {
-                    point.background: Palette.accent-background;
-                    tip.background: Palette.accent-background;
+                    point.background: RogPalette.accent;
+                    tip.background: RogPalette.accent;
                     tip.opacity: 1.0;
                 }
             ]
             //
             point := Rectangle {
-                background: Palette.control-foreground;
+                background: RogPalette.text-primary;
                 x: scale_x_to_graph(n.x) - self.width / 2;
                 y: graph.height - scale_y_to_graph(n.y) - self.height / 2;
                 width: 18px;
@@ -142,10 +143,14 @@ export component Graph inherits Rectangle {
                             } else if n.x + scale_x_to_node(self.mouse-x - self.pressed-x) < nodes[idx - 1].x {
                                 n.x = nodes[idx - 1].x + pad;
                             }
+                            
+                            // Y-Axis: Monotonic Non-Decreasing
                             if n.y + scale_y_to_node(self.height - self.mouse-y - self.pressed-y) > nodes[idx + 1].y {
-                                n.y = nodes[idx + 1].y - pad;
+                                n.y = nodes[idx + 1].y; // Allow equality
                             } else if n.y + scale_y_to_node(self.height - self.mouse-y - self.pressed-y) < nodes[idx - 1].y {
-                                n.y = nodes[idx - 1].y + pad;
+                                n.y = nodes[idx - 1].y; // Allow equality
+                            } else if n.y + scale_y_to_node(self.height - self.mouse-y - self.pressed-y) < 0.0 {
+                                n.y = 0px;
                             }
                         } else if idx == 0 {
                             if n.x + scale_x_to_node(self.mouse-x - self.pressed-x) < 0.0 {
@@ -153,10 +158,12 @@ export component Graph inherits Rectangle {
                             } else if n.x + scale_x_to_node(self.mouse-x - self.pressed-x) > nodes[idx + 1].x {
                                 n.x = nodes[idx + 1].x - pad;
                             }
+                            
+                            // Y-Axis: <= Next Point
                             if n.y - scale_y_to_node(self.mouse-y - self.pressed-y) < 0.0 {
-                                n.y = 1px;
+                                n.y = 0px; // Allow 0 RPM
                             } else if n.y + scale_y_to_node(self.height - self.mouse-y - self.pressed-y) > nodes[idx + 1].y {
-                                n.y = nodes[idx + 1].y - pad;
+                                n.y = nodes[idx + 1].y; // Allow equality
                             }
                         } else if idx == nodes.length - 1 {
                             if n.x + scale_x_to_node(self.mouse-x - self.pressed-x) > scale_x_to_node(graph.width) {
@@ -164,10 +171,14 @@ export component Graph inherits Rectangle {
                             } else if n.x + scale_x_to_node(self.mouse-x - self.pressed-x) < nodes[idx - 1].x {
                                 n.x = nodes[idx - 1].x + pad;
                             }
+                            
+                            // Y-Axis: >= Previous Point
                             if n.y - scale_y_to_node(self.mouse-y - self.pressed-y) > scale_y_to_node(graph.height) {
-                                n.y = scale_y_to_node(graph.height - 1px);
+                                n.y = scale_y_to_node(graph.height);
                             } else if n.y + scale_y_to_node(self.height - self.mouse-y - self.pressed-y) < nodes[idx - 1].y {
-                                n.y = nodes[idx - 1].y + pad;
+                                n.y = nodes[idx - 1].y; // Allow equality
+                            } else if n.y + scale_y_to_node(self.height - self.mouse-y - self.pressed-y) < 0.0 {
+                                n.y = 0px;
                             }
                         }
                     }
@@ -189,7 +200,7 @@ export component Graph inherits Rectangle {
             }
 
             tip := Rectangle {
-                background: Palette.control-foreground;
+                background: RogPalette.control-background;
                 opacity: 0.3;
                 x: final_x_pos();
                 y: final_y_pos();
@@ -224,7 +235,7 @@ export component Graph inherits Rectangle {
                 }
                 //
                 label := Text {
-                    color: Palette.accent-foreground;
+                    color: RogPalette.text-primary;
                     font-size: 16px;
                     text: "\{Math.floor(n.x / 1px)}c, \{fan_pct()}%";
                 }

rog-control-center/ui/widgets/sidebar.slint

@@ -1,7 +1,8 @@
 // Copyright © SixtyFPS GmbH <info@slint.dev>
 // SPDX-License-Identifier: MIT
 
-import { Palette, HorizontalBox, VerticalBox } from "std-widgets.slint";
+import { HorizontalBox, VerticalBox } from "std-widgets.slint";
+import { RogPalette } from "../themes/rog_theme.slint";
 
 component SideBarItem inherits Rectangle {
     // padding only has effect on layout elements
@@ -28,12 +29,21 @@ component SideBarItem inherits Rectangle {
     ]
     state := Rectangle {
         opacity: 0;
-        border-width: 2px;
-        border-radius: 10px;
-        border-color: Palette.accent-background;
-        background: Palette.alternate-background;
+        border-width: 0px; // Modern look: no full border, maybe just a left bar? 
+        // Or keep the ROG style border
+        border-color: RogPalette.accent;
+        background: root.selected ? RogPalette.control-background : RogPalette.alternate-background;
+        
+        // Add a red indicator line on the left for selected items
+        Rectangle {
+            x: 0;
+            width: 4px;
+            height: 100%;
+            background: root.selected ? RogPalette.accent : Colors.transparent;
+        }
+        
         animate opacity { duration: 150ms; }
-        animate border-width { duration: 150ms; }
+        // animate border-width { duration: 150ms; }
         height: l.preferred-height;
     }
 
@@ -41,9 +51,10 @@ component SideBarItem inherits Rectangle {
         y: (parent.height - self.height) / 2;
         spacing: 0px;
         label := Text {
-            color: Palette.foreground;
+            color: root.selected ? RogPalette.accent : RogPalette.text-primary;
             vertical-alignment: center;
             font-size: 14px;
+            font-weight: root.selected ? 700 : 400;
         }
     }
 
@@ -66,10 +77,10 @@ export component SideBar inherits Rectangle {
     accessible-role: tab;
     accessible-delegate-focus: root.current-focused >= 0 ? root.current-focused : root.current-item;
     Rectangle {
-        border-width: 2px;
-        border-color: Palette.accent-background;
+        border-width: 0px;
+        // border-color: RogPalette.accent;
         border-radius: 0px;
-        background: Palette.background.darker(0.2);
+        background: RogPalette.alternate-background; // Darker sidebar
         fs := FocusScope {
             key-pressed(event) => {
                 if (event.text == "\n") {
@@ -104,12 +115,19 @@ export component SideBar inherits Rectangle {
         spacing: 4px;
         alignment: start;
         label := Text {
-            font-size: 16px;
+            font-size: 24px; // Larger brand text
+            font-weight: 800;
             horizontal-alignment: center;
+            color: RogPalette.accent; // ROG Red brand text
+        }
+
+        // Spacer after brand text
+        Rectangle {
+            height: 20px;
         }
 
         navigation := VerticalLayout {
-            spacing: -6px;
+            spacing: 4px; // Spacing between items
             alignment: start;
             vertical-stretch: 0;
             for item[index] in root.model: SideBarItem {

rog-control-center/ui/widgets/status_bar.slint

@@ -0,0 +1,58 @@
+import { RogPalette } from "../themes/rog_theme.slint";
+
+export global SystemStatus {
+    in property <int> cpu_temp: 0;
+    in property <int> gpu_temp: 0;
+    in property <int> cpu_fan: 0;
+    in property <int> gpu_fan: 0;
+    in property <string> power_w: "--";
+    in property <string> power_avg_w: "--";
+}
+
+component StatusItem inherits Rectangle {
+    in property <string> label;
+    in property <string> value;
+    in property <string> unit;
+    
+    HorizontalLayout {
+        spacing: 5px;
+        Text { text: label; color: RogPalette.text-secondary; font-weight: 700; vertical-alignment: center; }
+        Text { text: value; color: RogPalette.text-primary; vertical-alignment: center; }
+        Text { text: unit; color: RogPalette.text-secondary; font-size: 12px; vertical-alignment: center; }
+    }
+}
+
+export component StatusBar inherits Rectangle {
+    background: RogPalette.control-background;
+    height: 30px;
+    
+    // Simulated top border
+    Rectangle {
+        y: 0px;
+        x: 0px;
+        width: parent.width;
+        height: 1px;
+        background: RogPalette.control-border;
+    }
+    
+    HorizontalLayout {
+        padding-left: 20px;
+        padding-right: 20px;
+        spacing: 20px;
+        alignment: space-between;
+        
+        HorizontalLayout {
+            spacing: 20px;
+            StatusItem { label: "CPU"; value: SystemStatus.cpu_temp; unit: "°C"; }
+            StatusItem { label: "GPU"; value: SystemStatus.gpu_temp; unit: "°C"; }
+        }
+
+        HorizontalLayout {
+             spacing: 20px;
+             StatusItem { label: "PWR"; value: SystemStatus.power_w; unit: "W"; }
+             StatusItem { label: "AVG"; value: SystemStatus.power_avg_w; unit: "W"; }
+             StatusItem { label: "CPU Fan"; value: SystemStatus.cpu_fan; unit: "RPM"; }
+             StatusItem { label: "GPU Fan"; value: SystemStatus.gpu_fan; unit: "RPM"; }
+        }
+    }
+}

rog-control-center/ui/windows/tray_tooltip.slint

@@ -0,0 +1,76 @@
+import { RogPalette } from "../themes/rog_theme.slint";
+import { SystemStatus } from "../widgets/status_bar.slint";
+
+component StatusItem inherits Rectangle {
+    in property <string> label;
+    in property <string> value;
+    in property <string> unit;
+    
+    HorizontalLayout {
+        spacing: 8px;
+        Text { 
+            text: label; 
+            color: RogPalette.text-secondary; 
+            font-weight: 700; 
+            vertical-alignment: center; 
+            font-size: 13px;
+        }
+        Text { 
+            text: value; 
+            color: RogPalette.text-primary; 
+            vertical-alignment: center; 
+            font-size: 14px;
+        }
+        Text { 
+            text: unit; 
+            color: RogPalette.text-secondary; 
+            font-size: 11px; 
+            vertical-alignment: center; 
+        }
+    }
+}
+
+export component TrayTooltip inherits Window {
+    always-on-top: true;
+    no-frame: true;
+    background: transparent;
+    width: 280px;
+    height: 160px;
+
+    Rectangle {
+        background: RogPalette.control-background;
+        border-radius: 8px;
+        border-width: 1px;
+        border-color: RogPalette.control-border;
+        drop-shadow-blur: 10px;
+        drop-shadow-color: rgba(0,0,0,0.5);
+        
+        VerticalLayout {
+            padding: 15px;
+            spacing: 12px;
+            
+            Text {
+                text: "System Statistics";
+                color: RogPalette.accent;
+                font-size: 16px;
+                font-weight: 800;
+            }
+            
+            GridLayout {
+                spacing: 15px;
+                Row {
+                    StatusItem { label: "CPU"; value: SystemStatus.cpu_temp; unit: "°C"; }
+                    StatusItem { label: "GPU"; value: SystemStatus.gpu_temp; unit: "°C"; }
+                }
+                Row {
+                    StatusItem { label: "FAN"; value: SystemStatus.cpu_fan; unit: "RPM"; }
+                    StatusItem { label: "GPU"; value: SystemStatus.gpu_fan; unit: "RPM"; }
+                }
+                Row {
+                    StatusItem { label: "PWR"; value: SystemStatus.power_w; unit: "W"; }
+                    StatusItem { label: "AVG"; value: SystemStatus.power_avg_w; unit: "W"; }
+                }
+            }
+        }
+    }
+}

rog-platform/src/asus_armoury.rs

@@ -272,10 +272,33 @@ macro_rules! define_attribute_getters {
 }
 
 define_attribute_getters!(
-    apu_mem, cores_performance, cores_efficiency, ppt_pl1_spl, ppt_pl2_sppt, ppt_apu_sppt,
-    ppt_platform_sppt, ppt_fppt, nv_dynamic_boost, nv_temp_target, dgpu_base_tgp, dgpu_tgp,
-    charge_mode, boot_sound, mcu_powersave, panel_od, panel_hd_mode, egpu_connected, egpu_enable,
-    dgpu_disable, gpu_mux_mode, mini_led_mode
+    apu_mem,
+    cores_performance,
+    cores_efficiency,
+    ppt_pl1_spl,
+    ppt_pl2_sppt,
+    ppt_apu_sppt,
+    ppt_platform_sppt,
+    ppt_fppt,
+    nv_dynamic_boost,
+    nv_temp_target,
+    dgpu_base_tgp,
+    dgpu_tgp,
+    charge_mode,
+    boot_sound,
+    kbd_leds_awake,
+    kbd_leds_sleep,
+    kbd_leds_boot,
+    kbd_leds_shutdown,
+    mcu_powersave,
+    panel_od,
+    panel_hd_mode,
+    egpu_connected,
+    egpu_enable,
+    dgpu_disable,
+    gpu_mux_mode,
+    mini_led_mode,
+    screen_auto_brightness
 );
 
 /// CamelCase names of the properties. Intended for use with DBUS
@@ -322,6 +345,11 @@ pub enum FirmwareAttribute {
     PendingReboot = 23,
     PptEnabled = 24,
     None = 25,
+    ScreenAutoBrightness = 26,
+    KbdLedsAwake = 27,
+    KbdLedsSleep = 28,
+    KbdLedsBoot = 29,
+    KbdLedsShutdown = 30,
 }
 
 impl FirmwareAttribute {
@@ -363,9 +391,13 @@ impl From<&str> for FirmwareAttribute {
             "nv_dynamic_boost" => Self::NvDynamicBoost,
             "nv_temp_target" => Self::NvTempTarget,
             "nv_base_tgp" => Self::DgpuBaseTgp,
-            "dgpu_tgp" => Self::DgpuTgp,
+            "nv_tgp" => Self::DgpuTgp,
             "charge_mode" => Self::ChargeMode,
             "boot_sound" => Self::BootSound,
+            "kbd_leds_awake" => Self::KbdLedsAwake,
+            "kbd_leds_sleep" => Self::KbdLedsSleep,
+            "kbd_leds_boot" => Self::KbdLedsBoot,
+            "kbd_leds_shutdown" => Self::KbdLedsShutdown,
             "mcu_powersave" => Self::McuPowersave,
             "panel_overdrive" => Self::PanelOverdrive,
             "panel_hd_mode" => Self::PanelHdMode,
@@ -375,6 +407,7 @@ impl From<&str> for FirmwareAttribute {
             "gpu_mux_mode" => Self::GpuMuxMode,
             "mini_led_mode" => Self::MiniLedMode,
             "pending_reboot" => Self::PendingReboot,
+            "screen_auto_brightness" => Self::ScreenAutoBrightness,
             _ => {
                 error!("Invalid firmware attribute: {}", s);
                 Self::None
@@ -399,7 +432,7 @@ impl From<FirmwareAttribute> for &str {
             FirmwareAttribute::NvDynamicBoost => "nv_dynamic_boost",
             FirmwareAttribute::NvTempTarget => "nv_temp_target",
             FirmwareAttribute::DgpuBaseTgp => "dgpu_base_tgp",
-            FirmwareAttribute::DgpuTgp => "dgpu_tgp",
+            FirmwareAttribute::DgpuTgp => "nv_tgp",
             FirmwareAttribute::ChargeMode => "charge_mode",
             FirmwareAttribute::BootSound => "boot_sound",
             FirmwareAttribute::McuPowersave => "mcu_powersave",
@@ -410,7 +443,12 @@ impl From<FirmwareAttribute> for &str {
             FirmwareAttribute::DgpuDisable => "dgpu_disable",
             FirmwareAttribute::GpuMuxMode => "gpu_mux_mode",
             FirmwareAttribute::MiniLedMode => "mini_led_mode",
+            FirmwareAttribute::KbdLedsAwake => "kbd_leds_awake",
+            FirmwareAttribute::KbdLedsSleep => "kbd_leds_sleep",
+            FirmwareAttribute::KbdLedsBoot => "kbd_leds_boot",
+            FirmwareAttribute::KbdLedsShutdown => "kbd_leds_shutdown",
             FirmwareAttribute::PendingReboot => "pending_reboot",
+            FirmwareAttribute::ScreenAutoBrightness => "screen_auto_brightness",
             FirmwareAttribute::None => "none",
         }
     }

rog-platform/src/cpu.rs

@@ -267,18 +267,24 @@ mod tests {
     fn check_cpu() {
         let cpu = CPUControl::new().unwrap();
         assert_eq!(cpu.get_governor().unwrap(), CPUGovernor::Powersave);
-        assert_eq!(cpu.get_available_governors().unwrap(), vec![
-            CPUGovernor::Performance,
-            CPUGovernor::Powersave
-        ]);
+        assert_eq!(
+            cpu.get_available_governors().unwrap(),
+            vec![
+                CPUGovernor::Performance,
+                CPUGovernor::Powersave
+            ]
+        );
 
         assert_eq!(cpu.get_epp().unwrap(), CPUEPP::BalancePower);
-        assert_eq!(cpu.get_available_epp().unwrap(), vec![
-            CPUEPP::Default,
-            CPUEPP::Performance,
-            CPUEPP::BalancePerformance,
-            CPUEPP::BalancePower,
-            CPUEPP::Power,
-        ]);
+        assert_eq!(
+            cpu.get_available_epp().unwrap(),
+            vec![
+                CPUEPP::Default,
+                CPUEPP::Performance,
+                CPUEPP::BalancePerformance,
+                CPUEPP::BalancePower,
+                CPUEPP::Power,
+            ]
+        );
     }
 }

rog-platform/src/platform.rs

@@ -275,11 +275,16 @@ impl std::str::FromStr for PlatformProfile {
     type Err = PlatformError;
 
     fn from_str(profile: &str) -> Result<Self> {
-        match profile.to_ascii_lowercase().trim() {
+        match profile
+            .to_ascii_lowercase()
+            .trim()
+            .replace(|c| !char::is_alphabetic(c), "")
+            .as_str()
+        {
             "balanced" => Ok(PlatformProfile::Balanced),
             "performance" => Ok(PlatformProfile::Performance),
             "quiet" => Ok(PlatformProfile::Quiet),
-            "low-power" => Ok(PlatformProfile::LowPower),
+            "lowpower" => Ok(PlatformProfile::LowPower),
             "custom" => Ok(PlatformProfile::Custom),
             _ => Err(PlatformError::NotSupported),
         }
@@ -288,11 +293,16 @@ impl std::str::FromStr for PlatformProfile {
 
 impl From<&str> for PlatformProfile {
     fn from(profile: &str) -> Self {
-        match profile.to_ascii_lowercase().trim() {
+        match profile
+            .to_ascii_lowercase()
+            .trim()
+            .replace(|c| !char::is_alphabetic(c), "")
+            .as_str()
+        {
             "balanced" => PlatformProfile::Balanced,
             "performance" => PlatformProfile::Performance,
             "quiet" => PlatformProfile::Quiet,
-            "low-power" => PlatformProfile::LowPower,
+            "lowpower" => PlatformProfile::LowPower,
             "custom" => PlatformProfile::Custom,
             _ => {
                 warn!("{profile} is unknown, using ThrottlePolicy::Balanced");

rog-platform/src/power.rs

@@ -101,8 +101,15 @@ impl AsusPower {
             });
         }
 
-        Err(PlatformError::MissingFunction(
-            "Did not find a battery".to_owned(),
-        ))
+        // No battery found. Return an AsusPower with an empty battery path so
+        // callers can still be constructed and query `has_*` methods which
+        // will correctly report absence. This avoids hard-failing on systems
+        // where the asus-nb-wmi driver loads on desktops with no battery.
+        info!("Did not find a battery, continuing without battery support");
+        Ok(Self {
+            mains,
+            battery: PathBuf::new(),
+            usb,
+        })
     }
 }

rog-scsi/src/builtin_modes.rs

@@ -177,6 +177,12 @@ pub enum AuraMode {
     DoubleFade = 14,
 }
 
+#[cfg(feature = "dbus")]
+impl zbus::zvariant::Basic for AuraMode {
+    const SIGNATURE_CHAR: char = 'u';
+    const SIGNATURE_STR: &'static str = "u";
+}
+
 impl AuraMode {
     pub fn list() -> [String; 15] {
         [

rog-slash/src/data.rs

@@ -12,9 +12,13 @@ use crate::usb::{PROD_ID1, PROD_ID1_STR, PROD_ID2, PROD_ID2_STR};
 
 #[derive(Default, Debug, Copy, Clone, PartialEq, Eq, Deserialize, Serialize)]
 pub enum SlashType {
-    GA403,
-    GA605,
-    GU605,
+    GA403_2024,
+    GA403_2025,
+    GA605_2024,
+    GA605_2025,
+    GU605_2024,
+    GU605_2025,
+    G614_2025,
     #[default]
     Unsupported,
 }
@@ -22,30 +26,51 @@ pub enum SlashType {
 impl SlashType {
     pub const fn prod_id(&self) -> u16 {
         match self {
-            SlashType::GA403 => PROD_ID1,
-            SlashType::GA605 => PROD_ID2,
-            SlashType::GU605 => PROD_ID1,
+            SlashType::GA403_2025 => PROD_ID2,
+            SlashType::GA403_2024 => PROD_ID1,
+            SlashType::GA605_2025 => PROD_ID2,
+            SlashType::GA605_2024 => PROD_ID2,
+            SlashType::GU605_2025 => PROD_ID2,
+            SlashType::GU605_2024 => PROD_ID1,
+            SlashType::G614_2025 => PROD_ID2,
             SlashType::Unsupported => 0,
         }
     }
 
     pub const fn prod_id_str(&self) -> &str {
         match self {
-            SlashType::GA403 => PROD_ID1_STR,
-            SlashType::GA605 => PROD_ID2_STR,
-            SlashType::GU605 => PROD_ID1_STR,
+            SlashType::GA403_2025 => PROD_ID2_STR,
+            SlashType::GA403_2024 => PROD_ID1_STR,
+            SlashType::GA605_2025 => PROD_ID2_STR,
+            SlashType::GA605_2024 => PROD_ID2_STR,
+            SlashType::GU605_2025 => PROD_ID2_STR,
+            SlashType::GU605_2024 => PROD_ID1_STR,
+            SlashType::G614_2025 => PROD_ID2_STR,
             SlashType::Unsupported => "",
         }
     }
 
     pub fn from_dmi() -> Self {
         let board_name = DMIID::new().unwrap_or_default().board_name.to_uppercase();
-        if board_name.contains("GA403") {
-            SlashType::GA403
+        if board_name.contains("G614F") {
+            SlashType::G614_2025
+        } else if [
+            "GA403W", "GA403UH", "GA403UM", "GA403UP",
+        ]
+        .iter()
+        .any(|s| board_name.contains(s))
+        {
+            SlashType::GA403_2025
+        } else if board_name.contains("GA403") {
+            SlashType::GA403_2024
+        } else if board_name.contains("GA605K") {
+            SlashType::GA605_2025
         } else if board_name.contains("GA605") {
-            SlashType::GA605
+            SlashType::GA605_2024
+        } else if board_name.contains("GU605C") {
+            SlashType::GU605_2025
         } else if board_name.contains("GU605") {
-            SlashType::GU605
+            SlashType::GU605_2024
         } else {
             SlashType::Unsupported
         }
@@ -56,10 +81,14 @@ impl FromStr for SlashType {
     type Err = SlashError;
 
     fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {
-        Ok(match s {
-            "ga403" | "GA403" => Self::GA403,
-            "ga605" | "GA605" => Self::GA605,
-            "gu605" | "GU605" => Self::GU605,
+        Ok(match s.to_uppercase().as_str() {
+            "GA403_2025" => Self::GA403_2025,
+            "GA403_2024" => Self::GA403_2024,
+            "GA605_2025" => Self::GA605_2025,
+            "GA605_2024" => Self::GA605_2024,
+            "GU605_2025" => Self::GU605_2025,
+            "GU605_2024" => Self::GU605_2024,
+            "G614_2025" => Self::G614_2025,
             _ => Self::Unsupported,
         })
     }
@@ -68,6 +97,7 @@ impl FromStr for SlashType {
 #[cfg_attr(feature = "dbus", derive(Type, Value, OwnedValue))]
 #[derive(Debug, Default, PartialEq, Eq, Copy, Clone, Deserialize, Serialize)]
 pub enum SlashMode {
+    Static = 0x06,
     Bounce = 0x10,
     Slash = 0x12,
     Loading = 0x13,
@@ -91,6 +121,7 @@ impl FromStr for SlashMode {
 
     fn from_str(s: &str) -> Result<Self, SlashError> {
         match s {
+            "Static" => Ok(SlashMode::Static),
             "Bounce" => Ok(SlashMode::Bounce),
             "Slash" => Ok(SlashMode::Slash),
             "Loading" => Ok(SlashMode::Loading),
@@ -114,6 +145,7 @@ impl FromStr for SlashMode {
 impl Display for SlashMode {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         let str = match &self {
+            SlashMode::Static => String::from("Static"),
             SlashMode::Bounce => String::from("Bounce"),
             SlashMode::Slash => String::from("Slash"),
             SlashMode::Loading => String::from("Loading"),
@@ -135,8 +167,9 @@ impl Display for SlashMode {
 }
 
 impl SlashMode {
-    pub fn list() -> [String; 15] {
+    pub fn list() -> [String; 16] {
         [
+            SlashMode::Static.to_string(),
             SlashMode::Bounce.to_string(),
             SlashMode::Slash.to_string(),
             SlashMode::Loading.to_string(),

rog-slash/src/usb.rs

@@ -37,14 +37,26 @@ pub fn get_slash_type() -> SlashType {
     let dmi = DMIID::new()
         .map_err(|_| SlashError::NoDevice)
         .unwrap_or_default();
-    let board_name = dmi.board_name;
-
-    if board_name.contains("GA403") {
-        SlashType::GA403
+    let board_name = dmi.board_name.to_uppercase();
+    if board_name.contains("G614F") {
+        SlashType::G614_2025
+    } else if [
+        "GA403W", "GA403UH", "GA403UM", "GA403UP",
+    ]
+    .iter()
+    .any(|s| board_name.contains(s))
+    {
+        SlashType::GA403_2025
+    } else if board_name.contains("GA403") {
+        SlashType::GA403_2024
+    } else if board_name.contains("GA605K") {
+        SlashType::GA605_2025
     } else if board_name.contains("GA605") {
-        SlashType::GA605
+        SlashType::GA605_2024
+    } else if board_name.contains("GU605C") {
+        SlashType::GU605_2025
     } else if board_name.contains("GU605") {
-        SlashType::GU605
+        SlashType::GU605_2024
     } else {
         SlashType::Unsupported
     }
@@ -52,9 +64,13 @@ pub fn get_slash_type() -> SlashType {
 
 pub const fn report_id(slash_type: SlashType) -> u8 {
     match slash_type {
-        SlashType::GA403 => REPORT_ID_193B,
-        SlashType::GA605 => REPORT_ID_19B6,
-        SlashType::GU605 => REPORT_ID_193B,
+        SlashType::GA403_2025 => REPORT_ID_19B6,
+        SlashType::GA403_2024 => REPORT_ID_193B,
+        SlashType::GA605_2025 => REPORT_ID_19B6,
+        SlashType::GA605_2024 => REPORT_ID_19B6,
+        SlashType::GU605_2025 => REPORT_ID_19B6,
+        SlashType::GU605_2024 => REPORT_ID_193B,
+        SlashType::G614_2025 => REPORT_ID_19B6,
         SlashType::Unsupported => REPORT_ID_19B6,
     }
 }

simulators/src/animatrix/mod.rs

@@ -43,10 +43,12 @@ impl AniMatrix {
                 vertical: 2,
                 horizontal: 5,
             },
-            AnimeType::GA402 | AnimeType::Unsupported => LedShape {
-                vertical: 2,
-                horizontal: 5,
-            },
+            AnimeType::GA402 | AnimeType::G635L | AnimeType::G835L | AnimeType::Unsupported => {
+                LedShape {
+                    vertical: 2,
+                    horizontal: 5,
+                }
+            }
             AnimeType::GU604 => LedShape {
                 vertical: 2,
                 horizontal: 5,
@@ -56,7 +58,9 @@ impl AniMatrix {
         // Do a hard mapping of each (derived from wireshardk captures)
         let rows = match model {
             AnimeType::GA401 => GA401.to_vec(),
-            AnimeType::GA402 | AnimeType::Unsupported => GA402.to_vec(),
+            AnimeType::GA402 | AnimeType::G635L | AnimeType::G835L | AnimeType::Unsupported => {
+                GA402.to_vec()
+            }
             AnimeType::GU604 => GU604.to_vec(),
         };
 

simulators/src/simulator.rs

@@ -157,8 +157,9 @@ fn main() -> Result<(), Box<dyn Error>> {
                 for (x_count, b) in dev.buffer[start..=end].iter().enumerate() {
                     canvas.set_draw_color(Color::RGB(*b, *b, *b));
 
+                    #[allow(clippy::manual_is_multiple_of)]
                     let x: i32 = w + x_count as i32 * w
-                        - if !(y_count + y_offset as usize).is_multiple_of(2) {
+                        - if (y_count + y_offset as usize) % 2 != 0 {
                             0
                         } else {
                             w / 2