diff --git a/Brewfile b/Brewfile
index e4607a6..0d33989 100644
--- a/Brewfile
+++ b/Brewfile
@@ -1,6 +1,7 @@
 tap "thoughtbot/formulae"
 tap "heroku/brew"
 brew "asdf"
+brew "chunkwm"
 brew "direnv"
 brew "git"
 brew "heroku"
@@ -11,6 +12,7 @@ brew "pv"
 brew "ripgrep"
 brew "rcm"
 brew "rsync"
+brew "skhd"
 brew "tig"
 brew "tmux"
 brew "vim"
@@ -31,7 +33,7 @@ cask "macvim"
 cask "phantomjs"
 cask "textmate"
 
-cask "font-vollkorn"
 cask "font-source-code-pro"
 cask "font-source-sans-pro"
-cask "font-courier-prime"
+cask "font-sourcecodepro-nerd-font"
+cask "font-sourcecodepro-nerd-font-mono"
diff --git a/Brewfile.extra b/Brewfile.extra
new file mode 100644
index 0000000..a2dcbb2
--- /dev/null
+++ b/Brewfile.extra
@@ -0,0 +1,27 @@
+brew "mackup"
+brew "mercurial"
+
+cask "colorpicker-skalacolor"
+cask "dropbox"
+cask "fantastical"
+cask "fontplop"
+cask "istat-menus"
+cask "ivolume"
+cask "mplayerx"
+cask "mpv"
+cask "sequel-pro"
+cask "skype"
+cask "spotify"
+cask "superduper"
+cask "vmware-fusion"
+cask "vlc"
+
+cask "font-courier-prime"
+cask "font-courier-prime-code"
+cask "font-ibm-plex"
+cask "font-inconsolata"
+cask "font-merriweather"
+cask "font-noto-sans"
+cask "font-noto-sans-mono"
+cask "font-public-sans"
+cask "font-vollkorn"
diff --git a/extra.sh b/extra.sh
new file mode 100755
index 0000000..ccf80f6
--- /dev/null
+++ b/extra.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+MAC_SETUP_DIR="$HOME/mac-setup"
+
+BOLD="\033[1m"
+WHITE="\033[0;37m"
+YELLOW="\033[1;33m"
+GREEN="\033[1;32m"
+NC="\033[0m"
+
+step() {
+  echo "${YELLOW}❯❯❯ ${WHITE}${BOLD}$1${NC} ${YELLOW}❮❮❮${NC}"
+}
+
+# Install brew bundles
+step "Installing Homebrew bundle extra"
+brew bundle --file="$MAC_SETUP_DIR/Brewfile.extra"
diff --git a/lib/homebrew.sh b/lib/homebrew.sh
deleted file mode 100644
index 1a24852..0000000
--- a/lib/homebrew.sh
+++ /dev/null
@@ -1 +0,0 @@
-#!/bin/sh