diff --git a/.tmux.conf b/.tmux.conf
deleted file mode 120000
index 2134eaa..0000000
--- a/.tmux.conf
+++ /dev/null
@@ -1 +0,0 @@
-/Users/joshfabean/.tmux.conf
\ No newline at end of file
diff --git a/.tmux.conf b/.tmux.conf
new file mode 100644
index 0000000..3798958
--- /dev/null
+++ b/.tmux.conf
@@ -0,0 +1,68 @@
+set-option -g status-position top
+bind-key b set-option status
+
+set-option -g default-shell /bin/zsh
+
+set-window-option -g mode-keys vi
+bind-key -t vi-copy 'v' begin-selection
+bind-key -t vi-copy y copy-pipe "reattach-to-user-namespace pbcopy"
+unbind -t vi-copy Enter
+bind-key -t vi-copy Enter copy-pipe "reattach-to-user-namespace pbcopy"
+
+##bind -n S-down new-window
+bind -n S-left prev
+bind -n S-right next
+
+set -g status-interval 1
+set -g status-justify centre # center align window list
+set -g status-right ''
+set -g status-left ''
+
+# default statusbar colors
+set -g status-fg white
+set -g status-bg default
+set -g status-attr bright
+
+# default window title colors
+set-window-option -g window-status-fg white
+set-window-option -g window-status-bg default
+set-window-option -g window-status-attr dim
+
+# active window title colors
+set-window-option -g window-status-current-fg white
+set-window-option -g window-status-current-bg default
+set-window-option -g window-status-current-attr bright
+
+# command/message line colors
+set -g message-fg white
+set -g message-bg black
+set -g message-attr bright
+
+set-option -gw xterm-keys on
+set-window-option -g xterm-keys on
+
+## set the default TERM
+##set -g default-terminal screen
+
+setw -g aggressive-resize on
+## update the TERM variable of terminal emulator when creating a new session or attaching a existing session
+set -g update-environment 'DISPLAY SSH_ASKPASS SSH_AGENT_PID SSH_CONNECTION WINDOWID XAUTHORITY TERM'
+## determine if we should enable 256-colour support
+#if "[[ ${TERM} =~ 256color || ${TERM} == fbterm ]]" '
+set -g default-terminal screen-256color
+
+setw -g mouse on                                                                                                                 
+
+bind-key -T root PPage if-shell -F "#{alternate_on}" "send-keys PPage" "copy-mode -e; send-keys PPage"
+bind-key -t vi-copy PPage page-up
+bind-key -t vi-copy NPage page-down
+
+bind-key -T root WheelUpPane if-shell -F -t = "#{alternate_on}" "send-keys -M" "select-pane -t =; copy-mode -e; send-keys -M"
+bind-key -T root WheelDownPane if-shell -F -t = "#{alternate_on}" "send-keys -M" "select-pane -t =; send-keys -M"
+bind-key -t vi-copy WheelUpPane halfpage-up
+bind-key -t vi-copy WheelDownPane halfpage-down
+
+set-option -g base-index 1
+set-window-option -g pane-base-index 1
+
+source ~/.tmux.powerline.conf
diff --git a/.tmux.powerline.conf b/.tmux.powerline.conf
new file mode 100644
index 0000000..b03841d
--- /dev/null
+++ b/.tmux.powerline.conf
@@ -0,0 +1,25 @@
+set -g status-bg "colour8"
+set -g message-command-fg "colour14"
+set -g status-justify "left"
+set -g status-left-length "100"
+set -g status "on"
+set -g pane-active-border-fg "colour11"
+set -g message-bg "colour10"
+set -g status-right-length "100"
+set -g status-right-attr "none"
+set -g message-fg "colour14"
+set -g message-command-bg "colour10"
+set -g status-attr "none"
+set -g pane-border-fg "colour10"
+set -g status-left-attr "none"
+setw -g window-status-fg "colour11"
+setw -g window-status-attr "none"
+setw -g window-status-activity-bg "colour8"
+setw -g window-status-activity-attr "none"
+setw -g window-status-activity-fg "colour11"
+setw -g window-status-separator ""
+setw -g window-status-bg "colour8"
+set -g status-left "#[fg=colour15,bg=colour11] #S #[fg=colour11,bg=colour8,nobold,nounderscore,noitalics]"
+set -g status-right "#[fg=colour10,bg=colour8,nobold,nounderscore,noitalics]#[fg=colour14,bg=colour10]#{battery_icon} #{battery_percentage} #{battery_remain}  #[fg=colour14,bg=colour10] %m-%d-%Y  %l:%M #[fg=colour11,bg=colour10,nobold,nounderscore,noitalics]#[fg=colour15,bg=colour11] #h "
+setw -g window-status-format "#[fg=colour11,bg=colour8] #I #[fg=colour11,bg=colour8] #W "
+setw -g window-status-current-format "#[fg=colour8,bg=colour10,nobold,nounderscore,noitalics]#[fg=colour14,bg=colour10] #I #[fg=colour14,bg=colour10] #W #[fg=colour10,bg=colour8,nobold,nounderscore,noitalics]"