From ddf1dc01b13e9598623ef4f695c3582cdea382bb Mon Sep 17 00:00:00 2001
From: August Heen <august@heen.dev>
Date: Mon, 11 Mar 2024 01:03:58 -0500
Subject: [PATCH 1/3] Add Everforest theme variants

---
 themes/everforest-dark-hard    | 19 +++++++++++++++++++
 themes/everforest-dark-medium  | 19 +++++++++++++++++++
 themes/everforest-dark-soft    | 19 +++++++++++++++++++
 themes/everforest-dark-vivid   | 19 +++++++++++++++++++
 themes/everforest-light-hard   | 19 +++++++++++++++++++
 themes/everforest-light-medium | 19 +++++++++++++++++++
 themes/everforest-light-soft   | 19 +++++++++++++++++++
 7 files changed, 133 insertions(+)
 create mode 100644 themes/everforest-dark-hard
 create mode 100644 themes/everforest-dark-medium
 create mode 100644 themes/everforest-dark-soft
 create mode 100644 themes/everforest-dark-vivid
 create mode 100644 themes/everforest-light-hard
 create mode 100644 themes/everforest-light-medium
 create mode 100644 themes/everforest-light-soft

diff --git a/themes/everforest-dark-hard b/themes/everforest-dark-hard
new file mode 100644
index 0000000..a69c48e
--- /dev/null
+++ b/themes/everforest-dark-hard
@@ -0,0 +1,19 @@
+color0  #1e2326
+color1  #e67e80
+color2  #a7c080
+color3  #dbbc7f
+color4  #7fbbb3
+color5  #d699b6
+color6  #83c092
+color7  #fffbef
+color8  #374145
+color9  #e67e80
+color10 #a7c080
+color11 #dbbc7f
+color12 #7fbbb3
+color13 #d699b6
+color14 #83c092
+color15 #e8e5d5
+background #232a2e
+foreground #d3c6aa
+cursor     #f3f5d9
diff --git a/themes/everforest-dark-medium b/themes/everforest-dark-medium
new file mode 100644
index 0000000..dc26e54
--- /dev/null
+++ b/themes/everforest-dark-medium
@@ -0,0 +1,19 @@
+color0  #232a2e
+color1  #e67e80
+color2  #a7c080
+color3  #dbbc7f
+color4  #7fbbb3
+color5  #d699b6
+color6  #83c092
+color7  #fdf6e3 
+color8  #3d484d
+color9  #e67e80
+color10 #a7c080
+color11 #dbbc7f
+color12 #7fbbb3
+color13 #d699b6
+color14 #83c092
+color15 #e0dcc7
+background #2d353b
+foreground #d3c6aa
+cursor     #f0f1d2
diff --git a/themes/everforest-dark-soft b/themes/everforest-dark-soft
new file mode 100644
index 0000000..5a8596c
--- /dev/null
+++ b/themes/everforest-dark-soft
@@ -0,0 +1,19 @@
+color0  #293136
+color1  #e67e80
+color2  #a7c080
+color3  #dbbc7f
+color4  #7fbbb3
+color5  #d699b6
+color6  #83c092
+color7  #f3ead3
+color8  #434f55
+color9  #e67e80
+color10 #a7c080
+color11 #dbbc7f
+color12 #7fbbb3
+color13 #d699b6
+color14 #83c092
+color15 #d8d3ba
+background #333c43
+foreground #d3c6aa
+cursor     #e5e6c5
diff --git a/themes/everforest-dark-vivid b/themes/everforest-dark-vivid
new file mode 100644
index 0000000..7163cb7
--- /dev/null
+++ b/themes/everforest-dark-vivid
@@ -0,0 +1,19 @@
+color0  #1e2326
+color1  #f85552
+color2  #8da101
+color3  #dfa000
+color4  #3a94c5
+color5  #df69ba
+color6  #35a77c
+color7  #fffbef
+color8  #374145
+color9  #e67e80
+color10 #a7c080
+color11 #dbbc7f
+color12 #7fbbb3
+color13 #d699b6
+color14 #83c092
+color15 #e8e5d5
+background #232a2e
+foreground #d3c6aa
+cursor     #93b259
diff --git a/themes/everforest-light-hard b/themes/everforest-light-hard
new file mode 100644
index 0000000..1b2f79f
--- /dev/null
+++ b/themes/everforest-light-hard
@@ -0,0 +1,19 @@
+color0  #1e2326
+color1  #f85552
+color2  #8da101
+color3  #dfa000
+color4  #3a94c5
+color5  #df69ba
+color6  #35a77c
+color7  #fffbef
+color8  #374145
+color9  #f85552
+color10 #8da101
+color11 #dfa000
+color12 #3a94c5
+color13 #df69ba
+color14 #35a77c
+color15 #e8e5d5
+background #fffbef
+foreground #5c6a72
+cursor     #3c4841
diff --git a/themes/everforest-light-medium b/themes/everforest-light-medium
new file mode 100644
index 0000000..c1eadb5
--- /dev/null
+++ b/themes/everforest-light-medium
@@ -0,0 +1,19 @@
+color0  #232a2e
+color1  #f85552
+color2  #8da101
+color3  #dfa000
+color4  #3a94c5
+color5  #df69ba
+color6  #35a77c
+color7  #fdf6e3
+color8  #3d484d
+color9  #f85552
+color10 #8da101
+color11 #dfa000
+color12 #3a94c5
+color13 #df69ba
+color14 #36a77c
+color15 #e0dcc7
+background #fdf6e3
+foreground #5c6a72
+cursor     #425047
diff --git a/themes/everforest-light-soft b/themes/everforest-light-soft
new file mode 100644
index 0000000..b4c0a14
--- /dev/null
+++ b/themes/everforest-light-soft
@@ -0,0 +1,19 @@
+color0  #293136
+color1  #f85552
+color2  #8da101
+color3  #dfa000
+color4  #3a94c5
+color5  #df69ba
+color6  #35a77c
+color7  #f3ead3
+color8  #374145
+color9  #f85552
+color10 #8da101
+color11 #dfa000
+color12 #3a94c5
+color13 #df69ba
+color14 #36a77c
+color15 #f2efdf
+background #f3ead3
+foreground #5c6a72
+cursor     #48584e

