diff --git a/dotfiles/config/terminator/config b/dotfiles/config/terminator/config
index 37da0bd7..ab9af71f 100644
--- a/dotfiles/config/terminator/config
+++ b/dotfiles/config/terminator/config
@@ -3,7 +3,9 @@
 [profiles]
   [[default]]
     use_system_font = False
-    font = Monaco 10
+    font = Monaco for Powerline 10
+    background_image = None
+    foreground_color = "#ffffff"
 [layouts]
   [[default]]
     [[[child1]]]
diff --git a/dotfiles/emacs.d b/dotfiles/emacs.d
index 486b996f..40f6afc7 160000
--- a/dotfiles/emacs.d
+++ b/dotfiles/emacs.d
@@ -1 +1 @@
-Subproject commit 486b996f18e3946cb531c946e1166fee89049306
+Subproject commit 40f6afc733731cd7ff4d7edc19bce8b229732d92
diff --git a/dotfiles/lib/shellrc/emacs.sh b/dotfiles/lib/shellrc/emacs.sh
index 8fdc2076..7f276cf7 100644
--- a/dotfiles/lib/shellrc/emacs.sh
+++ b/dotfiles/lib/shellrc/emacs.sh
@@ -1,4 +1,4 @@
-alias emacs='terminal_emacs'
+alias emacs='_emacs -c -n'
 is_osx && alias emacs='cocoa_emacs'
 alias terminal_emacs='_emacs -t'
 alias ec='_emacs -n '
diff --git a/dotfiles/tmux.conf b/dotfiles/tmux.conf
index cd2fc8ed..53a35fa9 100644
--- a/dotfiles/tmux.conf
+++ b/dotfiles/tmux.conf
@@ -1,4 +1,4 @@
-set-option -g default-command "reattach-to-user-namespace -l zsh"
+set-option -g default-command "zsh"
 
 unbind C-g
 set -g prefix C-o
