diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..e42085b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+vim/bundle/*
diff --git a/bin/vandal b/bin/vandal
new file mode 100755
index 0000000..1badf04
--- /dev/null
+++ b/bin/vandal
@@ -0,0 +1,64 @@
+#!/usr/bin/env ruby
+
+require 'fileutils'
+require 'open-uri'
+require 'yaml'
+
+BASE_DIR = File.join(File.dirname(__FILE__), '..', 'vim')
+BUNDLE_DIR = File.join(BASE_DIR, 'bundle')
+PACKAGES_FILE = File.join(BASE_DIR, 'packages.yml')
+
+ACTION = ARGV[0]
+exit unless [nil, 'edit', 'install', 'update'].include?(ACTION)
+
+if ACTION == 'edit'
+  `subl #{PACKAGES_FILE}`
+  exit
+end
+
+PACKAGES = (YAML.load_file(PACKAGES_FILE) || {}).map do |package|
+  package['dir'] = File.join(BUNDLE_DIR, package['dir'])
+  package
+end
+INSTALLED = Dir.entries(BUNDLE_DIR).delete_if{ |f| ['.', '..'].include?(f) }
+
+def install(meta)
+  `git clone git@github.com:#{meta['github']}.git #{meta['dir']} 2>/dev/null`
+  FileUtils.mv("#{meta['dir']}/.git", "#{meta['dir']}/_git")
+end
+
+def update(meta)
+  FileUtils.mv("#{meta['dir']}/_git", "#{meta['dir']}/.git")
+  `cd #{meta['dir']} && git pull 2>/dev/null`
+  FileUtils.mv("#{meta['dir']}/.git", "#{meta['dir']}/_git")
+end
+
+def remove(dir)
+  name = dir.split(?/).last.gsub(/\.-/, '_').split(?_).map(&:capitalize).join(' ')
+  puts "Removing #{name}"
+  FileUtils.rm_r(File.join(BUNDLE_DIR, dir))
+end
+
+# Removing packages
+(INSTALLED - PACKAGES.map{ |b| b['dir'].split(?/).last }).each{ |b| remove(b) }
+
+PACKAGES.each do |meta|
+  if File.exist?(meta['dir'])
+    if ACTION != 'install'
+      puts "Updating #{meta['name']}"
+      update(meta)
+    else
+      puts "Using #{meta['name']}"
+    end
+  else
+    if ACTION != 'update'
+      puts "Installing #{meta['name']}"
+      install(meta)
+    else
+      puts "Using #{meta['name']}"
+    end
+  end
+end
+
+puts
+puts 'Done'
diff --git a/bin/weight b/bin/weight
new file mode 100755
index 0000000..bdba045
--- /dev/null
+++ b/bin/weight
@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+
+files = `du -k -d 1`.scan(/(\d+).*\.\/(.*)/)
+maxlen = files.max_by{ |f| f[1].length }[1].length
+
+files.sort_by{ |f| f[0].to_i }.reverse.each do |f|
+  name = f[1]
+  size = f[0].to_i
+
+  print "%-#{maxlen+1}s" % name
+  if size < 1024
+    puts "#{size}K"
+  else
+    puts "#{size / 1024}M"
+  end
+end
diff --git a/git/.gitconfig b/git/gitconfig
similarity index 100%
rename from git/.gitconfig
rename to git/gitconfig
diff --git a/git/.gitignore b/git/gitignore
similarity index 100%
rename from git/.gitignore
rename to git/gitignore
diff --git a/setup.sh b/setup.sh
index e634776..3f47cf9 100755
--- a/setup.sh
+++ b/setup.sh
@@ -1,8 +1,8 @@
 cd ~
 
 # Git
-ln -s ~/.dotfiles/git/.gitconfig
-ln -s ~/.dotfiles/git/.gitignore
+ln -s ~/.dotfiles/git/gitconfig ~/.gitconfig
+ln -s ~/.dotfiles/git/gitignore ~/.gitignore
 
 # ZSH
 ln -s ~/.dotfiles/zsh/.zshrc
@@ -11,4 +11,8 @@ ln -s ~/.dotfiles/zsh/.zshrc
 ln -s ~/.dotfiles/ruby/.gemrc
 ln -s ~/.dotfiles/ruby/.aprc
 
+# THE VIM
+ln -s ~/.dotfiles/vim ~/.vim
+ln -s ~/.dotfiles/vim/vimrc ~/.vimrc
+
 cd -
diff --git a/sublime/config-dark b/sublime/config-dark
index e267727..4b02328 100644
--- a/sublime/config-dark
+++ b/sublime/config-dark
@@ -15,5 +15,7 @@
   "theme": "Soda Dark.sublime-theme",
   "translate_tabs_to_spaces": true,
   "tree_animation_enabled": false,
-  "trim_trailing_white_space_on_save": true
+  "trim_trailing_white_space_on_save": true,
+  "folder_exclude_patterns": [".git", ".bundle"],
+  "file_exclude_patterns": [".DS_Store"]
 }
diff --git a/sublime/config-light b/sublime/config-light
index d9f5873..fd6ca6e 100644
--- a/sublime/config-light
+++ b/sublime/config-light
@@ -15,5 +15,7 @@
   "theme": "Soda Light.sublime-theme",
   "translate_tabs_to_spaces": true,
   "tree_animation_enabled": false,
-  "trim_trailing_white_space_on_save": true
+  "trim_trailing_white_space_on_save": true,
+  "folder_exclude_patterns": [".git", ".bundle"],
+  "file_exclude_patterns": [".DS_Store"]
 }
diff --git a/vim/autoload/pathogen.vim b/vim/autoload/pathogen.vim
new file mode 100644
index 0000000..16c21fe
--- /dev/null
+++ b/vim/autoload/pathogen.vim
@@ -0,0 +1,328 @@
+" pathogen.vim - path option manipulation
+" Maintainer:   Tim Pope <http://tpo.pe/>
+" Version:      2.2
+
+" Install in ~/.vim/autoload (or ~\vimfiles\autoload).
+"
+" For management of individually installed plugins in ~/.vim/bundle (or
+" ~\vimfiles\bundle), adding `call pathogen#infect()` to the top of your
+" .vimrc is the only other setup necessary.
+"
+" The API is documented inline below.  For maximum ease of reading,
+" :set foldmethod=marker
+
+if exists("g:loaded_pathogen") || &cp
+  finish
+endif
+let g:loaded_pathogen = 1
+
+function! s:warn(msg)
+  if &verbose
+    echohl WarningMsg
+    echomsg a:msg
+    echohl NONE
+  endif
+endfunction
+
+" Point of entry for basic default usage.  Give a relative path to invoke
+" pathogen#incubate() (defaults to "bundle/{}"), or an absolute path to invoke
+" pathogen#surround().  For backwards compatibility purposes, a full path that
+" does not end in {} or * is given to pathogen#runtime_prepend_subdirectories()
+" instead.
+function! pathogen#infect(...) abort " {{{1
+  for path in a:0 ? reverse(copy(a:000)) : ['bundle/{}']
+    if path =~# '^[^\\/]\+$'
+      call s:warn('Change pathogen#infect('.string(path).') to pathogen#infect('.string(path.'/{}').')')
+      call pathogen#incubate(path . '/{}')
+    elseif path =~# '^[^\\/]\+[\\/]\%({}\|\*\)$'
+      call pathogen#incubate(path)
+    elseif path =~# '[\\/]\%({}\|\*\)$'
+      call pathogen#surround(path)
+    else
+      call s:warn('Change pathogen#infect('.string(path).') to pathogen#infect('.string(path.'/{}').')')
+      call pathogen#surround(path . '/{}')
+    endif
+  endfor
+  call pathogen#cycle_filetype()
+  return ''
+endfunction " }}}1
+
+" Split a path into a list.
+function! pathogen#split(path) abort " {{{1
+  if type(a:path) == type([]) | return a:path | endif
+  let split = split(a:path,'\\\@<!\%(\\\\\)*\zs,')
+  return map(split,'substitute(v:val,''\\\([\\,]\)'',''\1'',"g")')
+endfunction " }}}1
+
+" Convert a list to a path.
+function! pathogen#join(...) abort " {{{1
+  if type(a:1) == type(1) && a:1
+    let i = 1
+    let space = ' '
+  else
+    let i = 0
+    let space = ''
+  endif
+  let path = ""
+  while i < a:0
+    if type(a:000[i]) == type([])
+      let list = a:000[i]
+      let j = 0
+      while j < len(list)
+        let escaped = substitute(list[j],'[,'.space.']\|\\[\,'.space.']\@=','\\&','g')
+        let path .= ',' . escaped
+        let j += 1
+      endwhile
+    else
+      let path .= "," . a:000[i]
+    endif
+    let i += 1
+  endwhile
+  return substitute(path,'^,','','')
+endfunction " }}}1
+
+" Convert a list to a path with escaped spaces for 'path', 'tag', etc.
+function! pathogen#legacyjoin(...) abort " {{{1
+  return call('pathogen#join',[1] + a:000)
+endfunction " }}}1
+
+" Remove duplicates from a list.
+function! pathogen#uniq(list) abort " {{{1
+  let i = 0
+  let seen = {}
+  while i < len(a:list)
+    if (a:list[i] ==# '' && exists('empty')) || has_key(seen,a:list[i])
+      call remove(a:list,i)
+    elseif a:list[i] ==# ''
+      let i += 1
+      let empty = 1
+    else
+      let seen[a:list[i]] = 1
+      let i += 1
+    endif
+  endwhile
+  return a:list
+endfunction " }}}1
+
+" \ on Windows unless shellslash is set, / everywhere else.
+function! pathogen#separator() abort " {{{1
+  return !exists("+shellslash") || &shellslash ? '/' : '\'
+endfunction " }}}1
+
+" Convenience wrapper around glob() which returns a list.
+function! pathogen#glob(pattern) abort " {{{1
+  let files = split(glob(a:pattern),"\n")
+  return map(files,'substitute(v:val,"[".pathogen#separator()."/]$","","")')
+endfunction "}}}1
+
+" Like pathogen#glob(), only limit the results to directories.
+function! pathogen#glob_directories(pattern) abort " {{{1
+  return filter(pathogen#glob(a:pattern),'isdirectory(v:val)')
+endfunction "}}}1
+
+" Turn filetype detection off and back on again if it was already enabled.
+function! pathogen#cycle_filetype() " {{{1
+  if exists('g:did_load_filetypes')
+    filetype off
+    filetype on
+  endif
+endfunction " }}}1
+
+" Check if a bundle is disabled.  A bundle is considered disabled if it ends
+" in a tilde or its basename or full name is included in the list
+" g:pathogen_disabled.
+function! pathogen#is_disabled(path) " {{{1
+  if a:path =~# '\~$'
+    return 1
+  elseif !exists("g:pathogen_disabled")
+    return 0
+  endif
+  let sep = pathogen#separator()
+  let blacklist = g:pathogen_disabled
+  return index(blacklist, strpart(a:path, strridx(a:path, sep)+1)) != -1 && index(blacklist, a:path) != 1
+endfunction "}}}1
+
+" Prepend the given directory to the runtime path and append its corresponding
+" after directory.  If the directory is already included, move it to the
+" outermost position.  Wildcards are added as is.  Ending a path in /{} causes
+" all subdirectories to be added (except those in g:pathogen_disabled).
+function! pathogen#surround(path) abort " {{{1
+  let sep = pathogen#separator()
+  let rtp = pathogen#split(&rtp)
+  if a:path =~# '[\\/]{}$'
+    let path = fnamemodify(a:path[0:-4], ':p:s?[\\/]\=$??')
+    let before = filter(pathogen#glob_directories(path.sep.'*'), '!pathogen#is_disabled(v:val)')
+    let after  = filter(reverse(pathogen#glob_directories(path.sep."*".sep."after")), '!pathogen#is_disabled(v:val[0:-7])')
+    call filter(rtp,'v:val[0:strlen(path)-1] !=# path')
+  else
+    let path = fnamemodify(a:path, ':p:s?[\\/]\=$??')
+    let before = [path]
+    let after = [path . sep . 'after']
+    call filter(rtp, 'index(before + after, v:val) == -1')
+  endif
+  let &rtp = pathogen#join(before, rtp, after)
+  return &rtp
+endfunction " }}}1
+
+" Prepend all subdirectories of path to the rtp, and append all 'after'
+" directories in those subdirectories.  Deprecated.
+function! pathogen#runtime_prepend_subdirectories(path) " {{{1
+  call s:warn('Change pathogen#runtime_prepend_subdirectories('.string(a:path).') to pathogen#surround('.string(a:path.'/{}').')')
+  return pathogen#surround(a:path . pathogen#separator() . '{}')
+endfunction " }}}1
+
+" For each directory in the runtime path, add a second entry with the given
+" argument appended.  If the argument ends in '/{}', add a separate entry for
+" each subdirectory.  The default argument is 'bundle/{}', which means that
+" .vim/bundle/*, $VIM/vimfiles/bundle/*, $VIMRUNTIME/bundle/*,
+" $VIM/vim/files/bundle/*/after, and .vim/bundle/*/after will be added (on
+" UNIX).
+function! pathogen#incubate(...) abort " {{{1
+  let sep = pathogen#separator()
+  let name = a:0 ? a:1 : 'bundle/{}'
+  if "\n".s:done_bundles =~# "\\M\n".name."\n"
+    return ""
+  endif
+  let s:done_bundles .= name . "\n"
+  let list = []
+  for dir in pathogen#split(&rtp)
+    if dir =~# '\<after$'
+      if name =~# '{}$'
+        let list +=  filter(pathogen#glob_directories(substitute(dir,'after$',name[0:-3],'').'*[^~]'.sep.'after'), '!pathogen#is_disabled(v:val[0:-7])') + [dir]
+      else
+        let list += [dir, substitute(dir, 'after$', '', '') . name . sep . 'after']
+      endif
+    else
+      if name =~# '{}$'
+        let list +=  [dir] + filter(pathogen#glob_directories(dir.sep.name[0:-3].'*[^~]'), '!pathogen#is_disabled(v:val)')
+      else
+        let list += [dir . sep . name, dir]
+      endif
+    endif
+  endfor
+  let &rtp = pathogen#join(pathogen#uniq(list))
+  return 1
+endfunction " }}}1
+
+" Deprecated alias for pathogen#incubate().
+function! pathogen#runtime_append_all_bundles(...) abort " {{{1
+  if a:0
+    call s:warn('Change pathogen#runtime_append_all_bundles('.string(a:1).') to pathogen#incubate('.string(a:1.'/{}').')')
+  else
+    call s:warn('Change pathogen#runtime_append_all_bundles() to pathogen#incubate()')
+  endif
+  return call('pathogen#incubate', map(copy(a:000),'v:val . "/{}"'))
+endfunction
+
+let s:done_bundles = ''
+" }}}1
+
+" Invoke :helptags on all non-$VIM doc directories in runtimepath.
+function! pathogen#helptags() abort " {{{1
+  let sep = pathogen#separator()
+  for glob in pathogen#split(&rtp)
+    for dir in split(glob(glob), "\n")
+      if (dir.sep)[0 : strlen($VIMRUNTIME)] !=# $VIMRUNTIME.sep && filewritable(dir.sep.'doc') == 2 && !empty(filter(split(glob(dir.sep.'doc'.sep.'*'),"\n>"),'!isdirectory(v:val)')) && (!filereadable(dir.sep.'doc'.sep.'tags') || filewritable(dir.sep.'doc'.sep.'tags'))
+        helptags `=dir.'/doc'`
+      endif
+    endfor
+  endfor
+endfunction " }}}1
+
+command! -bar Helptags :call pathogen#helptags()
+
+" Execute the given command.  This is basically a backdoor for --remote-expr.
+function! pathogen#execute(...) abort " {{{1
+  for command in a:000
+    execute command
+  endfor
+  return ''
+endfunction " }}}1
+
+" Like findfile(), but hardcoded to use the runtimepath.
+function! pathogen#runtime_findfile(file,count) abort "{{{1
+  let rtp = pathogen#join(1,pathogen#split(&rtp))
+  let file = findfile(a:file,rtp,a:count)
+  if file ==# ''
+    return ''
+  else
+    return fnamemodify(file,':p')
+  endif
+endfunction " }}}1
+
+" Backport of fnameescape().
+function! pathogen#fnameescape(string) abort " {{{1
+  if exists('*fnameescape')
+    return fnameescape(a:string)
+  elseif a:string ==# '-'
+    return '\-'
+  else
+    return substitute(escape(a:string," \t\n*?[{`$\\%#'\"|!<"),'^[+>]','\\&','')
+  endif
+endfunction " }}}1
+
+if exists(':Vedit')
+  finish
+endif
+
+let s:vopen_warning = 0
+
+function! s:find(count,cmd,file,lcd) " {{{1
+  let rtp = pathogen#join(1,pathogen#split(&runtimepath))
+  let file = pathogen#runtime_findfile(a:file,a:count)
+  if file ==# ''
+    return "echoerr 'E345: Can''t find file \"".a:file."\" in runtimepath'"
+  endif
+  if !s:vopen_warning
+    let s:vopen_warning = 1
+    let warning = '|echohl WarningMsg|echo "Install scriptease.vim to continue using :V'.a:cmd.'"|echohl NONE'
+  else
+    let warning = ''
+  endif
+  if a:lcd
+    let path = file[0:-strlen(a:file)-2]
+    execute 'lcd `=path`'
+    return a:cmd.' '.pathogen#fnameescape(a:file) . warning
+  else
+    return a:cmd.' '.pathogen#fnameescape(file) . warning
+  endif
+endfunction " }}}1
+
+function! s:Findcomplete(A,L,P) " {{{1
+  let sep = pathogen#separator()
+  let cheats = {
+        \'a': 'autoload',
+        \'d': 'doc',
+        \'f': 'ftplugin',
+        \'i': 'indent',
+        \'p': 'plugin',
+        \'s': 'syntax'}
+  if a:A =~# '^\w[\\/]' && has_key(cheats,a:A[0])
+    let request = cheats[a:A[0]].a:A[1:-1]
+  else
+    let request = a:A
+  endif
+  let pattern = substitute(request,'/\|\'.sep,'*'.sep,'g').'*'
+  let found = {}
+  for path in pathogen#split(&runtimepath)
+    let path = expand(path, ':p')
+    let matches = split(glob(path.sep.pattern),"\n")
+    call map(matches,'isdirectory(v:val) ? v:val.sep : v:val')
+    call map(matches,'expand(v:val, ":p")[strlen(path)+1:-1]')
+    for match in matches
+      let found[match] = 1
+    endfor
+  endfor
+  return sort(keys(found))
+endfunction " }}}1
+
+command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Ve       :execute s:find(<count>,'edit<bang>',<q-args>,0)
+command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vedit    :execute s:find(<count>,'edit<bang>',<q-args>,0)
+command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vopen    :execute s:find(<count>,'edit<bang>',<q-args>,1)
+command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vsplit   :execute s:find(<count>,'split',<q-args>,<bang>1)
+command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vvsplit  :execute s:find(<count>,'vsplit',<q-args>,<bang>1)
+command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vtabedit :execute s:find(<count>,'tabedit',<q-args>,<bang>1)
+command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vpedit   :execute s:find(<count>,'pedit',<q-args>,<bang>1)
+command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vread    :execute s:find(<count>,'read',<q-args>,<bang>1)
+
+" vim:set et sw=2:
diff --git a/vim/packages.yml b/vim/packages.yml
new file mode 100644
index 0000000..e42d963
--- /dev/null
+++ b/vim/packages.yml
@@ -0,0 +1,60 @@
+- name: Ruby Debugger
+  dir: ruby_debugger
+  github: astashov/vim-ruby-debugger
+- name: Super Tab
+  dir: supertab
+  github: ervandew/supertab
+- name: Tabular
+  dir: tabular
+  github: godlygeek/tabular
+- name: Rdoc
+  dir: rdoc
+  github: depuracao/vim-rdoc
+- name: Snip Mate
+  dir: snipmate
+  github: msanders/snipmate.vim
+- name: JavaScript
+  dir: javascript
+  github: pangloss/vim-javascript
+- name: Nerd Tree
+  dir: nerdtree
+  github: scrooloose/nerdtree
+- name: Textile
+  dir: textile
+  github: timcharper/textile.vim
+- name: Cucumber
+  dir: cucumber
+  github: tpope/vim-cucumber
+- name: Haml
+  dir: haml
+  github: tpope/vim-haml
+- name: Markdown
+  dir: markdown
+  github: tpope/vim-markdown
+- name: Rails
+  dir: rails
+  github: tpope/vim-rails
+- name: Repeat
+  dir: repeat
+  github: tpope/vim-repeat
+- name: Surround
+  dir: surround
+  github: tpope/vim-surround
+- name: Vivid Chalk
+  dir: vivid_chalk
+  github: tpope/vim-vividchalk
+- name: Matchit
+  dir: matchit
+  github: tsaleh/vim-matchit
+- name: tmux
+  dir: tmux
+  github: tsaleh/vim-tmux
+- name: Ruby
+  dir: ruby
+  github: vim-ruby/vim-ruby
+- name: Gist
+  dir: gist
+  github: vim-scripts/Gist.vim
+- name: Solarized
+  dir: solarized
+  github: altercation/vim-colors-solarized
diff --git a/vim/vimrc b/vim/vimrc
new file mode 100644
index 0000000..8923fa6
--- /dev/null
+++ b/vim/vimrc
@@ -0,0 +1,8 @@
+execute pathogen#infect()
+execute pathogen#helptags()
+syntax on
+filetype plugin indent on
+
+set background=dark
+let g:solarized_termcolors=256
+colorscheme solarized
diff --git a/zsh/aliases.zsh b/zsh/aliases.zsh
index e4abf15..af235b4 100644
--- a/zsh/aliases.zsh
+++ b/zsh/aliases.zsh
@@ -1,6 +1,7 @@
 alias reload!='. ~/.zshrc'
 alias b='bundle exec'
 alias please='sudo'
+alias mkbundle='bundle install --path .bundle'
 
 # Services start-ups and shut-downs
 
diff --git a/zsh/functions/show-colors b/zsh/functions/show-colors
new file mode 100644
index 0000000..9768678
--- /dev/null
+++ b/zsh/functions/show-colors
@@ -0,0 +1 @@
+for code in {000..255}; do print -P -- "$code: %F{$code}Lorem ipsum dolor sit amet%f"; done
diff --git a/zsh/paths.zsh b/zsh/paths.zsh
index a38d7a7..3d917e3 100644
--- a/zsh/paths.zsh
+++ b/zsh/paths.zsh
@@ -1 +1,3 @@
-export PATH=~/.ssh_tunneler/bin:$PATH
+export PATH=~/.dotfiles/bin:$PATH
+export PATH=~/.apps/tunneler/bin:$PATH
+export PATH=/Applications/Sublime\ Text\ 2.app/Contents/SharedSupport/bin:$PATH
diff --git a/zsh/prompt.zsh b/zsh/prompt.zsh
index dc94e67..2435a49 100644
--- a/zsh/prompt.zsh
+++ b/zsh/prompt.zsh
@@ -14,21 +14,22 @@ git_dirty() {
   else
     if [[ $st == "nothing to commit (working directory clean)" ]]
     then
-      echo " %{$fg_bold[green]%}($(git_prompt_info))%{$reset_color%}"
+      echo " %F{002}($(git_prompt_info))%f"
     else
-      echo " %{$fg_bold[red]%}($(git_prompt_info))%{$reset_color%}"
+      echo " %F{001}($(git_prompt_info))%f"
     fi
   fi
 }
 
 git_prompt_info () {
  ref=$(/usr/bin/git symbolic-ref HEAD 2>/dev/null) || return
-# echo "(%{\e[0;33m%}${ref#refs/heads/}%{\e[0m%})"
  echo "${ref#refs/heads/}"
 }
 
 unpushed () {
-  /usr/bin/git cherry -v @{upstream} 2>/dev/null
+  if [[ -a .git ]]; then
+    git diff origin/master..HEAD
+  fi
 }
 
 need_push () {
@@ -36,14 +37,14 @@ need_push () {
   then
     echo ""
   else
-    echo " %{$fg_bold[magenta]%}➠%{$reset_color%}"
+    echo " %F{005}↑↑%f"
   fi
 }
 
 rb_prompt(){
   if $(which rbenv &> /dev/null)
   then
-    echo "%{$fg_bold[cyan]%}$(rbenv version | awk '{print $1}')%{$reset_color%}"
+    echo "%F{004%}$(rbenv version | awk '{print $1}')%f"
   else
     echo ""
   fi
@@ -54,7 +55,7 @@ current_time(){
 }
 
 directory_name(){
-  echo "%{$fg_bold[blue]%}%1/%\%{$reset_color%}"
+  echo "%F{003%}%1/%\%f"
 }
 
 export PROMPT=$'\n$(directory_name)$(git_dirty)$(need_push) › '