diff --git a/plugin/20_keymaps.lua b/plugin/20_keymaps.lua
index 68c4631..e4ec1e5 100644
--- a/plugin/20_keymaps.lua
+++ b/plugin/20_keymaps.lua
@@ -62,22 +62,22 @@ nmap_leader('ey', '<Cmd>lua vim.fn.setreg("+", vim.api.nvim_buf_get_name(0))<CR>
 nmap_leader('en', '<Cmd>messages<CR>', 'Notifications')
 
 -- Find
-nmap_leader('fb', '<Cmd>lua MiniPick.builtin.buffers()<CR>', 'Buffers')
-nmap_leader('fc', '<Cmd>lua MiniExtra.pickers.git_commits()<CR>', 'Commits (all)')
-nmap_leader('fC', '<Cmd>lua MiniExtra.pickers.git_commits({ path = "%" })<CR>', 'Commits (buf)')
-nmap_leader('fd', '<Cmd>lua MiniExtra.pickers.diagnostic({ scope = "all" })<CR>', 'Diagnostic workspace')
-nmap_leader('fD', '<Cmd>lua MiniExtra.pickers.diagnostic({ scope = "current" })<CR>', 'Diagnostic buffer')
-nmap_leader('ff', '<Cmd>lua MiniPick.builtin.files()<CR>', 'Files')
-nmap_leader('fg', '<Cmd>lua MiniPick.builtin.grep_live()<CR>', 'Grep live')
-nmap_leader('fG', '<Cmd>lua MiniPick.builtin.grep({ pattern = vim.fn.expand("<cword>") })<CR>', 'Grep word')
-nmap_leader('fh', '<Cmd>lua MiniPick.builtin.help()<CR>', 'Help tags')
-nmap_leader('fl', '<Cmd>lua MiniPick.builtin.buf_lines({ scope = "all" })<CR>', 'Lines (all)')
-nmap_leader('fL', '<Cmd>lua MiniPick.builtin.buf_lines({ scope = "current" })<CR>', 'Lines (buf)')
-nmap_leader('fm', '<Cmd>lua require("git").status()<CR>', 'Modified / changed files')
-nmap_leader('fr', '<Cmd>lua MiniPick.builtin.resume()<CR>', 'Resume')
-nmap_leader('fs', '<Cmd>lua MiniExtra.pickers.lsp({ scope = "workspace_symbol_live" })<CR>', 'Symbols workspace')
-nmap_leader('fS', '<Cmd>lua MiniExtra.pickers.lsp({ scope = "document_symbol" })<CR>', 'Symbols document')
-nmap_leader('f:', '<Cmd>lua MiniExtra.pickers.history({ scope = ":" })<CR>', 'Command history')
+nmap_leader('fb', '<Cmd>Pick buffers<CR>', 'Buffers')
+nmap_leader('fc', '<Cmd>Pick git_commits<CR>', 'Commits (all)')
+nmap_leader('fC', '<Cmd>Pick git_commits path="%"<CR>', 'Commits (buf)')
+nmap_leader('fd', '<Cmd>Pick diagnostic scope="all"<CR>', 'Diagnostic workspace')
+nmap_leader('fD', '<Cmd>Pick diagnostic scope="current"<CR>', 'Diagnostic buffer')
+nmap_leader('ff', '<Cmd>Pick files<CR>', 'Files')
+nmap_leader('fg', '<Cmd>Pick grep_live<CR>', 'Grep live')
+nmap_leader('fG', '<Cmd>Pick grep pattern="<cword>"<CR>', 'Grep word')
+nmap_leader('fh', '<Cmd>Pick help<CR>', 'Help tags')
+nmap_leader('fl', '<Cmd>Pick buf_lines scope="all"<CR>', 'Lines (all)')
+nmap_leader('fL', '<Cmd>Pick buf_lines scope="current"<CR>', 'Lines (buf)')
+nmap_leader('fm', '<Cmd>Pick git_status<CR>', 'Modified / changed files')
+nmap_leader('fr', '<Cmd>Pick resume<CR>', 'Resume')
+nmap_leader('fs', '<Cmd>Pick lsp scope="workspace_symbol_live"<CR>', 'Symbols workspace')
+nmap_leader('fS', '<Cmd>Pick lsp scope="document_symbol"<CR>', 'Symbols document')
+nmap_leader('f:', '<Cmd>Pick history scope=":"<CR>', 'Command history')
 
 -- Git
 nmap_leader('ga', '<Cmd>Git add %<CR>', 'Add current file')
diff --git a/plugin/30_mini.lua b/plugin/30_mini.lua
index d060a97..19c9669 100644
--- a/plugin/30_mini.lua
+++ b/plugin/30_mini.lua
@@ -62,6 +62,7 @@ Config.later(function()
   require('mini.pairs').setup()
   require('mini.pick').setup()
   require('mini.extra').setup()
+  MiniPick.registry.git_status = function() require('git').status() end
 end)
 
 -- File Explorer