diff --git a/lua/lsp-setup.lua b/lua/lsp-setup.lua
index e54c458..b9a9e1a 100644
--- a/lua/lsp-setup.lua
+++ b/lua/lsp-setup.lua
@@ -37,8 +37,8 @@ vim.api.nvim_create_autocmd('LspAttach', {
 		vim.keymap.set('n', '<space>wa', vim.lsp.buf.add_workspace_folder, opts('Add workspace folder'))
 		vim.keymap.set('n', '<space>wr', vim.lsp.buf.remove_workspace_folder, opts('Remove workspace folder'))
 		vim.keymap.set('n', '<space>D', vim.lsp.buf.type_definition, opts('Go to type definition'))
-		vim.keymap.set('n', '<space>rn', vim.lsp.buf.rename, opts('Rename symbol'))
-		vim.keymap.set({ 'n', 'v' }, '<space>ca', vim.lsp.buf.code_action, opts('Execute code action'))
+		vim.keymap.set('n', '<space>r', vim.lsp.buf.rename, opts('Rename symbol'))
+		vim.keymap.set({ 'n', 'v' }, '<space>x', vim.lsp.buf.code_action, opts('Execute code action'))
 		vim.keymap.set('n', 'gr', vim.lsp.buf.references, opts('Go to references'))
 		vim.keymap.set('n', '<space>f', function()
 			vim.lsp.buf.format { async = true }
@@ -58,3 +58,8 @@ rt.setup({
 		end,
 	},
 })
+
+local wk = require 'which-key'
+wk.add({
+	{ '<space>w', group = 'LSP workspace' }
+})
diff --git a/lua/plugins.lua b/lua/plugins.lua
index 048b976..3a24790 100644
--- a/lua/plugins.lua
+++ b/lua/plugins.lua
@@ -63,9 +63,9 @@ return {
 		'NeogitOrg/neogit',
 		version = 'v0.0.1',
 		dependencies = {
-			'nvim-lua/plenary.nvim',      -- required
-			'nvim-telescope/telescope.nvim', -- optional
-			'sindrets/diffview.nvim',     -- optional
+			'nvim-lua/plenary.nvim',
+			'nvim-telescope/telescope.nvim',
+			'sindrets/diffview.nvim',
 		},
 		config = true,
 	},
@@ -125,6 +125,13 @@ return {
 				desc = 'Buffer Local Keymaps (which-key)',
 			},
 		},
+		config = function (_, opts)
+			local wk = require('which-key')
+			wk.setup(opts)
+			wk.add({
+				{ '<leader>x', group = 'Trouble' }
+			})
+		end
 	},
 	{
 		'nvim-lualine/lualine.nvim',
@@ -148,7 +155,7 @@ return {
 	},
 	{
 		'folke/trouble.nvim',
-		opts = {}, -- for default options, refer to the configuration section for custom setup.
+		opts = {},
 		cmd = 'Trouble',
 		keys = {
 			{
@@ -162,12 +169,12 @@ return {
 				desc = 'Buffer Diagnostics (Trouble)',
 			},
 			{
-				'<leader>cs',
+				'<leader>xcs',
 				'<cmd>Trouble symbols toggle focus=false<cr>',
 				desc = 'Symbols (Trouble)',
 			},
 			{
-				'<leader>cl',
+				'<leader>xcl',
 				'<cmd>Trouble lsp toggle focus=false win.position=right<cr>',
 				desc = 'LSP Definitions / references / ... (Trouble)',
 			},