diff --git a/nvim/plugins.vimrc b/nvim/plugins.vimrc
index 5c57d84..2e76650 100644
--- a/nvim/plugins.vimrc
+++ b/nvim/plugins.vimrc
@@ -1,16 +1,14 @@
 " Assorted plugins
-Plug 'cespare/vim-toml'
-Plug 'ctrlpvim/ctrlp.vim'
+Plug 'cespare/vim-toml', { 'for': 'toml' }
 Plug 'honza/vim-snippets'
 Plug 'jiangmiao/auto-pairs'
-Plug 'leafgarland/typescript-vim'
-Plug 'mileszs/ack.vim'
-Plug 'posva/vim-vue'
-Plug 'ron-rs/ron.vim'
+Plug 'leafgarland/typescript-vim', { 'for': 'typescript' }
+Plug 'posva/vim-vue', { 'for': 'vue' }
+Plug 'ron-rs/ron.vim', { 'for': 'ron' }
 Plug 'tommcdo/vim-exchange'
 Plug 'tpope/vim-fugitive'
 Plug 'tpope/vim-projectionist'
-Plug 'tpope/vim-rails'
+Plug 'tpope/vim-rails', { 'for': 'ruby' }
 Plug 'tpope/vim-repeat'
 Plug 'tpope/vim-surround'
 Plug 'vim-test/vim-test'
@@ -29,14 +27,19 @@ Plug 'itchyny/lightline.vim' |
   " \ Plug 'edkolev/tmuxline.vim'
 
 " NerdTree
-Plug 'preservim/nerdtree' |
-  \ Plug 'Xuyuanp/nerdtree-git-plugin' |
+Plug 'preservim/nerdtree', { 'on': 'NERDTreeToggle' } |
+  \ Plug 'Xuyuanp/nerdtree-git-plugin', { 'on': 'NERDTreeToggle' } |
   \ Plug 'ryanoasis/vim-devicons' |
-  \ Plug 'tiagofumo/vim-nerdtree-syntax-highlight'
+  \ Plug 'tiagofumo/vim-nerdtree-syntax-highlight', { 'on': 'NERDTreeToggle' }
 
 " Vim-Markdown
 Plug 'godlygeek/tabular' |
-  \ Plug 'plasticboy/vim-markdown'
+      \ Plug 'plasticboy/vim-markdown', { 'for': 'markdown' }
+
+" Telescope
+Plug 'nvim-lua/popup.nvim'
+Plug 'nvim-lua/plenary.nvim'
+Plug 'nvim-telescope/telescope.nvim'
 
 " sonokai colorscheme + supporting plugins
 Plug 'sainnhe/sonokai' |
diff --git a/vimrc b/vimrc
index 40d8ce6..32a9d4d 100644
--- a/vimrc
+++ b/vimrc
@@ -54,6 +54,11 @@ let &t_SI = "\<Esc>[6 q"
 let &t_SR = "\<Esc>[4 q"
 let &t_EI = "\<Esc>[0 q"
 
+if executable('rg')
+  " Use rg over grep
+  set grepprg=rg\ --color\ never
+endif
+
 " Plugins
 call plug#begin('~/.vim/plugged')
 if filereadable(expand("~/.config/nvim/plugins.vimrc"))
@@ -91,9 +96,9 @@ if filereadable(expand("~/.config/nvim/nerdtree.vimrc"))
   source ~/.config/nvim/nerdtree.vimrc
 endif
 
-" Ack setup
-if filereadable(expand("~/.config/nvim/ack.vimrc"))
-  source ~/.config/nvim/ack.vimrc
+" Telescope setup
+if filereadable(expand("~/.config/nvim/telescope.vimrc"))
+  source ~/.config/nvim/telescope.vimrc
 endif
 
 " Test setup
@@ -101,7 +106,7 @@ if filereadable(expand("~/.config/nvim/test.vimrc"))
   source ~/.config/nvim/test.vimrc
 endif
 
-" Goyo setup
+" Markdown setup
 if filereadable(expand("~/.config/nvim/markdown.vimrc"))
   source ~/.config/nvim/markdown.vimrc
 endif