diff --git a/laptop/config/plugins.lua b/laptop/config/plugins.lua
index 54be125..5ba512e 100644
--- a/laptop/config/plugins.lua
+++ b/laptop/config/plugins.lua
@@ -27,7 +27,11 @@ require("lazy").setup(
         -- Plugin for lean
         "julian/lean.nvim",
         -- Treesitter
-        { "nvim-treesitter/nvim-treesitter", build = ":TSUpdate" },
+        {
+            "nvim-treesitter/nvim-treesitter",
+            build = ":TSUpdate",
+            dependencies = { "nvim-treesitter/nvim-treesitter-textobjects" }
+        },
         -- LSP related plugins
         "neovim/nvim-lspconfig",
         "nvim-lua/plenary.nvim",
@@ -44,9 +48,9 @@ require("lazy").setup(
         },
         "SirVer/ultisnips", -- For snippets
         -- Support programming terms
-        { "psliwka/vim-dirtytalk",           build = ":DirtytalkUpdate" },
+        { "psliwka/vim-dirtytalk",     build = ":DirtytalkUpdate" },
         -- vim-moonfly theme
-        { "bluz71/vim-moonfly-colors",       as = "moonfly" },
+        { "bluz71/vim-moonfly-colors", as = "moonfly" },
         -- Rust tools
         "simrat39/rust-tools.nvim",
         -- Automatically add bracket pairs
@@ -61,6 +65,7 @@ require("lazy").setup(
         "junegunn/fzf",
         "junegunn/fzf.vim",
         "karb94/neoscroll.nvim",
+        "hiphish/rainbow-delimiters.nvim",
     },
     {
         lockfile = vim.fn.stdpath("config") .. "/config/lazy-lock.json",
diff --git a/laptop/plugin/treesitter.lua b/laptop/plugin/treesitter.lua
index 4fe650f..c300afd 100644
--- a/laptop/plugin/treesitter.lua
+++ b/laptop/plugin/treesitter.lua
@@ -10,4 +10,79 @@ configs.setup({
         disable = { "make" },
     },
     indent = { enable = true },
+    incremental_selection = {
+        enable = true,
+        keymaps = {
+            init_selection = "<C-space>",
+            node_incremental = "<C-space>",
+            scope_incremental = false,
+            node_decremental = "<bs>",
+        },
+    },
+    select = {
+        enable = true,
+        lookahead = true,
+        keymaps = {
+            -- You can use the capture groups defined in textobjects.scm
+            ["a="] = { query = "@assignment.outer", desc = "Select outer part of an assignment" },
+            ["i="] = { query = "@assignment.inner", desc = "Select inner part of an assignment" },
+            ["l="] = { query = "@assignment.lhs", desc = "Select left hand side of an assignment" },
+            ["r="] = { query = "@assignment.rhs", desc = "Select right hand side of an assignment" },
+
+            ["aa"] = { query = "@parameter.outer", desc = "Select outer part of a parameter/argument" },
+            ["ia"] = { query = "@parameter.inner", desc = "Select inner part of a parameter/argument" },
+
+            ["ai"] = { query = "@conditional.outer", desc = "Select outer part of a conditional" },
+            ["ii"] = { query = "@conditional.inner", desc = "Select inner part of a conditional" },
+
+            ["al"] = { query = "@loop.outer", desc = "Select outer part of a loop" },
+            ["il"] = { query = "@loop.inner", desc = "Select inner part of a loop" },
+
+            ["af"] = { query = "@call.outer", desc = "Select outer part of a function call" },
+            ["if"] = { query = "@call.inner", desc = "Select inner part of a function call" },
+
+            ["am"] = { query = "@function.outer", desc = "Select outer part of a method/function definition" },
+            ["im"] = { query = "@function.inner", desc = "Select inner part of a method/function definition" },
+
+            ["ac"] = { query = "@class.outer", desc = "Select outer part of a class" },
+            ["ic"] = { query = "@class.inner", desc = "Select inner part of a class" },
+        },
+        move = {
+            enable = true,
+            set_jumps = true, -- whether to set jumps in the jumplist
+            goto_next_start = {
+                ["]f"] = { query = "@call.outer", desc = "Next function call start" },
+                ["]m"] = { query = "@function.outer", desc = "Next method/function def start" },
+                ["]c"] = { query = "@class.outer", desc = "Next class start" },
+                ["]i"] = { query = "@conditional.outer", desc = "Next conditional start" },
+                ["]l"] = { query = "@loop.outer", desc = "Next loop start" },
+
+                -- You can pass a query group to use query from `queries/<lang>/<query_group>.scm file in your runtime path.
+                -- Below example nvim-treesitter's `locals.scm` and `folds.scm`. They also provide highlights.scm and indent.scm.
+                ["]s"] = { query = "@scope", query_group = "locals", desc = "Next scope" },
+                ["]z"] = { query = "@fold", query_group = "folds", desc = "Next fold" },
+            },
+            goto_next_end = {
+                ["]F"] = { query = "@call.outer", desc = "Next function call end" },
+                ["]M"] = { query = "@function.outer", desc = "Next method/function def end" },
+                ["]C"] = { query = "@class.outer", desc = "Next class end" },
+                ["]I"] = { query = "@conditional.outer", desc = "Next conditional end" },
+                ["]L"] = { query = "@loop.outer", desc = "Next loop end" },
+            },
+            goto_previous_start = {
+                ["[f"] = { query = "@call.outer", desc = "Prev function call start" },
+                ["[m"] = { query = "@function.outer", desc = "Prev method/function def start" },
+                ["[c"] = { query = "@class.outer", desc = "Prev class start" },
+                ["[i"] = { query = "@conditional.outer", desc = "Prev conditional start" },
+                ["[l"] = { query = "@loop.outer", desc = "Prev loop start" },
+            },
+            goto_previous_end = {
+                ["[F"] = { query = "@call.outer", desc = "Prev function call end" },
+                ["[M"] = { query = "@function.outer", desc = "Prev method/function def end" },
+                ["[C"] = { query = "@class.outer", desc = "Prev class end" },
+                ["[I"] = { query = "@conditional.outer", desc = "Prev conditional end" },
+                ["[L"] = { query = "@loop.outer", desc = "Prev loop end" },
+            },
+        },
+    },
 })