diff --git a/nvim/.config/nvim/lua/custom/chadrc.lua b/nvim/.config/nvim/lua/custom/chadrc.lua
index fb4c22e..d8b1654 100644
--- a/nvim/.config/nvim/lua/custom/chadrc.lua
+++ b/nvim/.config/nvim/lua/custom/chadrc.lua
@@ -1,15 +1,9 @@
 local M = {}
 
-M.ui = { theme = 'catppuccin', tabufline= {enabled= false} }
+M.ui = { theme = 'bearded-arc', tabufline= {enabled= false} }
 M.plugins = "custom.plugins"
 M.mappings = require "custom.configs.mappings"
 vim.opt.spelllang = 'en_gb'
 vim.opt.spell = true
-vim.keymap.set("n", "]g", function ()
-  vim.diagnostic.goto_next()
-end)
-vim.keymap.set("n", "[g", function ()
-  vim.diagnostic.goto_prev()
-end)
 
 return M
diff --git a/nvim/.config/nvim/lua/custom/configs/lspconfig.lua b/nvim/.config/nvim/lua/custom/configs/lspconfig.lua
index 0c360ec..5c61a8d 100644
--- a/nvim/.config/nvim/lua/custom/configs/lspconfig.lua
+++ b/nvim/.config/nvim/lua/custom/configs/lspconfig.lua
@@ -19,7 +19,7 @@ lspconfig.gopls.setup {
   }
 }
 
-lspconfig.tsserver.setup{
+lspconfig.ts_ls.setup{
   on_attach=on_attach,
   capabilities=capabilities,
   init_options = {
diff --git a/nvim/.config/nvim/lua/custom/configs/mappings.lua b/nvim/.config/nvim/lua/custom/configs/mappings.lua
index 158213a..f83ac5b 100644
--- a/nvim/.config/nvim/lua/custom/configs/mappings.lua
+++ b/nvim/.config/nvim/lua/custom/configs/mappings.lua
@@ -1,5 +1,12 @@
 local M = {}
 
+vim.keymap.set("n", "]g", function ()
+  vim.diagnostic.goto_next()
+end)
+vim.keymap.set("n", "[g", function ()
+  vim.diagnostic.goto_prev()
+end)
+
 M.dap = {
   plugin = true,
   n = {
diff --git a/nvim/.config/nvim/lua/custom/configs/rust-tools.lua b/nvim/.config/nvim/lua/custom/configs/rust-tools.lua
index 3c462c2..90f4a1d 100644
--- a/nvim/.config/nvim/lua/custom/configs/rust-tools.lua
+++ b/nvim/.config/nvim/lua/custom/configs/rust-tools.lua
@@ -5,7 +5,14 @@ local options = {
   server = {
     on_attach = on_attach,
     capabilities = capabilities,
-  }
+  },
+  dap = {
+    adapter = {
+      type = "executable",
+      command = "lldb-vscode",
+      name = "rt_lldb",
+    },
+  },
 }
 
 return options
diff --git a/nvim/.config/nvim/lua/custom/plugins.lua b/nvim/.config/nvim/lua/custom/plugins.lua
index 71d704e..3ee9393 100644
--- a/nvim/.config/nvim/lua/custom/plugins.lua
+++ b/nvim/.config/nvim/lua/custom/plugins.lua
@@ -20,6 +20,7 @@ local plugins = {
       }
     }
   },
+  { "nvim-neotest/nvim-nio" },
   {
     "neovim/nvim-lspconfig",
     config=function ()
@@ -60,15 +61,9 @@ local plugins = {
     enabled = false
   },
   {
-    "simrat39/rust-tools.nvim",
-    ft = "rust",
-    opts = function ()
-      return require "custom.configs.rust-tools"
-    end,
-    config = function (_, opts)
-      require("rust-tools").setup(opts)
-    end,
-    dependencies = "neovim/nvim-lspconfig"
+    'mrcjkb/rustaceanvim',
+    version = '^5', -- Recommended
+    lazy = false, -- This plugin is already lazy
   },
   {
     "rust-lang/rust.vim",