diff --git a/tmux.conf b/tmux.conf
index beb9fbb..48b3fc6 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -15,6 +15,9 @@ set -g status-interval 5
 # Set focus events for Vim
 set -g focus-events on
 
+# Allow passthrough color excape sequences (Base16)
+set -g allow-passthrough 1
+
 # Force a reload of the config file
 bind r source-file ~/.tmux.conf\; display "Reloaded!"
 
diff --git a/zshrc b/zshrc
index 91aab0d..9741f0b 100644
--- a/zshrc
+++ b/zshrc
@@ -17,10 +17,7 @@ source "$(brew --prefix)/share/zsh-syntax-highlighting/zsh-syntax-highlighting.z
 export ZSH_HIGHLIGHT_HIGHLIGHTERS_DIR="$(brew --prefix)/share/zsh-syntax-highlighting/highlighters"
 
 # Base16 Shell
-BASE16_SHELL="$HOME/.config/base16-shell/"
-[ -n "$PS1" ] && \
-  [ -s "$BASE16_SHELL/profile_helper.sh" ] && \
-  eval "$("$BASE16_SHELL/profile_helper.sh")"
+source ~/.config/base16-shell/base16-shell.plugin.zsh
 
 # FD
 FD_OPTIONS="--follow --exclude .git --exclude node_modules"