diff --git a/README.md b/README.md
index 28e055470..f42d72cbf 100644
--- a/README.md
+++ b/README.md
@@ -233,7 +233,7 @@ return {
 ```
 
 The same module with be avaliable in your `config.lua` in the `doom.features.module_name` field.
-The settings should have autocomplete from sumneko lua lsp.
+The settings should have autocomplete from lua lsp.
 ```lua
 -- config.lua
 local whichkey = doom.features.whichkey -- Get the whichkey module
diff --git a/doc/doom_nvim.norg b/doc/doom_nvim.norg
index 35bb9f889..f1c75fe6e 100644
--- a/doc/doom_nvim.norg
+++ b/doc/doom_nvim.norg
@@ -157,7 +157,7 @@ Some of the defining features that make this project unique are:
    @end
 
     The same module with be avaliable in your `config.lua` in the `doom.features.module_name` field.
-    The settings should have autocomplete from sumneko lua lsp.
+    The settings should have autocomplete from lua lsp.
     @code lua
     -- config.lua
     local whichkey = doom.features.whichkey -- Get the whichkey module
diff --git a/doc/doom_nvim_modules.norg b/doc/doom_nvim_modules.norg
index 8f6d1f639..87c9b523e 100644
--- a/doc/doom_nvim_modules.norg
+++ b/doc/doom_nvim_modules.norg
@@ -203,7 +203,6 @@ version: 0.0.11
      example.packages = {
        ["example-plugin.nvim"] = { -- Use the repository name as the key
          "GithubUser/example-plugin.nvim",
-         commit = "..." -- We like to pin plugins to commits to avoid issues upgrading.
        }
      }
 
diff --git a/docs/modules.md b/docs/modules.md
index 0941fbfa7..eadf0760e 100644
--- a/docs/modules.md
+++ b/docs/modules.md
@@ -207,7 +207,6 @@ example.settings = {...} -- Doom-nvim provided object to change settings
 example.packages = {
   ["example-plugin.nvim"] = { -- Use the repository name as the key
     "GithubUser/example-plugin.nvim",
-    commit = "..." -- We like to pin plugins to commits to avoid issues upgrading.
   }
 }
 
diff --git a/lazy-lock.json b/lazy-lock.json
index f14895f89..6621a71c7 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -1,47 +1,62 @@
 {
-  "Comment.nvim": { "branch": "master", "commit": "e89df176e8b38e931b7e71a470f923a317976d86" },
-  "LuaSnip": { "branch": "master", "commit": "53e812a6f51c9d567c98215733100f0169bcc20a" },
-  "bufferline.nvim": { "branch": "main", "commit": "2d5266d14b7b5dbc54923469b4599f0349f7cedc" },
+  "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
+  "LuaSnip": { "branch": "master", "commit": "80a8528f084a97b624ae443a6f50ff8074ba486b" },
+  "SchemaStore.nvim": { "branch": "main", "commit": "976e7e3e9c400b99f1cb337b2ce804a9652571ec" },
+  "bclose.vim": { "branch": "master", "commit": "99018b4a2dd18aea1cbd3aa23565b01a0f8c5b73" },
+  "bufferline.nvim": { "branch": "main", "commit": "357cc8f8eeb64702e6fcf2995e3b9becee99a5d3" },
   "cmd-parser.nvim": { "branch": "master", "commit": "6363b8bddef968c3ec51a38172af44f675f01ef3" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "59224771f91b86d1de12570b4070fe4ad7cd1eeb" },
-  "cmp-nvim-lua": { "branch": "main", "commit": "f3491638d123cfd2c8048aefaf66d246ff250ca6" },
+  "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" },
+  "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
-  "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" },
-  "dashboard-nvim": { "branch": "master", "commit": "f7d623457d6621b25a1292b24e366fae40cb79ab" },
-  "editorconfig-vim": { "branch": "master", "commit": "30ddc057f71287c3ac2beca876e7ae6d5abe26a0" },
-  "fidget.nvim": { "branch": "main", "commit": "44585a0c0085765195e6961c15529ba6c5a2a13b" },
-  "friendly-snippets": { "branch": "main", "commit": "45698b3d193fff404c3c9c30d25dc138a729d64b" },
-  "gitsigns.nvim": { "branch": "main", "commit": "addd6e174a85fc1c4007ab0b65d77e6555b417bf" },
-  "heirline.nvim": { "branch": "master", "commit": "19cab76f52710ec67bd8829cbc96d0c322963090" },
-  "indent-blankline.nvim": { "branch": "master", "commit": "c4c203c3e8a595bc333abaf168fcb10c13ed5fb7" },
-  "iron.nvim": { "branch": "master", "commit": "f4131638454aeb96cbd92652dd8c396e48eb4118" },
-  "lazy.nvim": { "branch": "main", "commit": "666ed7bf73eb5895253c1155bd29270b066cbdac" },
-  "lazygit.nvim": { "branch": "main", "commit": "32bffdebe273e571588f25c8a708ca7297928617" },
-  "lsp_signature.nvim": { "branch": "master", "commit": "1979f1118e2b38084e7c148f279eed6e9300a342" },
-  "mason-lspconfig": { "branch": "main", "commit": "43c7f402cb9822b61b5dc05bf0b385928df256a6" },
-  "mason.nvim": { "branch": "main", "commit": "5ab101aa11849c2424d5b87726105daae8cb49e8" },
-  "mini.cursorword": { "branch": "main", "commit": "21af5679b39cf1a6bc6bf4eeaabc35e1b5ee7110" },
-  "neodev.nvim": { "branch": "main", "commit": "0e3f5e763639951f96f9acbdc9f52a9fedf91b46" },
-  "neogen": { "branch": "main", "commit": "0958aeffcddf46e57785c3026be934816b4f39d2" },
-  "neorg": { "branch": "main", "commit": "aa613122f82ca7485b7055937a742b709ed3c576" },
-  "null-ls.nvim": { "branch": "main", "commit": "915558963709ea17c5aa246ca1c9786bfee6ddb4" },
-  "nvim-autopairs": { "branch": "master", "commit": "f00eb3b766c370cb34fdabc29c760338ba9e4c6c" },
-  "nvim-cmp": { "branch": "main", "commit": "11a95792a5be0f5a40bab5fc5b670e5b1399a939" },
+  "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
+  "dashboard-nvim": { "branch": "master", "commit": "c71cab740e2add248c54c458b5ca9d6e77c30fa6" },
+  "doom-themes.nvim": { "branch": "main", "commit": "03d417d3eab71c320744f8da22251715ba6cee53" },
+  "editorconfig-vim": { "branch": "master", "commit": "0d54ea863089fb13be423b4aed6cca35f3a5d778" },
+  "fidget.nvim": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" },
+  "firenvim": { "branch": "master", "commit": "138424db463e6c0e862a05166a4ccc781cd7c19d" },
+  "friendly-snippets": { "branch": "main", "commit": "43727c2ff84240e55d4069ec3e6158d74cb534b6" },
+  "gitsigns.nvim": { "branch": "main", "commit": "af0f583cd35286dd6f0e3ed52622728703237e50" },
+  "heirline.nvim": { "branch": "master", "commit": "7f1e805dfc001d5dbb7d894105063f463f6c7dcc" },
+  "indent-blankline.nvim": { "branch": "master", "commit": "64fdadb3ada61c4297452f7662789b01ee82ffcb" },
+  "lazy.nvim": { "branch": "main", "commit": "16603c6917435d8446f7357cb61095138a417085" },
+  "lazygit.nvim": { "branch": "main", "commit": "de35012036d43bca03628d40d083f7c02a4cda3f" },
+  "lsp_signature.nvim": { "branch": "master", "commit": "33250c84c7a552daf28ac607d9d9e82f88cd0907" },
+  "mason-lspconfig": { "branch": "main", "commit": "40301e1c74bc0946eece13edf2b1c561cc497491" },
+  "mason.nvim": { "branch": "main", "commit": "cd7835b15f5a4204fc37e0aa739347472121a54c" },
+  "mini.cursorword": { "branch": "main", "commit": "8d3e1e052688bcd52e9e819a5cdb7f8a5b498c64" },
+  "minimap.vim": { "branch": "master", "commit": "701f4cf4b60a3e1685d2da484282f3a3d8bf9db6" },
+  "neodev.nvim": { "branch": "main", "commit": "f3f5d756f4043180523bb69072a104f7216b5f42" },
+  "neogen": { "branch": "main", "commit": "70127baaff25611deaf1a29d801fc054ad9d2dc1" },
+  "neogit": { "branch": "master", "commit": "05899be06d611c485cfb6e17ef6e3b695de67b62" },
+  "neorg": { "branch": "main", "commit": "9ffc5ac49dbb5ea6f008b6fbc6e3c1e85e66911c" },
+  "null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" },
+  "nvim-autopairs": { "branch": "master", "commit": "0f04d78619cce9a5af4f355968040f7d675854a1" },
+  "nvim-cmp": { "branch": "main", "commit": "51260c02a8ffded8e16162dcf41a23ec90cfba62" },
   "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" },
