diff --git a/profiles/desktop/gnome/default.nix b/profiles/desktop/gnome/default.nix
index f267bc3..1a10185 100644
--- a/profiles/desktop/gnome/default.nix
+++ b/profiles/desktop/gnome/default.nix
@@ -8,7 +8,9 @@
   programs.xwayland.enable = true;
   xdg.portal.enable = true;
 
-  services.udev.packages = with pkgs; [ gnome.gnome-settings-daemon ];
+  services.udev.packages = [
+    (pkgs.gnome-settings-daemon or pkgs.gnome.gnome-settings-daemon)
+  ];
 
   programs.gnome-terminal.enable = false;
 
@@ -22,7 +24,7 @@
     firefox
     pavucontrol
     lxterminal
-    gnome.gnome-tweaks
+    (pkgs.gnome-tweaks or pkgs.gnome.gnome-tweaks)
     # TODO: shadow gnome-terminal
     ffmpegthumbnailer
     libheif # HEIF thumbnails
@@ -48,21 +50,20 @@
     gnome-tour
     (pkgs.gedit or pkgs.gnome.gedit) # text editor (24.05 vs 23.11)
     papers # Document Viewer (new)
-  ]) ++ (with pkgs.gnome; [
-    eog
-    #cheese # webcam tool
-    simple-scan # scanning utility
-    yelp # Help
-    #baobab # Disk Usage Analyser
-    evince # Document Viewer
-    gnome-music
-    gnome-terminal
-    epiphany # web browser
-    geary # email reader
-    totem # video player
-    tali # poker game
-    iagno # go game
-    hitori # sudoku game
-    atomix # puzzle game
+    (pkgs.eog or pkgs.gnome.eog)
+    #pkgs.cheese # webcam tool
+    #pkgs.baobab # Disk Usage Analyser
+    (pkgs.simple-scan or pkgs.gnome.simple-scan) # scanning utility
+    (pkgs.yelp or pkgs.gnome.yelp) # Help
+    (pkgs.evince or pkgs.gnome.evince) # Document Viewer
+    (pkgs.gnome-music or pkgs.gnome.gnome-music)
+    (pkgs.gnome-terminal or pkgs.gnome.gnome-terminal)
+    (pkgs.epiphany or pkgs.gnome.epiphany) # web browser
+    (pkgs.geary or pkgs.gnome.geary) # email reader
+    (pkgs.totem or pkgs.gnome.totem) # video player
+    (pkgs.tali or pkgs.gnome.tali) # poker game
+    (pkgs.iagno or pkgs.gnome.iagno) # go game
+    (pkgs.hitori or pkgs.gnome.hitori) # sudoku game
+    (pkgs.atomix or pkgs.gnome.atomix) # puzzle game
   ]);
 }
diff --git a/profiles/desktop/lutris.nix b/profiles/desktop/lutris.nix
index 8e127f4..33bf862 100644
--- a/profiles/desktop/lutris.nix
+++ b/profiles/desktop/lutris.nix
@@ -13,19 +13,19 @@ lib.mkMerge [
         pkgs.winetricks
         pkgs.pixman
         pkgs.libjpeg
-        pkgs.gnome.zenity
+        (pkgs.zenity or pkgs.gnome.pkgs.adwaita-icon-theme)
       ];
       extraLibraries =  pkgs: [
       ];
     })
 
     # ensure icons appear
-    pkgs.gnome.adwaita-icon-theme
+    (pkgs.adwaita-icon-theme or pkgs.gnome.pkgs.adwaita-icon-theme)
     pkgs.hicolor-icon-theme #
 
     # Needed for some installers like League of Legends
     pkgs.openssl
-    pkgs.gnome.zenity
+    (pkgs.zenity or pkgs.gnome.pkgs.adwaita-icon-theme)
 
   ];
 
diff --git a/users/pbsds/home/profiles/desktop/gnome/default.nix b/users/pbsds/home/profiles/desktop/gnome/default.nix
index 8aecc45..25e6120 100644
--- a/users/pbsds/home/profiles/desktop/gnome/default.nix
+++ b/users/pbsds/home/profiles/desktop/gnome/default.nix
@@ -49,7 +49,7 @@ in
   ];
 
   home.packages = [
-    pkgs.gnome.gnome-tweaks
+    (pkgs.gnome-tweaks or pkgs.gnome.gnome-tweaks)
     pkgs.vimix-gtk-themes # shell theme
   ] ++ gnomeExtensions;