diff --git a/lua/user/keymaps.lua b/lua/user/keymaps.lua
index e132b02..5762456 100644
--- a/lua/user/keymaps.lua
+++ b/lua/user/keymaps.lua
@@ -62,7 +62,7 @@ keymap("n", "<C-_>", "<esc><cmd>lua require('Comment.api').toggle.linewise.curre
 -- keymap("i", "<C-l>", "<esc><cmd>lua _LIVE_SERVER()<cr>", opts)
 
 -- ALT + l to open terminal and run live-server
-keymap("n", "<A-l>", "<cmd>terminal<cr>live-server<cr>", opts)
+keymap("n", "<A-l>", "<cmd>terminal live-server<cr>", opts)
 
 -- Resize with arrows
 -- cona
diff --git a/lua/user/whichkey.lua b/lua/user/whichkey.lua
index 331e7e5..c129e82 100644
--- a/lua/user/whichkey.lua
+++ b/lua/user/whichkey.lua
@@ -302,7 +302,8 @@ local mappings = {
 
 	t = {
 		name = "  Terminal",
-		l = { "<cmd>lua _LIVE_SERVER()<cr>", "Live Server" },
+		-- l = { "<cmd>lua _LIVE_SERVER()<cr>", "Live Server" },
+		l = { "<cmd>terminal live-server<cr>", "Live Server" },
 		P = { "<cmd>lua _NEWTAB_TOGGLE()<cr>", "Power Shell" },
 		-- l = { "<cmd>ToggleTerm direction=tab<cr>live-server<cr>", "Live Server" },
 		x = { "<cmd>ToggleTermToggleAll!<cr>", "Close Tab" },
@@ -327,7 +328,7 @@ local mappings = {
 		r = { "<cmd>RunCode<CR>", "Run Code" },
 		f = { "<cmd>RunFile<CR>", "Run File" },
 		p = { "<cmd>RunProject<CR>", "Run Project" },
-		g = { "<cmd>terminal<cr>gradle run<cr>", "Run Gradle" },
+		g = { "<cmd>terminal gradle run<cr>", "Run Gradle" },
 		m = {
 			"<cmd>ToggleTerm size=70 direction=float<cr>mvn exec:java -Dexec.mainClass=com.pojokcode.App<cr>",
 			"Run MVN",