Merge pull request #3 from mrmcc3/update

Update radix colors and add new theme

10 files changed, 175 insertions, 94 deletions

diff --git a/README.md b/README.md
index 9d1c585..7a6d9b2 100644
--- a/README.md
+++ b/README.md
@@ -31,17 +31,29 @@
   - It should be straightforward to use helix theme inheritance to swap out the
     default color palette with other radix color combinations without losing the
     principles of the theme. (see the berry variant)
+- If you find languages that aren't highlighted nicely or have a suggestion for
+  improvements please open an issue.
+
+### Changes
+
+#### 2023-11-21
+
+- Update colors to radix colors 3.0
+- Add a new default theme. Move the old default to yo_sand with some color tweaks
     
 ### Screenshots
 
 | **yo** | **yo_light** |
 |:-:|:-:|
-|![yo](https://user-images.githubusercontent.com/4220099/213588257-f4ef642d-39f8-4b99-9a92-dff14b781633.png)|![yo_light](https://user-images.githubusercontent.com/4220099/213587651-824ab69b-9c67-49d4-b045-cd17b540fb2f.png)|
+|<img width="710" alt="yo" src="https://github.com/mrmcc3/yo-theme-helix/assets/4220099/11a18910-1a90-4196-bc8b-475ee8718b57">|<img width="717" alt="yo_light" src="https://github.com/mrmcc3/yo-theme-helix/assets/4220099/9dc6eb1c-7464-41e8-9cce-00e9ac52532d">|
 
 | **yo_berry** | **yo_berry_light** |
 |:-:|:-:|
-|![yo_berry](https://user-images.githubusercontent.com/4220099/213587643-8cdf4995-cb78-44f4-a0f4-a1221d59bb22.png)|![yo_berry_light](https://user-images.githubusercontent.com/4220099/213587646-d4141b57-322d-4e1f-9d43-1d33e755bc96.png)|
+|<img width="698" alt="yo_berry" src="https://github.com/mrmcc3/yo-theme-helix/assets/4220099/e87955b9-8328-4ec6-a390-90c241007541">|<img width="696" alt="yo_berry_light" src="https://github.com/mrmcc3/yo-theme-helix/assets/4220099/0cf211f5-86ea-4d0b-a6ed-697a7d446030">|
 
+| **yo_sand** | **yo_sand_light** |
+|:-:|:-:|
+|<img width="705" alt="yo_sand" src="https://github.com/mrmcc3/yo-theme-helix/assets/4220099/4da47cbb-af45-484e-bfb5-7f7f81e96e5a">|<img width="696" alt="yo_sand_light" src="https://github.com/mrmcc3/yo-theme-helix/assets/4220099/5acd80ea-a678-4f52-b0eb-cdda2d0cfac9">|
 
 [helix]: https://helix-editor.com/
 [zenbones]: https://github.com/mcchrish/zenbones.nvim
diff --git a/yo.toml b/yo.toml
index 10b6df8..edff271 100644
--- a/yo.toml
+++ b/yo.toml
@@ -1,6 +1,4 @@
-# yo
-
-# Helix theme inspired by Zenbones & Alabaster.
+# Helix theme inspired by Zenbones & Alabaster with radix colors.
 # Author: Michael McClintock @mrmcc3
 # License: MIT
 
@@ -69,7 +67,8 @@ constant = { fg = "constant" }
 "string.special.symbol" = { fg = "constant" }
 variable = { fg = "p10" }
 namespace = { fg = "p10" }
-punctuation = { fg = "p11" }
+punctuation = { fg = "p9" }
+"punctuation.delimiter" = { fg = "p8" }
 function = { fg = "p11" }
 attribute = { fg = "p11" }
 tag = { fg = "p12" }
@@ -90,24 +89,24 @@ markup = { fg = "p9" }
 
 [palette] # radix ui colors
 
-# primary - sandDark
-p1 = "#161615"
-p2 = "#1c1c1a"
-p3 = "#232320"
-p4 = "#282826"
-p5 = "#2e2e2b"
-p6 = "#353431"
-p7 = "#3e3e3a"
-p8 = "#51504b"
-p9 = "#717069"
-p10 = "#7f7e77"
-p11 = "#a1a09a"
-p12 = "#ededec"
+# grayDark
+p1 = "#111111"
+p2 = "#191919"
+p3 = "#222222"
+p4 = "#2a2a2a"
+p5 = "#313131"
+p6 = "#3a3a3a"
+p7 = "#484848"
+p8 = "#606060"
+p9 = "#6e6e6e"
+p10 = "#7b7b7b"
+p11 = "#b4b4b4"
+p12 = "#eeeeee"
 
-error = "#f2555a" # redDark-10
-warning = "#ffcb47" # amberDark-10
-info = "#369eff" # blueDark-10
+error = "#ec5d5e" # redDark-10
+warning = "#ff801f" # orangeDark-10
+info = "#3b9eff" # blueDark-10
 
-string = "#46a758" # green-9
-constant = "#8e4ec6" # purple-9
-keyword = "#a18072" # bronze-9
+string = "#33b074" # greenDark-10
+constant = "#9a5cd0" # purpleDark-10
+keyword = "#ae8c7e" # bronzeDark-10
diff --git a/yo_berry.toml b/yo_berry.toml
index 4cf05cd..00e3c7f 100644
--- a/yo_berry.toml
+++ b/yo_berry.toml
@@ -1,32 +1,30 @@
-# yo_berry - yo variant with berry colors
-
-# Helix theme inspired by Zenbones & Alabaster.
+# Helix theme inspired by Zenbones & Alabaster with radix colors.
 # Author: Michael McClintock @mrmcc3
 # License: MIT
 
 inherits = "yo"
 
-[palette] # radix ui colors
+[palette]
 
-# primary - mauveDark
-p1 = "#161618"
-p2 = "#1c1c1f"
-p3 = "#232326"
-p4 = "#28282c"
-p5 = "#2e2e32"
-p6 = "#34343a"
-p7 = "#3e3e44"
-p8 = "#504f57"
-p9 = "#706f78"
-p10 = "#7e7d86"
-p11 = "#a09fa6"
-p12 = "#ededef"
+# mauveDark
+p1 = "#121113"
+p2 = "#1a191b"
+p3 = "#232225"
+p4 = "#2b292d"
+p5 = "#323035"
+p6 = "#3c393f"
+p7 = "#49474e"
+p8 = "#625f69"
+p9 = "#6f6d78"
+p10 = "#7c7a85"
+p11 = "#b5b2bc"
+p12 = "#eeeef0"
 
-error = "#f04f88" # crimsonDark-10
-warning = "#ffef5c" # yellowDark-10
-info = "#369eff" # blueDark-10
+error = "#ee518a" # crimsonDark-10
+warning = "#ffff57" # yellowDark-10
+info = "#3b9eff" # blueDark-10
 
-string = "#12a594" # teal-9
-constant = "#bd54c6" # plum-10
-keyword = "#9490e9" # custom
+string = "#0eb39e" # teal-10
+constant = "#b658c4" # plum-10
+keyword = "#9eb1ff" # indigo-11
 
diff --git a/yo_berry_dark.toml b/yo_berry_dark.toml
index 166bd3a..320b70b 100644
--- a/yo_berry_dark.toml
+++ b/yo_berry_dark.toml
@@ -1,18 +1,15 @@
-# yo_berry_dark - darker yo berry variant
-
-# Helix theme inspired by Zenbones & Alabaster.
+# Helix theme inspired by Zenbones & Alabaster with radix colors.
 # Author: Michael McClintock @mrmcc3
 # License: MIT
 
 inherits = "yo_berry"
 
-[palette] # radix ui colors
-
-# primary - mauveDark. shift p1-p5 -> p2-p6
+[palette]
 
-p2 = "#161618"
-p3 = "#1c1c1f"
-p4 = "#232326"
-p5 = "#28282c"
-p6 = "#2e2e32"
+# mauveDark. shift p1-p5 -> p2-p6
+p2 = "#121113"
+p3 = "#1a191b"
+p4 = "#232225"
+p5 = "#2b292d"
+p6 = "#323035"
 
diff --git a/yo_berry_light.toml b/yo_berry_light.toml
index 57682af..a8e8042 100644
--- a/yo_berry_light.toml
+++ b/yo_berry_light.toml
@@ -1,12 +1,10 @@
-# yo_berry_light - light yo berry variant
-
-# Helix theme inspired by Zenbones & Alabaster.
+# Helix theme inspired by Zenbones & Alabaster with radix colors.
 # Author: Michael McClintock @mrmcc3
 # License: MIT
 
 inherits = "yo_berry"
 
-[palette] # radix ui colors
+[palette]
 
 # primary - mauve
 p1 = "#fdfcfd"
@@ -26,5 +24,7 @@ error = "#e03177" # crimson-10
 warning = "#ed5f00" # orange-10
 info = "#0081f1" # blue-10
 
-constant = "#a43cb4" # plum-10
+string = "#0d9b8a" # teal-10
+constant = "#a144af" # plum-10
+keyword = "#5753c6" # iris-11
 
diff --git a/yo_dark.toml b/yo_dark.toml
index 49502ac..173e60f 100644
--- a/yo_dark.toml
+++ b/yo_dark.toml
@@ -1,6 +1,4 @@
-# yo_dark - darker yo variant
-
-# Helix theme inspired by Zenbones & Alabaster.
+# Helix theme inspired by Zenbones & Alabaster with radix colors.
 # Author: Michael McClintock @mrmcc3
 # License: MIT
 
@@ -8,10 +6,9 @@ inherits = "yo"
 
 [palette]
 
-# in the default theme p1 is unused. shift p1-p5 -> p2-p6
-
-p2 = "#161615"
-p3 = "#1c1c1a"
-p4 = "#232320"
-p5 = "#282826"
-p6 = "#2e2e2b"
+# grayDark. shift p1-p5 -> p2-p6
+p2 = "#111111"
+p3 = "#191919"
+p4 = "#222222"
+p5 = "#2a2a2a"
+p6 = "#313131"
diff --git a/yo_light.toml b/yo_light.toml
index 3967bb4..3fba4af 100644
--- a/yo_light.toml
+++ b/yo_light.toml
@@ -1,27 +1,30 @@
-# yo_light
-
-# Helix theme inspired by Zenbones & Alabaster.
+# Helix theme inspired by Zenbones & Alabaster with radix colors.
 # Author: Michael McClintock @mrmcc3
 # License: MIT
 
 inherits = "yo"
 
-[palette] # radix ui colors
+[palette]
+
+# gray
+p1 = "#fcfcfc"
+p2 = "#f9f9f9"
+p3 = "#f0f0f0"
+p4 = "#e8e8e8"
+p5 = "#e0e0e0"
+p6 = "#d9d9d9"
+p7 = "#cecece"
+p8 = "#bbbbbb"
+p9 = "#8d8d8d"
+p10 = "#838383"
+p11 = "#646464"
+p12 = "#202020"
+
 
-# primary - sand
-p1 = "#fdfdfc"
-p2 = "#f9f9f8"
-p3 = "#f3f3f2"
-p4 = "#eeeeec"
-p5 = "#e9e9e6"
-p6 = "#e3e3e0"
-p7 = "#dbdbd7"
-p8 = "#c8c7c1"
-p9 = "#90908c"
-p10 = "#868682"
-p11 = "#706f6c"
-p12 = "#1b1b18"
+error = "#dc3e42" # red-10
+warning = "#ef5f00" # orange-10
+info = "#0588f0" # blue-10
 
-error = "#dc3d43" # red-10
-warning = "#ed5f00" # orange-10
-info = "#0081f1" # blue-10
+string = "#2b9a66" # green-10
+constant = "#8347b9" # purple-10
+keyword = "#957468" # bronze-10
diff --git a/yo_sand.toml b/yo_sand.toml
new file mode 100644
index 0000000..e3e8fd1
--- /dev/null
+++ b/yo_sand.toml
@@ -0,0 +1,30 @@
+# Helix theme inspired by Zenbones & Alabaster with radix colors.
+# Author: Michael McClintock @mrmcc3
+# License: MIT
+
+inherits = "yo"
+
+[palette]
+
+# sandDark
+p1 = "#111110"
+p2 = "#191918"
+p3 = "#222221"
+p4 = "#2a2a28"
+p5 = "#31312e"
+p6 = "#3b3a37"
+p7 = "#494844"
+p8 = "#62605b"
+p9 = "#6f6d66"
+p10 = "#7c7b74"
+p11 = "#b5b3ad"
+p12 = "#eeeeec"
+
+error = "#ec6142" # tomatoDark-10
+warning = "#ffd60a" # amberDark-10
+info = "#23afd0" # cyanDark-10
+
+string = "#53b365" # grassDark-10
+constant = "#de51a8" # pinkDark-10
+keyword = "#dbb594" # brownDark-11
+
diff --git a/yo_sand_dark.toml b/yo_sand_dark.toml
new file mode 100644
index 0000000..8f20895
--- /dev/null
+++ b/yo_sand_dark.toml
@@ -0,0 +1,15 @@
+# Helix theme inspired by Zenbones & Alabaster with radix colors.
+# Author: Michael McClintock @mrmcc3
+# License: MIT
+
+inherits = "yo_sand"
+
+[palette]
+
+# sandDark. shift p1-p5 -> p2-p6
+p2 = "#111110"
+p3 = "#191918"
+p4 = "#222221"
+p5 = "#2a2a28"
+p6 = "#31312e"
+
diff --git a/yo_sand_light.toml b/yo_sand_light.toml
new file mode 100644
index 0000000..b05e3e5
--- /dev/null
+++ b/yo_sand_light.toml
@@ -0,0 +1,30 @@
+# Helix theme inspired by Zenbones & Alabaster with radix colors.
+# Author: Michael McClintock @mrmcc3
+# License: MIT
+
+inherits = "yo_sand"
+
+[palette]
+
+# sand
+p1 = "#fdfdfc"
+p2 = "#f9f9f8"
+p3 = "#f1f0ef"
+p4 = "#e9e8e6"
+p5 = "#e2e1de"
+p6 = "#dad9d6"
+p7 = "#cfceca"
+p8 = "#bcbbb5"
+p9 = "#8d8d86"
+p10 = "#82827c"
+p11 = "#63635e"
+p12 = "#21201c"
+
+error = "#dd4425" # tomato-10
+warning = "#ffba18" # amber-10
+info = "#0797b9" # cyan-10
+
+string = "#3e9b4f" # grass-10
+constant = "#cf3897" # pink-10
+keyword =  "#815e46" # brown-11
+