diff --git a/README.md b/README.md
index ad4a07c..8443eb1 100644
--- a/README.md
+++ b/README.md
@@ -10,6 +10,10 @@ A starting point for Neovim that is:
 
 **NOT** a Neovim distribution, but instead a starting point for your configuration.
 
+## Requirements
+
+- **Neovim 0.11.5+** (required for this configuration)
+
 ## Installation
 
 ### Install Neovim
diff --git a/lua/custom/plugins/languages/go.lua b/lua/custom/plugins/languages/go.lua
index 83ded8c..e78b38d 100644
--- a/lua/custom/plugins/languages/go.lua
+++ b/lua/custom/plugins/languages/go.lua
@@ -14,9 +14,6 @@ return {
         event = "FileType",                                     -- Load the plugin when a Go file is opened
         ft = { "go", "gomod" },                                 -- Specify the file types
         build = ':lua require("go.install").update_all_sync()', -- Install/update binaries
-        setup = function()
-            require("go").setup()
-        end,
     },
 
     -- Other plugins...
diff --git a/lua/custom/plugins/nalin.lua b/lua/custom/plugins/nalin.lua
index 26effa3..08c74ad 100644
--- a/lua/custom/plugins/nalin.lua
+++ b/lua/custom/plugins/nalin.lua
@@ -7,9 +7,27 @@ return {
     },
     {
         'IogaMaster/neocord',
-
-        event = "VeryLazy"
-
+        event = "VeryLazy",
+        opts = {
+            logo = "auto",
+            logo_tooltip = nil,
+            main_image = "language",
+            client_id = "1157438221865717891",
+            log_level = nil,
+            debounce_timeout = 10,
+            blacklist = {},
+            file_assets = {},
+            show_time = true,
+            global_timer = false,
+            editing_text = "Editing %s",
+            file_explorer_text = "Browsing %s",
+            git_commit_text = "Committing changes",
+            plugin_manager_text = "Managing plugins",
+            reading_text = "Reading %s",
+            workspace_text = "Working on %s",
+            line_number_text = "Line %s out of %s",
+            terminal_text = "Using Terminal",
+        },
     },
     {
         "stsewd/spotify.nvim",
diff --git a/lua/custom/plugins/ui.lua b/lua/custom/plugins/ui.lua
index 17f4cac..5120103 100644
--- a/lua/custom/plugins/ui.lua
+++ b/lua/custom/plugins/ui.lua
@@ -357,7 +357,7 @@ return {
 	},
 	{
 		"folke/todo-comments.nvim",
-		event = "bufRead",
+		event = "BufRead",
 		dependencies = { "nvim-lua/plenary.nvim" },
 		opts = {
 			signs = false, -- show icons in the signs column
diff --git a/lua/custom/plugins/utility.lua b/lua/custom/plugins/utility.lua
index bfd3529..63cea2c 100644
--- a/lua/custom/plugins/utility.lua
+++ b/lua/custom/plugins/utility.lua
@@ -41,7 +41,7 @@ return {
     },
     {
         "https://github.com/wellle/targets.vim",
-        event = "insertEnter"
+        event = "InsertEnter"
     },
     {
         'razak17/tailwind-fold.nvim',
diff --git a/lua/keymaps.lua b/lua/keymaps.lua
index ac765b0..ac86d23 100644
--- a/lua/keymaps.lua
+++ b/lua/keymaps.lua
@@ -1,11 +1,11 @@
 vim.keymap.set({ 'i' }, 'jk', '<Esc>', { silent = true })
 vim.keymap.set({ 'i' }, 'jj', '<Esc>', { silent = true })
 
+-- Declare diagnostic visibility state
+local lspDiagnosticsVisible = true
 
-vim.keymap.set({ 'i' }, 'jj', '<Esc>', { silent = true })
-
-vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, { desc = 'Go to previous [D]iagnostic message' })
-vim.keymap.set('n', ']d', vim.diagnostic.goto_next, { desc = 'Go to next [D]iagnostic message' })
+vim.keymap.set('n', '[d', function() vim.diagnostic.jump({ count = -1 }) end, { desc = 'Go to previous [D]iagnostic message' })
+vim.keymap.set('n', ']d', function() vim.diagnostic.jump({ count = 1 }) end, { desc = 'Go to next [D]iagnostic message' })
 
 vim.keymap.set('n', '[h', ':Gitsigns prev_hunk<CR>', { desc = 'Go to previous [D]iagnostic message' })
 vim.keymap.set('n', ']h', ':Gitsigns next_hunk<CR>', { desc = 'Go to next [D]iagnostic message' })
@@ -42,9 +42,6 @@ vim.api.nvim_set_keymap('n', '<leader><Tab>', ':tabnext<CR>', { noremap = true,
 vim.api.nvim_set_keymap('n', '<leader>ll', ':Lazy<CR>', { noremap = true, silent = true })
 vim.api.nvim_set_keymap('n', '<leader>lm', ':Mason<CR>', { noremap = true, silent = true })
 
-vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, { desc = 'Go to previous [D]iagnostic message' })
-vim.keymap.set('n', ']d', vim.diagnostic.goto_next, { desc = 'Go to next [D]iagnostic message' })
-
 -- toggle stuff
 vim.api.nvim_set_keymap("n", "<leader>ts", ":SupermavenToggle <CR>", { noremap = true, silent = true })
 vim.api.nvim_set_keymap("n", "<leader>lt", ":LspStart tailwindcss<CR>", { noremap = true, silent = true })
diff --git a/lua/kickstart/plugins/cmp.lua b/lua/kickstart/plugins/cmp.lua
index 6161f03..494af86 100644
--- a/lua/kickstart/plugins/cmp.lua
+++ b/lua/kickstart/plugins/cmp.lua
@@ -32,13 +32,6 @@ return {
                     },
                 },
             },
-            'saadparwaiz1/cmp_luasnip',
-
-            -- Adds other completion capabilities.
-            --  nvim-cmp does not ship with all sources by default. They are split
-            --  into multiple repos for maintenance purposes.
-            'hrsh7th/cmp-nvim-lsp',
-            'hrsh7th/cmp-path',
         },
         config = function()
             -- See `:help cmp`
diff --git a/lua/kickstart/plugins/git.lua b/lua/kickstart/plugins/git.lua
index 0f36497..fe2aac0 100644
--- a/lua/kickstart/plugins/git.lua
+++ b/lua/kickstart/plugins/git.lua
@@ -10,13 +10,17 @@ return {
         opts = {
             signs = {
                 add = { text = '+' },
-                unstaged = { text = '▌' },
                 change = { text = '~' },
                 delete = { text = '_' },
                 topdelete = { text = '‾' },
                 changedelete = { text = '~' },
-                normal = { text = '┆' },
-                default = { text = '┆' },
+            },
+            signs_staged = {
+                add = { text = '┃' },
+                change = { text = '┃' },
+                delete = { text = '_' },
+                topdelete = { text = '‾' },
+                changedelete = { text = '~' },
             },
         },
     },
diff --git a/lua/kickstart/plugins/lspconfig.lua b/lua/kickstart/plugins/lspconfig.lua
index fe980f4..f9a7426 100644
--- a/lua/kickstart/plugins/lspconfig.lua
+++ b/lua/kickstart/plugins/lspconfig.lua
@@ -17,7 +17,7 @@ return {
 		-- Main LSP Configuration
 		"neovim/nvim-lspconfig",
 		dependencies = {
-			event = "bufRead",
+			event = "BufRead",
 			-- Automatically install LSPs and related tools to stdpath for Neovim
 			{ "williamboman/mason.nvim", config = true }, -- NOTE: Must be loaded before dependants
 			"williamboman/mason-lspconfig.nvim",
@@ -91,7 +91,7 @@ return {
 					-- When you move your cursor, the highlights will be cleared (the second autocommand).
 					local client = vim.lsp.get_client_by_id(event.data.client_id)
 
-					if client and client.supports_method(vim.lsp.protocol.Methods.textDocument_documentHighlight) then
+					if client and client:supports_method(vim.lsp.protocol.Methods.textDocument_documentHighlight, event.buf) then
 						local highlight_augroup =
 							vim.api.nvim_create_augroup("kickstart-lsp-highlight", { clear = false })
 						vim.api.nvim_create_autocmd({ "CursorHold", "CursorHoldI" }, {
@@ -119,7 +119,7 @@ return {
 					-- code, if the language server you are using supports them
 					--
 					-- This may be unwanted, since they displace some of your code
-					if client and client.supports_method(vim.lsp.protocol.Methods.textDocument_inlayHint) then
+					if client and client:supports_method(vim.lsp.protocol.Methods.textDocument_inlayHint, event.buf) then
 						map("<leader>th", function()
 							vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled({ bufnr = event.buf }))
 						end, "[T]oggle Inlay [H]ints")
diff --git a/lua/kickstart/plugins/treesitter.lua b/lua/kickstart/plugins/treesitter.lua
index 917fa4d..68c1254 100644
--- a/lua/kickstart/plugins/treesitter.lua
+++ b/lua/kickstart/plugins/treesitter.lua
@@ -1,7 +1,7 @@
 return {
     { -- Highlight, edit, and navigate code
         'nvim-treesitter/nvim-treesitter',
-        event = 'bufRead',
+        event = 'BufRead',
         dependencies = {
             'nvim-treesitter/nvim-treesitter-textobjects',
         },
@@ -25,7 +25,7 @@ return {
                 keymaps = {
                     init_selection = '<c-space>',
                     node_incremental = '<c-space>',
-                    scope_incremental = '<c-i>',
+                    scope_incremental = '<c-s>',
                     node_decremental = '<M-space>',
                 },
             },
diff --git a/lua/lazy-bootstrap.lua b/lua/lazy-bootstrap.lua
index 8dc96c8..37c768f 100644
--- a/lua/lazy-bootstrap.lua
+++ b/lua/lazy-bootstrap.lua
@@ -1,7 +1,7 @@
 -- [[ Install `lazy.nvim` plugin manager ]]
 --    See `:help lazy.nvim.txt` or https://github.com/folke/lazy.nvim for more info
 local lazypath = vim.fn.stdpath 'data' .. '/lazy/lazy.nvim'
-if not (vim.uv or vim.loop).fs_stat(lazypath) then
+if not vim.uv.fs_stat(lazypath) then
   local lazyrepo = 'https://github.com/folke/lazy.nvim.git'
   local out = vim.fn.system { 'git', 'clone', '--filter=blob:none', '--branch=stable', lazyrepo, lazypath }
   if vim.v.shell_error ~= 0 then
diff --git a/lua/lazy-plugins.lua b/lua/lazy-plugins.lua
index 4705293..66d2b65 100644
--- a/lua/lazy-plugins.lua
+++ b/lua/lazy-plugins.lua
@@ -53,30 +53,4 @@ require('lazy').setup({
     -- require 'kickstart.plugins.lint',
 })
 
-
--- The setup config table shows all available config options with their default values:
-require("neocord").setup({
-    -- General options
-    logo                = "auto",                -- "auto" or url
-    logo_tooltip        = nil,                   -- nil or string
-    main_image          = "language",            -- "language" or "logo"
-    client_id           = "1157438221865717891", -- Use your own Discord application client id (not recommended)
-    log_level           = nil,                   -- Log messages at or above this level (one of the following: "debug", "info", "warn", "error")
-    debounce_timeout    = 10,                    -- Number of seconds to debounce events (or calls to `:lua package.loaded.presence:update(<filename>, true)`)
-    blacklist           = {},                    -- A list of strings or Lua patterns that disable Rich Presence if the current file name, path, or workspace matches
-    file_assets         = {},                    -- Custom file asset definitions keyed by file names and extensions (see default config at `lua/presence/file_assets.lua` for reference)
-    show_time           = true,                  -- Show the timer
-    global_timer        = false,                 -- if set true, timer won't update when any event are triggered
-
-    -- Rich Presence text options
-    editing_text        = "Editing %s",         -- Format string rendered when an editable file is loaded in the buffer (either string or function(filename: string): string)
-    file_explorer_text  = "Browsing %s",        -- Format string rendered when browsing a file explorer (either string or function(file_explorer_name: string): string)
-    git_commit_text     = "Committing changes", -- Format string rendered when committing changes in git (either string or function(filename: string): string)
-    plugin_manager_text = "Managing plugins",   -- Format string rendered when managing plugins (either string or function(plugin_manager_name: string): string)
-    reading_text        = "Reading %s",         -- Format string rendered when a read-only or unmodifiable file is loaded in the buffer (either string or function(filename: string): string)
-    workspace_text      = "Working on %s",      -- Format string rendered when in a git repository (either string or function(project_name: string|nil, filename: string): string)
-    line_number_text    = "Line %s out of %s",  -- Format string rendered when `enable_line_number` is set to true (either string or function(line_number: number, line_count: number): string)
-    terminal_text       = "Using Terminal",     -- Format string rendered when in terminal mode.
-})
-
 -- vim: ts=4 sts=4 sw=4 et
diff --git a/lua/options.lua b/lua/options.lua
index a0993de..4f3b489 100644
--- a/lua/options.lua
+++ b/lua/options.lua
@@ -1,5 +1,6 @@
 -- [[ Setting options ]]
 -- See `:help vim.opt`
+-- Neovim 0.11.5 compatible configuration
 
 vim.o.shell = "/usr/bin/fish"
 vim.o.shellcmdflag = "-c"
diff --git a/madux28mhk.tmp b/madux28mhk.tmp
deleted file mode 100644
index cda0993..0000000
Binary files a/madux28mhk.tmp and /dev/null differ