diff --git a/home/common/optional/desktop/cinnamon/default.nix b/home/common/optional/desktop/cinnamon/default.nix
new file mode 100644
index 0000000..65b3071
--- /dev/null
+++ b/home/common/optional/desktop/cinnamon/default.nix
@@ -0,0 +1 @@
+{imports = [../common];}
diff --git a/home/common/optional/desktop/common/default.nix b/home/common/optional/desktop/common/default.nix
new file mode 100644
index 0000000..f349273
--- /dev/null
+++ b/home/common/optional/desktop/common/default.nix
@@ -0,0 +1,12 @@
+{pkgs, ... }: {
+  imports = [
+    ./firefox.nix
+  ];
+  # Global packages for desktop environments
+  home.packages = [
+    pkgs.kitty
+    pkgs.zathura
+    pkgs.xfce.thunar
+    pkgs.wofi
+  ];
+}
diff --git a/home/common/optional/firefox.nix b/home/common/optional/desktop/common/firefox.nix
similarity index 100%
rename from home/common/optional/firefox.nix
rename to home/common/optional/desktop/common/firefox.nix
diff --git a/home/common/optional/desktop/hyprland/default.nix b/home/common/optional/desktop/hyprland/default.nix
index 3417242..002fc7f 100644
--- a/home/common/optional/desktop/hyprland/default.nix
+++ b/home/common/optional/desktop/hyprland/default.nix
@@ -7,6 +7,8 @@
 
   imports = [
     ../wallpaper-changer/swww-wallpaper-changer
+    ../common
+    ../waybar.nix
   ];
   wayland.windowManager.hyprland = {
     enable = true;
@@ -25,7 +27,7 @@
 
       ${monitor}
       $terminal = kitty
-      $fileManager = dolphin
+      $fileManager = thunar
       $menu = wofi --show drun
 
       env = XCURSOR_SIZE,24
diff --git a/home/semita.nix b/home/semita.nix
index 65063c4..2340b66 100644
--- a/home/semita.nix
+++ b/home/semita.nix
@@ -9,14 +9,12 @@
     ./users/sam
 
     ./common/core
-    ./common/optional/sops.nix
-    ./common/optional/firefox.nix
 
     # Import optional
     ./common/optional/git.nix
+    ./common/optional/sops.nix
     ./common/optional/syncthing.nix
     ./common/optional/desktop/hyprland
-    ./common/optional/desktop/waybar.nix
 
   ];
 
diff --git a/home/sparky.nix b/home/sparky.nix
index 2a8ce4e..ba0a262 100644
--- a/home/sparky.nix
+++ b/home/sparky.nix
@@ -10,11 +10,11 @@
 
     ./common/core
     ./common/optional/sops.nix
-    ./common/optional/firefox.nix
 
     # Import optional
     ./common/optional/git.nix
     ./common/optional/syncthing.nix
+    ./common/optional/desktop/cinnamon
 
   ];
 monitors = [