diff --git a/dotfiles/Xresources b/dotfiles/Xresources
index 1abb3a5e..e69de29b 100644
--- a/dotfiles/Xresources
+++ b/dotfiles/Xresources
@@ -1,104 +0,0 @@
-! ------------------------------------------------------------------------------
-! ROFI Color theme
-! ------------------------------------------------------------------------------
-
-rofi.font:             source code pro semibold 12
-
-#define BG
-#define RED #F44336
-#define LBLUE #0288D1
-#define GREEN #388E3C
-#define BGREY #37474F
-#define YELLOW #FFEB3B
-#define TEAL #26A69A
-#define DGREY #424242
-#define LAMBER #FFECB3
-#define LGREY #E0E0E0
-#define BLACK #000000
-#define BLUE2 #0D47A1
-#define BLUE1 #1E88E5
-#define WHITE #FFFFFF
-
-
-#define _GREEN #4CAF50
-#define _YELLOW #FFEB3B
-#define _BLUE #2196F3
-#define _TEAL #80CBC4
-#define _RED #F44336
-#define _DGREY #212121
-#define T_DGREY #DD212121
-#define NONE #00000000
-
-#define ROFIBG T_DGREY
-#define ROFI1 NONE
-#define ROFI2 NONE
-#define ROFIACCENT NONE
-#define ROFITEXT _BLUE
-
-! border width
-rofi.fullscreen: true
-rofi.bw:   0
-rofi.dpi: 200
-rofi.padding: 50
-rofi.color-enabled: true
-rofi.color-window: ROFIBG, ROFIACCENT, ROFIACCENT
-rofi.color-normal: ROFI1, ROFITEXT, ROFI1, ROFI2, _YELLOW
-
-! ------------------------------------------------------------------------------
-! URxvt
-! ------------------------------------------------------------------------------
-urxvt.saveLines: 1000000
-URxvt.font:     xft:source code pro:size=11:antialias=true
-URxvt.boldFont: xft:source code pro:bold:size=11:antialias=true
-
-! Base16 Default Dark
-! Scheme: Chris Kempson (http://chriskempson.com)
-
-#define base00 #181818
-#define base01 #282828
-#define base02 #383838
-#define base03 #585858
-#define base04 #b8b8b8
-#define base05 #d8d8d8
-#define base06 #e8e8e8
-#define base07 #f8f8f8
-#define base08 #ab4642
-#define base09 #dc9656
-#define base0A #f7ca88
-#define base0B #a1b56c
-#define base0C #86c1b9
-#define base0D #7cafc2
-#define base0E #ba8baf
-#define base0F #a16946
-
-*.foreground:   base05
-*.background:   base00
-*.cursorColor:  base05
-
-*.color0:       base00
-*.color1:       base08
-*.color2:       base0B
-*.color3:       base0A
-*.color4:       base0D
-*.color5:       base0E
-*.color6:       base0C
-*.color7:       base05
-
-*.color8:       base03
-*.color9:       base08
-*.color10:      base0B
-*.color11:      base0A
-*.color12:      base0D
-*.color13:      base0E
-*.color14:      base0C
-*.color15:      base07
-
-! Note: colors beyond 15 might not be loaded (e.g., xterm, urxvt),
-! use 'shell' template to set these if necessary
-*.color16:      base09
-*.color17:      base0F
-*.color18:      base01
-*.color19:      base02
-*.color20:      base04
-*.color21:      base06
-
diff --git a/dotfiles/lib/shellenv/emacs.sh b/dotfiles/lib/shellenv/emacs.sh
deleted file mode 100644
index 57897159..00000000
--- a/dotfiles/lib/shellenv/emacs.sh
+++ /dev/null
@@ -1,146 +0,0 @@
-# ATTENTION: Most of the functions in this file are part of a now
-# deprecated system for starting emacs that made the $EDITOR
-# environment variable work for git and other things
-
-# This approach is no longer in use.
-# alias emacs='_emacs -c -n '
-# is_osx && alias emacs='cocoa_emacs'
-# alias terminal_emacs='_emacs -t'
-# is_ssh && emacs="terminal_emacs"
-
-alias e='emacsclient -n'
-is_osx && alias emacs='reattach-to-user-namespace emacsclient -c -n'
-
-function kill_all_emacs {
-    emacs_pids | xargs kill -9
-}
-
-function edb {
-    \emacs --debug-init
-}
-
-function cocoa_emacs {
-    reattach-to-user-namespace zsh -c '_emacs -c -n "$@"'
-}
-
-function _emacs_daemon {
-    local server_name="$(_emacs_server_file)"
-    if ! emacs_daemon_exists "$server_name"; then
-        echo "Starting emacs with server name '$server_name'"
-        command emacs "$@" --daemon="$server_name"
-    fi
-}
-
-function _emacs {
-    _emacs_daemon
-    emacsclient "$@" --server-file="$(_emacs_server_file)"
-}
-
-function _emacs_daemon_arguments {
-    _emacs_daemon "$@"
-    emacsclient -c -n --server-file="$(_emacs_server_file)"
-}
-
-function _emacs_server_file {
-    local server_name="global"
-    [ ! -z ${PER_DIRECTORY_EMACS+y} ] && server_name="$(_current_dot_directory)"
-    echo $server_name
-}
-
-function emacs_daemon_exists {
-    ! test -z "$(ps aux | grep -v grep | grep -i "emacs.*--daemon=.*$1$")"
-}
-
-function _dot_directory {
-    echo $1 | sed "s:/:.:g"
-}
-
-function _current_dot_directory {
-    local directory="$(git rev-parse --show-toplevel 2> /dev/null || pwd)"
-    _dot_directory $directory
-}
-
-function existing_emacs {
-    # Return any existing emacs server file or the one that should
-    # be created if it doesn't exist.
-    local server_file="$(emacs_get_running_instances | head -n1)"
-    [ -z "$server_file" ] && server_file="$(_emacs_server_file)"
-    echo $server_file
-}
-
-function emacs_make_frame_if_none_exists {
-    execute_elisp '(make-frame-if-none-exists-and-focus)' > /dev/null
-    focus_emacs
-}
-
-function emacs_ensure_running_with_frame {
-    test -z "$(emacs_get_running_instances)" && emacs || \
-        emacs_make_frame_if_none_exists "$(emacs_get_running_instances | head -n1)"
-}
-
-function execute_elisp {
-    _emacs -e "$1"
-}
-
-function focus_emacs {
-    is_osx && osascript -e 'tell application "Emacs" to activate'
-}
-
-function emacs_pids {
-    local flags=''
-    is_osx && flags='-i'
-    pgrep "$flags" emacs
-}
-
-function emacs_get_running_instances {
-    emacs_pids | xargs ps -o command -p | egrep -o " --daemon=(.*)" | awk -F= '{print $2}' | sed 's/\^J3,4\^J//'
-}
-
-function emacs_open {
-    if ! emacs_daemon_exists; then
-    emacs
-    fi
-    emacs_make_frame_if_none_exists
-    [ ! -z "$*" ] && _emacs "$@"
-    focus_emacs
-}
-
-function time_emacs {
-    time \emacs --daemon="timing" || echo ''; emacsclient -e "(kill-emacs)" --server-file="timing"
-}
-
-function emacs_editor {
-    local client_path="$(which emacsclient)"
-    if is_osx; then
-        reattach-to-user-namespace "$client_path" "$@"
-    else
-        "$client_path" "$@"
-    fi
-}
-
-function emacs_pager {
-    TMP="$(mktemp -t emacs_pager.XXXXX --suffix=.ansi_color)"
-    echo $TMP
-    cat > "$TMP"
-    # -n may seem strange here, but it actually makes sense. There is
-    # -no need to wait since the buffer is inside of emacs now
-    emacs_editor "$TMP" -n "$@"
-    rm "$TMP"
-}
-
-# Make emacs the default editor.
-export EDITOR="$HOME/.lib/bin/editor.sh"
-# XXX: Set alternate editor to less on purpose to avoid having a new emacs
-# daemon start. For some reason the client doesn't detect some running emacs
-# serves and I'd rather it not try to start a new daemon when I'm already inside
-# emacs.
-export ALTERNATE_EDITOR="less"
-export VISUAL="$EDITOR"
-export GIT_EDITOR="$EDITOR"
-
-# This actually gets executed in dotfiles/lib/shellrc.sh to make sure that it takes precedence over other settings
-function inside_emacs_hook {
-    export PAGER="$HOME/.lib/bin/pager.sh"
-    export GITPAGER="$PAGER"
-    export MANPAGER="$PAGER"
-}