diff --git a/novelwriter/assets/themes/aura_bright.conf b/novelwriter/assets/themes/aura_bright.conf
index 2b022c22..a6428a55 100644
--- a/novelwriter/assets/themes/aura_bright.conf
+++ b/novelwriter/assets/themes/aura_bright.conf
@@ -18,7 +18,7 @@ purple  = #7752ce
 [Project]
 root     = default
 folder   = red
-file     = default
+file     = #7b788a
 title    = cyan
 chapter  = purple
 scene    = #c540cc
diff --git a/novelwriter/assets/themes/aura_soft.conf b/novelwriter/assets/themes/aura_soft.conf
index cf619963..098f4bc3 100644
--- a/novelwriter/assets/themes/aura_soft.conf
+++ b/novelwriter/assets/themes/aura_soft.conf
@@ -6,7 +6,7 @@ credit = Dalton Menezes
 url    = https://github.com/daltonmenezes/aura-theme
 
 [Base]
-base    = #15141b
+base    = #21202e
 default = #bdbdbd
 faded   = #6d6d6d
 red     = #c55858
@@ -30,7 +30,7 @@ inactive = red
 disabled = faded
 
 [Palette]
-window          = #0c0c11
+window          = #191924
 windowtext      = default
 base            = base
 alternatebase   = #353249
@@ -58,7 +58,7 @@ line           = #29263c
 link           = blue
 headertext     = cyan
 headertag      = cyan:128
-emphasis       = purple:L110
+emphasis       = #a581ec
 dialog         = cyan
 altdialog      = blue
 note           = yellow
diff --git a/novelwriter/assets/themes/b2t_garden_dark.conf b/novelwriter/assets/themes/b2t_garden_dark.conf
index 2da82a6f..f5ecceba 100644
--- a/novelwriter/assets/themes/b2t_garden_dark.conf
+++ b/novelwriter/assets/themes/b2t_garden_dark.conf
@@ -20,10 +20,10 @@ purple  = #da72b2
 [Project]
 root     = default
 folder   = orange
-file     = #1c8217
-title    = default
-chapter  = #90d98c
-scene    = #4cb946
+file     = default
+title    = #1c8217
+chapter  = #4cb946
+scene    = #90d98c
 note     = faded
 active   = green
 inactive = orange
diff --git a/novelwriter/assets/themes/b2t_garden_light.conf b/novelwriter/assets/themes/b2t_garden_light.conf
index 5903a761..ac2287b7 100644
--- a/novelwriter/assets/themes/b2t_garden_light.conf
+++ b/novelwriter/assets/themes/b2t_garden_light.conf
@@ -20,10 +20,10 @@ purple  = #d362a8
 [Project]
 root     = default
 folder   = orange
-file     = #6bcc66
-title    = default
-chapter  = #1c8217
-scene    = #3fac39
+file     = default
+title    = #6bcc66
+chapter  = #3fac39
+scene    = #1c8217
 note     = faded
 active   = green
 inactive = orange
diff --git a/novelwriter/assets/themes/b4t_classic_o_dark.conf b/novelwriter/assets/themes/b4t_classic_o_dark.conf
index b9d8fa8b..ce775630 100644
--- a/novelwriter/assets/themes/b4t_classic_o_dark.conf
+++ b/novelwriter/assets/themes/b4t_classic_o_dark.conf
@@ -14,16 +14,16 @@ orange  = #eca277
 yellow  = #f3cd91
 green   = #7bd892
 cyan    = #5ee3d1
-blue    = #9cc1fc
+blue    = #87b4fc
 purple  = #d19af4
 
 [Project]
 root     = default
-folder   = #649efb
+folder   = #73a7fb
 file     = default
 title    = #039582
-chapter  = #1abba6
-scene    = #5ee3d1
+chapter  = #1BC3AD
+scene    = #93ebdf
 note     = #d19af4
 active   = default
 inactive = faded
@@ -40,11 +40,11 @@ tooltiptext     = base
 button          = #22272f
 buttontext      = default
 brighttext      = base
-highlight       = #0c9c89
+highlight       = #1bbba5
 highlightedtext = base
 link            = blue
 linkvisited     = blue
