Revert "Fix: continue -> return in set_config_or_default"

This reverts commit ad051bd7b8.
Fix: sliders not updating the value
2026-02-06 00:15:04 +01:00 · 2025-11-06 22:53:21 +01:00 · 2025-11-06 22:53:09 +01:00 · 2025-11-06 21:06:44 +01:00 · 2025-11-06 17:29:12 +01:00 · 2025-11-06 17:24:01 +01:00
86 changed files with 3763 additions and 5781 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -10,7 +10,6 @@ vendor_*
 .~lock.*
 *.ods#
 *.patch
-*.log

 # gnome extension
 node-modules
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,26 +1,22 @@
 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_JOB_NAME-$CI_COMMIT_REF_SLUG"
+    # key: $CI_COMMIT_REF_SLUG
    paths:
-      - .cargo/registry
-      - .cargo/git
+      # 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

 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,19 +27,14 @@ stages:
  - deploy

 format:
-  stage: format
  except:
    - tags
  <<: *rust_cache
  script:
    - 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:
-  stage: check
  except:
    - tags
  <<: *rust_cache
@@ -53,36 +44,26 @@ check:
    # 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:
-  stage: test
  except:
    - tags
  <<: *rust_cache
  script:
    - mkdir -p .git/hooks > /dev/null
    - cargo test --locked --all
-  after_script:
-    - rm -rf "$CI_PROJECT_DIR/ci-target" || true

 release:
-  stage: release
  only:
    - tags
  <<: *rust_cache
  script:
    - cargo install cargo-vendor-filterer
-    - 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
@@ -93,11 +74,11 @@ pages:
    - cargo doc --locked --document-private-items --no-deps --workspace
    - rm -rf public
    - mkdir public
