diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua
index 44084df..aef246c 100644
--- a/.config/nvim/lua/plugins.lua
+++ b/.config/nvim/lua/plugins.lua
@@ -72,13 +72,6 @@ return require("packer").startup({
 			"nvim-treesitter/nvim-treesitter",
 			run = ":TSUpdate",
 		})
-		-- Navic
-		use({
-			"SmiteshP/nvim-navic",
-			requires = {
-				"neovim/nvim-lspconfig",
-			},
-		})
 		-- Rainbow parentheses
 		use({
 			"p00f/nvim-ts-rainbow",
@@ -86,6 +79,28 @@ return require("packer").startup({
 				"nvim-treesitter/nvim-treesitter",
 			},
 		})
+		-- Autopair
+		use({
+			"windwp/nvim-autopairs",
+			requires = {
+				"nvim-treesitter/nvim-treesitter",
+			},
+		})
+		-- Autotag
+		use({
+			"windwp/nvim-ts-autotag",
+			requires = {
+				"nvim-treesitter/nvim-treesitter",
+			},
+		})
+
+		-- Navic
+		use({
+			"SmiteshP/nvim-navic",
+			requires = {
+				"neovim/nvim-lspconfig",
+			},
+		})
 
 		-- Cutlass
 		use("gbprod/cutlass.nvim")
diff --git a/.config/nvim/lua/plugins/autopairs.lua b/.config/nvim/lua/plugins/autopairs.lua
new file mode 100644
index 0000000..c07c894
--- /dev/null
+++ b/.config/nvim/lua/plugins/autopairs.lua
@@ -0,0 +1,11 @@
+local npairs = require("nvim-autopairs")
+local Rule = require("nvim-autopairs.rule")
+
+npairs.setup({
+	check_ts = true,
+})
+
+local cmp_autopairs = require("nvim-autopairs.completion.cmp")
+local cmp = require("cmp")
+
+cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done())
diff --git a/.config/nvim/lua/plugins/treesitter.lua b/.config/nvim/lua/plugins/treesitter.lua
index 5ef2026..229449c 100644
--- a/.config/nvim/lua/plugins/treesitter.lua
+++ b/.config/nvim/lua/plugins/treesitter.lua
@@ -28,4 +28,7 @@ require("nvim-treesitter.configs").setup({
 		enable = true,
 		extended_mode = true,
 	},
+	autotag = {
+		enable = true,
+	},
 })