diff --git a/lua/plugins.lua b/lua/plugins.lua
index c14a476..10b062a 100644
--- a/lua/plugins.lua
+++ b/lua/plugins.lua
@@ -1,12 +1,25 @@
 local plugins = {
+	{
+		"kylechui/nvim-surround",
+		version = "*", -- Use for stability; omit to use `main` branch for the latest features
+		event = "VeryLazy",
+		config = function()
+			require("nvim-surround").setup({
+                keymaps = {
+                    visual = "<leader>s",
+                    visual_line = "<leader>s"
+                }
+            })
+		end,
+	},
 	{
 		"akinsho/bufferline.nvim",
 		version = "*",
 		dependencies = "nvim-tree/nvim-web-devicons",
 	},
-    {
-        "akinsho/toggleterm.nvim"
-    },
+	{
+		"akinsho/toggleterm.nvim",
+	},
 	{
 		dir = "/home/meyer/dev/lua/vencord.nvim",
 	},
diff --git a/lua/setuplsp.lua b/lua/setuplsp.lua
index 6f3ab50..32907d3 100644
--- a/lua/setuplsp.lua
+++ b/lua/setuplsp.lua
@@ -95,20 +95,21 @@ local function setupJDTLS()
 	}
 	return config
 end
-vim.api.nvim_create_autocmd("FileType", {
-	pattern = "java",
-	callback = function()
-		local jdtls = require("jdtls")
-		jdtls.start_or_attach(setupJDTLS())
-		-- require("jdtls").setup_dap()
-		vim.keymap.set({ "n", "i" }, "<A-F>", function()
-			require("jdtls").organize_imports()
-			vim.lsp.buf.format()
-		end, {})
-	end,
-})
+-- vim.api.nvim_create_autocmd("FileType", {
+-- 	pattern = "java",
+-- 	callback = function()
+-- 		local jdtls = require("jdtls")
+-- 		jdtls.start_or_attach(setupJDTLS())
+-- 		-- require("jdtls").setup_dap()
+-- 		vim.keymap.set({ "n", "i" }, "<A-F>", function()
+-- 			require("jdtls").organize_imports()
+-- 			vim.lsp.buf.format()
+-- 		end, {})
+-- 	end,
+-- })
 -- ENDjdtls
 require("lspconfig").emmet_language_server.setup({
+    filetypes = {"css", "scss", "sass", "less", "html"}
 	capabilities = capabilities,
 })
 require("lspconfig").cssls.setup({
diff --git a/lua/setupterminal.lua b/lua/setupterminal.lua
index f49f17b..b142625 100644
--- a/lua/setupterminal.lua
+++ b/lua/setupterminal.lua
@@ -29,11 +29,12 @@ require("toggleterm").setup({
 	-- shading_factor = "<number>", -- the percentage by which to lighten dark terminal background, default: -30
 	-- shading_ratio = "<number>", -- the ratio of shading factor for light/dark terminal background, default: -3
 	start_in_insert = true,
-	insert_mappings = true, -- whether or not the open mapping applies in insert mode
+	insert_mappings = false, -- whether or not the open mapping applies in insert mode
 	terminal_mappings = true, -- whether or not the open mapping applies in the opened terminals
 	persist_size = true,
 	persist_mode = true, -- if set to true (default) the previous terminal mode will be remembered
-	direction = "horizontal",
+	direction = "tab",
+	-- direction = "horizontal",
 	close_on_exit = true, -- close the terminal window when the process exits
 	-- Change the default shell. Can be a string or a function returning a string
 	shell = vim.o.shell,