diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index dbf4e69..3763c4f 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -13,7 +13,14 @@
             (add-to-list 'load-path directory)
             (let ((default-directory directory))
               (normal-top-level-add-subdirs-to-load-path)))
-        '("/usr/share/emacs/site-lisp" "~/.emacs.d/site-lisp")))
+        '("/usr/share/emacs/site-lisp" "~/.emacs.d/site-lisp"
+          "/usr/local/emacs/share/emacs/site-lisp"))
+  (mapc #'(lambda (directory)
+            (add-to-list 'load-path directory)
+            (let ((loaddefs (concat directory "/loaddefs.el")))
+              (when (file-exists-p loaddefs)
+                (load loaddefs))))
+        '("~/var/src/emacs/dispass.el" "~/var/src/emacs/mode-icons")))
 
 (require 'geiser-install)
 (require 'iso-transl)
@@ -60,27 +67,22 @@
   "Face for the supposedly empty line in commit messages."
   :group 'local)
 
-(eval-after-load "ebuff-menu"
-  '(define-key electric-buffer-menu-mode-map
-     (kbd "C-s") 'isearch-forward))
-
 (eval-after-load "em-term"
-  '(add-to-list 'eshell-visual-commands
-                "unison"))
+  '(add-to-list 'eshell-visual-commands "unison"))
 
 (eval-after-load "emms-source-file"
-      '(progn
-         (require 'emms-setup)
+  '(progn
+     (require 'emms-setup)
+     (require 'emms-player-mpd)
 
-         (emms-standard)
-         (require 'emms-player-mpd)
+     (emms-standard)
 
-         (setq emms-player-mpd-server-name "localhost")
-         (setq emms-player-mpd-server-port "6600")
+     (add-to-list 'emms-info-functions 'emms-info-mpd)
+     (add-to-list 'emms-player-list 'emms-player-mpd)
 
-         (add-to-list 'emms-info-functions 'emms-info-mpd)
-         (add-to-list 'emms-player-list 'emms-player-mpd)
-         (setq emms-player-mpd-music-directory "/mnt/music/mp3")))
+     (setq emms-player-mpd-server-name "localhost")
+     (setq emms-player-mpd-server-port "6600")
+     (setq emms-player-mpd-music-directory "/mnt/music/mp3")))
 
 (eval-after-load "flymake"
   '(progn
@@ -109,8 +111,8 @@
 (eval-after-load "jabber"
   '(remove-hook 'jabber-alert-presence-hooks 'jabber-presence-echo))
 
-(eval-after-load "mu4e"
-  '(require 'mu4e-init))
+(eval-after-load "newst-treeview"
+  '(require 'newsticker-init))
 
 (eval-after-load "org"
   '(require 'org-init))
@@ -211,6 +213,8 @@
            "line too long"
            "at least two spaces before inline comment"
            "trailing whitespace"
+           "imported but unused"
+           "Unused import"
            "too many blank lines"))))
 (setq flymake-log-file-name (expand-file-name "~/.emacs.d/flymake.log"))
 (setq flymake-log-level 0)
@@ -218,7 +222,6 @@
       (eval-when-compile
         (regexp-opt '("warning"
                       "Warning"
-                      "imported but unused"
                       "redefinition of unused"
                       "Redefining built-in"
                       "Redefining name"
@@ -290,6 +293,7 @@
 (setq window-combination-resize t)
 (setq yas-prompt-functions '(yas-ido-prompt))
 
+(add-hook 'after-change-major-mode-hook 'set-current-mode-icon)
 (add-hook 'after-save-hook 'oni:after-save-func t)
 (add-hook 'before-save-hook 'oni:before-save-func)
 (add-hook 'c-mode-hook 'oni:c-mode-func)
@@ -376,7 +380,7 @@
 
 (add-to-list
  'display-buffer-alist
- '("^\\*magit: .*\\*$" . ((display-buffer-same-window . nil))))
+ '(".*" . ((display-buffer-same-window . nil))))
 (add-to-list
  'display-buffer-alist
  '("^\\*git-project-list\\*$" . ((git-project-show-window . nil))))