diff --git a/.base16-shell b/.base16-shell
new file mode 160000
index 0000000..ce8e1e5
--- /dev/null
+++ b/.base16-shell
@@ -0,0 +1 @@
+Subproject commit ce8e1e540367ea83cc3e01eec7b2a11783b3f9e1
diff --git a/.dotbot.conf.yaml b/.dotbot.conf.yaml
index 73f0f18..259fbe5 100644
--- a/.dotbot.conf.yaml
+++ b/.dotbot.conf.yaml
@@ -8,6 +8,7 @@
     ~/.ack: ack
     ~/.ag: ag
     ~/.config/alacritty: alacritty
+    ~/.config/base16-shell: .base16-shell
     ~/.config/kitty: kitty
     ~/.config/nvim: nvim
     ~/.config/starship.toml: starship.toml
diff --git a/.gitmodules b/.gitmodules
index f6c3b30..718b111 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -5,3 +5,6 @@
 [submodule ".antigen"]
 	path = .antigen
 	url = https://github.com/zsh-users/antigen.git
+[submodule ".base16-shell"]
+	path = .base16-shell
+	url = https://github.com/chriskempson/base16-shell.git
diff --git a/nvim/init.vim b/nvim/init.vim
index 2092901..baac05d 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -197,5 +197,7 @@ endif
 
 call plug#begin(data_dir . '/plugins')
 
+source ~/.config/nvim/plugins/base16-vim.vim
+
 call plug#end()
 doautocmd User PlugLoaded
diff --git a/nvim/plugins/base16-vim.vim b/nvim/plugins/base16-vim.vim
new file mode 100644
index 0000000..c7acc15
--- /dev/null
+++ b/nvim/plugins/base16-vim.vim
@@ -0,0 +1,14 @@
+" Base16 for Vim
+Plug 'chriskempson/base16-vim'
+
+function ActivateColorscheme()
+  if filereadable(expand("~/.vimrc_background"))
+    let base16colorspace=256
+    source ~/.vimrc_background
+  endif
+endfunction
+
+augroup ActivateColorscheme
+  autocmd!
+  autocmd User PlugLoaded call ActivateColorscheme()
+augroup END
diff --git a/zshrc b/zshrc
index 2ca612b..e022d4a 100644
--- a/zshrc
+++ b/zshrc
@@ -81,6 +81,12 @@ path=(
 # Fish shell like syntax highlighting for zsh
 source "$(brew --prefix)/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh"
 
+# Base16 Shell
+BASE16_SHELL="$HOME/.config/base16-shell/"
+[ -n "$PS1" ] && \
+    [ -s "$BASE16_SHELL/profile_helper.sh" ] && \
+        eval "$("$BASE16_SHELL/profile_helper.sh")"
+
 # *** *** Aliases *** ***
 # ***********************