diff --git a/vim/gvimrc b/vim/gvimrc
index 792588f..5edf6db 100644
--- a/vim/gvimrc
+++ b/vim/gvimrc
@@ -1,27 +1,29 @@
-set guifont=Monaco:h12
-"set guifont=ProFontWindows:h9
+"
+" GVIMRC - for GUI Vim Version (gvim, MacVim)
+"
+set guifont=Monaco:h13
 set anti
-set lines=50
-"set lines=70
-set columns=132
+set lines=65
+set columns=150
 set nomousefocus
 set ruler
 set errorbells
 set visualbell
-set foldmethod=expr
+set showtabline=2
+set guicursor=a:blinkon0
+set fuoptions=maxvert,maxhorz
 
-if exists('&macatsui')
-	set nomacatsui
+set guioptions-=T
+set guioptions+=a
+if &background == "dark"
+    hi normal guibg=black
+    set transp=8
 endif
 
-
 "colorscheme zenburn
 "colorscheme freya
-colorscheme moria
-
-
-
-" Let's do Ctrl-W work as expected, Gvim thinks we use a QZERTY Keyboard
-nnoremap <silent> <C-Z> <C-W>
-nnoremap <silent> <D-+> :call Zoom()<CR>
-nnoremap <silent> <C-S> :set list!<CR>
+"colorscheme moria
+"colorscheme morning
+"colorscheme desert
+"colorscheme macvim
+colorscheme inkpot
diff --git a/vim/templates/skeleton.c b/vim/templates/skeleton.c
index 863a2d7..1166b82 100644
--- a/vim/templates/skeleton.c
+++ b/vim/templates/skeleton.c
@@ -3,11 +3,11 @@
 
 Copyright by Andrea Mistrali <am@am.cx>.
 First version: <crdate>
-Last modified: 06:Apr:2007 10:55
+Last modified: <lmdate>
 
 Synopsis: <description>
 
-$Id: skeleton.c,v 1.2 2007-04-06 08:56:27 andre Exp $
+$Id$
 
 */
 
diff --git a/vim/templates/skeleton.pl b/vim/templates/skeleton.pl
index 2fd3eaf..c93a449 100644
--- a/vim/templates/skeleton.pl
+++ b/vim/templates/skeleton.pl
@@ -3,8 +3,8 @@
 
 # Copyright by Andrea Mistrali <am@am.cx>.
 # First version: <crdate>
-# Last modified: 06:Apr:2007 10:55
+# Last modified: <lmdate>
 #
 # Synopsis: <description>
 #
-# $Id: skeleton.pl,v 1.2 2007-04-06 08:56:27 andre Exp $
+# $Id$
diff --git a/vim/templates/skeleton.py b/vim/templates/skeleton.py
index 2ecbe9b..aa9f3ca 100644
--- a/vim/templates/skeleton.py
+++ b/vim/templates/skeleton.py
@@ -5,11 +5,11 @@
 
  Copyright by Andrea Mistrali <am@am.cx>.
  First version: <crdate>
- Last modified: 06:Apr:2007 10:56
+ Last modified: <lmdate>
 
  Synopsis: <description>
 
