diff --git a/init.lua b/init.lua
index 7d3d198..d0e5008 100644
--- a/init.lua
+++ b/init.lua
@@ -76,6 +76,7 @@ utils.map('n', '<leader>o', '<cmd>Telescope oldfiles<cr>')
 utils.map('n', '<leader>h', '<cmd>Telescope command_history<cr>')
 utils.map('n', '<C-S-p>', '<cmd>Telescope commands<cr>')
 utils.map('n', '<leader>b', '<cmd>Telescope buffers<cr>')
+utils.map('n', '<space>r', '<cmd>Telescope lsp_references<cr>')
 utils.map('n', '<C-S-o>', '<cmd>Telescope lsp_document_symbols<cr>')
 -------------------- LSP -----------------------------------
 local lsp = require 'lspconfig'
@@ -89,12 +90,15 @@ utils.map('n', '<space>,', '<cmd>lua vim.lsp.diagnostic.goto_prev()<CR>')
 utils.map('n', '<space>;', '<cmd>lua vim.lsp.diagnostic.goto_next()<CR>')
 utils.map('n', '<space>a', '<cmd>lua vim.lsp.buf.code_action()<CR>')
 utils.map('n', '<space>d', '<cmd>lua vim.lsp.buf.definition()<CR>')
+utils.map('n', '<space>e', '<cmd>lua vim.lsp.buf.declaration()<CR>')
 utils.map('n', '<space>f', '<cmd>lua vim.lsp.buf.formatting()<CR>')
 utils.map('n', '<space>h', '<cmd>lua vim.lsp.buf.hover()<CR>')
 utils.map('n', '<space>m', '<cmd>lua vim.lsp.buf.rename()<CR>')
-utils.map('n', '<space>r', '<cmd>lua vim.lsp.buf.references()<CR>')
+-- utils.map('n', '<space>r', '<cmd>lua vim.lsp.buf.references()<CR>')
 utils.map('n', '<space>s', '<cmd>lua vim.lsp.buf.document_symbol()<CR>')
 
+utils.map('n', '<A-o>', ':ClangdSwitchSourceHeader<CR>')
+
 -------------------- GITSIGNS ------------------------------
 -- require('gitsigns').setup()
 -------------------- LIGHTBULB -----------------------------
@@ -111,3 +115,4 @@ utils.map('v', '<A-#>', 'gc')
 -------------------- CMAKE ---------------------------------
 require('telescope').load_extension('cmake')
 g.cmake_build_dir = '{cwd}/build_nvim'
+utils.map('n', '<F5>', ':CMake build<CR>:copen<CR>')