diff --git a/symlinks/config/nvim/lua/esensar/init/plugins.lua b/symlinks/config/nvim/lua/esensar/init/plugins.lua
index cce14c6..a5b157f 100644
--- a/symlinks/config/nvim/lua/esensar/init/plugins.lua
+++ b/symlinks/config/nvim/lua/esensar/init/plugins.lua
@@ -35,7 +35,7 @@ return require("lazy").setup({
 	{ "romainl/vim-devdocs", cmd = "DD" }, -- Quick DevDocs.io search using :DD
 	"gpanders/editorconfig.nvim", -- .editorconfig support
 	"lewis6991/impatient.nvim", -- Caching lua modules for faster startup
-	"rcarriga/nvim-notify", -- notifications UI
+	"j-hui/fidget.nvim", -- notifications UI
 	"MunifTanjim/nui.nvim", -- General UI
 	"jiangmiao/auto-pairs", -- Autoclosing of brackets and quotes
 
@@ -137,6 +137,12 @@ return require("lazy").setup({
 	"hrsh7th/nvim-cmp", -- completion integration
 	"mhartington/formatter.nvim", -- formatting support
 	"mfussenegger/nvim-lint", -- linting support
+	{
+		"smjonas/inc-rename.nvim",
+		config = function()
+			require("inc_rename").setup()
+		end,
+	},
 
 	-- LSP language specific
 	"folke/neodev.nvim", -- Built-in Lua integration with LSP
diff --git a/symlinks/config/nvim/lua/esensar/lsp/server_config.lua b/symlinks/config/nvim/lua/esensar/lsp/server_config.lua
index 2dc9956..aeb8f68 100644
--- a/symlinks/config/nvim/lua/esensar/lsp/server_config.lua
+++ b/symlinks/config/nvim/lua/esensar/lsp/server_config.lua
@@ -10,7 +10,9 @@ local function on_attach(client, bufnr)
 	vim.keymap.set("n", "gD", vim.lsp.buf.declaration, opts)
 	vim.keymap.set("n", "gr", vim.lsp.buf.references, opts)
 	vim.keymap.set("n", "gi", vim.lsp.buf.implementation, opts)
-	vim.keymap.set("n", "<Leader>rn", vim.lsp.buf.rename, opts)
+	vim.keymap.set("n", "<Leader>rn", function()
+		return ":IncRename " .. vim.fn.expand("<cword>")
+	end, vim.tbl_extend("force", opts, { expr = true }))
 	vim.keymap.set({ "n", "i" }, "<A-k>", vim.lsp.buf.signature_help, opts)
 	vim.keymap.set("n", "K", vim.lsp.buf.hover, opts)
 	vim.keymap.set("n", "<A-CR>", vim.lsp.buf.code_action, opts)
diff --git a/symlinks/config/nvim/plugin/telescope.lua b/symlinks/config/nvim/plugin/telescope.lua
index 366245e..d9e4c2b 100644
--- a/symlinks/config/nvim/plugin/telescope.lua
+++ b/symlinks/config/nvim/plugin/telescope.lua
@@ -21,7 +21,6 @@ require("telescope").setup({
 })
 
 require("telescope").load_extension("dap")
-require("telescope").load_extension("notify")
 require("telescope").load_extension("ui-select")
 
 vim.keymap.set("n", "<C-P>", function()
diff --git a/symlinks/config/nvim/plugin/ui.lua b/symlinks/config/nvim/plugin/ui.lua
index 24e083a..4ad38b2 100644
--- a/symlinks/config/nvim/plugin/ui.lua
+++ b/symlinks/config/nvim/plugin/ui.lua
@@ -3,12 +3,9 @@ local input = require("nui.input")
 local event = require("nui.utils.autocmd").event
 
 -- Notifications
-local notify = require("notify")
-notify.setup({
-	render = "minimal",
-	stages = "static",
-})
-vim.notify = notify
+local fidget = require("fidget")
+fidget.setup()
+vim.notify = fidget.notify
 
 -- Inputs
 local input_ui