Release: 6.3.0

Feat: add support for G835L
fix: rogcc not starting in rog ally
2026-01-22 17:33:19 +01:00 · 2026-01-14 02:16:22 +01:00 · 2026-01-14 02:13:30 +01:00 · 2026-01-14 02:10:03 +01:00 · 2026-01-14 02:02:26 +01:00 · 2026-01-14 02:00:59 +01:00
16 changed files with 1035 additions and 854 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,12 +1,13 @@
 # Changelog

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

 ### Changed
 - Added support for TUF keyboard powerstate control
 - Improved AniMe Matrix support thanks to @Seom1177 !
 - Fixed a bug with one-shot battery change, thanks @bitr8 !
-
+- Changed the CLI interface of asusctl to be less confusing
+- Added support for G835L, thanks to @shevchenko0013 !

 ## [6.2.0]

--- a/Cargo.lock
+++ b/Cargo.lock
@@ -151,6 +151,38 @@ dependencies = [
 "syn 2.0.114",
 ]

+[[package]]
+name = "argh"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34ff18325c8a36b82f992e533ece1ec9f9a9db446bd1c14d4f936bac88fcd240"
+dependencies = [
+ "argh_derive",
+ "argh_shared",
+ "rust-fuzzy-search",
+]
+
+[[package]]
+name = "argh_derive"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "adb7b2b83a50d329d5d8ccc620f5c7064028828538bdf5646acd60dc1f767803"
+dependencies = [
+ "argh_shared",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.114",
+]
+
+[[package]]
+name = "argh_shared"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a464143cc82dedcdc3928737445362466b7674b5db4e2eb8e869846d6d84f4f6"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "arrayref"
 version = "0.3.9"
