diff --git a/Makefile b/Makefile
index 23f1c01..64c8dfd 100644
--- a/Makefile
+++ b/Makefile
@@ -9,14 +9,15 @@ link:
 	-ln -s ~/Git/dotfiles/.tmux.conf ~
 
 brew:
-	sh -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
-	sh ./macos/brewfile.sh
+	-sh -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+	-brew bundle --file ./macos/Brewfile
+	-sudo chsh -s /usr/local/bin/bash
 
 cask:
-	sh ./macos/caskfile-basics.sh
+	brew bundle --file ./macos/Caskfile
 
 cask_personal:
-	sh ./macos/caskfile-personal.sh
+	-brew bundle --file ./macos/Caskfile.personal
 
 tmux:
 	-git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm
@@ -27,6 +28,6 @@ bash_git_prompt:
 	-ln -s ~/Git/dotfiles/.git-prompt-colors.sh ~
 
 vim:
- 	-ln -s ~/Git/dotfiles/.vim ~
+	-ln -s ~/Git/dotfiles/.vim ~
 	-ln -s ~/Git/dotfiles/.vimrc ~
 	-git clone https://github.com/VundleVim/Vundle.vim.git ~/.vim/bundle/Vundle.vim
diff --git a/macos/Brewfile b/macos/Brewfile
new file mode 100644
index 0000000..b489294
--- /dev/null
+++ b/macos/Brewfile
@@ -0,0 +1,18 @@
+tap 'homebrew/bundle'
+
+brew 'bash'
+brew 'bash-git-prompt'
+brew 'bitwarden-cli'
+brew 'coreutils'
+brew 'docker'
+brew 'git'
+brew 'gh'
+brew 'htop'
+brew 'iperf3'
+brew 'jq'
+brew 'nvm'
+brew 'thefuck'
+brew 'tmux'
+brew 'tree'
+brew 'wget'
+brew 'youtube-dl'
diff --git a/macos/Caskfile b/macos/Caskfile
new file mode 100644
index 0000000..8f035ec
--- /dev/null
+++ b/macos/Caskfile
@@ -0,0 +1,27 @@
+# Install casks I want on every computer.
+
+cask_args appdir: '/Applications'
+
+cask 'alt-tab'
+cask 'apparency'
+cask 'arc'
+cask 'bartender'
+cask 'datweatherdoe'
+cask 'figma'
+cask 'firefox'
+cask 'forklift'
+cask 'gifox'
+cask 'google-chrome'
+cask 'iterm2'
+cask 'keyboardcleantool'
+cask 'monitorcontrol'
+cask 'notion'
+cask 'qlmarkdown'
+cask 'raycast'
+cask 'slack'
+cask 'soundsource'
+# cask 'istat-menus' # -- replaced by stats
+cask 'stats'
+cask 'the-unarchiver'
+cask 'visual-studio-code'
+cask 'vlc'
diff --git a/macos/Caskfile.personal b/macos/Caskfile.personal
new file mode 100644
index 0000000..3530c5b
--- /dev/null
+++ b/macos/Caskfile.personal
@@ -0,0 +1,26 @@
+# Install casks I want on personal computers only
+
+cask_args appdir: '/Applications'
+
+cask 'authy'
+cask 'battle-net'
+cask 'bitwarden'
+cask 'discord'
+cask 'kindle'
+cask 'ledger-live'
+cask 'microsoft-office'
+cask 'mqtt-explorer'
+cask 'obsidian'
+cask 'onedrive'
+cask 'pibar'
+cask 'plex'
+cask 'plexamp'
+cask 'protonvpn'
+cask 'spotify'
+cask 'steam'
+cask 'synology-drive'
+cask 'tailscale'
+cask 'telegram'
+cask 'viber'
+cask 'yattee'
+cask 'yubico-yubikey-manager'
diff --git a/macos/caskfile-basics.sh b/macos/caskfile-basics.sh
index 4180b83..351d271 100644
--- a/macos/caskfile-basics.sh
+++ b/macos/caskfile-basics.sh
@@ -1,7 +1,5 @@
 # Install casks I want on every computer.
 
-brew tap homebrew/cask
-
 brew install --cask alt-tab
 brew install --cask apparency
 brew install --cask arc