diff --git a/bash/.bashrc b/bash/.bashrc
index 8f63c90..cfd6be4 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -13,6 +13,7 @@ alias l.='ls -lh --color=auto' 2>/dev/null
 alias l='ls -lh'
 alias ll='ls -lh'
 #set -o vi
+alias p='ping'
 
 #golang stuff
 export GOPATH=$HOME/gopath
diff --git a/conky/.config/conky/conky.conf b/conky/.config/conky/conky.conf
index 6e8ae9a..3a5b248 100644
--- a/conky/.config/conky/conky.conf
+++ b/conky/.config/conky/conky.conf
@@ -57,5 +57,5 @@ conky.config = {
 }
 
 conky.text = [[
-L $loadavg | M $mem | $battery_short | N ${upspeedf enp4s0}/${downspeedf enp4s0} | ${time %m/%d} ${time %H:%M}
+$loadavg | $mem | ${upspeedf enp4s0}/${downspeedf enp4s0} | ${time %m/%d} ${time %H:%M} | $battery_short 
 ]]
diff --git a/vim/.vim/bundle/goyo.vim b/vim/.vim/bundle/goyo.vim
new file mode 160000
index 0000000..5b8bd03
--- /dev/null
+++ b/vim/.vim/bundle/goyo.vim
@@ -0,0 +1 @@
+Subproject commit 5b8bd0378758c1d9550d8429bef24b3d6d78b592
diff --git a/vim/.vim/bundle/lightline-buffer b/vim/.vim/bundle/lightline-buffer
new file mode 160000
index 0000000..1c090e0
--- /dev/null
+++ b/vim/.vim/bundle/lightline-buffer
@@ -0,0 +1 @@
+Subproject commit 1c090e0782dbe4e5a6a8353dffcd97971c84b1ca
diff --git a/vim/.vim/bundle/minibufexpl.vim b/vim/.vim/bundle/minibufexpl.vim
new file mode 160000
index 0000000..ad72976
--- /dev/null
+++ b/vim/.vim/bundle/minibufexpl.vim
@@ -0,0 +1 @@
+Subproject commit ad72976ca3df4585d49aa296799f14f3b34cf953
diff --git a/vim/.vimrc b/vim/.vimrc
index e44b663..3b3bf55 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -6,6 +6,7 @@ set encoding=utf-8
 let mapleader=","
 set nu
 set laststatus=2
+set showtabline=2
 set hidden
 set incsearch
 
@@ -54,6 +55,9 @@ nnoremap <C-h> <C-W><C-H>
 inoremap jj <Esc>
 inoremap jk <Esc>
 inoremap kj <Esc>
+" blank lines
+nnoremap <Enter> o<ESC>
+nnoremap <S-Enter> O<ESC>
 
 nnoremap <leader>l :ls<CR>:b<Space>
 nnoremap <Tab> :bnext<CR>
@@ -76,17 +80,46 @@ Plugin 'VundleVim/Vundle.vim'
 Plugin 'tpope/vim-fugitive'
 Plugin 'kien/ctrlp.vim'
 Plugin 'scrooloose/nerdtree'
+"Plugin 'fholgado/minibufexpl.vim'
 Plugin 'tmhedberg/SimpylFold'
 Plugin 'vim-scripts/indentpython.vim'
 Plugin 'scrooloose/syntastic'
 " PEP8 checking plugin
 Plugin 'nvie/vim-flake8'
-"Plugin 'Lokaltog/powerline', {'rtp': 'powerline/bindings/vim/'}
 Plugin 'itchyny/lightline.vim'
+Plugin 'taohex/lightline-buffer'
 "Plugin 'klen/python-mode'
 Plugin 'itchyny/calendar.vim'
 Plugin 'davidhalter/jedi-vim'
 Plugin 'tpope/vim-surround'
+Plugin 'junegunn/goyo.vim'
 
 call vundle#end()            " required
 filetype plugin indent on    " required
+
+" use lightline-buffer in lightline
+let g:lightline = {
+    \ 'tabline': {
+    \   'left': [ [ 'bufferinfo' ],
+    \             [ 'separator' ],
+    \             [ 'bufferbefore', 'buffercurrent', 'bufferafter' ], ],
+    \   'right': [ [ 'close' ], ],
+    \ },
+    \ 'component_expand': {
+    \   'buffercurrent': 'lightline#buffer#buffercurrent',
+    \   'bufferbefore': 'lightline#buffer#bufferbefore',
+    \   'bufferafter': 'lightline#buffer#bufferafter',
+    \ },
+    \ 'component_type': {
+    \   'buffercurrent': 'tabsel',
+    \   'bufferbefore': 'raw',
+    \   'bufferafter': 'raw',
+    \ },
+    \ 'component_function': {
+    \   'bufferinfo': 'lightline#buffer#bufferinfo',
+    \ },
+    \ 'component': {
+    \   'separator': '',
+    \ },
+    \ }
+
diff --git a/x/.Xresources b/x/.Xresources
index da76c80..2043cc1 100644
--- a/x/.Xresources
+++ b/x/.Xresources
@@ -30,3 +30,4 @@ URxvt*matcher.button:   1
 ! URxvt*url-launcher:      /usr/bin/google-chrome
 URxvt*url-launcher:     /home/jon/apps/firefox/firefox 
 
+! URxvt.blurRadius: 25