diff --git a/hosts/default.nix b/hosts/default.nix
index 4b930cf..2ca063c 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -8,6 +8,7 @@
       ../nixos/wayland.nix
       ../nixos/collections/dev.nix
       ../nixos/collections/gaming.nix
+      ../nixos/collections/media.nix
       ../nixos/collections/office.nix
       ./buckwheat/configuration.nix
       home-manager.nixosModules.home-manager {
diff --git a/nixos/cli.nix b/nixos/cli.nix
index 1c6c2cb..0b8c6c3 100644
--- a/nixos/cli.nix
+++ b/nixos/cli.nix
@@ -83,7 +83,6 @@
     dstat
     dua
     exiftool
-    ffmpeg
     fq
     fx
     glow
@@ -95,7 +94,6 @@
     htmlq
     hugo
     iftop
-    imagemagick
     ipcalc
     ipfetch
     iptraf-ng
@@ -131,7 +129,9 @@
     yai
     yank
     yq-go
-    yt-dlp
     zoxide
+    #Emacs
+    emacs
+    emacsPackages.doom
   ];
 }
diff --git a/nixos/collections/media.nix b/nixos/collections/media.nix
new file mode 100644
index 0000000..841c47a
--- /dev/null
+++ b/nixos/collections/media.nix
@@ -0,0 +1,13 @@
+# Media packages configuration.nix
+{ config, lib, pkgs, inputs, user, ... }:
+{
+  users.users.${user.name}.packages = with pkgs; [
+    ani-cli
+    ffmpeg
+    imagemagick
+    mangal
+    mpv
+    yt-dlp
+    ytfzf
+  ];
+}
diff --git a/nixos/collections/office.nix b/nixos/collections/office.nix
index 5884d16..4b7cddd 100644
--- a/nixos/collections/office.nix
+++ b/nixos/collections/office.nix
@@ -5,6 +5,7 @@
     ledger
     libreoffice
     #obsidian
+    mupdf
     pandoc
     pdftk
     qcal
diff --git a/nixos/gui.nix b/nixos/gui.nix
index 199cb11..05b2f3b 100644
--- a/nixos/gui.nix
+++ b/nixos/gui.nix
@@ -43,22 +43,16 @@
     dconf.enable = true;
   };
   users.users.${user.name}.packages = with pkgs; [
-    ani-cli
     bitwarden
     glib
     gparted
     lagrange
     librewolf
-    mangal
-    mpv
     mullvad-browser
-    mupdf
     #onionshare-gui
     signal-desktop
     simplex-chat-desktop
     tor-browser-bundle-bin
-    #urlview
-    ytfzf
   ];
   environment.systemPackages = with pkgs; [
     libnotify