-  "nvim-lspconfig": { "branch": "master", "commit": "ed88435764d8b00442e66d39ec3d9c360e560783" },
-  "nvim-mapper": { "branch": "main", "commit": "7585479199ad7c3fdfed47ae79d26198f948cfc5" },
-  "nvim-tree.lua": { "branch": "master", "commit": "3ce0a8e770f70a135ef969e0a640bd8d05baf42c" },
-  "nvim-treesitter": { "branch": "master", "commit": "51d220e0bd8922caabcb3e5de936fc599a1bd210" },
-  "nvim-ts-autotag": { "branch": "main", "commit": "fdefe46c6807441460f11f11a167a2baf8e4534b" },
-  "nvim-ts-context-commentstring": { "branch": "main", "commit": "4a42b30376c1bd625ab5016c2079631d531d797a" },
-  "nvim-web-devicons": { "branch": "master", "commit": "a8cf88cbdb5c58e2b658e179c4b2aa997479b3da" },
-  "persistence.nvim": { "branch": "main", "commit": "8484fdaa284207f77ec69b9627316bf334ad653f" },
-  "plenary.nvim": { "branch": "master", "commit": "1c7e3e6b0f4dd5a174fcea9fda8a4d7de593b826" },
-  "project.nvim": { "branch": "main", "commit": "685bc8e3890d2feb07ccf919522c97f7d33b94e4" },
+  "nvim-dap": { "branch": "master", "commit": "79dbc70eb79271ad801e4ff293887cde324c28d0" },
+  "nvim-dap-ui": { "branch": "master", "commit": "34160a7ce6072ef332f350ae1d4a6a501daf0159" },
+  "nvim-lspconfig": { "branch": "master", "commit": "d0467b9574b48429debf83f8248d8cee79562586" },
+  "nvim-mapper": { "branch": "main", "commit": "6f146f4c846ce45b947c6acc550771a0c893c7be" },
+  "nvim-tree.lua": { "branch": "master", "commit": "78a9ca5ed6557f29cd0ce203df44213e54bfabb9" },
+  "nvim-treesitter": { "branch": "master", "commit": "d2fe87062dde25e7fdadac061f6ca04541275e31" },
+  "nvim-ts-autotag": { "branch": "main", "commit": "6be1192965df35f94b8ea6d323354f7dc7a557e4" },
+  "nvim-ts-context-commentstring": { "branch": "main", "commit": "92e688f013c69f90c9bbd596019ec10235bc51de" },
+  "nvim-web-devicons": { "branch": "master", "commit": "5de460ca7595806044eced31e3c36c159a493857" },
+  "persistence.nvim": { "branch": "main", "commit": "ad538bfd5336f1335cdb6fd4e0b0eebfa6e12f32" },
+  "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" },
+  "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" },
   "range-highlight.nvim": { "branch": "master", "commit": "8b5e8ccb3460b2c3675f4639b9f54e64eaab36d9" },
