Merge branch 'main' into 'main'

Update Discord Icon in Readme See merge request asus-linux/asusctl!181
Update Discord Icon to Readme
2026-02-06 00:15:04 +01:00 · 2024-05-07 01:59:22 +00:00 · 2024-04-23 16:19:28 +00:00
191 changed files with 8931 additions and 24180 deletions
--- a/.cargo-husky/hooks/post-commit
+++ b/.cargo-husky/hooks/post-commit
@@ -1,53 +0,0 @@
-#!/bin/sh
-set -e
-
-ROOT_DIR=$(git rev-parse --show-toplevel)
-AURA_DATA="${ROOT_DIR}/rog-aura/data/aura_support.ron"
-SPEC_FILE="${ROOT_DIR}/distro-packaging/asusctl.spec"
-TRANSLATION="${ROOT_DIR}/rog-control-center/translations/en/rog-control-center.po"
-VERSION=$(grep -Pm1 'version = "(\d+.\d+.\d+.*)"' "${ROOT_DIR}/Cargo.toml" | cut -d'"' -f2)
-
-if [ -z "$VERSION" ]; then
-    echo "Error: Could not extract version from Cargo.toml"
-    exit 1
-fi
-if [ ! -f "$SPEC_FILE" ]; then
-    echo "Error: Spec file not found at ${SPEC_FILE}"
-    exit 1
-fi
-
-# Update spec file
-sed -i "s/^%define version.*/%define version ${VERSION}/" "$SPEC_FILE"
-if git diff --quiet "$SPEC_FILE"; then
-    echo "No changes to spec file"
-else
-    git add "$SPEC_FILE"
-    git commit --no-verify -m "chore: update spec file version to ${VERSION}"
-    echo "Updated spec file version to ${VERSION}"
-fi
-
-# Update translations only if UI files changed
-if git diff-tree -r HEAD@{1} HEAD --name-only | grep -q "^rog-control-center/ui/"; then
-    echo 'find -name \*.slint | xargs slint-tr-extractor -o ${TRANSLATION}'
-    find -name \*.slint | xargs slint-tr-extractor -o $TRANSLATION
-    if git diff --quiet "$TRANSLATION"; then
-        echo "No changes to translation file"
-    else
-        git add "$TRANSLATION"
-        git commit --no-verify -m "chore: update translations"
-        echo "Updated ${TRANSLATION}"
-    fi
-else
-    echo "No changes in rog-control-center/ui/, skipping translation update"
-fi
-
-# Update aura data
-cargo test --package rog_aura --lib -- aura_detection::tests::check_data_file_parse --exact
-cargo test --package rog_aura --lib -- aura_detection::tests::find_data_file_groups --exact
-if git diff --quiet "$AURA_DATA"; then
-    echo "No changes to aura data file"
-else
-    git add "$AURA_DATA"
-    git commit --no-verify -m "chore: update aura data"
-    echo "Updated $AURA_DATA"
-fi
--- a/.cargo-husky/hooks/pre-commit
+++ b/.cargo-husky/hooks/pre-commit
@@ -1,6 +1,18 @@
 #!/bin/sh
+
 set -e

-echo '+cargo fmt --all -- --check'
-cargo fmt --all -- --check
-git add -u
+echo 'find -name \*.slint | xargs slint-tr-extractor -o rog-control-center/translations/en/rog-control-center.po'
+find -name \*.slint | xargs slint-tr-extractor -o rog-control-center/translations/en/rog-control-center.po
+
+echo '+cargo +nightly fmt --all -- --check'
+cargo +nightly fmt --all -- --check
+
+echo '+cargo clippy --all -- -D warnings'
+cargo clippy --all -- -D warnings
+
+echo '+cargo test --all'
+cargo test --all
+
+echo '+cargo cranky'
+cargo cranky
--- a/.cargo-husky/hooks/pre-push
+++ b/.cargo-husky/hooks/pre-push
@@ -2,8 +2,8 @@

 set -e

-echo '+cargo fmt --all -- --check'
-cargo fmt --all -- --check
+echo '+cargo +nightly fmt --all -- --check'
+cargo +nightly fmt --all -- --check
 echo '+cargo clippy --all -- -D warnings'
 cargo clippy --all -- -D warnings
 echo '+cargo cranky'
--- a/.editorconfig
+++ b/.editorconfig
@@ -8,9 +8,6 @@ indent_style = space
 trim_trailing_whitespace = true
 insert_final_newline = true

-[*.slint]
-indent_size = 4
-
 [*.md]
 trim_trailing_whitespace = false

--- a/.gitignore
+++ b/.gitignore
@@ -9,7 +9,6 @@ vendor_*
 .vscode
 .~lock.*
 *.ods#
-*.patch

 # gnome extension
 node-modules
@@ -20,8 +19,3 @@ desktop-extensions/gnome*/@types/gir-generated
 desktop-extensions/gnome*/node_modules
 desktop-extensions/gnome*/schemas/gschemas.compiled
 desktop-extensions/gnome*/*.zip
-
-# agents and reference
-CLAUDE.md
-AGENTS.md
-/reference
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,27 +1,23 @@
 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
+  - apt-get update -qq && apt-get install -y -qq libinput-dev libseat-dev libudev-dev libgtk-3-dev grep llvm clang libclang-dev libsdl2-dev libsdl2-gfx-dev

 stages:
  - format
@@ -35,24 +31,20 @@ format:
    - tags
  <<: *rust_cache
  script:
-    - rustup component add rustfmt || true
+    - echo "nightly" > rust-toolchain
+    - rustup component add rustfmt
    - cargo fmt --check
-  after_script:
-    - du -sh "$CI_PROJECT_DIR/ci-target" || true
-    - rm -rf "$CI_PROJECT_DIR/ci-target" || true

 check:
  except:
    - tags
  <<: *rust_cache
  script:
-    - rustup component add clippy || true
-    - cargo check --locked --workspace
+    - rustup component add clippy
+    - cargo 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:
  except:
@@ -60,9 +52,7 @@ test:
  <<: *rust_cache
  script:
    - mkdir -p .git/hooks > /dev/null
-    - cargo test --locked --all
-  after_script:
-    - rm -rf "$CI_PROJECT_DIR/ci-target" || true
+    - cargo test --all

 release:
  only:
@@ -70,15 +60,11 @@ release:
  <<: *rust_cache
  script:
    - cargo install cargo-vendor-filterer
-    - cargo fetch
-    - make FROZEN=1 && make vendor
+    - make && 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
@@ -86,14 +72,14 @@ pages:
    - tags
  <<: *rust_cache
  script:
-    - cargo doc --locked --document-private-items --no-deps --workspace
+    - cargo doc --document-private-items --no-deps --workspace
    - rm -rf public
    - mkdir public
-    - cp -R ci-target/doc/* public
-    - if [ -f extra/index.html ]; then cp extra/index.html public; else echo "no extra/index.html to copy"; fi
+    - 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,355 +1,11 @@
 # Changelog

-## [6.3.2]
+All notable changes to this project will be documented in this file.

-### Changes
- Improve the notification area, @shevchenko0013 strikes again!
- Improve firmware attributes handling
- Very good looking UI restyling from @shevchenko0013
- Added support for GA402NV matrix: thanks @Ghoul4500
- Fixed aura CLI interface
- Fixed LEDs handling in rogcc
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

-## [6.3.1]
-
-### Changes
- Removed a lighting mode that is unavailable in windows to G835L: thanks to @shevchenko0013 again!
- Added translations for Ukranian language, thanks @shevchenko0013!
- Added LEDs definition for G615LR, thanks @btnrv
- Fix improper usage of Quiet when only LowPower is available
-
-## [6.3.0]
-
-### Changed
- Added support for TUF keyboard powerstate control
- Improved AniMe Matrix support thanks to @Seom1177 !
- Fixed a bug with one-shot battery change, thanks @bitr8 !
- Changed the CLI interface of asusctl to be less confusing
- Added support for G835L, thanks to @shevchenko0013 !
-
-## [6.2.0]
-
-### Changed
- Added aura support for FX607V: thanks @jomp16
- Added testing support for G835LW
- Added support for GU605C models slash lighting: thanks @Otters
- Restore fedora: thanks @ali205412
- Add support to G614F models slash lighting
-
-## [6.1.22]
-
-### Changed
- Allow configuration of nv_tgp
- Treat dGPU attributes as power profiles
- Add EXPERTBOOK DMI match to ensure the service is loaded
- Support G815L thanks to @solost !
-
-## [6.1.21]
-
-### Changed
- Kill Fedora: screw your cursed cargo bullshit
- Restore CI building
-
-## [6.1.20]
-
-### Changed
- Addded support for G635L: thanks @luca_pisl !
- Suppress verbose output in applications too, not just daemon
-
-## [6.1.18]
-
-### Changed
- Add aura support for G614FR (ROG Strix G16 2025)
- all notifications now respects the timeout 
- improve udev daemon-starting rule
- reduce log noise
-
-## [v6.1.17]
-
-### Changed
- Fix Makefile
- Share a single HID device
-
-## [v6.1.16]
-
-### Changed
- Expose more properties via rog-control-center
- Add support for a few more models
-
-## [v6.1.15]
-
-### 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
-
-## [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
- RGOCC: Fix quiet fan-curves availability
-
-## [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
- Fixes to PPT settings in UI
-
-## [v6.1.0-rc7]
-
- Refactor PPT handling more:
-  1. Per profile, per-ac/dc
-  2. Do not apply unless group is enabled
-  3. Better reset/disable handling
-  4. Selecting a profile defaults PPT to off/disabled
- Bugfix: prevent an AniMe thread async deadlock
-
-## [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
- Bug fix: correctly set charge limit from UI
-
-## [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
- Bug fix: better handle missing tray (for example gnome)
- Strip out all outdated and unsafe tuning stuff
- Allow each performance profile to have different PPT settings
-
-## [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
-
-## [v6.0.12]
-
-### Changed
- Add Ally X aura config
- Fixes to Ally led power configs
- Fix CLI led modes
- Add FX517Z to aura_support
- Add G614JJ Aura support
- Add G614JZ (2023 Strix G16) Aura support
-
-## [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
- Fixed AniMe on GA402XZ
- Update some of the G713 device aura features
- Update some of the G513 device aura features
-
-## [v6.0.10]
-
-### Added
- Add the GA401I model to aura_support.
-
-### Changed
-
- Aura support return a default aura definition instead of nothing
- Minor updates in aura controller to ensure configs are updated if the support file changes
- Don't panic if -ENODEV on fan_curve enable
- Adjust the G513Q support to match what is on the asus website.
- Adjust init sequence of anime to prevent accidental use of Slash as Anime
- Enable notifs and tray icon without supergfx
-
-## [v6.0.9]
-
-### Added
-
- Add G513RS to laptop DB.
- Add G512LI to laptop DB.
-
-### Changed
-
- Rename and recreate the default Anime config if cache setup fails
-
-### Fixed
-
- Nuke the issue of GUI taking 100% of a CPU core
-
-## [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.
-
-## [v6.0.7]
-
-### Changed
-
- Add a config option to set if throttle policy is changed on ac/bat change (UI only)
- Allow X11 GUI. This is *not* supported. Please see readme.
- Fixes to some GUI widget layouts and sizing
- Do a backup HID raw write fro brightness if the read-back value does not match. This is a temporary solve for some G14 and G16 until the kernel patch is ready.
- Reimplement the older 0x1866 MCU keyboard control power bits plus UI control for it. If you had a keyboard affected by Lightbar issues and it is older than a couple of years this should help. If not, please file a bug.
-
-## [v6.0.6]
-
-### Added
- Add GX650R laptop to aura DB
-
-### Changed
- Further tweaks to aura init
- More logging
- Fix TUF laptop led power
- Sanitize the dbus path for aura devices (remove `.` chars)
- Even more error handling (gracefully)
- Better checking for dbus interfaces
- Remove dbus `supported_interfaces`
- dbus ObjectManager is now at root `/`
-
-## [v6.0.5]
-
-### Changed
-
- Better more robust error handling in ROGCC
- Try to better handle pre-2021 laptops with lightbar
- Add more logging to try and trace the charge_control_end_threshold issue
- Make `kbd_brightness` optional to work around issues on some laptops that seem to lack it. Likely this will all need a refactor *again* if work proceeds in kernel for better RGB support.
-
-## [v6.0.4]
-
-### Changed
-
- Remove some `todo()` in rogcc
- Add missing `#[zbus(property)]` derive to Slash dbus properties
- Match G533Q laptop explicitly to the 0x8166 PID
-
-## [v6.0.3]
-
-### NOTE
-
- Xorg is not supported any longer. All major desktops and distros are Wayland.
-
-### Changed
-
- Add a check to prevent non-TUF laptops with screwed up method return from TUF acpi methods from trying to add a TUF aura device without actually being a TUF laptop.
- Make the G834JZ entry in aura db generic for all G834J
-
-## [v6.0.2]
-
-### Changed
-
- Clean up code
- Don't panic if no aura device in ROGCC
- Try to prevent an errorenous tuf keyboard detection
+## [Unreleased]

 ## [v6.0.1]

--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,57 +1,59 @@
+[workspace]
+members = [
+    "asusctl",
+    "asusd",
+    "asusd-user",
+    "config-traits",
+    "cpuctl",
+    "dmi-id",
+    "rog-platform",
+    "rog-dbus",
+    "rog-anime",
+    "rog-aura",
+    "rog-profiles",
+    "rog-control-center",
+    "rog-slash",
+    "simulators",
+]
+default-members = [
+    "asusctl",
+    "asusd",
+    "asusd-user",
+    "cpuctl",
+    "rog-control-center",
+]
+resolver = "2"
+
 [workspace.package]
-version = "6.3.1"
-rust-version = "1.82"
+version = "6.0.1"
+rust-version = "1.77"
 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"
 edition = "2021"

-[workspace]
-resolver = "2"
-members = [
-  "asusctl",
-  "asusd",
-  "asusd-user",
-  "config-traits",
-  "dmi-id",
-  "rog-platform",
-  "rog-dbus",
-  "rog-anime",
-  "rog-aura",
-  "rog-profiles",
-  "rog-control-center",
-  "rog-slash",
-  "simulators",
-  "rog-scsi",
-]
-
-default-members = ["asusctl", "asusd", "asusd-user", "rog-control-center"]
-
 [workspace.dependencies]
-tokio = { version = "^1.39.0", default-features = false, features = [
-  "macros",
-  "sync",
-  "time",
-  "rt",
-  "rt-multi-thread",
+tokio = { version = "^1.36.0", default-features = false, features = [
+    "macros",
+    "sync",
+    "time",
+    "rt-multi-thread",
 ] }
 concat-idents = "^1.1"
 dirs = "^4.0"
-smol = "^2.0"
+smol = "^1.3"
 mio = "0.8.11"

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

-serde = { version = "^1.0", features = ["serde_derive"] }
+serde = "^1.0"
+serde_derive = "^1.0"
 ron = "*"
+typeshare = "1.0.0"

 log = "^0.4"
 env_logger = "^0.10.0"
@@ -60,18 +62,18 @@ 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"

-notify-rust = { version = "4.11.5", features = ["z", "async"] }
-
-sg = { git = "https://github.com/flukejones/sg-rs.git" }
+notify-rust = { git = "https://github.com/flukejones/notify-rust.git", rev = "54176413b81189a3e4edbdc20a0b4f7e2e35c063", default-features = false, features = [
+    "z",
+] }

 [profile.release]
 # thin = 57s, asusd = 9.0M
@@ -80,15 +82,15 @@ lto = "fat"
 debug = false
 opt-level = 3
 panic = "abort"
-# codegen-units = 1
+codegen-units = 1

 [profile.dev]
 opt-level = 1
-# codegen-units = 1
+codegen-units = 16

 [profile.dev.package."*"]
 opt-level = 1
-# codegen-units = 1
+codegen-units = 16

 [profile.bench]
 debug = false
--- a/MANUAL.md
+++ b/MANUAL.md
@@ -48,7 +48,7 @@ The LED controller (e.g, aura) enables setting many of the factory modes availab

 #### Supported laptops

-There are over 80 supported laptops as of 01-01-2023. Please see [the rog-aura crate readme for further details](/rog-aura/README.md).
+There are over 60 supported laptops as of 01-01-2023. Please see [the rog-aura crate readme for further details](/rog-aura/README.md).

 ### Charge control

@@ -420,13 +420,13 @@ To switch to next/previous Aura modes you will need to bind both the aura keys (
 **Next**

 ```
-asusctl aura -n
+asusctl led-mode -n
 ```

 **Previous**

 ```
-asusctl aura -p
+asusctl led-mode -p
 ```

 To switch Fan/Thermal profiles you need to bind the Fn+F5 key to `asusctl profile -n`.
--- a/87
+++ b/87
@@ -1,4 +1,4 @@
-VERSION := $(shell /usr/bin/grep -Pm1 'version = "(\d+.\d+.\d+.*)"' Cargo.toml | cut -d'"' -f2)
+VERSION := $(shell /usr/bin/grep -Pm1 'version = "(\d.\d.\d)"' Cargo.toml | cut -d'"' -f2)

 INSTALL = install
 INSTALL_PROGRAM = ${INSTALL} -D -m 0755
@@ -17,8 +17,6 @@ BIN_D := asusd
 BIN_U := asusd-user
 LEDCFG := aura_support.ron

-DESTDIR_REALPATH = $(shell realpath $(DESTDIR))
-
 SRC := Cargo.toml Cargo.lock Makefile $(shell find -type f -wholename '**/src/*.rs')

 STRIP_BINARIES ?= 0
@@ -32,20 +30,6 @@ else
 	TARGET = debug
 endif

-X11 ?= 0
-ifeq ($(X11),1)
-	ARGS += --features "rog-control-center/x11"
-endif
-
-# Always use the versions in Cargo.lock by default
-ARGS += --locked
-
-# Allow optionally freezing the build to avoid any network access and enforce Cargo.lock strictly
-FROZEN ?= 0
-ifeq ($(FROZEN),1)
-	ARGS += --frozen
-endif
-
 VENDORED ?= 0
 ifeq ($(VENDORED),1)
 	ARGS += --frozen
@@ -59,38 +43,24 @@ 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
-
-install-asusd: target/$(TARGET)/$(BIN_D)
-	$(INSTALL_PROGRAM) "./target/$(TARGET)/$(BIN_D)" "$(DESTDIR)$(bindir)/$(BIN_D)"
-
-install-asusctl: target/$(TARGET)/$(BIN_C)
-	$(INSTALL_PROGRAM) "./target/$(TARGET)/$(BIN_C)" "$(DESTDIR)$(bindir)/$(BIN_C)"
-
-install-asusd_user: target/$(TARGET)/$(BIN_U)
-	$(INSTALL_PROGRAM) "./target/$(TARGET)/$(BIN_U)" "$(DESTDIR)$(bindir)/$(BIN_U)"
-
-install-rog_gui: target/$(TARGET)/$(BIN_ROG)
+install-program:
 	$(INSTALL_PROGRAM) "./target/$(TARGET)/$(BIN_ROG)" "$(DESTDIR)$(bindir)/$(BIN_ROG)"

-.PHONY: install-asusd install-asusctl install-asusd_user install-rog_gui
+	$(INSTALL_PROGRAM) "./target/$(TARGET)/$(BIN_C)" "$(DESTDIR)$(bindir)/$(BIN_C)"
+	$(INSTALL_PROGRAM) "./target/$(TARGET)/$(BIN_D)" "$(DESTDIR)$(bindir)/$(BIN_D)"
+	$(INSTALL_PROGRAM) "./target/$(TARGET)/$(BIN_U)" "$(DESTDIR)$(bindir)/$(BIN_U)"

-install-program: install-asusd install-asusctl install-asusd_user install-rog_gui
-
-install-data-rog_gui:
+install-data:
 	$(INSTALL_DATA) "./rog-control-center/data/$(BIN_ROG).desktop" "$(DESTDIR)$(datarootdir)/applications/$(BIN_ROG).desktop"
 	$(INSTALL_DATA) "./rog-control-center/data/$(BIN_ROG).png" "$(DESTDIR)$(datarootdir)/icons/hicolor/512x512/apps/$(BIN_ROG).png"
-	cd rog-aura/data/layouts && find . -type f -name "*.ron" -exec $(INSTALL_DATA) "{}" "$(DESTDIR_REALPATH)$(datarootdir)/rog-gui/layouts/{}" \;
+	cd rog-aura/data/layouts && find . -type f -name "*.ron" -exec $(INSTALL_DATA) "{}" "$(DESTDIR)$(datarootdir)/rog-gui/layouts/{}" \;
+
+	$(INSTALL_DATA) "./data/$(BIN_D).rules" "$(DESTDIR)$(libdir)/udev/rules.d/99-$(BIN_D).rules"
+	$(INSTALL_DATA) "./rog-aura/data/$(LEDCFG)" "$(DESTDIR)$(datarootdir)/asusd/$(LEDCFG)"
+	$(INSTALL_DATA) "./data/$(BIN_D).conf" "$(DESTDIR)$(datarootdir)/dbus-1/system.d/$(BIN_D).conf"
+
+	$(INSTALL_DATA) "./data/$(BIN_D).service" "$(DESTDIR)$(libdir)/systemd/system/$(BIN_D).service"
+	$(INSTALL_DATA) "./data/$(BIN_U).service" "$(DESTDIR)$(libdir)/systemd/user/$(BIN_U).service"

 	$(INSTALL_DATA) "./data/icons/asus_notif_yellow.png" "$(DESTDIR)$(datarootdir)/icons/hicolor/512x512/apps/asus_notif_yellow.png"
 	$(INSTALL_DATA) "./data/icons/asus_notif_green.png" "$(DESTDIR)$(datarootdir)/icons/hicolor/512x512/apps/asus_notif_green.png"
@@ -106,24 +76,9 @@ install-data-rog_gui:
 	$(INSTALL_DATA) "./data/icons/scalable/gpu-vfio.svg" "$(DESTDIR)$(datarootdir)/icons/hicolor/scalable/status/gpu-vfio.svg"
 	$(INSTALL_DATA) "./data/icons/scalable/notification-reboot.svg" "$(DESTDIR)$(datarootdir)/icons/hicolor/scalable/status/notification-reboot.svg"

-install-data-asusd:
-	$(INSTALL_DATA) "./data/$(BIN_D).rules" "$(DESTDIR)$(libdir)/udev/rules.d/99-$(BIN_D).rules"
-	$(INSTALL_DATA) "./rog-aura/data/$(LEDCFG)" "$(DESTDIR)$(datarootdir)/asusd/$(LEDCFG)"
-	$(INSTALL_DATA) "./data/$(BIN_D).conf" "$(DESTDIR)$(datarootdir)/dbus-1/system.d/$(BIN_D).conf"
-
-	$(INSTALL_DATA) "./data/$(BIN_D).service" "$(DESTDIR)$(libdir)/systemd/system/$(BIN_D).service"
-
-	cd rog-anime/data && find "./anime" -type f -exec $(INSTALL_DATA) "{}" "$(DESTDIR_REALPATH)$(datarootdir)/asusd/{}" \;
-
-install-data-asusd_user:
-	$(INSTALL_DATA) "./data/$(BIN_U).service" "$(DESTDIR)$(libdir)/systemd/user/$(BIN_U).service"
-
-.PHONY: install-data-asusd install-data-asusd_user
-
-install-data: install-data-asusd install-data-asusd_user install-data-rog_gui
+	cd rog-anime/data && find "./anime" -type f -exec $(INSTALL_DATA) "{}" "$(DESTDIR)$(datarootdir)/asusd/{}" \;

 install: install-program install-data
-	$(INSTALL_DATA) "./LICENSE" "$(DESTDIR)$(datarootdir)/asusctl/LICENSE"

 uninstall:
 	rm -f "$(DESTDIR)$(bindir)/$(BIN_ROG)"
@@ -158,12 +113,16 @@ 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
+	cargo vendor-filterer --platform x86_64-unknown-linux-gnu vendor
 	tar pcfJ vendor_asusctl_$(VERSION).tar.xz vendor
 	rm -rf vendor

+bindings:
+	typeshare ./rog-anime/src/ --lang=typescript --output-file=bindings/ts/anime.ts
+	typeshare ./rog-aura/src/ --lang=typescript --output-file=bindings/ts/aura.ts
+	typeshare ./rog-profiles/src/ --lang=typescript --output-file=bindings/ts/profiles.ts
+	typeshare ./rog-platform/src/ --lang=typescript --output-file=bindings/ts/platform.ts
+
 translate:
 	find -name \*.slint | xargs slint-tr-extractor -o rog-control-center/translations/en/rog-control-center.po

@@ -174,7 +133,7 @@ ifeq ($(VENDORED),1)
 	tar pxf vendor_asusctl_$(VERSION).tar.xz
 endif
 	cargo build $(ARGS)
-ifeq ($(STRIP_BINARIES),1)
+ifneq ($(STRIP_BINARIES),0)
 	strip -s ./target/$(TARGET)/$(BIN_C)
 	strip -s ./target/$(TARGET)/$(BIN_D)
 	strip -s ./target/$(TARGET)/$(BIN_U)
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # `asusctl` for ASUS ROG

-[![Become a Patron!](https://github.com/codebard/patron-button-and-widgets-by-codebard/blob/master/images/become_a_patron_button.png?raw=true)](https://www.patreon.com/bePatron?u=7602281) [![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/V7V5CLU67) - [Asus Linux Website](https://asus-linux.org/)
+[Become a Patron!](https://www.patreon.com/bePatron?u=7602281) - [Asus Linux Website](https://asus-linux.org/)

 **WARNING:** Many features are developed in tandem with kernel patches. If you see a feature is missing you either need a patched kernel or latest release.

@@ -11,13 +11,7 @@ Now includes a GUI, `rog-control-center`.

 ## Kernel support

-Due to on-going driver work the minimum suggested kernel version is always **the latest*, as improvements and fixes are continuous.
-
-Support for TDP is tied to the new asus-armoury driver: available mainline since linux 6.19: everything older is not supported.
-
-## X11 support
-
-X11 is not supported at all, as in I will not help you with X11 issues if there are any due to limited time and it being unmaintained itself. You can however build `rog-control-center` with it enabled `cargo build --features "rog-control-center/x11"`.
+**The minimum supported kernel version is 6.10**, which will contain the patches from [here](https://lore.kernel.org/platform-driver-x86/20240404001652.86207-1-luke@ljones.dev/). Z13 devices will need [these](https://lore.kernel.org/linux-input/20240416090402.31057-1-luke@ljones.dev/T/#t)

 ## Goals

@@ -35,22 +29,18 @@ The level of support for laptops is dependent on folks submitting data to includ

 See the [rog-aura readme](./rog-aura/README.md) for more details.

-## Discord
-
-[![Discord](https://img.shields.io/badge/Discord-7289DA?style=for-the-badge&logo=discord&logoColor=white)](https://discord.gg/B8GftRW2Hd)
-
 ## SUPPORTED LAPTOPS

 Most ASUS gaming laptops that have a USB keyboard. If `lsusb` shows something similar
 to this:

-```plain
+```
 Bus 001 Device 002: ID 0b05:1866 ASUSTek Computer, Inc. N-KEY Device
 ```

 or

-```plain
+```
 Bus 003 Device 002: ID 0b05:19b6 ASUSTek Computer, Inc. [unknown]
 ```

@@ -72,56 +62,33 @@ The list is a bit outdated as many features have been enabled in the Linux kerne
 - [x] Toggle bios setting for boot/POST sound
 - [x] Toggle GPU MUX (g-sync, or called MUX on 2022+ laptops)

-## GUI
+# GUI

 A gui is now in the repo - ROG Control Center. At this time it is still a WIP, but it has almost all features in place already.

-**NOTE**: Xorg is not supported.
+# BUILDING

-## BUILDING
-
-Rust and cargo are required, they can be installed from [rustup.rs](https://rustup.rs/).
-
-Distro packaging should work with the stable toolchain. If your distro does not provide a recent Rust toolchain, install rustup and use the stable toolchain.
+Rust and cargo are required, they can be installed from [rustup.rs](https://rustup.rs/) or from the distro repos if newer than 1.75.

 **fedora:**

-```sh
-dnf install cmake clang-devel  libxkbcommon-devel systemd-devel expat-devel pcre2-devel libzstd-devel gtk3-devel
-make
-sudo make install
-```
+    dnf install cmake clang-devel libinput-devel libseat-devel libgbm-devel libxkbcommon-devel systemd-devel \
+    libdrm-devel expat-devel pcre2-devel libzstd-devel libappindicator-gtk3
+    make
+    sudo make install

 **openSUSE:**

 Works with KDE Plasma (without GTK packages)

-```sh
-zypper in -t pattern devel_basis
-zypper in rustup make cmake clang-devel libxkbcommon-devel systemd-devel expat-devel pcre2-devel libzstd-devel gtk3-devel
-make
-sudo make install
-```
-
-**Debian(unsuported):**
-
-officially unsuported,but you can still try and test it by yourself(some features may not be available).
-
-```sh
-sudo apt install libclang-dev libudev-dev libfontconfig-dev build-essential cmake libxkbcommon-dev
-curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
-make
-sudo make install
-```
+    zypper in -t pattern devel_basis
+    zypper in rustup make cmake libinput-devel libseat-devel libgbm-devel systemd-devel clang-devel llvm-devel gdk-pixbuf-devel cairo-devel pango-devel freetype-devel libexpat-devel libayatana-indicator3-7
+    make
+    sudo make install

 **Ubuntu, Popos (unsuported):**

-```sh
-sudo apt install make cargo gcc pkg-config openssl libasound2-dev cmake build-essential python3 libfreetype6-dev libexpat1-dev libxcb-composite0-dev libssl-dev libx11-dev libfontconfig1-dev curl libclang-dev libudev-dev checkinstall libseat-dev libinput-dev libxkbcommon-dev libgbm-dev
-
-make
-sudo make install
-```
+instructions removed as outdated

 ## Installing

@@ -139,15 +106,15 @@ You may also need to activate the service for debian install. If running Pop!\_O

 If you are upgrading from a previous installed version, you will need to restart the service or reboot.

-```sh
-systemctl daemon-reload && systemctl restart asusd
+```
+$ systemctl daemon-reload && systemctl restart asusd
 ```

 ## Uninstalling

 Run `sudo make uninstall` in the source repo, and remove `/etc/asusd/`.

-## Contributing
+# Contributing

 See `CONTRIBUTING.md`. Additionally, also do `cargo clean` and `cargo test` on first checkout to ensure the commit hooks are used (via `cargo-husky`).

@@ -155,17 +122,21 @@ Generation of the bindings with `make bindings` requires `typeshare` to be insta

 Dbus introsepction XML requires with `make introspection` requires `anime_sim` to be running before starting `asusd`.

-## OTHER
+# Join the Community

-### AniMe Matrix simulator
+[![Discord](https://img.shields.io/badge/Discord-7289DA?style=for-the-badge&logo=discord&logoColor=white)](https://discord.gg/z8y99XqPb7)
+
+# OTHER
+
+## AniMe Matrix simulator

 A simulator using SDL2 can be built using `cargo build --package rog_simulators` and run with `./target/debug/anime_sim`. Once started `asusd` will need restarting to pick it up. If running this sim on a laptop _with_ the display, the simulated display will be used instead of the physical display.

-### Supporting more laptops
+## Supporting more laptops

 Please file a support request.

-## License & Trademarks
+# License & Trademarks

 Mozilla Public License 2 (MPL-2.0)

@@ -178,7 +149,3 @@ Reference to any ASUS products, services, processes, or other information and/or
 The use of ROG and ASUS trademarks within this website and associated tools and libraries is only to provide a recognisable identifier to users to enable them to associate that these tools will work with ASUS ROG laptops.

 ---
-
-## AI Disaclaimer
-
-Portions of this code have been written by various AI tools and reviewed by the maintainer exaclty as with every other contribution.
--- a/asusctl/Cargo.toml
+++ b/asusctl/Cargo.toml
@@ -10,33 +10,19 @@ edition.workspace = true

 [dependencies]
 rog_anime = { path = "../rog-anime" }
-rog_scsi = { path = "../rog-scsi" }
 rog_slash = { path = "../rog-slash" }
 rog_aura = { path = "../rog-aura" }
 rog_dbus = { path = "../rog-dbus" }
 rog_profiles = { path = "../rog-profiles" }
 rog_platform = { path = "../rog-platform" }
+asusd = { path = "../asusd" }
 dmi_id = { path = "../dmi-id" }

-log.workspace = true
-env_logger.workspace = true
-
 ron.workspace = true
 gumdrop.workspace = true
 zbus.workspace = true
-argh = "0.1"

 [dev-dependencies]
 rog_dbus = { path = "../rog-dbus" }

-[package.metadata.deb]
-license-file = ["../LICENSE", "4"]
-extended-description = """\
-An utility for Linux to control many aspects of various ASUS laptops
-but can also be used with non-asus laptops with reduced features."""
-depends = "$auto"
-section = "utility"
-priority = "optional"
-assets = [
-  ["target/release/asusctl", "usr/bin/", "755"],
-]
+cargo-husky.workspace = true
--- a/asusctl/examples/anime-diag-png.rs
+++ b/asusctl/examples/anime-diag-png.rs
@@ -26,7 +26,7 @@ fn main() -> Result<(), Box<dyn Error>> {
        AnimeType::GA401,
    )?;

-    let anime_type = get_anime_type();
+    let anime_type = get_anime_type()?;

    proxy.write(matrix.into_data_buffer(anime_type)?).unwrap();

--- a/asusctl/examples/anime-diag.rs
+++ b/asusctl/examples/anime-diag.rs
@@ -29,7 +29,7 @@ fn main() {
            }
        }

-        let anime_type = get_anime_type();
+        let anime_type = get_anime_type().unwrap();
        proxy
            .write(matrix.into_data_buffer(anime_type).unwrap())
            .unwrap();
--- a/asusctl/examples/anime-gif.rs
+++ b/asusctl/examples/anime-gif.rs
@@ -19,7 +19,7 @@ fn main() {

    let path = Path::new(&args[1]);
    let brightness = args[2].parse::<f32>().unwrap();
-    let anime_type = get_anime_type();
+    let anime_type = get_anime_type().unwrap();
    let mut seq = Sequences::new(anime_type);
    seq.insert(
        0,
--- a/asusctl/examples/anime-grid.rs
+++ b/asusctl/examples/anime-grid.rs
@@ -14,7 +14,7 @@ fn main() {
    let conn = Connection::system().unwrap();
    let proxy = AnimeProxyBlocking::new(&conn).unwrap();

-    let anime_type = get_anime_type();
+    let anime_type = get_anime_type().unwrap();
    let mut matrix = AnimeGrid::new(anime_type);
    let tmp = matrix.get_mut();

--- a/asusctl/examples/anime-led-scan.rs
+++ b/asusctl/examples/anime-led-scan.rs
@@ -1,547 +0,0 @@
-//! LED scanning tool for discovering AniMe Matrix buffer-to-LED mappings.
-//!
-//! This tool lights up one buffer index at a time, allowing you to observe
-//! which physical LED corresponds to each buffer position. This is essential
-//! for mapping new device types like G835L where the exact layout is unknown.
-//!
-//! You might want to use it slowly, as it sometimes doesn't work properly.
-//! Maybe there's better ways to make this reliable but for now it works for my use case.
-//!
-//! # Usage
-//! ```
-//! cargo run --example anime-led-scan -- [options]
-//! ```
-//!
-//! # Controls
-//! - `n` or `Enter`: Next index
-//! - `p` or `Backspace`: Previous index
-//! - `j` followed by number: Jump to specific index
-//! - `+` / `-`: Adjust step size (default 1)
-//! - `s`: Save current index to notes file
-//! - `r`: Mark current index as row start
-//! - `q` or `Ctrl+C`: Quit
-//!
-//! # Output
-//! Creates a `led-scan-notes.txt` file with recorded observations.
-
-use std::env;
-use std::fs::OpenOptions;
-use std::io::{self, BufRead, Write};
-
-use rog_anime::usb::{get_anime_type, Brightness};
-use rog_anime::{AnimeDataBuffer, AnimeType};
-use rog_dbus::zbus_anime::AnimeProxyBlocking;
-use zbus::blocking::Connection;
-
-/// Saved device state for restoration on exit
-struct SavedState {
-    builtins_enabled: bool,
-    brightness: Brightness,
-    display_enabled: bool,
-}
-
-fn print_help(scan_len: usize, buffer_len: usize) {
-    println!("\n=== LED Scan Tool ===");
-    println!(
-        "Scan range: 0-{} (buffer size: {})",
-        scan_len - 1,
-        buffer_len
-    );
-    println!("Commands:");
-    println!("  n, Enter     - Next index");
-    println!("  p, Backspace - Previous index");
-    println!("  j <num>      - Jump to index");
-    println!("  + / -        - Increase/decrease step size");
-    println!("  s            - Save note for current index");
-    println!("  r            - Mark as row start");
-    println!("  a            - Auto-scan (runs through all indices)");
-    println!("  f            - Fill all buffer bytes");
-    println!("  f <start> <end> - Fill range (inclusive)");
-    println!("  p1/p2/p3     - Fill pane 1/2/3 only (each is 627 bytes)");
-    println!("  hold         - Hold current LED (press Enter to release)");
-    println!("  hold <s> <e> - Hold range (press Enter to release)");
-    println!("  c            - Clear display");
-    println!("  row          - Step through rows (G835L, provisional)");
-    println!("  row <n>      - Show specific row (G835L, provisional)");
-    println!("  allrows      - Light all rows sequentially (G835L)");
-    println!("  rowmap       - Print the full row mapping (G835L)");
-    println!("  h            - Show this help");
-    println!("  q            - Quit and restore state");
-    println!();
-}
-
-fn save_note(index: usize, note: &str) -> io::Result<()> {
-    let mut file = OpenOptions::new()
-        .create(true)
-        .append(true)
-        .open("led-scan-notes.txt")?;
-    writeln!(file, "Index {}: {}", index, note)?;
-    Ok(())
-}
-
-fn write_single_led(
-    proxy: &AnimeProxyBlocking,
-    anime_type: AnimeType,
-    index: usize,
-    brightness: u8,
-) {
-    let mut buffer = AnimeDataBuffer::new(anime_type);
-    let data = buffer.data_mut();
-    if index < data.len() {
-        data[index] = brightness;
-    }
-    if let Err(e) = proxy.write(buffer) {
-        eprintln!("Error writing to device: {}", e);
-    }
-}
-
-fn clear_display(proxy: &AnimeProxyBlocking, anime_type: AnimeType) {
-    let buffer = AnimeDataBuffer::new(anime_type);
-    let _ = proxy.write(buffer);
-}
-
-fn fill_display(proxy: &AnimeProxyBlocking, anime_type: AnimeType, brightness: u8) {
-    let mut buffer = AnimeDataBuffer::new(anime_type);
-    let data = buffer.data_mut();
-    for byte in data.iter_mut() {
-        *byte = brightness;
-    }
-    if let Err(e) = proxy.write(buffer) {
-        eprintln!("Error writing to device: {}", e);
-    }
-}
-
-/// Fill a range of LEDs. Both start and end are INCLUSIVE.
-fn fill_range(
-    proxy: &AnimeProxyBlocking,
-    anime_type: AnimeType,
-    start: usize,
-    end: usize,
-    brightness: u8,
-) {
-    let mut buffer = AnimeDataBuffer::new(anime_type);
-    let data = buffer.data_mut();
-    for i in start..=end.min(data.len().saturating_sub(1)) {
-        data[i] = brightness;
-    }
-    if let Err(e) = proxy.write(buffer) {
-        eprintln!("Error writing to device: {}", e);
-    }
-}
-
-fn fill_pane(proxy: &AnimeProxyBlocking, anime_type: AnimeType, pane: usize, brightness: u8) {
-    const PANE_LEN: usize = 627;
-    let start = pane * PANE_LEN;
-    let end = start + PANE_LEN - 1;
-    fill_range(proxy, anime_type, start, end, brightness);
-}
-
-/// G835L row pattern (PROVISIONAL - needs hardware verification):
-/// - Rows 0-1: 1 LED each
-/// - Rows 2-3: 2 LEDs each
-/// - ... (pairs of rows with same length)
-/// - Rows 26-27: 14 LEDs each
-/// - Rows 28+: 15 LEDs each (constant)
-///
-/// Returns (start_index, end_index_inclusive, row_length)
-fn g835l_row_bounds(row: usize) -> (usize, usize, usize) {
-    let triangle_rows = 28;
-    let triangle_leds = 210;
-
-    if row < triangle_rows {
-        let length = row / 2 + 1;
-        let mut start = 0usize;
-        for r in 0..row {
-            start += r / 2 + 1;
-        }
-        (start, start + length - 1, length)
-    } else {
-        let rows_after_triangle = row - triangle_rows;
-        let start = triangle_leds + rows_after_triangle * 15;
-        (start, start + 14, 15)
-    }
-}
-
-fn g835l_total_rows() -> usize {
-    28 + 40
-}
-
-fn save_state(proxy: &AnimeProxyBlocking) -> SavedState {
-    SavedState {
-        builtins_enabled: proxy.builtins_enabled().unwrap_or(false),
-        brightness: proxy.brightness().unwrap_or(Brightness::Med),
-        display_enabled: proxy.enable_display().unwrap_or(true),
-    }
-}
-
-fn restore_state(proxy: &AnimeProxyBlocking, state: &SavedState) {
-    let _ = proxy.set_builtins_enabled(state.builtins_enabled);
-    let _ = proxy.set_brightness(state.brightness);
-    let _ = proxy.set_enable_display(state.display_enabled);
-    let _ = proxy.run_main_loop(true);
-}
-
-fn main() {
-    let args: Vec<String> = env::args().collect();
-
-    let mut start_index = 0usize;
-    let mut brightness = 200u8;
-    let mut scan_limit: Option<usize> = None;
-
-    let mut i = 1;
-    while i < args.len() {
-        match args[i].as_str() {
-            "--start" | "-s" => {
-                if i + 1 < args.len() {
-                    start_index = args[i + 1].parse().unwrap_or(0);
-                    i += 1;
-                }
-            }
-            "--brightness" | "-b" => {
-                if i + 1 < args.len() {
-                    brightness = args[i + 1].parse().unwrap_or(200);
-                    i += 1;
-                }
-            }
-            "--limit" | "-l" => {
-                if i + 1 < args.len() {
-                    scan_limit = args[i + 1].parse().ok();
-                    i += 1;
-                }
-            }
-            "--help" | "-h" => {
-                println!("LED Scan Tool for AniMe Matrix");
-                println!();
-                println!("Usage: anime-led-scan [options]");
-                println!();
-                println!("Options:");
-                println!("  -s, --start <N>      Start at index N (default: 0)");
-                println!("  -b, --brightness <N> LED brightness 0-255 (default: 200)");
-                println!("  -l, --limit <N>      Cap scan range to N indices (e.g. 810 for G835L)");
-                println!("  -h, --help           Show this help");
-                return;
-            }
-            _ => {}
-        }
-        i += 1;
-    }
-
-    let conn = match Connection::system() {
-        Ok(c) => c,
-        Err(e) => {
-            eprintln!("Failed to connect to D-Bus: {}", e);
-            eprintln!("Make sure asusd is running.");
-            return;
-        }
-    };
-
-    let proxy = match AnimeProxyBlocking::new(&conn) {
-        Ok(p) => p,
-        Err(e) => {
-            eprintln!("Failed to create Anime proxy: {}", e);
-            eprintln!("Make sure asusd supports your device.");
-            return;
-        }
-    };
-
-    let anime_type = get_anime_type();
-    let buffer_len = anime_type.data_length();
-    let scan_len = scan_limit.unwrap_or(buffer_len).min(buffer_len);
-
-    println!("=== LED Scan Tool ===");
-    println!("Device type: {:?}", anime_type);
-    println!("Buffer length: {} bytes", buffer_len);
-    println!("Scan range: 0-{}", scan_len - 1);
-    println!("Brightness: {}", brightness);
-    println!();
-
-    // Save current state for restoration
-    let saved_state = save_state(&proxy);
-    println!("Saved device state for restoration on exit.");
-
-    // Stop system animations
-    if let Err(e) = proxy.run_main_loop(false) {
-        eprintln!("Warning: Could not stop main loop: {}", e);
-    }
-    println!("Stopped system animations.");
-
-    print_help(scan_len, buffer_len);
-
-    let mut current_index = start_index.min(scan_len - 1);
-    let mut step = 1usize;
-
-    write_single_led(&proxy, anime_type, current_index, brightness);
-    println!(">>> Index: {} (step: {})", current_index, step);
-
-    let stdin = io::stdin();
-    let mut input = String::new();
-
-    loop {
-        input.clear();
-        print!("> ");
-        io::stdout().flush().unwrap();
-
-        if stdin.lock().read_line(&mut input).is_err() {
-            break;
-        }
-
-        let cmd = input.trim();
-
-        match cmd {
-            "q" | "quit" | "exit" => {
-                clear_display(&proxy, anime_type);
-                restore_state(&proxy, &saved_state);
-                println!("Restored device state. Goodbye!");
-                break;
-            }
-            "n" | "" => {
-                current_index = (current_index + step).min(scan_len - 1);
-                write_single_led(&proxy, anime_type, current_index, brightness);
-                println!(">>> Index: {} (step: {})", current_index, step);
-            }
-            "p" => {
-                current_index = current_index.saturating_sub(step);
-                write_single_led(&proxy, anime_type, current_index, brightness);
-                println!(">>> Index: {} (step: {})", current_index, step);
-            }
-            "+" => {
-                step = step.saturating_mul(2).max(1);
-                println!("Step size: {}", step);
-            }
-            "-" => {
-                step = step.saturating_div(2).max(1);
-                println!("Step size: {}", step);
-            }
-            "r" => {
-                if let Err(e) = save_note(current_index, "ROW START") {
-                    eprintln!("Error saving note: {}", e);
-                } else {
-                    println!("Saved: Index {} marked as ROW START", current_index);
-                }
-            }
-            "h" | "help" | "?" => {
-                print_help(scan_len, buffer_len);
-            }
-            cmd if cmd.starts_with('j') => {
-                let num_str = cmd.trim_start_matches('j').trim();
-                if let Ok(idx) = num_str.parse::<usize>() {
-                    if idx < scan_len {
-                        current_index = idx;
-                        write_single_led(&proxy, anime_type, current_index, brightness);
-                        println!(">>> Index: {} (step: {})", current_index, step);
-                    } else {
-                        println!("Index {} out of range (max: {})", idx, scan_len - 1);
-                    }
-                } else {
-                    println!("Usage: j <number>");
-                }
-            }
-            cmd if cmd.starts_with('s') && !cmd.starts_with("show") => {
-                let note = cmd.trim_start_matches('s').trim();
-                let note = if note.is_empty() { "observed" } else { note };
-                if let Err(e) = save_note(current_index, note) {
-                    eprintln!("Error saving note: {}", e);
-                } else {
-                    println!("Saved note for index {}", current_index);
-                }
-            }
-            "a" => {
-                println!("Auto-scan mode (0 to {})...", scan_len - 1);
-                let delay = std::time::Duration::from_millis(10);
-                for idx in current_index..scan_len {
-                    write_single_led(&proxy, anime_type, idx, brightness);
-                    print!("\rIndex: {} / {}   ", idx, scan_len - 1);
-                    io::stdout().flush().unwrap();
-                    std::thread::sleep(delay);
-                    current_index = idx;
-                }
-                println!();
-                println!("Auto-scan complete. Current index: {}", current_index);
-            }
-            "c" => {
-                clear_display(&proxy, anime_type);
-                println!("Display cleared");
-            }
-            "f" => {
-                fill_display(&proxy, anime_type, brightness);
-                println!("All buffer bytes filled at brightness {}", brightness);
-            }
-            "p1" => {
-                fill_pane(&proxy, anime_type, 0, brightness);
-                println!("Pane 1 (indices 0-626) filled");
-            }
-            "p2" => {
-                fill_pane(&proxy, anime_type, 1, brightness);
-                println!("Pane 2 (indices 627-1253) filled");
-            }
-            "p3" => {
-                fill_pane(&proxy, anime_type, 2, brightness);
-                println!("Pane 3 (indices 1254-1880) filled");
-            }
-            cmd if cmd.starts_with("f ") => {
-                let parts: Vec<&str> = cmd.split_whitespace().collect();
-                if parts.len() == 3 {
-                    if let (Ok(start), Ok(end)) =
-                        (parts[1].parse::<usize>(), parts[2].parse::<usize>())
-                    {
-                        fill_range(&proxy, anime_type, start, end, brightness);
-                        println!("Filled indices {} to {}", start, end);
-                    } else {
-                        println!("Usage: f <start> <end>");
-                    }
-                } else {
-                    println!("Usage: f <start> <end>");
-                }
-            }
-            "show" => {
-                write_single_led(&proxy, anime_type, current_index, brightness);
-                println!(">>> Index: {} (step: {})", current_index, step);
-            }
-            "row" => {
-                if anime_type != AnimeType::G835L {
-                    println!("Warning: Row commands use G835L mapping (provisional). You can add to this code to support other types. `examples/anime-led-scan.rs[402:425]`");
-                }
-                println!("Row stepping mode. Press Enter for next row, 'q' to quit.");
-                let total = g835l_total_rows();
-                for row_num in 0..total {
-                    let (start, end, len) = g835l_row_bounds(row_num);
-                    if end >= scan_len {
-                        println!("Row {} exceeds scan limit, stopping.", row_num);
-                        break;
-                    }
-                    println!("Row {}: indices {}-{} ({} LEDs)", row_num, start, end, len);
-                    fill_range(&proxy, anime_type, start, end, brightness);
-                    input.clear();
-                    print!("(Enter=next, q=quit) > ");
-                    io::stdout().flush().unwrap();
-                    if stdin.lock().read_line(&mut input).is_err() {
-                        break;
-                    }
-                    if input.trim() == "q" {
-                        break;
-                    }
-                    clear_display(&proxy, anime_type);
-                }
-                println!("Row stepping done.");
-            }
-            cmd if cmd.starts_with("row ") => {
-                if anime_type != AnimeType::G835L {
-                    println!("Warning: Row commands use G835L mapping (provisional).");
-                }
-                let row_str = cmd.trim_start_matches("row ").trim();
-                if let Ok(row_num) = row_str.parse::<usize>() {
-                    let total = g835l_total_rows();
-                    if row_num < total {
-                        let (start, end, len) = g835l_row_bounds(row_num);
-                        if end < scan_len {
-                            println!("Row {}: indices {}-{} ({} LEDs)", row_num, start, end, len);
-                            fill_range(&proxy, anime_type, start, end, brightness);
-                        } else {
-                            println!("Row {} exceeds scan limit", row_num);
-                        }
-                    } else {
-                        println!("Row {} out of range (max: {})", row_num, total - 1);
-                    }
-                } else {
-                    println!("Usage: row <number>");
-                }
-            }
-            "allrows" => {
-                if anime_type != AnimeType::G835L {
-                    println!("Warning: Row commands use G835L mapping (provisional).");
-                }
-                println!("Lighting all rows sequentially (200ms each)...");
-                let total = g835l_total_rows();
-                let delay = std::time::Duration::from_millis(200);
-                for row_num in 0..total {
-                    let (start, end, len) = g835l_row_bounds(row_num);
-                    if end >= scan_len {
-                        println!("\nRow {} exceeds scan limit, stopping.", row_num);
-                        break;
-                    }
-                    print!(
-                        "\rRow {}/{}: indices {}-{} ({} LEDs)    ",
-                        row_num,
-                        total - 1,
-                        start,
-                        end,
-                        len
-                    );
-                    io::stdout().flush().unwrap();
-                    fill_range(&proxy, anime_type, start, end, brightness);
-                    std::thread::sleep(delay);
-                    clear_display(&proxy, anime_type);
-                }
-                println!("\nDone.");
-            }
-            "rowmap" => {
-                if anime_type != AnimeType::G835L {
-                    println!("Warning: Row map is for G835L (provisional).");
-                }
-                println!("G835L Row Map:");
-                let total = g835l_total_rows();
-                for row_num in 0..total {
-                    let (start, end, len) = g835l_row_bounds(row_num);
-                    let marker = if end >= scan_len {
-                        " (exceeds limit)"
-                    } else {
-                        ""
-                    };
-                    println!(
-                        "  Row {:2}: indices {:4}-{:4} ({:2} LEDs){}",
-                        row_num, start, end, len, marker
-                    );
-                }
-            }
-            "hold" => {
-                // Single write, wait for Enter to release
-                println!("Holding index {}. Press Enter to release...", current_index);
-                write_single_led(&proxy, anime_type, current_index, brightness);
-                input.clear();
-                let _ = stdin.lock().read_line(&mut input);
-                clear_display(&proxy, anime_type);
-                println!("Released.");
-            }
-            cmd if cmd.starts_with("hold ") => {
-                let arg = cmd.trim_start_matches("hold ").trim();
-                let (start, end): (usize, usize) = match arg {
-                    "p1" | "1" => (0, 626),
-                    "p2" | "2" => (627, 1253),
-                    _ => {
-                        let parts: Vec<&str> = arg.split_whitespace().collect();
-                        if parts.len() == 2 {
-                            if let (Ok(s), Ok(e)) = (parts[0].parse(), parts[1].parse()) {
-                                (s, e)
-                            } else {
-                                println!("Usage: hold p1, hold p2, or hold <start> <end>");
-                                continue;
-                            }
-                        } else {
-                            println!("Usage: hold p1, hold p2, or hold <start> <end>");
-                            continue;
-                        }
-                    }
-                };
-                println!("Holding range {}-{}. Press Enter to release...", start, end);
-                fill_range(&proxy, anime_type, start, end, brightness);
-                input.clear();
-                let _ = stdin.lock().read_line(&mut input);
-                clear_display(&proxy, anime_type);
-                println!("Released.");
-            }
-            _ => {
-                if let Ok(idx) = cmd.parse::<usize>() {
-                    if idx < scan_len {
-                        current_index = idx;
-                        write_single_led(&proxy, anime_type, current_index, brightness);
-                        println!(">>> Index: {} (step: {})", current_index, step);
-                    } else {
-                        println!("Index {} out of range (max: {})", idx, scan_len - 1);
-                    }
-                } else {
-                    println!("Unknown command: '{}'. Type 'h' for help.", cmd);
-                }
-            }
-        }
-    }
-}
--- a/asusctl/examples/anime-outline.rs
+++ b/asusctl/examples/anime-outline.rs
@@ -9,7 +9,7 @@ use zbus::blocking::Connection;
 fn main() {
    let conn = Connection::system().unwrap();
    let proxy = AnimeProxyBlocking::new(&conn).unwrap();
-    let anime_type = get_anime_type();
+    let anime_type = get_anime_type().unwrap();
    let mut matrix = AnimeDataBuffer::new(anime_type);
    matrix.data_mut()[1] = 100; // start = 1
    for n in matrix.data_mut()[2..32].iter_mut() {
--- a/asusctl/examples/anime-png.rs
+++ b/asusctl/examples/anime-png.rs
@@ -20,7 +20,7 @@ fn main() -> Result<(), Box<dyn Error>> {
        exit(-1);
    }

-    let anime_type = get_anime_type();
+    let anime_type = get_anime_type()?;
    let matrix = AnimeImage::from_png(
        Path::new(&args[1]),
        args[2].parse::<f32>().unwrap(),
--- a/asusctl/examples/anime-spinning.rs
+++ b/asusctl/examples/anime-spinning.rs
@@ -23,7 +23,7 @@ fn main() -> Result<(), Box<dyn Error>> {
        exit(-1);
    }

-    let anime_type = get_anime_type();
+    let anime_type = get_anime_type()?;
    let mut matrix = AnimeImage::from_png(
        Path::new(&args[1]),
        args[2].parse::<f32>().unwrap(),
--- 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,
-        default = "0",
-        description = "how many loops to play - 0 is infinite"
+    #[options(
+        meta = "",
+        default = "1",
+        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,
-        default = "0",
-        description = "how many loops to play - 0 is infinite"
+    #[options(
+        meta = "",
+        default = "1",
+        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,66 @@
-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),
 }

-/// 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,429 +70,174 @@ 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,
 }

-/// Two-colour star effect (separate subcommand name)
-#[derive(FromArgs, Debug, Clone, Default)]
-#[argh(subcommand, name = "stars", description = "two-colour star effect")]
-pub struct StarsTwoColour {
-    #[argh(option, description = "set the first RGB value e.g. ff00ff")]
-    pub colour: Colour,
-
-    #[argh(option, description = "set the second RGB value e.g. ff00ff")]
-    pub colour2: Colour,
-
-    #[argh(option, description = "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"
-    )]
-    pub zone: AuraZone,
-}
-
-/// Rain effect (single-speed, separate subcommand name)
-#[derive(FromArgs, Debug, Clone, Default)]
-#[argh(
-    subcommand,
-    name = "rain",
-    description = "single speed-based rain effect"
-)]
-pub struct RainSingleSpeed {
-    #[argh(option, description = "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"
-    )]
-    pub zone: AuraZone,
-}
-
-/// Laser (single-colour with speed) separate subcommand
-#[derive(FromArgs, Debug, Clone, Default)]
-#[argh(
-    subcommand,
-    name = "laser",
-    description = "single-colour effect with speed"
-)]
-pub struct LaserSingleColourSpeed {
-    #[argh(option, short = 'c', description = "set the RGB value e.g. ff00ff")]
-    pub colour: Colour,
-
-    #[argh(option, description = "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"
-    )]
-    pub zone: AuraZone,
-}
-
-/// Ripple (single-colour with speed) separate subcommand
-#[derive(FromArgs, Debug, Clone, Default)]
-#[argh(
-    subcommand,
-    name = "ripple",
-    description = "single-colour effect with speed"
-)]
-pub struct RippleSingleColourSpeed {
-    #[argh(option, short = 'c', description = "set the RGB value e.g. ff00ff")]
-    pub colour: Colour,
-
-    #[argh(option, description = "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"
-    )]
-    pub zone: AuraZone,
-}
-
-/// Pulse / Comet / Flash variants (single-colour) separate subcommands
-#[derive(FromArgs, Debug, Clone, Default)]
-#[argh(subcommand, name = "pulse", description = "single-colour pulse effect")]
-pub struct PulseSingleColour {
-    #[argh(option, short = 'c', description = "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"
-    )]
-    pub zone: AuraZone,
-}
-
-#[derive(FromArgs, Debug, Clone, Default)]
-#[argh(subcommand, name = "comet", description = "single-colour comet effect")]
-pub struct CometSingleColour {
-    #[argh(option, short = 'c', description = "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"
-    )]
-    pub zone: AuraZone,
-}
-
-#[derive(FromArgs, Debug, Clone, Default)]
-#[argh(subcommand, name = "flash", description = "single-colour flash effect")]
-pub struct FlashSingleColour {
-    #[argh(option, short = 'c', description = "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"
-    )]
-    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
-    RainbowWave(SingleSpeedDirection), // 3
-    Stars(StarsTwoColour),             // 4
-    Rain(RainSingleSpeed),             // 5
-    Highlight(SingleColourSpeed),      // 6
-    Laser(LaserSingleColourSpeed),     // 7
-    Ripple(RippleSingleColourSpeed),   // 8
-    Pulse(PulseSingleColour),          // 10
-    Comet(CometSingleColour),          // 11
-    Flash(FlashSingleColour),          // 12
+    #[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")]
+    Strobe(SingleSpeed), // 2
+    #[options(help = "rainbow cycling in one of four directions")]
+    Rainbow(SingleSpeedDirection), // 3
+    #[options(help = "rain pattern mimicking raindrops")]
+    Stars(TwoColourSpeed), // 4
+    #[options(help = "rain pattern of three preset colours")]
+    Rain(SingleSpeed), // 5
+    #[options(help = "pressed keys are highlighted to fade")]
+    Highlight(SingleColourSpeed), // 6
+    #[options(help = "pressed keys generate horizontal laser")]
+    Laser(SingleColourSpeed), // 7
+    #[options(help = "pressed keys ripple outwards like a splash")]
+    Ripple(SingleColourSpeed), // 8
+    #[options(help = "set a rapid pulse")]
+    Pulse(SingleColour), // 10
+    #[options(help = "set a vertical line zooming from left")]
+    Comet(SingleColour), // 11
+    #[options(help = "set a wide vertical line zooming from left")]
+    Flash(SingleColour), // 12
 }

 impl Default for SetAuraBuiltin {
@@ -555,79 +299,6 @@ impl From<&SingleSpeedDirection> for AuraEffect {
    }
 }

-impl From<&StarsTwoColour> for AuraEffect {
-    fn from(aura: &StarsTwoColour) -> Self {
-        Self {
-            colour1: aura.colour,
-            colour2: aura.colour2,
-            zone: aura.zone,
-            ..Default::default()
-        }
-    }
-}
-
-impl From<&RainSingleSpeed> for AuraEffect {
-    fn from(aura: &RainSingleSpeed) -> Self {
-        Self {
-            speed: aura.speed,
-            zone: aura.zone,
-            ..Default::default()
-        }
-    }
-}
-
-impl From<&LaserSingleColourSpeed> for AuraEffect {
-    fn from(aura: &LaserSingleColourSpeed) -> Self {
-        Self {
-            colour1: aura.colour,
-            speed: aura.speed,
-            zone: aura.zone,
-            ..Default::default()
-        }
-    }
-}
-
-impl From<&RippleSingleColourSpeed> for AuraEffect {
-    fn from(aura: &RippleSingleColourSpeed) -> Self {
-        Self {
-            colour1: aura.colour,
-            speed: aura.speed,
-            zone: aura.zone,
-            ..Default::default()
-        }
-    }
-}
-
-impl From<&PulseSingleColour> for AuraEffect {
-    fn from(aura: &PulseSingleColour) -> Self {
-        Self {
-            colour1: aura.colour,
-            zone: aura.zone,
-            ..Default::default()
-        }
-    }
-}
-
-impl From<&CometSingleColour> for AuraEffect {
-    fn from(aura: &CometSingleColour) -> Self {
-        Self {
-            colour1: aura.colour,
-            zone: aura.zone,
-            ..Default::default()
-        }
-    }
-}
-
-impl From<&FlashSingleColour> for AuraEffect {
-    fn from(aura: &FlashSingleColour) -> Self {
-        Self {
-            colour1: aura.colour,
-            zone: aura.zone,
-            ..Default::default()
-        }
-    }
-}
-
 impl From<&SetAuraBuiltin> for AuraEffect {
    fn from(aura: &SetAuraBuiltin) -> Self {
        match aura {
@@ -641,14 +312,14 @@ impl From<&SetAuraBuiltin> for AuraEffect {
                data.mode = AuraModeNum::Breathe;
                data
            }
-            SetAuraBuiltin::RainbowCycle(x) => {
+            SetAuraBuiltin::Strobe(x) => {
                let mut data: AuraEffect = x.into();
-                data.mode = AuraModeNum::RainbowCycle;
+                data.mode = AuraModeNum::Strobe;
                data
            }
-            SetAuraBuiltin::RainbowWave(x) => {
+            SetAuraBuiltin::Rainbow(x) => {
                let mut data: AuraEffect = x.into();
-                data.mode = AuraModeNum::RainbowWave;
+                data.mode = AuraModeNum::Rainbow;
                data
            }
            SetAuraBuiltin::Stars(x) => {
--- a/asusctl/src/cli_opts.rs
+++ b/asusctl/src/cli_opts.rs
@@ -1,314 +1,118 @@
-use argh::FromArgs;
-use rog_platform::platform::PlatformProfile;
+use gumdrop::Options;
+use rog_platform::platform::ThrottlePolicy;

 use crate::anime_cli::AnimeCommand;
 use crate::aura_cli::{LedBrightness, LedPowerCommand1, LedPowerCommand2, SetAuraBuiltin};
 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(command)]
+    pub command: Option<CliCommand>,
 }

-/// Top-level subcommands for asusctl
-#[derive(FromArgs, Debug)]
-#[argh(subcommand)]
+#[derive(Options)]
 pub enum CliCommand {
-    Aura(LedModeCommand),
-    AuraPowerOld(LedPowerCommand1),
-    AuraPower(LedPowerCommand2),
-    Brightness(BrightnessCommand),
+    #[options(help = "Set the keyboard lighting from built-in modes")]
+    LedMode(LedModeCommand),
+    #[options(help = "Set the LED power states")]
+    LedPow1(LedPowerCommand1),
+    #[options(help = "Set the LED power states")]
+    LedPow2(LedPowerCommand2),
+    #[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),
-    Scsi(ScsiCommand),
-    Armoury(ArmouryCommand),
-    Backlight(BacklightCommand),
-    Battery(BatteryCommand),
-    Info(InfoCommand),
+    #[options(help = "Change bios settings")]
+    Bios(BiosCommand),
 }

-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,
+
+    #[options(help = "toggle to next profile in list")]
+    pub next: bool,
+
+    #[options(help = "list available profiles")]
+    pub list: bool,
+
+    #[options(help = "get profile")]
+    pub profile_get: bool,
+
+    #[options(meta = "", help = "set the active profile")]
+    pub profile_set: Option<ThrottlePolicy>,
 }

-#[derive(FromArgs, Debug)]
-#[argh(subcommand)]
-pub enum ProfileSubCommand {
-    Next(ProfileNextCommand),
-    List(ProfileListCommand),
-    Get(ProfileGetCommand),
-    Set(ProfileSetCommand),
-}
-
-impl Default for ProfileSubCommand {
-    fn default() -> Self {
-        ProfileSubCommand::List(ProfileListCommand::default())
-    }
-}
-
-#[derive(FromArgs, Debug, Default)]
-#[argh(
-    subcommand,
-    name = "next",
-    description = "toggle to next profile in list"
-)]
-pub struct ProfileNextCommand {}
-
-#[derive(FromArgs, Debug, Default)]
-#[argh(subcommand, name = "list", description = "list available profiles")]
-pub struct ProfileListCommand {}
-
-#[derive(FromArgs, Debug, Default)]
-#[argh(subcommand, name = "get", description = "get profile")]
-pub struct ProfileGetCommand {}
-
-#[derive(FromArgs, Debug, Default)]
-#[argh(subcommand, name = "set", description = "set profile")]
-pub struct ProfileSetCommand {
-    #[argh(positional, description = "profile to set")]
-    pub profile: PlatformProfile,
-
-    #[argh(
-        switch,
-        short = 'a',
-        description = "set the profile to use on AC power"
-    )]
-    pub ac: bool,
-
-    #[argh(
-        switch,
-        short = 'b',
-        description = "set the profile to use on battery power"
-    )]
-    pub battery: bool,
-}
-
-#[derive(FromArgs, Debug, Default)]
-#[argh(subcommand, name = "aura", description = "led mode commands")]
+#[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"
-)]
-pub struct ArmouryCommand {
-    #[argh(subcommand)]
-    pub command: ArmourySubCommand,
+#[derive(Options)]
+pub struct GraphicsCommand {
+    #[options(help = "print help message")]
+    pub help: bool,
 }

-#[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)"
+#[derive(Options, Debug)]
+pub struct BiosCommand {
+    #[options(help = "print help message")]
+    pub help: bool,
+    #[options(
+        meta = "",
+        short = "S",
+        no_long,
+        help = "set bios POST sound: asusctl -S <true/false>"
    )]
-    pub property: String,
-
-    #[argh(positional, description = "value to set for the given attribute")]
-    pub value: i32,
-}
-
-#[derive(FromArgs, Debug, Default)]
-#[argh(
-    subcommand,
-    name = "list",
-    description = "list all firmware-attributes supported by asus-armoury"
-)]
-pub struct ArmouryPropertyListCommand {}
-
-#[derive(FromArgs, Debug, Default)]
-#[argh(
-    subcommand,
-    name = "get",
-    description = "get a firmware-attribute from asus-armoury"
-)]
-pub struct ArmouryPropertyGetCommand {
-    #[argh(
-        positional,
-        description = "name of the property to get (see asus-armoury list for available properties)"
+    pub post_sound_set: Option<bool>,
+    #[options(no_long, short = "s", help = "read bios POST sound")]
+    pub post_sound_get: bool,
+    #[options(
+        meta = "",
+        short = "D",
+        no_long,
+        help = "Switch GPU MUX mode: 0 = Discrete, 1 = Optimus, reboot required"
    )]
-    pub property: String,
-}
-
-#[derive(FromArgs, Debug, Default)]
-#[argh(subcommand, name = "backlight", description = "backlight options")]
-pub struct BacklightCommand {
-    #[argh(option, description = "set screen brightness <0-100>")]
-    pub screenpad_brightness: Option<i32>,
-
-    #[argh(
-        option,
-        description = "set screenpad gamma brightness 0.5 - 2.2, 1.0 == linear"
+    pub gpu_mux_mode_set: Option<u8>,
+    #[options(no_long, short = "d", help = "get GPU mode")]
+    pub gpu_mux_mode_get: bool,
+    #[options(
+        meta = "",
+        short = "O",
+        no_long,
+        help = "Set device panel overdrive <true/false>"
    )]
-    pub screenpad_gamma: Option<f32>,
-
-    #[argh(
-        option,
-        description = "set screenpad brightness to sync with primary display"
-    )]
-    pub sync_screenpad_brightness: Option<bool>,
+    pub panel_overdrive_set: Option<bool>,
+    #[options(no_long, short = "o", help = "get panel overdrive")]
+    pub panel_overdrive_get: 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 rog_platform::platform::PlatformProfile;
+use gumdrop::Options;
+use rog_platform::platform::ThrottlePolicy;
 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>,
+    pub mod_profile: Option<ThrottlePolicy>,

-    #[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
--- a/asusctl/src/scsi_cli.rs
+++ b/asusctl/src/scsi_cli.rs
@@ -1,30 +0,0 @@
-use argh::FromArgs;
-use rog_scsi::{AuraMode, Colour, Direction, Speed};
-
-#[derive(FromArgs, Debug)]
-#[argh(subcommand, name = "scsi", description = "scsi LED commands")]
-pub struct ScsiCommand {
-    #[argh(option, description = "enable the SCSI drive LEDs")]
-    pub enable: Option<bool>,
-
-    #[argh(option, description = "set LED mode (use 'list' for all options)")]
-    pub mode: Option<AuraMode>,
-
-    #[argh(
-        option,
-        description = "set LED mode speed <slowest, slow, med, fast, fastest>"
-    )]
-    pub speed: Option<Speed>,
-
-    #[argh(option, description = "set LED mode direction <forward, reverse>")]
-    pub direction: Option<Direction>,
-
-    #[argh(
-        option,
-        description = "set LED colours <hex>, specify up to 4 with repeated arg"
-    )]
-    pub colours: Vec<Colour>,
-
-    #[argh(switch, description = "list available animations")]
-    pub list: bool,
-}
--- a/asusctl/src/slash_cli.rs
+++ b/asusctl/src/slash_cli.rs
@@ -1,34 +1,20 @@
-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 = "Ddisable the Slash Ledbar")]
    pub disable: bool,
-    #[argh(option, short = 'l', description = "set brightness value <0-255>")]
+    #[options(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-255>")]
    pub interval: Option<u8>,
-    #[argh(option, description = "set SlashMode (use 'list' for options)")]
-    pub mode: Option<SlashMode>,
-    #[argh(switch, description = "list available animations")]
+    #[options(help = "Set SlashMode (so 'list' for all options)")]
+    pub slash_mode: Option<SlashMode>,
+    #[options(help = "list available animations")]
    pub list: bool,
-
-    #[argh(option, short = 'B', description = "show the animation on boot")]
-    pub show_on_boot: Option<bool>,
-    #[argh(option, short = 'S', description = "show the animation on shutdown")]
-    pub show_on_shutdown: Option<bool>,
-    #[argh(option, short = 's', description = "show the animation on sleep")]
-    pub show_on_sleep: Option<bool>,
-    #[argh(option, short = 'b', description = "show the animation on battery")]
-    pub show_on_battery: Option<bool>,
-    #[argh(
-        option,
-        short = 'w',
-        description = "show the low-battery warning animation"
-    )]
-    pub show_battery_warning: Option<bool>,
 }
--- a/asusd-user/Cargo.toml
+++ b/asusd-user/Cargo.toml
@@ -12,16 +12,13 @@ edition.workspace = true
 name = "asusd-user"
 path = "src/daemon.rs"

-[features]
-default = []
-local_data = []
-
 [dependencies]
 dirs.workspace = true
 smol.workspace = true

 # serialisation
 serde.workspace = true
+serde_derive.workspace = true
 ron.workspace = true

 rog_anime = { path = "../rog-anime" }
@@ -33,15 +30,8 @@ config-traits = { path = "../config-traits" }
 zbus.workspace = true
 env_logger.workspace = true

-[package.metadata.deb]
-license-file = ["../LICENSE", "4"]
-extended-description = """\
-An user utility for Linux to control fancy things on various ASUS laptops
-like keyboard effects or anime matrix animation cycles."""
-depends = "$auto"
-section = "utility"
-priority = "optional"
-assets = [
-  ["target/release/asusd-user", "usr/bin/", "755"],
-  ["../asusd_user-fakeinstall/usr/lib/systemd/user/*", "usr/lib/systemd/user/", "644"],
-]
+[dev-dependencies]
+cargo-husky.workspace = true
+
+[package.metadata.cargo-machete]
+ignored = ["serde"]
--- a/asusd-user/src/config.rs
+++ b/asusd-user/src/config.rs
@@ -6,7 +6,7 @@ use rog_anime::{ActionLoader, AnimTime, AnimeType, Fade, Sequences as AnimeSeque
 use rog_aura::effects::{AdvancedEffects as AuraSequences, Breathe, DoomFlicker, Effect, Static};
 use rog_aura::keyboard::LedCode;
 use rog_aura::{Colour, Speed};
-use serde::{Deserialize, Serialize};
+use serde_derive::{Deserialize, Serialize};

 use crate::error::Error;

--- a/asusd-user/src/ctrl_anime.rs
+++ b/asusd-user/src/ctrl_anime.rs
@@ -9,7 +9,7 @@ use rog_anime::error::AnimeError;
 use rog_anime::{ActionData, ActionLoader, AnimTime, Fade, Sequences, Vec2};
 use rog_dbus::zbus_anime::AnimeProxyBlocking;
 use ron::ser::PrettyConfig;
-use serde::{Deserialize, Serialize};
+use serde_derive::{Deserialize, Serialize};
 use zbus::interface;
 use zbus::zvariant::{ObjectPath, Type};

@@ -66,7 +66,7 @@ pub struct CtrlAnimeInner<'a> {
    do_early_return: Arc<AtomicBool>,
 }

-impl CtrlAnimeInner<'static> {
+impl<'a> CtrlAnimeInner<'static> {
    pub fn new(
        sequences: Sequences,
        client: AnimeProxyBlocking<'static>,
@@ -81,7 +81,7 @@ impl CtrlAnimeInner<'static> {

    /// To be called on each main loop iteration to pump out commands to the
    /// anime
-    pub fn run(&self) -> Result<(), Error> {
+    pub fn run(&'a self) -> Result<(), Error> {
        if self.do_early_return.load(Ordering::SeqCst) {
            return Ok(());
        }
@@ -151,7 +151,10 @@ impl CtrlAnime<'static> {
    pub async fn add_to_server(self, server: &mut zbus::Connection) {
        server
            .object_server()
-            .at(&ObjectPath::from_str_unchecked("/xyz/ljones/Anime"), self)
+            .at(
+                &ObjectPath::from_str_unchecked("/org/asuslinux/Anime"),
+                self,
+            )
            .await
            .map_err(|err| {
                println!("CtrlAnime: add_to_server {}", err);
@@ -167,7 +170,7 @@ impl CtrlAnime<'static> {
 // - Do actions
 // - Write config if required
 // - Unset inner_early_return
-#[interface(name = "xyz.ljones.Asusd")]
+#[interface(name = "org.asuslinux.Daemon")]
 impl CtrlAnime<'static> {
    pub fn insert_asus_gif(
        &mut self,
--- a/asusd-user/src/daemon.rs
+++ b/asusd-user/src/daemon.rs
@@ -11,7 +11,8 @@ use rog_aura::aura_detection::LedSupportData;
 use rog_aura::keyboard::KeyLayout;
 use rog_dbus::zbus_anime::AnimeProxyBlocking;
 use rog_dbus::zbus_aura::AuraProxyBlocking;
-use rog_dbus::{list_iface_blocking, DBUS_NAME};
+use rog_dbus::zbus_platform::PlatformProxyBlocking;
+use rog_dbus::DBUS_NAME;
 use smol::Executor;
 use zbus::Connection;

@@ -35,16 +36,20 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
    println!("rog-platform v{}", rog_platform::VERSION);

    let conn = zbus::blocking::Connection::system().unwrap();
+    let platform_proxy = PlatformProxyBlocking::new(&conn).unwrap();

-    let supported = list_iface_blocking()?;
+    let supported = platform_proxy
+        .supported_interfaces()
+        .unwrap_or_default()
+        .contains(&"Anime".to_string());
    let config = ConfigBase::new().load();
    let executor = Executor::new();

    let early_return = Arc::new(AtomicBool::new(false));
    // Set up the anime data and run loop/thread
-    if supported.contains(&"xyz.ljones.Anime".to_string()) {
+    if supported {
        if let Some(cfg) = config.active_anime {
-            let anime_type = get_anime_type();
+            let anime_type = get_anime_type()?;
            let anime_config = ConfigAnime::new().set_name(cfg).load();
            let anime = anime_config.create(anime_type)?;
            let anime_config = Arc::new(Mutex::new(anime_config));
--- a/asusd-user/src/zbus_anime.rs
+++ b/asusd-user/src/zbus_anime.rs
@@ -1,8 +1,8 @@
-//! # `DBus` interface proxy for: `xyz.ljones.Asusd`
+//! # `DBus` interface proxy for: `org.asuslinux.Daemon`
 //!
 //! This code was generated by `zbus-xmlgen` `1.0.0` from `DBus` introspection
-//! data. Source: `Interface '/xyz/ljones/Anime' from service
-//! 'xyz.ljones.Asusd' on session bus`.
+//! data. Source: `Interface '/org/asuslinux/Anime' from service
+//! 'org.asuslinux.Daemon' on session bus`.
 //!
 //! You may prefer to adapt it, instead of using it verbatim.
 //!
@@ -23,7 +23,10 @@

 use zbus::proxy;

-#[proxy(interface = "xyz.ljones.Asusd", default_path = "/xyz/ljones/Anime")]
+#[proxy(
+    interface = "org.asuslinux.Daemon",
+    default_path = "/org/asuslinux/Anime"
+)]
 trait Daemon {
    /// InsertAsusGif method
    fn insert_asus_gif(
--- a/asusd/Cargo.toml
+++ b/asusd/Cargo.toml
@@ -18,7 +18,6 @@ config-traits = { path = "../config-traits" }
 rog_anime = { path = "../rog-anime", features = ["dbus"] }
 rog_slash = { path = "../rog-slash", features = ["dbus"] }
 rog_aura = { path = "../rog-aura", features = ["dbus"] }
-rog_scsi = { path = "../rog-scsi", features = ["dbus"] }
 rog_platform = { path = "../rog-platform" }
 rog_profiles = { path = "../rog-profiles" }
 dmi_id = { path = "../dmi-id" }
@@ -34,29 +33,17 @@ tokio.workspace = true
 log.workspace = true
 env_logger.workspace = true

-futures-util.workspace = true
 zbus.workspace = true
 logind-zbus.workspace = true

 # serialisation
 serde.workspace = true
+serde_derive.workspace = true

 concat-idents.workspace = true

 [dev-dependencies]
 cargo-husky.workspace = true

-[package.metadata.deb]
-license-file = ["../LICENSE", "4"]
-extended-description = """\
-The dbus server for asusctl and rog-control-center applications."""
-depends = "$auto"
-section = "utility"
-priority = "optional"
-assets = [
-  ["target/release/asusd", "usr/bin/", "755"],
-  ["../asusd-fakeinstall/usr/lib/systemd/system/*", "usr/lib/systemd/system/", "644"],
-  ["../asusd-fakeinstall/usr/lib/udev/rules.d/*", "usr/lib/udev/rules.d/", "644"],
-  ["../asusd-fakeinstall/usr/share/asusd/*", "usr/share/share/asusd/", "644"],
-  ["../asusd-fakeinstall/usr/share/dbus-1/system.d/*", "usr/share/dbus-1/system.d/", "644"],
-]
+[package.metadata.cargo-machete]
+ignored = ["serde"]
--- a/asusd/src/asus_armoury.rs
+++ b/asusd/src/asus_armoury.rs
@@ -1,551 +0,0 @@
-use std::sync::Arc;
-
-use config_traits::StdConfig;
-use log::{debug, error, info, warn};
-use rog_platform::asus_armoury::{
-    AttrValue, Attribute, FirmwareAttribute, FirmwareAttributeType, FirmwareAttributes,
-};
-use rog_platform::platform::{PlatformProfile, RogPlatform};
-use rog_platform::power::AsusPower;
-use serde::{Deserialize, Serialize};
-use tokio::sync::Mutex;
-use zbus::object_server::SignalEmitter;
-use zbus::zvariant::{ObjectPath, OwnedObjectPath, OwnedValue, Type, Value};
-use zbus::{fdo, interface, Connection};
-
-use crate::config::Config;
-use crate::error::RogError;
-use crate::{Reloadable, ASUS_ZBUS_PATH};
-
-const MOD_NAME: &str = "asus_armoury";
-
-#[derive(Debug, Default, Clone, Deserialize, Serialize, Type, Value, OwnedValue)]
-pub struct PossibleValues {
-    strings: Vec<String>,
-    nums: Vec<i32>,
-}
-
-fn dbus_path_for_attr(attr_name: &str) -> OwnedObjectPath {
-    ObjectPath::from_str_unchecked(&format!("{ASUS_ZBUS_PATH}/{MOD_NAME}/{attr_name}")).into()
-}
-
-#[derive(Clone)]
-pub struct AsusArmouryAttribute {
-    attr: Attribute,
-    config: Arc<Mutex<Config>>,
-    /// platform control required here for access to PPD or Throttle profile
-    platform: RogPlatform,
-    power: AsusPower,
-}
-
-impl AsusArmouryAttribute {
-    pub fn new(
-        attr: Attribute,
-        platform: RogPlatform,
-        power: AsusPower,
-        config: Arc<Mutex<Config>>,
-    ) -> Self {
-        Self {
-            attr,
-            config,
-            platform,
-            power,
-        }
-    }
-
-    pub fn attribute_name(&self) -> String {
-        String::from(self.attr.name())
-    }
-
-    fn resolve_i32_value(refreshed: Option<i32>, cached: &AttrValue) -> i32 {
-        refreshed
-            .or(match cached {
-                AttrValue::Integer(i) => Some(*i),
-                _ => None,
-            })
-            .unwrap_or(-1)
-    }
-
-    pub async fn emit_limits(&self, connection: &Connection) -> Result<(), RogError> {
-        let path = dbus_path_for_attr(self.attr.name());
-        let signal = SignalEmitter::new(connection, path)?;
-        self.min_value_changed(&signal).await?;
-        self.max_value_changed(&signal).await?;
-        self.scalar_increment_changed(&signal).await?;
-        self.current_value_changed(&signal).await?;
-        Ok(())
-    }
-
-    pub async fn move_to_zbus(self, connection: &Connection) -> Result<(), RogError> {
-        let path = dbus_path_for_attr(self.attr.name());
-        connection
-            .object_server()
-            .at(path.clone(), self)
-            .await
-            .map_err(|e| error!("Couldn't add server at path: {path}, {e:?}"))
-            .ok();
-        Ok(())
-    }
-
-    async fn watch_and_notify(
-        &mut self,
-        signal_ctxt: SignalEmitter<'static>,
-    ) -> Result<(), RogError> {
-        use futures_util::StreamExt;
-
-        let name = self.name();
-        macro_rules! watch_value_notify {
-            ($attr_str:expr, $fn_prop_changed:ident) => {
-                match self.attr.get_watcher($attr_str) {
-                    Ok(watch) => {
-                        let name = <&str>::from(name);
-                        let ctrl = self.clone();
-                        let sig = signal_ctxt.clone();
-                        tokio::spawn(async move {
-                            let mut buffer = [0; 32];
-                            if let Ok(stream) = watch.into_event_stream(&mut buffer) {
-                                stream
-                                    .for_each(|_| async {
-                                        debug!("{} changed", name);
-                                        ctrl.$fn_prop_changed(&sig).await.ok();
-                                    })
-                                    .await;
-                            } else {
-                                info!(
-                                    "inotify event stream failed for {} ({}). You can ignore this \
-                                     if unsupported",
-                                    name, $attr_str
-                                );
-                            }
-                        });
-                    }
-                    Err(e) => info!(
-                        "inotify watch failed: {}. You can ignore this if your device does not \
-                         support the feature",
-                        e
-                    ),
-                }
-            };
-        }
-
-        // "current_value", "default_value", "min_value", "max_value"
-        watch_value_notify!("current_value", current_value_changed);
-        watch_value_notify!("default_value", default_value_changed);
-        watch_value_notify!("min_value", min_value_changed);
-        watch_value_notify!("max_value", max_value_changed);
-
-        Ok(())
-    }
-}
-
-#[derive(Clone, Default)]
-pub struct ArmouryAttributeRegistry {
-    attrs: Vec<AsusArmouryAttribute>,
-}
-
-impl ArmouryAttributeRegistry {
-    pub fn push(&mut self, attr: AsusArmouryAttribute) {
-        self.attrs.push(attr);
-    }
-
-    pub async fn emit_limits(&self, connection: &Connection) -> Result<(), RogError> {
-        let mut last_err: Option<RogError> = None;
-        for attr in &self.attrs {
-            if let Err(e) = attr.emit_limits(connection).await {
-                error!(
-                    "Failed to emit updated limits for attribute '{}': {e:?}",
-                    attr.attribute_name()
-                );
-                last_err = Some(e);
-            }
-        }
-        if let Some(err) = last_err {
-            Err(err)
-        } else {
-            Ok(())
-        }
-    }
-}
-
-impl crate::Reloadable for AsusArmouryAttribute {
-    async fn reload(&mut self) -> Result<(), RogError> {
-        info!("Reloading {}", self.attr.name());
-        let attribute: FirmwareAttribute = self.attr.name().into();
-        let name = self.attr.name();
-
-        let config = self.config.lock().await;
-        let apply_value = match attribute.property_type() {
-            FirmwareAttributeType::Ppt => {
-                let profile: PlatformProfile = self.platform.get_platform_profile()?.into();
-                let power_plugged = self
-                    .power
-                    .get_online()
-                    .map_err(|e| {
-                        error!("Could not get power status: {e:?}");
-                        e
-                    })
-                    .unwrap_or_default()
-                    == 1;
-
-                let apply_value = {
-                    config.select_tunings_ref(power_plugged, profile).and_then(
-                        |tuning| match tuning.enabled {
-                            true => tuning.group.get(&self.name()).copied(),
-                            false => None,
-                        },
-                    )
-                };
-
-                apply_value.map_or(AttrValue::None, AttrValue::Integer)
-            }
-            FirmwareAttributeType::Gpu => {
-                info!("Reload called on GPU attribute {name}: doing nothing");
-                AttrValue::None
-            }
-            _ => {
-                info!("Reload called on firmware attribute {name}");
-                match config.armoury_settings.get(&attribute) {
-                    Some(saved_value) => AttrValue::Integer(*saved_value),
-                    None => AttrValue::None,
-                }
-            }
-        };
-
-        match apply_value {
-            AttrValue::None => {
-                info!(
-                    "No saved value for attribute {}: skipping.",
-                    self.attr.name()
-                );
-            }
-            _ => {
-                info!("Applying value {apply_value:?} to attribute {name}");
-                self.attr.set_current_value(&apply_value).map_err(|e| {
-                    error!("Could not set {name} value: {e:?}");
-                    self.attr.base_path_exists();
-                    e
-                })?;
-
-                info!("Restored asus-armoury setting {name} to {apply_value:?}");
-            }
-        }
-
-        Ok(())
-    }
-}
-
-/// If return is `-1` on a property then there is available value for that
-/// property
-#[interface(name = "xyz.ljones.AsusArmoury")]
-impl AsusArmouryAttribute {
-    #[zbus(property)]
-    fn name(&self) -> FirmwareAttribute {
-        self.attr.name().into()
-    }
-
-    #[zbus(property)]
-    async fn available_attrs(&self) -> Vec<String> {
-        let mut attrs = Vec::new();
-        if !matches!(self.attr.default_value(), AttrValue::None) {
-            attrs.push("default_value".to_string());
-        }
-        if !matches!(self.attr.min_value(), AttrValue::None) {
-            attrs.push("min_value".to_string());
-        }
-        if !matches!(self.attr.max_value(), AttrValue::None) {
-            attrs.push("max_value".to_string());
-        }
-        if !matches!(self.attr.scalar_increment(), AttrValue::None) {
-            attrs.push("scalar_increment".to_string());
-        }
-        if !matches!(self.attr.possible_values(), AttrValue::None) {
-            attrs.push("possible_values".to_string());
-        }
-        // TODO: Don't unwrap, use error
-        if let Ok(value) = self.attr.current_value().map_err(|e| {
-            error!("Failed to read: {e:?}");
-            e
-        }) {
-            if !matches!(value, AttrValue::None) {
-                attrs.push("current_value".to_string());
-            }
-        }
-        attrs
-    }
-
-    /// If return is `-1` then there is no default value
-    #[zbus(property)]
-    async fn default_value(&self) -> i32 {
-        match self.attr.default_value() {
-            AttrValue::Integer(i) => *i,
-            _ => -1,
-        }
-    }
-
-    async fn restore_default(&self) -> fdo::Result<()> {
-        self.attr.restore_default()?;
-        if self.name().property_type() == FirmwareAttributeType::Ppt {
-            let profile: PlatformProfile = self.platform.get_platform_profile()?.into();
-            let power_plugged = self
-                .power
-                .get_online()
-                .map_err(|e| {
-                    error!("Could not get power status: {e:?}");
-                    e
-                })
-                .unwrap_or_default();
-
-            let mut config = self.config.lock().await;
-            let tuning = config.select_tunings(power_plugged == 1, profile);
-            if let Some(tune) = tuning.group.get_mut(&self.name()) {
-                if let AttrValue::Integer(i) = self.attr.default_value() {
-                    *tune = *i;
-                }
-            }
-            if tuning.enabled {
-                self.attr
-                    .set_current_value(self.attr.default_value())
-                    .map_err(|e| {
-                        error!("Could not set value: {e:?}");
-                        e
-                    })?;
-            }
-            config.write();
-        }
-        Ok(())
-    }
-
-    #[zbus(property)]
-    async fn min_value(&self) -> i32 {
-        Self::resolve_i32_value(self.attr.refresh_min_value(), self.attr.min_value())
-    }
-
-    #[zbus(property)]
-    async fn max_value(&self) -> i32 {
-        Self::resolve_i32_value(self.attr.refresh_max_value(), self.attr.max_value())
-    }
-
-    #[zbus(property)]
-    async fn scalar_increment(&self) -> i32 {
-        Self::resolve_i32_value(
-            self.attr.refresh_scalar_increment(),
-            self.attr.scalar_increment(),
-        )
-    }
-
-    #[zbus(property)]
-    async fn possible_values(&self) -> Vec<i32> {
-        match self.attr.possible_values() {
-            AttrValue::EnumInt(i) => i.clone(),
-            _ => Vec::default(),
-        }
-    }
-
-    #[zbus(property)]
-    async fn current_value(&self) -> fdo::Result<i32> {
-        if self.name().property_type() == FirmwareAttributeType::Ppt {
-            let profile: PlatformProfile = self.platform.get_platform_profile()?.into();
-            let power_plugged = self
-                .power
-                .get_online()
-                .map_err(|e| {
-                    error!("Could not get power status: {e:?}");
-                    e
-                })
-                .unwrap_or_default()
-                == 1;
-            let config = self.config.lock().await;
-            if let Some(tuning) = config.select_tunings_ref(power_plugged, 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);
-            }
-            return Err(fdo::Error::Failed(
-                "Could not read current value".to_string(),
-            ));
-        }
-
-        if let Ok(AttrValue::Integer(i)) = self.attr.current_value() {
-            return Ok(i);
-        }
-        Err(fdo::Error::Failed(
-            "Could not read current value".to_string(),
-        ))
-    }
-
-    #[zbus(property)]
-    async fn set_current_value(&mut self, value: i32) -> fdo::Result<()> {
-        let name = self.attr.name();
-        let apply_value = match self.name().property_type() {
-            FirmwareAttributeType::Ppt => {
-                let profile: PlatformProfile = self.platform.get_platform_profile()?.into();
-                let power_plugged = self
-                    .power
-                    .get_online()
-                    .map_err(|e| {
-                        error!("Could not get power status: {e:?}");
-                        e
-                    })
-                    .unwrap_or_default();
-
-                let mut config = self.config.lock().await;
-                let tuning = config.select_tunings(power_plugged == 1, profile);
-
-                if let Some(tune) = tuning.group.get_mut(&self.name()) {
-                    *tune = value;
-                } else {
-                    tuning.group.insert(self.name(), value);
-                    debug!("Store tuning config for {name} = {:?}", value);
-                }
-
-                match tuning.enabled {
-                    true => {
-                        debug!("Tuning is enabled: setting value to PPT property {name} = {value}");
-                        AttrValue::Integer(value)
-                    }
-                    false => {
-                        warn!("Tuning is disabled: skipping setting value to PPT property {name}");
-                        AttrValue::None
-                    }
-                }
-            }
-            _ => {
-                let mut settings = self.config.lock().await;
-                settings
-                    .armoury_settings
-                    .entry(self.name())
-                    .and_modify(|setting| {
-                        debug!("Set config for {name} = {value}");
-                        *setting = value;
-                    })
-                    .or_insert_with(|| {
-                        debug!("Adding config for {name} = {value}");
-                        value
-                    });
-
-                AttrValue::Integer(value)
-            }
-        };
-
-        self.attr.set_current_value(&apply_value).map_err(|e| {
-            error!("Could not set value {value} to attribute {name}: {e:?}");
-            e
-        })?;
-
-        // write config after setting value
-        self.config.lock().await.write();
-        Ok(())
-    }
-}
-
-pub async fn start_attributes_zbus(
-    conn: &Connection,
-    platform: RogPlatform,
-    power: AsusPower,
-    attributes: FirmwareAttributes,
-    config: Arc<Mutex<Config>>,
-) -> Result<ArmouryAttributeRegistry, RogError> {
-    let mut registry = ArmouryAttributeRegistry::default();
-    for attr in attributes.attributes() {
-        let mut attr = AsusArmouryAttribute::new(
-            attr.clone(),
-            platform.clone(),
-            power.clone(),
-            config.clone(),
-        );
-
-        let registry_attr = attr.clone();
-
-        if let Err(e) = attr.reload().await {
-            error!(
-                "Skipping attribute '{}' due to reload error: {e:?}",
-                attr.attr.name()
-            );
-            break;
-        }
-
-        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());
-                }
-            }
-            Err(e) => {
-                error!(
-                    "Failed to create SignalEmitter for '{}': {e:?}",
-                    attr.attr.name()
-                );
-            }
-        }
-
-        if let Err(e) = attr.move_to_zbus(conn).await {
-            error!("Failed to register attribute '{attr_name}' on zbus: {e:?}");
-            continue;
-        }
-
-        registry.push(registry_attr);
-    }
-    Ok(registry)
-}
-
-pub async fn set_config_or_default(
-    attrs: &FirmwareAttributes,
-    config: &mut Config,
-    power_plugged: bool,
-    profile: PlatformProfile,
-) {
-    for attr in attrs.attributes().iter() {
-        let name: FirmwareAttribute = attr.name().into();
-        if name.property_type() == FirmwareAttributeType::Ppt {
-            let tuning = config.select_tunings(power_plugged, profile);
-            if !tuning.enabled {
-                debug!("Tuning group is not enabled, skipping");
-                return;
-            }
-
-            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
-                    );
-                    // config.write();
-                }
-            }
-        } else {
-            // Handle non-PPT attributes (boolean and other settings)
-            if let Some(saved_value) = config.armoury_settings.get(&name) {
-                attr.set_current_value(&AttrValue::Integer(*saved_value))
-                    .map_err(|e| {
-                        error!("Failed to set {}: {e}", <&str>::from(name));
-                    })
-                    .ok();
-                info!(
-                    "Restored armoury setting for {} = {:?}",
-                    <&str>::from(name),
-                    saved_value
-                );
-            }
-        }
-    }
-}
--- a/asusd/src/aura_anime/mod.rs
+++ b/asusd/src/aura_anime/mod.rs
@@ -1,248 +0,0 @@
-pub mod config;
-/// Implements `CtrlTask`, Reloadable, `ZbusRun`
-pub mod trait_impls;
-
-use std::convert::TryFrom;
-use std::sync::atomic::{AtomicBool, Ordering};
-use std::sync::Arc;
-use std::thread::sleep;
-
-use config_traits::StdConfig;
-use log::{debug, error, info, warn};
-use rog_anime::usb::{
-    pkt_flush, pkt_set_brightness, pkt_set_enable_display, pkt_set_enable_powersave_anim,
-    pkts_for_init, Brightness,
-};
-use rog_anime::{ActionData, AnimeDataBuffer, AnimePacketType};
-use rog_platform::hid_raw::HidRaw;
-use rog_platform::usb_raw::USBRaw;
-use tokio::sync::Mutex;
-
-use self::config::{AniMeConfig, AniMeConfigCached};
-use crate::error::RogError;
-
-#[derive(Debug, Clone)]
-pub struct AniMe {
-    hid: Option<Arc<Mutex<HidRaw>>>,
-    usb: Option<Arc<Mutex<USBRaw>>>,
-    config: Arc<Mutex<AniMeConfig>>,
-    cache: AniMeConfigCached,
-    // set to force thread to exit
-    thread_exit: Arc<AtomicBool>,
-    // Set to false when the thread exits
-    thread_running: Arc<AtomicBool>,
-}
-
-impl AniMe {
-    pub fn new(
-        hid: Option<Arc<Mutex<HidRaw>>>,
-        usb: Option<Arc<Mutex<USBRaw>>>,
-        config: Arc<Mutex<AniMeConfig>>,
-    ) -> Self {
-        Self {
-            hid,
-            usb,
-            config,
-            cache: AniMeConfigCached::default(),
-            thread_exit: Arc::new(AtomicBool::new(false)),
-            thread_running: Arc::new(AtomicBool::new(false)),
-        }
-    }
-
-    /// Will fail if something is already holding the config lock
-    async fn do_init_cache(&mut self) {
-        if let Ok(mut config) = self.config.try_lock() {
-            if let Err(e) = self.cache.init_from_config(&config, config.anime_type) {
-                error!(
-                    "Trying to cache the Anime Config failed, will reset to default config: {e:?}"
-                );
-                config.rename_file_old();
-                *config = AniMeConfig::new();
-                config.write();
-            } else {
-                debug!("Initialised AniMe cache");
-            }
-        } else {
-            error!("AniMe Matrix could not init cache")
-        }
-    }
-
-    /// Initialise the device if required.
-    pub async fn do_initialization(&mut self) -> Result<(), RogError> {
-        self.do_init_cache().await;
-        let pkts = pkts_for_init();
-        self.write_bytes(&pkts[0]).await?;
-        self.write_bytes(&pkts[1]).await?;
-        debug!("Succesfully initialised AniMe matrix display");
-        Ok(())
-    }
-
-    pub async fn write_bytes(&self, message: &[u8]) -> Result<(), RogError> {
-        if let Some(hid) = &self.hid {
-            hid.lock().await.write_bytes(message)?;
-        } else if let Some(usb) = &self.usb {
-            usb.lock().await.write_bytes(message)?;
-        }
-        Ok(())
-    }
-
-    /// Write only a data packet. This will modify the leds brightness using the
-    /// global brightness set in config.
-    async fn write_data_buffer(&self, mut buffer: AnimeDataBuffer) -> Result<(), RogError> {
-        for led in buffer.data_mut().iter_mut() {
-            let mut bright = *led as f32;
-            if bright > 254.0 {
-                bright = 254.0;
-            }
-            *led = bright as u8;
-        }
-        let data = AnimePacketType::try_from(buffer)?;
-        for row in &data {
-            self.write_bytes(row).await?;
-        }
-        self.write_bytes(&pkt_flush()).await
-    }
-
-    pub async fn set_builtins_enabled(
-        &self,
-        enabled: bool,
-        bright: Brightness,
-    ) -> Result<(), RogError> {
-        self.write_bytes(&pkt_set_enable_powersave_anim(enabled))
-            .await?;
-        self.write_bytes(&pkt_set_enable_display(enabled)).await?;
-        self.write_bytes(&pkt_set_brightness(bright)).await?;
-        self.write_bytes(&pkt_set_enable_powersave_anim(enabled))
-            .await
-    }
-
-    /// Start an action thread. This is classed as a singleton and there should
-    /// be only one running - so the thread uses atomics to signal run/exit.
-    ///
-    /// Because this also writes to the usb device, other write tries (display
-    /// only) *must* get the mutex lock and set the `thread_exit` atomic.
-    async fn run_thread(&self, actions: Vec<ActionData>, mut once: bool) {
-        if actions.is_empty() {
-            warn!("AniMe system actions was empty");
-            return;
-        }
-
-        self.write_bytes(&pkt_set_enable_powersave_anim(false))
-            .await
-            .map_err(|err| {
-                warn!("rog_anime::run_animation:callback {}", err);
-            })
-            .ok();
-
-        let thread_exit = self.thread_exit.clone();
-        let thread_running = self.thread_running.clone();
-        let anime_type = self.config.lock().await.anime_type;
-        let inner = self.clone();
-
-        // Loop rules:
-        // - Lock the mutex **only when required**. That is, the lock must be held for
-        //   the shortest duration possible.
-        // - An AtomicBool used for thread exit should be checked in every loop,
-        //   including nested
-
-        // The only reason for this outer thread is to prevent blocking while waiting
-        // for the next spawned thread to exit
-        // TODO: turn this in to async task (maybe? COuld still risk blocking main
-        // thread)
-        tokio::spawn(async move {
-            info!("AniMe new system thread started");
-            // First two loops are to ensure we *do* aquire a lock on the mutex
-            // The reason the loop is required is because the USB writes can block
-            // for up to 10ms. We can't fail to get the atomics.
-            while thread_running.load(Ordering::SeqCst) {
-                // Make any running loop exit first
-                thread_exit.store(true, Ordering::SeqCst);
-            }
-
-            info!("AniMe no previous system thread running (now)");
-            thread_exit.store(false, Ordering::SeqCst);
-            thread_running.store(true, Ordering::SeqCst);
-            'main: loop {
-                for action in &actions {
-                    if thread_exit.load(Ordering::SeqCst) {
-                        break 'main;
-                    }
-                    match action {
-                        ActionData::Animation(frames) => {
-                            // TODO: sort all this out
-                            rog_anime::run_animation(frames, &|frame| {
-                                if thread_exit.load(Ordering::Acquire) {
-                                    info!("rog-anime: animation sub-loop was asked to exit");
-                                    return Ok(true); // Do safe exit
-                                }
-                                let inner = inner.clone();
-                                tokio::task::spawn(async move {
-                                    inner
-                                        .write_data_buffer(frame)
-                                        .await
-                                        .map_err(|err| {
-                                            warn!("rog_anime::run_animation:callback {}", err);
-                                        })
-                                        .ok();
-                                });
-                                Ok(false) // Don't exit yet
-                            });
-                            if thread_exit.load(Ordering::Acquire) {
-                                info!("rog-anime: sub-loop exited and main loop exiting now");
-                                break 'main;
-                            }
-                        }
-                        ActionData::Image(image) => {
-                            once = false;
-                            inner
-                                .write_data_buffer(image.as_ref().clone())
-                                .await
-                                .map_err(|e| error!("{}", e))
-                                .ok();
-                        }
-                        ActionData::Pause(duration) => sleep(*duration),
-                        ActionData::AudioEq
-                        | ActionData::SystemInfo
-                        | ActionData::TimeDate
-                        | ActionData::Matrix => {}
-                    }
-                }
-                if thread_exit.load(Ordering::SeqCst) {
-                    break 'main;
-                }
-                if once || actions.is_empty() {
-                    break 'main;
-                }
-            }
-            // Clear the display on exit
-            if let Ok(data) =
-                AnimeDataBuffer::from_vec(anime_type, vec![0u8; anime_type.data_length()])
-                    .map_err(|e| error!("{}", e))
-            {
-                inner
-                    .write_data_buffer(data)
-                    .await
-                    .map_err(|err| {
-                        warn!("rog_anime::run_animation:callback {}", err);
-                    })
-                    .ok();
-            }
-            // A write can block for many milliseconds so lets not hold the config lock for
-            // the same period
-            let enabled = inner.config.lock().await.builtin_anims_enabled;
-            inner
-                .write_bytes(&pkt_set_enable_powersave_anim(enabled))
-                .await
-                .map_err(|err| {
-                    warn!("rog_anime::run_animation:callback {}", err);
-                })
-                .ok();
-            // Loop ended, set the atmonics
-            thread_running.store(false, Ordering::SeqCst);
-            info!("AniMe system thread exited");
-        })
-        .await
-        .map(|err| info!("AniMe system thread: {:?}", err))
-        .ok();
-    }
-}
--- a/asusd/src/aura_laptop/mod.rs
+++ b/asusd/src/aura_laptop/mod.rs
@@ -1,298 +0,0 @@
-use std::sync::Arc;
-
-use config::AuraConfig;
-use config_traits::StdConfig;
-use log::info;
-use rog_aura::keyboard::{AuraLaptopUsbPackets, LedUsbPackets};
-use rog_aura::usb::{AURA_LAPTOP_LED_APPLY, AURA_LAPTOP_LED_SET};
-use rog_aura::{AuraDeviceType, AuraEffect, LedBrightness, PowerZones, AURA_LAPTOP_LED_MSG_LEN};
-use rog_platform::hid_raw::HidRaw;
-use rog_platform::keyboard_led::KeyboardBacklight;
-use tokio::sync::{Mutex, MutexGuard};
-
-use crate::error::RogError;
-
-pub mod config;
-pub mod trait_impls;
-
-#[derive(Debug, Clone)]
-pub struct Aura {
-    pub hid: Option<Arc<Mutex<HidRaw>>>,
-    pub backlight: Option<Arc<Mutex<KeyboardBacklight>>>,
-    pub config: Arc<Mutex<AuraConfig>>,
-}
-
-impl Aura {
-    /// Initialise the device if required.
-    pub async fn do_initialization(&self) -> Result<(), RogError> {
-        if let Some(hid) = &self.hid {
-            let hid = hid.lock().await;
-            let init_1: [u8; 2] = [
-                0x5d, 0xb9,
-            ];
-            let init_2 = b"]ASUS Tech.Inc.";
-            let init_3: [u8; 6] = [
-                0x5d, 0x05, 0x20, 0x31, 0, 0x1a,
-            ];
-
-            hid.write_bytes(&init_1)?;
-            hid.write_bytes(init_2)?;
-            hid.write_bytes(&init_3)?;
-
-            let config = self.config.lock().await;
-            if config.support_data.device_name.contains("GZ30")
-                || config.support_data.device_name.contains("Z13")
-            {
-                let z13_init: [u8; 4] = [
-                    0x5d, 0xc0, 0x03, 0x01,
-                ];
-                hid.write_bytes(&z13_init)?;
-            }
-        }
-        Ok(())
-    }
-
-    pub async fn lock_config(&self) -> MutexGuard<'_, AuraConfig> {
-        self.config.lock().await
-    }
-
-    /// Will lock the internal config and update. If anything else has locked
-    /// this in scope then a deadlock can occur.
-    pub async fn update_config(&self) -> Result<(), RogError> {
-        let mut config = self.config.lock().await;
-        let bright = if let Some(bl) = self.backlight.as_ref() {
-            bl.lock().await.get_brightness().unwrap_or_default()
-        } else {
-            config.brightness.into()
-        };
-        config.read();
-        config.brightness = bright.into();
-        config.write();
-        Ok(())
-    }
-
-    pub async fn write_current_config_mode(&self, config: &mut AuraConfig) -> Result<(), RogError> {
-        if config.multizone_on {
-            let mode = config.current_mode;
-            let mut create = false;
-            // There is no multizone config for this mode so create one here
-            // using the colours of rainbow if it exists, or first available
-            // mode, or random
-            if config.multizone.is_none() {
-                create = true;
-            } else if let Some(multizones) = config.multizone.as_ref() {
-                if !multizones.contains_key(&mode) {
-                    create = true;
-                }
-            }
-            if create {
-                info!("No user-set config for zone founding, attempting a default");
-                config.create_multizone_default()?;
-            }
-
-            if let Some(multizones) = config.multizone.as_mut() {
-                if let Some(set) = multizones.get(&mode) {
-                    for mode in set.clone() {
-                        self.write_effect_and_apply(config.led_type, &mode).await?;
-                    }
-                }
-            }
-        } else {
-            let mode = config.current_mode;
-            if let Some(effect) = config.builtins.get(&mode).cloned() {
-                self.write_effect_and_apply(config.led_type, &effect)
-                    .await?;
-            }
-        }
-
-        Ok(())
-    }
-
-    /// Write the AuraEffect to the device. Will lock `backlight` or `hid`.
-    ///
-    /// If per-key or software-mode is active it must be marked as disabled in
-    /// config.
-    pub async fn write_effect_and_apply(
-        &self,
-        dev_type: AuraDeviceType,
-        mode: &AuraEffect,
-    ) -> Result<(), RogError> {
-        if matches!(dev_type, AuraDeviceType::LaptopKeyboardTuf) {
-            if let Some(platform) = &self.backlight {
-                let buf = [
-                    1, mode.mode as u8, mode.colour1.r, mode.colour1.g, mode.colour1.b,
-                    mode.speed as u8,
-                ];
-                platform.lock().await.set_kbd_rgb_mode(&buf)?;
-            }
-        } else if let Some(hid_raw) = &self.hid {
-            let bytes: [u8; AURA_LAPTOP_LED_MSG_LEN] = mode.into();
-            let hid_raw = hid_raw.lock().await;
-            hid_raw.write_bytes(&bytes)?;
-            hid_raw.write_bytes(&AURA_LAPTOP_LED_SET)?;
-            // Changes won't persist unless apply is set
-            hid_raw.write_bytes(&AURA_LAPTOP_LED_APPLY)?;
-        } else {
-            return Err(RogError::NoAuraKeyboard);
-        }
-
-        Ok(())
-    }
-
-    pub async fn set_brightness(&self, value: u8) -> Result<(), RogError> {
-        if let Some(backlight) = &self.backlight {
-            backlight.lock().await.set_brightness(value)?;
-            return Ok(());
-        }
-        Err(RogError::MissingFunction(
-            "No LED backlight control available".to_string(),
-        ))
-    }
-
-    /// Set combination state for boot animation/sleep animation/all leds/keys
-    /// leds/side leds LED active
-    pub async fn set_power_states(&self, config: &AuraConfig) -> Result<(), RogError> {
-        if matches!(config.led_type, rog_aura::AuraDeviceType::LaptopKeyboardTuf) {
-            if let Some(backlight) = &self.backlight {
-                // TODO: tuf bool array
-                let buf = config.enabled.to_bytes(config.led_type);
-                backlight.lock().await.set_kbd_rgb_state(&buf)?;
-            }
-        } else if let Some(hid_raw) = &self.hid {
-            let hid_raw = hid_raw.lock().await;
-            if let Some(p) = config.enabled.states.first() {
-                if p.zone == PowerZones::Ally {
-                    let msg = [
-                        0x5d,
-                        0xd1,
-                        0x09,
-                        0x01,
-                        p.new_to_byte() as u8,
-                        0x0,
-                        0x0,
-                    ];
-                    hid_raw.write_bytes(&msg)?;
-                    return Ok(());
-                }
-            }
-
-            let mut enabled = config.enabled.clone();
-            if config.support_data.device_name.contains("GZ30")
-                || config.support_data.device_name.contains("Z13")
-            {
-                let logo_state = enabled
-                    .states
-                    .iter()
-                    .find(|s| s.zone == PowerZones::Logo)
-                    .cloned();
-                if let Some(logo) = logo_state {
-                    let mut lid_found = false;
-                    let mut bar_found = false;
-
-                    for s in enabled.states.iter_mut() {
-                        if s.zone == PowerZones::Lid {
-                            s.boot = logo.boot;
-                            s.awake = logo.awake;
-                            s.sleep = logo.sleep;
-                            s.shutdown = logo.shutdown;
-                            lid_found = true;
-                        }
-                        if s.zone == PowerZones::Lightbar {
-                            s.boot = logo.boot;
-                            s.awake = logo.awake;
-                            s.sleep = logo.sleep;
-                            s.shutdown = logo.shutdown;
-                            bar_found = true;
-                        }
-                    }
-
-                    if !lid_found {
-                        let mut new_state = logo;
-                        new_state.zone = PowerZones::Lid;
-                        enabled.states.push(new_state.clone());
-                        new_state.zone = PowerZones::Lightbar;
-                        enabled.states.push(new_state);
-                    } else if !bar_found {
-                        // Lid found but not bar?
-                        let mut new_state = logo;
-                        new_state.zone = PowerZones::Lightbar;
-                        enabled.states.push(new_state);
-                    }
-                }
-            }
-
-            let bytes = enabled.to_bytes(config.led_type);
-            let msg = [
-                0x5d, 0xbd, 0x01, bytes[0], bytes[1], bytes[2], bytes[3], 0xff,
-            ];
-            hid_raw.write_bytes(&msg)?;
-        }
-        Ok(())
-    }
-
-    /// Write an effect block. This is for per-key, but can be repurposed to
-    /// write the raw factory mode packets - when doing this it is expected that
-    /// only the first `Vec` (`effect[0]`) is valid.
-    pub async fn write_effect_block(
-        &self,
-        config: &mut AuraConfig,
-        effect: &AuraLaptopUsbPackets,
-    ) -> Result<(), RogError> {
-        if config.brightness == LedBrightness::Off {
-            config.brightness = LedBrightness::Med;
-            config.write();
-        }
-
-        let pkt_type = effect[0][1];
-        const PER_KEY_TYPE: u8 = 0xbc;
-
-        if let Some(hid_raw) = &self.hid {
-            let hid_raw = hid_raw.lock().await;
-            if pkt_type != PER_KEY_TYPE {
-                config.per_key_mode_active = false;
-                hid_raw.write_bytes(&effect[0])?;
-                hid_raw.write_bytes(&AURA_LAPTOP_LED_SET)?;
-                // hid_raw.write_bytes(&LED_APPLY)?;
-            } else {
-                if !config.per_key_mode_active {
-                    let init = LedUsbPackets::get_init_msg();
-                    hid_raw.write_bytes(&init)?;
-                    config.per_key_mode_active = true;
-                }
-                for row in effect.iter() {
-                    hid_raw.write_bytes(row)?;
-                }
-            }
-        } else if matches!(config.led_type, rog_aura::AuraDeviceType::LaptopKeyboardTuf) {
-            if let Some(tuf) = &self.backlight {
-                for row in effect.iter() {
-                    let r = row[9];
-                    let g = row[10];
-                    let b = row[11];
-                    tuf.lock().await.set_kbd_rgb_mode(&[
-                        0, 0, r, g, b, 0,
-                    ])?;
-                }
-            }
-        }
-        Ok(())
-    }
-
-    pub async fn fix_ally_power(&mut self) -> Result<(), RogError> {
-        if self.config.lock().await.led_type == AuraDeviceType::Ally {
-            if let Some(hid_raw) = &self.hid {
-                let mut config = self.config.lock().await;
-                if config.ally_fix.is_none() {
-                    let msg = [
-                        0x5d, 0xbd, 0x01, 0xff, 0xff, 0xff, 0xff,
-                    ];
-                    hid_raw.lock().await.write_bytes(&msg)?;
-                    info!("Reset Ally power settings to base");
-                    config.ally_fix = Some(true);
-                }
-                config.write();
-            }
-        }
-        Ok(())
-    }
-}
--- a/asusd/src/aura_laptop/trait_impls.rs
+++ b/asusd/src/aura_laptop/trait_impls.rs
@@ -1,349 +0,0 @@
-use std::collections::BTreeMap;
-
-use config_traits::StdConfig;
-use log::{debug, error, info, warn};
-use rog_aura::keyboard::{AuraLaptopUsbPackets, LaptopAuraPower};
-use rog_aura::{AuraDeviceType, AuraEffect, AuraModeNum, AuraZone, LedBrightness, PowerZones};
-use zbus::fdo::Error as ZbErr;
-use zbus::object_server::SignalEmitter;
-use zbus::zvariant::OwnedObjectPath;
-use zbus::{interface, Connection};
-
-use super::Aura;
-use crate::error::RogError;
-use crate::{CtrlTask, Reloadable};
-
-pub const AURA_ZBUS_NAME: &str = "Aura";
-pub const AURA_ZBUS_PATH: &str = "/xyz/ljones";
-
-#[derive(Clone)]
-pub struct AuraZbus(Aura);
-
-impl AuraZbus {
-    pub fn new(aura: Aura) -> Self {
-        Self(aura)
-    }
-
-    pub async fn start_tasks(
-        mut self,
-        connection: &Connection,
-        // _signal_ctx: SignalEmitter<'static>,
-        path: OwnedObjectPath,
-    ) -> Result<(), RogError> {
-        // let task = zbus.clone();
-        // let signal_ctx = signal_ctx.clone();
-        self.reload()
-            .await
-            .unwrap_or_else(|err| warn!("Controller error: {}", err));
-        connection
-            .object_server()
-            .at(path.clone(), self)
-            .await
-            .map_err(|e| error!("Couldn't add server at path: {path}, {e:?}"))
-            .ok();
-        // TODO: skip this until we keep handles to tasks so they can be killed
-        // task.create_tasks(signal_ctx).await
-        Ok(())
-    }
-}
-
-/// The main interface for changing, reading, or notfying
-///
-/// LED commands are split between Brightness, Modes, Per-Key
-#[interface(name = "xyz.ljones.Aura")]
-impl AuraZbus {
-    /// Return the device type for this Aura keyboard
-    #[zbus(property)]
-    async fn device_type(&self) -> AuraDeviceType {
-        self.0.config.lock().await.led_type
-    }
-
-    /// Return the current LED brightness
-    #[zbus(property)]
-    async fn brightness(&self) -> Result<LedBrightness, ZbErr> {
-        if let Some(bl) = self.0.backlight.as_ref() {
-            return Ok(bl.lock().await.get_brightness().map(|n| n.into())?);
-        }
-        Err(ZbErr::Failed("No sysfs brightness control".to_string()))
-    }
-
-    /// Set the keyboard brightness level (0-3)
-    #[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?);
-        }
-        Err(ZbErr::Failed("No sysfs brightness control".to_string()))
-    }
-
-    /// Total levels of brightness available
-    #[zbus(property)]
-    async fn supported_brightness(&self) -> Vec<LedBrightness> {
-        vec![
-            LedBrightness::Off,
-            LedBrightness::Low,
-            LedBrightness::Med,
-            LedBrightness::High,
-        ]
-    }
-
-    /// The total available modes
-    #[zbus(property)]
-    async fn supported_basic_modes(&self) -> Result<Vec<AuraModeNum>, ZbErr> {
-        let config = self.0.config.lock().await;
-        Ok(config.builtins.keys().cloned().collect())
-    }
-
-    #[zbus(property)]
-    async fn supported_basic_zones(&self) -> Result<Vec<AuraZone>, ZbErr> {
-        let config = self.0.config.lock().await;
-        Ok(config.support_data.basic_zones.clone())
-    }
-
-    #[zbus(property)]
-    async fn supported_power_zones(&self) -> Result<Vec<PowerZones>, ZbErr> {
-        let config = self.0.config.lock().await;
-        Ok(config.support_data.power_zones.clone())
-    }
-
-    /// The current mode data
-    #[zbus(property)]
-    async fn led_mode(&self) -> Result<AuraModeNum, ZbErr> {
-        // entirely possible to deadlock here, so use try instead of lock()
-        // let ctrl = self.0.lock().await;
-        // Ok(config.current_mode)
-        if let Ok(config) = self.0.config.try_lock() {
-            Ok(config.current_mode)
-        } else {
-            Err(ZbErr::Failed("Aura control couldn't lock self".to_string()))
-        }
-    }
-
-    /// Set an Aura effect if the effect mode or zone is supported.
-    ///
-    /// On success the aura config file is read to refresh cached values, then
-    /// the effect is stored and config written to disk.
-    #[zbus(property)]
-    async fn set_led_mode(&mut self, num: AuraModeNum) -> Result<(), ZbErr> {
-        let mut config = self.0.config.lock().await;
-        config.current_mode = num;
-        self.0.write_current_config_mode(&mut config).await?;
-        if config.brightness == LedBrightness::Off {
-            config.brightness = LedBrightness::Med;
-        }
-        self.0.set_brightness(config.brightness.into()).await?;
-        config.write();
-        Ok(())
-    }
-
-    /// The current mode data
-    #[zbus(property)]
-    async fn led_mode_data(&self) -> Result<AuraEffect, ZbErr> {
-        // entirely possible to deadlock here, so use try instead of lock()
-        if let Ok(config) = self.0.config.try_lock() {
-            let mode = config.current_mode;
-            match config.builtins.get(&mode) {
-                Some(effect) => Ok(effect.clone()),
-                None => Err(ZbErr::Failed("Could not get the current effect".into())),
-            }
-        } else {
-            Err(ZbErr::Failed("Aura control couldn't lock self".to_string()))
-        }
-    }
-
-    /// Set an Aura effect if the effect mode or zone is supported.
-    ///
-    /// On success the aura config file is read to refresh cached values, then
-    /// the effect is stored and config written to disk.
-    #[zbus(property)]
-    async fn set_led_mode_data(&mut self, effect: AuraEffect) -> Result<(), ZbErr> {
-        let mut config = self.0.config.lock().await;
-        if !config.support_data.basic_modes.contains(&effect.mode)
-            || effect.zone != AuraZone::None
-                && !config.support_data.basic_zones.contains(&effect.zone)
-        {
-            return Err(ZbErr::NotSupported(format!(
-                "The Aura effect is not supported: {effect:?}"
-            )));
-        }
-
-        self.0
-            .write_effect_and_apply(config.led_type, &effect)
-            .await?;
-        if config.brightness == LedBrightness::Off {
-            config.brightness = LedBrightness::Med;
-        }
-        self.0.set_brightness(config.brightness.into()).await?;
-        config.set_builtin(effect);
-        config.write();
-        Ok(())
-    }
-
-    /// Get the data set for every mode available
-    async fn all_mode_data(&self) -> BTreeMap<AuraModeNum, AuraEffect> {
-        let config = self.0.config.lock().await;
-        config.builtins.clone()
-    }
-
-    // As property doesn't work for AuraPowerDev (complexity of serialization?)
-    #[zbus(property)]
-    async fn led_power(&self) -> LaptopAuraPower {
-        let config = self.0.config.lock().await;
-        config.enabled.clone()
-    }
-
-    /// Set a variety of states, input is array of enum.
-    /// `enabled` sets if the sent array should be disabled or enabled
-    ///
-    /// For Modern ROG devices the "enabled" flag is ignored.
-    #[zbus(property)]
-    async fn set_led_power(&mut self, options: LaptopAuraPower) -> Result<(), ZbErr> {
-        let mut config = self.0.config.lock().await;
-        for opt in options.states {
-            let zone = opt.zone;
-            for state in config.enabled.states.iter_mut() {
-                if state.zone == zone {
-                    *state = opt;
-                    break;
-                }
-            }
-        }
-        config.write();
-        Ok(self.0.set_power_states(&config).await.map_err(|e| {
-            warn!("{}", e);
-            e
-        })?)
-    }
-
-    /// On machine that have some form of either per-key keyboard or per-zone
-    /// this can be used to write custom effects over dbus. The input is a
-    /// nested `Vec<Vec<8>>` where `Vec<u8>` is a raw USB packet
-    async fn direct_addressing_raw(&self, data: AuraLaptopUsbPackets) -> Result<(), ZbErr> {
-        let mut config = self.0.config.lock().await;
-        self.0.write_effect_block(&mut config, &data).await?;
-        Ok(())
-    }
-}
-
-impl CtrlTask for AuraZbus {
-    fn zbus_path() -> &'static str {
-        "/xyz/ljones"
-    }
-
-    async fn create_tasks(&self, _: SignalEmitter<'static>) -> Result<(), RogError> {
-        let inner1 = self.0.clone();
-        let inner3 = self.0.clone();
-        self.create_sys_event_tasks(
-            move |sleeping| {
-                let inner1 = inner1.clone();
-                // unwrap as we want to bomb out of the task
-                async move {
-                    if !sleeping {
-                        info!("CtrlKbdLedTask reloading brightness and modes");
-                        if let Some(backlight) = &inner1.backlight {
-                            backlight
-                                .lock()
-                                .await
-                                .set_brightness(inner1.config.lock().await.brightness.into())
-                                .map_err(|e| {
-                                    error!("CtrlKbdLedTask: {e}");
-                                    e
-                                })
-                                .unwrap();
-                        }
-                        let mut config = inner1.config.lock().await;
-                        inner1
-                            .write_current_config_mode(&mut config)
-                            .await
-                            .map_err(|e| {
-                                error!("CtrlKbdLedTask: {e}");
-                                e
-                            })
-                            .unwrap();
-                    } else if sleeping {
-                        inner1
-                            .update_config()
-                            .await
-                            .map_err(|e| {
-                                error!("CtrlKbdLedTask: {e}");
-                                e
-                            })
-                            .unwrap();
-                    }
-                }
-            },
-            move |_shutting_down| {
-                let inner3 = inner3.clone();
-                async move {
-                    info!("CtrlKbdLedTask reloading brightness and modes");
-                    if let Some(backlight) = &inner3.backlight {
-                        // unwrap as we want to bomb out of the task
-                        backlight
-                            .lock()
-                            .await
-                            .set_brightness(inner3.config.lock().await.brightness.into())
-                            .map_err(|e| {
-                                error!("CtrlKbdLedTask: {e}");
-                                e
-                            })
-                            .unwrap();
-                    }
-                }
-            },
-            move |_lid_closed| {
-                // on lid change
-                async move {}
-            },
-            move |_power_plugged| {
-                // power change
-                async move {}
-            },
-        )
-        .await;
-
-        // let ctrl2 = self.0.clone();
-        // let ctrl = self.0.lock().await;
-        // if ctrl.led_node.has_brightness_control() {
-        //     let watch = ctrl.led_node.monitor_brightness()?;
-        //     tokio::spawn(async move {
-        //         let mut buffer = [0; 32];
-        //         watch
-        //             .into_event_stream(&mut buffer)
-        //             .unwrap()
-        //             .for_each(|_| async {
-        //                 if let Some(lock) = ctrl2.try_lock() {
-        //                     load_save(true, lock).unwrap(); // unwrap as we want
-        //                                                     // to
-        //                                                     // bomb out of the
-        //                                                     // task
-        //                 }
-        //             })
-        //             .await;
-        //     });
-        // }
-
-        Ok(())
-    }
-}
-
-impl Reloadable for AuraZbus {
-    async fn reload(&mut self) -> Result<(), RogError> {
-        self.0.fix_ally_power().await?;
-        debug!("reloading keyboard mode");
-        let mut config = self.0.lock_config().await;
-        self.0.write_current_config_mode(&mut config).await?;
-        debug!("reloading power states");
-        self.0
-            .set_power_states(&config)
-            .await
-            .map_err(|err| warn!("{err}"))
-            .ok();
-        Ok(())
-    }
-}
--- a/asusd/src/aura_manager.rs
+++ b/asusd/src/aura_manager.rs
@@ -1,592 +0,0 @@
-// Plan:
-// - Manager has udev monitor on USB looking for ROG devices
-// - If a device is found, add it to watch
-// - Add it to Zbus server
-// - If udev sees device removed then remove the zbus path
-
-use std::collections::HashMap;
-use std::sync::Arc;
-
-use dmi_id::DMIID;
-use futures_lite::future::block_on;
-use log::{debug, error, info, warn};
-use mio::{Events, Interest, Poll, Token};
-use rog_platform::error::PlatformError;
-use rog_platform::hid_raw::HidRaw;
-use tokio::sync::Mutex;
-use udev::{Device, MonitorBuilder};
-use zbus::zvariant::{ObjectPath, OwnedObjectPath};
-use zbus::Connection;
-
-use crate::aura_anime::trait_impls::AniMeZbus;
-use crate::aura_laptop::trait_impls::AuraZbus;
-use crate::aura_scsi::trait_impls::ScsiZbus;
-use crate::aura_slash::trait_impls::SlashZbus;
-use crate::aura_types::DeviceHandle;
-use crate::error::RogError;
-use crate::ASUS_ZBUS_PATH;
-
-const MOD_NAME: &str = "aura";
-
-/// Returns only the Device details concatenated in a form usable for
-/// adding/appending to a filename
-pub fn filename_partial(parent: &Device) -> Option<OwnedObjectPath> {
-    if let Some(id_product) = parent.attribute_value("idProduct") {
-        let id_product = id_product.to_string_lossy();
-        let mut path = if let Some(devnum) = parent.attribute_value("devnum") {
-            let devnum = devnum.to_string_lossy();
-            if let Some(devpath) = parent.attribute_value("devpath") {
-                let devpath = devpath.to_string_lossy();
-                format!("{id_product}_{devnum}_{devpath}")
-            } else {
-                format!("{id_product}_{devnum}")
-            }
-        } else {
-            format!("{id_product}")
-        };
-        if path.contains('.') {
-            warn!("dbus path for {id_product} contains `.`, removing");
-            path.replace('.', "").clone_into(&mut path);
-        }
-        return Some(ObjectPath::from_str_unchecked(&path).into());
-    }
-    None
-}
-
-fn dbus_path_for_dev(parent: &Device) -> Option<OwnedObjectPath> {
-    if let Some(filename) = filename_partial(parent) {
-        return Some(
-            ObjectPath::from_str_unchecked(&format!("{ASUS_ZBUS_PATH}/{MOD_NAME}/{filename}"))
-                .into(),
-        );
-    }
-    None
-}
-
-fn dbus_path_for_tuf() -> OwnedObjectPath {
-    ObjectPath::from_str_unchecked(&format!("{ASUS_ZBUS_PATH}/{MOD_NAME}/tuf")).into()
-}
-
-fn dbus_path_for_slash() -> OwnedObjectPath {
-    ObjectPath::from_str_unchecked(&format!("{ASUS_ZBUS_PATH}/{MOD_NAME}/slash")).into()
-}
-
-fn dbus_path_for_anime() -> OwnedObjectPath {
-    ObjectPath::from_str_unchecked(&format!("{ASUS_ZBUS_PATH}/{MOD_NAME}/anime")).into()
-}
-
-fn dbus_path_for_scsi(prod_id: &str) -> OwnedObjectPath {
-    ObjectPath::from_str_unchecked(&format!("{ASUS_ZBUS_PATH}/{MOD_NAME}/{prod_id}_scsi")).into()
-}
-
-fn dev_prop_matches(dev: &Device, prop: &str, value: &str) -> bool {
-    if let Some(p) = dev.property_value(prop) {
-        return p == value;
-    }
-    false
-}
-
-/// A device.
-///
-/// Each controller within should track its dbus path so it can be removed if
-/// required.
-pub struct AsusDevice {
-    device: DeviceHandle,
-    dbus_path: OwnedObjectPath,
-    hid_key: Option<String>,
-}
-
-pub struct DeviceManager {
-    _dbus_connection: Connection,
-    _hid_handles: Arc<Mutex<HashMap<String, Arc<Mutex<HidRaw>>>>>,
-}
-
-impl DeviceManager {
-    #[allow(clippy::type_complexity)]
-    async fn get_or_create_hid_handle(
-        handles: &Arc<Mutex<HashMap<String, Arc<Mutex<HidRaw>>>>>,
-        endpoint: &Device,
-    ) -> Result<(Arc<Mutex<HidRaw>>, String), RogError> {
-        let dev_node = endpoint
-            .devnode()
-            .ok_or_else(|| RogError::MissingFunction("hidraw devnode missing".to_string()))?;
-        let key = dev_node.to_string_lossy().to_string();
-
-        if let Some(existing) = handles.lock().await.get(&key).cloned() {
-            return Ok((existing, key));
-        }
-
-        let hidraw = HidRaw::from_device(endpoint.clone())?;
-        let handle = Arc::new(Mutex::new(hidraw));
-        handles.lock().await.insert(key.clone(), handle.clone());
-        Ok((handle, key))
-    }
-
-    async fn init_hid_devices(
-        connection: &Connection,
-        device: Device,
-        handles: Arc<Mutex<HashMap<String, Arc<Mutex<HidRaw>>>>>,
-    ) -> Result<Vec<AsusDevice>, RogError> {
-        let mut devices = Vec::new();
-        if let Some(usb_device) = device.parent_with_subsystem_devtype("usb", "usb_device")? {
-            if let Some(usb_id) = usb_device.attribute_value("idProduct") {
-                if let Some(vendor_id) = usb_device.attribute_value("idVendor") {
-                    if vendor_id != "0b05" {
-                        debug!("Not ASUS vendor ID: {}", vendor_id.to_string_lossy());
-                        return Ok(devices);
-                    }
-                    // Almost all devices are identified by the productId.
-                    // So let's see what we have and:
-                    // 1. Generate an interface path
-                    // 2. Create the device
-                    // Use the top-level endpoint, not the parent
-                    if let Ok((dev, hid_key)) =
-                        Self::get_or_create_hid_handle(&handles, &device).await
-                    {
-                        debug!("Testing device {usb_id:?}");
-                        // SLASH DEVICE
-                        if let Ok(dev_type) = DeviceHandle::new_slash_hid(
-                            dev.clone(),
-                            usb_id.to_str().unwrap_or_default(),
-                        )
-                        .await
-                        {
-                            if let DeviceHandle::Slash(slash) = dev_type.clone() {
-                                let path =
-                                    dbus_path_for_dev(&usb_device).unwrap_or(dbus_path_for_slash());
-                                let ctrl = SlashZbus::new(slash);
-                                ctrl.start_tasks(connection, path.clone()).await.unwrap();
-                                devices.push(AsusDevice {
-                                    device: dev_type,
-                                    dbus_path: path,
-                                    hid_key: Some(hid_key.clone()),
-                                });
-                            }
-                        }
-                        // ANIME MATRIX DEVICE
-                        if let Ok(dev_type) = DeviceHandle::maybe_anime_hid(
-                            dev.clone(),
-                            usb_id.to_str().unwrap_or_default(),
-                        )
-                        .await
-                        {
-                            if let DeviceHandle::AniMe(anime) = dev_type.clone() {
-                                let path =
-                                    dbus_path_for_dev(&usb_device).unwrap_or(dbus_path_for_anime());
-                                let ctrl = AniMeZbus::new(anime);
-                                ctrl.start_tasks(connection, path.clone()).await.unwrap();
-                                devices.push(AsusDevice {
-                                    device: dev_type,
-                                    dbus_path: path,
-                                    hid_key: Some(hid_key.clone()),
-                                });
-                            }
-                        }
-                        // AURA LAPTOP DEVICE
-                        if let Ok(dev_type) = DeviceHandle::maybe_laptop_aura(
-                            Some(dev),
-                            usb_id.to_str().unwrap_or_default(),
-                        )
-                        .await
-                        {
-                            if let DeviceHandle::Aura(aura) = dev_type.clone() {
-                                let path =
-                                    dbus_path_for_dev(&usb_device).unwrap_or(dbus_path_for_tuf());
-                                let ctrl = AuraZbus::new(aura);
-                                ctrl.start_tasks(connection, path.clone()).await.unwrap();
-                                devices.push(AsusDevice {
-                                    device: dev_type,
-                                    dbus_path: path,
-                                    hid_key: Some(hid_key),
-                                });
-                            }
-                        }
-                    } else {
-                        warn!("Failed to initialise shared hid handle for {usb_id:?}");
-                    }
-                }
-            }
-        }
-        Ok(devices)
-    }
-
-    /// To be called on daemon startup
-    async fn init_all_hid(
-        connection: &Connection,
-        handles: Arc<Mutex<HashMap<String, Arc<Mutex<HidRaw>>>>>,
-    ) -> Result<Vec<AsusDevice>, RogError> {
-        // track and ensure we use only one hidraw per prod_id
-        // let mut interfaces = HashSet::new();
-        let mut devices: Vec<AsusDevice> = Vec::new();
-
-        let mut enumerator = udev::Enumerator::new().map_err(|err| {
-            warn!("{}", err);
-            PlatformError::Udev("enumerator failed".into(), err)
-        })?;
-
-        enumerator.match_subsystem("hidraw").map_err(|err| {
-            warn!("{}", err);
-            PlatformError::Udev("match_subsystem failed".into(), err)
-        })?;
-
-        for device in enumerator
-            .scan_devices()
-            .map_err(|e| PlatformError::IoPath("enumerator".to_owned(), e))?
-        {
-            devices.append(&mut Self::init_hid_devices(connection, device, handles.clone()).await?);
-        }
-
-        Ok(devices)
-    }
-
-    async fn init_scsi(
-        connection: &Connection,
-        device: &Device,
-        path: OwnedObjectPath,
-    ) -> Option<AsusDevice> {
-        // "ID_MODEL_ID" "1932"
-        // "ID_VENDOR_ID" "0b05"
-        if dev_prop_matches(device, "ID_VENDOR_ID", "0b05") {
-            if let Some(dev_node) = device.devnode() {
-                let prod_id = device
-                    .property_value("ID_MODEL_ID")
-                    .unwrap_or_default()
-                    .to_string_lossy();
-                if let Ok(dev_type) =
-                    DeviceHandle::maybe_scsi(dev_node.as_os_str().to_str().unwrap(), &prod_id).await
-                {
-                    if let DeviceHandle::Scsi(scsi) = dev_type.clone() {
-                        let ctrl = ScsiZbus::new(scsi);
-                        ctrl.start_tasks(connection, path.clone()).await.unwrap();
-                        return Some(AsusDevice {
-                            device: dev_type,
-                            dbus_path: path,
-                            hid_key: None,
-                        });
-                    }
-                }
-            }
-        }
-        None
-    }
-
-    async fn init_all_scsi(connection: &Connection) -> Result<Vec<AsusDevice>, RogError> {
-        // track and ensure we use only one hidraw per prod_id
-        // let mut interfaces = HashSet::new();
-        let mut devices: Vec<AsusDevice> = Vec::new();
-
-        let mut enumerator = udev::Enumerator::new().map_err(|err| {
-            warn!("{}", err);
-            PlatformError::Udev("enumerator failed".into(), err)
-        })?;
-
-        enumerator.match_subsystem("block").map_err(|err| {
-            warn!("{}", err);
-            PlatformError::Udev("match_subsystem failed".into(), err)
-        })?;
-
-        let mut found = Vec::new();
-        for device in enumerator
-            .scan_devices()
-            .map_err(|e| PlatformError::IoPath("enumerator".to_owned(), e))?
-        {
-            if let Some(serial) = device.property_value("ID_SERIAL_SHORT") {
-                let serial = serial.to_string_lossy().to_string();
-                let path = dbus_path_for_scsi(&serial);
-                if found.contains(&path) {
-                    continue;
-                }
-
-                if let Some(dev) = Self::init_scsi(connection, &device, path.clone()).await {
-                    devices.push(dev);
-                    found.push(path);
-                }
-            } else {
-                debug!("No serial for SCSI device: {:?}", device.devpath());
-            }
-        }
-
-        Ok(devices)
-    }
-
-    pub async fn find_all_devices(
-        connection: &Connection,
-        handles: Arc<Mutex<HashMap<String, Arc<Mutex<HidRaw>>>>>,
-    ) -> Vec<AsusDevice> {
-        let mut devices: Vec<AsusDevice> = Vec::new();
-        // HID first, always
-        if let Ok(devs) = &mut Self::init_all_hid(connection, handles.clone()).await {
-            devices.append(devs);
-        }
-        // USB after, need to check if HID picked something up and if so, skip it
-        let mut do_anime = true;
-        let mut do_slash = true;
-        let mut do_kb_backlight = true;
-        for dev in devices.iter() {
-            if matches!(dev.device, DeviceHandle::Slash(_)) {
-                do_slash = false;
-            }
-            if matches!(dev.device, DeviceHandle::AniMe(_)) {
-                do_anime = false;
-            }
-            if matches!(dev.device, DeviceHandle::Aura(_) | DeviceHandle::OldAura(_)) {
-                do_kb_backlight = false;
-            }
-        }
-
-        if do_slash {
-            if let Ok(dev_type) = DeviceHandle::new_slash_usb().await {
-                if let DeviceHandle::Slash(slash) = dev_type.clone() {
-                    let path = dbus_path_for_slash();
-                    let ctrl = SlashZbus::new(slash);
-                    ctrl.start_tasks(connection, path.clone()).await.unwrap();
-                    devices.push(AsusDevice {
-                        device: dev_type,
-                        dbus_path: path,
-                        hid_key: None,
-                    });
-                }
-            } else {
-                info!("Tested device was not Slash");
-            }
-        }
-
-        if do_anime {
-            if let Ok(dev_type) = DeviceHandle::maybe_anime_usb().await {
-                // TODO: this is copy/pasted
-                if let DeviceHandle::AniMe(anime) = dev_type.clone() {
-                    let path = dbus_path_for_anime();
-                    let ctrl = AniMeZbus::new(anime);
-                    if ctrl
-                        .start_tasks(connection, path.clone())
-                        .await
-                        .map_err(|e| error!("Failed to start tasks: {e:?}, not adding this device"))
-                        .is_ok()
-                    {
-                        devices.push(AsusDevice {
-                            device: dev_type,
-                            dbus_path: path,
-                            hid_key: None,
-                        });
-                    }
-                }
-            } else {
-                info!("Tested device was not AniMe Matrix");
-            }
-        }
-
-        if do_kb_backlight {
-            // TUF AURA LAPTOP DEVICE
-            // product_name = ASUS TUF Gaming F15 FX507ZE_FX507ZE
-            // product_family = ASUS TUF Gaming F15
-            let product_name = DMIID::new().unwrap_or_default().product_name;
-            let product_family = DMIID::new().unwrap_or_default().product_family;
-            info!(
-                "No USB keyboard aura, system is {product_name}, try using sysfs backlight control"
-            );
-            if product_name.contains("TUF") || product_family.contains("TUF") {
-                info!("TUF laptop, try using sysfs backlight control");
-                if let Ok(dev_type) = DeviceHandle::maybe_laptop_aura(None, "tuf").await {
-                    if let DeviceHandle::Aura(aura) = dev_type.clone() {
-                        let path = dbus_path_for_tuf();
-                        let ctrl = AuraZbus::new(aura);
-                        ctrl.start_tasks(connection, path.clone()).await.unwrap();
-                        devices.push(AsusDevice {
-                            device: dev_type,
-                            dbus_path: path,
-                            hid_key: None,
-                        });
-                    }
-                }
-            }
-        }
-
-        if let Ok(devs) = &mut Self::init_all_scsi(connection).await {
-            devices.append(devs);
-        }
-
-        devices
-    }
-
-    pub async fn new(connection: Connection) -> Result<Self, RogError> {
-        let conn_copy = connection.clone();
-        let hid_handles = Arc::new(Mutex::new(HashMap::new()));
-        let devices = Self::find_all_devices(&conn_copy, hid_handles.clone()).await;
-        info!("Found {} valid devices on startup", devices.len());
-        let devices = Arc::new(Mutex::new(devices));
-        let manager = Self {
-            _dbus_connection: connection,
-            _hid_handles: hid_handles.clone(),
-        };
-
-        // TODO: The /sysfs/ LEDs don't cause events, so they need to be manually
-        // checked for and added
-
-        let hid_handles_thread = hid_handles.clone();
-        std::thread::spawn(move || {
-            let mut monitor = MonitorBuilder::new()?.listen()?;
-            let mut poll = Poll::new()?;
-            let mut events = Events::with_capacity(1024);
-            poll.registry()
-                .register(&mut monitor, Token(0), Interest::READABLE)?;
-
-            let rt = tokio::runtime::Runtime::new().expect("Unable to create Runtime");
-            let _enter = rt.enter();
-            loop {
-                if poll.poll(&mut events, None).is_err() {
-                    continue;
-                }
-                for event in monitor.iter() {
-                    let action = event
-                        .action()
-                        .unwrap_or_default()
-                        .to_string_lossy()
-                        .to_string();
-
-                    let subsys = if let Some(subsys) = event.subsystem() {
-                        subsys.to_string_lossy().to_string()
-                    } else {
-                        continue;
-                    };
-
-                    let devices = devices.clone();
-                    let conn_copy = conn_copy.clone();
-                    let hid_handles = hid_handles_thread.clone();
-                    block_on(async move {
-                        // SCSCI devs
-                        if subsys == "block" {
-                            if action == "remove" {
-                                if let Some(serial) =
-                                    event.device().property_value("ID_SERIAL_SHORT")
-                                {
-                                    let serial = serial.to_string_lossy().to_string();
-                                    let path = dbus_path_for_scsi(&serial);
-
-                                    let index = if let Some(index) = devices
-                                        .lock()
-                                        .await
-                                        .iter()
-                                        .position(|dev| dev.dbus_path == path)
-                                    {
-                                        index
-                                    } else {
-                                        if dev_prop_matches(&event.device(), "ID_VENDOR_ID", "0b05")
-                                        {
-                                            warn!("No device for dbus path: {path:?}");
-                                        }
-                                        return Ok(());
-                                    };
-                                    info!("removing: {path:?}");
-                                    let dev = devices.lock().await.remove(index);
-                                    let path = path.clone();
-                                    if let DeviceHandle::Scsi(_) = dev.device {
-                                        conn_copy
-                                            .object_server()
-                                            .remove::<ScsiZbus, _>(&path)
-                                            .await?;
-                                    }
-                                }
-                            } else if action == "add" {
-                                let evdev = event.device();
-                                if let Some(serial) = evdev.property_value("ID_SERIAL_SHORT") {
-                                    let serial = serial.to_string_lossy().to_string();
-                                    let path = dbus_path_for_scsi(&serial);
-                                    if let Some(new_devs) =
-                                        Self::init_scsi(&conn_copy, &evdev, path).await
-                                    {
-                                        devices.lock().await.append(&mut vec![new_devs]);
-                                    }
-                                }
-                            };
-                        }
-
-                        if subsys == "hidraw" {
-                            if let Some(parent) =
-                                event.parent_with_subsystem_devtype("usb", "usb_device")?
-                            {
-                                if action == "remove" {
-                                    if let Some(path) = dbus_path_for_dev(&parent) {
-                                        // Find the indexs of devices matching the path
-                                        let removals: Vec<usize> = devices
-                                            .lock()
-                                            .await
-                                            .iter()
-                                            .enumerate()
-                                            .filter_map(|(i, dev)| {
-                                                if dev.dbus_path == path {
-                                                    Some(i)
-                                                } else {
-                                                    None
-                                                }
-                                            })
-                                            .collect();
-                                        if removals.is_empty() {
-                                            return Ok(());
-                                        }
-                                        info!("removing: {path:?}");
-                                        // Iter in reverse so as to not screw up indexing
-                                        for index in removals.iter().rev() {
-                                            let dev = devices.lock().await.remove(*index);
-                                            let hid_key = dev.hid_key.clone();
-                                            let path = path.clone();
-                                            let res = match dev.device {
-                                                DeviceHandle::Aura(_) => {
-                                                    conn_copy
-                                                        .object_server()
-                                                        .remove::<AuraZbus, _>(&path)
-                                                        .await?
-                                                }
-                                                DeviceHandle::Slash(_) => {
-                                                    conn_copy
-                                                        .object_server()
-                                                        .remove::<SlashZbus, _>(&path)
-                                                        .await?
-                                                }
-                                                DeviceHandle::AniMe(_) => {
-                                                    conn_copy
-                                                        .object_server()
-                                                        .remove::<AniMeZbus, _>(&path)
-                                                        .await?
-                                                }
-                                                DeviceHandle::Scsi(_) => {
-                                                    conn_copy
-                                                        .object_server()
-                                                        .remove::<ScsiZbus, _>(&path)
-                                                        .await?
-                                                }
-                                                _ => todo!(),
-                                            };
-                                            info!("AuraManager removed: {path:?}, {res}");
-                                            if let Some(key) = hid_key {
-                                                hid_handles.lock().await.remove(&key);
-                                            }
-                                        }
-                                    }
-                                } else if action == "add" {
-                                    let evdev = event.device();
-                                    if let Ok(mut new_devs) = Self::init_hid_devices(
-                                        &conn_copy,
-                                        evdev,
-                                        hid_handles.clone(),
-                                    )
-                                    .await
-                                    .map_err(|e| error!("Couldn't add new device: {e:?}"))
-                                    {
-                                        devices.lock().await.append(&mut new_devs);
-                                    }
-                                };
-                            }
-                        }
-                        Ok::<(), RogError>(())
-                    })
-                    .map_err(|e| error!("{e:?}"))
-                    .ok();
-                }
-            }
-            // Required for return type on spawn
-            #[allow(unreachable_code)]
-            Ok::<(), RogError>(())
-        });
-        Ok(manager)
-    }
-}
--- a/asusd/src/aura_scsi/config.rs
+++ b/asusd/src/aura_scsi/config.rs
@@ -1,114 +0,0 @@
-use std::collections::BTreeMap;
-
-use config_traits::{StdConfig, StdConfigLoad};
-use rog_aura::AuraDeviceType;
-use rog_scsi::{AuraEffect, AuraMode};
-use serde::{Deserialize, Serialize};
-
-const CONFIG_FILE: &str = "scsi.ron";
-
-/// Config for base system actions for the anime display
-#[derive(Deserialize, Serialize, Debug)]
-pub struct ScsiConfig {
-    #[serde(skip)]
-    pub dev_type: AuraDeviceType,
-    pub enabled: bool,
-    pub current_mode: AuraMode,
-    pub modes: BTreeMap<AuraMode, AuraEffect>,
-}
-
-impl ScsiConfig {
-    pub fn get_effect(&mut self, mode: AuraMode) -> Option<&AuraEffect> {
-        self.modes.get(&mode)
-    }
-
-    pub fn save_effect(&mut self, effect: AuraEffect) {
-        self.current_mode = effect.mode;
-        self.modes.insert(*effect.mode(), effect);
-    }
-}
-
-impl Default for ScsiConfig {
-    fn default() -> Self {
-        ScsiConfig {
-            enabled: true,
-            current_mode: AuraMode::Static,
-            dev_type: AuraDeviceType::ScsiExtDisk,
-            modes: BTreeMap::from([
-                (AuraMode::Off, AuraEffect::default_with_mode(AuraMode::Off)),
-                (
-                    AuraMode::Static,
-                    AuraEffect::default_with_mode(AuraMode::Static),
-                ),
-                (
-                    AuraMode::Breathe,
-                    AuraEffect::default_with_mode(AuraMode::Breathe),
-                ),
-                (
-                    AuraMode::Flashing,
-                    AuraEffect::default_with_mode(AuraMode::Flashing),
-                ),
-                (
-                    AuraMode::RainbowCycle,
-                    AuraEffect::default_with_mode(AuraMode::RainbowCycle),
-                ),
-                (
-                    AuraMode::RainbowWave,
-                    AuraEffect::default_with_mode(AuraMode::RainbowWave),
-                ),
-                (
-                    AuraMode::RainbowCycleBreathe,
-                    AuraEffect::default_with_mode(AuraMode::RainbowCycleBreathe),
-                ),
-                (
-                    AuraMode::ChaseFade,
-                    AuraEffect::default_with_mode(AuraMode::ChaseFade),
-                ),
-                (
-                    AuraMode::RainbowCycleChaseFade,
-                    AuraEffect::default_with_mode(AuraMode::RainbowCycleChaseFade),
-                ),
-                (
-                    AuraMode::Chase,
-                    AuraEffect::default_with_mode(AuraMode::Chase),
-                ),
-                (
-                    AuraMode::RainbowCycleChase,
-                    AuraEffect::default_with_mode(AuraMode::RainbowCycleChase),
-                ),
-                (
-                    AuraMode::RainbowCycleWave,
-                    AuraEffect::default_with_mode(AuraMode::RainbowCycleWave),
-                ),
-                (
-                    AuraMode::RainbowPulseChase,
-                    AuraEffect::default_with_mode(AuraMode::RainbowPulseChase),
-                ),
-                (
-                    AuraMode::RandomFlicker,
-                    AuraEffect::default_with_mode(AuraMode::RandomFlicker),
-                ),
-                (
-                    AuraMode::DoubleFade,
-                    AuraEffect::default_with_mode(AuraMode::DoubleFade),
-                ),
-            ]),
-        }
-    }
-}
-
-impl StdConfig for ScsiConfig {
-    fn new() -> Self {
-        Self::default()
-    }
-
-    fn file_name(&self) -> String {
-        CONFIG_FILE.to_owned()
-    }
-
-    fn config_dir() -> std::path::PathBuf {
-        std::path::PathBuf::from(crate::CONFIG_PATH_BASE)
-    }
-}
-
-impl StdConfigLoad for ScsiConfig {}
--- a/asusd/src/aura_scsi/mod.rs
+++ b/asusd/src/aura_scsi/mod.rs
@@ -1,45 +0,0 @@
-use std::sync::Arc;
-
-use config::ScsiConfig;
-use rog_scsi::{AuraEffect, Device, Task};
-use tokio::sync::{Mutex, MutexGuard};
-
-use crate::error::RogError;
-
-pub mod config;
-pub mod trait_impls;
-
-#[derive(Clone)]
-pub struct ScsiAura {
-    device: Arc<Mutex<Device>>,
-    config: Arc<Mutex<ScsiConfig>>,
-}
-
-impl ScsiAura {
-    pub fn new(device: Arc<Mutex<Device>>, config: Arc<Mutex<ScsiConfig>>) -> Self {
-        Self { device, config }
-    }
-
-    pub async fn lock_config(&self) -> MutexGuard<'_, ScsiConfig> {
-        self.config.lock().await
-    }
-
-    pub async fn write_effect(&self, effect: &AuraEffect) -> Result<(), RogError> {
-        let tasks: Vec<Task> = effect.into();
-        for task in &tasks {
-            self.device.lock().await.perform(task).ok();
-        }
-        Ok(())
-    }
-
-    /// Initialise the device if required. Locks the internal config so be wary
-    /// of deadlocks.
-    pub async fn do_initialization(&self) -> Result<(), RogError> {
-        let config = self.config.lock().await;
-        let mode = config.current_mode;
-        if let Some(effect) = config.modes.get(&mode) {
-            self.write_effect(effect).await?;
-        }
-        Ok(())
-    }
-}
--- a/asusd/src/aura_scsi/trait_impls.rs
+++ b/asusd/src/aura_scsi/trait_impls.rs
@@ -1,116 +0,0 @@
-use std::collections::BTreeMap;
-
-use config_traits::StdConfig;
-use log::error;
-use rog_aura::AuraDeviceType;
-use rog_scsi::{AuraEffect, AuraMode};
-use zbus::fdo::Error as ZbErr;
-use zbus::zvariant::OwnedObjectPath;
-use zbus::{interface, Connection};
-
-use super::ScsiAura;
-use crate::error::RogError;
-
-#[derive(Clone)]
-pub struct ScsiZbus(ScsiAura);
-
-impl ScsiZbus {
-    pub fn new(scsi: ScsiAura) -> Self {
-        Self(scsi)
-    }
-
-    pub async fn start_tasks(
-        self,
-        connection: &Connection,
-        path: OwnedObjectPath,
-    ) -> Result<(), RogError> {
-        connection
-            .object_server()
-            .at(path.clone(), self)
-            .await
-            .map_err(|e| error!("Couldn't add server at path: {path}, {e:?}"))
-            .ok();
-        Ok(())
-    }
-}
-
-#[interface(name = "xyz.ljones.ScsiAura")]
-impl ScsiZbus {
-    /// Return the device type for this Aura keyboard
-    #[zbus(property)]
-    async fn device_type(&self) -> AuraDeviceType {
-        self.0.config.lock().await.dev_type
-    }
-
-    /// Get enabled or not
-    #[zbus(property)]
-    async fn enabled(&self) -> bool {
-        let lock = self.0.lock_config().await;
-        lock.enabled
-    }
-
-    /// Set enabled true or false
-    #[zbus(property)]
-    async fn set_enabled(&self, enabled: bool) {
-        let mut config = self.0.lock_config().await;
-        config.enabled = enabled;
-        config.write();
-    }
-
-    #[zbus(property)]
-    async fn led_mode(&self) -> u8 {
-        let config = self.0.lock_config().await;
-        config.current_mode as u8
-    }
-
-    #[zbus(property)]
-    async fn set_led_mode(&self, mode: AuraMode) -> Result<(), zbus::Error> {
-        let mut config = self.0.lock_config().await;
-        if let Some(effect) = config.get_effect(mode) {
-            self.0
-                .write_effect(effect)
-                .await
-                .map_err(|e| zbus::Error::Failure(format!("{e:?}")))?;
-        } else {
-            return Err(zbus::Error::Failure("Mode data does not exist".to_string()));
-        }
-        config.current_mode = mode;
-        config.write();
-        Ok(())
-    }
-
-    /// The current mode data
-    #[zbus(property)]
-    async fn led_mode_data(&self) -> Result<AuraEffect, ZbErr> {
-        // entirely possible to deadlock here, so use try instead of lock()
-        if let Ok(config) = self.0.config.try_lock() {
-            let mode = config.current_mode;
-            match config.modes.get(&mode) {
-                Some(effect) => Ok(effect.clone()),
-                None => Err(ZbErr::Failed("Could not get the current effect".into())),
-            }
-        } else {
-            Err(ZbErr::Failed("Aura control couldn't lock self".to_string()))
-        }
-    }
-
-    /// Set an Aura effect if the effect mode or zone is supported.
-    ///
-    /// On success the aura config file is read to refresh cached values, then
-    /// 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.write_effect(&effect).await?;
-
-        let mut config = self.0.config.lock().await;
-        config.save_effect(effect);
-        config.write();
-        Ok(())
-    }
-
-    /// Get the data set for every mode available
-    async fn all_mode_data(&self) -> BTreeMap<AuraMode, AuraEffect> {
-        let config = self.0.config.lock().await;
-        config.modes.clone()
-    }
-}
--- a/asusd/src/aura_slash/config.rs
+++ b/asusd/src/aura_slash/config.rs
@@ -1,66 +0,0 @@
-use config_traits::{StdConfig, StdConfigLoad};
-use rog_slash::{DeviceState, SlashMode, SlashType};
-use serde::{Deserialize, Serialize};
-
-const CONFIG_FILE: &str = "slash.ron";
-
-/// Config for base system actions for the anime display
-#[derive(Deserialize, Serialize, Debug)]
-pub struct SlashConfig {
-    #[serde(skip)]
-    pub slash_type: SlashType,
-    pub enabled: bool,
-    pub brightness: u8,
-    pub display_interval: u8,
-    pub display_mode: SlashMode,
-    pub show_on_boot: bool,
-    pub show_on_shutdown: bool,
-    pub show_on_sleep: bool,
-    pub show_on_battery: bool,
-    pub show_battery_warning: bool,
-    pub show_on_lid_closed: bool,
-}
-
-impl Default for SlashConfig {
-    fn default() -> Self {
-        SlashConfig {
-            enabled: true,
-            brightness: 255,
-            display_interval: 0,
-            display_mode: SlashMode::Bounce,
-            slash_type: SlashType::Unsupported,
-            show_on_boot: true,
-            show_on_shutdown: true,
-            show_on_sleep: true,
-            show_on_battery: true,
-            show_battery_warning: true,
-            show_on_lid_closed: true,
-        }
-    }
-}
-impl StdConfig for SlashConfig {
-    fn new() -> Self {
-        Self::default()
-    }
-
-    fn file_name(&self) -> String {
-        CONFIG_FILE.to_owned()
-    }
-
-    fn config_dir() -> std::path::PathBuf {
-        std::path::PathBuf::from(crate::CONFIG_PATH_BASE)
-    }
-}
-
-impl StdConfigLoad for SlashConfig {}
-
-impl From<&SlashConfig> for DeviceState {
-    fn from(config: &SlashConfig) -> Self {
-        DeviceState {
-            slash_enabled: config.enabled,
-            slash_brightness: config.brightness,
-            slash_interval: config.display_interval,
-            slash_mode: config.display_mode,
-        }
-    }
-}
--- a/asusd/src/aura_slash/mod.rs
+++ b/asusd/src/aura_slash/mod.rs
@@ -1,69 +0,0 @@
-use std::sync::Arc;
-
-use config::SlashConfig;
-use rog_platform::hid_raw::HidRaw;
-use rog_platform::usb_raw::USBRaw;
-use rog_slash::usb::{slash_pkt_enable, slash_pkt_init, slash_pkt_options, slash_pkt_set_mode};
-use tokio::sync::{Mutex, MutexGuard};
-
-use crate::error::RogError;
-
-pub mod config;
-pub mod trait_impls;
-
-#[derive(Debug, Clone)]
-pub struct Slash {
-    hid: Option<Arc<Mutex<HidRaw>>>,
-    usb: Option<Arc<Mutex<USBRaw>>>,
-    config: Arc<Mutex<SlashConfig>>,
-}
-
-impl Slash {
-    pub fn new(
-        hid: Option<Arc<Mutex<HidRaw>>>,
-        usb: Option<Arc<Mutex<USBRaw>>>,
-        config: Arc<Mutex<SlashConfig>>,
-    ) -> Self {
-        Self { hid, usb, config }
-    }
-
-    pub async fn lock_config(&self) -> MutexGuard<'_, SlashConfig> {
-        self.config.lock().await
-    }
-
-    pub async fn write_bytes(&self, message: &[u8]) -> Result<(), RogError> {
-        if let Some(hid) = &self.hid {
-            hid.lock().await.write_bytes(message)?;
-        } else if let Some(usb) = &self.usb {
-            usb.lock().await.write_bytes(message)?;
-        }
-        Ok(())
-    }
-
-    /// Initialise the device if required. Locks the internal config so be wary
-    /// of deadlocks.
-    pub async fn do_initialization(&self) -> Result<(), RogError> {
-        // Don't try to initialise these models as the asus drivers already did
-        let config = self.config.lock().await;
-        for pkt in &slash_pkt_init(config.slash_type) {
-            self.write_bytes(pkt).await?;
-        }
-        self.write_bytes(&slash_pkt_enable(config.slash_type, config.enabled))
-            .await?;
-
-        // Apply config upon initialization
-        let option_packets = slash_pkt_options(
-            config.slash_type,
-            config.enabled,
-            config.brightness,
-            config.display_interval,
-        );
-        self.write_bytes(&option_packets).await?;
-
-        let mode_packets = slash_pkt_set_mode(config.slash_type, config.display_mode);
-        // self.node.write_bytes(&mode_packets[0])?;
-        self.write_bytes(&mode_packets[1]).await?;
-
-        Ok(())
-    }
-}
--- a/asusd/src/aura_slash/trait_impls.rs
+++ b/asusd/src/aura_slash/trait_impls.rs
@@ -1,317 +0,0 @@
-use config_traits::StdConfig;
-use log::{debug, error, warn};
-use rog_slash::usb::{
-    slash_pkt_battery_saver, slash_pkt_boot, slash_pkt_enable, slash_pkt_lid_closed,
-    slash_pkt_low_battery, slash_pkt_options, slash_pkt_save, slash_pkt_set_mode,
-    slash_pkt_shutdown, slash_pkt_sleep,
-};
-use rog_slash::{DeviceState, SlashMode};
-use zbus::zvariant::OwnedObjectPath;
-use zbus::{interface, Connection};
-
-use super::Slash;
-use crate::error::RogError;
-use crate::Reloadable;
-
-#[derive(Clone)]
-pub struct SlashZbus(Slash);
-
-impl SlashZbus {
-    pub fn new(slash: Slash) -> Self {
-        Self(slash)
-    }
-
-    pub async fn start_tasks(
-        mut self,
-        connection: &Connection,
-        path: OwnedObjectPath,
-    ) -> Result<(), RogError> {
-        // let task = zbus.clone();
-        self.reload()
-            .await
-            .unwrap_or_else(|err| warn!("Controller error: {}", err));
-        connection
-            .object_server()
-            .at(path.clone(), self)
-            .await
-            .map_err(|e| error!("Couldn't add server at path: {path}, {e:?}"))
-            .ok();
-        Ok(())
-    }
-}
-
-#[interface(name = "xyz.ljones.Slash")]
-impl SlashZbus {
-    /// Get enabled or not
-    #[zbus(property)]
-    async fn enabled(&self) -> bool {
-        let lock = self.0.lock_config().await;
-        lock.enabled
-    }
-
-    /// Set enabled true or false
-    #[zbus(property)]
-    async fn set_enabled(&self, enabled: bool) {
-        let mut config = self.0.lock_config().await;
-        let brightness = if enabled && config.brightness == 0 {
-            0x88
-        } else {
-            config.brightness
-        };
-        self.0
-            .write_bytes(&slash_pkt_enable(config.slash_type, enabled))
-            .await
-            .map_err(|err| {
-                warn!("ctrl_slash::enable {}", err);
-            })
-            .ok();
-        self.0
-            .write_bytes(&slash_pkt_options(
-                config.slash_type,
-                enabled,
-                brightness,
-                config.display_interval,
-            ))
-            .await
-            .map_err(|err| {
-                warn!("ctrl_slash::set_options {}", err);
-            })
-            .ok();
-
-        config.enabled = enabled;
-        config.brightness = brightness;
-        config.write();
-    }
-
-    /// Get brightness level
-    #[zbus(property)]
-    async fn brightness(&self) -> u8 {
-        let config = self.0.lock_config().await;
-        config.brightness
-    }
-
-    /// Set brightness level
-    #[zbus(property)]
-    async fn set_brightness(&self, brightness: u8) {
-        let mut config = self.0.lock_config().await;
-        let enabled = brightness > 0;
-        self.0
-            .write_bytes(&slash_pkt_options(
-                config.slash_type,
-                enabled,
-                brightness,
-                config.display_interval,
-            ))
-            .await
-            .map_err(|err| {
-                warn!("ctrl_slash::set_options {}", err);
-            })
-            .ok();
-
-        config.enabled = enabled;
-        config.brightness = brightness;
-        config.write();
-    }
-
-    #[zbus(property)]
-    async fn interval(&self) -> u8 {
-        let config = self.0.lock_config().await;
-        config.display_interval
-    }
-
-    /// Set interval between slash animations (0-255)
-    #[zbus(property)]
-    async fn set_interval(&self, interval: u8) {
-        let mut config = self.0.lock_config().await;
-        self.0
-            .write_bytes(&slash_pkt_options(
-                config.slash_type, config.enabled, config.brightness, interval,
-            ))
-            .await
-            .map_err(|err| {
-                warn!("ctrl_slash::set_options {}", err);
-            })
-            .ok();
-
-        config.display_interval = interval;
-        config.write();
-    }
-
-    #[zbus(property)]
-    async fn mode(&self) -> zbus::fdo::Result<u8> {
-        let config = self.0.lock_config().await;
-        Ok(config.display_interval)
-    }
-
-    /// Set interval between slash animations (0-255)
-    #[zbus(property)]
-    async fn set_mode(&self, mode: SlashMode) -> zbus::Result<()> {
-        let mut config = self.0.lock_config().await;
-
-        let command_packets = slash_pkt_set_mode(config.slash_type, mode);
-        // self.node.write_bytes(&command_packets[0])?;
-        self.0.write_bytes(&command_packets[1]).await?;
-        self.0
-            .write_bytes(&slash_pkt_save(config.slash_type))
-            .await?;
-
-        config.display_mode = mode;
-        config.write();
-        Ok(())
-    }
-
-    /// Get the device state as stored by asusd
-    // #[zbus(property)]
-    async fn device_state(&self) -> DeviceState {
-        let config = self.0.lock_config().await;
-        DeviceState::from(&*config)
-    }
-
-    #[zbus(property)]
-    async fn show_on_boot(&self) -> zbus::fdo::Result<bool> {
-        let config = self.0.lock_config().await;
-        Ok(config.show_on_boot)
-    }
-
-    #[zbus(property)]
-    async fn set_show_on_boot(&self, enable: bool) -> zbus::Result<()> {
-        let mut config = self.0.lock_config().await;
-        self.0
-            .write_bytes(&slash_pkt_boot(config.slash_type, enable))
-            .await?;
-        config.show_on_boot = enable;
-        config.write();
-        Ok(())
-    }
-
-    #[zbus(property)]
-    async fn show_on_sleep(&self) -> zbus::fdo::Result<bool> {
-        let config = self.0.lock_config().await;
-        Ok(config.show_on_sleep)
-    }
-
-    #[zbus(property)]
-    async fn set_show_on_sleep(&self, enable: bool) -> zbus::Result<()> {
-        let mut config = self.0.lock_config().await;
-        self.0
-            .write_bytes(&slash_pkt_sleep(config.slash_type, enable))
-            .await?;
-        config.show_on_sleep = enable;
-        config.write();
-        Ok(())
-    }
-
-    #[zbus(property)]
-    async fn show_on_shutdown(&self) -> zbus::fdo::Result<bool> {
-        let config = self.0.lock_config().await;
-        Ok(config.show_on_shutdown)
-    }
-
-    #[zbus(property)]
-    async fn set_show_on_shutdown(&self, enable: bool) -> zbus::Result<()> {
-        let mut config = self.0.lock_config().await;
-        self.0
-            .write_bytes(&slash_pkt_shutdown(config.slash_type, enable))
-            .await?;
-        config.show_on_shutdown = enable;
-        config.write();
-        Ok(())
-    }
-
-    #[zbus(property)]
-    async fn show_on_battery(&self) -> zbus::fdo::Result<bool> {
-        let config = self.0.lock_config().await;
-        Ok(config.show_on_battery)
-    }
-
-    #[zbus(property)]
-    async fn set_show_on_battery(&self, enable: bool) -> zbus::Result<()> {
-        let mut config = self.0.lock_config().await;
-        self.0
-            .write_bytes(&slash_pkt_battery_saver(config.slash_type, enable))
-            .await?;
-        config.show_on_battery = enable;
-        config.write();
-        Ok(())
-    }
-
-    #[zbus(property)]
-    async fn show_battery_warning(&self) -> zbus::fdo::Result<bool> {
-        let config = self.0.lock_config().await;
-        Ok(config.show_battery_warning)
-    }
-
-    #[zbus(property)]
-    async fn set_show_battery_warning(&self, enable: bool) -> zbus::Result<()> {
-        let mut config = self.0.lock_config().await;
-        self.0
-            .write_bytes(&slash_pkt_low_battery(config.slash_type, enable))
-            .await?;
-        config.show_battery_warning = enable;
-        config.write();
-        Ok(())
-    }
-
-    #[zbus(property)]
-    async fn show_on_lid_closed(&self) -> zbus::fdo::Result<bool> {
-        let config = self.0.lock_config().await;
-        Ok(config.show_on_lid_closed)
-    }
-
-    #[zbus(property)]
-    async fn set_show_on_lid_closed(&self, enable: bool) -> zbus::Result<()> {
-        let mut config = self.0.lock_config().await;
-        self.0
-            .write_bytes(&slash_pkt_lid_closed(config.slash_type, enable))
-            .await?;
-        self.0
-            .write_bytes(&slash_pkt_save(config.slash_type))
-            .await?;
-        config.show_on_lid_closed = enable;
-        config.write();
-        Ok(())
-    }
-}
-
-impl Reloadable for SlashZbus {
-    async fn reload(&mut self) -> Result<(), RogError> {
-        debug!("reloading slash settings");
-        let config = self.0.lock_config().await;
-        self.0
-            .write_bytes(&slash_pkt_options(
-                config.slash_type,
-                config.enabled,
-                config.brightness,
-                config.display_interval,
-            ))
-            .await
-            .map_err(|err| {
-                warn!("set_options {}", err);
-            })
-            .ok();
-
-        macro_rules! write_bytes_with_warning {
-            ($packet_fn:expr, $cfg:ident, $warn_msg:expr) => {
-                self.0
-                    .write_bytes(&$packet_fn(config.slash_type, config.$cfg))
-                    .await
-                    .map_err(|err| {
-                        warn!("{} {}", $warn_msg, err);
-                    })
-                    .ok();
-            };
-        }
-
-        write_bytes_with_warning!(slash_pkt_boot, show_on_boot, "show_on_boot");
-        write_bytes_with_warning!(slash_pkt_sleep, show_on_sleep, "show_on_sleep");
-        write_bytes_with_warning!(slash_pkt_shutdown, show_on_shutdown, "show_on_shutdown");
-        write_bytes_with_warning!(slash_pkt_battery_saver, show_on_battery, "show_on_battery");
-        write_bytes_with_warning!(
-            slash_pkt_low_battery,
-            show_battery_warning,
-            "show_battery_warning"
-        );
-
-        Ok(())
-    }
-}
--- a/asusd/src/aura_types.rs
+++ b/asusd/src/aura_types.rs
@@ -1,210 +0,0 @@
-use std::sync::Arc;
-
-use config_traits::{StdConfig, StdConfigLoad};
-use log::{debug, error, info};
-use rog_anime::error::AnimeError;
-use rog_anime::usb::get_anime_type;
-use rog_anime::AnimeType;
-use rog_aura::AuraDeviceType;
-use rog_platform::hid_raw::HidRaw;
-use rog_platform::keyboard_led::KeyboardBacklight;
-use rog_platform::usb_raw::USBRaw;
-use rog_scsi::{open_device, ScsiType};
-use rog_slash::error::SlashError;
-use rog_slash::SlashType;
-use tokio::sync::Mutex;
-
-use crate::aura_anime::config::AniMeConfig;
-use crate::aura_anime::AniMe;
-use crate::aura_laptop::config::AuraConfig;
-use crate::aura_laptop::Aura;
-use crate::aura_scsi::config::ScsiConfig;
-use crate::aura_scsi::ScsiAura;
-use crate::aura_slash::config::SlashConfig;
-use crate::aura_slash::Slash;
-use crate::error::RogError;
-
-pub enum _DeviceHandle {
-    /// The AniMe devices require USBRaw as they are not HID devices
-    Usb(USBRaw),
-    HidRaw(HidRaw),
-    LedClass(KeyboardBacklight),
-    /// TODO
-    MulticolourLed,
-    None,
-}
-
-#[derive(Clone)]
-pub enum DeviceHandle {
-    Aura(Aura),
-    Slash(Slash),
-    /// The AniMe devices require USBRaw as they are not HID devices
-    AniMe(AniMe),
-    Scsi(ScsiAura),
-    Ally(Arc<Mutex<HidRaw>>),
-    OldAura(Arc<Mutex<HidRaw>>),
-    /// TUF laptops have an aditional set of attributes added to the LED /sysfs/
-    TufLedClass(Arc<Mutex<HidRaw>>),
-    /// TODO
-    MulticolourLed,
-    None,
-}
-
-impl DeviceHandle {
-    /// Try Slash HID. If one exists it is initialsed and returned.
-    pub async fn new_slash_hid(
-        device: Arc<Mutex<HidRaw>>,
-        prod_id: &str,
-    ) -> Result<Self, RogError> {
-        debug!("Testing for HIDRAW Slash");
-        let slash_type = SlashType::from_dmi();
-        if matches!(slash_type, SlashType::Unsupported)
-            || slash_type
-                .prod_id_str()
-                .to_lowercase()
-                .trim_start_matches("0x")
-                != prod_id
-        {
-            log::info!("Unknown or invalid slash: {prod_id:?}, skipping");
-            return Err(RogError::NotFound("No slash device".to_string()));
-        }
-        info!("Found slash type {slash_type:?}: {prod_id}");
-
-        let mut config = SlashConfig::new().load();
-        config.slash_type = slash_type;
-        let slash = Slash::new(Some(device), None, Arc::new(Mutex::new(config)));
-        slash.do_initialization().await?;
-        Ok(Self::Slash(slash))
-    }
-
-    /// Try Slash USB. If one exists it is initialsed and returned.
-    pub async fn new_slash_usb() -> Result<Self, RogError> {
-        debug!("Testing for USB Slash");
-        let slash_type = SlashType::from_dmi();
-        if matches!(slash_type, SlashType::Unsupported) {
-            return Err(RogError::Slash(SlashError::NoDevice));
-        }
-
-        if let Ok(usb) = USBRaw::new(slash_type.prod_id()) {
-            info!("Found Slash USB {slash_type:?}");
-
-            let mut config = SlashConfig::new().load();
-            config.slash_type = slash_type;
-            let slash = Slash::new(
-                None,
-                Some(Arc::new(Mutex::new(usb))),
-                Arc::new(Mutex::new(config)),
-            );
-            slash.do_initialization().await?;
-            Ok(Self::Slash(slash))
-        } else {
-            Err(RogError::NotFound("No slash device found".to_string()))
-        }
-    }
-
-    /// Try AniMe Matrix HID. If one exists it is initialsed and returned.
-    pub async fn maybe_anime_hid(
-        _device: Arc<Mutex<HidRaw>>,
-        _prod_id: &str,
-    ) -> Result<Self, RogError> {
-        // TODO: can't use HIDRAW for anime at the moment
-        Err(RogError::NotFound(
-            "Can't use anime over hidraw yet. Skip.".to_string(),
-        ))
-
-        // debug!("Testing for HIDRAW AniMe");
-        // let anime_type = AnimeType::from_dmi();
-        // dbg!(prod_id);
-        // if matches!(anime_type, AnimeType::Unsupported) || prod_id != "193b"
-        // {     log::info!("Unknown or invalid AniMe: {prod_id:?},
-        // skipping");     return Err(RogError::NotFound("No
-        // anime-matrix device".to_string())); }
-        // info!("Found AniMe Matrix HIDRAW {anime_type:?}: {prod_id}");
-
-        // let mut config = AniMeConfig::new().load();
-        // config.anime_type = anime_type;
-        // let mut anime = AniMe::new(Some(device), None,
-        // Arc::new(Mutex::new(config))); anime.do_initialization().
-        // await?; Ok(Self::AniMe(anime))
-    }
-
-    pub async fn maybe_anime_usb() -> Result<Self, RogError> {
-        debug!("Testing for USB AniMe");
-        let anime_type = get_anime_type();
-        if matches!(anime_type, AnimeType::Unsupported) {
-            info!("No Anime Matrix capable laptop found");
-            return Err(RogError::Anime(AnimeError::NoDevice));
-        }
-
-        if let Ok(usb) = USBRaw::new(0x193b) {
-            info!("Found AniMe Matrix USB {anime_type:?}");
-
-            let mut config = AniMeConfig::new().load();
-            config.anime_type = anime_type;
-            let mut anime = AniMe::new(
-                None,
-                Some(Arc::new(Mutex::new(usb))),
-                Arc::new(Mutex::new(config)),
-            );
-            anime.do_initialization().await?;
-            Ok(Self::AniMe(anime))
-        } else {
-            Err(RogError::NotFound(
-                "No AnimeMatrix device found".to_string(),
-            ))
-        }
-    }
-
-    pub async fn maybe_scsi(dev_node: &str, prod_id: &str) -> Result<Self, RogError> {
-        debug!("Testing for SCSI");
-        let prod_id = ScsiType::from(prod_id);
-        if prod_id == ScsiType::Unsupported {
-            log::info!("Unknown or invalid SCSI: {prod_id:?}, skipping");
-            return Err(RogError::NotFound("No SCSI device".to_string()));
-        }
-        info!("Found SCSI device {prod_id:?} on {dev_node}");
-
-        let mut config = ScsiConfig::new().load();
-        config.dev_type = AuraDeviceType::ScsiExtDisk;
-        let dev = Arc::new(Mutex::new(open_device(dev_node)?));
-        let scsi = ScsiAura::new(dev, Arc::new(Mutex::new(config)));
-        scsi.do_initialization().await?;
-        Ok(Self::Scsi(scsi))
-    }
-
-    pub async fn maybe_laptop_aura(
-        device: Option<Arc<Mutex<HidRaw>>>,
-        prod_id: &str,
-    ) -> Result<Self, RogError> {
-        debug!("Testing for laptop aura");
-        let aura_type = AuraDeviceType::from(prod_id);
-        if !matches!(
-            aura_type,
-            AuraDeviceType::LaptopKeyboard2021
-                | AuraDeviceType::LaptopKeyboardPre2021
-                | AuraDeviceType::LaptopKeyboardTuf
-        ) {
-            log::info!("Unknown or invalid laptop aura: {prod_id:?}, skipping");
-            return Err(RogError::NotFound("No laptop aura device".to_string()));
-        }
-        info!("Found laptop aura type {prod_id:?}");
-
-        let backlight = KeyboardBacklight::new()
-            .map_err(|e| error!("Keyboard backlight error: {e:?}"))
-            .map_or(None, |k| {
-                info!("Found sysfs backlight control");
-                Some(Arc::new(Mutex::new(k)))
-            });
-
-        // Load saved mode, colours, brightness, power from disk; apply on reload
-        let mut config = AuraConfig::load_and_update_config(prod_id);
-        config.led_type = aura_type;
-        let aura = Aura {
-            hid: device,
-            backlight,
-            config: Arc::new(Mutex::new(config)),
-        };
-        aura.do_initialization().await?;
-        Ok(Self::Aura(aura))
-    }
-}
--- a/asusd/src/config.rs
+++ b/asusd/src/config.rs
@@ -1,119 +1,85 @@
-use std::collections::HashMap;
-
-use config_traits::{StdConfig, StdConfigLoad2};
-use rog_platform::asus_armoury::FirmwareAttribute;
+use config_traits::{StdConfig, StdConfigLoad3};
 use rog_platform::cpu::CPUEPP;
-use rog_platform::platform::PlatformProfile;
-use serde::{Deserialize, Serialize};
+use rog_platform::platform::ThrottlePolicy;
+use serde_derive::{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,
-    pub group: HashMap<FirmwareAttribute, i32>,
-}
-type Tunings = HashMap<PlatformProfile, Tuning>;
-
-#[derive(Deserialize, Serialize, PartialEq)]
+#[derive(Deserialize, Serialize, Debug, PartialEq, PartialOrd)]
 pub struct Config {
-    // The current charge limit applied
+    /// Save charge limit for restoring on boot/resume
    pub charge_control_end_threshold: u8,
-    /// Save charge limit for restoring after one-shot full charge
-    #[serde(default = "default_base_charge_limit")]
-    pub base_charge_control_end_threshold: u8,
+    pub panel_od: bool,
+    pub boot_sound: bool,
+    pub mini_led_mode: bool,
    pub disable_nvidia_powerd_on_battery: bool,
    /// An optional command/script to run when power is changed to AC
    pub ac_command: String,
    /// An optional command/script to run when power is changed to battery
    pub bat_command: String,
    /// Set true if energy_performance_preference should be set if the
-    /// platform profile is changed
-    pub platform_profile_linked_epp: bool,
-    /// Which platform profile to use on battery power
-    pub platform_profile_on_battery: PlatformProfile,
-    /// Should the throttle policy be set on bat/ac change?
-    pub change_platform_profile_on_battery: bool,
-    /// Which platform profile to use on AC power
-    pub platform_profile_on_ac: PlatformProfile,
-    /// Should the platform profile be set on bat/ac change?
-    pub change_platform_profile_on_ac: bool,
-    /// The energy_performance_preference for this platform profile
-    pub profile_quiet_epp: CPUEPP,
-    /// The energy_performance_preference for this platform profile
-    pub profile_balanced_epp: CPUEPP,
-    /// The energy_performance_preference for this platform profile
-    pub profile_custom_epp: CPUEPP,
-    /// The energy_performance_preference for this platform profile
-    pub profile_performance_epp: CPUEPP,
-    pub ac_profile_tunings: Tunings,
-    pub dc_profile_tunings: Tunings,
-    pub armoury_settings: HashMap<FirmwareAttribute, i32>,
+    /// throttle/platform profile is changed
+    pub throttle_policy_linked_epp: bool,
+    /// Which throttle/profile to use on battery power
+    pub throttle_policy_on_battery: ThrottlePolicy,
+    /// Which throttle/profile to use on AC power
+    pub throttle_policy_on_ac: ThrottlePolicy,
+    /// The energy_performance_preference for this throttle/platform profile
+    pub throttle_quiet_epp: CPUEPP,
+    /// The energy_performance_preference for this throttle/platform profile
+    pub throttle_balanced_epp: CPUEPP,
+    /// The energy_performance_preference for this throttle/platform profile
+    pub throttle_performance_epp: CPUEPP,
+    /// Defaults to `None` if not supported
    #[serde(skip_serializing_if = "Option::is_none", default)]
-    pub screenpad_gamma: Option<f32>,
+    pub ppt_pl1_spl: Option<u8>,
+    /// Defaults to `None` if not supported
    #[serde(skip_serializing_if = "Option::is_none", default)]
-    pub screenpad_sync_primary: Option<bool>,
+    pub ppt_pl2_sppt: Option<u8>,
+    /// Defaults to `None` if not supported
+    #[serde(skip_serializing_if = "Option::is_none", default)]
+    pub ppt_fppt: Option<u8>,
+    /// Defaults to `None` if not supported
+    #[serde(skip_serializing_if = "Option::is_none", default)]
+    pub ppt_apu_sppt: Option<u8>,
+    /// Defaults to `None` if not supported
+    #[serde(skip_serializing_if = "Option::is_none", default)]
+    pub ppt_platform_sppt: Option<u8>,
+    /// Defaults to `None` if not supported
+    #[serde(skip_serializing_if = "Option::is_none", default)]
+    pub nv_dynamic_boost: Option<u8>,
+    /// Defaults to `None` if not supported
+    #[serde(skip_serializing_if = "Option::is_none", default)]
+    pub nv_temp_target: Option<u8>,
    /// Temporary state for AC/Batt
    #[serde(skip)]
    pub last_power_plugged: u8,
 }

-impl Config {
-    pub fn select_tunings(&mut self, power_plugged: bool, profile: PlatformProfile) -> &mut Tuning {
-        let config = if power_plugged {
-            &mut self.ac_profile_tunings
-        } else {
-            &mut self.dc_profile_tunings
-        };
-        config.entry(profile).or_insert_with(Tuning::default)
-    }
-
-    pub fn select_tunings_ref(
-        &self,
-        power_plugged: bool,
-        profile: PlatformProfile,
-    ) -> Option<&Tuning> {
-        let config = if power_plugged {
-            &self.ac_profile_tunings
-        } else {
-            &self.dc_profile_tunings
-        };
-        config.get(&profile)
-    }
-}
-
 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,
+            panel_od: false,
+            boot_sound: false,
+            mini_led_mode: false,
            disable_nvidia_powerd_on_battery: true,
            ac_command: Default::default(),
            bat_command: Default::default(),
-            platform_profile_linked_epp: true,
-            platform_profile_on_battery: PlatformProfile::Quiet,
-            change_platform_profile_on_battery: true,
-            platform_profile_on_ac: PlatformProfile::Performance,
-            change_platform_profile_on_ac: true,
-            profile_quiet_epp: CPUEPP::Power,
-            profile_balanced_epp: CPUEPP::BalancePower,
-            profile_performance_epp: CPUEPP::Performance,
-            profile_custom_epp: CPUEPP::Performance,
-            ac_profile_tunings: HashMap::default(),
-            dc_profile_tunings: HashMap::default(),
-            armoury_settings: HashMap::default(),
+            throttle_policy_linked_epp: true,
+            throttle_policy_on_battery: ThrottlePolicy::Quiet,
+            throttle_policy_on_ac: ThrottlePolicy::Performance,
+            throttle_quiet_epp: CPUEPP::Power,
+            throttle_balanced_epp: CPUEPP::BalancePower,
+            throttle_performance_epp: CPUEPP::Performance,
+            ppt_pl1_spl: Default::default(),
+            ppt_pl2_sppt: Default::default(),
+            ppt_fppt: Default::default(),
+            ppt_apu_sppt: Default::default(),
+            ppt_platform_sppt: Default::default(),
+            nv_dynamic_boost: Default::default(),
+            nv_temp_target: Default::default(),
            last_power_plugged: Default::default(),
-            screenpad_gamma: Default::default(),
-            screenpad_sync_primary: Default::default(),
        }
    }
 }
@@ -123,8 +89,8 @@ impl StdConfig for Config {
        Config {
            charge_control_end_threshold: 100,
            disable_nvidia_powerd_on_battery: true,
-            platform_profile_on_battery: PlatformProfile::Quiet,
-            platform_profile_on_ac: PlatformProfile::Performance,
+            throttle_policy_on_battery: ThrottlePolicy::Quiet,
+            throttle_policy_on_ac: ThrottlePolicy::Performance,
            ac_command: String::new(),
            bat_command: String::new(),
            ..Default::default()
@@ -140,128 +106,130 @@ impl StdConfig for Config {
    }
 }

-impl StdConfigLoad2<Config611, Config601> for Config {}
+impl StdConfigLoad3<Config472, Config506, Config507> for Config {}

 #[derive(Deserialize, Serialize)]
-pub struct Config611 {
+pub struct Config507 {
+    /// Save charge limit for restoring on boot
    pub charge_control_end_threshold: u8,
-    #[serde(skip)]
-    pub base_charge_control_end_threshold: u8,
-    pub disable_nvidia_powerd_on_battery: bool,
-    pub ac_command: String,
-    pub bat_command: String,
-    pub platform_profile_linked_epp: bool,
-    pub platform_profile_on_battery: PlatformProfile,
-    pub change_platform_profile_on_battery: bool,
-    pub platform_profile_on_ac: PlatformProfile,
-    pub change_platform_profile_on_ac: bool,
-    pub profile_quiet_epp: CPUEPP,
-    pub profile_balanced_epp: CPUEPP,
-    pub profile_custom_epp: CPUEPP,
-    pub profile_performance_epp: CPUEPP,
-    pub ac_profile_tunings: Tunings,
-    pub dc_profile_tunings: Tunings,
-    pub armoury_settings: HashMap<FirmwareAttribute, i32>,
-    #[serde(skip)]
-    pub last_power_plugged: u8,
-}
-
-impl From<Config611> for Config {
-    fn from(c: Config611) -> Self {
-        let mut config = Self {
-            // Restore the base charge limit
-            charge_control_end_threshold: c.charge_control_end_threshold,
-            base_charge_control_end_threshold: c.charge_control_end_threshold,
-            disable_nvidia_powerd_on_battery: c.disable_nvidia_powerd_on_battery,
-            ac_command: c.ac_command,
-            bat_command: c.bat_command,
-            platform_profile_linked_epp: c.platform_profile_linked_epp,
-            platform_profile_on_battery: c.platform_profile_on_battery,
-            change_platform_profile_on_battery: c.change_platform_profile_on_battery,
-            platform_profile_on_ac: c.platform_profile_on_ac,
-            change_platform_profile_on_ac: c.change_platform_profile_on_ac,
-            profile_quiet_epp: c.profile_quiet_epp,
-            profile_balanced_epp: c.profile_balanced_epp,
-            profile_performance_epp: c.profile_performance_epp,
-            profile_custom_epp: c.profile_performance_epp,
-            last_power_plugged: c.last_power_plugged,
-            ac_profile_tunings: HashMap::default(),
-            dc_profile_tunings: HashMap::default(),
-            armoury_settings: HashMap::default(),
-            screenpad_gamma: None,
-            screenpad_sync_primary: Default::default(),
-        };
-
-        config.ac_profile_tunings = c.ac_profile_tunings;
-        config.dc_profile_tunings = c.dc_profile_tunings;
-        config.armoury_settings = c.armoury_settings;
-        config
-    }
-}
-
-#[derive(Deserialize, Serialize)]
-pub struct Config601 {
-    pub charge_control_end_threshold: u8,
-    #[serde(skip)]
-    pub base_charge_control_end_threshold: u8,
    pub panel_od: bool,
-    pub boot_sound: bool,
    pub mini_led_mode: bool,
    pub disable_nvidia_powerd_on_battery: bool,
    pub ac_command: String,
    pub bat_command: String,
-    pub platform_profile_linked_epp: bool,
-    pub platform_profile_on_battery: PlatformProfile,
-    pub change_platform_profile_on_battery: bool,
-    pub platform_profile_on_ac: PlatformProfile,
-    pub change_platform_profile_on_ac: bool,
-    pub profile_quiet_epp: CPUEPP,
-    pub profile_balanced_epp: CPUEPP,
-    pub profile_performance_epp: CPUEPP,
-    #[serde(skip_serializing_if = "Option::is_none", default)]
+    pub platform_policy_linked_epp: bool,
+    pub platform_policy_on_battery: ThrottlePolicy,
+    pub platform_policy_on_ac: ThrottlePolicy,
+    //
    pub ppt_pl1_spl: Option<u8>,
-    #[serde(skip_serializing_if = "Option::is_none", default)]
    pub ppt_pl2_sppt: Option<u8>,
-    #[serde(skip_serializing_if = "Option::is_none", default)]
-    pub ppt_pl3_fppt: Option<u8>,
-    #[serde(skip_serializing_if = "Option::is_none", default)]
    pub ppt_fppt: Option<u8>,
-    #[serde(skip_serializing_if = "Option::is_none", default)]
    pub ppt_apu_sppt: Option<u8>,
-    #[serde(skip_serializing_if = "Option::is_none", default)]
    pub ppt_platform_sppt: Option<u8>,
-    #[serde(skip_serializing_if = "Option::is_none", default)]
    pub nv_dynamic_boost: Option<u8>,
-    #[serde(skip_serializing_if = "Option::is_none", default)]
    pub nv_temp_target: Option<u8>,
-    #[serde(skip)]
-    pub last_power_plugged: u8,
 }

-impl From<Config601> for Config {
-    fn from(c: Config601) -> Self {
+impl From<Config507> for Config {
+    fn from(c: Config507) -> Self {
        Self {
-            // Restore the base charge limit
            charge_control_end_threshold: c.charge_control_end_threshold,
-            base_charge_control_end_threshold: c.charge_control_end_threshold,
+            panel_od: c.panel_od,
+            boot_sound: false,
            disable_nvidia_powerd_on_battery: c.disable_nvidia_powerd_on_battery,
            ac_command: c.ac_command,
            bat_command: c.bat_command,
-            platform_profile_linked_epp: c.platform_profile_linked_epp,
-            platform_profile_on_battery: c.platform_profile_on_battery,
-            change_platform_profile_on_battery: c.change_platform_profile_on_battery,
-            platform_profile_on_ac: c.platform_profile_on_ac,
-            change_platform_profile_on_ac: c.change_platform_profile_on_ac,
-            profile_quiet_epp: c.profile_quiet_epp,
-            profile_balanced_epp: c.profile_balanced_epp,
-            profile_performance_epp: c.profile_performance_epp,
-            profile_custom_epp: c.profile_performance_epp,
-            last_power_plugged: c.last_power_plugged,
-            ac_profile_tunings: HashMap::default(),
-            dc_profile_tunings: HashMap::default(),
-            armoury_settings: HashMap::default(),
-            screenpad_gamma: None,
-            screenpad_sync_primary: Default::default(),
+            mini_led_mode: c.mini_led_mode,
+            throttle_policy_linked_epp: true,
+            throttle_policy_on_battery: c.platform_policy_on_battery,
+            throttle_policy_on_ac: c.platform_policy_on_ac,
+            throttle_quiet_epp: CPUEPP::Power,
+            throttle_balanced_epp: CPUEPP::BalancePower,
+            throttle_performance_epp: CPUEPP::Performance,
+            ppt_pl1_spl: c.ppt_pl1_spl,
+            ppt_pl2_sppt: c.ppt_pl2_sppt,
+            ppt_fppt: c.ppt_fppt,
+            ppt_apu_sppt: c.ppt_apu_sppt,
+            ppt_platform_sppt: c.ppt_platform_sppt,
+            nv_dynamic_boost: c.nv_dynamic_boost,
+            nv_temp_target: c.nv_temp_target,
+            last_power_plugged: 0,
+        }
+    }
+}
+
+#[derive(Deserialize, Serialize)]
+pub struct Config506 {
+    /// Save charge limit for restoring on boot
+    pub charge_control_end_threshold: u8,
+    pub panel_od: bool,
+    pub mini_led_mode: bool,
+    pub disable_nvidia_powerd_on_battery: bool,
+    pub ac_command: String,
+    pub bat_command: String,
+    /// Restored on boot as well as when power is plugged
+    #[serde(skip)]
+    pub platform_policy_to_restore: ThrottlePolicy,
+    pub platform_policy_on_battery: ThrottlePolicy,
+    pub platform_policy_on_ac: ThrottlePolicy,
+    //
+    pub ppt_pl1_spl: Option<u8>,
+    pub ppt_pl2_sppt: Option<u8>,
+    pub ppt_fppt: Option<u8>,
+    pub ppt_apu_sppt: Option<u8>,
+    pub ppt_platform_sppt: Option<u8>,
+    pub nv_dynamic_boost: Option<u8>,
+    pub nv_temp_target: Option<u8>,
+}
+
+impl From<Config506> for Config {
+    fn from(c: Config506) -> Self {
+        Self {
+            charge_control_end_threshold: c.charge_control_end_threshold,
+            panel_od: c.panel_od,
+            boot_sound: false,
+            disable_nvidia_powerd_on_battery: c.disable_nvidia_powerd_on_battery,
+            ac_command: c.ac_command,
+            bat_command: c.bat_command,
+            mini_led_mode: c.mini_led_mode,
+            throttle_policy_linked_epp: true,
+            throttle_policy_on_battery: c.platform_policy_on_battery,
+            throttle_policy_on_ac: c.platform_policy_on_ac,
+            throttle_quiet_epp: CPUEPP::Power,
+            throttle_balanced_epp: CPUEPP::BalancePower,
+            throttle_performance_epp: CPUEPP::Performance,
+            ppt_pl1_spl: c.ppt_pl1_spl,
+            ppt_pl2_sppt: c.ppt_pl2_sppt,
+            ppt_fppt: c.ppt_fppt,
+            ppt_apu_sppt: c.ppt_apu_sppt,
+            ppt_platform_sppt: c.ppt_platform_sppt,
+            nv_dynamic_boost: c.nv_dynamic_boost,
+            nv_temp_target: c.nv_temp_target,
+            last_power_plugged: 0,
+        }
+    }
+}
+
+#[derive(Deserialize, Serialize)]
+pub struct Config472 {
+    /// Save charge limit for restoring on boot
+    pub bat_charge_limit: u8,
+    pub panel_od: bool,
+    pub mini_led_mode: bool,
+    pub disable_nvidia_powerd_on_battery: bool,
+    pub ac_command: String,
+    pub bat_command: String,
+}
+
+impl From<Config472> for Config {
+    fn from(c: Config472) -> Self {
+        Self {
+            charge_control_end_threshold: c.bat_charge_limit,
+            panel_od: c.panel_od,
+            disable_nvidia_powerd_on_battery: true,
+            ac_command: c.ac_command,
+            bat_command: c.bat_command,
+            ..Default::default()
        }
    }
 }
--- a/asusd/src/ctrl_anime/config.rs
+++ b/asusd/src/ctrl_anime/config.rs
@@ -1,27 +1,81 @@
 use std::time::Duration;

-use config_traits::{StdConfig, StdConfigLoad};
+use config_traits::{StdConfig, StdConfigLoad2};
 use rog_anime::error::AnimeError;
 use rog_anime::usb::Brightness;
 use rog_anime::{
    ActionData, ActionLoader, AnimTime, Animations, AnimeType, DeviceState, Fade, Vec2,
 };
-use serde::{Deserialize, Serialize};
+use serde_derive::{Deserialize, Serialize};

 const CONFIG_FILE: &str = "anime.ron";

-#[derive(Debug, Clone, Deserialize, Serialize, Default)]
-pub struct AniMeConfigCached {
+#[derive(Deserialize, Serialize)]
+pub struct AnimeConfigV460 {
+    pub system: Vec<ActionLoader>,
+    pub boot: Vec<ActionLoader>,
+    pub wake: Vec<ActionLoader>,
+    pub sleep: Vec<ActionLoader>,
+    pub shutdown: Vec<ActionLoader>,
+    pub brightness: f32,
+}
+
+impl From<AnimeConfigV460> for AnimeConfig {
+    fn from(c: AnimeConfigV460) -> AnimeConfig {
+        AnimeConfig {
+            system: c.system,
+            boot: c.boot,
+            wake: c.wake,
+            shutdown: c.shutdown,
+            ..Default::default()
+        }
+    }
+}
+
+#[derive(Deserialize, Serialize, Debug)]
+pub struct AnimeConfigV472 {
+    pub model_override: Option<AnimeType>,
+    pub system: Vec<ActionLoader>,
+    pub boot: Vec<ActionLoader>,
+    pub wake: Vec<ActionLoader>,
+    pub sleep: Vec<ActionLoader>,
+    pub shutdown: Vec<ActionLoader>,
+    pub brightness: f32,
+    pub display_enabled: bool,
+    pub display_brightness: Brightness,
+    pub builtin_anims_enabled: bool,
+    pub builtin_anims: Animations,
+}
+
+impl From<AnimeConfigV472> for AnimeConfig {
+    fn from(c: AnimeConfigV472) -> AnimeConfig {
+        AnimeConfig {
+            system: c.system,
+            boot: c.boot,
+            wake: c.wake,
+            shutdown: c.shutdown,
+            model_override: c.model_override,
+            display_enabled: c.display_enabled,
+            display_brightness: c.display_brightness,
+            builtin_anims_enabled: c.builtin_anims_enabled,
+            builtin_anims: c.builtin_anims,
+            ..Default::default()
+        }
+    }
+}
+
+#[derive(Deserialize, Serialize, Default)]
+pub struct AnimeConfigCached {
    pub system: Vec<ActionData>,
    pub boot: Vec<ActionData>,
    pub wake: Vec<ActionData>,
    pub shutdown: Vec<ActionData>,
 }

-impl AniMeConfigCached {
+impl AnimeConfigCached {
    pub fn init_from_config(
        &mut self,
-        config: &AniMeConfig,
+        config: &AnimeConfig,
        anime_type: AnimeType,
    ) -> Result<(), AnimeError> {
        let mut sys = Vec::with_capacity(config.system.len());
@@ -53,9 +107,8 @@ impl AniMeConfigCached {

 /// Config for base system actions for the anime display
 #[derive(Deserialize, Serialize, Debug, Clone)]
-pub struct AniMeConfig {
-    #[serde(skip)]
-    pub anime_type: AnimeType,
+pub struct AnimeConfig {
+    pub model_override: Option<AnimeType>,
    pub system: Vec<ActionLoader>,
    pub boot: Vec<ActionLoader>,
    pub wake: Vec<ActionLoader>,
@@ -71,10 +124,10 @@ pub struct AniMeConfig {
    pub builtin_anims: Animations,
 }

-impl Default for AniMeConfig {
+impl Default for AnimeConfig {
    fn default() -> Self {
-        AniMeConfig {
-            anime_type: AnimeType::GA402,
+        AnimeConfig {
+            model_override: None,
            system: Vec::new(),
            boot: Vec::new(),
            wake: Vec::new(),
@@ -92,7 +145,7 @@ impl Default for AniMeConfig {
    }
 }

-impl StdConfig for AniMeConfig {
+impl StdConfig for AnimeConfig {
    fn new() -> Self {
        Self::create_default()
    }
@@ -106,10 +159,10 @@ impl StdConfig for AniMeConfig {
    }
 }

-impl StdConfigLoad for AniMeConfig {}
+impl StdConfigLoad2<AnimeConfigV460, AnimeConfigV472> for AnimeConfig {}

-impl From<&AniMeConfig> for DeviceState {
-    fn from(config: &AniMeConfig) -> Self {
+impl From<&AnimeConfig> for DeviceState {
+    fn from(config: &AnimeConfig) -> Self {
        DeviceState {
            display_enabled: config.display_enabled,
            display_brightness: config.display_brightness,
@@ -123,7 +176,7 @@ impl From<&AniMeConfig> for DeviceState {
    }
 }

-impl AniMeConfig {
+impl AnimeConfig {
    // fn clamp_config_brightness(mut config: &mut AnimeConfig) {
    //     if config.brightness < 0.0 || config.brightness > 1.0 {
    //         warn!(
@@ -136,46 +189,40 @@ impl AniMeConfig {

    fn create_default() -> Self {
        // create a default config here
-        AniMeConfig {
+        AnimeConfig {
            system: vec![],
-            boot: vec![
-                ActionLoader::ImageAnimation {
-                    file: "/usr/share/asusd/anime/custom/sonic-run.gif".into(),
-                    scale: 0.9,
-                    angle: 0.65,
-                    translation: Vec2::default(),
-                    brightness: 1.0,
-                    time: AnimTime::Fade(Fade::new(
-                        Duration::from_secs(2),
-                        Some(Duration::from_secs(2)),
-                        Duration::from_secs(2),
-                    )),
-                },
-            ],
-            wake: vec![
-                ActionLoader::ImageAnimation {
-                    file: "/usr/share/asusd/anime/custom/sonic-run.gif".into(),
-                    scale: 0.9,
-                    angle: 0.65,
-                    translation: Vec2::default(),
-                    brightness: 1.0,
-                    time: AnimTime::Fade(Fade::new(
-                        Duration::from_secs(2),
-                        Some(Duration::from_secs(2)),
-                        Duration::from_secs(2),
-                    )),
-                },
-            ],
-            shutdown: vec![
-                ActionLoader::ImageAnimation {
-                    file: "/usr/share/asusd/anime/custom/sonic-wait.gif".into(),
-                    scale: 0.9,
-                    angle: 0.0,
-                    translation: Vec2::new(3.0, 2.0),
-                    brightness: 1.0,
-                    time: AnimTime::Infinite,
-                },
-            ],
+            boot: vec![ActionLoader::ImageAnimation {
+                file: "/usr/share/asusd/anime/custom/sonic-run.gif".into(),
+                scale: 0.9,
+                angle: 0.65,
+                translation: Vec2::default(),
+                brightness: 1.0,
+                time: AnimTime::Fade(Fade::new(
+                    Duration::from_secs(2),
+                    Some(Duration::from_secs(2)),
+                    Duration::from_secs(2),
+                )),
+            }],
+            wake: vec![ActionLoader::ImageAnimation {
+                file: "/usr/share/asusd/anime/custom/sonic-run.gif".into(),
+                scale: 0.9,
+                angle: 0.65,
+                translation: Vec2::default(),
+                brightness: 1.0,
+                time: AnimTime::Fade(Fade::new(
+                    Duration::from_secs(2),
+                    Some(Duration::from_secs(2)),
+                    Duration::from_secs(2),
+                )),
+            }],
+            shutdown: vec![ActionLoader::ImageAnimation {
+                file: "/usr/share/asusd/anime/custom/sonic-wait.gif".into(),
+                scale: 0.9,
+                angle: 0.0,
+                translation: Vec2::new(3.0, 2.0),
+                brightness: 1.0,
+                time: AnimTime::Infinite,
+            }],
            ..Default::default()
        }
    }
--- a/asusd/src/ctrl_anime/mod.rs
+++ b/asusd/src/ctrl_anime/mod.rs
@@ -0,0 +1,290 @@
+pub mod config;
+/// Implements `CtrlTask`, Reloadable, `ZbusRun`
+pub mod trait_impls;
+
+use std::convert::TryFrom;
+use std::sync::atomic::{AtomicBool, Ordering};
+use std::sync::Arc;
+use std::thread::sleep;
+
+use ::zbus::export::futures_util::lock::Mutex;
+use log::{error, info, warn};
+use rog_anime::error::AnimeError;
+use rog_anime::usb::{
+    get_anime_type, pkt_flush, pkt_set_brightness, pkt_set_enable_display,
+    pkt_set_enable_powersave_anim, pkts_for_init, Brightness,
+};
+use rog_anime::{ActionData, AnimeDataBuffer, AnimePacketType, AnimeType};
+use rog_platform::hid_raw::HidRaw;
+use rog_platform::usb_raw::USBRaw;
+
+use self::config::{AnimeConfig, AnimeConfigCached};
+use crate::error::RogError;
+
+enum Node {
+    Usb(USBRaw),
+    Hid(HidRaw),
+}
+
+impl Node {
+    pub fn write_bytes(&self, message: &[u8]) -> Result<(), RogError> {
+        // TODO: map and pass on errors
+        match self {
+            Node::Usb(u) => {
+                u.write_bytes(message).ok();
+            }
+            Node::Hid(h) => {
+                h.write_bytes(message).ok();
+            }
+        }
+        Ok(())
+    }
+
+    pub fn set_builtins_enabled(&self, enabled: bool, bright: Brightness) -> Result<(), RogError> {
+        self.write_bytes(&pkt_set_enable_powersave_anim(enabled))?;
+        self.write_bytes(&pkt_set_enable_display(enabled))?;
+        self.write_bytes(&pkt_set_brightness(bright))?;
+        self.write_bytes(&pkt_set_enable_powersave_anim(enabled))
+    }
+}
+
+pub struct CtrlAnime {
+    // node: HidRaw,
+    node: Node,
+    anime_type: AnimeType,
+    cache: AnimeConfigCached,
+    config: AnimeConfig,
+    // set to force thread to exit
+    thread_exit: Arc<AtomicBool>,
+    // Set to false when the thread exits
+    thread_running: Arc<AtomicBool>,
+}
+
+impl CtrlAnime {
+    #[inline]
+    pub fn new(config: AnimeConfig) -> Result<CtrlAnime, RogError> {
+        let usb = USBRaw::new(0x193b).ok();
+        let hid = HidRaw::new("193b").ok();
+        let node = if usb.is_some() {
+            info!("Anime using the USB interface");
+            unsafe { Node::Usb(usb.unwrap_unchecked()) }
+        } else if hid.is_some() {
+            info!("Anime using the HID interface");
+            unsafe { Node::Hid(hid.unwrap_unchecked()) }
+        } else {
+            return Err(RogError::Anime(AnimeError::NoDevice));
+        };
+
+        // TODO: something better to set wakeups disabled
+        // if matches!(node, Node::Usb(_)) {
+        //     if let Ok(mut enumerator) = udev::Enumerator::new() {
+        //         enumerator.match_subsystem("usb").ok();
+        //         enumerator.match_attribute("idProduct", "193b").ok();
+
+        //         if let Ok(mut enumer) = enumerator.scan_devices() {
+        //             if let Some(mut dev) = enumer.next() {
+        //                 dev.set_attribute_value("power/wakeup", "disabled").ok();
+        //             }
+        //         }
+        //     }
+        // }
+
+        let mut anime_type = get_anime_type()?;
+        if let AnimeType::Unknown = anime_type {
+            if let Some(model) = config.model_override {
+                warn!("Overriding the Animatrix type as {model:?}");
+                anime_type = model;
+            }
+        }
+
+        info!("Device has an AniMe Matrix display: {anime_type:?}");
+        let mut cache = AnimeConfigCached::default();
+        cache.init_from_config(&config, anime_type)?;
+
+        let ctrl = CtrlAnime {
+            node,
+            anime_type,
+            cache,
+            config,
+            thread_exit: Arc::new(AtomicBool::new(false)),
+            thread_running: Arc::new(AtomicBool::new(false)),
+        };
+        ctrl.do_initialization()?;
+
+        Ok(ctrl)
+    }
+
+    // let device = CtrlAnime::get_device(0x0b05, 0x193b)?;
+
+    /// Start an action thread. This is classed as a singleton and there should
+    /// be only one running - so the thread uses atomics to signal run/exit.
+    ///
+    /// Because this also writes to the usb device, other write tries (display
+    /// only) *must* get the mutex lock and set the `thread_exit` atomic.
+    async fn run_thread(inner: Arc<Mutex<CtrlAnime>>, actions: Vec<ActionData>, mut once: bool) {
+        if actions.is_empty() {
+            warn!("AniMe system actions was empty");
+            return;
+        }
+
+        if let Some(lock) = inner.try_lock() {
+            lock.node
+                .write_bytes(&pkt_set_enable_powersave_anim(false))
+                .map_err(|err| {
+                    warn!("rog_anime::run_animation:callback {}", err);
+                })
+                .ok();
+        }
+
+        // Loop rules:
+        // - Lock the mutex **only when required**. That is, the lock must be held for
+        //   the shortest duration possible.
+        // - An AtomicBool used for thread exit should be checked in every loop,
+        //   including nested
+
+        // The only reason for this outer thread is to prevent blocking while waiting
+        // for the next spawned thread to exit
+        // TODO: turn this in to async task (maybe? COuld still risk blocking main
+        // thread)
+        std::thread::Builder::new()
+            .name("AniMe system thread start".into())
+            .spawn(move || {
+                info!("AniMe new system thread started");
+                // Getting copies of these Atomics is done *in* the thread to ensure
+                // we don't block other threads/main
+                let thread_exit;
+                let thread_running;
+                let anime_type;
+                loop {
+                    if let Some(lock) = inner.try_lock() {
+                        thread_exit = lock.thread_exit.clone();
+                        thread_running = lock.thread_running.clone();
+                        anime_type = lock.anime_type;
+                        break;
+                    }
+                }
+                // First two loops are to ensure we *do* aquire a lock on the mutex
+                // The reason the loop is required is because the USB writes can block
+                // for up to 10ms. We can't fail to get the atomics.
+                while thread_running.load(Ordering::SeqCst) {
+                    // Make any running loop exit first
+                    thread_exit.store(true, Ordering::SeqCst);
+                }
+
+                info!("AniMe no previous system thread running (now)");
+                thread_exit.store(false, Ordering::SeqCst);
+                thread_running.store(true, Ordering::SeqCst);
+                'main: loop {
+                    for action in &actions {
+                        if thread_exit.load(Ordering::SeqCst) {
+                            break 'main;
+                        }
+                        match action {
+                            ActionData::Animation(frames) => {
+                                rog_anime::run_animation(frames, &|frame| {
+                                    if thread_exit.load(Ordering::Acquire) {
+                                        info!("rog-anime: animation sub-loop was asked to exit");
+                                        return Ok(true); // Do safe exit
+                                    }
+                                    inner
+                                        .try_lock()
+                                        .map(|lock| {
+                                            lock.write_data_buffer(frame)
+                                                .map_err(|err| {
+                                                    warn!(
+                                                        "rog_anime::run_animation:callback {}",
+                                                        err
+                                                    );
+                                                })
+                                                .ok();
+                                            false // Don't exit yet
+                                        })
+                                        .map_or_else(
+                                            || {
+                                                warn!("rog_anime::run_animation:callback failed");
+                                                Err(AnimeError::NoFrames)
+                                            },
+                                            Ok,
+                                        )
+                                });
+                                if thread_exit.load(Ordering::Acquire) {
+                                    info!("rog-anime: sub-loop exited and main loop exiting now");
+                                    break 'main;
+                                }
+                            }
+                            ActionData::Image(image) => {
+                                once = false;
+                                if let Some(lock) = inner.try_lock() {
+                                    lock.write_data_buffer(image.as_ref().clone())
+                                        .map_err(|e| error!("{}", e))
+                                        .ok();
+                                }
+                            }
+                            ActionData::Pause(duration) => sleep(*duration),
+                            ActionData::AudioEq
+                            | ActionData::SystemInfo
+                            | ActionData::TimeDate
+                            | ActionData::Matrix => {}
+                        }
+                    }
+                    if thread_exit.load(Ordering::SeqCst) {
+                        break 'main;
+                    }
+                    if once || actions.is_empty() {
+                        break 'main;
+                    }
+                }
+                // Clear the display on exit
+                if let Some(lock) = inner.try_lock() {
+                    if let Ok(data) =
+                        AnimeDataBuffer::from_vec(anime_type, vec![0u8; anime_type.data_length()])
+                            .map_err(|e| error!("{}", e))
+                    {
+                        lock.write_data_buffer(data)
+                            .map_err(|err| {
+                                warn!("rog_anime::run_animation:callback {}", err);
+                            })
+                            .ok();
+                    }
+                    lock.node
+                        .write_bytes(&pkt_set_enable_powersave_anim(
+                            lock.config.builtin_anims_enabled,
+                        ))
+                        .map_err(|err| {
+                            warn!("rog_anime::run_animation:callback {}", err);
+                        })
+                        .ok();
+                }
+                // Loop ended, set the atmonics
+                thread_running.store(false, Ordering::SeqCst);
+                info!("AniMe system thread exited");
+            })
+            .map(|err| info!("AniMe system thread: {:?}", err))
+            .ok();
+    }
+
+    /// Write only a data packet. This will modify the leds brightness using the
+    /// global brightness set in config.
+    fn write_data_buffer(&self, mut buffer: AnimeDataBuffer) -> Result<(), RogError> {
+        for led in buffer.data_mut().iter_mut() {
+            let mut bright = *led as f32;
+            if bright > 254.0 {
+                bright = 254.0;
+            }
+            *led = bright as u8;
+        }
+        let data = AnimePacketType::try_from(buffer)?;
+        for row in &data {
+            self.node.write_bytes(row)?;
+        }
+        self.node.write_bytes(&pkt_flush())?;
+        Ok(())
+    }
+
+    fn do_initialization(&self) -> Result<(), RogError> {
+        let pkts = pkts_for_init();
+        self.node.write_bytes(&pkts[0])?;
+        self.node.write_bytes(&pkts[1])?;
+        Ok(())
+    }
+}
--- a/asusd/src/ctrl_anime/trait_impls.rs
+++ b/asusd/src/ctrl_anime/trait_impls.rs
@@ -1,22 +1,23 @@
 use std::sync::atomic::Ordering;
+use std::sync::Arc;

 use config_traits::StdConfig;
-use log::{debug, error, warn};
+use log::warn;
 use logind_zbus::manager::ManagerProxy;
 use rog_anime::usb::{
    pkt_set_brightness, pkt_set_builtin_animations, pkt_set_enable_display,
    pkt_set_enable_powersave_anim, Brightness,
 };
 use rog_anime::{Animations, AnimeDataBuffer, DeviceState};
-use zbus::object_server::SignalEmitter;
-use zbus::proxy::CacheProperties;
-use zbus::zvariant::OwnedObjectPath;
-use zbus::{interface, Connection};
+use zbus::export::futures_util::lock::Mutex;
+use zbus::{interface, CacheProperties, Connection, SignalContext};

-use super::config::AniMeConfig;
-use super::AniMe;
+use super::config::AnimeConfig;
+use super::CtrlAnime;
 use crate::error::RogError;
-use crate::Reloadable;
+
+pub const ANIME_ZBUS_NAME: &str = "Anime";
+pub const ANIME_ZBUS_PATH: &str = "/org/asuslinux";

 async fn get_logind_manager<'a>() -> ManagerProxy<'a> {
    let connection = Connection::system()
@@ -31,121 +32,104 @@ async fn get_logind_manager<'a>() -> ManagerProxy<'a> {
 }

 #[derive(Clone)]
-pub struct AniMeZbus(AniMe);
+pub struct CtrlAnimeZbus(pub Arc<Mutex<CtrlAnime>>);

-impl AniMeZbus {
-    pub fn new(anime: AniMe) -> Self {
-        Self(anime)
-    }
-
-    pub async fn start_tasks(
-        mut self,
-        connection: &Connection,
-        path: OwnedObjectPath,
-    ) -> Result<(), RogError> {
-        // let task = zbus.clone();
-        self.reload()
-            .await
-            .unwrap_or_else(|err| warn!("Controller error: {}", err));
-        connection
-            .object_server()
-            .at(path.clone(), self)
-            .await
-            .map_err(|e| {
-                error!("Couldn't add server at path: {path}, {e:?}");
-                e
-            })?;
-        debug!("start_tasks was successful");
-        Ok(())
+/// The struct with the main dbus methods requires this trait
+impl crate::ZbusRun for CtrlAnimeZbus {
+    async fn add_to_server(self, server: &mut Connection) {
+        Self::add_to_server_helper(self, ANIME_ZBUS_PATH, server).await;
    }
 }

 // None of these calls can be guarnateed to succeed unless we loop until okay
 // If the try_lock *does* succeed then any other thread trying to lock will not
 // grab it until we finish.
-#[interface(name = "xyz.ljones.Anime")]
-impl AniMeZbus {
+#[interface(name = "org.asuslinux.Anime")]
+impl CtrlAnimeZbus {
    /// Writes a data stream of length. Will force system thread to exit until
    /// it is restarted
    async fn write(&self, input: AnimeDataBuffer) -> zbus::fdo::Result<()> {
-        let bright = self.0.config.lock().await.display_brightness;
-        if self.0.config.lock().await.builtin_anims_enabled {
-            // This clears the display, causing flickers if done indiscriminately on every
-            // write. Therefore, we guard it behind a config check.
-            self.0.set_builtins_enabled(false, bright).await?;
-        }
-        self.0.thread_exit.store(true, Ordering::SeqCst);
-        self.0.write_data_buffer(input).await.map_err(|err| {
-            warn!("ctrl_anime::run_animation:callback {}", err);
-            err
-        })?;
+        self.0
+            .lock()
+            .await
+            .thread_exit
+            .store(true, Ordering::SeqCst);
+        self.0
+            .lock()
+            .await
+            .write_data_buffer(input)
+            .map_err(|err| {
+                warn!("ctrl_anime::run_animation:callback {}", err);
+                err
+            })?;
        Ok(())
    }

    /// Set base brightness level
    #[zbus(property)]
    async fn brightness(&self) -> Brightness {
-        if let Ok(config) = self.0.config.try_lock() {
-            return config.display_brightness;
-        }
-        Brightness::Off
+        self.0.lock().await.config.display_brightness
    }

    /// Set base brightness level
    #[zbus(property)]
    async fn set_brightness(&self, brightness: Brightness) {
        self.0
-            .write_bytes(&pkt_set_brightness(brightness))
+            .lock()
            .await
+            .node
+            .write_bytes(&pkt_set_brightness(brightness))
            .map_err(|err| {
                warn!("ctrl_anime::set_brightness {}", err);
            })
            .ok();
        self.0
-            .write_bytes(&pkt_set_enable_display(brightness != Brightness::Off))
+            .lock()
            .await
+            .node
+            .write_bytes(&pkt_set_enable_display(brightness != Brightness::Off))
            .map_err(|err| {
                warn!("ctrl_anime::set_brightness {}", err);
            })
            .ok();

-        let mut config = self.0.config.lock().await;
-        config.display_enabled = brightness != Brightness::Off;
-        config.display_brightness = brightness;
-        config.write();
+        self.0.lock().await.config.display_enabled = brightness != Brightness::Off;
+        self.0.lock().await.config.display_brightness = brightness;
+        self.0.lock().await.config.write();
    }

    #[zbus(property)]
    async fn builtins_enabled(&self) -> bool {
-        if let Ok(config) = self.0.config.try_lock() {
-            return config.builtin_anims_enabled;
-        }
-        false
+        let lock = self.0.lock().await;
+        lock.config.builtin_anims_enabled
    }

    /// Enable the builtin animations or not. This is quivalent to "Powersave
    /// animations" in Armory crate
    #[zbus(property)]
    async fn set_builtins_enabled(&self, enabled: bool) {
-        let mut config = self.0.config.lock().await;
-        let brightness = config.display_brightness;
+        let brightness = self.0.lock().await.config.display_brightness;
        self.0
-            .set_builtins_enabled(enabled, brightness)
+            .lock()
            .await
+            .node
+            .set_builtins_enabled(enabled, brightness)
            .map_err(|err| {
                warn!("ctrl_anime::set_builtins_enabled {}", err);
            })
            .ok();

        if !enabled {
-            let anime_type = config.anime_type;
+            let anime_type = self.0.lock().await.anime_type;
            let data = vec![255u8; anime_type.data_length()];
            if let Ok(tmp) = AnimeDataBuffer::from_vec(anime_type, data).map_err(|err| {
                warn!("ctrl_anime::set_builtins_enabled {}", err);
            }) {
                self.0
-                    .write_bytes(tmp.data())
+                    .lock()
                    .await
+                    .node
+                    .write_bytes(tmp.data())
                    .map_err(|err| {
                        warn!("ctrl_anime::set_builtins_enabled {}", err);
                    })
@@ -153,75 +137,77 @@ impl AniMeZbus {
            }
        }

-        config.builtin_anims_enabled = enabled;
-        config.write();
+        self.0.lock().await.config.builtin_anims_enabled = enabled;
+        self.0.lock().await.config.write();
        if enabled {
-            self.0.thread_exit.store(true, Ordering::Release);
+            self.0
+                .lock()
+                .await
+                .thread_exit
+                .store(true, Ordering::Release);
        }
    }

    #[zbus(property)]
    async fn builtin_animations(&self) -> Animations {
-        if let Ok(config) = self.0.config.try_lock() {
-            return config.builtin_anims;
-        }
-        Animations::default()
+        self.0.lock().await.config.builtin_anims
    }

    /// Set which builtin animation is used for each stage
    #[zbus(property)]
    async fn set_builtin_animations(&self, settings: Animations) {
        self.0
-            .write_bytes(&pkt_set_builtin_animations(
-                settings.boot, settings.awake, settings.sleep, settings.shutdown,
-            ))
+            .lock()
            .await
+            .node
+            .write_bytes(&pkt_set_builtin_animations(
+                settings.boot,
+                settings.awake,
+                settings.sleep,
+                settings.shutdown,
+            ))
            .map_err(|err| {
                warn!("ctrl_anime::run_animation:callback {}", err);
            })
            .ok();
        self.0
-            .write_bytes(&pkt_set_enable_powersave_anim(true))
+            .lock()
            .await
+            .node
+            .write_bytes(&pkt_set_enable_powersave_anim(true))
            .map_err(|err| {
                warn!("ctrl_anime::run_animation:callback {}", err);
            })
            .ok();
-        let mut config = self.0.config.lock().await;
-        config.display_enabled = true;
-        config.builtin_anims = settings;
-        config.write();
+        self.0.lock().await.config.display_enabled = true;
+        self.0.lock().await.config.builtin_anims = settings;
+        self.0.lock().await.config.write();
    }

    #[zbus(property)]
    async fn enable_display(&self) -> bool {
-        if let Ok(config) = self.0.config.try_lock() {
-            return config.display_enabled;
-        }
-        false
+        self.0.lock().await.config.display_enabled
    }

    /// Set whether the AniMe is enabled at all
    #[zbus(property)]
    async fn set_enable_display(&self, enabled: bool) {
        self.0
-            .write_bytes(&pkt_set_enable_display(enabled))
+            .lock()
            .await
+            .node
+            .write_bytes(&pkt_set_enable_display(enabled))
            .map_err(|err| {
                warn!("ctrl_anime::run_animation:callback {}", err);
            })
            .ok();
-        let mut config = self.0.config.lock().await;
-        config.display_enabled = enabled;
-        config.write();
+        self.0.lock().await.config.display_enabled = enabled;
+        self.0.lock().await.config.write();
    }

    #[zbus(property)]
    async fn off_when_unplugged(&self) -> bool {
-        if let Ok(config) = self.0.config.try_lock() {
-            return config.off_when_unplugged;
-        }
-        false
+        self.0.lock().await.config.off_when_unplugged
    }

    /// Set if to turn the AniMe Matrix off when external power is unplugged
@@ -231,40 +217,34 @@ impl AniMeZbus {
        let pow = manager.on_external_power().await.unwrap_or_default();

        self.0
-            .write_bytes(&pkt_set_enable_display(!pow && !enabled))
+            .lock()
            .await
+            .node
+            .write_bytes(&pkt_set_enable_display(!pow && !enabled))
            .map_err(|err| {
                warn!("create_sys_event_tasks::off_when_lid_closed {}", err);
            })
            .ok();

-        let mut config = self.0.config.lock().await;
-        config.off_when_unplugged = enabled;
-        config.write();
+        self.0.lock().await.config.off_when_unplugged = enabled;
+        self.0.lock().await.config.write();
    }

    #[zbus(property)]
    async fn off_when_suspended(&self) -> bool {
-        if let Ok(config) = self.0.config.try_lock() {
-            return config.off_when_suspended;
-        }
-        false
+        self.0.lock().await.config.off_when_suspended
    }

    /// Set if to turn the AniMe Matrix off when the laptop is suspended
    #[zbus(property)]
    async fn set_off_when_suspended(&self, enabled: bool) {
-        let mut config = self.0.config.lock().await;
-        config.off_when_suspended = enabled;
-        config.write();
+        self.0.lock().await.config.off_when_suspended = enabled;
+        self.0.lock().await.config.write();
    }

    #[zbus(property)]
    async fn off_when_lid_closed(&self) -> bool {
-        if let Ok(config) = self.0.config.try_lock() {
-            return config.off_when_lid_closed;
-        }
-        false
+        self.0.lock().await.config.off_when_lid_closed
    }

    /// Set if to turn the AniMe Matrix off when the lid is closed
@@ -274,40 +254,50 @@ impl AniMeZbus {
        let lid = manager.lid_closed().await.unwrap_or_default();

        self.0
-            .write_bytes(&pkt_set_enable_display(lid && !enabled))
+            .lock()
            .await
+            .node
+            .write_bytes(&pkt_set_enable_display(lid && !enabled))
            .map_err(|err| {
                warn!("create_sys_event_tasks::off_when_lid_closed {}", err);
            })
            .ok();

-        let mut config = self.0.config.lock().await;
-        config.off_when_lid_closed = enabled;
-        config.write();
+        self.0.lock().await.config.off_when_lid_closed = enabled;
+        self.0.lock().await.config.write();
    }

    /// The main loop is the base system set action if the user isn't running
    /// the user daemon
    async fn run_main_loop(&self, start: bool) {
        if start {
-            self.0.thread_exit.store(true, Ordering::SeqCst);
-            self.0.run_thread(self.0.cache.system.clone(), false).await;
+            self.0
+                .lock()
+                .await
+                .thread_exit
+                .store(true, Ordering::SeqCst);
+            CtrlAnime::run_thread(
+                self.0.clone(),
+                self.0.lock().await.cache.system.clone(),
+                false,
+            )
+            .await;
        }
    }

    /// Get the device state as stored by asusd
    // #[zbus(property)]
    async fn device_state(&self) -> DeviceState {
-        DeviceState::from(&*self.0.config.lock().await)
+        DeviceState::from(&self.0.lock().await.config)
    }
 }

-impl crate::CtrlTask for AniMeZbus {
+impl crate::CtrlTask for CtrlAnimeZbus {
    fn zbus_path() -> &'static str {
-        "ANIME_ZBUS_PATH"
+        ANIME_ZBUS_PATH
    }

-    async fn create_tasks(&self, _: SignalEmitter<'static>) -> Result<(), RogError> {
+    async fn create_tasks(&self, _: SignalContext<'static>) -> Result<(), RogError> {
        let inner1 = self.0.clone();
        let inner2 = self.0.clone();
        let inner3 = self.0.clone();
@@ -317,15 +307,21 @@ impl crate::CtrlTask for AniMeZbus {
                // on_sleep
                let inner = inner1.clone();
                async move {
-                    let config = inner.config.lock().await.clone();
+                    let config = inner.lock().await.config.clone();
                    if config.display_enabled {
-                        inner.thread_exit.store(true, Ordering::Release); // ensure clean slate
+                        inner
+                            .lock()
+                            .await
+                            .thread_exit
+                            .store(true, Ordering::Release); // ensure clean slate

                        inner
+                            .lock()
+                            .await
+                            .node
                            .write_bytes(&pkt_set_enable_display(
                                !(sleeping && config.off_when_suspended),
                            ))
-                            .await
                            .map_err(|err| {
                                warn!("create_sys_event_tasks::off_when_suspended {}", err);
                            })
@@ -333,10 +329,12 @@ impl crate::CtrlTask for AniMeZbus {

                        if config.builtin_anims_enabled {
                            inner
+                                .lock()
+                                .await
+                                .node
                                .write_bytes(&pkt_set_enable_powersave_anim(
                                    !(sleeping && config.off_when_suspended),
                                ))
-                                .await
                                .map_err(|err| {
                                    warn!("create_sys_event_tasks::off_when_suspended {}", err);
                                })
@@ -344,11 +342,18 @@ impl crate::CtrlTask for AniMeZbus {
                        } else if !sleeping && !config.builtin_anims_enabled {
                            // Run custom wake animation
                            inner
-                                .write_bytes(&pkt_set_enable_powersave_anim(false))
+                                .lock()
                                .await
+                                .node
+                                .write_bytes(&pkt_set_enable_powersave_anim(false))
                                .ok(); // ensure builtins are disabled

-                            inner.run_thread(inner.cache.wake.clone(), true).await;
+                            CtrlAnime::run_thread(
+                                inner.clone(),
+                                inner.lock().await.cache.wake.clone(),
+                                true,
+                            )
+                            .await;
                        }
                    }
                }
@@ -357,16 +362,26 @@ impl crate::CtrlTask for AniMeZbus {
                // on_shutdown
                let inner = inner2.clone();
                async move {
-                    let AniMeConfig {
+                    let AnimeConfig {
                        display_enabled,
                        builtin_anims_enabled,
                        ..
-                    } = *inner.config.lock().await;
+                    } = inner.lock().await.config;
                    if display_enabled && !builtin_anims_enabled {
                        if shutting_down {
-                            inner.run_thread(inner.cache.shutdown.clone(), true).await;
+                            CtrlAnime::run_thread(
+                                inner.clone(),
+                                inner.lock().await.cache.shutdown.clone(),
+                                true,
+                            )
+                            .await;
                        } else {
-                            inner.run_thread(inner.cache.boot.clone(), true).await;
+                            CtrlAnime::run_thread(
+                                inner.clone(),
+                                inner.lock().await.cache.boot.clone(),
+                                true,
+                            )
+                            .await;
                        }
                    }
                }
@@ -375,24 +390,28 @@ impl crate::CtrlTask for AniMeZbus {
                let inner = inner3.clone();
                // on lid change
                async move {
-                    let AniMeConfig {
+                    let AnimeConfig {
                        off_when_lid_closed,
                        builtin_anims_enabled,
                        ..
-                    } = *inner.config.lock().await;
+                    } = inner.lock().await.config;
                    if off_when_lid_closed {
                        if builtin_anims_enabled {
                            inner
-                                .write_bytes(&pkt_set_enable_powersave_anim(!lid_closed))
+                                .lock()
                                .await
+                                .node
+                                .write_bytes(&pkt_set_enable_powersave_anim(!lid_closed))
                                .map_err(|err| {
                                    warn!("create_sys_event_tasks::off_when_suspended {}", err);
                                })
                                .ok();
                        }
                        inner
-                            .write_bytes(&pkt_set_enable_display(!lid_closed))
+                            .lock()
                            .await
+                            .node
+                            .write_bytes(&pkt_set_enable_display(!lid_closed))
                            .map_err(|err| {
                                warn!("create_sys_event_tasks::off_when_lid_closed {}", err);
                            })
@@ -404,33 +423,39 @@ impl crate::CtrlTask for AniMeZbus {
                let inner = inner4.clone();
                // on power change
                async move {
-                    let AniMeConfig {
+                    let AnimeConfig {
                        off_when_unplugged,
                        builtin_anims_enabled,
                        brightness_on_battery,
                        ..
-                    } = *inner.config.lock().await;
+                    } = inner.lock().await.config;
                    if off_when_unplugged {
                        if builtin_anims_enabled {
                            inner
-                                .write_bytes(&pkt_set_enable_powersave_anim(power_plugged))
+                                .lock()
                                .await
+                                .node
+                                .write_bytes(&pkt_set_enable_powersave_anim(power_plugged))
                                .map_err(|err| {
                                    warn!("create_sys_event_tasks::off_when_suspended {}", err);
                                })
                                .ok();
                        }
                        inner
-                            .write_bytes(&pkt_set_enable_display(power_plugged))
+                            .lock()
                            .await
+                            .node
+                            .write_bytes(&pkt_set_enable_display(power_plugged))
                            .map_err(|err| {
                                warn!("create_sys_event_tasks::off_when_unplugged {}", err);
                            })
                            .ok();
                    } else {
                        inner
-                            .write_bytes(&pkt_set_brightness(brightness_on_battery))
+                            .lock()
                            .await
+                            .node
+                            .write_bytes(&pkt_set_brightness(brightness_on_battery))
                            .map_err(|err| {
                                warn!("create_sys_event_tasks::off_when_unplugged {}", err);
                            })
@@ -445,62 +470,52 @@ impl crate::CtrlTask for AniMeZbus {
    }
 }

-impl crate::Reloadable for AniMeZbus {
+impl crate::Reloadable for CtrlAnimeZbus {
    async fn reload(&mut self) -> Result<(), RogError> {
-        let AniMeConfig {
-            builtin_anims_enabled,
-            builtin_anims,
-            display_enabled,
-            display_brightness,
-            off_when_lid_closed,
-            off_when_unplugged,
-            ..
-        } = *self.0.config.lock().await;
+        if let Some(lock) = self.0.try_lock() {
+            let anim = &lock.config.builtin_anims;
+            // Set builtins
+            if lock.config.builtin_anims_enabled {
+                lock.node.write_bytes(&pkt_set_builtin_animations(
+                    anim.boot,
+                    anim.awake,
+                    anim.sleep,
+                    anim.shutdown,
+                ))?;
+            }
+            // Builtins enabled or na?
+            lock.node.set_builtins_enabled(
+                lock.config.builtin_anims_enabled,
+                lock.config.display_brightness,
+            )?;

-        // Set builtins
-        if builtin_anims_enabled {
-            self.0
-                .write_bytes(&pkt_set_builtin_animations(
-                    builtin_anims.boot,
-                    builtin_anims.awake,
-                    builtin_anims.sleep,
-                    builtin_anims.shutdown,
-                ))
-                .await?;
-        }
-        // Builtins enabled or na?
-        self.0
-            .set_builtins_enabled(builtin_anims_enabled, display_brightness)
-            .await?;
+            let manager = get_logind_manager().await;
+            let lid_closed = manager.lid_closed().await.unwrap_or_default();
+            let power_plugged = manager.on_external_power().await.unwrap_or_default();

-        let manager = get_logind_manager().await;
-        let lid_closed = manager.lid_closed().await.unwrap_or_default();
-        let power_plugged = manager.on_external_power().await.unwrap_or_default();
-
-        let turn_off =
-            (lid_closed && off_when_lid_closed) || (!power_plugged && off_when_unplugged);
-        self.0
-            .write_bytes(&pkt_set_enable_display(!turn_off))
-            .await
-            .map_err(|err| {
-                warn!("create_sys_event_tasks::reload {}", err);
-            })
-            .ok();
-
-        if turn_off || !display_enabled {
-            self.0.write_bytes(&pkt_set_enable_display(false)).await?;
-            // early return so we don't run animation thread
-            return Ok(());
-        }
-
-        if !builtin_anims_enabled && !self.0.cache.boot.is_empty() {
-            self.0
-                .write_bytes(&pkt_set_enable_powersave_anim(false))
-                .await
+            let turn_off = (lid_closed && lock.config.off_when_lid_closed)
+                || (!power_plugged && lock.config.off_when_unplugged);
+            lock.node
+                .write_bytes(&pkt_set_enable_display(!turn_off))
+                .map_err(|err| {
+                    warn!("create_sys_event_tasks::reload {}", err);
+                })
                .ok();

-            let action = self.0.cache.boot.clone();
-            self.0.run_thread(action, true).await;
+            if turn_off || !lock.config.display_enabled {
+                lock.node.write_bytes(&pkt_set_enable_display(false))?;
+                // early return so we don't run animation thread
+                return Ok(());
+            }
+
+            if !lock.config.builtin_anims_enabled && !lock.cache.boot.is_empty() {
+                lock.node
+                    .write_bytes(&pkt_set_enable_powersave_anim(false))
+                    .ok();
+
+                let action = lock.cache.boot.clone();
+                CtrlAnime::run_thread(self.0.clone(), action, true).await;
+            }
        }
        Ok(())
    }
--- a/asusd/src/aura_laptop/config.rs
+++ b/asusd/src/aura_laptop/config.rs
@@ -7,20 +7,12 @@ use rog_aura::keyboard::LaptopAuraPower;
 use rog_aura::{
    AuraDeviceType, AuraEffect, AuraModeNum, AuraZone, Direction, LedBrightness, Speed, GRADIENT,
 };
-use serde::{Deserialize, Serialize};
-
-use crate::error::RogError;
+use serde_derive::{Deserialize, Serialize};

 #[derive(Deserialize, Serialize, Default, Debug, Clone)]
 // #[serde(default)]
 pub struct AuraConfig {
-    #[serde(skip)]
-    pub led_type: AuraDeviceType,
-    #[serde(skip)]
-    pub support_data: LedSupportData,
    pub config_name: String,
-    #[serde(skip_serializing_if = "Option::is_none", default)]
-    pub ally_fix: Option<bool>,
    pub brightness: LedBrightness,
    pub current_mode: AuraModeNum,
    pub builtins: BTreeMap<AuraModeNum, AuraEffect>,
@@ -28,11 +20,10 @@ pub struct AuraConfig {
    pub multizone: Option<BTreeMap<AuraModeNum, Vec<AuraEffect>>>,
    pub multizone_on: bool,
    pub enabled: LaptopAuraPower,
-    #[serde(skip)]
-    pub per_key_mode_active: bool,
 }

 impl StdConfig for AuraConfig {
+    /// Detect the keyboard type and load from default DB if data available
    fn new() -> Self {
        panic!("This should not be used");
    }
@@ -63,29 +54,24 @@ impl AuraConfig {
        let support_data = LedSupportData::get_data(prod_id);
        let enabled = LaptopAuraPower::new(device_type, &support_data);
        let mut config = AuraConfig {
-            led_type: device_type,
-            support_data,
            config_name: format!("aura_{prod_id}.ron"),
-            ally_fix: None,
            brightness: LedBrightness::Med,
            current_mode: AuraModeNum::Static,
            builtins: BTreeMap::new(),
            multizone: None,
            multizone_on: false,
            enabled,
-            per_key_mode_active: false,
        };

-        for n in &config.support_data.basic_modes {
+        for n in &support_data.basic_modes {
            debug!("creating default for {n}");
            config
                .builtins
                .insert(*n, AuraEffect::default_with_mode(*n));
-        }
-        if !config.support_data.basic_zones.is_empty() {
-            for n in &config.support_data.basic_modes {
+
+            if !support_data.basic_zones.is_empty() {
                let mut default = vec![];
-                for (i, tmp) in config.support_data.basic_zones.iter().enumerate() {
+                for (i, tmp) in support_data.basic_zones.iter().enumerate() {
                    default.push(AuraEffect {
                        mode: *n,
                        zone: *tmp,
@@ -118,14 +104,14 @@ impl AuraConfig {
            self.multizone_on = false;
        } else {
            if let Some(multi) = self.multizone.as_mut() {
-                if let Some(fx_vec) = multi.get_mut(effect.mode()) {
-                    for fx in fx_vec.iter_mut() {
+                if let Some(fx) = multi.get_mut(effect.mode()) {
+                    for fx in fx.iter_mut() {
                        if fx.zone == effect.zone {
                            *fx = effect;
                            return;
                        }
                    }
-                    fx_vec.push(effect);
+                    fx.push(effect);
                } else {
                    multi.insert(*effect.mode(), vec![effect]);
                }
@@ -144,116 +130,16 @@ impl AuraConfig {
        }
        None
    }
-
-    /// Create a default for the `current_mode` if multizone and no config
-    /// exists.
-    pub fn create_multizone_default(&mut self) -> Result<(), RogError> {
-        let mut default = vec![];
-        for (i, tmp) in self.support_data.basic_zones.iter().enumerate() {
-            default.push(AuraEffect {
-                mode: self.current_mode,
-                zone: *tmp,
-                colour1: *GRADIENT.get(i).unwrap_or(&GRADIENT[0]),
-                colour2: *GRADIENT.get(GRADIENT.len() - i).unwrap_or(&GRADIENT[6]),
-                speed: Speed::Med,
-                direction: Direction::Left,
-            });
-        }
-        if default.is_empty() {
-            return Err(RogError::AuraEffectNotSupported);
-        }
-
-        if let Some(multizones) = self.multizone.as_mut() {
-            multizones.insert(self.current_mode, default);
-        } else {
-            let mut tmp = BTreeMap::new();
-            tmp.insert(self.current_mode, default);
-            self.multizone = Some(tmp);
-        }
-        Ok(())
-    }
-
-    /// Reload the config from disk then verify and update it if required.
-    /// Always rewrites the file to disk.
-    pub fn load_and_update_config(prod_id: &str) -> AuraConfig {
-        // New loads data from the DB also
-        let mut config_init = AuraConfig::new(prod_id);
-        // config_init.set_filename(prod_id);
-        let mut config_loaded = config_init.clone().load();
-        // update the initialised data with what we loaded from disk
-        for mode_init in &mut config_init.builtins {
-            // update init values from loaded values if they exist
-            if let Some(loaded) = config_loaded.builtins.get(mode_init.0) {
-                *mode_init.1 = loaded.clone();
-            }
-        }
-        // Then replace just incase the initialised data contains new modes added
-        config_loaded.builtins = config_init.builtins;
-        config_loaded.support_data = config_init.support_data;
-        config_loaded.led_type = config_init.led_type;
-        config_loaded.ally_fix = config_init.ally_fix;
-
-        for enabled_init in &mut config_init.enabled.states {
-            for enabled in &mut config_loaded.enabled.states {
-                if enabled.zone == enabled_init.zone {
-                    *enabled_init = *enabled;
-                    break;
-                }
-            }
-        }
-        config_loaded.enabled = config_init.enabled;
-
-        if let (Some(mut multizone_init), Some(multizone_loaded)) =
-            (config_init.multizone, config_loaded.multizone.as_mut())
-        {
-            for mode in multizone_init.iter_mut() {
-                // update init values from loaded values if they exist
-                if let Some(loaded) = multizone_loaded.get(mode.0) {
-                    let mut new_set = Vec::new();
-                    let data = LedSupportData::get_data(prod_id);
-                    // only reuse a zone mode if the mode is supported
-                    for mode in loaded {
-                        if data.basic_modes.contains(&mode.mode) {
-                            new_set.push(mode.clone());
-                        }
-                    }
-                    *mode.1 = new_set;
-                }
-            }
-            *multizone_loaded = multizone_init;
-        }
-
-        config_loaded.write();
-        config_loaded
-    }
 }

 #[cfg(test)]
 mod tests {
-    use std::sync::{Mutex, MutexGuard, OnceLock};
-
-    use rog_aura::keyboard::AuraPowerState;
-    use rog_aura::{
-        AuraEffect, AuraModeNum, AuraZone, Colour, Direction, LedBrightness, PowerZones, Speed,
-    };
+    use rog_aura::{AuraEffect, AuraModeNum, AuraZone, Colour};

    use super::AuraConfig;

-    // Global mutex to serialize tests that rely on process-wide environment
-    // variables
-    static TEST_MUTEX: OnceLock<Mutex<()>> = OnceLock::new();
-
-    fn test_lock() -> MutexGuard<'static, ()> {
-        TEST_MUTEX
-            .get_or_init(|| Mutex::new(()))
-            .lock()
-            .expect("TEST_MUTEX poisoned")
-    }
-
    #[test]
    fn set_multizone_4key_config() {
-        let _guard = test_lock();
-        std::env::set_var("BOARD_NAME", "");
        let mut config = AuraConfig::new("19b6");

        let effect = AuraEffect {
@@ -344,8 +230,6 @@ mod tests {

    #[test]
    fn set_multizone_multimode_config() {
-        let _guard = test_lock();
-        std::env::set_var("BOARD_NAME", "");
        let mut config = AuraConfig::new("19b6");

        let effect = AuraEffect {
@@ -390,68 +274,4 @@ mod tests {
        let sta = res.get(&AuraModeNum::Pulse).unwrap();
        assert_eq!(sta.len(), 1);
    }
-
-    #[test]
-    fn verify_0x1866_g531i() {
-        let _guard = test_lock();
-        std::env::set_var("BOARD_NAME", "G513I");
-        let mut config = AuraConfig::new("1866");
-
-        assert_eq!(config.brightness, LedBrightness::Med);
-        assert_eq!(config.builtins.len(), 5);
-        assert_eq!(
-            config.builtins.first_entry().unwrap().get(),
-            &AuraEffect {
-                mode: AuraModeNum::Static,
-                zone: AuraZone::None,
-                colour1: Colour { r: 166, g: 0, b: 0 },
-                colour2: Colour { r: 0, g: 0, b: 0 },
-                speed: Speed::Med,
-                direction: Direction::Right
-            }
-        );
-        assert_eq!(config.enabled.states.len(), 1);
-        assert_eq!(
-            config.enabled.states[0],
-            AuraPowerState {
-                zone: PowerZones::KeyboardAndLightbar,
-                boot: true,
-                awake: true,
-                sleep: true,
-                shutdown: true
-            }
-        );
-    }
-
-    #[test]
-    fn verify_0x19b6_g634j() {
-        let _guard = test_lock();
-        std::env::set_var("BOARD_NAME", "G634J");
-        let mut config = AuraConfig::new("19b6");
-
-        assert_eq!(config.brightness, LedBrightness::Med);
-        assert_eq!(config.builtins.len(), 12);
-        assert_eq!(
-            config.builtins.first_entry().unwrap().get(),
-            &AuraEffect {
-                mode: AuraModeNum::Static,
-                zone: AuraZone::None,
-                colour1: Colour { r: 166, g: 0, b: 0 },
-                colour2: Colour { r: 0, g: 0, b: 0 },
-                speed: Speed::Med,
-                direction: Direction::Right
-            }
-        );
-        assert_eq!(config.enabled.states.len(), 4);
-        assert_eq!(
-            config.enabled.states[0],
-            AuraPowerState {
-                zone: PowerZones::Keyboard,
-                boot: true,
-                awake: true,
-                sleep: true,
-                shutdown: true
-            }
-        );
-    }
 }
--- a/asusd/src/ctrl_aura/controller.rs
+++ b/asusd/src/ctrl_aura/controller.rs
@@ -0,0 +1,458 @@
+use std::collections::{BTreeMap, HashSet};
+
+use config_traits::{StdConfig, StdConfigLoad};
+use inotify::Inotify;
+use log::{debug, info, warn};
+use rog_aura::aura_detection::LedSupportData;
+use rog_aura::keyboard::{LedUsbPackets, UsbPackets};
+use rog_aura::usb::{LED_APPLY, LED_SET};
+use rog_aura::{
+    AuraDeviceType, AuraEffect, Direction, LedBrightness, Speed, GRADIENT, LED_MSG_LEN,
+};
+use rog_platform::hid_raw::HidRaw;
+use rog_platform::keyboard_led::KeyboardLed;
+use zbus::zvariant::OwnedObjectPath;
+
+use super::config::AuraConfig;
+use crate::ctrl_aura::manager::{dbus_path_for_dev, dbus_path_for_tuf};
+use crate::error::RogError;
+
+#[derive(Debug)]
+pub enum LEDNode {
+    /// Brightness and/or TUF RGB controls
+    KbdLed(KeyboardLed),
+    /// Raw HID handle
+    Rog(KeyboardLed, HidRaw),
+}
+
+impl LEDNode {
+    // TODO: move various methods upwards to this
+    pub fn set_brightness(&self, value: u8) -> Result<(), RogError> {
+        match self {
+            LEDNode::KbdLed(k) => k.set_brightness(value)?,
+            LEDNode::Rog(k, _) => k.set_brightness(value)?,
+        }
+        Ok(())
+    }
+
+    pub fn get_brightness(&self) -> Result<u8, RogError> {
+        Ok(match self {
+            LEDNode::KbdLed(k) => k.get_brightness()?,
+            LEDNode::Rog(k, _) => k.get_brightness()?,
+        })
+    }
+
+    pub fn monitor_brightness(&self) -> Result<Inotify, RogError> {
+        Ok(match self {
+            LEDNode::KbdLed(k) => k.monitor_brightness()?,
+            LEDNode::Rog(k, _) => k.monitor_brightness()?,
+        })
+    }
+}
+
+/// Individual controller for one Aura device
+pub struct CtrlKbdLed {
+    pub led_type: AuraDeviceType,
+    pub led_node: LEDNode,
+    pub supported_data: LedSupportData, // TODO: is storing this really required?
+    pub per_key_mode_active: bool,
+    pub config: AuraConfig,
+    pub dbus_path: OwnedObjectPath,
+}
+
+impl CtrlKbdLed {
+    pub fn find_all() -> Result<Vec<Self>, RogError> {
+        info!("Searching for all Aura devices");
+        let mut devices = Vec::new();
+        let mut found = HashSet::new(); // track and ensure we use only one hidraw per prod_id
+
+        let mut enumerator = udev::Enumerator::new().map_err(|err| {
+            warn!("{}", err);
+            err
+        })?;
+
+        enumerator.match_subsystem("hidraw").map_err(|err| {
+            warn!("{}", err);
+            err
+        })?;
+
+        for end_point in enumerator.scan_devices()? {
+            // usb_device gives us a product and vendor ID
+            if let Some(usb_device) =
+                end_point.parent_with_subsystem_devtype("usb", "usb_device")?
+            {
+                // The asus_wmi driver latches MCU that controls the USB endpoints
+                if let Some(parent) = end_point.parent() {
+                    if let Some(driver) = parent.driver() {
+                        // There is a tree of devices added so filter by driver
+                        if driver != "asus" {
+                            continue;
+                        }
+                    } else {
+                        continue;
+                    }
+                }
+                // Device is something like 002, while its parent is the MCU
+                // Think of it like the device is an endpoint of the USB device attached
+                let mut prod_id = String::new();
+                if let Some(usb_id) = usb_device.attribute_value("idProduct") {
+                    prod_id = usb_id.to_string_lossy().to_string();
+                    let aura_dev = AuraDeviceType::from(prod_id.as_str());
+                    if aura_dev == AuraDeviceType::Unknown || found.contains(&aura_dev) {
+                        log::debug!("Unknown or invalid device: {usb_id:?}, skipping");
+                        continue;
+                    }
+                    found.insert(aura_dev);
+                }
+
+                let dev_node = if let Some(dev_node) = usb_device.devnode() {
+                    dev_node
+                } else {
+                    debug!("Device has no devnode, skipping");
+                    continue;
+                };
+                info!("AuraControl found device at: {:?}", dev_node);
+                let dbus_path = dbus_path_for_dev(&usb_device).unwrap_or_default();
+                let dev = HidRaw::from_device(end_point)?;
+                let mut dev = Self::from_hidraw(dev, dbus_path)?;
+                dev.config = Self::init_config(&prod_id);
+                devices.push(dev);
+            }
+        }
+
+        // Check for a TUF laptop LED. Assume there is only ever one.
+        if let Ok(tuf_kbd) = KeyboardLed::new() {
+            if tuf_kbd.has_kbd_rgb_mode() {
+                info!("AuraControl found a TUF laptop keyboard");
+                let ctrl = CtrlKbdLed {
+                    led_type: AuraDeviceType::LaptopTuf,
+                    led_node: LEDNode::KbdLed(tuf_kbd),
+                    supported_data: LedSupportData::get_data("tuf"),
+                    per_key_mode_active: false,
+                    config: Self::init_config("tuf"),
+                    dbus_path: dbus_path_for_tuf(),
+                };
+                devices.push(ctrl);
+            }
+        }
+
+        info!("Found {} Aura devices", devices.len());
+
+        Ok(devices)
+    }
+
+    /// The generated data from this function has a default config. This config
+    /// should be overwritten. The reason for the default config is because
+    /// of async issues between this and udev/hidraw
+    pub fn from_hidraw(device: HidRaw, dbus_path: OwnedObjectPath) -> Result<Self, RogError> {
+        let rgb_led = KeyboardLed::new()?;
+        let prod_id = AuraDeviceType::from(device.prod_id());
+        if prod_id == AuraDeviceType::Unknown {
+            log::error!("{} is AuraDevice::Unknown", device.prod_id());
+            return Err(RogError::NoAuraNode);
+        }
+
+        // New loads data from the DB also
+        // let config = Self::init_config(prod_id, data);
+
+        let data = LedSupportData::get_data(device.prod_id());
+        let ctrl = CtrlKbdLed {
+            led_type: prod_id,
+            led_node: LEDNode::Rog(rgb_led, device),
+            supported_data: data.clone(),
+            per_key_mode_active: false,
+            config: AuraConfig::default(),
+            dbus_path,
+        };
+        Ok(ctrl)
+    }
+
+    pub fn init_config(prod_id: &str) -> AuraConfig {
+        // New loads data from the DB also
+        let mut config_init = AuraConfig::new(prod_id);
+        // config_init.set_filename(prod_id);
+        let mut config_loaded = config_init.clone().load();
+        // update the initialised data with what we loaded from disk
+        for mode in &mut config_init.builtins {
+            // update init values from loaded values if they exist
+            if let Some(loaded) = config_loaded.builtins.get(mode.0) {
+                *mode.1 = loaded.clone();
+            }
+        }
+        // Then replace just incase the initialised data contains new modes added
+        config_loaded.builtins = config_init.builtins;
+
+        if let (Some(mut multizone_init), Some(multizone_loaded)) =
+            (config_init.multizone, config_loaded.multizone.as_mut())
+        {
+            for mode in multizone_init.iter_mut() {
+                // update init values from loaded values if they exist
+                if let Some(loaded) = multizone_loaded.get(mode.0) {
+                    let mut new_set = Vec::new();
+                    let data = LedSupportData::get_data(prod_id);
+                    // only reuse a zone mode if the mode is supported
+                    for mode in loaded {
+                        if data.basic_modes.contains(&mode.mode) {
+                            new_set.push(mode.clone());
+                        }
+                    }
+                    *mode.1 = new_set;
+                }
+            }
+            *multizone_loaded = multizone_init;
+        }
+
+        config_loaded
+    }
+
+    /// Set combination state for boot animation/sleep animation/all leds/keys
+    /// leds/side leds LED active
+    pub(super) fn set_power_states(&mut self) -> Result<(), RogError> {
+        if let LEDNode::KbdLed(_platform) = &mut self.led_node {
+            // TODO: tuf bool array
+            // if let Some(pwr) =
+            // AuraPowerConfig::to_tuf_bool_array(&self.config.enabled) {
+            //     let buf = [1, pwr[1] as u8, pwr[2] as u8, pwr[3] as u8,
+            // pwr[4] as u8];     platform.set_kbd_rgb_state(&buf)?;
+            // }
+        } else if let LEDNode::Rog(_, hid_raw) = &self.led_node {
+            let bytes = self.config.enabled.to_bytes(self.led_type);
+            let message = [0x5d, 0xbd, 0x01, bytes[0], bytes[1], bytes[2], bytes[3]];
+
+            hid_raw.write_bytes(&message)?;
+            hid_raw.write_bytes(&LED_SET)?;
+            // Changes won't persist unless apply is set
+            hid_raw.write_bytes(&LED_APPLY)?;
+        }
+        Ok(())
+    }
+
+    /// Write an effect block. This is for per-key, but can be repurposed to
+    /// write the raw factory mode packets - when doing this it is expected that
+    /// only the first `Vec` (`effect[0]`) is valid.
+    pub fn write_effect_block(&mut self, effect: &UsbPackets) -> Result<(), RogError> {
+        if self.config.brightness == LedBrightness::Off {
+            self.config.brightness = LedBrightness::Med;
+            self.config.write();
+        }
+
+        let pkt_type = effect[0][1];
+        const PER_KEY_TYPE: u8 = 0xbc;
+
+        if pkt_type != PER_KEY_TYPE {
+            self.per_key_mode_active = false;
+            if let LEDNode::Rog(_, hid_raw) = &self.led_node {
+                hid_raw.write_bytes(&effect[0])?;
+                hid_raw.write_bytes(&LED_SET)?;
+                // hid_raw.write_bytes(&LED_APPLY)?;
+            }
+        } else {
+            if !self.per_key_mode_active {
+                if let LEDNode::Rog(_, hid_raw) = &self.led_node {
+                    let init = LedUsbPackets::get_init_msg();
+                    hid_raw.write_bytes(&init)?;
+                }
+                self.per_key_mode_active = true;
+            }
+            if let LEDNode::Rog(_, hid_raw) = &self.led_node {
+                for row in effect.iter() {
+                    hid_raw.write_bytes(row)?;
+                }
+            } else if let LEDNode::KbdLed(tuf) = &self.led_node {
+                for row in effect.iter() {
+                    let r = row[9];
+                    let g = row[10];
+                    let b = row[11];
+                    tuf.set_kbd_rgb_mode(&[0, 0, r, g, b, 0])?;
+                }
+            }
+        }
+        Ok(())
+    }
+
+    pub fn write_mode(&mut self, mode: &AuraEffect) -> Result<(), RogError> {
+        if let LEDNode::KbdLed(platform) = &self.led_node {
+            let buf = [
+                1,
+                mode.mode as u8,
+                mode.colour1.r,
+                mode.colour1.g,
+                mode.colour1.b,
+                mode.speed as u8,
+            ];
+            platform.set_kbd_rgb_mode(&buf)?;
+        } else if let LEDNode::Rog(_, hid_raw) = &self.led_node {
+            let bytes: [u8; LED_MSG_LEN] = mode.into();
+            hid_raw.write_bytes(&bytes)?;
+            hid_raw.write_bytes(&LED_SET)?;
+            // Changes won't persist unless apply is set
+            hid_raw.write_bytes(&LED_APPLY)?;
+        } else {
+            return Err(RogError::NoAuraKeyboard);
+        }
+        self.per_key_mode_active = false;
+        Ok(())
+    }
+
+    pub(super) fn write_current_config_mode(&mut self) -> Result<(), RogError> {
+        if self.config.multizone_on {
+            let mode = self.config.current_mode;
+            let mut create = false;
+            // There is no multizone config for this mode so create one here
+            // using the colours of rainbow if it exists, or first available
+            // mode, or random
+            if self.config.multizone.is_none() {
+                create = true;
+            } else if let Some(multizones) = self.config.multizone.as_ref() {
+                if !multizones.contains_key(&mode) {
+                    create = true;
+                }
+            }
+            if create {
+                info!("No user-set config for zone founding, attempting a default");
+                self.create_multizone_default()?;
+            }
+
+            if let Some(multizones) = self.config.multizone.as_mut() {
+                if let Some(set) = multizones.get(&mode) {
+                    for mode in set.clone() {
+                        self.write_mode(&mode)?;
+                    }
+                }
+            }
+        } else {
+            let mode = self.config.current_mode;
+            if let Some(effect) = self.config.builtins.get(&mode).cloned() {
+                self.write_mode(&effect)?;
+            }
+        }
+
+        Ok(())
+    }
+
+    /// Create a default for the `current_mode` if multizone and no config
+    /// exists.
+    fn create_multizone_default(&mut self) -> Result<(), RogError> {
+        let mut default = vec![];
+        for (i, tmp) in self.supported_data.basic_zones.iter().enumerate() {
+            default.push(AuraEffect {
+                mode: self.config.current_mode,
+                zone: *tmp,
+                colour1: *GRADIENT.get(i).unwrap_or(&GRADIENT[0]),
+                colour2: *GRADIENT.get(GRADIENT.len() - i).unwrap_or(&GRADIENT[6]),
+                speed: Speed::Med,
+                direction: Direction::Left,
+            });
+        }
+        if default.is_empty() {
+            return Err(RogError::AuraEffectNotSupported);
+        }
+
+        if let Some(multizones) = self.config.multizone.as_mut() {
+            multizones.insert(self.config.current_mode, default);
+        } else {
+            let mut tmp = BTreeMap::new();
+            tmp.insert(self.config.current_mode, default);
+            self.config.multizone = Some(tmp);
+        }
+        Ok(())
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use rog_aura::aura_detection::LedSupportData;
+    use rog_aura::{AuraDeviceType, AuraModeNum, AuraZone, PowerZones};
+    use rog_platform::hid_raw::HidRaw;
+    use rog_platform::keyboard_led::KeyboardLed;
+    use zbus::zvariant::OwnedObjectPath;
+
+    use super::CtrlKbdLed;
+    use crate::ctrl_aura::config::AuraConfig;
+    use crate::ctrl_aura::controller::LEDNode;
+
+    #[test]
+    #[ignore = "Unable to run in CI as the HIDRAW device is required"]
+    fn create_multizone_if_no_config() {
+        // Checking to ensure set_mode errors when unsupported modes are tried
+        let config = AuraConfig::new("19b6");
+        let supported_basic_modes = LedSupportData {
+            device_name: String::new(),
+            product_id: String::new(),
+            layout_name: "ga401".to_owned(),
+            basic_modes: vec![AuraModeNum::Static],
+            basic_zones: vec![],
+            advanced_type: rog_aura::keyboard::AdvancedAuraType::None,
+            power_zones: vec![PowerZones::Keyboard, PowerZones::RearGlow],
+        };
+        let mut controller = CtrlKbdLed {
+            led_type: AuraDeviceType::LaptopPost2021,
+            led_node: LEDNode::Rog(KeyboardLed::default(), HidRaw::new("19b6").unwrap()),
+            supported_data: supported_basic_modes,
+            per_key_mode_active: false,
+            config,
+            dbus_path: OwnedObjectPath::default(),
+        };
+
+        assert!(controller.config.multizone.is_none());
+        assert!(controller.create_multizone_default().is_err());
+        assert!(controller.config.multizone.is_none());
+
+        controller.supported_data.basic_zones.push(AuraZone::Key1);
+        controller.supported_data.basic_zones.push(AuraZone::Key2);
+        assert!(controller.create_multizone_default().is_ok());
+        assert!(controller.config.multizone.is_some());
+
+        let m = controller.config.multizone.unwrap();
+        assert!(m.contains_key(&AuraModeNum::Static));
+        let e = m.get(&AuraModeNum::Static).unwrap();
+        assert_eq!(e.len(), 2);
+        assert_eq!(e[0].zone, AuraZone::Key1);
+        assert_eq!(e[1].zone, AuraZone::Key2);
+    }
+
+    #[test]
+    #[ignore = "Unable to run in CI as the HIDRAW device is required"]
+    // TODO: use sim device
+    fn next_mode_create_multizone_if_no_config() {
+        // Checking to ensure set_mode errors when unsupported modes are tried
+        let config = AuraConfig::new("19b6");
+        let supported_basic_modes = LedSupportData {
+            device_name: String::new(),
+            product_id: String::new(),
+            layout_name: "ga401".to_owned(),
+            basic_modes: vec![AuraModeNum::Static],
+            basic_zones: vec![AuraZone::Key1, AuraZone::Key2],
+            advanced_type: rog_aura::keyboard::AdvancedAuraType::None,
+            power_zones: vec![PowerZones::Keyboard, PowerZones::RearGlow],
+        };
+        let mut controller = CtrlKbdLed {
+            led_type: AuraDeviceType::LaptopPost2021,
+            led_node: LEDNode::Rog(KeyboardLed::default(), HidRaw::new("19b6").unwrap()),
+            supported_data: supported_basic_modes,
+            per_key_mode_active: false,
+            config,
+            dbus_path: OwnedObjectPath::default(),
+        };
+
+        assert!(controller.config.multizone.is_none());
+        controller.config.multizone_on = true;
+        // This is called in toggle_mode. It will error here because we have no
+        // keyboard node in tests.
+        assert_eq!(
+            controller
+                .write_current_config_mode()
+                .unwrap_err()
+                .to_string(),
+            "No supported Aura keyboard"
+        );
+        assert!(controller.config.multizone.is_some());
+
+        let m = controller.config.multizone.unwrap();
+        assert!(m.contains_key(&AuraModeNum::Static));
+        let e = m.get(&AuraModeNum::Static).unwrap();
+        assert_eq!(e.len(), 2);
+        assert_eq!(e[0].zone, AuraZone::Key1);
+        assert_eq!(e[1].zone, AuraZone::Key2);
+    }
+}
--- a/asusd/src/ctrl_aura/manager.rs
+++ b/asusd/src/ctrl_aura/manager.rs
@@ -0,0 +1,187 @@
+// Plan:
+// - Manager has udev monitor on USB looking for ROG devices
+// - If a device is found, add it to watch
+// - Add it to Zbus server
+// - If udev sees device removed then remove the zbus path
+
+use std::collections::HashSet;
+
+use log::{debug, error, info, warn};
+use mio::{Events, Interest, Poll, Token};
+use rog_aura::AuraDeviceType;
+use rog_platform::hid_raw::HidRaw;
+use tokio::task::spawn_blocking;
+use udev::{Device, MonitorBuilder};
+use zbus::object_server::SignalContext;
+use zbus::zvariant::{ObjectPath, OwnedObjectPath};
+use zbus::Connection;
+
+use crate::ctrl_aura::controller::CtrlKbdLed;
+use crate::ctrl_aura::trait_impls::{CtrlAuraZbus, AURA_ZBUS_PATH};
+use crate::error::RogError;
+use crate::{CtrlTask, Reloadable};
+
+pub struct AuraManager {
+    _connection: Connection,
+}
+
+impl AuraManager {
+    pub async fn new(connection: Connection) -> Result<Self, RogError> {
+        let conn_copy = connection.clone();
+        let mut interfaces = HashSet::new();
+
+        // Do the initial keyboard detection:
+        let all = CtrlKbdLed::find_all()?;
+        for ctrl in all {
+            let path = ctrl.dbus_path.clone();
+            interfaces.insert(path.clone()); // ensure we record the initial stuff
+            let sig_ctx = CtrlAuraZbus::signal_context(&connection)?;
+            let sig_ctx2 = sig_ctx.clone();
+            let zbus = CtrlAuraZbus::new(ctrl, sig_ctx);
+            start_tasks(zbus, connection.clone(), sig_ctx2, path).await?;
+        }
+
+        let manager = Self {
+            _connection: connection,
+        };
+
+        // detect all plugged in aura devices (eventually)
+        // only USB devices are detected for here
+        spawn_blocking(move || {
+            let mut monitor = MonitorBuilder::new()?.match_subsystem("hidraw")?.listen()?;
+            let mut poll = Poll::new()?;
+            let mut events = Events::with_capacity(1024);
+            poll.registry()
+                .register(&mut monitor, Token(0), Interest::READABLE)?;
+
+            loop {
+                if poll.poll(&mut events, None).is_err() {
+                    continue;
+                }
+                for event in monitor.iter() {
+                    let parent = if let Some(parent) =
+                        event.parent_with_subsystem_devtype("usb", "usb_device")?
+                    {
+                        parent
+                    } else {
+                        continue;
+                    };
+
+                    let action = if let Some(action) = event.action() {
+                        action
+                    } else {
+                        continue;
+                    };
+
+                    let id_product = if let Some(id_product) = parent.attribute_value("idProduct") {
+                        id_product.to_string_lossy()
+                    } else {
+                        continue;
+                    };
+
+                    let path = if let Some(path) = dbus_path_for_dev(&parent) {
+                        path
+                    } else {
+                        continue;
+                    };
+
+                    let aura_device = AuraDeviceType::from(&*id_product);
+                    if aura_device == AuraDeviceType::Unknown {
+                        warn!("idProduct:{id_product:?} is unknown, not using");
+                        continue;
+                    }
+
+                    if action == "remove" {
+                        if interfaces.remove(&path) {
+                            info!("AuraManager removing: {path:?}");
+                            let conn_copy = conn_copy.clone();
+                            tokio::spawn(async move {
+                                let res = conn_copy
+                                    .object_server()
+                                    .remove::<CtrlAuraZbus, _>(&path)
+                                    .await
+                                    .map_err(|e| {
+                                        error!("Failed to remove {path:?}, {e:?}");
+                                        e
+                                    })?;
+                                info!("AuraManager removed: {path:?}, {res}");
+                                Ok::<(), RogError>(())
+                            });
+                        }
+                    } else if action == "add" {
+                        if interfaces.contains(&path) {
+                            debug!("Already a ctrl at {path:?}");
+                            continue;
+                        }
+
+                        // Need to check the driver is asus to prevent using hid_generic
+                        if let Some(p2) = event.parent() {
+                            if let Some(driver) = p2.driver() {
+                                // There is a tree of devices added so filter by driver
+                                if driver != "asus" {
+                                    debug!("{id_product:?} driver was not asus, skipping");
+                                    continue;
+                                }
+                            } else {
+                                continue;
+                            }
+                        }
+
+                        if let Some(dev_node) = event.devnode() {
+                            if let Ok(raw) = HidRaw::from_device(event.device())
+                                .map_err(|e| error!("device path error: {e:?}"))
+                            {
+                                if let Ok(mut ctrl) = CtrlKbdLed::from_hidraw(raw, path.clone()) {
+                                    ctrl.config = CtrlKbdLed::init_config(&id_product);
+                                    interfaces.insert(path.clone());
+                                    info!("AuraManager starting device at: {dev_node:?}, {path:?}");
+                                    let sig_ctx = CtrlAuraZbus::signal_context(&conn_copy)?;
+                                    let zbus = CtrlAuraZbus::new(ctrl, sig_ctx);
+                                    let sig_ctx = CtrlAuraZbus::signal_context(&conn_copy)?;
+                                    let conn_copy = conn_copy.clone();
+                                    tokio::spawn(async move {
+                                        start_tasks(zbus, conn_copy.clone(), sig_ctx, path).await
+                                    });
+                                }
+                            }
+                        }
+                    };
+                }
+            }
+            // Required for return type on spawn
+            #[allow(unreachable_code)]
+            Ok::<(), RogError>(())
+        });
+        Ok(manager)
+    }
+}
+
+pub(crate) fn dbus_path_for_dev(parent: &Device) -> Option<OwnedObjectPath> {
+    if let Some(filename) = super::filename_partial(parent) {
+        return Some(
+            ObjectPath::from_str_unchecked(&format!("{AURA_ZBUS_PATH}/{filename}")).into(),
+        );
+    }
+    None
+}
+
+pub(crate) fn dbus_path_for_tuf() -> OwnedObjectPath {
+    ObjectPath::from_str_unchecked(&format!("{AURA_ZBUS_PATH}/tuf")).into()
+}
+
+async fn start_tasks(
+    mut zbus: CtrlAuraZbus,
+    connection: Connection,
+    _signal_ctx: SignalContext<'static>,
+    path: OwnedObjectPath,
+) -> Result<(), RogError> {
+    // let task = zbus.clone();
+    // let signal_ctx = signal_ctx.clone();
+    zbus.reload()
+        .await
+        .unwrap_or_else(|err| warn!("Controller error: {}", err));
+    connection.object_server().at(path, zbus).await.unwrap();
+    // TODO: skip this until we keep handles to tasks so they can be killed
+    // task.create_tasks(signal_ctx).await
+    Ok(())
+}
--- a/asusd/src/ctrl_aura/mod.rs
+++ b/asusd/src/ctrl_aura/mod.rs
@@ -0,0 +1,29 @@
+use udev::Device;
+use zbus::zvariant::{ObjectPath, OwnedObjectPath};
+
+pub mod config;
+pub mod controller;
+pub mod manager;
+/// Implements `CtrlTask`, `Reloadable`, `ZbusRun`
+pub mod trait_impls;
+
+/// Returns only the Device details concatenated in a form usable for
+/// adding/appending to a filename
+pub(super) fn filename_partial(parent: &Device) -> Option<OwnedObjectPath> {
+    if let Some(id_product) = parent.attribute_value("idProduct") {
+        let id_product = id_product.to_string_lossy();
+        let path = if let Some(devnum) = parent.attribute_value("devnum") {
+            let devnum = devnum.to_string_lossy();
+            if let Some(devpath) = parent.attribute_value("devpath") {
+                let devpath = devpath.to_string_lossy();
+                format!("{id_product}_{devnum}_{devpath}")
+            } else {
+                format!("{id_product}_{devnum}")
+            }
+        } else {
+            format!("{id_product}")
+        };
+        return Some(ObjectPath::from_str_unchecked(&path).into());
+    }
+    None
+}
--- a/asusd/src/ctrl_aura/trait_impls.rs
+++ b/asusd/src/ctrl_aura/trait_impls.rs
@@ -0,0 +1,295 @@
+use std::collections::BTreeMap;
+use std::sync::Arc;
+
+use config_traits::StdConfig;
+use log::{debug, error, info, warn};
+use rog_aura::keyboard::{LaptopAuraPower, UsbPackets};
+use rog_aura::{AuraDeviceType, AuraEffect, AuraModeNum, AuraZone, LedBrightness, PowerZones};
+use zbus::export::futures_util::lock::{Mutex, MutexGuard};
+use zbus::export::futures_util::StreamExt;
+use zbus::fdo::Error as ZbErr;
+use zbus::{interface, SignalContext};
+
+use super::controller::CtrlKbdLed;
+use crate::error::RogError;
+use crate::CtrlTask;
+
+pub const AURA_ZBUS_NAME: &str = "Aura";
+pub const AURA_ZBUS_PATH: &str = "/org/asuslinux";
+
+#[derive(Clone)]
+pub struct CtrlAuraZbus(Arc<Mutex<CtrlKbdLed>>, SignalContext<'static>);
+
+impl CtrlAuraZbus {
+    pub fn new(controller: CtrlKbdLed, signal: SignalContext<'static>) -> Self {
+        Self(Arc::new(Mutex::new(controller)), signal)
+    }
+
+    fn update_config(lock: &mut CtrlKbdLed) -> Result<(), RogError> {
+        let bright = lock.led_node.get_brightness()?;
+        lock.config.read();
+        lock.config.brightness = bright.into();
+        lock.config.write();
+        Ok(())
+    }
+}
+
+/// The main interface for changing, reading, or notfying
+///
+/// LED commands are split between Brightness, Modes, Per-Key
+#[interface(name = "org.asuslinux.Aura")]
+impl CtrlAuraZbus {
+    /// Return the device type for this Aura keyboard
+    #[zbus(property)]
+    async fn device_type(&self) -> AuraDeviceType {
+        let ctrl = self.0.lock().await;
+        ctrl.led_type
+    }
+
+    /// Return the current LED brightness
+    #[zbus(property)]
+    async fn brightness(&self) -> Result<LedBrightness, ZbErr> {
+        let ctrl = self.0.lock().await;
+        Ok(ctrl.led_node.get_brightness().map(|n| n.into())?)
+    }
+
+    /// Set the keyboard brightness level (0-3)
+    #[zbus(property)]
+    async fn set_brightness(&mut self, brightness: LedBrightness) -> Result<(), ZbErr> {
+        let ctrl = self.0.lock().await;
+        Ok(ctrl.led_node.set_brightness(brightness.into())?)
+    }
+
+    /// Total levels of brightness available
+    #[zbus(property)]
+    async fn supported_brightness(&self) -> Vec<LedBrightness> {
+        vec![
+            LedBrightness::Off,
+            LedBrightness::Low,
+            LedBrightness::Med,
+            LedBrightness::High,
+        ]
+    }
+
+    /// The total available modes
+    #[zbus(property)]
+    async fn supported_basic_modes(&self) -> Result<Vec<AuraModeNum>, ZbErr> {
+        let ctrl = self.0.lock().await;
+        Ok(ctrl.config.builtins.keys().cloned().collect())
+    }
+
+    #[zbus(property)]
+    async fn supported_basic_zones(&self) -> Result<Vec<AuraZone>, ZbErr> {
+        let ctrl = self.0.lock().await;
+        Ok(ctrl.supported_data.basic_zones.clone())
+    }
+
+    #[zbus(property)]
+    async fn supported_power_zones(&self) -> Result<Vec<PowerZones>, ZbErr> {
+        let ctrl = self.0.lock().await;
+        Ok(ctrl.supported_data.power_zones.clone())
+    }
+
+    /// The current mode data
+    #[zbus(property)]
+    async fn led_mode(&self) -> Result<AuraModeNum, ZbErr> {
+        let ctrl = self.0.lock().await;
+        Ok(ctrl.config.current_mode)
+    }
+
+    /// Set an Aura effect if the effect mode or zone is supported.
+    ///
+    /// On success the aura config file is read to refresh cached values, then
+    /// the effect is stored and config written to disk.
+    #[zbus(property)]
+    async fn set_led_mode(&mut self, num: AuraModeNum) -> Result<(), ZbErr> {
+        let mut ctrl = self.0.lock().await;
+        ctrl.config.current_mode = num;
+        ctrl.write_current_config_mode()?;
+        if ctrl.config.brightness == LedBrightness::Off {
+            ctrl.config.brightness = LedBrightness::Med;
+        }
+        ctrl.led_node
+            .set_brightness(ctrl.config.brightness.into())?;
+        ctrl.config.write();
+
+        self.led_mode_data_invalidate(&self.1).await.ok();
+        Ok(())
+    }
+
+    /// The current mode data
+    #[zbus(property)]
+    async fn led_mode_data(&self) -> Result<AuraEffect, ZbErr> {
+        let ctrl = self.0.lock().await;
+        let mode = ctrl.config.current_mode;
+        match ctrl.config.builtins.get(&mode) {
+            Some(effect) => Ok(effect.clone()),
+            None => Err(ZbErr::Failed("Could not get the current effect".into())),
+        }
+    }
+
+    /// Set an Aura effect if the effect mode or zone is supported.
+    ///
+    /// On success the aura config file is read to refresh cached values, then
+    /// the effect is stored and config written to disk.
+    #[zbus(property)]
+    async fn set_led_mode_data(&mut self, effect: AuraEffect) -> Result<(), ZbErr> {
+        let mut ctrl = self.0.lock().await;
+        if !ctrl.supported_data.basic_modes.contains(&effect.mode)
+            || effect.zone != AuraZone::None
+                && !ctrl.supported_data.basic_zones.contains(&effect.zone)
+        {
+            return Err(ZbErr::NotSupported(format!(
+                "The Aura effect is not supported: {effect:?}"
+            )));
+        }
+
+        ctrl.write_mode(&effect)?;
+        if ctrl.config.brightness == LedBrightness::Off {
+            ctrl.config.brightness = LedBrightness::Med;
+        }
+        ctrl.led_node
+            .set_brightness(ctrl.config.brightness.into())?;
+        ctrl.config.set_builtin(effect);
+        ctrl.config.write();
+
+        self.led_mode_invalidate(&self.1).await.ok();
+        Ok(())
+    }
+
+    /// Get the data set for every mode available
+    async fn all_mode_data(&self) -> BTreeMap<AuraModeNum, AuraEffect> {
+        let ctrl = self.0.lock().await;
+        ctrl.config.builtins.clone()
+    }
+
+    // As property doesn't work for AuraPowerDev (complexity of serialization?)
+    #[zbus(property)]
+    async fn led_power(&self) -> LaptopAuraPower {
+        let ctrl = self.0.lock().await;
+        ctrl.config.enabled.clone()
+    }
+
+    /// Set a variety of states, input is array of enum.
+    /// `enabled` sets if the sent array should be disabled or enabled
+    ///
+    /// For Modern ROG devices the "enabled" flag is ignored.
+    #[zbus(property)]
+    async fn set_led_power(&mut self, options: LaptopAuraPower) -> Result<(), ZbErr> {
+        let mut ctrl = self.0.lock().await;
+        for opt in options.states {
+            let zone = opt.zone;
+            for config in ctrl.config.enabled.states.iter_mut() {
+                if config.zone == zone {
+                    *config = opt;
+                }
+            }
+        }
+        ctrl.config.write();
+        Ok(ctrl.set_power_states().map_err(|e| {
+            warn!("{}", e);
+            e
+        })?)
+    }
+
+    /// On machine that have some form of either per-key keyboard or per-zone
+    /// this can be used to write custom effects over dbus. The input is a
+    /// nested `Vec<Vec<8>>` where `Vec<u8>` is a raw USB packet
+    async fn direct_addressing_raw(&self, data: UsbPackets) -> Result<(), ZbErr> {
+        let mut ctrl = self.0.lock().await;
+        ctrl.write_effect_block(&data)?;
+        Ok(())
+    }
+}
+
+impl CtrlTask for CtrlAuraZbus {
+    fn zbus_path() -> &'static str {
+        "/org/asuslinux"
+    }
+
+    async fn create_tasks(&self, _: SignalContext<'static>) -> Result<(), RogError> {
+        let load_save =
+            |start: bool, mut lock: MutexGuard<'_, CtrlKbdLed>| -> Result<(), RogError> {
+                // If waking up
+                if !start {
+                    info!("CtrlKbdLedTask reloading brightness and modes");
+                    lock.led_node
+                        .set_brightness(lock.config.brightness.into())
+                        .map_err(|e| {
+                            error!("CtrlKbdLedTask: {e}");
+                            e
+                        })?;
+                    lock.write_current_config_mode().map_err(|e| {
+                        error!("CtrlKbdLedTask: {e}");
+                        e
+                    })?;
+                } else if start {
+                    Self::update_config(&mut lock).map_err(|e| {
+                        error!("CtrlKbdLedTask: {e}");
+                        e
+                    })?;
+                }
+                Ok(())
+            };
+
+        let inner1 = self.0.clone();
+        let inner3 = self.0.clone();
+        self.create_sys_event_tasks(
+            move |sleeping| {
+                let inner1 = inner1.clone();
+                async move {
+                    let lock = inner1.lock().await;
+                    load_save(sleeping, lock).unwrap(); // unwrap as we want to
+                                                        // bomb out of the task
+                }
+            },
+            move |_shutting_down| {
+                let inner3 = inner3.clone();
+                async move {
+                    let lock = inner3.lock().await;
+                    load_save(false, lock).unwrap(); // unwrap as we want to
+                                                     // bomb out of the task
+                }
+            },
+            move |_lid_closed| {
+                // on lid change
+                async move {}
+            },
+            move |_power_plugged| {
+                // power change
+                async move {}
+            },
+        )
+        .await;
+
+        let ctrl2 = self.0.clone();
+        let ctrl = self.0.lock().await;
+        let watch = ctrl.led_node.monitor_brightness()?;
+        tokio::spawn(async move {
+            let mut buffer = [0; 32];
+            watch
+                .into_event_stream(&mut buffer)
+                .unwrap()
+                .for_each(|_| async {
+                    if let Some(lock) = ctrl2.try_lock() {
+                        load_save(true, lock).unwrap(); // unwrap as we want to
+                                                        // bomb out of the task
+                    }
+                })
+                .await;
+        });
+
+        Ok(())
+    }
+}
+
+impl crate::Reloadable for CtrlAuraZbus {
+    async fn reload(&mut self) -> Result<(), RogError> {
+        let mut ctrl = self.0.lock().await;
+        debug!("reloading keyboard mode");
+        ctrl.write_current_config_mode()?;
+        debug!("reloading power states");
+        ctrl.set_power_states().map_err(|err| warn!("{err}")).ok();
+        Ok(())
+    }
+}
--- a/asusd/src/ctrl_backlight.rs
+++ b/asusd/src/ctrl_backlight.rs
@@ -1,348 +0,0 @@
-use std::sync::Arc;
-use std::time::Duration;
-
-use config_traits::StdConfig;
-use log::{info, warn};
-use rog_platform::backlight::{Backlight, BacklightType};
-use tokio::sync::Mutex;
-use zbus::fdo::Error as FdoErr;
-use zbus::object_server::SignalEmitter;
-use zbus::{interface, Connection};
-
-use crate::config::Config;
-use crate::error::RogError;
-use crate::ASUS_ZBUS_PATH;
-
-#[derive(Clone)]
-pub struct CtrlBacklight {
-    backlights: Vec<Backlight>,
-    config: Arc<Mutex<Config>>,
-}
-
-impl CtrlBacklight {
-    pub fn new(config: Arc<Mutex<Config>>) -> Result<Self, RogError> {
-        let mut backlights = Vec::new();
-
-        if let Ok(primary) = Backlight::new(BacklightType::Primary) {
-            info!("Found primary display backlight");
-            backlights.push(primary);
-        }
-
-        if let Ok(screenpad) = Backlight::new(BacklightType::Screenpad) {
-            info!("Found screenpad backlight");
-            backlights.push(screenpad);
-        }
-
-        if backlights.is_empty() {
-            return Err(RogError::MissingFunction("No backlights found".into()));
-        }
-
-        Ok(Self { backlights, config })
-    }
-
-    fn get_backlight(&self, device_type: &BacklightType) -> Option<&Backlight> {
-        self.backlights
-            .iter()
-            .find(|b| b.device_type() == device_type)
-    }
-
-    async fn set_brightness_with_sync(
-        &self,
-        device_type: &BacklightType,
-        level: i32,
-    ) -> Result<(), FdoErr> {
-        let sync = self
-            .config
-            .lock()
-            .await
-            .screenpad_sync_primary
-            .unwrap_or_default();
-
-        // If sync is enabled and we're setting screenpad brightness, set primary first
-        if sync && *device_type == BacklightType::Screenpad {
-            if let Some(primary) = self.get_backlight(&BacklightType::Primary) {
-                if let Ok(primary_max) = primary.get_max_brightness() {
-                    let primary_scaled = level * primary_max / 100;
-                    let _ = primary.set_brightness(primary_scaled);
-                }
-            }
-        }
-
-        if let Some(backlight) = self.get_backlight(device_type) {
-            let max = backlight.get_max_brightness().map_err(|e| {
-                warn!("Failed to get max brightness: {}", e);
-                FdoErr::Failed(format!("Failed to get max brightness: {}", e))
-            })?;
-
-            let gamma = self.config.lock().await.screenpad_gamma.unwrap_or(1.0);
-            let scaled = if *device_type == BacklightType::Screenpad {
-                // Apply non-linear scaling with the configurable gamma value only for Screenpad
-                let normalized_level = level as f32 / 100.0;
-                let gamma_corrected = normalized_level.powf(gamma);
-                (gamma_corrected * max as f32) as i32
-            } else {
-                // Linear scaling for other devices
-                level * max / 100
-            };
-
-            backlight.set_brightness(scaled).map_err(|e| {
-                warn!("Failed to set brightness: {}", e);
-                FdoErr::Failed(format!("Failed to set brightness: {}", e))
-            })?;
-
-            // If sync is enabled and we're setting primary brightness, set screenpad
-            // afterward
-            if sync && *device_type == BacklightType::Primary {
-                for other in self
-                    .backlights
-                    .iter()
-                    .filter(|b| b.device_type() != device_type)
-                {
-                    if let Ok(other_max) = other.get_max_brightness() {
-                        let other_scaled = if other.device_type() == &BacklightType::Screenpad {
-                            // Apply gamma only to Screenpad
-                            let normalized_level = level as f32 / 100.0;
-                            let gamma_corrected = normalized_level.powf(gamma);
-                            (gamma_corrected * other_max as f32) as i32
-                        } else {
-                            // Linear scaling for other devices
-                            level * other_max / 100
-                        };
-                        let _ = other.set_brightness(other_scaled);
-                    }
-                }
-            }
-
-            Ok(())
-        } else {
-            Err(FdoErr::NotSupported(format!(
-                "Backlight {:?} not found",
-                device_type
-            )))
-        }
-    }
-
-    async fn get_brightness_percent(&self, device_type: &BacklightType) -> Result<i32, FdoErr> {
-        if let Some(backlight) = self.get_backlight(device_type) {
-            let brightness = backlight.get_brightness().map_err(|e| {
-                warn!("Failed to get brightness: {}", e);
-                FdoErr::Failed(format!("Failed to get brightness: {}", e))
-            })?;
-
-            let max = backlight.get_max_brightness().map_err(|e| {
-                warn!("Failed to get max brightness: {}", e);
-                FdoErr::Failed(format!("Failed to get max brightness: {}", e))
-            })?;
-
-            if *device_type == BacklightType::Screenpad {
-                let gamma = self.config.lock().await.screenpad_gamma.unwrap_or(1.0);
-                let normalized = brightness as f32 / max as f32;
-                let corrected = normalized.powf(1.0 / gamma);
-                Ok((corrected * 100.0).round() as i32)
-            } else {
-                Ok(brightness * 100 / max)
-            }
-        } else {
-            Err(FdoErr::NotSupported(format!(
-                "Backlight {:?} not found",
-                device_type
-            )))
-        }
-    }
-
-    pub async fn start_watch_primary(&self) -> Result<(), RogError> {
-        if self.get_backlight(&BacklightType::Screenpad).is_none() {
-            return Ok(());
-        }
-
-        if let Some(sync) = self.config.lock().await.screenpad_sync_primary {
-            if !sync {
-                return Ok(());
-            }
-        }
-
-        if let Some(backlight) = self.get_backlight(&BacklightType::Primary) {
-            let watch = backlight.monitor_brightness()?;
-
-            let backlights = self.clone();
-            tokio::spawn(async move {
-                let mut last_level = 0;
-                let mut buffer = [0; 32];
-                use futures_lite::StreamExt;
-                if let Ok(mut stream) = watch.into_event_stream(&mut buffer) {
-                    loop {
-                        let _ = stream.next().await;
-
-                        let sync = backlights.config.lock().await.screenpad_sync_primary;
-                        if let Some(sync) = sync {
-                            if !sync {
-                                continue;
-                            }
-                        } else if backlights
-                            .config
-                            .lock()
-                            .await
-                            .screenpad_sync_primary
-                            .is_none()
-                        {
-                            continue;
-                        }
-
-                        let level = backlights
-                            .get_brightness_percent(&BacklightType::Primary)
-                            .await
-                            .unwrap_or(60);
-                        if last_level != level {
-                            last_level = level;
-                            backlights
-                                .set_brightness_with_sync(&BacklightType::Screenpad, level)
-                                .await
-                                .ok();
-                        }
-
-                        // other processes cause "MODIFY" event and make this spin 100%, so sleep
-                        tokio::time::sleep(Duration::from_millis(300)).await;
-                    }
-                    // watch
-                    //     .into_event_stream(&mut buffer)
-                    //     .unwrap()
-                    //     .for_each(|_| async {})
-                    //     .await;
-                }
-            });
-        }
-
-        Ok(())
-    }
-}
-
-#[interface(name = "xyz.ljones.Backlight")]
-impl CtrlBacklight {
-    #[zbus(property)]
-    async fn screenpad_sync_with_primary(&self) -> bool {
-        self.config
-            .lock()
-            .await
-            .screenpad_sync_primary
-            .unwrap_or_default()
-    }
-
-    #[zbus(property)]
-    async fn set_screenpad_sync_with_primary(&self, sync: bool) -> Result<(), zbus::Error> {
-        self.config.lock().await.screenpad_sync_primary = Some(sync);
-        self.config.lock().await.write();
-        Ok(())
-    }
-
-    #[zbus(property)]
-    async fn screenpad_gamma(&self) -> String {
-        (self.config.lock().await.screenpad_gamma.unwrap_or(1.0)).to_string()
-    }
-
-    #[zbus(property)]
-    async fn set_screenpad_gamma(&self, value: &str) -> Result<(), zbus::Error> {
-        let gamma: f32 = value
-            .parse()
-            .map_err(|_| FdoErr::Failed("Invalid gamma value, must be a valid number".into()))?;
-
-        if gamma < 0.1 {
-            return Err(FdoErr::Failed("Gamma value must be greater than 0".into()).into());
-        }
-        if gamma > 2.0 {
-            return Err(FdoErr::Failed("Gamma value must be 2.0 or less".into()).into());
-        }
-        self.config.lock().await.screenpad_gamma = Some(gamma);
-        self.config.lock().await.write();
-        Ok(())
-    }
-
-    #[zbus(property)]
-    async fn primary_brightness(&self) -> Result<i32, FdoErr> {
-        self.get_brightness_percent(&BacklightType::Primary).await
-    }
-
-    #[zbus(property)]
-    async fn set_primary_brightness(
-        &self,
-        #[zbus(signal_context)] ctxt: SignalEmitter<'_>,
-        level: i32,
-    ) -> Result<(), zbus::Error> {
-        if level > 100 {
-            return Err(FdoErr::Failed("Brightness level must be 0-100".into()).into());
-        }
-
-        self.set_brightness_with_sync(&BacklightType::Primary, level)
-            .await?;
-        self.primary_brightness_changed(&ctxt).await?;
-
-        Ok(())
-    }
-
-    #[zbus(property)]
-    async fn screenpad_brightness(&self) -> Result<i32, FdoErr> {
-        self.get_brightness_percent(&BacklightType::Screenpad).await
-    }
-
-    #[zbus(property)]
-    async fn set_screenpad_brightness(
-        &self,
-        // #[zbus(signal_context)] ctxt: SignalEmitter<'_>,
-        level: i32,
-    ) -> Result<(), zbus::Error> {
-        if level > 100 {
-            return Err(FdoErr::Failed("Brightness level must be 0-100".into()).into());
-        }
-
-        self.set_brightness_with_sync(&BacklightType::Screenpad, level)
-            .await?;
-        // self.screenpad_brightness_changed(&ctxt).await?;
-
-        Ok(())
-    }
-
-    #[zbus(property)]
-    async fn screenpad_power(&self) -> Result<bool, FdoErr> {
-        if let Some(backlight) = self.get_backlight(&BacklightType::Screenpad) {
-            let power = backlight.get_bl_power().map_err(|e| {
-                warn!("Failed to get backlight power: {}", e);
-                FdoErr::Failed(format!("Failed to get backlight power: {}", e))
-            })?;
-            Ok(power == 0)
-        } else {
-            Err(FdoErr::NotSupported("Screenpad backlight not found".into()))
-        }
-    }
-
-    #[zbus(property)]
-    async fn set_screenpad_power(
-        &self,
-        #[zbus(signal_context)] ctxt: SignalEmitter<'_>,
-        power: bool,
-    ) -> Result<(), zbus::Error> {
-        if let Some(backlight) = self.get_backlight(&BacklightType::Screenpad) {
-            backlight
-                .set_bl_power(if power { 0 } else { 1 })
-                .map_err(|e| {
-                    warn!("Failed to set backlight power: {}", e);
-                    FdoErr::Failed(format!("Failed to set backlight power: {}", e))
-                })?;
-            self.screenpad_power_changed(&ctxt).await?;
-            Ok(())
-        } else {
-            Err(FdoErr::NotSupported("Screenpad backlight not found".into()).into())
-        }
-    }
-}
-
-impl crate::ZbusRun for CtrlBacklight {
-    async fn add_to_server(self, server: &mut Connection) {
-        Self::add_to_server_helper(self, ASUS_ZBUS_PATH, server).await;
-    }
-}
-
-impl crate::Reloadable for CtrlBacklight {
-    async fn reload(&mut self) -> Result<(), RogError> {
-        info!("Reloading backlight settings");
-        Ok(())
-    }
-}
--- a/asusd/src/ctrl_fancurves.rs
+++ b/asusd/src/ctrl_fancurves.rs
@@ -4,26 +4,25 @@ use std::sync::Arc;
 use config_traits::{StdConfig, StdConfigLoad};
 use futures_lite::StreamExt;
 use log::{debug, error, info, warn};
-use rog_platform::platform::{PlatformProfile, RogPlatform};
+use rog_platform::platform::{RogPlatform, ThrottlePolicy};
 use rog_profiles::error::ProfileError;
 use rog_profiles::fan_curve_set::CurveData;
 use rog_profiles::{find_fan_curve_node, FanCurvePU, FanCurveProfiles};
-use serde::{Deserialize, Serialize};
+use serde_derive::{Deserialize, Serialize};
 use tokio::sync::Mutex;
-use zbus::object_server::SignalEmitter;
-use zbus::{interface, Connection};
+use zbus::{interface, Connection, SignalContext};

 use crate::error::RogError;
 use crate::{CtrlTask, CONFIG_PATH_BASE};

 pub const FAN_CURVE_ZBUS_NAME: &str = "FanCurves";
-pub const FAN_CURVE_ZBUS_PATH: &str = "/xyz/ljones";
+pub const FAN_CURVE_ZBUS_PATH: &str = "/org/asuslinux";

 #[derive(Deserialize, Serialize, Debug, Default)]
 pub struct FanCurveConfig {
    pub profiles: FanCurveProfiles,
    #[serde(skip)]
-    pub current: PlatformProfile,
+    pub current: u8,
 }

 impl StdConfig for FanCurveConfig {
@@ -54,7 +53,7 @@ pub struct CtrlFanCurveZbus {
 impl CtrlFanCurveZbus {
    pub fn new() -> Result<Self, RogError> {
        let platform = RogPlatform::new()?;
-        if platform.has_platform_profile() {
+        if platform.has_throttle_thermal_policy() {
            info!("Device has profile control available");
            find_fan_curve_node()?;
            info!("Device has fan curves available");
@@ -65,13 +64,16 @@ impl CtrlFanCurveZbus {
            if config.profiles.balanced.is_empty() || !config.file_path().exists() {
                info!("Fetching default fan curves");

-                let current = platform.get_platform_profile()?;
-                let profiles = platform.get_platform_profile_choices()?;
-                for this in profiles {
+                let current = platform.get_throttle_thermal_policy()?;
+                for this in [
+                    ThrottlePolicy::Balanced,
+                    ThrottlePolicy::Performance,
+                    ThrottlePolicy::Quiet,
+                ] {
                    // For each profile we need to switch to it before we
                    // can read the existing values from hardware. The ACPI method used
                    // for this is what limits us.
-                    platform.set_platform_profile(this.into())?;
+                    platform.set_throttle_thermal_policy(this.into())?;
                    let mut dev = find_fan_curve_node()?;
                    fan_curves.set_active_curve_to_defaults(this, &mut dev)?;

@@ -80,7 +82,7 @@ impl CtrlFanCurveZbus {
                        info!("{}", String::from(curve));
                    }
                }
-                platform.set_platform_profile(current.as_str())?;
+                platform.set_throttle_thermal_policy(current)?;
                config.profiles = fan_curves;
                config.write();
            } else {
@@ -98,13 +100,13 @@ impl CtrlFanCurveZbus {
    }
 }

-#[interface(name = "xyz.ljones.FanCurves")]
+#[interface(name = "org.asuslinux.FanCurves")]
 impl CtrlFanCurveZbus {
    /// Set all fan curves for a profile to enabled status. Will also activate a
    /// fan curve if in the same profile mode
    async fn set_fan_curves_enabled(
        &mut self,
-        profile: PlatformProfile,
+        profile: ThrottlePolicy,
        enabled: bool,
    ) -> zbus::fdo::Result<()> {
        self.config
@@ -125,7 +127,7 @@ impl CtrlFanCurveZbus {
    /// activate a fan curve if in the same profile mode
    async fn set_profile_fan_curve_enabled(
        &mut self,
-        profile: PlatformProfile,
+        profile: ThrottlePolicy,
        fan: FanCurvePU,
        enabled: bool,
    ) -> zbus::fdo::Result<()> {
@@ -146,7 +148,7 @@ impl CtrlFanCurveZbus {
    /// Get the fan-curve data for the currently active ThrottlePolicy
    async fn fan_curve_data(
        &mut self,
-        profile: PlatformProfile,
+        profile: ThrottlePolicy,
    ) -> zbus::fdo::Result<Vec<CurveData>> {
        let curve = self
            .config
@@ -162,7 +164,7 @@ impl CtrlFanCurveZbus {
    /// Will also activate the fan curve if the user is in the same mode.
    async fn set_fan_curve(
        &mut self,
-        profile: PlatformProfile,
+        profile: ThrottlePolicy,
        curve: CurveData,
    ) -> zbus::fdo::Result<()> {
        self.config
@@ -170,7 +172,7 @@ impl CtrlFanCurveZbus {
            .await
            .profiles
            .save_fan_curve(curve, profile)?;
-        let active: PlatformProfile = self.platform.get_platform_profile()?.into();
+        let active: ThrottlePolicy = self.platform.get_throttle_thermal_policy()?.into();
        if active == profile {
            self.config
                .lock()
@@ -187,15 +189,15 @@ impl CtrlFanCurveZbus {
    ///
    /// Each platform_profile has a different default and the default can be
    /// read only for the currently active profile.
-    async fn set_curves_to_defaults(&mut self, profile: PlatformProfile) -> zbus::fdo::Result<()> {
-        let active = self.platform.get_platform_profile()?;
-        self.platform.set_platform_profile(profile.into())?;
+    async fn set_curves_to_defaults(&mut self, profile: ThrottlePolicy) -> zbus::fdo::Result<()> {
+        let active = self.platform.get_throttle_thermal_policy()?;
+        self.platform.set_throttle_thermal_policy(profile.into())?;
        self.config
            .lock()
            .await
            .profiles
            .set_active_curve_to_defaults(profile, &mut find_fan_curve_node()?)?;
-        self.platform.set_platform_profile(active.as_str())?;
+        self.platform.set_throttle_thermal_policy(active)?;
        self.config.lock().await.write();
        Ok(())
    }
@@ -205,16 +207,16 @@ impl CtrlFanCurveZbus {
    ///
    /// Each platform_profile has a different default and the defualt can be
    /// read only for the currently active profile.
-    async fn reset_profile_curves(&self, profile: PlatformProfile) -> zbus::fdo::Result<()> {
-        let active = self.platform.get_platform_profile()?;
+    async fn reset_profile_curves(&self, profile: ThrottlePolicy) -> zbus::fdo::Result<()> {
+        let active = self.platform.get_throttle_thermal_policy()?;

-        self.platform.set_platform_profile(profile.into())?;
+        self.platform.set_throttle_thermal_policy(profile.into())?;
        self.config
            .lock()
            .await
            .profiles
-            .set_active_curve_to_defaults(active.as_str().into(), &mut find_fan_curve_node()?)?;
-        self.platform.set_platform_profile(active.as_str())?;
+            .set_active_curve_to_defaults(active.into(), &mut find_fan_curve_node()?)?;
+        self.platform.set_throttle_thermal_policy(active)?;

        self.config.lock().await.write();
        Ok(())
@@ -232,32 +234,27 @@ impl CtrlTask for CtrlFanCurveZbus {
        FAN_CURVE_ZBUS_PATH
    }

-    async fn create_tasks(&self, _signal_ctxt: SignalEmitter<'static>) -> Result<(), RogError> {
-        let watch_platform_profile = self.platform.monitor_platform_profile()?;
+    async fn create_tasks(&self, _signal_ctxt: SignalContext<'static>) -> Result<(), RogError> {
+        let watch_throttle_thermal_policy = self.platform.monitor_throttle_thermal_policy()?;
        let platform = self.platform.clone();
        let config = self.config.clone();
        let fan_curves = self.config.clone();

        tokio::spawn(async move {
            let mut buffer = [0; 32];
-            if let Ok(mut stream) = watch_platform_profile.into_event_stream(&mut buffer) {
+            if let Ok(mut stream) = watch_throttle_thermal_policy.into_event_stream(&mut buffer) {
                while (stream.next().await).is_some() {
-                    debug!("watch_platform_profile changed");
-                    if let Ok(profile) =
-                        platform
-                            .get_platform_profile()
-                            .map(|p| p.into())
-                            .map_err(|e| {
-                                error!("get_platform_profile error: {e}");
-                            })
-                    {
+                    debug!("watch_throttle_thermal_policy changed");
+                    if let Ok(profile) = platform.get_throttle_thermal_policy().map_err(|e| {
+                        error!("get_throttle_thermal_policy error: {e}");
+                    }) {
                        if profile != config.lock().await.current {
                            fan_curves
                                .lock()
                                .await
                                .profiles
                                .write_profile_curve_to_platform(
-                                    profile,
+                                    profile.into(),
                                    &mut find_fan_curve_node().unwrap(),
                                )
                                .map_err(|e| warn!("write_profile_curve_to_platform, {}", e))
@@ -276,7 +273,7 @@ impl CtrlTask for CtrlFanCurveZbus {
 impl crate::Reloadable for CtrlFanCurveZbus {
    /// Fetch the active profile and use that to set all related components up
    async fn reload(&mut self) -> Result<(), RogError> {
-        let active = self.platform.get_platform_profile()?.into();
+        let active = self.platform.get_throttle_thermal_policy()?.into();
        let mut config = self.config.lock().await;
        if let Ok(mut device) = find_fan_curve_node() {
            config
--- a/asusd/src/ctrl_platform.rs
+++ b/asusd/src/ctrl_platform.rs
--- a/asusd/src/ctrl_slash/config.rs
+++ b/asusd/src/ctrl_slash/config.rs
@@ -0,0 +1,51 @@
+use config_traits::{StdConfig, StdConfigLoad};
+use rog_slash::{DeviceState, SlashMode};
+use serde_derive::{Deserialize, Serialize};
+
+const CONFIG_FILE: &str = "slash.ron";
+
+/// Config for base system actions for the anime display
+#[derive(Deserialize, Serialize, Debug)]
+pub struct SlashConfig {
+    pub slash_enabled: bool,
+    pub slash_brightness: u8,
+    pub slash_interval: u8,
+    pub slash_mode: SlashMode,
+}
+
+impl Default for SlashConfig {
+    fn default() -> Self {
+        SlashConfig {
+            slash_enabled: true,
+            slash_brightness: 255,
+            slash_interval: 0,
+            slash_mode: SlashMode::Bounce,
+        }
+    }
+}
+impl StdConfig for SlashConfig {
+    fn new() -> Self {
+        Self::default()
+    }
+
+    fn file_name(&self) -> String {
+        CONFIG_FILE.to_owned()
+    }
+
+    fn config_dir() -> std::path::PathBuf {
+        std::path::PathBuf::from(crate::CONFIG_PATH_BASE)
+    }
+}
+
+impl StdConfigLoad for SlashConfig {}
+
+impl From<&SlashConfig> for DeviceState {
+    fn from(config: &SlashConfig) -> Self {
+        DeviceState {
+            slash_enabled: config.slash_enabled,
+            slash_brightness: config.slash_brightness,
+            slash_interval: config.slash_interval,
+            slash_mode: config.slash_mode,
+        }
+    }
+}
--- a/asusd/src/ctrl_slash/mod.rs
+++ b/asusd/src/ctrl_slash/mod.rs
@@ -0,0 +1,106 @@
+pub mod config;
+pub mod trait_impls;
+
+use rog_platform::hid_raw::HidRaw;
+use rog_platform::usb_raw::USBRaw;
+use rog_slash::error::SlashError;
+use rog_slash::usb::{get_slash_type, pkt_set_mode, pkt_set_options, pkts_for_init};
+use rog_slash::{SlashMode, SlashType};
+
+use crate::ctrl_slash::config::SlashConfig;
+use crate::error::RogError;
+
+enum Node {
+    Usb(USBRaw),
+    Hid(HidRaw),
+}
+
+impl Node {
+    pub fn write_bytes(&self, message: &[u8]) -> Result<(), RogError> {
+        // TODO: map and pass on errors
+        match self {
+            Node::Usb(u) => {
+                u.write_bytes(message).ok();
+            }
+            Node::Hid(h) => {
+                h.write_bytes(message).ok();
+            }
+        }
+        Ok(())
+    }
+}
+
+pub struct CtrlSlash {
+    // node: HidRaw,
+    node: Node,
+    config: SlashConfig,
+    // slash_type: SlashType,
+    // // set to force thread to exit
+    // thread_exit: Arc<AtomicBool>,
+    // // Set to false when the thread exits
+    // thread_running: Arc<AtomicBool>,
+}
+
+impl CtrlSlash {
+    #[inline]
+    pub fn new(config: SlashConfig) -> Result<CtrlSlash, RogError> {
+        let slash_type = get_slash_type()?;
+        if matches!(slash_type, SlashType::Unknown | SlashType::Unsupported) {
+            return Err(RogError::Slash(SlashError::NoDevice));
+        }
+
+        let usb = USBRaw::new(rog_slash::usb::PROD_ID).ok();
+        let hid = HidRaw::new(rog_slash::usb::PROD_ID_STR).ok();
+        let node = if usb.is_some() {
+            unsafe { Node::Usb(usb.unwrap_unchecked()) }
+        } else if hid.is_some() {
+            unsafe { Node::Hid(hid.unwrap_unchecked()) }
+        } else {
+            return Err(RogError::NotSupported);
+        };
+
+        let ctrl = CtrlSlash {
+            node,
+            config,
+            // slash_type,
+            // thread_exit: Arc::new(AtomicBool::new(false)),
+            // thread_running: Arc::new(AtomicBool::new(false)),
+        };
+        ctrl.do_initialization()?;
+
+        Ok(ctrl)
+    }
+
+    fn do_initialization(&self) -> Result<(), RogError> {
+        let init_packets = pkts_for_init();
+        self.node.write_bytes(&init_packets[0])?;
+        self.node.write_bytes(&init_packets[1])?;
+
+        // Apply config upon initialization
+        let option_packets = pkt_set_options(
+            self.config.slash_enabled,
+            self.config.slash_brightness,
+            self.config.slash_interval,
+        );
+        self.node.write_bytes(&option_packets)?;
+
+        let mode_packets = pkt_set_mode(self.config.slash_mode);
+        self.node.write_bytes(&mode_packets[0])?;
+        self.node.write_bytes(&mode_packets[1])?;
+
+        Ok(())
+    }
+
+    pub fn set_options(&self, enabled: bool, brightness: u8, interval: u8) -> Result<(), RogError> {
+        let command_packets = pkt_set_options(enabled, brightness, interval);
+        self.node.write_bytes(&command_packets)?;
+        Ok(())
+    }
+
+    pub fn set_slash_mode(&self, slash_mode: SlashMode) -> Result<(), RogError> {
+        let command_packets = pkt_set_mode(slash_mode);
+        self.node.write_bytes(&command_packets[0])?;
+        self.node.write_bytes(&command_packets[1])?;
+        Ok(())
+    }
+}
--- a/asusd/src/ctrl_slash/trait_impls.rs
+++ b/asusd/src/ctrl_slash/trait_impls.rs
@@ -0,0 +1,161 @@
+use std::sync::Arc;
+
+use config_traits::StdConfig;
+use log::warn;
+use rog_slash::usb::{pkt_set_mode, pkt_set_options};
+use rog_slash::{DeviceState, SlashMode};
+use zbus::export::futures_util::lock::Mutex;
+use zbus::{interface, Connection, SignalContext};
+
+use crate::ctrl_slash::CtrlSlash;
+use crate::error::RogError;
+
+pub const SLASH_ZBUS_NAME: &str = "Slash";
+pub const SLASH_ZBUS_PATH: &str = "/org/asuslinux";
+
+#[derive(Clone)]
+pub struct CtrlSlashZbus(pub Arc<Mutex<CtrlSlash>>);
+
+/// The struct with the main dbus methods requires this trait
+impl crate::ZbusRun for CtrlSlashZbus {
+    async fn add_to_server(self, server: &mut Connection) {
+        Self::add_to_server_helper(self, SLASH_ZBUS_PATH, server).await;
+    }
+}
+
+#[interface(name = "org.asuslinux.Slash")]
+impl CtrlSlashZbus {
+    /// Get enabled or not
+    #[zbus(property)]
+    async fn enabled(&self) -> bool {
+        let lock = self.0.lock().await;
+        lock.config.slash_enabled
+    }
+
+    /// Set enabled true or false
+    async fn set_enabled(&self, enabled: bool) {
+        let mut lock = self.0.lock().await;
+        let brightness = if enabled && lock.config.slash_brightness == 0 {
+            0x88
+        } else {
+            lock.config.slash_brightness
+        };
+        lock.node
+            .write_bytes(&pkt_set_options(
+                enabled,
+                brightness,
+                lock.config.slash_interval,
+            ))
+            .map_err(|err| {
+                warn!("ctrl_slash::set_options {}", err);
+            })
+            .ok();
+
+        lock.config.slash_enabled = enabled;
+        lock.config.slash_brightness = brightness;
+        lock.config.write();
+    }
+
+    /// Get brightness level
+    #[zbus(property)]
+    async fn brightness(&self) -> u8 {
+        let lock = self.0.lock().await;
+        lock.config.slash_brightness
+    }
+
+    /// Set brightness level
+    async fn set_brightness(&self, brightness: u8) {
+        let mut lock = self.0.lock().await;
+        let enabled = brightness > 0;
+        lock.node
+            .write_bytes(&pkt_set_options(
+                enabled,
+                brightness,
+                lock.config.slash_interval,
+            ))
+            .map_err(|err| {
+                warn!("ctrl_slash::set_options {}", err);
+            })
+            .ok();
+
+        lock.config.slash_enabled = enabled;
+        lock.config.slash_brightness = brightness;
+        lock.config.write();
+    }
+
+    #[zbus(property)]
+    async fn interval(&self) -> u8 {
+        let lock = self.0.lock().await;
+        lock.config.slash_interval
+    }
+
+    /// Set interval between slash animations (0-255)
+    async fn set_interval(&self, interval: u8) {
+        let mut lock = self.0.lock().await;
+        lock.node
+            .write_bytes(&pkt_set_options(
+                lock.config.slash_enabled,
+                lock.config.slash_brightness,
+                interval,
+            ))
+            .map_err(|err| {
+                warn!("ctrl_slash::set_options {}", err);
+            })
+            .ok();
+
+        lock.config.slash_interval = interval;
+        lock.config.write();
+    }
+
+    #[zbus(property)]
+    async fn slash_mode(&self) -> u8 {
+        let lock = self.0.lock().await;
+        lock.config.slash_interval
+    }
+
+    /// Set interval between slash animations (0-255)
+    async fn set_slash_mode(&self, slash_mode: SlashMode) {
+        let mut lock = self.0.lock().await;
+
+        let command_packets = pkt_set_mode(slash_mode);
+
+        lock.node
+            .write_bytes(&command_packets[0])
+            .map_err(|err| {
+                warn!("ctrl_slash::set_options {}", err);
+            })
+            .ok();
+        lock.node
+            .write_bytes(&command_packets[1])
+            .map_err(|err| {
+                warn!("ctrl_slash::set_options {}", err);
+            })
+            .ok();
+
+        lock.config.slash_mode = slash_mode;
+        lock.config.write();
+    }
+
+    /// Get the device state as stored by asusd
+    // #[zbus(property)]
+    async fn device_state(&self) -> DeviceState {
+        let lock = self.0.lock().await;
+        DeviceState::from(&lock.config)
+    }
+}
+
+impl crate::CtrlTask for CtrlSlashZbus {
+    fn zbus_path() -> &'static str {
+        SLASH_ZBUS_PATH
+    }
+
+    async fn create_tasks(&self, _: SignalContext<'static>) -> Result<(), RogError> {
+        Ok(())
+    }
+}
+
+impl crate::Reloadable for CtrlSlashZbus {
+    async fn reload(&mut self) -> Result<(), RogError> {
+        Ok(())
+    }
+}
--- a/asusd/src/daemon.rs
+++ b/asusd/src/daemon.rs
@@ -2,38 +2,36 @@ use std::env;
 use std::error::Error;
 use std::sync::Arc;

+use ::zbus::export::futures_util::lock::Mutex;
 use ::zbus::Connection;
-use asusd::asus_armoury::{start_attributes_zbus, ArmouryAttributeRegistry};
-use asusd::aura_manager::DeviceManager;
 use asusd::config::Config;
-use asusd::ctrl_backlight::CtrlBacklight;
+use asusd::ctrl_anime::config::AnimeConfig;
+use asusd::ctrl_anime::trait_impls::CtrlAnimeZbus;
+use asusd::ctrl_anime::CtrlAnime;
+use asusd::ctrl_aura::manager::AuraManager;
 use asusd::ctrl_fancurves::CtrlFanCurveZbus;
 use asusd::ctrl_platform::CtrlPlatform;
-use asusd::{print_board_info, start_tasks, CtrlTask, ZbusRun, DBUS_NAME};
-use config_traits::{StdConfig, StdConfigLoad2};
+use asusd::ctrl_slash::config::SlashConfig;
+use asusd::ctrl_slash::trait_impls::CtrlSlashZbus;
+use asusd::ctrl_slash::CtrlSlash;
+use asusd::{print_board_info, start_tasks, CtrlTask, DBUS_NAME};
+use config_traits::{StdConfig, StdConfigLoad, StdConfigLoad2, StdConfigLoad3};
 use log::{error, info};
-use rog_platform::asus_armoury::FirmwareAttributes;
-use rog_platform::platform::RogPlatform;
-use rog_platform::power::AsusPower;
-use tokio::sync::Mutex;
 use zbus::fdo::ObjectManager;

 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
-    println!("Starting asusd daemon...");
-
    // console_subscriber::init();
    let mut logger = env_logger::Builder::new();
    logger
        .parse_default_env()
        .target(env_logger::Target::Stdout)
        .format_timestamp(None)
-        .filter_level(log::LevelFilter::Debug)
        .init();

    let is_service = match env::var_os("IS_SERVICE") {
        Some(val) => val == "1",
-        None => true,
+        None => false,
    };

    if !is_service {
@@ -63,93 +61,76 @@ async fn start_daemon() -> Result<(), Box<dyn Error>> {
    // println!("{:?}", supported.supported_functions());

    // Start zbus server
-    let mut server = Connection::system().await?;
-    if let Err(e) = server.object_server().at("/", ObjectManager).await {
-        error!("Failed to register ObjectManager at root '/': {e:?}");
-    }
+    let mut connection = Connection::system().await?;
+    connection
+        .object_server()
+        .at("/org/asuslinux", ObjectManager)
+        .await
+        .unwrap();

    let config = Config::new().load();
    let cfg_path = config.file_path();
    let config = Arc::new(Mutex::new(config));

    // supported.add_to_server(&mut connection).await;
-    let platform = RogPlatform::new()?; // TODO: maybe needs async mutex?
-    let power = AsusPower::new()?; // TODO: maybe needs async mutex?
-    let attributes = FirmwareAttributes::new();
-    let armoury_registry = match start_attributes_zbus(
-        &server,
-        platform.clone(),
-        power.clone(),
-        attributes.clone(),
-        config.clone(),
-    )
-    .await
-    {
-        Ok(registry) => {
-            info!("attribute on zbus initialized");
-            registry
-        }
-        Err(e) => {
-            error!("Failed to initialize firmware attributes over zbus: {e:?}");
-            ArmouryAttributeRegistry::default()
-        }
-    };

    match CtrlFanCurveZbus::new() {
        Ok(ctrl) => {
-            info!("FanCurves: found supported fancurves");
-            let sig_ctx = CtrlFanCurveZbus::signal_context(&server)?;
-            start_tasks(ctrl, &mut server, sig_ctx).await?;
-            info!("FanCurves: initialized");
+            let sig_ctx = CtrlFanCurveZbus::signal_context(&connection)?;
+            start_tasks(ctrl, &mut connection, sig_ctx).await?;
        }
        Err(err) => {
            error!("FanCurves: {}", err);
        }
    }

-    match CtrlBacklight::new(config.clone()) {
-        Ok(backlight) => {
-            info!("Backlight: found supported backlight");
-            backlight.start_watch_primary().await?;
-            backlight.add_to_server(&mut server).await;
-            info!("Backlight: initialized");
-        }
-        Err(err) => {
-            error!("Backlight: {}", err);
-        }
-    }
-
    match CtrlPlatform::new(
-        platform,
-        power,
-        attributes,
        config.clone(),
        &cfg_path,
-        CtrlPlatform::signal_context(&server)?,
-        server.clone(),
-        armoury_registry,
+        CtrlPlatform::signal_context(&connection)?,
    ) {
        Ok(ctrl) => {
-            info!("CtrlPlatform: initialized");
-            let sig_ctx = CtrlPlatform::signal_context(&server)?;
-            start_tasks(ctrl, &mut server, sig_ctx).await?;
-            info!("CtrlPlatform: tasks started");
+            let sig_ctx = CtrlPlatform::signal_context(&connection)?;
+            start_tasks(ctrl, &mut connection, sig_ctx).await?;
        }
        Err(err) => {
            error!("CtrlPlatform: {}", err);
        }
    }

-    let _ = DeviceManager::new(server.clone()).await?;
+    match CtrlAnime::new(AnimeConfig::new().load()) {
+        Ok(ctrl) => {
+            let zbus = CtrlAnimeZbus(Arc::new(Mutex::new(ctrl)));
+            let sig_ctx = CtrlAnimeZbus::signal_context(&connection)?;
+            start_tasks(zbus, &mut connection, sig_ctx).await?;
+        }
+        Err(err) => {
+            info!("AniMe control: {}", err);
+        }
+    }

-    info!("DeviceManager initialized");
+    match CtrlSlash::new(SlashConfig::new().load()) {
+        Ok(ctrl) => {
+            let zbus = CtrlSlashZbus(Arc::new(Mutex::new(ctrl)));
+            // Currently, the Slash has no need for a loop watching power events, however,
+            // it could be cool to have the slash do some power-on/off animation
+            // (It has a built-in power on animation which plays when u plug in the power
+            // supply)
+            let sig_ctx = CtrlSlashZbus::signal_context(&connection)?;
+            start_tasks(zbus, &mut connection, sig_ctx).await?;
+        }
+        Err(err) => {
+            info!("AniMe control: {}", err);
+        }
+    }
+
+    let _ = AuraManager::new(connection.clone()).await?;

    // Request dbus name after finishing initalizing all functions
-    server.request_name(DBUS_NAME).await?;
+    connection.request_name(DBUS_NAME).await?;

-    info!("Startup success on dbus name {DBUS_NAME}: begining dbus server loop");
    loop {
        // This is just a blocker to idle and ensure the reator reacts
-        server.executor().tick().await;
+        connection.executor().tick().await;
    }
 }
--- a/asusd/src/error.rs
+++ b/asusd/src/error.rs
@@ -142,10 +142,3 @@ impl From<RogError> for zbus::fdo::Error {
        zbus::fdo::Error::Failed(format!("{}", err))
    }
 }
-
-impl From<RogError> for zbus::Error {
-    #[inline]
-    fn from(err: RogError) -> Self {
-        zbus::Error::Failure(format!("{}", err))
-    }
-}
--- a/asusd/src/lib.rs
+++ b/asusd/src/lib.rs
@@ -1,19 +1,17 @@
 #![deny(unused_must_use)]
 /// Configuration loading, saving
 pub mod config;
-pub mod ctrl_backlight;
+/// Control of anime matrix display
+pub mod ctrl_anime;
+/// Keyboard LED brightness control, RGB, and LED display modes
+pub mod ctrl_aura;
 /// Control platform profiles + fan-curves if available
 pub mod ctrl_fancurves;
 /// Control ASUS bios function such as boot sound, Optimus/Dedicated gfx mode
 pub mod ctrl_platform;
+/// Control of Slash led bar
+pub mod ctrl_slash;

-pub mod asus_armoury;
-pub mod aura_anime;
-pub mod aura_laptop;
-pub mod aura_manager;
-pub mod aura_scsi;
-pub mod aura_slash;
-pub mod aura_types;
 pub mod error;

 use std::future::Future;
@@ -24,19 +22,15 @@ use futures_lite::stream::StreamExt;
 use log::{debug, info, warn};
 use logind_zbus::manager::ManagerProxy;
 use tokio::time::sleep;
-use zbus::object_server::{Interface, SignalEmitter};
-use zbus::proxy::CacheProperties;
 use zbus::zvariant::ObjectPath;
-use zbus::Connection;
+use zbus::{CacheProperties, Connection, SignalContext};

 use crate::error::RogError;

 const CONFIG_PATH_BASE: &str = "/etc/asusd/";
-pub const ASUS_ZBUS_PATH: &str = "/xyz/ljones";
-
-pub static DBUS_NAME: &str = "xyz.ljones.Asusd";
-pub static DBUS_PATH: &str = "/xyz/ljones/Daemon";
-pub static DBUS_IFACE: &str = "xyz.ljones.Asusd";
+pub static DBUS_NAME: &str = "org.asuslinux.Daemon";
+pub static DBUS_PATH: &str = "/org/asuslinux/Daemon";
+pub static DBUS_IFACE: &str = "org.asuslinux.Daemon";

 /// This macro adds a function which spawns an `inotify` task on the passed in
 /// `Executor`.
@@ -45,7 +39,7 @@ pub static DBUS_IFACE: &str = "xyz.ljones.Asusd";
 /// methods to be available:
 /// - `<name>() -> SomeValue`, functionally is a getter, but is allowed to have
 ///   side effects.
-/// - `notify_<name>(SignalEmitter, SomeValue)`
+/// - `notify_<name>(SignalContext, SomeValue)`
 ///
 /// In most cases if `SomeValue` is stored in a config then `<name>()` getter is
 /// expected to update it. The getter should *never* write back to the path or
@@ -62,13 +56,13 @@ pub static DBUS_IFACE: &str = "xyz.ljones.Asusd";
 /// // TODO: this is kind of useless if it can't trigger some action
 #[macro_export]
 macro_rules! task_watch_item {
-    ($name:ident $name_str:literal $self_inner:ident) => {
+    ($name:ident $self_inner:ident) => {
        concat_idents::concat_idents!(fn_name = watch_, $name {
        async fn fn_name(
            &self,
-            signal_ctxt: SignalEmitter<'static>,
+            signal_ctxt: SignalContext<'static>,
        ) -> Result<(), RogError> {
-            use futures_util::StreamExt;
+            use zbus::export::futures_util::StreamExt;

            let ctrl = self.clone();
            concat_idents::concat_idents!(watch_fn = monitor_, $name {
@@ -78,15 +72,12 @@ macro_rules! task_watch_item {
                            let mut buffer = [0; 32];
                            watch.into_event_stream(&mut buffer).unwrap().for_each(|_| async {
                                if let Ok(value) = ctrl.$name() { // get new value from zbus method
-                                    if ctrl.config.lock().await.$name != value {
-                                        log::debug!("{} was changed to {} externally", $name_str, value);
-                                        concat_idents::concat_idents!(notif_fn = $name, _changed {
-                                            ctrl.notif_fn(&signal_ctxt).await.ok();
-                                        });
-                                        let mut lock = ctrl.config.lock().await;
-                                        lock.$name = value;
-                                        lock.write();
-                                    }
+                                    concat_idents::concat_idents!(notif_fn = $name, _changed {
+                                        ctrl.notif_fn(&signal_ctxt).await.ok();
+                                    });
+                                    let mut lock = ctrl.config.lock().await;
+                                    lock.$name = value;
+                                    lock.write();
                                }
                            }).await;
                        });
@@ -106,9 +97,9 @@ macro_rules! task_watch_item_notify {
        concat_idents::concat_idents!(fn_name = watch_, $name {
        async fn fn_name(
            &self,
-            signal_ctxt: SignalEmitter<'static>,
+            signal_ctxt: SignalContext<'static>,
        ) -> Result<(), RogError> {
-            use futures_util::StreamExt;
+            use zbus::export::futures_util::StreamExt;

            let ctrl = self.clone();
            concat_idents::concat_idents!(watch_fn = monitor_, $name {
@@ -149,7 +140,7 @@ pub trait ReloadAndNotify {

    fn reload_and_notify(
        &mut self,
-        signal_context: &SignalEmitter<'static>,
+        signal_context: &SignalContext<'static>,
        data: Self::Data,
    ) -> impl Future<Output = Result<(), RogError>> + Send;
 }
@@ -158,7 +149,7 @@ pub trait ZbusRun {
    fn add_to_server(self, server: &mut Connection) -> impl Future<Output = ()> + Send;

    fn add_to_server_helper(
-        iface: impl Interface,
+        iface: impl zbus::Interface,
        path: &str,
        server: &mut Connection,
    ) -> impl Future<Output = ()> + Send {
@@ -180,8 +171,8 @@ pub trait ZbusRun {
 pub trait CtrlTask {
    fn zbus_path() -> &'static str;

-    fn signal_context(connection: &Connection) -> Result<SignalEmitter<'static>, zbus::Error> {
-        SignalEmitter::new(connection, Self::zbus_path())
+    fn signal_context(connection: &Connection) -> Result<SignalContext<'static>, zbus::Error> {
+        SignalContext::new(connection, Self::zbus_path())
    }

    /// Implement to set up various tasks that may be required, using the
@@ -189,7 +180,7 @@ pub trait CtrlTask {
    /// separate thread.
    fn create_tasks(
        &self,
-        signal: SignalEmitter<'static>,
+        signal: SignalContext<'static>,
    ) -> impl Future<Output = Result<(), RogError>> + Send;

    // /// Create a timed repeating task
@@ -303,7 +294,7 @@ pub trait GetSupported {
 pub async fn start_tasks<T>(
    mut zbus: T,
    connection: &mut Connection,
-    signal_ctx: SignalEmitter<'static>,
+    signal_ctx: SignalContext<'static>,
 ) -> Result<(), RogError>
 where
    T: ZbusRun + Reloadable + CtrlTask + Clone,
--- a/config-traits/Cargo.toml
+++ b/config-traits/Cargo.toml
@@ -13,3 +13,6 @@ serde.workspace = true
 ron.workspace = true

 log.workspace = true
+
+[dev-dependencies]
+cargo-husky.workspace = true
--- a/config-traits/src/lib.rs
+++ b/config-traits/src/lib.rs
@@ -146,7 +146,11 @@ where

    /// Renames the existing file to `<file>-old`
    fn rename_file_old(&self) {
-        warn!("Renaming {} to {}-old", self.file_name(), self.file_name());
+        warn!(
+            "Renaming {} to {}-old and recreating config",
+            self.file_name(),
+            self.file_name()
+        );
        let mut cfg_old = self.file_path().to_string_lossy().to_string();
        cfg_old.push_str("-old");
        std::fs::rename(self.file_path(), cfg_old).unwrap_or_else(|err| {
@@ -203,7 +207,7 @@ macro_rules! std_config_load {
        /// new one created
        pub trait $trait_name<$($generic),*>
        where
-            Self: $crate::StdConfig + DeserializeOwned + Serialize,
+            Self: $crate::StdConfig +std::fmt::Debug + DeserializeOwned + Serialize,
            $($generic: DeserializeOwned + Into<Self>),*
        {
            fn load(mut self) -> Self {
@@ -270,8 +274,6 @@ mod tests {
            }
        }

-        let _ = Test {};
-
        impl crate::StdConfigLoad1<Old1> for Test {}
    }

@@ -321,8 +323,6 @@ mod tests {
            }
        }

-        let _ = Test {};
-
        impl crate::StdConfigLoad3<Old1, Old2, Old3> for Test {}
    }
 }
--- a/cpuctl/Cargo.toml
+++ b/cpuctl/Cargo.toml
@@ -0,0 +1,11 @@
+[package]
+name = "cpuctl"
+license.workspace = true
+version.workspace = true
+readme.workspace = true
+authors.workspace = true
+repository.workspace = true
+homepage.workspace = true
+edition.workspace = true
+
+[dependencies]
--- a/cpuctl/src/lib.rs
+++ b/cpuctl/src/lib.rs
@@ -0,0 +1,14 @@
+pub fn add(left: usize, right: usize) -> usize {
+    left + right
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn it_works() {
+        let result = add(2, 2);
+        assert_eq!(result, 4);
+    }
+}
--- a/data/asusd.conf
+++ b/data/asusd.conf
@@ -3,24 +3,24 @@
          "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
 <busconfig>
    <policy group="adm">
-        <allow send_destination="xyz.ljones.Asusd"/>
-        <allow receive_sender="xyz.ljones.Asusd"/>
+        <allow send_destination="org.asuslinux.Daemon"/>
+        <allow receive_sender="org.asuslinux.Daemon"/>
    </policy>
    <policy group="sudo">
-        <allow send_destination="xyz.ljones.Asusd"/>
-        <allow receive_sender="xyz.ljones.Asusd"/>
+        <allow send_destination="org.asuslinux.Daemon"/>
+        <allow receive_sender="org.asuslinux.Daemon"/>
    </policy>
    <policy group="users">
-        <allow send_destination="xyz.ljones.Asusd"/>
-        <allow receive_sender="xyz.ljones.Asusd"/>
+        <allow send_destination="org.asuslinux.Daemon"/>
+        <allow receive_sender="org.asuslinux.Daemon"/>
    </policy>
    <policy group="wheel">
-        <allow send_destination="xyz.ljones.Asusd"/>
-        <allow receive_sender="xyz.ljones.Asusd"/>
+        <allow send_destination="org.asuslinux.Daemon"/>
+        <allow receive_sender="org.asuslinux.Daemon"/>
    </policy>
    <policy user="root">
-        <allow own="xyz.ljones.Asusd"/>
-        <allow send_destination="xyz.ljones.Asusd"/>
-        <allow receive_sender="xyz.ljones.Asusd"/>
+        <allow own="org.asuslinux.Daemon"/>
+        <allow send_destination="org.asuslinux.Daemon"/>
+        <allow receive_sender="org.asuslinux.Daemon"/>
    </policy>
 </busconfig>
--- a/data/asusd.rules
+++ b/data/asusd.rules
@@ -7,16 +7,11 @@ ENV{DMI_FAMILY}=="*ROG*", GOTO="asusd_start"
 ENV{DMI_FAMILY}=="*Zephyrus*", GOTO="asusd_start"
 ENV{DMI_FAMILY}=="*Strix*", GOTO="asusd_start"
 ENV{DMI_FAMILY}=="*Vivo*ook*", GOTO="asusd_start"
-ENV{DMI_FAMILY}=="*Zenbook*", GOTO="asusd_start"
-ENV{DMI_FAMILY}=="*ProArt*", GOTO="asusd_start"
-ENV{DMI_FAMILY}=="*TX Air*", GOTO="asusd_start"
-ENV{DMI_FAMILY}=="*TX Gaming*", GOTO="asusd_start"
-ENV{DMI_FAMILY}=="*EXPERTBOOK*", GOTO="asusd_start"
 # No match so
 GOTO="asusd_end"

 LABEL="asusd_start"
-ACTION=="add|change", DRIVER=="asus-nb-wmi", TAG+="systemd", ENV{SYSTEMD_WANTS}+="asusd.service"
-ACTION=="add|remove", DRIVER=="asus-nb-wmi", TAG+="systemd", ENV{SYSTEMD_WANTS}+="asusd.service"
+ACTION=="add|change", DRIVER=="asus-nb-wmi", TAG+="systemd", ENV{SYSTEMD_WANTS}="asusd.service"
+ACTION=="add|remove", DRIVER=="asus-nb-wmi", TAG+="systemd", RUN+="systemctl restart asusd.service"

 LABEL="asusd_end"
--- a/data/asusd.service
+++ b/data/asusd.service
@@ -6,17 +6,13 @@ 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="info"
 # required to prevent init issues with hid_asus and MCU
 ExecStartPre=/bin/sleep 1
 ExecStart=/usr/bin/asusd
 Restart=on-failure
 RestartSec=1
 Type=dbus
-BusName=xyz.ljones.Asusd
+BusName=org.asuslinux.Daemon
 SELinuxContext=system_u:system_r:unconfined_t:s0
 #SELinuxContext=system_u:object_r:modules_object_t:s0
-TimeoutSec=10
--- a/data/icons/asus_notif_red.png
+++ b/data/icons/asus_notif_red.png
--- a/design-patterns.md
+++ b/design-patterns.md
@@ -135,7 +135,7 @@ impl crate::ZbusAdd for CtrlAnimeZbus {
    }
 }

-#[dbus_interface(name = "xyz.ljones.Asusd")]
+#[dbus_interface(name = "org.asuslinux.Daemon")]
 impl CtrlAnimeZbus {
    async fn <zbus method>() {
       let lock = self.inner.lock().await;
--- a/distro-packaging/asusctl.spec
+++ b/distro-packaging/asusctl.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package asus-nb-ctrl
 #
-# Copyright (c) 2020-2025 Luke Jones <luke@ljones.dev>
+# Copyright (c) 2020-2021 Luke Jones <luke@ljones.dev>
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,43 +20,36 @@
 %global debug_package %{nil}
 %endif

-%define version 6.3.1
-%define specrelease %{?dist}
-%define pkg_release 1%{specrelease}
+%global rpm_dkms_opt 1

 # Use hardening ldflags.
 %global rustflags -Clink-arg=-Wl,-z,relro,-z,now
-Name:    asusctl
-Version: %{version}
-Release: %{pkg_release}
-Summary: Control fan speeds, LEDs, graphics modes, and charge levels for ASUS notebooks
-License: MPLv2
+Name:           asusctl
+Version:        4.7.0
+Release:        2
+Summary:        Control fan speeds, LEDs, graphics modes, and charge levels for ASUS notebooks
+License:        MPLv2

-Group:   System Environment/Kernel
+Group:          System Environment/Kernel

-URL:     https://gitlab.com/asus-linux/asusctl
-Source:  https://gitlab.com/asus-linux/asusctl/-/archive/%{version}/%{name}-%{version}.tar.gz
+URL:            https://gitlab.com/asus-linux/asusctl
+Source:         %{name}-%{version}.tar.gz
+Source1:        vendor-%{name}-%{version}.tar.gz
+Source2:        cargo_config

-%if %{defined fedora}
+BuildRequires:  cargo
 BuildRequires:  rust-packaging
 BuildRequires:  systemd-rpm-macros
-%else
-BuildRequires:  cargo-packaging
-%endif
-BuildRequires:  git
 BuildRequires:  clang-devel
-BuildRequires:  cargo
 BuildRequires:  cmake
 BuildRequires:  rust
 BuildRequires:  rust-std-static
-BuildRequires:  pkgconfig(gbm)
-BuildRequires:  pkgconfig(libinput)
-BuildRequires:  pkgconfig(libseat)
+BuildRequires:  pkgconfig(dbus-1)
 BuildRequires:  pkgconfig(libudev)
-BuildRequires:  pkgconfig(xkbcommon)
-BuildRequires:  pkgconfig(libzstd)
-BuildRequires:  pkgconfig(fontconfig)
+BuildRequires:  pkgconfig(gtk+-3.0)
+BuildRequires:  pkgconfig(gdk-3.0)
 BuildRequires:  desktop-file-utils
+Requires: libappindicator-gtk3

 %description
 asus-nb-ctrl is a utility for Linux to control many aspects of various
@@ -68,7 +61,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,85 +68,30 @@ a notification service, and ability to run in the background.

 %prep
 %autosetup
-mkdir -p .cargo
-cat > .cargo/config.toml << 'EOF'
-[term]
-verbose = true
-[net]
-offline = false
-EOF
+%setup -D -T -a 1 -c -n %{name}-%{version}/vendor
+cd ..
+
+mv Cargo.lock{,.bak}
+%cargo_prep
+mv Cargo.lock{.bak,}
+sed -i 's|replace-with = "local-registry"|replace-with = "vendored-sources"|' .cargo/config
+cat %{SOURCE2} >> .cargo/config

 %build
 export RUSTFLAGS="%{rustflags}"
-%if %{defined fedora}
-/usr/bin/cargo build --release --locked
-%else
-/usr/bin/cargo auditable build --release --locked
-%endif
+%cargo_build
+#cargo build --release --frozen --offline --config .cargo/config.toml

 %install
 export RUSTFLAGS="%{rustflags}"
+mkdir -p "%{buildroot}/%{_bindir}" "%{buildroot}%{_docdir}"
+%make_install
+ 
+install -D -m 0644 README.md %{buildroot}/%{_docdir}/%{name}/README.md
+install -D -m 0644 rog-anime/README.md %{buildroot}/%{_docdir}/%{name}/README-anime.md
+install -D -m 0644 rog-anime/data/diagonal-template.png %{buildroot}/%{_docdir}/%{name}/diagonal-template.png

-%define _target_dir target/release
-
-# 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 +101,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 +117,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/dmi-id/src/lib.rs
+++ b/dmi-id/src/lib.rs
@@ -1,4 +1,4 @@
-use log::warn;
+use log::{info, warn};

 #[derive(Debug, Default, PartialEq, Eq, PartialOrd, Clone)]
 pub struct DMIID {
@@ -33,6 +33,8 @@ impl DMIID {
        })?;

        if let Some(device) = (result).next() {
+            info!("Found dmi ID info at {:?}", device.sysname());
+
            return Ok(Self {
                id_model: device
                    .property_value("ID_MODEL")
--- a/extra/index.html
+++ b/extra/index.html
@@ -1,23 +0,0 @@
-<!doctype html>
-<html lang="en">
-<head>
-  <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width,initial-scale=1">
-  <title>asusctl docs</title>
-  <!-- Redirect to the generated crate docs -->
-  <meta http-equiv="refresh" content="0;url=asusctl/index.html">
-  <link rel="canonical" href="asusctl/index.html">
-  <style>
-    body { font-family: system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", Arial; color:#222; display:flex; align-items:center; justify-content:center; height:100vh; margin:0 }
-    .box { text-align:center }
-    a { color: #0366d6 }
-  </style>
-</head>
-<body>
-  <div class="box">
-    <h1>asusctl documentation</h1>
-    <p>Redirecting to the generated docs — if your browser doesn't redirect automatically, <a href="asusctl/index.html">click here</a>.</p>
-    <p>If you expected a different landing page, update <code>extra/index.html</code> accordingly.</p>
-  </div>
-</body>
-</html>
--- a/rog-anime/Cargo.toml
+++ b/rog-anime/Cargo.toml
@@ -28,9 +28,17 @@ gif.workspace = true
 log.workspace = true

 serde.workspace = true
+serde_derive.workspace = true

 glam.workspace = true
+typeshare.workspace = true

 zbus = { workspace = true, optional = true }

 dmi_id = { path = "../dmi-id", optional = true }
+
+[dev-dependencies]
+cargo-husky.workspace = true
+
+[package.metadata.cargo-machete]
+ignored = ["serde"]
--- a/rog-anime/data/g835l/images/.gitkeep
+++ b/rog-anime/data/g835l/images/.gitkeep
--- a/rog-anime/data/g835l/templates/custom-image-template.png
+++ b/rog-anime/data/g835l/templates/custom-image-template.png
--- a/rog-anime/src/data.rs
+++ b/rog-anime/src/data.rs
@@ -3,9 +3,9 @@ use std::str::FromStr;
 use std::thread::sleep;
 use std::time::{Duration, Instant};

-use dmi_id::DMIID;
 use log::info;
-use serde::{Deserialize, Serialize};
+use serde_derive::{Deserialize, Serialize};
+use typeshare::typeshare;
 #[cfg(feature = "dbus")]
 use zbus::zvariant::{OwnedValue, Type, Value};

@@ -22,19 +22,15 @@ const BLOCK_END: usize = 634;
 const PANE_LEN: usize = BLOCK_END - BLOCK_START;

 /// First packet is for GA401 + GA402
-pub const USB_PREFIX1: [u8; 7] = [
-    0x5e, 0xc0, 0x02, 0x01, 0x00, 0x73, 0x02,
-];
+pub const USB_PREFIX1: [u8; 7] = [0x5e, 0xc0, 0x02, 0x01, 0x00, 0x73, 0x02];
 /// Second packet is for GA401 + GA402
-pub const USB_PREFIX2: [u8; 7] = [
-    0x5e, 0xc0, 0x02, 0x74, 0x02, 0x73, 0x02,
-];
+pub const USB_PREFIX2: [u8; 7] = [0x5e, 0xc0, 0x02, 0x74, 0x02, 0x73, 0x02];
 /// Third packet is for GA402 matrix
-pub const USB_PREFIX3: [u8; 7] = [
-    0x5e, 0xc0, 0x02, 0xe7, 0x04, 0x73, 0x02,
-];
+pub const USB_PREFIX3: [u8; 7] = [0x5e, 0xc0, 0x02, 0xe7, 0x04, 0x73, 0x02];

+#[typeshare]
 #[cfg_attr(feature = "dbus", derive(Type, Value, OwnedValue))]
+#[typeshare]
 #[derive(Default, Deserialize, PartialEq, Eq, Clone, Copy, Serialize, Debug)]
 pub struct Animations {
    pub boot: AnimBooting,
@@ -44,7 +40,9 @@ pub struct Animations {
 }

 // TODO: move this out
+#[typeshare]
 #[cfg_attr(feature = "dbus", derive(Type))]
+#[typeshare]
 #[derive(Debug, PartialEq, Eq, Copy, Clone, Deserialize, Serialize)]
 pub struct DeviceState {
    pub display_enabled: bool,
@@ -57,68 +55,34 @@ pub struct DeviceState {
    pub brightness_on_battery: Brightness,
 }

+#[typeshare]
 #[cfg_attr(feature = "dbus", derive(Type), zvariant(signature = "s"))]
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Deserialize, Serialize, Default)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq, Deserialize, Serialize)]
 pub enum AnimeType {
    GA401,
    GA402,
    GU604,
-    G635L,
-    G835L,
-    #[default]
-    Unsupported,
+    Unknown,
 }

 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::Unknown,
+        })
    }
 }

 impl AnimeType {
-    pub fn from_dmi() -> Self {
-        let board_name = DMIID::new().unwrap_or_default().board_name.to_uppercase();
-        if board_name.contains("GA401I") || board_name.contains("GA401Q") {
-            AnimeType::GA401
-        } else if board_name.contains("GA402R")
-            || board_name.contains("GA402X")
-            || board_name.contains("GA402N")
-        {
-            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
-        }
-    }
-
    /// The width of diagonal images
    pub fn width(&self) -> usize {
        match self {
            AnimeType::GU604 => 70,
-            // TODO: Find G635L W*H
-            AnimeType::G635L => 68,
-            AnimeType::G835L => 68,
            _ => 74,
        }
    }
@@ -128,8 +92,6 @@ impl AnimeType {
        match self {
            AnimeType::GA401 => 36,
            AnimeType::GU604 => 43,
-            AnimeType::G635L => 34,
-            AnimeType::G835L => 34,
            _ => 39,
        }
    }
@@ -138,9 +100,7 @@ impl AnimeType {
    pub fn data_length(&self) -> usize {
        match self {
            AnimeType::GA401 => PANE_LEN * 2,
-            // G835L has 810 LEDs: 210 (triangle) + 600 (staggered rectangle)
-            AnimeType::G635L => 810, // TODO: This is provisional until we have a G635L to test on
-            AnimeType::G835L => 810,
+            AnimeType::GU604 => PANE_LEN * 3,
            _ => PANE_LEN * 3,
        }
    }
@@ -204,35 +164,19 @@ impl TryFrom<AnimeDataBuffer> for AnimePacketType {
        }

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

-        // G835L has different packing: 627 bytes in pane 1, 183 bytes in pane 2
-        if anime.anime == AnimeType::G835L || anime.anime == AnimeType::G635L {
-            let data = anime.data.as_slice();
-            // Pane 1: first 627 bytes
-            let pane1_len = PANE_LEN.min(data.len());
-            buffers[0][BLOCK_START..BLOCK_START + pane1_len].copy_from_slice(&data[..pane1_len]);
-            // Pane 2: remaining bytes (183)
-            if data.len() > PANE_LEN {
-                let pane2_len = data.len() - PANE_LEN;
-                buffers[1][BLOCK_START..BLOCK_START + pane2_len].copy_from_slice(&data[PANE_LEN..]);
-            }
-        } else {
-            for (idx, chunk) in anime.data.as_slice().chunks(PANE_LEN).enumerate() {
-                buffers[idx][BLOCK_START..BLOCK_START + chunk.len()].copy_from_slice(chunk);
-            }
+        for (idx, chunk) in anime.data.as_slice().chunks(PANE_LEN).enumerate() {
+            buffers[idx][BLOCK_START..BLOCK_END].copy_from_slice(chunk);
        }
-
        buffers[0][..7].copy_from_slice(&USB_PREFIX1);
        buffers[1][..7].copy_from_slice(&USB_PREFIX2);

        if matches!(
            anime.anime,
-            AnimeType::GA402 | AnimeType::GU604 | AnimeType::Unsupported
+            AnimeType::GA402 | AnimeType::GU604 | AnimeType::Unknown
        ) {
            buffers[2][..7].copy_from_slice(&USB_PREFIX3);
        }
--- a/rog-anime/src/diagonal.rs
+++ b/rog-anime/src/diagonal.rs
@@ -3,8 +3,6 @@
 use std::path::Path;
 use std::time::Duration;

-use log::error;
-
 use crate::data::AnimeDataBuffer;
 use crate::error::{AnimeError, Result};
 use crate::AnimeType;
@@ -51,10 +49,7 @@ impl AnimeDiagonal {
        bright: f32,
        anime_type: AnimeType,
    ) -> Result<Self> {
-        let data = std::fs::read(path).map_err(|e| {
-            error!("Could not open {path:?}: {e:?}");
-            e
-        })?;
+        let data = std::fs::read(path)?;
        let data = std::io::Cursor::new(data);
        let decoder = png_pong::Decoder::new(data)?.into_steps();
        let png_pong::Step { raster, delay: _ } = decoder.last().ok_or(AnimeError::NoFrames)??;
@@ -146,8 +141,6 @@ impl AnimeDiagonal {
        match anime_type {
            AnimeType::GA401 => self.to_ga401_packets(),
            AnimeType::GU604 => self.to_gu604_packets(),
-            AnimeType::G635L => self.to_g835l_packets(), // TODO: Verify with G635L model
-            AnimeType::G835L => self.to_g835l_packets(),
            _ => self.to_ga402_packets(),
        }
    }
@@ -383,80 +376,4 @@ impl AnimeDiagonal {

        AnimeDataBuffer::from_vec(crate::AnimeType::GA402, buf)
    }
-
-    /// G835L diagonal packing - inverted geometry (rows grow then constant)
-    /// Triangle (rows 0-27): pairs grow from 1→14 LEDs
-    /// Rectangle (rows 28-67): constant 15 LEDs
-    ///
-    /// Diagonal PNG layout for G835L:
-    /// - Image height = 34 (row pairs)
-    /// - Image width  = 68 (half-step X grid)
-    /// - Even/odd rows are interleaved in X (staggered by 0.5 LED = 1 px)
-    fn to_g835l_packets(&self) -> Result<AnimeDataBuffer> {
-        use log::debug;
-
-        let mut buf = vec![0u8; AnimeType::G835L.data_length()];
-        let mut buf_idx = 0usize;
-
-        debug!(
-            "G835L packing: image dimensions {}x{}, buffer size {}",
-            self.1.first().map(|r| r.len()).unwrap_or(0),
-            self.1.len(),
-            buf.len()
-        );
-
-        // Helper: get row length for G835L
-        fn row_length(row: usize) -> usize {
-            if row < 28 {
-                row / 2 + 1
-            } else {
-                15
-            }
-        }
-
-        // Helper: starting X (in LED units) for the row
-        fn first_x(row: usize) -> usize {
-            if row < 28 {
-                0
-            } else {
-                (row - 28) / 2
-            }
-        }
-
-        // Process all 68 rows
-        for row in 0..68 {
-            let len = row_length(row);
-            let img_y = row / 2;
-            let base_x = first_x(row);
-            let stagger = row % 2;
-
-            for i in 0..len {
-                // Half-step X grid: even rows on even pixels, odd rows on odd pixels.
-                let img_x = (base_x + i) * 2 + stagger;
-
-                // Read from image, clamp to bounds
-                let val = if img_y < self.1.len() && img_x < self.1[img_y].len() {
-                    self.1[img_y][img_x]
-                } else {
-                    0
-                };
-
-                // Log first LED of each row for debugging
-                if i == 0 {
-                    debug!(
-                        "Row {}: len={}, first LED at img[{}][{}] = {}",
-                        row, len, img_y, img_x, val
-                    );
-                }
-
-                if buf_idx < buf.len() {
-                    buf[buf_idx] = val;
-                }
-                buf_idx += 1;
-            }
-        }
-
-        debug!("G835L packing complete: {} bytes written", buf_idx);
-        AnimeDataBuffer::from_vec(AnimeType::G835L, buf)
-    }
 }
--- a/rog-anime/src/gif.rs
+++ b/rog-anime/src/gif.rs
@@ -4,8 +4,7 @@ use std::path::Path;
 use std::time::Duration;

 use glam::Vec2;
-use log::error;
-use serde::{Deserialize, Serialize};
+use serde_derive::{Deserialize, Serialize};

 use crate::error::{AnimeError, Result};
 use crate::{AnimeDataBuffer, AnimeDiagonal, AnimeImage, AnimeType, Pixel};
@@ -108,10 +107,7 @@ impl AnimeGif {
        // Configure the decoder such that it will expand the image to RGBA.
        decoder.set_color_output(gif::ColorOutput::RGBA);
        // Read the file header
-        let file = File::open(file_name).map_err(|e| {
-            error!("Could not open {file_name:?}: {e:?}");
-            e
-        })?;
+        let file = File::open(file_name)?;
        let mut decoder = decoder.read_info(file)?;

        let mut frames = Vec::default();
@@ -190,14 +186,12 @@ impl AnimeGif {
        anime_type: AnimeType,
    ) -> Result<Self> {
        let mut frames = Vec::new();
+
        let mut decoder = gif::DecodeOptions::new();
        // Configure the decoder such that it will expand the image to RGBA.
        decoder.set_color_output(gif::ColorOutput::RGBA);
        // Read the file header
-        let file = File::open(file_name).map_err(|e| {
-            error!("Could not open {file_name:?}: {e:?}");
-            e
-        })?;
+        let file = File::open(file_name)?;
        let mut decoder = decoder.read_info(file)?;

        let height = decoder.height();
--- a/rog-anime/src/image.rs
+++ b/rog-anime/src/image.rs
@@ -3,7 +3,6 @@ use std::path::Path;

 pub use glam::Vec2;
 use glam::{Mat3, Vec3};
-use log::error;

 use crate::data::AnimeDataBuffer;
 use crate::error::{AnimeError, Result};
@@ -137,8 +136,8 @@ impl AnimeImage {
    fn scale_y(anime_type: AnimeType) -> f32 {
        match anime_type {
            AnimeType::GA401 => 0.3,
-            AnimeType::GA402 => 0.283,
-            _ => 0.28,
+            AnimeType::GU604 => 0.28,
+            _ => 0.283,
        }
    }

@@ -149,7 +148,6 @@ impl AnimeImage {
    /// square grid, so `first_x` is the x position on that grid where the
    /// LED is actually positioned in relation to the Y.
    ///
-    /// For GA401/GA402/GU604 (shrinking pattern - diagonal cuts in from left):
    /// ```text
    /// +------------+
    /// |            |
@@ -163,19 +161,6 @@ impl AnimeImage {
    ///    ^   ------+
    ///  first_x
    /// ```
-    ///
-    /// For G835L/G635L (inverted pattern - triangle grows then rectangle shifts):
-    /// ```text
-    /// ●              <- Row 0: first_x = 0, width = 1
-    ///  ●             <- Row 1: first_x = 0 (stagger), width = 1
-    /// ● ●            <- Row 2: first_x = 0, width = 2
-    ///  ● ●           <- Row 3: first_x = 0 (stagger), width = 2
-    /// ...            <- Triangle continues, first_x = 0 for rows 0-27
-    ///       ● ● ● ● ● ● ● ● ● ● ● ● ● ● ●  <- Row 28+: first_x grows
-    ///        ● ● ● ● ● ● ● ● ● ● ● ● ● ● ● <- Rectangle shifts right
-    /// ```
-    /// Triangle (rows 0-27): first_x = 0 (no cumulative shift)
-    /// Rectangle (rows 28-67): first_x = (y - 28) / 2 (shifts right)
    fn first_x(anime_type: AnimeType, y: u32) -> u32 {
        match anime_type {
            AnimeType::GA401 => {
@@ -183,7 +168,7 @@ impl AnimeImage {
                    // first 5 rows for GA401 are always at X = 0
                    return 0;
                }
-                y.div_ceil(2) - 3
+                (y + 1) / 2 - 3
            }
            AnimeType::GU604 => {
                // first 9 rows start at zero
@@ -193,23 +178,13 @@ impl AnimeImage {
                // and then their offset grows by one every two rows
                (y - 9) / 2
            }
-            AnimeType::G635L | AnimeType::G835L => {
-                // G835L/G635L have inverted geometry - triangle at top-left, rectangle shifts right
-                // Triangle (rows 0-27): no cumulative shift, just alternating stagger
-                // Rectangle (rows 28-67): shifts right by ~0.5px per row
-                if y < 28 {
-                    0
-                } else {
-                    (y - 28) / 2
-                }
-            }
            _ => {
                // first 11 rows start at zero
                if y <= 11 {
                    return 0;
                }
                // and then their offset grows by one every two rows
-                y.div_ceil(2) - 5
+                (y + 1) / 2 - 5
            }
        }
    }
@@ -237,7 +212,7 @@ impl AnimeImage {
                    // First 5 rows for GA401 are always 33 physical LEDs long
                    return 33;
                }
-                36 - y.div_ceil(2)
+                36 - (y + 1) / 2
            }
            AnimeType::GU604 => {
                if y <= 9 {
@@ -245,16 +220,6 @@ impl AnimeImage {
                }
                38 - Self::first_x(anime_type, y) + y % 2
            }
-            AnimeType::G635L | AnimeType::G835L => {
-                // G835L/G635L rows GROW then stay constant (inverted from other devices)
-                // Triangle (rows 0-27): pairs of rows with same length, 1→14
-                // Rectangle (rows 28-67): constant 15 LEDs
-                if y < 28 {
-                    y / 2 + 1
-                } else {
-                    15
-                }
-            }
            _ => {
                if y <= 11 {
                    return 34;
@@ -269,9 +234,8 @@ impl AnimeImage {
        match anime_type {
            // 33.0 = Longest row LED count (physical) plus half-pixel offset
            AnimeType::GA401 => (33.0 + 0.5) * Self::scale_x(anime_type),
+
            AnimeType::GU604 => (38.0 + 0.5) * Self::scale_x(anime_type),
-            AnimeType::G635L => (33.0 + 0.5) * Self::scale_x(anime_type),
-            AnimeType::G835L => (33.0 + 0.5) * Self::scale_x(anime_type),
            _ => (35.0 + 0.5) * Self::scale_x(anime_type),
        }
    }
@@ -281,8 +245,6 @@ impl AnimeImage {
        match anime_type {
            AnimeType::GA401 => 55,
            AnimeType::GU604 => 62,
-            AnimeType::G635L => 68,
-            AnimeType::G835L => 68,
            _ => 61,
        }
    }
@@ -293,8 +255,6 @@ impl AnimeImage {
            // 54.0 = End column LED count (physical) plus one dead pixel
            AnimeType::GA401 => (54.0 + 1.0) * Self::scale_y(anime_type),
            AnimeType::GU604 => 62.0 * Self::scale_y(anime_type),
-            AnimeType::G635L => 68.0 * Self::scale_y(anime_type),
-            AnimeType::G835L => 68.0 * Self::scale_y(anime_type),
            // GA402 may not have dead pixels and require only the physical LED count
            _ => 61.0 * Self::scale_y(anime_type),
        }
@@ -308,8 +268,8 @@ impl AnimeImage {
                1 | 3 => 35, // Some rows are padded
                _ => 36 - y / 2,
            },
-
-            // Other devices don't have dead pixels
+            AnimeType::GU604 => AnimeImage::width(anime_type, y),
+            // GA402 does not have padding, equivalent to width
            _ => AnimeImage::width(anime_type, y),
        }
    }
@@ -360,9 +320,7 @@ impl AnimeImage {
            let pos = Vec3::new(led.x(), led.y(), 1.0);
            let x0 = led_from_px.mul_vec3(pos + Vec3::new(0.0, -0.5, 0.0));

-            const GROUP: [f32; 4] = [
-                0.0, 0.5, 1.0, 1.5,
-            ];
+            const GROUP: [f32; 4] = [0.0, 0.5, 1.0, 1.5];
            for u in &GROUP {
                for v in &GROUP {
                    let sample = x0 + *u * du + *v * dv;
@@ -444,35 +402,13 @@ impl AnimeImage {
        let transform =
            Mat3::from_scale_angle_translation(self.scale, self.angle, self.translation);

-        let pos_in_leds = Mat3::from_translation(self.led_center());
+        let pos_in_leds = Mat3::from_translation(Vec2::new(20.0, 20.0));
        // Get LED-to-image coords
        let led_from_px = pos_in_leds * led_from_cm * transform * cm_from_px * center;

        led_from_px.inverse()
    }

-    fn led_center(&self) -> Vec2 {
-        if !matches!(self.anime_type, AnimeType::G635L | AnimeType::G835L) {
-            return Vec2::new(20.0, 20.0);
-        }
-
-        let mut min = Vec2::splat(f32::INFINITY);
-        let mut max = Vec2::splat(f32::NEG_INFINITY);
-        for led in self.led_pos.iter().flatten() {
-            let pos = Vec2::new(led.x(), led.y());
-            min = min.min(pos);
-            max = max.max(pos);
-        }
-
-        if min.x.is_finite() {
-            let mut center = (min + max) * 0.5;
-            center.y += 1.0;
-            center
-        } else {
-            Vec2::new(20.0, 20.0)
-        }
-    }
-
    /// Generate the base image from inputs. The result can be displayed as is
    /// or updated via scale, position, or angle then displayed again after
    /// `update()`.
@@ -485,10 +421,7 @@ impl AnimeImage {
        bright: f32,
        anime_type: AnimeType,
    ) -> Result<Self> {
-        let data = std::fs::read(path).map_err(|e| {
-            error!("Could not open {path:?}: {e:?}");
-            e
-        })?;
+        let data = std::fs::read(path)?;
        let data = std::io::Cursor::new(data);
        let decoder = png_pong::Decoder::new(data)?.into_steps();
        let png_pong::Step { raster, delay: _ } = decoder.last().ok_or(AnimeError::NoFrames)??;
--- a/rog-anime/src/sequencer.rs
+++ b/rog-anime/src/sequencer.rs
@@ -3,7 +3,7 @@ use std::path::PathBuf;
 use std::time::Duration;

 use glam::Vec2;
-use serde::{Deserialize, Serialize};
+use serde_derive::{Deserialize, Serialize};

 use crate::error::Result;
 use crate::{AnimTime, AnimeDataBuffer, AnimeDiagonal, AnimeGif, AnimeImage, AnimeType};
@@ -75,7 +75,10 @@ impl ActionData {
                time,
                brightness,
            } => ActionData::Animation(AnimeGif::from_diagonal_gif(
-                file, *time, *brightness, anime_type,
+                file,
+                *time,
+                *brightness,
+                anime_type,
            )?),
            ActionLoader::AsusImage {
                file,
@@ -88,7 +91,10 @@ impl ActionData {
                    ActionData::Image(Box::new(data))
                }
                _ => ActionData::Animation(AnimeGif::from_diagonal_png(
-                    file, anime_type, *time, *brightness,
+                    file,
+                    anime_type,
+                    *time,
+                    *brightness,
                )?),
            },
            ActionLoader::ImageAnimation {
@@ -102,12 +108,24 @@ impl ActionData {
                if let Some(ext) = file.extension() {
                    if ext.to_string_lossy().to_lowercase() == "png" {
                        return Ok(ActionData::Animation(AnimeGif::from_png(
-                            file, *scale, *angle, *translation, *time, *brightness, anime_type,
+                            file,
+                            *scale,
+                            *angle,
+                            *translation,
+                            *time,
+                            *brightness,
+                            anime_type,
                        )?));
                    }
                }
                ActionData::Animation(AnimeGif::from_gif(
-                    file, *scale, *angle, *translation, *time, *brightness, anime_type,
+                    file,
+                    *scale,
+                    *angle,
+                    *translation,
+                    *time,
+                    *brightness,
+                    anime_type,
                )?)
            }
            ActionLoader::Image {
@@ -122,13 +140,24 @@ impl ActionData {
                    AnimTime::Infinite => {
                        // If no time then create a plain static image
                        let image = AnimeImage::from_png(
-                            file, *scale, *angle, *translation, *brightness, anime_type,
+                            file,
+                            *scale,
+                            *angle,
+                            *translation,
+                            *brightness,
+                            anime_type,
                        )?;
                        let data = <AnimeDataBuffer>::try_from(&image)?;
                        ActionData::Image(Box::new(data))
                    }
                    _ => ActionData::Animation(AnimeGif::from_png(
-                        file, *scale, *angle, *translation, *time, *brightness, anime_type,
+                        file,
+                        *scale,
+                        *angle,
+                        *translation,
+                        *time,
+                        *brightness,
+                        anime_type,
                    )?),
                }
            }
--- a/rog-anime/src/usb.rs
+++ b/rog-anime/src/usb.rs
@@ -11,7 +11,8 @@
 use std::str::FromStr;

 use dmi_id::DMIID;
-use serde::{Deserialize, Serialize};
+use serde_derive::{Deserialize, Serialize};
+use typeshare::typeshare;
 #[cfg(feature = "dbus")]
 use zbus::zvariant::{OwnedValue, Type, Value};

@@ -28,6 +29,7 @@ pub const PROD_ID: u16 = 0x193b;
    derive(Type, Value, OwnedValue),
    zvariant(signature = "u")
 )]
+#[typeshare]
 #[derive(Debug, Default, PartialEq, Eq, Copy, Clone, Deserialize, Serialize)]
 /// Base LED brightness of the display
 pub enum Brightness {
@@ -80,6 +82,7 @@ impl From<Brightness> for i32 {
    derive(Type, Value, OwnedValue),
    zvariant(signature = "s")
 )]
+#[typeshare]
 #[derive(Debug, Default, PartialEq, Eq, Copy, Clone, Deserialize, Serialize)]
 pub enum AnimBooting {
    #[default]
@@ -120,6 +123,7 @@ impl From<AnimBooting> for i32 {
    derive(Type, Value, OwnedValue),
    zvariant(signature = "s")
 )]
+#[typeshare]
 #[derive(Debug, Default, PartialEq, Eq, Copy, Clone, Deserialize, Serialize)]
 pub enum AnimAwake {
    #[default]
@@ -160,6 +164,7 @@ impl From<AnimAwake> for i32 {
    derive(Type, Value, OwnedValue),
    zvariant(signature = "s")
 )]
+#[typeshare]
 #[derive(Debug, Default, PartialEq, Eq, Copy, Clone, Deserialize, Serialize)]
 pub enum AnimSleeping {
    #[default]
@@ -200,6 +205,7 @@ impl From<AnimSleeping> for i32 {
    derive(Type, Value, OwnedValue),
    zvariant(signature = "s")
 )]
+#[typeshare]
 #[derive(Debug, Default, PartialEq, Eq, Copy, Clone, Deserialize, Serialize)]
 pub enum AnimShutdown {
    #[default]
@@ -235,32 +241,25 @@ impl From<AnimShutdown> for i32 {
    }
 }

-/// `get_maybe_anime_type` is very broad, matching on part of the laptop board
-/// name only. For this reason `find_node()` must be used also to verify if the
-/// USB device is available.
+/// `get_anime_type` is very broad, matching on part of the laptop board name
+/// only. For this reason `find_node()` must be used also to verify if the USB
+/// device is available.
 ///
 /// The currently known USB device is `19b6`.
 #[inline]
-pub fn get_anime_type() -> AnimeType {
-    let dmi = DMIID::new().unwrap_or_default();
-    let board_name = dmi.board_name.to_uppercase();
+pub fn get_anime_type() -> Result<AnimeType, AnimeError> {
+    let dmi = DMIID::new().map_err(|_| AnimeError::NoDevice)?; // TODO: better error
+    let board_name = dmi.board_name;

    if board_name.contains("GA401I") || board_name.contains("GA401Q") {
-        AnimeType::GA401
-    } else if board_name.contains("GA402R")
-        || board_name.contains("GA402X")
-        || board_name.contains("GA402N")
-    {
-        AnimeType::GA402
+        return Ok(AnimeType::GA401);
+    } else if board_name.contains("GA402R") {
+        return Ok(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
+        return Ok(AnimeType::GU604);
    }
+    log::warn!("AniMe Matrix device found but not yet supported, will default to a GA402 layout");
+    Ok(AnimeType::Unknown)
 }

 /// Get the two device initialization packets. These are required for device
--- a/rog-anime/tests/data/g835l-diagonal-fullbright.png
+++ b/rog-anime/tests/data/g835l-diagonal-fullbright.png
--- a/rog-anime/tests/data/g835l-diagonal.gif
+++ b/rog-anime/tests/data/g835l-diagonal.gif
--- a/rog-anime/tests/data/g835l-diagonal.png
+++ b/rog-anime/tests/data/g835l-diagonal.png
--- a/rog-anime/tests/g835l.rs
+++ b/rog-anime/tests/g835l.rs
@@ -1,556 +0,0 @@
-// TODO: This is a provisional copy paste of GA401
-
-#[cfg(test)]
-mod tests {
-    use std::path::PathBuf;
-
-    use rog_anime::*;
-
-    #[test]
-    fn g835l_image_edge_packet_check() {
-        let pkt0_check = [
-            0x5e, 0xc0, 0x02, 0x01, 0x00, 0x73, 0x02, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-            0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff,
-            0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00,
-            0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff,
-            0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff,
-            0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff,
-            0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        ];
-        let pkt1_check = [
-            0x5e, 0xc0, 0x02, 0x74, 0x02, 0x73, 0x02, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff,
-            0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        ];
-
-        let mut matrix = AnimeImage::new(
-            Vec2::new(1.0, 1.0),
-            0.0,
-            Vec2::default(),
-            0.0,
-            vec![Pixel::default(); 1000],
-            100,
-            AnimeType::G835L,
-        )
-        .unwrap();
-        matrix.edge_outline();
-        let data = AnimeDataBuffer::try_from(&matrix).unwrap();
-        let pkt = AnimePacketType::try_from(data).unwrap();
-
-        assert_eq!(pkt[0], pkt0_check);
-        assert_eq!(pkt[1], pkt1_check);
-    }
-
-    #[test]
-    fn g835l_diagonal_packet_check() {
-        let pkt0_check = [
-            0x5e, 0xc0, 0x02, 0x01, 0x00, 0x73, 0x02, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-            0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff,
-            0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00,
-            0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff,
-            0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff,
-            0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff,
-            0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        ];
-        let pkt1_check = [
-            0x5e, 0xc0, 0x02, 0x74, 0x02, 0x73, 0x02, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff,
-            0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        ];
-
-        let mut path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
-        path.push("tests/data/g835l-diagonal.png");
-
-        let matrix = AnimeDiagonal::from_png(&path, None, 255.0, AnimeType::G835L).unwrap();
-        let data = matrix.into_data_buffer(AnimeType::G835L).unwrap();
-        let pkt = AnimePacketType::try_from(data).unwrap();
-
-        assert_eq!(pkt[0], pkt0_check);
-        assert_eq!(pkt[1], pkt1_check);
-    }
-
-    #[test]
-    fn g835l_diagonal_fullbright_packet_check() {
-        let pkt0_check = [
-            0x5e, 0xc0, 0x02, 0x01, 0x00, 0x73, 0x02, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-            0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        ];
-        let pkt1_check = [
-            0x5e, 0xc0, 0x02, 0x74, 0x02, 0x73, 0x02, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        ];
-
-        let mut path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
-        path.push("tests/data/g835l-diagonal-fullbright.png");
-
-        let matrix = AnimeDiagonal::from_png(&path, None, 255.0, AnimeType::G835L).unwrap();
-        let data = matrix.into_data_buffer(AnimeType::G835L).unwrap();
-        let pkt = AnimePacketType::try_from(data).unwrap();
-
-        assert_eq!(pkt[0], pkt0_check);
-        assert_eq!(pkt[1], pkt1_check);
-    }
-
-    #[test]
-    fn g835l_diagonal_gif_wave_packet_check() {
-        let pkt0_frame0_check = [
-            0x5e, 0xc0, 0x02, 0x01, 0x00, 0x73, 0x02, 0x7f, 0x92, 0x84, 0xa2, 0x95, 0xac, 0x8a,
-            0xa0, 0xaf, 0x97, 0xa4, 0xa8, 0x91, 0x9c, 0x9e, 0x99, 0x98, 0x98, 0x91, 0x82, 0x99,
-            0x97, 0x8d, 0x7c, 0x67, 0x99, 0x8d, 0x7a, 0x63, 0x4a, 0xa0, 0x92, 0x7d, 0x63, 0x48,
-            0x2e, 0x9a, 0x83, 0x67, 0x4a, 0x2e, 0x17, 0xa6, 0x8d, 0x70, 0x50, 0x32, 0x19, 0x08,
-            0x9a, 0x7b, 0x5a, 0x3b, 0x20, 0x0c, 0x02, 0xa8, 0x89, 0x67, 0x46, 0x2a, 0x15, 0x09,
-            0x07, 0x97, 0x75, 0x54, 0x37, 0x21, 0x13, 0x10, 0x16, 0xa6, 0x84, 0x63, 0x45, 0x2e,
-            0x20, 0x1c, 0x21, 0x2e, 0x91, 0x71, 0x54, 0x3d, 0x2f, 0x2a, 0x2e, 0x3a, 0x4c, 0x9d,
-            0x7d, 0x61, 0x4c, 0x3e, 0x39, 0x3d, 0x49, 0x5a, 0x6d, 0x87, 0x6d, 0x58, 0x4c, 0x48,
-            0x4c, 0x58, 0x69, 0x7c, 0x8e, 0x8e, 0x75, 0x63, 0x58, 0x55, 0x5a, 0x67, 0x78, 0x8b,
-            0x9d, 0xab, 0x7a, 0x69, 0x60, 0x5f, 0x66, 0x74, 0x86, 0x9a, 0xac, 0xba, 0xc1, 0x7a,
-            0x6c, 0x65, 0x66, 0x6f, 0x7f, 0x93, 0xa7, 0xba, 0xc9, 0xd0, 0xce, 0x6a, 0x65, 0x69,
-            0x74, 0x86, 0x9c, 0xb2, 0xc7, 0xd6, 0xde, 0xdd, 0xd2, 0x63, 0x61, 0x67, 0x75, 0x89,
-            0xa1, 0xba, 0xd0, 0xe1, 0xea, 0xea, 0xe0, 0xcc, 0x59, 0x61, 0x71, 0x88, 0xa2, 0xbd,
-            0xd5, 0xe8, 0xf3, 0xf4, 0xec, 0xd9, 0xbf, 0x4e, 0x58, 0x6a, 0x82, 0x9e, 0xbc, 0xd6,
-            0xeb, 0xf8, 0xfc, 0xf4, 0xe4, 0xca, 0xac, 0x4b, 0x5f, 0x79, 0x97, 0xb6, 0xd3, 0xea,
-            0xf9, 0xfe, 0xf9, 0xea, 0xd3, 0xb6, 0x96, 0x3d, 0x51, 0x6c, 0x8c, 0xad, 0xcb, 0xe4,
-            0xf6, 0xfd, 0xfa, 0xed, 0xd8, 0xbd, 0x9f, 0x82, 0x43, 0x5e, 0x7f, 0xa1, 0xc0, 0xdb,
-            0xee, 0xf7, 0xf6, 0xeb, 0xd8, 0xc0, 0xa4, 0x89, 0x71, 0x50, 0x70, 0x92, 0xb3, 0xcf,
-            0xe3, 0xee, 0xee, 0xe6, 0xd5, 0xbe, 0xa4, 0x8c, 0x76, 0x67, 0x62, 0x84, 0xa5, 0xc1,
-            0xd5, 0xe1, 0xe3, 0xdc, 0xcd, 0xb8, 0xa1, 0x8a, 0x77, 0x6a, 0x64, 0x76, 0x96, 0xb2,
-            0xc7, 0xd3, 0xd5, 0xcf, 0xc1, 0xae, 0x99, 0x84, 0x73, 0x68, 0x65, 0x6a, 0x89, 0xa4,
-            0xb8, 0xc4, 0xc6, 0xc0, 0xb3, 0xa1, 0x8d, 0x7a, 0x6b, 0x63, 0x62, 0x69, 0x78, 0x98,
-            0xab, 0xb5, 0xb8, 0xb1, 0xa4, 0x93, 0x7f, 0x6e, 0x60, 0x59, 0x5b, 0x64, 0x75, 0x8c,
-            0xa0, 0xa9, 0xaa, 0xa3, 0x95, 0x83, 0x70, 0x5f, 0x53, 0x4d, 0x50, 0x5b, 0x6e, 0x87,
-            0xa4, 0xa0, 0x9f, 0x96, 0x87, 0x74, 0x61, 0x50, 0x44, 0x3f, 0x42, 0x4f, 0x64, 0x7e,
-            0x9d, 0xbc, 0x97, 0x8c, 0x7c, 0x68, 0x53, 0x41, 0x34, 0x2f, 0x33, 0x41, 0x56, 0x73,
-            0x93, 0xb3, 0xd1, 0x86, 0x74, 0x5e, 0x47, 0x34, 0x27, 0x21, 0x25, 0x32, 0x48, 0x65,
-            0x86, 0xa7, 0xc6, 0xe0, 0x70, 0x57, 0x3f, 0x2a, 0x1b, 0x14, 0x17, 0x24, 0x39, 0x56,
-            0x77, 0x99, 0xb9, 0xd4, 0xe6, 0x56, 0x3b, 0x24, 0x13, 0x0a, 0x0c, 0x17, 0x2c, 0x48,
-            0x69, 0x8b, 0xab, 0xc6, 0xd9, 0xe3, 0x3b, 0x22, 0x0f, 0x04, 0x04, 0x0e, 0x21, 0x3c,
-            0x5b, 0x7d, 0x9c, 0xb7, 0xca, 0xd5, 0xd6, 0x25, 0x0f, 0x03, 0x00, 0x08, 0x19, 0x32,
-            0x50, 0x70, 0x8f, 0xa9, 0xbc, 0xc6, 0xc7, 0xc0, 0x14, 0x05, 0x01, 0x06, 0x15, 0x2c,
-            0x49, 0x67, 0x84, 0x9c, 0xae, 0xb7, 0xb8, 0xb0, 0xa2, 0x0c, 0x05, 0x09, 0x16, 0x2b,
-            0x45, 0x61, 0x7c, 0x93, 0xa3, 0xab, 0xaa, 0xa2, 0x93, 0x81, 0x0e, 0x10, 0x1b, 0x2e,
-            0x46, 0x60, 0x78, 0x8d, 0x9b, 0xa1, 0x9e, 0x94, 0x85, 0x72, 0x5f, 0x1b, 0x24, 0x35,
-            0x4b, 0x62, 0x79, 0x8b, 0x96, 0x9a, 0x96, 0x8a, 0x79, 0x65, 0x50, 0x3f, 0x30, 0x40,
-            0x54, 0x6a, 0x7e, 0x8d, 0x97, 0x98, 0x91, 0x84, 0x70, 0x5a, 0x44, 0x32, 0x26, 0x4d,
-            0x60, 0x74, 0x87, 0x94, 0x9b, 0x9a, 0x91, 0x81, 0x6c, 0x53, 0x3c, 0x28, 0x1a, 0x15,
-            0x6e, 0x82, 0x93, 0x9f, 0xa4, 0xa1, 0x96, 0x83, 0x6b, 0x51, 0x37, 0x21, 0x11, 0x0a,
-            0x0e, 0x91, 0xa1, 0xac, 0xb0, 0xab, 0x9e, 0x89, 0x6f, 0x53, 0x37, 0x1e, 0x0d, 0x04,
-            0x05, 0x11, 0xb0, 0xbb, 0xbe, 0xb8, 0xaa, 0x93, 0x77, 0x59, 0x3a, 0x20, 0x0c, 0x01,
-            0x01, 0x0a, 0x1d, 0xca, 0xcd, 0xc7, 0xb7, 0xa0, 0x83, 0x62, 0x42, 0x26, 0x10, 0x03,
-            0x01, 0x08, 0x19, 0x31, 0xdc, 0xd6, 0xc6, 0xae, 0x90, 0x6f, 0x4e, 0x30, 0x18, 0x0a,
-            0x05, 0x0a, 0x19, 0x2f, 0x4a, 0xe4, 0xd4, 0xbd, 0x9f, 0x7d, 0x5b, 0x3c, 0x24, 0x14,
-            0x0d, 0x11, 0x1e, 0x32, 0x4a, 0x64, 0xe1, 0xcb, 0xad, 0x8c, 0x6a, 0x4b, 0x31, 0x20,
-            0x19, 0x1b, 0x26, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        ];
-        let pkt1_frame0_check = [
-            0x5e, 0xc0, 0x02, 0x74, 0x02, 0x73, 0x02, 0x4f, 0x66, 0x7c, 0xd6, 0xba, 0x99, 0x78,
-            0x59, 0x40, 0x2f, 0x27, 0x28, 0x32, 0x42, 0x57, 0x6d, 0x80, 0x8f, 0xc4, 0xa5, 0x85,
-            0x67, 0x4f, 0x3e, 0x35, 0x37, 0x40, 0x4f, 0x63, 0x77, 0x89, 0x96, 0x9b, 0xad, 0x8f,
-            0x73, 0x5c, 0x4c, 0x44, 0x46, 0x4f, 0x5e, 0x71, 0x84, 0x94, 0xa0, 0xa3, 0x9f, 0x96,
-            0x7b, 0x66, 0x58, 0x52, 0x54, 0x5e, 0x6e, 0x80, 0x93, 0xa2, 0xac, 0xaf, 0xa9, 0x9a,
-            0x80, 0x6d, 0x61, 0x5c, 0x60, 0x6c, 0x7c, 0x8f, 0xa2, 0xb2, 0xbb, 0xbd, 0xb5, 0xa5,
-            0x8e, 0x70, 0x66, 0x64, 0x6a, 0x77, 0x89, 0x9d, 0xb1, 0xc1, 0xca, 0xcb, 0xc4, 0xb3,
-            0x9a, 0x7c, 0x66, 0x67, 0x6f, 0x7e, 0x92, 0xa8, 0xbd, 0xce, 0xd9, 0xda, 0xd3, 0xc1,
-            0xa8, 0x8a, 0x68, 0x65, 0x70, 0x82, 0x98, 0xb0, 0xc7, 0xd9, 0xe5, 0xe8, 0xe1, 0xd0,
-            0xb7, 0x98, 0x76, 0x54, 0x6d, 0x81, 0x99, 0xb3, 0xcd, 0xe1, 0xee, 0xf3, 0xed, 0xdd,
-            0xc5, 0xa6, 0x85, 0x63, 0x45, 0x7b, 0x96, 0xb3, 0xce, 0xe5, 0xf4, 0xfa, 0xf6, 0xe8,
-            0xd1, 0xb4, 0x93, 0x71, 0x53, 0x3b, 0x8f, 0xad, 0xcb, 0xe4, 0xf5, 0xfe, 0xfc, 0xef,
-            0xda, 0xbe, 0x9f, 0x7f, 0x61, 0x4a, 0x3b, 0xa5, 0xc4, 0xdf, 0xf2, 0xfd, 0xfd, 0xf2,
-            0xdf, 0xc5, 0xa8, 0x89, 0x6e, 0x57, 0x49, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        ];
-        let pkt0_frame16_check = [
-            0x5e, 0xc0, 0x02, 0x01, 0x00, 0x73, 0x02, 0x95, 0x88, 0x92, 0x75, 0x81, 0x60, 0x8f,
-            0x6d, 0x4c, 0x7c, 0x5a, 0x3c, 0x8a, 0x69, 0x4a, 0x32, 0x77, 0x59, 0x41, 0x32, 0x83,
-            0x66, 0x50, 0x40, 0x3a, 0x72, 0x5c, 0x4e, 0x49, 0x4c, 0x79, 0x66, 0x59, 0x56, 0x5a,
-            0x65, 0x6c, 0x61, 0x5f, 0x66, 0x72, 0x84, 0x6d, 0x66, 0x66, 0x6e, 0x7d, 0x90, 0xa5,
-            0x65, 0x68, 0x72, 0x83, 0x99, 0xaf, 0xc5, 0x61, 0x65, 0x72, 0x86, 0x9d, 0xb6, 0xcd,
-            0xdf, 0x5f, 0x6e, 0x84, 0x9d, 0xb9, 0xd2, 0xe6, 0xf2, 0x55, 0x66, 0x7d, 0x99, 0xb7,
-            0xd2, 0xe8, 0xf7, 0xfc, 0x5a, 0x73, 0x91, 0xb1, 0xce, 0xe6, 0xf7, 0xfe, 0xfb, 0x4c,
-            0x67, 0x86, 0xa7, 0xc6, 0xe0, 0xf3, 0xfc, 0xfb, 0xf0, 0x58, 0x78, 0x9a, 0xbb, 0xd6,
-            0xeb, 0xf6, 0xf7, 0xed, 0xdc, 0x4a, 0x6a, 0x8c, 0xad, 0xca, 0xdf, 0xec, 0xee, 0xe7,
-            0xd7, 0xc1, 0x5b, 0x7d, 0x9f, 0xbc, 0xd2, 0xdf, 0xe3, 0xdd, 0xcf, 0xbb, 0xa4, 0x4f,
-            0x70, 0x90, 0xad, 0xc3, 0xd0, 0xd5, 0xd0, 0xc3, 0xb1, 0x9b, 0x87, 0x64, 0x83, 0x9f,
-            0xb4, 0xc1, 0xc6, 0xc1, 0xb5, 0xa3, 0x90, 0x7c, 0x6d, 0x5c, 0x79, 0x93, 0xa7, 0xb3,
-            0xb7, 0xb2, 0xa6, 0x95, 0x81, 0x6f, 0x61, 0x59, 0x73, 0x8b, 0x9d, 0xa7, 0xa9, 0xa3,
-            0x97, 0x85, 0x72, 0x60, 0x53, 0x4c, 0x4e, 0x70, 0x86, 0x96, 0x9e, 0x9f, 0x97, 0x89,
-            0x77, 0x63, 0x51, 0x44, 0x3e, 0x40, 0x4b, 0x86, 0x93, 0x99, 0x97, 0x8e, 0x7e, 0x6a,
-            0x55, 0x43, 0x35, 0x2f, 0x31, 0x3d, 0x51, 0x8a, 0x95, 0x99, 0x94, 0x88, 0x76, 0x61,
-            0x4a, 0x36, 0x27, 0x20, 0x22, 0x2e, 0x43, 0x5f, 0x9b, 0x9c, 0x96, 0x87, 0x73, 0x5b,
-            0x43, 0x2d, 0x1c, 0x14, 0x15, 0x20, 0x34, 0x50, 0x71, 0xa4, 0x9b, 0x8b, 0x74, 0x5a,
-            0x3f, 0x27, 0x15, 0x0b, 0x0a, 0x14, 0x27, 0x42, 0x62, 0x84, 0xa5, 0x92, 0x7a, 0x5d,
-            0x40, 0x26, 0x11, 0x05, 0x03, 0x0b, 0x1d, 0x36, 0x55, 0x76, 0x96, 0x9d, 0x83, 0x64,
-            0x45, 0x29, 0x12, 0x04, 0x00, 0x06, 0x15, 0x2d, 0x4b, 0x6a, 0x89, 0xa4, 0x8f, 0x6f,
-            0x4e, 0x30, 0x18, 0x07, 0x01, 0x05, 0x12, 0x28, 0x44, 0x62, 0x7f, 0x98, 0xab, 0x7c,
-            0x5a, 0x3b, 0x21, 0x0f, 0x06, 0x08, 0x14, 0x27, 0x41, 0x5c, 0x77, 0x8f, 0xa0, 0xa9,
-            0x68, 0x48, 0x2d, 0x1a, 0x10, 0x10, 0x19, 0x2b, 0x42, 0x5c, 0x74, 0x89, 0x98, 0xa0,
-            0x9e, 0x57, 0x3b, 0x27, 0x1c, 0x1b, 0x23, 0x33, 0x48, 0x5f, 0x76, 0x88, 0x95, 0x9a,
-            0x97, 0x8c, 0x4a, 0x36, 0x2a, 0x28, 0x2f, 0x3e, 0x51, 0x67, 0x7b, 0x8c, 0x96, 0x99,
-            0x93, 0x86, 0x73, 0x44, 0x39, 0x37, 0x3e, 0x4b, 0x5e, 0x72, 0x85, 0x93, 0x9b, 0x9c,
-            0x94, 0x84, 0x6f, 0x57, 0x48, 0x46, 0x4d, 0x5b, 0x6c, 0x80, 0x91, 0x9e, 0xa4, 0xa3,
-            0x99, 0x87, 0x70, 0x55, 0x3b, 0x54, 0x5c, 0x6a, 0x7c, 0x8f, 0xa0, 0xac, 0xb1, 0xad,
-            0xa1, 0x8e, 0x74, 0x58, 0x3b, 0x22, 0x69, 0x78, 0x8b, 0x9e, 0xaf, 0xbb, 0xbf, 0xbb,
-            0xad, 0x98, 0x7d, 0x5e, 0x40, 0x24, 0x0f, 0x84, 0x98, 0xac, 0xbe, 0xca, 0xce, 0xc9,
-            0xbb, 0xa5, 0x89, 0x68, 0x48, 0x2b, 0x14, 0x05, 0xa2, 0xb8, 0xcb, 0xd8, 0xdd, 0xd8,
-            0xca, 0xb3, 0x96, 0x75, 0x54, 0x35, 0x1c, 0x0c, 0x05, 0xc0, 0xd5, 0xe3, 0xea, 0xe6,
-            0xd8, 0xc2, 0xa5, 0x84, 0x61, 0x42, 0x28, 0x16, 0x0e, 0x10, 0xdb, 0xec, 0xf4, 0xf1,
-            0xe5, 0xd0, 0xb3, 0x92, 0x70, 0x50, 0x36, 0x23, 0x1a, 0x1b, 0x24, 0xf0, 0xfa, 0xfa,
-            0xef, 0xdb, 0xc0, 0xa0, 0x7e, 0x5f, 0x45, 0x32, 0x28, 0x28, 0x31, 0x40, 0xfc, 0xfe,
-            0xf5, 0xe3, 0xc9, 0xab, 0x8b, 0x6c, 0x53, 0x41, 0x37, 0x37, 0x3f, 0x4e, 0x61, 0xfd,
-            0xf7, 0xe7, 0xcf, 0xb3, 0x94, 0x78, 0x60, 0x4f, 0x46, 0x46, 0x4e, 0x5d, 0x6f, 0x82,
-            0xf4, 0xe7, 0xd1, 0xb7, 0x9b, 0x80, 0x6a, 0x5a, 0x53, 0x54, 0x5d, 0x6c, 0x7e, 0x91,
-            0xa1, 0xe2, 0xce, 0xb6, 0x9c, 0x84, 0x70, 0x62, 0x5d, 0x60, 0x6a, 0x7a, 0x8d, 0xa0,
-            0xb1, 0xbb, 0xc8, 0xb2, 0x9a, 0x84, 0x72, 0x67, 0x64, 0x69, 0x75, 0x86, 0x9b, 0xaf,
-            0xbf, 0xca, 0xcd, 0xa9, 0x93, 0x7f, 0x70, 0x67, 0x66, 0x6d, 0x7c, 0x8f, 0xa5, 0xbb,
-            0xcd, 0xd8, 0xdc, 0xd5, 0x89, 0x76, 0x69, 0x63, 0x64, 0x6e, 0x7e, 0x94, 0xac, 0xc4,
-            0xd8, 0xe5, 0xe9, 0xe3, 0xd4, 0x6b, 0x5f, 0x5a, 0x5e, 0x6a, 0x7d, 0x95, 0xaf, 0xc9,
-            0xdf, 0xed, 0xf3, 0xef, 0xe1, 0xca, 0x52, 0x4f, 0x54, 0x62, 0x77, 0x91, 0xae, 0xca,
-            0xe1, 0xf2, 0xfa, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        ];
-        let pkt1_frame16_check = [
-            0x5e, 0xc0, 0x02, 0x74, 0x02, 0x73, 0x02, 0xeb, 0xd6, 0xb9, 0x41, 0x47, 0x56, 0x6d,
-            0x89, 0xa8, 0xc6, 0xe0, 0xf3, 0xfd, 0xfd, 0xf2, 0xde, 0xc4, 0xa4, 0x39, 0x49, 0x61,
-            0x7e, 0x9f, 0xbe, 0xda, 0xef, 0xfb, 0xfd, 0xf5, 0xe3, 0xca, 0xad, 0x8f, 0x3a, 0x53,
-            0x71, 0x92, 0xb3, 0xd1, 0xe7, 0xf5, 0xf9, 0xf3, 0xe3, 0xcd, 0xb2, 0x95, 0x7b, 0x44,
-            0x62, 0x84, 0xa6, 0xc4, 0xdc, 0xec, 0xf1, 0xed, 0xdf, 0xcb, 0xb2, 0x98, 0x80, 0x6d,
-            0x54, 0x76, 0x97, 0xb6, 0xcf, 0xdf, 0xe6, 0xe3, 0xd7, 0xc5, 0xae, 0x96, 0x80, 0x6f,
-            0x66, 0x68, 0x89, 0xa7, 0xc0, 0xd1, 0xd8, 0xd6, 0xcc, 0xbb, 0xa6, 0x90, 0x7c, 0x6e,
-            0x66, 0x67, 0x7c, 0x9a, 0xb2, 0xc2, 0xc9, 0xc8, 0xbe, 0xae, 0x9a, 0x86, 0x74, 0x68,
-            0x63, 0x65, 0x70, 0x8e, 0xa4, 0xb4, 0xba, 0xb8, 0xaf, 0x9f, 0x8c, 0x79, 0x69, 0x5e,
-            0x5b, 0x60, 0x6d, 0x81, 0x9a, 0xa8, 0xad, 0xaa, 0x9f, 0x90, 0x7d, 0x6a, 0x5b, 0x52,
-            0x50, 0x57, 0x66, 0x7c, 0x96, 0x9e, 0xa2, 0x9d, 0x92, 0x81, 0x6e, 0x5b, 0x4c, 0x43,
-            0x42, 0x4a, 0x5b, 0x73, 0x8f, 0xae, 0x9a, 0x94, 0x86, 0x74, 0x60, 0x4c, 0x3d, 0x34,
-            0x33, 0x3c, 0x4d, 0x66, 0x85, 0xa5, 0xc4, 0x8e, 0x7f, 0x6a, 0x54, 0x40, 0x2f, 0x25,
-            0x24, 0x2d, 0x3f, 0x58, 0x78, 0x99, 0xba, 0xd6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        ];
-
-        let mut path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
-        path.push("tests/data/g835l-diagonal.gif");
-
-        let gif =
-            AnimeGif::from_diagonal_gif(&path, AnimTime::Count(1), 1.0, AnimeType::G835L).unwrap();
-        assert_eq!(gif.frame_count(), 48);
-
-        let pkt = AnimePacketType::try_from(gif.frames()[0].frame().clone()).unwrap();
-        assert_eq!(pkt[0], pkt0_frame0_check);
-        assert_eq!(pkt[1], pkt1_frame0_check);
-
-        let pkt = AnimePacketType::try_from(gif.frames()[16].frame().clone()).unwrap();
-        assert_eq!(pkt[0], pkt0_frame16_check);
-        assert_eq!(pkt[1], pkt1_frame16_check);
-    }
-}
--- a/rog-aura/Cargo.toml
+++ b/rog-aura/Cargo.toml
@@ -18,10 +18,15 @@ dbus = ["zbus"]

 [dependencies]
 serde.workspace = true
+serde_derive.workspace = true
 zbus = { workspace = true, optional = true }
 dmi_id = { path = "../dmi-id" }

 # cli and logging
 log.workspace = true
+typeshare.workspace = true

 ron = { version = "*", optional = true }
+
+[dev-dependencies]
+cargo-husky.workspace = true
--- a/rog-aura/data/aura_support.ron
+++ b/rog-aura/data/aura_support.ron
--- 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/aura_detection.rs
+++ b/rog-aura/src/aura_detection.rs
@@ -1,8 +1,6 @@
-use std::env;
-
 use dmi_id::DMIID;
 use log::{error, info, warn};
-use serde::{Deserialize, Serialize};
+use serde_derive::{Deserialize, Serialize};

 use crate::keyboard::AdvancedAuraType;
 use crate::{AuraModeNum, AuraZone, PowerZones};
@@ -62,20 +60,17 @@ impl LedSupportData {
    /// matches against laptops first, then will proceed with matching the
    /// `device_name` if there are no DMI matches.
    pub fn get_data(product_id: &str) -> Self {
-        let mut dmi = DMIID::new().unwrap_or_default();
-        if let Ok(board_name) = env::var("BOARD_NAME") {
-            dmi.board_name = board_name;
-        }
+        let dmi = DMIID::new().unwrap_or_default();
        // let prod_family = dmi.product_family().expect("Could not get
        // product_family");

        if let Some(data) = LedSupportFile::load_from_supoprt_db() {
-            return data.match_device(&dmi.board_name, product_id);
+            if let Some(data) = data.match_device(&dmi.board_name, product_id) {
+                return data;
+            }
        }
-        info!("Using generic LED control for keyboard brightness only. No aura_support file found");
-        let mut data = LedSupportData::default();
-        data.power_zones.push(PowerZones::Keyboard);
-        data
+        info!("Using generic LED control for keyboard brightness only");
+        LedSupportData::default()
    }
 }

@@ -89,7 +84,7 @@ impl LedSupportFile {

    /// The list is stored in ordered format, so the iterator must be reversed
    /// to ensure we match to *whole names* first before doing a glob match
-    fn match_device(&self, device_name: &str, product_id: &str) -> LedSupportData {
+    fn match_device(&self, device_name: &str, product_id: &str) -> Option<LedSupportData> {
        for config in self.0.iter().rev() {
            if device_name.contains(&config.device_name) {
                info!("Matched to {}", config.device_name);
@@ -97,27 +92,15 @@ impl LedSupportFile {
                    info!("Checking product ID");
                    if config.product_id == product_id {
                        info!("Matched to {}", config.product_id);
-                        return config.clone();
+                        return Some(config.clone());
                    } else {
                        continue;
                    }
                }
-                return config.clone();
+                return Some(config.clone());
            }
        }
-        warn!(
-            "the aura_support.ron file has no entry for this model: {device_name}, {product_id}. \
-             Using a default"
-        );
-        LedSupportData {
-            device_name: device_name.to_owned(),
-            product_id: product_id.to_owned(),
-            layout_name: "Default".to_owned(),
-            basic_modes: vec![AuraModeNum::Static],
-            basic_zones: vec![],
-            advanced_type: AdvancedAuraType::None,
-            power_zones: vec![PowerZones::Keyboard],
-        }
+        None
    }

    /// Load `LedSupportFile` from the `aura_support.ron` file at
@@ -164,25 +147,6 @@ impl LedSupportFile {
            return Some(data);
        }

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

 #[cfg(test)]
 mod tests {
-    use std::collections::HashMap;
    use std::fs::OpenOptions;
    use std::io::Write;
    use std::path::PathBuf;
@@ -210,16 +173,9 @@ mod tests {
            product_id: String::new(),
            layout_name: "ga401".to_owned(),
            basic_modes: vec![AuraModeNum::Static],
-            basic_zones: vec![
-                AuraZone::Key1,
-                AuraZone::Logo,
-                AuraZone::BarLeft,
-            ],
+            basic_zones: vec![AuraZone::Key1, AuraZone::Logo, AuraZone::BarLeft],
            advanced_type: AdvancedAuraType::Zoned(vec![LedCode::LightbarRight]),
-            power_zones: vec![
-                PowerZones::Keyboard,
-                PowerZones::RearGlow,
-            ],
+            power_zones: vec![PowerZones::Keyboard, PowerZones::RearGlow],
        };

        assert!(ron::to_string(&led).is_ok());
@@ -239,9 +195,6 @@ mod tests {
        let mut tmp_sort = tmp.clone();
        tmp_sort.0.sort_by(|a, b| a.product_id.cmp(&b.product_id));
        tmp_sort.0.sort_by(|a, b| a.device_name.cmp(&b.device_name));
-        for model in tmp_sort.0.iter_mut() {
-            model.basic_modes.sort_by_key(|a| *a as u8);
-        }
        if tmp != tmp_sort {
            let sorted =
                ron::ser::to_string_pretty(&tmp_sort, PrettyConfig::new().depth_limit(2)).unwrap();
@@ -264,31 +217,4 @@ mod tests {
            ron::ser::to_string_pretty(&tmp, my_config).unwrap()
        );
    }
-
-    #[test]
-    fn find_data_file_groups() {
-        let mut data = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
-        data.push("data/aura_support.ron");
-
-        let buf = std::fs::read_to_string(&data).unwrap();
-
-        let tmp = ron::from_str::<LedSupportFile>(&buf).unwrap();
-
-        let mut modes: HashMap<Vec<AuraModeNum>, Vec<String>> = HashMap::new();
-
-        for entry in tmp.0 {
-            if let Some(modes) = modes.get_mut(&entry.basic_modes) {
-                modes.push(entry.device_name);
-            } else {
-                modes.insert(entry.basic_modes, vec![entry.device_name]);
-            }
-        }
-        dbg!(modes);
-
-        // let my_config = PrettyConfig::new().depth_limit(2);
-        // println!(
-        //     "RON: {}",
-        //     ron::ser::to_string_pretty(&tmp, my_config).unwrap()
-        // );
-    }
 }
--- a/rog-aura/src/builtin_modes.rs
+++ b/rog-aura/src/builtin_modes.rs
@@ -1,13 +1,15 @@
 use std::fmt::Display;
 use std::str::FromStr;

-use serde::{Deserialize, Serialize};
+use serde_derive::{Deserialize, Serialize};
+use typeshare::typeshare;
 #[cfg(feature = "dbus")]
 use zbus::zvariant::{OwnedValue, Type, Value};

 use crate::error::Error;
-use crate::AURA_LAPTOP_LED_MSG_LEN;
+use crate::LED_MSG_LEN;

+#[typeshare]
 #[derive(Debug, Default, Copy, Clone, PartialEq, Eq, Deserialize, Serialize)]
 #[cfg_attr(
    feature = "dbus",
@@ -77,6 +79,7 @@ impl From<i32> for LedBrightness {
    }
 }

+#[typeshare]
 #[cfg_attr(feature = "dbus", derive(Type, Value, OwnedValue))]
 #[derive(Debug, Clone, PartialEq, Eq, Copy, Deserialize, Serialize)]
 pub struct Colour {
@@ -117,11 +120,7 @@ impl From<&[f32; 3]> for Colour {

 impl From<Colour> for [f32; 3] {
    fn from(c: Colour) -> Self {
-        [
-            c.r as f32 / 255.0,
-            c.g as f32 / 255.0,
-            c.b as f32 / 255.0,
-        ]
+        [c.r as f32 / 255.0, c.g as f32 / 255.0, c.b as f32 / 255.0]
    }
 }

@@ -137,12 +136,11 @@ impl From<&[u8; 3]> for Colour {

 impl From<Colour> for [u8; 3] {
    fn from(c: Colour) -> Self {
-        [
-            c.r, c.g, c.b,
-        ]
+        [c.r, c.g, c.b]
    }
 }

+#[typeshare]
 #[cfg_attr(
    feature = "dbus",
    derive(Type, Value, OwnedValue),
@@ -202,6 +200,7 @@ impl From<Speed> for u8 {
 /// Used for Rainbow mode.
 ///
 /// Enum corresponds to the required integer value
+#[typeshare]
 #[cfg_attr(
    feature = "dbus",
    derive(Type, Value, OwnedValue),
@@ -249,6 +248,7 @@ impl From<Direction> for i32 {
 }

 /// Enum of modes that convert to the actual number required by a USB HID packet
+#[typeshare]
 #[cfg_attr(
    feature = "dbus",
    derive(Type, Value, OwnedValue),
@@ -261,8 +261,8 @@ pub enum AuraModeNum {
    #[default]
    Static = 0,
    Breathe = 1,
-    RainbowCycle = 2,
-    RainbowWave = 3,
+    Strobe = 2,
+    Rainbow = 3,
    Star = 4,
    Rain = 5,
    Highlight = 6,
@@ -290,8 +290,8 @@ impl From<&AuraModeNum> for &str {
        match mode {
            AuraModeNum::Static => "Static",
            AuraModeNum::Breathe => "Breathe",
-            AuraModeNum::RainbowCycle => "RainbowCycle",
-            AuraModeNum::RainbowWave => "RainbowWave",
+            AuraModeNum::Strobe => "Strobe",
+            AuraModeNum::Rainbow => "Rainbow",
            AuraModeNum::Star => "Stars",
            AuraModeNum::Rain => "Rain",
            AuraModeNum::Highlight => "Highlight",
@@ -307,8 +307,8 @@ impl From<&str> for AuraModeNum {
    fn from(mode: &str) -> Self {
        match mode {
            "Breathe" => AuraModeNum::Breathe,
-            "RainbowCycle" => AuraModeNum::RainbowCycle,
-            "RainbowWave" => AuraModeNum::RainbowWave,
+            "Strobe" => AuraModeNum::Strobe,
+            "Rainbow" => AuraModeNum::Rainbow,
            "Stars" => AuraModeNum::Star,
            "Rain" => AuraModeNum::Rain,
            "Highlight" => AuraModeNum::Highlight,
@@ -326,8 +326,8 @@ impl From<u8> for AuraModeNum {
    fn from(mode: u8) -> Self {
        match mode {
            1 => AuraModeNum::Breathe,
-            2 => AuraModeNum::RainbowCycle,
-            3 => AuraModeNum::RainbowWave,
+            2 => AuraModeNum::Strobe,
+            3 => AuraModeNum::Rainbow,
            4 => AuraModeNum::Star,
            5 => AuraModeNum::Rain,
            6 => AuraModeNum::Highlight,
@@ -359,13 +359,8 @@ 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
+#[typeshare]
 #[cfg_attr(
    feature = "dbus",
    derive(Type, Value, OwnedValue),
@@ -437,8 +432,9 @@ impl From<AuraZone> for i32 {
 /// ```rust
 /// // let bytes: [u8; LED_MSG_LEN] = mode.into();
 /// ```
+#[typeshare]
 #[cfg_attr(feature = "dbus", derive(Type, Value, OwnedValue))]
-#[derive(Debug, Clone, PartialEq, Deserialize, Serialize)]
+#[derive(Debug, Clone, Deserialize, Serialize)]
 pub struct AuraEffect {
    /// The effect type
    pub mode: AuraModeNum,
@@ -498,6 +494,56 @@ impl Display for AuraEffect {
    }
 }

+pub struct AuraParameters {
+    pub zone: bool,
+    pub colour1: bool,
+    pub colour2: bool,
+    pub speed: bool,
+    pub direction: bool,
+}
+
+#[allow(clippy::fn_params_excessive_bools)]
+impl AuraParameters {
+    pub const fn new(
+        zone: bool,
+        colour1: bool,
+        colour2: bool,
+        speed: bool,
+        direction: bool,
+    ) -> Self {
+        Self {
+            zone,
+            colour1,
+            colour2,
+            speed,
+            direction,
+        }
+    }
+}
+
+impl AuraEffect {
+    /// A helper to provide detail on what effects have which parameters, e.g
+    /// the static factory mode accepts only one colour.
+    pub const fn allowed_parameters(mode: AuraModeNum) -> AuraParameters {
+        match mode {
+            AuraModeNum::Static
+            | AuraModeNum::Highlight
+            | AuraModeNum::Pulse
+            | AuraModeNum::Comet
+            | AuraModeNum::Flash => AuraParameters::new(true, true, false, false, false),
+            AuraModeNum::Breathe => AuraParameters::new(true, true, true, true, false),
+            AuraModeNum::Strobe | AuraModeNum::Rain => {
+                AuraParameters::new(true, false, false, true, false)
+            }
+            AuraModeNum::Rainbow => AuraParameters::new(true, false, false, true, true),
+            AuraModeNum::Star => AuraParameters::new(true, true, true, true, true),
+            AuraModeNum::Laser | AuraModeNum::Ripple => {
+                AuraParameters::new(true, true, false, true, false)
+            }
+        }
+    }
+}
+
 /// Parses `AuraEffect` in to packet data for writing to the USB interface
 ///
 /// Byte structure where colour is RGB, one byte per R, G, B:
@@ -506,9 +552,9 @@ impl Display for AuraEffect {
 /// |---|---|-----|-----|---------|------|----------|---|-----------|
 /// |5d |b3 |Zone |Mode |Colour 1 |Speed |Direction |00 |Colour 2   |
 /// ```
-impl From<&AuraEffect> for [u8; AURA_LAPTOP_LED_MSG_LEN] {
+impl From<&AuraEffect> for [u8; LED_MSG_LEN] {
    fn from(aura: &AuraEffect) -> Self {
-        let mut msg = [0u8; AURA_LAPTOP_LED_MSG_LEN];
+        let mut msg = [0u8; LED_MSG_LEN];
        msg[0] = 0x5d;
        msg[1] = 0xb3;
        msg[2] = aura.zone as u8;
@@ -527,7 +573,7 @@ impl From<&AuraEffect> for [u8; AURA_LAPTOP_LED_MSG_LEN] {

 impl From<&AuraEffect> for Vec<u8> {
    fn from(aura: &AuraEffect) -> Self {
-        let mut msg = vec![0u8; AURA_LAPTOP_LED_MSG_LEN];
+        let mut msg = vec![0u8; LED_MSG_LEN];
        msg[0] = 0x5d;
        msg[1] = 0xb3;
        msg[2] = aura.zone as u8;
@@ -546,9 +592,7 @@ impl From<&AuraEffect> for Vec<u8> {

 #[cfg(test)]
 mod tests {
-    use crate::{
-        AuraEffect, AuraModeNum, AuraZone, Colour, Direction, Speed, AURA_LAPTOP_LED_MSG_LEN,
-    };
+    use crate::{AuraEffect, AuraModeNum, AuraZone, Colour, Direction, Speed, LED_MSG_LEN};

    #[test]
    fn check_led_static_packet() {
@@ -564,7 +608,7 @@ mod tests {
            speed: Speed::Med,
            direction: Direction::Right,
        };
-        let ar = <[u8; AURA_LAPTOP_LED_MSG_LEN]>::from(&st);
+        let ar = <[u8; LED_MSG_LEN]>::from(&st);

        println!("{:02x?}", ar);
        let check = [
@@ -592,10 +636,7 @@ mod tests {
            0x5d, 0xb3, 0x01, 0x00, 0xff, 0x00, 0x00, 0xe1, 0x01, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
            0x0, 0x0,
        ];
-        assert_eq!(
-            <[u8; AURA_LAPTOP_LED_MSG_LEN]>::from(&st)[..9],
-            capture[..9]
-        );
+        assert_eq!(<[u8; LED_MSG_LEN]>::from(&st)[..9], capture[..9]);

        st.zone = AuraZone::Key2;
        st.colour1 = Colour {
@@ -607,10 +648,7 @@ mod tests {
            0x5d, 0xb3, 0x02, 0x00, 0xff, 0xff, 0x00, 0xe1, 0x01, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
            0x0, 0x0,
        ];
-        assert_eq!(
-            <[u8; AURA_LAPTOP_LED_MSG_LEN]>::from(&st)[..9],
-            capture[..9]
-        );
+        assert_eq!(<[u8; LED_MSG_LEN]>::from(&st)[..9], capture[..9]);

        st.zone = AuraZone::Key3;
        st.colour1 = Colour {
@@ -622,10 +660,7 @@ mod tests {
            0x5d, 0xb3, 0x03, 0x00, 0x00, 0xff, 0xff, 0xe1, 0x01, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
            0x0, 0x0,
        ];
-        assert_eq!(
-            <[u8; AURA_LAPTOP_LED_MSG_LEN]>::from(&st)[..9],
-            capture[..9]
-        );
+        assert_eq!(<[u8; LED_MSG_LEN]>::from(&st)[..9], capture[..9]);

        st.zone = AuraZone::Key4;
        st.colour1 = Colour {
@@ -637,10 +672,7 @@ mod tests {
            0x5d, 0xb3, 0x04, 0x00, 0xff, 0x00, 0xff, 0xe1, 0x01, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
            0x0, 0x0,
        ];
-        assert_eq!(
-            <[u8; AURA_LAPTOP_LED_MSG_LEN]>::from(&st)[..9],
-            capture[..9]
-        );
+        assert_eq!(<[u8; LED_MSG_LEN]>::from(&st)[..9], capture[..9]);

        st.zone = AuraZone::Logo;
        st.colour1 = Colour {
@@ -652,10 +684,7 @@ mod tests {
            0x5d, 0xb3, 0x05, 0x00, 0x2c, 0xff, 0x00, 0xe1, 0x01, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
            0x0, 0x0,
        ];
-        assert_eq!(
-            <[u8; AURA_LAPTOP_LED_MSG_LEN]>::from(&st)[..9],
-            capture[..9]
-        );
+        assert_eq!(<[u8; LED_MSG_LEN]>::from(&st)[..9], capture[..9]);

        st.zone = AuraZone::BarLeft;
        st.colour1 = Colour {
@@ -667,10 +696,7 @@ mod tests {
            0x5d, 0xb3, 0x06, 0x00, 0xff, 0x00, 0x00, 0xe1, 0x01, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
            0x0, 0x0,
        ];
-        assert_eq!(
-            <[u8; AURA_LAPTOP_LED_MSG_LEN]>::from(&st)[..9],
-            capture[..9]
-        );
+        assert_eq!(<[u8; LED_MSG_LEN]>::from(&st)[..9], capture[..9]);

        st.zone = AuraZone::BarRight;
        st.colour1 = Colour {
@@ -682,19 +708,13 @@ mod tests {
            0x5d, 0xb3, 0x07, 0x00, 0xff, 0x00, 0xcd, 0xe1, 0x01, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
            0x0, 0x0,
        ];
-        assert_eq!(
-            <[u8; AURA_LAPTOP_LED_MSG_LEN]>::from(&st)[..9],
-            capture[..9]
-        );
+        assert_eq!(<[u8; LED_MSG_LEN]>::from(&st)[..9], capture[..9]);

-        st.mode = AuraModeNum::RainbowWave;
+        st.mode = AuraModeNum::Rainbow;
        let capture = [
            0x5d, 0xb3, 0x07, 0x03, 0xff, 0x00, 0xcd, 0xe1, 0x01, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
            0x0, 0x0,
        ];
-        assert_eq!(
-            <[u8; AURA_LAPTOP_LED_MSG_LEN]>::from(&st)[..9],
-            capture[..9]
-        );
+        assert_eq!(<[u8; LED_MSG_LEN]>::from(&st)[..9], capture[..9]);
    }
 }
--- a/rog-aura/src/effects/base.rs
+++ b/rog-aura/src/effects/base.rs
@@ -2,7 +2,6 @@ use super::{EffectState, InputForEffect};
 use crate::keyboard::{KeyLayout, LedCode};
 use crate::Colour;

-#[allow(dead_code)]
 pub struct InputBased {
    led: LedCode,
    colour: Colour,
--- a/rog-aura/src/effects/mod.rs
+++ b/rog-aura/src/effects/mod.rs
@@ -1,4 +1,4 @@
-use serde::{Deserialize, Serialize};
+use serde_derive::{Deserialize, Serialize};

 mod doom;
 pub use doom::*;
@@ -12,7 +12,7 @@ pub use breathe::*;
 mod static_;
 pub use static_::*;

-use crate::keyboard::{AuraLaptopUsbPackets, KeyLayout, LedCode, LedUsbPackets};
+use crate::keyboard::{KeyLayout, LedCode, LedUsbPackets, UsbPackets};
 use crate::Colour;

 // static mut RNDINDEX: usize = 0;
@@ -106,7 +106,7 @@ impl AdvancedEffects {
        }
    }

-    pub fn create_packets(&self) -> AuraLaptopUsbPackets {
+    pub fn create_packets(&self) -> UsbPackets {
        let mut usb_packets = if self.zoned {
            // TODO: figure out if that single byte difference for multizone actually
            // matters
--- a/rog-aura/src/keyboard/advanced.rs
+++ b/rog-aura/src/keyboard/advanced.rs
@@ -1,5 +1,6 @@
 use log::warn;
 use serde::{Deserialize, Serialize};
+use typeshare::typeshare;
 #[cfg(feature = "dbus")]
 use zbus::zvariant::Type;

@@ -193,7 +194,8 @@ impl LedCode {
 }

 /// Represents the per-key raw USB packets
-pub type AuraLaptopUsbPackets = Vec<Vec<u8>>;
+#[typeshare]
+pub type UsbPackets = Vec<Vec<u8>>;

 /// A `UsbPackets` contains all data to change the full set of keyboard
 /// key colours individually.
@@ -202,11 +204,12 @@ pub type AuraLaptopUsbPackets = Vec<Vec<u8>>;
 /// to the keyboard EC. One row controls one group of keys, these keys are not
 /// necessarily all on the same row of the keyboard, with some splitting between
 /// two rows.
+#[typeshare]
 #[cfg_attr(feature = "dbus", derive(Type))]
 #[derive(Debug, Clone, Deserialize, Serialize)]
 pub struct LedUsbPackets {
    /// The packet data used to send data to the USB keyboard
-    usb_packets: AuraLaptopUsbPackets,
+    usb_packets: UsbPackets,
    /// Wether or not this packet collection is zoned. The determines which
    /// starting bytes are used and what the indexing is for lightbar RGB
    /// colours
@@ -469,22 +472,22 @@ impl LedUsbPackets {
    }

    #[inline]
-    pub fn get(&self) -> AuraLaptopUsbPackets {
+    pub fn get(&self) -> UsbPackets {
        self.usb_packets.clone()
    }

    #[inline]
-    pub fn get_ref(&self) -> &AuraLaptopUsbPackets {
+    pub fn get_ref(&self) -> &UsbPackets {
        &self.usb_packets
    }

    #[inline]
-    pub fn get_mut(&mut self) -> &mut AuraLaptopUsbPackets {
+    pub fn get_mut(&mut self) -> &mut UsbPackets {
        &mut self.usb_packets
    }
 }

-impl From<LedUsbPackets> for AuraLaptopUsbPackets {
+impl From<LedUsbPackets> for UsbPackets {
    fn from(k: LedUsbPackets) -> Self {
        k.usb_packets
    }
@@ -640,7 +643,7 @@ impl From<&LedCode> for &str {

 #[cfg(test)]
 mod tests {
-    use crate::keyboard::{AuraLaptopUsbPackets, LedCode, LedUsbPackets};
+    use crate::keyboard::{LedCode, LedUsbPackets, UsbPackets};

    macro_rules! colour_check_zoned {
        ($zone:expr, $pkt_idx_start:expr) => {
@@ -650,7 +653,7 @@ mod tests {
            c[1] = 255;
            c[2] = 255;

-            let pkt: AuraLaptopUsbPackets = zone.into();
+            let pkt: UsbPackets = zone.into();
            assert_eq!(pkt[0][$pkt_idx_start], 0xff);
            assert_eq!(pkt[0][$pkt_idx_start + 1], 0xff);
            assert_eq!(pkt[0][$pkt_idx_start + 2], 0xff);
@@ -660,7 +663,7 @@ mod tests {
    #[test]
    fn zone_to_packet_check() {
        let zone = LedUsbPackets::new_zoned(true);
-        let pkt: AuraLaptopUsbPackets = zone.into();
+        let pkt: UsbPackets = zone.into();
        assert_eq!(pkt[0][0], 0x5d);
        assert_eq!(pkt[0][1], 0xbc);
        assert_eq!(pkt[0][2], 0x01);
@@ -683,7 +686,7 @@ mod tests {
    #[test]
    fn perkey_to_packet_check() {
        let per_key = LedUsbPackets::new_per_key();
-        let pkt: AuraLaptopUsbPackets = per_key.into();
+        let pkt: UsbPackets = per_key.into();
        assert_eq!(pkt[0][0], 0x5d);
        assert_eq!(pkt[0][1], 0xbc);
        assert_eq!(pkt[0][2], 0x00);
@@ -709,7 +712,7 @@ mod tests {
        c[1] = 255;
        c[2] = 255;

-        let pkt: AuraLaptopUsbPackets = per_key.into();
+        let pkt: UsbPackets = per_key.into();
        assert_eq!(pkt[5][30], 0xff); // D, red
        assert_eq!(pkt[5][31], 0xff); // D
        assert_eq!(pkt[5][32], 0xff); // D
--- a/rog-aura/src/keyboard/layouts.rs
+++ b/rog-aura/src/keyboard/layouts.rs
@@ -488,7 +488,7 @@ mod tests {
            let rows = &data.key_rows;
            for row in rows {
                for k in &row.row {
-                    if data.key_shapes.contains_key(&k.1) {
+                    if data.key_shapes.get(&k.1).is_some() {
                        unused.remove(&k.1);
                    } else {
                        panic!("Key {:?} was missing matching shape {}", k.0, k.1);
--- a/rog-aura/src/keyboard/power.rs
+++ b/rog-aura/src/keyboard/power.rs
@@ -5,6 +5,7 @@ use std::ops::{BitAnd, BitOr};

 use log::warn;
 use serde::{Deserialize, Serialize};
+use typeshare::typeshare;
 #[cfg(feature = "dbus")]
 use zbus::zvariant::{OwnedValue, Type, Value};

@@ -15,6 +16,7 @@ use crate::{AuraDeviceType, PowerZones};
 /// - 2021+, the struct is a single zone with 4 states
 /// - pre-2021, the struct is 1 or 2 zones and 3 states
 /// - Tuf, the struct is 1 zone and 3 states
+#[typeshare]
 #[cfg_attr(feature = "dbus", derive(Type, Value, OwnedValue))]
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct AuraPowerState {
@@ -51,10 +53,7 @@ impl AuraPowerState {
    }

    fn tuf_to_bytes(&self) -> Vec<u8> {
-        // &cmd, &boot, &awake, &sleep, &keyboard
-        vec![
-            1, self.boot as u8, self.awake as u8, self.sleep as u8, 1,
-        ]
+        todo!("0s and 1s for bool array")
    }

    /// # Bits for older 0x1866 keyboard model
@@ -102,58 +101,44 @@ impl AuraPowerState {
        ]
    }

-    pub fn new_to_byte(&self) -> u32 {
+    fn new_to_byte(&self) -> u32 {
        match self.zone {
            PowerZones::Logo => {
                self.boot as u32
-                    | ((self.awake as u32) << 2)
-                    | ((self.sleep as u32) << 4)
-                    | ((self.shutdown as u32) << 6)
-            }
-            PowerZones::Ally => {
-                (self.boot as u32)
-                    | ((self.awake as u32) << 1)
-                    | ((self.sleep as u32) << 2)
-                    | ((self.shutdown as u32) << 3)
+                    | (self.awake as u32) << 2
+                    | (self.sleep as u32) << 4
+                    | (self.shutdown as u32) << 6
            }
            PowerZones::Keyboard => {
-                ((self.boot as u32) << 1)
-                    | ((self.awake as u32) << 3)
-                    | ((self.sleep as u32) << 5)
-                    | ((self.shutdown as u32) << 7)
+                (self.boot as u32) << 1
+                    | (self.awake as u32) << 3
+                    | (self.sleep as u32) << 5
+                    | (self.shutdown as u32) << 7
            }
            PowerZones::Lightbar => {
-                ((self.awake as u32) << (7 + 1))
-                    | ((self.boot as u32) << (7 + 2))
-                    | ((self.awake as u32) << (7 + 3))
-                    | ((self.sleep as u32) << (7 + 4))
-                    | ((self.shutdown as u32) << (7 + 5))
+                (self.boot as u32) << (7 + 2)
+                    | (self.awake as u32) << (7 + 3)
+                    | (self.sleep as u32) << (7 + 4)
+                    | (self.shutdown as u32) << (7 + 5)
            }
            PowerZones::Lid => {
-                ((self.boot as u32) << (15 + 1))
-                    | ((self.awake as u32) << (15 + 2))
-                    | ((self.sleep as u32) << (15 + 3))
-                    | ((self.shutdown as u32) << (15 + 4))
-                    | ((self.boot as u32) << (15 + 5))
-                    | ((self.awake as u32) << (15 + 6))
-                    | ((self.sleep as u32) << (15 + 7))
-                    | ((self.shutdown as u32) << (15 + 8))
+                (self.boot as u32) << (15 + 1)
+                    | (self.awake as u32) << (15 + 2)
+                    | (self.sleep as u32) << (15 + 3)
+                    | (self.shutdown as u32) << (15 + 4)
            }
            PowerZones::RearGlow => {
-                ((self.boot as u32) << (23 + 1))
-                    | ((self.awake as u32) << (23 + 2))
-                    | ((self.sleep as u32) << (23 + 3))
-                    | ((self.shutdown as u32) << (23 + 4))
-                    | ((self.boot as u32) << (23 + 5))
-                    | ((self.awake as u32) << (23 + 6))
-                    | ((self.sleep as u32) << (23 + 7))
-                    | ((self.shutdown as u32) << (23 + 8))
+                (self.boot as u32) << (23 + 1)
+                    | (self.awake as u32) << (23 + 2)
+                    | (self.sleep as u32) << (23 + 3)
+                    | (self.shutdown as u32) << (23 + 4)
            }
-            PowerZones::None | PowerZones::KeyboardAndLightbar => 0,
+            PowerZones::KeyboardAndLightbar | PowerZones::None => 0,
        }
    }
 }

+#[typeshare]
 #[cfg_attr(feature = "dbus", derive(Type, Value, OwnedValue))]
 #[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
 pub struct LaptopAuraPower {
@@ -201,18 +186,14 @@ impl LaptopAuraPower {
    // TODO: use support data to setup correct zones
    pub fn new(aura_type: AuraDeviceType, support_data: &LedSupportData) -> Self {
        match aura_type {
-            AuraDeviceType::Unknown | AuraDeviceType::Ally | AuraDeviceType::LaptopKeyboard2021 => {
+            AuraDeviceType::Unknown | AuraDeviceType::LaptopPost2021 => {
                let mut states = Vec::new();
                for zone in support_data.power_zones.iter() {
                    states.push(AuraPowerState::default_for(*zone))
                }
                Self { states }
            }
-            AuraDeviceType::LaptopKeyboardPre2021 => {
-                // The older devices are tri-state if have lightbar:
-                // 1. Keyboard
-                // 2. Lightbar
-                // 3. KeyboardAndLightbar
+            AuraDeviceType::LaptopPre2021 => {
                if support_data.power_zones.contains(&PowerZones::Lightbar) {
                    Self {
                        states: vec![AuraPowerState::default_for(PowerZones::KeyboardAndLightbar)],
@@ -223,48 +204,23 @@ impl LaptopAuraPower {
                    }
                }
            }
-            AuraDeviceType::LaptopKeyboardTuf => Self {
+            AuraDeviceType::LaptopTuf => Self {
                states: vec![AuraPowerState::default_for(PowerZones::Keyboard)],
            },
            AuraDeviceType::ScsiExtDisk => todo!(),
-            AuraDeviceType::AnimeOrSlash => todo!(),
        }
    }

    pub fn to_bytes(&self, aura_type: AuraDeviceType) -> Vec<u8> {
-        if let Some(stuff) = self.states.first() {
-            if stuff.zone == PowerZones::Ally {
-                return vec![
-                    0x5d,
-                    0xd1,
-                    0x09,
-                    0x01,
-                    stuff.new_to_byte() as u8,
-                ];
-            }
-        }
        match aura_type {
-            AuraDeviceType::LaptopKeyboard2021 | AuraDeviceType::Ally => self.new_to_bytes(),
-            AuraDeviceType::LaptopKeyboardPre2021 => {
-                if self.states.len() == 1 {
-                    self.states
-                        .first()
-                        .cloned()
-                        .unwrap_or_default()
-                        .old_to_bytes()
-                } else {
-                    let mut bytes: Vec<Vec<u8>> =
-                        self.states.iter().map(|s| s.old_to_bytes()).collect();
-                    let mut b = bytes.pop().unwrap();
-                    for i in bytes {
-                        for (i, n) in i.iter().enumerate() {
-                            b[i] |= n;
-                        }
-                    }
-                    b
-                }
-            }
-            AuraDeviceType::LaptopKeyboardTuf => self
+            AuraDeviceType::LaptopPost2021 => self.new_to_bytes(),
+            AuraDeviceType::LaptopPre2021 => self
+                .states
+                .first()
+                .cloned()
+                .unwrap_or_default()
+                .old_to_bytes(),
+            AuraDeviceType::LaptopTuf => self
                .states
                .first()
                .cloned()
@@ -274,8 +230,7 @@ impl LaptopAuraPower {
                warn!("Trying to create bytes for an unknown device");
                self.new_to_bytes()
            }
-            AuraDeviceType::ScsiExtDisk => todo!("scsi disk not implemented yet"),
-            AuraDeviceType::AnimeOrSlash => todo!("anime/slash not implemented yet"),
+            AuraDeviceType::ScsiExtDisk => todo!(),
        }
    }
 }
@@ -324,297 +279,254 @@ mod test {
    use crate::keyboard::{AuraPowerState, LaptopAuraPower};
    use crate::{AuraDeviceType, PowerZones};

-    fn to_binary_string_post2021(power: &LaptopAuraPower) -> String {
-        let bytes = power.to_bytes(AuraDeviceType::LaptopKeyboard2021);
-        format!(
-            "{:08b}, {:08b}, {:08b}, {:08b}",
-            bytes[0], bytes[1], bytes[2], bytes[3]
-        )
-    }
-
    #[test]
    fn check_0x1866_control_bytes() {
-        let power = LaptopAuraPower {
-            states: vec![
-                AuraPowerState {
-                    zone: PowerZones::Keyboard,
-                    boot: false,
-                    awake: true,
-                    sleep: false,
-                    shutdown: false,
-                },
-            ],
+        let state = AuraPowerState {
+            zone: PowerZones::Keyboard,
+            awake: true,
+            boot: false,
+            sleep: false,
+            shutdown: false,
        };
-        let bytes = power.to_bytes(AuraDeviceType::LaptopKeyboardPre2021);
+        let bytes = state.old_to_bytes();
        println!("{:08b}, {:08b}, {:08b}", bytes[0], bytes[1], bytes[2]);
        assert_eq!(bytes, [0x08, 0x00, 0x02, 0x00]);

-        let power = LaptopAuraPower {
-            states: vec![
-                AuraPowerState {
-                    zone: PowerZones::Lightbar,
-                    boot: false,
-                    awake: true,
-                    sleep: false,
-                    shutdown: false,
-                },
-            ],
+        let state = AuraPowerState {
+            zone: PowerZones::Lightbar,
+            awake: true,
+            boot: false,
+            sleep: false,
+            shutdown: false,
        };
-        let bytes = power.to_bytes(AuraDeviceType::LaptopKeyboardPre2021);
+        let bytes = state.old_to_bytes();
        println!("{:08b}, {:08b}, {:08b}", bytes[0], bytes[1], bytes[2]);
        assert_eq!(bytes, [0x04, 0x05, 0x02, 0x00]);

-        // let bytes = [
-        //     OldAuraPower::Keyboard,
-        //     OldAuraPower::Lightbar,
-        //     OldAuraPower::Awake,
-        //     OldAuraPower::Sleep,
-        //     OldAuraPower::Boot,
-        // ];
-        let power = LaptopAuraPower {
-            states: vec![
-                AuraPowerState {
-                    zone: PowerZones::Keyboard,
-                    boot: true,
-                    awake: true,
-                    sleep: true,
-                    shutdown: false,
-                },
-                AuraPowerState {
-                    zone: PowerZones::Lightbar,
-                    boot: true,
-                    awake: true,
-                    sleep: true,
-                    shutdown: false,
-                },
-            ],
+        let bytes = AuraPowerState {
+            zone: PowerZones::None,
+            awake: false,
+            boot: false,
+            sleep: true,
+            shutdown: false,
        };
-        let bytes = power.to_bytes(AuraDeviceType::LaptopKeyboardPre2021);
+        let bytes = bytes.old_to_bytes();
+        println!("{:08b}, {:08b}, {:08b}", bytes[0], bytes[1], bytes[2]);
+        assert_eq!(bytes, [0x30, 0x08, 0x04, 0x00]);
+
+        let bytes = AuraPowerState {
+            zone: PowerZones::None,
+            awake: false,
+            boot: true,
+            sleep: false,
+            shutdown: false,
+        };
+        let bytes = bytes.old_to_bytes();
+        println!("{:08b}, {:08b}, {:08b}", bytes[0], bytes[1], bytes[2]);
+        assert_eq!(bytes, [0xc3, 0x12, 0x09, 0x00]);
+
+        let power = AuraPowerState {
+            zone: PowerZones::KeyboardAndLightbar,
+            awake: true,
+            boot: true,
+            sleep: true,
+            shutdown: false,
+        };
+
+        let bytes = power.old_to_bytes();
        println!("{:08b}, {:08b}, {:08b}", bytes[0], bytes[1], bytes[2]);
        assert_eq!(bytes, [0xff, 0x1f, 0x000f, 0x00]);
    }

    #[test]
    fn check_0x19b6_control_bytes_binary_rep() {
-        let boot_logo_ = to_binary_string_post2021(&LaptopAuraPower {
-            states: vec![
-                AuraPowerState {
-                    zone: PowerZones::Logo,
-                    boot: true,
-                    awake: false,
-                    sleep: false,
-                    shutdown: false,
-                },
-            ],
+        fn to_binary_string(power: &LaptopAuraPower) -> String {
+            let bytes = power.to_bytes(AuraDeviceType::LaptopPost2021);
+            format!(
+                "{:08b}, {:08b}, {:08b}, {:08b}",
+                bytes[0], bytes[1], bytes[2], bytes[3]
+            )
+        }
+
+        let boot_logo_ = to_binary_string(&LaptopAuraPower {
+            states: vec![AuraPowerState {
+                zone: PowerZones::Logo,
+                boot: true,
+                awake: false,
+                sleep: false,
+                shutdown: false,
+            }],
        });
-        let boot_keyb_ = to_binary_string_post2021(&LaptopAuraPower {
-            states: vec![
-                AuraPowerState {
-                    zone: PowerZones::Keyboard,
-                    boot: true,
-                    awake: false,
-                    sleep: false,
-                    shutdown: false,
-                },
-            ],
+        let boot_keyb_ = to_binary_string(&LaptopAuraPower {
+            states: vec![AuraPowerState {
+                zone: PowerZones::Keyboard,
+                boot: true,
+                awake: false,
+                sleep: false,
+                shutdown: false,
+            }],
        });
-        let sleep_logo = to_binary_string_post2021(&LaptopAuraPower {
-            states: vec![
-                AuraPowerState {
-                    zone: PowerZones::Logo,
-                    boot: false,
-                    awake: false,
-                    sleep: true,
-                    shutdown: false,
-                },
-            ],
+        let sleep_logo = to_binary_string(&LaptopAuraPower {
+            states: vec![AuraPowerState {
+                zone: PowerZones::Logo,
+                boot: false,
+                awake: false,
+                sleep: true,
+                shutdown: false,
+            }],
        });
-        let sleep_keyb = to_binary_string_post2021(&LaptopAuraPower {
-            states: vec![
-                AuraPowerState {
-                    zone: PowerZones::Keyboard,
-                    boot: false,
-                    awake: false,
-                    sleep: true,
-                    shutdown: false,
-                },
-            ],
+        let sleep_keyb = to_binary_string(&LaptopAuraPower {
+            states: vec![AuraPowerState {
+                zone: PowerZones::Keyboard,
+                boot: false,
+                awake: false,
+                sleep: true,
+                shutdown: false,
+            }],
        });
-        let awake_logo = to_binary_string_post2021(&LaptopAuraPower {
-            states: vec![
-                AuraPowerState {
-                    zone: PowerZones::Logo,
-                    boot: false,
-                    awake: true,
-                    sleep: false,
-                    shutdown: false,
-                },
-            ],
+        let awake_logo = to_binary_string(&LaptopAuraPower {
+            states: vec![AuraPowerState {
+                zone: PowerZones::Logo,
+                boot: false,
+                awake: true,
+                sleep: false,
+                shutdown: false,
+            }],
        });
-        let awake_keyb = to_binary_string_post2021(&LaptopAuraPower {
-            states: vec![
-                AuraPowerState {
-                    zone: PowerZones::Keyboard,
-                    boot: false,
-                    awake: true,
-                    sleep: false,
-                    shutdown: false,
-                },
-            ],
+        let awake_keyb = to_binary_string(&LaptopAuraPower {
+            states: vec![AuraPowerState {
+                zone: PowerZones::Keyboard,
+                boot: false,
+                awake: true,
+                sleep: false,
+                shutdown: false,
+            }],
        });
-        let shut_logo_ = to_binary_string_post2021(&LaptopAuraPower {
-            states: vec![
-                AuraPowerState {
-                    zone: PowerZones::Logo,
-                    boot: false,
-                    awake: false,
-                    sleep: false,
-                    shutdown: true,
-                },
-            ],
+        let shut_logo_ = to_binary_string(&LaptopAuraPower {
+            states: vec![AuraPowerState {
+                zone: PowerZones::Logo,
+                boot: false,
+                awake: false,
+                sleep: false,
+                shutdown: true,
+            }],
        });
-        let shut_keyb_ = to_binary_string_post2021(&LaptopAuraPower {
-            states: vec![
-                AuraPowerState {
-                    zone: PowerZones::Keyboard,
-                    boot: false,
-                    awake: false,
-                    sleep: false,
-                    shutdown: true,
-                },
-            ],
+        let shut_keyb_ = to_binary_string(&LaptopAuraPower {
+            states: vec![AuraPowerState {
+                zone: PowerZones::Keyboard,
+                boot: false,
+                awake: false,
+                sleep: false,
+                shutdown: true,
+            }],
        });
-        let boot_bar__ = to_binary_string_post2021(&LaptopAuraPower {
-            states: vec![
-                AuraPowerState {
-                    zone: PowerZones::Lightbar,
-                    boot: true,
-                    awake: false,
-                    sleep: false,
-                    shutdown: false,
-                },
-            ],
+        let boot_bar__ = to_binary_string(&LaptopAuraPower {
+            states: vec![AuraPowerState {
+                zone: PowerZones::Lightbar,
+                boot: true,
+                awake: false,
+                sleep: false,
+                shutdown: false,
+            }],
        });
-        let awake_bar_ = to_binary_string_post2021(&LaptopAuraPower {
-            states: vec![
-                AuraPowerState {
-                    zone: PowerZones::Lightbar,
-                    boot: false,
-                    awake: true,
-                    sleep: false,
-                    shutdown: false,
-                },
-            ],
+        let awake_bar_ = to_binary_string(&LaptopAuraPower {
+            states: vec![AuraPowerState {
+                zone: PowerZones::Lightbar,
+                boot: false,
+                awake: true,
+                sleep: false,
+                shutdown: false,
+            }],
        });
-        let sleep_bar_ = to_binary_string_post2021(&LaptopAuraPower {
-            states: vec![
-                AuraPowerState {
-                    zone: PowerZones::Lightbar,
-                    boot: false,
-                    awake: false,
-                    sleep: true,
-                    shutdown: false,
-                },
-            ],
+        let sleep_bar_ = to_binary_string(&LaptopAuraPower {
+            states: vec![AuraPowerState {
+                zone: PowerZones::Lightbar,
+                boot: false,
+                awake: false,
+                sleep: true,
+                shutdown: false,
+            }],
        });
-        let shut_bar__ = to_binary_string_post2021(&LaptopAuraPower {
-            states: vec![
-                AuraPowerState {
-                    zone: PowerZones::Lightbar,
-                    boot: false,
-                    awake: false,
-                    sleep: false,
-                    shutdown: true,
-                },
-            ],
+        let shut_bar__ = to_binary_string(&LaptopAuraPower {
+            states: vec![AuraPowerState {
+                zone: PowerZones::Lightbar,
+                boot: false,
+                awake: false,
+                sleep: false,
+                shutdown: true,
+            }],
        });
-        let boot_lid__ = to_binary_string_post2021(&LaptopAuraPower {
-            states: vec![
-                AuraPowerState {
-                    zone: PowerZones::Lid,
-                    boot: true,
-                    awake: false,
-                    sleep: false,
-                    shutdown: false,
-                },
-            ],
+        let boot_lid__ = to_binary_string(&LaptopAuraPower {
+            states: vec![AuraPowerState {
+                zone: PowerZones::Lid,
+                boot: true,
+                awake: false,
+                sleep: false,
+                shutdown: false,
+            }],
        });
-        let awake_lid_ = to_binary_string_post2021(&LaptopAuraPower {
-            states: vec![
-                AuraPowerState {
-                    zone: PowerZones::Lid,
-                    boot: false,
-                    awake: true,
-                    sleep: false,
-                    shutdown: false,
-                },
-            ],
+        let awake_lid_ = to_binary_string(&LaptopAuraPower {
+            states: vec![AuraPowerState {
+                zone: PowerZones::Lid,
+                boot: false,
+                awake: true,
+                sleep: false,
+                shutdown: false,
+            }],
        });
-        let sleep_lid_ = to_binary_string_post2021(&LaptopAuraPower {
-            states: vec![
-                AuraPowerState {
-                    zone: PowerZones::Lid,
-                    boot: false,
-                    awake: false,
-                    sleep: true,
-                    shutdown: false,
-                },
-            ],
+        let sleep_lid_ = to_binary_string(&LaptopAuraPower {
+            states: vec![AuraPowerState {
+                zone: PowerZones::Lid,
+                boot: false,
+                awake: false,
+                sleep: true,
+                shutdown: false,
+            }],
        });
-        let shut_lid__ = to_binary_string_post2021(&LaptopAuraPower {
-            states: vec![
-                AuraPowerState {
-                    zone: PowerZones::Lid,
-                    boot: false,
-                    awake: false,
-                    sleep: false,
-                    shutdown: true,
-                },
-            ],
+        let shut_lid__ = to_binary_string(&LaptopAuraPower {
+            states: vec![AuraPowerState {
+                zone: PowerZones::Lid,
+                boot: false,
+                awake: false,
+                sleep: false,
+                shutdown: true,
+            }],
        });
-        let boot_rear_ = to_binary_string_post2021(&LaptopAuraPower {
-            states: vec![
-                AuraPowerState {
-                    zone: PowerZones::RearGlow,
-                    boot: true,
-                    awake: false,
-                    sleep: false,
-                    shutdown: false,
-                },
-            ],
+        let boot_rear_ = to_binary_string(&LaptopAuraPower {
+            states: vec![AuraPowerState {
+                zone: PowerZones::RearGlow,
+                boot: true,
+                awake: false,
+                sleep: false,
+                shutdown: false,
+            }],
        });
-        let awake_rear = to_binary_string_post2021(&LaptopAuraPower {
-            states: vec![
-                AuraPowerState {
-                    zone: PowerZones::RearGlow,
-                    boot: false,
-                    awake: true,
-                    sleep: false,
-                    shutdown: false,
-                },
-            ],
+        let awake_rear = to_binary_string(&LaptopAuraPower {
+            states: vec![AuraPowerState {
+                zone: PowerZones::RearGlow,
+                boot: false,
+                awake: true,
+                sleep: false,
+                shutdown: false,
+            }],
        });
-        let sleep_rear = to_binary_string_post2021(&LaptopAuraPower {
-            states: vec![
-                AuraPowerState {
-                    zone: PowerZones::RearGlow,
-                    boot: false,
-                    awake: false,
-                    sleep: true,
-                    shutdown: false,
-                },
-            ],
+        let sleep_rear = to_binary_string(&LaptopAuraPower {
+            states: vec![AuraPowerState {
+                zone: PowerZones::RearGlow,
+                boot: false,
+                awake: false,
+                sleep: true,
+                shutdown: false,
+            }],
        });
-        let shut_rear_ = to_binary_string_post2021(&LaptopAuraPower {
-            states: vec![
-                AuraPowerState {
-                    zone: PowerZones::RearGlow,
-                    boot: false,
-                    awake: false,
-                    sleep: false,
-                    shutdown: true,
-                },
-            ],
+        let shut_rear_ = to_binary_string(&LaptopAuraPower {
+            states: vec![AuraPowerState {
+                zone: PowerZones::RearGlow,
+                boot: false,
+                awake: false,
+                sleep: false,
+                shutdown: true,
+            }],
        });

        assert_eq!(boot_logo_, "00000001, 00000000, 00000000, 00000000");
@@ -627,22 +539,22 @@ mod test {
        assert_eq!(shut_keyb_, "10000000, 00000000, 00000000, 00000000");
        //
        assert_eq!(boot_bar__, "00000000, 00000010, 00000000, 00000000");
-        assert_eq!(awake_bar_, "00000000, 00000101, 00000000, 00000000");
+        assert_eq!(awake_bar_, "00000000, 00000100, 00000000, 00000000");
        assert_eq!(sleep_bar_, "00000000, 00001000, 00000000, 00000000");
        assert_eq!(shut_bar__, "00000000, 00010000, 00000000, 00000000");
        //
-        assert_eq!(boot_lid__, "00000000, 00000000, 00010001, 00000000");
-        assert_eq!(awake_lid_, "00000000, 00000000, 00100010, 00000000");
-        assert_eq!(sleep_lid_, "00000000, 00000000, 01000100, 00000000");
-        assert_eq!(shut_lid__, "00000000, 00000000, 10001000, 00000000");
+        assert_eq!(boot_lid__, "00000000, 00000000, 00000001, 00000000");
+        assert_eq!(awake_lid_, "00000000, 00000000, 00000010, 00000000");
+        assert_eq!(sleep_lid_, "00000000, 00000000, 00000100, 00000000");
+        assert_eq!(shut_lid__, "00000000, 00000000, 00001000, 00000000");
        //
-        assert_eq!(boot_rear_, "00000000, 00000000, 00000000, 00010001");
-        assert_eq!(awake_rear, "00000000, 00000000, 00000000, 00100010");
-        assert_eq!(sleep_rear, "00000000, 00000000, 00000000, 01000100");
-        assert_eq!(shut_rear_, "00000000, 00000000, 00000000, 10001000");
+        assert_eq!(boot_rear_, "00000000, 00000000, 00000000, 00000001");
+        assert_eq!(awake_rear, "00000000, 00000000, 00000000, 00000010");
+        assert_eq!(sleep_rear, "00000000, 00000000, 00000000, 00000100");
+        assert_eq!(shut_rear_, "00000000, 00000000, 00000000, 00001000");

        // All on
-        let byte1 = to_binary_string_post2021(&LaptopAuraPower {
+        let byte1 = to_binary_string(&LaptopAuraPower {
            states: vec![
                AuraPowerState {
                    zone: PowerZones::Keyboard,
@@ -666,6 +578,6 @@ mod test {
                },
            ],
        });
-        assert_eq!(byte1, "11111111, 00011111, 11111111, 11111111");
+        assert_eq!(byte1, "11111111, 00011110, 00001111, 00001111");
    }
 }
--- a/rog-aura/src/lib.rs
+++ b/rog-aura/src/lib.rs
@@ -6,6 +6,7 @@
 use std::fmt::Debug;

 use serde::{Deserialize, Serialize};
+use typeshare::typeshare;
 #[cfg(feature = "dbus")]
 use zbus::zvariant::{OwnedValue, Type, Value};

@@ -23,7 +24,7 @@ pub mod usb;

 pub mod keyboard;

-pub const AURA_LAPTOP_LED_MSG_LEN: usize = 17;
+pub const LED_MSG_LEN: usize = 17;
 pub const VERSION: &str = env!("CARGO_PKG_VERSION");

 pub const RED: Colour = Colour {
@@ -61,39 +62,32 @@ pub const ORANGE: Colour = Colour {
    g: 0xa4,
    b: 0x00,
 };
-pub const GRADIENT: [Colour; 7] = [
-    RED, VIOLET, BLUE, TEAL, GREEN, YELLOW, ORANGE,
-];
+pub const GRADIENT: [Colour; 7] = [RED, VIOLET, BLUE, TEAL, GREEN, YELLOW, ORANGE];

+#[typeshare]
 #[cfg_attr(feature = "dbus", derive(Type, Value, OwnedValue))]
 #[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Hash, Serialize, Deserialize)]
 pub enum AuraDeviceType {
    /// Most new laptops
    #[default]
-    LaptopKeyboard2021 = 0,
-    LaptopKeyboardPre2021 = 1,
-    LaptopKeyboardTuf = 2,
+    LaptopPost2021 = 0,
+    LaptopPre2021 = 1,
+    LaptopTuf = 2,
    ScsiExtDisk = 3,
-    Ally = 4,
-    AnimeOrSlash = 5,
    Unknown = 255,
 }

 impl AuraDeviceType {
    pub fn is_old_laptop(&self) -> bool {
-        *self == Self::LaptopKeyboardPre2021
+        *self == Self::LaptopPre2021
    }

    pub fn is_tuf_laptop(&self) -> bool {
-        *self == Self::LaptopKeyboardTuf
+        *self == Self::LaptopTuf
    }

    pub fn is_new_laptop(&self) -> bool {
-        *self == Self::LaptopKeyboard2021
-    }
-
-    pub fn is_ally(&self) -> bool {
-        *self == Self::Ally
+        *self == Self::LaptopPost2021
    }

    pub fn is_scsi(&self) -> bool {
@@ -104,18 +98,16 @@ impl AuraDeviceType {
 impl From<&str> for AuraDeviceType {
    fn from(s: &str) -> Self {
        match s.to_lowercase().trim_start_matches("0x") {
-            "tuf" => AuraDeviceType::LaptopKeyboardTuf,
+            "tuf" => AuraDeviceType::LaptopTuf,
            "1932" => AuraDeviceType::ScsiExtDisk,
-            "1866" | "1869" | "1854" => Self::LaptopKeyboardPre2021,
-            "1abe" | "1b4c" => Self::Ally,
-            "19b3" | "193b" => Self::AnimeOrSlash,
-            "19b6" | "1a30" | "18c6" => Self::LaptopKeyboard2021,
-            _ => Self::Unknown,
+            "1866" | "18c6" | "1869" | "1854" => Self::LaptopPre2021,
+            _ => Self::LaptopPost2021,
        }
    }
 }

 /// The powerr zones this laptop supports
+#[typeshare]
 #[cfg_attr(
    feature = "dbus",
    derive(Type, Value, OwnedValue),
@@ -134,9 +126,7 @@ pub enum PowerZones {
    Lid = 3,
    /// The led strip on the rear of some laptops
    RearGlow = 4,
-    /// Exists for the older 0x1866 models
+    /// On pre-2021 laptops there is either 1 or 2 zones used
    KeyboardAndLightbar = 5,
-    /// Ally specific for creating correct packet
-    Ally = 6,
    None = 255,
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Luke Jones	2b396f35c2	Merge branch 'main' into 'main' Update Discord Icon in Readme See merge request asus-linux/asusctl!181	2024-05-07 01:59:22 +00:00
Ashwanth Balakrishnan	6c503541bb	Update Discord Icon to Readme	2024-04-23 16:19:28 +00:00