-accent          = #0c9c89
+accent          = #1bbba5
 
 [GUI]
 helptext  = default:192
@@ -63,13 +63,13 @@ dialog         = #87B4FC
 altdialog      = #5A96F6
 note           = #d19af4
 hidden         = faded
-shortcode      = #18ae9a
+shortcode      = #ba6cea
 keyword        = #877af0
 tag            = #a095f3
 value          = faded
 optional       = faded
 spellcheckline = #ff688d
 errorline      = #5fe2d1
-replacetag     = blue
+replacetag     = #877af0
 modifier       = #ba6cea
 texthighlight  = cyan:56
diff --git a/novelwriter/assets/themes/b4t_classic_o_light.conf b/novelwriter/assets/themes/b4t_classic_o_light.conf
index 1619cafd..f259c1e7 100644
--- a/novelwriter/assets/themes/b4t_classic_o_light.conf
+++ b/novelwriter/assets/themes/b4t_classic_o_light.conf
@@ -19,7 +19,7 @@ purple  = #aa52e0
 
 [Project]
 root     = default
-folder   = #5996F6
+folder   = blue
 file     = faded
 title    = #007061
 chapter  = #039582
@@ -63,13 +63,13 @@ dialog         = #1a68e5
 altdialog      = #1249a0
 note           = purple
 hidden         = faded
-shortcode      = #17a592
-keyword        = #9488F2
+shortcode      = #c17eed
+keyword        = #9488f2
 tag            = #6555e0
 value          = faded
 optional       = faded
 spellcheckline = #ff2259
 errorline      = blue
-replacetag     = blue
+replacetag     = #7e6fe5
 modifier       = #c17eed
 texthighlight  = cyan:64
diff --git a/novelwriter/assets/themes/b4t_modern_c_dark.conf b/novelwriter/assets/themes/b4t_modern_c_dark.conf
index 75fdf78a..d420cae7 100644
--- a/novelwriter/assets/themes/b4t_modern_c_dark.conf
+++ b/novelwriter/assets/themes/b4t_modern_c_dark.conf
@@ -20,10 +20,10 @@ purple  = #d292f7
 [Project]
 root     = default
 folder   = blue
-file     = #fad6e4
+file     = default
 title    = #e64d87
-chapter  = #eb75a2
-scene    = #f5a3c2
+chapter  = #f17ea9
+scene    = #F6B1CB
 note     = #18ae9a
 active   = default
 inactive = faded
@@ -63,13 +63,13 @@ dialog         = yellow
 altdialog      = #9fabf8
 note           = #929ff7
 hidden         = faded
-shortcode      = cyan
+shortcode      = #6f81f0
 keyword        = #18ae9a
 tag            = #93ece0
 value          = #c5cdfb
 optional       = faded
 spellcheckline = #e64d87
 errorline      = blue
-replacetag     = blue
+replacetag     = cyan
 modifier       = #6f81f0
 texthighlight  = blue:72
diff --git a/novelwriter/assets/themes/b4t_modern_c_light.conf b/novelwriter/assets/themes/b4t_modern_c_light.conf
index 41b1ac27..319b28ad 100644
--- a/novelwriter/assets/themes/b4t_modern_c_light.conf
+++ b/novelwriter/assets/themes/b4t_modern_c_light.conf
@@ -20,10 +20,10 @@ purple  = #8e4fb3
 [Project]
 root     = default
 folder   = blue
-file     = #eb75a2
+file     = faded
 title    = #931f4c
-chapter  = #d22d6c
-scene    = #e64d87
+chapter  = #dd3f7c
+scene    = #eb75a2
 note     = #18ae9a
 active   = default
 inactive = faded
@@ -63,13 +63,13 @@ dialog         = #9f6303
 altdialog      = #354ddd
 note           = blue
 hidden         = faded
-shortcode      = cyan
+shortcode      = #354ddd
 keyword        = #007a6a
 tag            = #18ae9a
 value          = #8493F6
 optional       = faded
 spellcheckline = red
 errorline      = blue
-replacetag     = blue
+replacetag     = cyan
 modifier       = #354ddd
 texthighlight  = blue:64
diff --git a/novelwriter/assets/themes/castle_day.conf b/novelwriter/assets/themes/castle_day.conf
index b3755640..ab57dcd8 100644
--- a/novelwriter/assets/themes/castle_day.conf
+++ b/novelwriter/assets/themes/castle_day.conf
@@ -31,7 +31,7 @@ disabled = #b4aca5
 window          = base:D110
 windowtext      = default
 base            = base
-alternatebase   = base:D115
+alternatebase   = base:D118
 text            = default
 tooltipbase     = yellow:L230
 tooltiptext     = default
@@ -42,7 +42,7 @@ highlight       = #cf7c6d
 highlightedtext = base:L110
 link            = #5068b6
 linkvisited     = #5068b6
-accent          = red:192
+accent          = #cf7c6d
 
 [GUI]
 helptext  = default:L180
diff --git a/novelwriter/assets/themes/chernozem.conf b/novelwriter/assets/themes/chernozem.conf
index a39cc684..16411276 100644
--- a/novelwriter/assets/themes/chernozem.conf
+++ b/novelwriter/assets/themes/chernozem.conf
@@ -38,7 +38,7 @@ tooltiptext     = base
 button          = #362c2b
 buttontext      = default
 brighttext      = base
-highlight       = #5a8d55
+highlight       = #6ca167
 highlightedtext = #241d1d
 link            = blue
 linkvisited     = blue
diff --git a/novelwriter/assets/themes/floral_daydream.conf b/novelwriter/assets/themes/floral_daydream.conf
index c6bcfd6b..ecee703f 100644
--- a/novelwriter/assets/themes/floral_daydream.conf
+++ b/novelwriter/assets/themes/floral_daydream.conf
@@ -9,7 +9,7 @@ default = #ac3b6f
 faded   = #c285aa
 red     = #e76b6d
 orange  = #e08b46
-yellow  = #bea224
+yellow  = #cca333
 green   = #59976b
 cyan    = #5d9ea3
 blue    = #658cc5
@@ -53,9 +53,9 @@ errortext = red
 background     = base
 text           = #974169
 line           = #ffdbe4
-link           = blue
-headertext     = blue
-headertag      = blue:128
+link           = #4781d8
+headertext     = #4781d8
+headertag      = #4781d880
 emphasis       = #8152b8
 dialog         = #eb4073
 altdialog      = #4781d8
diff --git a/novelwriter/assets/themes/floral_midnight.conf b/novelwriter/assets/themes/floral_midnight.conf
index 305f8e7e..c05bb27d 100644
--- a/novelwriter/assets/themes/floral_midnight.conf
+++ b/novelwriter/assets/themes/floral_midnight.conf
@@ -4,7 +4,7 @@ mode   = dark
 author = Myian
 
 [Base]
-base    = #1e1e31
+base    = #212130
 default = #d3cfe7
 faded   = #948dac
 red     = #ff7b7d
@@ -28,7 +28,7 @@ inactive = faded
 disabled = #55516d
 
 [Palette]
-window          = base:D130
+window          = #181825
 windowtext      = default
 base            = base
 alternatebase   = #3e395a
@@ -57,7 +57,7 @@ link           = blue
 headertext     = blue
 headertag      = blue:128
 emphasis       = #ff9dd9
-dialog         = #c29df3
+dialog         = #d19df3
 altdialog      = blue
 note           = #65ca80
 hidden         = faded
diff --git a/novelwriter/assets/themes/new_moon.conf b/novelwriter/assets/themes/new_moon.conf
index 099c8c2f..a94660ba 100644
--- a/novelwriter/assets/themes/new_moon.conf
+++ b/novelwriter/assets/themes/new_moon.conf
@@ -11,7 +11,7 @@ default = #ffffff
 faded   = #777c85
 red     = #f2777a
 orange  = #fca369
-yellow  = #ffd479
+yellow  = #ffeea6
 green   = #92d192
 cyan    = #76d4d6
 blue    = #6ab0f3
@@ -35,7 +35,7 @@ windowtext      = default
 base            = base
 alternatebase   = #444444
 text            = default
-tooltipbase     = #ffeea6
+tooltipbase     = yellow
 tooltiptext     = base
 button          = #333333
 buttontext      = default
@@ -60,14 +60,14 @@ headertext     = purple
 headertag      = purple:128
 emphasis       = blue
 dialog         = default
-altdialog      = #ffeea6
+altdialog      = orange
 note           = yellow
 hidden         = faded
 shortcode      = cyan
 keyword        = red
 tag            = yellow
 value          = orange
-optional       = #ffeea6
+optional       = yellow
 spellcheckline = #ff6265
 errorline      = green
 replacetag     = purple
diff --git a/novelwriter/assets/themes/nordlicht.conf b/novelwriter/assets/themes/nordlicht.conf
index ba32e295..f8d9a846 100644
--- a/novelwriter/assets/themes/nordlicht.conf
+++ b/novelwriter/assets/themes/nordlicht.conf
@@ -8,12 +8,12 @@ base    = #ffffff
 default = #4c566a
 faded   = #7b88a1
 red     = #bf616a
-orange  = #d08770
+orange  = #c97c64
 yellow  = #daba7a
 green   = #7cac78
 cyan    = #6bacbe
 blue    = #6b8ab8
-purple  = #aa7aa1
+purple  = #a36f9a
 
 [Project]
 root     = default
@@ -57,14 +57,14 @@ link           = purple
 headertext     = #559db1
 headertag      = #559db188
 emphasis       = #549b86
-dialog         = #5e81ac
+dialog         = #5579a5
 altdialog      = #619b5b
 note           = orange
 hidden         = faded
 shortcode      = orange
 keyword        = purple
-tag            = #68a593
-value          = #68a593
+tag            = #549481
+value          = #549481
 optional       = faded
 spellcheckline = #ff3b4f
 errorline      = #58aa51
diff --git a/novelwriter/assets/themes/ruby_day.conf b/novelwriter/assets/themes/ruby_day.conf
index 5db7878c..db56a71b 100644
--- a/novelwriter/assets/themes/ruby_day.conf
+++ b/novelwriter/assets/themes/ruby_day.conf
@@ -7,18 +7,18 @@ author = Myian
 base    = #ffeeee
 default = #444252
 faded   = #8e8c9c
-red     = #e46363
-orange  = #df9a61
-yellow  = #e5c280
-green   = #72ac79
-cyan    = #6aa2a7
-blue    = #7b80c2
-purple  = #b781c2
+red     = #e46969
+orange  = #df9355
+yellow  = #dfb362
+green   = #62a369
+cyan    = #5c9da3
+blue    = #6e73bb
+purple  = #b67ac2
 
 [Project]
 root     = default
 folder   = orange
-file     = #7d7a8d
+file     = #757285
 title    = green
 chapter  = red
 scene    = blue
@@ -51,17 +51,17 @@ errortext = red
 
 [Syntax]
 background     = base
-text           = default
+text           = #343242
 line           = #f3dbdd
 link           = #5159cc
-headertext     = default
-headertag      = default:128
+headertext     = #343242
+headertag      = #34324280
 emphasis       = #c05858
-dialog         = #c53030
+dialog         = #ce1d1d
 altdialog      = #c45522
 note           = #9f58ad
 hidden         = faded
-shortcode      = #9f58ad
+shortcode      = #2a9638
 keyword        = #5159cc
 tag            = #9f58ad
 value          = #b98421
diff --git a/novelwriter/assets/themes/ruby_night.conf b/novelwriter/assets/themes/ruby_night.conf
index 5f4b47ec..640c6d84 100644
--- a/novelwriter/assets/themes/ruby_night.conf
+++ b/novelwriter/assets/themes/ruby_night.conf
@@ -4,7 +4,7 @@ mode   = dark
 author = Myian
 
 [Base]
-base    = #18181C
+base    = #18181c
 default = #dcd9e6
 faded   = #817b94
 red     = #ec6262
@@ -61,7 +61,7 @@ dialog         = #ff6969
 altdialog      = orange
 note           = purple
 hidden         = faded
-shortcode      = purple
+shortcode      = green
 keyword        = blue
 tag            = purple
 value          = yellow
@@ -70,4 +70,4 @@ spellcheckline = #ff2727
 errorline      = cyan
 replacetag     = blue
 modifier       = green
-texthighlight  = red:80
+texthighlight  = red:80
\ No newline at end of file