-  "telescope-file-browser.nvim": { "branch": "master", "commit": "304508fb7bea78e3c0eeddd88c4837501e403ae8" },
-  "telescope.nvim": { "branch": "master", "commit": "1ba7278cf08da8048e7f589ef6b65a39fd3e4dbf" },
-  "todo-comments.nvim": { "branch": "main", "commit": "077c59586d9d0726b0696dc5680eb863f4e04bc5" },
-  "which-key.nvim": { "branch": "main", "commit": "e4fa445065a2bb0bbc3cca85346b67817f28e83e" }
+  "ranger.vim": { "branch": "master", "commit": "91e82debdf566dfaf47df3aef0a5fd823cedf41c" },
+  "registers.nvim": { "branch": "main", "commit": "7a16c6e6fe96f3c9c8bb55b95047d745dd34ca4d" },
+  "rest.nvim": { "branch": "main", "commit": "b8d6c0a8762fd374e0204768a94241135ca3e311" },
+  "suda.vim": { "branch": "master", "commit": "8b0fc3711760195aba104e2d190cff9af8267052" },
+  "symbols-outline.nvim": { "branch": "master", "commit": "512791925d57a61c545bc303356e8a8f7869763c" },
+  "telescope-file-browser.nvim": { "branch": "master", "commit": "6e51d0cd6447cf2525412220ff0a2885eef9039c" },
+  "telescope.nvim": { "branch": "master", "commit": "4522d7e3ea75ffddabdc39957168a8a7060b5df0" },
+  "todo-comments.nvim": { "branch": "main", "commit": "4a6737a8d70fe1ac55c64dfa47fcb189ca431872" },
+  "toggleterm.nvim": { "branch": "main", "commit": "c80844fd52ba76f48fabf83e2b9f9b93273f418d" },
+  "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" },
+  "vim-superman": { "branch": "master", "commit": "19d307446576d9118625c5d9d3c7a4c9bec5571a" },
+  "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" }
 }
\ No newline at end of file
diff --git a/lua/doom/core/doom_global.lua b/lua/doom/core/doom_global.lua
index a42238d5c..9aeb4424a 100644
--- a/lua/doom/core/doom_global.lua
+++ b/lua/doom/core/doom_global.lua
@@ -2,7 +2,7 @@
 --
 -- Sets the `doom` global object including defaults and helper functions.
 -- We set it directly within this file (rather than returning the object) and
--- setting it elsewhere to allow sumneko_lua to provide documented type
+-- setting it elsewhere to allow lua_ls to provide documented type
 -- completions.
 
 --- TYPE DEFINITIONS
diff --git a/lua/doom/modules/core/doom/init.lua b/lua/doom/modules/core/doom/init.lua
index e152932b6..9dbb0ca09 100644
--- a/lua/doom/modules/core/doom/init.lua
+++ b/lua/doom/modules/core/doom/init.lua
@@ -10,11 +10,9 @@ required.packages = {
   },
   ["plenary.nvim"] = {
     "nvim-lua/plenary.nvim",
-    commit = "1c7e3e6b0f4dd5a174fcea9fda8a4d7de593b826",
   },
   ["nvim-web-devicons"] = {
     "kyazdani42/nvim-web-devicons",
-    commit = "a8cf88cbdb5c58e2b658e179c4b2aa997479b3da",
   },
 }
 
