From eed5cd187738ce43a30a6e0b2b73b711b68deb41 Mon Sep 17 00:00:00 2001
From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com>
Date: Mon, 2 Jun 2025 20:02:00 +0200
Subject: [PATCH] Merge and update the owl and tango themes

---
 novelwriter/assets/syntax/light_owl.conf   | 49 ------------
 novelwriter/assets/syntax/night_owl.conf   | 49 ------------
 novelwriter/assets/syntax/tango.conf       | 39 ----------
 novelwriter/assets/themes/light_owl.conf   | 91 ++++++++++++++++++++++
 novelwriter/assets/themes/night_owl.conf   | 91 ++++++++++++++++++++++
 novelwriter/assets/themes/tango_dark.conf  | 81 +++++++++++++++++++
 novelwriter/assets/themes/tango_light.conf | 81 +++++++++++++++++++
 7 files changed, 344 insertions(+), 137 deletions(-)
 delete mode 100644 novelwriter/assets/syntax/light_owl.conf
 delete mode 100644 novelwriter/assets/syntax/night_owl.conf
 delete mode 100644 novelwriter/assets/syntax/tango.conf
 create mode 100644 novelwriter/assets/themes/light_owl.conf
 create mode 100644 novelwriter/assets/themes/night_owl.conf
 create mode 100644 novelwriter/assets/themes/tango_dark.conf
 create mode 100644 novelwriter/assets/themes/tango_light.conf

