diff --git a/modules/features/neovim/default.nix b/modules/features/neovim/default.nix
index 0675322..ce61c0e 100644
--- a/modules/features/neovim/default.nix
+++ b/modules/features/neovim/default.nix
@@ -78,6 +78,7 @@ in
               kanagawa-nvim
               nvim-treesitter.withAllGrammars
               nvim-treesitter-textobjects
+              rainbow-delimiters-nvim
             ];
           };
 
@@ -96,7 +97,6 @@ in
             data = with pkgs.vimPlugins; [
               nvim-lspconfig
               lazydev-nvim
-              nvim-navic
               trouble-nvim
               typst-preview-nvim
             ];
diff --git a/modules/features/neovim/lua-config/init.lua b/modules/features/neovim/lua-config/init.lua
index db2c8bb..58946c4 100644
--- a/modules/features/neovim/lua-config/init.lua
+++ b/modules/features/neovim/lua-config/init.lua
@@ -1,5 +1,3 @@
-vim.loader.enable()
-
 require("options")
 require("plugins.lsp")
 require("plugins.completion")
diff --git a/modules/features/neovim/lua-config/lua/options.lua b/modules/features/neovim/lua-config/lua/options.lua
index 8743adc..0c299e7 100644
--- a/modules/features/neovim/lua-config/lua/options.lua
+++ b/modules/features/neovim/lua-config/lua/options.lua
@@ -16,7 +16,7 @@ vim.o.showmode = false
 vim.opt.shortmess:append("Wc")
 
 vim.schedule(function()
-	vim.o.clipboard = "unnamedplus"
+  vim.o.clipboard = "unnamedplus"
 end)
 
 vim.o.breakindent = true
@@ -45,7 +45,6 @@ vim.o.cursorline = true
 vim.o.scrolloff = 10
 
 vim.o.confirm = true
-vim.o.winborder = "rounded"
 
 vim.keymap.set("n", "<Esc>", "<cmd>nohlsearch<CR>")
 
