diff --git a/lua/keys.lua b/lua/keys.lua
index 4383173..139ee39 100644
--- a/lua/keys.lua
+++ b/lua/keys.lua
@@ -8,7 +8,7 @@ vim.api.nvim_set_keymap("n", "<leader>ft", "<CMD>TodoTelescope<CR>", {silent = t
 vim.api.nvim_set_keymap("n", "gr", "<cmd>lua require('telescope.builtin').lsp_references()<cr>", {silent = true})
 vim.api.nvim_set_keymap("n", "gd", "<cmd>lua require('telescope.builtin').lsp_definitions()<cr>", {silent = true})
 vim.api.nvim_set_keymap("n", "gi", "<cmd>lua require('telescope.builtin').lsp_implementations()<cr>", {silent = true})
-vim.api.nvim_set_keymap("n", "<leader>D", "<cmd>lua vim.lsp.diagnostic.goto_next { wrap = false }<cr>", {silent = true})
+vim.api.nvim_set_keymap("n", "<leader>D", "<cmd>lua vim.diagnostic.goto_next { wrap = false }<cr>", {silent = true})
 vim.api.nvim_set_keymap("n", "<leader>b", "<cmd>Gitsigns blame_line<cr>", {silent = true})
 vim.api.nvim_set_keymap("", "q:", "<Nop>", {silent = true})
 vim.api.nvim_set_keymap("n", "<leader>h", "<Plug>RestNvim", {silent = true})
diff --git a/lua/plugins.lua b/lua/plugins.lua
index 9246a8f..07ab0a9 100644
--- a/lua/plugins.lua
+++ b/lua/plugins.lua
@@ -162,20 +162,12 @@ return require("packer").startup(
         require "plugins/diffview"
       end
     }
-    --[[ use {
-      "akinsho/nvim-bufferline.lua",
+    use {
+      "akinsho/bufferline.nvim",
       config = function()
         require "plugins/bufferline"
       end,
       requires = "kyazdani42/nvim-web-devicons"
-    } ]]
-    use {
-      "rcarriga/vim-ultest",
-      config = function()
-        require "plugins/ultest"
-      end,
-      requires = {"vim-test/vim-test"},
-      run = ":UpdateRemotePlugins"
     }
     use {
       "vuki656/package-info.nvim",
@@ -321,8 +313,27 @@ return require("packer").startup(
       end,
       requires = {
         "kyazdani42/nvim-web-devicons",
-        "SmiteshP/nvim-gps",
-        "neovim/nvim-lspconfig"
+        "SmiteshP/nvim-gps"
+      },
+      after = {
+        "monokai.nvim",
+        "nvim-lspconfig"
+      }
+    }
+    use "isobit/vim-caddyfile"
+    use {
+      "nvim-neotest/neotest",
+      config = function()
+        require("plugins/neotest")
+      end,
+      requires = {
+        "nvim-lua/plenary.nvim",
+        "nvim-treesitter/nvim-treesitter",
+        "antoinemadec/FixCursorHold.nvim",
+        "haydenmeade/neotest-jest"
+      },
+      after = {
+        "monokai.nvim"
       }
     }
   end
diff --git a/lua/plugins/heirline.lua b/lua/plugins/heirline.lua
index 26c6e38..3c94621 100644
--- a/lua/plugins/heirline.lua
+++ b/lua/plugins/heirline.lua
@@ -29,15 +29,15 @@ local colors = {
   purple = "#ae81ff",
   red = "#e95678",
   diag = {
-    warn = utils.get_highlight("DiagnosticWarn").fg,
-    error = utils.get_highlight("DiagnosticError").fg,
-    hint = utils.get_highlight("DiagnosticHint").fg,
-    info = utils.get_highlight("DiagnosticInfo").fg
+    warn = utils.get_highlight("DiagnosticSignWarn").fg,
+    error = utils.get_highlight("DiagnosticSignError").fg,
+    hint = utils.get_highlight("DiagnosticSignHint").fg,
+    info = utils.get_highlight("DiagnosticSignInfo").fg
   },
   git = {
-    del = utils.get_highlight("GitSignsDelete").fg,
-    add = utils.get_highlight("GitSignsAdd").fg,
-    change = utils.get_highlight("GitSignsChange").fg
+    del = "#e95678",
+    add = "#a6e22e",
+    change = "#ae81ff"
   }
 }
 
@@ -433,7 +433,7 @@ local WinBars = {
     condition = function()
       return conditions.buffer_matches(
         {
-          buftype = {"nofile", "prompt", "help", "quickfix"},
+          buftype = {"nofile", "prompt", "help", "quickfix", "nofile", "promt"},
           filetype = {"^git.*", "fugitive"}
         }
       )
@@ -473,4 +473,19 @@ local WinBars = {
   {GSpace, FileNameShortBlock, GSpace, Gps, Align}
 }
 
+vim.api.nvim_create_autocmd(
+  "User",
+  {
+    pattern = "HeirlineInitWinbar",
+    callback = function(args)
+      local buf = args.buf
+      local buftype = vim.tbl_contains({"prompt", "nofile", "help", "quickfix"}, vim.bo[buf].buftype)
+      local filetype = vim.tbl_contains({"gitcommit", "fugitive"}, vim.bo[buf].filetype)
+      if buftype or filetype then
+        vim.opt_local.winbar = nil
+      end
+    end
+  }
+)
+
 require "heirline".setup(StatusLines, WinBars)
diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua
index 7b21d5f..e37bef2 100644
--- a/lua/plugins/lsp.lua
+++ b/lua/plugins/lsp.lua
@@ -1,4 +1,5 @@
 vim.ui.select = require "popui.ui-overrider"
+local util = require "lspconfig.util"
 
 local signError = vim.fn.sign_getdefined("DiagnosticSignError")
 signError["text"] = ""
@@ -52,9 +53,9 @@ vim.api.nvim_set_keymap("n", "<space>wl", "<cmd>lua print(vim.inspect(vim.lsp.bu
 vim.api.nvim_set_keymap("n", "<F2>", "<cmd>lua vim.lsp.buf.rename()<CR>", opts)
 vim.api.nvim_set_keymap("n", "<leader>a", "<cmd>lua vim.lsp.buf.code_action()<CR>", opts)
 vim.api.nvim_set_keymap("n", "<leader>d", "<cmd>lua vim.diagnostic.open_float()<CR>", opts)
-vim.api.nvim_set_keymap("n", "[d", "<cmd>lua vim.lsp.diagnostic.goto_prev()<CR>", opts)
-vim.api.nvim_set_keymap("n", "]d", "<cmd>lua vim.lsp.diagnostic.goto_next()<CR>", opts)
-vim.api.nvim_set_keymap("n", "<space>q", "<cmd>lua vim.lsp.diagnostic.set_loclist()<CR>", opts)
+vim.api.nvim_set_keymap("n", "[d", "<cmd>lua vim.diagnostic.goto_prev()<CR>", opts)
+vim.api.nvim_set_keymap("n", "]d", "<cmd>lua vim.diagnostic.goto_next()<CR>", opts)
+vim.api.nvim_set_keymap("n", "<space>q", "<cmd>lua vim.diagnostic.set_loclist()<CR>", opts)
 local on_attach = function(client, bufnr)
   local function buf_set_keymap(...)
     vim.api.nvim_buf_set_keymap(bufnr, ...)
@@ -95,6 +96,14 @@ require "lspconfig".tsserver.setup {
 
 require "lspconfig".eslint.setup {
   on_attach = on_attach,
+  root_dir = util.root_pattern(
+    ".eslintrc",
+    ".eslintrc.js",
+    ".eslintrc.cjs",
+    ".eslintrc.yaml",
+    ".eslintrc.yml",
+    ".eslintrc.json"
+  ),
   handlers = {
     ["eslint/openDoc"] = function(_, result)
       if not result then
diff --git a/lua/plugins/neotest.lua b/lua/plugins/neotest.lua
new file mode 100644
index 0000000..4521e0e
--- /dev/null
+++ b/lua/plugins/neotest.lua
@@ -0,0 +1,29 @@
+require("neotest").setup(
+  {
+    adapters = {
+      require("neotest-jest")(
+        {
+          jestCommand = "npx jest"
+        }
+      )
+    },
+    icons = {
+      passed = "🌈",
+      skipped = "🌙",
+      failed = "⛈️",
+      running = "☀️"
+    },
+    highlights = {
+      passed = "DiagnosticSignSuccess",
+      skipped = "DiagnosticSignInfo",
+      failed = "DiagnosticSignError",
+      running = "DiagnosticSignWarn"
+    }
+  }
+)
+
+local keymap = vim.api.nvim_set_keymap
+
+keymap("n", "<leader>tf", ':lua require("neotest").run.run(vim.fn.expand("%"))<CR>', {silent = true, noremap = true})
+keymap("n", "<leader>tn", ':lua require("neotest").run.run()<CR>', {silent = true})
+keymap("n", "<leader>td", ':lua require("neotest").output.open({enter=true,short=true})<CR>', {silent = true})
diff --git a/lua/plugins/ultest.lua b/lua/plugins/ultest.lua
deleted file mode 100644
index 84d088e..0000000
--- a/lua/plugins/ultest.lua
+++ /dev/null
@@ -1,18 +0,0 @@
-vim.cmd([[let test#javascript#reactscripts#options = "--watchAll=false"]])
-vim.cmd([[let test#javascriptreact#reactscripts#options = "--watchAll=false"]])
-vim.cmd([[let test#typescript#reactscripts#options = "--watchAll=false"]])
-vim.cmd([[let test#typescriptreact#reactscripts#options = "--watchAll=false"]])
-vim.cmd(
-  [[
-augroup UltestRunner
-    au!
-    au BufWritePost *.test.* UltestNearest
-    au BufWritePost *.spec.* UltestNearest
-augroup END
-]]
-)
-vim.g.ultest_virtual_text = 1
-vim.g.ultest_output_on_run = 0
-vim.g.ultest_pass_text = "🎉"
-vim.g.ultest_fail_text = "💥"
-vim.g.ultest_running_text = "⌛"