diff --git a/config/.config/nvim/lazy-lock.json b/config/.config/nvim/lazy-lock.json
index 8adf4ce..d955434 100644
--- a/config/.config/nvim/lazy-lock.json
+++ b/config/.config/nvim/lazy-lock.json
@@ -6,7 +6,7 @@
   "ai.nvim": { "branch": "main", "commit": "ab6b6f54612500f48d4d34fcf81529946b9338f3" },
   "asyncrun.vim": { "branch": "master", "commit": "61cc3081963a12048e00e89f8cedc8bd1cb83b8c" },
   "bufferline.nvim": { "branch": "main", "commit": "6c456b888823d9e4832aa91c482bccd19445c009" },
-  "catppuccin": { "branch": "main", "commit": "048c18fc531703815f5e10765ea46ce9b2c75ae4" },
+  "catppuccin": { "branch": "main", "commit": "bc1f2151f23227ba02ac203c2c59ad693352a741" },
   "ciderlsp-nvim": { "branch": "main", "commit": "00a86f96f4b8b9e94f0978c2db316447cc30a573" },
   "cmp-async-path": { "branch": "main", "commit": "d8229a93d7b71f22c66ca35ac9e6c6cd850ec61d" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
@@ -25,23 +25,26 @@
   "cmp-under-comparator": { "branch": "master", "commit": "6857f10272c3cfe930cece2afa2406e1385bfef8" },
   "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
   "conflict-marker.vim": { "branch": "master", "commit": "11a4d42244755505b66b15cd4496a150432eb5e3" },
-  "conform.nvim": { "branch": "master", "commit": "3d59cbd01a4b74124c5a6fb23b8cc63e5c2db3d5" },
+  "conform.nvim": { "branch": "master", "commit": "d99b75b4aedf0e912f41c5740a7267de739cddac" },
   "crates.nvim": { "branch": "main", "commit": "1dffccc0a95f656ebe00cacb4de282473430c5a1" },
   "dashboard-nvim": { "branch": "master", "commit": "63df28409d940f9cac0a925df09d3dc369db9841" },
   "debugprint.nvim": { "branch": "main", "commit": "0c81cd2bab372bba99815f505eb1fe759d38dd88" },
   "ferris.nvim": { "branch": "main", "commit": "52e39c017f511e8cf9a024022d48164bfbfe52ee" },
   "fidget.nvim": { "branch": "main", "commit": "3a93300c076109d86c7ce35ec67a8034ae6ba9db" },
-  "firenvim": { "branch": "master", "commit": "471354b1721d7082ffc3468dc84578e6ee42f163" },
-  "friendly-snippets": { "branch": "main", "commit": "69a2c1675b66e002799f5eef803b87a12f593049" },
-  "fzf": { "branch": "master", "commit": "09b0958b5f2b4ab0337f0c5125edba505462d162" },
+  "firenvim": { "branch": "master", "commit": "f2dd6d3bcf3309a7dd30c79b3b3c03ab55cea6e2" },
+  "friendly-snippets": { "branch": "main", "commit": "aced40b66b7bae9bc2c37fd7b11841d54727a7b0" },
+  "fzf": { "branch": "master", "commit": "da752fc9a4b3cb9dd08cc80614a491f980436b46" },
   "fzf.vim": { "branch": "master", "commit": "f6cb5b17897ff0c38f60fecd4b529678bcfec259" },
+  "gcert.nvim": { "branch": "main", "commit": "9dce1af29c31b97a51bab24e25695c25a367141e" },
   "git-conflict.nvim": { "branch": "main", "commit": "4c8e252b87d54d944c1e56bfb477f78b6fdaf661" },
   "go.nvim": { "branch": "master", "commit": "24d2fa373d55d9900cd4b502a88214dc17e6fab6" },
+  "googlepaths.nvim": { "branch": "main", "commit": "b46baaaec3f5dbf634d2ea722bb89c376f4eaecb" },
   "guihua.lua": { "branch": "master", "commit": "9fb6795474918b492d9ab01b1ebaf85e8bf6fe0b" },
   "hg": { "branch": "main", "commit": "1c4bdf80174ec840ba76c4dc7032c4313db62199" },
   "java-syntax.vim": { "branch": "master", "commit": "9a3d76a8c6cd7765ba93a7bdd9280594167e3f1b" },
+  "kanagawa.nvim": { "branch": "master", "commit": "c19b9023842697ec92caf72cd3599f7dd7be4456" },
   "kotlin-vim": { "branch": "master", "commit": "53fe045906df8eeb07cb77b078fc93acda6c90b8" },
-  "lazy.nvim": { "branch": "main", "commit": "28126922c9b54e35a192ac415788f202c3944c9f" },
+  "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" },
   "lazygit.nvim": { "branch": "main", "commit": "1e08e3f5ac1152339690140e61a4a32b3bdc7de5" },
   "leap.nvim": { "branch": "main", "commit": "9f7cf0a87ca2c3f47df37ef6787d34a65604d248" },
   "libp.nvim": { "branch": "main", "commit": "636b1748e92f66022c1763f32b2ded6b8606eda5" },
