diff --git a/config/nvim/lua/fschauen/keymap.lua b/config/nvim/lua/fschauen/keymap.lua
index 10f955b..44beb2c 100644
--- a/config/nvim/lua/fschauen/keymap.lua
+++ b/config/nvim/lua/fschauen/keymap.lua
@@ -121,6 +121,12 @@ local keymap = {
   { '<leader>sl', '<cmd>set list!  | set list?<CR>' },
   { '<leader>sw', '<cmd>set wrap!  | set wrap?<CR>' },
   { '<leader>ss', '<cmd>set spell! | set spell?<CR>' },
+
+  treesitter = {
+    { '<leader>tp', '<cmd>TSPlaygroundToggle<cr>' },
+    { '<leader>th', '<cmd>TSHighlightCapturesUnderCursor<cr>' },
+    { '<leader>tn', '<cmd>TSNodeUnderCursor<cr>' },
+  },
 }
 
 M.setup = function()
diff --git a/config/nvim/lua/fschauen/plugins/treesitter.lua b/config/nvim/lua/fschauen/plugins/treesitter.lua
index 2b4bb27..46151b3 100644
--- a/config/nvim/lua/fschauen/plugins/treesitter.lua
+++ b/config/nvim/lua/fschauen/plugins/treesitter.lua
@@ -1,12 +1,24 @@
 return {
   'nvim-treesitter/nvim-treesitter',
-
   dependencies = {
     'nvim-treesitter/nvim-treesitter-refactor',
     'nvim-treesitter/nvim-treesitter-textobjects',
     'nvim-treesitter/playground',
   },
-
+  keys = require('fschauen.keymap').treesitter,
+  event = {
+    'BufReadPost',
+    'BufNewFile'
+  },
+  cmd = {
+    'TSInstall',
+    'TSUninstall',
+    'TSUpdate',
+    'TSUpdateSync',
+    'TSInstallInfo',
+    'TSInstallSync',
+    'TSInstallFromGrammar',
+  },
   main = 'nvim-treesitter.configs',
   opts = {
     ensure_installed = {
@@ -84,23 +96,5 @@ return {
       enable = true,
     },
   },
-  event = {
-    'BufReadPost',
-    'BufNewFile'
-  },
-  cmd = {
-    'TSInstall',
-    'TSUninstall',
-    'TSUpdate',
-    'TSUpdateSync',
-    'TSInstallInfo',
-    'TSInstallSync',
-    'TSInstallFromGrammar',
-  },
-  keys = {
-    { '<leader>tp', '<cmd>TSPlaygroundToggle<cr>' },
-    { '<leader>th', '<cmd>TSHighlightCapturesUnderCursor<cr>' },
-    { '<leader>tn', '<cmd>TSNodeUnderCursor<cr>' },
-  },
 }