diff --git a/vim/vimrc b/vim/vimrc
index f42c52d..b970154 100755
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -210,6 +210,9 @@ if has("gui_running")
 else
     colors vahagn_black_terminal
 endif
+
+" enable 256 colors
+set t_Co=256
 " Configure coloring on command line terminals.
 if &term=="xterm"
     " enable 256 colors
@@ -326,8 +329,162 @@ if filereadable(expand("~/.vim/bundle/Vundle.vim/README.md"))
     set rtp+=~/.vim/bundle/Vundle.vim
     call vundle#begin()
     Plugin 'VundleVim/Vundle.vim'
+
+    "
+    "   Adds nice status and tabline.
+    "
+    Plugin 'bling/vim-airline'
+    let g:airline#extensions#tabline#enabled = 1
+    let g:airline#extensions#tabline#left_sep = ' '
+    let g:airline#extensions#tabline#left_alt_sep = '|'
+    "
+    "   Color table and picker.
+    "   :XtermColorTable
+    "   press: # to yank, t to toggle, f to set text color
+    "
+    Plugin 'xterm-color-table.vim'
+
+    "
     call vundle#end()
     filetype plugin indent on
+    filetype plugin on
+endif
+
+if exists("dddd")
+
+"Plugin 'Rip-Rip/clang_complete'
+"Plugin 'altercation/vim-colors-solarized.git'
+"Plugin 'flazz/vim-colorschemes'
+"Plugin 'Valloric/YouCompleteMe'
+"Plugin 'rhysd/vim-clang-format'
+Plugin 'vim-scripts/Mark'
+Plugin 'bling/vim-airline'
+Plugin 'danro/rename.vim'
+Plugin 'gmarik/Vundle.vim'
+Plugin 'kana/vim-operator-user'
+Plugin 'kien/ctrlp.vim'
+Plugin 'majutsushi/tagbar'
+Plugin 'mattn/emmet-vim'
+Plugin 'mileszs/ack.vim'
+Plugin 'nanotech/jellybeans.vim'
+Plugin 'scrooloose/nerdtree'
+Plugin 'scrooloose/syntastic'
+Plugin 'tmhedberg/matchit'
+Plugin 'tpope/vim-commentary'
+Plugin 'tpope/vim-dispatch'
+Plugin 'tpope/vim-eunuch'
+Plugin 'tpope/vim-fugitive'
+Plugin 'tpope/vim-unimpaired'
+Plugin 'vim-scripts/Align'
+Plugin 'vim-scripts/Buffergator'
+Plugin 'vim-scripts/a.vim'
+Plugin 'vim-scripts/taglist.vim'
+Plugin 'vim-scripts/DoxyGen-Syntax'
+Plugin 'vim-scripts/DoxygenToolkit.vim'
+Plugin 'msanders/snipmate.vim'
+Plugin 'vim-scripts/xml.vim'
+Plugin 'junegunn/vim-easy-align'
+Plugin 'ntpeters/vim-better-whitespace'
+Plugin 'airblade/vim-gitgutter'
+"Plugin 'eiginn/netrw'
+"Plugin 'vim-scripts/TagHighlight'
+"Plugin 'gcmt/taboo.vim'
+
+
+"
+"   Plugin configuration
+"
+
+" - - - - - - - - - - - - - -
+" NERDTree settings
+" - - - - - - - - - - - - - -
+map <C-n> :NERDTreeToggle<CR>
+map <C-m> :NERDTreeFind<CR>
+
+"map <C-n> :Explore<CR>
+"map <C-m> :Explore %:p:h<CR>
+let g:NERDTreeQuitOnOpen = 1
+let g:NERDTreeDirArrows = 1
+let NERDTreeIgnore = ['\.o$', '\.so$', '\.tsk$']
+
+" - - - - - - - - - - - - - -
+" tagbar settings
+" - - - - - - - - - - - - - -
+map <C-t> :TagbarToggle<CR>
+let g:tagbar_autoclose = 1
+let g:tagbar_autofocus = 1
+let g:tagbar_autoshowtag = 1
+let g:tagbar_compact = 1
+let g:tagbar_indent = 1
+let g:tagbar_sort = 1
+let g:tagbar_width = 60
+let g:tagbar_ctags_bin = "/opt/swt/bin/ctags"
+
+" - - - - - - - - - - - - - -
+" powerline
+" - - - - - - - - - - - - - -
+let g:Powerline_symbols = "unicode"
+
+" - - - - - - - - - - - - - -
+" CtrlP
+" - - - - - - - - - - - - - -
+let g:ctrlp_root_markers = ['.ctrlp']
+let g:ctrlp_custom_ignore = {
+  \ 'file': '\v\.(o|d|dd)$',
+  \ }
+
+" - - - - - - - - - - - - - -
+" Buffergator
+" - - - - - - - - - - - - - -
+let g:buffergator_viewport_split_policy = "L"
+
+" - - - - - - - - - - - - - -
+" syntastic
+" - - - - - - - - - - - - - -
+"let g:syntastic_cpp_compiler_options = ' -std=c++1y'
+let g:syntastic_mode_map = {
+        \ "mode": "active",
+        \ "active_filetypes": ["ruby", "php"],
+        \ "passive_filetypes": ["c", "cpp"] }
+
+
+" - - - - - - - - - - - - - -
+" vim-colorschemes
+" - - - - - - - - - - - - - -
+colorscheme jellybeans
+let g:jellybeans_use_lowcolor_black = 0
+
+" - - - - - - - - - - - - - -
+" Ack
+" - - - - - - - - - - - - - -
+let g:ack_default_options = " --ignore-file=is:tags -s -H --nocolor --nogroup --column"
+let g:ack_highlight = 1
+
+" - - - - - - - - - - - - - -
+" a
+" - - - - - - - - - - - - - -
+let g:alternateExtensions_h = "cpp,c"
+let g:alternateExtensions_cpp = "h"
+let g:alternateExtensions_c = "h"
+
+" - - - - - - - - - - - - - -
+" netrw
+" - - - - - - - - - - - - - -
+let g:netrw_altv          = 1
+let g:netrw_fastbrowse    = 2
+let g:netrw_keepdir       = 0
+let g:netrw_liststyle     = 3
+let g:netrw_retmap        = 1
+let g:netrw_silent        = 1
+let g:netrw_special_syntax= 1
+
+" - - - - - - - - - - - - - -
+" taboo vim
+" - - - - - - - - - - - - - -
+"let g:taboo_tab_format = "[%m:%N:%W] %f"
+
+let g:strip_whitespace_on_save = 1
+
 endif
 
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
@@ -421,144 +578,3 @@ nnoremap td  :tabclose<CR>
 "   Experimental staff
 "
 
