diff --git a/.config/nvim/lua/plugins/autocomplete.lua b/.config/nvim/lua/plugins/autocomplete.lua
index 214b639..727dc93 100644
--- a/.config/nvim/lua/plugins/autocomplete.lua
+++ b/.config/nvim/lua/plugins/autocomplete.lua
@@ -25,10 +25,13 @@ return {
       local cmp = require('cmp')
       local snippet = require('luasnip')
       local lspkind = require('lspkind')
+      local autopairs = require('nvim-autopairs.completion.cmp')
       local select_opts = { behavior = cmp.SelectBehavior.Select }
 
       require('luasnip.loaders.from_vscode').lazy_load()
 
+      cmp.event:on('confirm_done', autopairs.on_confirm_done())
+
       cmp.setup({
          enabled = function()
             -- disable completion in comments
@@ -200,4 +203,4 @@ return {
          },
       })
    end,
-}
\ No newline at end of file
+}
diff --git a/.config/nvim/lua/plugins/autopairs.lua b/.config/nvim/lua/plugins/autopairs.lua
index ea2daff..0524d9e 100644
--- a/.config/nvim/lua/plugins/autopairs.lua
+++ b/.config/nvim/lua/plugins/autopairs.lua
@@ -1,24 +1,14 @@
 return {
-   "windwp/nvim-autopairs",
-   event = { "InsertEnter" },
+   'windwp/nvim-autopairs',
+   event = { 'InsertEnter' },
    dependencies = {
-      "hrsh7th/nvim-cmp",
+      'hrsh7th/nvim-cmp',
+   },
+   opts = {
+      check_ts = true,
+      map_cr = false,
+      map_bs = true,
+      map_c_h = true, -- <C-h> deletes a pair
+      map_c_w = true, -- <C-w> delete pair if possible
    },
-
-   config = function()
-      local autopairs = require("nvim-autopairs")
-
-      autopairs.setup({
-         check_ts = true,
-         ts_config = {
-            lua = { "string" },
-            javascript = { "template_string" },
-            java = false,
-         },
-      })
-
-      local cmp_autopairs = require("nvim-autopairs.completion.cmp")
-      local cmp = require("cmp")
-      cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done())
-   end,
 }