diff --git a/system/modules/ui/desktops/common.nix b/system/modules/ui/desktops/common.nix
index 45a5a5f..11cfa7a 100644
--- a/system/modules/ui/desktops/common.nix
+++ b/system/modules/ui/desktops/common.nix
@@ -25,9 +25,10 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    aux.system.ui.audio.enable = true;
-
-    hardware.bluetooth.enable = true;
+    aux.system = {
+      bluetooth.enable = true;
+      ui.audio.enable = true;
+    };
 
     boot = {
       # Enable Plymouth for graphical bootsplash.
@@ -46,12 +47,12 @@ in
         # Enable the X11 windowing system.
         enable = true;
 
-        # Enable touchpad support (enabled by default in most desktop managers, buuuut just in case).
-        libinput.enable = true;
-
         # Configure keymap in X11
         xkb = config.aux.system.ui.desktops.xkb;
       };
+
+      # Enable touchpad support (enabled by default in most desktop managers, buuuut just in case).
+      libinput.enable = true;
     };
 
     # Support for AppImage files
diff --git a/system/modules/ui/flatpak.nix b/system/modules/ui/flatpak.nix
index 0474338..e477443 100644
--- a/system/modules/ui/flatpak.nix
+++ b/system/modules/ui/flatpak.nix
@@ -66,8 +66,8 @@ with lib;
         aggregatedIcons = pkgs.buildEnv {
           name = "system-icons";
           paths = with pkgs; [
-            (lib.mkIf config.aux.system.ui.gnome.enable gnome.gnome-themes-extra)
-            (lib.mkIf config.aux.system.ui.kde.enable kdePackages.breeze-icons)
+            (lib.mkIf config.aux.system.ui.desktops.gnome.enable gnome.gnome-themes-extra)
+            (lib.mkIf config.aux.system.ui.desktops.kde.enable kdePackages.breeze-icons)
           ];
           pathsToLink = [ "/share/icons" ];
         };