diff --git a/emacs.el b/emacs.el
index cdae6ee..2e6a029 100644
--- a/emacs.el
+++ b/emacs.el
@@ -31,9 +31,11 @@
 (require 'auto-complete)
 (global-auto-complete-mode t)
 
-;; Save backup files in .emacs
+;; Save backup files in temporary directory
+(setq backup-directory-alist
+      `((".*" . ,temporary-file-directory)))
 (setq auto-save-file-name-transforms
-      `((".*" ,(concat user-emacs-directory "auto-save/") t )))
+      `((".*" ,temporary-file-directory t)))
 
 ;; Mutt support.
 (setq auto-mode-alist (append '(("/tmp/mutt.*" . mail-mode)) auto-mode-alist))
@@ -61,17 +63,20 @@
  ;; 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.
+ '(ansi-color-names-vector
+   ["#3c3836" "#fb4934" "#b8bb26" "#fabd2f" "#83a598" "#d3869b" "#8ec07c" "#ebdbb2"])
  '(csv-separators (quote (";")))
- '(custom-enabled-themes (quote (atom-one-dark)))
+ '(custom-enabled-themes (quote (gruvbox)))
  '(custom-safe-themes
    (quote
-    ("08b8807d23c290c840bbb14614a83878529359eaba1805618b3be7d61b0b0a32" "6254372d3ffe543979f21c4a4179cd819b808e5dd0f1787e2a2a647f5759c1d1" "1160f5fc215738551fce39a67b2bcf312ed07ef3568d15d53c87baa4fd1f4d4e" default)))
+    ("c7a9a68bd07e38620a5508fef62ec079d274475c8f92d75ed0c33c45fbe306bc" "eb0a314ac9f75a2bf6ed53563b5d28b563eeba938f8433f6d1db781a47da1366" "a1289424bbc0e9f9877aa2c9a03c7dfd2835ea51d8781a0bf9e2415101f70a7e" "10e231624707d46f7b2059cc9280c332f7c7a530ebc17dba7e506df34c5332c4" "08b8807d23c290c840bbb14614a83878529359eaba1805618b3be7d61b0b0a32" "43bc55af3857f9e2dc14c4413739f36d758e4d75bcd9b67e9b7dc6d9fcc1db68" "6254372d3ffe543979f21c4a4179cd819b808e5dd0f1787e2a2a647f5759c1d1" "1160f5fc215738551fce39a67b2bcf312ed07ef3568d15d53c87baa4fd1f4d4e" default)))
+ '(fci-rule-color "#3E4451")
  '(inhibit-startup-screen t)
  '(jdee-global-classpath (quote ("/home/wilson/jdee-libs/")))
  '(jdee-server-dir "/opt/jdee-emacs-server/")
  '(package-selected-packages
    (quote
-    (literate-coffee-mode jdee javadoc-lookup pkgbuild-mode vala-snippets vala-mode phpunit ac-php php-completion php+-mode fish-mode hugo mips-mode stumpwm-mode slime muttrc-mode diff-hl magit wanderlust ## auctex yaml-mode typescript sass-mode php-mode outlined-elisp-mode monokai-theme markdown-mode fill-column-indicator edit-server dracula-theme dart-mode coffee-mode auto-complete atom-one-dark-theme atom-dark-theme)))
+    (focus web-mode bash-completion awk-it auto-complete-auctex moinmoin-mode tracwiki-mode mediawiki phabricator remark-mode csv-mode gruvbox-theme ac-math fish-mode hugo mips-mode stumpwm-mode slime muttrc-mode diff-hl magit wanderlust ## auctex yaml-mode typescript sass-mode php-mode outlined-elisp-mode monokai-theme markdown-mode fill-column-indicator edit-server dracula-theme dart-mode coffee-mode auto-complete atom-one-dark-theme atom-dark-theme)))
  '(send-mail-function (quote smtpmail-send-it)))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
diff --git a/fish/config.fish b/fish/config.fish
index c2f820b..33b2d27 100644
--- a/fish/config.fish
+++ b/fish/config.fish
@@ -1,4 +1,4 @@
-set -x PATH $PATH /usr/local/bin /usr/bin /bin /usr/local/games /usr/games ~/.pub/bin ~/.gem/ruby/2.4.0/bin
+set -x PATH $PATH /usr/local/bin /usr/bin /bin /usr/local/games /usr/games ~/.pub-cache/bin ~/.gem/ruby/2.4.0/bin
 
 set -x ARCHFLAGS -arch_x86_64
 
diff --git a/mutt/muttrc b/mutt/muttrc
index 21ff3e9..2b37e41 100644
--- a/mutt/muttrc
+++ b/mutt/muttrc
@@ -8,6 +8,8 @@ set sort = threads
 set sort_aux=last-date-received
 set sleep_time = 0
 
+set editor = "es"
+
 ## Work
 source "~/.mutt/work"
 folder-hook $folder 'source ~/.mutt/work'