@@ -53,17 +56,17 @@
   "lualine.nvim": { "branch": "master", "commit": "566b7036f717f3d676362742630518a47f132fff" },
   "luasnip-google.nvim": { "branch": "main", "commit": "5fd7feb144de0ecea837618c9c9e1bbecc0e3243" },
   "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "3ba1b92b771f33256b4969d696b82c8ae7075364" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "b9084b1f42f790d6230dc66dbcb6bcc35b148552" },
   "mason.nvim": { "branch": "main", "commit": "9c9416817c9f4e6f333c749327a1ed5355cfab61" },
   "mellifluous.nvim": { "branch": "main", "commit": "da719202489e37e3d5de29b5a0d650fa7f980cfd" },
   "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" },
   "neo-tree.nvim": { "branch": "v2.x", "commit": "80dc74d081823649809f78370fa5b204aa9a853a" },
-  "neodev.nvim": { "branch": "main", "commit": "5bbbeda6a9c672f314c95ca47a8b495cf6de17f9" },
+  "neodev.nvim": { "branch": "main", "commit": "e7ca4a2ea0da5e39a639c08c3edb352b9355f09e" },
   "neoscopes": { "branch": "main", "commit": "470dff042004b93c10d262e8b0ad7bf6f703f86f" },
   "neovim-ayu": { "branch": "master", "commit": "6463d39253bb70e2b867fce57f9e7174f657bd1b" },
   "neovim-throttle-debounce": { "branch": "main", "commit": "5247b097df15016ab31db672b77ec4938bb9cbfd" },
   "nui.nvim": { "branch": "main", "commit": "35da9ca1de0fc4dda96c2e214d93d363c145f418" },
-  "nvgoog": { "branch": "main", "commit": "75a9414f929c0e9454058f40dc57f096f7682ea0" },
+  "nvgoog": { "branch": "main", "commit": "8e1dd8f5bdfce3d634e4d9e0c9482170a43cb8c2" },
   "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" },
   "nvim-cmp-buffer-lines": { "branch": "master", "commit": "924ccc04dc5c919b6baa05d45818025baa82699a" },
   "nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" },
@@ -77,19 +80,20 @@
   "nvim-luapad": { "branch": "master", "commit": "a5b3d6aa1fe5fe75e6124927392a9d3a60a0ecce" },
   "nvim-scrollbar": { "branch": "main", "commit": "35f99d559041c7c0eff3a41f9093581ceea534e8" },
   "nvim-surround": { "branch": "main", "commit": "703ec63aa798e5e07d309b35e42def34bebe0174" },
-  "nvim-treesitter": { "branch": "master", "commit": "cd4e0909948eb33d3959e133c16f837e4db122c6" },
-  "nvim-web-devicons": { "branch": "master", "commit": "140edfcf25093e8b321d13e154cbce89ee868ca0" },
+  "nvim-treesitter": { "branch": "master", "commit": "81660800352ecab6a2e95f4ca30d637df1f3765e" },
+  "nvim-web-devicons": { "branch": "master", "commit": "b427ac5f9dff494f839e81441fb3f04a58cbcfbc" },
   "omnisharp-extended-lsp.nvim": { "branch": "main", "commit": "4be2e8689067494ed7e5a4f1221adc31d1a07783" },
   "onedark.nvim": { "branch": "main", "commit": "b5161f0c631571640485be5d1c059cab82c86872" },
   "persisted.nvim": { "branch": "main", "commit": "edd8aa41cd87f9da1b6ef0c584068dea192f65b7" },
   "plenary.nvim": { "branch": "master", "commit": "663246936325062427597964d81d30eaa42ab1e4" },
   "refactoring.nvim": { "branch": "master", "commit": "f4546284059f7dc01f65be93d03f6c850fd2aba1" },
-  "rustaceanvim": { "branch": "master", "commit": "a095a1f9397310d108ead239edc068b2624695b6" },
+  "rustaceanvim": { "branch": "master", "commit": "94dbc3479630b79f1fc05bad91dfeede50b9036c" },
   "scope.nvim": { "branch": "main", "commit": "cd27af77ad61a7199af5c28d27013fb956eb0e3e" },
+  "sonokai": { "branch": "master", "commit": "42822f8f9b3a5088f05cf72a0aa1477598ad1a40" },
   "tagalong.vim": { "branch": "main", "commit": "5a2bbf2b1d5b657685a49d48d98a4aa921c1fde3" },
   "telescope-dap.nvim": { "branch": "master", "commit": "8c88d9716c91eaef1cdea13cb9390d8ef447dbfe" },
   "telescope-import.nvim": { "branch": "main", "commit": "08e31708451b43d1ef766d370d5ef17e9f0c24ae" },
