diff --git a/.Xdefaults b/.Xdefaults
index a626c06..7678eaf 100644
--- a/.Xdefaults
+++ b/.Xdefaults
@@ -12,13 +12,17 @@ urxvt.termName:        rxvt-256color
 urxvt.visualBell:      true
 
 urxvt.perl-lib:        /usr/lib/urxvt/perl/
-urxvt.perl-ext-common: default,matcher,searchable-scrollback
+urxvt.perl-ext-common: default,url-select,keyboard-select
 urxvt.urlLauncher:     conkeror
+urxvt.url-select.launcher: conkeror
 urxvt.matcher.button:  1
+urxvt.keysym.M-Escape: perl:keyboard-select:activate
+urxvt.keysym.M-s: perl:keyboard-select:search
 
-urxvt.font: xft:Press Start 2P-10
-! xft:Monaco:weight=medium:pixelsize=18
-! urxvt.boldFont: xft:Monaco:weight=black:pixelsize=18
+urxvt.keysym.M-u: perl:url-select:select_next
+
+urxvt.font: xft:Monaco:weight=medium:pixelsize=18
+urxvt.boldFont: xft:Monaco:weight=black:pixelsize=18
 ! urxvt.italicFont: xft:Monaco:slant=italic:pixelsize=18
 
 urxvt.background: #111113
diff --git a/.conkerorrc/init.js b/.conkerorrc/init.js
index 3d247ba..9608427 100644
--- a/.conkerorrc/init.js
+++ b/.conkerorrc/init.js
@@ -254,4 +254,16 @@ function read_url_github_command_handler(input)
         || read_url_github_repo_command_handler(input);
 }
 
-read_url_handler_list = [read_url_github_command_handler];
+function read_url_local_port_handler(input)
+{
+    var m = /^lh (\d{1,5})$/.exec(input);
+
+    if (m) {
+        return "http://localhost:" + m[1];
+    }
+
+    return null;
+}
+
+read_url_handler_list = [read_url_local_port_handler,
+                         read_url_github_command_handler];
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 205aad0..11a390d 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -88,6 +88,9 @@
 (eval-after-load "info"
   '(require 'info+))
 
