diff --git a/configs/vimrc b/configs/vimrc
index aa3b213..3a1c31e 100644
--- a/configs/vimrc
+++ b/configs/vimrc
@@ -74,31 +74,31 @@ endif " has("autocmd")
 "  Those are my settings
 " ----------------------------------------------------------------------
 
-set tabstop=4
-set shiftwidth=4
-set foldmethod=marker
-set scrolloff=1       " always show one line around the cursor
-set laststatus=2      " always show the status bar ('cause I like to see the line and column, always)
-set showtabline=2     " always show the tabline
-set showmatch         " show matching bracket
-set noeb              " no error bells
-set autowrite         " write the file when switching between files or something
-set nowrap			  " do not wrap long lines
-set nobackup          " do not keep a backup file, use versions instead
-set history=50        " keep 50 lines of command line history
-set ruler             " show the cursor position all the time
-set showcmd           " display incomplete commands
-set incsearch         " do incremental searching
-set fo=tcroq          " wrap with textwidth, wrap comments, insert commend leader (twice), format comments
-set autoindent        " auto indent
-set smartindent       " smart identation
-set number
-set wim=longest,list  " file auto-completion
+set tabstop=4			" tabs are displayed as 4 spaces
+set shiftwidth=4		" by default, when auto-identing, add 4 spaces (or 1 tabstop)
+set foldmethod=marker	" fold on markers
+set scrolloff=1			" always show one line around the cursor
+set laststatus=2		" always show the status bar ('cause I like to see the line and column, always)
+set showtabline=2		" always show the tabline
+set showmatch			" show matching bracket
+set noerrorbells		" no error bells
+set autowrite			" write the file when switching between files or something
+set nowrap				" do not wrap long lines
+set nobackup			" do not keep a backup file, use versions instead
+set history=50			" keep 50 lines of command line history
+set ruler				" show the cursor position all the time
+set showcmd				" display incomplete commands
+set incsearch			" do incremental searching
+set formatoptions=tcq	" wrap with textwidth, wrap comments, insert commend leader (twice), format comments
+set smartindent			" smart identation
+set number				" show line numbers
+set wim=longest,list	" file auto-completion
+set background=dark		" to follow most of the colorschemes I use
 
 set t_Co=256			" 256 color terminals
 color busybee			" color for terminals (gvimrc sets the UI color)
 
-syntax sync minlines=500	" increases the number of lines to find the proper syntax
+syntax sync minlines=1500	" increases the number of lines to find the proper syntax
 
 let mapleader=","     " use comma to start user-defined (in plugins) functions
 
@@ -237,6 +237,7 @@ Bundle 'terryma/vim-multiple-cursors'
 
 " colorscheme
 Bundle 'croaker/mustang-vim'
+Bundle 'altercation/vim-colors-solarized'
 
 " Autocomplete
 " Bundle 'ervandew/supertab'
@@ -245,7 +246,7 @@ Bundle 'croaker/mustang-vim'
 let g:AutoPairsMapCR = 1
 
 " ----------------------------------------------------------------------
-" fancy tabline (to follow Powerline color scheme)
+" my fancy tabline (to follow Powerline color scheme)
 " ----------------------------------------------------------------------
 
 function PowerTabLine()