diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index 9cf6ff1..980e37e 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -1,3 +1,8 @@
+#remove escape delay
+set -s escape-time 0
+
+set -g default-terminal "rxvt-unicode-256color"
+
 #change C-b to Ca
 unbind C-b
 set-option -g prefix C-a
@@ -31,7 +36,9 @@ set -g mode-keys vi
 if-shell '[ $(echo "$(tmux -V | cut -d" " -f2) >= 2.1" | bc) -eq 1 ]' \
     'set -g mouse on' \
     'set -g mode-mouse on; set -g mouse-resize-pane on; set -g mouse-select-pane on; set -g mouse-select-window on' 
-#    'set -g mouse on; set -g mouse-utf8 on' \
+
+set -g mouse on
+#'set -g mouse on; set -g mouse-utf8 on' \
 
 bind-key Tab last-window
 bind-key BTab previous-window
diff --git a/vim/.vim/.netrwhist b/vim/.vim/.netrwhist
index 66efdea..5d389e8 100644
--- a/vim/.vim/.netrwhist
+++ b/vim/.vim/.netrwhist
@@ -1,5 +1,7 @@
 let g:netrw_dirhistmax  =10
-let g:netrw_dirhist_cnt =3
+let g:netrw_dirhist_cnt =5
 let g:netrw_dirhist_1='/home/jon'
 let g:netrw_dirhist_2='/home/jon/.gnome'
 let g:netrw_dirhist_3='/home/jon'
+let g:netrw_dirhist_4='/home/jon/dwm-6.1/.git'
+let g:netrw_dirhist_5='/etc/X11/xorg.conf.d'
diff --git a/vim/.vim/bundle/Vundle.vim b/vim/.vim/bundle/Vundle.vim
index 6437ad6..9a38216 160000
--- a/vim/.vim/bundle/Vundle.vim
+++ b/vim/.vim/bundle/Vundle.vim
@@ -1 +1 @@
-Subproject commit 6437ad6df4a3e6a87c5fb8bd2b8aadb277ec9c87
+Subproject commit 9a38216a1c0c597f978d73547d37681fc689c90d
diff --git a/vim/.vim/bundle/calendar.vim b/vim/.vim/bundle/calendar.vim
index 6d6be26..1aee272 160000
--- a/vim/.vim/bundle/calendar.vim
+++ b/vim/.vim/bundle/calendar.vim
@@ -1 +1 @@
-Subproject commit 6d6be26b2ad1870658525e2a42046429c845516c
+Subproject commit 1aee272cc37670b4f96c5d75975ae8af3bd8809e
diff --git a/vim/.vim/bundle/jedi-vim b/vim/.vim/bundle/jedi-vim
index 0c6a2b7..48af2af 160000
--- a/vim/.vim/bundle/jedi-vim
+++ b/vim/.vim/bundle/jedi-vim
@@ -1 +1 @@
-Subproject commit 0c6a2b77379f994c316983ca7f59784c1c957f78
+Subproject commit 48af2afd3ef06a61242d5c08a6357879ea639c36
diff --git a/vim/.vim/bundle/lightline.vim b/vim/.vim/bundle/lightline.vim
index b19faca..78c43c1 160000
--- a/vim/.vim/bundle/lightline.vim
+++ b/vim/.vim/bundle/lightline.vim
@@ -1 +1 @@
-Subproject commit b19faca129f7921766c0a32a7c378dc89a61e590
+Subproject commit 78c43c144643e49c529a93b9eaa4eda12614f923
diff --git a/vim/.vim/bundle/nerdtree b/vim/.vim/bundle/nerdtree
index 8cd17c1..a0e49c9 160000
--- a/vim/.vim/bundle/nerdtree
+++ b/vim/.vim/bundle/nerdtree
@@ -1 +1 @@
-Subproject commit 8cd17c1a478d8302e4782a95963abe46fc22c538
+Subproject commit a0e49c9b117d68dbc3e308b79529f8a3ab18e0f8
diff --git a/vim/.vim/bundle/syntastic b/vim/.vim/bundle/syntastic
index 5e1b26c..2c02edd 160000
--- a/vim/.vim/bundle/syntastic
+++ b/vim/.vim/bundle/syntastic
@@ -1 +1 @@
-Subproject commit 5e1b26c1724448c9d870b08dc93ce71528489333
+Subproject commit 2c02edd174c60abc6e176dda8e03ccc3276dcb2c
diff --git a/vim/.vim/bundle/targets.vim b/vim/.vim/bundle/targets.vim
new file mode 160000
index 0000000..c173218
--- /dev/null
+++ b/vim/.vim/bundle/targets.vim
@@ -0,0 +1 @@
+Subproject commit c1732189c9ec29cc3320094304019ffcafadafc4
diff --git a/vim/.vim/bundle/vim-buftabline b/vim/.vim/bundle/vim-buftabline
new file mode 160000
index 0000000..14d208b
--- /dev/null
+++ b/vim/.vim/bundle/vim-buftabline
@@ -0,0 +1 @@
+Subproject commit 14d208b1fa5f4308383e3ce429d57c84423029f9
diff --git a/vim/.vim/bundle/vim-fugitive b/vim/.vim/bundle/vim-fugitive
index 913fff1..409b098 160000
--- a/vim/.vim/bundle/vim-fugitive
+++ b/vim/.vim/bundle/vim-fugitive
@@ -1 +1 @@
-Subproject commit 913fff1cea3aa1a08a360a494fa05555e59147f5
+Subproject commit 409b098c93bc7d8345b1de300f9e2b8c3dce2add
diff --git a/vim/.vimrc b/vim/.vimrc
index e44b663..92b2598 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -54,6 +54,7 @@ nnoremap <C-h> <C-W><C-H>
 inoremap jj <Esc>
 inoremap jk <Esc>
 inoremap kj <Esc>
+nnoremap <CR> o<Esc>
 
 nnoremap <leader>l :ls<CR>:b<Space>
 nnoremap <Tab> :bnext<CR>
@@ -66,7 +67,7 @@ nnoremap <space> za
 map <C-n> :NERDTreeToggle<CR>
 
 "lightline colorscheme
-let g:lightline = {'colorscheme': 'powerline',}
+let g:lightline = {'colorscheme': 'jellybeans',}
 
 " set the runtime path to include Vundle and initialize
 set rtp+=~/.vim/bundle/Vundle.vim
@@ -87,6 +88,8 @@ Plugin 'itchyny/lightline.vim'
 Plugin 'itchyny/calendar.vim'
 Plugin 'davidhalter/jedi-vim'
 Plugin 'tpope/vim-surround'
+Plugin 'ap/vim-buftabline'
+Plugin 'wellle/targets.vim'
 
 call vundle#end()            " required
 filetype plugin indent on    " required