diff --git a/brew b/brew
index 7db7224..d9a0b81 100755
--- a/brew
+++ b/brew
@@ -33,15 +33,12 @@ brew install apple-gcc42
 brew install awscli
 brew install chruby
 brew install coreutils
-brew install docker
-brew install docker-compose
 brew install elixir
 brew install erlang
 brew install ffmpeg
-brew install fx
 brew install gdbm
 brew install git
-brew install gnupg2
+brew install gnupg
 brew install go
 brew install heroku
 brew install htop-osx
@@ -49,16 +46,17 @@ brew install hub
 brew install imagemagick
 brew install libffi
 brew install libyaml
-brew install kubernetes-cli
 brew install jq
 brew install markdown
+brew install mas
 brew install maven
 brew install mkvtoolnix
+brew install n
+brew install nmap
 brew install ngrok2
 brew install nmap
 brew install openssl
 brew install pandoc
-brew install phantomjs
 brew install readline
 brew install reattach-to-user-namespace
 brew install ruby-install
diff --git a/cask b/cask
index 3167bbd..10f2a7f 100755
--- a/cask
+++ b/cask
@@ -5,9 +5,9 @@ if [ -x "$brew_path" ] ; then
   echo "Install/Updating Homebrew Packages"
   echo ""
 
-  brew tap caskroom/cask
-  brew tap caskroom/versions
-  brew install brew-cask
+  #brew tap caskroom/cask
+  #brew tap caskroom/versions
+  #brew install brew-cask
 
   function installcask() {
     brew cask install "${@}"
@@ -26,6 +26,7 @@ if [ -x "$brew_path" ] ; then
   installcask daisydisk
   installcask dash
   installcask discord
+  installcask docker
   installcask dropbox
   installcask firefox
   installcask fluid
@@ -42,6 +43,7 @@ if [ -x "$brew_path" ] ; then
   installcask moom
   installcask nextcloud
   installcask ngrok
+  installcask phantomjs
   installcask postman
   installcask robo-3t
   installcask rowanj-gitx
@@ -54,9 +56,11 @@ if [ -x "$brew_path" ] ; then
   installcask superduper
   installcask teamviewer
   installcask virtualbox
+  installcask virtualbox-extension-pack
   installcask visual-studio-code
   installcask vlc
   installcask whatsapp
+  installcask zoomus
 else
   echo "Install Homebrew first. Run ~/dotfiles/brew first."
   echo ""
diff --git a/link/.yarnrc b/link/.yarnrc
index 30cb5cb..9a6930a 100644
--- a/link/.yarnrc
+++ b/link/.yarnrc
@@ -3,4 +3,4 @@
 
 
 registry "https://registry.npmjs.org"
-lastUpdateCheck 1551185681156
+lastUpdateCheck 1552235087861
diff --git a/link/Brewfile b/link/Brewfile
new file mode 100644
index 0000000..a34a334
--- /dev/null
+++ b/link/Brewfile
@@ -0,0 +1,101 @@
+tap "homebrew/bundle"
+tap "homebrew/cask"
+tap "homebrew/cask-versions"
+tap "homebrew/core"
+
+cask "java8"
+
+brew "ack"
+brew "antigen"
+brew "automake"
+brew "gdbm"
+brew "openssl"
+brew "readline"
+brew "xz"
+brew "awscli"
+brew "bison"
+brew "libffi"
+brew "chruby"
+brew "coreutils"
+brew "libyaml"
+brew "erlang"
+brew "elixir"
+brew "ffmpeg"
+brew "git"
+brew "gnupg"
+brew "go"
+brew "handbrake"
+brew "htop"
+brew "hub"
+brew "imagemagick"
+brew "jq"
+brew "markdown"
+brew "mas"
+brew "mkvtoolnix"
+brew "n", args: ["HEAD"]
+brew "nmap"
+brew "pandoc"
+brew "reattach-to-user-namespace"
+brew "ruby-install"
+brew "stow"
+brew "teensy_loader_cli"
+brew "the_platinum_searcher"
+brew "the_silver_searcher"
+brew "tmux"
+brew "tmuxinator-completion"
+brew "ttyrec"
+brew "vim"
+brew "wallpaper"
+brew "youtube-dl"
+brew "zsh"
+
+cask "1password"
+cask "adobe-creative-cloud"
+cask "alfred"
+cask "anki"
+cask "arq"
+cask "bartender"
+cask "bettertouchtool"
+cask "burp-suite"
+cask "daisydisk"
+cask "dash"
+cask "discord"
+cask "docker"
+cask "dropbox"
+cask "firefox"
+cask "fluid"
+cask "fork"
+cask "google-chrome"
+cask "handbrake"
+cask "hazel"
+cask "hyper-canary"
+cask "imazing"
+cask "istat-menus"
+cask "iterm2"
+cask "keycastr"
+cask "microsoft-office"
+cask "moom"
+cask "nextcloud"
+cask "ngrok"
+cask "notion"
+cask "phantomjs"
+cask "postman"
+cask "robo-3t"
+cask "rowanj-gitx"
+cask "secure-pipes"
+cask "sequel-pro"
+cask "shimo"
+cask "skype"
+cask "slack"
+cask "spotify"
+cask "superduper"
+cask "teamviewer"
+cask "virtualbox"
+cask "virtualbox-extension-pack"
+cask "visual-studio-code"
+cask "vlc"
+cask "whatsapp"
+cask "zoomus"
+
+mas "Monosnap", id: 540348655
+mas "Xcode", id: 497799835
diff --git a/osx b/osx
index 2028d48..d63982e 100755
--- a/osx
+++ b/osx
@@ -524,16 +524,16 @@ defaults write com.apple.terminal StringEncodings -array 4
 #defaults write org.x.X11 wm_ffm -bool true
 
 # Copy over my usual font
-cp "${HOME}/dotfiles/data/*.ttf" ~/Library/Fonts/
+# cp "${HOME}/dotfiles/data/*.ttf" ~/Library/Fonts/
 
 # Copy over my configuration
-cp "${HOME}/dotfiles/data/com.googlecode.iterm2.plist" ~/Library/Preferences/
+# cp "${HOME}/dotfiles/data/com.googlecode.iterm2.plist" ~/Library/Preferences/
 
 # Install pretty iTerm colors
-open "${HOME}/dotfiles/data/SolarizedDark.itermcolors"
+# open "${HOME}/dotfiles/data/SolarizedDark.itermcolors"
 
 # Don’t display the annoying prompt when quitting iTerm
-defaults write com.googlecode.iterm2 PromptOnQuit -bool false
+# defaults write com.googlecode.iterm2 PromptOnQuit -bool false
 
 ###############################################################################
 # Time Machine                                                                #
diff --git a/post/install-fonts b/post/install-fonts
index c69ac9b..c1e2a85 100644
--- a/post/install-fonts
+++ b/post/install-fonts
@@ -1,8 +1,4 @@
-#!/bin/bash
-
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-
-cd ../data
+cd ~/dotfiles/data
 cp -v *.ttf /Library/Fonts
 cd "Fira Code iScript"
 cp -v *.ttf /Library/Fonts