diff --git a/novelwriter/assets/syntax/light_owl.conf b/novelwriter/assets/syntax/light_owl.conf
deleted file mode 100644
index ce65e704..00000000
--- a/novelwriter/assets/syntax/light_owl.conf
+++ /dev/null
@@ -1,49 +0,0 @@
-##
-# Theme:  Light Owl
-# Source: https://github.com/sdras/night-owl-vscode-theme
-# Credit: Sarah Drasner
-##
-# Colours:
-# Background   = fbfbfb : 251, 251, 251
-# Current Line = e0e0e0 : 224, 224, 224
-# Selection    = e0e0e0 : 224, 224, 224
-# Foreground   = 403f52 :  64,  63,  82
-# Comment      = 989fb1 : 152, 159, 177
-# Red          = de3d3a : 222,  61,  58
-# Orange       = e0af05 : 224, 175,   5
-# Yellow       = daaa01 : 218, 170,   1
-# Green        = 08916a :   8, 145, 106
-# Aqua         = 2aa298 :  42, 162, 152
-# Blue         = 288ed7 :  40, 142, 215
-# Purple       = 964ac1 : 150,  74, 193
-##
-
-[Main]
-name       = Light Owl
-author     = Veronica Berglyd Olsen (adaptation)
-credit     = Sarah Drasner (color theme)
-url        = https://github.com/sdras/night-owl-vscode-theme
-license    = MIT License
-licenseurl = https://github.com/sdras/night-owl-vscode-theme/blob/master/LICENSE
-
-[Syntax]
-background     = 251, 251, 251
-text           =  64,  63,  82
-link           =  40, 142, 215
-headertext     =  40, 142, 215
-headertag      =  40, 142, 215, 160
-emphasis       = 224, 175,   5
-dialog         =   8, 145, 106
-altdialog      = 218, 170,   1
-note           = 128, 118,  75
-hidden         = 152, 159, 177
-shortcode      =  40, 142, 215
-keyword        = 222,  61,  58
-tag            = 150,  74, 193
-value          = 224, 175,   5
-optional       =  40, 142, 215
-spellcheckline = 222,  61,  58
-errorline      =   8, 145, 106
-replacetag     =  42, 162, 152
-modifier       =   8, 145, 106
-texthighlight  = 218, 170,   1, 96
diff --git a/novelwriter/assets/syntax/night_owl.conf b/novelwriter/assets/syntax/night_owl.conf
deleted file mode 100644
index 337cdfb8..00000000
--- a/novelwriter/assets/syntax/night_owl.conf
+++ /dev/null
@@ -1,49 +0,0 @@
-##
-# Theme:  Night Owl
-# Source: https://github.com/sdras/night-owl-vscode-theme
-# Credit: Sarah Drasner
-##
-# Colours:
-# Background   = 011627 :   1,  22,  39
-# Current Line = 32374d :  50,  55,  77
-# Selection    = 32374d :  50,  55,  77
-# Foreground   = d6deeb : 214, 222, 235
-# Comment      = 637777 :  99, 119, 119
-# Red          = f78c6c : 247, 140, 108
-# Orange       = ecc48d : 236, 196, 141
-# Yellow       = ffeb95 : 255, 235, 149
-# Green        = addb67 : 173, 219, 103
-# Aqua         = 7fdbca : 127, 219, 202
-# Blue         = 82aaff : 130, 170, 255
-# Purple       = c792ea : 199, 146, 234
-##
-
-[Main]
-name       = Night Owl
-author     = Veronica Berglyd Olsen (adaptation)
-credit     = Sarah Drasner (color theme)
-url        = https://github.com/sdras/night-owl-vscode-theme
-license    = MIT License
-licenseurl = https://github.com/sdras/night-owl-vscode-theme/blob/master/LICENSE
-
-[Syntax]
-background     =   1,  22,  39
-text           = 214, 222, 235
-link           = 130, 170, 255
-headertext     = 130, 170, 255
-headertag      = 130, 170, 255, 160
-emphasis       = 236, 196, 141
-dialog         = 173, 219, 103
-altdialog      = 255, 235, 149
-note           = 255, 249, 202
-hidden         =  99, 119, 119
-shortcode      = 130, 170, 255
-keyword        = 247, 140, 108
-tag            = 199, 146, 234
-value          = 255, 235, 149
-optional       = 130, 170, 255
-spellcheckline = 247, 140, 108
-errorline      = 173, 219, 103
-replacetag     = 127, 219, 202
-modifier       = 173, 219, 103
-texthighlight  = 255, 235, 149, 96
diff --git a/novelwriter/assets/syntax/tango.conf b/novelwriter/assets/syntax/tango.conf
deleted file mode 100644
index 7c5e9daa..00000000
--- a/novelwriter/assets/syntax/tango.conf
+++ /dev/null
@@ -1,39 +0,0 @@
-[Main]
-name   = Tango
-author = Veronica Berglyd Olsen (adaptation)
-
-##
-# Colours:
-# Background   = 30302f :  48,  48,  47
-# Foreground   = eeeeec : 238, 238, 236
-# Comment      = 8f8f8d : 143, 143, 141
-# Red          = ef2929 : 239,  41,  41
-# Orange       = c4a000 : 196, 160,   0
-# Yellow       = fce94f : 252, 233,  79
-# Green        = 8ae234 : 138, 226,  52
-# Cyan         = 34e2e2 :  52, 226, 226
-# Blue         = 3465a4 : 114, 159, 207
-# Purple       = ad7fa8 : 173, 127, 168
-##
-
-[Syntax]
-background     =  48,  48,  47
-text           = 238, 238, 236
-link           = 114, 159, 207
-headertext     = 114, 159, 207
-headertag      = 114, 159, 207, 160
-emphasis       = 196, 160,   0
-dialog         = 138, 226,  52
-altdialog      = 252, 233,  79
-note           = 252, 242, 164
-hidden         = 143, 143, 141
-shortcode      = 114, 159, 207
-keyword        = 239,  41,  41
-tag            = 173, 127, 168
-value          = 239,  41,  41
-optional       = 114, 159, 207
-spellcheckline = 239,  41,  41
-errorline      = 138, 226,  52
-replacetag     =  52, 226, 226
-modifier       = 114, 159, 207
-texthighlight  = 252, 233,  79, 96
diff --git a/novelwriter/assets/themes/light_owl.conf b/novelwriter/assets/themes/light_owl.conf
new file mode 100644
index 00000000..d91cf0ba
--- /dev/null
+++ b/novelwriter/assets/themes/light_owl.conf
@@ -0,0 +1,91 @@
+[Main]
+name       = Light Owl
+mode       = light
+author     = Veronica Berglyd Olsen (adaptation)
+credit     = Sarah Drasner (color theme)
+url        = https://github.com/sdras/night-owl-vscode-theme
+license    = MIT License
+licenseurl = https://github.com/sdras/night-owl-vscode-theme/blob/master/LICENSE
+
+##
+# Theme:  Light Owl
+# Source: https://github.com/sdras/night-owl-vscode-theme
+# Credit: Sarah Drasner
+##
+# Colours:
+# Background   = #fbfbfb
+# Current Line = #e0e0e0
+# Selection    = #e0e0e0
+# Foreground   = #403f52
+# Comment      = #989fb1
+# Red          = #de3d3a
+# Orange       = #e0af05
+# Yellow       = #daaa01
+# Green        = #08916a
+# Aqua         = #2aa298
+# Blue         = #288ed7
+# Purple       = #964ac1
+##
+
+[Base]
+default         = #403f52
+faded           = #989fb1
+red             = #de3d3a
+orange          = #e0af05
+yellow          = #daaa01
+green           = #08916a
+aqua            = #2aa298
+blue            = #288ed7
+purple          = #964ac1
+
+[Project]
+root            = blue
+folder          = yellow
+file            = default
+title           = green
+chapter         = red
+scene           = blue
+note            = yellow
+
+[Palette]
+window          = #e0e0e0
+windowtext      = default
+base            = #fbfbfb
+alternatebase   = #e0e0e0
+text            = default
+tooltipbase     = #ffffc0
+tooltiptext     = #15150d
+button          = #e0e0e0
+buttontext      = default
+brighttext      = #e0e0e0
+highlight       = #3087c6
+highlightedtext = #ffffff
+link            = blue
+linkvisited     = blue
+
+[GUI]
+helptext        = blue
+fadedtext       = faded
+errortext       = red
+
+[Syntax]
+background     = #fbfbfb
+text           = default
+link           = blue
+headertext     = blue
+headertag      = blue, 160
+emphasis       = orange
+dialog         = green
+altdialog      = yellow
+note           = #80764b
+hidden         = faded
+shortcode      = blue
+keyword        = red
+tag            = purple
+value          = orange
+optional       = blue
+spellcheckline = red
+errorline      = green
+replacetag     = aqua
+modifier       = green
+texthighlight  = yellow, 96
diff --git a/novelwriter/assets/themes/night_owl.conf b/novelwriter/assets/themes/night_owl.conf
new file mode 100644
index 00000000..a5f0a02b
--- /dev/null
+++ b/novelwriter/assets/themes/night_owl.conf
@@ -0,0 +1,91 @@
+[Main]
+name       = Night Owl
+mode       = dark
+author     = Veronica Berglyd Olsen (adaptation)
+credit     = Sarah Drasner (color theme)
+url        = https://github.com/sdras/night-owl-vscode-theme
+license    = MIT License
+licenseurl = https://github.com/sdras/night-owl-vscode-theme/blob/master/LICENSE
+
+##
+# Theme:  Night Owl
+# Source: https://github.com/sdras/night-owl-vscode-theme
+# Credit: Sarah Drasner
+##
+# Colours:
+# Background   = #011627
+# Current Line = #32374d
+# Selection    = #32374d
+# Foreground   = #d6deeb
+# Comment      = #637777
+# Red          = #f78c6c
+# Orange       = #ecc48d
+# Yellow       = #ffeb95
+# Green        = #addb67
+# Aqua         = #7fdbca
+# Blue         = #82aaff
+# Purple       = #c792ea
+##
+
+[Base]
+default         = #d6deeb
+faded           = #637777
+red             = #f78c6c
+orange          = #ecc48d
+yellow          = #addb67
+green           = #addb67
+aqua            = #7fdbca
+blue            = #82aaff
+purple          = #c792ea
+
+[Project]
+root            = blue
+folder          = yellow
+file            = default
+title           = green
+chapter         = red
+scene           = blue
+note            = yellow
+
+[Palette]
+window          = #32374d
+windowtext      = default
+base            = #011627
+alternatebase   = #32374d
+text            = default
+tooltipbase     = #ffffc0
+tooltiptext     = #15150d
+button          = #32374d
+buttontext      = default
+brighttext      = #32374d
+highlight       = #2c98f7
+highlightedtext = #ffffff
+link            = blue
+linkvisited     = blue
+
+[GUI]
+helptext        = blue
+fadedtext       = faded
+errortext       = red
+
+[Syntax]
+background     = #011627
+text           = default
+link           = blue
+headertext     = blue
+headertag      = blue, 160
+emphasis       = orange
+dialog         = green
+altdialog      = yellow
+note           = #fff9ca
+hidden         = faded
+shortcode      = blue
+keyword        = red
+tag            = purple
+value          = orange
+optional       = blue
+spellcheckline = red
+errorline      = green
+replacetag     = aqua
+modifier       = green
+texthighlight  = yellow, 96
diff --git a/novelwriter/assets/themes/tango_dark.conf b/novelwriter/assets/themes/tango_dark.conf
new file mode 100644
index 00000000..873e7f11
--- /dev/null
+++ b/novelwriter/assets/themes/tango_dark.conf
@@ -0,0 +1,81 @@
+[Main]
+name   = Tango Dark
+mode   = dark
+author = Veronica Berglyd Olsen (adaptation)
+
+##
+# Colours:
+# Background   = 30302f :  48,  48,  47
+# Foreground   = eeeeec : 238, 238, 236
+# Comment      = 8f8f8d : 143, 143, 141
+# Red          = ef2929 : 239,  41,  41
+# Orange       = c4a000 : 196, 160,   0
+# Yellow       = fce94f : 252, 233,  79
+# Green        = 8ae234 : 138, 226,  52
+# Cyan         = 34e2e2 :  52, 226, 226
+# Blue         = 3465a4 : 114, 159, 207
+# Purple       = ad7fa8 : 173, 127, 168
+##
+
+[Base]
+default         = #eeeeec
+faded           = #babdb6
+red             = #ef2929
+orange          = #fcaf3e
+yellow          = #fce94f
+green           = #8ae234
+aqua            = #34e2e2
+blue            = #729fcf
+purple          = #ad7fa8
+
+[Project]
+root            = blue
+folder          = yellow
+file            = default
+title           = green
+chapter         = red
+scene           = blue
+note            = yellow
+
+[Palette]
+window          = #555753
+windowtext      = default
+base            = #2e3436
+alternatebase   = #888a85
+text            = default
+tooltipbase     = #ffffc0
+tooltiptext     = #15150d
+button          = #555753
+buttontext      = default
+brighttext      = #555753
+highlight       = #2c98f7
+highlightedtext = #ffffff
+link            = blue
+linkvisited     = blue
+
+[GUI]
+helptext        = #e9b96e
+fadedtext       = faded
+errortext       = red
+
+[Syntax]
+background     = #2e3436
+text           = default
+link           = blue
+headertext     = blue
+headertag      = blue, 160
+emphasis       = orange
+dialog         = green
+altdialog      = yellow
+note           = #fcf2a4
+hidden         = faded
+shortcode      = blue
+keyword        = red
+tag            = purple
+value          = red
+optional       = blue
+spellcheckline = red
+errorline      = green
+replacetag     = cyan
+modifier       = blue
+texthighlight  = yellow, 96
diff --git a/novelwriter/assets/themes/tango_light.conf b/novelwriter/assets/themes/tango_light.conf
new file mode 100644
index 00000000..6ba5566a
--- /dev/null
+++ b/novelwriter/assets/themes/tango_light.conf
@@ -0,0 +1,81 @@
+[Main]
+name        = Tango Light
+mode        = light
+author = Veronica Berglyd Olsen (adaptation)
+
+##
+# Colours:
+# Background   = #eeeeec 
+# Foreground   = #2e3436 
+# Comment      = 8f8f8d : 143, 143, 141
+# Red          = #a40000 
+# Orange       = c4a000 : 196, 160,   0
+# Yellow       = fce94f : 252, 233,  79
+# Green        = 8ae234 : 138, 226,  52
+# Cyan         = 34e2e2 :  52, 226, 226
+# Blue         = 3465a4 : 114, 159, 207
+# Purple       = ad7fa8 : 173, 127, 168
+##
+
+[Base]
+default         = #2e3436
+faded           = #888a85 
+red             = #a40000
+orange          = #ce5c00
+yellow          = #c4a000
+green           = #4e9a06
+aqua            = #069a9a
+blue            = #204a87
+purple          = #5c3566
+
+[Project]
+root            = blue
+folder          = yellow
+file            = default
+title           = green
+chapter         = red
+scene           = blue
+note            = yellow
+
+[Palette]
+window          = #d3d7cf
+windowtext      = default
+base            = #eeeeec
+alternatebase   = #e0e0e0
+text            = default
+tooltipbase     = #ffffc0
+tooltiptext     = #15150d
+button          = #d3d7cf
+buttontext      = default
+brighttext      = #d3d7cf
+highlight       = #3087c6
+highlightedtext = #ffffff
+link            = blue
+linkvisited     = blue
+
+[GUI]
+helptext        = #8f5902
+fadedtext       = faded
+errortext       = red
+
+[Syntax]
+background     = #eeeeec
+text           = default
+link           = blue
+headertext     = blue
+headertag      = blue, 160
+emphasis       = orange
+dialog         = green
+altdialog      = yellow
+note           = #a78800
+hidden         = faded
+shortcode      = blue
+keyword        = red
+tag            = purple
+value          = red
+optional       = blue
+spellcheckline = red
+errorline      = green
+replacetag     = cyan
+modifier       = blue
+texthighlight  = yellow, 96