From 8d100dd95ce85cc9eafd6b17b4cecd2daed4c153 Mon Sep 17 00:00:00 2001
From: August Heen <august@heen.dev>
Date: Mon, 11 Mar 2024 09:42:38 -0500
Subject: [PATCH 2/3] Add Sonokai theme + variants

Also update CREDITS.md accordingly
---
 CREDITS.md               |  2 ++
 themes/sonokai           | 19 +++++++++++++++++++
 themes/sonokai-andromeda | 19 +++++++++++++++++++
 themes/sonokai-atlantis  | 19 +++++++++++++++++++
 themes/sonokai-espresso  | 19 +++++++++++++++++++
 themes/sonokai-maia      | 19 +++++++++++++++++++
 themes/sonokai-shusia    | 19 +++++++++++++++++++
 7 files changed, 116 insertions(+)
 create mode 100644 themes/sonokai
 create mode 100644 themes/sonokai-andromeda
 create mode 100644 themes/sonokai-atlantis
 create mode 100644 themes/sonokai-espresso
 create mode 100644 themes/sonokai-maia
 create mode 100644 themes/sonokai-shusia

diff --git a/CREDITS.md b/CREDITS.md
index 9612d20..ea8d444 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -119,3 +119,5 @@ If you don't see an attribution here feel free to request one or submit a PR.
 - mar - [memije](https://github.com/memije)
 - github-* [projekt0n](https://github.com/projekt0n/github-nvim-theme)
 - melange-* [savq](https://github.com/savq/melange)
+- everforest* [sainnhe](https://github.com/sainnhe)
+- sonokai* [sainnhe](https://github.com/sainnhe)
diff --git a/themes/sonokai b/themes/sonokai
new file mode 100644
index 0000000..6e9cf63
--- /dev/null
+++ b/themes/sonokai
@@ -0,0 +1,19 @@
+color0  #181819
+color1  #fc5d7c
+color2  #9ed072
+color3  #e7c664
+color4  #76cce0
+color5  #b39df3
+color6  #f39660
+color7  #e2e2e3
+color8  #7f8490
+color9  #fc5d7c
+color10 #9ed072
+color11 #e7c664
+color12 #76cce0
+color13 #b39df3
+color14 #f39660
+color15 #e2e2e3
+background #2c2e34
+foreground #e2e2e3
+cursor     #e2e2e3
diff --git a/themes/sonokai-andromeda b/themes/sonokai-andromeda
new file mode 100644
index 0000000..04ffd07
--- /dev/null
+++ b/themes/sonokai-andromeda
@@ -0,0 +1,19 @@
+color0  #181a1c
+color1  #fb617e
+color2  #9ed06c
+color3  #edc763
+color4  #6dcae8
+color5  #bb97ee
+color6  #f89860
+color7  #e1e3e4
+color8  #7e8294
+color9  #fb617e
+color10 #9ed06c
+color11 #edc763
+color12 #6dcae8
+color13 #bb97ee
+color14 #f89860
+color15 #e1e3e4
+background #2b2d3a
+foreground #e1e3e4
+cursor     #e1e3e4
diff --git a/themes/sonokai-atlantis b/themes/sonokai-atlantis
new file mode 100644
index 0000000..189848f
--- /dev/null
+++ b/themes/sonokai-atlantis
@@ -0,0 +1,19 @@
+color0  #181a1c
+color1  #ff6578
+color2  #9dd274
+color3  #eacb64
+color4  #72cce8
+color5  #ba9cf3
+color6  #f69c5e
+color7  #e1e3e4
+color8  #828a9a
+color9  #ff6578
+color10 #9dd274
+color11 #eacb64
+color12 #72cce8
+color13 #ba9cf3
+color14 #f69c5e
+color15 #e1e3e4
+background #2a2f38
+foreground #e1e3e4
+cursor     #e1e3e4
diff --git a/themes/sonokai-espresso b/themes/sonokai-espresso
new file mode 100644
index 0000000..c87d934
--- /dev/null
+++ b/themes/sonokai-espresso
@@ -0,0 +1,19 @@
+color0  #1f1e1c
+color1  #f86882
+color2  #a6cd77
+color3  #f0c66f
+color4  #81d0c9
+color5  #9fa0e1
+color6  #f08d71
+color7  #e4e3e1
+color8  #90817b
+color9  #f86882
+color10 #a6cd77
+color11 #f0c66f
+color12 #81d0c9
+color13 #9fa0e1
+color14 #f08d71
+color15 #e4e3e1
+background #312c2b
+foreground #e4e3e1
+cursor     #e4e3e1
diff --git a/themes/sonokai-maia b/themes/sonokai-maia
new file mode 100644
index 0000000..1a4c786
--- /dev/null
+++ b/themes/sonokai-maia
@@ -0,0 +1,19 @@
+color0  #1c1e1f
+color1  #f75c7c
+color2  #9cd57b
+color3  #e3d367
+color4  #78cee9
+color5  #baa0f8
+color6  #f3a96a
+color7  #e1e2e3
+color8  #82878b
+color9  #f75c7c
+color10 #9cd57b
+color11 #e3d367
+color12 #78cee9
+color13 #baa0f8
+color14 #f3a96a
+color15 #e1e2e3
+background #273136
+foreground #e1e2e3
+cursor     #e1e2e3
diff --git a/themes/sonokai-shusia b/themes/sonokai-shusia
new file mode 100644
index 0000000..51ed767
--- /dev/null
+++ b/themes/sonokai-shusia
@@ -0,0 +1,19 @@
+color0  #1a181a
+color1  #f85e84
+color2  #9ecd6f
+color3  #e5c463
+color4  #7accd7
+color5  #ab9df2
+color6  #ef9062
+color7  #e3e1e4
+color8  #848089
+color9  #f85e84
+color10 #9ecd6f
+color11 #e5c463
+color12 #7accd7
+color13 #ab9df2
+color14 #ef9062
+color15 #e3e1e4
+background #2d2a2e
+foreground #e3e1e4
+cursor     #e3e1e4

From b366868042098d487d0cdc7732cc6265fc8324e3 Mon Sep 17 00:00:00 2001
From: August Heen <august@heen.dev>
Date: Wed, 26 Feb 2025 15:10:36 -0600
Subject: [PATCH 3/3] everforest dark vivid

---
 bin/theme.sh                 | 273 +++++++++++++++++++++++++++++++++++
 themes/everforest-dark-vivid |   2 +-
 2 files changed, 274 insertions(+), 1 deletion(-)

diff --git a/bin/theme.sh b/bin/theme.sh
index c3d1cf2..0dfe87b 100755
--- a/bin/theme.sh
+++ b/bin/theme.sh
@@ -3271,6 +3271,90 @@ foreground: #d3c6aa
 background: #2f383e
 cursor: #d3c6aa
 
+everforest-dark-hard
+0: #1e2326
+1: #e67e80
+2: #a7c080
+3: #dbbc7f
+4: #7fbbb3
+5: #d699b6
+6: #83c092
+7: #fffbef
+8: #374145
+9: #e67e80
+10: #a7c080
+11: #dbbc7f
+12: #7fbbb3
+13: #d699b6
+14: #83c092
+15: #e8e5d5
+foreground: #d3c6aa
+background: #232a2e
+cursor: #f3f5d9
+
+everforest-dark-medium
+0: #232a2e
+1: #e67e80
+2: #a7c080
+3: #dbbc7f
+4: #7fbbb3
+5: #d699b6
+6: #83c092
+7: #fdf6e3
+8: #3d484d
+9: #e67e80
+10: #a7c080
+11: #dbbc7f
+12: #7fbbb3
+13: #d699b6
+14: #83c092
+15: #e0dcc7
+foreground: #d3c6aa
+background: #2d353b
+cursor: #f0f1d2
+
+everforest-dark-soft
+0: #293136
+1: #e67e80
+2: #a7c080
+3: #dbbc7f
+4: #7fbbb3
+5: #d699b6
+6: #83c092
+7: #f3ead3
+8: #434f55
+9: #e67e80
+10: #a7c080
+11: #dbbc7f
+12: #7fbbb3
+13: #d699b6
+14: #83c092
+15: #d8d3ba
+foreground: #d3c6aa
+background: #333c43
+cursor: #e5e6c5
+
+everforest-dark-vivid
+0: #1e2326
+1: #f85552
+2: #8da101
+3: #dfa000
+4: #3a94c5
+5: #df69ba
+6: #35a77c
+7: #fffbef
+8: #7a8478
+9: #e67e80
+10: #a7c080
+11: #dbbc7f
+12: #7fbbb3
+13: #d699b6
+14: #83c092
+15: #e8e5d5
+foreground: #d3c6aa
+background: #232a2e
+cursor: #93b259
+
 everforest-light
 0: #5c6a72
 1: #f85552
@@ -3292,6 +3376,69 @@ foreground: #5c6a72
 background: #f8f0dc
 cursor: #5c6a72
 
+everforest-light-hard
+0: #1e2326
+1: #f85552
+2: #8da101
+3: #dfa000
+4: #3a94c5
+5: #df69ba
+6: #35a77c
+7: #fffbef
+8: #374145
+9: #f85552
+10: #8da101
+11: #dfa000
+12: #3a94c5
+13: #df69ba
+14: #35a77c
+15: #e8e5d5
+foreground: #5c6a72
+background: #fffbef
+cursor: #3c4841
+
+everforest-light-medium
+0: #232a2e
+1: #f85552
+2: #8da101
+3: #dfa000
+4: #3a94c5
+5: #df69ba
+6: #35a77c
+7: #fdf6e3
+8: #3d484d
+9: #f85552
+10: #8da101
+11: #dfa000
+12: #3a94c5
+13: #df69ba
+14: #36a77c
+15: #e0dcc7
+foreground: #5c6a72
+background: #fdf6e3
+cursor: #425047
+
+everforest-light-soft
+0: #293136
+1: #f85552
+2: #8da101
+3: #dfa000
+4: #3a94c5
+5: #df69ba
+6: #35a77c
+7: #f3ead3
+8: #374145
+9: #f85552
+10: #8da101
+11: #dfa000
+12: #3a94c5
+13: #df69ba
+14: #36a77c
+15: #f2efdf
+foreground: #5c6a72
+background: #f3ead3
+cursor: #48584e
+
 falcon
 0: #000004
 1: #ff3600
@@ -8227,6 +8374,132 @@ foreground: #586e75
 background: #fdf6e3
 cursor: #586e75
 
+sonokai
+0: #181819
+1: #fc5d7c
+2: #9ed072
+3: #e7c664
+4: #76cce0
+5: #b39df3
+6: #f39660
+7: #e2e2e3
+8: #7f8490
+9: #fc5d7c
+10: #9ed072
+11: #e7c664
+12: #76cce0
+13: #b39df3
+14: #f39660
+15: #e2e2e3
+foreground: #e2e2e3
+background: #2c2e34
+cursor: #e2e2e3
+
+sonokai-andromeda
+0: #181a1c
+1: #fb617e
+2: #9ed06c
+3: #edc763
+4: #6dcae8
+5: #bb97ee
+6: #f89860
+7: #e1e3e4
+8: #7e8294
+9: #fb617e
+10: #9ed06c
+11: #edc763
+12: #6dcae8
+13: #bb97ee
+14: #f89860
+15: #e1e3e4
+foreground: #e1e3e4
+background: #2b2d3a
+cursor: #e1e3e4
+
+sonokai-atlantis
+0: #181a1c
+1: #ff6578
+2: #9dd274
+3: #eacb64
+4: #72cce8
+5: #ba9cf3
+6: #f69c5e
+7: #e1e3e4
+8: #828a9a
+9: #ff6578
+10: #9dd274
+11: #eacb64
+12: #72cce8
+13: #ba9cf3
+14: #f69c5e
+15: #e1e3e4
+foreground: #e1e3e4
+background: #2a2f38
+cursor: #e1e3e4
+
+sonokai-espresso
+0: #1f1e1c
+1: #f86882
+2: #a6cd77
+3: #f0c66f
+4: #81d0c9
+5: #9fa0e1
+6: #f08d71
+7: #e4e3e1
+8: #90817b
+9: #f86882
+10: #a6cd77
+11: #f0c66f
+12: #81d0c9
+13: #9fa0e1
+14: #f08d71
+15: #e4e3e1
+foreground: #e4e3e1
+background: #312c2b
+cursor: #e4e3e1
+
+sonokai-maia
+0: #1c1e1f
+1: #f75c7c
+2: #9cd57b
+3: #e3d367
+4: #78cee9
+5: #baa0f8
+6: #f3a96a
+7: #e1e2e3
+8: #82878b
+9: #f75c7c
+10: #9cd57b
+11: #e3d367
+12: #78cee9
+13: #baa0f8
+14: #f3a96a
+15: #e1e2e3
+foreground: #e1e2e3
+background: #273136
+cursor: #e1e2e3
+
+sonokai-shusia
+0: #1a181a
+1: #f85e84
+2: #9ecd6f
+3: #e5c463
+4: #7accd7
+5: #ab9df2
+6: #ef9062
+7: #e3e1e4
+8: #848089
+9: #f85e84
+10: #9ecd6f
+11: #e5c463
+12: #7accd7
+13: #ab9df2
+14: #ef9062
+15: #e3e1e4
+foreground: #e3e1e4
+background: #2d2a2e
+cursor: #e3e1e4
+
 source-code-x
 0: #4e596b
 1: #fb695d
diff --git a/themes/everforest-dark-vivid b/themes/everforest-dark-vivid
index 7163cb7..0380173 100644
--- a/themes/everforest-dark-vivid
+++ b/themes/everforest-dark-vivid
@@ -6,7 +6,7 @@ color4  #3a94c5
 color5  #df69ba
 color6  #35a77c
 color7  #fffbef
-color8  #374145
+color8  #7a8478
 color9  #e67e80
 color10 #a7c080
 color11 #dbbc7f