diff --git a/README.md b/README.md
index d8c9805..4f421c0 100644
--- a/README.md
+++ b/README.md
@@ -1,21 +1,32 @@
-# dotfiles
+# Dotfiles
 
-I primarily use OS X and Arch Linux.
+I primarily use OS X and [NixOS](http://nixos.org/).
 
-Current tool set:
-- tmux
-- zsh (I try fish every few months.. never sticks though)
-- vim + vundle + too many plugins
-- mbsync + notmuch + afew + alot + msmtp
-- weechat
-- Firefox + vimperator
+After ~15 years with Vim, I'm slowly making the switch to Emacs.
+I recently found Spacemacs and I'm giving that a try. I like it a lot so far.
+
+I'm also in the process of converting my notes, TODOs, bookmarks, etc. to Org mode. It ss going well.
 
-Linux-only tools:
-- XMonad + dzen2 + conky. Thinking about trying out i3.
-- urxvt
-- luakit, when my neckbeard starts itching
+Current tool set:
+- Terminal Multiplexer: [tmux](http://tmux.sourceforge.net/)
+- Shell: [zsh](http://www.zsh.org) & [Antigen](https://github.com/zsh-users/antigen) (I try [Fish](http://fishshell.com) every few months but it never sticks)
+- Editor: [Spacemacs](https://github.com/syl20bnr/spacemacs) (Emacs + Evil + lots of other things)
+- Email: [offlineimap](http://offlineimap.org/) + [mu](https://github.com/djcb/mu) + [mu4e](http://www.djcbsoftware.nl/code/mu/mu4e.html)
+- Browser: [Firefox](https://www.mozilla.org/en-US/firefox/)
+- Window Manager (Linux): [i3](https://i3wm.org/)
+- Window Manager (OS X): [Slate](https://github.com/jigish/slate)
+- Terminal Emulator (Linux): [rxvt-unicode](http://software.schmorp.de/pkg/rxvt-unicode.html)
+- Terminal Emulator (OS X): [iTerm 2](http://www.iterm2.com)
+- Launcher (Linux): [dmenu](http://tools.suckless.org/dmenu/)
+- Launcher (OS X): [Alfred](http://www.alfredapp.com)
+- Journal: [jrnl](http://maebert.github.io/jrnl/) (Although considering Org mode for this)
 
-OS X-only tools:
-- Alfred
-- iTerm
-- Slate
+TODO:
+- Switch from Gmail to [Fastmail](http://www.fastmail.com)
+- Switch to NixOS full time
+- Switch from Dropbox to... I don't know yet. BitTorrent Sync?
+- Get my spreadsheets off of Google docs. Also not sure what to switch to for these...
+- [vdirsyncer](https://github.com/untitaker/vdirsyncer) to sync CardDAV and CalDAV (to be hosted on Fastmail)
+  - Calendar: [khal](https://github.com/geier/khal) (Or maybe something in Emacs)
+  - Contacts: [khard](https://github.com/scheibler/khard)
+- Music: [mpd](http://www.musicpd.org/) or [Mopidy](https://www.mopidy.com/) & [ncmpcpp](http://ncmpcpp.rybczak.net/) (Currently using Spotify)