@@ -180,8 +212,9 @@ dependencies = [

 [[package]]
 name = "asusctl"
-version = "6.2.0"
+version = "6.3.0"
 dependencies = [
+ "argh",
 "dmi_id",
 "env_logger",
 "gumdrop",
@@ -199,7 +232,7 @@ dependencies = [

 [[package]]
 name = "asusd"
-version = "6.2.0"
+version = "6.3.0"
 dependencies = [
 "cargo-husky",
 "concat-idents",
@@ -226,7 +259,7 @@ dependencies = [

 [[package]]
 name = "asusd-user"
-version = "6.2.0"
+version = "6.3.0"
 dependencies = [
 "config-traits",
 "dirs",
@@ -905,7 +938,7 @@ dependencies = [

 [[package]]
 name = "config-traits"
-version = "6.2.0"
+version = "6.3.0"
 dependencies = [
 "log",
 "ron",
@@ -1241,7 +1274,7 @@ dependencies = [

 [[package]]
 name = "dmi_id"
-version = "6.2.0"
+version = "6.3.0"
 dependencies = [
 "log",
 "udev 0.8.0",
@@ -4449,7 +4482,7 @@ dependencies = [

 [[package]]
 name = "rog-control-center"
-version = "6.2.0"
+version = "6.3.0"
 dependencies = [
 "asusd",
 "concat-idents",
@@ -4480,7 +4513,7 @@ dependencies = [

 [[package]]
 name = "rog_anime"
-version = "6.2.0"
+version = "6.3.0"
 dependencies = [
 "dmi_id",
 "gif 0.12.0",
@@ -4494,7 +4527,7 @@ dependencies = [

 [[package]]
 name = "rog_aura"
-version = "6.2.0"
+version = "6.3.0"
 dependencies = [
 "dmi_id",
 "log",
@@ -4505,7 +4538,7 @@ dependencies = [

 [[package]]
 name = "rog_dbus"
-version = "6.2.0"
+version = "6.3.0"
 dependencies = [
 "asusd",
 "rog_anime",
@@ -4519,7 +4552,7 @@ dependencies = [

 [[package]]
 name = "rog_platform"
-version = "6.2.0"
+version = "6.3.0"
 dependencies = [
 "concat-idents",
 "inotify",
@@ -4532,7 +4565,7 @@ dependencies = [

 [[package]]
 name = "rog_profiles"
-version = "6.2.0"
+version = "6.3.0"
 dependencies = [
 "log",
 "rog_platform",
@@ -4543,7 +4576,7 @@ dependencies = [

 [[package]]
 name = "rog_scsi"
-version = "6.2.0"
+version = "6.3.0"
 dependencies = [
 "ron",
 "serde",
@@ -4553,7 +4586,7 @@ dependencies = [

 [[package]]
 name = "rog_simulators"
-version = "6.2.0"
+version = "6.3.0"
 dependencies = [
 "log",
 "rog_anime",
@@ -4563,7 +4596,7 @@ dependencies = [

 [[package]]
 name = "rog_slash"
-version = "6.2.0"
+version = "6.3.0"
 dependencies = [
 "dmi_id",
 "serde",
@@ -4621,6 +4654,12 @@ dependencies = [
 "libusb1-sys",
 ]

+[[package]]
+name = "rust-fuzzy-search"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a157657054ffe556d8858504af8a672a054a6e0bd9e8ee531059100c0fa11bb2"
+
 [[package]]
 name = "rustc-hash"
 version = "1.1.0"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,9 +1,12 @@
 [workspace.package]
-version = "6.2.0"
+version = "6.3.0"
 rust-version = "1.82"
 license = "MPL-2.0"
 readme = "README.md"
-authors = ["Luke <luke@ljones.dev>"]
+authors = [
+  "Luke <luke@ljones.dev>",
+  "Denis Benato <benato.denis96@gmail.com>"
+]
 repository = "https://gitlab.com/asus-linux/asusctl"
 homepage = "https://gitlab.com/asus-linux/asusctl"
 description = "Laptop feature control for ASUS ROG laptops and others"
--- a/asusctl/Cargo.toml
+++ b/asusctl/Cargo.toml
@@ -24,6 +24,7 @@ env_logger.workspace = true
 ron.workspace = true
 gumdrop.workspace = true
 zbus.workspace = true
+argh = "0.1"

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

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

-#[derive(Options)]
+/// Anime subcommands (image, gif, builtins, etc.)
+#[derive(FromArgs, Debug)]
+#[argh(subcommand)]
 pub enum AnimeActions {
-    #[options(help = "display a PNG image")]
    Image(AnimeImage),
-    #[options(help = "display a diagonal/pixel-perfect PNG")]
    PixelImage(AnimeImageDiagonal),
-    #[options(help = "display an animated GIF")]
    Gif(AnimeGif),
-    #[options(help = "display an animated diagonal/pixel-perfect GIF")]
    PixelGif(AnimeGifDiagonal),
-    #[options(help = "change which builtin animations are shown")]
    SetBuiltins(Builtins),
 }

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

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

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

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

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

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

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

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

-#[derive(Options, Debug)]
+/// Subcommands to enable/disable specific aura zones
+#[derive(FromArgs, Debug, Clone)]
+#[argh(subcommand)]
 pub enum SetAuraZoneEnabled {
-    /// Applies to both old and new models
-    #[options(help = "")]
-    Keyboard(AuraPowerStates),
-    #[options(help = "")]
-    Logo(AuraPowerStates),
-    #[options(help = "")]
-    Lightbar(AuraPowerStates),
-    #[options(help = "")]
-    Lid(AuraPowerStates),
-    #[options(help = "")]
-    RearGlow(AuraPowerStates),
-    #[options(help = "")]
-    Ally(AuraPowerStates),
+    Keyboard(KeyboardPower),
+    Logo(LogoPower),
+    Lightbar(LightbarPower),
+    Lid(LidPower),
+    RearGlow(RearGlowPower),
+    Ally(AllyPower),
 }

-#[derive(Debug, Clone, Options)]
-pub struct AuraPowerStates {
-    #[options(help = "print help message")]
-    pub help: bool,
-    #[options(help = "defaults to false if option unused")]
-    pub boot: bool,
-    #[options(help = "defaults to false if option unused")]
-    pub awake: bool,
-    #[options(help = "defaults to false if option unused")]
-    pub sleep: bool,
-    #[options(help = "defaults to false if option unused")]
-    pub shutdown: bool,
-}
-
-#[derive(Options)]
+/// Keyboard brightness argument helper
+#[derive(Debug, Clone)]
 pub struct LedBrightness {
    level: Option<u8>,
 }
+
 impl LedBrightness {
    pub fn new(level: Option<u8>) -> Self {
        LedBrightness { level }
@@ -72,176 +71,302 @@ impl LedBrightness {
        self.level
    }
 }
+
 impl FromStr for LedBrightness {
    type Err = Error;

    fn from_str(s: &str) -> Result<Self, Self::Err> {
        let s = s.to_lowercase();
        match s.as_str() {
-            "off" => Ok(LedBrightness { level: Some(0x00) }),
-            "low" => Ok(LedBrightness { level: Some(0x01) }),
-            "med" => Ok(LedBrightness { level: Some(0x02) }),
-            "high" => Ok(LedBrightness { level: Some(0x03) }),
-            _ => {
-                print!("Invalid argument, must be one of: off, low, med, high");
-                Err(Error::ParseBrightness)
-            }
+            "off" => Ok(Self::new(Some(0x00))),
+            "low" => Ok(Self::new(Some(0x01))),
+            "med" => Ok(Self::new(Some(0x02))),
+            "high" => Ok(Self::new(Some(0x03))),
+            _ => Err(Error::ParseBrightness),
        }
    }
 }
-#[allow(clippy::to_string_trait_impl)]
-impl ToString for LedBrightness {
-    fn to_string(&self) -> String {
+
+impl fmt::Display for LedBrightness {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
        let s = match self.level {
-            Some(0x00) => "low",
-            Some(0x01) => "med",
-            Some(0x02) => "high",
+            Some(0x00) => "off",
+            Some(0x01) => "low",
+            Some(0x02) => "med",
+            Some(0x03) => "high",
            _ => "unknown",
        };
-        s.to_owned()
+        write!(f, "{}", s)
    }
 }

-#[derive(Debug, Clone, Options, Default)]
+#[derive(FromArgs, Debug, Clone, Default)]
+#[argh(
+    subcommand,
+    name = "keyboard",
+    description = "set power states for keyboard zone"
+)]
+pub struct KeyboardPower {
+    #[argh(switch, description = "defaults to false if option unused")]
+    pub boot: bool,
+    #[argh(switch, description = "defaults to false if option unused")]
+    pub awake: bool,
+    #[argh(switch, description = "defaults to false if option unused")]
+    pub sleep: bool,
+    #[argh(switch, description = "defaults to false if option unused")]
+    pub shutdown: bool,
+}
+
+#[derive(FromArgs, Debug, Clone, Default)]
+#[argh(
+    subcommand,
+    name = "logo",
+    description = "set power states for logo zone"
+)]
+pub struct LogoPower {
+    #[argh(switch, description = "defaults to false if option unused")]
+    pub boot: bool,
+    #[argh(switch, description = "defaults to false if option unused")]
+    pub awake: bool,
+    #[argh(switch, description = "defaults to false if option unused")]
+    pub sleep: bool,
+    #[argh(switch, description = "defaults to false if option unused")]
+    pub shutdown: bool,
+}
+
+#[derive(FromArgs, Debug, Clone, Default)]
+#[argh(
+    subcommand,
+    name = "lightbar",
+    description = "set power states for lightbar zone"
+)]
+pub struct LightbarPower {
+    #[argh(switch, description = "enable power while device is booting")]
+    pub boot: bool,
+    #[argh(switch, description = "enable power while device is awake")]
+    pub awake: bool,
+    #[argh(switch, description = "enable power while device is sleeping")]
+    pub sleep: bool,
+    #[argh(
+        switch,
+        description = "enable power while device is shutting down or hibernating"
+    )]
+    pub shutdown: bool,
+}
+
+#[derive(FromArgs, Debug, Clone, Default)]
+#[argh(
+    subcommand,
+    name = "lid",
+    description = "set power states for lid zone"
+)]
+pub struct LidPower {
+    #[argh(switch, description = "defaults to false if option unused")]
+    pub boot: bool,
+    #[argh(switch, description = "defaults to false if option unused")]
+    pub awake: bool,
+    #[argh(switch, description = "defaults to false if option unused")]
+    pub sleep: bool,
+    #[argh(switch, description = "defaults to false if option unused")]
+    pub shutdown: bool,
+}
+
+#[derive(FromArgs, Debug, Clone, Default)]
+#[argh(
+    subcommand,
+    name = "rear-glow",
+    description = "set power states for rear glow zone"
+)]
+pub struct RearGlowPower {
+    #[argh(switch, description = "defaults to false if option unused")]
+    pub boot: bool,
+    #[argh(switch, description = "defaults to false if option unused")]
+    pub awake: bool,
+    #[argh(switch, description = "defaults to false if option unused")]
+    pub sleep: bool,
+    #[argh(switch, description = "defaults to false if option unused")]
+    pub shutdown: bool,
+}
+
+#[derive(FromArgs, Debug, Clone, Default)]
+#[argh(
+    subcommand,
+    name = "ally",
+    description = "set power states for ally zone"
+)]
+pub struct AllyPower {
+    #[argh(switch, description = "defaults to false if option unused")]
+    pub boot: bool,
+    #[argh(switch, description = "defaults to false if option unused")]
+    pub awake: bool,
+    #[argh(switch, description = "defaults to false if option unused")]
+    pub sleep: bool,
+    #[argh(switch, description = "defaults to false if option unused")]
+    pub shutdown: bool,
+}
+
+/// Single speed-based effect
+#[derive(FromArgs, Debug, Clone, Default)]
+#[argh(
+    subcommand,
+    name = "rainbow-cycle",
+    description = "single speed-based effect"
+)]
 pub struct SingleSpeed {
-    #[options(help = "print help message")]
-    help: bool,
-    #[options(no_long, meta = "WORD", help = "set the speed: low, med, high")]
+    #[argh(option, description = "set the speed: low, med, high")]
    pub speed: Speed,
-    #[options(
-        no_long,
-        meta = "",
-        help = "set the zone for this effect e.g, 0, 1, one, logo, lightbar-left"
+
+    #[argh(
+        option,
+        default = "AuraZone::None",
+        description = "set the zone for this effect e.g. 0, 1, one, logo, lightbar-left"
    )]
    pub zone: AuraZone,
 }

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

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

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

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

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

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

-/// Byte value for setting the built-in mode.
-///
-/// Enum corresponds to the required integer value
-// NOTE: The option names here must match those in rog-aura crate
-#[derive(Options)]
+/// Builtin aura effects
+#[derive(FromArgs, Debug)]
+#[argh(subcommand)]
 pub enum SetAuraBuiltin {
-    #[options(help = "set a single static colour")]
-    Static(SingleColour), // 0
-    #[options(help = "pulse between one or two colours")]
-    Breathe(TwoColourSpeed), // 1
-    #[options(help = "strobe through all colours")]
-    RainbowCycle(SingleSpeed), // 2
-    #[options(help = "rainbow cycling in one of four directions")]
+    Static(SingleColour),              // 0
+    Breathe(TwoColourSpeed),           // 1
+    RainbowCycle(SingleSpeed),         // 2
    RainbowWave(SingleSpeedDirection), // 3
-    #[options(help = "rain pattern mimicking raindrops")]
-    Stars(TwoColourSpeed), // 4
-    #[options(help = "rain pattern of three preset colours")]
-    Rain(SingleSpeed), // 5
-    #[options(help = "pressed keys are highlighted to fade")]
-    Highlight(SingleColourSpeed), // 6
-    #[options(help = "pressed keys generate horizontal laser")]
-    Laser(SingleColourSpeed), // 7
-    #[options(help = "pressed keys ripple outwards like a splash")]
-    Ripple(SingleColourSpeed), // 8
-    #[options(help = "set a rapid pulse")]
-    Pulse(SingleColour), // 10
-    #[options(help = "set a vertical line zooming from left")]
-    Comet(SingleColour), // 11
-    #[options(help = "set a wide vertical line zooming from left")]
-    Flash(SingleColour), // 12
+    Stars(TwoColourSpeed),             // 4
+    Rain(SingleSpeed),                 // 5
+    Highlight(SingleColourSpeed),      // 6
+    Laser(SingleColourSpeed),          // 7
+    Ripple(SingleColourSpeed),         // 8
+    Pulse(SingleColour),               // 10
+    Comet(SingleColour),               // 11
+    Flash(SingleColour),               // 12
 }

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

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

-#[derive(Default, Options)]
+#[derive(FromArgs, Default, Debug)]
+/// asusctl command-line options
 pub struct CliStart {
-    #[options(help_flag, help = "print help message")]
-    pub help: bool,
-    #[options(help = "show program version number")]
-    pub version: bool,
-    #[options(help = "show supported functions of this laptop")]
-    pub show_supported: bool,
-    #[options(meta = "", help = "<off, low, med, high>")]
-    pub kbd_bright: Option<LedBrightness>,
-    #[options(help = "Toggle to next keyboard brightness")]
-    pub next_kbd_bright: bool,
-    #[options(help = "Toggle to previous keyboard brightness")]
-    pub prev_kbd_bright: bool,
-    #[options(meta = "", help = "Set your battery charge limit <20-100>")]
-    pub chg_limit: Option<u8>,
-    #[options(help = "Toggle one-shot battery charge to 100%")]
-    pub one_shot_chg: bool,
-    #[options(command)]
-    pub command: Option<CliCommand>,
+    #[argh(subcommand)]
+    pub command: CliCommand,
 }

-#[derive(Options)]
+/// Top-level subcommands for asusctl
+#[derive(FromArgs, Debug)]
+#[argh(subcommand)]
 pub enum CliCommand {
-    #[options(help = "Set the keyboard lighting from built-in modes")]
    Aura(LedModeCommand),
-    #[options(help = "Set the LED power states")]
    AuraPowerOld(LedPowerCommand1),
-    #[options(help = "Set the LED power states")]
    AuraPower(LedPowerCommand2),
-    #[options(help = "Set or select platform_profile")]
+    Brightness(BrightnessCommand),
    Profile(ProfileCommand),
-    #[options(help = "Set, select, or modify fan curves if supported")]
    FanCurve(FanCurveCommand),
-    #[options(help = "Set the graphics mode (obsoleted by supergfxctl)")]
-    Graphics(GraphicsCommand),
-    #[options(name = "anime", help = "Manage AniMe Matrix")]
    Anime(AnimeCommand),
-    #[options(name = "slash", help = "Manage Slash Ledbar")]
    Slash(SlashCommand),
-    #[options(name = "scsi", help = "Manage SCSI external drive")]
    Scsi(ScsiCommand),
-    #[options(
-        help = "Change platform settings. This is a new interface exposed by the asus-armoury \
-                driver, some of the settings will be the same as the older platform interface"
-    )]
    Armoury(ArmouryCommand),
-    #[options(name = "backlight", help = "Set screen backlight levels")]
    Backlight(BacklightCommand),
+    Battery(BatteryCommand),
+    Info(InfoCommand),
 }

-#[derive(Debug, Clone, Options)]
+impl Default for CliCommand {
+    fn default() -> Self {
+        CliCommand::Info(InfoCommand::default())
+    }
+}
+
+#[derive(FromArgs, Debug)]
+#[argh(subcommand, name = "profile", description = "profile management")]
 pub struct ProfileCommand {
-    #[options(help = "print help message")]
-    pub help: bool,
-
-    #[options(help = "toggle to next profile in list")]
-    pub next: bool,
-
-    #[options(help = "list available profiles")]
-    pub list: bool,
-
-    #[options(help = "get profile")]
-    pub profile_get: bool,
-
-    #[options(meta = "", help = "set the active profile")]
-    pub profile_set: Option<PlatformProfile>,
-
-    #[options(short = "a", meta = "", help = "set the profile to use on AC power")]
-    pub profile_set_ac: Option<PlatformProfile>,
-
-    #[options(
-        short = "b",
-        meta = "",
-        help = "set the profile to use on battery power"
-    )]
-    pub profile_set_bat: Option<PlatformProfile>,
+    #[argh(subcommand)]
+    pub command: ProfileSubCommand,
 }

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

-#[derive(Options)]
-pub struct GraphicsCommand {
-    #[options(help = "print help message")]
-    pub help: bool,
-}
-
-#[derive(Options, Debug)]
+#[derive(FromArgs, Debug, Default)]
+#[argh(
+    subcommand,
+    name = "armoury",
+    description = "armoury / firmware attributes"
+)]
 pub struct ArmouryCommand {
-    #[options(help = "print help message")]
-    pub help: bool,
-    #[options(
-        free,
-        help = "append each value name followed by the value to set. `-1` sets to default"
-    )]
-    pub free: Vec<String>,
+    #[argh(subcommand)]
+    pub command: ArmourySubCommand,
 }

-#[derive(Options)]
+#[derive(FromArgs, Debug)]
+#[argh(subcommand)]
+pub enum ArmourySubCommand {
+    Set(ArmouryPropertySetCommand),
+    Get(ArmouryPropertyGetCommand),
+    List(ArmouryPropertyListCommand),
+}
+
+impl Default for ArmourySubCommand {
+    fn default() -> Self {
+        ArmourySubCommand::List(ArmouryPropertyListCommand::default())
+    }
+}
+
+#[derive(FromArgs, Debug, Default)]
+#[argh(
+    subcommand,
+    name = "set",
+    description = "set an asus-armoury firmware-attribute"
+)]
+pub struct ArmouryPropertySetCommand {
+    #[argh(
+        positional,
+        description = "name of the attribute to set (see asus-armoury list for available properties)"
+    )]
+    pub property: String,
+
+    #[argh(positional, description = "value to set for the given attribute")]
+    pub value: i32,
+}
+
+#[derive(FromArgs, Debug, Default)]
+#[argh(
+    subcommand,
+    name = "list",
+    description = "list all firmware-attributes supported by asus-armoury"
+)]
+pub struct ArmouryPropertyListCommand {}
+
+#[derive(FromArgs, Debug, Default)]
+#[argh(
+    subcommand,
+    name = "get",
+    description = "get a firmware-attribute from asus-armoury"
+)]
+pub struct ArmouryPropertyGetCommand {
+    #[argh(
+        positional,
+        description = "name of the property to get (see asus-armoury list for available properties)"
+    )]
+    pub property: String,
+}
+
+#[derive(FromArgs, Debug, Default)]
+#[argh(subcommand, name = "backlight", description = "backlight options")]
 pub struct BacklightCommand {
-    #[options(help = "print help message")]
-    pub help: bool,
-    #[options(meta = "", help = "Set screen brightness <0-100>")]
+    #[argh(option, description = "set screen brightness <0-100>")]
    pub screenpad_brightness: Option<i32>,
-    #[options(
-        meta = "",
-        help = "Set screenpad gamma brightness 0.5 - 2.2, 1.0 == linear"
+
+    #[argh(
+        option,
+        description = "set screenpad gamma brightness 0.5 - 2.2, 1.0 == linear"
    )]
    pub screenpad_gamma: Option<f32>,
