diff --git a/modules/graphical/default.nix b/modules/graphical/default.nix
index cad10837..ef628f9a 100644
--- a/modules/graphical/default.nix
+++ b/modules/graphical/default.nix
@@ -93,7 +93,7 @@ in
       home.packages = [
         alacritty
         chromium
-        firefox
+        firefox-wayland
 
         flameshot
         libnotify
diff --git a/profiles/base-user/.config/vifm/vifmrc b/profiles/base-user/.config/vifm/vifmrc
index 400aea0d..ea4862aa 100644
--- a/profiles/base-user/.config/vifm/vifmrc
+++ b/profiles/base-user/.config/vifm/vifmrc
@@ -223,7 +223,7 @@ filextype *.html,*.htm
         \ {Open with vim}
         \ nvim %f,
         \ {Open with firefox}
-        \ firefox-developer-edition %f &,
+        \ firefox %f &,
 filetype *.html,*.htm links, lynx
 
 " Object
diff --git a/profiles/base-user/mimeapps.nix b/profiles/base-user/mimeapps.nix
index 25f8ee38..ea2333ce 100644
--- a/profiles/base-user/mimeapps.nix
+++ b/profiles/base-user/mimeapps.nix
@@ -12,8 +12,9 @@
     "application/xhtml+xml" = [ "firefox.desktop" ];
     "application/x-extension-xhtml" = [ "firefox.desktop" ];
     "application/x-extension-xht" = [ "firefox.desktop" ];
-    "image/jpeg" = [ "viewnior.desktop" "gpicview.desktop" ];
-    "image/png" = [ "viewnior.desktop" "gpicview.desktop" ];
+    "image/jpeg" = [ "org.gnome.eog.desktop" ];
+    "image/png" = [ "org.gnome.eog.desktop" ];
+    "video/mp4" = [ "vlc.desktop" ];
     "text/plain" = [ "firefox.desktop" ];
     "x-scheme-handler/mailto" = [ "userapp-Thunderbird.desktop" ];
     "message/rfc822" = [ "userapp-Thunderbird.desktop" ];