diff --git a/nvim/init.lua b/nvim/init.lua
index 3fc70d7..c4d1f17 100644
--- a/nvim/init.lua
+++ b/nvim/init.lua
@@ -7,6 +7,20 @@ require('packer').startup(function(use)
   use 'neovim/nvim-lspconfig'
   use 'j-hui/fidget.nvim'
   use 'ray-x/lsp_signature.nvim'
+  use({
+    "glepnir/lspsaga.nvim",
+    branch = "main",
+    config = function()
+      require("lspsaga").init_lsp_saga({})
+    end,
+  })
+  use {
+    "folke/trouble.nvim",
+    requires = "kyazdani42/nvim-web-devicons",
+    config = function()
+      require("trouble").setup({})
+    end
+  }
 
   use 'nvim-lualine/lualine.nvim'
   use 'morhetz/gruvbox'
diff --git a/nvim/lua/lsp.lua b/nvim/lua/lsp.lua
index 0f43091..097b626 100644
--- a/nvim/lua/lsp.lua
+++ b/nvim/lua/lsp.lua
@@ -11,7 +11,9 @@ vim.api.nvim_create_autocmd(
   'BufWritePre',
   {
     pattern = { '<buffer>' },
-    callback = vim.lsp.buf.formatting_sync,
+    callback = function()
+      vim.lsp.buf.format({})
+    end,
   }
 )
 
diff --git a/nvim/lua/mappings.lua b/nvim/lua/mappings.lua
index cac0680..e9885b2 100644
--- a/nvim/lua/mappings.lua
+++ b/nvim/lua/mappings.lua
@@ -9,15 +9,13 @@ vim.keymap.set('n', '<leader>fh', telescope.help_tags)
 
 -- LSP Keymaps
 vim.keymap.set('n', '<leader>h', vim.lsp.buf.hover)
-vim.keymap.set('n', '<leader>r', vim.lsp.buf.rename)
-vim.keymap.set('n', '<leader><space>', vim.lsp.buf.code_action)
-vim.keymap.set('n', 'gD', vim.lsp.buf.declaration)
+vim.keymap.set('n', '<leader>r', ':Lspsaga rename<CR>')
+vim.keymap.set('n', '<leader><space>', ':Lspsaga code_action<CR>')
+vim.keymap.set('n', 'gf', ':Lspsaga lsp_finder<CR>')
 vim.keymap.set('n', 'gd', vim.lsp.buf.definition)
-vim.keymap.set('n', 'gt', vim.lsp.buf.type_definition)
-vim.keymap.set('n', 'gi', vim.lsp.buf.implementation)
-vim.keymap.set('n', 'gr', vim.lsp.buf.references)
+vim.keymap.set('n', 'gp', ':Lspsaga peek_definition<CR>')
 
-vim.keymap.set('n', '[d', vim.diagnostic.goto_prev)
-vim.keymap.set('n', ']d', vim.diagnostic.goto_next)
-vim.keymap.set('n', '[g', ":Gitsigns prev_hunk<CR>")
-vim.keymap.set('n', ']g', ":Gitsigns next_hunk<CR>")
+vim.keymap.set('n', '[d', ':Lspsaga diagnostic_jump_prev<CR>')
+vim.keymap.set('n', ']d', ':Lspsaga diagnostic_jump_next<CR>')
+vim.keymap.set('n', '[g', ':Gitsigns prev_hunk<CR>')
+vim.keymap.set('n', ']g', ':Gitsigns next_hunk<CR>')
diff --git a/nvim/plugin/packer_compiled.lua b/nvim/plugin/packer_compiled.lua
index 287162f..2fa7658 100644
--- a/nvim/plugin/packer_compiled.lua
+++ b/nvim/plugin/packer_compiled.lua
@@ -127,6 +127,12 @@ _G.packer_plugins = {
     path = "/home/digyx/.local/share/nvim/site/pack/packer/start/lsp_signature.nvim",
     url = "https://github.com/ray-x/lsp_signature.nvim"
   },
+  ["lspsaga.nvim"] = {
+    config = { "\27LJ\2\nA\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\18init_lsp_saga\flspsaga\frequire\0" },
+    loaded = true,
+    path = "/home/digyx/.local/share/nvim/site/pack/packer/start/lspsaga.nvim",
+    url = "https://github.com/glepnir/lspsaga.nvim"
+  },
   ["lualine.nvim"] = {
     loaded = true,
     path = "/home/digyx/.local/share/nvim/site/pack/packer/start/lualine.nvim",
@@ -192,6 +198,12 @@ _G.packer_plugins = {
     path = "/home/digyx/.local/share/nvim/site/pack/packer/start/telescope.nvim",
     url = "https://github.com/nvim-telescope/telescope.nvim"
   },
+  ["trouble.nvim"] = {
+    config = { "\27LJ\2\n9\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\ftrouble\frequire\0" },
+    loaded = true,
+    path = "/home/digyx/.local/share/nvim/site/pack/packer/start/trouble.nvim",
+    url = "https://github.com/folke/trouble.nvim"
+  },
   ["vim-startuptime"] = {
     loaded = true,
     path = "/home/digyx/.local/share/nvim/site/pack/packer/start/vim-startuptime",
@@ -205,6 +217,14 @@ _G.packer_plugins = {
 }
 
 time([[Defining packer_plugins]], false)
+-- Config for: lspsaga.nvim
+time([[Config for lspsaga.nvim]], true)
+try_loadstring("\27LJ\2\nA\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\18init_lsp_saga\flspsaga\frequire\0", "config", "lspsaga.nvim")
+time([[Config for lspsaga.nvim]], false)
+-- Config for: trouble.nvim
+time([[Config for trouble.nvim]], true)
+try_loadstring("\27LJ\2\n9\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\ftrouble\frequire\0", "config", "trouble.nvim")
+time([[Config for trouble.nvim]], false)
 vim.cmd [[augroup packer_load_aucmds]]
 vim.cmd [[au!]]
   -- Event lazy-loads