diff --git a/flake.nix b/flake.nix
index f126a57..e24c3c5 100755
--- a/flake.nix
+++ b/flake.nix
@@ -93,7 +93,7 @@
 
                 home-manager.darwinModules.home-manager
                 (import-tree ./hosts/common)
-                (import-tree ./hosts/darwin/home)
+                (import-tree ./hosts/darwin/home/users)
               ];
             };
           };
diff --git a/hosts/darwin/home/partials/env.nix b/hosts/darwin/home/partials/env.nix
new file mode 100644
index 0000000..90b0dee
--- /dev/null
+++ b/hosts/darwin/home/partials/env.nix
@@ -0,0 +1,19 @@
+{
+  config,
+  ...
+}:
+let
+  wallpaperPath = "${config.home.homeDirectory}/.config/wallpaper/current-wallpaper.jpg";
+in
+{
+  # Create wallpaper directory and download wallpaper
+  home.file.".config/wallpaper/current-wallpaper.jpg" = {
+    source = ./walls.jpg;
+  };
+
+  # Set wallpaper using activation script
+  home.activation.setWallpaper = config.lib.dag.entryAfter [ "writeBoundary" ] ''
+    # Set wallpaper for all desktops using osascript
+    $DRY_RUN_CMD /usr/bin/osascript -e "tell application \"System Events\" to tell every desktop to set picture to \"${wallpaperPath}\""
+  '';
+}
diff --git a/hosts/darwin/home/partials/shells.nix b/hosts/darwin/home/partials/shells.nix
new file mode 100644
index 0000000..643791a
--- /dev/null
+++ b/hosts/darwin/home/partials/shells.nix
@@ -0,0 +1,6 @@
+{ pkgs, ... }:
+{
+  home.packages = with pkgs; [
+    aria2
+  ];
+}
diff --git a/hosts/darwin/home/partials/walls.jpg b/hosts/darwin/home/partials/walls.jpg
new file mode 100644
index 0000000..3b9f4aa
Binary files /dev/null and b/hosts/darwin/home/partials/walls.jpg differ
diff --git a/hosts/darwin/home/alistreaza.nix b/hosts/darwin/home/users/alistreaza.nix
similarity index 88%
rename from hosts/darwin/home/alistreaza.nix
rename to hosts/darwin/home/users/alistreaza.nix
index f34919e..58a7f44 100644
--- a/hosts/darwin/home/alistreaza.nix
+++ b/hosts/darwin/home/users/alistreaza.nix
@@ -1,9 +1,11 @@
 { import-tree, ... }:
 {
   home-manager.users.alistreaza = {
+
     imports = [
-      (import-tree ../../../modules/home/common)
-      (import-tree ../../../modules/home/darwin)
+      (import-tree ../../../../modules/home/common)
+      (import-tree ../../../../modules/home/darwin)
+      (import-tree ../partials)
     ];
 
     home = {
diff --git a/hosts/darwin/home/config/ghostty/config b/hosts/darwin/home/users/config/ghostty/config
similarity index 100%
rename from hosts/darwin/home/config/ghostty/config
rename to hosts/darwin/home/users/config/ghostty/config
diff --git a/hosts/nixos/home/partials/gnome/dconf.nix b/hosts/nixos/home/partials/gnome/dconf.nix
index cec9983..1726400 100644
--- a/hosts/nixos/home/partials/gnome/dconf.nix
+++ b/hosts/nixos/home/partials/gnome/dconf.nix
@@ -41,7 +41,6 @@ with lib.hm.gvariant;
       };
 
       "org/gnome/desktop/interface" = {
-        icon-theme = "Papirus";
         accent-color = "teal";
         color-scheme = "prefer-dark";
       };
diff --git a/hosts/nixos/home/partials/xdg.nix b/hosts/nixos/home/partials/xdg.nix
new file mode 100644
index 0000000..3a51d89
--- /dev/null
+++ b/hosts/nixos/home/partials/xdg.nix
@@ -0,0 +1,10 @@
+{ ... }:
+
+{
+  xdg = {
+    userDirs = {
+      enable = true;
+      createDirectories = true;
+    };
+  };
+}
diff --git a/modules/system/nixos/apps/gnome/apps.nix b/modules/system/nixos/apps/gnome/apps.nix
index 516a56b..0ba538e 100644
--- a/modules/system/nixos/apps/gnome/apps.nix
+++ b/modules/system/nixos/apps/gnome/apps.nix
@@ -15,9 +15,7 @@ in
   config = mkIf cfg.enable {
 
     environment = {
-      systemPackages = with pkgs; [
-        nautilus # Gnome files explorer
-      ];
+      systemPackages = with pkgs; [ nautilus ];
     };
 
     services.gvfs.enable = true; # SMB, FTP, ... access
diff --git a/modules/system/nixos/apps/gnome/shell.nix b/modules/system/nixos/apps/gnome/shell.nix
index d49c749..15316ba 100644
--- a/modules/system/nixos/apps/gnome/shell.nix
+++ b/modules/system/nixos/apps/gnome/shell.nix
@@ -33,9 +33,6 @@ in
         # Gnome terminal
         ghostty
 
-        # Gnome icons
-        papirus-icon-theme
-
         # Gnome Extensions
         gnomeExtensions.paperwm
         gnomeExtensions.app-hider