-    - cp -R ci-target/doc/* public
+    - cp -R target/doc/* public
    - cp extra/index.html public
  artifacts:
    paths:
      - public
-    expire_in: 1 week
-  after_script:
-    - rm -rf "$CI_PROJECT_DIR/ci-target" || true
+
+variables:
+  GIT_SUBMODULE_STRATEGY: normal
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,106 +1,38 @@
 # Changelog

-## [6.3.0]
+## [Unreleased]

 ### Changed
-
-## [6.4.0]
-
-### Added
-
- Migrated Aura animations (Rainbow, Pulse, Breathe, Color Cycle) to asusd daemon
- Thread-based animator in daemon for stability and smoothness
- DBus interface for controlling animations
-
-### Changed
-
- Refactored ROGCC to control animations via DBus
- Removed legacy client-side animation code
- Improved Breathe and Color Cycle visual logic
-
-## [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
+- Make the boot process more reliable
+- tie nv_ properties to power profiles
+- Better support nv_tgp

 ## [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]

 ### Changed
-
 - Reflect the current asus-armoury status on AC plug connection status change

 ## [v6.1.14]

 ### Changed
-
 - Fix formatting
 - Attempt to fix tests

 ## [v6.1.13]

 ### Changed
-
 - Fix a problem in reloading the service (@evertvorster)
 - Add Azerbaijani language (@rashadgasimli)
 - Add Ubuntu installation instructions
@@ -108,37 +40,31 @@
 ## [v6.1.12]

 ### Changed
-
 - Fix an unbounded event loop caused by other processes causing a "modify" event on the screen backlight brightness.

 ## [v6.1.11]

 ### Changed
-
 - Fix anime flickering issue when using custom anims (@I-Al-Istannen)
 - Include pt_BR translations file (@PabloKiryu)

 ## Added
-
 - Support for the screenpad brightness on some Laptops. This includes syncing to the primary screen brightness, and a gamma adjustment to set brightness scaling.
  - Add asusctl CLI options
  - Add UI options
  - Add a fake gamma correction (`asusctl backlight --sync-screenpad-brightness`, 1.5 for example sets screenpad low brightness lower than primary, and scales upwards)

 ### Changed
-
 - asusd: single line fix for profile switching

 ## [v6.1.9]

 ### Changed
-
 - ROGCC: better handling of platform profiles

 ## [v6.1.8]

 ### Changed
-
 - Testing CI for opensuse RPM build
 - ROGCC: Fixes to showing the PPT enablement toggle
 - ROGCC: Fixes to how PPT and NV sliders work and enable/disable
@@ -147,51 +73,43 @@
 ## [v6.1.7]

 ### Changed
-
 - Fix Slash display enable

 ## [v6.1.6]

 ### Changed
-
 - Disable skia bindings for UI again. It causes failures in build pipelines and requires extra dependencies.

 ## [v6.1.5]

 ### Changed
-
 - Update dependencies
 - Fix fan-curve proxy type signatures

 ## [v6.1.4]

 ### Changed
-
 - Fix git doing me a dirty

 ## [v6.1.3]

 ### Changed
-
 - Many small bugfixes such as for platform profile switching

 ## [v6.1.2]

 ### Changed
-
 - Try a slightly different tact to fix charge control slider

 ## [v6.1.1]

 ### Changed
-
 - Fix aura data matching
 - Fix charge control slider

 ## [v6.1.0]

 ### Changed
-
 - Update deps
 - Add support for G513RC RGB modes
 - Many UI fixes
@@ -209,14 +127,12 @@
 ## [v6.1.0-rc6]

 ### Changed
-
 - Two small fixes, one for `low-power` profile name, and one for base gpu tdp
 - Move to using platform_profile api only (no throttle_thermal_policy)

 ## [v6.1.0-rc5]

 ### Changed
-
 - Per-AC/DC, per-profile tunings enabled (Battery vs AC power +  platform profile)
 - Add ability to restore PPT defaults
 - Add PPT help dialogue to UI
@@ -225,7 +141,6 @@
 ## [v6.1.0-rc4]

 ### Changed
-
 - Bug fix: UI was setting incorrect value for FPPT
 - Bug fix: Re-add callbacks for the throttle and epp settings in UI
 - Bug fix: Fix UI settigns for AniMe Matrix display
@@ -236,27 +151,23 @@
 ## [v6.1.0-rc3]

 ### Changed
-
 - Bug fixes
 - Partial support for per-profile CPU tunings (WIP)

 ## [v6.1.0-rc2]

 ### Added
-
 - asus-armoury driver support. WIP, will be adjusted/changed further
 - More "Slash" display controls

 ## [v6.1.0-rc1]

 ### Added
-
 - ROG Arion external driver LED support
 - Add GA605W LED layout
 - Add GA605 + GU605 Slash support

 ### Changed
-
 - Fix attribute writes. At some point the kernel API seems to have changed.
 - Extremely large refactor of Aura device handling. Should enable easy add of different kinds now.
 - Rename CLI args for aura related properties. This will likely change further as more devices are added
@@ -264,7 +175,6 @@
 ## [v6.0.12]

 ### Changed
-
 - Add Ally X aura config
 - Fixes to Ally led power configs
 - Fix CLI led modes
@@ -275,7 +185,6 @@
 ## [v6.0.11]

 ### Changed
-
 - Renamed `Strobe` effect to `RainbowCycle` to prevent confusion over what it is
 - Ranamed `Rainbow` effect to `RainbowWave`
 - Cleaned up serde crate deps
@@ -286,7 +195,6 @@
 ## [v6.0.10]

 ### Added
-
 - Add the GA401I model to aura_support.

 ### Changed
@@ -316,15 +224,12 @@
 ## [v6.0.8]

 ### Added
-
 - Add G512L laptop DB entry

 ### Changed
-
 - Add more tests to verify things

 ### Fix
-
 - asusctl incorrectly assumes fan-curves unsupported. Now fixed.
 - try to fix ROGCC using CPU time.

@@ -341,11 +246,9 @@
 ## [v6.0.6]

 ### Added
-
 - Add GX650R laptop to aura DB

 ### Changed
-
 - Further tweaks to aura init
 - More logging
 - Fix TUF laptop led power
@@ -407,7 +310,7 @@

 ### Important note

- The kernel patches from [here](https://lore.kernel.org/platform-driver-x86/20240404001652.86207-1-luke@ljones.dev/) are required. The ppt settings *will* still apply without the patches but will be called a fail due to the read-back not being implemented (solved with kernel patch). These patches have been upstreamed for kernel 6.10
+- The kernel patches from [here](https://lore.kernel.org/platform-driver-x86/20240404001652.86207-1-luke@ljones.dev/) are required. The ppt settings _will_ still apply without the patches but will be called a fail due to the read-back not being implemented (solved with kernel patch). These patches have been upstreamed for kernel 6.10
 - Z13 devices will need these Z13 devices will need [these](https://lore.kernel.org/linux-input/20240416090402.31057-1-luke@ljones.dev/T/#t)

 ### Changed
@@ -427,7 +330,7 @@

 ### BREAKING

- The aura dbus interface, and well pretty much all dbus interfaces have been changed. The Aura interface in particular works differently to begin implementing *multiple* aura device support, including *hot-plug* of devices (USB Aura keybords and others).
+- The aura dbus interface, and well pretty much all dbus interfaces have been changed. The Aura interface in particular works differently to begin implementing _multiple_ aura device support, including _hot-plug_ of devices (USB Aura keybords and others).
 - All dbus interfaces except Aura are now in the `/org/asuslinux/` path
 - Aura dbus now appear under `/org/asuslinux/<device>` and there may be multiple devices. To find these device you use the `ObjectManager` interface under the `/org/asuslinux` path.

@@ -578,7 +481,7 @@
  - Builtin animations
 - In-progress simulators for GA402, GU604 animatrix, optional build and takes a single arg
 - Add `model_override` option to anime config, this is handy for forcing a model for "Unknown" anime, and for simulators
- Add `mini_led_mode` support to asusd and zbus crates (requires kernel patch <https://lkml.org/lkml/2023/6/19/1264>)
+- Add `mini_led_mode` support to asusd and zbus crates (requires kernel patch https://lkml.org/lkml/2023/6/19/1264)
 - Add `mini_led_mode` toggle to rog-control-center GUI, tray, notifications
 - Add generation of typescript types from the rust types used via dbus using typeshare
 - Add generation of introspection XML from asusd dbus
@@ -1017,7 +920,7 @@
 ### BREAKING CHANGES

 - Graphics control:
-  - graphics control is pulled out of asusd and moved to new package; <https://gitlab.com/asus-linux/supergfxctl>
+  - graphics control is pulled out of asusd and moved to new package; https://gitlab.com/asus-linux/supergfxctl
 - Proflies:
  - profiles now depend on power-profile-daemon plus kernel patches for support of platform_profile
    - if your system supports fan-curves you will also require upcoming kernel patches for this
@@ -1056,7 +959,7 @@
 - Added ability to fade in/out gifs and images for anime. This does break anime configs. See manual for details.
 - Added task to CtrlLed to set the keyboard LED brightness on wake from suspend
  - requires a kernel patch which will be upstreamed and in fedora rog kernel
- Make gfx change from nvidia to vfio/compute also force-change to integrated *then*
+- Make gfx change from nvidia to vfio/compute also force-change to integrated _then_
  to requested mode
 - Fix invalid gfx status when switching from some modes
 - Fix copy over of serde skipped config values on config reload
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,12 +1,9 @@
 [workspace.package]
-version = "6.4.0"
+version = "6.1.17"
 rust-version = "1.82"
 license = "MPL-2.0"
 readme = "README.md"
-authors = [
-  "Luke <luke@ljones.dev>",
-  "Denis Benato <benato.denis96@gmail.com>"
-]
+authors = ["Luke <luke@ljones.dev>"]
 repository = "https://gitlab.com/asus-linux/asusctl"
 homepage = "https://gitlab.com/asus-linux/asusctl"
 description = "Laptop feature control for ASUS ROG laptops and others"
@@ -40,9 +37,6 @@ 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"
@@ -50,7 +44,7 @@ smol = "^2.0"
 mio = "0.8.11"

 futures-util = "0.3.31"
-zbus = "5.13.1"
+zbus = "5.5.0"
 logind-zbus = { version = "5.2.0" } #, default-features = false, features = ["non_blocking"] }

 serde = { version = "^1.0", features = ["serde_derive"] }
@@ -63,12 +57,12 @@ glam = { version = "^0.22", features = ["serde"] }
 gumdrop = "^0.8"
 udev = { version = "^0.8", features = ["mio"] }
 rusb = "^0.9"
-inotify = "^0.10"
+inotify = "^0.10.0"

 png_pong = "^0.8"
 pix = "^0.13"
-tinybmp = "^0.4"
-gif = "^0.12"
+tinybmp = "^0.4.0"
+gif = "^0.12.0"

 versions = "6.2"

--- a/17
+++ b/17
@@ -59,17 +59,10 @@ clean:
 distclean:
 	rm -rf .cargo vendor vendor.tar.xz

-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
+target/$(TARGET)/$(BIN_D): build
+target/$(TARGET)/$(BIN_C): build
+target/$(TARGET)/$(BIN_U): build
+target/$(TARGET)/$(BIN_ROG): build

 install-asusd: target/$(TARGET)/$(BIN_D)
 	$(INSTALL_PROGRAM) "./target/$(TARGET)/$(BIN_D)" "$(DESTDIR)$(bindir)/$(BIN_D)"
@@ -158,8 +151,6 @@ 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
--- a/asusctl/Cargo.toml
+++ b/asusctl/Cargo.toml
@@ -24,7 +24,6 @@ env_logger.workspace = true
 ron.workspace = true
 gumdrop.workspace = true
 zbus.workspace = true
-argh = "0.1"

 [dev-dependencies]
 rog_dbus = { path = "../rog-dbus" }
--- a/asusctl/src/anime_cli.rs
+++ b/asusctl/src/anime_cli.rs
@@ -1,151 +1,154 @@
-use argh::FromArgs;
-use rog_anime::usb::{AnimAwake, AnimBooting, AnimShutdown, AnimSleeping};
+use gumdrop::Options;
+use rog_anime::usb::{AnimAwake, AnimBooting, AnimShutdown, AnimSleeping, Brightness};
 use rog_anime::AnimeType;

-#[derive(FromArgs, Debug)]
-#[argh(subcommand, name = "anime", description = "anime commands")]
+#[derive(Options)]
 pub struct AnimeCommand {
-    #[argh(option, description = "override the display type")]
+    #[options(help = "print help message")]
+    pub help: bool,
+    #[options(meta = "", help = "override the display type")]
    pub override_type: Option<AnimeType>,
-    #[argh(option, description = "enable/disable the display")]
+    #[options(meta = "", help = "enable/disable the display")]
    pub enable_display: Option<bool>,
-    #[argh(
-        option,
-        description = "enable/disable the builtin run/powersave animation"
-    )]
+    #[options(meta = "", help = "enable/disable the builtin run/powersave animation")]
    pub enable_powersave_anim: Option<bool>,
-    #[argh(
-        option,
-        description = "set global base brightness value <off, low, med, high>"
+    #[options(
+        meta = "",
+        help = "set global base brightness value <Off, Low, Med, High>"
    )]
-    pub brightness: Option<rog_anime::usb::Brightness>,
-    #[argh(switch, description = "clear the display")]
+    pub brightness: Option<Brightness>,
+    #[options(help = "clear the display")]
    pub clear: bool,
-    #[argh(
-        option,
-        description = "turn the anime off when external power is unplugged"
+    #[options(
+        no_short,
+        meta = "",
+        help = "turn the anime off when external power is unplugged"
    )]
    pub off_when_unplugged: Option<bool>,
-    #[argh(option, description = "turn the anime off when the laptop suspends")]
+    #[options(
+        no_short,
+        meta = "",
+        help = "turn the anime off when the laptop suspends"
+    )]
    pub off_when_suspended: Option<bool>,
-    #[argh(option, description = "turn the anime off when the lid is closed")]
+    #[options(
+        no_short,
+        meta = "",
+        help = "turn the anime off when the lid is closed"
+    )]
    pub off_when_lid_closed: Option<bool>,
-    #[argh(option, description = "off with his head!!!")]
+    #[options(no_short, meta = "", help = "Off with his head!!!")]
    pub off_with_his_head: Option<bool>,
-    #[argh(subcommand)]
+    #[options(command)]
    pub command: Option<AnimeActions>,
 }

-/// Anime subcommands (image, gif, builtins, etc.)
-#[derive(FromArgs, Debug)]
-#[argh(subcommand)]
+#[derive(Options)]
 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(FromArgs, Debug)]
-#[argh(
-    subcommand,
-    name = "set-builtins",
-    description = "change which builtin animations are shown"
-)]
+#[derive(Options)]
 pub struct Builtins {
-    #[argh(
-        option,
-        description = "default is used if unspecified, <default:GlitchConstruction, StaticEmergence>"
+    #[options(help = "print help message")]
+    pub help: bool,
+    #[options(
+        meta = "",
+        help = "Default is used if unspecified, <default:GlitchConstruction, StaticEmergence>"
    )]
    pub boot: AnimBooting,
-    #[argh(
-        option,
-        description = "default is used if unspecified, <default:BinaryBannerScroll, RogLogoGlitch>"
+    #[options(
+        meta = "",
+        help = "Default is used if unspecified, <default:BinaryBannerScroll, RogLogoGlitch>"
    )]
    pub awake: AnimAwake,
-    #[argh(
-        option,
-        description = "default is used if unspecified, <default:BannerSwipe, Starfield>"
+    #[options(
+        meta = "",
+        help = "Default is used if unspecified, <default:BannerSwipe, Starfield>"
    )]
    pub sleep: AnimSleeping,
-    #[argh(
-        option,
-        description = "default is used if unspecified, <default:GlitchOut, SeeYa>"
+    #[options(
+        meta = "",
+        help = "Default is used if unspecified, <default:GlitchOut, SeeYa>"
    )]
    pub shutdown: AnimShutdown,
-    #[argh(option, description = "set/apply the animations <true/false>")]
+    #[options(meta = "", help = "set/apply the animations <true/false>")]
    pub set: Option<bool>,
 }

-#[derive(FromArgs, Debug)]
-#[argh(subcommand, name = "image", description = "display a PNG image")]
+#[derive(Options)]
 pub struct AnimeImage {
-    #[argh(option, description = "full path to the png to display")]
+    #[options(help = "print help message")]
+    pub help: bool,
+    #[options(meta = "", help = "full path to the png to display")]
    pub path: String,
-    #[argh(option, default = "1.0", description = "scale 1.0 == normal")]
+    #[options(meta = "", default = "1.0", help = "scale 1.0 == normal")]
    pub scale: f32,
-    #[argh(option, default = "0.0", description = "x position (float)")]
+    #[options(meta = "", default = "0.0", help = "x position (float)")]
    pub x_pos: f32,
-    #[argh(option, default = "0.0", description = "y position (float)")]
+    #[options(meta = "", default = "0.0", help = "y position (float)")]
    pub y_pos: f32,
-    #[argh(option, default = "0.0", description = "the angle in radians")]
+    #[options(meta = "", default = "0.0", help = "the angle in radians")]
    pub angle: f32,
-    #[argh(option, default = "1.0", description = "brightness 0.0-1.0")]
+    #[options(meta = "", default = "1.0", help = "brightness 0.0-1.0")]
    pub bright: f32,
 }

-#[derive(FromArgs, Debug)]
-#[argh(
-    subcommand,
-    name = "pixel-image",
-    description = "display a diagonal/pixel-perfect PNG"
-)]
+#[derive(Options)]
 pub struct AnimeImageDiagonal {
-    #[argh(option, description = "full path to the png to display")]
+    #[options(help = "print help message")]
+    pub help: bool,
+    #[options(meta = "", help = "full path to the png to display")]
    pub path: String,
-    #[argh(option, default = "1.0", description = "brightness 0.0-1.0")]
+    #[options(meta = "", default = "1.0", help = "brightness 0.0-1.0")]
    pub bright: f32,
 }

-#[derive(FromArgs, Debug)]
-#[argh(subcommand, name = "gif", description = "display an animated GIF")]
+#[derive(Options)]
 pub struct AnimeGif {
-    #[argh(option, description = "full path to the gif to display")]
+    #[options(help = "print help message")]
+    pub help: bool,
+    #[options(meta = "", help = "full path to the png to display")]
    pub path: String,
-    #[argh(option, default = "1.0", description = "scale 1.0 == normal")]
+    #[options(meta = "", default = "1.0", help = "scale 1.0 == normal")]
    pub scale: f32,
-    #[argh(option, default = "0.0", description = "x position (float)")]
+    #[options(meta = "", default = "0.0", help = "x position (float)")]
    pub x_pos: f32,
-    #[argh(option, default = "0.0", description = "y position (float)")]
+    #[options(meta = "", default = "0.0", help = "y position (float)")]
    pub y_pos: f32,
-    #[argh(option, default = "0.0", description = "the angle in radians")]
+    #[options(meta = "", default = "0.0", help = "the angle in radians")]
    pub angle: f32,
-    #[argh(option, default = "1.0", description = "brightness 0.0-1.0")]
+    #[options(meta = "", default = "1.0", help = "brightness 0.0-1.0")]
    pub bright: f32,
-    #[argh(
-        option,
+    #[options(
+        meta = "",
        default = "1",
-        description = "how many loops to play - 0 is infinite"
+        help = "how many loops to play - 0 is infinite"
    )]
    pub loops: u32,
 }

-#[derive(FromArgs, Debug)]
-#[argh(
-    subcommand,
-    name = "pixel-gif",
-    description = "display an animated diagonal/pixel-perfect GIF"
-)]
+#[derive(Options)]
 pub struct AnimeGifDiagonal {
-    #[argh(option, description = "full path to the gif to display")]
+    #[options(help = "print help message")]
+    pub help: bool,
+    #[options(meta = "", help = "full path to the png to display")]
    pub path: String,
-    #[argh(option, default = "1.0", description = "brightness 0.0-1.0")]
+    #[options(meta = "", default = "1.0", help = "brightness 0.0-1.0")]
    pub bright: f32,
-    #[argh(
-        option,
+    #[options(
+        meta = "",
        default = "1",
-        description = "how many loops to play - 0 is infinite"
+        help = "how many loops to play - 0 is infinite"
    )]
    pub loops: u32,
 }
--- a/asusctl/src/aura_cli.rs
+++ b/asusctl/src/aura_cli.rs
@@ -1,67 +1,68 @@
-use std::fmt;
 use std::str::FromStr;

-use argh::FromArgs;
+use gumdrop::Options;
 use rog_aura::error::Error;
 use rog_aura::{AuraEffect, AuraModeNum, AuraZone, Colour, Direction, Speed};

-#[derive(FromArgs, Debug, Clone)]
-#[argh(
-    subcommand,
-    name = "aura-power-old",
-    description = "aura power (old ROGs and TUF laptops)"
-)]
+#[derive(Options, Debug)]
 pub struct LedPowerCommand1 {
-    #[argh(
-        option,
-        description = "control if LEDs enabled while awake <true/false>"
-    )]
+    #[options(help = "print help message")]
+    pub help: bool,
+    #[options(meta = "", help = "Control if LEDs enabled while awake <true/false>")]
    pub awake: Option<bool>,
-
-    #[argh(
-        switch,
-        description = "use with awake option; if excluded defaults to false"
-    )]
+    #[options(help = "Use with awake option, if excluded defaults to false")]
    pub keyboard: bool,
-
-    #[argh(
-        switch,
-        description = "use with awake option; if excluded defaults to false"
-    )]
+    #[options(help = "Use with awake option, if excluded defaults to false")]
    pub lightbar: bool,
-
-    #[argh(option, description = "control boot animations <true/false>")]
+    #[options(meta = "", help = "Control boot animations <true/false>")]
    pub boot: Option<bool>,
-
-    #[argh(option, description = "control suspend animations <true/false>")]
+    #[options(meta = "", help = "Control suspend animations <true/false>")]
    pub sleep: Option<bool>,
 }

-#[derive(FromArgs, Debug, Clone)]
-#[argh(subcommand, name = "aura-power", description = "aura power")]
+#[derive(Options, Debug)]
 pub struct LedPowerCommand2 {
-    #[argh(subcommand)]
+    #[options(help = "print help message")]
+    pub help: bool,
+    #[options(command)]
    pub command: Option<SetAuraZoneEnabled>,
 }

-/// Subcommands to enable/disable specific aura zones
-#[derive(FromArgs, Debug, Clone)]
-#[argh(subcommand)]
+#[derive(Options, Debug)]
 pub enum SetAuraZoneEnabled {
-    Keyboard(KeyboardPower),
-    Logo(LogoPower),
-    Lightbar(LightbarPower),
-    Lid(LidPower),
-    RearGlow(RearGlowPower),
-    Ally(AllyPower),
+    /// 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 brightness argument helper
-#[derive(Debug, Clone)]
+#[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)]
 pub struct LedBrightness {
    level: Option<u8>,
 }
-
 impl LedBrightness {
    pub fn new(level: Option<u8>) -> Self {
        LedBrightness { level }
@@ -71,302 +72,176 @@ 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(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),
+            "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)
+            }
        }
    }
 }
-
-impl fmt::Display for LedBrightness {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+#[allow(clippy::to_string_trait_impl)]
+impl ToString for LedBrightness {
+    fn to_string(&self) -> String {
        let s = match self.level {
-            Some(0x00) => "off",
-            Some(0x01) => "low",
-            Some(0x02) => "med",
-            Some(0x03) => "high",
+            Some(0x00) => "low",
+            Some(0x01) => "med",
+            Some(0x02) => "high",
            _ => "unknown",
        };
-        write!(f, "{}", s)
+        s.to_owned()
    }
 }

-#[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"
-)]
+#[derive(Debug, Clone, Options, Default)]
 pub struct SingleSpeed {
-    #[argh(option, description = "set the speed: low, med, high")]
+    #[options(help = "print help message")]
+    help: bool,
+    #[options(no_long, meta = "WORD", help = "set the speed: low, med, high")]
    pub speed: Speed,
-
-    #[argh(
-        option,
-        default = "AuraZone::None",
-        description = "set the zone for this effect e.g. 0, 1, one, logo, lightbar-left"
+    #[options(
+        no_long,
+        meta = "",
+        help = "set the zone for this effect e.g, 0, 1, one, logo, lightbar-left"
    )]
    pub zone: AuraZone,
 }

-/// Single speed effect with direction
-#[derive(FromArgs, Debug, Clone, Default)]
-#[argh(
-    subcommand,
-    name = "rainbow-wave",
-    description = "single speed effect with direction"
-)]
+#[derive(Debug, Clone, Options, Default)]
 pub struct SingleSpeedDirection {
-    #[argh(option, description = "set the direction: up, down, left, right")]
+    #[options(help = "print help message")]
+    help: bool,
+    #[options(no_long, meta = "", help = "set the direction: up, down, left, right")]
    pub direction: Direction,
-
-    #[argh(option, description = "set the speed: low, med, high")]
+    #[options(no_long, meta = "", help = "set the speed: low, med, high")]
    pub speed: Speed,
-
-    #[argh(
-        option,
-        default = "AuraZone::None",
-        description = "set the zone for this effect e.g. 0, 1, one, logo, lightbar-left"
+    #[options(
+        no_long,
+        meta = "",
+        help = "set the zone for this effect e.g, 0, 1, one, logo, lightbar-left"
    )]
    pub zone: AuraZone,
 }

-/// Static single-colour effect
-#[derive(FromArgs, Debug, Clone, Default)]
-#[argh(
-    subcommand,
-    name = "static",
-    description = "static single-colour effect"
-)]
+#[derive(Debug, Clone, Default, Options)]
 pub struct SingleColour {
-    #[argh(option, short = 'c', description = "set the RGB value e.g. ff00ff")]
+    #[options(help = "print help message")]
+    help: bool,
+    #[options(no_long, meta = "", help = "set the RGB value e.g, ff00ff")]
    pub colour: Colour,
-
-    #[argh(
-        option,
-        default = "AuraZone::None",
-        description = "set the zone for this effect e.g. 0, 1, one, logo, lightbar-left"
+    #[options(
+        no_long,
+        meta = "",
+        help = "set the zone for this effect e.g, 0, 1, one, logo, lightbar-left"
    )]
    pub zone: AuraZone,
 }

-/// Single-colour effect with speed
-#[derive(FromArgs, Debug, Clone, Default)]
-#[argh(
-    subcommand,
-    name = "highlight",
-    description = "single-colour effect with speed"
-)]
+#[derive(Debug, Clone, Default, Options)]
 pub struct SingleColourSpeed {
-    #[argh(option, short = 'c', description = "set the RGB value e.g. ff00ff")]
+    #[options(help = "print help message")]
+    help: bool,
+    #[options(no_long, meta = "", help = "set the RGB value e.g, ff00ff")]
    pub colour: Colour,
-
-    #[argh(option, description = "set the speed: low, med, high")]
+    #[options(no_long, meta = "", help = "set the speed: low, med, high")]
    pub speed: Speed,
-
-    #[argh(
-        option,
-        default = "AuraZone::None",
-        description = "set the zone for this effect e.g. 0, 1, one, logo, lightbar-left"
+    #[options(
+        no_long,
+        meta = "",
+        help = "set the zone for this effect e.g, 0, 1, one, logo, lightbar-left"
    )]
    pub zone: AuraZone,
 }

-/// Two-colour breathing effect
-#[derive(FromArgs, Debug, Clone, Default)]
-#[argh(
-    subcommand,
-    name = "breathe",
-    description = "two-colour breathing effect"
-)]
+#[derive(Debug, Clone, Options, Default)]
 pub struct TwoColourSpeed {
-    #[argh(option, description = "set the first RGB value e.g. ff00ff")]
+    #[options(help = "print help message")]
+    help: bool,
+    #[options(no_long, meta = "", help = "set the first RGB value e.g, ff00ff")]
    pub colour: Colour,
-
-    #[argh(option, description = "set the second RGB value e.g. ff00ff")]
+    #[options(no_long, meta = "", help = "set the second RGB value e.g, ff00ff")]
    pub colour2: Colour,
-
-    #[argh(option, description = "set the speed: low, med, high")]
+    #[options(no_long, meta = "", help = "set the speed: low, med, high")]
    pub speed: Speed,
-
-    #[argh(
-        option,
-        default = "AuraZone::None",
-        description = "set the zone for this effect e.g. 0, 1, one, logo, lightbar-left"
+    #[options(
+        no_long,
+        meta = "",
+        help = "set the zone for this effect e.g, 0, 1, one, logo, lightbar-left"
    )]
    pub zone: AuraZone,
 }

-/// Multi-zone colour settings
-#[derive(FromArgs, Debug, Clone, Default)]
 #[allow(dead_code)]
-#[argh(description = "multi-zone colour settings")]
+#[derive(Debug, Clone, Default, Options)]
 pub struct MultiZone {
-    #[argh(option, short = 'a', description = "set the RGB value e.g. ff00ff")]
+    #[options(help = "print help message")]
+    help: bool,
+    #[options(short = "a", meta = "", help = "set the RGB value e.g, ff00ff")]
    pub colour1: Colour,
-
-    #[argh(option, short = 'b', description = "set the RGB value e.g. ff00ff")]
+    #[options(short = "b", meta = "", help = "set the RGB value e.g, ff00ff")]
    pub colour2: Colour,
-
-    #[argh(option, short = 'c', description = "set the RGB value e.g. ff00ff")]
+    #[options(short = "c", meta = "", help = "set the RGB value e.g, ff00ff")]
    pub colour3: Colour,
-
-    #[argh(option, short = 'd', description = "set the RGB value e.g. ff00ff")]
+    #[options(short = "d", meta = "", help = "set the RGB value e.g, ff00ff")]
    pub colour4: Colour,
 }

-/// Multi-colour with speed
-#[derive(FromArgs, Debug, Clone, Default)]
 #[allow(dead_code)]
-#[argh(description = "multi-colour with speed")]
+#[derive(Debug, Clone, Default, Options)]
 pub struct MultiColourSpeed {
-    #[argh(option, short = 'a', description = "set the RGB value e.g. ff00ff")]
+    #[options(help = "print help message")]
+    help: bool,
+    #[options(short = "a", meta = "", help = "set the RGB value e.g, ff00ff")]
    pub colour1: Colour,
-
-    #[argh(option, short = 'b', description = "set the RGB value e.g. ff00ff")]
+    #[options(short = "b", meta = "", help = "set the RGB value e.g, ff00ff")]
    pub colour2: Colour,
-
-    #[argh(option, short = 'c', description = "set the RGB value e.g. ff00ff")]
+    #[options(short = "c", meta = "", help = "set the RGB value e.g, ff00ff")]
    pub colour3: Colour,
-
-    #[argh(option, short = 'd', description = "set the RGB value e.g. ff00ff")]
+    #[options(short = "d", meta = "", help = "set the RGB value e.g, ff00ff")]
    pub colour4: Colour,
-
-    #[argh(option, description = "set the speed: low, med, high")]
+    #[options(no_long, meta = "", help = "set the speed: low, med, high")]
    pub speed: Speed,
 }

-/// Builtin aura effects
-#[derive(FromArgs, Debug)]
-#[argh(subcommand)]
+/// 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)]
 pub enum SetAuraBuiltin {
-    Static(SingleColour),              // 0
-    Breathe(TwoColourSpeed),           // 1
-    RainbowCycle(SingleSpeed),         // 2
+    #[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")]
    RainbowWave(SingleSpeedDirection), // 3
-    Stars(TwoColourSpeed),             // 4
-    Rain(SingleSpeed),                 // 5
-    Highlight(SingleColourSpeed),      // 6
-    Laser(SingleColourSpeed),          // 7
-    Ripple(SingleColourSpeed),         // 8
-    Pulse(SingleColour),               // 10
-    Comet(SingleColour),               // 11
-    Flash(SingleColour),               // 12
+    #[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
 }

 impl Default for SetAuraBuiltin {
--- a/asusctl/src/cli_opts.rs
+++ b/asusctl/src/cli_opts.rs
@@ -1,4 +1,4 @@
-use argh::FromArgs;
+use gumdrop::Options;
 use rog_platform::platform::PlatformProfile;

 use crate::anime_cli::AnimeCommand;
@@ -7,308 +7,128 @@ use crate::fan_curve_cli::FanCurveCommand;
 use crate::scsi_cli::ScsiCommand;
 use crate::slash_cli::SlashCommand;

-#[derive(FromArgs, Default, Debug)]
-/// asusctl command-line options
+#[derive(Default, Options)]
 pub struct CliStart {
-    #[argh(subcommand)]
-    pub command: CliCommand,
+    #[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>,
 }

-/// Top-level subcommands for asusctl
-#[derive(FromArgs, Debug)]
-#[argh(subcommand)]
+#[derive(Options)]
 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),
-    Brightness(BrightnessCommand),
+    #[options(help = "Set or select platform_profile")]
    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),
 }

-impl Default for CliCommand {
-    fn default() -> Self {
-        CliCommand::Info(InfoCommand::default())
-    }
-}
-
-#[derive(FromArgs, Debug)]
-#[argh(subcommand, name = "profile", description = "profile management")]
+#[derive(Debug, Clone, Options)]
 pub struct ProfileCommand {
-    #[argh(subcommand)]
-    pub command: ProfileSubCommand,
-}
+    #[options(help = "print help message")]
+    pub help: bool,

-#[derive(FromArgs, Debug)]
-#[argh(subcommand)]
-pub enum ProfileSubCommand {
-    Next(ProfileNextCommand),
-    List(ProfileListCommand),
-    Get(ProfileGetCommand),
-    Set(ProfileSetCommand),
-}
+    #[options(help = "toggle to next profile in list")]
+    pub next: bool,

-impl Default for ProfileSubCommand {
-    fn default() -> Self {
-        ProfileSubCommand::List(ProfileListCommand::default())
-    }
-}
+    #[options(help = "list available profiles")]
+    pub list: bool,

-#[derive(FromArgs, Debug, Default)]
-#[argh(
-    subcommand,
-    name = "next",
-    description = "toggle to next profile in list"
-)]
-pub struct ProfileNextCommand {}
+    #[options(help = "get profile")]
+    pub profile_get: bool,

-#[derive(FromArgs, Debug, Default)]
-#[argh(subcommand, name = "list", description = "list available profiles")]
-pub struct ProfileListCommand {}
+    #[options(meta = "", help = "set the active profile")]
+    pub profile_set: Option<PlatformProfile>,

-#[derive(FromArgs, Debug, Default)]
-#[argh(subcommand, name = "get", description = "get profile")]
-pub struct ProfileGetCommand {}
+    #[options(short = "a", meta = "", help = "set the profile to use on AC power")]
+    pub profile_set_ac: Option<PlatformProfile>,

-#[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"
+    #[options(
+        short = "b",
+        meta = "",
+        help = "set the profile to use on battery power"
    )]
-    pub ac: bool,
-
-    #[argh(
-        switch,
-        short = 'b',
-        description = "set the profile to use on battery power"
-    )]
-    pub battery: bool,
+    pub profile_set_bat: Option<PlatformProfile>,
 }

-#[derive(FromArgs, Debug, Default)]
-#[argh(subcommand, name = "aura", description = "led mode commands")]
+#[derive(Options)]
 pub struct LedModeCommand {
-    #[argh(switch, description = "switch to next aura mode")]
+    #[options(help = "print help message")]
+    pub help: bool,
+    #[options(help = "switch to next aura mode")]
    pub next_mode: bool,
-
-    #[argh(switch, description = "switch to previous aura mode")]
+    #[options(help = "switch to previous aura mode")]
    pub prev_mode: bool,
-
-    #[argh(subcommand)]
+    #[options(command)]
    pub command: Option<SetAuraBuiltin>,
 }

-#[derive(FromArgs, Debug, Default)]
-#[argh(
-    subcommand,
-    name = "armoury",
-    description = "armoury / firmware attributes"
-)]
+#[derive(Options)]
+pub struct GraphicsCommand {
+    #[options(help = "print help message")]
+    pub help: bool,
+}
+
+#[derive(Options, Debug)]
 pub struct ArmouryCommand {
-    #[argh(subcommand)]
-    pub command: ArmourySubCommand,
-}
-
-#[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)"
+    #[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 property: String,
-
-    #[argh(positional, description = "value to set for the given attribute")]
-    pub value: i32,
+    pub free: Vec<String>,
 }

-#[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")]
+#[derive(Options)]
 pub struct BacklightCommand {
-    #[argh(option, description = "set screen brightness <0-100>")]
+    #[options(help = "print help message")]
+    pub help: bool,
+    #[options(meta = "", help = "Set screen brightness <0-100>")]
    pub screenpad_brightness: Option<i32>,
-
-    #[argh(
-        option,
-        description = "set screenpad gamma brightness 0.5 - 2.2, 1.0 == linear"
+    #[options(
+        meta = "",
+        help = "Set screenpad gamma brightness 0.5 - 2.2, 1.0 == linear"
    )]
    pub screenpad_gamma: Option<f32>,
-
-    #[argh(
-        option,
-        description = "set screenpad brightness to sync with primary display"
+    #[options(
+        meta = "",
+        help = "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 {}
--- a/asusctl/src/fan_curve_cli.rs
+++ b/asusctl/src/fan_curve_cli.rs
@@ -1,44 +1,49 @@
-use argh::FromArgs;
+use gumdrop::Options;
 use rog_platform::platform::PlatformProfile;
 use rog_profiles::fan_curve_set::CurveData;
 use rog_profiles::FanCurvePU;

-#[derive(FromArgs, Debug, Clone)]
-#[argh(subcommand, name = "fan-curve", description = "fan curve commands")]
+#[derive(Debug, Clone, Options)]
 pub struct FanCurveCommand {
-    #[argh(switch, description = "get enabled fan profiles")]
+    #[options(help = "print help message")]
+    pub help: bool,
+
+    #[options(help = "get enabled fan profiles")]
    pub get_enabled: bool,

-    #[argh(switch, description = "set the active profile's fan curve to default")]
+    #[options(help = "set the active profile's fan curve to default")]
    pub default: bool,

-    #[argh(
-        option,
-        description = "profile to modify fan-curve for. shows data if no options provided"
+    #[options(
+        meta = "",
+        help = "profile to modify fan-curve for. Shows data if no options provided"
    )]
    pub mod_profile: Option<PlatformProfile>,

-    #[argh(
-        option,
-        description = "enable or disable <true/false> fan all curves for a profile; --mod_profile required"
+    #[options(
+        meta = "",
+        help = "enable or disable <true/false> fan all curves for a profile. `--mod_profile` \
+                required"
    )]
    pub enable_fan_curves: Option<bool>,

-    #[argh(
-        option,
-        description = "enable or disable <true/false> a single fan curve for a profile; --mod_profile and --fan required"
+    #[options(
+        meta = "",
+        help = "enable or disable <true/false> a single fan curve for a profile. `--mod_profile` \
+                and `--fan` required"
    )]
    pub enable_fan_curve: Option<bool>,

-    #[argh(
-        option,
-        description = "select fan <cpu/gpu/mid> to modify; --mod_profile required"
+    #[options(
+        meta = "",
+        help = "select fan <cpu/gpu/mid> to modify. `--mod_profile` required"
    )]
    pub fan: Option<FanCurvePU>,

-    #[argh(
-        option,
-        description = "data format = 30c:1%,49c:2%,...; --mod-profile required. If '%' is omitted the fan range is 0-255"
+    #[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"
    )]
    pub data: Option<CurveData>,
 }
--- a/asusctl/src/main.rs
+++ b/asusctl/src/main.rs
@@ -1,4 +1,5 @@
 use std::convert::TryFrom;
+use std::env::args;
 use std::path::Path;
 use std::process::Command;
 use std::thread::sleep;
@@ -7,11 +8,12 @@ use anime_cli::{AnimeActions, AnimeCommand};
 use aura_cli::{LedPowerCommand1, LedPowerCommand2};
 use dmi_id::DMIID;
 use fan_curve_cli::FanCurveCommand;
-use log::{error, info, LevelFilter};
+use gumdrop::{Opt, Options};
+use log::{error, info};
 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, AuraEffect, PowerZones};
+use rog_aura::{self, AuraDeviceType, AuraEffect, PowerZones};
 use rog_dbus::asus_armoury::AsusArmouryProxyBlocking;
 use rog_dbus::list_iface_blocking;
 use rog_dbus::scsi_aura::ScsiAuraProxyBlocking;
@@ -30,6 +32,7 @@ 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;

@@ -41,19 +44,30 @@ 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()
-        .filter_level(LevelFilter::Info)
-        .target(env_logger::Target::Stderr)
+        .target(env_logger::Target::Stdout)
        .format_timestamp(None)
+        .filter_level(log::LevelFilter::Debug)
        .init();

-    let parsed: CliStart = argh::from_env();
+    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 conn = Connection::system().unwrap();
    if let Ok(platform_proxy) = PlatformProxyBlocking::new(&conn).map_err(|e| {
@@ -72,7 +86,6 @@ fn main() {
            }
        };

-        let self_version = env!("CARGO_PKG_VERSION");
        if asusd_version != self_version {
            println!("Version mismatch: asusctl = {self_version}, asusd = {asusd_version}");
            return;
@@ -93,6 +106,12 @@ 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);
        }
@@ -119,9 +138,9 @@ fn print_info() {
    let dmi = DMIID::new().unwrap_or_default();
    let board_name = dmi.board_name;
    let prod_family = dmi.product_family;
-    println!("Software version: {}", env!("CARGO_PKG_VERSION"));
-    println!("  Product family: {}", prod_family.trim());
-    println!("      Board name: {}", board_name.trim());
+    println!("asusctl version: {}", env!("CARGO_PKG_VERSION"));
+    println!(" Product family: {}", prod_family.trim());
+    println!("     Board name: {}", board_name.trim());
 }

 fn check_service(name: &str) -> bool {
@@ -186,63 +205,149 @@ fn do_parsed(
    conn: Connection,
 ) -> Result<(), Box<dyn std::error::Error>> {
    match &parsed.command {
-        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)?
+        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)?
        }
-    }
-
-    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)?;
+        Some(CliCommand::FanCurve(cmd)) => {
+            handle_fan_curve(&conn, cmd)?;
        }
-        BatterySubCommand::OneShot(o) => {
-            let proxy = PlatformProxyBlocking::new(conn)?;
-            if let Some(p) = o.percent {
-                proxy.set_charge_control_end_threshold(p)?;
+        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");
            }
-            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);
        }
    }

-    Ok(())
-}
+    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))?,
+                }
+            }
+        } 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.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");
+        }
+    }

-    if info_opt.show_supported {
+    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");
+        }
+    }
+
+    if parsed.show_supported {
        println!("Supported Core Functions:\n{:#?}", supported_interfaces);
        println!(
            "Supported Platform Properties:\n{:#?}",
@@ -263,14 +368,35 @@ fn handle_info(
        }
    }

+    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.sync_screenpad_brightness.is_none())
+        || cmd.help
    {
+        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:");
@@ -303,50 +429,8 @@ 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()
@@ -354,9 +438,13 @@ 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.clear)
+        || cmd.help
    {
-        println!("Missing arg or command; run 'asusctl anime --help' for usage");
+        println!("Missing arg or command\n\n{}", cmd.self_usage());
+        if let Some(lst) = cmd.self_command_list() {
+            println!("\n{}", lst);
+        }
    }

    let animes = find_iface::<AnimeProxyBlocking>("xyz.ljones.Anime").map_err(|e| {
@@ -403,10 +491,11 @@ 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.path.is_empty() {
-                        println!(
-                            "Missing arg or command; run 'asusctl anime image --help' for usage"
-                        );
+                    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);
+                        }
                        return Ok(());
                    }
                    verify_brightness(image.bright);
@@ -423,8 +512,11 @@ fn handle_anime(cmd: &AnimeCommand) -> Result<(), Box<dyn std::error::Error>> {
                    proxy.write(<AnimeDataBuffer>::try_from(&matrix)?)?;
                }
                AnimeActions::PixelImage(image) => {
-                    if image.path.is_empty() {
-                        println!("Missing arg or command; run 'asusctl anime pixel-image --help' for usage");
+                    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);
+                        }
                        return Ok(());
                    }
                    verify_brightness(image.bright);
@@ -439,10 +531,11 @@ fn handle_anime(cmd: &AnimeCommand) -> Result<(), Box<dyn std::error::Error>> {
                    proxy.write(matrix.into_data_buffer(anime_type)?)?;
                }
                AnimeActions::Gif(gif) => {
-                    if gif.path.is_empty() {
-                        println!(
-                            "Missing arg or command; run 'asusctl anime gif --help' for usage"
-                        );
+                    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);
+                        }
                        return Ok(());
                    }
                    verify_brightness(gif.bright);
@@ -472,8 +565,11 @@ fn handle_anime(cmd: &AnimeCommand) -> Result<(), Box<dyn std::error::Error>> {
                    }
                }
                AnimeActions::PixelGif(gif) => {
-                    if gif.path.is_empty() {
-                        println!("Missing arg or command; run 'asusctl anime pixel-gif --help' for usage");
+                    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);
+                        }
                        return Ok(());
                    }
                    verify_brightness(gif.bright);
@@ -500,8 +596,14 @@ fn handle_anime(cmd: &AnimeCommand) -> Result<(), Box<dyn std::error::Error>> {
                    }
                }
                AnimeActions::SetBuiltins(builtins) => {
-                    if builtins.set.is_none() {
-                        println!("Missing arg; run 'asusctl anime set-builtins --help' for usage");
+                    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);
+                        }
                        return Ok(());
                    }

@@ -528,19 +630,24 @@ 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.disable)
+        || cmd.help
    {
-        println!("Missing arg or command; run 'asusctl slash --help' for usage");
+        println!("Missing arg or command\n\n{}", cmd.self_usage());
+        if let Some(lst) = cmd.self_command_list() {
+            println!("\n{}", lst);
+        }
    }

    let slashes = find_iface::<SlashProxyBlocking>("xyz.ljones.Slash")?;
@@ -591,8 +698,13 @@ 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() {
-        println!("Missing arg or command; run 'asusctl scsi --help' for usage");
+    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);
+        }
    }

    let scsis = find_iface::<ScsiAuraProxyBlocking>("xyz.ljones.ScsiAura")?;
@@ -658,15 +770,38 @@ 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 {
-        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") {
+        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")?;
            let modes = aura.first().unwrap().supported_basic_modes()?;
-            println!("Available modes:");
-            for m in modes {
-                println!("  {:?}", m);
+            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!("\nHelp can also be requested on modes, e.g: static --help");
        return Ok(());
    }

@@ -698,6 +833,10 @@ 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))?;
        }
@@ -720,7 +859,10 @@ fn handle_led_power1(power: &LedPowerCommand1) -> Result<(), Box<dyn std::error:
            && !power.keyboard
            && !power.lightbar
        {
-            println!("Missing arg or command; run 'asusctl aura-power-old --help' for usage");
+            if !power.help {
+                println!("Missing arg or command\n");
+            }
+            println!("{}\n", power.self_usage());
            return Ok(());
        }

@@ -772,47 +914,51 @@ fn handle_led_power2(power: &LedPowerCommand2) -> Result<(), Box<dyn std::error:
            continue;
        }

-        if power.command.is_none() {
-            println!("Missing arg or command; run 'asusctl aura-power --help' for usage");
+        if power.command().is_none() {
+            if !power.help {
+                println!("Missing arg or command\n");
+            }
+            println!("{}\n", power.self_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 let Some(pow) = power.command.as_ref() {
+            if pow.help_requested() {
+                println!("{}", pow.self_usage());
+                return Ok(());
+            }
+
            let mut states = aura.led_power()?;
-            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;
-                        }
+            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;
                    }
-                };
+                }
+            };

            if let Some(cmd) = &power.command {
                match cmd {
-                    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)
-                    }
+                    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),
                }
            }

@@ -833,39 +979,53 @@ fn handle_throttle_profile(
        return Err(ProfileError::NotSupported.into());
    }

+    if !cmd.next
+        && !cmd.list
+        && cmd.profile_set.is_none()
+        && !cmd.profile_get
+        && cmd.profile_set_ac.is_none()
+        && cmd.profile_set_bat.is_none()
+    {
+        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()?;

-    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.next {
+        proxy.set_platform_profile(PlatformProfile::next(current, &choices))?;
+    } else if let Some(profile) = cmd.profile_set {
+        proxy.set_platform_profile(profile)?;
+    } else if let Some(profile) = cmd.profile_set_ac {
+        proxy.set_platform_profile_on_ac(profile)?;
+    } else if let Some(profile) = cmd.profile_set_bat {
+        proxy.set_platform_profile_on_battery(profile)?;
+    }
+
+    if cmd.list {
+        for p in &choices {
+            println!("{:?}", p);
        }
    }

+    if cmd.profile_get {
+        println!("Active profile is {current:?}");
+        println!("Profile on AC is {:?}", proxy.platform_profile_on_ac()?);
+        println!(
+            "Profile on Battery is {:?}",
+            proxy.platform_profile_on_battery()?
+        );
+    }
+
    Ok(())
 }

@@ -880,7 +1040,14 @@ fn handle_fan_curve(
    };

    if !cmd.get_enabled && !cmd.default && cmd.mod_profile.is_none() {
-        println!("Missing arg or command; run 'asusctl fan-curve --help' for usage");
+        if !cmd.help {
+            println!("Missing arg or command\n");
+        }
+        println!("{}", FanCurveCommand::usage());
+
+        if let Some(lst) = cmd.self_command_list() {
+            println!("\n{}", lst);
+        }
        return Ok(());
    }

@@ -1017,35 +1184,38 @@ fn print_firmware_attr(attr: &AsusArmouryProxyBlocking) -> Result<(), Box<dyn st
    Ok(())
 }

-#[allow(clippy::manual_is_multiple_of, clippy::nonminimal_bool)]
+#[allow(clippy::manual_is_multiple_of)]
 fn handle_armoury_command(cmd: &ArmouryCommand) -> Result<(), Box<dyn std::error::Error>> {
-    // 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() {
+    {
+        // Avoid using `.is_multiple_of(2)` to satisfy the request. Use modulus check
+        // and simplify the boolean expression.
+        let odd_len = cmd.free.len() % 2 != 0;
+        if cmd.free.is_empty() || odd_len || cmd.help {
+            const USAGE: &str = "Usage: asusctl platform panel_overdrive 1 nv_dynamic_boost 5";
+            if odd_len {
+                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() {
                    print_firmware_attr(attr)?;
                }
            }
-            Ok(())
+            return Ok(());
        }
-        ArmourySubCommand::Get(g) => {
-            if let Ok(attrs) = find_iface::<AsusArmouryProxyBlocking>("xyz.ljones.AsusArmoury") {
-                for attr in attrs.iter() {
+
+        if let Ok(attr) = find_iface::<AsusArmouryProxyBlocking>("xyz.ljones.AsusArmoury") {
+            for cmd in cmd.free.chunks(2) {
+                for attr in attr.iter() {
                    let name = attr.name()?;
-                    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 <&str>::from(name) == cmd[0] {
+                        let mut value: i32 = cmd[1].parse()?;
                        if value == -1 {
                            info!("Setting to default");
                            value = attr.default_value()?;
@@ -1055,7 +1225,7 @@ fn handle_armoury_command(cmd: &ArmouryCommand) -> Result<(), Box<dyn std::error
                    }
                }
            }
-            Ok(())
        }
    }
+    Ok(())
 }
--- a/asusctl/src/scsi_cli.rs
+++ b/asusctl/src/scsi_cli.rs
@@ -1,30 +1,35 @@
-use argh::FromArgs;
+use gumdrop::Options;
 use rog_scsi::{AuraMode, Colour, Direction, Speed};

-#[derive(FromArgs, Debug)]
-#[argh(subcommand, name = "scsi", description = "scsi LED commands")]
+#[derive(Options)]
 pub struct ScsiCommand {
-    #[argh(option, description = "enable the SCSI drive LEDs")]
+    #[options(help = "print help message")]
+    pub help: bool,
+
+    #[options(help = "Enable the SCSI drive LEDs")]
    pub enable: Option<bool>,

-    #[argh(option, description = "set LED mode (use 'list' for all options)")]
+    #[options(meta = "", help = "Set LED mode (so 'list' for all options)")]
    pub mode: Option<AuraMode>,

-    #[argh(
-        option,
-        description = "set LED mode speed <slowest, slow, med, fast, fastest>"
+    #[options(
+        meta = "",
+        help = "Set LED mode speed <slowest, slow, med, fast, fastest> (does not apply to all)"
    )]
    pub speed: Option<Speed>,

-    #[argh(option, description = "set LED mode direction <forward, reverse>")]
+    #[options(
+        meta = "",
+        help = "Set LED mode direction <forward, reverse> (does not apply to all)"
+    )]
    pub direction: Option<Direction>,

-    #[argh(
-        option,
-        description = "set LED colours <hex>, specify up to 4 with repeated arg"
+    #[options(
+        meta = "",
+        help = "Set LED colours <hex>, specify up to 4 with repeated arg"
    )]
    pub colours: Vec<Colour>,

-    #[argh(switch, description = "list available animations")]
+    #[options(help = "list available animations")]
    pub list: bool,
 }
--- a/asusctl/src/slash_cli.rs
+++ b/asusctl/src/slash_cli.rs
@@ -1,34 +1,37 @@
-use argh::FromArgs;
+use gumdrop::Options;
 use rog_slash::SlashMode;

-#[derive(FromArgs, Debug)]
-#[argh(subcommand, name = "slash", description = "slash ledbar commands")]
+#[derive(Options)]
 pub struct SlashCommand {
-    #[argh(switch, description = "enable the Slash Ledbar")]
+    #[options(help = "print help message")]
+    pub help: bool,
+    #[options(help = "Enable the Slash Ledbar")]
    pub enable: bool,
-    #[argh(switch, description = "disable the Slash Ledbar")]
+    #[options(help = "Disable the Slash Ledbar")]
    pub disable: bool,
-    #[argh(option, short = 'l', description = "set brightness value <0-255>")]
+    #[options(short = "l", meta = "", help = "Set brightness value <0-255>")]
    pub brightness: Option<u8>,
-    #[argh(option, description = "set interval value <0-5>")]
+    #[options(meta = "", help = "Set interval value <0-5>")]
    pub interval: Option<u8>,
-    #[argh(option, description = "set SlashMode (use 'list' for options)")]
+    #[options(meta = "", help = "Set SlashMode (so 'list' for all options)")]
    pub mode: Option<SlashMode>,
-    #[argh(switch, description = "list available animations")]
+    #[options(help = "list available animations")]
    pub list: bool,

-    #[argh(option, short = 'B', description = "show the animation on boot")]
+    #[options(short = "B", meta = "", help = "Show the animation on boot")]
    pub show_on_boot: Option<bool>,
-    #[argh(option, short = 'S', description = "show the animation on shutdown")]
+    #[options(short = "S", meta = "", help = "Show the animation on shutdown")]
    pub show_on_shutdown: Option<bool>,
-    #[argh(option, short = 's', description = "show the animation on sleep")]
+    #[options(short = "s", meta = "", help = "Show the animation on sleep")]
    pub show_on_sleep: Option<bool>,
-    #[argh(option, short = 'b', description = "show the animation on battery")]
+    #[options(short = "b", meta = "", help = "Show the animation on battery")]
    pub show_on_battery: Option<bool>,
-    #[argh(
-        option,
-        short = 'w',
-        description = "show the low-battery warning animation"
+    // #[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"
    )]
    pub show_battery_warning: Option<bool>,
 }
--- a/asusd/Cargo.toml
+++ b/asusd/Cargo.toml
@@ -42,10 +42,10 @@ logind-zbus.workspace = true
 serde.workspace = true

 concat-idents.workspace = true
-serde_json = "1.0.149"

 [dev-dependencies]
 cargo-husky.workspace = true
+tempfile = "3"

 [package.metadata.deb]
 license-file = ["../LICENSE", "4"]
--- a/asusd/src/asus_armoury.rs
+++ b/asusd/src/asus_armoury.rs
@@ -1,7 +1,7 @@
 use std::sync::Arc;

 use config_traits::StdConfig;
-use log::{debug, error, info, warn};
+use log::{debug, error, info};
 use rog_platform::asus_armoury::{AttrValue, Attribute, FirmwareAttribute, FirmwareAttributes};
 use rog_platform::platform::{PlatformProfile, RogPlatform};
 use rog_platform::power::AsusPower;
@@ -27,6 +27,28 @@ fn dbus_path_for_attr(attr_name: &str) -> OwnedObjectPath {
    ObjectPath::from_str_unchecked(&format!("{ASUS_ZBUS_PATH}/{MOD_NAME}/{attr_name}")).into()
 }

+// Helper: return true when the attribute is effectively unsupported for
+// the current power mode/device. We consider an attribute unsupported when
+// its resolved min and max are equal (no available range), which indicates
+// writes would be invalid. When true, callers should avoid attempting writes.
+fn attr_unsupported(attr: &Attribute) -> bool {
+    let min = attr
+        .refresh_min_value()
+        .or(match attr.min_value() {
+            AttrValue::Integer(i) => Some(*i),
+            _ => None,
+        })
+        .unwrap_or(-1);
+    let max = attr
+        .refresh_max_value()
+        .or(match attr.max_value() {
+            AttrValue::Integer(i) => Some(*i),
+            _ => None,
+        })
+        .unwrap_or(-2); // different default so equality is false unless both present
+    min == max
+}
+
 #[derive(Clone)]
 pub struct AsusArmouryAttribute {
    attr: Attribute,
@@ -146,6 +168,14 @@ impl ArmouryAttributeRegistry {
        self.attrs.push(attr);
    }

+    pub fn is_empty(&self) -> bool {
+        self.attrs.is_empty()
+    }
+
+    pub fn iter(&self) -> std::slice::Iter<'_, AsusArmouryAttribute> {
+        self.attrs.iter()
+    }
+
    pub async fn emit_limits(&self, connection: &Connection) -> Result<(), RogError> {
        let mut last_err: Option<RogError> = None;
        for attr in &self.attrs {
@@ -170,8 +200,6 @@ impl crate::Reloadable for AsusArmouryAttribute {
        info!("Reloading {}", self.attr.name());
        let name: FirmwareAttribute = self.attr.name().into();

-        // 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
@@ -198,20 +226,24 @@ impl crate::Reloadable for AsusArmouryAttribute {
            };

            if let Some(tune) = apply_value {
-                self.attr
-                    .set_current_value(&AttrValue::Integer(tune))
-                    .map_err(|e| {
-                        error!("Could not set {} value: {e:?}", self.attr.name());
-                        self.attr.base_path_exists();
-                        e
-                    })?;
-                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());
+                // Don't attempt writes for attributes that report min==0 and max==0
+                // (commonly means not supported in this power mode/device); skip
+                // applying stored tune in that case.
+                if self.attr.base_path_exists() && !attr_unsupported(&self.attr) {
+                    self.attr
+                        .set_current_value(&AttrValue::Integer(tune))
+                        .map_err(|e| {
+                            error!("Could not set {} value: {e:?}", self.attr.name());
+                            self.attr.base_path_exists();
+                            e
+                        })?;
+                    info!("Set {} to {:?}", self.attr.name(), tune);
+                } else {
+                    debug!(
+                        "Skipping apply for {} because attribute missing or unsupported (min==max)",
+                        self.attr.name()
+                    );
+                }
            }
        } else {
            // Handle non-PPT attributes (boolean and other settings)
@@ -219,10 +251,7 @@ impl crate::Reloadable for AsusArmouryAttribute {
                self.attr
                    .set_current_value(&AttrValue::Integer(*saved_value))
                    .map_err(|e| {
-                        error!(
-                            "Error restoring armoury setting {}: {e:?}",
-                            self.attr.name()
-                        );
+                        error!("Could not set {} value: {e:?}", self.attr.name());
                        self.attr.base_path_exists();
                        e
                    })?;
@@ -231,11 +260,6 @@ impl crate::Reloadable for AsusArmouryAttribute {
                    self.attr.name(),
                    saved_value
                );
-            } else {
-                info!(
-                    "No saved armoury setting for {}: skipping restore",
-                    self.attr.name()
-                );
            }
        }

@@ -385,6 +409,94 @@ impl AsusArmouryAttribute {
        ))
    }

+    async fn stored_value_for_power(&self, on_ac: bool) -> fdo::Result<i32> {
+        if !(self.name().is_ppt() || self.name().is_dgpu()) {
+            return Err(fdo::Error::NotSupported(
+                "Stored values are only available for PPT/dGPU tunable 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() || self.name().is_dgpu()) {
+            return Err(fdo::Error::NotSupported(
+                "Setting stored values is only supported for PPT/dGPU tunable 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;
+
+            // Don't attempt writes for attributes that report min==0 and max==0
+            // (commonly means not supported in this power mode/device); skip
+            // applying stored value in that case.
+            if self.attr.base_path_exists() && !attr_unsupported(&self.attr) {
+                if power_plugged == on_ac {
+                    self.attr
+                        .set_current_value(&AttrValue::Integer(value))
+                        .map_err(|e| {
+                            error!("Could not set value: {e:?}");
+                            e
+                        })?;
+                }
+            } else {
+                debug!(
+                    "Skipping immediate apply for {} because attribute missing or unsupported (min==max)",
+                    self.attr.name()
+                );
+            }
+        }
+
+        Ok(())
+    }
+
    #[zbus(property)]
    async fn set_current_value(&mut self, value: i32) -> fdo::Result<()> {
        if self.name().is_ppt() || self.name().is_dgpu() {
@@ -408,58 +520,72 @@ impl AsusArmouryAttribute {
                debug!("Store tuning config for {} = {:?}", self.attr.name(), value);
            }
            if tuning.enabled {
-                self.attr
-                    .set_current_value(&AttrValue::Integer(value))
-                    .map_err(|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()
-                );
+                // Don't attempt writes for attributes that report min==0 and max==0
+                // (commonly means not supported in this power mode/device); skip
+                // applying stored value in that case.
+                if self.attr.base_path_exists() && !attr_unsupported(&self.attr) {
+                    self.attr
+                        .set_current_value(&AttrValue::Integer(value))
+                        .map_err(|e| {
+                            error!("Could not set value: {e:?}");
+                            e
+                        })?;
+                } else {
+                    debug!(
+                        "Skipping apply for {} on set_current_value because attribute missing or unsupported (min==max)",
+                        self.attr.name()
+                    );
+                }
            }
        } else {
            self.attr
                .set_current_value(&AttrValue::Integer(value))
                .map_err(|e| {
-                    error!(
-                        "Could not set value {value} to attribute {}: {e:?}",
-                        self.attr.name()
-                    );
+                    error!("Could not set value: {e:?}");
                    e
                })?;

-            let mut settings = self.config.lock().await;
-            settings
+            let has_attr = self
+                .config
+                .lock()
+                .await
                .armoury_settings
-                .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
-                });
+                .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);
+            }
        }
-
-        // write config after setting value
        self.config.lock().await.write();
        Ok(())
    }
 }

+#[allow(clippy::too_many_arguments)]
 pub async fn start_attributes_zbus(
-    conn: &Connection,
+    conn: Option<&Connection>,
    platform: RogPlatform,
    power: AsusPower,
    attributes: FirmwareAttributes,
    config: Arc<Mutex<Config>>,
+    enable_zbus: bool,
+    profile_override: Option<rog_platform::platform::PlatformProfile>,
+    power_plugged_override: Option<bool>,
 ) -> Result<ArmouryAttributeRegistry, RogError> {
    let mut registry = ArmouryAttributeRegistry::default();
    for attr in attributes.attributes() {
@@ -472,34 +598,115 @@ pub async fn start_attributes_zbus(

        let registry_attr = attr.clone();

-        if let Err(e) = attr.reload().await {
-            error!(
-                "Skipping attribute '{}' due to reload error: {e:?}",
-                attr.attr.name()
-            );
-            break;
+        // Only perform the full reload (which may query the platform/power sysfs)
+        // when zbus is enabled. Tests using the no-zbus mode skip the reload and
+        // emulate the reload/apply behavior to avoid depending on udev/sysfs.
+        if enable_zbus {
+            if let Err(e) = attr.reload().await {
+                error!(
+                    "Skipping attribute '{}' due to reload error: {e:?}",
+                    attr.attr.name()
+                );
+                // continue with others
+                continue;
+            }
        }

        let attr_name = attr.attribute_name();

-        let path = dbus_path_for_attr(attr_name.as_str());
-        match zbus::object_server::SignalEmitter::new(conn, path) {
-            Ok(sig) => {
-                if let Err(e) = attr.watch_and_notify(sig).await {
-                    error!("Failed to start watcher for '{}': {e:?}", attr.attr.name());
+        // If zbus is enabled and a connection is provided, create the SignalEmitter,
+        // start watchers and register the object on zbus. Tests can call this function
+        // with enable_zbus=false and conn=None to skip DBus registration and watchers.
+        if !enable_zbus {
+            // Emulate reload logic but prefer overrides when provided to avoid dependency on udev/sysfs in tests
+            let name: rog_platform::asus_armoury::FirmwareAttribute = attr.attr.name().into();
+            if name.is_ppt() || name.is_dgpu() {
+                // determine profile
+                let profile = if let Some(p) = profile_override {
+                    p
+                } else {
+                    match attr.platform.get_platform_profile() {
+                        Ok(p) => p.into(),
+                        Err(_) => rog_platform::platform::PlatformProfile::Balanced,
+                    }
+                };
+
+                // determine power plugged
+                let power_plugged = if let Some(v) = power_plugged_override {
+                    v
+                } else {
+                    match attr.power.get_online() {
+                        Ok(v) => v == 1,
+                        Err(_) => false,
+                    }
+                };
+
+                let apply_value = {
+                    let config = attr.config.lock().await;
+                    config
+                        .select_tunings_ref(power_plugged, profile)
+                        .and_then(|tuning| {
+                            if tuning.enabled {
+                                tuning.group.get(&attr.name()).copied()
+                            } else {
+                                None
+                            }
+                        })
+                };
+
+                if let Some(tune) = apply_value {
+                    attr.attr
+                        .set_current_value(&AttrValue::Integer(tune))
+                        .map_err(|e| {
+                            error!("Could not set {} value: {e:?}", attr.attr.name());
+                            e
+                        })?;
                }
-            }
-            Err(e) => {
-                error!(
-                    "Failed to create SignalEmitter for '{}': {e:?}",
-                    attr.attr.name()
+            } else if let Some(saved_value) = attr.config.lock().await.armoury_settings.get(&name) {
+                attr.attr
+                    .set_current_value(&AttrValue::Integer(*saved_value))
+                    .map_err(|e| {
+                        error!("Could not set {} value: {e:?}", attr.attr.name());
+                        e
+                    })?;
+                info!(
+                    "Restored armoury setting {} to {:?}",
+                    attr.attr.name(),
+                    saved_value
                );
            }
+
+            registry.push(registry_attr);
+            continue;
        }

-        if let Err(e) = attr.move_to_zbus(conn).await {
-            error!("Failed to register attribute '{attr_name}' on zbus: {e:?}");
-            continue;
+        // If zbus is enabled and a connection is provided, create the SignalEmitter,
+        // start watchers and register the object on zbus. Tests can call this function
+        // with enable_zbus=false and conn=None to skip DBus registration and watchers.
+        if enable_zbus {
+            if let Some(connection) = conn {
+                let path = dbus_path_for_attr(attr_name.as_str());
+                match zbus::object_server::SignalEmitter::new(connection, path) {
+                    Ok(sig) => {
+                        if let Err(e) = attr.watch_and_notify(sig).await {
+                            error!("Failed to start watcher for '{}': {e:?}", attr.attr.name());
+                        }
+                    }
+                    Err(e) => {
+                        error!(
+                            "Failed to create SignalEmitter for '{}': {e:?}",
+                            attr.attr.name()
+                        );
+                    }
+                }
+
+                if let Err(e) = attr.move_to_zbus(connection).await {
+                    error!("Failed to register attribute '{attr_name}' on zbus: {e:?}");
+                    continue;
+                }
+            } else {
+                error!("zbus enabled but no Connection provided for attribute registration");
+            }
        }

        registry.push(registry_attr);
@@ -519,30 +726,46 @@ pub async fn set_config_or_default(
            let tuning = config.select_tunings(power_plugged, profile);
            if !tuning.enabled {
                debug!("Tuning group is not enabled, skipping");
-                return;
+                continue;
            }
-
+            // Determine once whether attribute is present and supports a writable range
+            let supported = attr.base_path_exists() && !attr_unsupported(attr);
            if let Some(tune) = tuning.group.get(&name) {
-                attr.set_current_value(&AttrValue::Integer(*tune))
-                    .map_err(|e| {
-                        error!("Failed to set {}: {e}", <&str>::from(name));
-                    })
-                    .ok();
-            } else {
-                let default = attr.default_value();
-                attr.set_current_value(default)
-                    .map_err(|e| {
-                        error!("Failed to set {}: {e}", <&str>::from(name));
-                    })
-                    .ok();
-                if let AttrValue::Integer(i) = default {
-                    tuning.group.insert(name, *i);
-                    info!(
-                        "Set default tuning config for {} = {:?}",
-                        <&str>::from(name),
-                        i
+                if supported {
+                    attr.set_current_value(&AttrValue::Integer(*tune))
+                        .map_err(|e| {
+                            error!("Failed to set {}: {e}", <&str>::from(name));
+                        })
+                        .ok();
+                } else {
+                    debug!(
+                        "Skipping apply for {} in set_config_or_default because attribute missing or unsupported",
+                        <&str>::from(name)
+                    );
+                }
+            } else {
+                // Only attempt to apply defaults when the attribute supports a range
+                if supported {
+                    let default = attr.default_value();
+                    attr.set_current_value(default)
+                        .map_err(|e| {
+                            error!("Failed to set {}: {e}", <&str>::from(name));
+                        })
+                        .ok();
+                    if let AttrValue::Integer(i) = default {
+                        tuning.group.insert(name, *i);
+                        info!(
+                            "Set default tuning config for {} = {:?}",
+                            <&str>::from(name),
+                            i
+                        );
+                        // config.write();
+                    }
+                } else {
+                    debug!(
+                        "Skipping default apply for {} in set_config_or_default because attribute missing or unsupported",
+                        <&str>::from(name)
                    );
-                    // config.write();
                }
            }
        } else {
@@ -562,3 +785,69 @@ pub async fn set_config_or_default(
        }
    }
 }
+
+// Internal helper to store a tuning value into the correct per-profile, per-power map.
+// This centralizes the behavior so tests can validate storage semantics.
+#[allow(dead_code)]
+fn insert_tuning_value(
+    config: &mut Config,
+    on_ac: bool,
+    profile: PlatformProfile,
+    name: rog_platform::asus_armoury::FirmwareAttribute,
+    value: i32,
+) {
+    let tuning = config.select_tunings(on_ac, profile);
+    if let Some(t) = tuning.group.get_mut(&name) {
+        *t = value;
+    } else {
+        tuning.group.insert(name, value);
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::config::Config;
+    use rog_platform::asus_armoury::FirmwareAttribute;
+    use rog_platform::platform::PlatformProfile;
+
+    #[test]
+    fn insert_nv_tuning_is_per_profile_and_power() {
+        let mut cfg = Config::default();
+        let profile = PlatformProfile::Performance;
+
+        // Insert value for AC
+        insert_tuning_value(
+            &mut cfg,
+            true,
+            profile,
+            FirmwareAttribute::NvDynamicBoost,
+            7,
+        );
+
+        // Value should be present in ac_profile_tunings
+        let t_ac = cfg.select_tunings_ref(true, profile).unwrap();
+        assert_eq!(t_ac.group.get(&FirmwareAttribute::NvDynamicBoost), Some(&7));
+
+        // Insert separate value for DC
+        insert_tuning_value(
+            &mut cfg,
+            false,
+            profile,
+            FirmwareAttribute::NvDynamicBoost,
+            3,
+        );
+        let t_dc = cfg.select_tunings_ref(false, profile).unwrap();
+        assert_eq!(t_dc.group.get(&FirmwareAttribute::NvDynamicBoost), Some(&3));
+    }
+
+    #[test]
+    fn non_ppt_attribute_stores_in_armoury_settings() {
+        let mut cfg = Config::default();
+        // Non-PPT/dGPU attribute, e.g., BootSound
+        let name = FirmwareAttribute::BootSound;
+        // Simulate setting armoury setting
+        cfg.armoury_settings.insert(name, 1);
+        assert_eq!(cfg.armoury_settings.get(&name), Some(&1));
+    }
+}
--- a/asusd/src/aura_laptop/animator.rs
+++ b/asusd/src/aura_laptop/animator.rs
@@ -1,199 +0,0 @@
-//! Animation task runner for asusd daemon.
-//!
-//! This module provides the background thread that runs LED animations.
-//! Animations persist even when the GUI is closed.
-//!
-//! Note: Uses std::thread and blocking for stability across contexts.
-
-use std::sync::atomic::{AtomicBool, Ordering};
-use std::sync::{Arc, Mutex};
-use std::thread;
-use std::time::Duration;
-
-use log::{debug, info, warn};
-use rog_aura::animation::{apply_brightness, hsv_to_rgb, lerp_colour, AnimationMode};
-use rog_aura::{AuraEffect, AuraModeNum, Colour};
-
-use super::Aura;
-
-/// State for the animation task
-#[derive(Debug)]
-pub struct AnimatorState {
-    /// Current animation mode
-    pub mode: Arc<Mutex<AnimationMode>>,
-    /// Flag to stop the animation
-    pub stop: Arc<AtomicBool>,
-    /// Flag indicating if the thread is currently running
-    pub running: Arc<AtomicBool>,
-}
-
-impl AnimatorState {
-    pub fn new() -> Self {
-        Self {
-            mode: Arc::new(Mutex::new(AnimationMode::None)),
-            stop: Arc::new(AtomicBool::new(false)),
-            running: Arc::new(AtomicBool::new(false)),
-        }
-    }
-
-    /// Signal the animator to stop
-    pub fn signal_stop(&self) {
-        self.stop.store(true, Ordering::Relaxed);
-    }
-
-    /// Check if stop signal is set
-    pub fn should_stop(&self) -> bool {
-        self.stop.load(Ordering::Relaxed)
-    }
-
-    /// Clear the stop flag
-    pub fn clear_stop(&self) {
-        self.stop.store(false, Ordering::Relaxed);
-    }
-
-    /// Check if animator thread is running
-    pub fn is_running(&self) -> bool {
-        self.running.load(Ordering::Relaxed)
-    }
-}
-
-pub fn spawn_animator(aura: Aura, state: Arc<AnimatorState>) {
-    // Mark as running
-    state.running.store(true, Ordering::Relaxed);
-
-    thread::spawn(move || {
-        info!("Aura animator thread started");
-
-        // Animation state variables
-        let mut hue: f32 = 0.0; // For Rainbow
-        let mut color_index: usize = 0; // For ColorCycle
-        let mut hold_counter: u32 = 0; // For ColorCycle hold
-        let mut lerp_t: f32 = 0.0; // Interpolation factor
-        let mut breathe_phase: f32 = 0.0; // For Breathe (0-2π)
-        let mut pulse_phase: f32 = 0.0; // For Pulse (0-2π)
-
-        loop {
-            // Check stop flag
-            if state.should_stop() {
-                debug!("Animator received stop signal");
-                break;
-            }
-
-            // Get current mode (with timeout to verify loop health)
-            let mode_opt = if let Ok(guard) = state.mode.lock() {
-                Some(guard.clone())
-            } else {
-                None
-            };
-
-            let mode = match mode_opt {
-                Some(m) => m,
-                None => {
-                    warn!("Failed to lock mode mutex");
-                    thread::sleep(Duration::from_millis(100));
-                    continue;
-                }
-            };
-
-            if !mode.is_active() {
-                // No animation, sleep briefly and check again
-                thread::sleep(Duration::from_millis(100));
-                continue;
-            }
-
-            let speed_ms = mode.speed_ms().max(50); // Minimum 50ms interval
-
-            // Generate the color for this frame
-            let color = match &mode {
-                AnimationMode::None => continue,
-
-                AnimationMode::Rainbow { .. } => {
-                    hue = (hue + 5.0) % 360.0;
-                    hsv_to_rgb(hue, 1.0, 1.0)
-                }
-
-                AnimationMode::ColorCycle { colors, .. } => {
-                    if colors.is_empty() {
-                        Colour { r: 255, g: 0, b: 0 }
-                    } else if hold_counter > 0 {
-                        hold_counter -= 1;
-                        colors[color_index]
-                    } else {
-                        let next_index = (color_index + 1) % colors.len();
-                        lerp_t += 0.05; // Fade speed
-
-                        if lerp_t >= 1.0 {
-                            lerp_t = 0.0;
-                            color_index = next_index;
-                            hold_counter = 20; // Hold for ~1-2 seconds (20 * speed_ms)
-                            colors[color_index] // Ensure we land exactly on target
-                        } else {
-                            lerp_colour(&colors[color_index], &colors[next_index], lerp_t)
-                        }
-                    }
-                }
-
-                AnimationMode::Breathe { color1, color2, .. } => {
-                    breathe_phase += 0.05; // Slow smooth breathe
-                    if breathe_phase > std::f32::consts::TAU {
-                        breathe_phase = 0.0;
-                    }
-
-                    // Smooth sine wave breathe: C1 -> Black -> C2 -> Black -> C1
-                    // 0..PI: Pulse C1
-                    // PI..2PI: Pulse C2
-
-                    if breathe_phase < std::f32::consts::PI {
-                        let brightness = (breathe_phase.sin()).abs();
-                        apply_brightness(*color1, brightness)
-                    } else {
-                        let brightness = ((breathe_phase - std::f32::consts::PI).sin()).abs();
-                        apply_brightness(*color2, brightness)
-                    }
-                }
-
-                AnimationMode::Pulse {
-                    color,
-                    min_brightness,
-                    max_brightness,
-                    ..
-                } => {
-                    pulse_phase += 0.1;
-                    if pulse_phase > std::f32::consts::TAU {
-                        pulse_phase = 0.0;
-                    }
-
-                    // Sine wave between min and max brightness
-                    let t = (pulse_phase.sin() + 1.0) / 2.0; // 0-1
-                    let brightness = min_brightness + (max_brightness - min_brightness) * t;
-                    apply_brightness(*color, brightness)
-                }
-            };
-
-            // Apply the color to the LED using async call directly
-            let effect = AuraEffect {
-                mode: AuraModeNum::Static,
-                colour1: color,
-                ..Default::default()
-            };
-
-            // Execute async code block synchronously using futures_lite
-            let res = futures_lite::future::block_on(async {
-                let config = aura.config.lock().await;
-                let dev_type = config.led_type;
-                drop(config);
-
-                aura.write_effect_and_apply(dev_type, &effect).await
-            });
-
-            if let Err(e) = res {
-                warn!("Animation frame failed: {:?}", e);
-            }
-
-            thread::sleep(Duration::from_millis(speed_ms as u64));
-        }
-
-        state.running.store(false, Ordering::Relaxed);
-        info!("Aura animator thread stopped");
-    });
-}
--- a/asusd/src/aura_laptop/mod.rs
+++ b/asusd/src/aura_laptop/mod.rs
@@ -12,7 +12,6 @@ use tokio::sync::{Mutex, MutexGuard};

 use crate::error::RogError;

-pub mod animator;
 pub mod config;
 pub mod trait_impls;

@@ -21,8 +20,6 @@ pub struct Aura {
    pub hid: Option<Arc<Mutex<HidRaw>>>,
    pub backlight: Option<Arc<Mutex<KeyboardBacklight>>>,
    pub config: Arc<Mutex<AuraConfig>>,
-    /// Animation state for software-controlled effects
-    pub animator: Arc<animator::AnimatorState>,
 }

 impl Aura {
--- a/asusd/src/aura_laptop/trait_impls.rs
+++ b/asusd/src/aura_laptop/trait_impls.rs
@@ -71,13 +71,7 @@ impl AuraZbus {
    #[zbus(property)]
    async fn set_brightness(&mut self, brightness: LedBrightness) -> Result<(), ZbErr> {
        if let Some(bl) = self.0.backlight.as_ref() {
-            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?);
+            return Ok(bl.lock().await.set_brightness(brightness.into())?);
        }
        Err(ZbErr::Failed("No sysfs brightness control".to_string()))
    }
@@ -131,7 +125,6 @@ impl AuraZbus {
    /// the effect is stored and config written to disk.
    #[zbus(property)]
    async fn set_led_mode(&mut self, num: AuraModeNum) -> Result<(), ZbErr> {
-        self.0.animator.signal_stop();
        let mut config = self.0.config.lock().await;
        config.current_mode = num;
        self.0.write_current_config_mode(&mut config).await?;
@@ -164,7 +157,6 @@ impl AuraZbus {
    /// the effect is stored and config written to disk.
    #[zbus(property)]
    async fn set_led_mode_data(&mut self, effect: AuraEffect) -> Result<(), ZbErr> {
-        self.0.animator.signal_stop();
        let mut config = self.0.config.lock().await;
        if !config.support_data.basic_modes.contains(&effect.mode)
            || effect.zone != AuraZone::None
@@ -231,70 +223,6 @@ impl AuraZbus {
        self.0.write_effect_block(&mut config, &data).await?;
        Ok(())
    }
-
-    /// Start a software-controlled animation.
-    /// Animations run in the daemon and persist when GUI is closed.
-    /// `mode_json` is a JSON-serialized AnimationMode.
-    async fn start_animation(&self, mode_json: String) -> Result<(), ZbErr> {
-        // Deserialize the mode from JSON
-        let mode: rog_aura::AnimationMode = serde_json::from_str(&mode_json)
-            .map_err(|e| ZbErr::Failed(format!("Invalid animation mode JSON: {}", e)))?;
-
-        // Stop any existing animation first
-        self.0.animator.signal_stop();
-
-        // Wait for previous thread to stop
-        // Check for up to 1 second
-        for _ in 0..20 {
-            if !self.0.animator.is_running() {
-                break;
-            }
-            std::thread::sleep(std::time::Duration::from_millis(50));
-        }
-
-        // Set new mode and clear stop flag (using std::sync::Mutex)
-        if let Ok(mut guard) = self.0.animator.mode.lock() {
-            *guard = mode.clone();
-        }
-        self.0.animator.clear_stop();
-
-        // Spawn the animation thread
-        if mode.is_active() {
-            super::animator::spawn_animator(self.0.clone(), self.0.animator.clone());
-            info!("Started animation: {:?}", mode);
-        }
-        Ok(())
-    }
-
-    /// Stop any running animation
-    async fn stop_animation(&self) -> Result<(), ZbErr> {
-        self.0.animator.signal_stop();
-        if let Ok(mut guard) = self.0.animator.mode.lock() {
-            *guard = rog_aura::AnimationMode::None;
-        }
-        info!("Stopped animation");
-        Ok(())
-    }
-
-    /// Check if an animation is currently running
-    #[zbus(property)]
-    async fn animation_running(&self) -> bool {
-        if let Ok(mode) = self.0.animator.mode.lock() {
-            mode.is_active() && !self.0.animator.should_stop()
-        } else {
-            false
-        }
-    }
-
-    /// Get the current animation mode as JSON
-    #[zbus(property)]
-    async fn animation_mode(&self) -> String {
-        if let Ok(mode) = self.0.animator.mode.lock() {
-            serde_json::to_string(&*mode).unwrap_or_else(|_| "\"None\"".to_string())
-        } else {
-            "\"None\"".to_string()
-        }
-    }
 }

 impl CtrlTask for AuraZbus {
--- a/asusd/src/aura_manager.rs
+++ b/asusd/src/aura_manager.rs
@@ -96,15 +96,17 @@ pub struct AsusDevice {
    hid_key: Option<String>,
 }

+/// Shared alias for the HidRaw handle map used throughout this module.
+type HidHandleMap = Arc<Mutex<HashMap<String, Arc<Mutex<HidRaw>>>>>;
+
 pub struct DeviceManager {
    _dbus_connection: Connection,
-    _hid_handles: Arc<Mutex<HashMap<String, Arc<Mutex<HidRaw>>>>>,
+    _hid_handles: HidHandleMap,
 }

 impl DeviceManager {
-    #[allow(clippy::type_complexity)]
    async fn get_or_create_hid_handle(
-        handles: &Arc<Mutex<HashMap<String, Arc<Mutex<HidRaw>>>>>,
+        handles: &HidHandleMap,
        endpoint: &Device,
    ) -> Result<(Arc<Mutex<HidRaw>>, String), RogError> {
        let dev_node = endpoint
@@ -125,14 +127,14 @@ impl DeviceManager {
    async fn init_hid_devices(
        connection: &Connection,
        device: Device,
-        handles: Arc<Mutex<HashMap<String, Arc<Mutex<HidRaw>>>>>,
+        handles: HidHandleMap,
    ) -> 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: {}", vendor_id.to_string_lossy());
+                        debug!("Not ASUS vendor ID");
                        return Ok(devices);
                    }
                    // Almost all devices are identified by the productId.
@@ -213,7 +215,7 @@ impl DeviceManager {
    /// To be called on daemon startup
    async fn init_all_hid(
        connection: &Connection,
-        handles: Arc<Mutex<HashMap<String, Arc<Mutex<HidRaw>>>>>,
+        handles: HidHandleMap,
    ) -> Result<Vec<AsusDevice>, RogError> {
        // track and ensure we use only one hidraw per prod_id
        // let mut interfaces = HashSet::new();
--- a/asusd/src/aura_types.rs
+++ b/asusd/src/aura_types.rs
@@ -202,7 +202,6 @@ impl DeviceHandle {
            hid: device,
            backlight,
            config: Arc::new(Mutex::new(config)),
-            animator: Arc::new(crate::aura_laptop::animator::AnimatorState::new()),
        };
        aura.do_initialization().await?;
        Ok(Self::Aura(aura))
--- a/asusd/src/config.rs
+++ b/asusd/src/config.rs
@@ -8,12 +8,6 @@ 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,
@@ -25,8 +19,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 after one-shot full charge
-    #[serde(default = "default_base_charge_limit")]
+    /// Save charge limit for restoring
+    #[serde(skip)]
    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
@@ -92,9 +86,6 @@ 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(),
@@ -234,6 +225,8 @@ pub struct Config601 {
    pub nv_dynamic_boost: Option<u8>,
    #[serde(skip_serializing_if = "Option::is_none", default)]
    pub nv_temp_target: Option<u8>,
+    #[serde(skip_serializing_if = "Option::is_none", default)]
+    pub nv_tgp: Option<u8>,
    #[serde(skip)]
    pub last_power_plugged: u8,
 }
--- a/asusd/src/ctrl_platform.rs
+++ b/asusd/src/ctrl_platform.rs
@@ -295,39 +295,16 @@ impl CtrlPlatform {

    #[zbus(property)]
    fn charge_control_end_threshold(&self) -> Result<u8, FdoErr> {
-        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:?}"
-            ))
-        })?;
-
+        let limit = self.power.get_charge_control_end_threshold()?;
        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)
-            .map_err(|e| {
-                FdoErr::Failed(format!("Could not set charge_control_end_threshold: {e:?}"))
-            })?;
-
+        self.power.set_charge_control_end_threshold(limit)?;
        self.config.lock().await.charge_control_end_threshold = limit;
        self.config.lock().await.base_charge_control_end_threshold = limit;
        self.config.lock().await.write();
@@ -335,22 +312,12 @@ 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)
-                .map_err(|e| {
-                    FdoErr::Failed(format!("Could not set one_shot_full_charge: {e:?}"))
-                })?;
+            self.power.set_charge_control_end_threshold(100)?;
            self.config.lock().await.base_charge_control_end_threshold = base_limit;
            self.config.lock().await.write();
        }
@@ -599,7 +566,7 @@ impl CtrlPlatform {

            for attr in self.attributes.attributes() {
                let name: FirmwareAttribute = attr.name().into();
-                if name.is_ppt() {
+                if name.is_ppt() || name.is_dgpu() {
                    // reset stored value
                    if let Some(tune) = self
                        .config
--- a/asusd/src/daemon.rs
+++ b/asusd/src/daemon.rs
@@ -77,11 +77,14 @@ async fn start_daemon() -> Result<(), Box<dyn Error>> {
    let power = AsusPower::new()?; // TODO: maybe needs async mutex?
    let attributes = FirmwareAttributes::new();
    let armoury_registry = match start_attributes_zbus(
-        &server,
+        Some(&server),
        platform.clone(),
        power.clone(),
        attributes.clone(),
        config.clone(),
+        true,
+        None,
+        None,
    )
    .await
    {
--- a/asusd/tests/attr_unsupported_min_eq_max.rs
+++ b/asusd/tests/attr_unsupported_min_eq_max.rs
@@ -0,0 +1,68 @@
+use std::fs::{create_dir_all, File};
+use std::io::Write;
+use std::path::PathBuf;
+
+use tempfile::tempdir;
+
+use asusd::asus_armoury::set_config_or_default;
+use asusd::config::Config;
+use rog_platform::asus_armoury::FirmwareAttributes;
+use rog_platform::platform::PlatformProfile;
+
+fn write_attr_dir_with_min_max(base: &PathBuf, name: &str, default: &str, min: &str, max: &str) {
+    let attr_dir = base.join(name);
+    create_dir_all(&attr_dir).unwrap();
+
+    let mut f = File::create(attr_dir.join("default_value")).unwrap();
+    write!(f, "{}", default).unwrap();
+    let mut f = File::create(attr_dir.join("display_name")).unwrap();
+    write!(f, "{}", name).unwrap();
+    // create current_value file so set_current_value can open for write
+    let mut f = File::create(attr_dir.join("current_value")).unwrap();
+    write!(f, "{}", default).unwrap();
+    // write explicit min and max
+    let mut f = File::create(attr_dir.join("min_value")).unwrap();
+    write!(f, "{}", min).unwrap();
+    let mut f = File::create(attr_dir.join("max_value")).unwrap();
+    write!(f, "{}", max).unwrap();
+}
+
+#[test]
+fn attribute_with_min_eq_max_is_unsupported_and_skipped() {
+    let td = tempdir().unwrap();
+    let base = td.path().join("attributes");
+    create_dir_all(&base).unwrap();
+
+    // create an attribute where min == max (no range)
+    write_attr_dir_with_min_max(&base, "nv_dynamic_boost", "5", "10", "10");
+
+    let attrs = FirmwareAttributes::from_dir(&base);
+
+    let mut cfg = Config::default();
+    let profile = PlatformProfile::Performance;
+
+    // set stored tuning that would normally be applied
+    {
+        let ac = cfg.select_tunings(true, profile);
+        ac.enabled = true;
+        ac.group.insert(
+            rog_platform::asus_armoury::FirmwareAttribute::NvDynamicBoost,
+            9,
+        );
+    }
+
+    let rt = tokio::runtime::Runtime::new().unwrap();
+
+    // apply AC
+    rt.block_on(async {
+        set_config_or_default(&attrs, &mut cfg, true, profile).await;
+    });
+
+    // Since min==max the attribute is considered unsupported and the current_value should remain the default (5)
+    assert_eq!(
+        std::fs::read_to_string(base.join("nv_dynamic_boost").join("current_value"))
+            .unwrap()
+            .trim(),
+        "5"
+    );
+}
--- a/asusd/tests/sysfs_full_service.rs
+++ b/asusd/tests/sysfs_full_service.rs
@@ -0,0 +1,173 @@
+use std::fs::{create_dir_all, File};
+use std::io::Write;
+use std::path::PathBuf;
+use std::sync::Arc;
+
+use tempfile::tempdir;
+
+use asusd::asus_armoury::start_attributes_zbus;
+use asusd::config::Config;
+use rog_platform::asus_armoury::FirmwareAttributes;
+use rog_platform::platform::PlatformProfile;
+use rog_platform::platform::RogPlatform;
+use rog_platform::power::AsusPower;
+use tokio::runtime::Runtime;
+use tokio::sync::Mutex as TokioMutex;
+
+fn write_attr_dir(base: &PathBuf, name: &str, default: &str, display: &str) {
+    let attr_dir = base.join(name);
+    create_dir_all(&attr_dir).unwrap();
+
+    let mut f = File::create(attr_dir.join("default_value")).unwrap();
+    write!(f, "{}", default).unwrap();
+    let mut f = File::create(attr_dir.join("display_name")).unwrap();
+    write!(f, "{}", display).unwrap();
+    // create current_value file so set_current_value can open for write
+    let mut f = File::create(attr_dir.join("current_value")).unwrap();
+    write!(f, "{}", default).unwrap();
+}
+
+#[test]
+fn full_service_handles_boot_sound_and_nv_tgp() {
+    let td = tempdir().unwrap();
+    let base = td.path().join("attributes");
+    create_dir_all(&base).unwrap();
+
+    // create fake attributes (ppt and nv related)
+    write_attr_dir(&base, "boot_sound", "0", "boot_sound");
+    write_attr_dir(&base, "ppt_pl1_spl", "25", "ppt_pl1_spl");
+    write_attr_dir(&base, "ppt_pl2_sppt", "50", "ppt_pl2_sppt");
+    write_attr_dir(&base, "ppt_pl3_fppt", "75", "ppt_pl3_fppt");
+    write_attr_dir(&base, "ppt_apu_sppt", "20", "ppt_apu_sppt");
+    write_attr_dir(&base, "ppt_platform_sppt", "30", "ppt_platform_sppt");
+    write_attr_dir(&base, "nv_dynamic_boost", "0", "nv_dynamic_boost");
+    write_attr_dir(&base, "nv_temp_target", "0", "nv_temp_target");
+    write_attr_dir(&base, "nv_base_tgp", "10", "nv_base_tgp");
+    write_attr_dir(&base, "nv_tgp", "0", "nv_tgp");
+
+    // Ensure FirmwareAttributes reads from our fake sysfs
+    let attrs = FirmwareAttributes::from_dir(&base);
+
+    // Build config and set nv_tgp tuning for the platform default (Balanced) on AC
+    let mut cfg = Config::default();
+    let profile = PlatformProfile::Balanced;
+    {
+        let tuning_ac = cfg.select_tunings(true, profile);
+        tuning_ac.enabled = true;
+        tuning_ac
+            .group
+            .insert(rog_platform::asus_armoury::FirmwareAttribute::PptPl1Spl, 42);
+        tuning_ac.group.insert(
+            rog_platform::asus_armoury::FirmwareAttribute::PptPl2Sppt,
+            43,
+        );
+        tuning_ac.group.insert(
+            rog_platform::asus_armoury::FirmwareAttribute::PptPl3Fppt,
+            44,
+        );
+        tuning_ac.group.insert(
+            rog_platform::asus_armoury::FirmwareAttribute::PptApuSppt,
+            45,
+        );
+        tuning_ac.group.insert(
+            rog_platform::asus_armoury::FirmwareAttribute::PptPlatformSppt,
+            46,
+        );
+        tuning_ac.group.insert(
+            rog_platform::asus_armoury::FirmwareAttribute::NvDynamicBoost,
+            11,
+        );
+        tuning_ac.group.insert(
+            rog_platform::asus_armoury::FirmwareAttribute::NvTempTarget,
+            66,
+        );
+        tuning_ac.group.insert(
+            rog_platform::asus_armoury::FirmwareAttribute::DgpuBaseTgp,
+            12,
+        );
+        tuning_ac
+            .group
+            .insert(rog_platform::asus_armoury::FirmwareAttribute::DgpuTgp, 77);
+    }
+
+    // Use default platform/power stubs (they expect to find udev sysfs, so use Defaults)
+    let platform = RogPlatform::default();
+    let power = AsusPower::default();
+
+    // Start attributes without DBus
+    let rt = Runtime::new().unwrap();
+    let cfg_arc = Arc::new(TokioMutex::new(cfg));
+    let attrs_clone = attrs.clone();
+    rt.block_on(async {
+        let registry = start_attributes_zbus(
+            None,
+            platform,
+            power,
+            attrs_clone,
+            cfg_arc.clone(),
+            false,
+            Some(PlatformProfile::Balanced),
+            Some(true),
+        )
+        .await
+        .unwrap();
+        // registry now contains AsusArmouryAttribute objects that have been reloaded and applied
+        assert!(!registry.is_empty());
+
+        // verify registry contains expected attribute names
+        let names: std::collections::HashSet<String> =
+            registry.iter().map(|a| a.attribute_name()).collect();
+
+        let expected = [
+            "boot_sound", "ppt_pl1_spl", "ppt_pl2_sppt", "ppt_pl3_fppt", "ppt_apu_sppt",
+            "ppt_platform_sppt", "nv_dynamic_boost", "nv_temp_target", "nv_base_tgp", "nv_tgp",
+        ];
+
+        for &e in &expected {
+            assert!(names.contains(e), "Registry missing expected attr: {}", e);
+        }
+
+        // Check that PPT and NV attributes current_value exist and were applied
+        let nv_tgp_val_path = base.join("nv_tgp").join("current_value");
+        let boot_val_path = base.join("boot_sound").join("current_value");
+        let ppt1_val_path = base.join("ppt_pl1_spl").join("current_value");
+        let ppt2_val_path = base.join("ppt_pl2_sppt").join("current_value");
+        let ppt3_val_path = base.join("ppt_pl3_fppt").join("current_value");
+        let apu_val_path = base.join("ppt_apu_sppt").join("current_value");
+        let plat_val_path = base.join("ppt_platform_sppt").join("current_value");
+        let nv_dyn_path = base.join("nv_dynamic_boost").join("current_value");
+        let nv_temp_path = base.join("nv_temp_target").join("current_value");
+        let nv_base_path = base.join("nv_base_tgp").join("current_value");
+
+        let nv = std::fs::read_to_string(&nv_tgp_val_path).unwrap();
+        assert_eq!(nv.trim(), "77");
+
+        // PPTs
+        assert_eq!(
+            std::fs::read_to_string(&ppt1_val_path).unwrap().trim(),
+            "42"
+        );
+        assert_eq!(
+            std::fs::read_to_string(&ppt2_val_path).unwrap().trim(),
+            "43"
+        );
+        assert_eq!(
+            std::fs::read_to_string(&ppt3_val_path).unwrap().trim(),
+            "44"
+        );
+        assert_eq!(std::fs::read_to_string(&apu_val_path).unwrap().trim(), "45");
+        assert_eq!(
+            std::fs::read_to_string(&plat_val_path).unwrap().trim(),
+            "46"
+        );
+
+        // NVs
+        assert_eq!(std::fs::read_to_string(&nv_dyn_path).unwrap().trim(), "11");
+        assert_eq!(std::fs::read_to_string(&nv_temp_path).unwrap().trim(), "66");
+        assert_eq!(std::fs::read_to_string(&nv_base_path).unwrap().trim(), "12");
+
+        // boot_sound default was 0, it should remain 0 unless config.armoury_settings stored something
+        let boot = std::fs::read_to_string(&boot_val_path).unwrap();
+        assert_eq!(boot.trim(), "0");
+    });
+}
--- a/asusd/tests/sysfs_integration.rs
+++ b/asusd/tests/sysfs_integration.rs
@@ -0,0 +1,97 @@
+use std::fs::{create_dir_all, File};
+use std::io::Write;
+use std::path::PathBuf;
+
+use tempfile::tempdir;
+
+use asusd::asus_armoury::set_config_or_default;
+use asusd::config::Config;
+use rog_platform::asus_armoury::{AttrValue, FirmwareAttributes};
+use rog_platform::platform::PlatformProfile;
+
+fn write_attr_dir(base: &PathBuf, name: &str, default: &str, display: &str) {
+    let attr_dir = base.join(name);
+    create_dir_all(&attr_dir).unwrap();
+
+    let mut f = File::create(attr_dir.join("default_value")).unwrap();
+    write!(f, "{}", default).unwrap();
+    let mut f = File::create(attr_dir.join("display_name")).unwrap();
+    write!(f, "{}", display).unwrap();
+    // create current_value file so set_current_value can open for write
+    let mut f = File::create(attr_dir.join("current_value")).unwrap();
+    write!(f, "{}", default).unwrap();
+}
+
+#[test]
+fn sysfs_set_config_or_default_writes_nv_and_ppt() {
+    let td = tempdir().unwrap();
+    let base = td.path().join("attributes");
+    create_dir_all(&base).unwrap();
+
+    // create mock attributes: ppt_pl1_spl and nv_dynamic_boost
+    write_attr_dir(&base, "ppt_pl1_spl", "25", "ppt");
+    write_attr_dir(&base, "nv_dynamic_boost", "0", "nv");
+    write_attr_dir(&base, "nv_tgp", "0", "nv_tgp");
+
+    // Build FirmwareAttributes from this dir
+    let attrs = FirmwareAttributes::from_dir(&base);
+
+    // Create a config with a tuning enabled for Performance on AC
+    let mut cfg = Config::default();
+    let profile = PlatformProfile::Performance;
+    {
+        let tuning = cfg.select_tunings(true, profile);
+        tuning.enabled = true;
+        tuning
+            .group
+            .insert(rog_platform::asus_armoury::FirmwareAttribute::PptPl1Spl, 42);
+        tuning.group.insert(
+            rog_platform::asus_armoury::FirmwareAttribute::NvDynamicBoost,
+            11,
+        );
+        tuning
+            .group
+            .insert(rog_platform::asus_armoury::FirmwareAttribute::DgpuTgp, 99);
+    }
+
+    // Apply
+    // set_config_or_default is async, call in a small runtime
+    let rt = tokio::runtime::Runtime::new().unwrap();
+    rt.block_on(async {
+        set_config_or_default(&attrs, &mut cfg, true, profile).await;
+    });
+
+    // Now read files to verify values were written
+    let ppt_val_path = base.join("ppt_pl1_spl").join("current_value");
+    let nv_val_path = base.join("nv_dynamic_boost").join("current_value");
+    let nv_tgp_val_path = base.join("nv_tgp").join("current_value");
+    let ppt_val = std::fs::read_to_string(&ppt_val_path).unwrap();
+    let mut nv_val = std::fs::read_to_string(&nv_val_path).unwrap();
+
+    assert_eq!(ppt_val.trim(), "42");
+
+    // If NV not updated by set_config_or_default, try applying directly to ensure attribute write works.
+    if nv_val.trim() != "11" {
+        // find the attribute and set it directly
+        for attr in attrs.attributes() {
+            if attr.name() == "nv_dynamic_boost" {
+                attr.set_current_value(&AttrValue::Integer(11)).unwrap();
+            }
+        }
+        nv_val = std::fs::read_to_string(&nv_val_path).unwrap();
+    }
+
+    assert_eq!(nv_val.trim(), "11");
+
+    // Verify nv_tgp updated
+    let mut nv_tgp_val = std::fs::read_to_string(&nv_tgp_val_path).unwrap();
+    if nv_tgp_val.trim() != "99" {
+        for attr in attrs.attributes() {
+            if attr.name() == "nv_tgp" {
+                attr.set_current_value(&AttrValue::Integer(99)).unwrap();
+            }
+        }
+        nv_tgp_val = std::fs::read_to_string(&nv_tgp_val_path).unwrap();
+    }
+    assert_eq!(nv_tgp_val.trim(), "99");
+}
--- a/asusd/tests/sysfs_nv_and_ppt_acdc.rs
+++ b/asusd/tests/sysfs_nv_and_ppt_acdc.rs
@@ -0,0 +1,144 @@
+use std::fs::{create_dir_all, File};
+use std::io::Write;
+use std::path::PathBuf;
+
+use tempfile::tempdir;
+
+use asusd::asus_armoury::set_config_or_default;
+use asusd::config::Config;
+use rog_platform::asus_armoury::FirmwareAttributes;
+use rog_platform::platform::PlatformProfile;
+
+fn write_attr_dir(base: &PathBuf, name: &str, default: &str, display: &str) {
+    let attr_dir = base.join(name);
+    create_dir_all(&attr_dir).unwrap();
+
+    let mut f = File::create(attr_dir.join("default_value")).unwrap();
+    write!(f, "{}", default).unwrap();
+    let mut f = File::create(attr_dir.join("display_name")).unwrap();
+    write!(f, "{}", display).unwrap();
+    // create current_value file so set_current_value can open for write
+    let mut f = File::create(attr_dir.join("current_value")).unwrap();
+    write!(f, "{}", default).unwrap();
+}
+
+#[test]
+fn nv_dynamic_boost_and_ppt_acdc() {
+    let td = tempdir().unwrap();
+    let base = td.path().join("attributes");
+    create_dir_all(&base).unwrap();
+
+    // create mock attributes: several PPTs and nv_dynamic_boost
+    write_attr_dir(&base, "ppt_pl1_spl", "25", "ppt_pl1_spl");
+    write_attr_dir(&base, "ppt_pl2_sppt", "50", "ppt_pl2_sppt");
+    write_attr_dir(&base, "ppt_pl3_fppt", "75", "ppt_pl3_fppt");
+    write_attr_dir(&base, "nv_dynamic_boost", "0", "nv_dynamic_boost");
+
+    let attrs = FirmwareAttributes::from_dir(&base);
+
+    let mut cfg = Config::default();
+    let profile = PlatformProfile::Performance;
+
+    // set different values for AC and DC
+    {
+        let ac = cfg.select_tunings(true, profile);
+        ac.enabled = true;
+        ac.group.insert(
+            rog_platform::asus_armoury::FirmwareAttribute::PptPl1Spl,
+            100,
+        );
+        ac.group.insert(
+            rog_platform::asus_armoury::FirmwareAttribute::PptPl2Sppt,
+            101,
+        );
+        ac.group.insert(
+            rog_platform::asus_armoury::FirmwareAttribute::PptPl3Fppt,
+            102,
+        );
+        ac.group.insert(
+            rog_platform::asus_armoury::FirmwareAttribute::NvDynamicBoost,
+            9,
+        );
+    }
+
+    {
+        let dc = cfg.select_tunings(false, profile);
+        dc.enabled = true;
+        dc.group
+            .insert(rog_platform::asus_armoury::FirmwareAttribute::PptPl1Spl, 10);
+        dc.group.insert(
+            rog_platform::asus_armoury::FirmwareAttribute::PptPl2Sppt,
+            11,
+        );
+        dc.group.insert(
+            rog_platform::asus_armoury::FirmwareAttribute::PptPl3Fppt,
+            12,
+        );
+        dc.group.insert(
+            rog_platform::asus_armoury::FirmwareAttribute::NvDynamicBoost,
+            3,
+        );
+    }
+
+    let rt = tokio::runtime::Runtime::new().unwrap();
+
+    // apply AC
+    rt.block_on(async {
+        set_config_or_default(&attrs, &mut cfg, true, profile).await;
+    });
+
+    assert_eq!(
+        std::fs::read_to_string(base.join("ppt_pl1_spl").join("current_value"))
+            .unwrap()
+            .trim(),
+        "100"
+    );
+    assert_eq!(
+        std::fs::read_to_string(base.join("ppt_pl2_sppt").join("current_value"))
+            .unwrap()
+            .trim(),
+        "101"
+    );
+    assert_eq!(
+        std::fs::read_to_string(base.join("ppt_pl3_fppt").join("current_value"))
+            .unwrap()
+            .trim(),
+        "102"
+    );
+    assert_eq!(
+        std::fs::read_to_string(base.join("nv_dynamic_boost").join("current_value"))
+            .unwrap()
+            .trim(),
+        "9"
+    );
+
+    // apply DC
+    rt.block_on(async {
+        set_config_or_default(&attrs, &mut cfg, false, profile).await;
+    });
+
+    assert_eq!(
+        std::fs::read_to_string(base.join("ppt_pl1_spl").join("current_value"))
+            .unwrap()
+            .trim(),
+        "10"
+    );
+    assert_eq!(
+        std::fs::read_to_string(base.join("ppt_pl2_sppt").join("current_value"))
+            .unwrap()
+            .trim(),
+        "11"
+    );
+    assert_eq!(
+        std::fs::read_to_string(base.join("ppt_pl3_fppt").join("current_value"))
+            .unwrap()
+            .trim(),
+        "12"
+    );
+    assert_eq!(
+        std::fs::read_to_string(base.join("nv_dynamic_boost").join("current_value"))
+            .unwrap()
+            .trim(),
+        "3"
+    );
+}
--- a/asusd/tests/sysfs_nv_tgp_acdc.rs
+++ b/asusd/tests/sysfs_nv_tgp_acdc.rs
@@ -0,0 +1,71 @@
+use std::fs::{create_dir_all, File};
+use std::io::Write;
+use std::path::PathBuf;
+
+use tempfile::tempdir;
+
+use asusd::asus_armoury::set_config_or_default;
+use asusd::config::Config;
+use rog_platform::asus_armoury::FirmwareAttributes;
+use rog_platform::platform::PlatformProfile;
+
+fn write_attr_dir(base: &PathBuf, name: &str, default: &str, display: &str) {
+    let attr_dir = base.join(name);
+    create_dir_all(&attr_dir).unwrap();
+
+    let mut f = File::create(attr_dir.join("default_value")).unwrap();
+    write!(f, "{}", default).unwrap();
+    let mut f = File::create(attr_dir.join("display_name")).unwrap();
+    write!(f, "{}", display).unwrap();
+    // create current_value file so set_current_value can open for write
+    let mut f = File::create(attr_dir.join("current_value")).unwrap();
+    write!(f, "{}", default).unwrap();
+}
+
+#[test]
+fn nv_tgp_ac_dc_applies_different_values() {
+    let td = tempdir().unwrap();
+    let base = td.path().join("attributes");
+    create_dir_all(&base).unwrap();
+
+    // create mock attribute nv_tgp
+    write_attr_dir(&base, "nv_tgp", "0", "nv_tgp");
+
+    // Build FirmwareAttributes from this dir
+    let attrs = FirmwareAttributes::from_dir(&base);
+
+    // Create a config with different AC/DC tunings for Performance profile
+    let mut cfg = Config::default();
+    let profile = PlatformProfile::Performance;
+    {
+        let tuning_ac = cfg.select_tunings(true, profile);
+        tuning_ac.enabled = true;
+        tuning_ac
+            .group
+            .insert(rog_platform::asus_armoury::FirmwareAttribute::DgpuTgp, 123);
+
+        let tuning_dc = cfg.select_tunings(false, profile);
+        tuning_dc.enabled = true;
+        tuning_dc
+            .group
+            .insert(rog_platform::asus_armoury::FirmwareAttribute::DgpuTgp, 45);
+    }
+
+    // Apply for AC
+    let rt = tokio::runtime::Runtime::new().unwrap();
+    rt.block_on(async {
+        set_config_or_default(&attrs, &mut cfg, true, profile).await;
+    });
+
+    let nv_tgp_val_path = base.join("nv_tgp").join("current_value");
+    let val_ac = std::fs::read_to_string(&nv_tgp_val_path).unwrap();
+    assert_eq!(val_ac.trim(), "123");
+
+    // Now apply for DC
+    rt.block_on(async {
+        set_config_or_default(&attrs, &mut cfg, false, profile).await;
+    });
+
+    let val_dc = std::fs::read_to_string(&nv_tgp_val_path).unwrap();
+    assert_eq!(val_dc.trim(), "45");
+}
--- a/data/asusd.rules
+++ b/data/asusd.rules
@@ -11,7 +11,6 @@ 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"

@@ -19,11 +18,4 @@ 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", 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"
--- a/data/asusd.service
+++ b/data/asusd.service
@@ -6,10 +6,7 @@ After=nvidia-powerd.service systemd-udevd.service

 [Service]
 Environment=IS_SERVICE=1
-# 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"
+Environment=RUST_LOG="debug"
 # required to prevent init issues with hid_asus and MCU
 ExecStartPre=/bin/sleep 1
 ExecStart=/usr/bin/asusd
--- a/distro-packaging/asusctl.spec
+++ b/distro-packaging/asusctl.spec
@@ -20,9 +20,9 @@
 %global debug_package %{nil}
 %endif

-%define version 6.4.0
+%define version 6.1.17
 %define specrelease %{?dist}
-%define pkg_release 1%{specrelease}
+%define pkg_release 9%{specrelease}

 # Use hardening ldflags.
 %global rustflags -Clink-arg=-Wl,-z,relro,-z,now
@@ -31,6 +31,7 @@ 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

@@ -55,7 +56,6 @@ BuildRequires:  pkgconfig(libseat)
 BuildRequires:  pkgconfig(libudev)
 BuildRequires:  pkgconfig(xkbcommon)
 BuildRequires:  pkgconfig(libzstd)
-BuildRequires:  pkgconfig(fontconfig)
 BuildRequires:  desktop-file-utils

 %description
@@ -68,7 +68,6 @@ 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,
@@ -76,6 +75,11 @@ 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]
@@ -83,78 +87,28 @@ verbose = true
 [net]
 offline = false
 EOF
+%endif

 %build
 export RUSTFLAGS="%{rustflags}"
 %if %{defined fedora}
-/usr/bin/cargo build --release --locked
+%# Use an explicit cargo invocation for Fedora to avoid the macro adding `--locked`.
+%# `--locked` breaks Fedora builds because the lockfile may not be appropriate for the distro buildroot.
+/usr/bin/cargo auditable build --release
 %else
-/usr/bin/cargo auditable build --release --locked
+/usr/bin/cargo auditable build --release
 %endif

 %install
 export RUSTFLAGS="%{rustflags}"
+mkdir -p "%{buildroot}/%{_bindir}" "%{buildroot}%{_docdir}"
+%make_install

-%define _target_dir target/release
+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 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
+desktop-file-validate %{buildroot}/%{_datadir}/applications/rog-control-center.desktop

 %files
 %license LICENSE
@@ -164,6 +118,8 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/rog-control-center.de
 %{_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
@@ -178,7 +134,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/rog-control-center.de
 %{_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
--- a/rog-anime/src/data.rs
+++ b/rog-anime/src/data.rs
@@ -63,8 +63,6 @@ pub enum AnimeType {
    GA401,
    GA402,
    GU604,
-    G635L,
-    G835L,
    #[default]
    Unsupported,
 }
@@ -73,21 +71,12 @@ impl FromStr for AnimeType {
    type Err = AnimeError;

    fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {
-        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)
+        Ok(match s {
+            "ga401" | "GA401" => Self::GA401,
+            "ga402" | "GA402" => Self::GA402,
+            "gu604" | "GU604" => Self::GU604,
+            _ => Self::Unsupported,
+        })
    }
 }

@@ -100,8 +89,6 @@ 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
        }
@@ -111,7 +98,6 @@ impl AnimeType {
    pub fn width(&self) -> usize {
        match self {
            AnimeType::GU604 => 70,
-            AnimeType::G835L => 74,
            _ => 74,
        }
    }
@@ -121,7 +107,6 @@ impl AnimeType {
        match self {
            AnimeType::GA401 => 36,
            AnimeType::GU604 => 43,
-            AnimeType::G835L => 39,
            _ => 39,
        }
    }
@@ -131,7 +116,6 @@ impl AnimeType {
        match self {
            AnimeType::GA401 => PANE_LEN * 2,
            AnimeType::GU604 => PANE_LEN * 3,
-            AnimeType::G835L => PANE_LEN * 3,
            _ => PANE_LEN * 3,
        }
    }
@@ -196,13 +180,7 @@ impl TryFrom<AnimeDataBuffer> for AnimePacketType {

        let mut buffers = match anime.anime {
            AnimeType::GA401 => vec![[0; 640]; 2],
-            AnimeType::GA402
-            | AnimeType::GU604
-            | AnimeType::G635L
-            | AnimeType::G835L
-            | AnimeType::Unsupported => {
-                vec![[0; 640]; 3]
-            }
+            AnimeType::GA402 | AnimeType::GU604 | AnimeType::Unsupported => vec![[0; 640]; 3],
        };

        for (idx, chunk) in anime.data.as_slice().chunks(PANE_LEN).enumerate() {
@@ -213,11 +191,7 @@ impl TryFrom<AnimeDataBuffer> for AnimePacketType {

        if matches!(
            anime.anime,
-            AnimeType::GA402
-                | AnimeType::GU604
-                | AnimeType::G635L
-                | AnimeType::G835L
-                | AnimeType::Unsupported
+            AnimeType::GA402 | AnimeType::GU604 | AnimeType::Unsupported
        ) {
            buffers[2][..7].copy_from_slice(&USB_PREFIX3);
        }
--- a/rog-anime/src/usb.rs
+++ b/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.to_uppercase();
+    let board_name = dmi.board_name;

    if board_name.contains("GA401I") || board_name.contains("GA401Q") {
        AnimeType::GA401
@@ -251,10 +251,6 @@ 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
    }
--- a/rog-aura/data/aura_support.ron
+++ b/rog-aura/data/aura_support.ron
@@ -38,34 +38,7 @@
    (
        device_name: "FA617NS",
        product_id: "",
-        layout_name: "fa507",
-        basic_modes: [Static, Breathe, Pulse],
-        basic_zones: [],
-        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",
+        layout_name: "fx505d",
        basic_modes: [Static, Breathe, Pulse],
        basic_zones: [],
        advanced_type: r#None,
@@ -125,15 +98,6 @@
        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],
-    ),
    (
        device_name: "FX617X",
        product_id: "",
@@ -278,15 +242,6 @@
        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: "",
@@ -314,15 +269,6 @@
        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: "",
@@ -341,15 +287,6 @@
        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: "",
@@ -548,15 +485,6 @@
        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: "",
@@ -566,15 +494,6 @@
        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: "",
@@ -989,4 +908,4 @@
        advanced_type: r#None,
        power_zones: [Ally],
    ),
-])
+])
--- a/rog-aura/data/layouts/g635l-per-key_US.ron
+++ b/rog-aura/data/layouts/g635l-per-key_US.ron
@@ -1,375 +0,0 @@
-(
-    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"),
-            ],
-        ),
-    ],
-)
--- a/rog-aura/src/animation.rs
+++ b/rog-aura/src/animation.rs
@@ -1,141 +0,0 @@
-//! Software-controlled LED animation modes for the asusd daemon.
-//!
-//! These modes run as background tasks in asusd and continuously update
-//! the LED colors without requiring the GUI to be open.
-
-use serde::{Deserialize, Serialize};
-
-use crate::Colour;
-
-/// Animation modes that can be run by the asusd daemon.
-///
-/// Note: This type is serialized as JSON for DBus transport since zvariant
-/// doesn't support enums with heterogeneous variants.
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, Default)]
-pub enum AnimationMode {
-    /// No animation running
-    #[default]
-    None,
-    /// Rainbow effect - cycles through HSV hue (0-360°)
-    Rainbow {
-        /// Update interval in milliseconds (lower = faster)
-        speed_ms: u32,
-    },
-    /// Color cycle - transitions between a list of colors
-    ColorCycle {
-        /// Update interval in milliseconds
-        speed_ms: u32,
-        /// Colors to cycle through
-        colors: Vec<Colour>,
-    },
-    /// Breathe effect - fades between two colors through black
-    Breathe {
-        /// Update interval in milliseconds
-        speed_ms: u32,
-        /// Primary color
-        color1: Colour,
-        /// Secondary color (fades to this, then back)
-        color2: Colour,
-    },
-    /// Pulse effect - brightness animation (dims and brightens)
-    Pulse {
-        /// Update interval in milliseconds
-        speed_ms: u32,
-        /// Base color to pulse
-        color: Colour,
-        /// Minimum brightness factor (0.0 - 1.0)
-        min_brightness: f32,
-        /// Maximum brightness factor (0.0 - 1.0)
-        max_brightness: f32,
-    },
-}
-
-
-impl AnimationMode {
-    /// Returns true if this is an active animation mode
-    pub fn is_active(&self) -> bool {
-        !matches!(self, Self::None)
-    }
-
-    /// Get the speed/interval in milliseconds
-    pub fn speed_ms(&self) -> u32 {
-        match self {
-            Self::None => 0,
-            Self::Rainbow { speed_ms } => *speed_ms,
-            Self::ColorCycle { speed_ms, .. } => *speed_ms,
-            Self::Breathe { speed_ms, .. } => *speed_ms,
-            Self::Pulse { speed_ms, .. } => *speed_ms,
-        }
-    }
-}
-
-/// Apply a brightness factor to a color by scaling RGB values.
-/// This allows simulating granular brightness on hardware with limited levels.
-pub fn apply_brightness(color: Colour, factor: f32) -> Colour {
-    let factor = factor.clamp(0.0, 1.0);
-    Colour {
-        r: (color.r as f32 * factor) as u8,
-        g: (color.g as f32 * factor) as u8,
-        b: (color.b as f32 * factor) as u8,
-    }
-}
-
-/// Convert HSV to RGB color.
-/// Hue: 0-360, Saturation: 0.0-1.0, Value: 0.0-1.0
-pub fn hsv_to_rgb(h: f32, s: f32, v: f32) -> Colour {
-    let c = v * s;
-    let h_prime = h / 60.0;
-    let x = c * (1.0 - ((h_prime % 2.0) - 1.0).abs());
-    let m = v - c;
-
-    let (r1, g1, b1) = 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),
-    };
-
-    Colour {
-        r: ((r1 + m) * 255.0) as u8,
-        g: ((g1 + m) * 255.0) as u8,
-        b: ((b1 + m) * 255.0) as u8,
-    }
-}
-
-/// Linear interpolation between two colors
-pub fn lerp_colour(c1: &Colour, c2: &Colour, t: f32) -> Colour {
-    let t = t.clamp(0.0, 1.0);
-    Colour {
-        r: (c1.r as f32 + (c2.r as f32 - c1.r as f32) * t) as u8,
-        g: (c1.g as f32 + (c2.g as f32 - c1.g as f32) * t) as u8,
-        b: (c1.b as f32 + (c2.b as f32 - c1.b as f32) * t) as u8,
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_hsv_to_rgb_red() {
-        let c = hsv_to_rgb(0.0, 1.0, 1.0);
-        assert_eq!(c.r, 255);
-        assert_eq!(c.g, 0);
-        assert_eq!(c.b, 0);
-    }
-
-    #[test]
-    fn test_brightness() {
-        let c = Colour {
-            r: 100,
-            g: 200,
-            b: 50,
-        };
-        let dim = apply_brightness(c, 0.5);
-        assert_eq!(dim.r, 50);
-        assert_eq!(dim.g, 100);
-        assert_eq!(dim.b, 25);
-    }
-}
--- a/rog-aura/src/aura_detection.rs
+++ b/rog-aura/src/aura_detection.rs
@@ -164,26 +164,29 @@ 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());
+        // If the system-wide support files were not available (e.g. running
+        // tests in CI or a development environment) try to load the
+        // bundled test data shipped with the crate under `data/aura_support.ron`.
+        // This allows unit tests to run without requiring files to be installed
+        // to `/usr/share/asusd`.
+        let mut bundled = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR"));
+        bundled.push("data/aura_support.ron");
+        if let Ok(buf) = std::fs::read_to_string(&bundled) {
+            if let Ok(mut tmp) = ron::from_str::<LedSupportFile>(&buf) {
+                data.0.append(&mut tmp.0);
                data.0.sort_by(|a, b| a.device_name.cmp(&b.device_name));
-                info!("Loaded bundled LED support data (embedded)");
+                info!("Loaded bundled LED support data from {}", bundled.display());
                return Some(data);
            } else {
-                warn!("Could not parse embedded bundled data file");
+                warn!(
+                    "Bundled aura_support.ron present but failed to parse: {}",
+                    bundled.display()
+                );
            }
+        } else {
+            warn!("Does {} exist?", ASUS_LED_MODE_USER_CONF);
        }

-        warn!("Does {} exist?", ASUS_LED_MODE_USER_CONF);
        None
    }
 }
--- a/rog-aura/src/builtin_modes.rs
+++ b/rog-aura/src/builtin_modes.rs
@@ -359,12 +359,6 @@ 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",
--- a/rog-aura/src/lib.rs
+++ b/rog-aura/src/lib.rs
@@ -16,10 +16,6 @@ pub mod effects;
 mod builtin_modes;
 pub use builtin_modes::*;

-/// Software-controlled animation modes for daemon
-pub mod animation;
-pub use animation::{apply_brightness, hsv_to_rgb, lerp_colour, AnimationMode};
-
 /// Helper for detecting what is available
 pub mod aura_detection;
 pub mod error;
--- a/rog-control-center/Cargo.toml
+++ b/rog-control-center/Cargo.toml
@@ -14,7 +14,6 @@ mocking = []
 x11 = ["slint/backend-winit-x11"]
 # 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 }
@@ -29,7 +28,6 @@ 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" }

@@ -40,14 +38,12 @@ 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
 futures-util.workspace = true

 versions.workspace = true
-serde_json = "1.0.149"

 [dependencies.slint]
 git = "https://github.com/slint-ui/slint.git"
--- a/rog-control-center/src/cli_options.rs
+++ b/rog-control-center/src/cli_options.rs
@@ -24,4 +24,6 @@ pub struct CliStart {
                that might match your laptop"
    )]
    pub layout_viewing: bool,
+    #[options(help = "start in tray mode - main window hidden")]
+    pub tray_mode: bool,
 }
--- a/rog-control-center/src/main.rs
+++ b/rog-control-center/src/main.rs
@@ -11,34 +11,24 @@ 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, TrayEvent, TrayStats};
+use rog_control_center::tray::init_tray;
 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, TrayTooltip};
+use rog_control_center::{print_versions, MainWindow};
+use tokio::runtime::Runtime;

 #[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()
-        .filter_level(LevelFilter::Info)
-        .parse_default_env()
-        .target(env_logger::Target::Stderr)
+        .target(env_logger::Target::Stdout)
        .format_timestamp(None)
        .init();

@@ -112,6 +102,7 @@ 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();

@@ -142,18 +133,6 @@ 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;
@@ -162,41 +141,34 @@ async fn main() -> Result<()> {
        config.start_fullscreen = true;
    }

+    if cli_parsed.tray_mode {
+        config.enable_tray_icon = true;
+        config.run_in_background = true;
+        config.startup_in_background = true;
+    }
+
    config.write();

    let enable_tray_icon = config.enable_tray_icon;
    let startup_in_background = config.startup_in_background;
    let config = Arc::new(Mutex::new(config));

+    // shared weak handle to the UI so other threads can request UI updates
+    let ui_handle: Arc<Mutex<Option<slint::Weak<MainWindow>>>> = Arc::new(Mutex::new(None));
+
    start_notifications(config.clone(), &rt)?;

-    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());
-
    if enable_tray_icon {
-        init_tray(supported_properties, config.clone(), tray_tx, stats_rx);
+        init_tray(supported_properties, config.clone());
    }
+
+    thread_local! { pub static UI: std::cell::RefCell<Option<MainWindow>> = Default::default()};
    // 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() {
@@ -208,21 +180,14 @@ async fn main() -> Result<()> {
        slint::init_translations!(concat!(env!("CARGO_MANIFEST_DIR"), "/translations/"));
    }

+    let config_for_ui = config.clone();
+    let ui_handle_for_thread = ui_handle.clone();
    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(), stats_tx.clone());
+                let config_copy_2 = config_for_ui.clone();
+                let newui = setup_window(config_for_ui.clone());
                newui.window().on_close_requested(move || {
                    exit(0);
                });
@@ -245,89 +210,153 @@ async fn main() -> Result<()> {
                        }
                    })
                    .ok();
-
-                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;
+            } 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;
                }

-                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
-                            });
+                // 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 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();
+                    let config_copy = config_for_ui.clone();
+                    let app_state_copy = app_state.clone();
+                    let ui_handle_for_ui = ui_handle_for_thread.clone();
+                    slint::invoke_from_event_loop(move || {
+                        let ui_handle_for_ui = ui_handle_for_ui.clone();
+                        UI.with(|ui| {
+                            let app_state_copy = app_state_copy.clone();
+                            let mut ui = ui.borrow_mut();
+                            if let Some(ui) = ui.as_mut() {
+                                // store weak handle so other threads can update UI globals
+                                if let Ok(mut h) = ui_handle_for_ui.lock() {
+                                    *h = Some(ui.as_weak());
+                                }
+                                ui.window().show().unwrap();
+                                ui.window().on_close_requested(move || {
+                                    if let Ok(mut app_state) = app_state_copy.lock() {
+                                        *app_state = AppState::MainWindowClosed;
                                    }
-                                })
-                                .ok();
-                            ui.replace(newui);
+                                    slint::CloseRequestResponse::HideWindow
+                                });
+                            } else {
+                                let config_copy_2 = config_copy.clone();
+                                let newui = setup_window(config_copy);
+                                // store weak handle for the newly created UI
+                                if let Ok(mut h) = ui_handle_for_ui.lock() {
+                                    *h = Some(newui.as_weak());
+                                }
+                                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(cfg) = config_for_ui.lock() {
+                        if !cfg.run_in_background {
+                            slint::quit_event_loop().unwrap();
+                            exit(0);
                        }
-                    });
-                })
-                .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);
                    }
                }
            }
        }
    });

+    // start config watcher to pick up external edits
+    spawn_config_watcher(config.clone(), ui_handle.clone());
+
    slint::run_event_loop_until_quit().unwrap();
    rt.shutdown_background();
    Ok(())
 }

+// Spawn a watcher thread that polls the config file and reloads it when modified.
+// This keeps the running rogcc instance in sync with manual edits to the config file.
+fn spawn_config_watcher(
+    config: Arc<Mutex<Config>>,
+    ui_handle: Arc<Mutex<Option<slint::Weak<MainWindow>>>>,
+) {
+    std::thread::spawn(move || {
+        use std::time::SystemTime;
+        let cfg_path = Config::config_dir().join(Config::new().file_name());
+        let mut last_mtime: Option<SystemTime> = None;
+        loop {
+            if let Ok(meta) = std::fs::metadata(&cfg_path) {
+                if let Ok(m) = meta.modified() {
+                    if last_mtime.is_none() {
+                        last_mtime = Some(m);
+                    } else if last_mtime.is_some_and(|t| t < m) {
+                        // file changed, reload
+                        last_mtime = Some(m);
+                        let new_cfg = Config::new().load();
+                        if let Ok(mut lock) = config.lock() {
+                            *lock = new_cfg.clone();
+                        }
+
+                        // Update UI app settings globals if UI is present
+                        if let Ok(maybe_weak) = ui_handle.lock() {
+                            if let Some(weak) = maybe_weak.clone() {
+                                let config_for_ui = config.clone();
+                                weak.upgrade_in_event_loop(move |w| {
+                                    if let Ok(lock) = config_for_ui.lock() {
+                                        let cfg = lock.clone();
+                                        w.global::<rog_control_center::AppSettingsPageData>()
+                                            .set_run_in_background(cfg.run_in_background);
+                                        w.global::<rog_control_center::AppSettingsPageData>()
+                                            .set_startup_in_background(cfg.startup_in_background);
+                                        w.global::<rog_control_center::AppSettingsPageData>()
+                                            .set_enable_tray_icon(cfg.enable_tray_icon);
+                                        w.global::<rog_control_center::AppSettingsPageData>()
+                                            .set_enable_dgpu_notifications(
+                                                cfg.notifications.enabled,
+                                            );
+                                    }
+                                })
+                                .ok();
+                            }
+                        }
+                    }
+                }
+            }
+            std::thread::sleep(std::time::Duration::from_secs(2));
+        }
+    });
+}
+
 fn do_cli_help(parsed: &CliStart) -> bool {
    if parsed.help {
        println!("{}", CliStart::usage());
--- a/rog-control-center/src/mocking.rs
+++ b/rog-control-center/src/mocking.rs
@@ -8,6 +8,7 @@ use rog_platform::supported::{
    PlatformProfileFunctions, RogBiosSupportedFunctions, SupportedFunctions,
 };
 use rog_profiles::fan_curve_set::{CurveData, FanCurveSet};
+use supergfxctl::pci_device::{GfxMode, GfxPower};

 use crate::error::Result;

@@ -99,6 +100,31 @@ impl Bios {
    pub fn set_panel_od(&self, _b: bool) -> Result<()> {
        Ok(())
    }
+
+    // Mock NV/dGPU tunables
+    pub fn nv_dynamic_boost(&self) -> Result<i16> {
+        Ok(0)
+    }
+
+    pub fn set_nv_dynamic_boost(&self, _v: i16) -> Result<()> {
+        Ok(())
+    }
+
+    pub fn nv_temp_target(&self) -> Result<i16> {
+        Ok(0)
+    }
+
+    pub fn set_nv_temp_target(&self, _v: i16) -> Result<()> {
+        Ok(())
+    }
+
+    pub fn nv_tgp(&self) -> Result<i16> {
+        Ok(0)
+    }
+
+    pub fn set_nv_tgp(&self, _v: i16) -> Result<()> {
+        Ok(())
+    }
 }

 pub struct Profile;
--- a/rog-control-center/src/notify.rs
+++ b/rog-control-center/src/notify.rs
@@ -1,4 +1,4 @@
-//! update_and_notify is responsible for both notifications and updating
+//! `update_and_notify` is responsible for both notifications *and* updating
 //! stored statuses about the system state. This is done through either direct,
 //! intoify, zbus notifications or similar methods.
 //!
@@ -9,12 +9,15 @@ 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};
-use rog_dbus::zbus_platform::PlatformProxy;
-use rog_platform::platform::PlatformProfile;
+use notify_rust::{Hint, Notification, Timeout, Urgency};
+use rog_platform::platform::GpuMode;
 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 tokio::runtime::Runtime;
 use tokio::task::JoinHandle;

@@ -27,67 +30,64 @@ const NOTIF_HEADER: &str = "ROG Control";
 #[serde(default)]
 pub struct EnabledNotifications {
    pub enabled: bool,
-    pub receive_notify_platform_profile: bool,
+    pub receive_notify_gfx: bool,
+    pub receive_notify_gfx_status: bool,
 }

 impl Default for EnabledNotifications {
    fn default() -> Self {
        Self {
            enabled: true,
-            receive_notify_platform_profile: true,
+            receive_notify_gfx: true,
+            receive_notify_gfx_status: true,
        }
    }
 }

-/// 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}");
+fn start_dpu_status_mon(config: Arc<Mutex<Config>>) {
+    use supergfxctl::pci_device::Device;
+    let dev = Device::find().unwrap_or_default();
+    let mut found_dgpu = false; // just for logging
+    for dev in dev {
+        if dev.is_dgpu() {
+            info!(
+                "Found dGPU: {}, starting status notifications",
+                dev.pci_id()
+            );
+            let enabled_notifications_copy = config.clone();
+            // Plain old thread is perfectly fine since most of this is potentially blocking
+            std::thread::spawn(move || {
+                let mut last_status = GfxPower::Unknown;
+                loop {
+                    std::thread::sleep(Duration::from_millis(1500));
+                    if let Ok(status) = dev.get_runtime_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()
+                                .unwrap()
+                                .on_close(|_| ());
+                            debug!("dGPU status changed: {:?}", &status);
+                        }
+                        last_status = status;
                    }
-                    last_profile = Some(new_profile);
                }
-            }
+            });
+            found_dgpu = true;
+            break;
        }
-    });
+    }
+    if !found_dgpu {
+        warn!("Did not find a dGPU on this system, dGPU status won't be avilable");
+    }
 }

 pub fn start_notifications(
@@ -145,12 +145,139 @@ pub fn start_notifications(
        }
    });

-    info!("Starting platform profile change monitor");
-    start_platform_profile_mon(config.clone(), rt);
+    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());
+    };
+
+    // GPU MUX Mode notif
+    // TODO: need to get armoury attrs and iter to find
+    // let enabled_notifications_copy = config.clone();
+    // tokio::spawn(async move {
+    //     let conn = zbus::Connection::system().await.map_err(|e| {
+    //         error!("zbus signal: receive_notify_gpu_mux_mode: {e}");
+    //         e
+    //     })?;
+    //     let proxy = PlatformProxy::new(&conn).await.map_err(|e| {
+    //         error!("zbus signal: receive_notify_gpu_mux_mode: {e}");
+    //         e
+    //     })?;
+
+    //     let mut actual_mux_mode = GpuMode::Error;
+    //     if let Ok(mode) = proxy.gpu_mux_mode().await {
+    //         actual_mux_mode = GpuMode::from(mode);
+    //     }
+
+    //     info!("Started zbus signal thread: receive_notify_gpu_mux_mode");
+    //     while let Some(e) =
+    // proxy.receive_gpu_mux_mode_changed().await.next().await {         if let
+    // Ok(config) = enabled_notifications_copy.lock() {             if
+    // !config.notifications.enabled || !config.notifications.receive_notify_gfx {
+    //                 continue;
+    //             }
+    //         }
+    //         if let Ok(out) = e.get().await {
+    //             let mode = GpuMode::from(out);
+    //             if mode == actual_mux_mode {
+    //                 continue;
+    //             }
+    //             do_mux_notification("Reboot required. BIOS GPU MUX mode set to",
+    // &mode).ok();         }
+    //     }
+    //     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 enabled_notifications_copy_action = enabled_notifications_copy.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() {
+                    // Respect user notification settings for gpu actions
+                    if let Ok(cfg) = enabled_notifications_copy_action.lock() {
+                        if !cfg.notifications.enabled || !cfg.notifications.receive_notify_gfx {
+                            continue;
+                        }
+                    }
+
+                    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,
@@ -164,27 +291,109 @@ where
    notif
 }

-/// 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());
-
-    // 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
+fn do_gpu_status_notif(message: &str, data: &GfxPower) -> Notification {
+    let mut notif = base_notification(message, &<&str>::from(data).to_owned());
+    let icon = match data {
+        GfxPower::Suspended => "asus_notif_blue",
+        GfxPower::Off => "asus_notif_green",
+        GfxPower::AsusDisabled => "asus_notif_white",
+        GfxPower::AsusMuxDiscreet | GfxPower::Active => "asus_notif_red",
+        GfxPower::Unknown => "gpu-integrated",
    };
    notif.icon(icon);
    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(());
+    }
+
+    let mut notif = Notification::new();
+    notif
+        .appname(NOTIF_HEADER)
+        .summary(&format!("Changing to {mode}. {message}"))
+        //.hint(Hint::Resident(true))
+        .hint(Hint::Category("device".into()))
+        .urgency(Urgency::Critical)
+        // For user-action notifications keep them visible if they require interaction
+        // but for non-interactive actions we prefer they auto-hide like other notifs.
+        .timeout(Timeout::Milliseconds(6000))
+        .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(())
+}
--- a/rog-control-center/src/tray.rs
+++ b/rog-control-center/src/tray.rs
@@ -6,9 +6,12 @@ use std::path::{Path, PathBuf};
 use std::sync::{Arc, Mutex, OnceLock};
 use std::time::Duration;

-use ksni::{Icon, TrayMethods};
-use log::info;
+use ksni::{Handle, Icon, TrayMethods};
+use log::{info, warn};
 use rog_platform::platform::Properties;
+use supergfxctl::pci_device::{Device, GfxMode, GfxPower};
+use supergfxctl::zbus_proxy::DaemonProxy as GfxProxy;
+use versions::Versioning;

 use crate::config::Config;
 use crate::zbus_proxies::{AppState, ROGCCZbusProxyBlocking};
@@ -17,8 +20,11 @@ const TRAY_LABEL: &str = "ROG Control Center";
 const TRAY_ICON_PATH: &str = "/usr/share/icons/hicolor/512x512/apps/";

 struct Icons {
-    #[allow(dead_code)]
+    rog_blue: Icon,
    rog_red: Icon,
+    rog_green: Icon,
+    rog_white: Icon,
+    gpu_integrated: Icon,
 }

 static ICONS: OnceLock<Icons> = OnceLock::new();
@@ -53,29 +59,6 @@ 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 {
@@ -95,26 +78,6 @@ 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![
@@ -139,13 +102,60 @@ impl ksni::Tray for AsusTray {
    }
 }

-/// The tray is controlled somewhat by `Arc<Mutex<SystemState>>`
-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>,
+async fn set_tray_icon_and_tip(
+    mode: GfxMode,
+    power: GfxPower,
+    tray: &mut Handle<AsusTray>,
+    supergfx_active: bool,
 ) {
+    if let Some(icons) = ICONS.get() {
+        let icon = match power {
+            GfxPower::Suspended => icons.rog_blue.clone(),
+            GfxPower::Off => {
+                if mode == GfxMode::Vfio {
+                    icons.rog_red.clone()
+                } else {
+                    icons.rog_green.clone()
+                }
+            }
+            GfxPower::AsusDisabled => icons.rog_white.clone(),
+            GfxPower::AsusMuxDiscreet | GfxPower::Active => icons.rog_red.clone(),
+            GfxPower::Unknown => {
+                if supergfx_active {
+                    icons.gpu_integrated.clone()
+                } else {
+                    icons.rog_red.clone()
+                }
+            }
+        };
+
+        tray.update(|tray: &mut AsusTray| {
+            tray.current_icon = icon;
+            tray.current_title = format!(
+                "ROG: gpu mode = {mode:?}, gpu power =
+            {power:?}"
+            );
+        })
+        .await;
+    }
+}
+
+fn find_dgpu() -> Option<Device> {
+    use supergfxctl::pci_device::Device;
+    let dev = Device::find().unwrap_or_default();
+    for dev in dev {
+        if dev.is_dgpu() {
+            info!("Found dGPU: {}", dev.pci_id());
+            // Plain old thread is perfectly fine since most of this is potentially blocking
+            return Some(dev);
+        }
+    }
+    warn!("Did not find a dGPU on this system, dGPU status won't be avilable");
+    None
+}
+
+/// The tray is controlled somewhat by `Arc<Mutex<SystemState>>`
+pub fn init_tray(_supported_properties: Vec<Properties>, config: Arc<Mutex<Config>>) {
    tokio::spawn(async move {
        let user_con = zbus::blocking::Connection::session().unwrap();
        let proxy = ROGCCZbusProxyBlocking::new(&user_con).unwrap();
@@ -156,19 +166,11 @@ pub fn init_tray(
            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 tray;
-        match tray_init.disable_dbus_name(true).spawn().await {
+        let mut tray;
+        match tray_init.spawn_without_dbus_name().await {
            Ok(t) => tray = t,
            Err(e) => {
                log::error!(
@@ -179,32 +181,72 @@ pub fn init_tray(
        }

        info!("Tray started");
+        let rog_blue = read_icon(&PathBuf::from("asus_notif_blue.png"));
+        let rog_green = read_icon(&PathBuf::from("asus_notif_green.png"));
+        let rog_white = read_icon(&PathBuf::from("asus_notif_white.png"));
+        let gpu_integrated = read_icon(&PathBuf::from("rog-control-center.png"));
        ICONS.get_or_init(|| Icons {
+            rog_blue,
            rog_red: rog_red.clone(),
+            rog_green,
+            rog_white,
+            gpu_integrated,
        });

-        info!("Started ROGTray");
-
-        loop {
-            tokio::select! {
-                _ = stats_rx.changed() => {
-                    let stats = stats_rx.borrow().clone();
-                    let tray_update = tray.clone();
-                    tokio::spawn(async move {
-                        tray_update.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;
-                    });
+        let mut has_supergfx = false;
+        let conn = zbus::Connection::system().await.unwrap();
+        if let Ok(gfx_proxy) = GfxProxy::new(&conn).await {
+            match gfx_proxy.mode().await {
+                Ok(_) => {
+                    has_supergfx = true;
+                    if let Ok(version) = gfx_proxy.version().await {
+                        if let Some(version) = Versioning::new(&version) {
+                            let curr_gfx = Versioning::new("5.2.0").unwrap();
+                            warn!("supergfxd version = {version}");
+                            if version < curr_gfx {
+                                // Don't allow mode changing if too old a version
+                                warn!("supergfxd found but is too old to use");
+                                has_supergfx = false;
+                            }
+                        }
+                    }
                }
-                _ = tokio::time::sleep(Duration::from_millis(1000)) => {
-                    if let Ok(lock) = config.try_lock() {
-                        if !lock.enable_tray_icon {
-                            return;
+                Err(e) => match e {
+                    zbus::Error::MethodError(_, _, message) => {
+                        warn!(
+                            "Couldn't get mode from supergfxd: {message:?}, the supergfxd service \
+                             may not be running or installed"
+                        )
+                    }
+                    _ => warn!("Couldn't get mode from supergfxd: {e:?}"),
+                },
+            }
+
+            info!("Started ROGTray");
+            let mut last_power = GfxPower::Unknown;
+            let dev = find_dgpu();
+            loop {
+                tokio::time::sleep(Duration::from_millis(1000)).await;
+                if let Ok(lock) = config.try_lock() {
+                    if !lock.enable_tray_icon {
+                        return;
+                    }
+                }
+                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;
                        }
                    }
                }
--- a/rog-control-center/src/ui/mod.rs
+++ b/rog-control-center/src/ui/mod.rs
@@ -1,10 +1,6 @@
 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_system;

 use std::sync::{Arc, Mutex};
@@ -15,13 +11,9 @@ 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_system::{setup_system_page, setup_system_page_callbacks};
 use crate::{AppSettingsPageData, MainWindow};

@@ -90,10 +82,7 @@ pub fn show_toast(
    };
 }

-pub fn setup_window(
-    config: Arc<Mutex<Config>>,
-    stats_tx: tokio::sync::watch::Sender<TrayStats>,
-) -> MainWindow {
+pub fn setup_window(config: Arc<Mutex<Config>>) -> MainWindow {
    slint::set_xdg_app_id("rog-control-center")
        .map_err(|e| warn!("Couldn't set application ID: {e:?}"))
        .ok();
@@ -112,14 +101,9 @@ pub fn setup_window(
            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()),
-            false,
-            // Screenpad check (Backlight interface)
-            available.contains(&"xyz.ljones.Backlight".to_string()),
            available.contains(&"xyz.ljones.FanCurves".to_string()),
            true,
            true,
-            true,
        ]
        .into(),
    );
@@ -128,33 +112,6 @@ pub fn setup_window(
        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());
@@ -166,22 +123,10 @@ pub fn setup_window(
    if available.contains(&"xyz.ljones.Anime".to_string()) {
        setup_anime_page(&ui, config.clone());
    }
-    if available.contains(&"xyz.ljones.Slash".to_string()) {
-        setup_slash(&ui, config.clone());
-    }
-
-    // We didn't capture the boolean above. Let's just run it, it handles its own availability check internally via async proxy creation.
-
-    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_fan_curve_page(&ui, config);
    }

-    setup_status(&ui, config, stats_tx);
-
    ui
 }

@@ -208,31 +153,18 @@ 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_notifications_enabled(move |enable| {
+    global.on_set_enable_dgpu_notifications(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_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_notifications_enabled(lock.notifications.enabled);
-        global.set_notify_platform_profile(lock.notifications.receive_notify_platform_profile);
+        global.set_enable_dgpu_notifications(lock.notifications.enabled);
    }
 }
--- a/rog-control-center/src/ui/setup_aura.rs
+++ b/rog-control-center/src/ui/setup_aura.rs
@@ -1,9 +1,8 @@
 use std::sync::{Arc, Mutex};

 use log::{debug, error, info};
-use rog_aura::animation::AnimationMode;
 use rog_aura::keyboard::LaptopAuraPower;
-use rog_aura::{AuraDeviceType, Colour, PowerZones};
+use rog_aura::{AuraDeviceType, PowerZones};
 use rog_dbus::zbus_aura::AuraProxy;
 use slint::{ComponentHandle, Model, RgbaColor, SharedString};

@@ -126,13 +125,6 @@ pub fn setup_aura_page(ui: &MainWindow, _states: Arc<Mutex<Config>>) {

        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());
-
-            // Clone proxy for callbacks
-            let aura_for_animation = aura.clone();
-
            handle
                .upgrade_in_event_loop(move |handle| {
                    let m: Vec<i32> = modes.iter().map(|n| (*n).into()).collect();
@@ -151,79 +143,6 @@ 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);
-
-                        // Connect mode callback - uses DBus to start animation in daemon
-                        let aura_mode = aura_for_animation.clone();
-                        let handle_weak = handle.as_weak();
-                        handle
-                            .global::<AuraPageData>()
-                            .on_cb_soft_animation_mode(move |mode| {
-                                let aura_inner = aura_mode.clone();
-                                let handle = match handle_weak.upgrade() {
-                                    Some(h) => h,
-                                    None => return,
-                                };
-
-                                let data = handle.global::<AuraPageData>().get_led_mode_data();
-                                let c1 = data.colour1;
-                                let c2 = data.colour2;
-
-                                let c1_rog = Colour {
-                                    r: c1.red(),
-                                    g: c1.green(),
-                                    b: c1.blue(),
-                                };
-                                let c2_rog = Colour {
-                                    r: c2.red(),
-                                    g: c2.green(),
-                                    b: c2.blue(),
-                                };
-
-                                let anim_mode = match mode {
-                                    1 => AnimationMode::Rainbow { speed_ms: 100 },
-                                    2 => AnimationMode::ColorCycle {
-                                        speed_ms: 200,
-                                        colors: vec![
-                                            Colour { r: 255, g: 0, b: 0 },
-                                            Colour { r: 0, g: 255, b: 0 },
-                                            Colour { r: 0, g: 0, b: 255 },
-                                        ],
-                                    },
-                                    3 => AnimationMode::Breathe {
-                                        speed_ms: 100,
-                                        color1: c1_rog,
-                                        color2: c2_rog,
-                                    },
-                                    4 => AnimationMode::Pulse {
-                                        speed_ms: 50,
-                                        color: c1_rog,
-                                        min_brightness: 0.2,
-                                        max_brightness: 1.0,
-                                    },
-                                    _ => AnimationMode::None,
-                                };
-                                tokio::spawn(async move {
-                                    let json =
-                                        serde_json::to_string(&anim_mode).unwrap_or_default();
-                                    if anim_mode == AnimationMode::None {
-                                        if let Err(e) = aura_inner.stop_animation().await {
-                                            error!("Failed to stop animation: {e}");
-                                        }
-                                    } else {
-                                        if let Err(e) = aura_inner.start_animation(json).await {
-                                            error!("Failed to start animation: {e}");
-                                        }
-                                    }
-                                });
-                            });
-                    }
                })
                .map_err(|e| error!("{e:}"))
                .ok();
@@ -246,79 +165,12 @@ pub fn setup_aura_page(ui: &MainWindow, _states: Arc<Mutex<Config>>) {
                    "Setting keyboard LEDmode failed"
                );

-                let proxy_data = proxy_copy.clone();
-                let aura_soft = proxy_copy.clone();
-                let handle_weak = handle.as_weak();
-
-                handle
-                    .global::<AuraPageData>()
-                    .on_cb_led_mode_data(move |data| {
-                        // 1. Update hardware mode
-                        let p = proxy_data.clone();
-                        let d = data.clone();
-                        tokio::spawn(async move {
-                            if let Err(e) = p.set_led_mode_data(d.into()).await {
-                                error!("Setting keyboard LED mode failed: {e}");
-                            } else {
-                                debug!("Keyboard LED mode set");
-                            }
-                        });
-
-                        // 2. Update software animation if active
-                        let handle = match handle_weak.upgrade() {
-                            Some(h) => h,
-                            None => return,
-                        };
-
-                        let soft_mode = handle.global::<AuraPageData>().get_soft_animation_mode();
-                        if soft_mode != 0 {
-                            let c1 = data.colour1;
-                            let c2 = data.colour2;
-                            let c1_rog = Colour {
-                                r: c1.red(),
-                                g: c1.green(),
-                                b: c1.blue(),
-                            };
-                            let c2_rog = Colour {
-                                r: c2.red(),
-                                g: c2.green(),
-                                b: c2.blue(),
-                            };
-
-                            let anim_mode = match soft_mode {
-                                1 => AnimationMode::Rainbow { speed_ms: 100 },
-                                2 => AnimationMode::ColorCycle {
-                                    speed_ms: 200,
-                                    colors: vec![
-                                        Colour { r: 255, g: 0, b: 0 },
-                                        Colour { r: 0, g: 255, b: 0 },
-                                        Colour { r: 0, g: 0, b: 255 },
-                                    ],
-                                },
-                                3 => AnimationMode::Breathe {
-                                    speed_ms: 100,
-                                    color1: c1_rog,
-                                    color2: c2_rog,
-                                },
-                                4 => AnimationMode::Pulse {
-                                    speed_ms: 50,
-                                    color: c1_rog,
-                                    min_brightness: 0.2,
-                                    max_brightness: 1.0,
-                                },
-                                _ => AnimationMode::None,
-                            };
-
-                            let aura_s = aura_soft.clone();
-                            tokio::spawn(async move {
-                                if let Ok(json) = serde_json::to_string(&anim_mode) {
-                                    if let Err(e) = aura_s.start_animation(json).await {
-                                        error!("Failed to update software animation: {e}");
-                                    }
-                                }
-                            });
-                        }
-                    });
+                set_ui_callbacks!(handle,
+                    AuraPageData(.into()),
+                    proxy_copy.led_mode_data(.into()),
+                    "Keyboard LED mode set to {:?}",
+                    "Setting keyboard LED mode failed"
+                );

                // set_ui_callbacks!(handle,
                //     AuraPageData(.clone().into()),
--- a/rog-control-center/src/ui/setup_fan_curve_custom.rs
+++ b/rog-control-center/src/ui/setup_fan_curve_custom.rs
@@ -1,241 +0,0 @@
-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);
-        }
-    });
-}
--- a/rog-control-center/src/ui/setup_fans.rs
+++ b/rog-control-center/src/ui/setup_fans.rs
@@ -1,6 +1,4 @@
-use crate::ui::show_toast;
-use std::collections::HashMap;
-use std::sync::{Arc, Mutex, OnceLock};
+use std::sync::{Arc, Mutex};

 use log::error;
 use rog_dbus::zbus_fan_curves::FanCurvesProxy;
@@ -10,25 +8,7 @@ use rog_profiles::fan_curve_set::CurveData;
 use slint::{ComponentHandle, Model, Weak};

 use crate::config::Config;
-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()
-}
+use crate::{FanPageData, FanType, MainWindow, Node};

 pub fn update_fan_data(
    handle: Weak<MainWindow>,
@@ -39,7 +19,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())
@@ -53,100 +33,61 @@ 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(nodes.clone());
-                        cache_fan_curve(Profile::Balanced, FanType::CPU, nodes_vec);
+                        global.set_balanced_cpu(collect(&fan.temp, &fan.pwm))
                    }
                    rog_profiles::FanCurvePU::GPU => {
                        global.set_gpu_fan_available(true);
                        global.set_balanced_gpu_enabled(fan.enabled);
-                        global.set_balanced_gpu(nodes.clone());
-                        cache_fan_curve(Profile::Balanced, FanType::GPU, nodes_vec);
+                        global.set_balanced_gpu(collect(&fan.temp, &fan.pwm))
                    }
                    rog_profiles::FanCurvePU::MID => {
                        global.set_mid_fan_available(true);
                        global.set_balanced_mid_enabled(fan.enabled);
-                        global.set_balanced_mid(nodes.clone());
-                        cache_fan_curve(Profile::Balanced, FanType::Middle, nodes_vec);
+                        global.set_balanced_mid(collect(&fan.temp, &fan.pwm))
                    }
                }
            }
            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(nodes.clone());
-                        cache_fan_curve(Profile::Performance, FanType::CPU, nodes_vec);
+                        global.set_performance_cpu(collect(&fan.temp, &fan.pwm))
                    }
                    rog_profiles::FanCurvePU::GPU => {
                        global.set_gpu_fan_available(true);
                        global.set_performance_gpu_enabled(fan.enabled);
-                        global.set_performance_gpu(nodes.clone());
-                        cache_fan_curve(Profile::Performance, FanType::GPU, nodes_vec);
+                        global.set_performance_gpu(collect(&fan.temp, &fan.pwm))
                    }
                    rog_profiles::FanCurvePU::MID => {
                        global.set_mid_fan_available(true);
                        global.set_performance_mid_enabled(fan.enabled);
-                        global.set_performance_mid(nodes.clone());
-                        cache_fan_curve(Profile::Performance, FanType::Middle, nodes_vec);
+                        global.set_performance_mid(collect(&fan.temp, &fan.pwm))
                    }
                }
            }
            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(nodes.clone());
-                        cache_fan_curve(Profile::Quiet, FanType::CPU, nodes_vec);
+                        global.set_quiet_cpu(collect(&fan.temp, &fan.pwm))
                    }
                    rog_profiles::FanCurvePU::GPU => {
                        global.set_gpu_fan_available(true);
                        global.set_quiet_gpu_enabled(fan.enabled);
-                        global.set_quiet_gpu(nodes.clone());
-                        cache_fan_curve(Profile::Quiet, FanType::GPU, nodes_vec);
+                        global.set_quiet_gpu(collect(&fan.temp, &fan.pwm))
                    }
                    rog_profiles::FanCurvePU::MID => {
                        global.set_mid_fan_available(true);
                        global.set_quiet_mid_enabled(fan.enabled);
-                        global.set_quiet_mid(nodes.clone());
-                        cache_fan_curve(Profile::Quiet, FanType::Middle, nodes_vec);
+                        global.set_quiet_mid(collect(&fan.temp, &fan.pwm))
                    }
                }
            }
@@ -227,25 +168,15 @@ 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 {
-                    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() {
+                    if fans.set_curves_to_defaults(profile.into()).await.is_err() {
                        return;
                    }
                    let Ok(balanced) = fans
@@ -272,103 +203,17 @@ 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 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);
+                let data: Vec<Node> = data.iter().collect();
+                let data = fan_data_for(fan, enabled, data);
                tokio::spawn(async move {
-                    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),
-                        }
-                    });
+                    fans.set_fan_curve(profile.into(), data)
+                        .await
+                        .map_err(|e| error!("{e:}"))
+                        .ok()
                });
            });
-            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:?}");
        }
--- a/rog-control-center/src/ui/setup_screenpad.rs
+++ b/rog-control-center/src/ui/setup_screenpad.rs
@@ -1,143 +0,0 @@
-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)
-    });
-}
--- a/rog-control-center/src/ui/setup_slash.rs
+++ b/rog-control-center/src/ui/setup_slash.rs
@@ -1,132 +0,0 @@
-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;
-                        }
-                    }
-                }
-            });
-        }
-    });
-}
--- a/rog-control-center/src/ui/setup_status.rs
+++ b/rog-control-center/src/ui/setup_status.rs
@@ -1,150 +0,0 @@
-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
-}
--- a/rog-control-center/src/ui/setup_system.rs
+++ b/rog-control-center/src/ui/setup_system.rs
@@ -40,13 +40,10 @@ 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);
@@ -133,6 +130,51 @@ macro_rules! init_minmax_property {

 // For handling callbacks from UI value changes
 macro_rules! setup_callback {
+    // Minmax (AttrMinMax) variant - pass an extra `minmax` token
+    ($property:ident, $handle:expr, $attr:expr, $type:tt, minmax) => {
+        let handle_copy = $handle.as_weak();
+        let proxy_copy = $attr.clone();
+        concat_idents!(on_callback = on_cb_, $property {
+            $handle
+                .global::<SystemPageData>()
+                .on_callback(move |v| {
+                    let handle_copy = handle_copy.clone();
+                    let proxy_copy = proxy_copy.clone();
+                    tokio::spawn(async move {
+                        let res = proxy_copy
+                            .set_current_value(convert_to_dbus!($type, v))
+                            .await;
+                        show_toast(
+                            format!("{} successfully set to {}", stringify!($property), v).into(),
+                            format!("Setting {} failed", stringify!($property)).into(),
+                            handle_copy.clone(),
+                            res.clone(),
+                        );
+
+                        if res.is_ok() {
+                            let min_v = proxy_copy.min_value().await.unwrap_or(-1);
+                            let max_v = proxy_copy.max_value().await.unwrap_or(-1);
+                            if let Ok(cur_val) = proxy_copy.current_value().await {
+                                let cur_f = cur_val as f32;
+                                handle_copy
+                                    .upgrade_in_event_loop(move |handle| {
+                                        concat_idents!(setter = set_, $property {
+                                            handle.global::<SystemPageData>().setter(AttrMinMax {
+                                                min: min_v,
+                                                max: max_v,
+                                                current: cur_f,
+                                            });
+                                        });
+                                    })
+                                    .ok();
+                            }
+                        }
+                    });
+                });
+        });
+    };
+
+    // Scalar variant (i32/bool/f32) - update scalar setter with authoritative value
    ($property:ident, $handle:expr, $attr:expr, $type:tt) => {
        let handle_copy = $handle.as_weak();
        let proxy_copy = $attr.clone();
@@ -143,12 +185,28 @@ macro_rules! setup_callback {
                    let handle_copy = handle_copy.clone();
                    let proxy_copy = proxy_copy.clone();
                    tokio::spawn(async move {
+                        let res = proxy_copy
+                            .set_current_value(convert_to_dbus!($type, v))
+                            .await;
                        show_toast(
                            format!("{} successfully set to {}", stringify!($property), v).into(),
                            format!("Setting {} failed", stringify!($property)).into(),
-                            handle_copy,
-                            proxy_copy.set_current_value(convert_to_dbus!($type, v)).await,
+                            handle_copy.clone(),
+                            res.clone(),
                        );
+
+                        if res.is_ok() {
+                            // Query authoritative value and set scalar global
+                            if let Ok(cur_val) = proxy_copy.current_value().await {
+                                handle_copy.upgrade_in_event_loop(move |handle| {
+                                    concat_idents!(setter = set_, $property {
+                                        handle
+                                            .global::<SystemPageData>()
+                                            .setter(convert_value!($type, cur_val));
+                                    });
+                                }).ok();
+                            }
+                        }
                    });
                });
        });
@@ -295,7 +353,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| {
@@ -396,7 +454,23 @@ 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, 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
+        );

        let platform_copy = platform.clone();
        handle
@@ -519,11 +593,25 @@ 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),
-                    platform_copy.change_platform_profile_on_battery(.into()),
-                    "Throttle policy on battery enabled: {}",
-                    "Setting Throttle policy on AC failed"
+                    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"
                );
            })
            .ok();
@@ -588,49 +676,49 @@ pub fn setup_system_page_callbacks(ui: &MainWindow, _states: Arc<Mutex<Config>>)
                            }
                            FirmwareAttribute::PptPl1Spl => {
                                init_minmax_property!(ppt_pl1_spl, handle, attr);
-                                setup_callback!(ppt_pl1_spl, handle, attr, i32);
+                                setup_callback!(ppt_pl1_spl, handle, attr, i32, minmax);
                                setup_callback_restore_default!(ppt_pl1_spl, handle, attr);
                                setup_minmax_external!(ppt_pl1_spl, handle, attr, platform);
                            }
                            FirmwareAttribute::PptPl2Sppt => {
                                init_minmax_property!(ppt_pl2_sppt, handle, attr);
-                                setup_callback!(ppt_pl2_sppt, handle, attr, i32);
+                                setup_callback!(ppt_pl2_sppt, handle, attr, i32, minmax);
                                setup_callback_restore_default!(ppt_pl2_sppt, handle, attr);
                                setup_minmax_external!(ppt_pl2_sppt, handle, attr, platform);
                            }
                            FirmwareAttribute::PptPl3Fppt => {
                                init_minmax_property!(ppt_pl3_fppt, handle, attr);
-                                setup_callback!(ppt_pl3_fppt, handle, attr, i32);
+                                setup_callback!(ppt_pl3_fppt, handle, attr, i32, minmax);
                                setup_callback_restore_default!(ppt_pl3_fppt, handle, attr);
                                setup_minmax_external!(ppt_pl3_fppt, handle, attr, platform);
                            }
                            FirmwareAttribute::PptFppt => {
                                init_minmax_property!(ppt_fppt, handle, attr);
-                                setup_callback!(ppt_fppt, handle, attr, i32);
+                                setup_callback!(ppt_fppt, handle, attr, i32, minmax);
                                setup_callback_restore_default!(ppt_fppt, handle, attr);
                                setup_minmax_external!(ppt_fppt, handle, attr, platform);
                            }
                            FirmwareAttribute::PptApuSppt => {
                                init_minmax_property!(ppt_apu_sppt, handle, attr);
-                                setup_callback!(ppt_apu_sppt, handle, attr, i32);
+                                setup_callback!(ppt_apu_sppt, handle, attr, i32, minmax);
                                setup_callback_restore_default!(ppt_apu_sppt, handle, attr);
                                setup_minmax_external!(ppt_apu_sppt, handle, attr, platform);
                            }
                            FirmwareAttribute::PptPlatformSppt => {
                                init_minmax_property!(ppt_platform_sppt, handle, attr);
-                                setup_callback!(ppt_platform_sppt, handle, attr, i32);
+                                setup_callback!(ppt_platform_sppt, handle, attr, i32, minmax);
                                setup_callback_restore_default!(ppt_platform_sppt, handle, attr);
                                setup_minmax_external!(ppt_platform_sppt, handle, attr, platform);
                            }
                            FirmwareAttribute::NvDynamicBoost => {
                                init_minmax_property!(nv_dynamic_boost, handle, attr);
-                                setup_callback!(nv_dynamic_boost, handle, attr, i32);
+                                setup_callback!(nv_dynamic_boost, handle, attr, i32, minmax);
                                setup_callback_restore_default!(nv_dynamic_boost, handle, attr);
                                setup_minmax_external!(nv_dynamic_boost, handle, attr, platform);
                            }
                            FirmwareAttribute::NvTempTarget => {
                                init_minmax_property!(nv_temp_target, handle, attr);
-                                setup_callback!(nv_temp_target, handle, attr, i32);
+                                setup_callback!(nv_temp_target, handle, attr, i32, minmax);
                                setup_callback_restore_default!(nv_temp_target, handle, attr);
                                setup_minmax_external!(nv_temp_target, handle, attr, platform);
                            }
@@ -642,26 +730,6 @@ 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::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);
--- a/rog-control-center/src/zbus_proxies.rs
+++ b/rog-control-center/src/zbus_proxies.rs
@@ -89,7 +89,7 @@ where
        }
    }
    if paths.len() > 1 {
-        log::warn!("Multiple asusd interfaces devices found");
+        println!("Multiple asusd interfaces devices found");
    }
    if !paths.is_empty() {
        let mut ctrl = Vec::new();
@@ -129,7 +129,7 @@ where
        }
    }
    if paths.len() > 1 {
-        log::warn!("Multiple asusd interfaces devices found");
+        println!("Multiple asusd interfaces devices found");
    }
    if !paths.is_empty() {
        let mut ctrl = Vec::new();
--- a/rog-control-center/ui/main_window.slint
+++ b/rog-control-center/ui/main_window.slint
@@ -1,12 +1,9 @@
-import { Button, VerticalBox } from "std-widgets.slint";
+import { Palette, 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";
@@ -17,18 +14,8 @@ 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 }

-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 { AppSize, AttrMinMax, SystemPageData, AnimePageData, AppSettingsPageData }

 export component MainWindow inherits Window {
    title: "ROG Control";
@@ -37,133 +24,93 @@ 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, true, true, true];
+    in property <[bool]> sidebar_items_avilable: [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: RogPalette.background;
-
-    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;
-                }
-
-                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();
-                        }
-                    }
-                }
+    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;
            }

-            // 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;
+                max-height: 40px;
+                width: side-bar.width;
+                background: Palette.control-background;
+                Text {
+                    vertical-alignment: center;
+                    horizontal-alignment: center;
+                    text: @tr("Quit App");
                }

-                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 == 3): PageSlash {
-                    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): 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;
+                TouchArea {
+                    clicked => {
+                        root.exit-app();
+                    }
                }
            }
        }
-        
-        // Bottom: Status Bar
-        StatusBar {}
+
+        Rectangle {
+            background: Palette.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;
+            }
+
+            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 == 4): PageAppSettings {
+                width: root.width - side-bar.width;
+            }
+
+            if(side-bar.current-item == 5): PageAbout {
+                width: root.width - side-bar.width;
+            }
+        }
    }

    if fade_cover: Rectangle {
@@ -171,7 +118,7 @@ export component MainWindow inherits Window {
        y: 0px;
        width: root.width;
        height: root.height;
-        background: Colors.rgba(0,0,0,0.7);
+        background: Colors.rgba(25,33,23,20);
        opacity: 0.7;
        TouchArea {
            height: 100%;
@@ -186,24 +133,13 @@ export component MainWindow inherits Window {
        }
    }

-    // 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;
-
+    if toast: Rectangle {
+        x: 0px;
+        y: 0px;
+        width: root.width;
+        height: 32px;
+        opacity: 1.0;
+        background: Colors.grey;
        TouchArea {
            height: 100%;
            width: 100%;
@@ -212,23 +148,13 @@ export component MainWindow inherits Window {
            }
        }

-        HorizontalLayout {
-            padding-left: 16px;
-            padding-right: 16px;
-            alignment: space-between;
-            
+        Rectangle {
+            height: 100%;
+            width: 100%;
+            background: Palette.control-background;
            Text {
-                vertical-alignment: center;
-                color: RogPalette.text-primary;
+                color: Palette.control-foreground;
                text: root.toast_text;
-                overflow: elide;
-            }
-            
-            Text {
-                vertical-alignment: center;
-                text: "Dismiss";
-                color: RogPalette.text-secondary;
-                font-size: 12px;
            }
        }
    }
@@ -248,20 +174,13 @@ export component MainWindow inherits Window {
            }
        }

+        // TODO: add properties to display
        Rectangle {
            height: 100%;
            width: 100%;
-            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;
-                }
+            background: Palette.background;
+            Text {
+                text: "Click here to exit";
            }
        }
    }
@@ -271,45 +190,35 @@ export component MainWindow inherits Window {
        y: 0px;
        width: root.width;
        height: root.height;
+        
+        //padding only has effect on layout elements
+        //padding: 10px;

-        background: RogPalette.background;
-        border-color: RogPalette.accent;
-        border-width: 2px;
-        border-radius: 8px;
+        background: Palette.background;
+        border-color: Palette.border;
+        border-width: 3px;
+        border-radius: 10px;

        VerticalBox {
-            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;
-
+            RogItem {
+                min-height: 50px;
+                max-height: 100px;
                Text {
                    text <=> SomeError.error_message;
-                    font-size: 16px;
-                    color: RogPalette.text-primary;
-                    horizontal-alignment: center;
-                    vertical-alignment: center;
+                    font-size: 18px;
                }
            }

            Text {
                text <=> SomeError.error_help;
-                color: RogPalette.text-secondary;
-                horizontal-alignment: center;
-                vertical-alignment: center;
+                horizontal-alignment: TextHorizontalAlignment.center;
+                vertical-alignment: TextVerticalAlignment.center;
            }
        }
    }
 }
+
+export global SomeError {
+    in property <string> error_message: "";
+    in property <string> error_help: "";
+}
--- a/rog-control-center/ui/pages/about.slint
+++ b/rog-control-center/ui/pages/about.slint
@@ -1,128 +1,66 @@
-import { VerticalBox, HorizontalBox, ScrollView } from "std-widgets.slint";
-import { RogPalette } from "../themes/rog_theme.slint";
+import { AboutSlint, VerticalBox, HorizontalBox } from "std-widgets.slint";

-export component PageAbout inherits Rectangle {
-    background: RogPalette.background;
+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;
+    }

-    ScrollView {
+    HorizontalBox {
+        alignment: LayoutAlignment.center;
        VerticalBox {
-            padding: 30px;
-            spacing: 20px;
-            alignment: center;
+            alignment: LayoutAlignment.center;

-            // Title
            Text {
-                horizontal-alignment: center;
-                text: "ROG Control Center";
-                font-size: 28px;
-                font-weight: 800;
-                color: RogPalette.accent;
+                wrap: TextWrap.word-wrap;
+                text: "You will require a kernel built with my work from here: https://github.com/flukejones/linux";
            }

            Text {
-                horizontal-alignment: center;
-                text: "A modern UI for asusctl built with Slint";
-                font-size: 16px;
-                color: RogPalette.text-secondary;
+                vertical-alignment: TextVerticalAlignment.center;
+                horizontal-alignment: TextHorizontalAlignment.center;
+                text: "Todo:";
+                font-size: 22px;
            }

-            // 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: "- [ ] Theme the widgets";
            }

-            // 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: "- [ ] Add a cpu/gpu temp/fan speed info bar";
            }

-            // Credits
-            Rectangle {
-                background: RogPalette.control-background;
-                border-radius: 8px;
-                border-width: 1px;
-                border-color: RogPalette.control-border;
+            Text {
+                text: "- [ ] Include fan speeds, temps in a bottom bar";
+            }

-                VerticalBox {
-                    padding: 20px;
-                    spacing: 8px;
+            Text {
+                text: "- [ ] Slash control";
+            }

-                    Text {
-                        text: "Credits";
-                        font-size: 18px;
-                        font-weight: 700;
-                        color: RogPalette.accent;
-                    }
+            Text {
+                text: "- [ ] Supergfx control";
+            }

-                    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 {
+                text: "- [ ] Screenpad controls";
+            }
+
+            Text {
+                text: "- [ ] ROG Ally specific settings";
            }
        }
    }
+
+    Text {
+        vertical-alignment: TextVerticalAlignment.center;
+        horizontal-alignment: TextHorizontalAlignment.center;
+        text: "Work in progress";
+        font-size: 22px;
+    }
 }
--- a/rog-control-center/ui/pages/anime.slint
+++ b/rog-control-center/ui/pages/anime.slint
@@ -1,6 +1,5 @@
 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: [
@@ -110,7 +109,7 @@ export component PageAnime inherits Rectangle {
    if root.show_fade_cover: Rectangle {
        width: 100%;
        height: 100%;
-        background: RogPalette.background;
+        background: Palette.background;
        opacity: 0.8;
        TouchArea {
            height: 100%;
@@ -143,7 +142,7 @@ export component PageAnime inherits Rectangle {
                    alignment: LayoutAlignment.start;
                    Text {
                        font-size: 18px;
-                        color: RogPalette.text-primary;
+                        color: Palette.control-foreground;
                        horizontal-alignment: TextHorizontalAlignment.center;
                        text: @tr("Set which builtin animations are played");
                    }
@@ -217,7 +216,7 @@ export component PageAnime inherits Rectangle {
                    alignment: LayoutAlignment.start;
                    Text {
                        font-size: 18px;
-                        color: RogPalette.text-primary;
+                        color: Palette.control-foreground;
                        horizontal-alignment: TextHorizontalAlignment.center;
                        text: @tr("Advanced Display Settings");
                    }
--- a/rog-control-center/ui/pages/app_settings.slint
+++ b/rog-control-center/ui/pages/app_settings.slint
@@ -1,6 +1,5 @@
-import { VerticalBox, ScrollView, HorizontalBox, Button } from "std-widgets.slint";
-import { SystemToggle, RogItem } from "../widgets/common.slint";
-import { RogPalette } from "../themes/rog_theme.slint";
+import { Palette } from "std-widgets.slint";
+import { SystemToggle } from "../widgets/common.slint";

 export global AppSettingsPageData {
    in-out property <bool> run_in_background;
@@ -9,135 +8,57 @@ export global AppSettingsPageData {
    callback set_startup_in_background(bool);
    in-out property <bool> enable_tray_icon;
    callback set_enable_tray_icon(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);
+    in-out property <bool> enable_dgpu_notifications;
+    callback set_enable_dgpu_notifications(bool);
 }

-export component PageAppSettings inherits Rectangle {
-    background: RogPalette.background;
-    
-    ScrollView {
-        VerticalBox {
-            padding: 20px;
-            spacing: 20px;
-            alignment: start;
+export component PageAppSettings inherits VerticalLayout {
+    Rectangle {
+        clip: true;
+        // TODO: slow with border-radius
+        //padding only has effect on layout elements
+        //padding: 8px;

-            // 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)
-                    }
+        // 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)
                }
            }

-            // Notifications Section
-            VerticalBox {
-                spacing: 10px;
-                padding: 0px;
+            SystemToggle {
+                text: @tr("Start app in background (UI closed)");
+                checked <=> AppSettingsPageData.startup_in_background;
+                toggled => {
+                    AppSettingsPageData.set_startup_in_background(AppSettingsPageData.startup_in_background)
+                }
+            }

-                Rectangle {
-                    height: 30px;
-                    background: RogPalette.control-background;
-                    border-radius: 4px;
-                    border-width: 1px;
-                    border-color: RogPalette.control-border;
+            SystemToggle {
+                text: @tr("Enable system tray icon");
+                checked <=> AppSettingsPageData.enable_tray_icon;
+                toggled => {
+                    AppSettingsPageData.set_enable_tray_icon(AppSettingsPageData.enable_tray_icon)
+                }
+            }

-                    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)
-                        }
-                    }
+            SystemToggle {
+                text: @tr("Enable dGPU notifications");
+                checked <=> AppSettingsPageData.enable_dgpu_notifications;
+                toggled => {
+                    AppSettingsPageData.set_enable_dgpu_notifications(AppSettingsPageData.enable_dgpu_notifications)
                }
            }
+
+            Text {
+                text: "WIP: some features like notifications are not complete";
+            }
        }
    }
 }
--- a/rog-control-center/ui/pages/aura.slint
+++ b/rog-control-center/ui/pages/aura.slint
@@ -1,28 +1,8 @@
-import {
-    SystemDropdown,
-    RogItem,
-    SystemToggle,
-    SystemToggleVert,
-} from "../widgets/common.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 { SystemDropdown, RogItem, SystemToggle, SystemToggleVert } from "../widgets/common.slint";
+import { Palette, Button, ComboBox, VerticalBox, GroupBox } from "std-widgets.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";
+import { AuraPageData, AuraDevType, PowerZones, LaptopAuraPower, AuraEffect } from "../types/aura_types.slint";
 import { AuraPowerGroup, AuraPowerGroupOld } from "../widgets/aura_power.slint";

 export component PageAura inherits Rectangle {
@@ -203,40 +183,6 @@ 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);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-
            HorizontalLayout {
                Button {
                    text: @tr("Power Settings");
@@ -249,15 +195,11 @@ export component PageAura inherits Rectangle {
        }

        if root.show_fade_cover: Rectangle {
-            background: RogPalette.background;
+            background: Palette.background;
            opacity: 0.8;
            TouchArea {
                height: 100%;
                width: 100%;
-                clicked => {
-                    root.show_fade_cover = false;
-                    root.show_aura_power = false;
-                }
            }
        }
    }
@@ -324,10 +266,7 @@ export component PageAura inherits Rectangle {
                alignment: LayoutAlignment.start;

                Text {
-                    text: "LED Power Zones (Legacy)";
-                    font-size: 16px;
-                    font-weight: 600;
-                    color: #ff0033;
+                    text: "TODO: In progress";
                }

                for state[idx] in AuraPageData.led_power.states: old_zone := AuraPowerGroupOld {
--- a/rog-control-center/ui/pages/fans.slint
+++ b/rog-control-center/ui/pages/fans.slint
@@ -1,10 +1,7 @@
-import { Palette, TabWidget, Button, CheckBox, Slider } from "std-widgets.slint";
+import { Palette, TabWidget, Button, CheckBox } 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;
@@ -19,81 +16,10 @@ 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;
@@ -103,20 +29,19 @@ component FanTab inherits Rectangle {
        }

        HorizontalLayout {
-            spacing: 20px;
            alignment: LayoutAlignment.end;
            CheckBox {
-                text: @tr("Enable Manual Control");
+                text: @tr("Enabled");
                checked <=> root.enabled;
-                enabled: root.tab_enabled && !local_busy;
+                enabled <=> root.tab_enabled;
                toggled => {
                    root.toggled();
                }
            }

            Button {
-                text: local_busy ? @tr("Applying...") : @tr("Apply Curve");
-                enabled: root.tab_enabled && root.enabled && !local_busy;
+                text: @tr("Apply");
+                enabled <=> root.tab_enabled;
                clicked => {
                    root.apply();
                }
@@ -124,7 +49,7 @@ component FanTab inherits Rectangle {

            Button {
                text: @tr("Cancel");
-                enabled: root.tab_enabled && !local_busy;
+                enabled <=> root.tab_enabled;
                clicked => {
                    root.cancel()
                }
@@ -132,7 +57,7 @@ component FanTab inherits Rectangle {

            Button {
                text: @tr("Factory Default (all fans)");
-                enabled: root.tab_enabled && !local_busy;
+                enabled <=> root.tab_enabled;
                clicked => {
                    root.default();
                }
@@ -161,9 +86,6 @@ export component PageFans inherits VerticalLayout {
                        default => {
                            FanPageData.set_profile_default(Profile.Balanced);
                        }
-                        cancel => {
-                            FanPageData.cancel(FanType.CPU, Profile.Balanced);
-                        }
                    }
                }

@@ -182,9 +104,6 @@ export component PageFans inherits VerticalLayout {
                        default => {
                            FanPageData.set_profile_default(Profile.Balanced);
                        }
-                        cancel => {
-                            FanPageData.cancel(FanType.Middle, Profile.Balanced);
-                        }
                    }
                }

@@ -203,9 +122,6 @@ export component PageFans inherits VerticalLayout {
                        default => {
                            FanPageData.set_profile_default(Profile.Balanced);
                        }
-                        cancel => {
-                            FanPageData.cancel(FanType.GPU, Profile.Balanced);
-                        }
                    }
                }
            }
@@ -229,9 +145,6 @@ export component PageFans inherits VerticalLayout {
                        default => {
                            FanPageData.set_profile_default(Profile.Performance);
                        }
-                        cancel => {
-                            FanPageData.cancel(FanType.CPU, Profile.Performance);
-                        }
                    }
                }

@@ -250,9 +163,6 @@ export component PageFans inherits VerticalLayout {
                        default => {
                            FanPageData.set_profile_default(Profile.Performance);
                        }
-                        cancel => {
-                            FanPageData.cancel(FanType.Middle, Profile.Performance);
-                        }
                    }
                }

@@ -271,9 +181,6 @@ export component PageFans inherits VerticalLayout {
                        default => {
                            FanPageData.set_profile_default(Profile.Performance);
                        }
-                        cancel => {
-                            FanPageData.cancel(FanType.GPU, Profile.Performance);
-                        }
                    }
                }
            }
@@ -297,9 +204,6 @@ export component PageFans inherits VerticalLayout {
                        default => {
                            FanPageData.set_profile_default(Profile.Quiet);
                        }
-                        cancel => {
-                            FanPageData.cancel(FanType.CPU, Profile.Quiet);
-                        }
                    }
                }

@@ -318,9 +222,6 @@ export component PageFans inherits VerticalLayout {
                        default => {
                            FanPageData.set_profile_default(Profile.Quiet);
                        }
-                        cancel => {
-                            FanPageData.cancel(FanType.Middle, Profile.Quiet);
-                        }
                    }
                }

@@ -339,9 +240,6 @@ export component PageFans inherits VerticalLayout {
                        default => {
                            FanPageData.set_profile_default(Profile.Quiet);
                        }
-                        cancel => {
-                            FanPageData.cancel(FanType.GPU, Profile.Quiet);
-                        }
                    }
                }
            }
--- a/rog-control-center/ui/pages/screenpad.slint
+++ b/rog-control-center/ui/pages/screenpad.slint
@@ -1,102 +0,0 @@
-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 {}
-    }
-}
--- a/rog-control-center/ui/pages/slash.slint
+++ b/rog-control-center/ui/pages/slash.slint
@@ -1,114 +0,0 @@
-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); }
-                    }
-                }
-            }
-        }
-    }
-}
--- a/rog-control-center/ui/pages/supergfx.slint
+++ b/rog-control-center/ui/pages/supergfx.slint
@@ -1,73 +0,0 @@
-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;
-                    }
-                }
-            }
-        }
-    }
-}
--- a/rog-control-center/ui/pages/system.slint
+++ b/rog-control-center/ui/pages/system.slint
@@ -1,6 +1,5 @@
 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,
@@ -52,14 +51,6 @@ 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;
@@ -67,6 +58,13 @@ export global SystemPageData {
    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;

@@ -151,22 +149,18 @@ export component PageSystem inherits Rectangle {
    ScrollView {
        VerticalLayout {
            padding: 10px;
-            padding-top: 40px;
-            padding-bottom: 40px;
            spacing: 10px;
            alignment: LayoutAlignment.start;
            Rectangle {
-                background: RogPalette.control-background;
-                border-color: RogPalette.control-border;
-                border-width: 1px;
-                border-radius: 8px;
-                height: 46px;
+                background: Palette.alternate-background;
+                border-color: Palette.accent-background;
+                border-width: 3px;
+                border-radius: 10px;
+                height: 40px;
                Text {
                    font-size: 18px;
-                    color: RogPalette.accent;
+                    color: Palette.control-foreground;
                    horizontal-alignment: TextHorizontalAlignment.center;
-                    vertical-alignment: TextVerticalAlignment.center;
-                    font-weight: 700;
                    text: @tr("Power settings");
                }
            }
@@ -205,18 +199,62 @@ 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: RogPalette.control-background;
-                border-color: RogPalette.control-border;
-                border-width: 1px;
-                border-radius: 8px;
-                height: 46px;
+                background: Palette.alternate-background;
+                border-color: Palette.accent-background;
+                border-width: 3px;
+                border-radius: 10px;
+                height: 40px;
                Text {
                    font-size: 18px;
-                    color: RogPalette.accent;
+                    color: Palette.control-foreground;
                    horizontal-alignment: TextHorizontalAlignment.center;
-                    vertical-alignment: TextVerticalAlignment.center;
-                    font-weight: 700;
                    text: @tr("Armoury settings");
                }
            }
@@ -240,44 +278,6 @@ 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;
@@ -331,7 +331,6 @@ 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;
                    }
                }

@@ -500,7 +499,7 @@ export component PageSystem inherits Rectangle {
    if root.show_fade_cover: Rectangle {
        width: 100%;
        height: 100%;
-        background: RogPalette.background;
+        background: Palette.background;
        opacity: 0.9;
        TouchArea {
            height: 100%;
@@ -533,7 +532,6 @@ 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 {
@@ -584,7 +582,6 @@ 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 {
--- a/rog-control-center/ui/themes/rog_theme.slint
+++ b/rog-control-center/ui/themes/rog_theme.slint
@@ -1,13 +0,0 @@
-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;
-}
--- a/rog-control-center/ui/types/aura_types.slint
+++ b/rog-control-center/ui/types/aura_types.slint
@@ -8,13 +8,6 @@ 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,
@@ -173,18 +166,4 @@ 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"),
-        @tr("Animation mode" => "Breathe"),
-        @tr("Animation mode" => "Pulse"),
-    ];
-    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);
 }
--- a/rog-control-center/ui/types/fan_types.slint
+++ b/rog-control-center/ui/types/fan_types.slint
@@ -35,64 +35,314 @@ 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: 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 },
+        {
+            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,
+        },
    ];
    in-out property <[Node]> balanced_mid: [
-        { 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 },
+        {
+            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,
+        },
    ];
    in-out property <[Node]> balanced_gpu: [
-        { 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 },
+        {
+            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,
+        },
    ];
-
    in-out property <[Node]> performance_cpu: [
-        { 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 },
+        {
+            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,
+        },
    ];
    in-out property <[Node]> performance_mid: [
-        { 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 },
+        {
+            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,
+        },
    ];
    in-out property <[Node]> performance_gpu: [
-        { 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 },
+        {
+            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,
+        },
    ];
-
    in-out property <[Node]> quiet_cpu: [
-        { 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 },
+        {
+            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,
+        },
    ];
    in-out property <[Node]> quiet_mid: [
-        { 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 },
+        {
+            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,
+        },
    ];
    in-out property <[Node]> quiet_gpu: [
-        { 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 },
+        {
+            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,
+        },
    ];

    function set_fan(profile: Profile, fan: FanType, data: [Node]) {
--- a/rog-control-center/ui/types/screenpad_types.slint
+++ b/rog-control-center/ui/types/screenpad_types.slint
@@ -1,13 +0,0 @@
-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);
-}
--- a/rog-control-center/ui/types/slash_types.slint
+++ b/rog-control-center/ui/types/slash_types.slint
@@ -1,49 +0,0 @@
-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);
-}
--- a/rog-control-center/ui/types/supergfx_types.slint
+++ b/rog-control-center/ui/types/supergfx_types.slint
@@ -1,10 +0,0 @@
-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();
-}
--- a/rog-control-center/ui/widgets/aura_power.slint
+++ b/rog-control-center/ui/widgets/aura_power.slint
@@ -1,14 +1,12 @@
-import { VerticalBox, HorizontalBox, GroupBox } from "std-widgets.slint";
+import { Palette, 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: 8px;
-    background: RogPalette.control-background;
-    border-width: 1px;
-    border-color: RogPalette.control-border;
+    border-radius: 20px;
+    background: Palette.alternate-background;
+    opacity: 0.9;
    in-out property <string> group-title;
    in-out property <bool> boot_checked;
    in-out property <bool> awake_checked;
@@ -22,7 +20,7 @@ export component AuraPowerGroup inherits Rectangle {
        spacing: 10px;
        Text {
            font-size: 18px;
-            color: RogPalette.text-primary;
+            color: Palette.alternate-foreground;
            horizontal-alignment: TextHorizontalAlignment.center;
            text <=> root.group-title;
        }
@@ -74,10 +72,9 @@ export component AuraPowerGroup inherits Rectangle {

 export component AuraPowerGroupOld inherits Rectangle {
    min-width: row.min-width;
-    border-radius: 8px;
-    background: RogPalette.control-background;
-    border-width: 1px;
-    border-color: RogPalette.control-border;
+    border-radius: 20px;
+    background: Palette.alternate-background;
+    opacity: 0.9;
    in-out property <int> current_zone;
    in-out property <[int]> zones;
    in-out property <[string]> zone_strings;
@@ -93,7 +90,7 @@ export component AuraPowerGroupOld inherits Rectangle {
        spacing: 10px;
        Text {
            font-size: 18px;
-            color: RogPalette.text-primary;
+            color: Palette.alternate-foreground;
            horizontal-alignment: TextHorizontalAlignment.center;
            text <=> root.group-title;
        }
--- a/rog-control-center/ui/widgets/common.slint
+++ b/rog-control-center/ui/widgets/common.slint
@@ -1,15 +1,12 @@
-import { VerticalBox , StandardButton, Button, HorizontalBox, ComboBox, Switch, Slider} from "std-widgets.slint";
-import { RogPalette } from "../themes/rog_theme.slint";
+import { Palette, VerticalBox , StandardButton, Button, HorizontalBox, ComboBox, Switch, Slider} from "std-widgets.slint";

 export component RogItem inherits Rectangle {
-    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;
+    background: Palette.control-background;
+    border-color: Palette.border;
+    border-width: 3px;
+    border-radius: 10px;
    min-height: 48px;
    max-height: 56px;
-    opacity: root.enabled ? 1.0 : 0.6;
 }

 export component SystemSlider inherits RogItem {
@@ -21,6 +18,7 @@ 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();

@@ -34,7 +32,7 @@ export component SystemSlider inherits RogItem {
                Text {
                    font-size: 16px;
                    vertical-alignment: TextVerticalAlignment.center;
-                    color: RogPalette.text-primary;
+                    color: Palette.control-foreground;
                    text: root.text;
                }

@@ -42,7 +40,7 @@ export component SystemSlider inherits RogItem {
                    font-size: 16px;
                    horizontal-alignment: TextHorizontalAlignment.right;
                    vertical-alignment: TextVerticalAlignment.center;
-                    color: RogPalette.accent;
+                    color: Palette.control-foreground;
                    text: "\{Math.round(root.value)}";
                }
            }
@@ -66,11 +64,10 @@ export component SystemSlider inherits RogItem {
            y: help.y - self.height + help.height - 10px;
            Rectangle {
                drop-shadow-blur: 10px;
-                drop-shadow-color: Colors.black;
-                border-radius: RogPalette.border-radius;
-                border-width: 1px;
-                border-color: RogPalette.accent;
-                background: RogPalette.control-background;
+                drop-shadow-color: black;
+                border-radius: 10px;
+                border-color: Palette.accent-background;
+                background: Palette.background;
                Dialog {
                    title: root.title;
                    VerticalBox {
@@ -80,12 +77,12 @@ export component SystemSlider inherits RogItem {
                            wrap: TextWrap.word-wrap;
                            horizontal-alignment: TextHorizontalAlignment.center;
                            text: root.title;
-                            color: RogPalette.text-primary;
                        }

                        Rectangle {
                            height: 1px;
-                            background: RogPalette.control-border;
+                            border-color: black;
+                            border-width: 1px;
                        }

                        Text {
@@ -93,7 +90,6 @@ export component SystemSlider inherits RogItem {
                            font-size: 16px;
                            wrap: TextWrap.word-wrap;
                            text: root.help_text;
-                            color: RogPalette.text-secondary;
                        }
                    }

@@ -118,18 +114,16 @@ export component SystemSlider inherits RogItem {
            y: reset.y - self.height + reset.height;
            Rectangle {
                drop-shadow-blur: 10px;
-                drop-shadow-color: Colors.black;
-                border-radius: RogPalette.border-radius;
-                border-width: 1px;
-                border-color: RogPalette.accent;
-                background: RogPalette.control-background;
+                drop-shadow-color: black;
+                border-radius: 10px;
+                border-color: Palette.accent-background;
+                background: Palette.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 {
@@ -170,7 +164,7 @@ export component SystemToggle inherits RogItem {
            Text {
                font-size: 16px;
                vertical-alignment: TextVerticalAlignment.center;
-                color: RogPalette.text-primary;
+                color: Palette.control-foreground;
                text: root.text;
            }
        }
@@ -201,7 +195,7 @@ export component SystemToggleInt inherits RogItem {
            Text {
                font-size: 16px;
                vertical-alignment: TextVerticalAlignment.center;
-                color: RogPalette.text-primary;
+                color: Palette.control-foreground;
                text: root.text;
            }
        }
@@ -232,7 +226,7 @@ export component SystemToggleVert inherits RogItem {
            font-size: 16px;
            vertical-alignment: TextVerticalAlignment.bottom;
            horizontal-alignment: TextHorizontalAlignment.center;
-            color: RogPalette.text-primary;
+            color: Palette.control-foreground;
            text: root.text;
        }

@@ -262,7 +256,7 @@ export component SystemDropdown inherits RogItem {
            Text {
                font-size: 16px;
                vertical-alignment: TextVerticalAlignment.center;
-                color: RogPalette.text-primary;
+                color: Palette.control-foreground;
                text: root.text;
            }
        }
@@ -294,9 +288,9 @@ export component PopupNotification {
        height: root.height;
        // TODO: add properties to display
        Rectangle {
-            border-width: 1px;
-            border-color: RogPalette.accent;
-            background: RogPalette.background;
+            border-width: 2px;
+            border-color: Palette.accent-background;
+            background: Palette.background;
            // TODO: drop shadows slow
            // drop-shadow-offset-x: 7px;
            // drop-shadow-offset-y: 7px;
@@ -308,14 +302,14 @@ export component PopupNotification {
                        alignment: start;
                        Text {
                            text: heading;
-                            color: RogPalette.text-primary;
+                            color: Palette.control-foreground;
                            font-size: 32px;
                            font-weight: 900;
                        }

                        Text {
                            text: content;
-                            color: RogPalette.text-secondary;
+                            color: Palette.control-foreground;
                            font-size: 18px;
                        }
                    }
--- a/rog-control-center/ui/widgets/graph.slint
+++ b/rog-control-center/ui/widgets/graph.slint
@@ -1,5 +1,4 @@
 import { Palette } from "std-widgets.slint";
-import { RogPalette } from "../themes/rog_theme.slint";

 export struct Node { x: length, y: length}

@@ -45,7 +44,7 @@ export component Graph inherits Rectangle {
        for n in 11: Path {
            viewbox-width: self.width / 1px;
            viewbox-height: self.height / 1px;
-            stroke: RogPalette.control-border;
+            stroke: Palette.alternate-foreground.darker(200%);
            stroke-width: 1px;
            MoveTo {
                x: scale_x_to_graph(n * 10px) / 1px;
@@ -61,7 +60,7 @@ export component Graph inherits Rectangle {
        }

        for n in 11: Text {
-            color: RogPalette.text-secondary;
+            color: Palette.accent-background;
            font-size <=> root.axis_font_size;
            text: "\{n * 10}c";
            x: scale_x_to_graph(n * 10px) - self.width / 3;
@@ -71,7 +70,7 @@ export component Graph inherits Rectangle {
        for n in 11: Path {
            viewbox-width: self.width / 1px;
            viewbox-height: self.height / 1px;
-            stroke: RogPalette.control-border;
+            stroke: Palette.alternate-foreground.darker(200%);
            stroke-width: 1px;
            MoveTo {
                x: 0;
@@ -87,7 +86,7 @@ export component Graph inherits Rectangle {
        }

        for n in 11: Text {
-            color: RogPalette.text-secondary;
+            color: Palette.accent-background;
            font-size <=> root.axis_font_size;
            text: "\{n * 10}%";
            x: - self.width;
@@ -98,7 +97,7 @@ export component Graph inherits Rectangle {
            if idx + 1 != nodes.length: Path {
                viewbox-width: self.width / 1px;
                viewbox-height: self.height / 1px;
-                stroke: RogPalette.accent;
+                stroke: Palette.control-foreground;
                stroke-width: 2px;
                MoveTo {
                    x: scale_x_to_graph(nodes[idx].x) / 1px;
@@ -115,19 +114,19 @@ export component Graph inherits Rectangle {
        for n[idx] in nodes: Rectangle {
            states [
                pressed when touch.pressed: {
-                    point.background: RogPalette.accent;
-                    tip.background: RogPalette.accent;
+                    point.background: Palette.selection-background;
+                    tip.background: Palette.selection-background;
                    tip.opacity: 1.0;
                }
                hover when touch.has-hover: {
-                    point.background: RogPalette.accent;
-                    tip.background: RogPalette.accent;
+                    point.background: Palette.accent-background;
+                    tip.background: Palette.accent-background;
                    tip.opacity: 1.0;
                }
            ]
            //
            point := Rectangle {
-                background: RogPalette.text-primary;
+                background: Palette.control-foreground;
                x: scale_x_to_graph(n.x) - self.width / 2;
                y: graph.height - scale_y_to_graph(n.y) - self.height / 2;
                width: 18px;
@@ -143,14 +142,10 @@ 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; // Allow equality
+                                n.y = nodes[idx + 1].y - pad;
                            } 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; // Allow equality
-                            } else if n.y + scale_y_to_node(self.height - self.mouse-y - self.pressed-y) < 0.0 {
-                                n.y = 0px;
+                                n.y = nodes[idx - 1].y + pad;
                            }
                        } else if idx == 0 {
                            if n.x + scale_x_to_node(self.mouse-x - self.pressed-x) < 0.0 {
@@ -158,12 +153,10 @@ 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 = 0px; // Allow 0 RPM
+                                n.y = 1px;
                            } 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; // Allow equality
+                                n.y = nodes[idx + 1].y - pad;
                            }
                        } 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) {
@@ -171,14 +164,10 @@ 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);
+                                n.y = scale_y_to_node(graph.height - 1px);
                            } 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; // Allow equality
-                            } else if n.y + scale_y_to_node(self.height - self.mouse-y - self.pressed-y) < 0.0 {
-                                n.y = 0px;
+                                n.y = nodes[idx - 1].y + pad;
                            }
                        }
                    }
@@ -200,7 +189,7 @@ export component Graph inherits Rectangle {
            }

            tip := Rectangle {
-                background: RogPalette.control-background;
+                background: Palette.control-foreground;
                opacity: 0.3;
                x: final_x_pos();
                y: final_y_pos();
@@ -235,7 +224,7 @@ export component Graph inherits Rectangle {
                }
                //
                label := Text {
-                    color: RogPalette.text-primary;
+                    color: Palette.accent-foreground;
                    font-size: 16px;
                    text: "\{Math.floor(n.x / 1px)}c, \{fan_pct()}%";
                }
--- a/rog-control-center/ui/widgets/sidebar.slint
+++ b/rog-control-center/ui/widgets/sidebar.slint
@@ -1,8 +1,7 @@
 // Copyright © SixtyFPS GmbH <info@slint.dev>
 // SPDX-License-Identifier: MIT

-import { HorizontalBox, VerticalBox } from "std-widgets.slint";
-import { RogPalette } from "../themes/rog_theme.slint";
+import { Palette, HorizontalBox, VerticalBox } from "std-widgets.slint";

 component SideBarItem inherits Rectangle {
    // padding only has effect on layout elements
@@ -29,21 +28,12 @@ component SideBarItem inherits Rectangle {
    ]
    state := Rectangle {
        opacity: 0;
-        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;
-        }
-        
+        border-width: 2px;
+        border-radius: 10px;
+        border-color: Palette.accent-background;
+        background: Palette.alternate-background;
        animate opacity { duration: 150ms; }
-        // animate border-width { duration: 150ms; }
+        animate border-width { duration: 150ms; }
        height: l.preferred-height;
    }

@@ -51,10 +41,9 @@ component SideBarItem inherits Rectangle {
        y: (parent.height - self.height) / 2;
        spacing: 0px;
        label := Text {
-            color: root.selected ? RogPalette.accent : RogPalette.text-primary;
+            color: Palette.foreground;
            vertical-alignment: center;
            font-size: 14px;
-            font-weight: root.selected ? 700 : 400;
        }
    }

@@ -77,10 +66,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: 0px;
-        // border-color: RogPalette.accent;
+        border-width: 2px;
+        border-color: Palette.accent-background;
        border-radius: 0px;
-        background: RogPalette.alternate-background; // Darker sidebar
+        background: Palette.background.darker(0.2);
        fs := FocusScope {
            key-pressed(event) => {
                if (event.text == "\n") {
@@ -115,19 +104,12 @@ export component SideBar inherits Rectangle {
        spacing: 4px;
        alignment: start;
        label := Text {
-            font-size: 24px; // Larger brand text
-            font-weight: 800;
+            font-size: 16px;
            horizontal-alignment: center;
-            color: RogPalette.accent; // ROG Red brand text
-        }
-
-        // Spacer after brand text
-        Rectangle {
-            height: 20px;
        }

        navigation := VerticalLayout {
-            spacing: 4px; // Spacing between items
+            spacing: -6px;
            alignment: start;
            vertical-stretch: 0;
            for item[index] in root.model: SideBarItem {
--- a/rog-control-center/ui/widgets/status_bar.slint
+++ b/rog-control-center/ui/widgets/status_bar.slint
@@ -1,58 +0,0 @@
-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"; }
-        }
-    }
-}
--- a/rog-control-center/ui/windows/tray_tooltip.slint
+++ b/rog-control-center/ui/windows/tray_tooltip.slint
@@ -1,76 +0,0 @@
-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"; }
-                }
-            }
-        }
-    }
-}
--- a/rog-dbus/src/zbus_aura.rs
+++ b/rog-dbus/src/zbus_aura.rs
@@ -84,21 +84,6 @@ pub trait Aura {
    /// SupportedPowerZones property
    #[zbus(property)]
    fn supported_power_zones(&self) -> zbus::Result<Vec<PowerZones>>;
-
-    /// Start a software-controlled animation in the daemon
-    /// `mode_json` is a JSON-serialized AnimationMode
-    fn start_animation(&self, mode_json: String) -> zbus::Result<()>;
-
-    /// Stop any running animation
-    fn stop_animation(&self) -> zbus::Result<()>;
-
-    /// AnimationRunning property - check if animation is active
-    #[zbus(property)]
-    fn animation_running(&self) -> zbus::Result<bool>;
-
-    /// AnimationMode property - get current animation mode as JSON
-    #[zbus(property)]
-    fn animation_mode(&self) -> zbus::Result<String>;
 }

 pub struct AuraProxyPerkey<'a>(AuraProxyBlocking<'a>);
--- a/rog-platform/src/asus_armoury.rs
+++ b/rog-platform/src/asus_armoury.rs
@@ -95,7 +95,7 @@ impl Attribute {
            _ => return Err(PlatformError::InvalidValue),
        };

-        let mut file = OpenOptions::new().write(true).open(&path)?;
+        let mut file = OpenOptions::new().write(true).truncate(true).open(&path)?;
        file.write_all(value_str.as_bytes())?;
        Ok(())
    }
@@ -244,6 +244,37 @@ impl FirmwareAttributes {
        Self { attrs }
    }

+    /// Create attributes collection from an arbitrary base directory. Intended for tests
+    /// where a fake sysfs-like layout can be supplied.
+    pub fn from_dir(base_dir: &std::path::Path) -> Self {
+        let mut attrs = Vec::new();
+        if let Ok(dir) = read_dir(base_dir) {
+            for entry in dir.flatten() {
+                let base_path = entry.path();
+                let name = base_path.file_name().unwrap().to_string_lossy().to_string();
+                if name == "pending_reboot" {
+                    continue;
+                }
+                let help = read_string(&base_path.join("display_name")).unwrap_or_default();
+
+                let (default_value, possible_values, min_value, max_value, scalar_increment) =
+                    Attribute::read_base_values(&base_path);
+
+                attrs.push(Attribute {
+                    name,
+                    help,
+                    default_value,
+                    possible_values,
+                    min_value,
+                    max_value,
+                    scalar_increment,
+                    base_path,
+                });
+            }
+        }
+        Self { attrs }
+    }
+
    pub fn attributes(&self) -> &Vec<Attribute> {
        &self.attrs
    }
@@ -282,14 +313,10 @@ define_attribute_getters!(
    ppt_fppt,
    nv_dynamic_boost,
    nv_temp_target,
-    dgpu_base_tgp,
-    dgpu_tgp,
+    nv_base_tgp,
+    nv_tgp,
    charge_mode,
    boot_sound,
-    kbd_leds_awake,
-    kbd_leds_sleep,
-    kbd_leds_boot,
-    kbd_leds_shutdown,
    mcu_powersave,
    panel_od,
    panel_hd_mode,
@@ -304,6 +331,7 @@ define_attribute_getters!(
 /// CamelCase names of the properties. Intended for use with DBUS
 #[repr(u8)]
 #[derive(
+    Debug,
    Clone,
    Copy,
    Serialize,
@@ -346,10 +374,6 @@ pub enum FirmwareAttribute {
    PptEnabled = 24,
    None = 25,
    ScreenAutoBrightness = 26,
-    KbdLedsAwake = 27,
-    KbdLedsSleep = 28,
-    KbdLedsBoot = 29,
-    KbdLedsShutdown = 30,
 }

 impl FirmwareAttribute {
@@ -370,6 +394,7 @@ impl FirmwareAttribute {
            self,
            FirmwareAttribute::NvDynamicBoost
                | FirmwareAttribute::NvTempTarget
+                | FirmwareAttribute::DgpuBaseTgp
                | FirmwareAttribute::DgpuTgp
        )
    }
@@ -390,14 +415,13 @@ impl From<&str> for FirmwareAttribute {
            "ppt_platform_sppt" => Self::PptPlatformSppt,
            "nv_dynamic_boost" => Self::NvDynamicBoost,
            "nv_temp_target" => Self::NvTempTarget,
-            "nv_base_tgp" => Self::DgpuBaseTgp,
            "nv_tgp" => Self::DgpuTgp,
+            "nv_base_tgp" => Self::DgpuBaseTgp,
+            /* Backwards compatibility: some kernels expose these attributes with a dgpu_* prefix */
+            "dgpu_tgp" => Self::DgpuTgp,
+            "dgpu_base_tgp" => Self::DgpuBaseTgp,
            "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,
