diff --git a/fish/config.fish b/fish/config.fish
index 30355f1..8b439fb 100644
--- a/fish/config.fish
+++ b/fish/config.fish
@@ -4,6 +4,12 @@ end
 
 # *** *** Configuration *** ***
 
+# Base16 Shell
+if status --is-interactive
+    set BASE16_SHELL "$HOME/.config/base16-shell/"
+    source "$BASE16_SHELL/profile_helper.fish"
+end
+
 # asdf Version Manager
 source /usr/local/opt/asdf/libexec/asdf.fish
 
diff --git a/nvim/init.lua b/nvim/init.lua
index d7da58e..e7892e8 100644
--- a/nvim/init.lua
+++ b/nvim/init.lua
@@ -2,8 +2,8 @@ require("kogakure.options")
 require("kogakure.keymaps")
 require("kogakure.functions")
 require("kogakure.autocommands")
-require("kogakure.colorscheme")
 require("kogakure.plugins")
 require("kogakure.lsp")
+require("kogakure.colorscheme")
 
 require("kogakure/text-objects").basic_text_objects()