diff --git a/.config/mimeapps.list b/.config/mimeapps.list
index 55608a41..54c542ad 100644
--- a/.config/mimeapps.list
+++ b/.config/mimeapps.list
@@ -1,7 +1,11 @@
 [Added Associations]
 image/jpeg=sxiv.desktop
 video/H264=mpv.desktop
+text/html=qutebrowser.desktop
 
 [Default Applications]
+image/jpeg=sxiv.desktop
+image/png=sxiv.desktop
+text/html=qutebrowser.desktop
 x-scheme-handler/http=qutebrowser.desktop
 x-scheme-handler/https=qutebrowser.desktop
diff --git a/.emacs.d/lisp/main.el b/.emacs.d/lisp/main.el
index eee9a023..fa1e36f3 100644
--- a/.emacs.d/lisp/main.el
+++ b/.emacs.d/lisp/main.el
@@ -176,10 +176,12 @@
                                   (executable-find browse-url-conkeror-program)
                                   (executable-find browse-url-chrome-program)))
 
-;;; Extend MIME-types support (Matroska/mkv).
+;;; Extend MIME-types support for videos.
 (with-eval-after-load 'mailcap
   (add-to-list 'mailcap-mime-extensions '(".webm" . "video/webm"))
-  (add-to-list 'mailcap-mime-extensions '(".mp4" . "video/mpeg"))
+  (add-to-list 'mailcap-mime-extensions '(".mp4" . "video/mp4"))
+  (add-to-list 'mailcap-mime-extensions '(".flv" . "video/mp4"))
+  (add-to-list 'mailcap-mime-extensions '(".ogv" . "video/ogg"))
   (add-to-list 'mailcap-mime-extensions '(".mkv" . "video/x-matroska")))
 
 ;;; Default ispell dictionary. If not set, Emacs uses the current locale.