diff --git a/.config/nvim/lua/config/autocmds.lua b/.config/nvim/lua/config/autocmds.lua
index ca561cbc..be044771 100644
--- a/.config/nvim/lua/config/autocmds.lua
+++ b/.config/nvim/lua/config/autocmds.lua
@@ -8,6 +8,15 @@ vim.api.nvim_create_autocmd({ "FileType" }, {
     vim.opt_local.breakindent = true
     vim.opt_local.wrap = true
     vim.opt_local.spell = true
+    local secondary = "#379393"
+    local primary = "#933737"
+    vim.api.nvim_set_hl(0, "ObsidianRefText", { fg = primary, bold = true, underline = true })
+    vim.api.nvim_set_hl(0, "ObsidianRef", { fg = primary, bold = true, underline = true })
+    vim.api.nvim_set_hl(0, "ObsidianBullet", { fg = secondary, bold = true, underline = false })
+    vim.api.nvim_set_hl(0, "ObsidianDone", { fg = secondary, bold = true, underline = false })
+    vim.api.nvim_set_hl(0, "ObsidianTodo", { fg = secondary, bold = true, underline = false })
+    vim.api.nvim_set_hl(0, "obsidiantag", { fg = secondary, bold = false, italics = true })
+    vim.api.nvim_set_hl(0, "ObsidianTag", { fg = secondary, bold = false, italics = true })
     vim.api.nvim_buf_set_keymap(
       0,
       "i",
diff --git a/.config/nvim/lua/plugins/disabled.lua b/.config/nvim/lua/plugins/disabled.lua
index 6ed96ea9..26efacc3 100644
--- a/.config/nvim/lua/plugins/disabled.lua
+++ b/.config/nvim/lua/plugins/disabled.lua
@@ -1,6 +1,7 @@
 return {
   { "nvim-neo-tree/neo-tree.nvim", enabled = false },
   { "folke/tokyonight.nvim", enabled = false },
+  { "catpuccin/nvim", enabled = false },
   -- { "folke/noice.nvim", enabled = false },
 }
 -- TODO:
diff --git a/.config/nvim/lua/plugins/noirbuddy.lua b/.config/nvim/lua/plugins/noirbuddy.lua
index b70a14ba..bd11b80e 100644
--- a/.config/nvim/lua/plugins/noirbuddy.lua
+++ b/.config/nvim/lua/plugins/noirbuddy.lua
@@ -14,27 +14,6 @@
 -- #7C8080
 -- #8D8D8D
 -- #d4d4d4
-local noiropts = {
-  -- preset = "miami-nights",
-  styles = {
-    italic = true,
-    bold = true,
-    underline = true,
-    undercurl = true,
-  },
-  colors = {
-    primary = "#994848",
-    secondary = "#933737",
-    -- background = "#0f0f0f",
-    diagnostic_error = "#EC0034",
-    diagnostic_warning = "#ff7700",
-    diagnostic_info = "#d5d5d5",
-    diagnostic_hint = "#f5f5f5",
-    diff_add = "#f5f5f5",
-    diff_change = "#737373",
-    diff_delete = "#EC0034",
-  },
-}
 return {
   {
     "jesseleite/nvim-noirbuddy",
@@ -47,9 +26,58 @@ return {
     "LazyVim/LazyVim",
     opts = {
       colorscheme = function()
-        -- local Color, colors, Group, groups, styles = require("colorbuddy").setup()
-        -- Group.new("SpellBad", colors.primary, nil, styles.undercurl + styles.italic)
+        local noiropts = {
+          -- preset = "miami-nights",
+          styles = {
+            italic = true,
+            bold = true,
+            underline = true,
+            undercurl = true,
+          },
+          colors = {
+            secondary = "#379393",
+            primary = "#933737",
+            diagnostic_error = "#AC2020",
+            diagnostic_warning = "#ff7700",
+            diagnostic_info = "#d5d5d5",
+            diagnostic_hint = "#d5d5d5",
+            diff_add = "#f5f5f5",
+            diff_change = "#737373",
+            diff_delete = "#AC2020",
+          },
+        }
         require("noirbuddy").setup(noiropts)
+        local colorbuddy = require("colorbuddy")
+
+        local Color = colorbuddy.Color
+        local colors = colorbuddy.colors
+        local Group = colorbuddy.Group
+        local groups = colorbuddy.groups
+        local styles = colorbuddy.styles
+        Color.new("error", "#AC2020")
+        Color.new("warn", "#f79000")
+        Color.new("warnborder", "#79491d")
+        Color.new("infoborder", "#215858")
+        -- Override specific highlight groups
+        Group.new("NotifyINFOBorder", colors.infoborder)
+        Group.new("NotifyINFOTitle", colors.secondary)
+        Group.new("NotifyINFOIcon", colors.secondary)
+        Group.new("NotifyWARNBorder", colors.warnborder)
+        Group.new("NotifyWARNTitle", colors.warn)
+        Group.new("NotifyWARNIcon", colors.warn)
+        Group.new("NotifyERRORBorder", colors.error)
+        Group.new("NotifyERRORTitle", colors.error)
+        Group.new("NotifyERRORIcon", colors.error)
+        Group.new("ErrorMsg", colors.noir_1, colors.error)
+        Group.new("SpellBad", nil, nil, styles.undercurl)
+
+        -- Group.new("ObsidianExtLinkIcon", colors.primary, nil, styles.bold)
+        -- Group.new("ObsidianRef", colors.primary, nil, styles.underline + styles.bold)
+        -- Group.new("ObsidianRefText", colors.primary, nil, styles.underline + styles.bold)
+        -- Group.new("ObsidianBullet", colors.secondary, nil, styles.bold)
+        -- Group.new("ObsidianDone", colors.secondary, nil, styles.bold)
+        -- Group.new("ObsidianTodo", colors.secondary, nil, styles.bold)
+        -- Group.new("ObsidianTag", colors.secondary, nil, styles.italic)
       end,
     },
   },