diff --git a/nvim/autocmd.vim b/nvim/autocmd.vim
index 70ce7de..87c6954 100644
--- a/nvim/autocmd.vim
+++ b/nvim/autocmd.vim
@@ -104,3 +104,5 @@ autocmd BufNewFile,BufRead *.json set filetype=json
 autocmd BufNewFile,BufRead *.pcss set filetype=css syntax=scss
 autocmd BufNewFile,BufRead *.postcss set filetype=css syntax=scss
 autocmd BufNewFile,BufRead *.rss set filetype=xml
+autocmd BufEnter *.{js,jsx,ts,tsx} :syntax sync fromstart
+autocmd BufLeave *.{js,jsx,ts,tsx} :syntax sync clear
diff --git a/nvim/plugin-config.vim b/nvim/plugin-config.vim
index 01ef74a..16a2aac 100644
--- a/nvim/plugin-config.vim
+++ b/nvim/plugin-config.vim
@@ -29,5 +29,6 @@ source ~/.config/nvim/plugin-config/treesitter.lua
 source ~/.config/nvim/plugin-config/trouble.lua
 source ~/.config/nvim/plugin-config/ultisnips.vim
 source ~/.config/nvim/plugin-config/vim-easymotion.vim
+source ~/.config/nvim/plugin-config/vim-commentary.vim
 source ~/.config/nvim/plugin-config/vimux.vim
 source ~/.config/nvim/plugin-config/web-devicons.lua
diff --git a/nvim/plugin-config/vim-commentary.vim b/nvim/plugin-config/vim-commentary.vim
new file mode 100644
index 0000000..b35fead
--- /dev/null
+++ b/nvim/plugin-config/vim-commentary.vim
@@ -0,0 +1,6 @@
+" commentary.vim
+" https://github.com/tpope/vim-commentary
+
+autocmd FileType apache setlocal commentstring=#\ %s
+autocmd FileType gspec setlocal commentstring=#\ %s
+autocmd FileType eruby setlocal commentstring=<!--%s-->
diff --git a/nvim/plugins.vim b/nvim/plugins.vim
index 7d03c1a..0694fff 100644
--- a/nvim/plugins.vim
+++ b/nvim/plugins.vim
@@ -72,12 +72,14 @@ Plug 'yamatsum/nvim-cursorline'
 " Syntax Highlighting
 Plug 'JoosepAlviste/nvim-ts-context-commentstring'
 Plug 'editorconfig/editorconfig-vim'
+Plug 'jparise/vim-graphql'
 Plug 'jxnblk/vim-mdx-js'
 Plug 'mattn/emmet-vim'
 Plug 'norcalli/nvim-colorizer.lua'
 Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
+Plug 'peitalin/vim-jsx-typescript'
 Plug 'sheerun/vim-polyglot'
-Plug 'styled-components/vim-styled-components'
+Plug 'styled-components/vim-styled-components', { 'branch': 'main' }
 Plug 'vim-pandoc/vim-pandoc'
 Plug 'vim-pandoc/vim-pandoc-syntax'