diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml
index 43e59d8..f31299a 100644
--- a/.config/alacritty/alacritty.yml
+++ b/.config/alacritty/alacritty.yml
@@ -1,31 +1,63 @@
-# Colors (One Darker)
 colors:
 
+  # Onedarker
+  # primary:
+  #   foreground: "#abb2bf"
+  #   background: "#282c34"
+  #
+  # # Normal colors
+  # normal:
+  #   black: "#1b1d1e"
+  #   red: "#ff5995"
+  #   green: "#b6e354"
+  #   yellow: "#f3fd21"
+  #   blue: "#3f78ff"
+  #   magenta: "#9e6ffe"
+  #   cyan: "#23ced4"
+  #   white: "#abb2bf"
+  #
+  # # Bright colors
+  # bright:
+  #   black: "#505354"
+  #   red: "#ff5995"
+  #   green: "#b6e354"
+  #   yellow: "#f3fd21"
+  #   blue: "#3f78ff"
+  #   magenta: "#9e6ffe"
+  #   cyan: "#23ced4"
+  #   white: "#f8f8f2"
+
+  # TokyoNight
+  # Default colors
   primary:
-    foreground: "#abb2bf"
-    background: "#282c34"
+    background: '0x1a1b26'
+    foreground: '0xc0caf5'
 
-    # Normal colors
+  # Normal colors
   normal:
-    black: "#1b1d1e"
-    red: "#ff5995"
-    green: "#b6e354"
-    yellow: "#f3fd21"
-    blue: "#3f78ff"
-    magenta: "#9e6ffe"
-    cyan: "#23ced4"
-    white: "#abb2bf"
+    black:   '0x15161E'
+    red:     '0xf7768e'
+    green:   '0x9ece6a'
+    yellow:  '0xe0af68'
+    blue:    '0x7aa2f7'
+    magenta: '0xbb9af7'
+    cyan:    '0x7dcfff'
+    white:   '0xa9b1d6'
 
-    # Bright colors
+  # Bright colors
   bright:
-    black: "#505354"
-    red: "#ff5995"
-    green: "#b6e354"
-    yellow: "#f3fd21"
-    blue: "#3f78ff"
-    magenta: "#9e6ffe"
-    cyan: "#23ced4"
-    white: "#f8f8f2"
+    black:   '0x414868'
+    red:     '0xf7768e'
+    green:   '0x9ece6a'
+    yellow:  '0xe0af68'
+    blue:    '0x7aa2f7'
+    magenta: '0xbb9af7'
+    cyan:    '0x7dcfff'
+    white:   '0xc0caf5'
+
+  indexed_colors:
+    - { index: 16, color: '0xff9e64' }
+    - { index: 17, color: '0xdb4b4b' }
 
   transparent_background_colors: true
 
diff --git a/.config/shell/colors.sh b/.config/shell/colors.sh
index e09ea98..f8f7687 100644
--- a/.config/shell/colors.sh
+++ b/.config/shell/colors.sh
@@ -1,8 +1,9 @@
 #!/bin/sh
 # base16-shell (https://github.com/chriskempson/base16-shell)
 # Base16 Shell template by Chris Kempson (http://chriskempson.com)
-# OneDark scheme by Lalit Magant (http://github.com/tilal6991)
-
+COLOR_SCHEME="${COLOR_SCHEME:-onedark}"
+case "$COLOR_SCHEME" in
+onedark)
 color00="28/2c/34" # Base 00 - Black
 color01="e0/6c/75" # Base 08 - Red
 color02="98/c3/79" # Base 0B - Green
@@ -27,7 +28,36 @@ color20="56/5c/64" # Base 04
 color21="b6/bd/ca" # Base 06
 color_foreground="ab/b2/bf" # Base 05
 color_background="28/2c/34" # Base 00
+;;
 
+tokyonight)
+color00="15/16/1e" # Base 00 - Black
+color01="f7/76/8e" # Base 08 - Red
+color02="9e/ce/6a" # Base 0B - Green
+color03="e0/af/68" # Base 0A - Yellow
+color04="7a/a2/f7" # Base 0D - Blue
+color05="bb/9a/f7" # Base 0E - Magenta
+color06="7d/cf/ff" # Base 0C - Cyan
+color07="a9/b1/d6" # Base 05 - White
+color08="41/48/68" # Base 03 - Bright Black
+color09=$color01 # Base 08 - Bright Red
+color10=$color02 # Base 0B - Bright Green
+color11=$color03 # Base 0A - Bright Yellow
+color12=$color04 # Base 0D - Bright Blue
+color13=$color05 # Base 0E - Bright Magenta
+color14=$color06 # Base 0C - Bright Cyan
+color15="c0/ca/f5" # Base 07 - Bright White
+color16="d1/9a/66" # Base 09
+color17="be/50/46" # Base 0F
+color18="35/3b/45" # Base 01
+color19="3e/44/51" # Base 02
+color20="56/5c/64" # Base 04
+color21="b6/bd/ca" # Base 06
+color_foreground="c0/ca/f5" # Base 05
+color_background="1a/1b/26" # Base 00
+;;
+
+esac
 if [ -n "$TMUX" ]; then
   # Tell tmux to pass the escape sequences through
   # (Source: http://permalink.gmane.org/gmane.comp.terminal-emulators.tmux.user/1324)
diff --git a/.config/shell/env b/.config/shell/env
index a96a728..28ccdaf 100644
--- a/.config/shell/env
+++ b/.config/shell/env
@@ -19,17 +19,22 @@ fi
 export SYSTEMD_EDITOR="$EDITOR"
 export VISUAL="$EDITOR"
 
-
+# Add local bin path and shell bin path to PATH
 export PATH="$PATH:${XDG_DATA_HOME:-$HOME/.local}/bin:$SHELL_CONFIG_DIR/bin"
 
-
+# Basic default LS colors
 export LSCOLORS="Gxfxcxdxbxegedabagacad"
 
+# Theme for zsh and nvim (soon™)
+COLOR_SCHEME=tokyonight
 
+# move zsh cache to where it should go
 export ZSH_CACHE_DIR="${XDG_CACHE_HOME:-$HOME/.cache}/zsh"
+
 # Don't add extra space to the right side of the prompt
 export ZLE_RPROMPT_INDENT=0
 
+# Move zinit to where it should go
 export ZINIT_HOME_DIR="${XDG_DATA_HOME:-$HOME/.local/share}/zinit"