diff --git a/LICENSE-MIT.txt b/LICENSE-MIT.txt
index 760b382..9208509 100644
--- a/LICENSE-MIT.txt
+++ b/LICENSE-MIT.txt
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2016 Pedro Machado Santa <pedro.santa@gmail.com>
+Copyright (c) 2021 Pedro Machado Santa <pedro.santa@gmail.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
index b34e60b..d08ee86 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
-# ⚙ pedrosanta / dotfiles
-My collection of configuration and dotfiles, mostly set to work with **macOS**, **bash** shell and native **Terminal.app**, so if your preferences differ YMMV.
+# ⚙️ pedrosanta / dotfiles
+My collection of configuration and dotfiles, mostly set to work with **macOS**, **zsh** shell and native **Terminal.app**, so if your preferences differ YMMV.
 
 It makes use of [GNU Stow](https://www.gnu.org/software/stow/), a very simple and interesting symlink tool [particularly useful to help manage dotfiles repositories](http://brandon.invergo.net/news/2012-05-26-using-gnu-stow-to-manage-your-dotfiles.html).
 
@@ -38,6 +38,7 @@ Here are some more resources on dotfiles I think may be worth looking to:
 - [mathiasbynens/dotfiles](https://github.com/mathiasbynens/dotfiles), dotfiles repository and sensible hacker defaults for macOS;
 - [webpro/awesome-dotfiles](https://github.com/webpro/awesome-dotfiles), a curated list of dotfiles resources inspired by the awesome list;
 - And of course, [the huge list of dotfiles repositories on GitHub](https://github.com/search?q=dotfiles&s=stars&type=Repositories) to draw more ideas and inspiration;
+- [Compreensive guide on zsh configuration](https://thevaluable.dev/zsh-install-configure-mouseless/);
 
 ## License
 
diff --git a/brew.sh b/brew.sh
index 0b4fa0b..592a90e 100755
--- a/brew.sh
+++ b/brew.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/zsh
 
 # Make sure we're using the latest Homebrew.
 brew update
@@ -7,42 +7,41 @@ brew update
 brew upgrade
 
 # Install packages
-brew install git # System git it's ok, but we install this to get and load the git bash auto complete script
-brew install bash-completion
+brew install wget
+brew install zsh-completions
 brew install stow
 
 # Install completions.
-brew install docker-completion
-brew install docker-compose-completion
+#brew install docker-completion
+#brew install docker-compose-completion
 
-# Install Homebrew legacy cask versions tap. See https://github.com/Homebrew/homebrew-cask-versions
-# Needed for 1password6 cask.
-brew tap homebrew/cask-versions
-
-# Install binary Caskroom 'casks'
+# Install casks
 ## System Essentials
-brew cask install itsycal
-brew cask install skyfonts
-brew cask install java # Meh.
+brew install itsycal
 ## Other
-brew cask install dropbox
-brew cask install 1password6
-brew cask install google-chrome
-brew cask install spotify
-brew cask install spotify-notifications
-brew cask install sublime-text
-brew cask install docker
-brew cask install sourcetree
-brew cask install kitematic
-brew cask install steam
-brew cast install whatsapp
-brew cask install skype # Meh.
-brew cask install typora
-brew cask install duet
-brew cask install cyberduck
-brew cask install transmission
-brew cask install vlc
-brew cask install keka
+brew install 1password
+brew install google-chrome
+brew install sublime-text
+brew install sublime-merge
+brew install sourcetree
+brew install typora
+brew install --cask docker
+brew install slack
+brew install signal
+brew install whatsapp
+brew install skype
+brew install google-drive
+brew install dropbox
+brew install microsoft-office
+brew install adobe-creative-cloud
+brew install spotify
+brew install surfshark
+brew install cloudflare-warp
+brew install keka
+brew install cyberduck
+brew install pingplotter
+brew install vlc
+brew install --cask transmission
 
 # Remove outdated versions from the cellar
 brew cleanup
diff --git a/install.sh b/install.sh
index ed9fd5f..4f69ec4 100755
--- a/install.sh
+++ b/install.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/zsh
 
-stow --ignore ".DS_Store" bash
+stow --ignore ".DS_Store" zsh
 stow --ignore ".DS_Store" sublime
\ No newline at end of file
diff --git a/zsh/.zshrc b/zsh/.zshrc
new file mode 100644
index 0000000..3b32a69
--- /dev/null
+++ b/zsh/.zshrc
@@ -0,0 +1,11 @@
+if type brew &>/dev/null
+then
+  FPATH="$(brew --prefix)/share/zsh/site-functions:${FPATH}"
+
+  autoload -Uz compinit
+  compinit
+fi
+
+export NVM_DIR="$HOME/.nvm"
+[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
+[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion