diff --git a/bash/.bashrc b/bash/.bashrc
index e273039..01d5fc1 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -13,6 +13,8 @@ alias l.='ls -lh --color=auto' 2>/dev/null
 alias l='ls -lh'
 alias ll='ls -lh'
 #set -o vi
+alias p='ping'
+alias s='sudo'
 
 #golang stuff
 export GOPATH=$HOME/gopath
@@ -22,6 +24,7 @@ export EDITOR=/usr/bin/vim
 
 [ -f ~/.fzf.bash ] && source ~/.fzf.bash
 
+<<<<<<< HEAD
 #vi readline
 set -o vi
 #ctrl-x, ctrl-e to launch $EDITOR (vim)
@@ -29,3 +32,5 @@ bind -m vi-insert '"\C-x\C-e": edit-and-execute-command'
 
 #fix clear screen in vi mode
 bind -m vi-insert "\C-l":clear-screen
+=======
+>>>>>>> 8339691402a347f81d8e7896e8acfc8cebca7ddf
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/tmux/.tmux.conf b/tmux/.tmux.conf
index 980e37e..940568d 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -43,3 +43,36 @@ set -g mouse on
 bind-key Tab last-window
 bind-key BTab previous-window
 
+set -g default-terminal "screen-256color"
+
+# Basic status bar colors
+set-option -g status-bg default
+set-option -g status-fg white
+
+# Left side of status bar
+set-option -g status-left-length 40
+set-option -g status-left "#[fg=colour18,bg=colour12] #S #[fg=default,bg=default] "
+
+# Window status
+set-option -g window-status-format "#[fg=colour18,bg=brightblack] #I #[fg=white,bg=black] #W "
+set-option -g window-status-current-format "#[fg=colour18,bg=colour7] #I #[fg=colour18,bg=colour4] #W "
+set-option -g window-status-separator " "
+set-option -g status-justify left
+
+# Right side of status bar
+set-option -g status-right-length 40
+set-option -g status-right " #[fg=brightwhite,bg=black] %a, %d %b %H:%M #[fg=colour18,bg=colour4] #(whoami)@#h "
+
+# Pane border
+set-option -g pane-border-bg default
+set-option -g pane-border-fg brightblack
+set-option -g pane-active-border-bg default
+set-option -g pane-active-border-fg white
+
+# Pane number indicator
+set-option -g display-panes-colour brightblack
+set-option -g display-panes-active-colour brightwhite
+
+# Clock mode
+set-option -g clock-mode-colour white
+set-option -g clock-mode-style 24
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..128ddaa
--- /dev/null
+++ b/vim/.vim/bundle/lightline-buffer
@@ -0,0 +1 @@
+Subproject commit 128ddaad4a4d57c10f224428c7f64a10e5f21ca5
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/.vim/bundle/vim-easyescape b/vim/.vim/bundle/vim-easyescape
new file mode 160000
index 0000000..710f59b
--- /dev/null
+++ b/vim/.vim/bundle/vim-easyescape
@@ -0,0 +1 @@
+Subproject commit 710f59bc13acd843aa80b2a2954fea6154f730c5
diff --git a/vim/.vimrc b/vim/.vimrc
index 92b2598..19ba076 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
 
@@ -50,11 +51,23 @@ nnoremap <C-j> <C-W><C-J>
 nnoremap <C-k> <C-W><C-K>
 nnoremap <C-l> <C-W><C-L>
 nnoremap <C-h> <C-W><C-H>
+<<<<<<< HEAD
 " use jj to escape insert mode 
 inoremap jj <Esc>
 inoremap jk <Esc>
 inoremap kj <Esc>
 nnoremap <CR> o<Esc>
+=======
+" use jk to escape insert mode - using easyescape plugin 
+let g:easyescape_chars = { "j": 1, "k": 1 }
+let g:easyescape_timeout = 100
+cnoremap jk <ESC>
+cnoremap kj <ESC>
+
+" blank lines
+nnoremap <Enter> o<ESC>
+nnoremap <S-Enter> O<ESC>
+>>>>>>> 8339691402a347f81d8e7896e8acfc8cebca7ddf
 
 nnoremap <leader>l :ls<CR>:b<Space>
 nnoremap <Tab> :bnext<CR>
@@ -77,19 +90,52 @@ 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'
+<<<<<<< HEAD
 Plugin 'ap/vim-buftabline'
 Plugin 'wellle/targets.vim'
+=======
+Plugin 'junegunn/goyo.vim'
+Plugin 'zhou13/vim-easyescape'
+>>>>>>> 8339691402a347f81d8e7896e8acfc8cebca7ddf
 
 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..13e9429 100644
--- a/x/.Xresources
+++ b/x/.Xresources
@@ -1,32 +1,52 @@
-*background: #151B1A
-*foreground: #8FA388
-
-*cursorColor: #9E6438
-
-*color0: #2E2B38
-*color1: #984E66
-*color2: #7A8C54
-*color3: #9E6438
-*color4: #395667
-*color5: #9D916B
-*color6: #536556
-*color7: #828181
-*color8: #474159
-*color9: #A86D56
-*color10: #9FB274
-*color11: #B29F5E
-*color12: #507A91
-*color13: #B89855
-*color14: #7E9982
-*color15: #BDBDA4
 URxvt*scrollBar:	false
-URxvt.font:     xft:xos4 Terminus:size=14:antialias=true
-URxvt.boldFont: xft:xos4 Terminus:bold:size=14:antialias=true
+URxvt.font:     xft:Terminus:size=14:antialias=true
+!URxvt.boldFont: xft:Terminus:bold:size=14:antialias=true
 URxvt*transparent: true
 URxvt*shading: 10
 
 URxvt*perl-ext-common:  default,matcher
 URxvt*matcher.button:   1
 ! URxvt*url-launcher:      /usr/bin/google-chrome
-URxvt*url-launcher:     /home/jon/apps/firefox/firefox 
+! URxvt*url-launcher:     /home/jon/apps/firefox/firefox 
+URxvt*url-launcher:     /usr/bin/firefox
+
+! URxvt.blurRadius: 25
+URxvt*.termName: rxvt-unicode-256color
+
+! special
+*.foreground:   #c5c8c6
+*.background:   #1d1f21
+*.cursorColor:  #c5c8c6
+
+! black
+*.color0:       #282a2e
+*.color8:       #373b41
+
+! red
+*.color1:       #a54242
+*.color9:       #cc6666
+
+! green
+*.color2:       #8c9440
+*.color10:      #b5bd68
+
+! yellow
+*.color3:       #de935f
+*.color11:      #f0c674
+
+! blue
+*.color4:       #5f819d
+*.color12:      #81a2be
+
+! magenta
+*.color5:       #85678f
+*.color13:      #b294bb
+
+! cyan
+*.color6:       #5e8d87
+*.color14:      #8abeb7
+
+! white
+*.color7:       #707880
+*.color15:      #c5c8c6