diff --git a/lazy-lock.json b/lazy-lock.json
index f028464..bc23df1 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -1,11 +1,13 @@
 {
   "LuaSnip": { "branch": "master", "commit": "a658ae2906344a1d2b9c507738e585cf68e685c7" },
   "auto-save.nvim": { "branch": "main", "commit": "979b6c82f60cfa80f4cf437d77446d0ded0addf0" },
+  "autoclose.nvim": { "branch": "main", "commit": "469782b0456f0b4f764378ffda94c18599544e09" },
   "ccc.nvim": { "branch": "main", "commit": "4a0ddaf787cc82796e84ab8a7f70d086f250aeb6" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" },
+  "crates.nvim": { "branch": "main", "commit": "1dffccc0a95f656ebe00cacb4de282473430c5a1" },
   "glow.nvim": { "branch": "advanced_window", "commit": "f1157d4cb7e46e830c72004e7e1adb81a1f9b04c" },
   "indent-blankline.nvim": { "branch": "master", "commit": "4541d690816cb99a7fc248f1486aa87f3abce91c" },
   "lazy.nvim": { "branch": "main", "commit": "5af331ea65418dc9361769891921fdee4bcc837a" },
@@ -36,5 +38,6 @@
   "telescope.nvim": { "branch": "master", "commit": "c1a2af0af69e80e14e6b226d3957a064cd080805" },
   "text-case.nvim": { "branch": "main", "commit": "cd7cc65a412beb713e68f3b84e45990a939b7b6b" },
   "undotree": { "branch": "master", "commit": "485f01efde4e22cb1ce547b9e8c9238f36566f21" },
-  "vim-fugitive": { "branch": "master", "commit": "43f18ab9155c853a84ded560c6104e6300ad41da" }
+  "vim-fugitive": { "branch": "master", "commit": "43f18ab9155c853a84ded560c6104e6300ad41da" },
+  "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }
 }
\ No newline at end of file
diff --git a/lua/autocommands.lua b/lua/autocommands.lua
index d62d16f..878ad69 100644
--- a/lua/autocommands.lua
+++ b/lua/autocommands.lua
@@ -1,8 +1,8 @@
-function isEmpty()
-	return vim.api.nvim_buf_get_name(0) == ""
-		or vim.fn.filereadable(vim.api.nvim_buf_get_name(0)) == 0
-		or vim.fn.line("$") == 1 and vim.fn.col("$") == 1
-end
+--function isEmpty()
+--return vim.api.nvim_buf_get_name(0) == ""
+--or vim.fn.filereadable(vim.api.nvim_buf_get_name(0)) == 0
+--or vim.fn.line("$") == 1 and vim.fn.col("$") == 1
+--end
 
 --vim.api.nvim_create_autocmd({ "VimEnter" }, {
 --  callback = function()
@@ -13,24 +13,32 @@ end
 --})
 
 vim.api.nvim_create_autocmd("BufRead", {
-	pattern = ".env*",
-	command = "set filetype=sh",
+  pattern = ".env*",
+  command = "set filetype=sh",
 })
 
 vim.api.nvim_create_autocmd("BufRead", {
-	pattern = ".*rc",
-	command = "set filetype=sh",
+  pattern = ".*rc",
+  command = "set filetype=sh",
 })
 
 vim.api.nvim_create_autocmd("BufRead", {
-	pattern = "Dockerfile.*",
-	command = "set filetype=dockerfile",
+  pattern = "Dockerfile.*",
+  command = "set filetype=dockerfile",
 })
 
 vim.api.nvim_create_autocmd("BufRead", {
-	callback = function()
-		vim.cmd.CccHighlighterEnable()
-	end,
+  callback = function()
+    vim.cmd.CccHighlighterEnable()
+  end,
+})
+
+vim.api.nvim_create_autocmd({"BufEnter", "BufWinEnter"}, {
+  callback = function ()
+    if vim.bo.filetype == 'neo-tree' then
+      vim.api.nvim_command("stopinsert")
+    end
+  end
 })
 
 --vim.api.nvim_create_autocmd('BufEnter', {
diff --git a/lua/plugins/autoclose.lua b/lua/plugins/autoclose.lua
new file mode 100644
index 0000000..c2979f1
--- /dev/null
+++ b/lua/plugins/autoclose.lua
@@ -0,0 +1,4 @@
+return {
+  "m4xshen/autoclose.nvim",
+  opts = {},
+}
diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua
index d6e4117..824ea02 100644
--- a/lua/plugins/lsp.lua
+++ b/lua/plugins/lsp.lua
@@ -101,6 +101,13 @@ local on_attach = function(client, bufnr)
   end
 end
 
+local gen_capabilities = function(cmp)
+  -- nvim-cmp supports additional completion capabilities, so broadcast that to servers
+  local capabilities = vim.lsp.protocol.make_client_capabilities()
+  capabilities = cmp.default_capabilities(capabilities)
+end
+
+
 return {
   {
     "lvimuser/lsp-inlayhints.nvim",
@@ -146,8 +153,7 @@ return {
 
       -- LSP
       -- nvim-cmp supports additional completion capabilities, so broadcast that to servers
-      local capabilities = vim.lsp.protocol.make_client_capabilities()
-      capabilities = require("cmp_nvim_lsp").default_capabilities(capabilities)
+      local capabilities = gen_capabilities(require("cmp_nvim_lsp"));
 
       -- Install servers used
       mason_lspconfig.setup({
@@ -238,9 +244,13 @@ return {
     build = prereqs,
     opts = {
       server = {
-        on_attach = on_attach
+        on_attach = on_attach,
       },
     },
+    config = function(_, opts)
+      opts.server.capabilities = gen_capabilities(require("cmp_nvim_lsp"));
+      require('rust-tools').setup(opts)
+    end
     --config = function(_, opts)
     --require('rust-tools').setup(opts)
     --end
diff --git a/lua/plugins/surround.lua b/lua/plugins/surround.lua
new file mode 100644
index 0000000..441b788
--- /dev/null
+++ b/lua/plugins/surround.lua
@@ -0,0 +1,3 @@
+return {
+  "tpope/vim-surround",
+}
diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua
index bb4ffd3..38b399f 100644
--- a/lua/plugins/telescope.lua
+++ b/lua/plugins/telescope.lua
@@ -11,7 +11,9 @@ return {
 		{
 			"<leader>ff",
 			function()
-				require("telescope.builtin").find_files()
+				require("telescope.builtin").find_files({
+          hidden = true
+        })
 			end,
 			desc = "Find Files",
 		},
diff --git a/lua/tools/scratch-files.lua b/lua/tools/scratch-files.lua
index 0e44b83..95a13f9 100644
--- a/lua/tools/scratch-files.lua
+++ b/lua/tools/scratch-files.lua
@@ -29,7 +29,7 @@ require("util").keymaps({
 			function()
 				scratch(".txt")
 			end,
-			desc = "New text scratch file",
+			desc = "New [t]e[xt] scratch file",
 		},
 		["<leader>sn"] = {
 			function()
@@ -41,7 +41,7 @@ require("util").keymaps({
 			function()
 				scratch(".md")
 			end,
-			desc = "New markdown scratch file",
+			desc = "New [m]ark[d]own scratch file",
 		},
 		["<leader>sq"] = {
 			function()
@@ -53,19 +53,25 @@ require("util").keymaps({
 			function()
 				scratch(".ts")
 			end,
-			desc = "New ts scratch file",
+			desc = "New [t]ype[s]cript scratch file",
 		},
 		["<leader>sb"] = {
 			function()
 				scratch(".sh")
 			end,
-			desc = "New shell scratch file",
+			desc = "New [sh]ell scratch file",
 		},
 		["<leader>sj"] = {
 			function()
 				scratch(".js")
 			end,
-			desc = "New js scratch file",
+			desc = "New [j]ava[s]cript scratch file",
+		},
+		["<leader>sr"] = {
+			function()
+				scratch(".rs")
+			end,
+			desc = "New [r]u[s]t scratch file",
 		},
 	},
 })