+(eval-after-load "jabber"
+  '(remove-hook 'jabber-alert-presence-hooks 'jabber-presence-echo))
+
 (eval-after-load "org"
   '(progn
      (require 'appt)
@@ -172,14 +175,17 @@
 (setq flymake-gui-warnings-enabled nil)
 (setq flymake-info-line-regexp
       (eval-when-compile
-        (regexp-opt '("Invalid name"))))
+        (regexp-opt '("Invalid name"
+                      "Missing docstring"
+                      "multiple imports on one line"
+                      "expected 2 blank lines, found 1"
+                      "TODO:"))))
 (setq flymake-log-file-name (expand-file-name "~/.emacs.d/flymake.log"))
 (setq flymake-log-level 0)
 (setq flymake-warn-line-regexp
       (eval-when-compile
         (regexp-opt '("warning"
                       "Warning"
-                      "Missing docstring"
                       "String statement has no effect"
                       "No value passed for parameter"
                       "imported but unused"))))
@@ -208,7 +214,7 @@
 (setq jabber-history-dir "~/.emacs.d/jabber")
 (setq jabber-roster-show-bindings nil)
 (setq jit-lock-defer-time 0.2)
-(setq mail-header-separator "")
+(setq magit-repo-dirs '("~/var/src/"))
 (setq message-log-max 1000)
 (setq message-send-mail-function 'message-send-mail-with-sendmail)
 (setq mode-line-position nil)
@@ -227,10 +233,10 @@
                                (oni:email ryuslash at ninthfloor dot org)
                                (oni:email thomas at aethon dot nl)))
 (setq org-agenda-custom-commands
-      '(("b" "Bookmarks to look at."
-         todo "LOOKAT")
-        ("w" "Work todo."
-         tags-todo "CATEGORY=\"Work\"")))
+      '(("wt" "Work todo."
+         tags-todo "CATEGORY=\"Work\"")
+        ("wm" "Myaethon2 todo."
+         tags-todo "CATEGORY=\"myaethon2\"")))
 (setq org-agenda-sorting-strategy
       '((agenda habit-down time-up priority-down category-keep)
         (todo priority-down category-up)
@@ -325,7 +331,6 @@
 (setq user-full-name "Tom Willemsen")
 (setq whitespace-style '(face trailing))
 (setq window-combination-resize t)
-(setq yas-prompt-functions '(yas-ido-prompt))
 
 (add-hook 'after-save-hook 'oni:after-save-func t)
 (add-hook 'before-save-hook 'oni:before-save-func)
@@ -339,6 +344,7 @@
 (add-hook 'go-mode-hook 'oni:go-mode-func)
 (add-hook 'gtags-mode-hook 'oni:gtags-mode-func)
 (add-hook 'html-mode-hook 'oni:html-mode-func)
+(add-hook 'jabber-alert-message-hooks 'oni:jabber-alert-message-func)
 (add-hook 'jabber-chat-mode-hook 'oni:jabber-chat-mode-func)
 (add-hook 'jabber-roster-mode-hook 'oni:jabber-roster-mode-func)
 (add-hook 'java-mode-hook 'oni:java-mode-func)
@@ -356,7 +362,6 @@
 (add-hook 'term-mode-hook 'oni:term-mode-func)
 (add-hook 'texinfo-mode-hook 'oni:texinfo-mode-func)
 (add-hook 'write-file-hooks 'oni:write-file-func)
-(add-hook 'yas-minor-mode-hook 'oni:yas-minor-mode-func)
 
 (global-set-key (kbd "'") 'oni:self-insert-dwim)
 (global-set-key (kbd "<XF86AudioNext>") 'emms-next)
@@ -366,6 +371,7 @@
 (global-set-key (kbd "<XF86HomePage>") 'oni:raise-scratch)
 (global-set-key (kbd "<XF86Mail>") 'oni:view-mail)
 (global-set-key (kbd "<XF86Tools>") 'oni:start-emms)
+(global-set-key (kbd "<f10>") 'git-project-show-files)
 (global-set-key (kbd "<f5>") 'ext:reload-buffer)
 (global-set-key (kbd "<f6>") 'jabber-switch-to-roster-buffer)
 (global-set-key (kbd "<f7>") 'magit-status)
@@ -382,6 +388,7 @@
 (global-set-key (kbd "C-c c") 'org-capture)
 (global-set-key (kbd "C-c i p") 'identica-update-status-interactive)
 (global-set-key (kbd "C-c p") 'oni:show-buffer-position)
+(global-set-key (kbd "C-c t") 'ansi-term)
 (global-set-key (kbd "C-d") 'oni:kill-region-or-forward-char)
 (global-set-key (kbd "C-e") 'oni:move-end-of-dwim)
 (global-set-key (kbd "C-k") 'oni:kill-region-or-line)
@@ -419,6 +426,8 @@
              '("^\\*.*\\*$" . ((bw-display-in-bottom-window . nil))))
 (add-to-list 'display-buffer-alist
              '("^\\*magit: .*\\*$" . ((display-buffer-same-window . nil))))
+(add-to-list 'display-buffer-alist
+             '("^\\*git-project-list\\*$" . ((git-project-show-window . nil))))
 
 (delete "   " mode-line-format)
 
diff --git a/.emacs.d/site-lisp/oni.el b/.emacs.d/site-lisp/oni.el
index 2338ecc..a480282 100644
--- a/.emacs.d/site-lisp/oni.el
+++ b/.emacs.d/site-lisp/oni.el
@@ -24,6 +24,8 @@
 
 ;;; Code:
 
+(autoload 'notifications-notify "notifications")
+
 (defmacro oni:define-mailbox (name email &optional signature longname)
   "Define a mailbox function for mailbox NAME with address EMAIL.
 Optionally set signature to SIGNATURE and use LONGNAME as the
@@ -57,7 +59,7 @@ DOT are intentionally being skipped."
 
 (defvar oni:required-packages
   '(graphviz-dot-mode htmlize magit rainbow-delimiters
-                      rainbow-mode yasnippet markdown-mode flymake
+                      rainbow-mode markdown-mode flymake
                       flymake-cursor pony-mode sauron dispass
                       expand-region fill-column-indicator
                       git-auto-commit-mode idomenu magit smex)
@@ -173,7 +175,6 @@ DOT are intentionally being skipped."
 
 (defun oni:html-mode-func ()
   "Function for `html-mode-hook'."
-  (yas-minor-mode)
   (fci-mode))
 
 (defun oni:indent-shift-left (start end &optional count)
@@ -217,6 +218,10 @@ If COUNT has been specified indent by that much, otherwise look at
       (setq count tab-width))
     (indent-rigidly start end count)))
 
+(defun oni:jabber-alert-message-func (from buffer text title)
+  (notifications-notify :title title
+                        :body text))
+
 (defun oni:jabber-chat-mode-func ()
   "Function for `jabber-chat-mode-hook'."
   (visual-line-mode)
@@ -373,9 +378,7 @@ When dealing with braces, add another line and indent that too."
 
 (defun oni:org-mode-func ()
   "Function for `org-mode-hook'."
-  (flyspell-mode)
-  (auto-fill-mode)
-  (yas-minor-mode))
+  (auto-fill-mode))
 
 (defun oni:php-mode-func ()
   "Function for `php-mode-hook'."
@@ -390,8 +393,7 @@ When dealing with braces, add another line and indent that too."
   "Function for `prog-mode-hook'."
   (rainbow-delimiters-mode)
   (fci-mode)
-  (pretty-symbols-mode)
-  (yas-minor-mode))
+  (pretty-symbols-mode))
 
 (defun oni:python-mode-func ()
   "Function for `python-mode-hook'."
@@ -547,9 +549,5 @@ for easy selection."
   "Function for `write-file-hooks'."
   (time-stamp))
 
-(defun oni:yas-minor-mode-func ()
-  "Function for `yas-minor-mode-hook'."
-  (yas-load-directory (car yas-snippet-dirs)))
-
 (provide 'oni)
 ;;; oni.el ends here
diff --git a/.emacs.d/themes/new-theme.el b/.emacs.d/themes/new-theme.el
index 1d5a454..04f9930 100644
--- a/.emacs.d/themes/new-theme.el
+++ b/.emacs.d/themes/new-theme.el
@@ -30,9 +30,9 @@
 (custom-theme-set-faces
  'new
  '(default ((t (:background "#111113" :foreground "#eeeeec"))))
- '(flymake-errline ((t (:background nil :underline (:color "#ff5555" :style wave)))))
- '(flymake-infoline ((t (:background nil :underline (:color "#55ff55" :style wave)))))
- '(flymake-warnline ((t (:background nil :underline (:color "#5555ff" :style wave)))))
+ '(flymake-errline ((t (:background nil :underline (:color "#d16979" :style wave)))))
+ '(flymake-infoline ((t (:background nil :underline (:color "#4da5d1" :style wave)))))
+ '(flymake-warnline ((t (:background nil :underline (:color "#d19317" :style wave)))))
  '(font-lock-comment-delimiter-face ((t (:foreground "#a9a9a9" :slant italic :weight bold))))
  '(font-lock-comment-face ((t (:foreground "#a9a9a9" :slant italic))))
  '(font-lock-constant-face ((t (:foreground "#93d8d8"))))
@@ -44,10 +44,12 @@
  '(font-lock-variable-name-face ((t (:foreground "#c39cc3"))))
  '(highlight ((t (:background "#171719"))))
  '(ido-subdir ((t (:foreground "#ff5d55"))))
+ '(italic ((t (:slant italic))))
  '(jabber-chat-prompt-foreign ((t (:foreground "#ff5d55"))))
  '(jabber-chat-prompt-local ((t (:foreground "#78a2c1"))))
  '(jabber-roster-user-online ((t (:foreground "#769ff2"))))
  '(link ((t (:foreground "#ffbb56" :underline t))))
+ '(magit-item-highlight ((t (:weight bold))))
  '(minibuffer-prompt ((t (:foreground "#78a2c1"))))
  '(mode-line ((t (:background "#222224" :foreground "#eeeeec" :box nil))))
  '(mode-line-inactive ((t (:background "#171719" :foreground "#999999" :box nil))))
diff --git a/.xinitrc b/.xinitrc
old mode 100644
new mode 100755
index c48a296..8de9f49
--- a/.xinitrc
+++ b/.xinitrc
@@ -1,7 +1,19 @@
-
+#!/bin/bash
 xmodmap ~/.Xmodmap
 
+<<<<<<< HEAD
 emacs --daemon &
+=======
+# Source scripts in /etc/X11/xinit/xinitrc.d/
+if [ -d /etc/X11/xinit/xinitrc.d ]; then
+    for f in /etc/X11/xinit/xinitrc.d/*; do
+        [ -x "$f" ] && . "$f"
+    done
+    unset f
+fi
+
+{ emacs --daemon & } && sleep 1
+>>>>>>> origin/master
 
 pidof mpdscribble >& /dev/null
 if [ $? -ne 0 ]
@@ -9,7 +21,5 @@ then
     mpdscribble &
 fi
 
-# rox -b Default
-
 test -n "$1" && wm=$1 || wm="awesome" # wm="emacsclient -ce \"(oni:wm-init)\""
 exec $wm