diff --git a/modules/common/applications/media.nix b/modules/common/applications/media.nix
index d5a5eb6..a5e4452 100644
--- a/modules/common/applications/media.nix
+++ b/modules/common/applications/media.nix
@@ -12,7 +12,7 @@
   config = lib.mkIf (config.gui.enable && config.media.enable) {
     home-manager.users.${config.user} = {
       home.packages = with pkgs; [
-        sxiv # Image viewer
+        nsxiv # Image viewer
         mupdf # PDF viewer
         zathura # PDF viewer
       ];
@@ -29,12 +29,12 @@
       xdg.mimeApps = {
         associations.added = {
           "application/pdf" = [ "pwmt.zathura-cb.desktop" ];
-          "image/*" = [ "sxiv.desktop" ];
+          "image/*" = [ "nsxiv.desktop" ];
         };
         associations.removed = { "application/pdf" = [ "mupdf.desktop" ]; };
         defaultApplications = {
           "application/pdf" = [ "pwmt.zathura-cb.desktop" ];
-          "image/*" = [ "sxiv.desktop" ];
+          "image/*" = [ "nsxiv.desktop" ];
         };
       };
 
diff --git a/modules/common/mail/aerc.nix b/modules/common/mail/aerc.nix
index 6f3969c..bfd0241 100644
--- a/modules/common/mail/aerc.nix
+++ b/modules/common/mail/aerc.nix
@@ -170,6 +170,8 @@
               "${pkgs.gawk}/bin/awk -f ${pkgs.aerc}/share/aerc/filters/colorize";
             "application/x-sh" = "${pkgs.bat}/bin/bat -fP -l sh";
             "application/pdf" = "${pkgs.zathura}/bin/zathura -";
+            "audio/*" = "${pkgs.mpv}/bin/mpv -";
+            "image/*" = "${pkgs.feh}/bin/feh -";
           };
         };
       };