-    #[options(
-        meta = "",
-        help = "Set screenpad brightness to sync with primary display"
+
+    #[argh(
+        option,
+        description = "set screenpad brightness to sync with primary display"
    )]
    pub sync_screenpad_brightness: Option<bool>,
 }
+
+#[derive(FromArgs, Debug)]
+#[argh(subcommand, name = "battery", description = "battery options")]
+pub struct BatteryCommand {
+    #[argh(subcommand)]
+    pub command: BatterySubCommand,
+}
+
+#[derive(FromArgs, Debug)]
+#[argh(subcommand)]
+pub enum BatterySubCommand {
+    Limit(BatteryLimitCommand),
+    OneShot(BatteryOneShotCommand),
+    Info(BatteryInfoCommand),
+}
+
+impl Default for BatterySubCommand {
+    fn default() -> Self {
+        BatterySubCommand::OneShot(BatteryOneShotCommand::default())
+    }
+}
+
+#[derive(FromArgs, Debug)]
+#[argh(
+    subcommand,
+    name = "limit",
+    description = "set battery charge limit <20-100>"
+)]
+pub struct BatteryLimitCommand {
+    #[argh(positional, description = "charge limit percentage 20-100")]
+    pub limit: u8,
+}
+
+#[derive(FromArgs, Debug, Default)]
+#[argh(
+    subcommand,
+    name = "oneshot",
+    description = "one-shot full charge (optional percent)"
+)]
+pub struct BatteryOneShotCommand {
+    #[argh(positional, description = "optional target percent (defaults to 100)")]
+    pub percent: Option<u8>,
+}
+
+#[derive(FromArgs, Debug, Default)]
+#[argh(
+    subcommand,
+    name = "info",
+    description = "show current battery charge limit"
+)]
+pub struct BatteryInfoCommand {}
+
+#[derive(FromArgs, Debug, Default)]
+#[argh(
+    subcommand,
+    name = "info",
+    description = "show program version and system info"
+)]
+pub struct InfoCommand {
+    #[argh(switch, description = "show supported functions of this laptop")]
+    pub show_supported: bool,
+}
+
+#[derive(FromArgs, Debug)]
+#[argh(subcommand, name = "leds", description = "keyboard brightness control")]
+pub struct BrightnessCommand {
+    #[argh(subcommand)]
+    pub command: BrightnessSubCommand,
+}
+
+#[derive(FromArgs, Debug)]
+#[argh(subcommand)]
+pub enum BrightnessSubCommand {
+    Set(BrightnessSetCommand),
+    Get(BrightnessGetCommand),
+    Next(BrightnessNextCommand),
+    Prev(BrightnessPrevCommand),
+}
+
+impl Default for BrightnessSubCommand {
+    fn default() -> Self {
+        BrightnessSubCommand::Get(BrightnessGetCommand::default())
+    }
+}
+
+#[derive(FromArgs, Debug)]
+#[argh(
+    subcommand,
+    name = "set",
+    description = "set keyboard brightness <off, low, med, high>"
+)]
+pub struct BrightnessSetCommand {
+    #[argh(positional, description = "brightness level: off, low, med, high")]
+    pub level: LedBrightness,
+}
+
+#[derive(FromArgs, Debug, Default)]
+#[argh(
+    subcommand,
+    name = "get",
+    description = "get current keyboard brightness"
+)]
+pub struct BrightnessGetCommand {}
+
+#[derive(FromArgs, Debug, Default)]
+#[argh(
+    subcommand,
+    name = "next",
+    description = "toggle to next keyboard brightness"
+)]
+pub struct BrightnessNextCommand {}
+
+#[derive(FromArgs, Debug, Default)]
+#[argh(
+    subcommand,
+    name = "prev",
+    description = "toggle to previous keyboard brightness"
+)]
+pub struct BrightnessPrevCommand {}
--- a/asusctl/src/fan_curve_cli.rs
+++ b/asusctl/src/fan_curve_cli.rs
@@ -1,49 +1,44 @@
-use gumdrop::Options;
+use argh::FromArgs;
 use rog_platform::platform::PlatformProfile;
 use rog_profiles::fan_curve_set::CurveData;
 use rog_profiles::FanCurvePU;

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

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

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

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

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

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

