diff --git a/git/gitconfig b/git/gitconfig
index 5c4f3df..4078315 100644
--- a/git/gitconfig
+++ b/git/gitconfig
@@ -6,7 +6,7 @@
     unstage = "reset HEAD"
     unmodify = "checkout --"
     ignore-changes = "update-index --assume-unchangend"
-    unignore-changes = "update-index --no-assume-unchanged"    
+    unignore-changes = "update-index --no-assume-unchanged"
     visual = "!gitk"
     staged = "diff --staged"
 
@@ -21,7 +21,7 @@
 
     logl = log --graph --decorate --pretty=oneline --abbrev-commit --all
 
-    pushall = "!sh -c 'for r in $(git remote) ; do echo \"[$r] \" ; git push $r $1; done' -"
+    pushall = "!sh -c 'for r in $(git remote) ; do echo \"--- [$r] ---\" ; git push $r $1; done' -"
 
 [core]
     editor = vim
@@ -29,7 +29,7 @@
     whitespace = ""
     excludesfile = "~/.gitignore_global"
 [color]
-    ui = true 
+    ui = true
 [gui]
 	recentrepo = /home/hannes/programming/git-repositories/autobackup
 [push]
diff --git a/i3/i3/config b/i3/i3/config
index 7d348ec..92da36b 100644
--- a/i3/i3/config
+++ b/i3/i3/config
@@ -375,4 +375,3 @@ bar {
     i3bar_command i3bar
     status_command bash ~/.i3/scripts/i3bar_wrapper.bash ~/.i3/scripts/statusbar.conkyrc
 }
-
diff --git a/vim/vimrc b/vim/vimrc
index 8f7ec9e..1e333f5 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -22,6 +22,8 @@ Plugin 'tpope/vim-commentary'
 Plugin 'tpope/vim-fugitive'
 Plugin 'tpope/vim-speeddating'
 Plugin 'tpope/vim-surround'
+Plugin 'junegunn/goyo.vim'
+Plugin 'junegunn/limelight.vim'
 
 "Plugin 'Lokaltog/vim-easymotion'
 "Plugin 'PeterRincker/vim-argumentative'
@@ -64,7 +66,7 @@ set number
 set wildmode=list:longest
 set lazyredraw
 set wildmenu
-set showmatch
+set noshowmatch
 set colorcolumn=80
 set laststatus=2
 set matchtime=5
@@ -136,6 +138,7 @@ set ttimeout
 set timeoutlen=1000
 set ttimeoutlen=0
 set virtualedit=block
+set whichwrap=b,s
 
 " == line breaking ==
 set linebreak
@@ -182,6 +185,7 @@ nnoremap <leader>v <C-w>v<C-w>l
 
 nnoremap <leader>u :GundoToggle<CR>
 
+nmap <leader>w :Goyo<CR>:TogglePencil<CR>:Limelight!!<CR>
 
 " no more ex mode
 nnoremap Q <nop>
@@ -229,6 +233,16 @@ let g:airline#extensions#whitespace#enabled = 1
 let g:airline#extensions#whitespace#symbol = ''
 let g:airline#extensions#whitespace#checks = ['trailing']
 
+" == pencil ==
+let g:pencil#textwidth = 80
+let g:pencil#autoformat = 1
+let g:pencil#cursorwrap = 1
+
+" == goyo ==
+let g:goyo_width = 80
+let g:goyo_height = "90%"
+let g:goyo_linenr = 0
+
 " === functions ===
 function! DeleteTrailingWS()
      exe "normal mz"
diff --git a/zsh/zshrc b/zsh/zshrc
index 080284c..f1f721c 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -95,7 +95,7 @@ bm() {
 }
 
 
-[[ $TERM == "urxvt" ]] && export TERM="rxvt-unicode" 
+[[ $TERM == "urxvt" ]] && export TERM="rxvt-unicode"
 [[ $TERM == "screen" ]] && export TERM="screen-256color"
 
 ### ALIASES
@@ -152,6 +152,8 @@ alias cat="cat -v"
 alias vimrc="vim -c ':e \$MYVIMRC'"
 alias zshrc="vim -c ':e ~/.zshrc'"
 
+alias vim="nvim"
+
 # rebase the current branch onto WTF ARE YOU DOING YOU ARE DRUNNK TO GO BED
 ##alias rebase="git rebase -i $(git branch --contains HEAD | grep -v '\*.*' | head -1)"
 
@@ -214,7 +216,7 @@ extr()
             *.Z       ) uncompress "$1"   ;;
             *.7z      ) 7z x "$1"         ;;
             *)
-                echo "$1 cannot be extracted via $0" 
+                echo "$1 cannot be extracted via $0"
                 ;;
         esac
     else
@@ -370,7 +372,7 @@ tmux_wrap() {
 # if a shell is started, it automatically attaches to the lowest "s-x" session that has
 # no attached clients
 
-return 
+return
 
 [[ -n "$TMUX" ]] && return