diff --git a/nvim/.config/nvim/lua/user/lsp/actions.lua b/nvim/.config/nvim/lua/user/lsp/actions.lua
index 437890a..8900626 100644
--- a/nvim/.config/nvim/lua/user/lsp/actions.lua
+++ b/nvim/.config/nvim/lua/user/lsp/actions.lua
@@ -11,7 +11,7 @@ M.actions = function()
       vim.lsp.codelens.run()
     end,
     ['Show Definition (gd)'] = function()
-      vim.cmd 'Lspsaga peek_definition'
+      vim.lsp.buf.definition()
     end,
     ['Show Declaration (gD)'] = function()
       vim.lsp.buf.declaration()
@@ -22,21 +22,26 @@ M.actions = function()
     ['Show Implementation (gi)'] = function()
       vim.lsp.buf.implementation()
     end,
-    ['Find References - lspsaga (grR)'] = function()
-      vim.cmd 'Lspsaga finder'
-    end,
-    ['Find References (grr)'] = function()
+    ['Find References (gR)'] = function()
       vim.lsp.buf.references { includeDeclaration = false }
     end,
+    ['Add workspace folder'] = function()
+      vim.lsp.buf.add_workspace_folder()
+    end,
+    ['Remove workspace folder'] = function()
+      vim.lsp.buf.remove_workspace_folder()
+    end,
+    ['List workspace folders'] = function()
+      print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
+    end,
     ['Signature Help (<leader>lk)'] = function()
       vim.lsp.buf.signature_help()
     end,
     ['Signature Documentation (K)'] = function()
-      -- vim.lsp.buf.hover()
-      vim.cmd 'Lspsaga hover_doc'
+      vim.lsp.buf.hover()
     end,
-    ['Rename symbol (<leader>lrn)'] = function()
-      vim.cmd 'Lspsaga rename ++project'
+    ['Rename symbol (<leader>lr)'] = function()
+      vim.lsp.buf.rename()
     end,
     ['Diagnostics quickfix list (<leader>lq)'] = function()
       vim.diagnostic.setqflist()
diff --git a/nvim/.config/nvim/lua/user/lsp/keymaps.lua b/nvim/.config/nvim/lua/user/lsp/keymaps.lua
index 4d7c0b4..851b1c0 100644
--- a/nvim/.config/nvim/lua/user/lsp/keymaps.lua
+++ b/nvim/.config/nvim/lua/user/lsp/keymaps.lua
@@ -8,6 +8,7 @@ return function(bufnr)
   -- goto definition/declaration
   vim.keymap.set('n', 'gd', vim.lsp.buf.definition, returnOpts 'Go to definition')
   vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, returnOpts 'Go to declaration')
+  vim.keymap.set('n', '<leader>lk', vim.lsp.buf.signature_help, returnOpts 'Signature help')
 
   -- GoTo code navigation
   vim.keymap.set('n', 'gy', vim.lsp.buf.type_definition, returnOpts 'Go to type definition')