-  "telescope.nvim": { "branch": "master", "commit": "20efb3864903fb854a85faf57513ffd80582275b" },
+  "telescope.nvim": { "branch": "master", "commit": "301505da4bb72d11ffeee47ad45e0b677f70abe5" },
   "telescope_citc": { "branch": "main", "commit": "f0f74127e262d097119d2946634d3aa7e49b0c2f" },
   "telescope_codesearch": { "branch": "main", "commit": "a26077ad3c68cf897ae1c31da903d6516ebb9c92" },
   "telescope_fig": { "branch": "main", "commit": "f6122fe82417ebeaddb9343cfd5584f62a4b8df8" },
diff --git a/vim/.vim/lua/plugins/diagnostics.lua b/vim/.vim/lua/plugins/diagnostics.lua
index e3837bc..2d5956e 100644
--- a/vim/.vim/lua/plugins/diagnostics.lua
+++ b/vim/.vim/lua/plugins/diagnostics.lua
@@ -1,3 +1,6 @@
+-- disable underline
+vim.diagnostic.handlers.underline.show = function() end
+
 return {
 	{
 		"folke/trouble.nvim",
diff --git a/vim/.vim/lua/plugins/google.lua b/vim/.vim/lua/plugins/google.lua
index f166434..800d0e8 100644
--- a/vim/.vim/lua/plugins/google.lua
+++ b/vim/.vim/lua/plugins/google.lua
@@ -36,9 +36,9 @@ return {
 	veryLazy(glug("logmsgs")),
 	veryLazy(glug("googler")),
 	-- Add support for google filetypes
-	glug("google-filetypes", {
+	veryLazy(glug("google-filetypes", {
 		event = "BufReadPre",
-	}),
+	})),
 	-- Set up syntax, indent, and core settings for various filetypes
 	veryLazy(glug("ft-cel")),
 	veryLazy(glug("ft-clif")),
@@ -237,7 +237,7 @@ return {
 		end,
 	}),
 	-- Imports
-	glug("imp-google", {
+	veryLazy(glug("imp-google", {
 		dependencies = {
 			glugOpts("vim-imp", {
 				"flwyd/vim-imp",
@@ -254,7 +254,7 @@ return {
 		keys = {
 			{ "<leader>i", ":ImpSuggest <C-r><C-w><cr>" },
 		},
-	}),
+	})),
 	{
 		name = "ai.nvim",
 		url = "sso://googler@user/vvvv/ai.nvim",
diff --git a/vim/.vim/lua/plugins/lsp.lua b/vim/.vim/lua/plugins/lsp.lua
index a97e379..ee5a747 100644
--- a/vim/.vim/lua/plugins/lsp.lua
+++ b/vim/.vim/lua/plugins/lsp.lua
@@ -1,13 +1,5 @@
 local use_google = require("utils").use_google
 
-local deps = {
-	"hrsh7th/nvim-cmp",
-	"nvim-lua/lsp-status.nvim",
-	"VonHeikemen/lsp-zero.nvim",
-	"ray-x/go.nvim",
-	"ray-x/guihua.lua",
-}
-
 return {
 	{
 		"luozhiya/lsp-virtual-improved.nvim",
@@ -18,6 +10,7 @@ return {
 	},
 	{
 		"kosayoda/nvim-lightbulb",
+		event = { "LspAttach" },
 		opts = {
 			autocmd = { enabled = true },
 			virtual_text = {
@@ -38,6 +31,7 @@ return {
 	},
 	{
 		"hinell/lsp-timeout.nvim",
+		event = { "LspAttach" },
 		dependencies = { "neovim/nvim-lspconfig" },
 		cond = not use_google(),
 		config = function()
@@ -53,7 +47,13 @@ return {
 	},
 	{
 		"neovim/nvim-lspconfig",
-		dependencies = deps,
+		dependencies = {
+			"hrsh7th/nvim-cmp",
+			"nvim-lua/lsp-status.nvim",
+			"VonHeikemen/lsp-zero.nvim",
+			"ray-x/go.nvim",
+			"ray-x/guihua.lua",
+		},
 		keys = {
 			{ "<leader>rn", "<cmd>lua vim.lsp.buf.rename()<CR>" },
 			-- { "?", "<cmd>lua vim.lsp.buf.code_action()<CR>" },
diff --git a/vim/.vim/lua/plugins/telescope.lua b/vim/.vim/lua/plugins/telescope.lua
index 11cbafd..7c50805 100644
--- a/vim/.vim/lua/plugins/telescope.lua
+++ b/vim/.vim/lua/plugins/telescope.lua
@@ -36,20 +36,20 @@ local function get_visual_selection()
 end
 
 local keys = {
-	{ "<leader>ts", "<cmd>lua live_grep()<CR>", desc = "Search in CWD" },
-	{ "<leader>tk", "<cmd>Telescope Keymaps<CR>", desc = "Search Keymaps" },
-	{ "<C-P>", "<cmd>lua find_files()<CR>", desc = "Find Files in CWD" },
-	{ "<leader>tf", "<cmd>lua find_files()<CR>", desc = "Find Files in CWD" },
-	{ "<leader>td", "<cmd>lua find_dotfiles()<CR>", desc = "Find Dotfiles" },
-	{ "<leader>tn", ":Telescope notify<CR>", desc = "Notifications" },
-	{ "<leader>tk", ":Telescope keymaps<CR>", desc = "Keymaps" },
-	{ "<leader>tf.", "<cmd>lua vim.error('use <leader>e')<CR>", desc = "Find Files in Buffer Directory" },
-	{ "<leader>e", "<cmd>lua search_cwd()<CR>", desc = "Find Files in Buffer Directory" },
+	{ "<C-P>", ":lua find_files()<CR>", desc = "Find Files in CWD" },
+	{ "<leader>e", ":lua search_cwd()<CR>", desc = "Find Files in Buffer Directory" },
+	{ "<leader>tc", ":Telescope textcase<CR>", desc = "Text case" },
+	{ "<leader>td", ":lua find_dotfiles()<CR>", desc = "Find Dotfiles" },
+	{ "<leader>tf", ":lua find_files()<CR>", desc = "Find Files in CWD" },
+	{ "<leader>tf.", ":lua vim.error('use <leader>e')<CR>", desc = "Find Files in Buffer Directory" },
 	{ "<leader>tg", ":Telescope git_files<CR>", desc = "Git Files" },
-	{ "<leader>tr", ":Telescope resume<CR>", desc = "Telescope Resume" },
+	{ "<leader>th", ":lua require('telescope.builtin').help_tags{}<CR>", desc = "[T]elescope [H]elp" },
+	{ "<leader>tk", ":Telescope keymaps<CR>", desc = "Keymaps" },
+	{ "<leader>tk", ":Telescope Keymaps<CR>", desc = "Search Keymaps" },
+	{ "<leader>tn", ":Telescope notify<CR>", desc = "Notifications" },
 	{ "<leader>to", ":Telescope oldfiles<CR>", desc = "Recent(oldfiles) Files" },
-	{ "<leader>th", "<cmd>lua require('telescope.builtin').help_tags{}<CR>", desc = "[T]elescope [H]elp" },
-	{ "<leader>tns", [[<cmd>lua require("neoscopes").select()<CR>]], desc = "NeoScopes" },
+	{ "<leader>tr", ":Telescope resume<CR>", desc = "Telescope Resume" },
+	{ "<leader>ts", ":lua live_grep()<CR>", desc = "Search in CWD" },
 }
 
 if use_google() then
@@ -105,9 +105,13 @@ return {
 		config = function()
 			require("telescope").load_extension("import")
 		end,
-		keys = {
-			{ "<leader>i", ":Telescope import<CR>" },
-		},
+		keys = function()
+			if not use_google() then
+				return {
+					{ "<leader>i", ":Telescope import<CR>" },
+				}
+			end
+		end,
 	},
 	{
 		"nvim-telescope/telescope.nvim",
diff --git a/vim/.vim/lua/plugins/themes-personal.lua b/vim/.vim/lua/plugins/themes-personal.lua
index 8cd67eb..d7f738b 100644
--- a/vim/.vim/lua/plugins/themes-personal.lua
+++ b/vim/.vim/lua/plugins/themes-personal.lua
@@ -3,21 +3,21 @@ local use_google = require("utils").use_google
 return {
 	{
 		"sainnhe/sonokai",
-		cond = false,
+		-- cond = false,
 		config = function()
 			vim.g.sonokai_diagnostic_virtual_text = "highlighted"
 			vim.g.sonokai_style = "andromeda"
 			vim.g.sonokai_dim_inactive_windows = 1
-			vim.cmd("colorscheme sonokai")
+			-- vim.cmd("colorscheme sonokai")
 		end,
 	},
 	{
 		"rebelot/kanagawa.nvim",
 		lazy = use_google(), -- make sure we load this during startup if it is your main colorscheme
 		priority = 1000, -- make sure to load this before all the other start plugins
-		cond = not use_google(),
+		-- cond = not use_google(),
 		config = function()
-			vim.cmd("colorscheme kanagawa-wave")
+			-- vim.cmd("colorscheme kanagawa-wave")
 		end,
 	},
 	{