diff --git a/vim/.vim/lua/plugins/google.lua b/vim/.vim/lua/plugins/google.lua
index dff5f7e..b6c8af4 100644
--- a/vim/.vim/lua/plugins/google.lua
+++ b/vim/.vim/lua/plugins/google.lua
@@ -6,8 +6,10 @@ end
 
 vim.opt.rtp:append("/google/src/head/depot/google3/experimental/users/fentanes/nvgoog")
 
-local glug = require("nvgoog.google.util.glug").glug
-local glugOpts = require("nvgoog.google.util.glug").glugOpts
+-- local glug = require("nvgoog.google.util.glug").glug
+-- local glugOpts = require("nvgoog.google.util.glug").glugOpts
+local glug = require("glug").glug
+local glugOpts = require("glug").glugOpts
 local veryLazy = require("nvgoog.util").veryLazy
 
 return {
@@ -16,7 +18,6 @@ return {
 	-- Load google paths like //google/* with `gf`
 	{ import = "nvgoog.google.misc" },
 	-- maktaba is required by all google plugins
-	-- maktaba is required by all google plugins
 	glug("maktaba", {
 		lazy = true,
 		dependencies = {},
@@ -88,14 +89,7 @@ return {
 			"CorpWebChromeCs",
 		},
 	}),
-	{
-		name = "relatedfiles",
-		dir = "/usr/share/vim/google/relatedfiles",
-		dependencies = { "glaive" },
-		config = function()
-			vim.cmd([[Glaive relatedfiles]])
-		end,
-
+	glug("relatedfiles", {
 		keys = {
 			{
 				"<leader>rb",
@@ -110,7 +104,7 @@ return {
 				":exec relatedfiles#selector#JumpToCodeFile()<CR>",
 			},
 		},
-	},
+	}),
 	{ "junegunn/fzf", dir = "~/.fzf", build = "./install --all" },
 	{ "junegunn/fzf.vim", dependencies = { "junegunn/fzf" } },
 	-- Format google code
@@ -127,7 +121,7 @@ return {
 			clang_format_style = "function('codefmtgoogle#GetClangFormatStyle')",
 			gofmt_executable = "/usr/lib/google-golang/bin/gofmt",
 			prettier_executable = "/google/data/ro/teams/prettier/prettier",
-			ktfmt_executable = { "/google/bin/releases/kotlin-google-eng/ktfmt/ktfmt_deploy.jar", "--google-style" },
+			ktfmt_executable = { "/google/bin/releases/kotlin-google-eng/ktfmt", "--google-style" },
 			auto_format = {
 				["borg"] = "gclfmt",
 				["gcl"] = "gclfmt",
@@ -140,6 +134,7 @@ return {
 				["dart"] = "dartfmt",
 				["go"] = "gofmt",
 				["java"] = "google-java-format",
+				["kotlin"] = "ktfmt",
 				["jslayout"] = "jslfmt",
 				["markdown"] = "mdformat",
 				["ncl"] = "nclfmt",