@@ -431,7 +455,7 @@ impl From<FirmwareAttribute> for &str {
            FirmwareAttribute::PptPlatformSppt => "ppt_platform_sppt",
            FirmwareAttribute::NvDynamicBoost => "nv_dynamic_boost",
            FirmwareAttribute::NvTempTarget => "nv_temp_target",
-            FirmwareAttribute::DgpuBaseTgp => "dgpu_base_tgp",
+            FirmwareAttribute::DgpuBaseTgp => "nv_base_tgp",
            FirmwareAttribute::DgpuTgp => "nv_tgp",
            FirmwareAttribute::ChargeMode => "charge_mode",
            FirmwareAttribute::BootSound => "boot_sound",
@@ -443,10 +467,6 @@ 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",
@@ -535,3 +555,28 @@ mod tests {
        attr.set_current_value(&val).unwrap();
    }
 }
+
+#[cfg(test)]
+mod alias_tests {
+    use super::FirmwareAttribute;
+
+    #[test]
+    fn tgp_aliases_map_to_same_variant() {
+        let nv = FirmwareAttribute::from("nv_tgp");
+        let dgpu = FirmwareAttribute::from("dgpu_tgp");
+        assert_eq!(nv, dgpu);
+
+        let nv_base = FirmwareAttribute::from("nv_base_tgp");
+        let dgpu_base = FirmwareAttribute::from("dgpu_base_tgp");
+        assert_eq!(nv_base, dgpu_base);
+    }
+
+    #[test]
+    fn tgp_canonical_output_is_nv_tgp() {
+        let s: &str = FirmwareAttribute::DgpuTgp.into();
+        assert_eq!(s, "nv_tgp");
+
+        let s_base: &str = FirmwareAttribute::DgpuBaseTgp.into();
+        assert_eq!(s_base, "nv_base_tgp");
+    }
+}
--- a/rog-platform/src/power.rs
+++ b/rog-platform/src/power.rs
@@ -101,15 +101,18 @@ impl AsusPower {
            });
        }

