diff --git a/lua/configs/lspconfig.lua b/lua/configs/lspconfig.lua
index aea602d..eba5d9f 100644
--- a/lua/configs/lspconfig.lua
+++ b/lua/configs/lspconfig.lua
@@ -12,7 +12,7 @@ require("mason-lspconfig").setup_handlers {
 local servers = {
   "html",
   "cssls",
-  "tsserver",
+  "ts_ls",
   "clangd",
   "gopls",
   "astro",
@@ -23,7 +23,7 @@ local servers = {
   "bashls",
   "css_variables",
   "marksman",
-  "rust_analyzer",
+  -- "rust_analyzer",
   "ruff",
   "jdtls",
   "nil_ls",
diff --git a/lua/mappings.lua b/lua/mappings.lua
index be1cfef..caa7c38 100644
--- a/lua/mappings.lua
+++ b/lua/mappings.lua
@@ -146,4 +146,5 @@ end
 M.Trouble = function()
   map("n", "<leader>dx", "<cmd>Trouble diagnostics toggle<cr>", { desc = "Trouble Diagnostics" })
 end
+
 return M
diff --git a/lua/plugins.lua b/lua/plugins.lua
index 2bb6eb5..b3b0930 100644
--- a/lua/plugins.lua
+++ b/lua/plugins.lua
@@ -12,34 +12,7 @@ return {
     "williamboman/mason.nvim",
     -- opts = overrides.mason
     opts = {
-      ensure_installed = {
-        -- rust stuff
-        "rust-analyzer",
-
-        -- lua stuff
-        "lua-language-server",
-        "stylua",
-
-        -- web dev stuff
-        "css-lsp",
-        "html-lsp",
-        "typescript-language-server",
-        -- "deno",
-        "prettier",
-
-        -- c/cpp stuff
-        "clangd",
-        "clang-format",
-
-        -- python stuff
-        "pyright",
-        "mypy",
-        "autoflake",
-        "debugpy",
-        -- "ruff",
-        "shellharden",
-        "gopls",
-      },
+      PATH = "append",
     },
   },
   {
@@ -235,11 +208,14 @@ return {
   -- Rust --
   ----------
   {
-    "rust-lang/rust.vim",
-    ft = "rust",
-    init = function()
-      vim.g.rustfmt_autosave = 1
-    end,
+    "mrcjkb/rustaceanvim",
+    version = "^5", -- Recommended
+    lazy = false, -- This plugin is already lazy
+    ["rust-analyzer"] = {
+      cargo = {
+        all_features = true,
+      },
+    },
   },
   {
     "saecki/crates.nvim",