diff --git a/.dots b/.dots
index 5b5970a94..de3461b8b 100755
--- a/.dots
+++ b/.dots
@@ -10,14 +10,14 @@ function runDots() {
     # Run sections based on command line arguments
     for ARG in "$@"
     do
-        if [ $ARG == "bootstrap" ] || [ $ARG == "all" ]; then
-            echo ""
-            echo "------------------------------"
-            echo "Syncing the dev-setup repo to your local machine."
-            echo "------------------------------"
-            echo ""
-            cd ~ && curl -#L https://github.com/donnemartin/dev-setup/tarball/master | tar -xzv --strip-components 1 --exclude={README.md,LICENSE}
-        fi
+        # if [ $ARG == "bootstrap" ] || [ $ARG == "all" ]; then
+        #     echo ""
+        #     echo "------------------------------"
+        #     echo "Syncing the dev-setup repo to your local machine."
+        #     echo "------------------------------"
+        #     echo ""
+        #     cd ~ && curl -#L https://github.com/donnemartin/dev-setup/tarball/master | tar -xzv --strip-components 1 --exclude={README.md,LICENSE}
+        # fi
         if [ $ARG == "osxprep" ] || [ $ARG == "all" ]; then
             # Run the osxprep.sh Script
             echo ""
@@ -40,29 +40,41 @@ function runDots() {
             echo ""
             ./brew.sh
         fi
-        if [ $ARG == "osx" ] || [ $ARG == "all" ]; then
-            # Run the osx.sh Script
-            # I strongly suggest you read through the commented osx.sh
-            # source file and tweak any settings based on your personal
-            # preferences. The script defaults are intended for you to
-            # customize. For example, if you are not running an SSD you
-            # might want to change some of the settings listed in the
-            # SSD section.
-            echo ""
-            echo "------------------------------"
-            echo "Setting sensible OSX defaults."
-            echo "------------------------------"
+				if [ $ARG == "terminal" ] || [ $ARG == "all" ]; then
+            # Run the brew.sh Script
+            # For a full listing of installed formulae and apps, refer to
+            # the commented brew.sh source file directly and tweak it to
+            # suit your needs.
             echo ""
-            ./osx.sh
-        fi
-        if [ $ARG == "pydata" ] || [ $ARG == "all" ]; then
-            # Run the pydata.sh Script
             echo "------------------------------"
-            echo "Setting up Python data development environment."
+            echo "Installing Terminal updates along with some common formulae and apps."
             echo "------------------------------"
             echo ""
-            ./pydata.sh
+            ./terminal.sh
         fi
+        # if [ $ARG == "osx" ] || [ $ARG == "all" ]; then
+        #     # Run the osx.sh Script
+        #     # I strongly suggest you read through the commented osx.sh
+        #     # source file and tweak any settings based on your personal
+        #     # preferences. The script defaults are intended for you to
+        #     # customize. For example, if you are not running an SSD you
+        #     # might want to change some of the settings listed in the
+        #     # SSD section.
+        #     echo ""
+        #     echo "------------------------------"
+        #     echo "Setting sensible OSX defaults."
+        #     echo "------------------------------"
+        #     echo ""
+        #     ./osx.sh
+        # fi
+        # if [ $ARG == "pydata" ] || [ $ARG == "all" ]; then
+        #     # Run the pydata.sh Script
+        #     echo "------------------------------"
+        #     echo "Setting up Python data development environment."
+        #     echo "------------------------------"
+        #     echo ""
+        #     ./pydata.sh
+        # fi
         if [ $ARG == "aws" ] || [ $ARG == "all" ]; then
             # Run the aws.sh Script
             echo "------------------------------"
@@ -87,14 +99,14 @@ function runDots() {
             echo ""
             ./web.sh
         fi
-        if [ $ARG == "android" ] || [ $ARG == "all" ]; then
-            # Run the android.sh Script
-            echo "------------------------------"
-            echo "Setting up Android development environment."
-            echo "------------------------------"
-            echo ""
-            ./android.sh
-        fi
+        # if [ $ARG == "android" ] || [ $ARG == "all" ]; then
+        #     # Run the android.sh Script
+        #     echo "------------------------------"
+        #     echo "Setting up Android development environment."
+        #     echo "------------------------------"
+        #     echo ""
+        #     ./android.sh
+        # fi
     done
 
     echo "------------------------------"
diff --git a/aws.sh b/aws.sh
index e8b6fefa9..41aee8e12 100755
--- a/aws.sh
+++ b/aws.sh
@@ -11,51 +11,53 @@ echo "Setting up AWS."
 echo "This script requires pip and virtualenvwrapper to be installed."
 echo "See the pydata.sh script."
 
-echo "------------------------------"
-echo "Source virtualenvwrapper from ~/.extra"
-source ~/.extra
+# echo "------------------------------"
+# echo "Source virtualenvwrapper from ~/.extra"
+# source ~/.extra
 
 ###############################################################################
 # Python 2 Virtual Enviroment                                                 #
 ###############################################################################
 
-echo "------------------------------"
-echo "Updating py2-data virtual environment with AWS modules."
+# echo "------------------------------"
+# echo "Updating py2-data virtual environment with AWS modules."
 
 # Create a Python2 data environment
 # If this environment already exists from running pydata.sh,
 # it will not be overwritten
-mkvirtualenv py2-data
-workon py2-data
-
-pip install boto
-pip install awscli
-pip install mrjob
-pip install s3cmd
-
-EXTRA_PATH=~/.extra
-echo $EXTRA_PATH
-echo "" >> $EXTRA_PATH
-echo "" >> $EXTRA_PATH
-echo "# Configure aws cli autocomplete, added by aws.sh" >> $EXTRA_PATH
-echo "complete -C '~/.virtualenvs/py2-data/bin/aws_completer' aws" >> $EXTRA_PATH
-source $EXTRA_PATH
+# mkvirtualenv py2-data
+# workon py2-data
+curl "https://awscli.amazonaws.com/AWSCLIV2.pkg" -o "/tmp/AWSCLIV2.pkg"
+sudo installer -pkg /tmp/AWSCLIV2.pkg -target /
+
+pipenv install boto
+# pipenv install awscli
+pipenv install s3cmd
+# pipenv install mrjob
+
+# EXTRA_PATH=~/.extra
+# echo $EXTRA_PATH
+# echo "" >> $EXTRA_PATH
+# echo "" >> $EXTRA_PATH
+# echo "# Configure aws cli autocomplete, added by aws.sh" >> $EXTRA_PATH
+# echo "complete -C '~/.virtualenvs/py2-data/bin/aws_completer' aws" >> $EXTRA_PATH
+# source $EXTRA_PATH
 
 ###############################################################################
 # Python 3 Virtual Enviroment                                                 #
 ###############################################################################
 
-echo "------------------------------"
-echo "Updating py3-data virtual environment with AWS modules."
-
-# Create a Python3 data environment
-# If this environment already exists from running pydata.sh,
-# it will not be overwritten
-mkvirtualenv --python=/usr/local/bin/python3 py3-data
-workon py3-data
-
-pip install boto
-pip install awscli
+# echo "------------------------------"
+# echo "Updating py3-data virtual environment with AWS modules."
+#
+# # Create a Python3 data environment
+# # If this environment already exists from running pydata.sh,
+# # it will not be overwritten
+# mkvirtualenv --python=/usr/local/bin/python3 py3-data
+# workon py3-data
+#
+# pip install boto
+# pip install awscli
 #pip install mrjob  # Python 2 only
 #pip install s3cmd  # Python 2 only
 
@@ -74,40 +76,40 @@ pip install awscli
 
 # Check for Homebrew,
 # Install if we don't have it
-if test ! $(which brew); then
-  echo "Installing homebrew..."
-  ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
-fi
+# if test ! $(which brew); then
+#   echo "Installing homebrew..."
+#   ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
+# fi
 
 # Make sure we’re using the latest Homebrew.
-brew update
-
-brew install apache-spark
-
-###############################################################################
-# Install IPython Notebook Spark Integration
-###############################################################################
-
-echo "------------------------------"
-echo "Installing IPython Notebook Spark integration"
-
-# Add the pyspark IPython profile
-cp -r init/profile_pyspark/ ~/.ipython/profile_pyspark
-
-BASH_PROFILE_PATH=~/.bash_profile
-echo $BASH_PROFILE_PATH
-echo "" >> $BASH_PROFILE_PATH
-echo "" >> $BASH_PROFILE_PATH
-echo "# IPython Notebook Spark integration, added by aws.sh" >> $BASH_PROFILE_PATH
-# Run $ brew info apache-spark to determine the Spark install location
-echo "export SPARK_HOME='/usr/local/Cellar/apache-spark/1.4.1'" >> $BASH_PROFILE_PATH
-echo "# Appending pyspark-shell is needed for Spark 1.4+" >> $BASH_PROFILE_PATH
-echo "export PYSPARK_SUBMIT_ARGS='--master local[2] pyspark-shell'" >> $BASH_PROFILE_PATH
-echo "" >> $BASH_PROFILE_PATH
-source $BASH_PROFILE_PATH
+# brew update
+#
+# brew install apache-spark
+#
+# ###############################################################################
+# # Install IPython Notebook Spark Integration
+# ###############################################################################
+#
+# echo "------------------------------"
+# echo "Installing IPython Notebook Spark integration"
+#
+# # Add the pyspark IPython profile
+# cp -r init/profile_pyspark/ ~/.ipython/profile_pyspark
+#
+# BASH_PROFILE_PATH=~/.bash_profile
+# echo $BASH_PROFILE_PATH
+# echo "" >> $BASH_PROFILE_PATH
+# echo "" >> $BASH_PROFILE_PATH
+# echo "# IPython Notebook Spark integration, added by aws.sh" >> $BASH_PROFILE_PATH
+# # Run $ brew info apache-spark to determine the Spark install location
+# echo "export SPARK_HOME='/usr/local/Cellar/apache-spark/1.4.1'" >> $BASH_PROFILE_PATH
+# echo "# Appending pyspark-shell is needed for Spark 1.4+" >> $BASH_PROFILE_PATH
+# echo "export PYSPARK_SUBMIT_ARGS='--master local[2] pyspark-shell'" >> $BASH_PROFILE_PATH
+# echo "" >> $BASH_PROFILE_PATH
+# source $BASH_PROFILE_PATH
 
 echo "------------------------------"
 echo "TODO: Update .aws/ with your AWS credentials and region, or run aws --configure."
-echo "TODO: Update .mrjob.conf with your credentials, keypair, keypair location, region, and bucket info."
+# echo "TODO: Update .mrjob.conf with your credentials, keypair, keypair location, region, and bucket info."
 echo "TODO: Update .s3cfg with your credentials, location, and passphrase or run s3cmd --configure."
-echo "Script completed."
\ No newline at end of file
+echo "Script completed."
diff --git a/brew.sh b/brew.sh
index 2f8a7136f..f8af6ee78 100755
--- a/brew.sh
+++ b/brew.sh
@@ -23,151 +23,200 @@ brew upgrade --all
 
 # Install GNU core utilities (those that come with OS X are outdated).
 # Don’t forget to add `$(brew --prefix coreutils)/libexec/gnubin` to `$PATH`.
-brew install coreutils
-sudo ln -s /usr/local/bin/gsha256sum /usr/local/bin/sha256sum
+# brew install coreutils
+# sudo ln -s /usr/local/bin/gsha256sum /usr/local/bin/sha256sum
 
 # Install some other useful utilities like `sponge`.
-brew install moreutils
+# brew install moreutils
 # Install GNU `find`, `locate`, `updatedb`, and `xargs`, `g`-prefixed.
-brew install findutils
+# brew install findutils
 # Install GNU `sed`, overwriting the built-in `sed`.
-brew install gnu-sed
+# brew install gnu-sed
 # Install Bash 4.
-brew install bash
-brew install bash-completion2
+# brew install bash
+# brew install bash-completion2
 # We installed the new shell, now we have to activate it
-echo "Adding the newly installed shell to the list of allowed shells"
+# echo "Adding the newly installed shell to the list of allowed shells"
 # Prompts for password
-sudo bash -c 'echo /usr/local/bin/bash >> /etc/shells'
+# sudo bash -c 'echo /usr/local/bin/bash >> /etc/shells'
 # Change to the new shell, prompts for password
-chsh -s /usr/local/bin/bash
+# chsh -s /usr/local/bin/bash
 
 # Install `wget` with IRI support.
-brew install wget --with-iri
+# brew install wget --with-iri
 
 # Install RingoJS and Narwhal.
 # Note that the order in which these are installed is important;
 # see http://git.io/brew-narwhal-ringo.
-brew install ringojs
-brew install narwhal
+# brew install ringojs
+# brew install narwhal
 
 # Install Python
-brew install python
-brew install python3
+brew install pyenv
+pyenv install 3.8.5
+pyenv global 3.8.5
+brew install pipenv
+# brew install python
+# brew install python3
 
 # Install ruby-build and rbenv
-brew install ruby-build
-brew install rbenv
-LINE='eval "$(rbenv init -)"'
-grep -q "$LINE" ~/.extra || echo "$LINE" >> ~/.extra
+\curl -sSL https://get.rvm.io | bash -s stable
+[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # Load RVM into a shell session *as a function*
+rvm install 2.7.1
+rvm use default 2.7.1
+
+brew install nvm
+
+# copy the following into .zshrc
+export NVM_DIR="$HOME/.nvm"
+[ -s "/usr/local/opt/nvm/nvm.sh" ] && . "/usr/local/opt/nvm/nvm.sh"  # This loads nvm
+[ -s "/usr/local/opt/nvm/etc/bash_completion.d/nvm" ] && . "/usr/local/opt/nvm/etc/bash_completion.d/nvm"  # This loads nvm bash_completion
+
+nvm install 13
+
+# gem install bundler
+# brew install ruby-build
+# brew install rbenv
+# LINE='eval "$(rbenv init -)"'
+# grep -q "$LINE" ~/.extra || echo "$LINE" >> ~/.extra
 
 # Install more recent versions of some OS X tools.
-brew install vim --override-system-vi
-brew install homebrew/dupes/grep
-brew install homebrew/dupes/openssh
-brew install homebrew/dupes/screen
-brew install homebrew/php/php55 --with-gmp
+# brew install vim --override-system-vi
+# brew install homebrew/dupes/grep
+# brew install homebrew/dupes/openssh
+# brew install homebrew/dupes/screen
+# brew install homebrew/php/php55 --with-gmp
 
 # Install font tools.
-brew tap bramstein/webfonttools
-brew install sfnt2woff
-brew install sfnt2woff-zopfli
-brew install woff2
+# brew tap bramstein/webfonttools
+# brew install sfnt2woff
+# brew install sfnt2woff-zopfli
+# brew install woff2
 
 # Install some CTF tools; see https://github.com/ctfs/write-ups.
-brew install aircrack-ng
-brew install bfg
-brew install binutils
-brew install binwalk
-brew install cifer
-brew install dex2jar
-brew install dns2tcp
-brew install fcrackzip
-brew install foremost
-brew install hashpump
-brew install hydra
-brew install john
-brew install knock
-brew install netpbm
-brew install nmap
-brew install pngcheck
-brew install socat
-brew install sqlmap
-brew install tcpflow
-brew install tcpreplay
-brew install tcptrace
-brew install ucspi-tcp # `tcpserver` etc.
-brew install homebrew/x11/xpdf
-brew install xz
+# brew install aircrack-ng
+# brew install bfg
+# brew install binutils
+# brew install binwalk
+# brew install cifer
+# brew install dex2jar
+# brew install dns2tcp
+# brew install fcrackzip
+# brew install foremost
+# brew install hashpump
+# brew install hydra
+# brew install john
+# brew install knock
+# brew install netpbm
+# brew install nmap
+# brew install pngcheck
+# brew install socat
+# brew install sqlmap
+# brew install tcpflow
+# brew install tcpreplay
+# brew install tcptrace
+# brew install ucspi-tcp # `tcpserver` etc.
+# brew install homebrew/x11/xpdf
+# brew install xz
 
 # Install other useful binaries.
-brew install ack
-brew install dark-mode
+# brew install ack
+# brew install dark-mode
 #brew install exiv2
 brew install git
 brew install git-lfs
 brew install git-flow
 brew install git-extras
-brew install hub
+# brew install hub
+brew install yarn
 brew install imagemagick --with-webp
-brew install lua
-brew install lynx
-brew install p7zip
-brew install pigz
-brew install pv
-brew install rename
-brew install rhino
-brew install speedtest_cli
-brew install ssh-copy-id
-brew install tree
-brew install webkit2png
-brew install zopfli
-brew install pkg-config libffi
-brew install pandoc
+# brew install lua
+# brew install lynx
+# brew install p7zip
+# brew install pigz
+# brew install pv
+# brew install rename
+# brew install rhino
+# brew install speedtest_cli
+# brew install ssh-copy-id
+# brew install tree
+# brew install webkit2png
+# brew install zopfli
+# brew install pkg-config libffi
+# brew install pandoc
+brew install bash
+brew install brotli
+brew install cloc
+brew install docker
+brew install docker-compose
+brew install ghostscript
+brew install gh
+brew install mkcert
+brew install mysql
+brew install nvm
+brew install wget
+brew install stunnel
+brew install clamav
+brew install imagemagick
+brew install jq
+brew install oh-my-zsh
+brew install git-secret
 
 # Lxml and Libxslt
-brew install libxml2
-brew install libxslt
-brew link libxml2 --force
-brew link libxslt --force
+# brew install libxml2
+# brew install libxslt
+# brew link libxml2 --force
+# brew link libxslt --force
 
 # Install Heroku
-brew install heroku/brew/heroku
-heroku update
-
-# Core casks
-brew cask install --appdir="/Applications" alfred
-brew cask install --appdir="~/Applications" iterm2
-brew cask install --appdir="~/Applications" java
-brew cask install --appdir="~/Applications" xquartz
+# brew install heroku/brew/heroku
+# heroku update
+#
+# # Core casks
+# brew cask install --appdir="/Applications" alfred
+# brew cask install --appdir="~/Applications" iterm2
+# brew cask install --appdir="~/Applications" java
+# brew cask install --appdir="~/Applications" xquartz
 
 # Development tool casks
-brew cask install --appdir="/Applications" sublime-text
+# brew cask install --appdir="/Applications" sublime-text
 brew cask install --appdir="/Applications" atom
-brew cask install --appdir="/Applications" virtualbox
-brew cask install --appdir="/Applications" vagrant
-brew cask install --appdir="/Applications" macdown
+# brew cask install --appdir="/Applications" virtualbox
+# brew cask install --appdir="/Applications" vagrant
+# brew cask install --appdir="/Applications" macdown
 
 # Misc casks
 brew cask install --appdir="/Applications" google-chrome
-brew cask install --appdir="/Applications" firefox
-brew cask install --appdir="/Applications" skype
+# brew cask install --appdir="/Applications" firefox
+# brew cask install --appdir="/Applications" skype
 brew cask install --appdir="/Applications" slack
-brew cask install --appdir="/Applications" dropbox
-brew cask install --appdir="/Applications" evernote
+brew cask install --appdir="/Applications" aws-vpn-client
+
+# brew cask install --appdir="/Applications" dropbox
+# brew cask install --appdir="/Applications" evernote
 brew cask install --appdir="/Applications" 1password
 #brew cask install --appdir="/Applications" gimp
 #brew cask install --appdir="/Applications" inkscape
+brew cask install --appdir="/Applications" skitch
+brew cask install --appdir="/Applications" sketch
+brew cask install --appdir="/Applications" clamxav
+brew cask install --appdir="/Applications" zoom
 
 #Remove comment to install LaTeX distribution MacTeX
 #brew cask install --appdir="/Applications" mactex
 
 # Install Docker, which requires virtualbox
-brew install docker
-brew install boot2docker
+# brew install docker
+# brew install boot2docker
 
 # Install developer friendly quick look plugins; see https://github.com/sindresorhus/quick-look-plugins
-brew cask install qlcolorcode qlstephen qlmarkdown quicklook-json qlprettypatch quicklook-csv betterzip qlimagesize webpquicklook suspicious-package quicklookase qlvideo
+# brew cask install qlcolorcode qlstephen qlmarkdown quicklook-json qlprettypatch quicklook-csv betterzip qlimagesize webpquicklook suspicious-package quicklookase qlvideo
+
+
+brew tap homebrew/services
+brew services start mysql
+brew services start stunnel
+brew services start redis
 
 # Remove outdated versions from the cellar.
 brew cleanup
diff --git a/datastores.sh b/datastores.sh
index bc6fb882e..28dc576b7 100755
--- a/datastores.sh
+++ b/datastores.sh
@@ -20,10 +20,10 @@ brew update
 
 # Install data stores
 brew install mysql
-brew install postgresql
-brew install mongo
+# brew install postgresql
+# brew install mongo
 brew install redis
-brew install elasticsearch
+# brew install elasticsearch
 
 # Install mysql workbench
 # Install Cask
@@ -31,4 +31,4 @@ brew install caskroom/cask/brew-cask
 brew cask install --appdir="/Applications" mysqlworkbench
 
 # Remove outdated versions from the cellar.
-brew cleanup
\ No newline at end of file
+brew cleanup
diff --git a/terminal.sh b/terminal.sh
new file mode 100755
index 000000000..59d27b1bc
--- /dev/null
+++ b/terminal.sh
@@ -0,0 +1,56 @@
+
+
+cd ~ && {
+	brew tap homebrew/cask-fonts
+	brew install antigen
+
+	brew cask install font-meslo-nerd-font
+	brew cask install font-noto-nerd-font
+
+	sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
+
+	brew install romkatv/powerlevel10k/powerlevel10k
+	mv -f .zshrc .zshrc-old-1 2> /dev/null || true
+
+	p10k configure;
+
+	echo "
+zstyle ':completion:*' matcher-list 'm:{a-z}={A-Za-z}'
+
+source $HOME/antigen.zsh
+export NVM_AUTO_USE=true
+antigen bundle aws
+antigen bundle brew
+antigen bundle ember-cli
+antigen bundle git
+antigen bundle github
+antigen bundle lukechilds/zsh-nvm
+antigen bundle node
+antigen bundle osx
+antigen bundle rails
+antigen bundle ruby
+antigen bundle zsh-users/zsh-autosuggestions
+antigen bundle zsh-users/zsh-completions
+antigen bundle zsh-users/zsh-syntax-highlighting
+
+[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
+source /usr/local/opt/powerlevel10k/powerlevel10k.zsh-theme
+
+antigen apply
+
+[[ -s ${HOME}/repos/dochub/.bash ]] && source ${HOME}/repos/dochub/.bash
+[[ -s ${HOME}/repos/iexplorer/.bash ]] && source ${HOME}/repos/iexplorer/.bash
+[[ -s ${HOME}/repos/macroplant-rails2/.bash ]] && source ${HOME}/repos/macroplant-rails2/.bash
+
+if [ -f '~/google-cloud-sdk/path.zsh.inc' ]; then . '~/google-cloud-sdk/path.zsh.inc'; fi
+if [ -f '~/google-cloud-sdk/completion.zsh.inc' ]; then . '~/google-cloud-sdk/completion.zsh.inc'; fi
+
+alias ls='ls -G'
+alias ll='ls -lG'
+
+nvm use --silent 2> /dev/null > /dev/null
+
+" >>! ~/.zshrc
+	echo 'eval "$(pyenv init -)"' >>! ~/.zshrc
+
+cd -; }
diff --git a/web.sh b/web.sh
index dee44602c..184e5bb7c 100755
--- a/web.sh
+++ b/web.sh
@@ -23,9 +23,10 @@ brew install node
 # Remove outdated versions from the cellar.
 brew cleanup
 
-npm install -g coffee-script
-npm install -g grunt-cli
-npm install -g jshint
-npm install -g less
+yarn global add coffee-script
+yarn global add ember-cli
+# yarn global add grunt-cli
+# yarn global add jshint
+# yarn global add less
 
 #gem install jekyll