diff --git a/ftplugin/kotlin.lua b/ftplugin/kotlin.lua
index 94d00e9..a7cd09d 100644
--- a/ftplugin/kotlin.lua
+++ b/ftplugin/kotlin.lua
@@ -2,3 +2,25 @@ vim.opt_local.expandtab = true
 vim.opt_local.shiftwidth = 4
 vim.opt_local.tabstop = 4
 vim.opt_local.softtabstop = 4
+
+local lspconfig_status_ok, lspconfig = pcall(require, "lspconfig")
+if not lspconfig_status_ok then
+	return
+end
+
+lspconfig.kotlin_language_server.setup({
+	on_attach = require("user.lsp.handlers").on_attach,
+	capabilities = require("user.lsp.handlers").capabilities,
+	cmd = { "kotlin-language-server" },
+	filetypes = { "kotlin" },
+	root_dir = require("lspconfig.util").root_pattern(
+		"build.gradle.kts",
+		"build.gradle",
+		"settings.gradle",
+		"gradlew",
+		"pom.xml",
+		"build.gradle.kts",
+		"build.kts",
+		".git"
+	),
+})
diff --git a/lua/user/whichkey.lua b/lua/user/whichkey.lua
index 4542689..6d46711 100644
--- a/lua/user/whichkey.lua
+++ b/lua/user/whichkey.lua
@@ -329,15 +329,15 @@ local mappings = {
 		f = { "<cmd>RunFile<CR>", "Run File" },
 		p = { "<cmd>RunProject<CR>", "Run Project" },
 		g = { "<cmd>terminal gradle run<cr>", "Run Gradle" },
-		-- m = {
-		-- 	"<cmd>terminal mvn package<cr>",
-		-- 	"MVN Build",
-		-- },
 		m = {
-			name = "Maven",
-			b = { "<cmd>terminal mvn package<cr>", "MVN Build" },
-			r = { "<cmd>terminal java -jar target/my-app.jar<cr>", "Run JAR" },
+			"<cmd>terminal mvn package<cr>",
+			"MVN Build",
 		},
+		-- m = {
+		-- 	name = "Maven",
+		-- 	b = { "<cmd>terminal mvn package<cr>", "MVN Build" },
+		-- 	r = { "<cmd>terminal java -jar target/my-app.jar<cr>", "Run JAR" },
+		-- },
 	},
 	-- D = {
 	-- 	name = "Debug",