diff --git a/config/waybar/config.jsonc b/config/waybar/config.jsonc
index fcddb3f..14b9d14 100644
--- a/config/waybar/config.jsonc
+++ b/config/waybar/config.jsonc
@@ -179,8 +179,8 @@
         "format-high": " {percent}",
         "format-low": " {percent}",
         "tooltip-format": "<big>Brightness</big>\n🌣 {percent}",
-        "on-scroll-up": "light -A 1",
-        "on-scroll-down": "light -U 1"
+        "on-scroll-up": "brightnessctl set +5%",
+        "on-scroll-down": "brightnessctl set 5%-"
     },
     "pulseaudio#microphone": {
         "format": "{format_source}",
diff --git a/system/powertop.service b/system/powertop.service
new file mode 100644
index 0000000..1a767c7
--- /dev/null
+++ b/system/powertop.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Powertop tunings
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/usr/bin/powertop --auto-tune
+ExecStartPost=/bin/sh -c 'for f in $(find /sys/bus/usb/drivers/usbhid -regex '.*\/[0-9:.-]+' -printf '%f\n' | cut -d ":" -f 1 | sort -u); do echo on >| "/sys/bus/usb/devices/$f/power/control"; done'
+
+[Install]
+WantedBy=multi-user.target sleep.target