@@ -53,25 +52,23 @@ vim.keymap.set("n", "<leader>q", vim.diagnostic.setloclist, { desc = "Open diagn
 
 vim.keymap.set("t", "<Esc><Esc>", "<C-\\><C-n>", { desc = "Exit terminal mode" })
 
--- vim.keymap.set('n', '<left>', '<cmd>echo "Use h to move!!"<CR>')
--- vim.keymap.set('n', '<right>', '<cmd>echo "Use l to move!!"<CR>')
--- vim.keymap.set('n', '<up>', '<cmd>echo "Use k to move!!"<CR>')
--- vim.keymap.set('n', '<down>', '<cmd>echo "Use j to move!!"<CR>')
-
 vim.keymap.set("n", "<C-h>", "<C-w><C-h>", { desc = "Move focus to the left window" })
 vim.keymap.set("n", "<C-l>", "<C-w><C-l>", { desc = "Move focus to the right window" })
 vim.keymap.set("n", "<C-j>", "<C-w><C-j>", { desc = "Move focus to the lower window" })
 vim.keymap.set("n", "<C-k>", "<C-w><C-k>", { desc = "Move focus to the upper window" })
 
+vim.keymap.set("n", "j", "gj", { silent = true })
+vim.keymap.set("n", "k", "gk", { silent = true })
+
 -- vim.keymap.set("n", "<C-S-h>", "<C-w>H", { desc = "Move window to the left" })
 -- vim.keymap.set("n", "<C-S-l>", "<C-w>L", { desc = "Move window to the right" })
 -- vim.keymap.set("n", "<C-S-j>", "<C-w>J", { desc = "Move window to the lower" })
 -- vim.keymap.set("n", "<C-S-k>", "<C-w>K", { desc = "Move window to the upper" })
 
 vim.api.nvim_create_autocmd("TextYankPost", {
-	desc = "Highlight when yanking (copying) text",
-	group = vim.api.nvim_create_augroup("lux-highlight-yank", { clear = true }),
-	callback = function()
-		vim.hl.on_yank()
-	end,
+  desc = "Highlight when yanking (copying) text",
+  group = vim.api.nvim_create_augroup("lux-highlight-yank", { clear = true }),
+  callback = function()
+    vim.hl.on_yank()
+  end,
 })
diff --git a/modules/features/neovim/lua-config/lua/plugins/completion.lua b/modules/features/neovim/lua-config/lua/plugins/completion.lua
index d2ad212..6ed2db1 100644
--- a/modules/features/neovim/lua-config/lua/plugins/completion.lua
+++ b/modules/features/neovim/lua-config/lua/plugins/completion.lua
@@ -54,11 +54,11 @@ require("lz.n").load({
             auto_show = true,
             auto_show_delay_ms = 500,
             window = {
-              border = "rounded",
+              border = "none",
             },
           },
           menu = {
-            border = "rounded",
+            border = "none",
             draw = {
               columns = { { "kind_icon" }, { "label", gap = 1 } },
               components = {
@@ -103,7 +103,7 @@ require("lz.n").load({
         signature = {
           enabled = true,
           window = {
-            border = "rounded",
+            border = "none",
           },
         },
       })
diff --git a/modules/features/neovim/lua-config/lua/plugins/lsp.lua b/modules/features/neovim/lua-config/lua/plugins/lsp.lua
index ccedea1..fd7be40 100644
--- a/modules/features/neovim/lua-config/lua/plugins/lsp.lua
+++ b/modules/features/neovim/lua-config/lua/plugins/lsp.lua
@@ -24,19 +24,6 @@ require("lz.n").load({
       })
     end,
   },
-  {
-    "nvim-navic",
-    after = function()
-      require("nvim-navic").setup({
-        highlight = true,
-        separator = " > ",
-        depth_limit = 5,
-        lsp = {
-          auto_attach = false,
-        },
-      })
-    end,
-  },
   {
     "nvim-lspconfig",
     event = { "BufReadPre", "BufNewFile" },
@@ -58,9 +45,7 @@ require("lz.n").load({
         end
       end
 
-      vim.lsp.handlers["textDocument/hover"] = vim.lsp.with(vim.lsp.handlers.hover, { border = "rounded" })
-      vim.lsp.handlers["textDocument/signatureHelp"] =
-        vim.lsp.with(vim.lsp.handlers.signature_help, { border = "rounded" })
+      local lsp_float = { border = "single" }
 
       local navic_excluded_filetypes = {
         [""] = true,
@@ -124,7 +109,12 @@ require("lz.n").load({
           map("<leader>rn", vim.lsp.buf.rename, "[R]e[n]ame")
           map("<leader>ca", vim.lsp.buf.code_action, "[C]ode [A]ction", { "n", "x" })
           map("gD", vim.lsp.buf.declaration, "[G]oto [D]eclaration")
-          map("K", vim.lsp.buf.hover, "Hover Documentation")
+          map("K", function()
+            vim.lsp.buf.hover(lsp_float)
+          end, "Hover Documentation")
+          map("<C-s>", function()
+            vim.lsp.buf.signature_help(lsp_float)
+          end, "Signature Help", { "i", "s" })
 
           map("gd", telescope_picker("lsp_definitions"), "[G]oto [D]efinition")
           map("gr", telescope_picker("lsp_references"), "[G]oto [R]eferences")
@@ -191,7 +181,7 @@ require("lz.n").load({
           current_line = true,
         },
         float = {
-          border = "rounded",
+          border = "single",
           source = "if_many",
         },
       })
@@ -253,7 +243,7 @@ require("lz.n").load({
       require("trouble").setup({
         focus = true,
         preview = {
-          border = "rounded",
+          border = "single",
         },
       })
     end,
diff --git a/modules/features/neovim/lua-config/lua/plugins/telescope.lua b/modules/features/neovim/lua-config/lua/plugins/telescope.lua
index aa4224d..185bd42 100644
--- a/modules/features/neovim/lua-config/lua/plugins/telescope.lua
+++ b/modules/features/neovim/lua-config/lua/plugins/telescope.lua
@@ -81,7 +81,7 @@ require("lz.n").load({
         defaults = {
           path_display = { "truncate" },
           border = true,
-          borderchars = { "─", "│", "─", "│", "╭", "╮", "╯", "╰" },
+          borderchars = { "─", "│", "─", "│", "┌", "┐", "┘", "└" },
           layout_strategy = "horizontal",
           layout_config = {
             prompt_position = "top",
diff --git a/modules/features/neovim/lua-config/lua/plugins/ui.lua b/modules/features/neovim/lua-config/lua/plugins/ui.lua
index b433e64..2dda0bc 100644
--- a/modules/features/neovim/lua-config/lua/plugins/ui.lua
+++ b/modules/features/neovim/lua-config/lua/plugins/ui.lua
@@ -12,7 +12,6 @@ require("lz.n").load({
       else
         print("Error loading theme code: " .. err)
       end
-
     end,
   },
   {
@@ -88,8 +87,8 @@ require("lz.n").load({
         },
       })
 
-      vim.keymap.set("n", "<leader>bn", "<cmd>BufferLineCycleNext<cr>", { desc = "[B]uffer [N]ext" })
-      vim.keymap.set("n", "<leader>bp", "<cmd>BufferLineCyclePrev<cr>", { desc = "[B]uffer [P]revious" })
+      vim.keymap.set("n", "<C-0>", "<cmd>BufferLineCycleNext<cr>", { desc = "[B]uffer [N]ext" })
+      vim.keymap.set("n", "<C-9>", "<cmd>BufferLineCyclePrev<cr>", { desc = "[B]uffer [P]revious" })
       vim.keymap.set("n", "<leader>bb", "<cmd>BufferLinePick<cr>", { desc = "[B]uffer [B]rowse" })
       vim.keymap.set("n", "<leader>bd", "<cmd>bdelete<cr>", { desc = "[B]uffer [D]elete" })
     end,