diff --git a/.gvimrc b/.gvimrc
new file mode 100644
index 0000000..566c13e
--- /dev/null
+++ b/.gvimrc
@@ -0,0 +1,5 @@
+set guifont=Menlo:h14
+set gcr=n-v-c:block-Cursor/block-Cursor-blinkon0,i-ci:ver30-block-Cursor-blinkon0
+
+" Hide Toolbar from MacVim
+set guioptions-=T
diff --git a/.vim/colors/smyck.vim b/.vim/colors/smyck.vim
index 6eceb50..ab83e6b 100644
--- a/.vim/colors/smyck.vim
+++ b/.vim/colors/smyck.vim
@@ -16,8 +16,8 @@ if exists("syntax_on")
   syntax reset
 endif
 
-hi Normal               cterm=none ctermbg=none     ctermfg=15      gui=none        guibg=#2D2D2D   guifg=#F7F7F7
-hi LineNr               cterm=none ctermbg=none     ctermfg=8       gui=none        guibg=#2D2D2D   guifg=#8F8F8F
+hi Normal               cterm=none ctermbg=none     ctermfg=15      gui=none        guibg=#242424   guifg=#F7F7F7
+hi LineNr               cterm=none ctermbg=none     ctermfg=8       gui=none        guibg=#242424   guifg=#8F8F8F
 hi StatusLine           cterm=none ctermbg=8        ctermfg=15      gui=none        guibg=#5D5D5D   guifg=#FBFBFB
 hi StatusLineNC         cterm=none ctermbg=15       ctermfg=8       gui=none        guibg=#5D5D5D   guifg=#FBFBFB
 hi Search               cterm=none ctermbg=6        ctermfg=15      gui=none        guibg=#2EB5C1   guifg=#F7F7F7
@@ -37,12 +37,14 @@ hi SpellCap             cterm=none ctermbg=4        ctermfg=15      gui=none
 hi SpellRare            cterm=none ctermbg=4        ctermfg=15      gui=none                        guifg=#F7F7F7
 hi SpellLocal           cterm=none ctermbg=4        ctermfg=15      gui=none                        guifg=#F7F7F7
 hi Visual               cterm=none ctermbg=15       ctermfg=8       gui=none        guibg=#F7F7F7   guifg=#8F8F8F
-hi Directory            cterm=none ctermbg=none     ctermfg=4       gui=none
+hi Directory            cterm=none ctermbg=none     ctermfg=4       gui=none        guibg=#242424   guifg=#88CCE7
 hi SpecialKey           cterm=none ctermbg=none     ctermfg=8       gui=none                        guifg=#8F8F8F
 hi DiffAdd              cterm=bold ctermbg=2        ctermfg=15
 hi DiffChange           cterm=bold ctermbg=4        ctermfg=15
 hi DiffDelete           cterm=bold ctermbg=1        ctermfg=15
 hi DiffText             cterm=bold ctermbg=3        ctermfg=8
+hi MatchParen           cterm=none ctermbg=6        ctermbg=15      gui=none        guibg=#2EB5C1   guifg=#F7F7F7
+hi CursorLine           cterm=underline ctermbg=0   ctermbg=none    gui=none        guibg=#424242
 
 " ----------------------------------------------------------------------------
 " Syntax Highlighting
@@ -66,6 +68,10 @@ hi Symbol               cterm=none ctermbg=none ctermfg=9           gui=none
 hi Method               cterm=none ctermbg=none ctermfg=15          gui=none        guifg=#F7F7F7
 hi Interpolation        cterm=none ctermbg=none ctermfg=6           gui=none        guifg=#2EB5C1
 
+" Erlang
+hi link erlangAtom            Keyword
+hi link erlangBitType         Keyword
+
 hi link rubyBeginend          Keyword
 hi link rubyClass             Keyword
 hi link rubyModule            Keyword
@@ -85,5 +91,4 @@ hi link rubyInterpolation     Interpolation
 hi link rubyInterpolationDelimiter    Interpolation
 hi link rubyRailsMethod       Method
 
-" Erlang
-hi link erlangAtom            Keyword
+
diff --git a/.vimrc b/.vimrc
index f12c6a6..ff89372 100644
--- a/.vimrc
+++ b/.vimrc
@@ -42,6 +42,9 @@ autocmd BufWritePre * :call <SID>StripTrailingWhitespaces()
 " Highlight characters behind the 80 chars margin
 :au BufWinEnter * let w:m2=matchadd('ColumnMargin', '\%>80v.\+', -1)
 
+" Disable code folding
+set nofoldenable
+
 " Directories for swp files
 set backupdir=~/.vimbackup
 set directory=~/.vimbackup