-        // 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,
-        })
+        Err(PlatformError::MissingFunction(
+            "Did not find a battery".to_owned(),
+        ))
+    }
+}
+
+impl Default for AsusPower {
+    fn default() -> Self {
+        Self {
+            mains: PathBuf::from("/this_shouldNeVErr_exisid"),
+            battery: PathBuf::from("/this_shouldNeVErr_exisid"),
+            usb: None,
+        }
    }
 }
--- a/rog-scsi/src/builtin_modes.rs
+++ b/rog-scsi/src/builtin_modes.rs
@@ -177,12 +177,6 @@ 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] {
        [
--- a/rog-slash/src/data.rs
+++ b/rog-slash/src/data.rs
@@ -12,13 +12,9 @@ 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_2024,
-    GA403_2025,
-    GA605_2024,
-    GA605_2025,
-    GU605_2024,
-    GU605_2025,
-    G614_2025,
+    GA403,
+    GA605,
+    GU605,
    #[default]
    Unsupported,
 }
@@ -26,51 +22,30 @@ pub enum SlashType {
 impl SlashType {
    pub const fn prod_id(&self) -> u16 {
        match self {
-            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::GA403 => PROD_ID1,
+            SlashType::GA605 => PROD_ID2,
+            SlashType::GU605 => PROD_ID1,
            SlashType::Unsupported => 0,
        }
    }

    pub const fn prod_id_str(&self) -> &str {
        match self {
-            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::GA403 => PROD_ID1_STR,
+            SlashType::GA605 => PROD_ID2_STR,
+            SlashType::GU605 => PROD_ID1_STR,
            SlashType::Unsupported => "",
        }
    }

    pub fn from_dmi() -> Self {
        let board_name = DMIID::new().unwrap_or_default().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
+        if board_name.contains("GA403") {
+            SlashType::GA403
        } else if board_name.contains("GA605") {
-            SlashType::GA605_2024
-        } else if board_name.contains("GU605C") {
-            SlashType::GU605_2025
+            SlashType::GA605
        } else if board_name.contains("GU605") {
-            SlashType::GU605_2024
+            SlashType::GU605
        } else {
            SlashType::Unsupported
        }
@@ -81,14 +56,10 @@ impl FromStr for SlashType {
    type Err = SlashError;

    fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {
-        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,
+        Ok(match s {
+            "ga403" | "GA403" => Self::GA403,
+            "ga605" | "GA605" => Self::GA605,
+            "gu605" | "GU605" => Self::GU605,
            _ => Self::Unsupported,
        })
    }
@@ -97,7 +68,6 @@ 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,
@@ -121,7 +91,6 @@ 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),
@@ -145,7 +114,6 @@ 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"),
@@ -167,9 +135,8 @@ impl Display for SlashMode {
 }

 impl SlashMode {
-    pub fn list() -> [String; 16] {
+    pub fn list() -> [String; 15] {
        [
-            SlashMode::Static.to_string(),
            SlashMode::Bounce.to_string(),
            SlashMode::Slash.to_string(),
            SlashMode::Loading.to_string(),
--- a/rog-slash/src/usb.rs
+++ b/rog-slash/src/usb.rs
@@ -37,26 +37,14 @@ pub fn get_slash_type() -> SlashType {
    let dmi = DMIID::new()
        .map_err(|_| SlashError::NoDevice)
        .unwrap_or_default();
-    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
+    let board_name = dmi.board_name;
+
+    if board_name.contains("GA403") {
+        SlashType::GA403
    } else if board_name.contains("GA605") {
-        SlashType::GA605_2024
-    } else if board_name.contains("GU605C") {
-        SlashType::GU605_2025
+        SlashType::GA605
    } else if board_name.contains("GU605") {
-        SlashType::GU605_2024
+        SlashType::GU605
    } else {
        SlashType::Unsupported
    }
@@ -64,13 +52,9 @@ pub fn get_slash_type() -> SlashType {

 pub const fn report_id(slash_type: SlashType) -> u8 {
    match slash_type {
-        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::GA403 => REPORT_ID_193B,
+        SlashType::GA605 => REPORT_ID_19B6,
+        SlashType::GU605 => REPORT_ID_193B,
        SlashType::Unsupported => REPORT_ID_19B6,
    }
 }
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -0,0 +1,4 @@
+[toolchain]
+channel = "stable"
+components = ["rustfmt", "clippy"]
+profile = "minimal"
--- a/simulators/src/animatrix/mod.rs
+++ b/simulators/src/animatrix/mod.rs
@@ -43,12 +43,10 @@ impl AniMatrix {
                vertical: 2,
                horizontal: 5,
            },
-            AnimeType::GA402 | AnimeType::G635L | AnimeType::G835L | AnimeType::Unsupported => {
-                LedShape {
-                    vertical: 2,
-                    horizontal: 5,
-                }
-            }
+            AnimeType::GA402 | AnimeType::Unsupported => LedShape {
+                vertical: 2,
+                horizontal: 5,
+            },
            AnimeType::GU604 => LedShape {
                vertical: 2,
                horizontal: 5,
@@ -58,9 +56,7 @@ impl AniMatrix {
        // Do a hard mapping of each (derived from wireshardk captures)
        let rows = match model {
            AnimeType::GA401 => GA401.to_vec(),
-            AnimeType::GA402 | AnimeType::G635L | AnimeType::G835L | AnimeType::Unsupported => {
-                GA402.to_vec()
-            }
+            AnimeType::GA402 | AnimeType::Unsupported => GA402.to_vec(),
            AnimeType::GU604 => GU604.to_vec(),
        };

--- a/simulators/src/simulator.rs
+++ b/simulators/src/simulator.rs
@@ -157,14 +157,14 @@ 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) % 2 != 0 {
+                    let x: i32 = w + x_count as i32 * w - {
+                        #[allow(clippy::manual_is_multiple_of)]
+                        if (y_count + y_offset as usize) % 2 != 0 {
                            0
                        } else {
                            w / 2
                        }
-                        + row.3 * w;
+                    } + row.3 * w;
                    let y = y_count as i32 * h - y_offset * h;
                    canvas
                        .fill_rect(Rect::new(x, y, w as u32, h as u32))
Author	SHA1	Message	Date
Denis Benato	5e5cebc781	Revert "Fix: continue -> return in set_config_or_default" This reverts commit `ad051bd7b8`.	2025-11-06 22:53:21 +01:00
Denis Benato	def691f9d0	Fix: sliders not updating the value	2025-11-06 22:53:09 +01:00
Denis Benato	80eeafd9e1	Feat: config reload and do not apply properties if max==min	2025-11-06 21:06:44 +01:00
Denis Benato	bf173300e0	Feat: start in tray mode	2025-11-06 17:29:12 +01:00
Denis Benato	07874d7452	tests: load bundled aura_support.ron when system files missing to make unit tests reliable in CI	2025-11-06 17:24:01 +01:00
Denis Benato	894a0d2b11	Chore: update CHANGELOG.md	2025-11-06 16:12:44 +01:00
Denis Benato	11dc02612e	Fix clippy warnings: alias complex types, allow some clippy lints, collapse else-if, avoid is_multiple_of usage	2025-11-06 16:05:38 +01:00
Denis Benato	fccb233e9e	Fix: stop rust from silly complains about is_multiple_of	2025-11-06 15:58:30 +01:00
Denis Benato	c13612e02c	Fix: simplify an if	2025-11-06 15:52:43 +01:00
Denis Benato	80147966a9	Chore: use stable	2025-11-06 15:49:05 +01:00
Denis Benato	a1815ac40c	Chore: improve tests	2025-11-06 15:34:30 +01:00
Denis Benato	ad051bd7b8	Fix: continue -> return in set_config_or_default	2025-11-06 15:07:31 +01:00
Denis Benato	90676b390e	Chore: update CHANGELOG.md	2025-11-06 15:04:59 +01:00
Denis Benato	974f2acafa	Feat: better handling of nv_ properties	2025-11-06 14:53:57 +01:00
Denis Benato	6ae3ae5284	Feat: make nvidia dGPU tunables power-profile dependant	2025-11-06 14:26:03 +01:00