-if 0 = 1
-"--------------
-" Plugins
-"--------------
-"Plugin 'Rip-Rip/clang_complete'
-"Plugin 'altercation/vim-colors-solarized.git'
-"Plugin 'flazz/vim-colorschemes'
-"Plugin 'Valloric/YouCompleteMe'
-"Plugin 'rhysd/vim-clang-format'
-Plugin 'vim-scripts/Mark'
-Plugin 'bling/vim-airline'
-Plugin 'danro/rename.vim'
-Plugin 'gmarik/Vundle.vim'
-Plugin 'kana/vim-operator-user'
-Plugin 'kien/ctrlp.vim'
-Plugin 'majutsushi/tagbar'
-Plugin 'mattn/emmet-vim'
-Plugin 'mileszs/ack.vim'
-Plugin 'nanotech/jellybeans.vim'
-Plugin 'scrooloose/nerdtree'
-Plugin 'scrooloose/syntastic'
-Plugin 'tmhedberg/matchit'
-Plugin 'tpope/vim-commentary'
-Plugin 'tpope/vim-dispatch'
-Plugin 'tpope/vim-eunuch'
-Plugin 'tpope/vim-fugitive'
-Plugin 'tpope/vim-unimpaired'
-Plugin 'vim-scripts/Align'
-Plugin 'vim-scripts/Buffergator'
-Plugin 'vim-scripts/a.vim'
-Plugin 'vim-scripts/taglist.vim'
-Plugin 'vim-scripts/DoxyGen-Syntax'
-Plugin 'vim-scripts/DoxygenToolkit.vim'
-Plugin 'msanders/snipmate.vim'
-Plugin 'vim-scripts/xml.vim'
-Plugin 'junegunn/vim-easy-align'
-Plugin 'ntpeters/vim-better-whitespace'
-Plugin 'airblade/vim-gitgutter'
-"Plugin 'eiginn/netrw'
-"Plugin 'vim-scripts/TagHighlight'
-"Plugin 'gcmt/taboo.vim'
-
-Plugin 'xterm-color-table.vim'
-
-" All of your Plugins must be added before the following line
-call vundle#end()            " required
-filetype plugin indent on    " required
-" To ignore plugin indent changes, instead use:
-filetype plugin on
-
-" - - - - - - - - - - - - - -
-" NERDTree settings
-" - - - - - - - - - - - - - -
-map <C-n> :NERDTreeToggle<CR>
-map <C-m> :NERDTreeFind<CR>
-
-"map <C-n> :Explore<CR>
-"map <C-m> :Explore %:p:h<CR>
-let g:NERDTreeQuitOnOpen = 1
-let g:NERDTreeDirArrows = 1
-let NERDTreeIgnore = ['\.o$', '\.so$', '\.tsk$']
-
-" - - - - - - - - - - - - - -
-" tagbar settings
-" - - - - - - - - - - - - - -
-map <C-t> :TagbarToggle<CR>
-let g:tagbar_autoclose = 1
-let g:tagbar_autofocus = 1
-let g:tagbar_autoshowtag = 1
-let g:tagbar_compact = 1
-let g:tagbar_indent = 1
-let g:tagbar_sort = 1
-let g:tagbar_width = 60
-let g:tagbar_ctags_bin = "/opt/swt/bin/ctags"
-
-" - - - - - - - - - - - - - -
-" powerline
-" - - - - - - - - - - - - - -
-let g:Powerline_symbols = "unicode"
-
-" - - - - - - - - - - - - - -
-" CtrlP
-" - - - - - - - - - - - - - -
-let g:ctrlp_root_markers = ['.ctrlp']
-let g:ctrlp_custom_ignore = {
-  \ 'file': '\v\.(o|d|dd)$',
-  \ }
-
-" - - - - - - - - - - - - - -
-" Buffergator
-" - - - - - - - - - - - - - -
-let g:buffergator_viewport_split_policy = "L"
-
-" - - - - - - - - - - - - - -
-" syntastic
-" - - - - - - - - - - - - - -
-"let g:syntastic_cpp_compiler_options = ' -std=c++1y'
-let g:syntastic_mode_map = {
-        \ "mode": "active",
-        \ "active_filetypes": ["ruby", "php"],
-        \ "passive_filetypes": ["c", "cpp"] }
-
-
-" - - - - - - - - - - - - - -
-" vim-colorschemes
-" - - - - - - - - - - - - - -
-colorscheme jellybeans
-let g:jellybeans_use_lowcolor_black = 0
-
-" - - - - - - - - - - - - - -
-" Ack
-" - - - - - - - - - - - - - -
-let g:ack_default_options = " --ignore-file=is:tags -s -H --nocolor --nogroup --column"
-let g:ack_highlight = 1
-
-" - - - - - - - - - - - - - -
-" a
-" - - - - - - - - - - - - - -
-let g:alternateExtensions_h = "cpp,c"
-let g:alternateExtensions_cpp = "h"
-let g:alternateExtensions_c = "h"
-
-" - - - - - - - - - - - - - -
-" netrw
-" - - - - - - - - - - - - - -
-let g:netrw_altv          = 1
-let g:netrw_fastbrowse    = 2
-let g:netrw_keepdir       = 0
-let g:netrw_liststyle     = 3
-let g:netrw_retmap        = 1
-let g:netrw_silent        = 1
-let g:netrw_special_syntax= 1
-
-" - - - - - - - - - - - - - -
-" taboo vim
-" - - - - - - - - - - - - - -
-"let g:taboo_tab_format = "[%m:%N:%W] %f"
-
-let g:strip_whitespace_on_save = 1
-
-endif