diff --git a/after/plugin/neoclip.lua b/after/plugin/neoclip.lua
index f2a7da7..c7f339a 100644
--- a/after/plugin/neoclip.lua
+++ b/after/plugin/neoclip.lua
@@ -1,58 +1,58 @@
 require('neoclip').setup({
     history = 1000,
-      enable_persistent_history = false,
-      length_limit = 1048576,
-      continuous_sync = false,
-      db_path = vim.fn.stdpath("data") .. "/databases/neoclip.sqlite3",
-      filter = nil,
-      preview = true,
-      prompt = nil,
-      default_register = '"',
-      default_register_macros = 'q',
-      enable_macro_history = true,
-      content_spec_column = false,
-      disable_keycodes_parsing = false,
-      on_select = {
+    enable_persistent_history = false,
+    length_limit = 1048576,
+    continuous_sync = false,
+    db_path = vim.fn.stdpath("data") .. "/databases/neoclip.sqlite3",
+    filter = nil,
+    preview = true,
+    prompt = nil,
+    default_register = '"',
+    default_register_macros = 'q',
+    enable_macro_history = true,
+    content_spec_column = false,
+    disable_keycodes_parsing = false,
+    on_select = {
         move_to_front = false,
         close_telescope = true,
-      },
-      on_paste = {
+    },
+    on_paste = {
         set_reg = false,
         move_to_front = false,
         close_telescope = true,
-      },
-      on_replay = {
+    },
+    on_replay = {
         set_reg = false,
         move_to_front = false,
         close_telescope = true,
-      },
-      on_custom_action = {
+    },
+    on_custom_action = {
         close_telescope = true,
-      },
-      keys = {
+    },
+    keys = {
         telescope = {
-          i = {
-            select = '<cr>',
-            paste = '<c-j>',
-            paste_behind = '<c-k>',
-            replay = '<c-q>',  -- replay a macro
-            delete = '<c-d>',  -- delete an entry
-            edit = '<c-e>',  -- edit an entry
-            custom = {},
-          },
-          n = {
-            select = '<cr>',
-            paste = 'p',
-            --- It is possible to map to more than one key.
-            -- paste = { 'p', '<c-p>' },
-            paste_behind = 'P',
-            replay = 'q',
-            delete = 'd',
-            edit = 'e',
-            custom = {},
-          },
+            i = {
+                select = '<cr>',
+                paste = '<c-j>',
+                paste_behind = '<c-k>',
+                replay = '<c-q>',  -- replay a macro
+                delete = '<c-d>',  -- delete an entry
+                edit = '<c-e>',  -- edit an entry
+                custom = {},
+            },
+            n = {
+                select = '<cr>',
+                paste = 'p',
+                --- It is possible to map to more than one key.
+                -- paste = { 'p', '<c-p>' },
+                paste_behind = 'P',
+                replay = 'q',
+                delete = 'd',
+                edit = 'e',
+                custom = {},
+            },
         },
-      },
+    },
 })
 
 vim.keymap.set("n",  "<leader>o", "<cmd>Telescope neoclip<CR>", { desc = "Telescope Neoclip"})
diff --git a/after/plugin/parenthesis.lua b/after/plugin/parenthesis.lua
new file mode 100644
index 0000000..8554b43
--- /dev/null
+++ b/after/plugin/parenthesis.lua
@@ -0,0 +1,25 @@
+require("autoclose").setup({
+    keys = {
+        ["("] = { escape = false, close = true, pair = "()" },
+        ["["] = { escape = false, close = true, pair = "[]" },
+        ["{"] = { escape = false, close = true, pair = "{}" },
+
+        [">"] = { escape = true, close = false, pair = "<>" },
+        [")"] = { escape = true, close = false, pair = "()" },
+        ["]"] = { escape = true, close = false, pair = "[]" },
+        ["}"] = { escape = true, close = false, pair = "{}" },
+
+        ['"'] = { escape = true, close = true, pair = '""' },
+        ["'"] = { escape = true, close = true, pair = "''" },
+        ["`"] = { escape = true, close = true, pair = "``" },
+        ["$"] = { escape = true, close = true, pair = "$$", disabled_filetypes = {} },
+    },
+    options = {
+        disabled_filetypes = { "text" },
+        disable_when_touch = false,
+        touch_regex = "[%w(%[{]",
+        pair_spaces = true,
+        auto_indent = true,
+        disable_command_mode = false,
+    },
+})
diff --git a/lua/eddie/lazy.lua b/lua/eddie/lazy.lua
index a16a028..e6122d6 100644
--- a/lua/eddie/lazy.lua
+++ b/lua/eddie/lazy.lua
@@ -102,21 +102,22 @@ local plugins = {
             require('Comment').setup()
         end
     },
-    {
-        "windwp/nvim-autopairs",
-        config = function()
-            require("nvim-autopairs").setup()
-        end
-    },
-    {
-        "kylechui/nvim-surround",
-        version = "*", -- Use for stability; omit to use `main` branch for the latest features
-        event = "VeryLazy",
-        config = function()
-            require("nvim-surround").setup({
-            })
-        end
-    },
+    { 'm4xshen/autoclose.nvim' },
+    -- {
+    --     "windwp/nvim-autopairs",
+    --     config = function()
+    --         require("nvim-autopairs").setup()
+    --     end
+    -- },
+    -- {
+    --     "kylechui/nvim-surround",
+    --     version = "*", -- Use for stability; omit to use `main` branch for the latest features
+    --     event = "VeryLazy",
+    --     config = function()
+    --         require("nvim-surround").setup({
+    --         })
+    --     end
+    -- },
     { "nvim-tree/nvim-tree.lua" },
     {
         'nvim-lualine/lualine.nvim',