diff --git a/homeManagerModules/desktop/wayland/default.nix b/homeManagerModules/desktop/wayland/default.nix
index f5c95646..d54e4943 100644
--- a/homeManagerModules/desktop/wayland/default.nix
+++ b/homeManagerModules/desktop/wayland/default.nix
@@ -23,7 +23,7 @@
 
     home.packages = with pkgs; [
       blueberry
-      gnome.file-roller
+      file-roller
       libnotify
       networkmanagerapplet
     ];
diff --git a/homeManagerModules/options.nix b/homeManagerModules/options.nix
index ba1c021e..2499a5c7 100644
--- a/homeManagerModules/options.nix
+++ b/homeManagerModules/options.nix
@@ -38,7 +38,7 @@ in {
 
       nemo.enable = lib.mkOption {
         description = "Cinnamon Nemo file manager.";
-        default = cfg.defaultApps.fileManager == pkgs.cinnamon.nemo;
+        default = cfg.defaultApps.fileManager == pkgs.nemo;
         type = lib.types.bool;
       };
 
@@ -79,8 +79,8 @@ in {
       enable = lib.mkEnableOption "Declaratively set default apps and file associations.";
       audioPlayer = lib.mkPackageOption pkgs "audio player" {default = ["celluloid"];};
       editor = lib.mkPackageOption pkgs "text editor" {default = ["vscodium"];};
-      fileManager = lib.mkPackageOption pkgs "file manager" {default = ["cinnamon" "nemo"];};
-      imageViewer = lib.mkPackageOption pkgs "image viewer" {default = ["gnome" "eog"];};
+      fileManager = lib.mkPackageOption pkgs "file manager" {default = ["nemo"];};
+      imageViewer = lib.mkPackageOption pkgs "image viewer" {default = ["eog"];};
       pdfViewer = lib.mkPackageOption pkgs "pdf viewer" {default = ["evince"];};
       terminal = lib.mkPackageOption pkgs "terminal emulator" {default = ["kitty"];};
       terminalEditor = lib.mkPackageOption pkgs "terminal text editor" {default = ["vim"];};
diff --git a/homeManagerModules/theme.nix b/homeManagerModules/theme.nix
index 5ee9e912..6335f836 100644
--- a/homeManagerModules/theme.nix
+++ b/homeManagerModules/theme.nix
@@ -8,7 +8,7 @@
 in {
   config = lib.mkIf cfg.theme.enable {
     home.packages = [
-      pkgs.gnome.adwaita-icon-theme
+      pkgs.adwaita-icon-theme
       pkgs.liberation_ttf
     ];
 
diff --git a/nixosModules/services/flatpak/default.nix b/nixosModules/services/flatpak/default.nix
index 9bfaacb2..13749b3c 100644
--- a/nixosModules/services/flatpak/default.nix
+++ b/nixosModules/services/flatpak/default.nix
@@ -5,7 +5,7 @@
   ...
 }: {
   config = lib.mkIf config.ar.services.flatpak.enable {
-    environment.systemPackages = with pkgs; [gnome.gnome-software];
+    environment.systemPackages = with pkgs; [gnome-software];
 
     fileSystems = let
       mkRoSymBind = path: {
@@ -18,8 +18,8 @@
         name = "system-icons";
         paths =
           (with pkgs; [
-            gnome.adwaita-icon-theme
-            gnome.gnome-themes-extra
+            adwaita-icon-theme
+            gnome-themes-extra
           ])
           ++ lib.optional (config.stylix.enable) config.stylix.cursor.package;