diff --git a/novelwriter/assets/themes/solarized_dark.conf b/novelwriter/assets/themes/solarized_dark.conf
index 8bf4e983..cf3fdc3c 100644
--- a/novelwriter/assets/themes/solarized_dark.conf
+++ b/novelwriter/assets/themes/solarized_dark.conf
@@ -27,7 +27,7 @@ licenseurl = https://github.com/altercation/solarized/blob/master/LICENSE
 ##
 
 [Base]
-base    = #073642
+base    = #002b36
 default = #fdf6e3
 faded   = #eee8d5
 red     = #dc322f
@@ -51,12 +51,12 @@ inactive = red
 disabled = faded
 
 [Palette]
-window          = #002b36
+window          = #073642
 windowtext      = default
 base            = base
 alternatebase   = #586e75
 text            = default
-tooltipbase     = yellow
+tooltipbase     = yellow:L150
 tooltiptext     = #002b36
 button          = base
 buttontext      = default
@@ -75,21 +75,21 @@ errortext = red
 [Syntax]
 background     = base
 text           = default
-line           = default:32
+line           = #073642
 link           = blue
-headertext     = default:D125
-headertag      = cyan
+headertext     = blue
+headertag      = #657b83
 emphasis       = blue
 dialog         = cyan
-altdialog      = cyan
-note           = cyan:L115
-hidden         = default:D150
-shortcode      = yellow
+altdialog      = red
+note           = cyan:D125
+hidden         = default:L200
+shortcode      = blue
 keyword        = green
-tag            = orange
+tag            = yellow
 value          = orange
-optional       = cyan:L115
-spellcheckline = orange
+optional       = cyan:D125
+spellcheckline = red
 errorline      = red
 replacetag     = green
 modifier       = yellow
diff --git a/novelwriter/assets/themes/solarized_light.conf b/novelwriter/assets/themes/solarized_light.conf
index 5f01abe7..aba3a711 100644
--- a/novelwriter/assets/themes/solarized_light.conf
+++ b/novelwriter/assets/themes/solarized_light.conf
@@ -27,7 +27,7 @@ licenseurl = https://github.com/altercation/solarized/blob/master/LICENSE
 ##
 
 [Base]
-base    = #eee8d5
+base    = #fdf6e3
 default = #002b36
 faded   = #073642
 red     = #dc322f
@@ -51,12 +51,12 @@ inactive = red
 disabled = faded
 
 [Palette]
-window          = #fdf6e3
+window          = #eee8d5
 windowtext      = default
 base            = base
 alternatebase   = #93a1a1
 text            = default
-tooltipbase     = yellow
+tooltipbase     = yellow:L150
 tooltiptext     = #002b36
 button          = base
 buttontext      = default
@@ -75,21 +75,21 @@ errortext = red
 [Syntax]
 background     = base
 text           = default
-line           = default:32
+line           = #eee8d5
 link           = blue
-headertext     = default:L125
-headertag      = cyan
+headertext     = blue
+headertag      = #657b83
 emphasis       = blue
 dialog         = cyan
-altdialog      = cyan
+altdialog      = red
 note           = cyan:D125
 hidden         = default:L200
-shortcode      = yellow
+shortcode      = blue
 keyword        = green
-tag            = orange
+tag            = yellow
 value          = orange
 optional       = cyan:D125
-spellcheckline = orange
+spellcheckline = red
 errorline      = red
 replacetag     = green
 modifier       = yellow