diff --git a/lua/lazy-plugins.lua b/lua/lazy-plugins.lua
index 86059f2..f20890a 100644
--- a/lua/lazy-plugins.lua
+++ b/lua/lazy-plugins.lua
@@ -73,9 +73,6 @@ require('lazy').setup({
     end,
   },
 
-  -- Highlight todo, notes, etc in comments
-  { 'folke/todo-comments.nvim', event = 'VimEnter', dependencies = { 'nvim-lua/plenary.nvim' }, opts = { signs = false } },
-
   -- The following two comments only work if you have downloaded the kickstart repo, not just copy pasted the
   -- init.lua. If you want these files, they are in the repository, so you can just download them and
   -- place them in the correct locations.
diff --git a/lua/plugins/mini.lua b/lua/plugins/mini.lua
index 8a97d00..3280113 100644
--- a/lua/plugins/mini.lua
+++ b/lua/plugins/mini.lua
@@ -35,6 +35,17 @@ return { -- Collection of various small independent plugins/modules
     -- Trim all trailing empty lines with MiniTrailspace.trim_last_lines().
     require('mini.trailspace').setup()
 
+    require('mini.hipatterns').setup {
+      highlighters = {
+        fixme = { pattern = 'FIXME', group = 'MiniHipatternsFixme' },
+        hack = { pattern = 'HACK', group = 'MiniHipatternsHack' },
+        todo = { pattern = 'TODO', group = 'MiniHipatternsTodo' },
+        note = { pattern = 'NOTE', group = 'MiniHipatternsNote' },
+        see = { pattern = '[Ss][Ee][Ee]:', group = 'MiniHipatternsNote' },
+        warning = { pattern = 'WARNING', group = 'MiniHipatternsFixme' },
+      },
+    }
+
     -- Simple and easy statusline.
     --  You could remove this setup call if you don't like it,
     --  and try some other statusline plugin