diff --git a/system/gui/dwm.nix b/system/gui/dwm.nix
index 268cea6..ad804cb 100644
--- a/system/gui/dwm.nix
+++ b/system/gui/dwm.nix
@@ -25,8 +25,11 @@
 
         # Add dependencies for dwmipc / polybar communication patches
         buildInputs = previousAttrs.buildInputs ++ (with pkgs; [
+          # Dependencies for swallow patch
           xorg.libxcb
           xorg.xcbutil
+
+          # Dependencies for dwm-ipc patch
           yajl
           jsoncpp
         ]);
@@ -49,12 +52,25 @@
     executable = "/bin/redshift-gtk";
   };
 
+  # File Manager
+  programs.thunar = {
+    enable = true;
+    plugins = with pkgs.xfce; [
+      thunar-volman
+      thunar-archive-plugin
+      thunar-media-tags-plugin
+    ];
+  };
+
   environment.systemPackages = with pkgs; [
     # X11 Utilities
     arandr
     autorandr
     unclutter-xfixes
 
+    # Wallpaper
+    nitrogen
+
     # Terminal
     kitty
 
diff --git a/system/utilities/cloud.nix b/system/utilities/cloud.nix
new file mode 100644
index 0000000..fcf3823
--- /dev/null
+++ b/system/utilities/cloud.nix
@@ -0,0 +1,7 @@
+{ config, lib, pkgs, userSettings, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    rclone
+  ];
+}
diff --git a/system/utilities/default.nix b/system/utilities/default.nix
index b3d109d..18046c3 100644
--- a/system/utilities/default.nix
+++ b/system/utilities/default.nix
@@ -9,5 +9,6 @@
     ./backups.nix
     ./user-shell.nix
     ./samba.nix
+    ./cloud.nix
   ];
 }
diff --git a/user/media/creation.nix b/user/media/creation.nix
index e0323c9..efcfe11 100644
--- a/user/media/creation.nix
+++ b/user/media/creation.nix
@@ -5,5 +5,6 @@
     blender
     obs-studio
     freecad
+    sweethome3d.application
   ]);
 }
diff --git a/user/media/players.nix b/user/media/players.nix
index 997544f..65b90bc 100644
--- a/user/media/players.nix
+++ b/user/media/players.nix
@@ -9,6 +9,7 @@
     spotify
     spicetify-cli
     ani-cli
+    mangal
     calibre
   ]);
 }
diff --git a/user/productivity/math.nix b/user/productivity/math.nix
new file mode 100644
index 0000000..9b0f3c8
--- /dev/null
+++ b/user/productivity/math.nix
@@ -0,0 +1,8 @@
+{ config, lib, pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    qalculate-gtk
+    octave
+  ];
+}
diff --git a/user/utilities/default.nix b/user/utilities/default.nix
index 961b3b8..4332a76 100644
--- a/user/utilities/default.nix
+++ b/user/utilities/default.nix
@@ -10,5 +10,6 @@
     ./xdg.nix
     ./screenshot.nix
     ./phone.nix
+    ./downloads.nix
   ];
 }
diff --git a/user/utilities/downloads.nix b/user/utilities/downloads.nix
new file mode 100644
index 0000000..ad9477a
--- /dev/null
+++ b/user/utilities/downloads.nix
@@ -0,0 +1,7 @@
+{ config, lib, pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    qbittorrent-qt5
+  ];
+}