diff --git a/Brewfile b/Brewfile
index cb7bb40..1a92bf8 100644
--- a/Brewfile
+++ b/Brewfile
@@ -1,32 +1,52 @@
-tap homebrew/dupes
-tap homebrew/versions
-tap linode/cli
-tap thoughtbot/formulae
-install apg
-# install apple-gcc42
-install direnv
-# install elasticsearch
-install git
-install heroku-toolbelt
-install imagemagick
-install linode-cli
-install mackup
-install mariadb
-install mercurial
-install nginx
-install node
-install phantomjs
-install postgresql
-install pv
-install rbenv
-install rbenv-gem-rehash
-install rcm
-install rsync
-install ruby-build
-install the_silver_searcher
-install tig
-install tmux
-install vim
-install watch
-install wget
-install zsh
+tap "thoughtbot/formulae"
+brew "apg"
+brew "asdf"
+brew "direnv"
+brew "git"
+brew "imagemagick"
+brew "mas"
+brew "mackup"
+brew "phantomjs"
+brew "postgresql"
+brew "pv"
+brew "ripgrep"
+brew "rcm"
+brew "rsync"
+brew "tig"
+brew "tmux"
+brew "vim"
+brew "watch"
+brew "wget"
+brew "zsh"
+
+cask "1password"
+cask "acorn"
+cask "choosy"
+cask "colorpicker-skalacolor"
+cask "dropbox"
+cask "fantastical"
+cask "firefox"
+cask "google-chrome"
+cask "imagealpha"
+cask "imageoptim"
+cask "istat-menus"
+cask "iterm2"
+cask "ivolume"
+cask "java"
+cask "kaleidoscope"
+cask "macvim"
+cask "mplayerx"
+cask "mpv"
+cask "sequel-pro"
+cask "skype"
+cask "spotify"
+cask "superduper"
+cask "textmate"
+cask "vmware-fusion"
+cask "vlc"
+
+tap "caskroom/fonts"
+cask "font-vollkorn"
+cask "font-source-code-pro"
+cask "font-source-sans-pro"
+cask "font-courier-prime"
diff --git a/Caskfile b/Caskfile
deleted file mode 100644
index 67910ab..0000000
--- a/Caskfile
+++ /dev/null
@@ -1,48 +0,0 @@
-tap caskroom/cask
-tap caskroom/versions
-install brew-cask
-cask install 1password
-cask install acorn
-cask install adium
-cask install anvil
-# cask install arq
-# cask install bittorrent-sync
-# cask install choosy
-# cask install cloud
-# cask install coconutbattery
-cask install colorpicker-skalacolor
-# cask install commandq
-cask install dropbox
-cask install fantastical
-cask install firefox
-cask install flux
-cask install google-chrome
-cask install imagealpha
-cask install imageoptim
-cask install istat-menus
-cask install iterm2-beta
-cask install ivolume
-cask install java
-cask install kaleidoscope
-cask install macvim
-cask install mplayerx
-cask install mpv
-# cask install orbit
-# cask install prey
-cask install quicksilver
-cask install sequel-pro
-cask install skype
-cask install smoothmouse
-cask install spotify
-cask install superduper
-cask install textmate
-# cask install vmware-fusion
-cask install vlc
-
-tap caskroom/fonts
-cask install font-vollkorn
-cask install font-source-code-pro
-cask install font-source-sans-pro
-# cask install font-redacted
-# cask install font-comic-neue
-cask install font-courier-prime
diff --git a/mas.sh b/mas.sh
new file mode 100755
index 0000000..691e39e
--- /dev/null
+++ b/mas.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+mas install 904280696
+mas install 13764025890
+mas install 1084713122
+mas install 1107421413
+mas install 409183694
+mas install 403504866
+mas install 1278508951
+mas install 918858936
+mas install 530458789
+mas install 734335183
+mas install 409203825
+mas install 497799835
+mas install 409201541
+mas install 1179623856
+mas install 1082624744
+mas install 1225570693
+mas install 924726344
diff --git a/setup.sh b/setup.sh
index 96e2656..cda3422 100755
--- a/setup.sh
+++ b/setup.sh
@@ -1,21 +1,23 @@
 #!/bin/sh
 
-ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
+/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
 
 # We want to be in the user home directory.
 cd ~
 
-# Tap boneyard for bundle command
-brew tap homebrew/boneyard
-
 # Get Brewfiles.
-echo 'Downloading Brewfiles...'
+echo 'Downloading...'
 curl -s https://raw.githubusercontent.com/danbee/mac-setup/master/Brewfile > ~/Brewfile
-curl -s https://raw.githubusercontent.com/danbee/mac-setup/master/Caskfile > ~/Caskfile
+curl -s https://raw.githubusercontent.com/danbee/mac-setup/master/mas.sh > ~/mas.sh
+chmod +x ~/mas.sh
 
 # Install brew bundles
-echo 'Installing...'
-brew bundle && brew bundle Caskfile
+echo 'Installing Homebrew bundle...'
+brew bundle
+
+# Install Mac App Store apps
+echo 'Installing App Store apps'
+~/mas.sh
 
 echo 'Done!'