diff --git a/nixcfgs/users/js0ny/packages/cli.nix b/nixcfgs/users/js0ny/packages/cli.nix
index 8e043cc..87c7218 100644
--- a/nixcfgs/users/js0ny/packages/cli.nix
+++ b/nixcfgs/users/js0ny/packages/cli.nix
@@ -54,17 +54,11 @@
       miniserve
       jq
       srm
-      mediainfo
-      exiftool
       ddgr
       jujutsu
       github-copilot-cli
-      yt-dlp
       asciinema
       ansi2html
-      httpie
-      gron
-      jless
       unar
       trash-cli
       aria2
@@ -74,7 +68,11 @@
     ++ (
       if pkgs.stdenv.isDarwin
       then with pkgs; [duti]
-      else with pkgs; [bluetui]
+      else
+        with pkgs; [
+          bluetui
+          steam-run
+        ]
     );
 
   programs.nix-index.enable = true;
diff --git a/nixcfgs/users/js0ny/packages/gui.nix b/nixcfgs/users/js0ny/packages/gui.nix
index c135515..0ee1592 100644
--- a/nixcfgs/users/js0ny/packages/gui.nix
+++ b/nixcfgs/users/js0ny/packages/gui.nix
@@ -98,7 +98,6 @@ in {
       localsend
       cherry-studio
       kdePackages.kdeconnect-kde
-      picard
       qutebrowser
       ryubing
       qbittorrent
diff --git a/nixcfgs/users/js0ny/packages/media-tools.nix b/nixcfgs/users/js0ny/packages/media-tools.nix
new file mode 100644
index 0000000..a3d632a
--- /dev/null
+++ b/nixcfgs/users/js0ny/packages/media-tools.nix
@@ -0,0 +1,17 @@
+{pkgs, ...}: {
+  home.packages = with pkgs;
+    [
+      flac
+      mediainfo
+      exiftool
+      yt-dlp
+    ]
+    ++ (
+      if pkgs.stdenv.isLinux
+      then
+        with pkgs; [
+          picard
+        ]
+      else []
+    );
+}
diff --git a/nixcfgs/users/js0ny/programs/picard.nix b/nixcfgs/users/js0ny/programs/picard.nix
new file mode 100644
index 0000000..603b093
--- /dev/null
+++ b/nixcfgs/users/js0ny/programs/picard.nix
@@ -0,0 +1,29 @@
+{
+  lib,
+  pkgs,
+  ...
+}: {
+  home.packages = [pkgs.picard];
+
+  xdg.configFile."MusicBrainz/Picard-Override.ini".text = lib.generators.toINI {} {
+    setting = {
+      file_save_warning = false;
+      move_files = true;
+      rename_files = true;
+      show_new_user_dialog = false;
+    };
+  };
+
+  # Manually merge config
+  home.activation.mergePicardIni = lib.hm.dag.entryAfter ["writeBoundary"] ''
+    if [ -f ~/.config/MusicBrainz/Picard-Override.ini ]; then
+      # Create Picard.ini if it doesn't exist
+      touch ~/.config/MusicBrainz/Picard.ini
+
+      # Merge the override file into the main config
+      ${pkgs.crudini}/bin/crudini --merge ~/.config/MusicBrainz/Picard.ini < ~/.config/MusicBrainz/Picard-Override.ini
+
+      $DRY_RUN_CMD rm -f ~/.config/MusicBrainz/Picard-Override.ini
+    fi
+  '';
+}
diff --git a/nixcfgs/users/js0ny/zephyrus.nix b/nixcfgs/users/js0ny/zephyrus.nix
index 7bd6f38..810ac56 100644
--- a/nixcfgs/users/js0ny/zephyrus.nix
+++ b/nixcfgs/users/js0ny/zephyrus.nix
@@ -18,6 +18,7 @@
     ./packages/flatpak.nix
     ./packages/fonts.nix
     ./packages/stylix.nix
+    ./packages/media-tools.nix
 
     ./programs/antidots.nix
 
@@ -70,6 +71,7 @@
     ./programs/walker.nix
     ./programs/sioyek.nix
     ./programs/celluloid.nix
+    ./programs/picard.nix
 
     # Desktop Linux
     ./programs/desktop/gnome