diff --git a/novelwriter/assets/themes/catppuccin_latte.conf b/novelwriter/assets/themes/catppuccin_latte.conf
index 5db521c5..c00b4889 100644
--- a/novelwriter/assets/themes/catppuccin_latte.conf
+++ b/novelwriter/assets/themes/catppuccin_latte.conf
@@ -59,6 +59,7 @@ link           = blue
 headertext     = #7287fd
 headertag      = #7287fd80
 emphasis       = blue
+whitespace     = blue:100
 dialog         = purple
 altdialog      = #ea76cb
 note           = green
@@ -72,4 +73,4 @@ spellcheckline = red
 errorline      = green
 replacetag     = #e64553
 modifier       = cyan
-texthighlight  = purple:72
+texthighlight  = purple:48
diff --git a/novelwriter/assets/themes/catppuccin_mocha.conf b/novelwriter/assets/themes/catppuccin_mocha.conf
index 5b6c5ccc..9bc41c8e 100644
--- a/novelwriter/assets/themes/catppuccin_mocha.conf
+++ b/novelwriter/assets/themes/catppuccin_mocha.conf
@@ -13,7 +13,7 @@ red     = #f38ba8
 orange  = #fab387
 yellow  = #f9e2af
 green   = #a6e3a1
-cyan    = #94e2d5
+cyan    = #89dceb
 blue    = #89b4fa
 purple  = #cba6f7
 
@@ -37,7 +37,7 @@ alternatebase   = #45475a
 text            = default
 tooltipbase     = #eadbfc
 tooltiptext     = base
-button          = #1d1d2f
+button          = #1e1e2e
 buttontext      = default
 brighttext      = base
 highlight       = purple
@@ -59,6 +59,7 @@ link           = blue
 headertext     = #b4befe
 headertag      = #b4befe80
 emphasis       = blue
+whitespace     = blue:100
 dialog         = purple
 altdialog      = #f5c2e7
 note           = green
diff --git a/novelwriter/assets/themes/rose_pine.conf b/novelwriter/assets/themes/rose_pine.conf
index a77366a9..01326328 100644
--- a/novelwriter/assets/themes/rose_pine.conf
+++ b/novelwriter/assets/themes/rose_pine.conf
@@ -12,7 +12,7 @@ faded   = #908caa
 red     = #eb6f92
 orange  = #ebbcba
 yellow  = #f6c177
-green   = #6dca94
+green   = #88c5a1
 cyan    = #31748f
 blue    = #9ccfd8
 purple  = #c4a7e7
@@ -55,10 +55,11 @@ errortext = red
 background     = base
 text           = default
 line           = #21202e
-link           = orange
+link           = red
 headertext     = purple
 headertag      = purple:128
 emphasis       = purple
+whitespace     = purple:100
 dialog         = red
 altdialog      = orange
 note           = yellow
diff --git a/novelwriter/assets/themes/rose_pine_dawn.conf b/novelwriter/assets/themes/rose_pine_dawn.conf
index fdcbb0bb..34d6707b 100644
--- a/novelwriter/assets/themes/rose_pine_dawn.conf
+++ b/novelwriter/assets/themes/rose_pine_dawn.conf
@@ -8,10 +8,10 @@ url    = https://rosepinetheme.com
 [Base]
 base    = #faf4ed
 default = #575279
-faded   = #9893a5
+faded   = #797593
 red     = #b4637a
 orange  = #d7827e
-yellow  = #ea9d34
+yellow  = #cf8927
 green   = #4aa771
 cyan    = #286983
 blue    = #56949f
@@ -27,7 +27,7 @@ scene    = blue
 note     = yellow
 active   = blue
 inactive = red
-disabled = faded
+disabled = #9893a5
 
 [Palette]
 window          = base
@@ -41,13 +41,13 @@ button          = #fffaf3
 buttontext      = default
 brighttext      = base
 highlight       = red
-highlightedtext = #ffffff
+highlightedtext = base
 link            = red
 linkvisited     = red
 accent          = red
 
 [GUI]
-helptext  = #797593
+helptext  = faded
 fadedtext = faded
 errortext = red
 
@@ -55,13 +55,14 @@ errortext = red
 background     = base
 text           = default
 line           = #f4ede8
-link           = orange
+link           = red
 headertext     = purple
 headertag      = purple:128
 emphasis       = purple
+whitespace     = purple:100
 dialog         = red
 altdialog      = orange
-note           = #cf8927
+note           = yellow
 hidden         = faded
 shortcode      = cyan
 keyword        = cyan
@@ -70,6 +71,6 @@ value          = blue
 optional       = faded
 spellcheckline = red
 errorline      = blue
-replacetag     = #cf8927
+replacetag     = yellow
 modifier       = cyan
 texthighlight  = #dfdad9
diff --git a/novelwriter/assets/themes/selenium_dark.conf b/novelwriter/assets/themes/selenium_dark.conf
index 95b23535..0d6d33cc 100644
--- a/novelwriter/assets/themes/selenium_dark.conf
+++ b/novelwriter/assets/themes/selenium_dark.conf
@@ -6,7 +6,7 @@ author = Myian
 [Base]
 base    = #15141a
 default = #a9a1b4
-faded   = #786e87
+faded   = #625b70
 red     = #c04358
 orange  = #b1663a
 yellow  = #917a3e
@@ -22,10 +22,10 @@ file     = default
 title    = purple
 chapter  = blue
 scene    = cyan
-note     = #625b70
+note     = faded
 active   = #c7c0d2
 inactive = red
-disabled = #625b70
+disabled = faded
 
 [Icon]
 tool      = default
@@ -59,7 +59,7 @@ tooltiptext     = base
 button          = #1e1c25
 buttontext      = default
 brighttext      = base
