diff --git a/.arch-pkg-aur-zeus b/.arch-pkg-aur-zeus
index e38e70a0..c62f784f 100644
--- a/.arch-pkg-aur-zeus
+++ b/.arch-pkg-aur-zeus
@@ -4,10 +4,10 @@ bustle
 dropbox
 dropbox-cli
 emacs-yasnippet
-emacs-yasnippet-latex-git
 gsharkdown
 linux-custom
 movgrab
+msmtp-pwpatched
 otf-texgyre
 package-query
 pacman-color
diff --git a/.arch-pkg-explicit-zeus b/.arch-pkg-explicit-zeus
index 6311df14..6583184c 100644
--- a/.arch-pkg-explicit-zeus
+++ b/.arch-pkg-explicit-zeus
@@ -34,7 +34,6 @@ e2fsprogs
 emacs-lua-mode
 emacs-nox
 emacs-yasnippet
-emacs-yasnippet-latex-git
 epdfview
 fakeroot
 feh
@@ -91,7 +90,8 @@ mediainfo
 mercurial
 movgrab
 mplayer
-msmtp
+msmtp-mta
+msmtp-pwpatched
 mutt
 nano
 nasm
diff --git a/.arch-pkg-official-zeus b/.arch-pkg-official-zeus
index cab9a9c1..8e821c0c 100644
--- a/.arch-pkg-official-zeus
+++ b/.arch-pkg-official-zeus
@@ -11,7 +11,6 @@ atk
 atkmm
 atool
 attr
-auctex
 autoconf
 automake
 avahi
@@ -334,7 +333,7 @@ mozilla-common
 mpfr
 mpg123
 mplayer
-msmtp
+msmtp-mta
 mtdev
 musicbrainz
 mutt
