diff --git a/apparmor.d/abstractions/gtk b/apparmor.d/abstractions/gtk
deleted file mode 100644
index a5cccf3e..00000000
--- a/apparmor.d/abstractions/gtk
+++ /dev/null
@@ -1,52 +0,0 @@
-# apparmor.d - Full set of apparmor profiles
-# Copyright (C) 2017-2021 Mikhail Morfikov
-#               2021 Alexandre Pujol <alexandre@pujol.io>
-# SPDX-License-Identifier: GPL-2.0-only
-
-  abi <abi/3.0>,
-
-  /usr/share/themes/{,**} r,
-
-  /usr/share/gtksourceview-[0-9]*/{,**} r,
-
-  /usr/share/gtk-2.0/ r,
-  /usr/share/gtk-2.0/gtkrc r,
-
-  /usr/share/gtk-{3,4}.0/ r,
-  /usr/share/gtk-{3,4}.0/settings.ini r,
-
-  /etc/gtk-2.0/ r,
-  /etc/gtk-2.0/gtkrc r,
-  /etc/gtk-{3,4}.0/ r,
-  /etc/gtk-{3,4}.0/*.conf r,
-
-  /etc/gtk/gtkrc r,
-
-  owner @{HOME}/.themes/{,**} r,
-  owner @{HOME}/.local/share/themes/{,**} r,
-
-  owner @{HOME}/.gtk r,
-  owner @{HOME}/.gtkrc r,
-  owner @{HOME}/.gtkrc-2.0 r,
-  owner @{HOME}/.gtk-bookmarks r,
-  owner @{user_config_dirs}/gtkrc r,
-  owner @{user_config_dirs}/gtkrc-2.0 r,
-  owner @{user_config_dirs}/gtk-{3,4}.0/ rw,
-  owner @{user_config_dirs}/gtk-{3,4}.0/settings.ini r,
-  owner @{user_config_dirs}/gtk-{3,4}.0/bookmarks r,
-  owner @{user_config_dirs}/gtk-{3,4}.0/gtk.css r,
-  owner @{user_config_dirs}/gtk-{3,4}.0/colors.css r,
-  owner @{user_config_dirs}/gtk-{3,4}.0/servers r,
-
-  # for gtk file dialog
-  owner @{user_config_dirs}/gtk-2.0/ rw,
-  owner @{user_config_dirs}/gtk-2.0/gtkfilechooser.ini* rw,
-
-  # .Xauthority file required for X connections
-  owner @{HOME}/.Xauthority r,
-
-  # Xsession errors file
-  owner @{HOME}/.xsession-errors w,
-
-  # Include additions to the abstraction
-  include if exists <abstractions/gtk.d>
diff --git a/apparmor.d/abstractions/gtk.d/complete b/apparmor.d/abstractions/gtk.d/complete
new file mode 100644
index 00000000..c6111f20
--- /dev/null
+++ b/apparmor.d/abstractions/gtk.d/complete
@@ -0,0 +1,18 @@
+# apparmor.d - Full set of apparmor profiles
+# Copyright (C) 2022 Alexandre Pujol <alexandre@pujol.io>
+# SPDX-License-Identifier: GPL-2.0-only
+
+  abi <abi/3.0>,
+
+  /usr/share/gtk-{3,4}.0/ r,
+  /usr/share/gtk-{3,4}.0/settings.ini r,
+
+  /etc/gtk-{3,4}.0/ r,
+  /etc/gtk-{3,4}.0/*.conf r,
+
+  owner @{user_config_dirs}/gtk-{3,4}.0/ rw,
+  owner @{user_config_dirs}/gtk-{3,4}.0/settings.ini r,
+  owner @{user_config_dirs}/gtk-{3,4}.0/bookmarks r,
+  owner @{user_config_dirs}/gtk-{3,4}.0/gtk.css r,
+  owner @{user_config_dirs}/gtk-{3,4}.0/colors.css r,
+  owner @{user_config_dirs}/gtk-{3,4}.0/servers r,