From 5dffc39d71b2325d9e3b243efcf9012d90f71a49 Mon Sep 17 00:00:00 2001
From: johndovern <92282293+johndovern@users.noreply.github.com>
Date: Mon, 5 Jun 2023 17:43:50 -0700
Subject: [PATCH 01/16] Add kanagawa theme

---
 README.md                     |   3 +-
 themes/doom-kanagawa-theme.el | 178 ++++++++++++++++++++++++++++++++++
 2 files changed, 180 insertions(+), 1 deletion(-)
 create mode 100644 themes/doom-kanagawa-theme.el

diff --git a/README.md b/README.md
index 82323136..10e8f62a 100644
--- a/README.md
+++ b/README.md
@@ -94,6 +94,7 @@ welcome PRs to help us maintain and address inconsistencies in them.
 | doom-horizon                      | [link](https://github.com/aodhneine/horizon-theme.el)                                  | ported from VSCode Horizon (ported by [@karetsu](https://github.com/karetsu))                                                     |
 | doom-Iosvkem                      | [link](https://github.com/neutaaaaan/iosvkem)                                          | ported from the default dark theme for Adobe Brackets (ported by [@neutaaaaan](https://github.com/neutaaaaan))                    |
 | doom-ir-black                     | [link](https://github.com/twerth/ir_black)                                             | ported from Vim's ir_black colorscheme (ported by [@legendre6891](https://github.com/legendre6891))                               |
+| doom-kanagawa                     | [link](https://github.com/rebelot/kanagawa.nvim)                                       | based on rebelot's neovim colorscheme (ported py [@Anskrevy](https://github.com/Anskrevy))                                                                                                                                  |
 | doom-lantern                      | [link](https://github.com/Gitleptune/lantern-theme)                                    | based on Gitleptune's Lantern theme (ported by [@paladhammika](https://github.com/paladhammika))                                  |
 | doom-laserwave                    | [link](https://github.com/Jaredk3nt/laserwave)                                         | a clean synthwave/outrun theme inspired by VSCode's Laserwave (ported by [@hyakt](https://github.com/hyakt))                      |
 | doom-manegarm                     | original                                                                               | an original autumn-inspired dark theme (ported by [@kenranunderscore](https://github.com/kenranunderscore))                       |
@@ -122,7 +123,7 @@ welcome PRs to help us maintain and address inconsistencies in them.
 | doom-outrun-electric              | [link](https://github.com/samrap/outrun-theme-vscode)                                  | a high contrast, neon theme inspired by Outrun Electric on VSCode (ported by [@ema2159](https://github.com/ema2159))              |
 | doom-palenight                    | [link](https://github.com/equinusocio/vsc-material-theme)                              | adapted from equinusocio's Material themes (ported by [@Brettm12345](https://github.com/Brettm12345))                             |
 | doom-peacock                      | [link](https://github.com/daylerees/colour-schemes/blob/master/emacs/peacock-theme.el) | inspired by daylerees' Peacock (ported by [@teesloane](https://github.com/teesloane))                                             |
-| doom-pine                         | [link](https://github.com/morhetz/gruvbox)                                             | a green-tinged Gruvbox (by [@RomanHargrave](https://github.com/RomanHargrave))                                           |
+| doom-pine                         | [link](https://github.com/morhetz/gruvbox)                                             | a green-tinged Gruvbox (by [@RomanHargrave](https://github.com/RomanHargrave))                                                    |
 | doom-plain                        | [link](https://github.com/gko/plain/)                                                  | inspired by gko's plain theme for VSCode (ported by [@das-s](https://github.com/das-s))                                           |
 | doom-plain-dark                   | [link](https://github.com/gko/plain/)                                                  | inspired by gko's plain theme for VSCode (ported by [@das-s](https://github.com/das-s))                                           |
 | doom-rouge                        | [link](https://github.com/josefaidt/rouge-theme)                                       | ported from VSCode's Rouge Theme (ported by [@das-s](https://github.com/das-s))                                                   |
diff --git a/themes/doom-kanagawa-theme.el b/themes/doom-kanagawa-theme.el
new file mode 100644
index 00000000..d379777a
--- /dev/null
+++ b/themes/doom-kanagawa-theme.el
@@ -0,0 +1,178 @@
+;;; doom-kanagawa-theme.el --- inspired by rebelot/kanagawa.nvim and others -*- lexical-binding: t; no-byte-compile: t; -*-
+;;
+;; Added: June 4 2023
+;; Author: Anskrevy <https://github.com/Anskrevy
+;; Maintainer:
+;; Source: ????
+;;
+;;; Commentary:
+;;; Original theme by rebelot see: https://github.com/rebelot/kanagawa.nvim
+;;; Inspiration taken from modified version in https://github.com/NvChad/base46
+;;; and konrad1977 https://github.com/konrad1977/emacs .
+;;; fi
+;;
+;;; Code:
+
+(require 'doom-themes)
+
+
+;;
+;;; Variables
+
+(defgroup doom-kanagawa-theme nil
+  "Options for the `doom-kanagawa' theme."
+  :group 'doom-themes)
+
+(defcustom doom-kanagawa-brighter-modeline nil
+  "If non-nil, more vivid colors will be used to style the mode-line."
+  :group 'doom-kanagawa-theme
+  :type 'boolean)
+
+(defcustom doom-kanagawa-brighter-comments nil
+  "If non-nil, comments will be highlighted in more vivid colors."
+  :group 'doom-kanagawa-theme
+  :type 'boolean)
+
+(defcustom doom-kanagawa-padded-modeline doom-themes-padded-modeline
+  "If non-nil, adds a 4px padding to the mode-line.
+Can be an integer to determine the exact padding."
+  :group 'doom-kanagawa-theme
+  :type '(choice integer boolean))
+
+
+;;
+;;; Theme definition
+
+(def-doom-theme doom-kanagawa
+  "A dark theme inspired by rebelot/kanagawa.nvim and others."
+
+  ;; name        default   256           16
+  ((bg         '("#1d1c1c" "black"       "black"  ))
+   (fg         '("#DCD7BA" "#DCD7BA"     "brightwhite"  ))
+
+   ;; These are off-color variants of bg/fg, used primarily for `solaire-mode',
+   ;; but can also be useful as a basis for subtle highlights (e.g. for hl-line
+   ;; or region), especially when paired with the `doom-darken', `doom-lighten',
+   ;; and `doom-blend' helper functions.
+   (bg-alt     '("#181616" "black"       "black"        ))
+   (fg-alt     '("#C8C093" "#C8C093"     "white"        ))
+
+   ;; These should represent a spectrum from bg to fg, where base0 is a starker
+   ;; bg and base8 is a starker fg. For example, if bg is light grey and fg is
+   ;; dark grey, base0 should be white and base8 should be black.
+   (base0      '("#191922" "black"       "black"        ))
+   (base1      '("#28282E" "#28282E"     "brightblack"  ))
+   (base2      '("#222129" "#222129"     "brightblack"  ))
+   (base3      '("#26252C" "#26252C"     "brightblack"  ))
+   (base4      '("#37363A" "#37363A"     "brightblack"  ))
+   (base5      '("#464546" "#464546"     "brightblack"  ))
+   (base6      '("#545451" "#545451"     "brightblack"  ))
+   (base7      '("#727169" "#727169"     "brightblack"  ))
+   (base8      '("#BABDB9" "#BABDB9"     "white"        ))
+
+   (grey       base4)
+   (red        '("#d8616b" "#d8616b" "red"          ))
+   (orange     '("#ffa066" "#ffa066" "brightred"    ))
+   (green      '("#98bb6c" "#98bb6c" "green"        ))
+   (teal       '("#7AA89F" "#7AA89F" "brightgreen"  ))
+   (yellow     '("#E6C384" "#E6C384" "yellow"       ))
+   (blue       '("#7FB4CA" "#7FB4CA" "brightblue"   ))
+   (dark-blue  '("#7E9CD8" "#7E9CD8" "blue"         ))
+   (magenta    '("#957FB8" "#957FB8" "brightmagenta"))
+   (violet     '("#aaa1c8" "#aaa1c8" "magenta"      ))
+   (cyan       '("#A3D4D5" "#A3D4D5" "brightcyan"   ))
+   (dark-cyan  '("#658594" "#658594" "cyan"         ))
+
+   ;; These are the "universal syntax classes" that doom-themes establishes.
+   ;; These *must* be included in every doom themes, or your theme will throw an
+   ;; error, as they are used in the base theme defined in doom-themes-base.
+   (highlight      blue)
+   (vertical-bar   (doom-darken base1 0.1))
+   (selection      dark-blue)
+   (builtin        magenta)
+   (comments       (if doom-kanagawa-brighter-comments dark-cyan base5))
+   (doc-comments   (doom-lighten (if doom-kanagawa-brighter-comments dark-cyan base5) 0.25))
+   (constants      violet)
+   (functions      magenta)
+   (keywords       blue)
+   (methods        cyan)
+   (operators      blue)
+   (type           yellow)
+   (strings        green)
+   (variables      (doom-lighten magenta 0.4))
+   (numbers        orange)
+   (region         `(,(doom-lighten (car bg-alt) 0.15) ,@(doom-lighten (cdr base1) 0.35)))
+   (error          red)
+   (warning        yellow)
+   (success        green)
+   (vc-modified    orange)
+   (vc-added       green)
+   (vc-deleted     red)
+
+   ;; These are extra color variables used only in this theme; i.e. they aren't
+   ;; mandatory for derived themes.
+   (modeline-fg              fg)
+   (modeline-fg-alt          base5)
+   (modeline-bg              (if doom-kanagawa-brighter-modeline
+                                 (doom-darken blue 0.45)
+                               (doom-darken bg-alt 0.1)))
+   (modeline-bg-alt          (if doom-kanagawa-brighter-modeline
+                                 (doom-darken blue 0.475)
+                               `(,(doom-darken (car bg-alt) 0.15) ,@(cdr bg))))
+   (modeline-bg-inactive     `(,(car bg-alt) ,@(cdr base1)))
+   (modeline-bg-inactive-alt `(,(doom-darken (car bg-alt) 0.1) ,@(cdr bg)))
+
+   (-modeline-pad
+    (when doom-kanagawa-padded-modeline
+      (if (integerp doom-kanagawa-padded-modeline) doom-kanagawa-padded-modeline 4))))
+
+
+  ;;;; Base theme face overrides
+  (((line-number &override) :foreground base4)
+   ((line-number-current-line &override) :foreground fg)
+   ((font-lock-comment-face &override)
+    :background (if doom-kanagawa-brighter-comments (doom-lighten bg 0.05)))
+   (mode-line
+    :background modeline-bg :foreground modeline-fg
+    :box (if -modeline-pad `(:line-width ,-modeline-pad :color ,modeline-bg)))
+   (mode-line-inactive
+    :background modeline-bg-inactive :foreground modeline-fg-alt
+    :box (if -modeline-pad `(:line-width ,-modeline-pad :color ,modeline-bg-inactive)))
+   (mode-line-emphasis :foreground (if doom-kanagawa-brighter-modeline base8 highlight))
+
+   ;;;; css-mode <built-in> / scss-mode
+   (css-proprietary-property :foreground orange)
+   (css-property             :foreground green)
+   (css-selector             :foreground blue)
+   ;;;; doom-modeline
+   (doom-modeline-bar :background (if doom-kanagawa-brighter-modeline modeline-bg highlight))
+   (doom-modeline-buffer-file :inherit 'mode-line-buffer-id :weight 'bold)
+   (doom-modeline-buffer-path :inherit 'mode-line-emphasis :weight 'bold)
+   (doom-modeline-buffer-project-root :foreground green :weight 'bold)
+   ;;;; elscreen
+   (elscreen-tab-other-screen-face :background "#353a42" :foreground "#1e2022")
+   ;;;; ivy
+   (ivy-current-match :background dark-blue :distant-foreground base0 :weight 'normal)
+   ;;;; LaTeX-mode
+   (font-latex-math-face :foreground green)
+   ;;;; markdown-mode
+   (markdown-markup-face :foreground base5)
+   (markdown-header-face :inherit 'bold :foreground red)
+   ((markdown-code-face &override) :background (doom-lighten base3 0.05))
+   ;;;; rjsx-mode
+   (rjsx-tag :foreground red)
+   (rjsx-attr :foreground orange)
+   ;;;; solaire-mode
+   (solaire-mode-line-face
+    :inherit 'mode-line
+    :background modeline-bg-alt
+    :box (if -modeline-pad `(:line-width ,-modeline-pad :color ,modeline-bg-alt)))
+   (solaire-mode-line-inactive-face
+    :inherit 'mode-line-inactive
+    :background modeline-bg-inactive-alt
+    :box (if -modeline-pad `(:line-width ,-modeline-pad :color ,modeline-bg-inactive-alt))))
+
+  ;;;; Base theme variable overrides-
+  ())
+
+;;; doom-kanagawa-theme.el ends here

From 3c4469898c44c988f61a8b20cb9988070118746c Mon Sep 17 00:00:00 2001
From: johndovern <92282293+johndovern@users.noreply.github.com>
Date: Mon, 5 Jun 2023 18:34:11 -0700
Subject: [PATCH 02/16] Fix selection coloring

---
 themes/doom-kanagawa-theme.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/doom-kanagawa-theme.el b/themes/doom-kanagawa-theme.el
index d379777a..4237e009 100644
--- a/themes/doom-kanagawa-theme.el
+++ b/themes/doom-kanagawa-theme.el
@@ -88,7 +88,7 @@ Can be an integer to determine the exact padding."
    ;; error, as they are used in the base theme defined in doom-themes-base.
    (highlight      blue)
    (vertical-bar   (doom-darken base1 0.1))
-   (selection      dark-blue)
+   (selection      (doom-darken dark-blue 0.5))
    (builtin        magenta)
    (comments       (if doom-kanagawa-brighter-comments dark-cyan base5))
    (doc-comments   (doom-lighten (if doom-kanagawa-brighter-comments dark-cyan base5) 0.25))

From 55e4f8edcd710a08c3e0829ed984c2830a1913da Mon Sep 17 00:00:00 2001
From: johndovern <92282293+johndovern@users.noreply.github.com>
Date: Fri, 1 Sep 2023 23:07:24 -0700
Subject: [PATCH 03/16] Fix README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 10e8f62a..90978417 100644
--- a/README.md
+++ b/README.md
@@ -123,7 +123,7 @@ welcome PRs to help us maintain and address inconsistencies in them.
 | doom-outrun-electric              | [link](https://github.com/samrap/outrun-theme-vscode)                                  | a high contrast, neon theme inspired by Outrun Electric on VSCode (ported by [@ema2159](https://github.com/ema2159))              |
 | doom-palenight                    | [link](https://github.com/equinusocio/vsc-material-theme)                              | adapted from equinusocio's Material themes (ported by [@Brettm12345](https://github.com/Brettm12345))                             |
 | doom-peacock                      | [link](https://github.com/daylerees/colour-schemes/blob/master/emacs/peacock-theme.el) | inspired by daylerees' Peacock (ported by [@teesloane](https://github.com/teesloane))                                             |
-| doom-pine                         | [link](https://github.com/morhetz/gruvbox)                                             | a green-tinged Gruvbox (by [@RomanHargrave](https://github.com/RomanHargrave))                                                    |
+| doom-pine                         | [link](https://github.com/morhetz/gruvbox)                                             | a green-tinged Gruvbox (by [@RomanHargrave](https://github.com/RomanHargrave))                                           |
 | doom-plain                        | [link](https://github.com/gko/plain/)                                                  | inspired by gko's plain theme for VSCode (ported by [@das-s](https://github.com/das-s))                                           |
 | doom-plain-dark                   | [link](https://github.com/gko/plain/)                                                  | inspired by gko's plain theme for VSCode (ported by [@das-s](https://github.com/das-s))                                           |
 | doom-rouge                        | [link](https://github.com/josefaidt/rouge-theme)                                       | ported from VSCode's Rouge Theme (ported by [@das-s](https://github.com/das-s))                                                   |

From d274d06deed279842c7d96d324a1dc53de5d96c2 Mon Sep 17 00:00:00 2001
From: Anskrevy <95379591+Anskrevy@users.noreply.github.com>
Date: Mon, 4 Sep 2023 18:03:54 -0700
Subject: [PATCH 04/16] Update source

---
 themes/doom-kanagawa-theme.el | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/themes/doom-kanagawa-theme.el b/themes/doom-kanagawa-theme.el
index 4237e009..bb893cca 100644
--- a/themes/doom-kanagawa-theme.el
+++ b/themes/doom-kanagawa-theme.el
@@ -3,13 +3,12 @@
 ;; Added: June 4 2023
 ;; Author: Anskrevy <https://github.com/Anskrevy
 ;; Maintainer:
-;; Source: ????
+;; Source: https://github.com/rebelot/kanagawa.nvim
 ;;
 ;;; Commentary:
 ;;; Original theme by rebelot see: https://github.com/rebelot/kanagawa.nvim
 ;;; Inspiration taken from modified version in https://github.com/NvChad/base46
 ;;; and konrad1977 https://github.com/konrad1977/emacs .
-;;; fi
 ;;
 ;;; Code:
 

From aab4f765b6d86e09b453ee195832fddb66c66fda Mon Sep 17 00:00:00 2001
From: Anskrevy <95379591+Anskrevy@users.noreply.github.com>
Date: Mon, 5 Feb 2024 23:17:33 -0800
Subject: [PATCH 05/16] Some small tweaks

---
 themes/doom-kanagawa-theme.el | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/themes/doom-kanagawa-theme.el b/themes/doom-kanagawa-theme.el
index bb893cca..fc43d1e6 100644
--- a/themes/doom-kanagawa-theme.el
+++ b/themes/doom-kanagawa-theme.el
@@ -46,14 +46,14 @@ Can be an integer to determine the exact padding."
   "A dark theme inspired by rebelot/kanagawa.nvim and others."
 
   ;; name        default   256           16
-  ((bg         '("#1d1c1c" "black"       "black"  ))
+  ((bg         '("#181616" "black"       "black"  ))
    (fg         '("#DCD7BA" "#DCD7BA"     "brightwhite"  ))
 
    ;; These are off-color variants of bg/fg, used primarily for `solaire-mode',
    ;; but can also be useful as a basis for subtle highlights (e.g. for hl-line
    ;; or region), especially when paired with the `doom-darken', `doom-lighten',
    ;; and `doom-blend' helper functions.
-   (bg-alt     '("#181616" "black"       "black"        ))
+   (bg-alt     '("#1D1C19" "black"       "black"        ))
    (fg-alt     '("#C8C093" "#C8C093"     "white"        ))
 
    ;; These should represent a spectrum from bg to fg, where base0 is a starker
@@ -70,15 +70,15 @@ Can be an integer to determine the exact padding."
    (base8      '("#BABDB9" "#BABDB9"     "white"        ))
 
    (grey       base4)
-   (red        '("#d8616b" "#d8616b" "red"          ))
-   (orange     '("#ffa066" "#ffa066" "brightred"    ))
-   (green      '("#98bb6c" "#98bb6c" "green"        ))
+   (red        '("#FF5D62" "#FF5D62" "red"          ))
+   (orange     '("#FFA066" "#FFA066" "brightred"    ))
+   (green      '("#98BB6C" "#98BB6C" "green"        ))
    (teal       '("#7AA89F" "#7AA89F" "brightgreen"  ))
    (yellow     '("#E6C384" "#E6C384" "yellow"       ))
    (blue       '("#7FB4CA" "#7FB4CA" "brightblue"   ))
    (dark-blue  '("#7E9CD8" "#7E9CD8" "blue"         ))
    (magenta    '("#957FB8" "#957FB8" "brightmagenta"))
-   (violet     '("#aaa1c8" "#aaa1c8" "magenta"      ))
+   (violet     '("#9CABCA" "#9CABCA" "magenta"      ))
    (cyan       '("#A3D4D5" "#A3D4D5" "brightcyan"   ))
    (dark-cyan  '("#658594" "#658594" "cyan"         ))
 
@@ -139,6 +139,10 @@ Can be an integer to determine the exact padding."
     :box (if -modeline-pad `(:line-width ,-modeline-pad :color ,modeline-bg-inactive)))
    (mode-line-emphasis :foreground (if doom-kanagawa-brighter-modeline base8 highlight))
 
+   ;;;; indent-guides
+   (highlight-indent-guides-character-face :foreground base4)
+   (highlight-indent-guides-top-character-face :foreground base4)
+   (highlight-indent-guides-stack-character-face :foreground base4)
    ;;;; css-mode <built-in> / scss-mode
    (css-proprietary-property :foreground orange)
    (css-property             :foreground green)

From 3a2537986184500f6f05ec55ca4b244ade1451ad Mon Sep 17 00:00:00 2001
From: Anskrevy <95379591+Anskrevy@users.noreply.github.com>
Date: Mon, 5 Feb 2024 23:18:14 -0800
Subject: [PATCH 06/16] Add optional red cursor that some versions use

---
 themes/doom-kanagawa-theme.el | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/themes/doom-kanagawa-theme.el b/themes/doom-kanagawa-theme.el
index fc43d1e6..3901ee67 100644
--- a/themes/doom-kanagawa-theme.el
+++ b/themes/doom-kanagawa-theme.el
@@ -38,6 +38,11 @@ Can be an integer to determine the exact padding."
   :group 'doom-kanagawa-theme
   :type '(choice integer boolean))
 
+(defcustom doom-kanagawa-red-cursor nil
+  "If non-nil, cursor will be red."
+  :group 'doom-kanagawa-theme
+  :type 'boolean)
+
 
 ;;
 ;;; Theme definition
@@ -127,7 +132,8 @@ Can be an integer to determine the exact padding."
 
 
   ;;;; Base theme face overrides
-  (((line-number &override) :foreground base4)
+  ((cursor :background (if doom-kanagawa-red-cursor red fg-alt))
+   ((line-number &override) :foreground base4)
    ((line-number-current-line &override) :foreground fg)
    ((font-lock-comment-face &override)
     :background (if doom-kanagawa-brighter-comments (doom-lighten bg 0.05)))
@@ -143,6 +149,8 @@ Can be an integer to determine the exact padding."
    (highlight-indent-guides-character-face :foreground base4)
    (highlight-indent-guides-top-character-face :foreground base4)
    (highlight-indent-guides-stack-character-face :foreground base4)
+   ;;;; evil-snipe
+   (evil-snipe-first-match-face :foreground (if doom-kanagawa-red-cursor red blue) :background bg-alt)
    ;;;; css-mode <built-in> / scss-mode
    (css-proprietary-property :foreground orange)
    (css-property             :foreground green)

From 91d02596a04ff25087dd657fa7bae4a55f945d6b Mon Sep 17 00:00:00 2001
From: Anskrevy <95379591+Anskrevy@users.noreply.github.com>
Date: Sat, 23 Mar 2024 22:31:17 -0700
Subject: [PATCH 07/16] Better highlighting for corfu

---
 themes/doom-kanagawa-theme.el | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/themes/doom-kanagawa-theme.el b/themes/doom-kanagawa-theme.el
index 3901ee67..f3b2b14f 100644
--- a/themes/doom-kanagawa-theme.el
+++ b/themes/doom-kanagawa-theme.el
@@ -151,6 +151,8 @@ Can be an integer to determine the exact padding."
    (highlight-indent-guides-stack-character-face :foreground base4)
    ;;;; evil-snipe
    (evil-snipe-first-match-face :foreground (if doom-kanagawa-red-cursor red blue) :background bg-alt)
+   ;;;; corfu
+   (corfu-current :background base5)
    ;;;; css-mode <built-in> / scss-mode
    (css-proprietary-property :foreground orange)
    (css-property             :foreground green)

From 4766ee5234065251c2f6185f5e48d17584c32439 Mon Sep 17 00:00:00 2001
From: Anskrevy <95379591+Anskrevy@users.noreply.github.com>
Date: Sun, 24 Mar 2024 00:37:25 -0700
Subject: [PATCH 08/16] Make background highlights consistent

---
 themes/doom-kanagawa-theme.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/themes/doom-kanagawa-theme.el b/themes/doom-kanagawa-theme.el
index f3b2b14f..7709b5d9 100644
--- a/themes/doom-kanagawa-theme.el
+++ b/themes/doom-kanagawa-theme.el
@@ -105,7 +105,7 @@ Can be an integer to determine the exact padding."
    (strings        green)
    (variables      (doom-lighten magenta 0.4))
    (numbers        orange)
-   (region         `(,(doom-lighten (car bg-alt) 0.15) ,@(doom-lighten (cdr base1) 0.35)))
+   (region         base3)
    (error          red)
    (warning        yellow)
    (success        green)
@@ -152,7 +152,7 @@ Can be an integer to determine the exact padding."
    ;;;; evil-snipe
    (evil-snipe-first-match-face :foreground (if doom-kanagawa-red-cursor red blue) :background bg-alt)
    ;;;; corfu
-   (corfu-current :background base5)
+   (corfu-current :background base3)
    ;;;; css-mode <built-in> / scss-mode
    (css-proprietary-property :foreground orange)
    (css-property             :foreground green)

From 230712d5a16062ca5acc4b6839f46bebecf7d3fa Mon Sep 17 00:00:00 2001
From: Anskrevy <95379591+Anskrevy@users.noreply.github.com>
Date: Sun, 24 Mar 2024 13:19:43 -0700
Subject: [PATCH 09/16] Revert #4766ee5 change to region

---
 themes/doom-kanagawa-theme.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/doom-kanagawa-theme.el b/themes/doom-kanagawa-theme.el
index 7709b5d9..967c8c96 100644
--- a/themes/doom-kanagawa-theme.el
+++ b/themes/doom-kanagawa-theme.el
@@ -105,7 +105,7 @@ Can be an integer to determine the exact padding."
    (strings        green)
    (variables      (doom-lighten magenta 0.4))
    (numbers        orange)
-   (region         base3)
+   (region         `(,(doom-lighten (car bg-alt) 0.15) ,@(doom-lighten (cdr base1) 0.35)))
    (error          red)
    (warning        yellow)
    (success        green)

From 3390755d0a4df5fe5c9be8644da2d1601751fd87 Mon Sep 17 00:00:00 2001
From: Anskrevy <95379591+Anskrevy@users.noreply.github.com>
Date: Tue, 9 Jul 2024 20:32:55 -0700
Subject: [PATCH 10/16] fix: vterm color bright black previously invisible

---
 themes/doom-kanagawa-theme.el | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/themes/doom-kanagawa-theme.el b/themes/doom-kanagawa-theme.el
index 967c8c96..95515a05 100644
--- a/themes/doom-kanagawa-theme.el
+++ b/themes/doom-kanagawa-theme.el
@@ -184,6 +184,8 @@ Can be an integer to determine the exact padding."
     :inherit 'mode-line-inactive
     :background modeline-bg-inactive-alt
     :box (if -modeline-pad `(:line-width ,-modeline-pad :color ,modeline-bg-inactive-alt))))
+   ;;;; vterm
+   (vterm-color-bright-black :inherit 'term-color-bright-black :foreground base5)
 
   ;;;; Base theme variable overrides-
   ())

From 186f9a71fddcfaab753f99de5e4a76b5a7fb8049 Mon Sep 17 00:00:00 2001
From: Anskrevy <95379591+Anskrevy@users.noreply.github.com>
Date: Tue, 24 Jun 2025 03:31:44 +0000
Subject: [PATCH 11/16] Update themes/doom-kanagawa-theme.el

Co-authored-by: Prashant Vithani <prashantvithani@gmail.com>
---
 themes/doom-kanagawa-theme.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/themes/doom-kanagawa-theme.el b/themes/doom-kanagawa-theme.el
index 95515a05..9b0a9950 100644
--- a/themes/doom-kanagawa-theme.el
+++ b/themes/doom-kanagawa-theme.el
@@ -183,9 +183,9 @@ Can be an integer to determine the exact padding."
    (solaire-mode-line-inactive-face
     :inherit 'mode-line-inactive
     :background modeline-bg-inactive-alt
-    :box (if -modeline-pad `(:line-width ,-modeline-pad :color ,modeline-bg-inactive-alt))))
+    :box (if -modeline-pad `(:line-width ,-modeline-pad :color ,modeline-bg-inactive-alt)))
    ;;;; vterm
-   (vterm-color-bright-black :inherit 'term-color-bright-black :foreground base5)
+   (vterm-color-bright-black :inherit 'term-color-bright-black :foreground base5))
 
   ;;;; Base theme variable overrides-
   ())

From 0aa4c0950cb29b32a4d77310a2d31bb207283e9e Mon Sep 17 00:00:00 2001
From: Anskrevy <95379591+Anskrevy@users.noreply.github.com>
Date: Tue, 30 Sep 2025 17:35:00 -0700
Subject: [PATCH 12/16] refactor(kanagawa): make distinct hybrid theme

---
 README.md                           |   2 +-
 themes/doom-kanagawa-abyss-theme.el | 444 ++++++++++++++++++++++++++++
 themes/doom-kanagawa-theme.el       | 193 ------------
 3 files changed, 445 insertions(+), 194 deletions(-)
 create mode 100644 themes/doom-kanagawa-abyss-theme.el
 delete mode 100644 themes/doom-kanagawa-theme.el

diff --git a/README.md b/README.md
index 4115f609..77ac0c87 100644
--- a/README.md
+++ b/README.md
@@ -96,7 +96,7 @@ welcome PRs to help us maintain and address inconsistencies in them.
 | doom-horizon                      | [link](https://github.com/aodhneine/horizon-theme.el)                                  | ported from VSCode Horizon (ported by [@karetsu](https://github.com/karetsu))                                                     |
 | doom-Iosvkem                      | [link](https://github.com/neutaaaaan/iosvkem)                                          | ported from the default dark theme for Adobe Brackets (ported by [@neutaaaaan](https://github.com/neutaaaaan))                    |
 | doom-ir-black                     | [link](https://github.com/twerth/ir_black)                                             | ported from Vim's ir_black colorscheme (ported by [@legendre6891](https://github.com/legendre6891))                               |
-| doom-kanagawa                     | [link](https://github.com/rebelot/kanagawa.nvim)                                       | based on rebelot's neovim colorscheme (ported py [@Anskrevy](https://github.com/Anskrevy))                                                                                                                                  |
+| doom-kanagawa-abyss               | [link](https://github.com/rebelot/kanagawa.nvim)                                       | based on rebelot's neovim colorscheme, hybrid of wave and dragon (ported py [@Anskrevy](https://github.com/Anskrevy))             |
 | doom-lantern                      | [link](https://github.com/Gitleptune/lantern-theme)                                    | based on Gitleptune's Lantern theme (ported by [@paladhammika](https://github.com/paladhammika))                                  |
 | doom-laserwave                    | [link](https://github.com/Jaredk3nt/laserwave)                                         | a clean synthwave/outrun theme inspired by VSCode's Laserwave (ported by [@hyakt](https://github.com/hyakt))                      |
 | doom-manegarm                     | original                                                                               | an original autumn-inspired dark theme (ported by [@kenranunderscore](https://github.com/kenranunderscore))                       |
diff --git a/themes/doom-kanagawa-abyss-theme.el b/themes/doom-kanagawa-abyss-theme.el
new file mode 100644
index 00000000..1f089043
--- /dev/null
+++ b/themes/doom-kanagawa-abyss-theme.el
@@ -0,0 +1,444 @@
+;;; doom-kanagawa-abyss-theme.el --- inspired by rebelot/kanagawa.nvim and others -*- lexical-binding: t; no-byte-compile: t; -*-
+;;
+;; Added: June 4 2023
+;; Author: Anskrevy <https://github.com/Anskrevy
+;; Maintainer:
+;; Source: https://github.com/rebelot/kanagawa.nvim
+;;
+;;; Commentary:
+;;
+;; Kanagawa Abyss - A hybrid theme combining Dragon's deep, dark backgrounds
+;; with Wave's vibrant, bright color palette. This creates a high-contrast
+;; experience with vivid colors against deep blacks.
+;;
+;; Original theme by rebelot see: https://github.com/rebelot/kanagawa.nvim
+;; Inspiration taken from modified version in https://github.com/NvChad/base46
+;; and konrad1977 https://github.com/konrad1977/emacs .
+;;
+;;; Code:
+
+(require 'doom-themes)
+
+;;
+;;; Variables
+
+(defgroup doom-kanagawa-abyss-theme nil
+  "Options for the `doom-kanagawa-abyss' theme."
+  :group 'doom-themes)
+
+(defcustom doom-kanagawa-abyss-brighter-modeline nil
+  "If non-nil, more vivid colors will be used to style the mode-line."
+  :group 'doom-kanagawa-abyss-theme
+  :type 'boolean)
+
+(defcustom doom-kanagawa-abyss-brighter-comments nil
+  "If non-nil, comments will be highlighted in more vivid colors."
+  :group 'doom-kanagawa-abyss-theme
+  :type 'boolean)
+
+(defcustom doom-kanagawa-abyss-padded-modeline doom-themes-padded-modeline
+  "If non-nil, adds a 4px padding to the mode-line.
+Can be an integer to determine the exact padding."
+  :group 'doom-kanagawa-abyss-theme
+  :type '(choice integer boolean))
+
+(defcustom doom-kanagawa-abyss-red-cursor nil
+  "If non-nil, cursor will be red."
+  :group 'doom-kanagawa-abyss-theme
+  :type 'boolean)
+
+;;
+;;; Theme definition
+
+(def-doom-theme doom-kanagawa-abyss
+  "A dark theme combining Dragon's deep blacks with Wave's vibrant colors."
+
+  ;; name        default   256       16
+  ;; Dragon's deeper backgrounds for more contrast
+  ((bg         '("#181616" "#1c1c1c" "black"        ))
+   (fg         '("#DCD7BA" "#d0d0d0" "brightwhite"  ))
+
+   (bg-alt     '("#0d0c0c" "#080808" "black"        ))
+   (fg-alt     '("#C8C093" "#c6c6c6" "white"        ))
+
+   ;; Base colors - using Dragon's darker gradient
+   (base0      '("#0d0c0c" "#080808" "black"        ))
+   (base1      '("#12120f" "#121212" "brightblack"  ))
+   (base2      '("#1D1C19" "#1c1c1c" "brightblack"  ))
+   (base3      '("#282727" "#303030" "brightblack"  ))
+   (base4      '("#393836" "#3a3a3a" "brightblack"  ))
+   (base5      '("#625e5a" "#5f5f5f" "brightblack"  ))
+   (base6      '("#727169" "#767676" "brightblack"  ))
+   (base7      '("#C8C093" "#c6c6c6" "brightblack"  ))
+   (base8      '("#DCD7BA" "#d0d0d0" "white"        ))
+
+   (grey       base6)
+
+   ;; Core semantic colors - Wave's bright, vibrant palette
+   (red        '("#FF5D62" "#ff5f5f" "red"          ))
+   (orange     '("#FFA066" "#ff875f" "brightred"    ))
+   (green      '("#98BB6C" "#87af87" "green"        ))
+   (teal       '("#7AA89F" "#87af87" "brightgreen"  ))
+   (yellow     '("#E6C384" "#d7af87" "yellow"       ))
+   (blue       '("#7FB4CA" "#87afd7" "brightblue"   ))
+   (dark-blue  '("#7E9CD8" "#8787d7" "blue"         ))
+   (magenta    '("#957FB8" "#8787af" "brightmagenta"))
+   (violet     '("#9CABCA" "#afafd7" "magenta"      ))
+   (cyan       '("#A3D4D5" "#afd7d7" "brightcyan"   ))
+   (dark-cyan  '("#658594" "#5f8787" "cyan"         ))
+
+   ;; Extended Wave palette colors
+   (sakura-pink      '("#D27E99" "#d787af" "magenta"      ))
+   (peach-red        '("#FF5D62" "#ff5f5f" "red"          ))
+   (wave-aqua-1      '("#6A9589" "#5f8787" "cyan"         ))
+   (wave-blue-1      '("#223249" "#303030" "blue"         ))
+   (wave-blue-2      '("#2D4F67" "#5f5f87" "brightblue"   ))
+   (spring-violet-1  '("#938AA9" "#8787af" "magenta"      ))
+   (spring-violet-2  '("#9CABCA" "#afafd7" "brightmagenta"))
+   (boat-yellow-1    '("#938056" "#87875f" "yellow"       ))
+   (boat-yellow-2    '("#C0A36E" "#afaf5f" "yellow"       ))
+   (oni-violet-2     '("#b8b4d0" "#afafd7" "brightmagenta"))
+   (comet            '("#54536D" "#4e4e4e" "brightblack"  ))
+
+   ;; Diagnostic colors (Wave)
+   (samurai-red      '("#E82424" "#d70000" "red"          ))
+   (ronin-yellow     '("#FF9E3B" "#ff8700" "brightyellow" ))
+
+   ;; VCS colors (Wave)
+   (autumn-green     '("#76946A" "#5f875f" "green"        ))
+   (autumn-red       '("#C34043" "#af5f5f" "red"          ))
+   (autumn-yellow    '("#DCA561" "#d7af5f" "yellow"       ))
+
+   ;; Diff colors (Wave)
+   (winter-green     '("#2B3328" "#303030" "brightblack"  ))
+   (winter-yellow    '("#49443C" "#3a3a3a" "brightblack"  ))
+   (winter-red       '("#43242B" "#3a3a3a" "brightblack"  ))
+   (winter-blue      '("#252535" "#303030" "brightblack"  ))
+
+   ;; Face categories - Wave color mappings with high contrast
+   (highlight      dark-blue)
+   (vertical-bar   base3)
+   (selection      wave-blue-1)
+   (builtin        blue)
+   (comments       (if doom-kanagawa-abyss-brighter-comments wave-aqua-1 base6))
+   (doc-comments   (if doom-kanagawa-abyss-brighter-comments wave-aqua-1 comet))
+   (constants      violet)
+   (functions      magenta)
+   (keywords       blue)
+   (methods        cyan)
+   (operators      blue)
+   (type           yellow)
+   (strings        green)
+   (variables      (doom-lighten magenta 0.4))
+   (numbers        orange)
+   (region         wave-blue-1)
+   (error          red)
+   (warning        yellow)
+   (success        green)
+   (vc-modified    autumn-yellow)
+   (vc-added       autumn-green)
+   (vc-deleted     autumn-red)
+
+   ;; Mode-line configuration
+   (modeline-fg              fg)
+   (modeline-fg-alt          base5)
+   (modeline-bg              (if doom-kanagawa-abyss-brighter-modeline
+                                 (doom-darken dark-blue 0.45)
+                               base0))
+   (modeline-bg-alt          (if doom-kanagawa-abyss-brighter-modeline
+                                 (doom-darken dark-blue 0.475)
+                               (doom-darken base0 0.1)))
+   (modeline-bg-inactive     base1)
+   (modeline-bg-inactive-alt (doom-darken base1 0.1))
+
+   (-modeline-pad
+    (when doom-kanagawa-abyss-padded-modeline
+      (if (integerp doom-kanagawa-abyss-padded-modeline)
+          doom-kanagawa-abyss-padded-modeline
+        4))))
+
+  ;;;; Base theme face overrides
+  (
+   ;; Basic faces - high contrast on deep black
+   (default :background bg :foreground fg)
+   (cursor :background (if doom-kanagawa-abyss-red-cursor red blue) :foreground base0)
+   (hl-line :background base3)
+   (region :background region :distant-foreground fg)
+   ((line-number &override) :foreground base5 :background base0)
+   ((line-number-current-line &override) :foreground violet :background base3 :bold t)
+   (fringe :background base0 :foreground base4)
+   (vertical-border :foreground base3)
+
+   ;; Font lock
+   ((font-lock-builtin-face &override) :foreground blue)
+   ((font-lock-comment-face &override) :foreground comments :italic t
+    :background (if doom-kanagawa-abyss-brighter-comments (doom-lighten bg 0.05)))
+   ((font-lock-comment-delimiter-face &override) :foreground comments :italic t)
+   ((font-lock-constant-face &override) :foreground violet)
+   ((font-lock-doc-face &override) :foreground doc-comments :italic t)
+   ((font-lock-function-name-face &override) :foreground magenta)
+   ((font-lock-keyword-face &override) :foreground blue :weight 'semi-bold)
+   ((font-lock-string-face &override) :foreground green :italic t)
+   ((font-lock-type-face &override) :foreground yellow :weight 'semi-bold)
+   ((font-lock-variable-name-face &override) :foreground (doom-lighten magenta 0.4))
+   ((font-lock-warning-face &override) :foreground ronin-yellow)
+   ((font-lock-negation-char-face &override) :foreground peach-red)
+   ((font-lock-preprocessor-face &override) :foreground boat-yellow-2)
+   ((font-lock-regexp-grouping-backslash &override) :foreground boat-yellow-2)
+
+   ;; Mode-line
+   (mode-line
+    :background modeline-bg :foreground modeline-fg :bold t
+    :box (if -modeline-pad `(:line-width ,-modeline-pad :color ,modeline-bg)))
+   (mode-line-inactive
+    :background modeline-bg-inactive :foreground modeline-fg-alt
+    :box (if -modeline-pad `(:line-width ,-modeline-pad :color ,modeline-bg-inactive)))
+   (mode-line-emphasis :foreground (if doom-kanagawa-abyss-brighter-modeline base8 highlight))
+   (mode-line-buffer-id :foreground teal :bold t)
+   (mode-line-highlight :foreground boat-yellow-2)
+
+   ;; Highlighting
+   (match :background boat-yellow-2 :foreground base0 :bold t)
+   (trailing-whitespace :background comet)
+   (lazy-highlight :background wave-blue-2 :foreground fg :bold t)
+   ((isearch &override) :background autumn-yellow :foreground base0 :bold t)
+   ((isearch-fail &override) :background samurai-red :foreground bg)
+   (show-paren-match :background wave-aqua-1 :foreground base0 :bold t)
+   (show-paren-mismatch :background samurai-red :foreground fg-alt)
+
+   ;;;; centaur-tabs
+   (centaur-tabs-active-bar-face :background blue :foreground fg)
+   (centaur-tabs-selected :background bg :foreground fg :bold t)
+   (centaur-tabs-selected-modified :background bg :foreground fg)
+   (centaur-tabs-modified-marker-selected :background bg :foreground autumn-yellow)
+   (centaur-tabs-close-selected :inherit 'centaur-tabs-selected)
+   (centaur-tabs-unselected :background base0 :foreground base5)
+   (centaur-tabs-default :background base0 :foreground base5)
+   (centaur-tabs-unselected-modified :background base0 :foreground samurai-red)
+   (centaur-tabs-modified-marker-unselected :background base0 :foreground base5)
+   (centaur-tabs-close-unselected :background base0 :foreground base5)
+   (centaur-tabs-close-mouse-face :background nil :foreground samurai-red)
+
+   ;;;; company
+   (company-tooltip :background base3 :foreground fg)
+   (company-tooltip-common :foreground autumn-yellow :bold t)
+   (company-tooltip-quick-access :foreground violet)
+   (company-tooltip-scrollbar-thumb :background autumn-red)
+   (company-tooltip-scrollbar-track :background base3)
+   (company-tooltip-search :background boat-yellow-2 :foreground base0 :distant-foreground fg)
+   (company-tooltip-selection :background wave-blue-2 :foreground fg :bold t)
+   (company-tooltip-mouse :background base3 :foreground base0 :distant-foreground fg)
+   (company-tooltip-annotation :foreground peach-red :distant-foreground base1)
+   (company-scrollbar-bg :inherit 'tooltip)
+   (company-scrollbar-fg :background samurai-red)
+   (company-preview :foreground boat-yellow-2)
+   (company-preview-common :foreground autumn-yellow :bold t)
+   (company-preview-search :inherit 'company-tooltip-search)
+   (company-template-field :inherit 'match)
+
+   ;;;; corfu
+   (corfu-current :background base3)
+   (corfu-border :background base3)
+   (corfu-default :background base2)
+
+   ;;;; css-mode / scss-mode
+   (css-proprietary-property :foreground orange)
+   (css-property :foreground green)
+   (css-selector :foreground dark-blue)
+
+   ;;;; dashboard
+   (dashboard-heading :foreground violet :bold t)
+   (dashboard-items-face :foreground fg)
+   (dashboard-banner-logo-title :bold t :height 200)
+   (dashboard-no-items-face :foreground base5)
+
+   ;;;; doom-modeline
+   (doom-modeline-bar :background (if doom-kanagawa-abyss-brighter-modeline modeline-bg spring-violet-1) :bold t)
+   (doom-modeline-buffer-file :inherit 'mode-line-buffer-id :weight 'bold)
+   (doom-modeline-buffer-path :inherit 'mode-line-emphasis :weight 'bold :foreground teal)
+   (doom-modeline-buffer-project-root :foreground green :weight 'bold)
+   (doom-modeline-buffer-modified :foreground boat-yellow-2 :bold t)
+   (doom-modeline-buffer-major-mode :foreground teal :bold t)
+   (doom-modeline-panel :inherit 'bold :background orange :foreground base0)
+   (doom-modeline-info :bold t :foreground green)
+   (doom-modeline-warning :foreground yellow :bold t)
+   (doom-modeline-urgent :foreground red :bold t)
+   (doom-modeline-evil-insert-state :foreground samurai-red)
+   (doom-modeline-evil-visual-state :foreground green)
+   (doom-modeline-evil-replace-state :foreground ronin-yellow)
+   (doom-modeline-evil-normal-state :foreground cyan)
+   (doom-modeline-evil-motion-state :foreground cyan)
+
+   ;;;; ediff
+   (ediff-current-diff-A :background winter-red :foreground fg)
+   (ediff-current-diff-B :background winter-green :foreground fg)
+   (ediff-current-diff-C :background winter-blue :foreground fg)
+   (ediff-fine-diff-A :background autumn-red :foreground bg :bold t)
+   (ediff-fine-diff-B :background autumn-green :foreground bg :bold t)
+   (ediff-fine-diff-C :background winter-yellow :foreground bg :bold t)
+
+   ;;;; evil
+   (evil-ex-lazy-highlight :background autumn-green :foreground winter-green :bold t)
+   (evil-ex-substitute-matches :background autumn-red :foreground winter-red :bold t)
+   (evil-ex-substitute-replacement :foreground orange :strike-through nil)
+   (evil-search-highlight-persist-highlight-face :background boat-yellow-2 :foreground base0)
+   (evil-snipe-first-match-face :foreground blue :background bg-alt)
+
+   ;;;; flycheck
+   (flycheck-error (:underline `(:style wave :color ,samurai-red)))
+   (flycheck-warning (:underline `(:style wave :color ,ronin-yellow)))
+   (flycheck-info (:underline `(:style wave :color ,wave-aqua-1)))
+   (flycheck-fringe-error :foreground samurai-red)
+   (flycheck-fringe-warning :foreground ronin-yellow)
+   (flycheck-fringe-info :foreground wave-aqua-1)
+
+   ;;;; git-gutter
+   (git-gutter:added :foreground autumn-green :background base0)
+   (git-gutter:modified :foreground autumn-yellow :background base0)
+   (git-gutter:deleted :foreground autumn-red :background base0)
+
+   ;;;; indent-guides
+   (highlight-indent-guides-character-face :foreground base4)
+   (highlight-indent-guides-stack-character-face :foreground base4)
+   (highlight-indent-guides-stack-odd-face :foreground base4)
+   (highlight-indent-guides-stack-even-face :foreground comet)
+   (highlight-indent-guides-even-face :foreground base3)
+   (highlight-indent-guides-odd-face :foreground comet)
+
+   ;;;; ivy
+   (ivy-current-match :background dark-blue :foreground base0 :bold t)
+   (ivy-action :background nil :foreground fg)
+   (ivy-grep-line-number :background nil :foreground green)
+   (ivy-minibuffer-match-face-1 :background nil :foreground red)
+   (ivy-minibuffer-match-face-2 :background nil :foreground green)
+   (ivy-minibuffer-match-face-3 :background nil :foreground cyan)
+   (ivy-minibuffer-match-face-4 :background nil :foreground yellow)
+   (ivy-minibuffer-match-highlight :foreground cyan)
+   (ivy-grep-info :foreground cyan)
+   (ivy-confirm-face :foreground teal)
+   (ivy-posframe :background base3)
+   (ivy-posframe-border :background base4)
+
+   ;;;; LaTeX-mode
+   (font-latex-math-face :foreground green)
+   (font-latex-script-char-face :foreground cyan)
+
+   ;;;; lsp-mode and lsp-ui
+   (lsp-face-highlight-textual :background wave-blue-2)
+   (lsp-face-highlight-read :background wave-blue-2)
+   (lsp-face-highlight-write :background wave-blue-2)
+   (lsp-headerline-breadcrumb-path-error-face (:foreground base5 :background base0 :underline (:color green :style wave)))
+   (lsp-headerline-breadcrumb-path-face :background base0 :foreground fg)
+   (lsp-headerline-breadcrumb-symbols-error-face :foreground samurai-red)
+   (lsp-ui-doc-background :background base0 :foreground fg)
+   (lsp-ui-doc-header :background base0 :foreground fg :bold t)
+   (lsp-ui-doc-border :foreground base4)
+   (lsp-ui-sideline-code-action :foreground boat-yellow-2)
+   (lsp-ui-sideline-current-symbol :foreground blue)
+   (lsp-ui-sideline-symbol :foreground dark-cyan)
+   (lsp-ui-peek-filename :foreground cyan)
+
+   ;;;; markdown-mode
+   (markdown-markup-face :foreground base5)
+   (markdown-header-face :inherit 'bold :foreground red)
+   (markdown-header-face-1 :foreground red :height 1.3 :bold t)
+   (markdown-header-face-2 :foreground violet :height 1.15 :bold t)
+   (markdown-header-face-3 :foreground boat-yellow-2 :height 1.05)
+   ((markdown-code-face &override) :background base0 :foreground green)
+   (markdown-inline-code-face :background base0 :foreground green)
+   (markdown-blockquote-face :foreground oni-violet-2)
+
+   ;;;; org-mode
+   (org-block :background base0 :foreground fg)
+   (org-block-begin-line :background winter-blue :foreground blue)
+   (org-block-end-line :background winter-red :foreground peach-red)
+   (org-code :background base0 :foreground green)
+   (org-meta-line :background winter-green :foreground green)
+   (org-level-1 :foreground peach-red :height 1.3 :bold t)
+   (org-level-2 :foreground violet :height 1.15 :bold t)
+   (org-level-3 :foreground boat-yellow-2 :height 1.05)
+   (org-level-4 :foreground fg)
+   (org-level-5 :foreground fg)
+   (org-level-6 :foreground yellow)
+   (org-level-7 :foreground orange)
+   (org-level-8 :foreground green)
+   (org-todo :foreground orange :bold t)
+   (org-done :foreground dark-cyan :strike-through t)
+   (org-headline-done :foreground dark-cyan :strike-through t)
+   (org-ellipsis :foreground wave-blue-2 :bold t)
+   (org-date :foreground wave-blue-2)
+   (org-footnote :foreground teal)
+
+   ;;;; rainbow-delimiters
+   (rainbow-delimiters-mismatched-face :foreground samurai-red)
+   (rainbow-delimiters-unmatched-face :foreground teal)
+   (rainbow-delimiters-base-error-face :foreground samurai-red)
+   (rainbow-delimiters-base-face :foreground base5)
+   (rainbow-delimiters-depth-1-face :foreground violet)
+   (rainbow-delimiters-depth-2-face :foreground dark-cyan)
+   (rainbow-delimiters-depth-3-face :foreground spring-violet-1)
+   (rainbow-delimiters-depth-4-face :foreground green)
+   (rainbow-delimiters-depth-5-face :foreground teal)
+   (rainbow-delimiters-depth-6-face :foreground yellow)
+   (rainbow-delimiters-depth-7-face :foreground red)
+   (rainbow-delimiters-depth-8-face :foreground cyan)
+   (rainbow-delimiters-depth-9-face :foreground violet)
+
+   ;;;; rjsx-mode
+   (rjsx-tag :foreground red)
+   (rjsx-attr :foreground orange)
+
+   ;;;; solaire-mode
+   (solaire-default-face :background base1)
+   (solaire-hl-line-face :background base3)
+   (solaire-mode-line-face
+    :inherit 'mode-line
+    :background modeline-bg-alt
+    :box (if -modeline-pad `(:line-width ,-modeline-pad :color ,modeline-bg-alt)))
+   (solaire-mode-line-inactive-face
+    :inherit 'mode-line-inactive
+    :background modeline-bg-inactive-alt
+    :box (if -modeline-pad `(:line-width ,-modeline-pad :color ,modeline-bg-inactive-alt)))
+
+   ;;;; treemacs
+   (treemacs-root-face :foreground fg :bold t :height 1.2)
+   (treemacs-directory-face :foreground fg)
+   (treemacs-directory-collapsed-face :foreground fg)
+   (treemacs-file-face :foreground fg)
+   (treemacs-git-added-face :foreground orange)
+   (treemacs-git-renamed-face :foreground fg)
+   (treemacs-git-ignored-face :foreground base5)
+   (treemacs-git-unmodified-face :foreground fg)
+   (treemacs-git-modified-face :foreground green)
+
+   ;;;; vertico
+   (vertico-current :background wave-blue-1 :foreground yellow :bold t)
+   (vertico-multiline :background samurai-red)
+   (vertico-group-title :background winter-blue :foreground cyan :bold t)
+   (vertico-group-separator :background winter-blue :foreground cyan :strike-through t)
+   (vertico-posframe-border :background base4)
+   (vertico-posframe :background base3)
+
+   ;;;; vterm
+   (vterm-color-bright-black :inherit 'term-color-bright-black :foreground base5)
+
+   ;;;; which-key
+   (which-key-command-description-face :foreground dark-blue)
+   (which-key-group-description-face :foreground red)
+   (which-key-local-map-description-face :foreground yellow)
+   (which-key-key-face :foreground teal)
+   (which-key-posframe :background wave-blue-1)
+   (which-key-posframe-border :background wave-blue-1)
+
+   ;;;; whitespace-mode
+   (whitespace-space :foreground base5)
+   (whitespace-tab :foreground base5)
+   (whitespace-newline :foreground base5)
+   (whitespace-trailing :background comet)
+   (whitespace-line :background winter-red :foreground samurai-red)
+   )
+
+  ;;;; Base theme variable overrides
+  ())
+
+;;; doom-kanagawa-abyss-theme.el ends here
diff --git a/themes/doom-kanagawa-theme.el b/themes/doom-kanagawa-theme.el
deleted file mode 100644
index 9b0a9950..00000000
--- a/themes/doom-kanagawa-theme.el
+++ /dev/null
@@ -1,193 +0,0 @@
-;;; doom-kanagawa-theme.el --- inspired by rebelot/kanagawa.nvim and others -*- lexical-binding: t; no-byte-compile: t; -*-
-;;
-;; Added: June 4 2023
-;; Author: Anskrevy <https://github.com/Anskrevy
-;; Maintainer:
-;; Source: https://github.com/rebelot/kanagawa.nvim
-;;
-;;; Commentary:
-;;; Original theme by rebelot see: https://github.com/rebelot/kanagawa.nvim
-;;; Inspiration taken from modified version in https://github.com/NvChad/base46
-;;; and konrad1977 https://github.com/konrad1977/emacs .
-;;
-;;; Code:
-
-(require 'doom-themes)
-
-
-;;
-;;; Variables
-
-(defgroup doom-kanagawa-theme nil
-  "Options for the `doom-kanagawa' theme."
-  :group 'doom-themes)
-
-(defcustom doom-kanagawa-brighter-modeline nil
-  "If non-nil, more vivid colors will be used to style the mode-line."
-  :group 'doom-kanagawa-theme
-  :type 'boolean)
-
-(defcustom doom-kanagawa-brighter-comments nil
-  "If non-nil, comments will be highlighted in more vivid colors."
-  :group 'doom-kanagawa-theme
-  :type 'boolean)
-
-(defcustom doom-kanagawa-padded-modeline doom-themes-padded-modeline
-  "If non-nil, adds a 4px padding to the mode-line.
-Can be an integer to determine the exact padding."
-  :group 'doom-kanagawa-theme
-  :type '(choice integer boolean))
-
-(defcustom doom-kanagawa-red-cursor nil
-  "If non-nil, cursor will be red."
-  :group 'doom-kanagawa-theme
-  :type 'boolean)
-
-
-;;
-;;; Theme definition
-
-(def-doom-theme doom-kanagawa
-  "A dark theme inspired by rebelot/kanagawa.nvim and others."
-
-  ;; name        default   256           16
-  ((bg         '("#181616" "black"       "black"  ))
-   (fg         '("#DCD7BA" "#DCD7BA"     "brightwhite"  ))
-
-   ;; These are off-color variants of bg/fg, used primarily for `solaire-mode',
-   ;; but can also be useful as a basis for subtle highlights (e.g. for hl-line
-   ;; or region), especially when paired with the `doom-darken', `doom-lighten',
-   ;; and `doom-blend' helper functions.
-   (bg-alt     '("#1D1C19" "black"       "black"        ))
-   (fg-alt     '("#C8C093" "#C8C093"     "white"        ))
-
-   ;; These should represent a spectrum from bg to fg, where base0 is a starker
-   ;; bg and base8 is a starker fg. For example, if bg is light grey and fg is
-   ;; dark grey, base0 should be white and base8 should be black.
-   (base0      '("#191922" "black"       "black"        ))
-   (base1      '("#28282E" "#28282E"     "brightblack"  ))
-   (base2      '("#222129" "#222129"     "brightblack"  ))
-   (base3      '("#26252C" "#26252C"     "brightblack"  ))
-   (base4      '("#37363A" "#37363A"     "brightblack"  ))
-   (base5      '("#464546" "#464546"     "brightblack"  ))
-   (base6      '("#545451" "#545451"     "brightblack"  ))
-   (base7      '("#727169" "#727169"     "brightblack"  ))
-   (base8      '("#BABDB9" "#BABDB9"     "white"        ))
-
-   (grey       base4)
-   (red        '("#FF5D62" "#FF5D62" "red"          ))
-   (orange     '("#FFA066" "#FFA066" "brightred"    ))
-   (green      '("#98BB6C" "#98BB6C" "green"        ))
-   (teal       '("#7AA89F" "#7AA89F" "brightgreen"  ))
-   (yellow     '("#E6C384" "#E6C384" "yellow"       ))
-   (blue       '("#7FB4CA" "#7FB4CA" "brightblue"   ))
-   (dark-blue  '("#7E9CD8" "#7E9CD8" "blue"         ))
-   (magenta    '("#957FB8" "#957FB8" "brightmagenta"))
-   (violet     '("#9CABCA" "#9CABCA" "magenta"      ))
-   (cyan       '("#A3D4D5" "#A3D4D5" "brightcyan"   ))
-   (dark-cyan  '("#658594" "#658594" "cyan"         ))
-
-   ;; These are the "universal syntax classes" that doom-themes establishes.
-   ;; These *must* be included in every doom themes, or your theme will throw an
-   ;; error, as they are used in the base theme defined in doom-themes-base.
-   (highlight      blue)
-   (vertical-bar   (doom-darken base1 0.1))
-   (selection      (doom-darken dark-blue 0.5))
-   (builtin        magenta)
-   (comments       (if doom-kanagawa-brighter-comments dark-cyan base5))
-   (doc-comments   (doom-lighten (if doom-kanagawa-brighter-comments dark-cyan base5) 0.25))
-   (constants      violet)
-   (functions      magenta)
-   (keywords       blue)
-   (methods        cyan)
-   (operators      blue)
-   (type           yellow)
-   (strings        green)
-   (variables      (doom-lighten magenta 0.4))
-   (numbers        orange)
-   (region         `(,(doom-lighten (car bg-alt) 0.15) ,@(doom-lighten (cdr base1) 0.35)))
-   (error          red)
-   (warning        yellow)
-   (success        green)
-   (vc-modified    orange)
-   (vc-added       green)
-   (vc-deleted     red)
-
-   ;; These are extra color variables used only in this theme; i.e. they aren't
-   ;; mandatory for derived themes.
-   (modeline-fg              fg)
-   (modeline-fg-alt          base5)
-   (modeline-bg              (if doom-kanagawa-brighter-modeline
-                                 (doom-darken blue 0.45)
-                               (doom-darken bg-alt 0.1)))
-   (modeline-bg-alt          (if doom-kanagawa-brighter-modeline
-                                 (doom-darken blue 0.475)
-                               `(,(doom-darken (car bg-alt) 0.15) ,@(cdr bg))))
-   (modeline-bg-inactive     `(,(car bg-alt) ,@(cdr base1)))
-   (modeline-bg-inactive-alt `(,(doom-darken (car bg-alt) 0.1) ,@(cdr bg)))
-
-   (-modeline-pad
-    (when doom-kanagawa-padded-modeline
-      (if (integerp doom-kanagawa-padded-modeline) doom-kanagawa-padded-modeline 4))))
-
-
-  ;;;; Base theme face overrides
-  ((cursor :background (if doom-kanagawa-red-cursor red fg-alt))
-   ((line-number &override) :foreground base4)
-   ((line-number-current-line &override) :foreground fg)
-   ((font-lock-comment-face &override)
-    :background (if doom-kanagawa-brighter-comments (doom-lighten bg 0.05)))
-   (mode-line
-    :background modeline-bg :foreground modeline-fg
-    :box (if -modeline-pad `(:line-width ,-modeline-pad :color ,modeline-bg)))
-   (mode-line-inactive
-    :background modeline-bg-inactive :foreground modeline-fg-alt
-    :box (if -modeline-pad `(:line-width ,-modeline-pad :color ,modeline-bg-inactive)))
-   (mode-line-emphasis :foreground (if doom-kanagawa-brighter-modeline base8 highlight))
-
-   ;;;; indent-guides
-   (highlight-indent-guides-character-face :foreground base4)
-   (highlight-indent-guides-top-character-face :foreground base4)
-   (highlight-indent-guides-stack-character-face :foreground base4)
-   ;;;; evil-snipe
-   (evil-snipe-first-match-face :foreground (if doom-kanagawa-red-cursor red blue) :background bg-alt)
-   ;;;; corfu
-   (corfu-current :background base3)
-   ;;;; css-mode <built-in> / scss-mode
-   (css-proprietary-property :foreground orange)
-   (css-property             :foreground green)
-   (css-selector             :foreground blue)
-   ;;;; doom-modeline
-   (doom-modeline-bar :background (if doom-kanagawa-brighter-modeline modeline-bg highlight))
-   (doom-modeline-buffer-file :inherit 'mode-line-buffer-id :weight 'bold)
-   (doom-modeline-buffer-path :inherit 'mode-line-emphasis :weight 'bold)
-   (doom-modeline-buffer-project-root :foreground green :weight 'bold)
-   ;;;; elscreen
-   (elscreen-tab-other-screen-face :background "#353a42" :foreground "#1e2022")
-   ;;;; ivy
-   (ivy-current-match :background dark-blue :distant-foreground base0 :weight 'normal)
-   ;;;; LaTeX-mode
-   (font-latex-math-face :foreground green)
-   ;;;; markdown-mode
-   (markdown-markup-face :foreground base5)
-   (markdown-header-face :inherit 'bold :foreground red)
-   ((markdown-code-face &override) :background (doom-lighten base3 0.05))
-   ;;;; rjsx-mode
-   (rjsx-tag :foreground red)
-   (rjsx-attr :foreground orange)
-   ;;;; solaire-mode
-   (solaire-mode-line-face
-    :inherit 'mode-line
-    :background modeline-bg-alt
-    :box (if -modeline-pad `(:line-width ,-modeline-pad :color ,modeline-bg-alt)))
-   (solaire-mode-line-inactive-face
-    :inherit 'mode-line-inactive
-    :background modeline-bg-inactive-alt
-    :box (if -modeline-pad `(:line-width ,-modeline-pad :color ,modeline-bg-inactive-alt)))
-   ;;;; vterm
-   (vterm-color-bright-black :inherit 'term-color-bright-black :foreground base5))
-
-  ;;;; Base theme variable overrides-
-  ())
-
-;;; doom-kanagawa-theme.el ends here

From 46713e88d8793c6d7aa537ee5a0d8b6b3dd54dfb Mon Sep 17 00:00:00 2001
From: Anskrevy <95379591+Anskrevy@users.noreply.github.com>
Date: Tue, 30 Sep 2025 17:35:32 -0700
Subject: [PATCH 13/16] add(kanagawa): port dragon, lotus, and wave themes

---
 README.md                            |   3 +
 themes/doom-kanagawa-dragon-theme.el | 428 ++++++++++++++++++++++++++
 themes/doom-kanagawa-lotus-theme.el  | 429 +++++++++++++++++++++++++++
 themes/doom-kanagawa-wave-theme.el   | 429 +++++++++++++++++++++++++++
 4 files changed, 1289 insertions(+)
 create mode 100644 themes/doom-kanagawa-dragon-theme.el
 create mode 100644 themes/doom-kanagawa-lotus-theme.el
 create mode 100644 themes/doom-kanagawa-wave-theme.el

diff --git a/README.md b/README.md
index 77ac0c87..a2ce1cf1 100644
--- a/README.md
+++ b/README.md
@@ -97,6 +97,9 @@ welcome PRs to help us maintain and address inconsistencies in them.
 | doom-Iosvkem                      | [link](https://github.com/neutaaaaan/iosvkem)                                          | ported from the default dark theme for Adobe Brackets (ported by [@neutaaaaan](https://github.com/neutaaaaan))                    |
 | doom-ir-black                     | [link](https://github.com/twerth/ir_black)                                             | ported from Vim's ir_black colorscheme (ported by [@legendre6891](https://github.com/legendre6891))                               |
 | doom-kanagawa-abyss               | [link](https://github.com/rebelot/kanagawa.nvim)                                       | based on rebelot's neovim colorscheme, hybrid of wave and dragon (ported py [@Anskrevy](https://github.com/Anskrevy))             |
+| doom-kanagawa-dragon              | [link](https://github.com/rebelot/kanagawa.nvim)                                       | based on rebelot's neovim colorscheme (ported py [@Anskrevy](https://github.com/Anskrevy))                                        |
+| doom-kanagawa-lotus               | [link](https://github.com/rebelot/kanagawa.nvim)                                       | based on rebelot's neovim colorscheme (ported py [@Anskrevy](https://github.com/Anskrevy))                                        |
+| doom-kanagawa-wave                | [link](https://github.com/rebelot/kanagawa.nvim)                                       | based on rebelot's neovim colorscheme (ported py [@Anskrevy](https://github.com/Anskrevy))                                        |
 | doom-lantern                      | [link](https://github.com/Gitleptune/lantern-theme)                                    | based on Gitleptune's Lantern theme (ported by [@paladhammika](https://github.com/paladhammika))                                  |
 | doom-laserwave                    | [link](https://github.com/Jaredk3nt/laserwave)                                         | a clean synthwave/outrun theme inspired by VSCode's Laserwave (ported by [@hyakt](https://github.com/hyakt))                      |
 | doom-manegarm                     | original                                                                               | an original autumn-inspired dark theme (ported by [@kenranunderscore](https://github.com/kenranunderscore))                       |
diff --git a/themes/doom-kanagawa-dragon-theme.el b/themes/doom-kanagawa-dragon-theme.el
new file mode 100644
index 00000000..1442d1e9
--- /dev/null
+++ b/themes/doom-kanagawa-dragon-theme.el
@@ -0,0 +1,428 @@
+;;; doom-kanagawa-dragon-theme.el --- inspired by rebelot/kanagawa.nvim (dragon) -*- lexical-binding: t; no-byte-compile: t; -*-
+;;
+;; Added: September 30 2025
+;; Author: Anskrevy <https://github.com/Anskrevy
+;; Maintainer:
+;; Source: https://github.com/rebelot/kanagawa.nvim
+;;
+;;; Commentary:
+;;
+;; Kanagawa Dragon - A warmer, deeper, more muted dark theme optimized
+;; for late-night coding sessions with reduced blue light exposure.
+;;
+;;; Code:
+
+(require 'doom-themes)
+
+;;
+;;; Variables
+
+(defgroup doom-kanagawa-dragon-theme nil
+  "Options for the `doom-kanagawa-dragon' theme."
+  :group 'doom-themes)
+
+(defcustom doom-kanagawa-dragon-brighter-modeline nil
+  "If non-nil, more vivid colors will be used to style the mode-line."
+  :group 'doom-kanagawa-dragon-theme
+  :type 'boolean)
+
+(defcustom doom-kanagawa-dragon-brighter-comments nil
+  "If non-nil, comments will be highlighted in more vivid colors."
+  :group 'doom-kanagawa-dragon-theme
+  :type 'boolean)
+
+(defcustom doom-kanagawa-dragon-padded-modeline doom-themes-padded-modeline
+  "If non-nil, adds a 4px padding to the mode-line.
+Can be an integer to determine the exact padding."
+  :group 'doom-kanagawa-dragon-theme
+  :type '(choice integer boolean))
+
+(defcustom doom-kanagawa-dragon-red-cursor nil
+  "If non-nil, cursor will be red."
+  :group 'doom-kanagawa-dragon-theme
+  :type 'boolean)
+
+;;
+;;; Theme definition
+
+(def-doom-theme doom-kanagawa-dragon
+  "A dark theme with warmer tones inspired by Kanagawa Dragon."
+
+  ;; name        default   256       16
+  ;; Dragon Ink - Background colors (darker and warmer than Wave)
+  ((bg         '("#181616" "#1c1c1c" "black"        ))
+   (fg         '("#c5c9c5" "#c6c6c6" "brightwhite"  ))
+
+   (bg-alt     '("#0d0c0c" "#080808" "black"        ))
+   (fg-alt     '("#C8C093" "#c6c6c6" "white"        ))
+
+   (base0      '("#0d0c0c" "#080808" "black"        ))
+   (base1      '("#12120f" "#121212" "brightblack"  ))
+   (base2      '("#1D1C19" "#1c1c1c" "brightblack"  ))
+   (base3      '("#282727" "#303030" "brightblack"  ))
+   (base4      '("#393836" "#3a3a3a" "brightblack"  ))
+   (base5      '("#625e5a" "#5f5f5f" "brightblack"  ))
+   (base6      '("#737c73" "#767676" "brightblack"  ))
+   (base7      '("#a6a69c" "#9e9e9e" "brightblack"  ))
+   (base8      '("#c5c9c5" "#c6c6c6" "white"        ))
+
+   (grey       base6)
+
+   ;; Core semantic colors
+   (red        '("#c4746e" "#d75f5f" "red"          ))
+   (orange     '("#b6927b" "#af875f" "brightred"    ))
+   (green      '("#8a9a7b" "#87af87" "green"        ))
+   (teal       '("#8ea4a2" "#87afaf" "brightgreen"  ))
+   (yellow     '("#c4b28a" "#d7af87" "yellow"       ))
+   (blue       '("#8ba4b0" "#87afd7" "brightblue"   ))
+   (dark-blue  '("#8ba4b0" "#87afd7" "blue"         ))
+   (magenta    '("#8992a7" "#8787af" "brightmagenta"))
+   (violet     '("#a292a3" "#afafaf" "magenta"      ))
+   (cyan       '("#8ea4a2" "#87afaf" "brightcyan"   ))
+   (dark-cyan  '("#658594" "#5f8787" "cyan"         ))
+
+   ;; Extended Dragon-specific colors
+   (dragon-pink       '("#a292a3" "#afafaf" "magenta"     ))
+   (dragon-gray       '("#a6a69c" "#9e9e9e" "brightblack" ))
+   (dragon-gray2      '("#9e9b93" "#9e9e9e" "brightblack" ))
+   (dragon-gray3      '("#7a8382" "#808080" "brightblack" ))
+   (dragon-green      '("#87a987" "#87af87" "green"       ))
+   (dragon-orange2    '("#b98d7b" "#af875f" "brightred"   ))
+   (dragon-ash        '("#737c73" "#767676" "brightblack" ))
+   (dragon-teal       '("#949fb5" "#8787af" "brightcyan"  ))
+
+   ;; Wave colors used in BOTH themes (visual/search)
+   (wave-blue-1       '("#223249" "#303030" "blue"        ))
+   (wave-blue-2       '("#2D4F67" "#5f5f87" "brightblue"  ))
+
+   ;; Diagnostic colors
+   (samurai-red       '("#E82424" "#d70000" "red"         ))
+   (ronin-yellow      '("#FF9E3B" "#ff8700" "brightyellow"))
+   (wave-aqua-1       '("#6A9589" "#5f8787" "cyan"        ))
+
+   ;; VCS colors
+   (autumn-green      '("#76946A" "#5f875f" "green"       ))
+   (autumn-red        '("#C34043" "#af5f5f" "red"         ))
+   (autumn-yellow     '("#DCA561" "#d7af5f" "yellow"      ))
+
+   ;; Diff colors
+   (winter-green      '("#2B3328" "#303030" "brightblack" ))
+   (winter-yellow     '("#49443C" "#3a3a3a" "brightblack" ))
+   (winter-red        '("#43242B" "#3a3a3a" "brightblack" ))
+   (winter-blue       '("#252535" "#303030" "brightblack" ))
+
+   ;; Face categories
+   (highlight      dark-blue)
+   (vertical-bar   base3)
+   (selection      wave-blue-1)
+   (builtin        dragon-teal)
+   (comments       (if doom-kanagawa-dragon-brighter-comments wave-aqua-1 dragon-ash))
+   (doc-comments   (if doom-kanagawa-dragon-brighter-comments wave-aqua-1 dragon-gray3))
+   (constants      orange)
+   (functions      blue)
+   (keywords       magenta)
+   (methods        dragon-gray3)
+   (operators      red)
+   (type           teal)
+   (strings        green)
+   (variables      fg)
+   (numbers        violet)
+   (region         wave-blue-1)
+   (error          samurai-red)
+   (warning        ronin-yellow)
+   (success        dragon-green)
+   (vc-modified    autumn-yellow)
+   (vc-added       autumn-green)
+   (vc-deleted     autumn-red)
+
+   ;; Mode-line configuration
+   (modeline-fg              fg)
+   (modeline-fg-alt          base5)
+   (modeline-bg              (if doom-kanagawa-dragon-brighter-modeline
+                                 (doom-darken blue 0.45)
+                               base0))
+   (modeline-bg-alt          (if doom-kanagawa-dragon-brighter-modeline
+                                 (doom-darken blue 0.475)
+                               (doom-darken base0 0.1)))
+   (modeline-bg-inactive     base1)
+   (modeline-bg-inactive-alt (doom-darken base1 0.1))
+
+   (-modeline-pad
+    (when doom-kanagawa-dragon-padded-modeline
+      (if (integerp doom-kanagawa-dragon-padded-modeline)
+          doom-kanagawa-dragon-padded-modeline
+        4))))
+
+  ;;;; Base theme face overrides
+  (
+   ;; Basic faces
+   (default :background bg :foreground fg)
+   (cursor :background (if doom-kanagawa-dragon-red-cursor red blue) :foreground base0)
+   (hl-line :background base3)
+   (region :background region :distant-foreground fg)
+   ((line-number &override) :foreground base5 :background base0)
+   ((line-number-current-line &override) :foreground violet :background base3 :bold t)
+   (fringe :background base0 :foreground base4)
+   (vertical-border :foreground base3)
+
+   ;; Font lock
+   ((font-lock-builtin-face &override) :foreground dragon-teal)
+   ((font-lock-comment-face &override) :foreground comments :italic t
+    :background (if doom-kanagawa-dragon-brighter-comments (doom-lighten bg 0.05)))
+   ((font-lock-comment-delimiter-face &override) :foreground comments :italic t)
+   ((font-lock-constant-face &override) :foreground orange)
+   ((font-lock-doc-face &override) :foreground doc-comments :italic t)
+   ((font-lock-function-name-face &override) :foreground blue)
+   ((font-lock-keyword-face &override) :foreground magenta :weight 'semi-bold)
+   ((font-lock-string-face &override) :foreground green :italic t)
+   ((font-lock-type-face &override) :foreground teal :weight 'semi-bold)
+   ((font-lock-variable-name-face &override) :foreground fg)
+   ((font-lock-warning-face &override) :foreground ronin-yellow)
+   ((font-lock-negation-char-face &override) :foreground red)
+   ((font-lock-preprocessor-face &override) :foreground red)
+   ((font-lock-regexp-grouping-backslash &override) :foreground red)
+
+   ;; Mode-line
+   (mode-line
+    :background modeline-bg :foreground modeline-fg :bold t
+    :box (if -modeline-pad `(:line-width ,-modeline-pad :color ,modeline-bg)))
+   (mode-line-inactive
+    :background modeline-bg-inactive :foreground modeline-fg-alt
+    :box (if -modeline-pad `(:line-width ,-modeline-pad :color ,modeline-bg-inactive)))
+   (mode-line-emphasis :foreground (if doom-kanagawa-dragon-brighter-modeline base8 highlight))
+   (mode-line-buffer-id :foreground teal :bold t)
+   (mode-line-highlight :foreground yellow)
+
+   ;; Highlighting
+   (highlight :background dragon-gray3 :foreground fg)
+   (match :background yellow :foreground base0 :bold t)
+   (trailing-whitespace :background dragon-gray3)
+   (lazy-highlight :background wave-blue-2 :foreground fg :bold t)
+   ((isearch &override) :background autumn-yellow :foreground base0 :bold t)
+   ((isearch-fail &override) :background samurai-red :foreground bg)
+   (show-paren-match :background wave-aqua-1 :foreground base0 :bold t)
+   (show-paren-mismatch :background samurai-red :foreground fg-alt)
+
+   ;;;; centaur-tabs
+   (centaur-tabs-active-bar-face :background blue :foreground fg)
+   (centaur-tabs-selected :background bg :foreground fg :bold t)
+   (centaur-tabs-selected-modified :background bg :foreground fg)
+   (centaur-tabs-modified-marker-selected :background bg :foreground autumn-yellow)
+   (centaur-tabs-close-selected :inherit 'centaur-tabs-selected)
+   (centaur-tabs-unselected :background base0 :foreground base5)
+   (centaur-tabs-default :background base0 :foreground base5)
+   (centaur-tabs-unselected-modified :background base0 :foreground samurai-red)
+   (centaur-tabs-modified-marker-unselected :background base0 :foreground base5)
+   (centaur-tabs-close-unselected :background base0 :foreground base5)
+   (centaur-tabs-close-mouse-face :background nil :foreground samurai-red)
+
+   ;;;; company
+   (company-tooltip :background base3 :foreground fg)
+   (company-tooltip-common :foreground autumn-yellow :bold t)
+   (company-tooltip-quick-access :foreground violet)
+   (company-tooltip-scrollbar-thumb :background autumn-red)
+   (company-tooltip-scrollbar-track :background base3)
+   (company-tooltip-search :background yellow :foreground base0 :distant-foreground fg)
+   (company-tooltip-selection :background wave-blue-2 :foreground fg :bold t)
+   (company-tooltip-mouse :background base3 :foreground base0 :distant-foreground fg)
+   (company-tooltip-annotation :foreground red :distant-foreground base1)
+   (company-scrollbar-bg :inherit 'tooltip)
+   (company-scrollbar-fg :background samurai-red)
+   (company-preview :foreground yellow)
+   (company-preview-common :foreground autumn-yellow :bold t)
+   (company-preview-search :inherit 'company-tooltip-search)
+   (company-template-field :inherit 'match)
+
+   ;;;; css-mode / scss-mode
+   (css-proprietary-property :foreground orange)
+   (css-property :foreground green)
+   (css-selector :foreground blue)
+
+   ;;;; dashboard
+   (dashboard-heading :foreground violet :bold t)
+   (dashboard-items-face :foreground fg)
+   (dashboard-banner-logo-title :bold t :height 200)
+   (dashboard-no-items-face :foreground base5)
+
+   ;;;; doom-modeline
+   (doom-modeline-bar :background (if doom-kanagawa-dragon-brighter-modeline modeline-bg dragon-gray3) :bold t)
+   (doom-modeline-buffer-file :inherit 'mode-line-buffer-id :weight 'bold)
+   (doom-modeline-buffer-path :inherit 'mode-line-emphasis :weight 'bold :foreground teal)
+   (doom-modeline-buffer-project-root :foreground orange :weight 'bold)
+   (doom-modeline-buffer-modified :foreground yellow :bold t)
+   (doom-modeline-buffer-major-mode :foreground teal :bold t)
+   (doom-modeline-panel :inherit 'bold :background orange :foreground base0)
+   (doom-modeline-info :bold t :foreground green)
+   (doom-modeline-warning :foreground yellow :bold t)
+   (doom-modeline-urgent :foreground red :bold t)
+   (doom-modeline-evil-insert-state :foreground samurai-red)
+   (doom-modeline-evil-visual-state :foreground dragon-green)
+   (doom-modeline-evil-replace-state :foreground ronin-yellow)
+   (doom-modeline-evil-normal-state :foreground cyan)
+   (doom-modeline-evil-motion-state :foreground cyan)
+
+   ;;;; ediff
+   (ediff-current-diff-A :background winter-red :foreground fg)
+   (ediff-current-diff-B :background winter-green :foreground fg)
+   (ediff-current-diff-C :background winter-blue :foreground fg)
+   (ediff-fine-diff-A :background autumn-red :foreground bg :bold t)
+   (ediff-fine-diff-B :background autumn-green :foreground bg :bold t)
+   (ediff-fine-diff-C :background winter-yellow :foreground bg :bold t)
+
+   ;;;; evil
+   (evil-ex-lazy-highlight :background autumn-green :foreground winter-green :bold t)
+   (evil-ex-substitute-matches :background autumn-red :foreground winter-red :bold t)
+   (evil-ex-substitute-replacement :foreground orange :strike-through nil)
+   (evil-search-highlight-persist-highlight-face :background yellow :foreground base0)
+
+   ;;;; flycheck
+   (flycheck-error (:underline `(:style wave :color ,samurai-red)))
+   (flycheck-warning (:underline `(:style wave :color ,ronin-yellow)))
+   (flycheck-info (:underline `(:style wave :color ,wave-aqua-1)))
+   (flycheck-fringe-error :foreground samurai-red)
+   (flycheck-fringe-warning :foreground ronin-yellow)
+   (flycheck-fringe-info :foreground wave-aqua-1)
+
+   ;;;; git-gutter
+   (git-gutter:added :foreground autumn-green :background base0)
+   (git-gutter:modified :foreground autumn-yellow :background base0)
+   (git-gutter:deleted :foreground autumn-red :background base0)
+
+   ;;;; indent-guides
+   (highlight-indent-guides-character-face :foreground base4)
+   (highlight-indent-guides-stack-character-face :foreground base4)
+   (highlight-indent-guides-stack-odd-face :foreground base4)
+   (highlight-indent-guides-stack-even-face :foreground dragon-gray3)
+   (highlight-indent-guides-even-face :foreground base3)
+   (highlight-indent-guides-odd-face :foreground dragon-gray3)
+
+   ;;;; ivy
+   (ivy-current-match :background blue :foreground base0 :bold t)
+   (ivy-action :background nil :foreground fg)
+   (ivy-grep-line-number :background nil :foreground green)
+   (ivy-minibuffer-match-face-1 :background nil :foreground red)
+   (ivy-minibuffer-match-face-2 :background nil :foreground green)
+   (ivy-minibuffer-match-face-3 :background nil :foreground cyan)
+   (ivy-minibuffer-match-face-4 :background nil :foreground yellow)
+   (ivy-minibuffer-match-highlight :foreground cyan)
+   (ivy-grep-info :foreground cyan)
+   (ivy-confirm-face :foreground teal)
+   (ivy-posframe :background base3)
+   (ivy-posframe-border :background base4)
+
+   ;;;; LaTeX-mode
+   (font-latex-math-face :foreground green)
+   (font-latex-script-char-face :foreground cyan)
+
+   ;;;; lsp-mode and lsp-ui
+   (lsp-face-highlight-textual :background wave-blue-2)
+   (lsp-face-highlight-read :background wave-blue-2)
+   (lsp-face-highlight-write :background wave-blue-2)
+   (lsp-headerline-breadcrumb-path-error-face (:underline (:color green :style wave) :foreground base5 :background base0))
+   (lsp-headerline-breadcrumb-path-face :background base0 :foreground fg)
+   (lsp-headerline-breadcrumb-symbols-error-face :foreground samurai-red)
+   (lsp-ui-doc-background :background base0 :foreground fg)
+   (lsp-ui-doc-header :background base0 :foreground fg :bold t)
+   (lsp-ui-doc-border :foreground base4)
+   (lsp-ui-sideline-code-action :foreground yellow)
+   (lsp-ui-sideline-current-symbol :foreground blue)
+   (lsp-ui-sideline-symbol :foreground dark-cyan)
+   (lsp-ui-peek-filename :foreground cyan)
+
+   ;;;; markdown-mode
+   (markdown-markup-face :foreground base5)
+   (markdown-header-face :inherit 'bold :foreground red)
+   (markdown-header-face-1 :foreground red :height 1.3 :bold t)
+   (markdown-header-face-2 :foreground violet :height 1.15 :bold t)
+   (markdown-header-face-3 :foreground yellow :height 1.05)
+   ((markdown-code-face &override) :background base0 :foreground green)
+   (markdown-inline-code-face :background base0 :foreground green)
+   (markdown-blockquote-face :foreground dragon-gray)
+
+   ;;;; org-mode
+   (org-block :background base0 :foreground base5)
+   (org-block-begin-line :background winter-blue :foreground blue)
+   (org-block-end-line :background winter-red :foreground red)
+   (org-code :background base0 :foreground green)
+   (org-meta-line :background winter-green :foreground green)
+   (org-level-1 :foreground red :height 1.3 :bold t)
+   (org-level-2 :foreground violet :height 1.15 :bold t)
+   (org-level-3 :foreground yellow :height 1.05)
+   (org-level-4 :foreground fg)
+   (org-level-5 :foreground fg)
+   (org-level-6 :foreground yellow)
+   (org-level-7 :foreground orange)
+   (org-level-8 :foreground green)
+   (org-todo :foreground orange :bold t)
+   (org-done :foreground dark-cyan :strike-through t)
+   (org-headline-done :foreground dark-cyan :strike-through t)
+   (org-ellipsis :foreground wave-blue-2 :bold t)
+   (org-date :foreground wave-blue-2)
+   (org-footnote :foreground teal)
+
+   ;;;; rainbow-delimiters
+   (rainbow-delimiters-mismatched-face :foreground samurai-red)
+   (rainbow-delimiters-unmatched-face :foreground teal)
+   (rainbow-delimiters-base-error-face :foreground samurai-red)
+   (rainbow-delimiters-base-face :foreground base5)
+   (rainbow-delimiters-depth-1-face :foreground violet)
+   (rainbow-delimiters-depth-2-face :foreground dark-cyan)
+   (rainbow-delimiters-depth-3-face :foreground dragon-gray)
+   (rainbow-delimiters-depth-4-face :foreground green)
+   (rainbow-delimiters-depth-5-face :foreground teal)
+   (rainbow-delimiters-depth-6-face :foreground yellow)
+   (rainbow-delimiters-depth-7-face :foreground red)
+   (rainbow-delimiters-depth-8-face :foreground cyan)
+   (rainbow-delimiters-depth-9-face :foreground violet)
+
+   ;;;; solaire-mode
+   (solaire-default-face :background base1)
+   (solaire-hl-line-face :background base3)
+   (solaire-mode-line-face
+    :inherit 'mode-line
+    :background modeline-bg-alt
+    :box (if -modeline-pad `(:line-width ,-modeline-pad :color ,modeline-bg-alt)))
+   (solaire-mode-line-inactive-face
+    :inherit 'mode-line-inactive
+    :background modeline-bg-inactive-alt
+    :box (if -modeline-pad `(:line-width ,-modeline-pad :color ,modeline-bg-inactive-alt)))
+
+   ;;;; treemacs
+   (treemacs-root-face :foreground fg :bold t :height 1.2)
+   (treemacs-directory-face :foreground fg)
+   (treemacs-directory-collapsed-face :foreground fg)
+   (treemacs-file-face :foreground fg)
+   (treemacs-git-added-face :foreground orange)
+   (treemacs-git-renamed-face :foreground fg)
+   (treemacs-git-ignored-face :foreground base5)
+   (treemacs-git-unmodified-face :foreground fg)
+   (treemacs-git-modified-face :foreground green)
+
+   ;;;; vertico
+   (vertico-current :background wave-blue-1 :foreground yellow :bold t)
+   (vertico-multiline :background samurai-red)
+   (vertico-group-title :background winter-blue :foreground cyan :bold t)
+   (vertico-group-separator :background winter-blue :foreground cyan :strike-through t)
+   (vertico-posframe-border :background base4)
+   (vertico-posframe :background base3)
+
+   ;;;; which-key
+   (which-key-command-description-face :foreground blue)
+   (which-key-group-description-face :foreground red)
+   (which-key-local-map-description-face :foreground yellow)
+   (which-key-key-face :foreground teal)
+   (which-key-posframe :background wave-blue-1)
+   (which-key-posframe-border :background wave-blue-1)
+
+   ;;;; whitespace-mode
+   (whitespace-space :foreground base5)
+   (whitespace-tab :foreground base5)
+   (whitespace-newline :foreground base5)
+   (whitespace-trailing :background dragon-gray3)
+   (whitespace-line :background winter-red :foreground samurai-red)
+   )
+
+  ;;;; Base theme variable overrides
+  ())
+
+;;; doom-kanagawa-dragon-theme.el ends here
diff --git a/themes/doom-kanagawa-lotus-theme.el b/themes/doom-kanagawa-lotus-theme.el
new file mode 100644
index 00000000..883b1c7e
--- /dev/null
+++ b/themes/doom-kanagawa-lotus-theme.el
@@ -0,0 +1,429 @@
+;;; doom-kanagawa-lotus-theme.el --- inspired by rebelot/kanagawa.nvim (lotus) -*- lexical-binding: t; no-byte-compile: t; -*-
+;;
+;; Added: September 30 2025
+;; Author: Anskrevy <https://github.com/Anskrevy
+;; Maintainer:
+;; Source: https://github.com/rebelot/kanagawa.nvim
+;;
+;;; Commentary:
+;;
+;; Kanagawa Lotus - A serene light theme features warm cream backgrounds with
+;; muted, earthy colors optimized for bright environments and outdoor work.
+;;
+;;; Code:
+
+(require 'doom-themes)
+
+;;
+;;; Variables
+
+(defgroup doom-kanagawa-lotus-theme nil
+  "Options for the `doom-kanagawa-lotus' theme."
+  :group 'doom-themes)
+
+(defcustom doom-kanagawa-lotus-brighter-modeline nil
+  "If non-nil, more vivid colors will be used to style the mode-line."
+  :group 'doom-kanagawa-lotus-theme
+  :type 'boolean)
+
+(defcustom doom-kanagawa-lotus-brighter-comments nil
+  "If non-nil, comments will be highlighted in more vivid colors."
+  :group 'doom-kanagawa-lotus-theme
+  :type 'boolean)
+
+(defcustom doom-kanagawa-lotus-padded-modeline doom-themes-padded-modeline
+  "If non-nil, adds a 4px padding to the mode-line.
+Can be an integer to determine the exact padding."
+  :group 'doom-kanagawa-lotus-theme
+  :type '(choice integer boolean))
+
+;;
+;;; Theme definition
+
+(def-doom-theme doom-kanagawa-lotus
+  "A light theme with serene, warm tones inspired by Kanagawa Lotus."
+
+  ;; name        default   256       16
+  ;; Lotus White - Light warm backgrounds
+  ((bg         '("#f2ecbc" "#ffffaf" "white"        ))
+   (fg         '("#545464" "#5f5f5f" "black"        ))
+
+   (bg-alt     '("#d5cea3" "#d7d7af" "brightwhite"  ))
+   (fg-alt     '("#43436c" "#5f5f87" "brightblack"  ))
+
+   (base0      '("#d5cea3" "#d7d7af" "white"        ))
+   (base1      '("#dcd5ac" "#d7d7af" "brightwhite"  ))
+   (base2      '("#e5ddb0" "#d7d7af" "brightwhite"  ))
+   (base3      '("#e7dba0" "#d7d7af" "white"        ))
+   (base4      '("#e4d794" "#d7d7af" "white"        ))
+   (base5      '("#716e61" "#767676" "brightblack"  ))
+   (base6      '("#8a8980" "#878787" "brightblack"  ))
+   (base7      '("#a09cac" "#afafaf" "brightblack"  ))
+   (base8      '("#545464" "#5f5f5f" "black"        ))
+
+   (grey       base6)
+
+   ;; Core semantic colors
+   (red        '("#c84053" "#d75f5f" "red"          ))
+   (orange     '("#cc6d00" "#d75f00" "brightred"    ))
+   (green      '("#6f894e" "#5f875f" "green"        ))
+   (teal       '("#597b75" "#5f8787" "brightgreen"  ))
+   (yellow     '("#77713f" "#878700" "yellow"       ))
+   (blue       '("#6693bf" "#5f87af" "brightblue"   ))
+   (dark-blue  '("#4d699b" "#5f87af" "blue"         ))
+   (magenta    '("#624c83" "#5f5f87" "brightmagenta"))
+   (violet     '("#766b90" "#5f5f87" "magenta"      ))
+   (cyan       '("#5a7785" "#5f8787" "brightcyan"   ))
+   (dark-cyan  '("#5a7785" "#5f8787" "cyan"         ))
+
+   ;; Extended Lotus-specific colors
+   (lotus-pink        '("#b35b79" "#af5f87" "magenta"     ))
+   (lotus-blue5       '("#5d57a3" "#5f5faf" "blue"        ))
+   (lotus-violet1     '("#a09cac" "#afafaf" "brightmagenta"))
+   (lotus-violet3     '("#c9cbd1" "#c6c6c6" "brightwhite" ))
+   (lotus-blue1       '("#c7d7e0" "#d7d7d7" "brightcyan"  ))
+   (lotus-blue2       '("#b5cbd2" "#afd7d7" "brightcyan"  ))
+   (lotus-blue3       '("#9fb5c9" "#afd7d7" "brightblue"  ))
+   (lotus-red2        '("#d7474b" "#d75f5f" "red"         ))
+   (lotus-red3        '("#e82424" "#d70000" "brightred"   ))
+   (lotus-red4        '("#d9a594" "#d7afaf" "brightred"   ))
+   (lotus-orange2     '("#e98a00" "#ff8700" "brightyellow"))
+   (lotus-yellow2     '("#836f4a" "#875f5f" "yellow"      ))
+   (lotus-yellow3     '("#de9800" "#d7af00" "brightyellow"))
+   (lotus-yellow4     '("#f9d791" "#ffd787" "brightyellow"))
+   (lotus-green2      '("#6e915f" "#87875f" "green"       ))
+   (lotus-green3      '("#b7d0ae" "#afd7af" "brightgreen" ))
+   (lotus-gray        '("#dcd7ba" "#d7d7af" "white"       ))
+   (lotus-gray3       '("#8a8980" "#878787" "brightblack" ))
+   (lotus-teal1       '("#4e8ca2" "#5f87af" "brightcyan"  ))
+   (lotus-cyan        '("#d7e3d8" "#d7d7d7" "brightwhite" ))
+
+   ;; Diagnostic colors
+   (samurai-red       '("#e82424" "#d70000" "red"         ))
+   (ronin-yellow      '("#e98a00" "#ff8700" "brightyellow"))
+
+   ;; VCS colors
+   (lotus-vcs-added   '("#6e915f" "#87875f" "green"       ))
+   (lotus-vcs-removed '("#d7474b" "#d75f5f" "red"         ))
+   (lotus-vcs-changed '("#de9800" "#d7af00" "brightyellow"))
+
+   ;; Autumn colors
+   (autumn-green      '("#76946A" "#5f875f" "green"       ))
+   (autumn-red        '("#C34043" "#af5f5f" "red"         ))
+   (autumn-yellow     '("#DCA561" "#d7af5f" "yellow"      ))
+
+   ;; Face categories
+   (highlight      dark-blue)
+   (vertical-bar   base3)
+   (selection      lotus-violet3)
+   (builtin        blue)
+   (comments       (if doom-kanagawa-lotus-brighter-comments dark-cyan lotus-gray3))
+   (doc-comments   (if doom-kanagawa-lotus-brighter-comments dark-cyan fg-alt))
+   (constants      orange)
+   (functions      dark-blue)
+   (keywords       magenta)
+   (methods        cyan)
+   (operators      lotus-yellow2)
+   (type           teal)
+   (strings        green)
+   (variables      fg)
+   (numbers        lotus-pink)
+   (region         lotus-violet3)
+   (error          lotus-red3)
+   (warning        lotus-orange2)
+   (success        green)
+   (vc-modified    lotus-yellow3)
+   (vc-added       lotus-green2)
+   (vc-deleted     lotus-red2)
+
+   ;; Mode-line configuration
+   (modeline-fg              fg)
+   (modeline-fg-alt          base5)
+   (modeline-bg              (if doom-kanagawa-lotus-brighter-modeline
+                                 (doom-lighten dark-blue 0.4)
+                               base1))
+   (modeline-bg-alt          (if doom-kanagawa-lotus-brighter-modeline
+                                 (doom-lighten dark-blue 0.45)
+                               (doom-darken base1 0.05)))
+   (modeline-bg-inactive     base1)
+   (modeline-bg-inactive-alt (doom-darken base1 0.05))
+
+   (-modeline-pad
+    (when doom-kanagawa-lotus-padded-modeline
+      (if (integerp doom-kanagawa-lotus-padded-modeline)
+          doom-kanagawa-lotus-padded-modeline
+        4))))
+
+  ;;;; Base theme face overrides
+  (
+   ;; Basic faces
+   (default :background bg :foreground fg)
+   (cursor :background dark-blue :foreground bg)
+   (hl-line :background base3)
+   (region :background region :distant-foreground fg)
+   ((line-number &override) :foreground base7 :background bg-alt)
+   ((line-number-current-line &override) :foreground violet :background base3 :bold t)
+   (fringe :background bg-alt :foreground base4)
+   (vertical-border :foreground base3)
+
+   ;; Font lock
+   ((font-lock-builtin-face &override) :foreground blue)
+   ((font-lock-comment-face &override) :foreground comments :italic t
+    :background (if doom-kanagawa-lotus-brighter-comments (doom-darken bg 0.05)))
+   ((font-lock-comment-delimiter-face &override) :foreground comments :italic t)
+   ((font-lock-constant-face &override) :foreground orange)
+   ((font-lock-doc-face &override) :foreground doc-comments :italic t)
+   ((font-lock-function-name-face &override) :foreground dark-blue)
+   ((font-lock-keyword-face &override) :foreground magenta :weight 'semi-bold)
+   ((font-lock-string-face &override) :foreground green :italic t)
+   ((font-lock-type-face &override) :foreground teal :weight 'semi-bold)
+   ((font-lock-variable-name-face &override) :foreground fg)
+   ((font-lock-warning-face &override) :foreground lotus-orange2)
+   ((font-lock-negation-char-face &override) :foreground red)
+   ((font-lock-preprocessor-face &override) :foreground red)
+   ((font-lock-regexp-grouping-backslash &override) :foreground lotus-yellow2)
+
+   ;; Mode-line
+   (mode-line
+    :background modeline-bg :foreground modeline-fg :bold t
+    :box (if -modeline-pad `(:line-width ,-modeline-pad :color ,modeline-bg)))
+   (mode-line-inactive
+    :background modeline-bg-inactive :foreground modeline-fg-alt
+    :box (if -modeline-pad `(:line-width ,-modeline-pad :color ,modeline-bg-inactive)))
+   (mode-line-emphasis :foreground (if doom-kanagawa-lotus-brighter-modeline base8 highlight))
+   (mode-line-buffer-id :foreground teal :bold t)
+   (mode-line-highlight :foreground yellow)
+
+   ;; Highlighting
+   (highlight :background base3 :foreground violet)
+   (match :background yellow :foreground bg :bold t)
+   (trailing-whitespace :background base3)
+   (lazy-highlight :background lotus-blue2 :foreground fg :bold t)
+   ((isearch &override) :background autumn-yellow :foreground bg :bold t)
+   ((isearch-fail &override) :background samurai-red :foreground bg)
+   (show-paren-match :background teal :foreground bg :bold t)
+   (show-paren-mismatch :background samurai-red :foreground bg)
+
+   ;;;; centaur-tabs
+   (centaur-tabs-active-bar-face :background dark-blue :foreground fg)
+   (centaur-tabs-selected :background bg :foreground fg :bold t)
+   (centaur-tabs-selected-modified :background bg :foreground fg)
+   (centaur-tabs-modified-marker-selected :background bg :foreground autumn-yellow)
+   (centaur-tabs-close-selected :inherit 'centaur-tabs-selected)
+   (centaur-tabs-unselected :background base0 :foreground base5)
+   (centaur-tabs-default :background base0 :foreground base5)
+   (centaur-tabs-unselected-modified :background base0 :foreground samurai-red)
+   (centaur-tabs-modified-marker-unselected :background base0 :foreground base5)
+   (centaur-tabs-close-unselected :background base0 :foreground base5)
+   (centaur-tabs-close-mouse-face :background nil :foreground samurai-red)
+
+   ;;;; company
+   (company-tooltip :background lotus-blue1 :foreground fg)
+   (company-tooltip-common :foreground autumn-yellow :bold t)
+   (company-tooltip-quick-access :foreground violet)
+   (company-tooltip-scrollbar-thumb :background autumn-red)
+   (company-tooltip-scrollbar-track :background lotus-blue1)
+   (company-tooltip-search :background yellow :foreground bg :distant-foreground fg)
+   (company-tooltip-selection :background lotus-blue3 :foreground fg :bold t)
+   (company-tooltip-mouse :background lotus-blue1 :foreground bg :distant-foreground fg)
+   (company-tooltip-annotation :foreground red :distant-foreground base1)
+   (company-scrollbar-bg :inherit 'tooltip)
+   (company-scrollbar-fg :background samurai-red)
+   (company-preview :foreground yellow)
+   (company-preview-common :foreground autumn-yellow :bold t)
+   (company-preview-search :inherit 'company-tooltip-search)
+   (company-template-field :inherit 'match)
+
+   ;;;; css-mode / scss-mode
+   (css-proprietary-property :foreground orange)
+   (css-property :foreground green)
+   (css-selector :foreground dark-blue)
+
+   ;;;; dashboard
+   (dashboard-heading :foreground violet :bold t)
+   (dashboard-items-face :foreground fg)
+   (dashboard-banner-logo-title :bold t :height 200)
+   (dashboard-no-items-face :foreground base5)
+
+   ;;;; doom-modeline
+   (doom-modeline-bar :background (if doom-kanagawa-lotus-brighter-modeline modeline-bg violet) :bold t)
+   (doom-modeline-buffer-file :inherit 'mode-line-buffer-id :weight 'bold)
+   (doom-modeline-buffer-path :inherit 'mode-line-emphasis :weight 'bold :foreground teal)
+   (doom-modeline-buffer-project-root :foreground orange :weight 'bold)
+   (doom-modeline-buffer-modified :foreground yellow :bold t)
+   (doom-modeline-buffer-major-mode :foreground teal :bold t)
+   (doom-modeline-panel :inherit 'bold :background orange :foreground base0)
+   (doom-modeline-info :bold t :foreground green)
+   (doom-modeline-warning :foreground yellow :bold t)
+   (doom-modeline-urgent :foreground red :bold t)
+   (doom-modeline-evil-insert-state :foreground samurai-red)
+   (doom-modeline-evil-visual-state :foreground green)
+   (doom-modeline-evil-replace-state :foreground lotus-orange2)
+   (doom-modeline-evil-normal-state :foreground cyan)
+   (doom-modeline-evil-motion-state :foreground cyan)
+
+   ;;;; ediff
+   (ediff-current-diff-A :background lotus-red4 :foreground fg)
+   (ediff-current-diff-B :background lotus-green3 :foreground fg)
+   (ediff-current-diff-C :background lotus-cyan :foreground fg)
+   (ediff-fine-diff-A :background lotus-red2 :foreground bg :bold t)
+   (ediff-fine-diff-B :background lotus-green2 :foreground bg :bold t)
+   (ediff-fine-diff-C :background lotus-yellow4 :foreground bg :bold t)
+
+   ;;;; evil
+   (evil-ex-lazy-highlight :background lotus-green3 :foreground green :bold t)
+   (evil-ex-substitute-matches :background lotus-red4 :foreground red :bold t)
+   (evil-ex-substitute-replacement :foreground orange :strike-through nil)
+   (evil-search-highlight-persist-highlight-face :background lotus-yellow4 :foreground fg)
+
+   ;;;; flycheck
+   (flycheck-error (:underline `(:style wave :color ,lotus-red3)))
+   (flycheck-warning (:underline `(:style wave :color ,lotus-orange2)))
+   (flycheck-info (:underline `(:style wave :color ,cyan)))
+   (flycheck-fringe-error :foreground lotus-red3)
+   (flycheck-fringe-warning :foreground lotus-orange2)
+   (flycheck-fringe-info :foreground cyan)
+
+   ;;;; git-gutter
+   (git-gutter:added :foreground lotus-green2 :background bg-alt)
+   (git-gutter:modified :foreground lotus-yellow3 :background bg-alt)
+   (git-gutter:deleted :foreground lotus-red2 :background bg-alt)
+
+   ;;;; indent-guides
+   (highlight-indent-guides-character-face :foreground base3)
+   (highlight-indent-guides-stack-character-face :foreground base3)
+   (highlight-indent-guides-stack-odd-face :foreground base3)
+   (highlight-indent-guides-stack-even-face :foreground base4)
+   (highlight-indent-guides-even-face :foreground base2)
+   (highlight-indent-guides-odd-face :foreground base3)
+
+   ;;;; ivy
+   (ivy-current-match :background dark-blue :foreground bg :bold t)
+   (ivy-action :background nil :foreground fg)
+   (ivy-grep-line-number :background nil :foreground green)
+   (ivy-minibuffer-match-face-1 :background nil :foreground red)
+   (ivy-minibuffer-match-face-2 :background nil :foreground green)
+   (ivy-minibuffer-match-face-3 :background nil :foreground cyan)
+   (ivy-minibuffer-match-face-4 :background nil :foreground yellow)
+   (ivy-minibuffer-match-highlight :foreground cyan)
+   (ivy-grep-info :foreground cyan)
+   (ivy-confirm-face :foreground teal)
+   (ivy-posframe :background lotus-blue1)
+   (ivy-posframe-border :background base3)
+
+   ;;;; LaTeX-mode
+   (font-latex-math-face :foreground green)
+   (font-latex-script-char-face :foreground cyan)
+
+   ;;;; lsp-mode and lsp-ui
+   (lsp-face-highlight-textual :background lotus-blue2)
+   (lsp-face-highlight-read :background lotus-blue2)
+   (lsp-face-highlight-write :background lotus-blue2)
+   (lsp-headerline-breadcrumb-path-error-face (:foreground base5 :background base0 :underline (:color green :style wave)))
+   (lsp-headerline-breadcrumb-path-face :background base0 :foreground fg)
+   (lsp-headerline-breadcrumb-symbols-error-face :foreground samurai-red)
+   (lsp-ui-doc-background :background base0 :foreground fg)
+   (lsp-ui-doc-header :background base0 :foreground fg :bold t)
+   (lsp-ui-doc-border :foreground base4)
+   (lsp-ui-sideline-code-action :foreground yellow)
+   (lsp-ui-sideline-current-symbol :foreground dark-blue)
+   (lsp-ui-sideline-symbol :foreground dark-cyan)
+   (lsp-ui-peek-filename :foreground cyan)
+
+   ;;;; markdown-mode
+   (markdown-markup-face :foreground base5)
+   (markdown-header-face :inherit 'bold :foreground red)
+   (markdown-header-face-1 :foreground red :height 1.3 :bold t)
+   (markdown-header-face-2 :foreground violet :height 1.15 :bold t)
+   (markdown-header-face-3 :foreground yellow :height 1.05)
+   ((markdown-code-face &override) :background base0 :foreground green)
+   (markdown-inline-code-face :background base0 :foreground green)
+   (markdown-blockquote-face :foreground lotus-violet1)
+
+   ;;;; org-mode
+   (org-block :background base0 :foreground base5)
+   (org-block-begin-line :background lotus-blue2 :foreground dark-blue)  ; Light blue background
+   (org-block-end-line :background lotus-red4 :foreground red)           ; Light red/pink background
+   (org-code :background base0 :foreground green)
+   (org-meta-line :background lotus-green3 :foreground green)            ; Light green background
+   (org-level-1 :foreground red :height 1.3 :bold t)
+   (org-level-2 :foreground violet :height 1.15 :bold t)
+   (org-level-3 :foreground yellow :height 1.05)
+   (org-level-4 :foreground fg)
+   (org-level-5 :foreground fg)
+   (org-level-6 :foreground yellow)
+   (org-level-7 :foreground orange)
+   (org-level-8 :foreground green)
+   (org-todo :foreground orange :bold t)
+   (org-done :foreground dark-cyan :strike-through t)
+   (org-headline-done :foreground dark-cyan :strike-through t)
+   (org-ellipsis :foreground lotus-blue2 :bold t)
+   (org-date :foreground lotus-blue2)
+   (org-footnote :foreground teal)
+
+   ;;;; rainbow-delimiters
+   (rainbow-delimiters-mismatched-face :foreground samurai-red)
+   (rainbow-delimiters-unmatched-face :foreground teal)
+   (rainbow-delimiters-base-error-face :foreground samurai-red)
+   (rainbow-delimiters-base-face :foreground base5)
+   (rainbow-delimiters-depth-1-face :foreground violet)
+   (rainbow-delimiters-depth-2-face :foreground dark-cyan)
+   (rainbow-delimiters-depth-3-face :foreground lotus-violet1)
+   (rainbow-delimiters-depth-4-face :foreground green)
+   (rainbow-delimiters-depth-5-face :foreground teal)
+   (rainbow-delimiters-depth-6-face :foreground yellow)
+   (rainbow-delimiters-depth-7-face :foreground red)
+   (rainbow-delimiters-depth-8-face :foreground blue)
+   (rainbow-delimiters-depth-9-face :foreground violet)
+
+   ;;;; solaire-mode
+   (solaire-default-face :background base1)
+   (solaire-hl-line-face :background base3)
+   (solaire-mode-line-face
+    :inherit 'mode-line
+    :background modeline-bg-alt
+    :box (if -modeline-pad `(:line-width ,-modeline-pad :color ,modeline-bg-alt)))
+   (solaire-mode-line-inactive-face
+    :inherit 'mode-line-inactive
+    :background modeline-bg-inactive-alt
+    :box (if -modeline-pad `(:line-width ,-modeline-pad :color ,modeline-bg-inactive-alt)))
+
+   ;;;; treemacs
+   (treemacs-root-face :foreground fg :bold t :height 1.2)
+   (treemacs-directory-face :foreground fg)
+   (treemacs-directory-collapsed-face :foreground fg)
+   (treemacs-file-face :foreground fg)
+   (treemacs-git-added-face :foreground orange)
+   (treemacs-git-renamed-face :foreground fg)
+   (treemacs-git-ignored-face :foreground base5)
+   (treemacs-git-unmodified-face :foreground fg)
+   (treemacs-git-modified-face :foreground green)
+
+   ;;;; vertico
+   (vertico-current :background lotus-blue2 :foreground yellow :bold t)
+   (vertico-multiline :background samurai-red)
+   (vertico-group-title :background lotus-blue2 :foreground dark-blue :bold t)
+   (vertico-group-separator :background lotus-blue2 :foreground dark-blue :strike-through t)
+   (vertico-posframe-border :background base3)
+   (vertico-posframe :background lotus-blue1)
+
+   ;;;; which-key
+   (which-key-command-description-face :foreground dark-blue)
+   (which-key-group-description-face :foreground red)
+   (which-key-local-map-description-face :foreground yellow)
+   (which-key-key-face :foreground teal)
+   (which-key-posframe :background lotus-violet3)
+   (which-key-posframe-border :background lotus-violet3)
+
+   ;;;; whitespace-mode
+   (whitespace-space :foreground base5)
+   (whitespace-tab :foreground base5)
+   (whitespace-newline :foreground base5)
+   (whitespace-trailing :background base3)
+   (whitespace-line :background lotus-red4 :foreground samurai-red)
+   )
+
+  ;;;; Base theme variable overrides
+  ())
+
+;;; doom-kanagawa-lotus-theme.el ends here
diff --git a/themes/doom-kanagawa-wave-theme.el b/themes/doom-kanagawa-wave-theme.el
new file mode 100644
index 00000000..765c8347
--- /dev/null
+++ b/themes/doom-kanagawa-wave-theme.el
@@ -0,0 +1,429 @@
+;;; doom-kanagawa-wave-theme.el --- inspired by rebelot/kanagawa.nvim (wave) -*- lexical-binding: t; no-byte-compile: t; -*-
+;;
+;; Added: September 30 2025
+;; Author: Anskrevy <https://github.com/Anskrevy
+;; Maintainer:
+;; Source: https://github.com/rebelot/kanagawa.nvim
+;;
+;;; Commentary:
+;;
+;; Kanagawa Wave - A dark theme inspired by the colors of the famous painting
+;; "The Great Wave off Kanagawa" by Katsushika Hokusai.
+;;
+;; This is the default "Wave" variant, featuring heart-warming blue-green ocean
+;; tones balanced by warm accents, optimized for comfortable all-day viewing.
+;;
+;;; Code:
+
+(require 'doom-themes)
+
+;;
+;;; Variables
+
+(defgroup doom-kanagawa-wave-theme nil
+  "Options for the `doom-kanagawa-wave' theme."
+  :group 'doom-themes)
+
+(defcustom doom-kanagawa-wave-brighter-modeline nil
+  "If non-nil, more vivid colors will be used to style the mode-line."
+  :group 'doom-kanagawa-wave-theme
+  :type 'boolean)
+
+(defcustom doom-kanagawa-wave-brighter-comments nil
+  "If non-nil, comments will be highlighted in more vivid colors."
+  :group 'doom-kanagawa-wave-theme
+  :type 'boolean)
+
+(defcustom doom-kanagawa-wave-padded-modeline doom-themes-padded-modeline
+  "If non-nil, adds a 4px padding to the mode-line.
+Can be an integer to determine the exact padding."
+  :group 'doom-kanagawa-wave-theme
+  :type '(choice integer boolean))
+
+(defcustom doom-kanagawa-wave-red-cursor nil
+  "If non-nil, cursor will be red."
+  :group 'doom-kanagawa-wave-theme
+  :type 'boolean)
+
+;;
+;;; Theme definition
+
+(def-doom-theme doom-kanagawa-wave
+  "A dark theme inspired by Kanagawa - the colors of the Great Wave."
+
+  ;; name        default   256       16
+  ;; Sumi Ink - Background colors
+  ((bg         '("#1F1F28" "#1c1c1c" "black"        ))
+   (fg         '("#DCD7BA" "#d0d0d0" "brightwhite"  ))
+
+   (bg-alt     '("#16161D" "#121212" "black"        ))
+   (fg-alt     '("#C8C093" "#c6c6c6" "white"        ))
+
+   (base0      '("#16161D" "#121212" "black"        ))
+   (base1      '("#181820" "#1c1c1c" "brightblack"  ))
+   (base2      '("#1a1a22" "#1c1c1c" "brightblack"  ))
+   (base3      '("#2A2A37" "#303030" "brightblack"  ))
+   (base4      '("#363646" "#3a3a3a" "brightblack"  ))
+   (base5      '("#54546D" "#4e4e4e" "brightblack"  ))
+   (base6      '("#727169" "#767676" "brightblack"  ))
+   (base7      '("#C8C093" "#c6c6c6" "brightblack"  ))
+   (base8      '("#DCD7BA" "#d0d0d0" "white"        ))
+
+   (grey       base6)
+
+   ;; Core semantic colors from Kanagawa palette
+   (red        '("#E46876" "#d75f5f" "red"          ))
+   (orange     '("#FFA066" "#ff875f" "brightred"    ))
+   (green      '("#98BB6C" "#87af87" "green"        ))
+   (teal       '("#7AA89F" "#87af87" "brightgreen"  ))
+   (yellow     '("#E6C384" "#d7af87" "yellow"       ))
+   (blue       '("#7FB4CA" "#87afd7" "brightblue"   ))
+   (dark-blue  '("#7E9CD8" "#8787d7" "blue"         ))
+   (magenta    '("#957FB8" "#8787af" "brightmagenta"))
+   (violet     '("#9CABCA" "#afafd7" "magenta"      ))
+   (cyan       '("#A3D4D5" "#afd7d7" "brightcyan"   ))
+   (dark-cyan  '("#658594" "#5f8787" "cyan"         ))
+
+   ;; Extended Kanagawa Wave palette
+   (sakura-pink      '("#D27E99" "#d787af" "magenta"      ))
+   (peach-red        '("#FF5D62" "#ff5f5f" "red"          ))
+   (wave-aqua-1      '("#6A9589" "#5f8787" "cyan"         ))
+   (wave-blue-1      '("#223249" "#303030" "blue"         ))
+   (wave-blue-2      '("#2D4F67" "#5f5f87" "brightblue"   ))
+   (spring-violet-1  '("#938AA9" "#8787af" "magenta"      ))
+   (spring-violet-2  '("#9CABCA" "#afafd7" "brightmagenta"))
+   (boat-yellow-1    '("#938056" "#87875f" "yellow"       ))
+   (boat-yellow-2    '("#C0A36E" "#afaf5f" "yellow"       ))
+   (oni-violet-2     '("#b8b4d0" "#afafd7" "brightmagenta"))
+   (comet            '("#54536D" "#4e4e4e" "brightblack"  ))
+
+   ;; Diagnostic colors
+   (samurai-red      '("#E82424" "#d70000" "red"          ))
+   (ronin-yellow     '("#FF9E3B" "#ff8700" "brightyellow" ))
+
+   ;; VCS colors
+   (autumn-green     '("#76946A" "#5f875f" "green"        ))
+   (autumn-red       '("#C34043" "#af5f5f" "red"          ))
+   (autumn-yellow    '("#DCA561" "#d7af5f" "yellow"       ))
+
+   ;; Diff colors
+   (winter-green     '("#2B3328" "#303030" "brightblack"  ))
+   (winter-yellow    '("#49443C" "#3a3a3a" "brightblack"  ))
+   (winter-red       '("#43242B" "#3a3a3a" "brightblack"  ))
+   (winter-blue      '("#252535" "#303030" "brightblack"  ))
+
+   ;; Face categories
+   (highlight      dark-blue)
+   (vertical-bar   base3)
+   (selection      wave-blue-1)
+   (builtin        blue)
+   (comments       (if doom-kanagawa-wave-brighter-comments wave-aqua-1 base6))
+   (doc-comments   (if doom-kanagawa-wave-brighter-comments wave-aqua-1 comet))
+   (constants      orange)
+   (functions      dark-blue)
+   (keywords       magenta)
+   (methods        cyan)
+   (operators      boat-yellow-2)
+   (type           teal)
+   (strings        green)
+   (variables      fg)
+   (numbers        sakura-pink)
+   (region         wave-blue-1)
+   (error          samurai-red)
+   (warning        ronin-yellow)
+   (success        green)
+   (vc-modified    autumn-yellow)
+   (vc-added       autumn-green)
+   (vc-deleted     autumn-red)
+
+   ;; Mode-line configuration
+   (modeline-fg              fg)
+   (modeline-fg-alt          base5)
+   (modeline-bg              (if doom-kanagawa-wave-brighter-modeline
+                                 (doom-darken dark-blue 0.45)
+                               base0))
+   (modeline-bg-alt          (if doom-kanagawa-wave-brighter-modeline
+                                 (doom-darken dark-blue 0.475)
+                               (doom-darken base0 0.1)))
+   (modeline-bg-inactive     base1)
+   (modeline-bg-inactive-alt (doom-darken base1 0.1))
+
+   (-modeline-pad
+    (when doom-kanagawa-wave-padded-modeline
+      (if (integerp doom-kanagawa-wave-padded-modeline)
+          doom-kanagawa-wave-padded-modeline
+        4))))
+
+  ;;;; Base theme face overrides
+  (
+   ;; Basic faces
+   (default :background bg :foreground fg)
+   (cursor :background (if doom-kanagawa-wave-red-cursor red blue) :foreground base0)
+   (hl-line :background base3)
+   (region :background region :distant-foreground fg)
+   ((line-number &override) :foreground base5 :background base0)
+   ((line-number-current-line &override) :foreground violet :background base3 :bold t)
+   (fringe :background base0 :foreground base4)
+   (vertical-border :foreground base3)
+
+   ;; Font lock
+   ((font-lock-builtin-face &override) :foreground blue)
+   ((font-lock-comment-face &override) :foreground comments :italic t
+    :background (if doom-kanagawa-wave-brighter-comments (doom-lighten bg 0.05)))
+   ((font-lock-comment-delimiter-face &override) :foreground comments :italic t)
+   ((font-lock-constant-face &override) :foreground orange)
+   ((font-lock-doc-face &override) :foreground doc-comments :italic t)
+   ((font-lock-function-name-face &override) :foreground dark-blue)
+   ((font-lock-keyword-face &override) :foreground magenta :weight 'semi-bold)
+   ((font-lock-string-face &override) :foreground green :italic t)
+   ((font-lock-type-face &override) :foreground teal :weight 'semi-bold)
+   ((font-lock-variable-name-face &override) :foreground fg)
+   ((font-lock-warning-face &override) :foreground ronin-yellow)
+   ((font-lock-negation-char-face &override) :foreground peach-red)
+   ((font-lock-preprocessor-face &override) :foreground boat-yellow-2)
+   ((font-lock-regexp-grouping-backslash &override) :foreground boat-yellow-2)
+
+   ;; Mode-line
+   (mode-line
+    :background modeline-bg :foreground modeline-fg :bold t
+    :box (if -modeline-pad `(:line-width ,-modeline-pad :color ,modeline-bg)))
+   (mode-line-inactive
+    :background modeline-bg-inactive :foreground modeline-fg-alt
+    :box (if -modeline-pad `(:line-width ,-modeline-pad :color ,modeline-bg-inactive)))
+   (mode-line-emphasis :foreground (if doom-kanagawa-wave-brighter-modeline base8 highlight))
+   (mode-line-buffer-id :foreground teal :bold t)
+   (mode-line-highlight :foreground boat-yellow-2)
+
+   ;; Highlighting
+   (highlight :background comet :foreground spring-violet-1)
+   (match :background boat-yellow-2 :foreground base0 :bold t)
+   (trailing-whitespace :background comet)
+   (lazy-highlight :background wave-blue-2 :foreground fg :bold t)
+   ((isearch &override) :background autumn-yellow :foreground base0 :bold t)
+   ((isearch-fail &override) :background samurai-red :foreground bg)
+   (show-paren-match :background wave-aqua-1 :foreground base0 :bold t)
+   (show-paren-mismatch :background samurai-red :foreground fg-alt)
+
+   ;;;; centaur-tabs
+   (centaur-tabs-active-bar-face :background blue :foreground fg)
+   (centaur-tabs-selected :background bg :foreground fg :bold t)
+   (centaur-tabs-selected-modified :background bg :foreground fg)
+   (centaur-tabs-modified-marker-selected :background bg :foreground autumn-yellow)
+   (centaur-tabs-close-selected :inherit 'centaur-tabs-selected)
+   (centaur-tabs-unselected :background base0 :foreground base5)
+   (centaur-tabs-default :background base0 :foreground base5)
+   (centaur-tabs-unselected-modified :background base0 :foreground samurai-red)
+   (centaur-tabs-modified-marker-unselected :background base0 :foreground base5)
+   (centaur-tabs-close-unselected :background base0 :foreground base5)
+   (centaur-tabs-close-mouse-face :background nil :foreground samurai-red)
+
+   ;;;; company
+   (company-tooltip :background base3 :foreground fg)
+   (company-tooltip-common :foreground autumn-yellow :bold t)
+   (company-tooltip-quick-access :foreground violet)
+   (company-tooltip-scrollbar-thumb :background autumn-red)
+   (company-tooltip-scrollbar-track :background base3)
+   (company-tooltip-search :background boat-yellow-2 :foreground base0 :distant-foreground fg)
+   (company-tooltip-selection :background wave-blue-2 :foreground fg :bold t)
+   (company-tooltip-mouse :background base3 :foreground base0 :distant-foreground fg)
+   (company-tooltip-annotation :foreground peach-red :distant-foreground base1)
+   (company-scrollbar-bg :inherit 'tooltip)
+   (company-scrollbar-fg :background samurai-red)
+   (company-preview :foreground boat-yellow-2)
+   (company-preview-common :foreground autumn-yellow :bold t)
+   (company-preview-search :inherit 'company-tooltip-search)
+   (company-template-field :inherit 'match)
+
+   ;;;; css-mode / scss-mode
+   (css-proprietary-property :foreground orange)
+   (css-property :foreground green)
+   (css-selector :foreground dark-blue)
+
+   ;;;; dashboard
+   (dashboard-heading :foreground violet :bold t)
+   (dashboard-items-face :foreground fg)
+   (dashboard-banner-logo-title :bold t :height 200)
+   (dashboard-no-items-face :foreground base5)
+
+   ;;;; doom-modeline
+   (doom-modeline-bar :background (if doom-kanagawa-wave-brighter-modeline modeline-bg spring-violet-1) :bold t)
+   (doom-modeline-buffer-file :inherit 'mode-line-buffer-id :weight 'bold)
+   (doom-modeline-buffer-path :inherit 'mode-line-emphasis :weight 'bold :foreground teal)
+   (doom-modeline-buffer-project-root :foreground orange :weight 'bold)
+   (doom-modeline-buffer-modified :foreground boat-yellow-2 :bold t)
+   (doom-modeline-buffer-major-mode :foreground teal :bold t)
+   (doom-modeline-panel :inherit 'bold :background orange :foreground base3)
+   (doom-modeline-info :bold t :foreground green)
+   (doom-modeline-warning :foreground yellow :bold t)
+   (doom-modeline-urgent :foreground red :bold t)
+   (doom-modeline-evil-insert-state :foreground samurai-red)
+   (doom-modeline-evil-visual-state :foreground green)
+   (doom-modeline-evil-replace-state :foreground ronin-yellow)
+   (doom-modeline-evil-normal-state :foreground cyan)
+   (doom-modeline-evil-motion-state :foreground cyan)
+
+   ;;;; ediff
+   (ediff-current-diff-A :background winter-red :foreground fg)
+   (ediff-current-diff-B :background winter-green :foreground fg)
+   (ediff-current-diff-C :background winter-blue :foreground fg)
+   (ediff-fine-diff-A :background autumn-red :foreground bg :bold t)
+   (ediff-fine-diff-B :background autumn-green :foreground bg :bold t)
+   (ediff-fine-diff-C :background winter-yellow :foreground bg :bold t)
+
+   ;;;; evil
+   (evil-ex-lazy-highlight :background autumn-green :foreground winter-green :bold t)
+   (evil-ex-substitute-matches :background autumn-red :foreground winter-red :bold t)
+   (evil-ex-substitute-replacement :foreground orange :strike-through nil)
+   (evil-search-highlight-persist-highlight-face :background boat-yellow-2 :foreground base0)
+
+   ;;;; flycheck
+   (flycheck-error (:underline `(:style wave :color ,samurai-red)))
+   (flycheck-warning (:underline `(:style wave :color ,ronin-yellow)))
+   (flycheck-info (:underline `(:style wave :color ,wave-aqua-1)))
+   (flycheck-fringe-error :foreground samurai-red)
+   (flycheck-fringe-warning :foreground ronin-yellow)
+   (flycheck-fringe-info :foreground wave-aqua-1)
+
+   ;;;; git-gutter
+   (git-gutter:added :foreground autumn-green :background base0)
+   (git-gutter:modified :foreground autumn-yellow :background base0)
+   (git-gutter:deleted :foreground autumn-red :background base0)
+
+   ;;;; indent-guides
+   (highlight-indent-guides-character-face :foreground base4)
+   (highlight-indent-guides-stack-character-face :foreground base4)
+   (highlight-indent-guides-stack-odd-face :foreground base4)
+   (highlight-indent-guides-stack-even-face :foreground comet)
+   (highlight-indent-guides-even-face :foreground base3)
+   (highlight-indent-guides-odd-face :foreground comet)
+
+   ;;;; ivy
+   (ivy-current-match :background dark-blue :foreground base0 :bold t)
+   (ivy-action :background nil :foreground fg)
+   (ivy-grep-line-number :background nil :foreground green)
+   (ivy-minibuffer-match-face-1 :background nil :foreground red)
+   (ivy-minibuffer-match-face-2 :background nil :foreground green)
+   (ivy-minibuffer-match-face-3 :background nil :foreground cyan)
+   (ivy-minibuffer-match-face-4 :background nil :foreground yellow)
+   (ivy-minibuffer-match-highlight :foreground cyan)
+   (ivy-grep-info :foreground cyan)
+   (ivy-confirm-face :foreground teal)
+   (ivy-posframe :background base3)
+   (ivy-posframe-border :background base4)
+
+   ;;;; LaTeX-mode
+   (font-latex-math-face :foreground green)
+   (font-latex-script-char-face :foreground cyan)
+
+   ;;;; lsp-mode and lsp-ui
+   (lsp-face-highlight-textual :background wave-blue-2)
+   (lsp-face-highlight-read :background wave-blue-2)
+   (lsp-face-highlight-write :background wave-blue-2)
+   (lsp-headerline-breadcrumb-path-error-face (:underline (:color green :style wave) :foreground base5 :background base0))
+   (lsp-headerline-breadcrumb-path-face :background base0 :foreground fg)
+   (lsp-headerline-breadcrumb-symbols-error-face :foreground samurai-red)
+   (lsp-ui-doc-background :background base0 :foreground fg)
+   (lsp-ui-doc-header :background base0 :foreground fg :bold t)
+   (lsp-ui-doc-border :foreground base4)
+   (lsp-ui-sideline-code-action :foreground boat-yellow-2)
+   (lsp-ui-sideline-current-symbol :foreground blue)
+   (lsp-ui-sideline-symbol :foreground dark-cyan)
+   (lsp-ui-peek-filename :foreground cyan)
+
+   ;;;; markdown-mode
+   (markdown-markup-face :foreground base5)
+   (markdown-header-face :inherit 'bold :foreground peach-red)
+   (markdown-header-face-1 :foreground peach-red :height 1.3 :bold t)
+   (markdown-header-face-2 :foreground violet :height 1.15 :bold t)
+   (markdown-header-face-3 :foreground boat-yellow-2 :height 1.05)
+   ((markdown-code-face &override) :background base0 :foreground green)
+   (markdown-inline-code-face :background base0 :foreground green)
+   (markdown-blockquote-face :foreground oni-violet-2)
+
+   ;;;; org-mode
+   (org-block :background base0 :foreground base5)
+   (org-block-begin-line :background winter-blue :foreground blue)
+   (org-block-end-line :background winter-red :foreground peach-red)
+   (org-code :background base0 :foreground green)
+   (org-meta-line :background winter-green :foreground green)
+   (org-level-1 :foreground peach-red :height 1.3 :bold t)
+   (org-level-2 :foreground violet :height 1.15 :bold t)
+   (org-level-3 :foreground boat-yellow-2 :height 1.05)
+   (org-level-4 :foreground fg)
+   (org-level-5 :foreground fg)
+   (org-level-6 :foreground yellow)
+   (org-level-7 :foreground orange)
+   (org-level-8 :foreground green)
+   (org-todo :foreground orange :bold t)
+   (org-done :foreground dark-cyan :strike-through t)
+   (org-headline-done :foreground dark-cyan :strike-through t)
+   (org-ellipsis :foreground wave-blue-2 :bold t)
+   (org-date :foreground wave-blue-2)
+   (org-footnote :foreground teal)
+
+   ;;;; rainbow-delimiters
+   (rainbow-delimiters-mismatched-face :foreground samurai-red)
+   (rainbow-delimiters-unmatched-face :foreground teal)
+   (rainbow-delimiters-base-error-face :foreground samurai-red)
+   (rainbow-delimiters-base-face :foreground base5)
+   (rainbow-delimiters-depth-1-face :foreground violet)
+   (rainbow-delimiters-depth-2-face :foreground dark-cyan)
+   (rainbow-delimiters-depth-3-face :foreground spring-violet-1)
+   (rainbow-delimiters-depth-4-face :foreground green)
+   (rainbow-delimiters-depth-5-face :foreground teal)
+   (rainbow-delimiters-depth-6-face :foreground yellow)
+   (rainbow-delimiters-depth-7-face :foreground red)
+   (rainbow-delimiters-depth-8-face :foreground cyan)
+   (rainbow-delimiters-depth-9-face :foreground violet)
+
+   ;;;; solaire-mode
+   (solaire-default-face :background base1)
+   (solaire-hl-line-face :background base3)
+   (solaire-mode-line-face
+    :inherit 'mode-line
+    :background modeline-bg-alt
+    :box (if -modeline-pad `(:line-width ,-modeline-pad :color ,modeline-bg-alt)))
+   (solaire-mode-line-inactive-face
+    :inherit 'mode-line-inactive
+    :background modeline-bg-inactive-alt
+    :box (if -modeline-pad `(:line-width ,-modeline-pad :color ,modeline-bg-inactive-alt)))
+
+   ;;;; treemacs
+   (treemacs-root-face :foreground fg :bold t :height 1.2)
+   (treemacs-directory-face :foreground fg)
+   (treemacs-directory-collapsed-face :foreground fg)
+   (treemacs-file-face :foreground fg)
+   (treemacs-git-added-face :foreground orange)
+   (treemacs-git-renamed-face :foreground fg)
+   (treemacs-git-ignored-face :foreground base5)
+   (treemacs-git-unmodified-face :foreground fg)
+   (treemacs-git-modified-face :foreground green)
+
+   ;;;; vertico
+   (vertico-current :background wave-blue-1 :foreground yellow :bold t)
+   (vertico-multiline :background samurai-red)
+   (vertico-group-title :background winter-blue :foreground cyan :bold t)
+   (vertico-group-separator :background winter-blue :foreground cyan :strike-through t)
+   (vertico-posframe-border :background base4)
+   (vertico-posframe :background base3)
+
+   ;;;; which-key
+   (which-key-command-description-face :foreground dark-blue)
+   (which-key-group-description-face :foreground red)
+   (which-key-local-map-description-face :foreground yellow)
+   (which-key-key-face :foreground teal)
+   (which-key-posframe :background wave-blue-1)
+   (which-key-posframe-border :background wave-blue-1)
+
+   ;;;; whitespace-mode
+   (whitespace-space :foreground base5)
+   (whitespace-tab :foreground base5)
+   (whitespace-newline :foreground base5)
+   (whitespace-trailing :background comet)
+   (whitespace-line :background winter-red :foreground samurai-red)
+   )
+
+  ;;;; Base theme variable overrides
+  ())
+
+;;; doom-kanagawa-wave-theme.el ends here

From ba356483f7477c7df4bacd158807e7151600b038 Mon Sep 17 00:00:00 2001
From: Anskrevy <95379591+Anskrevy@users.noreply.github.com>
Date: Tue, 30 Sep 2025 17:56:17 -0700
Subject: [PATCH 14/16] feat(kanagawa): `*-match-org-blocks` option

---
 themes/doom-kanagawa-abyss-theme.el  | 13 +++++++++++--
 themes/doom-kanagawa-dragon-theme.el | 13 +++++++++++--
 themes/doom-kanagawa-lotus-theme.el  | 13 +++++++++++--
 themes/doom-kanagawa-wave-theme.el   | 13 +++++++++++--
 4 files changed, 44 insertions(+), 8 deletions(-)

diff --git a/themes/doom-kanagawa-abyss-theme.el b/themes/doom-kanagawa-abyss-theme.el
index 1f089043..edb795a4 100644
--- a/themes/doom-kanagawa-abyss-theme.el
+++ b/themes/doom-kanagawa-abyss-theme.el
@@ -47,6 +47,11 @@ Can be an integer to determine the exact padding."
   :group 'doom-kanagawa-abyss-theme
   :type 'boolean)
 
+(defcustom doom-kanagawa-abyss-match-org-blocks nil
+  "If non-nil, org block delimiters use the same colors."
+  :group 'doom-kanagawa-abyss-theme
+  :type 'boolean)
+
 ;;
 ;;; Theme definition
 
@@ -350,8 +355,12 @@ Can be an integer to determine the exact padding."
 
    ;;;; org-mode
    (org-block :background base0 :foreground fg)
-   (org-block-begin-line :background winter-blue :foreground blue)
-   (org-block-end-line :background winter-red :foreground peach-red)
+   (org-block-begin-line
+    :background (if doom-kanagawa-abyss-match-org-blocks base3 winter-blue)
+    :foreground (if doom-kanagawa-abyss-match-org-blocks base5 blue))
+   (org-block-end-line
+    :background (if doom-kanagawa-abyss-match-org-blocks base3 winter-red)
+    :foreground (if doom-kanagawa-abyss-match-org-blocks base5 red))
    (org-code :background base0 :foreground green)
    (org-meta-line :background winter-green :foreground green)
    (org-level-1 :foreground peach-red :height 1.3 :bold t)
diff --git a/themes/doom-kanagawa-dragon-theme.el b/themes/doom-kanagawa-dragon-theme.el
index 1442d1e9..7aabb6bc 100644
--- a/themes/doom-kanagawa-dragon-theme.el
+++ b/themes/doom-kanagawa-dragon-theme.el
@@ -42,6 +42,11 @@ Can be an integer to determine the exact padding."
   :group 'doom-kanagawa-dragon-theme
   :type 'boolean)
 
+(defcustom doom-kanagawa-dragon-match-org-blocks nil
+  "If non-nil, org block delimiters use the same colors."
+  :group 'doom-kanagawa-dragon-theme
+  :type 'boolean)
+
 ;;
 ;;; Theme definition
 
@@ -341,8 +346,12 @@ Can be an integer to determine the exact padding."
 
    ;;;; org-mode
    (org-block :background base0 :foreground base5)
-   (org-block-begin-line :background winter-blue :foreground blue)
-   (org-block-end-line :background winter-red :foreground red)
+   (org-block-begin-line
+    :background (if doom-kanagawa-dragon-match-org-blocks base3 winter-blue)
+    :foreground (if doom-kanagawa-dragon-match-org-blocks base5 blue))
+   (org-block-end-line
+    :background (if doom-kanagawa-dragon-match-org-blocks base3 winter-red)
+    :foreground (if doom-kanagawa-dragon-match-org-blocks base5 red))
    (org-code :background base0 :foreground green)
    (org-meta-line :background winter-green :foreground green)
    (org-level-1 :foreground red :height 1.3 :bold t)
diff --git a/themes/doom-kanagawa-lotus-theme.el b/themes/doom-kanagawa-lotus-theme.el
index 883b1c7e..991c4ebd 100644
--- a/themes/doom-kanagawa-lotus-theme.el
+++ b/themes/doom-kanagawa-lotus-theme.el
@@ -37,6 +37,11 @@ Can be an integer to determine the exact padding."
   :group 'doom-kanagawa-lotus-theme
   :type '(choice integer boolean))
 
+(defcustom doom-kanagawa-lotus-match-org-blocks nil
+  "If non-nil, org block delimiters use the same colors."
+  :group 'doom-kanagawa-lotus-theme
+  :type 'boolean)
+
 ;;
 ;;; Theme definition
 
@@ -342,8 +347,12 @@ Can be an integer to determine the exact padding."
 
    ;;;; org-mode
    (org-block :background base0 :foreground base5)
-   (org-block-begin-line :background lotus-blue2 :foreground dark-blue)  ; Light blue background
-   (org-block-end-line :background lotus-red4 :foreground red)           ; Light red/pink background
+   (org-block-begin-line
+    :background (if doom-kanagawa-lotus-match-org-blocks base3 lotus-blue2)
+    :foreground (if doom-kanagawa-lotus-match-org-blocks base5 dark-blue))
+   (org-block-end-line
+    :background (if doom-kanagawa-lotus-match-org-blocks base3 lotus-red4)
+    :foreground (if doom-kanagawa-lotus-match-org-blocks base5 red))
    (org-code :background base0 :foreground green)
    (org-meta-line :background lotus-green3 :foreground green)            ; Light green background
    (org-level-1 :foreground red :height 1.3 :bold t)
diff --git a/themes/doom-kanagawa-wave-theme.el b/themes/doom-kanagawa-wave-theme.el
index 765c8347..1e066d16 100644
--- a/themes/doom-kanagawa-wave-theme.el
+++ b/themes/doom-kanagawa-wave-theme.el
@@ -45,6 +45,11 @@ Can be an integer to determine the exact padding."
   :group 'doom-kanagawa-wave-theme
   :type 'boolean)
 
+(defcustom doom-kanagawa-wave-match-org-blocks nil
+  "If non-nil, org block delimiters use the same colors."
+  :group 'doom-kanagawa-wave-theme
+  :type 'boolean)
+
 ;;
 ;;; Theme definition
 
@@ -342,8 +347,12 @@ Can be an integer to determine the exact padding."
 
    ;;;; org-mode
    (org-block :background base0 :foreground base5)
-   (org-block-begin-line :background winter-blue :foreground blue)
-   (org-block-end-line :background winter-red :foreground peach-red)
+   (org-block-begin-line
+    :background (if doom-kanagawa-wave-match-org-blocks base3 winter-blue)
+    :foreground (if doom-kanagawa-wave-match-org-blocks base5 blue))
+   (org-block-end-line
+    :background (if doom-kanagawa-wave-match-org-blocks base3 winter-red)
+    :foreground (if doom-kanagawa-wave-match-org-blocks base5 peach-red))
    (org-code :background base0 :foreground green)
    (org-meta-line :background winter-green :foreground green)
    (org-level-1 :foreground peach-red :height 1.3 :bold t)

From c3f95e851bb8a953b61e98587075ad89316a171d Mon Sep 17 00:00:00 2001
From: Anskrevy <95379591+Anskrevy@users.noreply.github.com>
Date: Tue, 30 Sep 2025 18:01:13 -0700
Subject: [PATCH 15/16] fix(docs): typo

---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index a2ce1cf1..4b7f6cd6 100644
--- a/README.md
+++ b/README.md
@@ -96,10 +96,10 @@ welcome PRs to help us maintain and address inconsistencies in them.
 | doom-horizon                      | [link](https://github.com/aodhneine/horizon-theme.el)                                  | ported from VSCode Horizon (ported by [@karetsu](https://github.com/karetsu))                                                     |
 | doom-Iosvkem                      | [link](https://github.com/neutaaaaan/iosvkem)                                          | ported from the default dark theme for Adobe Brackets (ported by [@neutaaaaan](https://github.com/neutaaaaan))                    |
 | doom-ir-black                     | [link](https://github.com/twerth/ir_black)                                             | ported from Vim's ir_black colorscheme (ported by [@legendre6891](https://github.com/legendre6891))                               |
-| doom-kanagawa-abyss               | [link](https://github.com/rebelot/kanagawa.nvim)                                       | based on rebelot's neovim colorscheme, hybrid of wave and dragon (ported py [@Anskrevy](https://github.com/Anskrevy))             |
-| doom-kanagawa-dragon              | [link](https://github.com/rebelot/kanagawa.nvim)                                       | based on rebelot's neovim colorscheme (ported py [@Anskrevy](https://github.com/Anskrevy))                                        |
-| doom-kanagawa-lotus               | [link](https://github.com/rebelot/kanagawa.nvim)                                       | based on rebelot's neovim colorscheme (ported py [@Anskrevy](https://github.com/Anskrevy))                                        |
-| doom-kanagawa-wave                | [link](https://github.com/rebelot/kanagawa.nvim)                                       | based on rebelot's neovim colorscheme (ported py [@Anskrevy](https://github.com/Anskrevy))                                        |
+| doom-kanagawa-abyss               | [link](https://github.com/rebelot/kanagawa.nvim)                                       | based on rebelot's neovim colorscheme, hybrid of wave and dragon (ported by [@Anskrevy](https://github.com/Anskrevy))             |
+| doom-kanagawa-dragon              | [link](https://github.com/rebelot/kanagawa.nvim)                                       | based on rebelot's neovim colorscheme (ported by [@Anskrevy](https://github.com/Anskrevy))                                        |
+| doom-kanagawa-lotus               | [link](https://github.com/rebelot/kanagawa.nvim)                                       | based on rebelot's neovim colorscheme (ported by [@Anskrevy](https://github.com/Anskrevy))                                        |
+| doom-kanagawa-wave                | [link](https://github.com/rebelot/kanagawa.nvim)                                       | based on rebelot's neovim colorscheme (ported by [@Anskrevy](https://github.com/Anskrevy))                                        |
 | doom-lantern                      | [link](https://github.com/Gitleptune/lantern-theme)                                    | based on Gitleptune's Lantern theme (ported by [@paladhammika](https://github.com/paladhammika))                                  |
 | doom-laserwave                    | [link](https://github.com/Jaredk3nt/laserwave)                                         | a clean synthwave/outrun theme inspired by VSCode's Laserwave (ported by [@hyakt](https://github.com/hyakt))                      |
 | doom-manegarm                     | original                                                                               | an original autumn-inspired dark theme (ported by [@kenranunderscore](https://github.com/kenranunderscore))                       |

From 3f97e1ab208b5e2715b331c9fb3fb8a734b36172 Mon Sep 17 00:00:00 2001
From: Anskrevy <95379591+Anskrevy@users.noreply.github.com>
Date: Wed, 1 Oct 2025 16:33:36 -0700
Subject: [PATCH 16/16] fix(kanagawa): org block background colors

---
 themes/doom-kanagawa-abyss-theme.el  | 4 ++--
 themes/doom-kanagawa-dragon-theme.el | 4 ++--
 themes/doom-kanagawa-lotus-theme.el  | 4 ++--
 themes/doom-kanagawa-wave-theme.el   | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/themes/doom-kanagawa-abyss-theme.el b/themes/doom-kanagawa-abyss-theme.el
index edb795a4..5a2a7748 100644
--- a/themes/doom-kanagawa-abyss-theme.el
+++ b/themes/doom-kanagawa-abyss-theme.el
@@ -356,10 +356,10 @@ Can be an integer to determine the exact padding."
    ;;;; org-mode
    (org-block :background base0 :foreground fg)
    (org-block-begin-line
-    :background (if doom-kanagawa-abyss-match-org-blocks base3 winter-blue)
+    :background (if doom-kanagawa-abyss-match-org-blocks base0 winter-blue)
     :foreground (if doom-kanagawa-abyss-match-org-blocks base5 blue))
    (org-block-end-line
-    :background (if doom-kanagawa-abyss-match-org-blocks base3 winter-red)
+    :background (if doom-kanagawa-abyss-match-org-blocks base0 winter-red)
     :foreground (if doom-kanagawa-abyss-match-org-blocks base5 red))
    (org-code :background base0 :foreground green)
    (org-meta-line :background winter-green :foreground green)
diff --git a/themes/doom-kanagawa-dragon-theme.el b/themes/doom-kanagawa-dragon-theme.el
index 7aabb6bc..c48e7203 100644
--- a/themes/doom-kanagawa-dragon-theme.el
+++ b/themes/doom-kanagawa-dragon-theme.el
@@ -347,10 +347,10 @@ Can be an integer to determine the exact padding."
    ;;;; org-mode
    (org-block :background base0 :foreground base5)
    (org-block-begin-line
-    :background (if doom-kanagawa-dragon-match-org-blocks base3 winter-blue)
+    :background (if doom-kanagawa-dragon-match-org-blocks base0 winter-blue)
     :foreground (if doom-kanagawa-dragon-match-org-blocks base5 blue))
    (org-block-end-line
-    :background (if doom-kanagawa-dragon-match-org-blocks base3 winter-red)
+    :background (if doom-kanagawa-dragon-match-org-blocks base0 winter-red)
     :foreground (if doom-kanagawa-dragon-match-org-blocks base5 red))
    (org-code :background base0 :foreground green)
    (org-meta-line :background winter-green :foreground green)
diff --git a/themes/doom-kanagawa-lotus-theme.el b/themes/doom-kanagawa-lotus-theme.el
index 991c4ebd..35e30b66 100644
--- a/themes/doom-kanagawa-lotus-theme.el
+++ b/themes/doom-kanagawa-lotus-theme.el
@@ -348,10 +348,10 @@ Can be an integer to determine the exact padding."
    ;;;; org-mode
    (org-block :background base0 :foreground base5)
    (org-block-begin-line
-    :background (if doom-kanagawa-lotus-match-org-blocks base3 lotus-blue2)
+    :background (if doom-kanagawa-lotus-match-org-blocks base0 lotus-blue2)
     :foreground (if doom-kanagawa-lotus-match-org-blocks base5 dark-blue))
    (org-block-end-line
-    :background (if doom-kanagawa-lotus-match-org-blocks base3 lotus-red4)
+    :background (if doom-kanagawa-lotus-match-org-blocks base0 lotus-red4)
     :foreground (if doom-kanagawa-lotus-match-org-blocks base5 red))
    (org-code :background base0 :foreground green)
    (org-meta-line :background lotus-green3 :foreground green)            ; Light green background
diff --git a/themes/doom-kanagawa-wave-theme.el b/themes/doom-kanagawa-wave-theme.el
index 1e066d16..a62c76df 100644
--- a/themes/doom-kanagawa-wave-theme.el
+++ b/themes/doom-kanagawa-wave-theme.el
@@ -348,10 +348,10 @@ Can be an integer to determine the exact padding."
    ;;;; org-mode
    (org-block :background base0 :foreground base5)
    (org-block-begin-line
-    :background (if doom-kanagawa-wave-match-org-blocks base3 winter-blue)
+    :background (if doom-kanagawa-wave-match-org-blocks base0 winter-blue)
     :foreground (if doom-kanagawa-wave-match-org-blocks base5 blue))
    (org-block-end-line
-    :background (if doom-kanagawa-wave-match-org-blocks base3 winter-red)
+    :background (if doom-kanagawa-wave-match-org-blocks base0 winter-red)
     :foreground (if doom-kanagawa-wave-match-org-blocks base5 peach-red))
    (org-code :background base0 :foreground green)
    (org-meta-line :background winter-green :foreground green)