diff --git a/config/kitty/kitty.conf b/config/kitty/kitty.conf
index 6a91443..7e0e53d 100644
--- a/config/kitty/kitty.conf
+++ b/config/kitty/kitty.conf
@@ -5,6 +5,7 @@ open_url_modifiers ctrl
 cursor_blink_interval 0
 tab_bar_edge bottom
 tab_bar_style separator
+tab_separator ""
 tab_title_template "{index}: {title}"
 
 map ctrl+equal change_font_size all +2
@@ -32,7 +33,8 @@ color12 #0092ff
 color13 #9a5feb
 color14 #67fff0
 color15 #ffffff
-background #0e1019
+# background #0e1019
+background #1e1e1e
 selection_foreground #0e1019
 cursor #ff0018
 foreground #fffaf4
diff --git a/config/nvim/README.md b/config/nvim/README.md
index 0cb1381..1e33db3 100644
--- a/config/nvim/README.md
+++ b/config/nvim/README.md
@@ -2,10 +2,17 @@
 
 ## Install nvim
 ```bash
+# From AUR
 yay -S neovim-nightly-bin
+
+# From pacman
+sudo pacman -S neovim
 ```
 
-## Install plugin manager(`packer`)
+## Install plugin manager(`vim-plug`)
+```bash
+sh -c 'curl -fLo "${XDG_DATA_HOME:-$HOME/.local/share}"/nvim/site/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
+```
 
 ## Install LSP servers
 ```bash
diff --git a/config/nvim/init.vim b/config/nvim/init.vim
index b71f780..32b1585 100644
--- a/config/nvim/init.vim
+++ b/config/nvim/init.vim
@@ -1,27 +1,23 @@
 call plug#begin('~/.vim/plugged')
-  " Plug 'Smirnov-O/nten.vim'
-  Plug 'projekt0n/github-nvim-theme'
+  Plug 'Smirnov-O/nten.vim'
   Plug 'hoob3rt/lualine.nvim'
   Plug 'romgrk/barbar.nvim'
   Plug 'b3nj5m1n/kommentary'
   Plug 'jiangmiao/auto-pairs'
   Plug 'nvim-lua/plenary.nvim'
+  Plug 'lewis6991/gitsigns.nvim'
+  " LSP
+  Plug 'hrsh7th/nvim-compe'
+  Plug 'neovim/nvim-lspconfig'
+  Plug 'kabouzeid/nvim-lspinstall'
   " Files
   Plug 'junegunn/fzf.vim', {'on': ['Files', 'GFiles']}
-  " Plug 'kyazdani42/nvim-tree.lua', {'on': 'NvimTreeToggle'}
   " Syntax
-  Plug 'sheerun/vim-polyglot'
   Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
-  " Completion
-  Plug 'neovim/nvim-lspconfig'
-  Plug 'hrsh7th/nvim-compe'
-  Plug 'kabouzeid/nvim-lspinstall'
-  " Git
-  Plug 'lewis6991/gitsigns.nvim'
-  " Plug 'TimUntersberger/neogit'
+  Plug 'sheerun/vim-polyglot'
 call plug#end()
 
-" colo codedark
+colo codedark
 let mapleader=";"
 
 "== Config
@@ -54,7 +50,7 @@ set ts=4 sw=4 sts=4
 set sta et ai
 
 "== Custom commands
-com! Prettier :sil !prettier -w %
+com! Prettier :sil !prettier --no-semi -w % 
 com! Term  :vs|winc L|se nonu nornu|start|term
 com! GoFmt :sil !gofmt -w %
 com! Black :sil !black %
@@ -65,8 +61,7 @@ au FileType javascript,yaml,json setl et ts=2 sw=2 sts=4
 au FileType python setl et ts=4 sw=4 sts=4 ai
 autocmd BufReadPost,FileReadPost lua require "lsp_signature".on_attach()
 
-
 "== Config's
-lua require'config'
+lua require"config"
 so $HOME/.config/nvim/vimscript/barbar.vim
 so $HOME/.config/nvim/vimscript/mappings.vim
diff --git a/config/nvim/lua/config.lua b/config/nvim/lua/config.lua
index 3b99f34..173356c 100644
--- a/config/nvim/lua/config.lua
+++ b/config/nvim/lua/config.lua
@@ -3,13 +3,10 @@ require"lspconfig".gopls.setup {}
 -- require"lspconfig".pyls.setup {}
 -- require"lspconfig".rls.setup  {}
 -- require"lspconfig".denols.setup {}
-require"lspconfig".lua.setup{}
+-- require"lspconfig".lua.setup{}
 require"tsserver"
 require"efm"
 
--- Theme
-require"github-theme".setup {}
-
 -- Compe
 require'compe'.setup {
   enabled = true,
@@ -24,7 +21,7 @@ require'compe'.setup {
 
 -- LuaLine
 require'lualine'.setup {options={
-  theme = "github"
+  theme = "codedark"
 }}
 
 -- GitSigns
@@ -45,15 +42,10 @@ require'gitsigns'.setup {
   use_internal_diff = true,
 }
 
--- NvimTree
-vim.g.nvim_tree_side = "right"
-vim.g.nvim_tree_ignore = {".git", ".cache", "node_modules", "__pycache__", "env"}
--- vim.g.nvim_tree_auto_close = 0
-vim.g.nvim_tree_width = 24
-
-
 -- TreeSitter
 require'nvim-treesitter.configs'.setup {
   ensure_installed = {'javascript', 'typescript', 'jsdoc', 'python', 'go', 'bash'};
-  highlight = {enable=true};
+  highlight = {
+    enable=true
+  };
 }
diff --git a/config/nvim/vimscript/mappings.vim b/config/nvim/vimscript/mappings.vim
index 47d9bef..b27dd25 100644
--- a/config/nvim/vimscript/mappings.vim
+++ b/config/nvim/vimscript/mappings.vim
@@ -2,7 +2,6 @@ nno <C-s> :w<cr>
 nno <C-p> :GFiles<cr>
 nno <C-n> :enew<cr>
 nno <leader>; :Files<cr>
-" nno <leader>e :NvimTreeToggle<cr>
 nno <space> :noh<cr>
 
 " Buffer
@@ -24,14 +23,14 @@ nno si :lua vim.lsp.buf.implementation()<cr>
 nno <C-h> :winc h<cr>
 nno <C-j> :winc j<cr>
 nno <C-k> :winc k<cr>
-nno <C-l> :winc l<cr>
+nno<C-l> :winc l<cr>
 
 nno <A-h> :vert res +3<cr>
 nno <A-j> :res -3<cr>
 nno <A-k> :res +3<cr>
 nno <A-l> :vert res -3<cr>
 
-nno spv :vs<cr>
-nno sph :sp<cr>
+nno spv :vnew<cr>
+nno sph :new<cr>
 nno spk :winc K<cr>
 nno spl :winc L<cr>
diff --git a/zshrc b/zshrc
index d1c1816..6df0b1e 100644
--- a/zshrc
+++ b/zshrc
@@ -1,16 +1,16 @@
 ## StartShip
-#eval "$(starship init zsh)"
+# eval "$(starship init zsh)"
 
 ## Variables
 export GOPATH="$HOME/go"
-export PATH="$HOME/bin:$HOME/.local/bin:$HOME/.golang/bin:$GOPATH/bin:$PATH"
+export PATH="$HOME/bin:$HOME/.local/bin:$HOME/.golang/bin:$GOPATH/bin:$HOME/.yarn/bin:$PATH"
 export EDITOR="nvim"
 
 ## FzF
 export FZF_DEFAULT_COMMAND="fd -t f -t l -E node_modules -E env -E __pycache__"
 
 ## Oh my zsh
-plugins=(dotenv)
+plugins=(dotenv yarn node)
 ZSH_THEME="simple"
 source "$HOME/.oh-my-zsh/oh-my-zsh.sh"
 
@@ -20,14 +20,9 @@ eval $(fnm env)
 ## Aliases
 alias cls="clear" cp="cp -r" mkdir="mkdir -p"
 alias vim="nvim" vi="vim" e="$EDITOR"
-alias ...="cd ../.." .3="cd ../../.." .4="cd ../../../.."
+alias ...="cd ../.." .3="cd ../../.."
 alias gor="go run" gob="go build" gog="go get" goi="go install"
-alias pac="sudo pacman" pacs="pac -S" pacr="pac -R" pacss="pac -Ss"
 
 if [[ -f "/bin/exa" ]]; then
     alias ls="exa -l" la="ls -a"
 fi
-
-#THIS MUST BE AT THE END OF THE FILE FOR SDKMAN TO WORK!!!
-export SDKMAN_DIR="/home/sasha/.sdkman"
-[[ -s "/home/sasha/.sdkman/bin/sdkman-init.sh" ]] && source "/home/sasha/.sdkman/bin/sdkman-init.sh"