diff --git a/config/nvim/lua/fschauen/keymap.lua b/config/nvim/lua/fschauen/keymap.lua
index aff0aeb..c94407a 100644
--- a/config/nvim/lua/fschauen/keymap.lua
+++ b/config/nvim/lua/fschauen/keymap.lua
@@ -2,7 +2,6 @@ local M = {}
 
 local diagnostic = require 'fschauen.diagnostic'
 local window = require 'fschauen.window'
-local pick = require('fschauen.telescope').pickers
 
 local toggle_number = function()
   vim.wo.number = not vim.wo.number
@@ -14,14 +13,6 @@ local toggle_relativenumber = function()
   vim.wo.number = vim.wo.relativenumber or vim.wo.number
 end
 
-local toggle_colorcolumn = function()
-  if vim.o.colorcolumn == '' then
-    vim.o.colorcolumn = '+1'  -- one after 'textwidth'
-  else
-    vim.o.colorcolumn = ''    -- none
-  end
-end
-
 local keymap = {
   -- better navigation for wrapped lines
     { 'j', 'gj' },
@@ -92,68 +83,6 @@ local keymap = {
     { '<leader>do', diagnostic.open_float },
     { '<leader>dh', diagnostic.hide },
 
-  telescope_file_browser = {
-    { '<leader>fB', '<cmd>Telescope file_browser<cr>' , desc = ' file [B]rowser' },
-  },
-
-  telescope = {
-    { '<leader>fa',  pick.autocommands           '  Autocommands'         , desc = ' Telescope [a]utocommands'            },
-    { '<leader>fb',  pick.buffers                '  Buffers'              , desc = ' Telescope [b]uffers'                 },
-    { '<leader>fc',  pick.colorscheme            '  Colorschemes'         , desc = ' Telescope [c]olorschemes'            },
-    { '<leader>fdd', pick.diagnostics            '󰀪  Document Diagnostics' , desc = ' Telescope [d]iagnostics [d]ocument'  },
-    { '<leader>fdw', pick.diagnostics            '󰀪  Workspace Diagnostics', desc = ' Telescope [d]iagnostics [w]orkspace' },
-    --'<leader>fe'
-    { '<leader>ff',  pick.find_files             '  Files'                , desc = ' Telescope [f]ind files'              },
-    { '<leader>fF',  pick.all_files              '  ALL files'            , desc = ' Telescope all [F]iles'               },
-    { '<leader>fgr', pick.live_grep              '  Live grep'            , desc = ' Telescope Live [gr]ep'               },
-    { '<leader>fgf', pick.git_files              '  Git files'            , desc = ' Telescope [g]it [f]iles'             },
-    { '<leader>fgc', pick.git_commits            ' Commits'             , desc = ' Telescope [g]it [c]ommits'           },
-    { '<leader>fh',  pick.here                   '  Current buffer'       , desc = ' Telescope [b]uffer [h]ere'           },
-    { '<leader>fH',  pick.highlights             '󰌶  Highlights'           , desc = ' Telescope [H]ighlights'              },
-    --'<leader>fi'
-    { '<leader>fj',  pick.jumplist               '  Jumplist'             , desc = ' Telescope [j]umplist'                },
-    { '<leader>fk',  pick.keymaps                '  Keymaps'              , desc = ' Telescope [k]eymaps'                 },
-    { '<leader>fK',  pick.help_tags              '  Help tags'            , desc = ' Telescope [K] help/documentation'    },
-    { '<leader>fl',  pick.loclist                '  Location list'        , desc = ' Telescope [l]ocation List'           },
-    { '<leader>fm',  pick.man_pages              '  Man pages'            , desc = ' Telescope [m]an pages'               },
-    --'<leader>fn'
-    { '<leader>fo',  pick.vim_options            '  Vim options'          , desc = ' Telescope vim [o]ptions'             },
-    --'<leader>fp'
-    { '<leader>fq',  pick.quickfix               '  Quickfix'             , desc = ' Telescope [q]uickfix'                },
-    { '<leader>fr',  pick.lsp_references         '  References'           , desc = ' Telescope [r]eferences'              },
-    { '<leader>fR',  pick.registers              '󱓥  Registers'            , desc = ' Telescope [R]registers'              },
-    { '<leader>fs',  pick.lsp_document_symbols   '󰫧  Document Symbols '    , desc = ' Telescope lsp document [s]ymbols'    },
-    { '<leader>fS',  pick.lsp_workspace_symbols  '󱄑  Workspace Symbols '   , desc = ' Telescope lsp workspace [S]ymbols'   },
-    --'<leader>ft'   used in todo_comments below
-    { '<leader>fT',  pick.treesitter             '  Treesitter symbols'   , desc = ' Telescope [T]reesitter Symbols'      },
-    --'<leader>fu'
-    --'<leader>fv'
-    { '<leader>fw',  pick.selection              '  Grep'                 , desc = ' Telescope [w]word under cursor'      },
-    { '<leader>fw',  pick.selection              '  Grep',  mode = 'v'    , desc = ' Telescope [w]ord(s) selected'        },
-    --'<leader>fx'
-    --'<leader>fy'
-    { '<leader>fz',  pick.spell_suggest          '󰓆  Spelling suggestions' , desc = ' Telescope [z] spell suggestions'     },
-    { '<leader>f.',  pick.dotfiles               '  Dotfiles'             , desc = ' Telescope [.]dotfiles'               },
-    { '<leader>f:',  pick.command_history        '  Command history'      , desc = ' Telescope [:]command history'        },
-    { '<leader>f?',  pick.commands               '  Commands'             , desc = ' Telescope commands [?]'              },
-    { '<leader>f/',  pick.search_history         '  Search history'       , desc = ' Telescope [/]search history'         },
-    { '<leader>f<leader>', pick.resume           '󰐎  Resume'               , desc = ' Telescope Resume '                   },
-  },
-
-  todo_comments = {
-    { '<leader>ft', '<cmd>TodoTelescope<cr>' },
-  },
-
-  fugitive = {
-    { '<leader>gg', ':Git ' },
-    { '<leader>gs', '<cmd>tab Git<cr>' },
-    { '<leader>gb', '<cmd>Git blame<cr>' }
-  },
-
-  neogit = {
-    { '<leader>gn', '<cmd>Neogit<cr>' },
-  },
-
   -- disable highlight until next search
     { '<leader>h', '<cmd>nohlsearch<cr><esc>' },
 
@@ -167,52 +96,15 @@ local keymap = {
     {      '<leader>ll', window.toggle_quickfix,  desc = 'Toggle quickfix'  },
     { '<localleader>ll', window.toggle_loclist,   desc = 'Toggle loclist'   },
 
-  trouble = {
-    { '<leader>lt', '<cmd>TroubleToggle<cr>' },
-    { '<leader>lw', '<cmd>TroubleToggle workspace_diagnostics<cr>' },
-    { '<leader>ld', '<cmd>TroubleToggle document_diagnostics<cr>' },
-  },
-
   -- quickly open lazy.nvim plugin manager
     { '<leader>L', '<cmd>Lazy<cr>' },
 
-  nvim_tree = {
-    { '<leader>nn', '<cmd>NvimTreeOpen<cr>' },
-    { '<leader>nf', '<cmd>NvimTreeFindFile<cr>' },
-    { '<leader>nc', '<cmd>NvimTreeClose<cr>' },
-  },
-
   -- toggle options
     { '<leader>sn', toggle_number },
     { '<leader>sr', toggle_relativenumber },
     { '<leader>sl', '<cmd>set list!  | set list?<CR>' },
     { '<leader>sw', '<cmd>set wrap!  | set wrap?<CR>' },
     { '<leader>ss', '<cmd>set spell! | set spell?<CR>' },
-
-  virt_column = {
-    { '<leader>sc', toggle_colorcolumn, desc = 'Toggle virtual colunn' },
-  },
-
-  indent_blankline = {
-    { '<leader>si', '<cmd>IndentBlanklineToggle<cr>' },
-  },
-
-  treesitter = {
-    { '<leader>tp', '<cmd>TSPlaygroundToggle<cr>' },
-    { '<leader>th', '<cmd>TSHighlightCapturesUnderCursor<cr>' },
-    { '<leader>tn', '<cmd>TSNodeUnderCursor<cr>' },
-  },
-
-  undotree = {
-    { '<leader>u', '<cmd>UndotreeToggle<cr>' },
-  },
-
-  whitespace ={
-    { '<leader>ww', '<cmd>ToggleWhitespace<cr>' },
-    { '<leader>wj', '<cmd>NextTrailingWhitespace<cr>' },
-    { '<leader>wk', '<cmd>PrevTrailingWhitespace<cr>' },
-    { '<leader>wd', '<cmd>StripWhitespace<cr>' },
-  },
 }
 
 M.setup = function()
diff --git a/config/nvim/lua/fschauen/plugins/comment.lua b/config/nvim/lua/fschauen/plugins/comment.lua
index a05ae6f..ef55fe4 100644
--- a/config/nvim/lua/fschauen/plugins/comment.lua
+++ b/config/nvim/lua/fschauen/plugins/comment.lua
@@ -3,9 +3,9 @@ local M = { 'tpope/vim-commentary' }
 M.cmd = 'Commentary'
 
 M.keys = {
-  { 'gc',  '<Plug>Commentary', mode = { 'n', 'x', 'o' }, desc = 'Comment in/out' },
-  { 'gcc', '<Plug>CommentaryLine',             desc = 'Comment in/out line' },
-  { 'gcu', '<Plug>Commentary<Plug>Commentary', desc = 'Undo comment in/out' },
+  { 'gc',  '<Plug>Commentary', mode = { 'n', 'x', 'o' },  desc = 'Comment in/out' },
+  { 'gcc', '<Plug>CommentaryLine',                        desc = 'Comment in/out line' },
+  { 'gcu', '<Plug>Commentary<Plug>Commentary',            desc = 'Undo comment in/out' },
 }
 
 return M
diff --git a/config/nvim/lua/fschauen/plugins/fugitive.lua b/config/nvim/lua/fschauen/plugins/fugitive.lua
index 8dd0b56..fd961bc 100644
--- a/config/nvim/lua/fschauen/plugins/fugitive.lua
+++ b/config/nvim/lua/fschauen/plugins/fugitive.lua
@@ -5,7 +5,11 @@ M.cmd = {
   'Git',
 }
 
-M.keys = require('fschauen.keymap').fugitive
+M.keys = {
+  { '<leader>gg', ':Git ' },
+  { '<leader>gs', '<cmd>tab Git<cr>' },
+  { '<leader>gb', '<cmd>Git blame<cr>' }
+}
 
 return M
 
diff --git a/config/nvim/lua/fschauen/plugins/indent-blankline.lua b/config/nvim/lua/fschauen/plugins/indent-blankline.lua
index 4382f6a..40b0963 100644
--- a/config/nvim/lua/fschauen/plugins/indent-blankline.lua
+++ b/config/nvim/lua/fschauen/plugins/indent-blankline.lua
@@ -1,6 +1,8 @@
 local M = { 'lukas-reineke/indent-blankline.nvim' }
 
-M.keys = require('fschauen.keymap').indent_blankline
+M.keys = {
+  { '<leader>si', '<cmd>IndentBlanklineToggle<cr>' },
+}
 
 M.lazy = false -- trows an error when lazy loading
 
diff --git a/config/nvim/lua/fschauen/plugins/neogit.lua b/config/nvim/lua/fschauen/plugins/neogit.lua
index 01b0b99..d961524 100644
--- a/config/nvim/lua/fschauen/plugins/neogit.lua
+++ b/config/nvim/lua/fschauen/plugins/neogit.lua
@@ -4,7 +4,9 @@ M.dependencies = {
   'nvim-lua/plenary.nvim',
 }
 
-M.keys = require('fschauen.keymap').neogit
+M.keys = {
+  { '<leader>gn', '<cmd>Neogit<cr>' },
+}
 
 M.opts = {
   disable_hint = true,
diff --git a/config/nvim/lua/fschauen/plugins/nvim-tree.lua b/config/nvim/lua/fschauen/plugins/nvim-tree.lua
index 547b2e6..88c30ae 100644
--- a/config/nvim/lua/fschauen/plugins/nvim-tree.lua
+++ b/config/nvim/lua/fschauen/plugins/nvim-tree.lua
@@ -4,7 +4,11 @@ M.dependencies = {
   'nvim-tree/nvim-web-devicons',
 }
 
-M.keys = require('fschauen.keymap').nvim_tree
+M.keys = {
+  { '<leader>nn', '<cmd>NvimTreeOpen<cr>' },
+  { '<leader>nf', '<cmd>NvimTreeFindFile<cr>' },
+  { '<leader>nc', '<cmd>NvimTreeClose<cr>' },
+}
 
 M.opts = {
   disable_netrw = true,       -- replace netrw with nvim-tree
diff --git a/config/nvim/lua/fschauen/plugins/telescope-file-browser.lua b/config/nvim/lua/fschauen/plugins/telescope-file-browser.lua
index 0996aa7..583cff5 100644
--- a/config/nvim/lua/fschauen/plugins/telescope-file-browser.lua
+++ b/config/nvim/lua/fschauen/plugins/telescope-file-browser.lua
@@ -4,7 +4,9 @@ M.dependencies = {
   'nvim-telescope/telescope.nvim',
 }
 
-M.keys = require('fschauen.keymap').telescope_file_browser
+M.keys = {
+  { '<leader>fB', '<cmd>Telescope file_browser<cr>' , desc = ' file [B]rowser' },
+}
 
 M.config = function()
   require('telescope').load_extension 'file_browser'
diff --git a/config/nvim/lua/fschauen/plugins/telescope.lua b/config/nvim/lua/fschauen/plugins/telescope.lua
index 58454fa..54e8255 100644
--- a/config/nvim/lua/fschauen/plugins/telescope.lua
+++ b/config/nvim/lua/fschauen/plugins/telescope.lua
@@ -9,7 +9,50 @@ M.dependencies = {
 
 M.cmd = 'Telescope'
 
-M.keys = require('fschauen.keymap').telescope
+local pick = require('fschauen.telescope').pickers
+M.keys = {
+  { '<leader>fa',  pick.autocommands           '  Autocommands'         , desc = ' Telescope [a]utocommands'            },
+  { '<leader>fb',  pick.buffers                '  Buffers'              , desc = ' Telescope [b]uffers'                 },
+  { '<leader>fc',  pick.colorscheme            '  Colorschemes'         , desc = ' Telescope [c]olorschemes'            },
+  { '<leader>fdd', pick.diagnostics            '󰀪  Document Diagnostics' , desc = ' Telescope [d]iagnostics [d]ocument'  },
+  { '<leader>fdw', pick.diagnostics            '󰀪  Workspace Diagnostics', desc = ' Telescope [d]iagnostics [w]orkspace' },
+  --'<leader>fe'
+  { '<leader>ff',  pick.find_files             '  Files'                , desc = ' Telescope [f]ind files'              },
+  { '<leader>fF',  pick.all_files              '  ALL files'            , desc = ' Telescope all [F]iles'               },
+  { '<leader>fgr', pick.live_grep              '  Live grep'            , desc = ' Telescope Live [gr]ep'               },
+  { '<leader>fgf', pick.git_files              '  Git files'            , desc = ' Telescope [g]it [f]iles'             },
+  { '<leader>fgc', pick.git_commits            ' Commits'             , desc = ' Telescope [g]it [c]ommits'           },
+  { '<leader>fh',  pick.here                   '  Current buffer'       , desc = ' Telescope [b]uffer [h]ere'           },
+  { '<leader>fH',  pick.highlights             '󰌶  Highlights'           , desc = ' Telescope [H]ighlights'              },
+  --'<leader>fi'
+  { '<leader>fj',  pick.jumplist               '  Jumplist'             , desc = ' Telescope [j]umplist'                },
+  { '<leader>fk',  pick.keymaps                '  Keymaps'              , desc = ' Telescope [k]eymaps'                 },
+  { '<leader>fK',  pick.help_tags              '  Help tags'            , desc = ' Telescope [K] help/documentation'    },
+  { '<leader>fl',  pick.loclist                '  Location list'        , desc = ' Telescope [l]ocation List'           },
+  { '<leader>fm',  pick.man_pages              '  Man pages'            , desc = ' Telescope [m]an pages'               },
+  --'<leader>fn'
+  { '<leader>fo',  pick.vim_options            '  Vim options'          , desc = ' Telescope vim [o]ptions'             },
+  --'<leader>fp'
+  { '<leader>fq',  pick.quickfix               '  Quickfix'             , desc = ' Telescope [q]uickfix'                },
+  { '<leader>fr',  pick.lsp_references         '  References'           , desc = ' Telescope [r]eferences'              },
+  { '<leader>fR',  pick.registers              '󱓥  Registers'            , desc = ' Telescope [R]registers'              },
+  { '<leader>fs',  pick.lsp_document_symbols   '󰫧  Document Symbols '    , desc = ' Telescope lsp document [s]ymbols'    },
+  { '<leader>fS',  pick.lsp_workspace_symbols  '󱄑  Workspace Symbols '   , desc = ' Telescope lsp workspace [S]ymbols'   },
+  --'<leader>ft'   used in todo_comments
+  { '<leader>fT',  pick.treesitter             '  Treesitter symbols'   , desc = ' Telescope [T]reesitter Symbols'      },
+  --'<leader>fu'
+  --'<leader>fv'
+  { '<leader>fw',  pick.selection              '  Grep'                 , desc = ' Telescope [w]word under cursor'      },
+  { '<leader>fw',  pick.selection              '  Grep',  mode = 'v'    , desc = ' Telescope [w]ord(s) selected'        },
+  --'<leader>fx'
+  --'<leader>fy'
+  { '<leader>fz',  pick.spell_suggest          '󰓆  Spelling suggestions' , desc = ' Telescope [z] spell suggestions'     },
+  { '<leader>f.',  pick.dotfiles               '  Dotfiles'             , desc = ' Telescope [.]dotfiles'               },
+  { '<leader>f:',  pick.command_history        '  Command history'      , desc = ' Telescope [:]command history'        },
+  { '<leader>f?',  pick.commands               '  Commands'             , desc = ' Telescope commands [?]'              },
+  { '<leader>f/',  pick.search_history         '  Search history'       , desc = ' Telescope [/]search history'         },
+  { '<leader>f<leader>', pick.resume           '󰐎  Resume'               , desc = ' Telescope Resume '                   },
+}
 
 M.opts = function()
   local actions = require('telescope.actions')
diff --git a/config/nvim/lua/fschauen/plugins/todo-comments.lua b/config/nvim/lua/fschauen/plugins/todo-comments.lua
index dabf5c5..74e2308 100644
--- a/config/nvim/lua/fschauen/plugins/todo-comments.lua
+++ b/config/nvim/lua/fschauen/plugins/todo-comments.lua
@@ -2,15 +2,18 @@ local M = { 'folke/todo-comments.nvim' }
 
 M.dependencies = {
   'nvim-lua/plenary.nvim',
+  'nvim-telescope/telescope.nvim',
 }
 
-M.keys = require('fschauen.keymap').todo_comments
-
 M.event = {
   'BufReadPost',
   'BufNewFile'
 }
 
+M.keys = {
+  { '<leader>ft', '<cmd>TodoTelescope<cr>' },
+}
+
 M.opts = {
   keywords = {
     TODO = { icon = '󰄬 ' },
diff --git a/config/nvim/lua/fschauen/plugins/treesitter.lua b/config/nvim/lua/fschauen/plugins/treesitter.lua
index a909322..7a50809 100644
--- a/config/nvim/lua/fschauen/plugins/treesitter.lua
+++ b/config/nvim/lua/fschauen/plugins/treesitter.lua
@@ -6,8 +6,6 @@ M.dependencies = {
   'nvim-treesitter/playground',
 }
 
-M.keys = require('fschauen.keymap').treesitter
-
 M.event = {
   'BufReadPost',
   'BufNewFile'
@@ -23,6 +21,12 @@ M.cmd = {
   'TSInstallFromGrammar',
 }
 
+M.keys = {
+  { '<leader>tp', '<cmd>TSPlaygroundToggle<cr>' },
+  { '<leader>th', '<cmd>TSHighlightCapturesUnderCursor<cr>' },
+  { '<leader>tn', '<cmd>TSNodeUnderCursor<cr>' },
+}
+
 M.main = 'nvim-treesitter.configs'
 
 M.opts = {
diff --git a/config/nvim/lua/fschauen/plugins/trouble.lua b/config/nvim/lua/fschauen/plugins/trouble.lua
index e432e99..73d57a0 100644
--- a/config/nvim/lua/fschauen/plugins/trouble.lua
+++ b/config/nvim/lua/fschauen/plugins/trouble.lua
@@ -4,7 +4,11 @@ M.dependencies = {
   'nvim-tree/nvim-web-devicons',
 }
 
-M.keys = require('fschauen.keymap').trouble
+M.keys = {
+  { '<leader>lt', '<cmd>TroubleToggle<cr>' },
+  { '<leader>lw', '<cmd>TroubleToggle workspace_diagnostics<cr>' },
+  { '<leader>ld', '<cmd>TroubleToggle document_diagnostics<cr>' },
+}
 
 M.opts = {
   padding = false,      -- don't add an extra new line of top of the list
diff --git a/config/nvim/lua/fschauen/plugins/undotree.lua b/config/nvim/lua/fschauen/plugins/undotree.lua
index f163f03..ef55582 100644
--- a/config/nvim/lua/fschauen/plugins/undotree.lua
+++ b/config/nvim/lua/fschauen/plugins/undotree.lua
@@ -10,7 +10,9 @@ M.init = function()
   vim.g.undotree_TreeReturnShape = '╲'
 end
 
-M.keys = require('fschauen.keymap').undotree
+M.keys = {
+  { '<leader>u', '<cmd>UndotreeToggle<cr>' },
+}
 
 M.config = false
 
diff --git a/config/nvim/lua/fschauen/plugins/virt-column.lua b/config/nvim/lua/fschauen/plugins/virt-column.lua
index 3c0829d..023631f 100644
--- a/config/nvim/lua/fschauen/plugins/virt-column.lua
+++ b/config/nvim/lua/fschauen/plugins/virt-column.lua
@@ -5,7 +5,17 @@ M.event = {
   'BufNewFile'
 }
 
-M.keys = require('fschauen.keymap').virt_column
+local toggle_colorcolumn = function()
+  if vim.o.colorcolumn == '' then
+    vim.o.colorcolumn = '+1'  -- one after 'textwidth'
+  else
+    vim.o.colorcolumn = ''    -- none
+  end
+end
+
+M.keys = {
+  { '<leader>sc', toggle_colorcolumn, desc = 'Toggle virtual colunn' },
+}
 
 M.opts = {
   char = '│',
diff --git a/config/nvim/lua/fschauen/plugins/whitespace.lua b/config/nvim/lua/fschauen/plugins/whitespace.lua
index 0e2bb75..033adac 100644
--- a/config/nvim/lua/fschauen/plugins/whitespace.lua
+++ b/config/nvim/lua/fschauen/plugins/whitespace.lua
@@ -10,13 +10,18 @@ M.init = function()
   }
 end
 
-M.keys = require('fschauen.keymap').whitespace
-
 M.event = {
   'BufReadPost',
   'BufNewFile'
 }
 
+M.keys = {
+  { '<leader>ww', '<cmd>ToggleWhitespace<cr>' },
+  { '<leader>wj', '<cmd>NextTrailingWhitespace<cr>' },
+  { '<leader>wk', '<cmd>PrevTrailingWhitespace<cr>' },
+  { '<leader>wd', '<cmd>StripWhitespace<cr>' },
+}
+
 M.config = false
 
 return M