diff --git a/README.md b/README.md
index cf1c247..46ebe8f 100644
--- a/README.md
+++ b/README.md
@@ -11,10 +11,12 @@ I have implemented a custom couple of scripts to handle screen setup for work, h
 * [URxvt](https://github.com/exg/rxvt-unicode)
 
 ## Applications
-* [ncmpcpp](https://github.com/arybczak/ncmpcpp)
 * [NewsBoat](https://github.com/newsboat/newsboat)
 * [Sublime Text 3](https://www.sublimetext.com/)
 
+# Powerline
+On Arch/Manjaro we need to install the Powerline fonts from the git repository for it to work properly. We might also need to use the urxvt patched package of urxvt.
+
 # Stow Commands
 I use Gnu Stow to manage my dotfiles. Dotfiles from this repository can be used by issuing:
 ~~~
diff --git a/i3/.i3/workspaces/ws08.sh b/i3/.i3/workspaces/ws08.sh
index f76e2c0..cc60eac 100755
--- a/i3/.i3/workspaces/ws08.sh
+++ b/i3/.i3/workspaces/ws08.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
 . ~/.i3/env
 i3-msg "workspace 8:Media; append_layout ~/.i3/layouts/workspace8-media.json"
-i3-msg "workspace 8:Media; exec urxvt -fn xft:Terminus:pixelsize=22 -name newsboat -e newsboat"
-#i3-msg "workspace 8:Media; exec urxvt -fn xft:Terminus:pixelsize=20 -name ncmpcpp -e ncmpcpp"
-i3-msg "workspace 8:Media; move workspace to output $LAPTOP"
+i3-msg "workspace 8:Media; exec urxvt -fn xft:DejaVu\ Sans\ Mono\ for\ Powerline:pixelsize=22 -name newsboat -e newsboat"
+#i3-msg "workspace 8:Media; move workspace to output $LAPTOP"
diff --git a/newsboat/.newsboat/config b/newsboat/.newsboat/config
index 100daa4..5359b7f 100644
--- a/newsboat/.newsboat/config
+++ b/newsboat/.newsboat/config
@@ -1,4 +1,17 @@
 auto-reload yes
 reload-time 60
 browser "w3m %u"
-articlelist-format  "%4i %f %D  %t"
\ No newline at end of file
+articlelist-format  "%4i %f %D  %t"
+
+color background         default   default
+color listnormal         default   default
+color listnormal_unread  default   default
+color listfocus          black     yellow
+color listfocus_unread   black     yellow
+color info               default   black
+color article            default   default
+
+# highlights
+highlight article "^(Title):.*$" blue default
+highlight article "https?://[^ ]+" red default
+highlight article "\\[image\\ [0-9]+\\]" green default
diff --git a/vim/.vimrc b/vim/.vimrc
index 5b4e651..0b274d9 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -1,5 +1,7 @@
 syntax on
+filetype indent on
 
+set encoding=utf-8
 set clipboard=unnamed
 set smartindent
 set shiftwidth=2
@@ -8,21 +10,25 @@ set expandtab
 set number
 set autoread
 
-let g:powerline_pycmd="py3"
+"NERDTree
 let NERDTreeShowHidden=1
 let g:NERDTreeDirArrowExpandable = '▸'
 let g:NERDTreeDirArrowCollapsible = '▾'
 
-filetype indent on
+"Airline
+let g:airline#extensions#tabline#enabled = 1
+let g:Powerline_symbols='unicode'
+let g:airline_powerline_fonts = 1
+let g:airline_theme='solarized'
+let g:airline_solarized_bg='dark'
 
+"Mappings
 :nmap <c-s> :w<CR>
 :imap <c-s> <Esc>:w<CR>a
-nnoremap <F7> :tabp<CR>
-nnoremap <F8> :tabn<CR>
-nnoremap <F9> :bp<CR>
-nnoremap <F10> :bn<CR>
+nnoremap <F7> :bp<CR>
+nnoremap <F8> :bn<CR>
 map <C-n> :NERDTreeToggle<CR>
 
+"AutoCommands
 au BufWinEnter * set number
-autocmd StdinReadPre * let s:std_in=1
-autocmd VimEnter * if argc() == 0 && !exists("s:std_in") | NERDTree | endif
+au FileType xml setlocal equalprg=xmllint\ --format\ --recover\ -\ 2>/dev/null