diff --git a/.emacs b/.emacs
index f72da22c..270b3173 100644
--- a/.emacs
+++ b/.emacs
@@ -20,7 +20,7 @@
 (autoload 'linum-mode "linum" "toggle line numbers on/off" t)
 (global-set-key (kbd "C-<f5>") 'linum-mode)
 (setq linum-format "%d ")
-(global-linum-mode 1)
+(global-linum-mode 1) ; This may generate warnings. Bug?
 
 ;; Indentation
 ;(setq standard-indent 4) ;; Set standard indent to 2 rather that 4
@@ -66,15 +66,15 @@
 (setq-default fill-column 80)
 ;; (setq auto-fill-mode 1) ;; Does not work ?
 (add-hook 'text-mode-hook 'turn-on-auto-fill)
-(add-hook 'c-mode-common-hook 
-          (lambda ()
-            (auto-fill-mode 1)
-            (set (make-local-variable 'fill-nobreak-predicate)
-                 (lambda ()
-                   (not (eq (get-text-property (point) 'face)
-                            'font-lock-comment-face ))
-                   ))
-            ))
+;; (add-hook 'c-mode-common-hook 
+;;           (lambda ()
+;;             (auto-fill-mode 1)
+;;             (set (make-local-variable 'fill-nobreak-predicate)
+;;                  (lambda ()
+;;                    (not (eq (get-text-property (point) 'face)
+;;                             'font-lock-comment-face ))
+;;                    ))
+;;             ))
 
 
 ;; Man-mode
@@ -84,10 +84,12 @@
 ;; Theme
 ;;==============================================================================
 (custom-set-faces
-  ;; custom-set-faces was added by Custom.
-  ;; If you edit it by hand, you could mess it up, so be careful.
-  ;; Your init file should contain only one such instance.
-  ;; If there is more than one, they won't work right.
+ ;; custom-set-faces was added by Custom.
+ ;; If you edit it by hand, you could mess it up, so be careful.
+ ;; Your init file should contain only one such instance.
+ ;; If there is more than one, they won't work right.
+ '(lazy-highlight ((t (:background "blue"))))
+ '(link ((t (:foreground "cyan" :underline t))))
  '(minibuffer-prompt ((t (:foreground "cyan")))))
 
 ;;==============================================================================
@@ -99,11 +101,21 @@
 
 
 ;;==============================================================================
-;; Example of automode default modification
+;; Automode default modification
 ;;==============================================================================
+
+;; Read Matlab files in Octave mode.
 (setq auto-mode-alist
       (append
-       '(("\\.m$" . octave-mode)
+       '(("\\.m\\'" . octave-mode)
+         )
+       auto-mode-alist)
+      )
+
+;; Mutt support
+(setq auto-mode-alist
+      (append
+       '(("mutt.*" . text-mode)
          )
        auto-mode-alist)
       )
@@ -324,19 +336,22 @@
 ;;==============================================================================
 ;; Yasnippet
 ;;==============================================================================
+;; Yasnippet is slow when loading snipepts from source.
+;; Generate a bundle instead: yas/compile-bundle
+;; Besides you can convert the generated file to bytecode.
+
+(add-to-list 'load-path "~/.emacs.d/plugins")
+(require 'yasnippet-bundle)
 
 ;; (add-to-list 'load-path "/usr/share/emacs/site-lisp/yas")
 ;; (require 'yasnippet) ;; not yasnippet-bundle
 ;; (yas/initialize)
 
-;; ;; Develop and keep personal snippets under ~/emacs.d/mysnippets
-;; ;; (setq yas/root-directory "~/emacs.d/mysnippets")
+;; ;; Personal snippets
 ;; (setq yas/root-directory "~/.emacs.d/plugins/yas/snippets" )
 
-;; ;; "/usr/share/emacs/site-lisp/yas/snippets"
-
-;; ;; Load the snippets
-;; (yas/load-directory "/usr/share/emacs/site-lisp/yas/snippets")
+;; Load the snippets
+;; (yas/load-directory  "~/.emacs.d/plugins/yas/snippets") ; Warning: slow!
 ;; (yas/load-directory yas/root-directory)
 
 ;;==============================================================================
@@ -417,3 +432,11 @@
 ;; (setq mediawiki-site-alist
 ;;       (append '("ArchWiki" "https://wiki.archlinux.org/" "username" "password" "Main Page")
 ;;               mediawiki-site-alist))
+
+
+;; (custom-set-variables
+;;  ;; custom-set-variables was added by Custom.
+;;  ;; If you edit it by hand, you could mess it up, so be careful.
+;;  ;; Your init file should contain only one such instance.
+;;  ;; If there is more than one, they won't work right.
+;;  )
diff --git a/.emacs.d/abbrev_defs b/.emacs.d/abbrev_defs
index 529bfd66..0feddcd7 100644
--- a/.emacs.d/abbrev_defs
+++ b/.emacs.d/abbrev_defs
@@ -103,6 +103,7 @@
     ("svp" "s'il vous pla�ît" nil 1)
     ("teh" "the" nil 1)
     ("tex" "TeX" nil 2)
+    ("tps" "temps" nil 4)
     ("tjrs" "toujours" nil 4)
     ("ts" "tous" nil 1)
     ("tt" "tout" nil 3)
diff --git a/.emacs.d/plugins/yas/snippets/text-mode/cc-mode/c-mode/fopen b/.emacs.d/plugins/yas/snippets/text-mode/cc-mode/c-mode/fopen
new file mode 100644
index 00000000..044c7430
--- /dev/null
+++ b/.emacs.d/plugins/yas/snippets/text-mode/cc-mode/c-mode/fopen
@@ -0,0 +1,3 @@
+#name : FILE *fp = fopen(..., ...);
+# --
+FILE *${fp} = fopen(${"file"}, "${r}");
diff --git a/.emacs.d/plugins/yas/snippets/text-mode/cc-mode/c-mode/printf b/.emacs.d/plugins/yas/snippets/text-mode/cc-mode/c-mode/printf
new file mode 100644
index 00000000..055461d1
--- /dev/null
+++ b/.emacs.d/plugins/yas/snippets/text-mode/cc-mode/c-mode/printf
@@ -0,0 +1,6 @@
+# -*- mode: snippet -*-
+# name : printf 
+# contributor : joaotavora
+# --
+printf ("${1:%s}\\n"${1:$(if (string-match "%" text) "," "\);")
+}$2${1:$(if (string-match "%" text) "\);" "")}
\ No newline at end of file
diff --git a/.emacs.d/plugins/yas/snippets/text-mode/cc-mode/do b/.emacs.d/plugins/yas/snippets/text-mode/cc-mode/do
new file mode 100644
index 00000000..5f7a3136
--- /dev/null
+++ b/.emacs.d/plugins/yas/snippets/text-mode/cc-mode/do
@@ -0,0 +1,6 @@
+#name : do { ... } while (...)
+# --
+do
+{
+    $0
+} while (${1:condition});
\ No newline at end of file
diff --git a/.emacs.d/plugins/yas/snippets/text-mode/cc-mode/if b/.emacs.d/plugins/yas/snippets/text-mode/cc-mode/if
new file mode 100644
index 00000000..c3fe10de
--- /dev/null
+++ b/.emacs.d/plugins/yas/snippets/text-mode/cc-mode/if
@@ -0,0 +1,6 @@
+#name : if (...) { ... }
+# --
+if (${1:condition})
+{
+    $0
+}
\ No newline at end of file
diff --git a/.emacs.d/plugins/yas/snippets/text-mode/cc-mode/inc b/.emacs.d/plugins/yas/snippets/text-mode/cc-mode/inc
new file mode 100644
index 00000000..ae333284
--- /dev/null
+++ b/.emacs.d/plugins/yas/snippets/text-mode/cc-mode/inc
@@ -0,0 +1,3 @@
+#name : #include "..."
+# --
+#include "$1"
diff --git a/.emacs.d/plugins/yas/snippets/text-mode/cc-mode/inc.1 b/.emacs.d/plugins/yas/snippets/text-mode/cc-mode/inc.1
new file mode 100644
index 00000000..66326cd7
--- /dev/null
+++ b/.emacs.d/plugins/yas/snippets/text-mode/cc-mode/inc.1
@@ -0,0 +1,3 @@
+#name : #include <...>
+# --
+#include <$1>
diff --git a/.emacs.d/plugins/yas/snippets/text-mode/cc-mode/once b/.emacs.d/plugins/yas/snippets/text-mode/cc-mode/once
new file mode 100644
index 00000000..1b63c394
--- /dev/null
+++ b/.emacs.d/plugins/yas/snippets/text-mode/cc-mode/once
@@ -0,0 +1,8 @@
+#name : #ifndef XXX; #define XXX; #endif
+# --
+#ifndef ${1:_`(upcase (file-name-nondirectory (file-name-sans-extension (buffer-file-name))))`_H_}
+#define $1
+
+$0
+
+#endif /* $1 */
\ No newline at end of file
diff --git a/.emacs.d/plugins/yas/snippets/text-mode/cc-mode/struct b/.emacs.d/plugins/yas/snippets/text-mode/cc-mode/struct
new file mode 100644
index 00000000..f50dabf6
--- /dev/null
+++ b/.emacs.d/plugins/yas/snippets/text-mode/cc-mode/struct
@@ -0,0 +1,6 @@
+#name : struct ... { ... }
+# --
+struct ${1:name}
+{
+    $0
+};
\ No newline at end of file
diff --git a/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/abstract.yasnippet b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/abstract.yasnippet
new file mode 100644
index 00000000..bf05994a
--- /dev/null
+++ b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/abstract.yasnippet
@@ -0,0 +1,9 @@
+# -*- mode: snippet -*-
+# contributor : Mads D. Kristensen <madsdk@gmail.com>
+# key : abs
+# group: sections
+# name : \abstract
+# --
+\begin{abstract}
+$0
+\end{abstract}
\ No newline at end of file
diff --git a/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/art.yasnippet b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/article.yasnippet
similarity index 100%
rename from .emacs.d/plugins/yas/snippets/text-mode/latex-mode/art.yasnippet
rename to .emacs.d/plugins/yas/snippets/text-mode/latex-mode/article.yasnippet
diff --git a/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/beam.yasnippet b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/beamer.yasnippet
similarity index 100%
rename from .emacs.d/plugins/yas/snippets/text-mode/latex-mode/beam.yasnippet
rename to .emacs.d/plugins/yas/snippets/text-mode/latex-mode/beamer.yasnippet
diff --git a/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/begin b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/begin
new file mode 100644
index 00000000..dc42d2fe
--- /dev/null
+++ b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/begin
@@ -0,0 +1,7 @@
+#contributor : Rodrigo Setti <rodrigosetti@gmail.com>
+#name : \begin{environment} ... \end{environment}
+# --
+
+\begin{${1:environment}}
+$0
+\end{$1}
diff --git a/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/begin.yasnippet b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/begin.yasnippet
new file mode 100644
index 00000000..e18b643c
--- /dev/null
+++ b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/begin.yasnippet
@@ -0,0 +1,10 @@
+# -*- mode: snippet -*-
+# contributor: Mads D. Kristensen <madsdk@gmail.com>
+# contributor : Bjorn Reese <breese@users.sourceforge.net>
+# key: begin
+# group: environments
+# name: \begin{environment} ... \end{environment}
+# --
+\begin{${1:$$(yas/choose-value (mapcar 'car (LaTeX-environment-list)))}}
+$0
+\end{$1}
\ No newline at end of file
diff --git a/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/bib.yasnippet b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/bib.yasnippet
new file mode 100644
index 00000000..9dc6ad7c
--- /dev/null
+++ b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/bib.yasnippet
@@ -0,0 +1,8 @@
+# -*- mode: snippet -*-
+# contributor: Mads D. Kristensen <madsdk@gmail.com>
+# key: bib
+# group: misc
+# name: \bibliography
+# --
+\bibliographystyle{plain}
+\bibliography{$1}$0
\ No newline at end of file
diff --git a/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/big.yasnippet b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/big.yasnippet
new file mode 100644
index 00000000..ff594799
--- /dev/null
+++ b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/big.yasnippet
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# contributor: Song Qiang <tsiangsung@gmail.com>
+# key: big
+# group: math
+# name: \bigl( ... \bigr)
+# --
+\\${1:$$(yas/choose-value '("big" "Big" "bigg" "Bigg"))}l( $0  \\$1r)
\ No newline at end of file
diff --git a/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/bigop.yasnippet b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/bigop.yasnippet
new file mode 100644
index 00000000..7aa214fa
--- /dev/null
+++ b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/bigop.yasnippet
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# contributor: François Garillot <francois@garillot.net>
+# key: bigop
+# group: math
+# name: \bigop_{n}^{}
+# --
+\\big${1:$$(yas/choose-value '("oplus" "otimes" "odot" "cup" "cap" "uplus" "sqcup" "vee" "wedge"))}_{$2}^{$3}$0
diff --git a/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/binom.yasnippet b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/binom.yasnippet
new file mode 100644
index 00000000..be450ee1
--- /dev/null
+++ b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/binom.yasnippet
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# contributor: Song Qiang <tsiangsung@gmail.com>
+# key: binom
+# group: math
+# name: \binom{n}{k}
+# --
+\binom{${1:n}}{${2:k}}
diff --git a/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/block.yasnippet b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/block.yasnippet
new file mode 100644
index 00000000..39f3cd0c
--- /dev/null
+++ b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/block.yasnippet
@@ -0,0 +1,9 @@
+# -*- mode: snippet -*-
+# contributor: Claudio Marforio <marforio@gmail.com> 
+# key: block
+# group: environments
+# name : \begin{*block} ... \end{*block}
+# --
+\begin{${1:$$(yas/choose-value '("block" "exampleblock" "alertblock"))}}{${2:Block Title}}
+
+\end{$1}
diff --git a/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/bold.yasnippet b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/bold.yasnippet
new file mode 100644
index 00000000..c717a7b3
--- /dev/null
+++ b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/bold.yasnippet
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# contributor: Márcio M. Ribeiro <marcio.mr@gmail.com>
+# key: bf
+# group: font
+# name: {\bf ... }
+# --
+{\bf $1}$0
\ No newline at end of file
diff --git a/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/case.yasnippet b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/case.yasnippet
new file mode 100644
index 00000000..70a67d0c
--- /dev/null
+++ b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/case.yasnippet
@@ -0,0 +1,9 @@
+# -*- mode: snippet -*-
+# contributor: Mads D. Kristensen <madsdk@gmail.com>
+# key: case
+# group: math
+# name: \begin{cases} ... \end{cases}
+# --
+\begin{cases}
+$0 \\\\
+\end{cases}
diff --git a/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/cha.yasnippet b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/cha.yasnippet
new file mode 100644
index 00000000..898e21d6
--- /dev/null
+++ b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/cha.yasnippet
@@ -0,0 +1,9 @@
+# -*- mode: snippet -*-
+# contributor : Mads D. Kristensen <madsdk@gmail.com>
+# key : cha
+# group: sections
+# name : \chapter
+# --
+\chapter{${1:name}}
+\label{${2:"waiting for reftex-label call..."$(unless yas/modified-p (reftex-label nil 'dont-insert))}}
+$0
\ No newline at end of file
diff --git a/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/chastar.yasnippet b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/chastar.yasnippet
new file mode 100644
index 00000000..d9a8bb9b
--- /dev/null
+++ b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/chastar.yasnippet
@@ -0,0 +1,8 @@
+# -*- mode: snippet -*-
+# contributor : Mads D. Kristensen <madsdk@gmail.com>
+# key : cha*
+# group: sections
+# name : \chapter*
+# --
+\chapter*{${1:name}}
+$0
\ No newline at end of file
diff --git a/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/cite.yasnippet b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/cite.yasnippet
new file mode 100644
index 00000000..32aba87c
--- /dev/null
+++ b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/cite.yasnippet
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# contributor : Marcio M. Ribeiro <marcio.mr@gmail.com>
+# key: cite
+# group: references
+# name : \cite
+# --
+\cite{${1:label$(unless yas/modified-p (reftex-citation nil 'dont-insert))}}$0
diff --git a/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/coprod.yasnippet b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/coprod.yasnippet
new file mode 100644
index 00000000..770bbaac
--- /dev/null
+++ b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/coprod.yasnippet
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# contributor: François Garillot <francois@garillot.net>
+# key: coprod
+# group: math
+# name: \coprod_{n}^{}
+# --
+\coprod_{$1}^{$2}$0
diff --git a/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/desc.yasnippet b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/desc.yasnippet
new file mode 100644
index 00000000..86129d73
--- /dev/null
+++ b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/desc.yasnippet
@@ -0,0 +1,9 @@
+# -*- mode: snippet -*-
+# contributor : Mads D. Kristensen <madsdk@gmail.com>
+# key : desc
+# group: environments
+# name : \begin{description} ... \end{description}
+# --
+\begin{description}
+\item[$0]
+\end{description}
diff --git a/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/doc.yasnippet b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/doc.yasnippet
new file mode 100644
index 00000000..6203573a
--- /dev/null
+++ b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/doc.yasnippet
@@ -0,0 +1,10 @@
+# -*- mode: snippet -*-
+# contributor: Mads D. Kristensen <madsdk@gmail.com>
+# key: doc
+# name: \documentclass
+# --
+\documentclass[$2]{${1:$$(yas/choose-value '("article" "report" "book" "letter"))}}
+
+\begin{document}
+$0
+\end{document}
diff --git a/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/em.yasnippet b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/em.yasnippet
new file mode 100644
index 00000000..47f76b6f
--- /dev/null
+++ b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/em.yasnippet
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# contributor: Márcio M. Ribeiro <marcio.mr@gmail.com>
+# key: em
+# group: font
+# name: {\em ...}
+# --
+{\em $1}$0
diff --git a/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/enum.yasnippet b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/enum.yasnippet
new file mode 100644
index 00000000..9d7e3982
--- /dev/null
+++ b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/enum.yasnippet
@@ -0,0 +1,9 @@
+# -*- mode: snippet -*-
+# contributor : Mads D. Kristensen <madsdk@gmail.com>
+# key: enum
+# group: environments
+# name : \begin{enumerate} ... \end{enumerate}
+# --
+\begin{enumerate}
+\item $0
+\end{enumerate}
diff --git a/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/eq.yasnippet b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/eq.yasnippet
new file mode 100644
index 00000000..64be33fe
--- /dev/null
+++ b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/eq.yasnippet
@@ -0,0 +1,10 @@
+# -*- mode: snippet -*-
+# contributor: Mads D. Kristensen <madsdk@gmail.com>
+# key: eq
+# group: math
+# name: \begin{equation} ... \end{equation}
+# --
+\begin{equation}
+\label{${1:"waiting for reftex-label call..."$(unless yas/modified-p (reftex-label nil 'dont-insert))}}
+$0
+\end{equation}
diff --git a/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/eqs.yasnippet b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/eqs.yasnippet
new file mode 100644
index 00000000..1eee28c3
--- /dev/null
+++ b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/eqs.yasnippet
@@ -0,0 +1,10 @@
+# -*- mode: snippet -*-
+# contributor: Mads D. Kristensen <madsdk@gmail.com>
+# key: eqs
+# group: math
+# name: \begin{align} ... \end{align}
+# --
+\begin{${1:$$(yas/choose-value '("align" "align*" "multline" "gather" "subequations"))}}
+\label{${2:"waiting for reftex-label call..."$(unless yas/modified-p (reftex-label nil 'dont-insert))}}
+$0
+\end{$1}
diff --git a/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/fig.yasnippet b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/fig.yasnippet
new file mode 100644
index 00000000..2152c363
--- /dev/null
+++ b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/fig.yasnippet
@@ -0,0 +1,12 @@
+# -*- mode: snippet -*-
+# contributor : Mads D. Kristensen <madsdk@gmail.com>
+# key : fig
+# group: environments
+# name : \begin{figure} ... \end{figure}
+# --
+\begin{figure}[htbp]
+  \centering
+  $0
+  \caption{${1:caption}}
+  \label{${2:"waiting for reftex-label call..."$(unless yas/modified-p (reftex-label nil 'dont-insert))}}
+\end{figure}
diff --git a/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/frac.yasnippet b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/frac.yasnippet
new file mode 100644
index 00000000..12fa0231
--- /dev/null
+++ b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/frac.yasnippet
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# contributor: Song Qiang <tsiangsung@gmail.com>
+# key: frac
+# group: math
+# name: \frac{numerator}{denominator}
+# --
+\frac{${1:numerator}}{${2:denominator}}$0
\ No newline at end of file
diff --git a/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/frame.yasnippet b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/frame.yasnippet
new file mode 100644
index 00000000..62158d84
--- /dev/null
+++ b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/frame.yasnippet
@@ -0,0 +1,9 @@
+# -*- mode: snippet -*-
+# contributor: Claudio Marforio <marforio@gmail.com> 
+# key: frame
+# group: environments
+# name : \begin{frame} ... \end{frame}
+# --
+\begin{frame}{${1:Frame Title}}
+
+\end{frame}
diff --git a/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/graphics.yasnippet b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/graphics.yasnippet
new file mode 100644
index 00000000..c3add51b
--- /dev/null
+++ b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/graphics.yasnippet
@@ -0,0 +1,6 @@
+# -*- mode: snippet -*-
+# contributor : Mads D. Kristensen <madsdk@gmail.com>
+# key : graphics
+# name : \includegraphics
+# --
+\includegraphics[width=${1:\linewidth}]{${2:file}}
\ No newline at end of file
diff --git a/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/href.yasnippet b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/href.yasnippet
new file mode 100644
index 00000000..78ce8772
--- /dev/null
+++ b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/href.yasnippet
@@ -0,0 +1,6 @@
+# -*- mode: snippet -*-
+# key: href
+# group: environments
+# name: \href{url}{text}
+# --
+\href{${1:url}}{${2:text}}$0
\ No newline at end of file
diff --git a/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/int.yasnippet b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/int.yasnippet
new file mode 100644
index 00000000..ead32d7d
--- /dev/null
+++ b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/int.yasnippet
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# contributor: Song Qiang <tsiangsung@gmail.com>
+# key: int
+# group: math
+# name: \int_{n}^{}
+# --
+\\${1:$$(yas/choose-value '("int" "oint" "iint" "iiint" "iiiint" "idotsint"))}{$2}^{$3}$0
diff --git a/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/it.yasnippet b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/it.yasnippet
new file mode 100644
index 00000000..d9052bf6
--- /dev/null
+++ b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/it.yasnippet
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# contributor: Mads D. Kristensen <madsdk@gmail.com>
+# key: it
+# group: environments
+# name: \item
+# --
+\item $0
\ No newline at end of file
diff --git a/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/item.yasnippet b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/item.yasnippet
new file mode 100644
index 00000000..14fb2d08
--- /dev/null
+++ b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/item.yasnippet
@@ -0,0 +1,9 @@
+# -*- mode: snippet -*-
+# contributor : Mads D. Kristensen <madsdk@gmail.com>
+# key : item
+# group: environments
+# name : \begin{itemize} ... \end{itemize}
+# --
+\begin{itemize}
+\item $0
+\end{itemize}
diff --git a/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/label.yasnippet b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/label.yasnippet
new file mode 100644
index 00000000..9bcc82b2
--- /dev/null
+++ b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/label.yasnippet
@@ -0,0 +1,7 @@
+ -*- mode: snippet -*-
+# contributor : Márcio M. Ribeiro <marcio.mr@gmail.com>
+# key: lab
+# group: references
+# name : \label
+# --
+\label{${1:label$(unless yas/modified-p (reftex-label nil 'dont-insert))}}$0
diff --git a/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/lim.yasnippet b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/lim.yasnippet
new file mode 100644
index 00000000..04f14173
--- /dev/null
+++ b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/lim.yasnippet
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# contributor: François Garillot <francois@garillot.net>
+# key: lim
+# group: math
+# name: \lim_{n}
+# --
+\lim_{$1}$0
diff --git a/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/math.yasnippet b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/math.yasnippet
new file mode 100644
index 00000000..cfbdd048
--- /dev/null
+++ b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/math.yasnippet
@@ -0,0 +1,9 @@
+# -*- mode: snippet -*-
+# contributor: Song Qiang <tsiangsung@gmail.com>
+# key: math
+# group: math
+# name: displaymath \[ ... \]
+# --
+\[
+$1
+\]
diff --git a/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/matrix.yasnippet b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/matrix.yasnippet
new file mode 100644
index 00000000..58d643ca
--- /dev/null
+++ b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/matrix.yasnippet
@@ -0,0 +1,11 @@
+# -*- mode: snippet -*-
+# contributor: Song Qiang <tsiangsung@gmail.com>
+# key: matrix
+# group: math
+# name: \begin{matrix} ... \end{}
+# --
+\begin{${1:$$(yas/choose-value '("pmatrix" "bmatrix" "Bmatrix" "vmatrix" "Vmatrix" "smallmatrix"))}}
+\label{${2:"waiting for reftex-label call..."$(unless yas/modified-p (reftex-label nil 'dont-insert))}}
+$0
+\end{$1}
+
diff --git a/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/minipage.yasnippet b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/minipage.yasnippet
new file mode 100644
index 00000000..447b31ef
--- /dev/null
+++ b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/minipage.yasnippet
@@ -0,0 +1,9 @@
+# -*- mode: snippet -*-
+# contributor: Mads D. Kristensen <madsdk@gmail.com>
+# key: minipage
+# group: environments
+# name: \begin{minipage}[position][width] ... \end{minipage}
+# --
+\begin{minipage}[${1:htbp}]{${2:1.0}${3:\linewidth}}
+  $0
+\end{minipage}
\ No newline at end of file
diff --git a/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/par.yasnippet b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/par.yasnippet
new file mode 100644
index 00000000..ffe3e140
--- /dev/null
+++ b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/par.yasnippet
@@ -0,0 +1,9 @@
+# -*- mode: snippet -*-
+# contributor : Mads D. Kristensen <madsdk@gmail.com>
+# key: par
+# group: sections
+# name : \paragraph
+# --
+\paragraph{${1:name}}
+\label{${2:"waiting for reftex-label call..."$(unless yas/modified-p (reftex-label nil 'dont-insert))}}
+$0
\ No newline at end of file
diff --git a/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/prod.yasnippet b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/prod.yasnippet
new file mode 100644
index 00000000..71744751
--- /dev/null
+++ b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/prod.yasnippet
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# contributor: François Garillot <francois@garillot.net>
+# key: prod
+# group: math
+# name: \prod_{n}^{}
+# --
+\prod_{$1}^{$2}$0
diff --git a/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/ref.yasnippet b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/ref.yasnippet
new file mode 100644
index 00000000..c3a4116a
--- /dev/null
+++ b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/ref.yasnippet
@@ -0,0 +1,7 @@
+ -*- mode: snippet -*-
+# contributor : Márcio M. Ribeiro <marcio.mr@gmail.com>
+# key: ref
+# group: references
+# name : \ref
+# --
+\ref{${1:label$(unless yas/modified-p (reftex-reference nil 'dont-insert))}}$0
\ No newline at end of file
diff --git a/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/sec.yasnippet b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/sec.yasnippet
new file mode 100644
index 00000000..993e5aa0
--- /dev/null
+++ b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/sec.yasnippet
@@ -0,0 +1,9 @@
+# -*- mode: snippet -*-
+# contributor : Mads D. Kristensen <madsdk@gmail.com>
+# key : sec
+# group: sections
+# name : \section
+# --
+\section{${1:name}}
+\label{${2:"waiting for reftex-label call..."$(unless yas/modified-p (reftex-label nil 'dont-insert))}}
+$0
\ No newline at end of file
diff --git a/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/secstar.yasnippet b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/secstar.yasnippet
new file mode 100644
index 00000000..1d6ff55d
--- /dev/null
+++ b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/secstar.yasnippet
@@ -0,0 +1,8 @@
+# -*- mode: snippet -*-
+# contributor : Mads D. Kristensen <madsdk@gmail.com>
+# key : sec*
+# group: sections
+# name : \section*
+# --
+\section*{${1:name}}
+$0
\ No newline at end of file
diff --git a/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/ssub.yasnippet b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/ssub.yasnippet
new file mode 100644
index 00000000..c78dae65
--- /dev/null
+++ b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/ssub.yasnippet
@@ -0,0 +1,9 @@
+# -*- mode: snippet -*-
+# contributor : Mads D. Kristensen <madsdk@gmail.com>
+# key: ssub
+# group: sections
+# name : \subsubsection
+# --
+\subsubsection{${1:name}}
+\label{${2:"waiting for reftex-label call..."$(unless yas/modified-p (reftex-label nil 'dont-insert))}}
+$0
\ No newline at end of file
diff --git a/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/ssubstar.yasnippet b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/ssubstar.yasnippet
new file mode 100644
index 00000000..53994872
--- /dev/null
+++ b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/ssubstar.yasnippet
@@ -0,0 +1,8 @@
+# -*- mode: snippet -*-
+# contributor : Mads D. Kristensen <madsdk@gmail.com>
+# key: ssub*
+# group: sections
+# name : \subsubsection*
+# --
+\subsubsection*{${1:name}}
+$0
\ No newline at end of file
diff --git a/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/sub.yasnippet b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/sub.yasnippet
new file mode 100644
index 00000000..f71ebb26
--- /dev/null
+++ b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/sub.yasnippet
@@ -0,0 +1,9 @@
+# -*- mode: snippet -*-
+# contributor : Mads D. Kristensen <madsdk@gmail.com>
+# key: sub
+# group: sections
+# name : \subsection
+# --
+\subsection{${1:name}}
+\label{${2:"waiting for reftex-label call..."$(unless yas/modified-p (reftex-label nil 'dont-insert))}}
+$0
\ No newline at end of file
diff --git a/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/subfig.yasnippet b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/subfig.yasnippet
new file mode 100644
index 00000000..7388475c
--- /dev/null
+++ b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/subfig.yasnippet
@@ -0,0 +1,10 @@
+# -*- mode: snippet -*-
+# contributor : Mads D. Kristensen <madsdk@gmail.com>
+# key: subfig
+# group: environments
+# name : \subfigure
+# --
+\subfigure[${1:caption}]{
+  \label{${2:"waiting for reftex-label call..."$(unless yas/modified-p (reftex-label nil 'dont-insert))}}
+  $0
+}
diff --git a/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/substar.yasnippet b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/substar.yasnippet
new file mode 100644
index 00000000..3af6aaeb
--- /dev/null
+++ b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/substar.yasnippet
@@ -0,0 +1,8 @@
+# -*- mode: snippet -*-
+# contributor : Mads D. Kristensen <madsdk@gmail.com>
+# key: sub*
+# group: sections
+# name : \subsection*
+# --
+\subsection*{${1:name}}
+$0
\ No newline at end of file
diff --git a/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/sum.yasnippet b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/sum.yasnippet
new file mode 100644
index 00000000..2dd1ff51
--- /dev/null
+++ b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/sum.yasnippet
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# contributor: Song Qiang <tsiangsung@gmail.com>
+# key: sum
+# group: math
+# name: \sum_{n}^{}
+# --
+\sum_{$1}^{$2}$0
diff --git a/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/table.yasnippet b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/table.yasnippet
new file mode 100644
index 00000000..ebcc4444
--- /dev/null
+++ b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/table.yasnippet
@@ -0,0 +1,14 @@
+# -*- mode: snippet -*-
+# contributor : Mads D. Kristensen <madsdk@gmail.com>
+# key: table
+# group: environments
+# name : \begin{table} ... \end{table}
+# --
+\begin{table}[htbp]
+  \centering
+  \begin{tabular}{${3:format}}
+    $0
+  \end{tabular}
+  \caption{${1:caption}}
+  \label{${2:"waiting for reftex-label call..."$(unless yas/modified-p (reftex-label nil 'dont-insert))}}
+\end{table}
diff --git a/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/url.yasnippet b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/url.yasnippet
new file mode 100644
index 00000000..eb56f6b6
--- /dev/null
+++ b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/url.yasnippet
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# contributor: Mads D. Kristensen <madsdk@gmail.com>
+# key: url
+# group: environments
+# name: \url
+# --
+\url{${1:$$(yas/choose-value '("http" "ftp"))}://${2:address}}$0
\ No newline at end of file
diff --git a/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/use.yasnippet b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/use.yasnippet
new file mode 100644
index 00000000..8b990509
--- /dev/null
+++ b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/use.yasnippet
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# contributor: Mads D. Kristensen <madsdk@gmail.com>
+# key: use
+# group: misc
+# name: \usepackage
+# --
+\usepackage[$2]{$1}$0
\ No newline at end of file
diff --git a/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/verb.yasnippet b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/verb.yasnippet
new file mode 100644
index 00000000..c63f997d
--- /dev/null
+++ b/.emacs.d/plugins/yas/snippets/text-mode/latex-mode/verb.yasnippet
@@ -0,0 +1,11 @@
+# -*- mode: snippet -*-
+# contributor: Mads D. Kristensen <madsdk@gmail.com>
+# contributor : Bjorn Reese <breese@users.sourceforge.net>
+# contributor : Song Qiang <tsiangsung@gmail.com> 
+# key: verb
+# group: environments
+# name: \begin{verbatim} ... \end{verbatim}
+# --
+\begin{verbatim}
+$0
+\end{verbatim}
diff --git a/.emacs.d/plugins/yasnippet-bundle.elc b/.emacs.d/plugins/yasnippet-bundle.elc
new file mode 100644
index 00000000..29e8b995
Binary files /dev/null and b/.emacs.d/plugins/yasnippet-bundle.elc differ
diff --git a/.muttrc b/.muttrc
index 7daec161..b2e8583e 100644
--- a/.muttrc
+++ b/.muttrc
@@ -18,6 +18,12 @@ macro index <f2> '<sync-mailbox><enter-command>source ~/.mutt/$my_ac_personal<en
 macro index <f3> '<sync-mailbox><enter-command>source ~/.mutt/$my_ac_work<enter><change-folder>!<enter>'
 macro index <f4> '<sync-mailbox><enter-command>source ~/.mutt/$my_ac_university<enter><change-folder>!<enter>'
 
+#-------------------------------------------------------------------------------
+# General options
+#-------------------------------------------------------------------------------
+
+# TODO: why doesn't the $EDITOR variable work for connecting to emacs daemon?
+set editor="emacsclient -a \"\" -t"
 
 #-------------------------------------------------------------------------------
 # Receiving options
@@ -48,7 +54,88 @@ set beep_new = "yes"
 set mbox_type=Maildir
 set edit_headers=yes
 
-#set record=~/sent
-#set folder=~/mail
-#set mbox=+mbox
-#set postponed=+drafts
+
+
+
+#-------------------------------------------------------------------------------
+# Theme
+#-------------------------------------------------------------------------------
+
+
+# Colours for items in the index
+color index brightcyan black ~N
+# Hmm, don't like this.
+#color index brightgreen black "~N (~x byers.world)|(~x byers.x)|(~x langly.levallois123.axialys.net)|(~x the.earth.li)"
+color index brightyellow black ~F
+color index black green ~T
+color index brightred black ~D
+mono index bold ~N
+mono index bold ~F
+mono index bold ~T
+mono index bold ~D
+
+# Highlights inside the body of a message.
+
+# URLs
+color body brightgreen black "(http|ftp|news|telnet|finger)://[^ \"\t\r\n]*"
+color body brightgreen black "mailto:[-a-z_0-9.]+@[-a-z_0-9.]+"
+mono body bold "(http|ftp|news|telnet|finger)://[^ \"\t\r\n]*"
+mono body bold "mailto:[-a-z_0-9.]+@[-a-z_0-9.]+"
+
+# email addresses
+color body brightgreen black "[-a-z_0-9.%$]+@[-a-z_0-9.]+\\.[-a-z][-a-z]+"
+#mono body bold "[-a-z_0-9.%$]+@[-a-z_0-9.]+\\.[-a-z][-a-z]+"
+
+# header
+color header green black "^from:"
+color header green black "^to:"
+color header green black "^cc:"
+color header green black "^date:"
+color header yellow black "^newsgroups:"
+color header yellow black "^reply-to:"
+color header brightcyan black "^subject:"
+color header red black "^x-spam-rule:"
+color header green black "^x-mailer:"
+color header yellow black "^message-id:"
+color header yellow black "^Organization:"
+color header yellow black "^Organisation:"
+color header yellow black "^User-Agent:"
+color header yellow black "^message-id: .*pine"
+color header yellow black "^X-Fnord:"
+color header yellow black "^X-WebTV-Stationery:"
+color header yellow black "^X-Message-Flag:"
+color header yellow black "^X-Spam-Status:"
+color header yellow black "^X-SpamProbe:"
+color header red black "^X-SpamProbe: SPAM"
+
+
+# Coloring quoted text - coloring the first 7 levels:
+color quoted cyan black
+color quoted1 yellow black
+color quoted2 red black
+color quoted3 green black
+color quoted4 cyan black
+color quoted5 yellow black
+color quoted6 red black
+color quoted7 green black
+
+
+# Default color definitions
+#color hdrdefault white green
+color signature brightmagenta black
+color indicator black cyan 
+color attachment black green
+color error red black
+color message white black
+color search brightwhite magenta
+color status brightyellow blue
+color tree brightblue black
+color normal white black
+color tilde green black
+color bold brightyellow black
+#color underline magenta black
+color markers brightcyan black
+# Colour definitions when on a mono screen
+mono bold bold
+mono underline underline
+mono indicator reverse
diff --git a/.shell.d/alias_rc b/.shell.d/alias_rc
index efe3629b..b043b3f5 100644
--- a/.shell.d/alias_rc
+++ b/.shell.d/alias_rc
@@ -1,6 +1,6 @@
 ################################################################################
 ## Shell Config -- Alias Definitions.
-## Date 2012-06-21
+## Date 2012-07-02
 ################################################################################
 
 ##==============================================================================
@@ -20,17 +20,34 @@ if isShell "zsh"; then
     alias ssrc='source ~/.zshrc'
 fi
 
+## Enable color support of ls and also add handy aliases.
+if [ "$TERM" != "dumb" ]; then
+    eval "`dircolors -b`"
+fi
+
 ##==============================================================================
 ##==============================================================================
 
+## 'ls' redefinition
+alias ls='ls --color=auto -F -v'
+
+## Listing aliases
+alias l='ls -1'
+alias la='ls -lAh --group-directories-first' # Hidden files
+alias lc='ls -ltcrh --group-directories-first' # by change time
+alias lk='ls -lSrh --group-directories-first' # by size
+alias ll='ls -lh --group-directories-first' # Detailed view with human readable values.
+alias lx='ls -lXh --group-directories-first' # sort by extension
+
+# Misc
 alias cp="cp -i" # confirm before overwriting something
 alias xmx='xrdb -merge ~/.Xresources'
 alias grep='grep --color=auto'
  
 ## Emacs
 if [ -e "/usr/bin/emacs" ]; then
-    alias emacs='emacsclient -t -a "" -c'
-    alias emacs-reload="emacsclient -e '(kill-emacs)' >/dev/null 2>&1; /usr/bin/emacs --daemon"
+   alias em='emacsclient -a "" -t'
+   alias emacs-reload="emacsclient -e '(kill-emacs)' >/dev/null 2>&1; /usr/bin/emacs --daemon"
 fi
 
 ## Check colors supported by the current terminal.
@@ -87,26 +104,6 @@ fi
 
 # fi
 
-##==============================================================================
-## Listing aliases
-##==============================================================================
-
-## Enable color support of ls and also add handy aliases.
-if [ "$TERM" != "dumb" ]; then
-    eval "`dircolors -b`"
-fi
-
-## 'ls' redefinition
-alias ls='ls --color=auto -F -v'
-
-## Shortcuts
-alias l='ls -1'
-alias la='ls -lAh --group-directories-first' # Hidden files
-alias lc='ls -ltcrh --group-directories-first' # by change time
-alias lk='ls -lSrh --group-directories-first' # by size
-alias ll='ls -lh --group-directories-first' # Detailed view with human readable values.
-alias lx='ls -lXh --group-directories-first' # sort by extension
-
 ##==============================================================================
 ## Pacman aliases
 ##==============================================================================
diff --git a/.shell.d/main_rc b/.shell.d/main_rc
index fc207cca..2b001a4d 100644
--- a/.shell.d/main_rc
+++ b/.shell.d/main_rc
@@ -53,10 +53,8 @@ if [ "" != "$(command -v vim)" ]; then
     EDITOR=vim
 fi
 if [ "" != "$(command -v emacs)" ]; then
-    alias emacs='emacsclient -t'
-    EDITOR=emacs
-    # EDITOR="emacsclient --alternate-editor emacs +%d %s"
-
+   #EDITOR=emacs
+   EDITOR='emacsclient -a "" -t'
 fi
 export EDITOR