diff --git a/config/.config/nvim/init.lua b/config/.config/nvim/init.lua
index 7cbeb57c..9d7624d7 100644
--- a/config/.config/nvim/init.lua
+++ b/config/.config/nvim/init.lua
@@ -184,8 +184,8 @@ require('lazy').setup({
       'nvim-treesitter/nvim-treesitter-textobjects', -- required by nvim-surround
       'JoosepAlviste/nvim-ts-context-commentstring',
       {
-        'HiPhish/nvim-ts-rainbow2',
-        init = require('pluginconfig.treesitter').init_ts_rainbow2,
+        'HiPhish/rainbow-delimiters.nvim',
+        init = require('pluginconfig.treesitter').init_rainbow_delimiters,
       },
       {
         'haringsrob/nvim_context_vt',
diff --git a/config/.config/nvim/lazy-lock.json b/config/.config/nvim/lazy-lock.json
index 430f2698..4db42dc5 100644
--- a/config/.config/nvim/lazy-lock.json
+++ b/config/.config/nvim/lazy-lock.json
@@ -51,11 +51,11 @@
   "nvim-treesitter-textobjects": { "branch": "master", "commit": "e69a504baf2951d52e1f1fbb05145d43f236cbf1" },
   "nvim-ts-autotag": { "branch": "main", "commit": "6be1192965df35f94b8ea6d323354f7dc7a557e4" },
   "nvim-ts-context-commentstring": { "branch": "main", "commit": "92e688f013c69f90c9bbd596019ec10235bc51de" },
-  "nvim-ts-rainbow2": { "branch": "master", "commit": "b3120cd5ae9ca524af9cb602f41e12e301fa985f" },
   "nvim-web-devicons": { "branch": "master", "commit": "5de460ca7595806044eced31e3c36c159a493857" },
   "nvim_context_vt": { "branch": "master", "commit": "a14f9292b4bd68ceed433fc513f287641816dc6d" },
   "package-info.nvim": { "branch": "master", "commit": "4d98c8cc90d970d87c472c04bf7ca712336cc753" },
   "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" },
+  "rainbow-delimiters.nvim": { "branch": "master", "commit": "df8cdf68234fbf056202a9684931c3dfa89988c1" },
   "telescope-alternate.nvim": { "branch": "master", "commit": "bdf3efe80b2901efc6a17cb2c161eaf2aa8af0b1" },
   "telescope-dap.nvim": { "branch": "master", "commit": "313d2ea12ae59a1ca51b62bf01fc941a983d9c9c" },
   "telescope.nvim": { "branch": "master", "commit": "7011eaae0ac1afe036e30c95cf80200b8dc3f21a" },
diff --git a/config/.config/nvim/lua/pluginconfig/treesitter.lua b/config/.config/nvim/lua/pluginconfig/treesitter.lua
index d1921a1c..6f011d22 100644
--- a/config/.config/nvim/lua/pluginconfig/treesitter.lua
+++ b/config/.config/nvim/lua/pluginconfig/treesitter.lua
@@ -4,29 +4,48 @@ function M.setup_treesitter_context()
   require('treesitter-context').setup()
 end
 
-function M.init_ts_rainbow2()
+function M.init_rainbow_delimiters()
   local augroup = vim.api.nvim_create_augroup('ts_rainbow2_init', { clear = true })
 
   vim.api.nvim_create_autocmd('Colorscheme', {
     group = augroup,
     pattern = '*',
-    command = 'highlight link TSRainbowRed DiagnosticError'
+    command = 'highlight link RainbowDelimiterRed DiagnosticError'
   })
   vim.api.nvim_create_autocmd('Colorscheme', {
     group = augroup,
     pattern = '*',
-    command = 'highlight link TSRainbowYellow DiagnosticWarn'
+    command = 'highlight link RainbowDelimiterYellow DiagnosticWarn'
   })
   vim.api.nvim_create_autocmd('Colorscheme', {
     group = augroup,
     pattern = '*',
-    command = 'highlight TSRainbowGreen guifg=#b4be82'
+    command = 'highlight RainbowDelimiterGreen guifg=#b4be82'
   })
   vim.api.nvim_create_autocmd('Colorscheme', {
     group = augroup,
     pattern = '*',
-    command = 'highlight TSRainbowBlue guifg=#84a0c6'
+
+    command = 'highlight RainbowDelimiterBlue guifg=#84a0c6'
   })
+
+  local rainbow_delimiters = require('rainbow-delimiters')
+  vim.g.rainbow_delimiters = {
+    strategy = {
+      [''] = rainbow_delimiters.strategy['global'],
+      vim = rainbow_delimiters.strategy['local'],
+    },
+    query = {
+      [''] = 'rainbow-delimiters',
+      lua = 'rainbow-blocks',
+    },
+    highlight = {
+      'RainbowDelimiterRed',
+      'RainbowDelimiterYellow',
+      'RainbowDelimiterGreen',
+      'RainbowDelimiterBlue',
+    },
+  }
 end
 
 function M.setup_context_vt()
@@ -97,25 +116,6 @@ function M.setup()
       enable = true,
       additional_vim_regex_highlighting = false,
     },
-    rainbow = {
-      enable = true,
-      extended_mode = true,
-      max_file_lines = 1500,
-      query = {
-        'rainbow-parens',
-        html = 'rainbow-tags',
-        javascript = 'rainbow-tags-react',
-        tsx = 'rainbow-tags',
-        vue = 'rainbow-tags',
-      },
-      strategy = require('ts-rainbow').strategy.global,
-      hlgroups = {
-        'TSRainbowRed',
-        'TSRainbowYellow',
-        'TSRainbowGreen',
-        'TSRainbowBlue',
-      }
-    },
     context_commentstring = {
       enable = true,
       enable_autocmd = false,