diff --git a/vim/vimrc b/vim/vimrc
index 077bd16..f1e37d2 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -1,25 +1,86 @@
-"vimrc - VIM Configuration file"
+" vimrc - VIM Configuration file "
 
-"Autointend"
-:set cindent
+set nocompatible
+filetype off
 
-"Tabstop, Shiftwith and replace tabs with spaces" 
-:set tabstop=4
-:set shiftwidth=4
-:set expandtab
+set rtp+=~/.vim/bundle/Vundle.vim
 
-"Stuff needed by urxvt"
-:set nocompatible
-:set mouse=a
-:set backspace=2
+" Automatically setting up vundle "
+let has_vundle=1
+if !filereadable($HOME."/.vim/bundle/Vundle.vim/README.md")
+    echo "Installing Vundle..."
+    echo ""
+    silent !mkdir -p $HOME/.vim/bundle
+    silent !git clone https://github.com/gmarik/Vundle.vim $HOME/.vim/bundle/Vundle.vim
+    let has_vundle=0
+endif
 
-"Syntaxhighlighting, colorscheme, linenumbers"
-:syntax on
-:colorscheme calmar256-dark
-:set number
-:set list
-:set nowrap
-:set hlsearch
+" Start Vundle stuff "
+call vundle#begin()
+    Plugin 'VundleVim/Vundle.vim'
+    " A pretty statusline, bufferline integration "
+    Plugin 'itchyny/lightline.vim'
+    Plugin 'bling/vim-bufferline'
+    " <Tab> everything! "
+    Plugin 'ervandew/supertab'
+    " Glorious colorscheme "
+    Plugin 'nanotech/jellybeans.vim'
+    " Super easy commenting, toggle comments etc "
+    Plugin 'scrooloose/nerdcommenter'
+    " Autoclose (, " etc "
+    Plugin 'Townk/vim-autoclose'
+    " Git wrapper inside Vim "
+    Plugin 'tpope/vim-fugitive'
+    " Handle surround chars like "
+    Plugin 'tpope/vim-surround'
+    " Vim signs (:h signs) for modified lines based off VCS (e.g. Git) "
+    Plugin 'mhinz/vim-signify'
+" Finish Vundle stuff "
+call vundle#end()
 
-"Automaticly reread a file, if file has changed"
+" Installing plugins the first time, quits when done "
+if has_vundle == 0
+    :silent! PluginInstall
+    :qa
+endif
+
+filetype plugin indent on
+
+" Autointend and autoscroll 4 lines above the cursor "
+set cindent
+set scrolloff=4
+
+"T abstop, Shiftwith and replace tabs with spaces but not in makefiles "
+set tabstop=4
+set shiftwidth=4
+set expandtab
+
+" Autocommands for special files "
+autocmd FileType make set noexpandtab
+autocmd BufNewFile,BufRead *.md set ft=markdown tw=79
+autocmd BufNewFile,BufRead *.tex set ft=tex tw=79
+autocmd BufNewFile,BufRead *.txt set ft=sh tw=79
+
+" Stuff needed by urxvt "
+set nocompatible
+set mouse=a
+set backspace=2
+
+" Syntaxhighlighting, colorscheme, linenumbers "
+syntax on
+colorscheme jellybeans                  " Colorscheme from plugin "
+set cursorline
+set more                                " Use more "
+set title
+set vb t_vb=                            " No beeping and flashing "
+set wildmenu
+set background=dark
+set number
+set list
+set nowrap
+set hlsearch
+set laststatus=2
+set t_Co=256
+
+" Automaticly reread a file, if file has changed "
 set autoread