-    #[options(
-        meta = "",
-        help = "data format = 30c:1%,49c:2%,59c:3%,69c:4%,79c:31%,89c:49%,99c:56%,109c:58%. \
-                `--mod-profile` required. If '%' is omitted the fan range is 0-255"
+    #[argh(
+        option,
+        description = "data format = 30c:1%,49c:2%,...; --mod-profile required. If '%' is omitted the fan range is 0-255"
    )]
    pub data: Option<CurveData>,
 }
--- a/asusctl/src/main.rs
+++ b/asusctl/src/main.rs
@@ -1,5 +1,4 @@
 use std::convert::TryFrom;
-use std::env::args;
 use std::path::Path;
 use std::process::Command;
 use std::thread::sleep;
@@ -8,12 +7,11 @@ use anime_cli::{AnimeActions, AnimeCommand};
 use aura_cli::{LedPowerCommand1, LedPowerCommand2};
 use dmi_id::DMIID;
 use fan_curve_cli::FanCurveCommand;
-use gumdrop::{Opt, Options};
 use log::{error, info, LevelFilter};
 use rog_anime::usb::get_anime_type;
 use rog_anime::{AnimTime, AnimeDataBuffer, AnimeDiagonal, AnimeGif, AnimeImage, AnimeType, Vec2};
 use rog_aura::keyboard::{AuraPowerState, LaptopAuraPower};
-use rog_aura::{self, AuraDeviceType, AuraEffect, PowerZones};
+use rog_aura::{self, AuraEffect, PowerZones};
 use rog_dbus::asus_armoury::AsusArmouryProxyBlocking;
 use rog_dbus::list_iface_blocking;
 use rog_dbus::scsi_aura::ScsiAuraProxyBlocking;
@@ -32,7 +30,6 @@ use scsi_cli::ScsiCommand;
 use zbus::blocking::proxy::ProxyImpl;
 use zbus::blocking::Connection;

-use crate::aura_cli::{AuraPowerStates, LedBrightness};
 use crate::cli_opts::*;
 use crate::slash_cli::SlashCommand;

