diff --git a/.gitmodules b/.gitmodules
index 65ab9ea..7459d00 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,7 @@
 [submodule "pack/plugins/start/nvim-treesitter"]
 	path = pack/plugins/start/nvim-treesitter
 	url = https://github.com/nvim-treesitter/nvim-treesitter
+[submodule "pack/plugins/start/mini.nvim"]
+	path = pack/plugins/start/mini.nvim
+	url = https://github.com/echasnovski/mini.nvim.git
+	branch = stable
diff --git a/init.lua b/init.lua
index 4f1f3e4..bfc4bb0 100644
--- a/init.lua
+++ b/init.lua
@@ -3,6 +3,7 @@ vim.api.nvim_exec2('language POSIX', {})
 -- }}}
 
 -- Source plugins if they exist {{{
+pcall(require, 'mini-pick')
 pcall(require, 'treesitter')
 -- }}}
 
@@ -91,10 +92,10 @@ vim.api.nvim_create_autocmd({ 'TermOpen' }, {
 vim.keymap.set('n', '<F6>', ':b#<CR>', { noremap = true, silent = true })
 vim.keymap.set('n', '<F7>', ':bprevious<CR>', { noremap = true, silent = true })
 vim.keymap.set('n', '<F8>', ':bnext<CR>', { noremap = true, silent = true })
---vim.keymap.set('n', '<leader>f', ':find ', { noremap = true })
---vim.keymap.set('n', '<leader>f', ':FilePick ', { noremap = true })
+vim.keymap.set('n', '<leader>f', ':Pick files<CR>', { noremap = true })
+vim.keymap.set('n', '<leader>g', ':Pick grep_live<CR>', { noremap = true })
+vim.keymap.set('n', '<leader>b', ':Pick buffers<CR>', { noremap = true })
 vim.keymap.set('n', '<leader>t', ToggleTerminal)
 vim.keymap.set('t', '<Esc>', '<C-\\><C-n>')
 vim.keymap.set('n', 'x', '"_x')
-vim.keymap.set('n', '<leader>b', ':buffers<CR>:buffer ', { noremap = true, silent = true })
 -- }}}
diff --git a/lua/mini-pick.lua b/lua/mini-pick.lua
new file mode 100644
index 0000000..ed90c28
--- /dev/null
+++ b/lua/mini-pick.lua
@@ -0,0 +1 @@
+require('mini.pick').setup()
diff --git a/pack/plugins/start/mini.nvim b/pack/plugins/start/mini.nvim
new file mode 160000
index 0000000..94cae46
--- /dev/null
+++ b/pack/plugins/start/mini.nvim
@@ -0,0 +1 @@
+Subproject commit 94cae4660a8b2d95dbbd56e1fbc6fcfa2716d152