diff --git a/config.org b/config.org
index 6d12266..8fab311 100644
--- a/config.org
+++ b/config.org
@@ -2481,6 +2481,10 @@
      (add-to-list 'auto-mode-alist '("\\.html?\\'" . web-mode))
      (setq web-mode-auto-close-style 2)
    #+END_SRC
+** ediff
+   #+BEGIN_SRC emacs-lisp
+   (setq ediff-window-setup-function 'ediff-setup-windows-plain)
+   #+END_SRC
 * Broken
 ** mu4e
 *** General config
diff --git a/custom.el b/custom.el
index 2ff4c3f..9b4ddf5 100644
--- a/custom.el
+++ b/custom.el
@@ -33,7 +33,7 @@
  '(org-trello-current-prefix-keybinding "C-c o")
  '(package-selected-packages
    (quote
-    (org-agenda all-the-icons-gnus arch-packer flop-frame elpy js2-mode pdf-tools clojure-mode paredit geiser magit ensime counsel-projectile helm-projectile projectile yasnippet irony elfeed org-caldav switch-window evil ivy company helm clj-refactor cider ac-cider overtone org-tree-slide tagedit web-mode langtool ledger-mode dmenu ocodo-svg-modelines skewer-mode inf-ruby restclient shell-pop org-toodledo dired-narrow dired+ org-wunderlist youtube-dl dired-aux elfeed-org calfw-ical mu4e org-protocol ox-reveal ob-clojure ob-core calfw-org org-habit epa-file ibuf-ext helm-config exwm-randr exwm-config exwm-systemtray glsl-mode oauth2 transpose-frame clojure-snippets common-lisp-snippets go-snippets haskell-snippets java-snippets yasnippet-bundle smex matlab-mode beacon company-flx dired-du diredful free-keys elfeed-goodies exwm-surf el-autoyas flycheck-clojure company-erlang company-ghc company-ghci company-go company-lua company-arduino company-c-headers company-cmake company-distel company-irony ac-c-headers ac-html ac-html-angular ac-slime ace-window exwm angular-mode smart-mode-line-powerline-theme ace-jump-mode ace-jump-buffer ace-jump-helm-line resize-window volume babel babel-repl lua-mode pocket-reader el-pocket magit-svn dirtree mu4e-alert habitica scala-mode auto-complete calfw calfw-gcal org-gcal nlinum nlinum-relative color-theme-modern linum-relative i3wm org-bullets windresize powerline-evil persistent-soft multi-term ergoemacs-mode epresent engine-mode)))
+    (w3m pulseaudio-control org-agenda all-the-icons-gnus arch-packer flop-frame elpy js2-mode pdf-tools clojure-mode paredit geiser magit ensime counsel-projectile helm-projectile projectile yasnippet irony elfeed org-caldav switch-window evil ivy company helm clj-refactor cider ac-cider overtone org-tree-slide tagedit web-mode langtool ledger-mode dmenu ocodo-svg-modelines skewer-mode inf-ruby restclient shell-pop org-toodledo dired-narrow dired+ org-wunderlist youtube-dl dired-aux elfeed-org calfw-ical mu4e org-protocol ox-reveal ob-clojure ob-core calfw-org org-habit epa-file ibuf-ext helm-config exwm-randr exwm-config exwm-systemtray glsl-mode oauth2 transpose-frame clojure-snippets common-lisp-snippets go-snippets haskell-snippets java-snippets yasnippet-bundle smex matlab-mode beacon company-flx dired-du diredful free-keys elfeed-goodies exwm-surf el-autoyas flycheck-clojure company-erlang company-ghc company-ghci company-go company-lua company-arduino company-c-headers company-cmake company-distel company-irony ac-c-headers ac-html ac-html-angular ac-slime ace-window exwm angular-mode smart-mode-line-powerline-theme ace-jump-mode ace-jump-buffer ace-jump-helm-line resize-window volume babel babel-repl lua-mode pocket-reader el-pocket magit-svn dirtree mu4e-alert habitica scala-mode auto-complete calfw calfw-gcal org-gcal nlinum nlinum-relative color-theme-modern linum-relative i3wm org-bullets windresize powerline-evil persistent-soft multi-term ergoemacs-mode epresent engine-mode)))
  '(safe-local-variable-values (quote ((org-log-done))))
  '(send-mail-function (quote mailclient-send-it))
  '(show-paren-mode t)