@@ -56,22 +53,7 @@ fn main() {
        .format_timestamp(None)
        .init();

-    let self_version = env!("CARGO_PKG_VERSION");
-    println!("Starting version {self_version}");
-    let args: Vec<String> = args().skip(1).collect();
-
-    let missing_argument_k = gumdrop::Error::missing_argument(Opt::Short('k'));
-    let parsed = match CliStart::parse_args_default(&args) {
-        Ok(p) => p,
-        Err(err) if err.to_string() == missing_argument_k.to_string() => CliStart {
-            kbd_bright: Some(LedBrightness::new(None)),
-            ..Default::default()
-        },
-        Err(err) => {
-            println!("Error: {}", err);
-            return;
-        }
-    };
+    let parsed: CliStart = argh::from_env();

    let conn = Connection::system().unwrap();
    if let Ok(platform_proxy) = PlatformProxyBlocking::new(&conn).map_err(|e| {
@@ -90,6 +72,7 @@ fn main() {
            }
        };

+        let self_version = env!("CARGO_PKG_VERSION");
        if asusd_version != self_version {
            println!("Version mismatch: asusctl = {self_version}, asusd = {asusd_version}");
            return;
@@ -110,12 +93,6 @@ fn main() {
            }
        };

-        if parsed.version {
-            println!("asusctl v{}", env!("CARGO_PKG_VERSION"));
-            println!();
-            print_info();
-        }
-
        if let Err(err) = do_parsed(&parsed, &supported_interfaces, &supported_properties, conn) {
            print_error_help(&*err, &supported_interfaces, &supported_properties);
        }
@@ -142,9 +119,9 @@ fn print_info() {
    let dmi = DMIID::new().unwrap_or_default();
    let board_name = dmi.board_name;
    let prod_family = dmi.product_family;
-    println!("asusctl version: {}", env!("CARGO_PKG_VERSION"));
-    println!(" Product family: {}", prod_family.trim());
-    println!("     Board name: {}", board_name.trim());
+    println!("Software version: {}", env!("CARGO_PKG_VERSION"));
+    println!("  Product family: {}", prod_family.trim());
+    println!("      Board name: {}", board_name.trim());
 }

 fn check_service(name: &str) -> bool {
@@ -209,149 +186,63 @@ fn do_parsed(
    conn: Connection,
 ) -> Result<(), Box<dyn std::error::Error>> {
    match &parsed.command {
-        Some(CliCommand::Aura(mode)) => handle_led_mode(mode)?,
-        Some(CliCommand::AuraPowerOld(pow)) => handle_led_power1(pow)?,
-        Some(CliCommand::AuraPower(pow)) => handle_led_power2(pow)?,
-        Some(CliCommand::Profile(cmd)) => {
-            handle_throttle_profile(&conn, supported_properties, cmd)?
-        }
-        Some(CliCommand::FanCurve(cmd)) => {
-            handle_fan_curve(&conn, cmd)?;
-        }
-        Some(CliCommand::Graphics(_)) => do_gfx(),
-        Some(CliCommand::Anime(cmd)) => handle_anime(cmd)?,
-        Some(CliCommand::Slash(cmd)) => handle_slash(cmd)?,
-        Some(CliCommand::Scsi(cmd)) => handle_scsi(cmd)?,
-        Some(CliCommand::Armoury(cmd)) => handle_armoury_command(cmd)?,
-        Some(CliCommand::Backlight(cmd)) => handle_backlight(cmd)?,
-        None => {
-            if (!parsed.show_supported
-                && parsed.kbd_bright.is_none()
-                && parsed.chg_limit.is_none()
-                && !parsed.next_kbd_bright
-                && !parsed.prev_kbd_bright
-                && !parsed.one_shot_chg)
-                || parsed.help
-            {
-                println!("{}", CliStart::usage());
-                println!();
-                if let Some(cmdlist) = CliStart::command_list() {
-                    let dev_type =
-                        if let Ok(proxy) = find_iface::<AuraProxyBlocking>("xyz.ljones.Aura") {
-                            // TODO: commands on all?
-                            proxy
-                                .first()
-                                .unwrap()
-                                .device_type()
-                                .unwrap_or(AuraDeviceType::Unknown)
-                        } else {
-                            AuraDeviceType::Unknown
-                        };
-                    let commands: Vec<String> = cmdlist.lines().map(|s| s.to_owned()).collect();
-                    for command in commands.iter().filter(|command| {
-                        if command.trim().starts_with("fan-curve")
-                            && !supported_interfaces.contains(&"xyz.ljones.FanCurves".to_string())
-                        {
-                            return false;
-                        }
-
-                        if command.trim().starts_with("aura")
-                            && !supported_interfaces.contains(&"xyz.ljones.Aura".to_string())
-                        {
-                            return false;
-                        }
-
-                        if command.trim().starts_with("anime")
-                            && !supported_interfaces.contains(&"xyz.ljones.Anime".to_string())
-                        {
-                            return false;
-                        }
-
-                        if command.trim().starts_with("slash")
-                            && !supported_interfaces.contains(&"xyz.ljones.Slash".to_string())
-                        {
-                            return false;
-                        }
-
-                        if command.trim().starts_with("platform")
-                            && !supported_interfaces.contains(&"xyz.ljones.Platform".to_string())
-                        {
-                            return false;
-                        }
-
-                        if command.trim().starts_with("armoury")
-                            && !supported_interfaces.contains(&"xyz.ljones.AsusArmoury".to_string())
-                        {
-                            return false;
-                        }
-
-                        if command.trim().starts_with("backlight")
-                            && !supported_interfaces.contains(&"xyz.ljones.Backlight".to_string())
-                        {
-                            return false;
-                        }
-
-                        if !dev_type.is_old_laptop()
-                            && !dev_type.is_tuf_laptop()
-                            && command.trim().starts_with("aura-power-old")
-                        {
-                            return false;
-                        }
-                        if !dev_type.is_new_laptop() && command.trim().starts_with("aura-power") {
-                            return false;
-                        }
-                        true
-                    }) {
-                        println!("{}", command);
-                    }
-                }
-
-                println!("\nExtra help can be requested on any command or subcommand:");
-                println!(" asusctl aura --help");
-                println!(" asusctl aura static --help");
-            }
+        CliCommand::Aura(mode) => handle_led_mode(mode)?,
+        CliCommand::AuraPowerOld(pow) => handle_led_power1(pow)?,
+        CliCommand::AuraPower(pow) => handle_led_power2(pow)?,
+        CliCommand::Brightness(cmd) => handle_brightness(cmd)?,
+        CliCommand::Profile(cmd) => handle_throttle_profile(&conn, supported_properties, cmd)?,
+        CliCommand::FanCurve(cmd) => handle_fan_curve(&conn, cmd)?,
+        CliCommand::Anime(cmd) => handle_anime(cmd)?,
+        CliCommand::Slash(cmd) => handle_slash(cmd)?,
+        CliCommand::Scsi(cmd) => handle_scsi(cmd)?,
+        CliCommand::Armoury(cmd) => handle_armoury_command(cmd)?,
+        CliCommand::Backlight(cmd) => handle_backlight(cmd)?,
+        CliCommand::Battery(cmd) => handle_battery(cmd, &conn)?,
+        CliCommand::Info(info_opt) => {
+            handle_info(info_opt, supported_interfaces, supported_properties)?
        }
    }

-    if let Some(brightness) = &parsed.kbd_bright {
-        if let Ok(aura) = find_iface::<AuraProxyBlocking>("xyz.ljones.Aura") {
-            for aura in aura.iter() {
-                match brightness.level() {
-                    None => {
-                        let level = aura.brightness()?;
-                        println!("Current keyboard led brightness: {level:?}");
-                    }
-                    Some(level) => aura.set_brightness(rog_aura::LedBrightness::from(level))?,
-                }
+    Ok(())
+}
+
+fn handle_battery(
+    cmd: &BatteryCommand,
+    conn: &Connection,
+) -> Result<(), Box<dyn std::error::Error>> {
+    match &cmd.command {
+        BatterySubCommand::Limit(l) => {
+            let proxy = PlatformProxyBlocking::new(conn)?;
+            proxy.set_charge_control_end_threshold(l.limit)?;
+        }
+        BatterySubCommand::OneShot(o) => {
+            let proxy = PlatformProxyBlocking::new(conn)?;
+            if let Some(p) = o.percent {
+                proxy.set_charge_control_end_threshold(p)?;
            }
-        } else {
-            println!("No aura interface found");
+            proxy.one_shot_full_charge()?;
+        }
+        BatterySubCommand::Info(_) => {
+            let proxy = PlatformProxyBlocking::new(conn)?;
+            let limit = proxy.charge_control_end_threshold()?;
+            println!("Current battery charge limit: {}%", limit);
        }
    }

-    if parsed.next_kbd_bright {
-        if let Ok(aura) = find_iface::<AuraProxyBlocking>("xyz.ljones.Aura") {
-            for aura in aura.iter() {
-                let brightness = aura.brightness()?;
-                aura.set_brightness(brightness.next())?;
-            }
-        } else {
-            println!("No aura interface found");
-        }
-    }
+    Ok(())
+}

-    if parsed.prev_kbd_bright {
-        if let Ok(aura) = find_iface::<AuraProxyBlocking>("xyz.ljones.Aura") {
-            for aura in aura.iter() {
-                let brightness = aura.brightness()?;
-                aura.set_brightness(brightness.prev())?;
-            }
-        } else {
-            println!("No aura interface found");
-        }
-    }
+fn handle_info(
+    info_opt: &InfoCommand,
+    supported_interfaces: &[String],
+    supported_properties: &[Properties],
+) -> Result<(), Box<dyn std::error::Error>> {
+    println!("asusctl v{}", env!("CARGO_PKG_VERSION"));
+    println!();
+    print_info();
+    println!();

-    if parsed.show_supported {
+    if info_opt.show_supported {
        println!("Supported Core Functions:\n{:#?}", supported_interfaces);
        println!(
            "Supported Platform Properties:\n{:#?}",
@@ -372,35 +263,14 @@ fn do_parsed(
        }
    }

-    if let Some(chg_limit) = parsed.chg_limit {
-        let proxy = PlatformProxyBlocking::new(&conn)?;
-        proxy.set_charge_control_end_threshold(chg_limit)?;
-    }
-
-    if parsed.one_shot_chg {
-        let proxy = PlatformProxyBlocking::new(&conn)?;
-        proxy.one_shot_full_charge()?;
-    }
-
    Ok(())
 }

-fn do_gfx() {
-    println!(
-        "Please use supergfxctl for graphics switching. supergfxctl is the result of making \
-         asusctl graphics switching generic so all laptops can use it"
-    );
-    println!("This command will be removed in future");
-}
-
 fn handle_backlight(cmd: &BacklightCommand) -> Result<(), Box<dyn std::error::Error>> {
-    if (cmd.screenpad_brightness.is_none()
+    if cmd.screenpad_brightness.is_none()
        && cmd.screenpad_gamma.is_none()
-        && cmd.sync_screenpad_brightness.is_none())
-        || cmd.help
+        && cmd.sync_screenpad_brightness.is_none()
    {
-        println!("Missing arg or command\n\n{}", cmd.self_usage());
-
        let backlights = find_iface::<BacklightProxyBlocking>("xyz.ljones.Backlight")?;
        for backlight in backlights {
            println!("Current screenpad settings:");
@@ -433,8 +303,50 @@ fn handle_backlight(cmd: &BacklightCommand) -> Result<(), Box<dyn std::error::Er
    Ok(())
 }

+fn handle_brightness(cmd: &BrightnessCommand) -> Result<(), Box<dyn std::error::Error>> {
+    let Ok(aura_proxies) = find_iface::<AuraProxyBlocking>("xyz.ljones.Aura") else {
+        println!("No aura interface found");
+        return Ok(());
+    };
+
+    match &cmd.command {
+        BrightnessSubCommand::Set(s) => {
+            for aura in aura_proxies.iter() {
+                if let Some(level) = s.level.level() {
+                    aura.set_brightness(rog_aura::LedBrightness::from(level))?;
+                } else {
+                    let current = aura.brightness()?;
+                    println!("Current keyboard led brightness: {current:?}");
+                }
+            }
+        }
+        BrightnessSubCommand::Get(_) => {
+            for aura in aura_proxies.iter() {
+                let level = aura.brightness()?;
+                println!("Current keyboard led brightness: {level:?}");
+            }
+
+            return Ok(());
+        }
+        BrightnessSubCommand::Next(_) => {
+            for aura in aura_proxies.iter() {
+                let brightness = aura.brightness()?;
+                aura.set_brightness(brightness.next())?;
+            }
+        }
+        BrightnessSubCommand::Prev(_) => {
+            for aura in aura_proxies.iter() {
+                let brightness = aura.brightness()?;
+                aura.set_brightness(brightness.prev())?;
+            }
+        }
+    }
+
+    Ok(())
+}
+
 fn handle_anime(cmd: &AnimeCommand) -> Result<(), Box<dyn std::error::Error>> {
-    if (cmd.command.is_none()
+    if cmd.command.is_none()
        && cmd.enable_display.is_none()
        && cmd.enable_powersave_anim.is_none()
        && cmd.brightness.is_none()
@@ -442,13 +354,9 @@ fn handle_anime(cmd: &AnimeCommand) -> Result<(), Box<dyn std::error::Error>> {
        && cmd.off_when_suspended.is_none()
        && cmd.off_when_unplugged.is_none()
        && cmd.off_with_his_head.is_none()
-        && !cmd.clear)
-        || cmd.help
+        && !cmd.clear
    {
-        println!("Missing arg or command\n\n{}", cmd.self_usage());
-        if let Some(lst) = cmd.self_command_list() {
-            println!("\n{}", lst);
-        }
+        println!("Missing arg or command; run 'asusctl anime --help' for usage");
    }

    let animes = find_iface::<AnimeProxyBlocking>("xyz.ljones.Anime").map_err(|e| {
@@ -495,11 +403,10 @@ fn handle_anime(cmd: &AnimeCommand) -> Result<(), Box<dyn std::error::Error>> {
        if let Some(action) = cmd.command.as_ref() {
            match action {
                AnimeActions::Image(image) => {
-                    if image.help_requested() || image.path.is_empty() {
-                        println!("Missing arg or command\n\n{}", image.self_usage());
-                        if let Some(lst) = image.self_command_list() {
-                            println!("\n{}", lst);
-                        }
+                    if image.path.is_empty() {
+                        println!(
+                            "Missing arg or command; run 'asusctl anime image --help' for usage"
+                        );
                        return Ok(());
                    }
                    verify_brightness(image.bright);
@@ -516,11 +423,8 @@ fn handle_anime(cmd: &AnimeCommand) -> Result<(), Box<dyn std::error::Error>> {
                    proxy.write(<AnimeDataBuffer>::try_from(&matrix)?)?;
                }
                AnimeActions::PixelImage(image) => {
-                    if image.help_requested() || image.path.is_empty() {
-                        println!("Missing arg or command\n\n{}", image.self_usage());
-                        if let Some(lst) = image.self_command_list() {
-                            println!("\n{}", lst);
-                        }
+                    if image.path.is_empty() {
+                        println!("Missing arg or command; run 'asusctl anime pixel-image --help' for usage");
                        return Ok(());
                    }
                    verify_brightness(image.bright);
@@ -535,11 +439,10 @@ fn handle_anime(cmd: &AnimeCommand) -> Result<(), Box<dyn std::error::Error>> {
                    proxy.write(matrix.into_data_buffer(anime_type)?)?;
                }
                AnimeActions::Gif(gif) => {
-                    if gif.help_requested() || gif.path.is_empty() {
-                        println!("Missing arg or command\n\n{}", gif.self_usage());
-                        if let Some(lst) = gif.self_command_list() {
-                            println!("\n{}", lst);
-                        }
+                    if gif.path.is_empty() {
+                        println!(
+                            "Missing arg or command; run 'asusctl anime gif --help' for usage"
+                        );
                        return Ok(());
                    }
                    verify_brightness(gif.bright);
@@ -569,11 +472,8 @@ fn handle_anime(cmd: &AnimeCommand) -> Result<(), Box<dyn std::error::Error>> {
                    }
                }
                AnimeActions::PixelGif(gif) => {
-                    if gif.help_requested() || gif.path.is_empty() {
-                        println!("Missing arg or command\n\n{}", gif.self_usage());
-                        if let Some(lst) = gif.self_command_list() {
-                            println!("\n{}", lst);
-                        }
+                    if gif.path.is_empty() {
+                        println!("Missing arg or command; run 'asusctl anime pixel-gif --help' for usage");
                        return Ok(());
                    }
                    verify_brightness(gif.bright);
@@ -600,14 +500,8 @@ fn handle_anime(cmd: &AnimeCommand) -> Result<(), Box<dyn std::error::Error>> {
                    }
                }
                AnimeActions::SetBuiltins(builtins) => {
-                    if builtins.help_requested() || builtins.set.is_none() {
-                        println!(
-                            "\nAny unspecified args will be set to default (first shown var)\n"
-                        );
-                        println!("\n{}", builtins.self_usage());
-                        if let Some(lst) = builtins.self_command_list() {
-                            println!("\n{}", lst);
-                        }
+                    if builtins.set.is_none() {
+                        println!("Missing arg; run 'asusctl anime set-builtins --help' for usage");
                        return Ok(());
                    }

@@ -634,24 +528,19 @@ fn verify_brightness(brightness: f32) {
 }

 fn handle_slash(cmd: &SlashCommand) -> Result<(), Box<dyn std::error::Error>> {
-    if (cmd.brightness.is_none()
+    if cmd.brightness.is_none()
        && cmd.interval.is_none()
        && cmd.show_on_boot.is_none()
        && cmd.show_on_shutdown.is_none()
        && cmd.show_on_sleep.is_none()
        && cmd.show_on_battery.is_none()
        && cmd.show_battery_warning.is_none()
-        // && cmd.show_on_lid_closed.is_none()
        && cmd.mode.is_none()
        && !cmd.list
        && !cmd.enable
-        && !cmd.disable)
-        || cmd.help
+        && !cmd.disable
    {
-        println!("Missing arg or command\n\n{}", cmd.self_usage());
-        if let Some(lst) = cmd.self_command_list() {
-            println!("\n{}", lst);
-        }
+        println!("Missing arg or command; run 'asusctl slash --help' for usage");
    }

    let slashes = find_iface::<SlashProxyBlocking>("xyz.ljones.Slash")?;
@@ -702,13 +591,8 @@ fn handle_slash(cmd: &SlashCommand) -> Result<(), Box<dyn std::error::Error>> {
 }

 fn handle_scsi(cmd: &ScsiCommand) -> Result<(), Box<dyn std::error::Error>> {
-    if (!cmd.list && cmd.enable.is_none() && cmd.mode.is_none() && cmd.colours.is_empty())
-        || cmd.help
-    {
-        println!("Missing arg or command\n\n{}", cmd.self_usage());
-        if let Some(lst) = cmd.self_command_list() {
-            println!("\n{}", lst);
-        }
+    if !cmd.list && cmd.enable.is_none() && cmd.mode.is_none() && cmd.colours.is_empty() {
+        println!("Missing arg or command; run 'asusctl scsi --help' for usage");
    }

    let scsis = find_iface::<ScsiAuraProxyBlocking>("xyz.ljones.ScsiAura")?;
@@ -774,38 +658,15 @@ fn handle_scsi(cmd: &ScsiCommand) -> Result<(), Box<dyn std::error::Error>> {

 fn handle_led_mode(mode: &LedModeCommand) -> Result<(), Box<dyn std::error::Error>> {
    if mode.command.is_none() && !mode.prev_mode && !mode.next_mode {
-        if !mode.help {
-            println!("Missing arg or command\n");
-        }
-        println!("{}\n", mode.self_usage());
-        println!("Commands available");
-
-        if let Some(cmdlist) = LedModeCommand::command_list() {
-            let commands: Vec<String> = cmdlist.lines().map(|s| s.to_owned()).collect();
-            // TODO: multiple rgb check
-            let aura = find_iface::<AuraProxyBlocking>("xyz.ljones.Aura")?;
+        println!("Missing arg or command; run 'asusctl aura --help' for usage");
+        // print available modes when possible
+        if let Ok(aura) = find_iface::<AuraProxyBlocking>("xyz.ljones.Aura") {
            let modes = aura.first().unwrap().supported_basic_modes()?;
-            for command in commands.iter().filter(|command| {
-                for mode in &modes {
-                    let mut mode = <&str>::from(mode).to_string();
-                    if let Some(pos) = mode.chars().skip(1).position(|c| c.is_uppercase()) {
-                        mode.insert(pos + 1, '-');
-                    }
-                    if command.trim().starts_with(&mode.to_lowercase()) {
-                        return true;
-                    }
-                }
-                // TODO
-                // if !supported.basic_zones.is_empty() && command.trim().starts_with("multi") {
-                //     return true;
-                // }
-                false
-            }) {
-                println!("{}", command);
+            println!("Available modes:");
+            for m in modes {
+                println!("  {:?}", m);
            }
        }
-
-        println!("\nHelp can also be requested on modes, e.g: static --help");
        return Ok(());
    }

@@ -837,10 +698,6 @@ fn handle_led_mode(mode: &LedModeCommand) -> Result<(), Box<dyn std::error::Erro
            aura.set_led_mode(modes[pos])?;
        }
    } else if let Some(mode) = mode.command.as_ref() {
-        if mode.help_requested() {
-            println!("{}", mode.self_usage());
-            return Ok(());
-        }
        for aura in aura {
            aura.set_led_mode_data(<AuraEffect>::from(mode))?;
        }
@@ -863,10 +720,7 @@ fn handle_led_power1(power: &LedPowerCommand1) -> Result<(), Box<dyn std::error:
            && !power.keyboard
            && !power.lightbar
        {
-            if !power.help {
-                println!("Missing arg or command\n");
-            }
-            println!("{}\n", power.self_usage());
+            println!("Missing arg or command; run 'asusctl aura-power-old --help' for usage");
            return Ok(());
        }

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

-        if power.command().is_none() {
-            if !power.help {
-                println!("Missing arg or command\n");
-            }
-            println!("{}\n", power.self_usage());
+        if power.command.is_none() {
+            println!("Missing arg or command; run 'asusctl aura-power --help' for usage");
            println!("Commands available");
-
-            if let Some(cmdlist) = LedPowerCommand2::command_list() {
-                let commands: Vec<String> = cmdlist.lines().map(|s| s.to_owned()).collect();
-                for command in &commands {
-                    println!("{}", command);
-                }
-            }
-
-            println!("\nHelp can also be requested on commands, e.g: boot --help");
            return Ok(());
        }

-        if let Some(pow) = power.command.as_ref() {
-            if pow.help_requested() {
-                println!("{}", pow.self_usage());
-                return Ok(());
-            }
-
+        if let Some(_pow) = power.command.as_ref() {
            let mut states = aura.led_power()?;
-            let mut set = |zone: PowerZones, set_to: &AuraPowerStates| {
-                for state in states.states.iter_mut() {
-                    if state.zone == zone {
-                        state.boot = set_to.boot;
-                        state.awake = set_to.awake;
-                        state.sleep = set_to.sleep;
-                        state.shutdown = set_to.shutdown;
-                        break;
+            let mut set =
+                |zone: PowerZones, boot_v: bool, awake_v: bool, sleep_v: bool, shutdown_v: bool| {
+                    for state in states.states.iter_mut() {
+                        if state.zone == zone {
+                            state.boot = boot_v;
+                            state.awake = awake_v;
+                            state.sleep = sleep_v;
+                            state.shutdown = shutdown_v;
+                            break;
+                        }
                    }
-                }
-            };
+                };

            if let Some(cmd) = &power.command {
                match cmd {
-                    aura_cli::SetAuraZoneEnabled::Keyboard(k) => set(PowerZones::Keyboard, k),
-                    aura_cli::SetAuraZoneEnabled::Logo(l) => set(PowerZones::Logo, l),
-                    aura_cli::SetAuraZoneEnabled::Lightbar(l) => set(PowerZones::Lightbar, l),
-                    aura_cli::SetAuraZoneEnabled::Lid(l) => set(PowerZones::Lid, l),
-                    aura_cli::SetAuraZoneEnabled::RearGlow(r) => set(PowerZones::RearGlow, r),
-                    aura_cli::SetAuraZoneEnabled::Ally(r) => set(PowerZones::Ally, r),
+                    aura_cli::SetAuraZoneEnabled::Keyboard(k) => {
+                        set(PowerZones::Keyboard, k.boot, k.awake, k.sleep, k.shutdown)
+                    }
+                    aura_cli::SetAuraZoneEnabled::Logo(l) => {
+                        set(PowerZones::Logo, l.boot, l.awake, l.sleep, l.shutdown)
+                    }
+                    aura_cli::SetAuraZoneEnabled::Lightbar(l) => {
+                        set(PowerZones::Lightbar, l.boot, l.awake, l.sleep, l.shutdown)
+                    }
+                    aura_cli::SetAuraZoneEnabled::Lid(l) => {
+                        set(PowerZones::Lid, l.boot, l.awake, l.sleep, l.shutdown)
+                    }
+                    aura_cli::SetAuraZoneEnabled::RearGlow(r) => {
+                        set(PowerZones::RearGlow, r.boot, r.awake, r.sleep, r.shutdown)
+                    }
+                    aura_cli::SetAuraZoneEnabled::Ally(r) => {
+                        set(PowerZones::Ally, r.boot, r.awake, r.sleep, r.shutdown)
+                    }
                }
            }

@@ -983,51 +833,37 @@ fn handle_throttle_profile(
        return Err(ProfileError::NotSupported.into());
    }

-    if !cmd.next
-        && !cmd.list
-        && cmd.profile_set.is_none()
-        && !cmd.profile_get
-        && cmd.profile_set_ac.is_none()
-        && cmd.profile_set_bat.is_none()
-    {
-        if !cmd.help {
-            println!("Missing arg or command\n");
-        }
-        println!("{}", ProfileCommand::usage());
-
-        if let Some(lst) = cmd.self_command_list() {
-            println!("\n{}", lst);
-        }
-        return Ok(());
-    }
-
    let proxy = PlatformProxyBlocking::new(conn)?;
    let current = proxy.platform_profile()?;
    let choices = proxy.platform_profile_choices()?;

-    if cmd.next {
-        proxy.set_platform_profile(PlatformProfile::next(current, &choices))?;
-    } else if let Some(profile) = cmd.profile_set {
-        proxy.set_platform_profile(profile)?;
-    } else if let Some(profile) = cmd.profile_set_ac {
-        proxy.set_platform_profile_on_ac(profile)?;
-    } else if let Some(profile) = cmd.profile_set_bat {
-        proxy.set_platform_profile_on_battery(profile)?;
-    }
-
-    if cmd.list {
-        for p in &choices {
-            println!("{:?}", p);
+    match &cmd.command {
+        crate::cli_opts::ProfileSubCommand::Next(_) => {
+            proxy.set_platform_profile(PlatformProfile::next(current, &choices))?;
+        }
+        crate::cli_opts::ProfileSubCommand::Set(s) => {
+            if !s.ac && !s.battery {
+                proxy.set_platform_profile(s.profile)?;
+            } else {
+                if s.ac {
+                    proxy.set_platform_profile_on_ac(s.profile)?;
+                }
+                if s.battery {
+                    proxy.set_platform_profile_on_battery(s.profile)?;
+                }
+            }
+        }
+        crate::cli_opts::ProfileSubCommand::List(_) => {
+            for p in &choices {
+                println!("{:?}", p);
+            }
+        }
+        crate::cli_opts::ProfileSubCommand::Get(_) => {
+            println!("Active profile: {current:?}");
+            println!();
+            println!("AC profile {:?}", proxy.platform_profile_on_ac()?);
+            println!("Battery profile {:?}", proxy.platform_profile_on_battery()?);
        }
-    }
-
-    if cmd.profile_get {
-        println!("Active profile is {current:?}");
-        println!("Profile on AC is {:?}", proxy.platform_profile_on_ac()?);
-        println!(
-            "Profile on Battery is {:?}",
-            proxy.platform_profile_on_battery()?
-        );
    }

    Ok(())
@@ -1044,14 +880,7 @@ fn handle_fan_curve(
    };

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

@@ -1190,33 +1019,33 @@ fn print_firmware_attr(attr: &AsusArmouryProxyBlocking) -> Result<(), Box<dyn st

 #[allow(clippy::manual_is_multiple_of, clippy::nonminimal_bool)]
 fn handle_armoury_command(cmd: &ArmouryCommand) -> Result<(), Box<dyn std::error::Error>> {
-    {
-        if cmd.free.is_empty() || (cmd.free.len() % 2 != 0) || cmd.help {
-            const USAGE: &str = "Usage: asusctl armoury panel_overdrive 1 nv_dynamic_boost 5";
-            if cmd.free.len() % 2 != 0 {
-                println!(
-                    "Incorrect number of args, each attribute label must be paired with a setting:"
-                );
-                println!("{USAGE}");
-                return Ok(());
-            }
-
-            if let Ok(attr) = find_iface::<AsusArmouryProxyBlocking>("xyz.ljones.AsusArmoury") {
-                println!("\n{USAGE}\n");
-                println!("Available firmware attributes: ");
-                for attr in attr.iter() {
+    // If nested subcommand provided, handle set/get/list.
+    match &cmd.command {
+        ArmourySubCommand::List(_) => {
+            if let Ok(attrs) = find_iface::<AsusArmouryProxyBlocking>("xyz.ljones.AsusArmoury") {
+                for attr in attrs.iter() {
                    print_firmware_attr(attr)?;
                }
            }
-            return Ok(());
+            Ok(())
        }
-
-        if let Ok(attr) = find_iface::<AsusArmouryProxyBlocking>("xyz.ljones.AsusArmoury") {
-            for cmd in cmd.free.chunks(2) {
-                for attr in attr.iter() {
+        ArmourySubCommand::Get(g) => {
+            if let Ok(attrs) = find_iface::<AsusArmouryProxyBlocking>("xyz.ljones.AsusArmoury") {
+                for attr in attrs.iter() {
                    let name = attr.name()?;
-                    if <&str>::from(name) == cmd[0] {
-                        let mut value: i32 = cmd[1].parse()?;
+                    if <&str>::from(name) == g.property {
+                        print_firmware_attr(attr)?;
+                    }
+                }
+            }
+            Ok(())
+        }
+        ArmourySubCommand::Set(s) => {
+            if let Ok(attrs) = find_iface::<AsusArmouryProxyBlocking>("xyz.ljones.AsusArmoury") {
+                for attr in attrs.iter() {
+                    let name = attr.name()?;
+                    if <&str>::from(name) == s.property {
+                        let mut value: i32 = s.value;
                        if value == -1 {
                            info!("Setting to default");
                            value = attr.default_value()?;
@@ -1226,7 +1055,7 @@ fn handle_armoury_command(cmd: &ArmouryCommand) -> Result<(), Box<dyn std::error
                    }
                }
            }
+            Ok(())
        }
    }
-    Ok(())
 }
--- a/asusctl/src/scsi_cli.rs
+++ b/asusctl/src/scsi_cli.rs
@@ -1,35 +1,30 @@
-use gumdrop::Options;
+use argh::FromArgs;
 use rog_scsi::{AuraMode, Colour, Direction, Speed};

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

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

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

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

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

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

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

-    #[options(short = "B", meta = "", help = "Show the animation on boot")]
+    #[argh(option, short = 'B', description = "show the animation on boot")]
    pub show_on_boot: Option<bool>,
-    #[options(short = "S", meta = "", help = "Show the animation on shutdown")]
+    #[argh(option, short = 'S', description = "show the animation on shutdown")]
    pub show_on_shutdown: Option<bool>,
-    #[options(short = "s", meta = "", help = "Show the animation on sleep")]
+    #[argh(option, short = 's', description = "show the animation on sleep")]
    pub show_on_sleep: Option<bool>,
-    #[options(short = "b", meta = "", help = "Show the animation on battery")]
+    #[argh(option, short = 'b', description = "show the animation on battery")]
    pub show_on_battery: Option<bool>,
-    // #[options(short = "L", meta = "", help = "Show the animation on lid closed")]
-    // pub show_on_lid_closed: Option<bool>,
-    #[options(
-        short = "w",
-        meta = "",
-        help = "Show the low-battery warning animation"
+    #[argh(
+        option,
+        short = 'w',
+        description = "show the low-battery warning animation"
    )]
    pub show_battery_warning: Option<bool>,
 }
--- a/distro-packaging/asusctl.spec
+++ b/distro-packaging/asusctl.spec
@@ -20,7 +20,7 @@
 %global debug_package %{nil}
 %endif

-%define version 6.2.0
+%define version 6.3.0
 %define specrelease %{?dist}
 %define pkg_release 1%{specrelease}

--- a/rog-aura/data/aura_support.ron
+++ b/rog-aura/data/aura_support.ron
@@ -566,6 +566,15 @@
        advanced_type: PerKey,
        power_zones: [Keyboard, Lightbar, Logo, RearGlow],
    ),
+    (
+        device_name: "G835L",
+        product_id: "",
+        layout_name: "g814ji-per-key",
+        basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Star, Rain, Highlight, Laser, Ripple, Pulse, Comet, Flash],
+        basic_zones: [],
+        advanced_type: PerKey,
+        power_zones: [Keyboard, Lightbar, Logo],
+    ),
    (
        device_name: "GA401I",
        product_id: "",
--- a/rog-control-center/Cargo.toml
+++ b/rog-control-center/Cargo.toml
@@ -14,6 +14,7 @@ mocking = []
 x11 = ["slint/backend-winit-x11"]
 # Optional tokio debug feature does not require nightly; remove RUSTFLAGS note.
 tokio-debug = ["console-subscriber"]
+rog_ally = []

 [dependencies]
 console-subscriber = { version = "^0.4", optional = true }
--- a/rog-control-center/src/main.rs
+++ b/rog-control-center/src/main.rs
@@ -107,7 +107,6 @@ async fn main() -> Result<()> {
    let board_name = dmi.board_name;
    let prod_family = dmi.product_family;
    info!("Running on {board_name}, product: {prod_family}");
-    let is_rog_ally = board_name == "RC71L" || board_name == "RC72L" || prod_family == "ROG Ally";

    let args: Vec<String> = args().skip(1).collect();

@@ -138,6 +137,18 @@ async fn main() -> Result<()> {
        config.start_fullscreen = false;
    }

+    let is_rog_ally = {
+        #[cfg(feature = "rog_ally")]
+        {
+            board_name == "RC71L" || board_name == "RC72L" || prod_family == "ROG Ally"
+        }
+        #[cfg(not(feature = "rog_ally"))]
+        {
+            false
+        }
+    };
+
+    #[cfg(feature = "rog_ally")]
    if is_rog_ally {
        config.notifications.enabled = false;
        config.enable_tray_icon = false;
@@ -145,6 +156,7 @@ async fn main() -> Result<()> {
        config.startup_in_background = false;
        config.start_fullscreen = true;
    }
+
    config.write();

    let enable_tray_icon = config.enable_tray_icon;
@@ -203,76 +215,77 @@ async fn main() -> Result<()> {
                        }
                    })
                    .ok();
-            } else {
-                // save as a var, don't hold the lock the entire time or deadlocks happen
-                if let Ok(app_state) = app_state.lock() {
-                    state = *app_state;
+
+                continue;
+            }
+
+            // save as a var, don't hold the lock the entire time or deadlocks happen
+            if let Ok(app_state) = app_state.lock() {
+                state = *app_state;
+            }
+
+            // This sleep is required to give the event loop time to react
+            sleep(Duration::from_millis(300));
+            if state == AppState::MainWindowShouldOpen {
+                if let Ok(mut app_state) = app_state.lock() {
+                    *app_state = AppState::MainWindowOpen;
                }

-                // This sleep is required to give the event loop time to react
-                sleep(Duration::from_millis(300));
-                if state == AppState::MainWindowShouldOpen {
-                    if let Ok(mut app_state) = app_state.lock() {
-                        *app_state = AppState::MainWindowOpen;
-                    }
+                let config_copy = config.clone();
+                let app_state_copy = app_state.clone();
+                slint::invoke_from_event_loop(move || {
+                    UI.with(|ui| {
+                        let app_state_copy = app_state_copy.clone();
+                        let mut ui = ui.borrow_mut();
+                        if let Some(ui) = ui.as_mut() {
+                            ui.window().show().unwrap();
+                            ui.window().on_close_requested(move || {
+                                if let Ok(mut app_state) = app_state_copy.lock() {
+                                    *app_state = AppState::MainWindowClosed;
+                                }
+                                slint::CloseRequestResponse::HideWindow
+                            });
+                        } else {
+                            let config_copy_2 = config_copy.clone();
+                            let newui = setup_window(config_copy);
+                            newui.window().on_close_requested(move || {
+                                if let Ok(mut app_state) = app_state_copy.lock() {
+                                    *app_state = AppState::MainWindowClosed;
+                                }
+                                slint::CloseRequestResponse::HideWindow
+                            });

-                    let config_copy = config.clone();
-                    let app_state_copy = app_state.clone();
-                    slint::invoke_from_event_loop(move || {
-                        UI.with(|ui| {
-                            let app_state_copy = app_state_copy.clone();
-                            let mut ui = ui.borrow_mut();
-                            if let Some(ui) = ui.as_mut() {
-                                ui.window().show().unwrap();
-                                ui.window().on_close_requested(move || {
-                                    if let Ok(mut app_state) = app_state_copy.lock() {
-                                        *app_state = AppState::MainWindowClosed;
+                            let ui_copy = newui.as_weak();
+                            newui
+                                .window()
+                                .set_rendering_notifier(move |s, _| {
+                                    if let slint::RenderingState::RenderingSetup = s {
+                                        let config = config_copy_2.clone();
+                                        ui_copy
+                                            .upgrade_in_event_loop(move |w| {
+                                                let fullscreen =
+                                                    config.lock().is_ok_and(|c| c.start_fullscreen);
+                                                if fullscreen && !w.window().is_fullscreen() {
+                                                    w.window().set_fullscreen(fullscreen);
+                                                }
+                                            })
+                                            .ok();
                                    }
-                                    slint::CloseRequestResponse::HideWindow
-                                });
-                            } else {
-                                let config_copy_2 = config_copy.clone();
-                                let newui = setup_window(config_copy);
-                                newui.window().on_close_requested(move || {
-                                    if let Ok(mut app_state) = app_state_copy.lock() {
-                                        *app_state = AppState::MainWindowClosed;
-                                    }
-                                    slint::CloseRequestResponse::HideWindow
-                                });
-
-                                let ui_copy = newui.as_weak();
-                                newui
-                                    .window()
-                                    .set_rendering_notifier(move |s, _| {
-                                        if let slint::RenderingState::RenderingSetup = s {
-                                            let config = config_copy_2.clone();
-                                            ui_copy
-                                                .upgrade_in_event_loop(move |w| {
-                                                    let fullscreen = config
-                                                        .lock()
-                                                        .is_ok_and(|c| c.start_fullscreen);
-                                                    if fullscreen && !w.window().is_fullscreen() {
-                                                        w.window().set_fullscreen(fullscreen);
-                                                    }
-                                                })
-                                                .ok();
-                                        }
-                                    })
-                                    .ok();
-                                ui.replace(newui);
-                            }
-                        });
-                    })
-                    .unwrap();
-                } else if state == AppState::QuitApp {
-                    slint::quit_event_loop().unwrap();
-                    exit(0);
-                } else if state != AppState::MainWindowOpen {
-                    if let Ok(config) = config.lock() {
-                        if !config.run_in_background {
-                            slint::quit_event_loop().unwrap();
-                            exit(0);
+                                })
+                                .ok();
+                            ui.replace(newui);
                        }
+                    });
+                })
+                .unwrap();
+            } else if state == AppState::QuitApp {
+                slint::quit_event_loop().unwrap();
+                exit(0);
+            } else if state != AppState::MainWindowOpen {
+                if let Ok(config) = config.lock() {
+                    if !config.run_in_background {
+                        slint::quit_event_loop().unwrap();
+                        exit(0);
                    }
                }
            }
--- a/rog-control-center/ui/pages/about.slint
+++ b/rog-control-center/ui/pages/about.slint
@@ -17,7 +17,7 @@ export component PageAbout inherits VerticalLayout {

            Text {
                wrap: TextWrap.word-wrap;
-                text: "You will require a kernel built with my work from here: https://github.com/flukejones/linux";
+                text: "You need to use kernel version 6.19 to use this software";
            }

            Text {
@@ -43,10 +43,6 @@ export component PageAbout inherits VerticalLayout {
                text: "- [ ] Slash control";
            }

-            Text {
-                text: "- [ ] Supergfx control";
-            }
-
            Text {
                text: "- [ ] Screenpad controls";
            }
Author	SHA1	Message	Date
Denis Benato	5303bfc1ad	Release: 6.3.0	2026-01-14 02:16:22 +01:00
Denis Benato	635f1dc9b9	Feat: add support for G835L	2026-01-14 02:13:30 +01:00
Denis Benato	33a4dba8fe	fix: rogcc not starting in rog ally	2026-01-14 02:10:03 +01:00
Denis Benato	e4680c9543	Merge branch 'remove_supergfxctl' into devel	2026-01-14 02:02:26 +01:00
Denis Benato	60c4818381	fix: implement Display instead of ToString	2026-01-14 02:00:59 +01:00
Denis Benato	9cd48dc101	chore: edit CHANGELOG.md	2026-01-14 01:59:03 +01:00
Denis Benato	8d954c16fa	fix: cargo clippy --fix	2026-01-14 01:57:48 +01:00
Denis Benato	3665d9cc8e	feat: improve the cli interface	2026-01-14 01:56:58 +01:00
Denis Benato	d7ddee246a	feat: refactor the cli battery interface	2026-01-14 01:45:56 +01:00
Denis Benato	e85938b34d	feat: refactor cli options for leds	2026-01-14 01:32:10 +01:00
Denis Benato	b7d480dd39	fix: help strings	2026-01-14 01:14:53 +01:00
Denis Benato	77640d1637	feat: improve profile cli usage	2026-01-14 01:05:35 +01:00
Denis Benato	32da2a2da0	feat: make easier to use armoury subcommand	2026-01-14 00:31:13 +01:00
Denis Benato	7981a85ff5	feat: improve cmdline	2026-01-14 00:06:34 +01:00
Denis Benato	e3035adf98	chore: change the text in about page	2026-01-13 23:55:52 +01:00
Denis Benato	be17e0b388	feat: remove references to graphic switching	2026-01-13 23:53:23 +01:00
Denis Benato	20cbddb6fa	feat: refactor cli interface	2026-01-13 23:50:31 +01:00