diff --git a/Brewfile b/Brewfile
index 5cbb77b..8e8d66b 100644
--- a/Brewfile
+++ b/Brewfile
@@ -1,41 +1,160 @@
+##
+# brews
+##
+
 ## Productive stuff
-ack
-httpie
-wget
-packer
-watch
+brew "ack"
+brew "httpie"
+brew "wget"
+brew "packer"
+brew "watch"
 
 ## Programming stuff
-rbenv
-ruby-build
-ngrok
-nvm
-npm
-python
-git
-git-flow
+brew "rbenv"
+brew "ruby-build"
+brew "ngrok"
+brew "nvm"
+brew "npm"
+brew "python"
+brew "git"
+brew "git-flow"
 
 ## Shell stuff
-zsh
-zsh-completions
-zsh-syntax-highlighting
-tmux
-tmate
+brew "zsh"
+brew "zsh-completions"
+brew "zsh-syntax-highlighting"
+brew "tmux"
+brew "tmate"
 
 ## VPN stuff
-#tuntap
-#openconnect
+#brew "tuntap"
+#brew "openconnect"
 
-## brew cask and more versions of casks
-caskroom/cask/brew-cask
+## brew "cask and more versions of casks
+brew "caskroom/cask/brew-cask"
 
 ## Pivotal CF cli
-cloudfoundry-cli
+brew "cloudfoundry-cli"
 
 ## Time-waste stuff
-#fortune
-#cowsay
-youtube-dl
+#brew "fortune"
+#brew "cowsay"
+brew "youtube-dl"
+
+## Games
+brew "homebrew/games/ckan"
+
+##
+# taps
+##
+
+## brew cask and more versions of casks
+tap "caskroom/versions"
+
+## Add tap "for Pivotal
+tap "pivotal/tap"
+
+## Tap for packer
+tap "homebrew/binary"
+
+## Tap for tmate
+tap "nviennot/tmate"
+
+##
+# casks
+##
+
+## Install a ton of great apps using Homebrew cask instead of downloading, clicking and manually installing :)
+
+## Standard app replacements
+# Web
+cask "google-chrome"
+# cask Terminal
+cask "iterm2"
+
+## Boxes
+# Virtualization
+cask "vagrant"
+cask "virtualbox"
+# Containers
+cask "dockertoolbox"
+
+## Coding
+# SourceTree
+cask "sourcetree"
+# Text editing
+cask "sublime-text3"
+cask "atom"
+# Markdown
+cask "macdown"
+
+## Desktop
+# Proper screen ligthing
+cask "flux"
+# QuickLook plugins
+cask "qlcolorcode"
+cask "qlstephen"
+cask "qlmarkdown"
+cask "quicklook-json"
+cask "betterzipql"
+cask "suspicious-package"
+# Window management
+cask "spectacle"
+# Logitech Unifying software for keyboard and trackball
+cask "logitech-unifying"
+
+## Media
+# Video player
+cask "vlc"
+# PDF reader
+cask "skim"
+# Picture viewer
+cask "xee"
+# Comic reader
+cask "simple-comic"
+# Sonos music manager
+cask "sonos"
+# Soundcloud client (yes, that's the correct spelling)
+cask "soundcleod"
+# Adobe Flash
+cask "flash"
+# Podcast player
+cask "instacast"
+# Music player - install vox from App Store instead
+# Spotify player
+cask "spotify"
+
+
+## Work
+# Screen recording
+cask "screenflow"
+# Note taking
+cask "evernote"
+cask "nvalt"
+# VMware View
+cask "vmware-horizon-view-client"
+# Collaboration
+cask "slack"
+# Podcast cleanup
+cask "levelator"
+cask "audio-hijack"
+
+## Cloud resources
+cask "google-cloud-sdk"
+
+## Social
+# Skype
+cask "skype"
+
+## Storage
+# Online storage
+cask "dropbox"
+cask "google-drive"
+# Compression
+cask "keka"
+# Management
+cask "filezilla"
 
 ## Games
-homebrew/games/ckan
+# Steam client - now possible to stream games from the gaming rig to the Mac!
+cask "steam"
diff --git a/Caskfile b/Caskfile
deleted file mode 100644
index 19a0e25..0000000
--- a/Caskfile
+++ /dev/null
@@ -1,89 +0,0 @@
-## Install a ton of great apps using Homebrew cask instead of downloading, clicking and manually installing :)
-
-## Standard app replacements
-# Web
-google-chrome
-# Terminal
-iterm2
-
-## Boxes
-# Virtualization
-vagrant
-virtualbox
-# Containers
-dockertoolbox
-
-## Coding
-# SourceTree
-#sourcetree
-# Text editing
-#sublime-text3
-atom
-# Markdown
-#macdown
-
-## Desktop
-# Proper screen ligthing
-flux
-# QuickLook plugins
-qlcolorcode qlstephen qlmarkdown quicklook-json betterzipql suspicious-package
-# Window management
-spectacle
-# Logitech Unifying software for keyboard and trackball
-logitech-unifying
-
-## Media
-# Video player
-vlc
-# PDF reader
-skim
-# Picture viewer
-xee
-# Comic reader
-#simple-comic
-# Sonos music manager
-sonos
-# Soundcloud client (yes, that's the correct spelling)
-soundcleod
-# Adobe Flash
-flash
-# Podcast player
-#instacast
-# Music player - install vox from App Store instead
-# Spotify player
-spotify
-
-
-## Work
-# Screen recording
-screenflow
-# Note taking
-#evernote
-#nvalt
-# VMware View
-vmware-horizon-view-client
-# Collaboration
-#slack - use App store instead
-# Podcast cleanup
-#levelator
-audio-hijack
-
-## Cloud resources
-google-cloud-sdk
-
-## Social
-# Skype
-skype
-
-## Storage
-# Online storage
-dropbox
-google-drive
-# Compression
-keka
-# Management
-filezilla
-
-## Games
-# Steam client - now possible to stream games from the gaming rig to the Mac!
-steam
diff --git a/Taps b/Taps
deleted file mode 100644
index 80c3d32..0000000
--- a/Taps
+++ /dev/null
@@ -1,11 +0,0 @@
-## brew cask and more versions of casks
-caskroom/versions
-
-## Add tap for Pivotal
-pivotal/tap
-
-## Tap for packer
-homebrew/binary
-
-## Tap for tmate
-nviennot/tmate
diff --git a/bootstrap.sh b/bootstrap.sh
index b99e697..f4154f1 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -7,14 +7,8 @@ brew update
 # Install oh-my-zsh to beautify and manage zsh
 curl -L http://install.ohmyz.sh | sh
 
-# install brew taps, needs to be fixed properly later
-while read in; do brew tap "$in"; done < Taps
-
-# Install brews
-brew install $(cat Brewfile|grep -v "#")
-
-# Install casks
-brew cask install $(cat Caskfile|grep -v "#")
+# install from Brewfile
+brew bundle
 
 # Set standard settings
 source 'settings.sh'