diff --git a/.gitmodules b/.gitmodules
index 9f52cb77..dda1b189 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "src/powerline"]
-	path = src/powerline
-	url = https://github.com/powerline/powerline.git
 [submodule "src/prezto"]
 	path = src/prezto
 	url = https://github.com/kejadlen/prezto.git
diff --git a/.tmux.conf b/.tmux.conf
index 9410add5..d18644f2 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -25,6 +25,23 @@ bind-key -T copy-mode-vi 'V' send -X select-line
 bind-key -T copy-mode-vi 'r' send -X rectangle-toggle
 bind-key -T copy-mode-vi 'y' send -X copy-pipe-and-cancel "reattach-to-user-namespace pbcopy"
 
+# colors
+set -g pane-active-border-fg brightred
+
+# statusline (shamelessly stolen from powerline)
+set-option -g status-interval 2
+set-option -g status-left "#{?client_prefix,#[fg=colour254]#[bg=colour31]#[bold]#[noitalics]#[nounderscore],#[fg=colour16]#[bg=colour254]#[bold]#[noitalics]#[nounderscore]} #S #{?client_prefix,#[fg=colour31],#[fg=colour254]}#[bg=colour235]#[nobold] "
+set-option -g status-left-length 20
+set-option -g status-right ""
+set-option -g status-style fg=colour231,bg=colour235
+
+set-option -g window-status-activity-style fg=colour11,bg=colour235
+set-option -g window-status-bell-style fg=colour1,bg=colour235
+set-option -g window-status-current-format "#[fg=colour235,bg=colour31,nobold,noitalics,nounderscore] #[fg=colour117,bg=colour31,nobold,noitalics,nounderscore]#I#F#[fg=colour231,bg=colour31,bold,noitalics,nounderscore] #W #[fg=colour31,bg=colour235,nobold,noitalics,nounderscore]"
+set-option -g window-status-format "#[fg=colour244,bg=colour235,nobold,noitalics,nounderscore] #I#{?window_flags,#F, } #[fg=colour240,bg=colour235,nobold,noitalics,nounderscore]#[default]#W "
+set-option -g window-status-last-style fg=colour31,bg=colour235
+set-option -g window-status-style fg=colour249,bg=colour235
+
 ## etc
 set-window-option -g mode-keys vi
 set-option -sg escape-time 1 # increase vim responsiveness
@@ -71,6 +88,4 @@ bind -r = resize-pane -U 3
 unbind r
 bind r source-file ~/.tmux.conf \; display 'Reloaded tmux.conf'
 
-source-file ~/.dotfiles/src/powerline/powerline/bindings/tmux/powerline.conf
-
 if-shell "[[ -e ~/.tmux.conf.local ]]" "source-file ~/.tmux.conf.local"
diff --git a/src/powerline b/src/powerline
deleted file mode 160000
index c3261d4e..00000000
--- a/src/powerline
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c3261d4e57905420a5a18da5abeafbb327cca256