diff --git a/apparmor.d/groups/freedesktop/xorg b/apparmor.d/groups/freedesktop/xorg
index 9e1625e8..378c8111 100644
--- a/apparmor.d/groups/freedesktop/xorg
+++ b/apparmor.d/groups/freedesktop/xorg
@@ -92,13 +92,14 @@ profile xorg @{exec_path} flags=(attach_disconnected) {
   @{sys}/class/ r,
   @{sys}/class/{tty,input,drm}/ r,
   @{sys}/class/power_supply/ r,
+  @{sys}/devices/@{pci}/ r,
+  @{sys}/devices/@{pci}/backlight/**/{,max_,actual_}brightness r,
+  @{sys}/devices/@{pci}/backlight/**/{uevent,type,enabled} r,
+  @{sys}/devices/@{pci}/backlight/**/brightness rw,
+  @{sys}/devices/@{pci}/boot_vga r,
   @{sys}/devices/**/{uevent,name,id,config} r,
   @{sys}/devices/**/hid r,
   @{sys}/devices/**/power_supply/**/{type,online} r,
-  @{sys}/devices/@{pci}/ r,
-  @{sys}/devices/@{pci}/backlight/*/{,max_}brightness r,
-  @{sys}/devices/@{pci}/backlight/*/brightness rw,
-  @{sys}/devices/@{pci}/boot_vga r,
   @{sys}/devices/platform/ r,
   @{sys}/module/i915/{,**} r,
 
diff --git a/apparmor.d/groups/gnome/gsd-power b/apparmor.d/groups/gnome/gsd-power
index 03c23744..09683999 100644
--- a/apparmor.d/groups/gnome/gsd-power
+++ b/apparmor.d/groups/gnome/gsd-power
@@ -69,17 +69,18 @@ profile gsd-power @{exec_path} flags=(attach_disconnected) {
   @{sys}/class/ r,
   @{sys}/class/backlight/ r,
 
-  @{sys}/devices/@{pci}/class r,
+  @{sys}/devices/@{pci}/*_backlight/{,max_,actual_}brightness rw,
+  @{sys}/devices/@{pci}/*_backlight/{uevent,type,enabled} r,
+  @{sys}/devices/@{pci}/backlight/**/{,max_,actual_}brightness rw,
+  @{sys}/devices/@{pci}/backlight/**/{uevent,type,enabled} r,
   @{sys}/devices/@{pci}/backlight/**/brightness rw,
-  @{sys}/devices/@{pci}/backlight/**/{max_brightness,actual_brightness} r,
-  @{sys}/devices/@{pci}/backlight/**/{uevent,type} r,
-  @{sys}/devices/@{pci}/drm/card@{int}/**/brightness rw,
-  @{sys}/devices/@{pci}/drm/card@{int}/**/{max_brightness,actual_brightness} r,
+  @{sys}/devices/@{pci}/class r,
+  @{sys}/devices/@{pci}/drm/card@{int}/**/{,max_,actual_}brightness rw,
   @{sys}/devices/@{pci}/drm/card@{int}/**/{uevent,type,enabled} r,
-
-  @{sys}/devices/platform/**/leds/*backlight*/uevent r,
-  @{sys}/devices/platform/**/leds/*backlight*/max_brightness r,
-  @{sys}/devices/platform/**/leds/*backlight*/brightness rw,
+  @{sys}/devices/@{pci}/drm/card@{int}/**/brightness rw,
+  @{sys}/devices/**/leds/**/{,max_,actual_}brightness rw,
+  @{sys}/devices/**/leds/**/{uevent,type,enabled} r,
+  @{sys}/devices/**/leds/**/brightness_hw_changed r,
 
         @{PROC}/cmdline r,
         @{PROC}/sys/kernel/osrelease r,
diff --git a/apparmor.d/groups/kde/kauth-backlighthelper b/apparmor.d/groups/kde/kauth-backlighthelper
index 0098d81c..9b42d9a1 100644
--- a/apparmor.d/groups/kde/kauth-backlighthelper
+++ b/apparmor.d/groups/kde/kauth-backlighthelper
@@ -22,14 +22,14 @@ profile kauth-backlighthelper @{exec_path} {
 
   @{sys}/class/backlight/ r,
   @{sys}/class/leds/ r,
-  @{sys}/devices/@{pci}/backlight/**/{max_brightness,actual_brightness} r,
-  @{sys}/devices/@{pci}/backlight/**/{uevent,type} r,
+  @{sys}/devices/@{pci}/*_backlight/{,max_,actual_}brightness rw,
+  @{sys}/devices/@{pci}/*_backlight/{uevent,type,enabled} r,
+  @{sys}/devices/@{pci}/backlight/**/{,max_,actual_}brightness rw,
+  @{sys}/devices/@{pci}/backlight/**/{uevent,type,enabled} r,
   @{sys}/devices/@{pci}/backlight/**/brightness rw,
-  @{sys}/devices/@{pci}/drm/card@{int}/**/{max_brightness,actual_brightness} r,
+  @{sys}/devices/@{pci}/drm/card@{int}/**/{,max_,actual_}brightness rw,
   @{sys}/devices/@{pci}/drm/card@{int}/**/{uevent,type,enabled} r,
   @{sys}/devices/@{pci}/drm/card@{int}/**/brightness rw,
-  @{sys}/devices/@{pci}/intel_backlight/{max_,}brightness rw,
-  @{sys}/devices/@{pci}/intel_backlight/type r,
 
   /dev/tty r,
 
diff --git a/apparmor.d/groups/systemd/systemd-backlight b/apparmor.d/groups/systemd/systemd-backlight
index 3617ddd3..066dbf33 100644
--- a/apparmor.d/groups/systemd/systemd-backlight
+++ b/apparmor.d/groups/systemd/systemd-backlight
@@ -27,19 +27,20 @@ profile systemd-backlight @{exec_path} {
   @{sys}/class/ r,
   @{sys}/class/backlight/ r,
 
-  @{sys}/devices/@{pci}/*:@{int}.@{int}/**/ r,
   @{sys}/devices/@{pci}/ r,
-  @{sys}/devices/@{pci}/backlight/**/{max_brightness,actual_brightness} r,
-  @{sys}/devices/@{pci}/backlight/**/{uevent,type} r,
+  @{sys}/devices/@{pci}/*_backlight/{,max_,actual_}brightness rw,
+  @{sys}/devices/@{pci}/*_backlight/{uevent,type,enabled} r,
+  @{sys}/devices/@{pci}/backlight/**/{,max_,actual_}brightness rw,
+  @{sys}/devices/@{pci}/backlight/**/{uevent,type,enabled} r,
   @{sys}/devices/@{pci}/backlight/**/brightness rw,
   @{sys}/devices/@{pci}/class r,
-  @{sys}/devices/@{pci}/drm/card@{int}/**/{max_brightness,actual_brightness} r,
-  @{sys}/devices/@{pci}/drm/card@{int}/**/{uevent,type} r,
+  @{sys}/devices/@{pci}/drm/card@{int}/**/{,max_,actual_}brightness rw,
+  @{sys}/devices/@{pci}/drm/card@{int}/**/{uevent,type,enabled} r,
   @{sys}/devices/@{pci}/drm/card@{int}/**/brightness rw,
   @{sys}/devices/@{pci}/uevent r,
-  @{sys}/devices/**/leds/**/brightness rw,
+  @{sys}/devices/**/leds/**/{,max_,actual_}brightness rw,
+  @{sys}/devices/**/leds/**/{uevent,type,enabled} r,
   @{sys}/devices/**/leds/**/brightness_hw_changed r,
-  @{sys}/devices/**/leds/**/max_brightness r,
 
   include if exists <local/systemd-backlight>
 }
diff --git a/apparmor.d/groups/xfce/xfpm-power-backlight-helper b/apparmor.d/groups/xfce/xfpm-power-backlight-helper
index a00ebb09..5f71150e 100644
--- a/apparmor.d/groups/xfce/xfpm-power-backlight-helper
+++ b/apparmor.d/groups/xfce/xfpm-power-backlight-helper
@@ -15,14 +15,14 @@ profile xfpm-power-backlight-helper @{exec_path} {
 
   @{sys}/class/backlight/ r,
   @{sys}/class/leds/ r,
-  @{sys}/devices/@{pci}/backlight/**/{max_brightness,actual_brightness} r,
-  @{sys}/devices/@{pci}/backlight/**/{uevent,type} r,
+  @{sys}/devices/@{pci}/backlight/**/{,max_,actual_}brightness rw,
+  @{sys}/devices/@{pci}/backlight/**/{uevent,type,enabled} r,
   @{sys}/devices/@{pci}/backlight/**/brightness rw,
-  @{sys}/devices/@{pci}/drm/card@{int}/**/{max_brightness,actual_brightness} r,
+  @{sys}/devices/@{pci}/drm/card@{int}/**/{,max_,actual_}brightness rw,
   @{sys}/devices/@{pci}/drm/card@{int}/**/{uevent,type,enabled} r,
   @{sys}/devices/@{pci}/drm/card@{int}/**/brightness rw,
-  @{sys}/devices/@{pci}/intel_backlight/{max_,}brightness rw,
-  @{sys}/devices/@{pci}/intel_backlight/type r,
+  @{sys}/devices/@{pci}/*_backlight/{,max_,actual_}brightness rw,
+  @{sys}/devices/@{pci}/*_backlight/{uevent,type,enabled} r,
 
   include if exists <local/xfpm-power-backlight-helper>
 }
diff --git a/apparmor.d/profiles-g-l/light b/apparmor.d/profiles-g-l/light
index d4ff8a7d..379f32ac 100644
--- a/apparmor.d/profiles-g-l/light
+++ b/apparmor.d/profiles-g-l/light
@@ -23,12 +23,14 @@ profile light @{exec_path} {
 
   @{sys}/class/backlight/ r,
   @{sys}/class/leds/ r,
-
-  @{sys}/devices/@{pci}/drm/**/intel_backlight/{,max_}brightness r,
-  @{sys}/devices/@{pci}/drm/**/intel_backlight/brightness rw,
-
-  @{sys}/devices/@{pci}/backlight/*/{,max_}brightness r,
-  @{sys}/devices/@{pci}/backlight/*/brightness rw,
+  @{sys}/devices/@{pci}/*_backlight/{,max_,actual_}brightness rw,
+  @{sys}/devices/@{pci}/*_backlight/{uevent,type,enabled} r,
+  @{sys}/devices/@{pci}/backlight/**/{,max_,actual_}brightness rw,
+  @{sys}/devices/@{pci}/backlight/**/{uevent,type,enabled} r,
+  @{sys}/devices/@{pci}/backlight/**/brightness rw,
+  @{sys}/devices/**/leds/**/{,max_,actual_}brightness rw,
+  @{sys}/devices/**/leds/**/{uevent,type,enabled} r,
+  @{sys}/devices/**/leds/**/brightness_hw_changed r,
 
   # file_inherit
   owner /dev/tty@{int} rw,
diff --git a/apparmor.d/profiles-s-z/thermald b/apparmor.d/profiles-s-z/thermald
index 1e72d45e..abea43b6 100644
--- a/apparmor.d/profiles-s-z/thermald
+++ b/apparmor.d/profiles-s-z/thermald
@@ -38,7 +38,7 @@ profile thermald @{exec_path} flags=(attach_disconnected) {
   @{sys}/devices/system/cpu/intel_pstate/no_turbo rw,
   @{sys}/devices/system/cpu/intel_pstate/status r,
 
-  @{sys}/devices/@{pci}/drm/**/intel_backlight/max_brightness r,
+  @{sys}/devices/@{pci}/*_backlight/{,max_,actual_}brightness r,
   @{sys}/devices/@{pci}/power_limits/power_limit_@{int}_max_uw r,
   @{sys}/devices/@{pci}/power_limits/power_limit_@{int}_min_uw r,
   @{sys}/devices/@{pci}/power_limits/power_limit_@{int}_tmax_us r,