diff --git a/nvim/lua/theme.lua b/nvim/lua/theme.lua
index c7f3c41..140198c 100644
--- a/nvim/lua/theme.lua
+++ b/nvim/lua/theme.lua
@@ -1,5 +1,3 @@
-vim.api.nvim_set_option('laststatus', 2)
-vim.cmd('colorscheme gruvbox')
 local themegroup = vim.api.nvim_create_augroup('themegroup', { clear = true })
 
 vim.api.nvim_create_autocmd('ColorScheme', {
@@ -12,3 +10,5 @@ vim.api.nvim_create_autocmd('ColorScheme', {
     group = themegroup,
     command = "hi NonText guibg=none ctermbg=none",
 })
+vim.api.nvim_set_option('laststatus', 2)
+vim.cmd('colorscheme gruvbox')
diff --git a/zsh/config.d/90-envoy.zsh b/zsh/config.d/90-envoy.zsh
index b0242f8..2f19e4c 100644
--- a/zsh/config.d/90-envoy.zsh
+++ b/zsh/config.d/90-envoy.zsh
@@ -1,4 +1,4 @@
 [ "$(which clang-format)" != "" ] && export CLANG_FORMAT=/opt/llvm/bin/clang-format || echo "WARNING: clang-format not installed. Required to push to envoy repo"
 [ "$(which buildozer)" != "" ] && export BUILDOZER_BIN=$HOME/.go/go/bin/buildozer || echo "WARNING: buildozer not installed. Required to push to envoy repo"
-([ "$(which buildifier)" != "" ] && export BUILDIFIER_BIN=$HOME/.go/go/bin/buildifier) || echo "WARNING: buildifier not installed. Required to push to envoy repo"
+[ "$(which buildifier)" != "" ] && export BUILDIFIER_BIN=$HOME/.go/go/bin/buildifier || echo "WARNING: buildifier not installed. Required to push to envoy repo"