diff --git a/README.org b/README.org
index bac3d24..5cb12f0 100644
--- a/README.org
+++ b/README.org
@@ -75,6 +75,7 @@ A repository of my personal configuration files.
 - [[https://github.com/GeorgeFilipkin/pulsemixer][pulsemixer]]
 - [[https://www.python.org/][Python]]
 - [[https://github.com/dylanaraps/pywal][pywal]]
+- [[https://github.com/BurntSushi/ripgrep][ripgrep]]
 - [[https://github.com/Spotifyd/spotifyd][Spotifyd]]
 - [[http://www.gnu.org/software/stow/][stow]]
 - [[https://github.com/muennich/sxiv][sxiv]]
@@ -162,7 +163,7 @@ A repository of my personal configuration files.
 - [[https://github.com/ctrlpvim/ctrlp.vim][ctrlp/ctrlp.vim]]
 - [[https://github.com/easymotion/vim-easymotion][easymotion/vim-easymotion]]
 - [[https://github.com/farmergreg/vim-lastplace][farmergreg/vim-lastplace]]
-- [[https://github.com/junegunn/fzf][ junegunn/fzf]]
+- [[https://github.com/junegunn/fzf.vim][junegunn/fzf.vim]]
 - [[https://github.com/mbbill/undotree][mbbill/undotree]]
 - [[https://github.com/mhinz/vim-signify][mhinz/vim-signify]]
 - [[https://github.com/myusuf3/numbers.vim][myusuf3/numbers.vim]]
diff --git a/fish/.config/omf/init.fish b/fish/.config/omf/init.fish
index 735fa02..4d8549e 100644
--- a/fish/.config/omf/init.fish
+++ b/fish/.config/omf/init.fish
@@ -312,3 +312,9 @@ if set -q FZF_COMPLETE
         bind -M insert \t '__fzf_complete'
     end
 end
+
+# Make fzf use ripgrep if available
+if type rg &> /dev/null
+  export FZF_DEFAULT_COMMAND='rg --files'
+  export FZF_DEFAULT_OPTS='-m --height 50% --border'
+end
diff --git a/install b/install
index a29cf9a..aeab811 100755
--- a/install
+++ b/install
@@ -1,7 +1,7 @@
 #!/usr/bin/env fish
 
 # Prerequisite & inistalled apps
-set prerequisiteApps bat broot brave caffeine-ng exa fslint fzf graphviz isync imagemagick lightdm-gtk-greeter mailcap deadd-notification-center-bin neofetch npm pandoc-bin pamixer playerctl pulseaudio pulsemixer python pywal stow sxiv tldr trayer udisks2 xwallpaper yarn xprop zathura
+set prerequisiteApps bat broot brave caffeine-ng exa fslint fzf graphviz isync imagemagick lightdm-gtk-greeter mailcap deadd-notification-center-bin neofetch npm pandoc-bin pamixer playerctl pulseaudio pulsemixer python pywal ripgrep stow sxiv tldr trayer udisks2 xwallpaper yarn xprop zathura
 set prerequisiteFonts otf-nerd-fonts-fira-code noto-fonts ttf-unifont
 set prerequisiteLibraries python-panflute
 set prerequisiteLsp bash-language-server ccls php-language-server python-language-server typescript-language-server-bin vscode-css-languageserver-bin vscode-html-languageserver-bin nodejs-intelephense
diff --git a/neovim/.config/nvim/init.vim b/neovim/.config/nvim/init.vim
index 3f59143..3574e93 100644
--- a/neovim/.config/nvim/init.vim
+++ b/neovim/.config/nvim/init.vim
@@ -19,8 +19,7 @@
         Plug 'bling/vim-bufferline'
         Plug 'easymotion/vim-easymotion'
         Plug 'farmergreg/vim-lastplace'
-        Plug 'junegunn/fzf'
-        Plug 'ctrlpvim/ctrlp.vim'
+        Plug 'junegunn/fzf.vim'
         Plug 'mbbill/undotree'
         Plug 'mhinz/vim-signify'
         Plug 'myusuf3/numbers.vim'
@@ -215,4 +214,19 @@
         map <Leader>j <Plug>(easymotion-j)
         map <Leader>k <Plug>(easymotion-k)
     " }
+
+    " fzf {
+        nnoremap <silent> <C-f> :Files<CR>
+        nnoremap <silent> <Leader>f :Rg<CR>
+
+        nnoremap <silent> <Leader>f :Rg<CR>
+        nnoremap <silent> <Leader>/ :BLines<CR>
+        nnoremap <silent> <Leader>' :Marks<CR>
+        nnoremap <silent> <Leader>g :Commits<CR>
+        nnoremap <silent> <Leader>H :Helptags<CR>
+        nnoremap <silent> <Leader>hh :History<CR>
+        nnoremap <silent> <Leader>h: :History:<CR>
+        nnoremap <silent> <Leader>h/ :History/<CR> 
+
+    " }
 " }
diff --git a/zsh/.zshenv b/zsh/.zshenv
index 3d14e7c..de12eea 100644
--- a/zsh/.zshenv
+++ b/zsh/.zshenv
@@ -240,3 +240,9 @@ vterm_prompt_end() {
 	printf "\e]51;A$(whoami)@$(hostname):$(pwd)\e\\"
 }
 PROMPT=$PROMPT'%{$(vterm_prompt_end)%}'
+
+# Make fzf use ripgrep if available
+if type rg &> /dev/null; then
+  export FZF_DEFAULT_COMMAND='rg --files'
+  export FZF_DEFAULT_OPTS='-m --height 50% --border'
+fi