diff --git a/.config/nvim/lua/config/plugins.lua b/.config/nvim/lua/config/plugins.lua
index 51f3d90..f710e6a 100644
--- a/.config/nvim/lua/config/plugins.lua
+++ b/.config/nvim/lua/config/plugins.lua
@@ -48,17 +48,22 @@ return packer.startup(function(use)
   use { "tpope/vim-fugitive", event = "User InGitRepo" }
 
   -- Editing
+  use { "andymass/vim-matchup", after = "nvim-treesitter" }
   use { "godlygeek/tabular" }
   use { "JoosepAlviste/nvim-ts-context-commentstring", after = "nvim-treesitter" }
   use { "kana/vim-textobj-user" }
   use { "mg979/vim-visual-multi", branch = "master" }
+  use { "nvim-treesitter/nvim-treesitter-context", after = "nvim-treesitter" }
+  use { "nvim-treesitter/nvim-treesitter-textobjects", after = "nvim-treesitter" }
+  use { "p00f/nvim-ts-rainbow", after = "nvim-treesitter" }
   use { "terryma/vim-expand-region" }
   use { "tommcdo/vim-exchange", event = "VimEnter" }
   use { "tpope/vim-abolish" }
   use { "tpope/vim-commentary", event = "VimEnter" }
   use { "tpope/vim-repeat", event = "VimEnter" }
   use { "tpope/vim-surround", event = "VimEnter" }
-  use { "windwp/nvim-autopairs" }
+  use { "windwp/nvim-autopairs", after = "nvim-treesitter" }
+  use { "windwp/nvim-ts-autotag", after = "nvim-treesitter" }
 
   -- UI
   use { "junegunn/goyo.vim" }
diff --git a/.config/nvim/lua/config/treesitter.lua b/.config/nvim/lua/config/treesitter.lua
index c1688af..fcfd616 100644
--- a/.config/nvim/lua/config/treesitter.lua
+++ b/.config/nvim/lua/config/treesitter.lua
@@ -44,11 +44,29 @@ require("nvim-treesitter.configs").setup({
     enable = true,
     disable = {},
   },
-  indent = {
+  indent = { enable = true },
+  incremental_selection = {
     enable = true,
+    keymaps = {
+      init_selection = "gnn",
+      node_incremental = "grn",
+      scope_incremental = "grc",
+      node_decremental = "grm",
+    },
   },
-  context_commentstring = {
-    enable = true,
+  -- Extensions
+  autotag = { enable = true },
+  context_commentstring = { enable = true },
+  matchup = { enable = true },
+  rainbow = { enable = true },
+  textobjects = {
+    select = {
+      enable = true,
+      keymaps = {
+        ["af"] = "@function.outer",
+        ["if"] = "@function.inner",
+      },
+    },
   },
 })