diff --git a/bombadil.toml b/bombadil.toml
index 97b8f1e..1a6685f 100644
--- a/bombadil.toml
+++ b/bombadil.toml
@@ -14,7 +14,6 @@ dotfiles_dir = "src/dotfiles"
 # and `target` shall be relative to $HOME directory or absolute.
 # You can have as many dot entry as you want, linking files or directories
 alacritty = { source = "alacritty", target = ".config/alacritty" }
-nvim = { source = "nvim", target = ".config/nvim" }
 sway = { source = "sway", target = ".config/sway" }
 waybar = { source = "waybar", target = ".config/waybar" }
 wofi = { source = "wofi", target = ".config/wofi" }
@@ -22,12 +21,9 @@ wofi = { source = "wofi", target = ".config/wofi" }
 # zsh
 p10k = { source = "zsh/p10k.zsh", target = ".p10k.zsh" }
 zsh = { source = "zsh/zsh", target = ".zsh", ignore = [ ".keep" ] }
-zsh_aliases = { source = "zsh/zsh_aliases", target = ".zsh_aliases" }
 zshenv = { source = "zsh/zshenv", target = ".zshenv" }
 zshrc = { source = "zsh/zshrc", target = ".zshrc" }
 
 # vim
+nvim = { source = "nvim", target = ".config/nvim" }
 vimrc = { source = "vim/vimrc", target = ".vimrc" }
-vimrc_colors = { source = "vim/vimrc.colors", target = ".vimrc.colors" }
-vimrc_lightline = { source = "vim/vimrc.lightline", target = ".vimrc.lightline" }
-vimrc_plugins = { source = "vim/vimrc.plugins", target = ".vimrc.plugins" }
diff --git a/vim/vimrc.colors b/nvim/colors
similarity index 76%
rename from vim/vimrc.colors
rename to nvim/colors
index 6b0f7b9..630a67a 100644
--- a/vim/vimrc.colors
+++ b/nvim/colors
@@ -18,6 +18,11 @@ function! s:sonokai_custom() abort
   call sonokai#highlight('SignColumn', l:palette.fg, l:palette.bg1)
   call sonokai#highlight('VertSplit', l:palette.bg1, l:palette.none)
   call sonokai#highlight('Terminal', l:palette.fg, l:palette.bg1)
+  "call sonokai#highlight('CocGitAddedSign', l:palette.fg, l:palette.bg1)
+  "call sonokai#highlight('CocGitChangedSign', l:palette.fg, l:palette.bg1)
+  "call sonokai#highlight('CocGitRemovedSign', l:palette.fg, l:palette.bg1)
+  "call sonokai#highlight('CocGitTopRemovedSign', l:palette.fg, l:palette.bg1)
+  "call sonokai#highlight('CocGitChangeRemovedSign', l:palette.fg, l:palette.bg1)
 endfunction
 
 augroup CustomColors
diff --git a/vim/vimrc.lightline b/nvim/lightline
similarity index 100%
rename from vim/vimrc.lightline
rename to nvim/lightline
diff --git a/vim/vimrc.plugins b/nvim/plugins
similarity index 100%
rename from vim/vimrc.plugins
rename to nvim/plugins
diff --git a/vim/vimrc b/vim/vimrc
index 3360f57..24d6d2d 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -68,19 +68,19 @@ endfunction
 
 " Plugins
 call plug#begin('~/.vim/plugged')
-if filereadable(expand("~/.vimrc.plugins"))
-  source ~/.vimrc.plugins
+if filereadable(expand("~/.config/nvim/plugins"))
+  source ~/.config/nvim/plugins
 endif
 call plug#end()
 
 " Lightline setup
-if filereadable(expand("~/.vimrc.lightline"))
-  source ~/.vimrc.lightline
+if filereadable(expand("~/.config/nvim/lightline"))
+  source ~/.config/nvim/lightline
 endif
 
 " Color setup
-if filereadable(expand("~/.vimrc.colors"))
-  source ~/.vimrc.colors
+if filereadable(expand("~/.config/nvim/colors"))
+  source ~/.config/nvim/colors
 endif
 
 " Set secure AFTER any other rc importing
diff --git a/zsh/zsh/aliases b/zsh/zsh/aliases
new file mode 100644
index 0000000..ad9930c
--- /dev/null
+++ b/zsh/zsh/aliases
@@ -0,0 +1,2 @@
+alias e="$EDITOR"
+alias ls="ls --color"
diff --git a/zsh/zsh_aliases b/zsh/zsh_aliases
deleted file mode 100644
index ff7678a..0000000
--- a/zsh/zsh_aliases
+++ /dev/null
@@ -1 +0,0 @@
-alias e="$EDITOR"
diff --git a/zsh/zshrc b/zsh/zshrc
index d28f250..23ccc4c 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -20,7 +20,7 @@ fi
 [[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
 
 # Custom aliases
-[[ ! -f ~/.zsh_aliases ]] || source ~/.zsh_aliases
+[[ ! -f ~/.zsh/aliases ]] || source ~/.zsh/aliases
 
 export NVM_DIR="$HOME/.nvm"
 [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm