diff --git a/novelwriter/assets/themes/aura.conf b/novelwriter/assets/themes/aura.conf
index 1c89fe62..a31ac7ba 100644
--- a/novelwriter/assets/themes/aura.conf
+++ b/novelwriter/assets/themes/aura.conf
@@ -58,7 +58,7 @@ line           = #29263c
 link           = blue
 headertext     = cyan
 headertag      = cyan:128
-emphasis       = purple:L110
+emphasis       = purple:L105
 dialog         = cyan
 altdialog      = blue
 note           = yellow
diff --git a/novelwriter/assets/themes/aura_bright.conf b/novelwriter/assets/themes/aura_bright.conf
index a6428a55..651e452c 100644
--- a/novelwriter/assets/themes/aura_bright.conf
+++ b/novelwriter/assets/themes/aura_bright.conf
@@ -1,5 +1,5 @@
 [Main]
-name   = Aura (Bright)
+name   = Aura Bright
 mode   = light
 author = Myian
 
diff --git a/novelwriter/assets/themes/aura_soft.conf b/novelwriter/assets/themes/aura_soft.conf
index 098f4bc3..f8d58f70 100644
--- a/novelwriter/assets/themes/aura_soft.conf
+++ b/novelwriter/assets/themes/aura_soft.conf
@@ -1,5 +1,5 @@
 [Main]
-name   = Aura (Soft)
+name   = Aura Soft
 mode   = dark
 author = Myian
 credit = Dalton Menezes
diff --git a/novelwriter/assets/themes/b4t_classic_o_light.conf b/novelwriter/assets/themes/b4t_classic_o_light.conf
index f259c1e7..0f9c94a1 100644
--- a/novelwriter/assets/themes/b4t_classic_o_light.conf
+++ b/novelwriter/assets/themes/b4t_classic_o_light.conf
@@ -61,15 +61,15 @@ headertag      = cyan:128
 emphasis       = #008976
 dialog         = #1a68e5
 altdialog      = #1249a0
-note           = purple
+note           = #c17eed
 hidden         = faded
-shortcode      = #c17eed
-keyword        = #9488f2
-tag            = #6555e0
+shortcode      = purple
+keyword        = #6555e0
+tag            = #9488f2
 value          = faded
 optional       = faded
 spellcheckline = #ff2259
 errorline      = blue
 replacetag     = #7e6fe5
-modifier       = #c17eed
+modifier       = purple
 texthighlight  = cyan:64
diff --git a/novelwriter/assets/themes/b4t_modern_c_dark.conf b/novelwriter/assets/themes/b4t_modern_c_dark.conf
index d420cae7..e348fbef 100644
--- a/novelwriter/assets/themes/b4t_modern_c_dark.conf
+++ b/novelwriter/assets/themes/b4t_modern_c_dark.conf
@@ -60,7 +60,7 @@ headertext     = red
 headertag      = red:128
 emphasis       = #f391b6
 dialog         = yellow
-altdialog      = #9fabf8
+altdialog      = #e86296
 note           = #929ff7
 hidden         = faded
 shortcode      = #6f81f0
diff --git a/novelwriter/assets/themes/b4t_modern_c_light.conf b/novelwriter/assets/themes/b4t_modern_c_light.conf
index 319b28ad..b881167f 100644
--- a/novelwriter/assets/themes/b4t_modern_c_light.conf
+++ b/novelwriter/assets/themes/b4t_modern_c_light.conf
@@ -60,7 +60,7 @@ headertext     = red
 headertag      = red:128
 emphasis       = #d53874
 dialog         = #9f6303
-altdialog      = #354ddd
+altdialog      = #e86296
 note           = blue
 hidden         = faded
 shortcode      = #354ddd
diff --git a/novelwriter/assets/themes/chalky_soil.conf b/novelwriter/assets/themes/chalky_soil.conf
index bf41868b..5e90b992 100644
--- a/novelwriter/assets/themes/chalky_soil.conf
+++ b/novelwriter/assets/themes/chalky_soil.conf
@@ -58,10 +58,10 @@ headertext     = red
 headertag      = red:128
 emphasis       = #488843
 dialog         = #b95a00
-altdialog      = yellow
+altdialog      = #b18010
 note           = faded
 hidden         = faded
-shortcode      = #967044
+shortcode      = blue
 keyword        = blue
 tag            = #276096
 value          = #276096
diff --git a/novelwriter/assets/themes/chernozem.conf b/novelwriter/assets/themes/chernozem.conf
index 16411276..56f80f66 100644
--- a/novelwriter/assets/themes/chernozem.conf
+++ b/novelwriter/assets/themes/chernozem.conf
@@ -61,7 +61,7 @@ dialog         = orange
 altdialog      = yellow
 note           = faded
 hidden         = faded
-shortcode      = #af8973
+shortcode      = blue
 keyword        = blue
 tag            = #a1c4e4
 value          = #a1c4e4
diff --git a/novelwriter/assets/themes/full_moon.conf b/novelwriter/assets/themes/full_moon.conf
index d6d52f46..c6e2c864 100644
--- a/novelwriter/assets/themes/full_moon.conf
+++ b/novelwriter/assets/themes/full_moon.conf
@@ -5,70 +5,69 @@ author = Myian
 
 [Base]
 base    = #ffffff
-default = #454c55
-faded   = #9197a0
-red     = #d84f52
-orange  = #db7a34
-yellow  = #c5931f
-green   = #479e47
-cyan    = #219fa3
-blue    = #3e8acc
-purple  = #bd70cc
-
+default = #37404e
+faded   = #93a2a8
+red     = #d35654
+orange  = #d17a09
+yellow  = #caac00
+green   = #579220
+cyan    = #1b948a
+blue    = #2d78b9
+purple  = #c45fb3
 
 [Project]
 root     = default
 folder   = orange
-file     = green
-title    = blue
+file     = purple
+title    = green
 chapter  = red
-scene    = purple
+scene    = blue
 note     = yellow
 active   = green
 inactive = red
 disabled = faded
 
 [Palette]
-window          = #eceef1
+window          = #e7ebee
 windowtext      = default
 base            = base
-alternatebase   = #e2eaf0
+alternatebase   = #d4d9dd
 text            = default
 tooltipbase     = #ffeea6
 tooltiptext     = default
-button          = #ffffff
+button          = base
 buttontext      = default
 brighttext      = base
-highlight       = #549adb
+highlight       = #5495ce
 highlightedtext = base
 link            = blue
 linkvisited     = blue
-accent          = #549adb
+accent          = #5495ce
 
 [GUI]
-helptext  = faded:D125
-fadedtext = faded:L135
+helptext  = #586a72
+fadedtext = faded
 errortext = red
 
 [Syntax]
 background     = base
-text           = #565c63
-line           = #eceff5
+text           = #586a72
+line           = #e7ebee
 link           = blue
 headertext     = purple
 headertag      = purple:128
 emphasis       = blue
-dialog         = #2d2d2d
-altdialog      = orange
-note           = yellow
+dialog         = #0e2a35
+altdialog      = cyan
+note           = green
 hidden         = faded
-shortcode      = cyan
-keyword        = red
-tag            = yellow
+shortcode      = #c5931f
+keyword        = #c5931f
+tag            = red
 value          = orange
-optional       = yellow
+optional       = #c5931f
 spellcheckline = #f73c3f
 errorline      = cyan
 replacetag     = purple
-modifier       = green
+modifier       = #c5931f
 texthighlight  = blue:80
diff --git a/novelwriter/assets/themes/new_moon.conf b/novelwriter/assets/themes/new_moon.conf
index a94660ba..4bbb2e58 100644
--- a/novelwriter/assets/themes/new_moon.conf
+++ b/novelwriter/assets/themes/new_moon.conf
@@ -7,7 +7,7 @@ url    = https://github.com/taniarascia/new-moon
 
 [Base]
 base    = #2d2d2d
-default = #ffffff
+default = #d1d7e0
 faded   = #777c85
 red     = #f2777a
 orange  = #fca369
@@ -20,10 +20,10 @@ purple  = #e1a6f2
 [Project]
 root     = default
 folder   = orange
-file     = green
-title    = blue
+file     = purple
+title    = green
 chapter  = red
-scene    = purple
+scene    = blue
 note     = yellow
 active   = green
 inactive = red
@@ -37,39 +37,39 @@ alternatebase   = #444444
 text            = default
 tooltipbase     = yellow
 tooltiptext     = base
-button          = #333333
+button          = #2d2d2d
 buttontext      = default
 brighttext      = base
 highlight       = #4386c5
-highlightedtext = default
+highlightedtext = #ffffff
 link            = blue
 linkvisited     = blue
 accent          = #4386c5
 
 [GUI]
-helptext  = #a4a4a4
-fadedtext = #949494
+helptext  = #999eaa
+fadedtext = faded
 errortext = red
 
 [Syntax]
 background     = base
-text           = #bcc2cc
+text           = #b3b9c5
 line           = #444444
 link           = blue
 headertext     = purple
 headertag      = purple:128
 emphasis       = blue
-dialog         = default
-altdialog      = orange
-note           = yellow
+dialog         = #ffffff
+altdialog      = cyan
+note           = green
 hidden         = faded
-shortcode      = cyan
-keyword        = red
-tag            = yellow
-value          = orange
+shortcode      = yellow
+keyword        = yellow
+tag            = red
+value          = #ffd479
 optional       = yellow
 spellcheckline = #ff6265
 errorline      = green
 replacetag     = purple
-modifier       = green
+modifier       = yellow
 texthighlight  = blue:80
diff --git a/novelwriter/assets/themes/ruby_day.conf b/novelwriter/assets/themes/ruby_day.conf
index db56a71b..5a56e472 100644
--- a/novelwriter/assets/themes/ruby_day.conf
+++ b/novelwriter/assets/themes/ruby_day.conf
@@ -40,8 +40,8 @@ buttontext      = default
 brighttext      = red
 highlight       = #da3d3d
 highlightedtext = base
-link            = #9f58ad
-linkvisited     = #9f58ad
+link            = #da3d3d
+linkvisited     = #da3d3d
 accent          = #c43939
 
 [GUI]
diff --git a/novelwriter/assets/themes/ruby_night.conf b/novelwriter/assets/themes/ruby_night.conf
index 640c6d84..37f60ac6 100644
--- a/novelwriter/assets/themes/ruby_night.conf
+++ b/novelwriter/assets/themes/ruby_night.conf
@@ -7,7 +7,7 @@ author = Myian
 base    = #18181c
 default = #dcd9e6
 faded   = #817b94
-red     = #ec6262
+red     = #ff6969
 orange  = #f89d68
 yellow  = #ebcf84
 green   = #7fb88b
@@ -40,8 +40,8 @@ buttontext      = default
 brighttext      = base
 highlight       = #a52a2c
 highlightedtext = #ebd9d9
-link            = purple
-linkvisited     = purple
+link            = red
+linkvisited     = red
 accent          = #a52a2c
 
 [GUI]
@@ -57,7 +57,7 @@ link           = blue
 headertext     = default
 headertag      = default:128
 emphasis       = #ff9d9d
-dialog         = #ff6969
+dialog         = red
 altdialog      = orange
 note           = purple
 hidden         = faded