- $Id: skeleton.py,v 1.2 2007-04-06 08:56:27 andre Exp $
+ $Id$
 
 """
 
diff --git a/vim/templates/skeleton.sh b/vim/templates/skeleton.sh
index bdcf39b..16e6b87 100644
--- a/vim/templates/skeleton.sh
+++ b/vim/templates/skeleton.sh
@@ -3,8 +3,8 @@
 
 # Copyright by Andrea Mistrali <am@am.cx>.
 # First version: <crdate>
-# Last modified: 06:Apr:2007 10:56
+# Last modified: <lmdate>
 #
 # Synopsis: <description>
 #
-# $Id: skeleton.sh,v 1.2 2007-04-06 08:56:27 andre Exp $
+# $Id$
diff --git a/vim/vimrc b/vim/vimrc
index 06c7daa..2dbd5a5 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -1,3 +1,7 @@
+"
+" General Setup
+"
+
 set nocompatible	" Use Vim defaults (much better!)
 set backspace=indent,eol,start		" allow backspacing over everything
 set noautoindent
@@ -6,84 +10,103 @@ set backup
 set viminfo='20,\"50,f10
 set history=50
 set nohlsearch
+set paste
 
 set ruler
 set cmdheight=1
 set laststatus=2
 set shiftwidth=2
-set foldcolumn=1
-" tab management
+set nofoldenable
 set tabstop=4
 set softtabstop=4
 set expandtab
 
 set background=dark
-"set title Uncomment with new version of iTerm
 set title 
 
-set browsedir=current
+set browsedir=buffer
 set cpoptions=aAcF$
 set modeline
 set modelines=1
-set encoding=iso-8859-1
+set encoding=utf-8
 set listchars=tab:->,trail:.,eol:$
-"set paste
 set smartcase
 set errorbells
 "set visualbell
 set showcmd		" Show (partial) command in status line.
 set showmatch		" Show matching brackets.
-"set ignorecase		" Do case insensitive matching
+set ignorecase		" Do case insensitive matching
 set incsearch		" Incremental search
 set autowrite		" Automatically save before commands like :next and :make
 set statusline=%<%f\ %H%m%r%=%-14.(%l,%c%)\ %P\ Buf.%n
 set backupcopy=yes
 set fileformats=unix,mac,dos
 set fileformat=unix
-" COMPLETION
-"set completeopt=longest,menuone
-"set completeopt=longest,menuone,preview
-inoremap <expr> <cr> pumvisible() ? "<c-y>" : "<c-g>u<cr>"
-inoremap <expr> <c-n> pumvisible() ? "<c-n>" : "<c-n><c-r>=pumvisible() ? "<down>" : "<cr>"
-inoremap <expr> <m-;> pumvisible() ? "<c-n>" : "<c-x><c-o><c-n><c-p><c-r>=pumvisible() ? "<down>" : "<cr>"
-"
-
-
-
 set mouse=a
+colorscheme torte
+
+" """""""""""""""""""""""""
+" COMPLETION & INDENTATION
+" """""""""""""""""""""""""
+set completeopt=longest,menu
+" Map C-Tab to complete
+inoremap <silent> <C-tab> ^N
+
+" Emacs like indenting. Pressing Tab indents line
+set indentkeys==0{,0},0),:,0#,!^F,o,O,e,!<Tab>,!^F
+set cinkeys==0{,0},0),:,0#,!^F,o,O,e,!<Tab>,!^F
 
 " Suffixes that get lower priority when doing tab completion for filenames.
 "" These are files we are not likely to want to edit or read.
 set suffixes=.bak,~,.swp,.o,.info,.aux,.log,.dvi,.bbl,.blg,.brf,.cb,.ind,.idx,.ilg,.inx,.out,.toc
 
-colorscheme torte
 
+" """""""""""""""
 " TagLIST support
-let Tlist_Ctags_Cmd="ctags"
-"let Tlist_Use_Right_Window = 0
-"let Tlist_Display_Prototype = 1
+" """""""""""""""
+"let Tlist_Ctags_Cmd="/opt/local/bin/ctags"
 let Tlist_Exit_OnlyWindow = 1
-"let Tlist_Compact_Format = 1
 let Tlist_File_Fold_Auto_Close = 1
 "let Tlist_Use_SingleClick = 0 "Do not use yet
+let Tlist_Use_Right_Window = 1
+let Tlist_Display_Prototype = 0
+let Tlist_Compact_Format = 1
 
+" """"""""
+" NERDTree
+" """"""""
+let NERDTreeIgnore=['\.vim$', '\~$', '\.pyc']
+let NERDTreeShowBookmarks=1
+
+" """""""""""
+" BufExplorer
+" """""""""""
+let g:bufExplorerSplitBelow=1
+let g:bufExplorerResize=1
+
+
+" """""""""""""""""""""
 " Map keys to functions
-nnoremap <silent> <F8> :Tlist<CR>
-nnoremap <silent> ,l :set list!<CR>
+" """""""""""""""""""""
+let mapleader = "\\"
+"let mapleader = ","
+nnoremap <silent> <Leader>l :set list!<CR>
+nnoremap <silent> <Leader>f :set fullscreen!<CR>
+nnoremap <silent> <Leader>n :NERDTreeToggle<CR>
+nnoremap <silent> <Leader>t :Tlist<CR>
+nnoremap <silent> <Leader>N :set number!<CR>
+nnoremap <silent> <Leader>b :HSBufExplorer<CR>
+map      <silent> <Leader>c <plug>NERDCommenterToggle
 
 " Vim5 comes with syntaxhighlighting. If you want to enable syntaxhightlighting
 " by default uncomment the next three lines. 
 if has("syntax")
   syntax on		" Default to no syntax highlightning 
-endif
+endif " has("syntax")
 
 if has("autocmd")
 	filetype plugin indent on
 	filetype plugin on
-endif " has ("autocmd")
-
-" Let's go to where we left
-if has("autocmd")
 	" When editing a file, always jump to the last cursor position
 	autocmd BufReadPost *
 		\ if line("'\"") > 0 && line ("'\"") <= line("$") |
diff --git a/zshenv b/zshenv
index 8c614a6..b8ef725 100644
--- a/zshenv
+++ b/zshenv
@@ -54,7 +54,7 @@ autoload -U compinit; compinit
 
 if [ `uname -s` = "Darwin" ]; then
   # Alias for editors on OSX
-  alias vim='/Applications/Vim.app/Contents/MacOS/Vim'
+  alias vim='/Applications/MacVim.app/Contents/MacOS/Vim'
   alias aquamacs='open -a Aquamacs\ Emacs'
   alias ldd='otool -L'
   alias ls='ls -F -G'