diff --git a/dotfiles/xkb/keymap/default b/dotfiles/xkb/keymap/default
deleted file mode 100644
index fc6e3a9a..00000000
--- a/dotfiles/xkb/keymap/default
+++ /dev/null
@@ -1,7 +0,0 @@
-default xkb_keymap "default" {
-	xkb_keycodes  { include "evdev+aliases(qwerty)"	};
-	xkb_types     { include "complete"	};
-	xkb_compat    { include "complete"	};
-	xkb_symbols   { include "pc+us+inet(evdev)+ctrl(nocaps)+ctrl(swapcaps)"	};
-	xkb_geometry  { include "pc(pc105)"	};
-};
\ No newline at end of file
diff --git a/dotfiles/xkb/symbols/default b/dotfiles/xkb/symbols/default
deleted file mode 100644
index bdc7b385..00000000
--- a/dotfiles/xkb/symbols/default
+++ /dev/null
@@ -1,153 +0,0 @@
-// $Id: symbols 67048 2014-02-05 00:39:26Z vinc17/xvii $
-
-// See examples in /usr/share/X11/xkb/symbols
-
-xkb_symbols "local" {
-    key <LALT> {
-        type = "ONE_LEVEL",
-        symbols[Group1] = [ ISO_Level3_Shift ]
-    };
-    key <RALT> {
-        type = "ONE_LEVEL",
-        symbols[Group1] = [ ISO_Level3_Shift ]
-    };
-    key <LMTA> {
-        type = "ONE_LEVEL",
-        symbols[Group1] = [ Alt_L ]
-    };
-    key <RMTA> {
-        type = "ONE_LEVEL",
-        symbols[Group1] = [ Alt_L ]
-    };
-    key <TLDE> { [ grave, notsign, dead_grave ] };
-    key <AE01> { [ 1, exclam, onesuperior, exclamdown ] };
-    key <AE02> { [ 2, quotedbl, twosuperior, dead_diaeresis ] };
-    key <AE03> { [ 3, sterling, threesuperior, ellipsis ] };
-    key <AE04> { [ 4, dollar, EuroSign, currency ] };
-    key <AE05> { [ 5, percent ] };
-    key <AE06> { [ 6, asciicircum, diamond, dead_circumflex ] };
-    key <AE07> { [ 7, ampersand ] };
-    key <AE08> { [ 8, asterisk, U220F, multiply ] };
-    key <AE09> { [ 9, parenleft ] };
-    key <AE10> { [ 0, parenright, degree, dead_abovering ] };
-    key <AE11> { [ minus, underscore, hyphen, U2212 ] };
-    key <AE12> { [ equal, plus, notequal, plusminus ] };
-    key <BKSP> { [ BackSpace, 0x1000017 ] };
-    key <AD01> { [ q, Q, emptyset ] };
-    key <AD02> { [ w, W ] };
-    key <AD03> { [ e, E, U2203, U2200 ] };
-    key <AD04> { [ r, R, registered, radical ] };
-    key <AD05> { [ t, T ] };
-    key <AD06> { [ y, Y, yen ] };
-    key <AD07> { [ u, U, union, uparrow ] };
-    key <AD08> { [ i, I, intersection, infinity ] };
-    key <AD09> { [ o, O, oe, OE ] };
-    key <AD10> { [ p, P, section, paragraph ] };
-    key <AD11> { [ bracketleft,  braceleft,  dead_acute, leftarrow ] };
-    key <AD12> { [ bracketright, braceright, dead_grave, rightarrow ] };
-    key <AC01> { [ a, A, ae, AE ] };
-    key <AC02> { [ s, S, ssharp, U2211 ] };
-    key <AC03> { [ d, D, dagger, downarrow ] };
-    key <AC04> { [ f, F, U2500, U2502 ] };
-    key <AC05> { [ g, G, U250C, U251C ] };
-    key <AC06> { [ h, H, U2510, U2524 ] };
-    key <AC07> { [ j, J, U2514, U252C ] };
-    key <AC08> { [ k, K, U2518, U2534 ] };
-    key <AC09> { [ l, L, sterling, U253C ] };
-    key <AC10> { [ semicolon, colon, dead_diaeresis ] };
-    key <AC11> { [ apostrophe, at, dead_acute, dead_cedilla ] };
-    key <BKSL> { [ numbersign, asciitilde, dead_circumflex, dead_tilde ] };
-    key <LSGT> { [ backslash, bar, emdash, brokenbar ] };
-    key <AB01> { [ z, Z, guillemotleft, elementof ] };
-    key <AB02> { [ x, X, guillemotright, notelementof ] };
-    key <AB03> { [ c, C, copyright, includedin ] };
-    key <AB04> { [ v, V, logicalor, logicaland ] };
-    key <AB05> { [ b, B ] };
-    key <AB06> { [ n, N, endash ] };
-    key <AB07> { [ m, M, mu ] };
-    key <AB08> { [ comma, less, cedilla, lessthanequal ] };
-    key <AB09> { [ period, greater, periodcentered, greaterthanequal ] };
-    key <AB10> { [ slash, question, division, questiondown ] };
-    key <FK01> {
-        type = "CUSTFNKEY",
-        symbols[Group1] = [ eacute, Eacute, F1, XF86Switch_VT_1 ]
-    };
-    key <FK02> {
-        type = "CUSTFNKEY",
-        symbols[Group1] = [ egrave, Egrave, F2, XF86Switch_VT_2 ]
-    };
-    key <FK03> {
-        type = "CUSTFNKEY",
-        symbols[Group1] = [ ecircumflex, Ecircumflex, F3, XF86Switch_VT_3 ]
-    };
-    key <FK04> {
-        type = "CUSTFNKEY",
-        symbols[Group1] = [ ediaeresis, Ediaeresis, F4, XF86Switch_VT_4 ]
-    };
-    key <FK05> {
-        type = "CUSTFNKEY",
-        symbols[Group1] = [ acircumflex, Acircumflex, F5, XF86Switch_VT_5 ]
-    };
-    key <FK06> {
-        type = "CUSTFNKEY",
-        symbols[Group1] = [ icircumflex, Icircumflex, F6, XF86Switch_VT_6 ]
-    };
-    key <FK07> {
-        type = "CUSTFNKEY",
-        symbols[Group1] = [ ocircumflex, Ocircumflex, F7, XF86Switch_VT_7 ]
-    };
-    key <FK08> {
-        type = "CUSTFNKEY",
-        symbols[Group1] = [ ucircumflex, Ucircumflex, F8, XF86Switch_VT_8 ]
-    };
-    key <FK09> {
-        type = "CUSTFNKEY",
-        symbols[Group1] = [ agrave, Agrave, F9, XF86Switch_VT_9 ]
-    };
-    key <FK10> {
-        type = "CUSTFNKEY",
-        symbols[Group1] = [ ugrave, Ugrave, F10, XF86Switch_VT_10 ]
-    };
-    key <FK11> {
-        type = "CUSTFNKEY",
-        symbols[Group1] = [ idiaeresis, Idiaeresis, F11, XF86Switch_VT_11 ]
-    };
-    key <FK12> {
-        type = "CUSTFNKEY",
-        symbols[Group1] = [ ccedilla, Ccedilla, F12, XF86Switch_VT_12 ]
-    };
-    key <SPCE> { [ space, nobreakspace ] };
-    key <KPEQ> { [ equal ] };
-    key <KPDV> { [ slash ] };
-    key <KPMU> { [ asterisk ] };
-    key <KPSU> { [ minus ] };
-    key <KPAD> { [ plus ] };
-    key <KPEN> { [ Return ] };
-    key <KP7>  { [ 7 ] };
-    key <KP8>  { [ 8 ] };
-    key <KP9>  { [ 9 ] };
-    key <KP4>  { [ 4 ] };
-    key <KP5>  { [ 5 ] };
-    key <KP6>  { [ 6 ] };
-    key <KP1>  { [ 1 ] };
-    key <KP2>  { [ 2 ] };
-    key <KP3>  { [ 3 ] };
-    key <KP0>  { [ 0 ] };
-    key <KPDL> { [ period ] };
-    key <UP> {
-        type = "CUSTLEVELTHREE",
-        symbols[Group1] = [ Up, 0x1000012 ]
-    };
-    key <LEFT> {
-        type = "CUSTLEVELTHREE",
-        symbols[Group1] = [ Left, 0x1000001 ]
-    };
-    key <DOWN> {
-        type = "CUSTLEVELTHREE",
-        symbols[Group1] = [ Down, 0x1000013 ]
-    };
-    key <RGHT> {
-        type = "CUSTLEVELTHREE",
-        symbols[Group1] = [ Right, 0x1000005 ]
-    };
-};
diff --git a/dotfiles/xkb/types/default b/dotfiles/xkb/types/default
deleted file mode 100644
index 72c89969..00000000
--- a/dotfiles/xkb/types/default
+++ /dev/null
@@ -1,26 +0,0 @@
-// $Id: types 43746 2011-05-15 14:32:38Z vinc17/xvii $
-
-default xkb_types "local" {
-
-    include "complete"
-
-    type "CUSTFNKEY" {
-        modifiers = Shift+Lock+Control+Alt;
-        map[Shift] = Level2;
-        map[Lock] = Level2;
-        map[Control] = Level3;
-        map[Control+Alt] = Level4;
-        level_name[Level1] = "Base";
-        level_name[Level2] = "Caps";
-        level_name[Level3] = "Level3";
-        level_name[Level4] = "Ctrl+Alt";
-    };
-
-    type "CUSTLEVELTHREE" {
-        modifiers = LevelThree;
-        map[LevelThree] = Level2;
-        level_name[Level1] = "Base";
-        level_name[Level2] = "Alt";
-    };
-
-};
\ No newline at end of file
diff --git a/dotfiles/xsession b/dotfiles/xsession
deleted file mode 100644
index c16fc59a..00000000
--- a/dotfiles/xsession
+++ /dev/null
@@ -1,5 +0,0 @@
-if [ -d $HOME/.xkb/keymap ]; then
-  setxkbmap -types local -print | \
-    sed -e '/xkb_symbols/s/"[[:space:]]/+local&/' > $HOME/.xkb/keymap/custom
-  xkbcomp -w0 -I$HOME/.xkb -R$HOME/.xkb keymap/custom $DISPLAY
-fi
\ No newline at end of file
diff --git a/dotfiles/xsessionrc b/dotfiles/xsessionrc
new file mode 100644
index 00000000..492b77e3
--- /dev/null
+++ b/dotfiles/xsessionrc
@@ -0,0 +1 @@
+setxkbmap -layout "$(setxkbmap -print | awk -F + '/xkb_symbols/ {print $2}')" -option ctrl:nocaps
\ No newline at end of file
diff --git a/start.sh b/start.sh
index 227e7960..5c5bfc22 100644
--- a/start.sh
+++ b/start.sh
@@ -28,6 +28,7 @@ function osx() {
     brew install git
     brew install python
     sudo easy_install pip
+    sudo pip install cider
 }
 
 function go() {
diff --git a/tasks/linux.py b/tasks/linux.py
index c0e54e1b..cb89996b 100644
--- a/tasks/linux.py
+++ b/tasks/linux.py
@@ -1,5 +1,9 @@
+import os
+
 from invoke import ctask
 
+from util import RESOURCES_DIRECTORY
+
 
 @ctask(default=True)
 def all(ctx):
@@ -24,3 +28,16 @@ def get_sbt(ctx):
     ctx.run('wget http://dl.bintray.com/sbt/debian/sbt-0.13.5.deb '
             '--output-document=sbt.deb; sudo dpkg -i sbt.deb; '
             'sudo apt-get update; sudo apt-get install sbt; rm sbt.deb')
+
+
+@ctask
+def get_spotify(ctx):
+    pass
+
+
+@ctask
+def monaco(ctx):
+    ctx.run("sudo cp {0} /usr/share/fonts/fontfiles".format(
+        os.path.join(RESOURCES_DIRECTORY, "Monaco-Powerline.otf")
+    ))
+    ctx.run("sudo fc-cache -fv")