diff --git a/README.md b/README.md
index 26c610c..5bcf814 100644
--- a/README.md
+++ b/README.md
@@ -39,6 +39,7 @@ This port of Catppuccin is special because it was the first one and the one that
     -   [BarBar](https://github.com/romgrk/barbar.nvim)
     -   [NvimTree](https://github.com/kyazdani42/nvim-tree.lua)
     -   [Neo-tree](https://github.com/nvim-neo-tree/neo-tree.nvim)
+    -   [Nvim-dap](https://github.com/mfussenegger/nvim-dap) and [Nvim-dap-ui](https://github.com/rcarriga/nvim-dap-ui)
     -   [Git Gutter](https://github.com/airblade/vim-gitgutter)
     -   [Fern](https://github.com/lambdalisue/fern.vim)
     -   [Lightline](https://github.com/itchyny/lightline.vim)
@@ -144,6 +145,10 @@ integrations = {
 		show_root = true,
 		transparent_panel = false,
 	},
+	dap = {
+		enabled = false,
+		enable_ui = false,
+	},
 	which_key = false,
 	indent_blankline = {
 		enabled = true,
@@ -304,6 +309,16 @@ integration = {
 }
 ```
 
+-   **Nvim-dap:** setting `enabled` to `true`, you need to override nvim-dap's default highlight groups, AFTER requiring nvim-dap:
+
+```lua
+require("dap")
+local sign = vim.fn.sign_define
+sign("DapBreakpoint", { text = "●", texthl = "DapBreakpoint", linehl = "", numhl = ""})
+sign("DapBreakpointCondition", { text = "●", texthl = "DapBreakpointCondition", linehl = "", numhl = ""})
+sign("DapLogPoint", { text = "◆", texthl = "DapLogPoint", linehl = "", numhl = ""})
+```
+
 ### Compile
 
 Catppuccin is a highly customizable and configurable colorscheme. This does however come at the cost of complexity and execution time.
@@ -332,7 +347,6 @@ By default catppuccin writes the compiled results into the system's cache direct
 ```
 
 #### Post-install/update hooks
-It's recommended to add `:CatppuccinCompile` to post-install/update hooks. For example:
 
 Packer.nvim
 
diff --git a/lua/catppuccin/config.lua b/lua/catppuccin/config.lua
index 158669b..10051b7 100644
--- a/lua/catppuccin/config.lua
+++ b/lua/catppuccin/config.lua
@@ -57,6 +57,10 @@ config.options = {
 			show_root = true,
 			transparent_panel = false,
 		},
+		dap = {
+			enabled = false,
+			enable_ui = false,
+		},
 		neotree = {
 			enabled = false,
 			show_root = true,
diff --git a/lua/catppuccin/groups/integrations/dap.lua b/lua/catppuccin/groups/integrations/dap.lua
new file mode 100644
index 0000000..5d6aea6
--- /dev/null
+++ b/lua/catppuccin/groups/integrations/dap.lua
@@ -0,0 +1,34 @@
+local M = {}
+
+function M.get()
+	return {
+		-- nvim-dap
+		DapBreakpoint = { fg = cp.red },
+		DapBreakpointCondition = { fg = cp.yellow },
+		DapLogPoint = { fg = cp.sky },
+
+		-- nvim-dap-ui
+		DAPUIScope = { fg = cp.sky },
+		DAPUIType = { fg = cp.mauve },
+		DAPUIValue = { fg = cp.sky },
+		DAPUIVariable = { fg = cp.text },
+		DapUIModifiedValue = { fg = cp.peach },
+		DapUIDecoration = { fg = cp.sky },
+		DapUIThread = { fg = cp.green },
+		DapUIStoppedThread = { fg = cp.sky },
+		DapUISource = { fg = cp.lavender },
+		DapUILineNumber = { fg = cp.sky },
+		DapUIFloatBorder = { fg = cp.sky },
+
+		DapUIWatchesEmpty = { fg = cp.maroon },
+		DapUIWatchesValue = { fg = cp.green },
+		DapUIWatchesError = { fg = cp.maroon },
+
+		DapUIBreakpointsPath = { fg = cp.sky },
+		DapUIBreakpointsInfo = { fg = cp.green },
+		DapUIBreakpointsCurrentLine = { fg = cp.green, style = { "bold" } },
+		DapUIBreakpointsDisabledLine = { fg = cp.gray0 },
+	}
+end
+
+return M