-highlight       = #625b70
+highlight       = faded
 highlightedtext = #e4e0ec
 link            = #9267d3
 linkvisited     = #9267d3
diff --git a/novelwriter/assets/themes/selenium_light.conf b/novelwriter/assets/themes/selenium_light.conf
index 64f448e6..e2a56830 100644
--- a/novelwriter/assets/themes/selenium_light.conf
+++ b/novelwriter/assets/themes/selenium_light.conf
@@ -6,7 +6,7 @@ author = Myian
 [Base]
 base    = #e7e3eb
 default = #463d52
-faded   = #8a8197
+faded   = #888095
 red     = #c04358
 orange  = #b1663a
 yellow  = #917a3e
@@ -54,12 +54,12 @@ windowtext      = #29252f
 base            = base
 alternatebase   = #c1bccd
 text            = #29252f
-tooltipbase     = #ebebf1
-tooltiptext     = default
-button          = #e6e3eb
+tooltipbase     = #c1bccd
+tooltiptext     = #29252f
+button          = #e7e3eb
 buttontext      = default
 brighttext      = base
-highlight       = #797082
+highlight       = #766c81
 highlightedtext = #f0eff3
 link            = #623a9b
 linkvisited     = #623a9b
@@ -72,7 +72,7 @@ errortext = red
 
 [Syntax]
 background     = base
-text           = #62576f
+text           = #625b70
 line           = #d2cfda
 link           = blue
 headertext     = #29252f
diff --git a/novelwriter/assets/themes/waterlily_dark.conf b/novelwriter/assets/themes/waterlily_dark.conf
index fd19a045..9a4a3bb5 100644
--- a/novelwriter/assets/themes/waterlily_dark.conf
+++ b/novelwriter/assets/themes/waterlily_dark.conf
@@ -5,8 +5,8 @@ author = Myian
 
 [Base]
 base    = #1e2b33
-default = #d7dbdd
-faded   = #869aa5
+default = #d0dee6
+faded   = #7b8e99
 red     = #ff7474
 orange  = #fca469
 yellow  = #f7eaa4
@@ -25,7 +25,7 @@ scene    = #ff9fbd
 note     = faded
 active   = #ff9fbd
 inactive = faded
-disabled = #374a5c
+disabled = #3e5366
 
 [Icon]
 tool      = default
@@ -54,7 +54,7 @@ windowtext      = default
 base            = base
 alternatebase   = #3b515f
 text            = default
-tooltipbase     = yellow
+tooltipbase     = #ffbad0
 tooltiptext     = base
 button          = base
 buttontext      = default
@@ -75,7 +75,7 @@ background     = base
 text           = default
 line           = #283842
 link           = blue
-headertext     = default
+headertext     = #e8eef1
 headertag      = faded
 emphasis       = green
 whitespace     = green:64
diff --git a/novelwriter/assets/themes/waterlily_light.conf b/novelwriter/assets/themes/waterlily_light.conf
index 7d1ad410..bf906d94 100644
--- a/novelwriter/assets/themes/waterlily_light.conf
+++ b/novelwriter/assets/themes/waterlily_light.conf
@@ -4,19 +4,19 @@ mode   = light
 author = Myian
 
 [Base]
-base    = #f5faf7
-default = #435c4e
-faded   = #91ac96
+base    = #f4fcfb
+default = #435e66
+faded   = #91acab
 red     = #d36868
 orange  = #e08b63
 yellow  = #cab330
 green   = #62a729
-cyan    = #31b6a4
+cyan    = #41a594
 blue    = #589dca
 purple  = #bd7fe7
 
 [Project]
-root     = #526b5d
+root     = default
 folder   = blue
 file     = purple
 title    = green
@@ -25,7 +25,7 @@ scene    = #e6859a
 note     = faded
 active   = #da7b8f
 inactive = faded
-disabled = #b6c9ba
+disabled = #b6cac7
 
 [Icon]
 tool      = default
@@ -49,17 +49,17 @@ warning   = orange
 error     = red
 
 [Palette]
-window          = #e2eee7
+window          = #e2eeed
 windowtext      = default
 base            = base
-alternatebase   = #c7e0d1
+alternatebase   = #c7e0e0
 text            = default
-tooltipbase     = #f3ebbb
-tooltiptext     = default
+tooltipbase     = #ffdfe6
+tooltiptext     = #223f47
 button          = base
 buttontext      = default
 brighttext      = base
-highlight       = #6bb3b3
+highlight       = #4da1af
 highlightedtext = base
 link            = blue
 linkvisited     = blue
@@ -72,24 +72,24 @@ errortext = red
 
 [Syntax]
 background     = base
-text           = #54615a
-line           = #e9f3ed
+text           = default
+line           = #e2eeed
 link           = #0b9caf
-headertext     = #526b5d
-headertag      = #526b5d80
+headertext     = #57757e
+headertag      = #b6cac7
 emphasis       = #1e920e
 whitespace     = #1e920e64
 dialog         = #d15574
-altdialog      = #d86f3e
+altdialog      = #dd6b37
 note           = #0b9caf
-hidden         = #89a189
-shortcode      = #0b9caf
-keyword        = #9b5cc5
-tag            = #bd911b
-value          = #04a770
-optional       = #89a189
+hidden         = #87a3a0
+shortcode      = #9a54c9
+keyword        = #9a54c9
+tag            = #c9a02e
+value          = #05af77
+optional       = #87a3a0
 spellcheckline = #ff3e3e
-errorline      = #04a770
+errorline      = #05af77
 replacetag     = #0b9caf
-modifier       = #9b5cc5
+modifier       = #9a54c9
 texthighlight  = cyan:64