diff --git a/lua/doom/modules/core/treesitter/init.lua b/lua/doom/modules/core/treesitter/init.lua
index ead70ccb9..f440a8592 100644
--- a/lua/doom/modules/core/treesitter/init.lua
+++ b/lua/doom/modules/core/treesitter/init.lua
@@ -46,16 +46,11 @@ treesitter.settings = {
 treesitter.packages = {
   ["nvim-treesitter"] = {
     "nvim-treesitter/nvim-treesitter",
-    commit = {
-      ["nvim-0.7"] = "d76b0de6536c2461f97cfeca0550f8cb89793935",
-      ["latest"] = "51d220e0bd8922caabcb3e5de936fc599a1bd210",
-    },
     build =  ":TSUpdate",
     branch = "master",
   },
   ["nvim-ts-context-commentstring"] = {
     "JoosepAlviste/nvim-ts-context-commentstring",
-    commit = "4a42b30376c1bd625ab5016c2079631d531d797a",
     -- after = "nvim-treesitter",
     dependencies = {
       "nvim-treesitter/nvim-treesitter"
@@ -64,7 +59,6 @@ treesitter.packages = {
   },
   ["nvim-ts-autotag"] = {
     "windwp/nvim-ts-autotag",
-    commit = "fdefe46c6807441460f11f11a167a2baf8e4534b",
     -- after = "nvim-treesitter",
     dependencies = {
       "nvim-treesitter/nvim-treesitter"
diff --git a/lua/doom/modules/core/updater/init.lua b/lua/doom/modules/core/updater/init.lua
index 15538d7ec..d00670b2e 100644
--- a/lua/doom/modules/core/updater/init.lua
+++ b/lua/doom/modules/core/updater/init.lua
@@ -24,7 +24,6 @@ local updater = {}
 updater.packages = {
   ["plenary.nvim"] = {
     "nvim-lua/plenary.nvim",
-    commit = "1c7e3e6b0f4dd5a174fcea9fda8a4d7de593b826",
   },
 }
 
diff --git a/lua/doom/modules/features/annotations/init.lua b/lua/doom/modules/features/annotations/init.lua
index 749ac05cb..193862755 100644
--- a/lua/doom/modules/features/annotations/init.lua
+++ b/lua/doom/modules/features/annotations/init.lua
@@ -19,7 +19,6 @@ annotations.settings = {
 annotations.packages = {
   ["neogen"] = {
     "danymat/neogen",
-    commit = "0958aeffcddf46e57785c3026be934816b4f39d2",
     keys = { "<leader>cg" },
     cmd = "Neogen",
     dependencies={
diff --git a/lua/doom/modules/features/auto_install/init.lua b/lua/doom/modules/features/auto_install/init.lua
index cd43da59d..e8ed33daf 100644
--- a/lua/doom/modules/features/auto_install/init.lua
+++ b/lua/doom/modules/features/auto_install/init.lua
@@ -15,11 +15,9 @@ auto_install.settings = {
 auto_install.packages = {
   ["mason.nvim"] = {
     "williamboman/mason.nvim",
-    commit = "5ab101aa11849c2424d5b87726105daae8cb49e8",
   },
   ["mason-lspconfig"] = {
     "williamboman/mason-lspconfig",
-    commit = "43c7f402cb9822b61b5dc05bf0b385928df256a6",
   },
 }
 
diff --git a/lua/doom/modules/features/auto_session/init.lua b/lua/doom/modules/features/auto_session/init.lua
index 57dc317a2..d51fd16df 100644
--- a/lua/doom/modules/features/auto_session/init.lua
+++ b/lua/doom/modules/features/auto_session/init.lua
@@ -7,7 +7,6 @@ auto_session.settings = {
 auto_session.packages = {
   ["persistence.nvim"] = {
     "folke/persistence.nvim",
-    commit = "8484fdaa284207f77ec69b9627316bf334ad653f",
   },
 }
 
diff --git a/lua/doom/modules/features/autopairs/init.lua b/lua/doom/modules/features/autopairs/init.lua
index b5eddd68e..86750134d 100644
--- a/lua/doom/modules/features/autopairs/init.lua
+++ b/lua/doom/modules/features/autopairs/init.lua
@@ -9,7 +9,6 @@ autopairs.settings = {
 autopairs.packages = {
   ["nvim-autopairs"] = {
     "windwp/nvim-autopairs",
-    commit = "f00eb3b766c370cb34fdabc29c760338ba9e4c6c",
     event = "InsertEnter",
   },
 }
diff --git a/lua/doom/modules/features/colorizer/init.lua b/lua/doom/modules/features/colorizer/init.lua
index 86f961b35..45e91c93e 100644
--- a/lua/doom/modules/features/colorizer/init.lua
+++ b/lua/doom/modules/features/colorizer/init.lua
@@ -9,7 +9,6 @@ colorizer.settings = {
 colorizer.packages = {
   ["nvim-colorizer.lua"] = {
     "norcalli/nvim-colorizer.lua",
-    commit = "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6",
     event = "VeryLazy",
   },
 }
diff --git a/lua/doom/modules/features/comment/init.lua b/lua/doom/modules/features/comment/init.lua
index e387ab403..34c16a0fc 100644
--- a/lua/doom/modules/features/comment/init.lua
+++ b/lua/doom/modules/features/comment/init.lua
@@ -44,7 +44,6 @@ comment.settings = {
 comment.packages = {
   ["Comment.nvim"] = {
     "numToStr/Comment.nvim",
-    commit = "e89df176e8b38e931b7e71a470f923a317976d86",
   },
 }
 
diff --git a/lua/doom/modules/features/dap/init.lua b/lua/doom/modules/features/dap/init.lua
index 0cc4cf0d5..2638aac50 100644
--- a/lua/doom/modules/features/dap/init.lua
+++ b/lua/doom/modules/features/dap/init.lua
@@ -41,11 +41,9 @@ dap.settings = {
 dap.packages = {
   ["nvim-dap"] = {
     "mfussenegger/nvim-dap",
-    commit = "b8201fd104287e9c24f898f1f7f5202896eea203",
   },
   ["nvim-dap-ui"] = {
     "rcarriga/nvim-dap-ui",
-    commit = "b80227ea56a48177786904f6322abc8b2dc0bc36",
     dependencies = {
       "mfussenegger/nvim-dap",
     }
diff --git a/lua/doom/modules/features/dashboard/init.lua b/lua/doom/modules/features/dashboard/init.lua
index 4e4389739..814c1461d 100644
--- a/lua/doom/modules/features/dashboard/init.lua
+++ b/lua/doom/modules/features/dashboard/init.lua
@@ -67,7 +67,6 @@ dashboard.settings = {
 dashboard.packages = {
   ["dashboard-nvim"] = {
     "glepnir/dashboard-nvim",
-    commit = "f7d623457d6621b25a1292b24e366fae40cb79ab",
     cmd = "Dashboard",
     lazy = true,
   },
diff --git a/lua/doom/modules/features/doom_themes/init.lua b/lua/doom/modules/features/doom_themes/init.lua
index 92df2a1d6..6f9a07dfb 100644
--- a/lua/doom/modules/features/doom_themes/init.lua
+++ b/lua/doom/modules/features/doom_themes/init.lua
@@ -7,7 +7,6 @@ doom_themes.configs = {}
 doom_themes.packages = {
   ["doom-themes.nvim"] = {
     "GustavoPrietoP/doom-themes.nvim",
-    commit = "03d417d3eab71c320744f8da22251715ba6cee53",
     event = "ColorScheme",
     lazy = true,
   },
diff --git a/lua/doom/modules/features/editorconfig/init.lua b/lua/doom/modules/features/editorconfig/init.lua
index 2f838fa6f..4f93d241f 100644
--- a/lua/doom/modules/features/editorconfig/init.lua
+++ b/lua/doom/modules/features/editorconfig/init.lua
@@ -5,7 +5,6 @@ editorconfig.settings = {}
 editorconfig.packages = {
   ["editorconfig-vim"] = {
     "editorconfig/editorconfig-vim",
-    commit = "30ddc057f71287c3ac2beca876e7ae6d5abe26a0",
   },
 }
 
diff --git a/lua/doom/modules/features/explorer/init.lua b/lua/doom/modules/features/explorer/init.lua
index 7283cd3a7..603d8fdcf 100644
--- a/lua/doom/modules/features/explorer/init.lua
+++ b/lua/doom/modules/features/explorer/init.lua
@@ -94,7 +94,6 @@ explorer.settings = {
 explorer.packages = {
   ["nvim-tree.lua"] = {
     "nvim-tree/nvim-tree.lua",
-    commit = "3ce0a8e770f70a135ef969e0a640bd8d05baf42c",
     cmd = {
       "NvimTreeClipboard",
       "NvimTreeClose",
diff --git a/lua/doom/modules/features/firenvim/init.lua b/lua/doom/modules/features/firenvim/init.lua
index 70efb617e..192ab0e03 100644
--- a/lua/doom/modules/features/firenvim/init.lua
+++ b/lua/doom/modules/features/firenvim/init.lua
@@ -25,7 +25,6 @@ firenvim.settings = {
 firenvim.packages = {
   ["firenvim"] = {
     "glacambre/firenvim",
-    commit = "b6be2e074b8f62815a45e31eb0966b4dd5e57810",
     build =  function()
       vim.fn["firenvim#install"](0)
     end,
diff --git a/lua/doom/modules/features/gitsigns/init.lua b/lua/doom/modules/features/gitsigns/init.lua
index cbfe50127..a005a1cd8 100644
--- a/lua/doom/modules/features/gitsigns/init.lua
+++ b/lua/doom/modules/features/gitsigns/init.lua
@@ -35,12 +35,6 @@ gitsigns.settings = {
   },
   numhl = false,
   linehl = false,
-  keymaps = {
-    -- Default keymap options
-    noremap = true,
-    buffer = true,
-
-  },
   watch_gitdir = { interval = 1000, follow_files = true },
   current_line_blame_opts = {
     delay = 1000,
@@ -56,7 +50,6 @@ gitsigns.settings = {
 gitsigns.packages = {
   ["gitsigns.nvim"] = {
     "lewis6991/gitsigns.nvim",
-    commit = "addd6e174a85fc1c4007ab0b65d77e6555b417bf",
     event = "VeryLazy",
   },
 }
diff --git a/lua/doom/modules/features/illuminate/init.lua b/lua/doom/modules/features/illuminate/init.lua
index bd2c674d1..ea79e596d 100644
--- a/lua/doom/modules/features/illuminate/init.lua
+++ b/lua/doom/modules/features/illuminate/init.lua
@@ -19,7 +19,6 @@ illuminate.settings = {
 illuminate.packages = {
   ["mini.cursorword"] = {
     "echasnovski/mini.cursorword",
-    commit = "21af5679b39cf1a6bc6bf4eeaabc35e1b5ee7110",
     event = "VeryLazy",
   },
 }
diff --git a/lua/doom/modules/features/indentlines/init.lua b/lua/doom/modules/features/indentlines/init.lua
index 2b989574b..b5b0b6257 100644
--- a/lua/doom/modules/features/indentlines/init.lua
+++ b/lua/doom/modules/features/indentlines/init.lua
@@ -1,23 +1,24 @@
 local indentlines = {}
 
 indentlines.settings = {
-  char = "│",
-  use_treesitter = true,
-  show_first_indent_level = false,
-  filetype_exclude = { "help", "dashboard", "packer", "norg", "DoomInfo" },
-  buftype_exclude = { "terminal" },
+  indent = {
+    char = "│",
+  },
+  exclude = {
+    filetypes = { "help", "dashboard", "packer", "norg", "DoomInfo" },
+    buftypes = { "terminal" },
+  }
 }
 
 indentlines.packages = {
   ["indent-blankline.nvim"] = {
     "lukas-reineke/indent-blankline.nvim",
-    commit = "c4c203c3e8a595bc333abaf168fcb10c13ed5fb7",
   },
 }
 
 indentlines.configs = {}
 indentlines.configs["indent-blankline.nvim"] = function()
-  require("indent_blankline").setup(
+  require("ibl").setup(
     vim.tbl_deep_extend("force", doom.features.indentlines.settings, {
       -- To remove indent lines, remove the module. Having the module and
       -- disabling it makes no sense.
diff --git a/lua/doom/modules/features/lazygit/init.lua b/lua/doom/modules/features/lazygit/init.lua
index f469504c5..d3d4b500c 100644
--- a/lua/doom/modules/features/lazygit/init.lua
+++ b/lua/doom/modules/features/lazygit/init.lua
@@ -5,7 +5,6 @@ lazygit.settings = {}
 lazygit.packages = {
   ["lazygit.nvim"] = {
     "kdheepak/lazygit.nvim",
-    commit = "32bffdebe273e571588f25c8a708ca7297928617",
     cmd = { "LazyGit", "LazyGitConfig" },
     lazy = true,
   },
diff --git a/lua/doom/modules/features/linter/init.lua b/lua/doom/modules/features/linter/init.lua
index bd66ec310..8f85b17e0 100644
--- a/lua/doom/modules/features/linter/init.lua
+++ b/lua/doom/modules/features/linter/init.lua
@@ -13,7 +13,6 @@ linter.requires_modules = { "features.lsp" }
 linter.packages = {
   ["null-ls.nvim"] = {
     "jose-elias-alvarez/null-ls.nvim",
-    commit = "915558963709ea17c5aa246ca1c9786bfee6ddb4",
     dependencies={"neovim/nvim-lspconfig"},
     lazy = true,
   },
diff --git a/lua/doom/modules/features/lsp/init.lua b/lua/doom/modules/features/lsp/init.lua
index 112f2b5a0..a8ba73a79 100644
--- a/lua/doom/modules/features/lsp/init.lua
+++ b/lua/doom/modules/features/lsp/init.lua
@@ -100,20 +100,16 @@ lsp.settings = {
 lsp.packages = {
   ["nvim-lspconfig"] = {
     "neovim/nvim-lspconfig",
-    commit = "ed88435764d8b00442e66d39ec3d9c360e560783",
   },
   ["nvim-cmp"] = {
     "hrsh7th/nvim-cmp",
-    commit = "11a95792a5be0f5a40bab5fc5b670e5b1399a939",
     event = "InsertEnter",
     dependencies =  {
       "L3MON4D3/LuaSnip",
-      commit = "53e812a6f51c9d567c98215733100f0169bcc20a",
     },
   },
   ["cmp-nvim-lua"] = {
     "hrsh7th/cmp-nvim-lua",
-    commit = "f3491638d123cfd2c8048aefaf66d246ff250ca6",
     -- after = "nvim-cmp",
     dependencies = {
       "hrsh7th/nvim-cmp",
@@ -135,7 +131,6 @@ lsp.packages = {
   },
   ["cmp-buffer"] = {
     "hrsh7th/cmp-buffer",
-    commit = "3022dbc9166796b644a841a02de8dd1cc1d311fa",
     -- after = "nvim-cmp",
     dependencies = {
       "hrsh7th/nvim-cmp",
@@ -143,7 +138,6 @@ lsp.packages = {
   },
   ["cmp_luasnip"] = {
     "saadparwaiz1/cmp_luasnip",
-    commit = "18095520391186d634a0045dacaa346291096566",
     -- after = "nvim-cmp",
     dependencies = {
       "hrsh7th/nvim-cmp",
@@ -151,7 +145,6 @@ lsp.packages = {
   },
   ["lsp_signature.nvim"] = {
     "ray-x/lsp_signature.nvim",
-    commit = "1979f1118e2b38084e7c148f279eed6e9300a342",
     -- after = "nvim-lspconfig",
     dependencies = {
       "neovim/nvim-lspconfig",
diff --git a/lua/doom/modules/features/lsp_progress/init.lua b/lua/doom/modules/features/lsp_progress/init.lua
index 24ef6980b..f8fcb2aab 100644
--- a/lua/doom/modules/features/lsp_progress/init.lua
+++ b/lua/doom/modules/features/lsp_progress/init.lua
@@ -5,7 +5,7 @@ fidget.settings = {}
 fidget.packages = {
   ["fidget.nvim"] = {
     "j-hui/fidget.nvim",
-    commit = "44585a0c0085765195e6961c15529ba6c5a2a13b",
+    tag = "legacy",
     dependencies = {"neovim/nvim-lspconfig"},
     -- after = "nvim-lspconfig",
     event = "VeryLazy",
diff --git a/lua/doom/modules/features/minimap/init.lua b/lua/doom/modules/features/minimap/init.lua
index 516c6489c..ac87bdf98 100644
--- a/lua/doom/modules/features/minimap/init.lua
+++ b/lua/doom/modules/features/minimap/init.lua
@@ -5,7 +5,6 @@ minimap.settings = {}
 minimap.packages = {
   ["minimap.vim"] = {
     "wfxr/minimap.vim",
-    commit = "2b0151d7302f87f90c4664d119518dda73cc4633",
     lazy = true,
     cmd = {
       "Minimap",
diff --git a/lua/doom/modules/features/neogit/init.lua b/lua/doom/modules/features/neogit/init.lua
index b5563dff3..087b7464c 100644
--- a/lua/doom/modules/features/neogit/init.lua
+++ b/lua/doom/modules/features/neogit/init.lua
@@ -5,7 +5,6 @@ neogit.settings = {}
 neogit.packages = {
   ["neogit"] = {
     "NeogitOrg/neogit",
-    commit = "28b0227405e135424a79824ff6b840897cb4aba5",
     cmd = "Neogit",
     lazy = true,
   },
diff --git a/lua/doom/modules/features/neorg/init.lua b/lua/doom/modules/features/neorg/init.lua
index fdbeef217..b75a1ae71 100644
--- a/lua/doom/modules/features/neorg/init.lua
+++ b/lua/doom/modules/features/neorg/init.lua
@@ -42,10 +42,6 @@ neorg.settings = {
 neorg.packages = {
   ["neorg"] = {
     "nvim-neorg/neorg",
-    commit = {
-      ["nvim-0.7"] = "d93126cfcc2b5f90c063676f8669fed9b0806bcd",
-      ["latest"] = "aa613122f82ca7485b7055937a742b709ed3c576",
-    },
     cmd = "Neorg",
     dependencies = {"nvim-treesitter/nvim-treesitter"},
     -- after = "nvim-treesitter",
diff --git a/lua/doom/modules/features/projects/init.lua b/lua/doom/modules/features/projects/init.lua
index 656758df9..6e1c1ba0e 100644
--- a/lua/doom/modules/features/projects/init.lua
+++ b/lua/doom/modules/features/projects/init.lua
@@ -38,7 +38,6 @@ projects.settings = {
 projects.packages = {
   ["project.nvim"] = {
     "ahmedkhalf/project.nvim",
-    commit = "685bc8e3890d2feb07ccf919522c97f7d33b94e4",
     cmd = "Telescope projects",
     dependencies =  { "nvim-treesitter/nvim-treesitter" },
   },
diff --git a/lua/doom/modules/features/range_highlight/init.lua b/lua/doom/modules/features/range_highlight/init.lua
index 4cbe73fc7..22cadaabe 100644
--- a/lua/doom/modules/features/range_highlight/init.lua
+++ b/lua/doom/modules/features/range_highlight/init.lua
@@ -5,7 +5,6 @@ range_highlight.settings = {}
 range_highlight.packages = {
   ["range-highlight.nvim"] = {
     "winston0410/range-highlight.nvim",
-    commit = "8b5e8ccb3460b2c3675f4639b9f54e64eaab36d9",
     dependencies = {
       { "winston0410/cmd-parser.nvim" },
     },
diff --git a/lua/doom/modules/features/ranger/init.lua b/lua/doom/modules/features/ranger/init.lua
index b30146228..3ec56ba53 100644
--- a/lua/doom/modules/features/ranger/init.lua
+++ b/lua/doom/modules/features/ranger/init.lua
@@ -5,7 +5,6 @@ ranger.settings = {}
 ranger.packages = {
   ["ranger.vim"] = {
     "francoiscabrol/ranger.vim",
-    commit = "91e82debdf566dfaf47df3aef0a5fd823cedf41c",
     dependencies = {
       "rbgrouleff/bclose.vim"
     },
diff --git a/lua/doom/modules/features/repl/init.lua b/lua/doom/modules/features/repl/init.lua
index cf4394eb8..ef6fce09c 100644
--- a/lua/doom/modules/features/repl/init.lua
+++ b/lua/doom/modules/features/repl/init.lua
@@ -41,7 +41,6 @@ repl.settings = {
 repl.packages = {
   ["iron.nvim"] = {
     "hkupty/iron.nvim",
-    commit = "f4131638454aeb96cbd92652dd8c396e48eb4118",
     cmd = "IronRepl",
   },
 }
diff --git a/lua/doom/modules/features/restclient/init.lua b/lua/doom/modules/features/restclient/init.lua
index ba4b5a657..f8a4f5194 100644
--- a/lua/doom/modules/features/restclient/init.lua
+++ b/lua/doom/modules/features/restclient/init.lua
@@ -5,7 +5,6 @@ restclient.settings = {}
 restclient.packages = {
   ["rest.nvim"] = {
     "rest-nvim/rest.nvim",
-    commit = "090e253c114b6d5448bac5869a28a6623c195e3a",
     cmd = {
       "RestNvim",
       "RestNvimPreview",
diff --git a/lua/doom/modules/features/show_registers/init.lua b/lua/doom/modules/features/show_registers/init.lua
index 695a9d183..a9c3468ea 100644
--- a/lua/doom/modules/features/show_registers/init.lua
+++ b/lua/doom/modules/features/show_registers/init.lua
@@ -5,7 +5,6 @@ show_registers.settings = {}
 show_registers.packages = {
   ["registers.nvim"] = {
     "tversteeg/registers.nvim",
-    commit = "667ae447d2c7efb64461a2c58f5311d1248cdb5f",
     opt = true,
   },
 }
diff --git a/lua/doom/modules/features/statusline/init.lua b/lua/doom/modules/features/statusline/init.lua
index 9d4a20b71..7f8ec98d8 100644
--- a/lua/doom/modules/features/statusline/init.lua
+++ b/lua/doom/modules/features/statusline/init.lua
@@ -159,7 +159,6 @@ end
 statusline.packages = {
   ["heirline.nvim"] = {
     "rebelot/heirline.nvim",
-    commit = "19cab76f52710ec67bd8829cbc96d0c322963090",
   },
 }
 
diff --git a/lua/doom/modules/features/suda/init.lua b/lua/doom/modules/features/suda/init.lua
index 83ffe23f5..0410642bc 100644
--- a/lua/doom/modules/features/suda/init.lua
+++ b/lua/doom/modules/features/suda/init.lua
@@ -5,7 +5,6 @@ suda.settings = {}
 suda.packages = {
   ["suda.vim"] = {
     "lambdalisue/suda.vim",
-    commit = "08abd39dfe1cee681b8ce3e7321da5fa03e045c1",
     lazy = true,
     cmd = { "SudaRead", "SudaWrite" },
   },
diff --git a/lua/doom/modules/features/superman/init.lua b/lua/doom/modules/features/superman/init.lua
index 0a1b7c4df..dc6e966d0 100644
--- a/lua/doom/modules/features/superman/init.lua
+++ b/lua/doom/modules/features/superman/init.lua
@@ -5,7 +5,6 @@ superman.settings = {}
 superman.packages = {
   ["vim-superman"] = {
     "jez/vim-superman",
-    commit = "19d307446576d9118625c5d9d3c7a4c9bec5571a",
     cmd = "SuperMan",
     lazy = true,
   },
diff --git a/lua/doom/modules/features/symbols/init.lua b/lua/doom/modules/features/symbols/init.lua
index 8460adad7..4bcbad511 100644
--- a/lua/doom/modules/features/symbols/init.lua
+++ b/lua/doom/modules/features/symbols/init.lua
@@ -19,19 +19,17 @@ symbols.settings = {
 symbols.packages = {
   ["symbols-outline.nvim"] = {
     "simrat39/symbols-outline.nvim",
-    commit = "6a3ed24c5631da7a5d418bced57c16b32af7747c",
     cmd = {
       "SymbolsOutline",
       "SymbolsOutlineOpen",
       "SymbolsOutlineClose",
     },
-    opt = true,
   },
 }
 
 symbols.configs = {}
-symbols.configs["symbols_outline.nvim"] = function()
-  vim.g.symbols_outline = doom.features.symbols.settings
+symbols.configs["symbols-outline.nvim"] = function()
+  require("symbols-outline").setup(doom.features.symbols.settings)
 end
 
 symbols.binds = {
diff --git a/lua/doom/modules/features/tabline/init.lua b/lua/doom/modules/features/tabline/init.lua
index f3d20e2ea..7b02ea5c3 100644
--- a/lua/doom/modules/features/tabline/init.lua
+++ b/lua/doom/modules/features/tabline/init.lua
@@ -40,14 +40,14 @@ tabline.settings = {
           name = "Tests",
           auto_close = true,
           matcher = function(buf)
-            return buf.filename:match("%_test") or buf.filename:match("%_spec")
+            return buf.name:match("%_test") or buf.name:match("%_spec")
           end,
         },
         {
           name = "Docs",
           auto_close = true,
           matcher = function(buf)
-            return buf.filename:match("%.md") or buf.filename:match("%.txt")
+            return buf.name:match("%.md") or buf.name:match("%.txt")
           end,
         },
       },
@@ -133,7 +133,6 @@ tabline.packages = {
   ["bufferline.nvim"] = {
     "akinsho/bufferline.nvim",
     branch = "main",
-    commit = "2d5266d14b7b5dbc54923469b4599f0349f7cedc",
     event = "BufAdd",
   },
 }
diff --git a/lua/doom/modules/features/telescope/init.lua b/lua/doom/modules/features/telescope/init.lua
index e42b913e0..f891306d5 100644
--- a/lua/doom/modules/features/telescope/init.lua
+++ b/lua/doom/modules/features/telescope/init.lua
@@ -49,13 +49,11 @@ telescope.settings = {
 telescope.packages = {
   ["telescope.nvim"] = {
     "nvim-telescope/telescope.nvim",
-    commit = "1ba7278cf08da8048e7f589ef6b65a39fd3e4dbf",
     cmd = "Telescope",
     lazy = true,
   },
   ["telescope-file-browser.nvim"] = {
     "nvim-telescope/telescope-file-browser.nvim",
-    commit = "304508fb7bea78e3c0eeddd88c4837501e403ae8",
     cmd = "Telescope browse_files",
     keys = "<leader>.",
     dependencies = {"nvim-telescope/telescope.nvim"},
diff --git a/lua/doom/modules/features/terminal/init.lua b/lua/doom/modules/features/terminal/init.lua
index b68fefaae..0174e1f40 100644
--- a/lua/doom/modules/features/terminal/init.lua
+++ b/lua/doom/modules/features/terminal/init.lua
@@ -25,7 +25,6 @@ terminal.settings = {
 terminal.packages = {
   ["toggleterm.nvim"] = {
     "akinsho/toggleterm.nvim",
-    commit = "a54e6c471ce1cd8ef8357e34598a28a955297131",
     cmd = { "ToggleTerm", "TermExec" },
     keys = {terminal.settings.open_mapping},
     lazy = true,
diff --git a/lua/doom/modules/features/todo_comments/init.lua b/lua/doom/modules/features/todo_comments/init.lua
index b740c04a7..c7bb389bf 100644
--- a/lua/doom/modules/features/todo_comments/init.lua
+++ b/lua/doom/modules/features/todo_comments/init.lua
@@ -5,7 +5,6 @@ todo_comments.settings = {}
 todo_comments.packages = {
   ["todo-comments.nvim"] = {
     "folke/todo-comments.nvim",
-    commit = "077c59586d9d0726b0696dc5680eb863f4e04bc5",
     event = "VeryLazy",
   },
 }
diff --git a/lua/doom/modules/features/trouble/init.lua b/lua/doom/modules/features/trouble/init.lua
index 9ee582b25..1c38739be 100644
--- a/lua/doom/modules/features/trouble/init.lua
+++ b/lua/doom/modules/features/trouble/init.lua
@@ -5,7 +5,6 @@ trouble.settings = {}
 trouble.packages = {
   ["trouble.nvim"] = {
     "folke/trouble.nvim",
-    commit = "83ec606e7065adf134d17f4af6bae510e3c491c1",
     cmd = { "Trouble", "TroubleClose", "TroubleRefresh", "TroubleToggle" },
     lazy = true,
   },
diff --git a/lua/doom/modules/features/whichkey/init.lua b/lua/doom/modules/features/whichkey/init.lua
index 4c0db98ff..ed55028a2 100644
--- a/lua/doom/modules/features/whichkey/init.lua
+++ b/lua/doom/modules/features/whichkey/init.lua
@@ -64,7 +64,6 @@ whichkey.settings = {
 whichkey.packages = {
   ["which-key.nvim"] = {
     "folke/which-key.nvim",
-    commit = "e4fa445065a2bb0bbc3cca85346b67817f28e83e",
     keys = { "<leader>" },
   },
 }
diff --git a/lua/doom/modules/features/zen/init.lua b/lua/doom/modules/features/zen/init.lua
index b4127dc2b..754e65e98 100644
--- a/lua/doom/modules/features/zen/init.lua
+++ b/lua/doom/modules/features/zen/init.lua
@@ -51,7 +51,6 @@ zen.settings = {
 zen.packages = {
   ["TrueZen.nvim"] = {
     "Pocco81/TrueZen.nvim",
-    commit = "98740c76254c65576ec294551028b65081053588",
     module = "true-zen",
     event = "BufWinEnter",
   },
diff --git a/lua/doom/modules/langs/json/init.lua b/lua/doom/modules/langs/json/init.lua
index 3e36ca4f4..cf1c8f4ac 100644
--- a/lua/doom/modules/langs/json/init.lua
+++ b/lua/doom/modules/langs/json/init.lua
@@ -43,7 +43,6 @@ json.settings = {
 json.packages = {
   ["SchemaStore.nvim"] = {
     "b0o/SchemaStore.nvim",
-    commit = "571056608b7fc569f856c8174fcbffaad548eec5",
     ft = "json",
   },
 }
diff --git a/lua/doom/modules/langs/lua/init.lua b/lua/doom/modules/langs/lua/init.lua
index d25a75c5a..5d935a730 100644
--- a/lua/doom/modules/langs/lua/init.lua
+++ b/lua/doom/modules/langs/lua/init.lua
@@ -13,15 +13,15 @@ lua.settings = {
   disable_lsp = false,
   --- Name of the language server
   --- @type string
-  lsp_name = "sumneko_lua",
+  lsp_name = "lua_ls",
   --- Custom config to pass to nvim-lspconfig
   --- @type table|nil
   lsp_config = {
-    formatter = {
-      enabled = true,
-    },
     settings = {
       Lua = {
+        format = {
+          enable = true,
+        },
         completion = {
           callSnippet = "Replace",
         },
@@ -91,7 +91,6 @@ lua.settings = {
 lua.packages = {
   ["lua-dev.nvim"] = {
     "folke/neodev.nvim",
-    commit = "0e3f5e763639951f96f9acbdc9f52a9fedf91b46",
     ft = "lua",
   },
 }
diff --git a/lua/doom/modules/langs/utils.lua b/lua/doom/modules/langs/utils.lua
index 2cb2d06a3..61fde202b 100644
--- a/lua/doom/modules/langs/utils.lua
+++ b/lua/doom/modules/langs/utils.lua
@@ -121,47 +121,50 @@ module.use_mason_package = function(package_name, success_handler, error_handler
   end
   profiler.start("mason|using package " .. package_name)
   local ok, err = xpcall(function()
-    local package = mason.get_package(package_name)
-    if not package:is_installed() then
-      -- If statusline enabled, push the package to the statusline state
-      -- So we can provide feedback to user
-      local statusline = doom.features.statusline
-      if statusline then
-        statusline.state.start_mason_package(package_name)
-      end
-
-      package:install()
-      package:on("install:success", function(handle)
-        -- Remove package from statusline state to hide it
+    local registry = require("mason-registry")
+    registry.refresh(function ()
+      local package = mason.get_package(package_name)
+      if not package:is_installed() then
+        -- If statusline enabled, push the package to the statusline state
+        -- So we can provide feedback to user
+        local statusline = doom.features.statusline
         if statusline then
-          statusline.state.finish_mason_package(package_name)
+          statusline.state.start_mason_package(package_name)
         end
-        vim.schedule(function()
-          success_handler(handle)
+
+        package:install()
+        package:on("install:success", function(handle)
+          -- Remove package from statusline state to hide it
+          if statusline then
+            statusline.state.finish_mason_package(package_name)
+          end
+          vim.schedule(function()
+            success_handler(handle)
+          end)
+          profiler.stop("mason|using package " .. package_name)
         end)
-        profiler.stop("mason|using package " .. package_name)
-      end)
-      package:on("install:failed", function(pkg)
-        -- Remove package from statusline state to hide it
-        if statusline then
-          statusline.state.finish_mason_package(package_name)
-        end
-        local err = "Mason.nvim install failed.  Reason:\n"
-        if pkg and pkg.stdio and pkg.stdio.buffers and pkg.stdio.buffers.stderr then
-          for _, line in ipairs(pkg.stdio.buffers.stderr) do
-            err = err .. line
+        package:on("install:failed", function(pkg)
+          -- Remove package from statusline state to hide it
+          if statusline then
+            statusline.state.finish_mason_package(package_name)
+          end
+          local err = "Mason.nvim install failed.  Reason:\n"
+          if pkg and pkg.stdio and pkg.stdio.buffers and pkg.stdio.buffers.stderr then
+            for _, line in ipairs(pkg.stdio.buffers.stderr) do
+              err = err .. line
+            end
           end
-        end
 
-        vim.schedule(function()
-          on_err(package_name, err)
+          vim.schedule(function()
+            on_err(package_name, err)
+          end)
+          profiler.stop("mason|using package " .. package_name)
         end)
+      else
         profiler.stop("mason|using package " .. package_name)
-      end)
-    else
-      profiler.stop("mason|using package " .. package_name)
-      success_handler(package, package.get_handle(package))
-    end
+        success_handler(package, package.get_handle(package))
+      end
+    end)
   end, debug.traceback)
   if not ok then
     profiler.stop("mason|using package " .. package_name)
@@ -246,7 +249,7 @@ module.use_lsp_mason = function(lsp_name, options)
           and lsp_config_server.manager.try_add_wrapper
         or lsp_config_server.manager.try_add
       for _, bufnr in ipairs(vim.api.nvim_list_bufs()) do
-        buffer_handler(bufnr)
+        buffer_handler(lsp_config_server.manager, bufnr)
       end
     end
   end