From e4826832b52c1c31a529c5610fcca8726522a315 Mon Sep 17 00:00:00 2001
From: lucy <lucykaufmann@protonmail.com>
Date: Wed, 16 Sep 2026 19:50:58 +0200
Subject: [PATCH] go back to old color defs

---
 build/base16-0x96f.css                        | 97 +++++--------------
 build/base16-3024.css                         | 97 +++++--------------
 build/base16-apathy.css                       | 97 +++++--------------
 build/base16-apprentice.css                   | 97 +++++--------------
 build/base16-arroz-con-dulce-dark.css         | 97 +++++--------------
 build/base16-arroz-con-dulce.css              | 97 +++++--------------
 build/base16-ascendancy.css                   | 97 +++++--------------
 build/base16-ashes.css                        | 97 +++++--------------
 build/base16-atelier-cave-light.css           | 97 +++++--------------
 build/base16-atelier-cave.css                 | 97 +++++--------------
 build/base16-atelier-dune-light.css           | 97 +++++--------------
 build/base16-atelier-dune.css                 | 97 +++++--------------
 build/base16-atelier-estuary-light.css        | 97 +++++--------------
 build/base16-atelier-estuary.css              | 97 +++++--------------
 build/base16-atelier-forest-light.css         | 97 +++++--------------
 build/base16-atelier-forest.css               | 97 +++++--------------
 build/base16-atelier-heath-light.css          | 97 +++++--------------
 build/base16-atelier-heath.css                | 97 +++++--------------
 build/base16-atelier-lakeside-light.css       | 97 +++++--------------
 build/base16-atelier-lakeside.css             | 97 +++++--------------
 build/base16-atelier-plateau-light.css        | 97 +++++--------------
 build/base16-atelier-plateau.css              | 97 +++++--------------
 build/base16-atelier-savanna-light.css        | 97 +++++--------------
 build/base16-atelier-savanna.css              | 97 +++++--------------
 build/base16-atelier-seaside-light.css        | 97 +++++--------------
 build/base16-atelier-seaside.css              | 97 +++++--------------
 build/base16-atelier-sulphurpool-light.css    | 97 +++++--------------
 build/base16-atelier-sulphurpool.css          | 97 +++++--------------
 build/base16-atlas.css                        | 97 +++++--------------
 build/base16-ayu-dark.css                     | 97 +++++--------------
 build/base16-ayu-light.css                    | 97 +++++--------------
 build/base16-ayu-mirage.css                   | 97 +++++--------------
 build/base16-aztec.css                        | 97 +++++--------------
 build/base16-bespin.css                       | 97 +++++--------------
 build/base16-black-metal-bathory.css          | 97 +++++--------------
 build/base16-black-metal-burzum.css           | 97 +++++--------------
 build/base16-black-metal-dark-funeral.css     | 97 +++++--------------
 build/base16-black-metal-gorgoroth.css        | 97 +++++--------------
 build/base16-black-metal-immortal.css         | 97 +++++--------------
 build/base16-black-metal-khold.css            | 97 +++++--------------
 build/base16-black-metal-marduk.css           | 97 +++++--------------
 build/base16-black-metal-mayhem.css           | 97 +++++--------------
 build/base16-black-metal-nile.css             | 97 +++++--------------
 build/base16-black-metal-venom.css            | 97 +++++--------------
 build/base16-black-metal.css                  | 97 +++++--------------
 build/base16-blueforest.css                   | 97 +++++--------------
 build/base16-blueish.css                      | 97 +++++--------------
 build/base16-boo-shnickle-light.css           | 97 +++++--------------
 build/base16-boo-shnickle.css                 | 97 +++++--------------
 build/base16-bosque.css                       | 97 +++++--------------
 build/base16-brasa.css                        | 97 +++++--------------
 build/base16-brewer.css                       | 97 +++++--------------
 build/base16-bright.css                       | 97 +++++--------------
 build/base16-brogrammer.css                   | 97 +++++--------------
 build/base16-brushtrees-dark.css              | 97 +++++--------------
 build/base16-brushtrees.css                   | 97 +++++--------------
 build/base16-cacao.css                        | 97 +++++--------------
 build/base16-caroline.css                     | 97 +++++--------------
 build/base16-catppuccin-frappe.css            | 97 +++++--------------
 build/base16-catppuccin-latte.css             | 97 +++++--------------
 build/base16-catppuccin-macchiato.css         | 97 +++++--------------
 build/base16-catppuccin-mocha.css             | 97 +++++--------------
 build/base16-cerulean-signal-dark.css         | 97 +++++--------------
 build/base16-cerulean-signal-light.css        | 97 +++++--------------
 build/base16-chalk.css                        | 97 +++++--------------
 build/base16-charcoal-dark.css                | 97 +++++--------------
 build/base16-charcoal-light.css               | 97 +++++--------------
 build/base16-chicago-day.css                  | 97 +++++--------------
 build/base16-chicago-night.css                | 97 +++++--------------
 build/base16-chinoiserie-midnight.css         | 97 +++++--------------
 build/base16-chinoiserie-morandi.css          | 97 +++++--------------
 build/base16-chinoiserie-night.css            | 97 +++++--------------
 build/base16-chinoiserie.css                  | 97 +++++--------------
 build/base16-circus.css                       | 97 +++++--------------
 build/base16-classic-dark.css                 | 97 +++++--------------
 build/base16-classic-light.css                | 97 +++++--------------
 build/base16-codeschool.css                   | 97 +++++--------------
 build/base16-colors.css                       | 97 +++++--------------
 build/base16-corduroy-dark.css                | 97 +++++--------------
 build/base16-corduroy.css                     | 97 +++++--------------
 build/base16-cupcake.css                      | 97 +++++--------------
 build/base16-cupertino.css                    | 97 +++++--------------
 build/base16-cyberpunk.css                    | 97 +++++--------------
 build/base16-da-one-black.css                 | 97 +++++--------------
 build/base16-da-one-gray.css                  | 97 +++++--------------
 build/base16-da-one-ocean.css                 | 97 +++++--------------
 build/base16-da-one-paper.css                 | 97 +++++--------------
 build/base16-da-one-sea.css                   | 97 +++++--------------
 build/base16-da-one-white.css                 | 97 +++++--------------
 build/base16-danqing-light.css                | 97 +++++--------------
 build/base16-danqing.css                      | 97 +++++--------------
 build/base16-darcula.css                      | 97 +++++--------------
 build/base16-darkmoss.css                     | 97 +++++--------------
 build/base16-darktooth.css                    | 97 +++++--------------
 build/base16-darkviolet.css                   | 97 +++++--------------
 build/base16-decaf.css                        | 97 +++++--------------
 build/base16-deep-oceanic-next.css            | 97 +++++--------------
 build/base16-default-dark.css                 | 97 +++++--------------
 build/base16-default-light.css                | 97 +++++--------------
 build/base16-digital-rain.css                 | 97 +++++--------------
 build/base16-dirtysea.css                     | 97 +++++--------------
 build/base16-dracula.css                      | 97 +++++--------------
 build/base16-edge-dark.css                    | 97 +++++--------------
 build/base16-edge-light.css                   | 97 +++++--------------
 build/base16-eighties.css                     | 97 +++++--------------
 build/base16-eldritch.css                     | 97 +++++--------------
 build/base16-embers-light.css                 | 97 +++++--------------
 build/base16-embers.css                       | 97 +++++--------------
 build/base16-emil.css                         | 97 +++++--------------
 build/base16-equilibrium-dark.css             | 97 +++++--------------
 build/base16-equilibrium-gray-dark.css        | 97 +++++--------------
 build/base16-equilibrium-gray-light.css       | 97 +++++--------------
 build/base16-equilibrium-light.css            | 97 +++++--------------
 build/base16-eris.css                         | 97 +++++--------------
 build/base16-espresso.css                     | 97 +++++--------------
 build/base16-eva-dim.css                      | 97 +++++--------------
 build/base16-eva.css                          | 97 +++++--------------
 build/base16-evenok-dark.css                  | 97 +++++--------------
 build/base16-everforest-dark-hard.css         | 97 +++++--------------
 build/base16-everforest-dark-medium.css       | 97 +++++--------------
 build/base16-everforest-dark-soft.css         | 97 +++++--------------
 build/base16-everforest-light-hard.css        | 97 +++++--------------
 build/base16-everforest-light-medium.css      | 97 +++++--------------
 build/base16-everforest-light-soft.css        | 97 +++++--------------
 build/base16-everforest.css                   | 97 +++++--------------
 build/base16-flat.css                         | 97 +++++--------------
 build/base16-flexoki-dark.css                 | 97 +++++--------------
 build/base16-flexoki-light.css                | 97 +++++--------------
 build/base16-framer.css                       | 97 +++++--------------
 build/base16-fruit-soda.css                   | 97 +++++--------------
 build/base16-gigavolt.css                     | 97 +++++--------------
 build/base16-github-dark-colorblind.css       | 97 +++++--------------
 build/base16-github-dark-dimmed.css           | 97 +++++--------------
 build/base16-github-dark-high-contrast.css    | 97 +++++--------------
 build/base16-github-dark.css                  | 97 +++++--------------
 build/base16-github-light-colorblind.css      | 97 +++++--------------
 build/base16-github-light-high-contrast.css   | 97 +++++--------------
 build/base16-github.css                       | 97 +++++--------------
 build/base16-google-dark.css                  | 97 +++++--------------
 build/base16-google-light.css                 | 97 +++++--------------
 build/base16-gotham.css                       | 97 +++++--------------
 build/base16-grayscale-dark.css               | 97 +++++--------------
 build/base16-grayscale-light.css              | 97 +++++--------------
 build/base16-greenscreen.css                  | 97 +++++--------------
 build/base16-gruber.css                       | 97 +++++--------------
 build/base16-gruvbox-dark-hard.css            | 97 +++++--------------
 build/base16-gruvbox-dark-medium-forest.css   | 97 +++++--------------
 build/base16-gruvbox-dark-medium.css          | 97 +++++--------------
 build/base16-gruvbox-dark-pale.css            | 97 +++++--------------
 build/base16-gruvbox-dark-soft.css            | 97 +++++--------------
 build/base16-gruvbox-dark.css                 | 97 +++++--------------
 build/base16-gruvbox-light-hard.css           | 97 +++++--------------
 build/base16-gruvbox-light-medium.css         | 97 +++++--------------
 build/base16-gruvbox-light-soft.css           | 97 +++++--------------
 build/base16-gruvbox-light.css                | 97 +++++--------------
 build/base16-gruvbox-material-dark-hard.css   | 97 +++++--------------
 build/base16-gruvbox-material-dark-medium.css | 97 +++++--------------
 build/base16-gruvbox-material-dark-soft.css   | 97 +++++--------------
 build/base16-gruvbox-material-light-hard.css  | 97 +++++--------------
 .../base16-gruvbox-material-light-medium.css  | 97 +++++--------------
 build/base16-gruvbox-material-light-soft.css  | 97 +++++--------------
 build/base16-hardcore.css                     | 97 +++++--------------
 build/base16-hardhacker.css                   | 97 +++++--------------
 build/base16-harmonic16-dark.css              | 97 +++++--------------
 build/base16-harmonic16-light.css             | 97 +++++--------------
 build/base16-heetch-light.css                 | 97 +++++--------------
 build/base16-heetch.css                       | 97 +++++--------------
 build/base16-helios.css                       | 97 +++++--------------
 build/base16-hopscotch.css                    | 97 +++++--------------
 build/base16-horizon-dark.css                 | 97 +++++--------------
 build/base16-horizon-light.css                | 97 +++++--------------
 build/base16-horizon-terminal-dark.css        | 97 +++++--------------
 build/base16-horizon-terminal-light.css       | 97 +++++--------------
 build/base16-humanoid-dark.css                | 97 +++++--------------
 build/base16-humanoid-light.css               | 97 +++++--------------
 build/base16-ia-dark.css                      | 97 +++++--------------
 build/base16-ia-light.css                     | 97 +++++--------------
 build/base16-icy.css                          | 97 +++++--------------
 build/base16-irblack.css                      | 97 +++++--------------
 build/base16-isotope.css                      | 97 +++++--------------
 build/base16-jabuti.css                       | 97 +++++--------------
 build/base16-jellybeans.css                   | 97 +++++--------------
 build/base16-kanagawa-dragon.css              | 97 +++++--------------
 build/base16-kanagawa.css                     | 97 +++++--------------
 build/base16-katy.css                         | 97 +++++--------------
 build/base16-kimber.css                       | 97 +++++--------------
 build/base16-kissa-latte.css                  | 97 +++++--------------
 build/base16-kissa-macchiato.css              | 97 +++++--------------
 build/base16-lichen-chartreuse-dark.css       | 97 +++++--------------
 build/base16-lichen-chartreuse-light.css      | 97 +++++--------------
 build/base16-lime.css                         | 97 +++++--------------
 build/base16-linux-vt.css                     | 97 +++++--------------
 build/base16-macintosh.css                    | 97 +++++--------------
 build/base16-marrakesh.css                    | 97 +++++--------------
 build/base16-materia.css                      | 97 +++++--------------
 build/base16-material-darker.css              | 97 +++++--------------
 build/base16-material-lighter.css             | 97 +++++--------------
 build/base16-material-palenight.css           | 97 +++++--------------
 build/base16-material-vivid.css               | 97 +++++--------------
 build/base16-material.css                     | 97 +++++--------------
 build/base16-measured-dark.css                | 97 +++++--------------
 build/base16-measured-light.css               | 97 +++++--------------
 build/base16-mellow-purple.css                | 97 +++++--------------
 build/base16-mexico-light.css                 | 97 +++++--------------
 build/base16-mezcal.css                       | 97 +++++--------------
 build/base16-mocha.css                        | 97 +++++--------------
 build/base16-monokai.css                      | 97 +++++--------------
 build/base16-moonlight.css                    | 97 +++++--------------
 build/base16-mountain.css                     | 97 +++++--------------
 build/base16-nebula.css                       | 97 +++++--------------
 build/base16-neovim-dark.css                  | 97 +++++--------------
 build/base16-neovim-light.css                 | 97 +++++--------------
 build/base16-noche.css                        | 97 +++++--------------
 build/base16-nord-light.css                   | 97 +++++--------------
 build/base16-nord.css                         | 97 +++++--------------
 build/base16-nova.css                         | 97 +++++--------------
 build/base16-ocean.css                        | 97 +++++--------------
 build/base16-oceanicnext.css                  | 97 +++++--------------
 build/base16-ocote.css                        | 97 +++++--------------
 build/base16-one-light.css                    | 97 +++++--------------
 build/base16-onedark-dark.css                 | 97 +++++--------------
 build/base16-onedark.css                      | 97 +++++--------------
 build/base16-outrun-dark.css                  | 97 +++++--------------
 build/base16-oxocarbon-dark.css               | 97 +++++--------------
 build/base16-oxocarbon-light.css              | 97 +++++--------------
 build/base16-pandora.css                      | 97 +++++--------------
 build/base16-papel.css                        | 97 +++++--------------
 build/base16-papercolor-dark.css              | 97 +++++--------------
 build/base16-papercolor-light.css             | 97 +++++--------------
 build/base16-paraiso.css                      | 97 +++++--------------
 build/base16-pasque.css                       | 97 +++++--------------
 build/base16-pastelon-de-amarillos-dark.css   | 97 +++++--------------
 build/base16-pastelon-de-amarillos.css        | 97 +++++--------------
 ...ase16-penumbra-dark-contrast-plus-plus.css | 97 +++++--------------
 build/base16-penumbra-dark-contrast-plus.css  | 97 +++++--------------
 build/base16-penumbra-dark.css                | 97 +++++--------------
 ...se16-penumbra-light-contrast-plus-plus.css | 97 +++++--------------
 build/base16-penumbra-light-contrast-plus.css | 97 +++++--------------
 build/base16-penumbra-light.css               | 97 +++++--------------
 build/base16-phd.css                          | 97 +++++--------------
 build/base16-pico.css                         | 97 +++++--------------
 build/base16-pinky.css                        | 97 +++++--------------
 build/base16-pop.css                          | 97 +++++--------------
 build/base16-porple.css                       | 97 +++++--------------
 build/base16-precious-dark-eleven.css         | 97 +++++--------------
 build/base16-precious-dark-fifteen.css        | 97 +++++--------------
 build/base16-precious-light-warm.css          | 97 +++++--------------
 build/base16-precious-light-white.css         | 97 +++++--------------
 build/base16-primer-dark-dimmed.css           | 97 +++++--------------
 build/base16-primer-dark.css                  | 97 +++++--------------
 build/base16-primer-light.css                 | 97 +++++--------------
 build/base16-purpledream.css                  | 97 +++++--------------
 build/base16-qualia.css                       | 97 +++++--------------
 build/base16-railscasts.css                   | 97 +++++--------------
 build/base16-rebecca.css                      | 97 +++++--------------
 build/base16-rose-pine-dawn.css               | 97 +++++--------------
 build/base16-rose-pine-moon.css               | 97 +++++--------------
 build/base16-rose-pine.css                    | 97 +++++--------------
 build/base16-saga.css                         | 97 +++++--------------
 build/base16-sagelight.css                    | 97 +++++--------------
 build/base16-sakura.css                       | 97 +++++--------------
 build/base16-sandcastle.css                   | 97 +++++--------------
 build/base16-selenized-black.css              | 97 +++++--------------
 build/base16-selenized-dark.css               | 97 +++++--------------
 build/base16-selenized-light.css              | 97 +++++--------------
 build/base16-selenized-white.css              | 97 +++++--------------
 build/base16-seti.css                         | 97 +++++--------------
 build/base16-shades-of-purple.css             | 97 +++++--------------
 build/base16-shadesmear-dark.css              | 97 +++++--------------
 build/base16-shadesmear-light.css             | 97 +++++--------------
 build/base16-shapeshifter.css                 | 97 +++++--------------
 build/base16-silk-dark.css                    | 97 +++++--------------
 build/base16-silk-light.css                   | 97 +++++--------------
 build/base16-snazzy.css                       | 97 +++++--------------
 build/base16-soft-server.css                  | 97 +++++--------------
 build/base16-solarflare-light.css             | 97 +++++--------------
 build/base16-solarflare.css                   | 97 +++++--------------
 build/base16-solarized-dark.css               | 97 +++++--------------
 build/base16-solarized-light.css              | 97 +++++--------------
 build/base16-spaceduck.css                    | 97 +++++--------------
 build/base16-spacemacs.css                    | 97 +++++--------------
 build/base16-sparky.css                       | 97 +++++--------------
 build/base16-standardized-dark.css            | 97 +++++--------------
 build/base16-standardized-light.css           | 97 +++++--------------
 build/base16-stella.css                       | 97 +++++--------------
 build/base16-still-alive.css                  | 97 +++++--------------
 build/base16-summercamp.css                   | 97 +++++--------------
 build/base16-summerfruit-dark.css             | 97 +++++--------------
 build/base16-summerfruit-light.css            | 97 +++++--------------
 build/base16-swamp-dark.css                   | 97 +++++--------------
 build/base16-swamp-light.css                  | 97 +++++--------------
 build/base16-synth-midnight-dark.css          | 97 +++++--------------
 build/base16-synth-midnight-light.css         | 97 +++++--------------
 build/base16-tango.css                        | 97 +++++--------------
 build/base16-tarot.css                        | 97 +++++--------------
 build/base16-tender.css                       | 97 +++++--------------
 build/base16-terracotta-dark.css              | 97 +++++--------------
 build/base16-terracotta.css                   | 97 +++++--------------
 build/base16-tinta.css                        | 97 +++++--------------
 build/base16-tokyo-city-dark.css              | 97 +++++--------------
 build/base16-tokyo-city-light.css             | 97 +++++--------------
 build/base16-tokyo-city-terminal-dark.css     | 97 +++++--------------
 build/base16-tokyo-city-terminal-light.css    | 97 +++++--------------
 build/base16-tokyo-night-dark.css             | 97 +++++--------------
 build/base16-tokyo-night-light.css            | 97 +++++--------------
 build/base16-tokyo-night-moon.css             | 97 +++++--------------
 build/base16-tokyo-night-storm.css            | 97 +++++--------------
 build/base16-tokyo-night-terminal-dark.css    | 97 +++++--------------
 build/base16-tokyo-night-terminal-light.css   | 97 +++++--------------
 build/base16-tokyo-night-terminal-storm.css   | 97 +++++--------------
 build/base16-tokyodark-terminal.css           | 97 +++++--------------
 build/base16-tokyodark.css                    | 97 +++++--------------
 build/base16-tomorrow-night-eighties.css      | 97 +++++--------------
 build/base16-tomorrow-night.css               | 97 +++++--------------
 build/base16-tomorrow.css                     | 97 +++++--------------
 build/base16-tube.css                         | 97 +++++--------------
 build/base16-twilight.css                     | 97 +++++--------------
 build/base16-unikitty-dark.css                | 97 +++++--------------
 build/base16-unikitty-light.css               | 97 +++++--------------
 build/base16-unikitty-reversible.css          | 97 +++++--------------
 build/base16-uwunicorn.css                    | 97 +++++--------------
 build/base16-valua.css                        | 97 +++++--------------
 build/base16-vesper.css                       | 97 +++++--------------
 build/base16-vice.css                         | 97 +++++--------------
 build/base16-vulcan.css                       | 97 +++++--------------
 build/base16-windows-10-light.css             | 97 +++++--------------
 build/base16-windows-10.css                   | 97 +++++--------------
 build/base16-windows-95-light.css             | 97 +++++--------------
 build/base16-windows-95.css                   | 97 +++++--------------
 build/base16-windows-highcontrast-light.css   | 97 +++++--------------
 build/base16-windows-highcontrast.css         | 97 +++++--------------
 build/base16-windows-nt-light.css             | 97 +++++--------------
 build/base16-windows-nt.css                   | 97 +++++--------------
 build/base16-woodland.css                     | 97 +++++--------------
 build/base16-xcode-dusk.css                   | 97 +++++--------------
 build/base16-yesterday-bright.css             | 97 +++++--------------
 build/base16-yesterday-night.css              | 97 +++++--------------
 build/base16-yesterday.css                    | 97 +++++--------------
 build/base16-zenbones.css                     | 97 +++++--------------
 build/base16-zenburn.css                      | 97 +++++--------------
 templates/default.mustache                    | 97 +++++--------------
 341 files changed, 7843 insertions(+), 25234 deletions(-)

diff --git a/build/base16-0x96f.css b/build/base16-0x96f.css
index 02bfff5..d2c69c4 100644
--- a/build/base16-0x96f.css
+++ b/build/base16-0x96f.css
@@ -1,88 +1,37 @@
 @define-color accent_color #49cae4;
 @define-color accent_bg_color #49cae4;
 @define-color accent_fg_color #262427;
-@define-color destructive_color #ff7272;
-@define-color destructive_bg_color #ff7272;
-@define-color destructive_fg_color #262427;
-@define-color success_color #bcdf59;
-@define-color success_bg_color #bcdf59;
-@define-color success_fg_color #262427;
-@define-color warning_color #a093e2;
-@define-color warning_bg_color #a093e2;
-@define-color warning_fg_color #262427;
-@define-color error_color #ff7272;
-@define-color error_bg_color #ff7272;
-@define-color error_fg_color #262427;
+
 @define-color window_bg_color #262427;
 @define-color window_fg_color #fcfcfc;
+
 @define-color view_bg_color #262427;
 @define-color view_fg_color #fcfcfc;
-@define-color headerbar_bg_color #3b393c;
+
+@define-color headerbar_bg_color #262427;
 @define-color headerbar_fg_color #fcfcfc;
-@define-color headerbar_border_color rgba(0.23137255, 0.22352941, 0.23529412, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #262427;
+@define-color dialog_fg_color #fcfcfc;
+
+@define-color popover_bg_color #262427;
+@define-color popover_fg_color #fcfcfc;
+
+
 @define-color sidebar_bg_color #3b393c;
 @define-color sidebar_fg_color #fcfcfc;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #3b393c;
 @define-color card_fg_color #fcfcfc;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #3b393c;
-@define-color dialog_fg_color #fcfcfc;
-@define-color popover_bg_color #3b393c;
-@define-color popover_fg_color #fcfcfc;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #514f52;
-@define-color blue_1 #49cae4;
-@define-color blue_2 #49cae4;
-@define-color blue_3 #49cae4;
-@define-color blue_4 #49cae4;
-@define-color blue_5 #49cae4;
-@define-color green_1 #bcdf59;
-@define-color green_2 #bcdf59;
-@define-color green_3 #bcdf59;
-@define-color green_4 #bcdf59;
-@define-color green_5 #bcdf59;
-@define-color yellow_1 #ffca58;
-@define-color yellow_2 #ffca58;
-@define-color yellow_3 #ffca58;
-@define-color yellow_4 #ffca58;
-@define-color yellow_5 #ffca58;
-@define-color orange_1 #fc9d6f;
-@define-color orange_2 #fc9d6f;
-@define-color orange_3 #fc9d6f;
-@define-color orange_4 #fc9d6f;
-@define-color orange_5 #fc9d6f;
+
+
 @define-color red_1 #ff7272;
-@define-color red_2 #ff7272;
-@define-color red_3 #ff7272;
-@define-color red_4 #ff7272;
-@define-color red_5 #ff7272;
+@define-color green_1 #bcdf59;
+@define-color yellow_1 #ffca58;
+@define-color blue_1 #49cae4;
 @define-color purple_1 #a093e2;
-@define-color purple_2 #a093e2;
-@define-color purple_3 #a093e2;
-@define-color purple_4 #a093e2;
-@define-color purple_5 #a093e2;
-@define-color brown_1 #ff8787;
-@define-color brown_2 #ff8787;
-@define-color brown_3 #ff8787;
-@define-color brown_4 #ff8787;
-@define-color brown_5 #ff8787;
-@define-color light_1 #fcfcfc;
-@define-color light_2 #fcfcfc;
-@define-color light_3 #fcfcfc;
-@define-color light_4 #fcfcfc;
-@define-color light_5 #fcfcfc;
-@define-color dark_1 #fcfcfc;
-@define-color dark_2 #fcfcfc;
-@define-color dark_3 #fcfcfc;
-@define-color dark_4 #fcfcfc;
-@define-color dark_5 #fcfcfc;
+@define-color teal_1 #aee8f4;
+@define-color orange_1 #fc9d6f;
+@define-color gray_1 #676567;
+
diff --git a/build/base16-3024.css b/build/base16-3024.css
index bf0b366..9db53c3 100644
--- a/build/base16-3024.css
+++ b/build/base16-3024.css
@@ -1,88 +1,37 @@
 @define-color accent_color #01a0e4;
 @define-color accent_bg_color #01a0e4;
 @define-color accent_fg_color #090300;
-@define-color destructive_color #db2d20;
-@define-color destructive_bg_color #db2d20;
-@define-color destructive_fg_color #090300;
-@define-color success_color #01a252;
-@define-color success_bg_color #01a252;
-@define-color success_fg_color #090300;
-@define-color warning_color #a16a94;
-@define-color warning_bg_color #a16a94;
-@define-color warning_fg_color #090300;
-@define-color error_color #db2d20;
-@define-color error_bg_color #db2d20;
-@define-color error_fg_color #090300;
+
 @define-color window_bg_color #090300;
 @define-color window_fg_color #a5a2a2;
+
 @define-color view_bg_color #090300;
 @define-color view_fg_color #a5a2a2;
-@define-color headerbar_bg_color #3a3432;
+
+@define-color headerbar_bg_color #090300;
 @define-color headerbar_fg_color #a5a2a2;
-@define-color headerbar_border_color rgba(0.22745098, 0.20392157, 0.19607843, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #090300;
+@define-color dialog_fg_color #a5a2a2;
+
+@define-color popover_bg_color #090300;
+@define-color popover_fg_color #a5a2a2;
+
+
 @define-color sidebar_bg_color #3a3432;
 @define-color sidebar_fg_color #a5a2a2;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #3a3432;
 @define-color card_fg_color #a5a2a2;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #3a3432;
-@define-color dialog_fg_color #a5a2a2;
-@define-color popover_bg_color #3a3432;
-@define-color popover_fg_color #a5a2a2;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #4a4543;
-@define-color blue_1 #01a0e4;
-@define-color blue_2 #01a0e4;
-@define-color blue_3 #01a0e4;
-@define-color blue_4 #01a0e4;
-@define-color blue_5 #01a0e4;
-@define-color green_1 #01a252;
-@define-color green_2 #01a252;
-@define-color green_3 #01a252;
-@define-color green_4 #01a252;
-@define-color green_5 #01a252;
-@define-color yellow_1 #fded02;
-@define-color yellow_2 #fded02;
-@define-color yellow_3 #fded02;
-@define-color yellow_4 #fded02;
-@define-color yellow_5 #fded02;
-@define-color orange_1 #e8bbd0;
-@define-color orange_2 #e8bbd0;
-@define-color orange_3 #e8bbd0;
-@define-color orange_4 #e8bbd0;
-@define-color orange_5 #e8bbd0;
+
+
 @define-color red_1 #db2d20;
-@define-color red_2 #db2d20;
-@define-color red_3 #db2d20;
-@define-color red_4 #db2d20;
-@define-color red_5 #db2d20;
+@define-color green_1 #01a252;
+@define-color yellow_1 #fded02;
+@define-color blue_1 #01a0e4;
 @define-color purple_1 #a16a94;
-@define-color purple_2 #a16a94;
-@define-color purple_3 #a16a94;
-@define-color purple_4 #a16a94;
-@define-color purple_5 #a16a94;
-@define-color brown_1 #cdab53;
-@define-color brown_2 #cdab53;
-@define-color brown_3 #cdab53;
-@define-color brown_4 #cdab53;
-@define-color brown_5 #cdab53;
-@define-color light_1 #a5a2a2;
-@define-color light_2 #a5a2a2;
-@define-color light_3 #a5a2a2;
-@define-color light_4 #a5a2a2;
-@define-color light_5 #a5a2a2;
-@define-color dark_1 #a5a2a2;
-@define-color dark_2 #a5a2a2;
-@define-color dark_3 #a5a2a2;
-@define-color dark_4 #a5a2a2;
-@define-color dark_5 #a5a2a2;
+@define-color teal_1 #b5e4f4;
+@define-color orange_1 #e8bbd0;
+@define-color gray_1 #5c5855;
+
diff --git a/build/base16-apathy.css b/build/base16-apathy.css
index 4d904da..1f9e070 100644
--- a/build/base16-apathy.css
+++ b/build/base16-apathy.css
@@ -1,88 +1,37 @@
 @define-color accent_color #96883e;
 @define-color accent_bg_color #96883e;
 @define-color accent_fg_color #031a16;
-@define-color destructive_color #3e9688;
-@define-color destructive_bg_color #3e9688;
-@define-color destructive_fg_color #031a16;
-@define-color success_color #883e96;
-@define-color success_bg_color #883e96;
-@define-color success_fg_color #031a16;
-@define-color warning_color #4c963e;
-@define-color warning_bg_color #4c963e;
-@define-color warning_fg_color #031a16;
-@define-color error_color #3e9688;
-@define-color error_bg_color #3e9688;
-@define-color error_fg_color #031a16;
+
 @define-color window_bg_color #031a16;
 @define-color window_fg_color #81b5ac;
+
 @define-color view_bg_color #031a16;
 @define-color view_fg_color #81b5ac;
-@define-color headerbar_bg_color #0b342d;
+
+@define-color headerbar_bg_color #031a16;
 @define-color headerbar_fg_color #81b5ac;
-@define-color headerbar_border_color rgba(0.04313725, 0.20392157, 0.17647059, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #031a16;
+@define-color dialog_fg_color #81b5ac;
+
+@define-color popover_bg_color #031a16;
+@define-color popover_fg_color #81b5ac;
+
+
 @define-color sidebar_bg_color #0b342d;
 @define-color sidebar_fg_color #81b5ac;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #0b342d;
 @define-color card_fg_color #81b5ac;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #0b342d;
-@define-color dialog_fg_color #81b5ac;
-@define-color popover_bg_color #0b342d;
-@define-color popover_fg_color #81b5ac;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #184e45;
-@define-color blue_1 #96883e;
-@define-color blue_2 #96883e;
-@define-color blue_3 #96883e;
-@define-color blue_4 #96883e;
-@define-color blue_5 #96883e;
-@define-color green_1 #883e96;
-@define-color green_2 #883e96;
-@define-color green_3 #883e96;
-@define-color green_4 #883e96;
-@define-color green_5 #883e96;
-@define-color yellow_1 #3e4c96;
-@define-color yellow_2 #3e4c96;
-@define-color yellow_3 #3e4c96;
-@define-color yellow_4 #3e4c96;
-@define-color yellow_5 #3e4c96;
-@define-color orange_1 #3e7996;
-@define-color orange_2 #3e7996;
-@define-color orange_3 #3e7996;
-@define-color orange_4 #3e7996;
-@define-color orange_5 #3e7996;
+
+
 @define-color red_1 #3e9688;
-@define-color red_2 #3e9688;
-@define-color red_3 #3e9688;
-@define-color red_4 #3e9688;
-@define-color red_5 #3e9688;
+@define-color green_1 #883e96;
+@define-color yellow_1 #3e4c96;
+@define-color blue_1 #96883e;
 @define-color purple_1 #4c963e;
-@define-color purple_2 #4c963e;
-@define-color purple_3 #4c963e;
-@define-color purple_4 #4c963e;
-@define-color purple_5 #4c963e;
-@define-color brown_1 #3e965b;
-@define-color brown_2 #3e965b;
-@define-color brown_3 #3e965b;
-@define-color brown_4 #3e965b;
-@define-color brown_5 #3e965b;
-@define-color light_1 #81b5ac;
-@define-color light_2 #81b5ac;
-@define-color light_3 #81b5ac;
-@define-color light_4 #81b5ac;
-@define-color light_5 #81b5ac;
-@define-color dark_1 #81b5ac;
-@define-color dark_2 #81b5ac;
-@define-color dark_3 #81b5ac;
-@define-color dark_4 #81b5ac;
-@define-color dark_5 #81b5ac;
+@define-color teal_1 #963e4c;
+@define-color orange_1 #3e7996;
+@define-color gray_1 #2b685e;
+
diff --git a/build/base16-apprentice.css b/build/base16-apprentice.css
index ce0c327..526a2d7 100644
--- a/build/base16-apprentice.css
+++ b/build/base16-apprentice.css
@@ -1,88 +1,37 @@
 @define-color accent_color #5f87af;
 @define-color accent_bg_color #5f87af;
 @define-color accent_fg_color #262626;
-@define-color destructive_color #af5f5f;
-@define-color destructive_bg_color #af5f5f;
-@define-color destructive_fg_color #262626;
-@define-color success_color #5f875f;
-@define-color success_bg_color #5f875f;
-@define-color success_fg_color #262626;
-@define-color warning_color #5f5f87;
-@define-color warning_bg_color #5f5f87;
-@define-color warning_fg_color #262626;
-@define-color error_color #af5f5f;
-@define-color error_bg_color #af5f5f;
-@define-color error_fg_color #262626;
+
 @define-color window_bg_color #262626;
 @define-color window_fg_color #bcbcbc;
+
 @define-color view_bg_color #262626;
 @define-color view_fg_color #bcbcbc;
-@define-color headerbar_bg_color #303030;
+
+@define-color headerbar_bg_color #262626;
 @define-color headerbar_fg_color #bcbcbc;
-@define-color headerbar_border_color rgba(0.18823529, 0.18823529, 0.18823529, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #262626;
+@define-color dialog_fg_color #bcbcbc;
+
+@define-color popover_bg_color #262626;
+@define-color popover_fg_color #bcbcbc;
+
+
 @define-color sidebar_bg_color #303030;
 @define-color sidebar_fg_color #bcbcbc;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #303030;
 @define-color card_fg_color #bcbcbc;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #303030;
-@define-color dialog_fg_color #bcbcbc;
-@define-color popover_bg_color #303030;
-@define-color popover_fg_color #bcbcbc;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #3a3a3a;
-@define-color blue_1 #5f87af;
-@define-color blue_2 #5f87af;
-@define-color blue_3 #5f87af;
-@define-color blue_4 #5f87af;
-@define-color blue_5 #5f87af;
-@define-color green_1 #5f875f;
-@define-color green_2 #5f875f;
-@define-color green_3 #5f875f;
-@define-color green_4 #5f875f;
-@define-color green_5 #5f875f;
-@define-color yellow_1 #87875f;
-@define-color yellow_2 #87875f;
-@define-color yellow_3 #87875f;
-@define-color yellow_4 #87875f;
-@define-color yellow_5 #87875f;
-@define-color orange_1 #ff8700;
-@define-color orange_2 #ff8700;
-@define-color orange_3 #ff8700;
-@define-color orange_4 #ff8700;
-@define-color orange_5 #ff8700;
+
+
 @define-color red_1 #af5f5f;
-@define-color red_2 #af5f5f;
-@define-color red_3 #af5f5f;
-@define-color red_4 #af5f5f;
-@define-color red_5 #af5f5f;
+@define-color green_1 #5f875f;
+@define-color yellow_1 #87875f;
+@define-color blue_1 #5f87af;
 @define-color purple_1 #5f5f87;
-@define-color purple_2 #5f5f87;
-@define-color purple_3 #5f5f87;
-@define-color purple_4 #5f5f87;
-@define-color purple_5 #5f5f87;
-@define-color brown_1 #af5f5f;
-@define-color brown_2 #af5f5f;
-@define-color brown_3 #af5f5f;
-@define-color brown_4 #af5f5f;
-@define-color brown_5 #af5f5f;
-@define-color light_1 #bcbcbc;
-@define-color light_2 #bcbcbc;
-@define-color light_3 #bcbcbc;
-@define-color light_4 #bcbcbc;
-@define-color light_5 #bcbcbc;
-@define-color dark_1 #bcbcbc;
-@define-color dark_2 #bcbcbc;
-@define-color dark_3 #bcbcbc;
-@define-color dark_4 #bcbcbc;
-@define-color dark_5 #bcbcbc;
+@define-color teal_1 #5f8787;
+@define-color orange_1 #ff8700;
+@define-color gray_1 #444444;
+
diff --git a/build/base16-arroz-con-dulce-dark.css b/build/base16-arroz-con-dulce-dark.css
index 24d2bbe..c8ef235 100644
--- a/build/base16-arroz-con-dulce-dark.css
+++ b/build/base16-arroz-con-dulce-dark.css
@@ -1,88 +1,37 @@
 @define-color accent_color #b99ac8;
 @define-color accent_bg_color #b99ac8;
 @define-color accent_fg_color #21140f;
-@define-color destructive_color #e07a8a;
-@define-color destructive_bg_color #e07a8a;
-@define-color destructive_fg_color #21140f;
-@define-color success_color #d47a50;
-@define-color success_bg_color #d47a50;
-@define-color success_fg_color #21140f;
-@define-color warning_color #d58ab4;
-@define-color warning_bg_color #d58ab4;
-@define-color warning_fg_color #21140f;
-@define-color error_color #e07a8a;
-@define-color error_bg_color #e07a8a;
-@define-color error_fg_color #21140f;
+
 @define-color window_bg_color #21140f;
 @define-color window_fg_color #f2dfc0;
+
 @define-color view_bg_color #21140f;
 @define-color view_fg_color #f2dfc0;
-@define-color headerbar_bg_color #2c1a13;
+
+@define-color headerbar_bg_color #21140f;
 @define-color headerbar_fg_color #f2dfc0;
-@define-color headerbar_border_color rgba(0.17254902, 0.10196078, 0.07450980, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #21140f;
+@define-color dialog_fg_color #f2dfc0;
+
+@define-color popover_bg_color #21140f;
+@define-color popover_fg_color #f2dfc0;
+
+
 @define-color sidebar_bg_color #2c1a13;
 @define-color sidebar_fg_color #f2dfc0;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #2c1a13;
 @define-color card_fg_color #f2dfc0;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #2c1a13;
-@define-color dialog_fg_color #f2dfc0;
-@define-color popover_bg_color #2c1a13;
-@define-color popover_fg_color #f2dfc0;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #3b241a;
-@define-color blue_1 #b99ac8;
-@define-color blue_2 #b99ac8;
-@define-color blue_3 #b99ac8;
-@define-color blue_4 #b99ac8;
-@define-color blue_5 #b99ac8;
-@define-color green_1 #d47a50;
-@define-color green_2 #d47a50;
-@define-color green_3 #d47a50;
-@define-color green_4 #d47a50;
-@define-color green_5 #d47a50;
-@define-color yellow_1 #d9a441;
-@define-color yellow_2 #d9a441;
-@define-color yellow_3 #d9a441;
-@define-color yellow_4 #d9a441;
-@define-color yellow_5 #d9a441;
-@define-color orange_1 #e68a4a;
-@define-color orange_2 #e68a4a;
-@define-color orange_3 #e68a4a;
-@define-color orange_4 #e68a4a;
-@define-color orange_5 #e68a4a;
+
+
 @define-color red_1 #e07a8a;
-@define-color red_2 #e07a8a;
-@define-color red_3 #e07a8a;
-@define-color red_4 #e07a8a;
-@define-color red_5 #e07a8a;
+@define-color green_1 #d47a50;
+@define-color yellow_1 #d9a441;
+@define-color blue_1 #b99ac8;
 @define-color purple_1 #d58ab4;
-@define-color purple_2 #d58ab4;
-@define-color purple_3 #d58ab4;
-@define-color purple_4 #d58ab4;
-@define-color purple_5 #d58ab4;
-@define-color brown_1 #b97755;
-@define-color brown_2 #b97755;
-@define-color brown_3 #b97755;
-@define-color brown_4 #b97755;
-@define-color brown_5 #b97755;
-@define-color light_1 #f2dfc0;
-@define-color light_2 #f2dfc0;
-@define-color light_3 #f2dfc0;
-@define-color light_4 #f2dfc0;
-@define-color light_5 #f2dfc0;
-@define-color dark_1 #f2dfc0;
-@define-color dark_2 #f2dfc0;
-@define-color dark_3 #f2dfc0;
-@define-color dark_4 #f2dfc0;
-@define-color dark_5 #f2dfc0;
+@define-color teal_1 #d98276;
+@define-color orange_1 #e68a4a;
+@define-color gray_1 #a98568;
+
diff --git a/build/base16-arroz-con-dulce.css b/build/base16-arroz-con-dulce.css
index 48b3ccd..d94103a 100644
--- a/build/base16-arroz-con-dulce.css
+++ b/build/base16-arroz-con-dulce.css
@@ -1,88 +1,37 @@
 @define-color accent_color #5940a0;
 @define-color accent_bg_color #5940a0;
 @define-color accent_fg_color #fff8e7;
-@define-color destructive_color #a11d48;
-@define-color destructive_bg_color #a11d48;
-@define-color destructive_fg_color #fff8e7;
-@define-color success_color #a2380c;
-@define-color success_bg_color #a2380c;
-@define-color success_fg_color #fff8e7;
-@define-color warning_color #8c1f68;
-@define-color warning_bg_color #8c1f68;
-@define-color warning_fg_color #fff8e7;
-@define-color error_color #a11d48;
-@define-color error_bg_color #a11d48;
-@define-color error_fg_color #fff8e7;
+
 @define-color window_bg_color #fff8e7;
 @define-color window_fg_color #4a2c20;
+
 @define-color view_bg_color #fff8e7;
 @define-color view_fg_color #4a2c20;
-@define-color headerbar_bg_color #f7ebd3;
+
+@define-color headerbar_bg_color #fff8e7;
 @define-color headerbar_fg_color #4a2c20;
-@define-color headerbar_border_color rgba(0.96862745, 0.92156863, 0.82745098, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #fff8e7;
+@define-color dialog_fg_color #4a2c20;
+
+@define-color popover_bg_color #fff8e7;
+@define-color popover_fg_color #4a2c20;
+
+
 @define-color sidebar_bg_color #f7ebd3;
 @define-color sidebar_fg_color #4a2c20;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #f7ebd3;
 @define-color card_fg_color #4a2c20;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #f7ebd3;
-@define-color dialog_fg_color #4a2c20;
-@define-color popover_bg_color #f7ebd3;
-@define-color popover_fg_color #4a2c20;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #ead6b8;
-@define-color blue_1 #5940a0;
-@define-color blue_2 #5940a0;
-@define-color blue_3 #5940a0;
-@define-color blue_4 #5940a0;
-@define-color blue_5 #5940a0;
-@define-color green_1 #a2380c;
-@define-color green_2 #a2380c;
-@define-color green_3 #a2380c;
-@define-color green_4 #a2380c;
-@define-color green_5 #a2380c;
-@define-color yellow_1 #855500;
-@define-color yellow_2 #855500;
-@define-color yellow_3 #855500;
-@define-color yellow_4 #855500;
-@define-color yellow_5 #855500;
-@define-color orange_1 #a3470a;
-@define-color orange_2 #a3470a;
-@define-color orange_3 #a3470a;
-@define-color orange_4 #a3470a;
-@define-color orange_5 #a3470a;
+
+
 @define-color red_1 #a11d48;
-@define-color red_2 #a11d48;
-@define-color red_3 #a11d48;
-@define-color red_4 #a11d48;
-@define-color red_5 #a11d48;
+@define-color green_1 #a2380c;
+@define-color yellow_1 #855500;
+@define-color blue_1 #5940a0;
 @define-color purple_1 #8c1f68;
-@define-color purple_2 #8c1f68;
-@define-color purple_3 #8c1f68;
-@define-color purple_4 #8c1f68;
-@define-color purple_5 #8c1f68;
-@define-color brown_1 #653221;
-@define-color brown_2 #653221;
-@define-color brown_3 #653221;
-@define-color brown_4 #653221;
-@define-color brown_5 #653221;
-@define-color light_1 #4a2c20;
-@define-color light_2 #4a2c20;
-@define-color light_3 #4a2c20;
-@define-color light_4 #4a2c20;
-@define-color light_5 #4a2c20;
-@define-color dark_1 #4a2c20;
-@define-color dark_2 #4a2c20;
-@define-color dark_3 #4a2c20;
-@define-color dark_4 #4a2c20;
-@define-color dark_5 #4a2c20;
+@define-color teal_1 #98263e;
+@define-color orange_1 #a3470a;
+@define-color gray_1 #c8a77a;
+
diff --git a/build/base16-ascendancy.css b/build/base16-ascendancy.css
index 5a907bf..6718b8a 100644
--- a/build/base16-ascendancy.css
+++ b/build/base16-ascendancy.css
@@ -1,88 +1,37 @@
 @define-color accent_color #458588;
 @define-color accent_bg_color #458588;
 @define-color accent_fg_color #282828;
-@define-color destructive_color #d05000;
-@define-color destructive_bg_color #d05000;
-@define-color destructive_fg_color #282828;
-@define-color success_color #b8bb26;
-@define-color success_bg_color #b8bb26;
-@define-color success_fg_color #282828;
-@define-color warning_color #fabd2f;
-@define-color warning_bg_color #fabd2f;
-@define-color warning_fg_color #282828;
-@define-color error_color #d05000;
-@define-color error_bg_color #d05000;
-@define-color error_fg_color #282828;
+
 @define-color window_bg_color #282828;
 @define-color window_fg_color #d5c7a1;
+
 @define-color view_bg_color #282828;
 @define-color view_fg_color #d5c7a1;
-@define-color headerbar_bg_color #212f3d;
+
+@define-color headerbar_bg_color #282828;
 @define-color headerbar_fg_color #d5c7a1;
-@define-color headerbar_border_color rgba(0.12941176, 0.18431373, 0.23921569, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #282828;
+@define-color dialog_fg_color #d5c7a1;
+
+@define-color popover_bg_color #282828;
+@define-color popover_fg_color #d5c7a1;
+
+
 @define-color sidebar_bg_color #212f3d;
 @define-color sidebar_fg_color #d5c7a1;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #212f3d;
 @define-color card_fg_color #d5c7a1;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #212f3d;
-@define-color dialog_fg_color #d5c7a1;
-@define-color popover_bg_color #212f3d;
-@define-color popover_fg_color #d5c7a1;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #504945;
-@define-color blue_1 #458588;
-@define-color blue_2 #458588;
-@define-color blue_3 #458588;
-@define-color blue_4 #458588;
-@define-color blue_5 #458588;
-@define-color green_1 #b8bb26;
-@define-color green_2 #b8bb26;
-@define-color green_3 #b8bb26;
-@define-color green_4 #b8bb26;
-@define-color green_5 #b8bb26;
-@define-color yellow_1 #ffcc1b;
-@define-color yellow_2 #ffcc1b;
-@define-color yellow_3 #ffcc1b;
-@define-color yellow_4 #ffcc1b;
-@define-color yellow_5 #ffcc1b;
-@define-color orange_1 #fe8019;
-@define-color orange_2 #fe8019;
-@define-color orange_3 #fe8019;
-@define-color orange_4 #fe8019;
-@define-color orange_5 #fe8019;
+
+
 @define-color red_1 #d05000;
-@define-color red_2 #d05000;
-@define-color red_3 #d05000;
-@define-color red_4 #d05000;
-@define-color red_5 #d05000;
+@define-color green_1 #b8bb26;
+@define-color yellow_1 #ffcc1b;
+@define-color blue_1 #458588;
 @define-color purple_1 #fabd2f;
-@define-color purple_2 #fabd2f;
-@define-color purple_3 #fabd2f;
-@define-color purple_4 #fabd2f;
-@define-color purple_5 #fabd2f;
-@define-color brown_1 #b59b4d;
-@define-color brown_2 #b59b4d;
-@define-color brown_3 #b59b4d;
-@define-color brown_4 #b59b4d;
-@define-color brown_5 #b59b4d;
-@define-color light_1 #d5c7a1;
-@define-color light_2 #d5c7a1;
-@define-color light_3 #d5c7a1;
-@define-color light_4 #d5c7a1;
-@define-color light_5 #d5c7a1;
-@define-color dark_1 #d5c7a1;
-@define-color dark_2 #d5c7a1;
-@define-color dark_3 #d5c7a1;
-@define-color dark_4 #d5c7a1;
-@define-color dark_5 #d5c7a1;
+@define-color teal_1 #8f3f71;
+@define-color orange_1 #fe8019;
+@define-color gray_1 #928374;
+
diff --git a/build/base16-ashes.css b/build/base16-ashes.css
index 8426066..4db713a 100644
--- a/build/base16-ashes.css
+++ b/build/base16-ashes.css
@@ -1,88 +1,37 @@
 @define-color accent_color #ae95c7;
 @define-color accent_bg_color #ae95c7;
 @define-color accent_fg_color #1c2023;
-@define-color destructive_color #c7ae95;
-@define-color destructive_bg_color #c7ae95;
-@define-color destructive_fg_color #1c2023;
-@define-color success_color #95c7ae;
-@define-color success_bg_color #95c7ae;
-@define-color success_fg_color #1c2023;
-@define-color warning_color #c795ae;
-@define-color warning_bg_color #c795ae;
-@define-color warning_fg_color #1c2023;
-@define-color error_color #c7ae95;
-@define-color error_bg_color #c7ae95;
-@define-color error_fg_color #1c2023;
+
 @define-color window_bg_color #1c2023;
 @define-color window_fg_color #c7ccd1;
+
 @define-color view_bg_color #1c2023;
 @define-color view_fg_color #c7ccd1;
-@define-color headerbar_bg_color #393f45;
+
+@define-color headerbar_bg_color #1c2023;
 @define-color headerbar_fg_color #c7ccd1;
-@define-color headerbar_border_color rgba(0.22352941, 0.24705882, 0.27058824, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #1c2023;
+@define-color dialog_fg_color #c7ccd1;
+
+@define-color popover_bg_color #1c2023;
+@define-color popover_fg_color #c7ccd1;
+
+
 @define-color sidebar_bg_color #393f45;
 @define-color sidebar_fg_color #c7ccd1;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #393f45;
 @define-color card_fg_color #c7ccd1;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #393f45;
-@define-color dialog_fg_color #c7ccd1;
-@define-color popover_bg_color #393f45;
-@define-color popover_fg_color #c7ccd1;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #565e65;
-@define-color blue_1 #ae95c7;
-@define-color blue_2 #ae95c7;
-@define-color blue_3 #ae95c7;
-@define-color blue_4 #ae95c7;
-@define-color blue_5 #ae95c7;
-@define-color green_1 #95c7ae;
-@define-color green_2 #95c7ae;
-@define-color green_3 #95c7ae;
-@define-color green_4 #95c7ae;
-@define-color green_5 #95c7ae;
-@define-color yellow_1 #aec795;
-@define-color yellow_2 #aec795;
-@define-color yellow_3 #aec795;
-@define-color yellow_4 #aec795;
-@define-color yellow_5 #aec795;
-@define-color orange_1 #c7c795;
-@define-color orange_2 #c7c795;
-@define-color orange_3 #c7c795;
-@define-color orange_4 #c7c795;
-@define-color orange_5 #c7c795;
+
+
 @define-color red_1 #c7ae95;
-@define-color red_2 #c7ae95;
-@define-color red_3 #c7ae95;
-@define-color red_4 #c7ae95;
-@define-color red_5 #c7ae95;
+@define-color green_1 #95c7ae;
+@define-color yellow_1 #aec795;
+@define-color blue_1 #ae95c7;
 @define-color purple_1 #c795ae;
-@define-color purple_2 #c795ae;
-@define-color purple_3 #c795ae;
-@define-color purple_4 #c795ae;
-@define-color purple_5 #c795ae;
-@define-color brown_1 #c79595;
-@define-color brown_2 #c79595;
-@define-color brown_3 #c79595;
-@define-color brown_4 #c79595;
-@define-color brown_5 #c79595;
-@define-color light_1 #c7ccd1;
-@define-color light_2 #c7ccd1;
-@define-color light_3 #c7ccd1;
-@define-color light_4 #c7ccd1;
-@define-color light_5 #c7ccd1;
-@define-color dark_1 #c7ccd1;
-@define-color dark_2 #c7ccd1;
-@define-color dark_3 #c7ccd1;
-@define-color dark_4 #c7ccd1;
-@define-color dark_5 #c7ccd1;
+@define-color teal_1 #95aec7;
+@define-color orange_1 #c7c795;
+@define-color gray_1 #747c84;
+
diff --git a/build/base16-atelier-cave-light.css b/build/base16-atelier-cave-light.css
index 02500f6..31f1f80 100644
--- a/build/base16-atelier-cave-light.css
+++ b/build/base16-atelier-cave-light.css
@@ -1,88 +1,37 @@
 @define-color accent_color #576ddb;
 @define-color accent_bg_color #576ddb;
 @define-color accent_fg_color #efecf4;
-@define-color destructive_color #be4678;
-@define-color destructive_bg_color #be4678;
-@define-color destructive_fg_color #efecf4;
-@define-color success_color #2a9292;
-@define-color success_bg_color #2a9292;
-@define-color success_fg_color #efecf4;
-@define-color warning_color #955ae7;
-@define-color warning_bg_color #955ae7;
-@define-color warning_fg_color #efecf4;
-@define-color error_color #be4678;
-@define-color error_bg_color #be4678;
-@define-color error_fg_color #efecf4;
+
 @define-color window_bg_color #efecf4;
 @define-color window_fg_color #585260;
+
 @define-color view_bg_color #efecf4;
 @define-color view_fg_color #585260;
-@define-color headerbar_bg_color #e2dfe7;
+
+@define-color headerbar_bg_color #efecf4;
 @define-color headerbar_fg_color #585260;
-@define-color headerbar_border_color rgba(0.88627451, 0.87450980, 0.90588235, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #efecf4;
+@define-color dialog_fg_color #585260;
+
+@define-color popover_bg_color #efecf4;
+@define-color popover_fg_color #585260;
+
+
 @define-color sidebar_bg_color #e2dfe7;
 @define-color sidebar_fg_color #585260;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #e2dfe7;
 @define-color card_fg_color #585260;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #e2dfe7;
-@define-color dialog_fg_color #585260;
-@define-color popover_bg_color #e2dfe7;
-@define-color popover_fg_color #585260;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #8b8792;
-@define-color blue_1 #576ddb;
-@define-color blue_2 #576ddb;
-@define-color blue_3 #576ddb;
-@define-color blue_4 #576ddb;
-@define-color blue_5 #576ddb;
-@define-color green_1 #2a9292;
-@define-color green_2 #2a9292;
-@define-color green_3 #2a9292;
-@define-color green_4 #2a9292;
-@define-color green_5 #2a9292;
-@define-color yellow_1 #a06e3b;
-@define-color yellow_2 #a06e3b;
-@define-color yellow_3 #a06e3b;
-@define-color yellow_4 #a06e3b;
-@define-color yellow_5 #a06e3b;
-@define-color orange_1 #aa573c;
-@define-color orange_2 #aa573c;
-@define-color orange_3 #aa573c;
-@define-color orange_4 #aa573c;
-@define-color orange_5 #aa573c;
+
+
 @define-color red_1 #be4678;
-@define-color red_2 #be4678;
-@define-color red_3 #be4678;
-@define-color red_4 #be4678;
-@define-color red_5 #be4678;
+@define-color green_1 #2a9292;
+@define-color yellow_1 #a06e3b;
+@define-color blue_1 #576ddb;
 @define-color purple_1 #955ae7;
-@define-color purple_2 #955ae7;
-@define-color purple_3 #955ae7;
-@define-color purple_4 #955ae7;
-@define-color purple_5 #955ae7;
-@define-color brown_1 #bf40bf;
-@define-color brown_2 #bf40bf;
-@define-color brown_3 #bf40bf;
-@define-color brown_4 #bf40bf;
-@define-color brown_5 #bf40bf;
-@define-color light_1 #585260;
-@define-color light_2 #585260;
-@define-color light_3 #585260;
-@define-color light_4 #585260;
-@define-color light_5 #585260;
-@define-color dark_1 #585260;
-@define-color dark_2 #585260;
-@define-color dark_3 #585260;
-@define-color dark_4 #585260;
-@define-color dark_5 #585260;
+@define-color teal_1 #398bc6;
+@define-color orange_1 #aa573c;
+@define-color gray_1 #7e7887;
+
diff --git a/build/base16-atelier-cave.css b/build/base16-atelier-cave.css
index 18f969d..bfeb43a 100644
--- a/build/base16-atelier-cave.css
+++ b/build/base16-atelier-cave.css
@@ -1,88 +1,37 @@
 @define-color accent_color #576ddb;
 @define-color accent_bg_color #576ddb;
 @define-color accent_fg_color #19171c;
-@define-color destructive_color #be4678;
-@define-color destructive_bg_color #be4678;
-@define-color destructive_fg_color #19171c;
-@define-color success_color #2a9292;
-@define-color success_bg_color #2a9292;
-@define-color success_fg_color #19171c;
-@define-color warning_color #955ae7;
-@define-color warning_bg_color #955ae7;
-@define-color warning_fg_color #19171c;
-@define-color error_color #be4678;
-@define-color error_bg_color #be4678;
-@define-color error_fg_color #19171c;
+
 @define-color window_bg_color #19171c;
 @define-color window_fg_color #8b8792;
+
 @define-color view_bg_color #19171c;
 @define-color view_fg_color #8b8792;
-@define-color headerbar_bg_color #26232a;
+
+@define-color headerbar_bg_color #19171c;
 @define-color headerbar_fg_color #8b8792;
-@define-color headerbar_border_color rgba(0.14901961, 0.13725490, 0.16470588, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #19171c;
+@define-color dialog_fg_color #8b8792;
+
+@define-color popover_bg_color #19171c;
+@define-color popover_fg_color #8b8792;
+
+
 @define-color sidebar_bg_color #26232a;
 @define-color sidebar_fg_color #8b8792;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #26232a;
 @define-color card_fg_color #8b8792;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #26232a;
-@define-color dialog_fg_color #8b8792;
-@define-color popover_bg_color #26232a;
-@define-color popover_fg_color #8b8792;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #585260;
-@define-color blue_1 #576ddb;
-@define-color blue_2 #576ddb;
-@define-color blue_3 #576ddb;
-@define-color blue_4 #576ddb;
-@define-color blue_5 #576ddb;
-@define-color green_1 #2a9292;
-@define-color green_2 #2a9292;
-@define-color green_3 #2a9292;
-@define-color green_4 #2a9292;
-@define-color green_5 #2a9292;
-@define-color yellow_1 #a06e3b;
-@define-color yellow_2 #a06e3b;
-@define-color yellow_3 #a06e3b;
-@define-color yellow_4 #a06e3b;
-@define-color yellow_5 #a06e3b;
-@define-color orange_1 #aa573c;
-@define-color orange_2 #aa573c;
-@define-color orange_3 #aa573c;
-@define-color orange_4 #aa573c;
-@define-color orange_5 #aa573c;
+
+
 @define-color red_1 #be4678;
-@define-color red_2 #be4678;
-@define-color red_3 #be4678;
-@define-color red_4 #be4678;
-@define-color red_5 #be4678;
+@define-color green_1 #2a9292;
+@define-color yellow_1 #a06e3b;
+@define-color blue_1 #576ddb;
 @define-color purple_1 #955ae7;
-@define-color purple_2 #955ae7;
-@define-color purple_3 #955ae7;
-@define-color purple_4 #955ae7;
-@define-color purple_5 #955ae7;
-@define-color brown_1 #bf40bf;
-@define-color brown_2 #bf40bf;
-@define-color brown_3 #bf40bf;
-@define-color brown_4 #bf40bf;
-@define-color brown_5 #bf40bf;
-@define-color light_1 #8b8792;
-@define-color light_2 #8b8792;
-@define-color light_3 #8b8792;
-@define-color light_4 #8b8792;
-@define-color light_5 #8b8792;
-@define-color dark_1 #8b8792;
-@define-color dark_2 #8b8792;
-@define-color dark_3 #8b8792;
-@define-color dark_4 #8b8792;
-@define-color dark_5 #8b8792;
+@define-color teal_1 #398bc6;
+@define-color orange_1 #aa573c;
+@define-color gray_1 #655f6d;
+
diff --git a/build/base16-atelier-dune-light.css b/build/base16-atelier-dune-light.css
index 54e4592..52e3220 100644
--- a/build/base16-atelier-dune-light.css
+++ b/build/base16-atelier-dune-light.css
@@ -1,88 +1,37 @@
 @define-color accent_color #6684e1;
 @define-color accent_bg_color #6684e1;
 @define-color accent_fg_color #fefbec;
-@define-color destructive_color #d73737;
-@define-color destructive_bg_color #d73737;
-@define-color destructive_fg_color #fefbec;
-@define-color success_color #60ac39;
-@define-color success_bg_color #60ac39;
-@define-color success_fg_color #fefbec;
-@define-color warning_color #b854d4;
-@define-color warning_bg_color #b854d4;
-@define-color warning_fg_color #fefbec;
-@define-color error_color #d73737;
-@define-color error_bg_color #d73737;
-@define-color error_fg_color #fefbec;
+
 @define-color window_bg_color #fefbec;
 @define-color window_fg_color #6e6b5e;
+
 @define-color view_bg_color #fefbec;
 @define-color view_fg_color #6e6b5e;
-@define-color headerbar_bg_color #e8e4cf;
+
+@define-color headerbar_bg_color #fefbec;
 @define-color headerbar_fg_color #6e6b5e;
-@define-color headerbar_border_color rgba(0.90980392, 0.89411765, 0.81176471, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #fefbec;
+@define-color dialog_fg_color #6e6b5e;
+
+@define-color popover_bg_color #fefbec;
+@define-color popover_fg_color #6e6b5e;
+
+
 @define-color sidebar_bg_color #e8e4cf;
 @define-color sidebar_fg_color #6e6b5e;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #e8e4cf;
 @define-color card_fg_color #6e6b5e;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #e8e4cf;
-@define-color dialog_fg_color #6e6b5e;
-@define-color popover_bg_color #e8e4cf;
-@define-color popover_fg_color #6e6b5e;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #a6a28c;
-@define-color blue_1 #6684e1;
-@define-color blue_2 #6684e1;
-@define-color blue_3 #6684e1;
-@define-color blue_4 #6684e1;
-@define-color blue_5 #6684e1;
-@define-color green_1 #60ac39;
-@define-color green_2 #60ac39;
-@define-color green_3 #60ac39;
-@define-color green_4 #60ac39;
-@define-color green_5 #60ac39;
-@define-color yellow_1 #ae9513;
-@define-color yellow_2 #ae9513;
-@define-color yellow_3 #ae9513;
-@define-color yellow_4 #ae9513;
-@define-color yellow_5 #ae9513;
-@define-color orange_1 #b65611;
-@define-color orange_2 #b65611;
-@define-color orange_3 #b65611;
-@define-color orange_4 #b65611;
-@define-color orange_5 #b65611;
+
+
 @define-color red_1 #d73737;
-@define-color red_2 #d73737;
-@define-color red_3 #d73737;
-@define-color red_4 #d73737;
-@define-color red_5 #d73737;
+@define-color green_1 #60ac39;
+@define-color yellow_1 #ae9513;
+@define-color blue_1 #6684e1;
 @define-color purple_1 #b854d4;
-@define-color purple_2 #b854d4;
-@define-color purple_3 #b854d4;
-@define-color purple_4 #b854d4;
-@define-color purple_5 #b854d4;
-@define-color brown_1 #d43552;
-@define-color brown_2 #d43552;
-@define-color brown_3 #d43552;
-@define-color brown_4 #d43552;
-@define-color brown_5 #d43552;
-@define-color light_1 #6e6b5e;
-@define-color light_2 #6e6b5e;
-@define-color light_3 #6e6b5e;
-@define-color light_4 #6e6b5e;
-@define-color light_5 #6e6b5e;
-@define-color dark_1 #6e6b5e;
-@define-color dark_2 #6e6b5e;
-@define-color dark_3 #6e6b5e;
-@define-color dark_4 #6e6b5e;
-@define-color dark_5 #6e6b5e;
+@define-color teal_1 #1fad83;
+@define-color orange_1 #b65611;
+@define-color gray_1 #999580;
+
diff --git a/build/base16-atelier-dune.css b/build/base16-atelier-dune.css
index fd5f79c..51d2bc6 100644
--- a/build/base16-atelier-dune.css
+++ b/build/base16-atelier-dune.css
@@ -1,88 +1,37 @@
 @define-color accent_color #6684e1;
 @define-color accent_bg_color #6684e1;
 @define-color accent_fg_color #20201d;
-@define-color destructive_color #d73737;
-@define-color destructive_bg_color #d73737;
-@define-color destructive_fg_color #20201d;
-@define-color success_color #60ac39;
-@define-color success_bg_color #60ac39;
-@define-color success_fg_color #20201d;
-@define-color warning_color #b854d4;
-@define-color warning_bg_color #b854d4;
-@define-color warning_fg_color #20201d;
-@define-color error_color #d73737;
-@define-color error_bg_color #d73737;
-@define-color error_fg_color #20201d;
+
 @define-color window_bg_color #20201d;
 @define-color window_fg_color #a6a28c;
+
 @define-color view_bg_color #20201d;
 @define-color view_fg_color #a6a28c;
-@define-color headerbar_bg_color #292824;
+
+@define-color headerbar_bg_color #20201d;
 @define-color headerbar_fg_color #a6a28c;
-@define-color headerbar_border_color rgba(0.16078431, 0.15686275, 0.14117647, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #20201d;
+@define-color dialog_fg_color #a6a28c;
+
+@define-color popover_bg_color #20201d;
+@define-color popover_fg_color #a6a28c;
+
+
 @define-color sidebar_bg_color #292824;
 @define-color sidebar_fg_color #a6a28c;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #292824;
 @define-color card_fg_color #a6a28c;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #292824;
-@define-color dialog_fg_color #a6a28c;
-@define-color popover_bg_color #292824;
-@define-color popover_fg_color #a6a28c;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #6e6b5e;
-@define-color blue_1 #6684e1;
-@define-color blue_2 #6684e1;
-@define-color blue_3 #6684e1;
-@define-color blue_4 #6684e1;
-@define-color blue_5 #6684e1;
-@define-color green_1 #60ac39;
-@define-color green_2 #60ac39;
-@define-color green_3 #60ac39;
-@define-color green_4 #60ac39;
-@define-color green_5 #60ac39;
-@define-color yellow_1 #ae9513;
-@define-color yellow_2 #ae9513;
-@define-color yellow_3 #ae9513;
-@define-color yellow_4 #ae9513;
-@define-color yellow_5 #ae9513;
-@define-color orange_1 #b65611;
-@define-color orange_2 #b65611;
-@define-color orange_3 #b65611;
-@define-color orange_4 #b65611;
-@define-color orange_5 #b65611;
+
+
 @define-color red_1 #d73737;
-@define-color red_2 #d73737;
-@define-color red_3 #d73737;
-@define-color red_4 #d73737;
-@define-color red_5 #d73737;
+@define-color green_1 #60ac39;
+@define-color yellow_1 #ae9513;
+@define-color blue_1 #6684e1;
 @define-color purple_1 #b854d4;
-@define-color purple_2 #b854d4;
-@define-color purple_3 #b854d4;
-@define-color purple_4 #b854d4;
-@define-color purple_5 #b854d4;
-@define-color brown_1 #d43552;
-@define-color brown_2 #d43552;
-@define-color brown_3 #d43552;
-@define-color brown_4 #d43552;
-@define-color brown_5 #d43552;
-@define-color light_1 #a6a28c;
-@define-color light_2 #a6a28c;
-@define-color light_3 #a6a28c;
-@define-color light_4 #a6a28c;
-@define-color light_5 #a6a28c;
-@define-color dark_1 #a6a28c;
-@define-color dark_2 #a6a28c;
-@define-color dark_3 #a6a28c;
-@define-color dark_4 #a6a28c;
-@define-color dark_5 #a6a28c;
+@define-color teal_1 #1fad83;
+@define-color orange_1 #b65611;
+@define-color gray_1 #7d7a68;
+
diff --git a/build/base16-atelier-estuary-light.css b/build/base16-atelier-estuary-light.css
index 0d0272e..1065449 100644
--- a/build/base16-atelier-estuary-light.css
+++ b/build/base16-atelier-estuary-light.css
@@ -1,88 +1,37 @@
 @define-color accent_color #36a166;
 @define-color accent_bg_color #36a166;
 @define-color accent_fg_color #f4f3ec;
-@define-color destructive_color #ba6236;
-@define-color destructive_bg_color #ba6236;
-@define-color destructive_fg_color #f4f3ec;
-@define-color success_color #7d9726;
-@define-color success_bg_color #7d9726;
-@define-color success_fg_color #f4f3ec;
-@define-color warning_color #5f9182;
-@define-color warning_bg_color #5f9182;
-@define-color warning_fg_color #f4f3ec;
-@define-color error_color #ba6236;
-@define-color error_bg_color #ba6236;
-@define-color error_fg_color #f4f3ec;
+
 @define-color window_bg_color #f4f3ec;
 @define-color window_fg_color #5f5e4e;
+
 @define-color view_bg_color #f4f3ec;
 @define-color view_fg_color #5f5e4e;
-@define-color headerbar_bg_color #e7e6df;
+
+@define-color headerbar_bg_color #f4f3ec;
 @define-color headerbar_fg_color #5f5e4e;
-@define-color headerbar_border_color rgba(0.90588235, 0.90196078, 0.87450980, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #f4f3ec;
+@define-color dialog_fg_color #5f5e4e;
+
+@define-color popover_bg_color #f4f3ec;
+@define-color popover_fg_color #5f5e4e;
+
+
 @define-color sidebar_bg_color #e7e6df;
 @define-color sidebar_fg_color #5f5e4e;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #e7e6df;
 @define-color card_fg_color #5f5e4e;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #e7e6df;
-@define-color dialog_fg_color #5f5e4e;
-@define-color popover_bg_color #e7e6df;
-@define-color popover_fg_color #5f5e4e;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #929181;
-@define-color blue_1 #36a166;
-@define-color blue_2 #36a166;
-@define-color blue_3 #36a166;
-@define-color blue_4 #36a166;
-@define-color blue_5 #36a166;
-@define-color green_1 #7d9726;
-@define-color green_2 #7d9726;
-@define-color green_3 #7d9726;
-@define-color green_4 #7d9726;
-@define-color green_5 #7d9726;
-@define-color yellow_1 #a5980d;
-@define-color yellow_2 #a5980d;
-@define-color yellow_3 #a5980d;
-@define-color yellow_4 #a5980d;
-@define-color yellow_5 #a5980d;
-@define-color orange_1 #ae7313;
-@define-color orange_2 #ae7313;
-@define-color orange_3 #ae7313;
-@define-color orange_4 #ae7313;
-@define-color orange_5 #ae7313;
+
+
 @define-color red_1 #ba6236;
-@define-color red_2 #ba6236;
-@define-color red_3 #ba6236;
-@define-color red_4 #ba6236;
-@define-color red_5 #ba6236;
+@define-color green_1 #7d9726;
+@define-color yellow_1 #a5980d;
+@define-color blue_1 #36a166;
 @define-color purple_1 #5f9182;
-@define-color purple_2 #5f9182;
-@define-color purple_3 #5f9182;
-@define-color purple_4 #5f9182;
-@define-color purple_5 #5f9182;
-@define-color brown_1 #9d6c7c;
-@define-color brown_2 #9d6c7c;
-@define-color brown_3 #9d6c7c;
-@define-color brown_4 #9d6c7c;
-@define-color brown_5 #9d6c7c;
-@define-color light_1 #5f5e4e;
-@define-color light_2 #5f5e4e;
-@define-color light_3 #5f5e4e;
-@define-color light_4 #5f5e4e;
-@define-color light_5 #5f5e4e;
-@define-color dark_1 #5f5e4e;
-@define-color dark_2 #5f5e4e;
-@define-color dark_3 #5f5e4e;
-@define-color dark_4 #5f5e4e;
-@define-color dark_5 #5f5e4e;
+@define-color teal_1 #5b9d48;
+@define-color orange_1 #ae7313;
+@define-color gray_1 #878573;
+
diff --git a/build/base16-atelier-estuary.css b/build/base16-atelier-estuary.css
index 1e39b2e..b72f8be 100644
--- a/build/base16-atelier-estuary.css
+++ b/build/base16-atelier-estuary.css
@@ -1,88 +1,37 @@
 @define-color accent_color #36a166;
 @define-color accent_bg_color #36a166;
 @define-color accent_fg_color #22221b;
-@define-color destructive_color #ba6236;
-@define-color destructive_bg_color #ba6236;
-@define-color destructive_fg_color #22221b;
-@define-color success_color #7d9726;
-@define-color success_bg_color #7d9726;
-@define-color success_fg_color #22221b;
-@define-color warning_color #5f9182;
-@define-color warning_bg_color #5f9182;
-@define-color warning_fg_color #22221b;
-@define-color error_color #ba6236;
-@define-color error_bg_color #ba6236;
-@define-color error_fg_color #22221b;
+
 @define-color window_bg_color #22221b;
 @define-color window_fg_color #929181;
+
 @define-color view_bg_color #22221b;
 @define-color view_fg_color #929181;
-@define-color headerbar_bg_color #302f27;
+
+@define-color headerbar_bg_color #22221b;
 @define-color headerbar_fg_color #929181;
-@define-color headerbar_border_color rgba(0.18823529, 0.18431373, 0.15294118, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #22221b;
+@define-color dialog_fg_color #929181;
+
+@define-color popover_bg_color #22221b;
+@define-color popover_fg_color #929181;
+
+
 @define-color sidebar_bg_color #302f27;
 @define-color sidebar_fg_color #929181;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #302f27;
 @define-color card_fg_color #929181;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #302f27;
-@define-color dialog_fg_color #929181;
-@define-color popover_bg_color #302f27;
-@define-color popover_fg_color #929181;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #5f5e4e;
-@define-color blue_1 #36a166;
-@define-color blue_2 #36a166;
-@define-color blue_3 #36a166;
-@define-color blue_4 #36a166;
-@define-color blue_5 #36a166;
-@define-color green_1 #7d9726;
-@define-color green_2 #7d9726;
-@define-color green_3 #7d9726;
-@define-color green_4 #7d9726;
-@define-color green_5 #7d9726;
-@define-color yellow_1 #a5980d;
-@define-color yellow_2 #a5980d;
-@define-color yellow_3 #a5980d;
-@define-color yellow_4 #a5980d;
-@define-color yellow_5 #a5980d;
-@define-color orange_1 #ae7313;
-@define-color orange_2 #ae7313;
-@define-color orange_3 #ae7313;
-@define-color orange_4 #ae7313;
-@define-color orange_5 #ae7313;
+
+
 @define-color red_1 #ba6236;
-@define-color red_2 #ba6236;
-@define-color red_3 #ba6236;
-@define-color red_4 #ba6236;
-@define-color red_5 #ba6236;
+@define-color green_1 #7d9726;
+@define-color yellow_1 #a5980d;
+@define-color blue_1 #36a166;
 @define-color purple_1 #5f9182;
-@define-color purple_2 #5f9182;
-@define-color purple_3 #5f9182;
-@define-color purple_4 #5f9182;
-@define-color purple_5 #5f9182;
-@define-color brown_1 #9d6c7c;
-@define-color brown_2 #9d6c7c;
-@define-color brown_3 #9d6c7c;
-@define-color brown_4 #9d6c7c;
-@define-color brown_5 #9d6c7c;
-@define-color light_1 #929181;
-@define-color light_2 #929181;
-@define-color light_3 #929181;
-@define-color light_4 #929181;
-@define-color light_5 #929181;
-@define-color dark_1 #929181;
-@define-color dark_2 #929181;
-@define-color dark_3 #929181;
-@define-color dark_4 #929181;
-@define-color dark_5 #929181;
+@define-color teal_1 #5b9d48;
+@define-color orange_1 #ae7313;
+@define-color gray_1 #6c6b5a;
+
diff --git a/build/base16-atelier-forest-light.css b/build/base16-atelier-forest-light.css
index 13c566b..a64f2de 100644
--- a/build/base16-atelier-forest-light.css
+++ b/build/base16-atelier-forest-light.css
@@ -1,88 +1,37 @@
 @define-color accent_color #407ee7;
 @define-color accent_bg_color #407ee7;
 @define-color accent_fg_color #f1efee;
-@define-color destructive_color #f22c40;
-@define-color destructive_bg_color #f22c40;
-@define-color destructive_fg_color #f1efee;
-@define-color success_color #7b9726;
-@define-color success_bg_color #7b9726;
-@define-color success_fg_color #f1efee;
-@define-color warning_color #6666ea;
-@define-color warning_bg_color #6666ea;
-@define-color warning_fg_color #f1efee;
-@define-color error_color #f22c40;
-@define-color error_bg_color #f22c40;
-@define-color error_fg_color #f1efee;
+
 @define-color window_bg_color #f1efee;
 @define-color window_fg_color #68615e;
+
 @define-color view_bg_color #f1efee;
 @define-color view_fg_color #68615e;
-@define-color headerbar_bg_color #e6e2e0;
+
+@define-color headerbar_bg_color #f1efee;
 @define-color headerbar_fg_color #68615e;
-@define-color headerbar_border_color rgba(0.90196078, 0.88627451, 0.87843137, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #f1efee;
+@define-color dialog_fg_color #68615e;
+
+@define-color popover_bg_color #f1efee;
+@define-color popover_fg_color #68615e;
+
+
 @define-color sidebar_bg_color #e6e2e0;
 @define-color sidebar_fg_color #68615e;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #e6e2e0;
 @define-color card_fg_color #68615e;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #e6e2e0;
-@define-color dialog_fg_color #68615e;
-@define-color popover_bg_color #e6e2e0;
-@define-color popover_fg_color #68615e;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #a8a19f;
-@define-color blue_1 #407ee7;
-@define-color blue_2 #407ee7;
-@define-color blue_3 #407ee7;
-@define-color blue_4 #407ee7;
-@define-color blue_5 #407ee7;
-@define-color green_1 #7b9726;
-@define-color green_2 #7b9726;
-@define-color green_3 #7b9726;
-@define-color green_4 #7b9726;
-@define-color green_5 #7b9726;
-@define-color yellow_1 #c38418;
-@define-color yellow_2 #c38418;
-@define-color yellow_3 #c38418;
-@define-color yellow_4 #c38418;
-@define-color yellow_5 #c38418;
-@define-color orange_1 #df5320;
-@define-color orange_2 #df5320;
-@define-color orange_3 #df5320;
-@define-color orange_4 #df5320;
-@define-color orange_5 #df5320;
+
+
 @define-color red_1 #f22c40;
-@define-color red_2 #f22c40;
-@define-color red_3 #f22c40;
-@define-color red_4 #f22c40;
-@define-color red_5 #f22c40;
+@define-color green_1 #7b9726;
+@define-color yellow_1 #c38418;
+@define-color blue_1 #407ee7;
 @define-color purple_1 #6666ea;
-@define-color purple_2 #6666ea;
-@define-color purple_3 #6666ea;
-@define-color purple_4 #6666ea;
-@define-color purple_5 #6666ea;
-@define-color brown_1 #c33ff3;
-@define-color brown_2 #c33ff3;
-@define-color brown_3 #c33ff3;
-@define-color brown_4 #c33ff3;
-@define-color brown_5 #c33ff3;
-@define-color light_1 #68615e;
-@define-color light_2 #68615e;
-@define-color light_3 #68615e;
-@define-color light_4 #68615e;
-@define-color light_5 #68615e;
-@define-color dark_1 #68615e;
-@define-color dark_2 #68615e;
-@define-color dark_3 #68615e;
-@define-color dark_4 #68615e;
-@define-color dark_5 #68615e;
+@define-color teal_1 #3d97b8;
+@define-color orange_1 #df5320;
+@define-color gray_1 #9c9491;
+
diff --git a/build/base16-atelier-forest.css b/build/base16-atelier-forest.css
index 23709bf..ac1cd6f 100644
--- a/build/base16-atelier-forest.css
+++ b/build/base16-atelier-forest.css
@@ -1,88 +1,37 @@
 @define-color accent_color #407ee7;
 @define-color accent_bg_color #407ee7;
 @define-color accent_fg_color #1b1918;
-@define-color destructive_color #f22c40;
-@define-color destructive_bg_color #f22c40;
-@define-color destructive_fg_color #1b1918;
-@define-color success_color #7b9726;
-@define-color success_bg_color #7b9726;
-@define-color success_fg_color #1b1918;
-@define-color warning_color #6666ea;
-@define-color warning_bg_color #6666ea;
-@define-color warning_fg_color #1b1918;
-@define-color error_color #f22c40;
-@define-color error_bg_color #f22c40;
-@define-color error_fg_color #1b1918;
+
 @define-color window_bg_color #1b1918;
 @define-color window_fg_color #a8a19f;
+
 @define-color view_bg_color #1b1918;
 @define-color view_fg_color #a8a19f;
-@define-color headerbar_bg_color #2c2421;
+
+@define-color headerbar_bg_color #1b1918;
 @define-color headerbar_fg_color #a8a19f;
-@define-color headerbar_border_color rgba(0.17254902, 0.14117647, 0.12941176, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #1b1918;
+@define-color dialog_fg_color #a8a19f;
+
+@define-color popover_bg_color #1b1918;
+@define-color popover_fg_color #a8a19f;
+
+
 @define-color sidebar_bg_color #2c2421;
 @define-color sidebar_fg_color #a8a19f;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #2c2421;
 @define-color card_fg_color #a8a19f;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #2c2421;
-@define-color dialog_fg_color #a8a19f;
-@define-color popover_bg_color #2c2421;
-@define-color popover_fg_color #a8a19f;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #68615e;
-@define-color blue_1 #407ee7;
-@define-color blue_2 #407ee7;
-@define-color blue_3 #407ee7;
-@define-color blue_4 #407ee7;
-@define-color blue_5 #407ee7;
-@define-color green_1 #7b9726;
-@define-color green_2 #7b9726;
-@define-color green_3 #7b9726;
-@define-color green_4 #7b9726;
-@define-color green_5 #7b9726;
-@define-color yellow_1 #c38418;
-@define-color yellow_2 #c38418;
-@define-color yellow_3 #c38418;
-@define-color yellow_4 #c38418;
-@define-color yellow_5 #c38418;
-@define-color orange_1 #df5320;
-@define-color orange_2 #df5320;
-@define-color orange_3 #df5320;
-@define-color orange_4 #df5320;
-@define-color orange_5 #df5320;
+
+
 @define-color red_1 #f22c40;
-@define-color red_2 #f22c40;
-@define-color red_3 #f22c40;
-@define-color red_4 #f22c40;
-@define-color red_5 #f22c40;
+@define-color green_1 #7b9726;
+@define-color yellow_1 #c38418;
+@define-color blue_1 #407ee7;
 @define-color purple_1 #6666ea;
-@define-color purple_2 #6666ea;
-@define-color purple_3 #6666ea;
-@define-color purple_4 #6666ea;
-@define-color purple_5 #6666ea;
-@define-color brown_1 #c33ff3;
-@define-color brown_2 #c33ff3;
-@define-color brown_3 #c33ff3;
-@define-color brown_4 #c33ff3;
-@define-color brown_5 #c33ff3;
-@define-color light_1 #a8a19f;
-@define-color light_2 #a8a19f;
-@define-color light_3 #a8a19f;
-@define-color light_4 #a8a19f;
-@define-color light_5 #a8a19f;
-@define-color dark_1 #a8a19f;
-@define-color dark_2 #a8a19f;
-@define-color dark_3 #a8a19f;
-@define-color dark_4 #a8a19f;
-@define-color dark_5 #a8a19f;
+@define-color teal_1 #3d97b8;
+@define-color orange_1 #df5320;
+@define-color gray_1 #766e6b;
+
diff --git a/build/base16-atelier-heath-light.css b/build/base16-atelier-heath-light.css
index 8cdf988..78f0ecd 100644
--- a/build/base16-atelier-heath-light.css
+++ b/build/base16-atelier-heath-light.css
@@ -1,88 +1,37 @@
 @define-color accent_color #516aec;
 @define-color accent_bg_color #516aec;
 @define-color accent_fg_color #f7f3f7;
-@define-color destructive_color #ca402b;
-@define-color destructive_bg_color #ca402b;
-@define-color destructive_fg_color #f7f3f7;
-@define-color success_color #918b3b;
-@define-color success_bg_color #918b3b;
-@define-color success_fg_color #f7f3f7;
-@define-color warning_color #7b59c0;
-@define-color warning_bg_color #7b59c0;
-@define-color warning_fg_color #f7f3f7;
-@define-color error_color #ca402b;
-@define-color error_bg_color #ca402b;
-@define-color error_fg_color #f7f3f7;
+
 @define-color window_bg_color #f7f3f7;
 @define-color window_fg_color #695d69;
+
 @define-color view_bg_color #f7f3f7;
 @define-color view_fg_color #695d69;
-@define-color headerbar_bg_color #d8cad8;
+
+@define-color headerbar_bg_color #f7f3f7;
 @define-color headerbar_fg_color #695d69;
-@define-color headerbar_border_color rgba(0.84705882, 0.79215686, 0.84705882, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #f7f3f7;
+@define-color dialog_fg_color #695d69;
+
+@define-color popover_bg_color #f7f3f7;
+@define-color popover_fg_color #695d69;
+
+
 @define-color sidebar_bg_color #d8cad8;
 @define-color sidebar_fg_color #695d69;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #d8cad8;
 @define-color card_fg_color #695d69;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #d8cad8;
-@define-color dialog_fg_color #695d69;
-@define-color popover_bg_color #d8cad8;
-@define-color popover_fg_color #695d69;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #ab9bab;
-@define-color blue_1 #516aec;
-@define-color blue_2 #516aec;
-@define-color blue_3 #516aec;
-@define-color blue_4 #516aec;
-@define-color blue_5 #516aec;
-@define-color green_1 #918b3b;
-@define-color green_2 #918b3b;
-@define-color green_3 #918b3b;
-@define-color green_4 #918b3b;
-@define-color green_5 #918b3b;
-@define-color yellow_1 #bb8a35;
-@define-color yellow_2 #bb8a35;
-@define-color yellow_3 #bb8a35;
-@define-color yellow_4 #bb8a35;
-@define-color yellow_5 #bb8a35;
-@define-color orange_1 #a65926;
-@define-color orange_2 #a65926;
-@define-color orange_3 #a65926;
-@define-color orange_4 #a65926;
-@define-color orange_5 #a65926;
+
+
 @define-color red_1 #ca402b;
-@define-color red_2 #ca402b;
-@define-color red_3 #ca402b;
-@define-color red_4 #ca402b;
-@define-color red_5 #ca402b;
+@define-color green_1 #918b3b;
+@define-color yellow_1 #bb8a35;
+@define-color blue_1 #516aec;
 @define-color purple_1 #7b59c0;
-@define-color purple_2 #7b59c0;
-@define-color purple_3 #7b59c0;
-@define-color purple_4 #7b59c0;
-@define-color purple_5 #7b59c0;
-@define-color brown_1 #cc33cc;
-@define-color brown_2 #cc33cc;
-@define-color brown_3 #cc33cc;
-@define-color brown_4 #cc33cc;
-@define-color brown_5 #cc33cc;
-@define-color light_1 #695d69;
-@define-color light_2 #695d69;
-@define-color light_3 #695d69;
-@define-color light_4 #695d69;
-@define-color light_5 #695d69;
-@define-color dark_1 #695d69;
-@define-color dark_2 #695d69;
-@define-color dark_3 #695d69;
-@define-color dark_4 #695d69;
-@define-color dark_5 #695d69;
+@define-color teal_1 #159393;
+@define-color orange_1 #a65926;
+@define-color gray_1 #9e8f9e;
+
diff --git a/build/base16-atelier-heath.css b/build/base16-atelier-heath.css
index 450e162..c17acc6 100644
--- a/build/base16-atelier-heath.css
+++ b/build/base16-atelier-heath.css
@@ -1,88 +1,37 @@
 @define-color accent_color #516aec;
 @define-color accent_bg_color #516aec;
 @define-color accent_fg_color #1b181b;
-@define-color destructive_color #ca402b;
-@define-color destructive_bg_color #ca402b;
-@define-color destructive_fg_color #1b181b;
-@define-color success_color #918b3b;
-@define-color success_bg_color #918b3b;
-@define-color success_fg_color #1b181b;
-@define-color warning_color #7b59c0;
-@define-color warning_bg_color #7b59c0;
-@define-color warning_fg_color #1b181b;
-@define-color error_color #ca402b;
-@define-color error_bg_color #ca402b;
-@define-color error_fg_color #1b181b;
+
 @define-color window_bg_color #1b181b;
 @define-color window_fg_color #ab9bab;
+
 @define-color view_bg_color #1b181b;
 @define-color view_fg_color #ab9bab;
-@define-color headerbar_bg_color #292329;
+
+@define-color headerbar_bg_color #1b181b;
 @define-color headerbar_fg_color #ab9bab;
-@define-color headerbar_border_color rgba(0.16078431, 0.13725490, 0.16078431, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #1b181b;
+@define-color dialog_fg_color #ab9bab;
+
+@define-color popover_bg_color #1b181b;
+@define-color popover_fg_color #ab9bab;
+
+
 @define-color sidebar_bg_color #292329;
 @define-color sidebar_fg_color #ab9bab;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #292329;
 @define-color card_fg_color #ab9bab;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #292329;
-@define-color dialog_fg_color #ab9bab;
-@define-color popover_bg_color #292329;
-@define-color popover_fg_color #ab9bab;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #695d69;
-@define-color blue_1 #516aec;
-@define-color blue_2 #516aec;
-@define-color blue_3 #516aec;
-@define-color blue_4 #516aec;
-@define-color blue_5 #516aec;
-@define-color green_1 #918b3b;
-@define-color green_2 #918b3b;
-@define-color green_3 #918b3b;
-@define-color green_4 #918b3b;
-@define-color green_5 #918b3b;
-@define-color yellow_1 #bb8a35;
-@define-color yellow_2 #bb8a35;
-@define-color yellow_3 #bb8a35;
-@define-color yellow_4 #bb8a35;
-@define-color yellow_5 #bb8a35;
-@define-color orange_1 #a65926;
-@define-color orange_2 #a65926;
-@define-color orange_3 #a65926;
-@define-color orange_4 #a65926;
-@define-color orange_5 #a65926;
+
+
 @define-color red_1 #ca402b;
-@define-color red_2 #ca402b;
-@define-color red_3 #ca402b;
-@define-color red_4 #ca402b;
-@define-color red_5 #ca402b;
+@define-color green_1 #918b3b;
+@define-color yellow_1 #bb8a35;
+@define-color blue_1 #516aec;
 @define-color purple_1 #7b59c0;
-@define-color purple_2 #7b59c0;
-@define-color purple_3 #7b59c0;
-@define-color purple_4 #7b59c0;
-@define-color purple_5 #7b59c0;
-@define-color brown_1 #cc33cc;
-@define-color brown_2 #cc33cc;
-@define-color brown_3 #cc33cc;
-@define-color brown_4 #cc33cc;
-@define-color brown_5 #cc33cc;
-@define-color light_1 #ab9bab;
-@define-color light_2 #ab9bab;
-@define-color light_3 #ab9bab;
-@define-color light_4 #ab9bab;
-@define-color light_5 #ab9bab;
-@define-color dark_1 #ab9bab;
-@define-color dark_2 #ab9bab;
-@define-color dark_3 #ab9bab;
-@define-color dark_4 #ab9bab;
-@define-color dark_5 #ab9bab;
+@define-color teal_1 #159393;
+@define-color orange_1 #a65926;
+@define-color gray_1 #776977;
+
diff --git a/build/base16-atelier-lakeside-light.css b/build/base16-atelier-lakeside-light.css
index 485f72f..35a48e2 100644
--- a/build/base16-atelier-lakeside-light.css
+++ b/build/base16-atelier-lakeside-light.css
@@ -1,88 +1,37 @@
 @define-color accent_color #257fad;
 @define-color accent_bg_color #257fad;
 @define-color accent_fg_color #ebf8ff;
-@define-color destructive_color #d22d72;
-@define-color destructive_bg_color #d22d72;
-@define-color destructive_fg_color #ebf8ff;
-@define-color success_color #568c3b;
-@define-color success_bg_color #568c3b;
-@define-color success_fg_color #ebf8ff;
-@define-color warning_color #6b6bb8;
-@define-color warning_bg_color #6b6bb8;
-@define-color warning_fg_color #ebf8ff;
-@define-color error_color #d22d72;
-@define-color error_bg_color #d22d72;
-@define-color error_fg_color #ebf8ff;
+
 @define-color window_bg_color #ebf8ff;
 @define-color window_fg_color #516d7b;
+
 @define-color view_bg_color #ebf8ff;
 @define-color view_fg_color #516d7b;
-@define-color headerbar_bg_color #c1e4f6;
+
+@define-color headerbar_bg_color #ebf8ff;
 @define-color headerbar_fg_color #516d7b;
-@define-color headerbar_border_color rgba(0.75686275, 0.89411765, 0.96470588, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #ebf8ff;
+@define-color dialog_fg_color #516d7b;
+
+@define-color popover_bg_color #ebf8ff;
+@define-color popover_fg_color #516d7b;
+
+
 @define-color sidebar_bg_color #c1e4f6;
 @define-color sidebar_fg_color #516d7b;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #c1e4f6;
 @define-color card_fg_color #516d7b;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #c1e4f6;
-@define-color dialog_fg_color #516d7b;
-@define-color popover_bg_color #c1e4f6;
-@define-color popover_fg_color #516d7b;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #7ea2b4;
-@define-color blue_1 #257fad;
-@define-color blue_2 #257fad;
-@define-color blue_3 #257fad;
-@define-color blue_4 #257fad;
-@define-color blue_5 #257fad;
-@define-color green_1 #568c3b;
-@define-color green_2 #568c3b;
-@define-color green_3 #568c3b;
-@define-color green_4 #568c3b;
-@define-color green_5 #568c3b;
-@define-color yellow_1 #8a8a0f;
-@define-color yellow_2 #8a8a0f;
-@define-color yellow_3 #8a8a0f;
-@define-color yellow_4 #8a8a0f;
-@define-color yellow_5 #8a8a0f;
-@define-color orange_1 #935c25;
-@define-color orange_2 #935c25;
-@define-color orange_3 #935c25;
-@define-color orange_4 #935c25;
-@define-color orange_5 #935c25;
+
+
 @define-color red_1 #d22d72;
-@define-color red_2 #d22d72;
-@define-color red_3 #d22d72;
-@define-color red_4 #d22d72;
-@define-color red_5 #d22d72;
+@define-color green_1 #568c3b;
+@define-color yellow_1 #8a8a0f;
+@define-color blue_1 #257fad;
 @define-color purple_1 #6b6bb8;
-@define-color purple_2 #6b6bb8;
-@define-color purple_3 #6b6bb8;
-@define-color purple_4 #6b6bb8;
-@define-color purple_5 #6b6bb8;
-@define-color brown_1 #b72dd2;
-@define-color brown_2 #b72dd2;
-@define-color brown_3 #b72dd2;
-@define-color brown_4 #b72dd2;
-@define-color brown_5 #b72dd2;
-@define-color light_1 #516d7b;
-@define-color light_2 #516d7b;
-@define-color light_3 #516d7b;
-@define-color light_4 #516d7b;
-@define-color light_5 #516d7b;
-@define-color dark_1 #516d7b;
-@define-color dark_2 #516d7b;
-@define-color dark_3 #516d7b;
-@define-color dark_4 #516d7b;
-@define-color dark_5 #516d7b;
+@define-color teal_1 #2d8f6f;
+@define-color orange_1 #935c25;
+@define-color gray_1 #7195a8;
+
diff --git a/build/base16-atelier-lakeside.css b/build/base16-atelier-lakeside.css
index 27b079d..96dfc31 100644
--- a/build/base16-atelier-lakeside.css
+++ b/build/base16-atelier-lakeside.css
@@ -1,88 +1,37 @@
 @define-color accent_color #257fad;
 @define-color accent_bg_color #257fad;
 @define-color accent_fg_color #161b1d;
-@define-color destructive_color #d22d72;
-@define-color destructive_bg_color #d22d72;
-@define-color destructive_fg_color #161b1d;
-@define-color success_color #568c3b;
-@define-color success_bg_color #568c3b;
-@define-color success_fg_color #161b1d;
-@define-color warning_color #6b6bb8;
-@define-color warning_bg_color #6b6bb8;
-@define-color warning_fg_color #161b1d;
-@define-color error_color #d22d72;
-@define-color error_bg_color #d22d72;
-@define-color error_fg_color #161b1d;
+
 @define-color window_bg_color #161b1d;
 @define-color window_fg_color #7ea2b4;
+
 @define-color view_bg_color #161b1d;
 @define-color view_fg_color #7ea2b4;
-@define-color headerbar_bg_color #1f292e;
+
+@define-color headerbar_bg_color #161b1d;
 @define-color headerbar_fg_color #7ea2b4;
-@define-color headerbar_border_color rgba(0.12156863, 0.16078431, 0.18039216, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #161b1d;
+@define-color dialog_fg_color #7ea2b4;
+
+@define-color popover_bg_color #161b1d;
+@define-color popover_fg_color #7ea2b4;
+
+
 @define-color sidebar_bg_color #1f292e;
 @define-color sidebar_fg_color #7ea2b4;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #1f292e;
 @define-color card_fg_color #7ea2b4;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #1f292e;
-@define-color dialog_fg_color #7ea2b4;
-@define-color popover_bg_color #1f292e;
-@define-color popover_fg_color #7ea2b4;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #516d7b;
-@define-color blue_1 #257fad;
-@define-color blue_2 #257fad;
-@define-color blue_3 #257fad;
-@define-color blue_4 #257fad;
-@define-color blue_5 #257fad;
-@define-color green_1 #568c3b;
-@define-color green_2 #568c3b;
-@define-color green_3 #568c3b;
-@define-color green_4 #568c3b;
-@define-color green_5 #568c3b;
-@define-color yellow_1 #8a8a0f;
-@define-color yellow_2 #8a8a0f;
-@define-color yellow_3 #8a8a0f;
-@define-color yellow_4 #8a8a0f;
-@define-color yellow_5 #8a8a0f;
-@define-color orange_1 #935c25;
-@define-color orange_2 #935c25;
-@define-color orange_3 #935c25;
-@define-color orange_4 #935c25;
-@define-color orange_5 #935c25;
+
+
 @define-color red_1 #d22d72;
-@define-color red_2 #d22d72;
-@define-color red_3 #d22d72;
-@define-color red_4 #d22d72;
-@define-color red_5 #d22d72;
+@define-color green_1 #568c3b;
+@define-color yellow_1 #8a8a0f;
+@define-color blue_1 #257fad;
 @define-color purple_1 #6b6bb8;
-@define-color purple_2 #6b6bb8;
-@define-color purple_3 #6b6bb8;
-@define-color purple_4 #6b6bb8;
-@define-color purple_5 #6b6bb8;
-@define-color brown_1 #b72dd2;
-@define-color brown_2 #b72dd2;
-@define-color brown_3 #b72dd2;
-@define-color brown_4 #b72dd2;
-@define-color brown_5 #b72dd2;
-@define-color light_1 #7ea2b4;
-@define-color light_2 #7ea2b4;
-@define-color light_3 #7ea2b4;
-@define-color light_4 #7ea2b4;
-@define-color light_5 #7ea2b4;
-@define-color dark_1 #7ea2b4;
-@define-color dark_2 #7ea2b4;
-@define-color dark_3 #7ea2b4;
-@define-color dark_4 #7ea2b4;
-@define-color dark_5 #7ea2b4;
+@define-color teal_1 #2d8f6f;
+@define-color orange_1 #935c25;
+@define-color gray_1 #5a7b8c;
+
diff --git a/build/base16-atelier-plateau-light.css b/build/base16-atelier-plateau-light.css
index 7751a2d..8450cf1 100644
--- a/build/base16-atelier-plateau-light.css
+++ b/build/base16-atelier-plateau-light.css
@@ -1,88 +1,37 @@
 @define-color accent_color #7272ca;
 @define-color accent_bg_color #7272ca;
 @define-color accent_fg_color #f4ecec;
-@define-color destructive_color #ca4949;
-@define-color destructive_bg_color #ca4949;
-@define-color destructive_fg_color #f4ecec;
-@define-color success_color #4b8b8b;
-@define-color success_bg_color #4b8b8b;
-@define-color success_fg_color #f4ecec;
-@define-color warning_color #8464c4;
-@define-color warning_bg_color #8464c4;
-@define-color warning_fg_color #f4ecec;
-@define-color error_color #ca4949;
-@define-color error_bg_color #ca4949;
-@define-color error_fg_color #f4ecec;
+
 @define-color window_bg_color #f4ecec;
 @define-color window_fg_color #585050;
+
 @define-color view_bg_color #f4ecec;
 @define-color view_fg_color #585050;
-@define-color headerbar_bg_color #e7dfdf;
+
+@define-color headerbar_bg_color #f4ecec;
 @define-color headerbar_fg_color #585050;
-@define-color headerbar_border_color rgba(0.90588235, 0.87450980, 0.87450980, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #f4ecec;
+@define-color dialog_fg_color #585050;
+
+@define-color popover_bg_color #f4ecec;
+@define-color popover_fg_color #585050;
+
+
 @define-color sidebar_bg_color #e7dfdf;
 @define-color sidebar_fg_color #585050;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #e7dfdf;
 @define-color card_fg_color #585050;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #e7dfdf;
-@define-color dialog_fg_color #585050;
-@define-color popover_bg_color #e7dfdf;
-@define-color popover_fg_color #585050;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #8a8585;
-@define-color blue_1 #7272ca;
-@define-color blue_2 #7272ca;
-@define-color blue_3 #7272ca;
-@define-color blue_4 #7272ca;
-@define-color blue_5 #7272ca;
-@define-color green_1 #4b8b8b;
-@define-color green_2 #4b8b8b;
-@define-color green_3 #4b8b8b;
-@define-color green_4 #4b8b8b;
-@define-color green_5 #4b8b8b;
-@define-color yellow_1 #a06e3b;
-@define-color yellow_2 #a06e3b;
-@define-color yellow_3 #a06e3b;
-@define-color yellow_4 #a06e3b;
-@define-color yellow_5 #a06e3b;
-@define-color orange_1 #b45a3c;
-@define-color orange_2 #b45a3c;
-@define-color orange_3 #b45a3c;
-@define-color orange_4 #b45a3c;
-@define-color orange_5 #b45a3c;
+
+
 @define-color red_1 #ca4949;
-@define-color red_2 #ca4949;
-@define-color red_3 #ca4949;
-@define-color red_4 #ca4949;
-@define-color red_5 #ca4949;
+@define-color green_1 #4b8b8b;
+@define-color yellow_1 #a06e3b;
+@define-color blue_1 #7272ca;
 @define-color purple_1 #8464c4;
-@define-color purple_2 #8464c4;
-@define-color purple_3 #8464c4;
-@define-color purple_4 #8464c4;
-@define-color purple_5 #8464c4;
-@define-color brown_1 #bd5187;
-@define-color brown_2 #bd5187;
-@define-color brown_3 #bd5187;
-@define-color brown_4 #bd5187;
-@define-color brown_5 #bd5187;
-@define-color light_1 #585050;
-@define-color light_2 #585050;
-@define-color light_3 #585050;
-@define-color light_4 #585050;
-@define-color light_5 #585050;
-@define-color dark_1 #585050;
-@define-color dark_2 #585050;
-@define-color dark_3 #585050;
-@define-color dark_4 #585050;
-@define-color dark_5 #585050;
+@define-color teal_1 #5485b6;
+@define-color orange_1 #b45a3c;
+@define-color gray_1 #7e7777;
+
diff --git a/build/base16-atelier-plateau.css b/build/base16-atelier-plateau.css
index c8a1834..1b9ca98 100644
--- a/build/base16-atelier-plateau.css
+++ b/build/base16-atelier-plateau.css
@@ -1,88 +1,37 @@
 @define-color accent_color #7272ca;
 @define-color accent_bg_color #7272ca;
 @define-color accent_fg_color #1b1818;
-@define-color destructive_color #ca4949;
-@define-color destructive_bg_color #ca4949;
-@define-color destructive_fg_color #1b1818;
-@define-color success_color #4b8b8b;
-@define-color success_bg_color #4b8b8b;
-@define-color success_fg_color #1b1818;
-@define-color warning_color #8464c4;
-@define-color warning_bg_color #8464c4;
-@define-color warning_fg_color #1b1818;
-@define-color error_color #ca4949;
-@define-color error_bg_color #ca4949;
-@define-color error_fg_color #1b1818;
+
 @define-color window_bg_color #1b1818;
 @define-color window_fg_color #8a8585;
+
 @define-color view_bg_color #1b1818;
 @define-color view_fg_color #8a8585;
-@define-color headerbar_bg_color #292424;
+
+@define-color headerbar_bg_color #1b1818;
 @define-color headerbar_fg_color #8a8585;
-@define-color headerbar_border_color rgba(0.16078431, 0.14117647, 0.14117647, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #1b1818;
+@define-color dialog_fg_color #8a8585;
+
+@define-color popover_bg_color #1b1818;
+@define-color popover_fg_color #8a8585;
+
+
 @define-color sidebar_bg_color #292424;
 @define-color sidebar_fg_color #8a8585;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #292424;
 @define-color card_fg_color #8a8585;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #292424;
-@define-color dialog_fg_color #8a8585;
-@define-color popover_bg_color #292424;
-@define-color popover_fg_color #8a8585;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #585050;
-@define-color blue_1 #7272ca;
-@define-color blue_2 #7272ca;
-@define-color blue_3 #7272ca;
-@define-color blue_4 #7272ca;
-@define-color blue_5 #7272ca;
-@define-color green_1 #4b8b8b;
-@define-color green_2 #4b8b8b;
-@define-color green_3 #4b8b8b;
-@define-color green_4 #4b8b8b;
-@define-color green_5 #4b8b8b;
-@define-color yellow_1 #a06e3b;
-@define-color yellow_2 #a06e3b;
-@define-color yellow_3 #a06e3b;
-@define-color yellow_4 #a06e3b;
-@define-color yellow_5 #a06e3b;
-@define-color orange_1 #b45a3c;
-@define-color orange_2 #b45a3c;
-@define-color orange_3 #b45a3c;
-@define-color orange_4 #b45a3c;
-@define-color orange_5 #b45a3c;
+
+
 @define-color red_1 #ca4949;
-@define-color red_2 #ca4949;
-@define-color red_3 #ca4949;
-@define-color red_4 #ca4949;
-@define-color red_5 #ca4949;
+@define-color green_1 #4b8b8b;
+@define-color yellow_1 #a06e3b;
+@define-color blue_1 #7272ca;
 @define-color purple_1 #8464c4;
-@define-color purple_2 #8464c4;
-@define-color purple_3 #8464c4;
-@define-color purple_4 #8464c4;
-@define-color purple_5 #8464c4;
-@define-color brown_1 #bd5187;
-@define-color brown_2 #bd5187;
-@define-color brown_3 #bd5187;
-@define-color brown_4 #bd5187;
-@define-color brown_5 #bd5187;
-@define-color light_1 #8a8585;
-@define-color light_2 #8a8585;
-@define-color light_3 #8a8585;
-@define-color light_4 #8a8585;
-@define-color light_5 #8a8585;
-@define-color dark_1 #8a8585;
-@define-color dark_2 #8a8585;
-@define-color dark_3 #8a8585;
-@define-color dark_4 #8a8585;
-@define-color dark_5 #8a8585;
+@define-color teal_1 #5485b6;
+@define-color orange_1 #b45a3c;
+@define-color gray_1 #655d5d;
+
diff --git a/build/base16-atelier-savanna-light.css b/build/base16-atelier-savanna-light.css
index e12eb50..7280fbf 100644
--- a/build/base16-atelier-savanna-light.css
+++ b/build/base16-atelier-savanna-light.css
@@ -1,88 +1,37 @@
 @define-color accent_color #478c90;
 @define-color accent_bg_color #478c90;
 @define-color accent_fg_color #ecf4ee;
-@define-color destructive_color #b16139;
-@define-color destructive_bg_color #b16139;
-@define-color destructive_fg_color #ecf4ee;
-@define-color success_color #489963;
-@define-color success_bg_color #489963;
-@define-color success_fg_color #ecf4ee;
-@define-color warning_color #55859b;
-@define-color warning_bg_color #55859b;
-@define-color warning_fg_color #ecf4ee;
-@define-color error_color #b16139;
-@define-color error_bg_color #b16139;
-@define-color error_fg_color #ecf4ee;
+
 @define-color window_bg_color #ecf4ee;
 @define-color window_fg_color #526057;
+
 @define-color view_bg_color #ecf4ee;
 @define-color view_fg_color #526057;
-@define-color headerbar_bg_color #dfe7e2;
+
+@define-color headerbar_bg_color #ecf4ee;
 @define-color headerbar_fg_color #526057;
-@define-color headerbar_border_color rgba(0.87450980, 0.90588235, 0.88627451, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #ecf4ee;
+@define-color dialog_fg_color #526057;
+
+@define-color popover_bg_color #ecf4ee;
+@define-color popover_fg_color #526057;
+
+
 @define-color sidebar_bg_color #dfe7e2;
 @define-color sidebar_fg_color #526057;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #dfe7e2;
 @define-color card_fg_color #526057;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #dfe7e2;
-@define-color dialog_fg_color #526057;
-@define-color popover_bg_color #dfe7e2;
-@define-color popover_fg_color #526057;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #87928a;
-@define-color blue_1 #478c90;
-@define-color blue_2 #478c90;
-@define-color blue_3 #478c90;
-@define-color blue_4 #478c90;
-@define-color blue_5 #478c90;
-@define-color green_1 #489963;
-@define-color green_2 #489963;
-@define-color green_3 #489963;
-@define-color green_4 #489963;
-@define-color green_5 #489963;
-@define-color yellow_1 #a07e3b;
-@define-color yellow_2 #a07e3b;
-@define-color yellow_3 #a07e3b;
-@define-color yellow_4 #a07e3b;
-@define-color yellow_5 #a07e3b;
-@define-color orange_1 #9f713c;
-@define-color orange_2 #9f713c;
-@define-color orange_3 #9f713c;
-@define-color orange_4 #9f713c;
-@define-color orange_5 #9f713c;
+
+
 @define-color red_1 #b16139;
-@define-color red_2 #b16139;
-@define-color red_3 #b16139;
-@define-color red_4 #b16139;
-@define-color red_5 #b16139;
+@define-color green_1 #489963;
+@define-color yellow_1 #a07e3b;
+@define-color blue_1 #478c90;
 @define-color purple_1 #55859b;
-@define-color purple_2 #55859b;
-@define-color purple_3 #55859b;
-@define-color purple_4 #55859b;
-@define-color purple_5 #55859b;
-@define-color brown_1 #867469;
-@define-color brown_2 #867469;
-@define-color brown_3 #867469;
-@define-color brown_4 #867469;
-@define-color brown_5 #867469;
-@define-color light_1 #526057;
-@define-color light_2 #526057;
-@define-color light_3 #526057;
-@define-color light_4 #526057;
-@define-color light_5 #526057;
-@define-color dark_1 #526057;
-@define-color dark_2 #526057;
-@define-color dark_3 #526057;
-@define-color dark_4 #526057;
-@define-color dark_5 #526057;
+@define-color teal_1 #1c9aa0;
+@define-color orange_1 #9f713c;
+@define-color gray_1 #78877d;
+
diff --git a/build/base16-atelier-savanna.css b/build/base16-atelier-savanna.css
index 64b5bdd..bd01254 100644
--- a/build/base16-atelier-savanna.css
+++ b/build/base16-atelier-savanna.css
@@ -1,88 +1,37 @@
 @define-color accent_color #478c90;
 @define-color accent_bg_color #478c90;
 @define-color accent_fg_color #171c19;
-@define-color destructive_color #b16139;
-@define-color destructive_bg_color #b16139;
-@define-color destructive_fg_color #171c19;
-@define-color success_color #489963;
-@define-color success_bg_color #489963;
-@define-color success_fg_color #171c19;
-@define-color warning_color #55859b;
-@define-color warning_bg_color #55859b;
-@define-color warning_fg_color #171c19;
-@define-color error_color #b16139;
-@define-color error_bg_color #b16139;
-@define-color error_fg_color #171c19;
+
 @define-color window_bg_color #171c19;
 @define-color window_fg_color #87928a;
+
 @define-color view_bg_color #171c19;
 @define-color view_fg_color #87928a;
-@define-color headerbar_bg_color #232a25;
+
+@define-color headerbar_bg_color #171c19;
 @define-color headerbar_fg_color #87928a;
-@define-color headerbar_border_color rgba(0.13725490, 0.16470588, 0.14509804, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #171c19;
+@define-color dialog_fg_color #87928a;
+
+@define-color popover_bg_color #171c19;
+@define-color popover_fg_color #87928a;
+
+
 @define-color sidebar_bg_color #232a25;
 @define-color sidebar_fg_color #87928a;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #232a25;
 @define-color card_fg_color #87928a;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #232a25;
-@define-color dialog_fg_color #87928a;
-@define-color popover_bg_color #232a25;
-@define-color popover_fg_color #87928a;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #526057;
-@define-color blue_1 #478c90;
-@define-color blue_2 #478c90;
-@define-color blue_3 #478c90;
-@define-color blue_4 #478c90;
-@define-color blue_5 #478c90;
-@define-color green_1 #489963;
-@define-color green_2 #489963;
-@define-color green_3 #489963;
-@define-color green_4 #489963;
-@define-color green_5 #489963;
-@define-color yellow_1 #a07e3b;
-@define-color yellow_2 #a07e3b;
-@define-color yellow_3 #a07e3b;
-@define-color yellow_4 #a07e3b;
-@define-color yellow_5 #a07e3b;
-@define-color orange_1 #9f713c;
-@define-color orange_2 #9f713c;
-@define-color orange_3 #9f713c;
-@define-color orange_4 #9f713c;
-@define-color orange_5 #9f713c;
+
+
 @define-color red_1 #b16139;
-@define-color red_2 #b16139;
-@define-color red_3 #b16139;
-@define-color red_4 #b16139;
-@define-color red_5 #b16139;
+@define-color green_1 #489963;
+@define-color yellow_1 #a07e3b;
+@define-color blue_1 #478c90;
 @define-color purple_1 #55859b;
-@define-color purple_2 #55859b;
-@define-color purple_3 #55859b;
-@define-color purple_4 #55859b;
-@define-color purple_5 #55859b;
-@define-color brown_1 #867469;
-@define-color brown_2 #867469;
-@define-color brown_3 #867469;
-@define-color brown_4 #867469;
-@define-color brown_5 #867469;
-@define-color light_1 #87928a;
-@define-color light_2 #87928a;
-@define-color light_3 #87928a;
-@define-color light_4 #87928a;
-@define-color light_5 #87928a;
-@define-color dark_1 #87928a;
-@define-color dark_2 #87928a;
-@define-color dark_3 #87928a;
-@define-color dark_4 #87928a;
-@define-color dark_5 #87928a;
+@define-color teal_1 #1c9aa0;
+@define-color orange_1 #9f713c;
+@define-color gray_1 #5f6d64;
+
diff --git a/build/base16-atelier-seaside-light.css b/build/base16-atelier-seaside-light.css
index fadc417..2759363 100644
--- a/build/base16-atelier-seaside-light.css
+++ b/build/base16-atelier-seaside-light.css
@@ -1,88 +1,37 @@
 @define-color accent_color #3d62f5;
 @define-color accent_bg_color #3d62f5;
 @define-color accent_fg_color #f4fbf4;
-@define-color destructive_color #e6193c;
-@define-color destructive_bg_color #e6193c;
-@define-color destructive_fg_color #f4fbf4;
-@define-color success_color #29a329;
-@define-color success_bg_color #29a329;
-@define-color success_fg_color #f4fbf4;
-@define-color warning_color #ad2bee;
-@define-color warning_bg_color #ad2bee;
-@define-color warning_fg_color #f4fbf4;
-@define-color error_color #e6193c;
-@define-color error_bg_color #e6193c;
-@define-color error_fg_color #f4fbf4;
+
 @define-color window_bg_color #f4fbf4;
 @define-color window_fg_color #5e6e5e;
+
 @define-color view_bg_color #f4fbf4;
 @define-color view_fg_color #5e6e5e;
-@define-color headerbar_bg_color #cfe8cf;
+
+@define-color headerbar_bg_color #f4fbf4;
 @define-color headerbar_fg_color #5e6e5e;
-@define-color headerbar_border_color rgba(0.81176471, 0.90980392, 0.81176471, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #f4fbf4;
+@define-color dialog_fg_color #5e6e5e;
+
+@define-color popover_bg_color #f4fbf4;
+@define-color popover_fg_color #5e6e5e;
+
+
 @define-color sidebar_bg_color #cfe8cf;
 @define-color sidebar_fg_color #5e6e5e;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #cfe8cf;
 @define-color card_fg_color #5e6e5e;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #cfe8cf;
-@define-color dialog_fg_color #5e6e5e;
-@define-color popover_bg_color #cfe8cf;
-@define-color popover_fg_color #5e6e5e;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #8ca68c;
-@define-color blue_1 #3d62f5;
-@define-color blue_2 #3d62f5;
-@define-color blue_3 #3d62f5;
-@define-color blue_4 #3d62f5;
-@define-color blue_5 #3d62f5;
-@define-color green_1 #29a329;
-@define-color green_2 #29a329;
-@define-color green_3 #29a329;
-@define-color green_4 #29a329;
-@define-color green_5 #29a329;
-@define-color yellow_1 #98981b;
-@define-color yellow_2 #98981b;
-@define-color yellow_3 #98981b;
-@define-color yellow_4 #98981b;
-@define-color yellow_5 #98981b;
-@define-color orange_1 #87711d;
-@define-color orange_2 #87711d;
-@define-color orange_3 #87711d;
-@define-color orange_4 #87711d;
-@define-color orange_5 #87711d;
+
+
 @define-color red_1 #e6193c;
-@define-color red_2 #e6193c;
-@define-color red_3 #e6193c;
-@define-color red_4 #e6193c;
-@define-color red_5 #e6193c;
+@define-color green_1 #29a329;
+@define-color yellow_1 #98981b;
+@define-color blue_1 #3d62f5;
 @define-color purple_1 #ad2bee;
-@define-color purple_2 #ad2bee;
-@define-color purple_3 #ad2bee;
-@define-color purple_4 #ad2bee;
-@define-color purple_5 #ad2bee;
-@define-color brown_1 #e619c3;
-@define-color brown_2 #e619c3;
-@define-color brown_3 #e619c3;
-@define-color brown_4 #e619c3;
-@define-color brown_5 #e619c3;
-@define-color light_1 #5e6e5e;
-@define-color light_2 #5e6e5e;
-@define-color light_3 #5e6e5e;
-@define-color light_4 #5e6e5e;
-@define-color light_5 #5e6e5e;
-@define-color dark_1 #5e6e5e;
-@define-color dark_2 #5e6e5e;
-@define-color dark_3 #5e6e5e;
-@define-color dark_4 #5e6e5e;
-@define-color dark_5 #5e6e5e;
+@define-color teal_1 #1999b3;
+@define-color orange_1 #87711d;
+@define-color gray_1 #809980;
+
diff --git a/build/base16-atelier-seaside.css b/build/base16-atelier-seaside.css
index 053af31..e24200e 100644
--- a/build/base16-atelier-seaside.css
+++ b/build/base16-atelier-seaside.css
@@ -1,88 +1,37 @@
 @define-color accent_color #3d62f5;
 @define-color accent_bg_color #3d62f5;
 @define-color accent_fg_color #131513;
-@define-color destructive_color #e6193c;
-@define-color destructive_bg_color #e6193c;
-@define-color destructive_fg_color #131513;
-@define-color success_color #29a329;
-@define-color success_bg_color #29a329;
-@define-color success_fg_color #131513;
-@define-color warning_color #ad2bee;
-@define-color warning_bg_color #ad2bee;
-@define-color warning_fg_color #131513;
-@define-color error_color #e6193c;
-@define-color error_bg_color #e6193c;
-@define-color error_fg_color #131513;
+
 @define-color window_bg_color #131513;
 @define-color window_fg_color #8ca68c;
+
 @define-color view_bg_color #131513;
 @define-color view_fg_color #8ca68c;
-@define-color headerbar_bg_color #242924;
+
+@define-color headerbar_bg_color #131513;
 @define-color headerbar_fg_color #8ca68c;
-@define-color headerbar_border_color rgba(0.14117647, 0.16078431, 0.14117647, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #131513;
+@define-color dialog_fg_color #8ca68c;
+
+@define-color popover_bg_color #131513;
+@define-color popover_fg_color #8ca68c;
+
+
 @define-color sidebar_bg_color #242924;
 @define-color sidebar_fg_color #8ca68c;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #242924;
 @define-color card_fg_color #8ca68c;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #242924;
-@define-color dialog_fg_color #8ca68c;
-@define-color popover_bg_color #242924;
-@define-color popover_fg_color #8ca68c;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #5e6e5e;
-@define-color blue_1 #3d62f5;
-@define-color blue_2 #3d62f5;
-@define-color blue_3 #3d62f5;
-@define-color blue_4 #3d62f5;
-@define-color blue_5 #3d62f5;
-@define-color green_1 #29a329;
-@define-color green_2 #29a329;
-@define-color green_3 #29a329;
-@define-color green_4 #29a329;
-@define-color green_5 #29a329;
-@define-color yellow_1 #98981b;
-@define-color yellow_2 #98981b;
-@define-color yellow_3 #98981b;
-@define-color yellow_4 #98981b;
-@define-color yellow_5 #98981b;
-@define-color orange_1 #87711d;
-@define-color orange_2 #87711d;
-@define-color orange_3 #87711d;
-@define-color orange_4 #87711d;
-@define-color orange_5 #87711d;
+
+
 @define-color red_1 #e6193c;
-@define-color red_2 #e6193c;
-@define-color red_3 #e6193c;
-@define-color red_4 #e6193c;
-@define-color red_5 #e6193c;
+@define-color green_1 #29a329;
+@define-color yellow_1 #98981b;
+@define-color blue_1 #3d62f5;
 @define-color purple_1 #ad2bee;
-@define-color purple_2 #ad2bee;
-@define-color purple_3 #ad2bee;
-@define-color purple_4 #ad2bee;
-@define-color purple_5 #ad2bee;
-@define-color brown_1 #e619c3;
-@define-color brown_2 #e619c3;
-@define-color brown_3 #e619c3;
-@define-color brown_4 #e619c3;
-@define-color brown_5 #e619c3;
-@define-color light_1 #8ca68c;
-@define-color light_2 #8ca68c;
-@define-color light_3 #8ca68c;
-@define-color light_4 #8ca68c;
-@define-color light_5 #8ca68c;
-@define-color dark_1 #8ca68c;
-@define-color dark_2 #8ca68c;
-@define-color dark_3 #8ca68c;
-@define-color dark_4 #8ca68c;
-@define-color dark_5 #8ca68c;
+@define-color teal_1 #1999b3;
+@define-color orange_1 #87711d;
+@define-color gray_1 #687d68;
+
diff --git a/build/base16-atelier-sulphurpool-light.css b/build/base16-atelier-sulphurpool-light.css
index 9d9d999..3a89d9d 100644
--- a/build/base16-atelier-sulphurpool-light.css
+++ b/build/base16-atelier-sulphurpool-light.css
@@ -1,88 +1,37 @@
 @define-color accent_color #3d8fd1;
 @define-color accent_bg_color #3d8fd1;
 @define-color accent_fg_color #f5f7ff;
-@define-color destructive_color #c94922;
-@define-color destructive_bg_color #c94922;
-@define-color destructive_fg_color #f5f7ff;
-@define-color success_color #ac9739;
-@define-color success_bg_color #ac9739;
-@define-color success_fg_color #f5f7ff;
-@define-color warning_color #6679cc;
-@define-color warning_bg_color #6679cc;
-@define-color warning_fg_color #f5f7ff;
-@define-color error_color #c94922;
-@define-color error_bg_color #c94922;
-@define-color error_fg_color #f5f7ff;
+
 @define-color window_bg_color #f5f7ff;
 @define-color window_fg_color #5e6687;
+
 @define-color view_bg_color #f5f7ff;
 @define-color view_fg_color #5e6687;
-@define-color headerbar_bg_color #dfe2f1;
+
+@define-color headerbar_bg_color #f5f7ff;
 @define-color headerbar_fg_color #5e6687;
-@define-color headerbar_border_color rgba(0.87450980, 0.88627451, 0.94509804, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #f5f7ff;
+@define-color dialog_fg_color #5e6687;
+
+@define-color popover_bg_color #f5f7ff;
+@define-color popover_fg_color #5e6687;
+
+
 @define-color sidebar_bg_color #dfe2f1;
 @define-color sidebar_fg_color #5e6687;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #dfe2f1;
 @define-color card_fg_color #5e6687;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #dfe2f1;
-@define-color dialog_fg_color #5e6687;
-@define-color popover_bg_color #dfe2f1;
-@define-color popover_fg_color #5e6687;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #979db4;
-@define-color blue_1 #3d8fd1;
-@define-color blue_2 #3d8fd1;
-@define-color blue_3 #3d8fd1;
-@define-color blue_4 #3d8fd1;
-@define-color blue_5 #3d8fd1;
-@define-color green_1 #ac9739;
-@define-color green_2 #ac9739;
-@define-color green_3 #ac9739;
-@define-color green_4 #ac9739;
-@define-color green_5 #ac9739;
-@define-color yellow_1 #c08b30;
-@define-color yellow_2 #c08b30;
-@define-color yellow_3 #c08b30;
-@define-color yellow_4 #c08b30;
-@define-color yellow_5 #c08b30;
-@define-color orange_1 #c76b29;
-@define-color orange_2 #c76b29;
-@define-color orange_3 #c76b29;
-@define-color orange_4 #c76b29;
-@define-color orange_5 #c76b29;
+
+
 @define-color red_1 #c94922;
-@define-color red_2 #c94922;
-@define-color red_3 #c94922;
-@define-color red_4 #c94922;
-@define-color red_5 #c94922;
+@define-color green_1 #ac9739;
+@define-color yellow_1 #c08b30;
+@define-color blue_1 #3d8fd1;
 @define-color purple_1 #6679cc;
-@define-color purple_2 #6679cc;
-@define-color purple_3 #6679cc;
-@define-color purple_4 #6679cc;
-@define-color purple_5 #6679cc;
-@define-color brown_1 #9c637a;
-@define-color brown_2 #9c637a;
-@define-color brown_3 #9c637a;
-@define-color brown_4 #9c637a;
-@define-color brown_5 #9c637a;
-@define-color light_1 #5e6687;
-@define-color light_2 #5e6687;
-@define-color light_3 #5e6687;
-@define-color light_4 #5e6687;
-@define-color light_5 #5e6687;
-@define-color dark_1 #5e6687;
-@define-color dark_2 #5e6687;
-@define-color dark_3 #5e6687;
-@define-color dark_4 #5e6687;
-@define-color dark_5 #5e6687;
+@define-color teal_1 #22a2c9;
+@define-color orange_1 #c76b29;
+@define-color gray_1 #898ea4;
+
diff --git a/build/base16-atelier-sulphurpool.css b/build/base16-atelier-sulphurpool.css
index 4234d5b..a72e174 100644
--- a/build/base16-atelier-sulphurpool.css
+++ b/build/base16-atelier-sulphurpool.css
@@ -1,88 +1,37 @@
 @define-color accent_color #3d8fd1;
 @define-color accent_bg_color #3d8fd1;
 @define-color accent_fg_color #202746;
-@define-color destructive_color #c94922;
-@define-color destructive_bg_color #c94922;
-@define-color destructive_fg_color #202746;
-@define-color success_color #ac9739;
-@define-color success_bg_color #ac9739;
-@define-color success_fg_color #202746;
-@define-color warning_color #6679cc;
-@define-color warning_bg_color #6679cc;
-@define-color warning_fg_color #202746;
-@define-color error_color #c94922;
-@define-color error_bg_color #c94922;
-@define-color error_fg_color #202746;
+
 @define-color window_bg_color #202746;
 @define-color window_fg_color #979db4;
+
 @define-color view_bg_color #202746;
 @define-color view_fg_color #979db4;
-@define-color headerbar_bg_color #293256;
+
+@define-color headerbar_bg_color #202746;
 @define-color headerbar_fg_color #979db4;
-@define-color headerbar_border_color rgba(0.16078431, 0.19607843, 0.33725490, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #202746;
+@define-color dialog_fg_color #979db4;
+
+@define-color popover_bg_color #202746;
+@define-color popover_fg_color #979db4;
+
+
 @define-color sidebar_bg_color #293256;
 @define-color sidebar_fg_color #979db4;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #293256;
 @define-color card_fg_color #979db4;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #293256;
-@define-color dialog_fg_color #979db4;
-@define-color popover_bg_color #293256;
-@define-color popover_fg_color #979db4;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #5e6687;
-@define-color blue_1 #3d8fd1;
-@define-color blue_2 #3d8fd1;
-@define-color blue_3 #3d8fd1;
-@define-color blue_4 #3d8fd1;
-@define-color blue_5 #3d8fd1;
-@define-color green_1 #ac9739;
-@define-color green_2 #ac9739;
-@define-color green_3 #ac9739;
-@define-color green_4 #ac9739;
-@define-color green_5 #ac9739;
-@define-color yellow_1 #c08b30;
-@define-color yellow_2 #c08b30;
-@define-color yellow_3 #c08b30;
-@define-color yellow_4 #c08b30;
-@define-color yellow_5 #c08b30;
-@define-color orange_1 #c76b29;
-@define-color orange_2 #c76b29;
-@define-color orange_3 #c76b29;
-@define-color orange_4 #c76b29;
-@define-color orange_5 #c76b29;
+
+
 @define-color red_1 #c94922;
-@define-color red_2 #c94922;
-@define-color red_3 #c94922;
-@define-color red_4 #c94922;
-@define-color red_5 #c94922;
+@define-color green_1 #ac9739;
+@define-color yellow_1 #c08b30;
+@define-color blue_1 #3d8fd1;
 @define-color purple_1 #6679cc;
-@define-color purple_2 #6679cc;
-@define-color purple_3 #6679cc;
-@define-color purple_4 #6679cc;
-@define-color purple_5 #6679cc;
-@define-color brown_1 #9c637a;
-@define-color brown_2 #9c637a;
-@define-color brown_3 #9c637a;
-@define-color brown_4 #9c637a;
-@define-color brown_5 #9c637a;
-@define-color light_1 #979db4;
-@define-color light_2 #979db4;
-@define-color light_3 #979db4;
-@define-color light_4 #979db4;
-@define-color light_5 #979db4;
-@define-color dark_1 #979db4;
-@define-color dark_2 #979db4;
-@define-color dark_3 #979db4;
-@define-color dark_4 #979db4;
-@define-color dark_5 #979db4;
+@define-color teal_1 #22a2c9;
+@define-color orange_1 #c76b29;
+@define-color gray_1 #6b7394;
+
diff --git a/build/base16-atlas.css b/build/base16-atlas.css
index a6c7676..e37ff3c 100644
--- a/build/base16-atlas.css
+++ b/build/base16-atlas.css
@@ -1,88 +1,37 @@
 @define-color accent_color #14747e;
 @define-color accent_bg_color #14747e;
 @define-color accent_fg_color #002635;
-@define-color destructive_color #ff5a67;
-@define-color destructive_bg_color #ff5a67;
-@define-color destructive_fg_color #002635;
-@define-color success_color #7fc06e;
-@define-color success_bg_color #7fc06e;
-@define-color success_fg_color #002635;
-@define-color warning_color #9a70a4;
-@define-color warning_bg_color #9a70a4;
-@define-color warning_fg_color #002635;
-@define-color error_color #ff5a67;
-@define-color error_bg_color #ff5a67;
-@define-color error_fg_color #002635;
+
 @define-color window_bg_color #002635;
 @define-color window_fg_color #a1a19a;
+
 @define-color view_bg_color #002635;
 @define-color view_fg_color #a1a19a;
-@define-color headerbar_bg_color #00384d;
+
+@define-color headerbar_bg_color #002635;
 @define-color headerbar_fg_color #a1a19a;
-@define-color headerbar_border_color rgba(0.00000000, 0.21960784, 0.30196078, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #002635;
+@define-color dialog_fg_color #a1a19a;
+
+@define-color popover_bg_color #002635;
+@define-color popover_fg_color #a1a19a;
+
+
 @define-color sidebar_bg_color #00384d;
 @define-color sidebar_fg_color #a1a19a;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #00384d;
 @define-color card_fg_color #a1a19a;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #00384d;
-@define-color dialog_fg_color #a1a19a;
-@define-color popover_bg_color #00384d;
-@define-color popover_fg_color #a1a19a;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #517f8d;
-@define-color blue_1 #14747e;
-@define-color blue_2 #14747e;
-@define-color blue_3 #14747e;
-@define-color blue_4 #14747e;
-@define-color blue_5 #14747e;
-@define-color green_1 #7fc06e;
-@define-color green_2 #7fc06e;
-@define-color green_3 #7fc06e;
-@define-color green_4 #7fc06e;
-@define-color green_5 #7fc06e;
-@define-color yellow_1 #ffcc1b;
-@define-color yellow_2 #ffcc1b;
-@define-color yellow_3 #ffcc1b;
-@define-color yellow_4 #ffcc1b;
-@define-color yellow_5 #ffcc1b;
-@define-color orange_1 #f08e48;
-@define-color orange_2 #f08e48;
-@define-color orange_3 #f08e48;
-@define-color orange_4 #f08e48;
-@define-color orange_5 #f08e48;
+
+
 @define-color red_1 #ff5a67;
-@define-color red_2 #ff5a67;
-@define-color red_3 #ff5a67;
-@define-color red_4 #ff5a67;
-@define-color red_5 #ff5a67;
+@define-color green_1 #7fc06e;
+@define-color yellow_1 #ffcc1b;
+@define-color blue_1 #14747e;
 @define-color purple_1 #9a70a4;
-@define-color purple_2 #9a70a4;
-@define-color purple_3 #9a70a4;
-@define-color purple_4 #9a70a4;
-@define-color purple_5 #9a70a4;
-@define-color brown_1 #c43060;
-@define-color brown_2 #c43060;
-@define-color brown_3 #c43060;
-@define-color brown_4 #c43060;
-@define-color brown_5 #c43060;
-@define-color light_1 #a1a19a;
-@define-color light_2 #a1a19a;
-@define-color light_3 #a1a19a;
-@define-color light_4 #a1a19a;
-@define-color light_5 #a1a19a;
-@define-color dark_1 #a1a19a;
-@define-color dark_2 #a1a19a;
-@define-color dark_3 #a1a19a;
-@define-color dark_4 #a1a19a;
-@define-color dark_5 #a1a19a;
+@define-color teal_1 #5dd7b9;
+@define-color orange_1 #f08e48;
+@define-color gray_1 #6c8b91;
+
diff --git a/build/base16-ayu-dark.css b/build/base16-ayu-dark.css
index 309e714..d9b6c63 100644
--- a/build/base16-ayu-dark.css
+++ b/build/base16-ayu-dark.css
@@ -1,88 +1,37 @@
 @define-color accent_color #59c2ff;
 @define-color accent_bg_color #59c2ff;
 @define-color accent_fg_color #0b0e14;
-@define-color destructive_color #f07178;
-@define-color destructive_bg_color #f07178;
-@define-color destructive_fg_color #0b0e14;
-@define-color success_color #aad94c;
-@define-color success_bg_color #aad94c;
-@define-color success_fg_color #0b0e14;
-@define-color warning_color #d2a6ff;
-@define-color warning_bg_color #d2a6ff;
-@define-color warning_fg_color #0b0e14;
-@define-color error_color #f07178;
-@define-color error_bg_color #f07178;
-@define-color error_fg_color #0b0e14;
+
 @define-color window_bg_color #0b0e14;
 @define-color window_fg_color #e6e1cf;
+
 @define-color view_bg_color #0b0e14;
 @define-color view_fg_color #e6e1cf;
-@define-color headerbar_bg_color #131721;
+
+@define-color headerbar_bg_color #0b0e14;
 @define-color headerbar_fg_color #e6e1cf;
-@define-color headerbar_border_color rgba(0.07450980, 0.09019608, 0.12941176, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #0b0e14;
+@define-color dialog_fg_color #e6e1cf;
+
+@define-color popover_bg_color #0b0e14;
+@define-color popover_fg_color #e6e1cf;
+
+
 @define-color sidebar_bg_color #131721;
 @define-color sidebar_fg_color #e6e1cf;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #131721;
 @define-color card_fg_color #e6e1cf;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #131721;
-@define-color dialog_fg_color #e6e1cf;
-@define-color popover_bg_color #131721;
-@define-color popover_fg_color #e6e1cf;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #202229;
-@define-color blue_1 #59c2ff;
-@define-color blue_2 #59c2ff;
-@define-color blue_3 #59c2ff;
-@define-color blue_4 #59c2ff;
-@define-color blue_5 #59c2ff;
-@define-color green_1 #aad94c;
-@define-color green_2 #aad94c;
-@define-color green_3 #aad94c;
-@define-color green_4 #aad94c;
-@define-color green_5 #aad94c;
-@define-color yellow_1 #ffb454;
-@define-color yellow_2 #ffb454;
-@define-color yellow_3 #ffb454;
-@define-color yellow_4 #ffb454;
-@define-color yellow_5 #ffb454;
-@define-color orange_1 #ff8f40;
-@define-color orange_2 #ff8f40;
-@define-color orange_3 #ff8f40;
-@define-color orange_4 #ff8f40;
-@define-color orange_5 #ff8f40;
+
+
 @define-color red_1 #f07178;
-@define-color red_2 #f07178;
-@define-color red_3 #f07178;
-@define-color red_4 #f07178;
-@define-color red_5 #f07178;
+@define-color green_1 #aad94c;
+@define-color yellow_1 #ffb454;
+@define-color blue_1 #59c2ff;
 @define-color purple_1 #d2a6ff;
-@define-color purple_2 #d2a6ff;
-@define-color purple_3 #d2a6ff;
-@define-color purple_4 #d2a6ff;
-@define-color purple_5 #d2a6ff;
-@define-color brown_1 #e6b450;
-@define-color brown_2 #e6b450;
-@define-color brown_3 #e6b450;
-@define-color brown_4 #e6b450;
-@define-color brown_5 #e6b450;
-@define-color light_1 #e6e1cf;
-@define-color light_2 #e6e1cf;
-@define-color light_3 #e6e1cf;
-@define-color light_4 #e6e1cf;
-@define-color light_5 #e6e1cf;
-@define-color dark_1 #e6e1cf;
-@define-color dark_2 #e6e1cf;
-@define-color dark_3 #e6e1cf;
-@define-color dark_4 #e6e1cf;
-@define-color dark_5 #e6e1cf;
+@define-color teal_1 #95e6cb;
+@define-color orange_1 #ff8f40;
+@define-color gray_1 #3e4b59;
+
diff --git a/build/base16-ayu-light.css b/build/base16-ayu-light.css
index 50ba59a..21904d2 100644
--- a/build/base16-ayu-light.css
+++ b/build/base16-ayu-light.css
@@ -1,88 +1,37 @@
 @define-color accent_color #399ee6;
 @define-color accent_bg_color #399ee6;
 @define-color accent_fg_color #f8f9fa;
-@define-color destructive_color #f07171;
-@define-color destructive_bg_color #f07171;
-@define-color destructive_fg_color #f8f9fa;
-@define-color success_color #6cbf49;
-@define-color success_bg_color #6cbf49;
-@define-color success_fg_color #f8f9fa;
-@define-color warning_color #a37acc;
-@define-color warning_bg_color #a37acc;
-@define-color warning_fg_color #f8f9fa;
-@define-color error_color #f07171;
-@define-color error_bg_color #f07171;
-@define-color error_fg_color #f8f9fa;
+
 @define-color window_bg_color #f8f9fa;
 @define-color window_fg_color #5c6166;
+
 @define-color view_bg_color #f8f9fa;
 @define-color view_fg_color #5c6166;
-@define-color headerbar_bg_color #edeff1;
+
+@define-color headerbar_bg_color #f8f9fa;
 @define-color headerbar_fg_color #5c6166;
-@define-color headerbar_border_color rgba(0.92941176, 0.93725490, 0.94509804, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #f8f9fa;
+@define-color dialog_fg_color #5c6166;
+
+@define-color popover_bg_color #f8f9fa;
+@define-color popover_fg_color #5c6166;
+
+
 @define-color sidebar_bg_color #edeff1;
 @define-color sidebar_fg_color #5c6166;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #edeff1;
 @define-color card_fg_color #5c6166;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #edeff1;
-@define-color dialog_fg_color #5c6166;
-@define-color popover_bg_color #edeff1;
-@define-color popover_fg_color #5c6166;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #d2d4d8;
-@define-color blue_1 #399ee6;
-@define-color blue_2 #399ee6;
-@define-color blue_3 #399ee6;
-@define-color blue_4 #399ee6;
-@define-color blue_5 #399ee6;
-@define-color green_1 #6cbf49;
-@define-color green_2 #6cbf49;
-@define-color green_3 #6cbf49;
-@define-color green_4 #6cbf49;
-@define-color green_5 #6cbf49;
-@define-color yellow_1 #f2ae49;
-@define-color yellow_2 #f2ae49;
-@define-color yellow_3 #f2ae49;
-@define-color yellow_4 #f2ae49;
-@define-color yellow_5 #f2ae49;
-@define-color orange_1 #fa8d3e;
-@define-color orange_2 #fa8d3e;
-@define-color orange_3 #fa8d3e;
-@define-color orange_4 #fa8d3e;
-@define-color orange_5 #fa8d3e;
+
+
 @define-color red_1 #f07171;
-@define-color red_2 #f07171;
-@define-color red_3 #f07171;
-@define-color red_4 #f07171;
-@define-color red_5 #f07171;
+@define-color green_1 #6cbf49;
+@define-color yellow_1 #f2ae49;
+@define-color blue_1 #399ee6;
 @define-color purple_1 #a37acc;
-@define-color purple_2 #a37acc;
-@define-color purple_3 #a37acc;
-@define-color purple_4 #a37acc;
-@define-color purple_5 #a37acc;
-@define-color brown_1 #e6ba7e;
-@define-color brown_2 #e6ba7e;
-@define-color brown_3 #e6ba7e;
-@define-color brown_4 #e6ba7e;
-@define-color brown_5 #e6ba7e;
-@define-color light_1 #5c6166;
-@define-color light_2 #5c6166;
-@define-color light_3 #5c6166;
-@define-color light_4 #5c6166;
-@define-color light_5 #5c6166;
-@define-color dark_1 #5c6166;
-@define-color dark_2 #5c6166;
-@define-color dark_3 #5c6166;
-@define-color dark_4 #5c6166;
-@define-color dark_5 #5c6166;
+@define-color teal_1 #4cbf99;
+@define-color orange_1 #fa8d3e;
+@define-color gray_1 #a0a6ac;
+
diff --git a/build/base16-ayu-mirage.css b/build/base16-ayu-mirage.css
index 3980c54..c8569fc 100644
--- a/build/base16-ayu-mirage.css
+++ b/build/base16-ayu-mirage.css
@@ -1,88 +1,37 @@
 @define-color accent_color #73d0ff;
 @define-color accent_bg_color #73d0ff;
 @define-color accent_fg_color #1f2430;
-@define-color destructive_color #f28779;
-@define-color destructive_bg_color #f28779;
-@define-color destructive_fg_color #1f2430;
-@define-color success_color #d5ff80;
-@define-color success_bg_color #d5ff80;
-@define-color success_fg_color #1f2430;
-@define-color warning_color #d4bfff;
-@define-color warning_bg_color #d4bfff;
-@define-color warning_fg_color #1f2430;
-@define-color error_color #f28779;
-@define-color error_bg_color #f28779;
-@define-color error_fg_color #1f2430;
+
 @define-color window_bg_color #1f2430;
 @define-color window_fg_color #cccac2;
+
 @define-color view_bg_color #1f2430;
 @define-color view_fg_color #cccac2;
-@define-color headerbar_bg_color #242936;
+
+@define-color headerbar_bg_color #1f2430;
 @define-color headerbar_fg_color #cccac2;
-@define-color headerbar_border_color rgba(0.14117647, 0.16078431, 0.21176471, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #1f2430;
+@define-color dialog_fg_color #cccac2;
+
+@define-color popover_bg_color #1f2430;
+@define-color popover_fg_color #cccac2;
+
+
 @define-color sidebar_bg_color #242936;
 @define-color sidebar_fg_color #cccac2;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #242936;
 @define-color card_fg_color #cccac2;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #242936;
-@define-color dialog_fg_color #cccac2;
-@define-color popover_bg_color #242936;
-@define-color popover_fg_color #cccac2;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #323844;
-@define-color blue_1 #73d0ff;
-@define-color blue_2 #73d0ff;
-@define-color blue_3 #73d0ff;
-@define-color blue_4 #73d0ff;
-@define-color blue_5 #73d0ff;
-@define-color green_1 #d5ff80;
-@define-color green_2 #d5ff80;
-@define-color green_3 #d5ff80;
-@define-color green_4 #d5ff80;
-@define-color green_5 #d5ff80;
-@define-color yellow_1 #ffd173;
-@define-color yellow_2 #ffd173;
-@define-color yellow_3 #ffd173;
-@define-color yellow_4 #ffd173;
-@define-color yellow_5 #ffd173;
-@define-color orange_1 #ffad66;
-@define-color orange_2 #ffad66;
-@define-color orange_3 #ffad66;
-@define-color orange_4 #ffad66;
-@define-color orange_5 #ffad66;
+
+
 @define-color red_1 #f28779;
-@define-color red_2 #f28779;
-@define-color red_3 #f28779;
-@define-color red_4 #f28779;
-@define-color red_5 #f28779;
+@define-color green_1 #d5ff80;
+@define-color yellow_1 #ffd173;
+@define-color blue_1 #73d0ff;
 @define-color purple_1 #d4bfff;
-@define-color purple_2 #d4bfff;
-@define-color purple_3 #d4bfff;
-@define-color purple_4 #d4bfff;
-@define-color purple_5 #d4bfff;
-@define-color brown_1 #f27983;
-@define-color brown_2 #f27983;
-@define-color brown_3 #f27983;
-@define-color brown_4 #f27983;
-@define-color brown_5 #f27983;
-@define-color light_1 #cccac2;
-@define-color light_2 #cccac2;
-@define-color light_3 #cccac2;
-@define-color light_4 #cccac2;
-@define-color light_5 #cccac2;
-@define-color dark_1 #cccac2;
-@define-color dark_2 #cccac2;
-@define-color dark_3 #cccac2;
-@define-color dark_4 #cccac2;
-@define-color dark_5 #cccac2;
+@define-color teal_1 #95e6cb;
+@define-color orange_1 #ffad66;
+@define-color gray_1 #4a5059;
+
diff --git a/build/base16-aztec.css b/build/base16-aztec.css
index 2d1af42..0a0da84 100644
--- a/build/base16-aztec.css
+++ b/build/base16-aztec.css
@@ -1,88 +1,37 @@
 @define-color accent_color #5b4a9f;
 @define-color accent_bg_color #5b4a9f;
 @define-color accent_fg_color #101600;
-@define-color destructive_color #ee2e00;
-@define-color destructive_bg_color #ee2e00;
-@define-color destructive_fg_color #101600;
-@define-color success_color #63d932;
-@define-color success_bg_color #63d932;
-@define-color success_fg_color #101600;
-@define-color warning_color #883e9f;
-@define-color warning_bg_color #883e9f;
-@define-color warning_fg_color #101600;
-@define-color error_color #ee2e00;
-@define-color error_bg_color #ee2e00;
-@define-color error_fg_color #101600;
+
 @define-color window_bg_color #101600;
 @define-color window_fg_color #ffda51;
+
 @define-color view_bg_color #101600;
 @define-color view_fg_color #ffda51;
-@define-color headerbar_bg_color #1a1e01;
+
+@define-color headerbar_bg_color #101600;
 @define-color headerbar_fg_color #ffda51;
-@define-color headerbar_border_color rgba(0.10196078, 0.11764706, 0.00392157, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #101600;
+@define-color dialog_fg_color #ffda51;
+
+@define-color popover_bg_color #101600;
+@define-color popover_fg_color #ffda51;
+
+
 @define-color sidebar_bg_color #1a1e01;
 @define-color sidebar_fg_color #ffda51;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #1a1e01;
 @define-color card_fg_color #ffda51;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #1a1e01;
-@define-color dialog_fg_color #ffda51;
-@define-color popover_bg_color #1a1e01;
-@define-color popover_fg_color #ffda51;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #242604;
-@define-color blue_1 #5b4a9f;
-@define-color blue_2 #5b4a9f;
-@define-color blue_3 #5b4a9f;
-@define-color blue_4 #5b4a9f;
-@define-color blue_5 #5b4a9f;
-@define-color green_1 #63d932;
-@define-color green_2 #63d932;
-@define-color green_3 #63d932;
-@define-color green_4 #63d932;
-@define-color green_5 #63d932;
-@define-color yellow_1 #eebb00;
-@define-color yellow_2 #eebb00;
-@define-color yellow_3 #eebb00;
-@define-color yellow_4 #eebb00;
-@define-color yellow_5 #eebb00;
-@define-color orange_1 #ee8800;
-@define-color orange_2 #ee8800;
-@define-color orange_3 #ee8800;
-@define-color orange_4 #ee8800;
-@define-color orange_5 #ee8800;
+
+
 @define-color red_1 #ee2e00;
-@define-color red_2 #ee2e00;
-@define-color red_3 #ee2e00;
-@define-color red_4 #ee2e00;
-@define-color red_5 #ee2e00;
+@define-color green_1 #63d932;
+@define-color yellow_1 #eebb00;
+@define-color blue_1 #5b4a9f;
 @define-color purple_1 #883e9f;
-@define-color purple_2 #883e9f;
-@define-color purple_3 #883e9f;
-@define-color purple_4 #883e9f;
-@define-color purple_5 #883e9f;
-@define-color brown_1 #a928b9;
-@define-color brown_2 #a928b9;
-@define-color brown_3 #a928b9;
-@define-color brown_4 #a928b9;
-@define-color brown_5 #a928b9;
-@define-color light_1 #ffda51;
-@define-color light_2 #ffda51;
-@define-color light_3 #ffda51;
-@define-color light_4 #ffda51;
-@define-color light_5 #ffda51;
-@define-color dark_1 #ffda51;
-@define-color dark_2 #ffda51;
-@define-color dark_3 #ffda51;
-@define-color dark_4 #ffda51;
-@define-color dark_5 #ffda51;
+@define-color teal_1 #3d94a5;
+@define-color orange_1 #ee8800;
+@define-color gray_1 #2e2e05;
+
diff --git a/build/base16-bespin.css b/build/base16-bespin.css
index 1b8283b..457f581 100644
--- a/build/base16-bespin.css
+++ b/build/base16-bespin.css
@@ -1,88 +1,37 @@
 @define-color accent_color #5ea6ea;
 @define-color accent_bg_color #5ea6ea;
 @define-color accent_fg_color #28211c;
-@define-color destructive_color #cf6a4c;
-@define-color destructive_bg_color #cf6a4c;
-@define-color destructive_fg_color #28211c;
-@define-color success_color #54be0d;
-@define-color success_bg_color #54be0d;
-@define-color success_fg_color #28211c;
-@define-color warning_color #9b859d;
-@define-color warning_bg_color #9b859d;
-@define-color warning_fg_color #28211c;
-@define-color error_color #cf6a4c;
-@define-color error_bg_color #cf6a4c;
-@define-color error_fg_color #28211c;
+
 @define-color window_bg_color #28211c;
 @define-color window_fg_color #8a8986;
+
 @define-color view_bg_color #28211c;
 @define-color view_fg_color #8a8986;
-@define-color headerbar_bg_color #36312e;
+
+@define-color headerbar_bg_color #28211c;
 @define-color headerbar_fg_color #8a8986;
-@define-color headerbar_border_color rgba(0.21176471, 0.19215686, 0.18039216, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #28211c;
+@define-color dialog_fg_color #8a8986;
+
+@define-color popover_bg_color #28211c;
+@define-color popover_fg_color #8a8986;
+
+
 @define-color sidebar_bg_color #36312e;
 @define-color sidebar_fg_color #8a8986;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #36312e;
 @define-color card_fg_color #8a8986;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #36312e;
-@define-color dialog_fg_color #8a8986;
-@define-color popover_bg_color #36312e;
-@define-color popover_fg_color #8a8986;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #5e5d5c;
-@define-color blue_1 #5ea6ea;
-@define-color blue_2 #5ea6ea;
-@define-color blue_3 #5ea6ea;
-@define-color blue_4 #5ea6ea;
-@define-color blue_5 #5ea6ea;
-@define-color green_1 #54be0d;
-@define-color green_2 #54be0d;
-@define-color green_3 #54be0d;
-@define-color green_4 #54be0d;
-@define-color green_5 #54be0d;
-@define-color yellow_1 #f9ee98;
-@define-color yellow_2 #f9ee98;
-@define-color yellow_3 #f9ee98;
-@define-color yellow_4 #f9ee98;
-@define-color yellow_5 #f9ee98;
-@define-color orange_1 #cf7d34;
-@define-color orange_2 #cf7d34;
-@define-color orange_3 #cf7d34;
-@define-color orange_4 #cf7d34;
-@define-color orange_5 #cf7d34;
+
+
 @define-color red_1 #cf6a4c;
-@define-color red_2 #cf6a4c;
-@define-color red_3 #cf6a4c;
-@define-color red_4 #cf6a4c;
-@define-color red_5 #cf6a4c;
+@define-color green_1 #54be0d;
+@define-color yellow_1 #f9ee98;
+@define-color blue_1 #5ea6ea;
 @define-color purple_1 #9b859d;
-@define-color purple_2 #9b859d;
-@define-color purple_3 #9b859d;
-@define-color purple_4 #9b859d;
-@define-color purple_5 #9b859d;
-@define-color brown_1 #937121;
-@define-color brown_2 #937121;
-@define-color brown_3 #937121;
-@define-color brown_4 #937121;
-@define-color brown_5 #937121;
-@define-color light_1 #8a8986;
-@define-color light_2 #8a8986;
-@define-color light_3 #8a8986;
-@define-color light_4 #8a8986;
-@define-color light_5 #8a8986;
-@define-color dark_1 #8a8986;
-@define-color dark_2 #8a8986;
-@define-color dark_3 #8a8986;
-@define-color dark_4 #8a8986;
-@define-color dark_5 #8a8986;
+@define-color teal_1 #afc4db;
+@define-color orange_1 #cf7d34;
+@define-color gray_1 #666666;
+
diff --git a/build/base16-black-metal-bathory.css b/build/base16-black-metal-bathory.css
index 969bf69..3cc9fa0 100644
--- a/build/base16-black-metal-bathory.css
+++ b/build/base16-black-metal-bathory.css
@@ -1,88 +1,37 @@
 @define-color accent_color #888888;
 @define-color accent_bg_color #888888;
 @define-color accent_fg_color #000000;
-@define-color destructive_color #5f8787;
-@define-color destructive_bg_color #5f8787;
-@define-color destructive_fg_color #000000;
-@define-color success_color #fbcb97;
-@define-color success_bg_color #fbcb97;
-@define-color success_fg_color #000000;
-@define-color warning_color #999999;
-@define-color warning_bg_color #999999;
-@define-color warning_fg_color #000000;
-@define-color error_color #5f8787;
-@define-color error_bg_color #5f8787;
-@define-color error_fg_color #000000;
+
 @define-color window_bg_color #000000;
 @define-color window_fg_color #c1c1c1;
+
 @define-color view_bg_color #000000;
 @define-color view_fg_color #c1c1c1;
-@define-color headerbar_bg_color #121212;
+
+@define-color headerbar_bg_color #000000;
 @define-color headerbar_fg_color #c1c1c1;
-@define-color headerbar_border_color rgba(0.07058824, 0.07058824, 0.07058824, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #000000;
+@define-color dialog_fg_color #c1c1c1;
+
+@define-color popover_bg_color #000000;
+@define-color popover_fg_color #c1c1c1;
+
+
 @define-color sidebar_bg_color #121212;
 @define-color sidebar_fg_color #c1c1c1;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #121212;
 @define-color card_fg_color #c1c1c1;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #121212;
-@define-color dialog_fg_color #c1c1c1;
-@define-color popover_bg_color #121212;
-@define-color popover_fg_color #c1c1c1;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #222222;
-@define-color blue_1 #888888;
-@define-color blue_2 #888888;
-@define-color blue_3 #888888;
-@define-color blue_4 #888888;
-@define-color blue_5 #888888;
-@define-color green_1 #fbcb97;
-@define-color green_2 #fbcb97;
-@define-color green_3 #fbcb97;
-@define-color green_4 #fbcb97;
-@define-color green_5 #fbcb97;
-@define-color yellow_1 #e78a53;
-@define-color yellow_2 #e78a53;
-@define-color yellow_3 #e78a53;
-@define-color yellow_4 #e78a53;
-@define-color yellow_5 #e78a53;
-@define-color orange_1 #aaaaaa;
-@define-color orange_2 #aaaaaa;
-@define-color orange_3 #aaaaaa;
-@define-color orange_4 #aaaaaa;
-@define-color orange_5 #aaaaaa;
+
+
 @define-color red_1 #5f8787;
-@define-color red_2 #5f8787;
-@define-color red_3 #5f8787;
-@define-color red_4 #5f8787;
-@define-color red_5 #5f8787;
+@define-color green_1 #fbcb97;
+@define-color yellow_1 #e78a53;
+@define-color blue_1 #888888;
 @define-color purple_1 #999999;
-@define-color purple_2 #999999;
-@define-color purple_3 #999999;
-@define-color purple_4 #999999;
-@define-color purple_5 #999999;
-@define-color brown_1 #444444;
-@define-color brown_2 #444444;
-@define-color brown_3 #444444;
-@define-color brown_4 #444444;
-@define-color brown_5 #444444;
-@define-color light_1 #c1c1c1;
-@define-color light_2 #c1c1c1;
-@define-color light_3 #c1c1c1;
-@define-color light_4 #c1c1c1;
-@define-color light_5 #c1c1c1;
-@define-color dark_1 #c1c1c1;
-@define-color dark_2 #c1c1c1;
-@define-color dark_3 #c1c1c1;
-@define-color dark_4 #c1c1c1;
-@define-color dark_5 #c1c1c1;
+@define-color teal_1 #aaaaaa;
+@define-color orange_1 #aaaaaa;
+@define-color gray_1 #333333;
+
diff --git a/build/base16-black-metal-burzum.css b/build/base16-black-metal-burzum.css
index 7d097c2..4849636 100644
--- a/build/base16-black-metal-burzum.css
+++ b/build/base16-black-metal-burzum.css
@@ -1,88 +1,37 @@
 @define-color accent_color #888888;
 @define-color accent_bg_color #888888;
 @define-color accent_fg_color #000000;
-@define-color destructive_color #5f8787;
-@define-color destructive_bg_color #5f8787;
-@define-color destructive_fg_color #000000;
-@define-color success_color #ddeecc;
-@define-color success_bg_color #ddeecc;
-@define-color success_fg_color #000000;
-@define-color warning_color #999999;
-@define-color warning_bg_color #999999;
-@define-color warning_fg_color #000000;
-@define-color error_color #5f8787;
-@define-color error_bg_color #5f8787;
-@define-color error_fg_color #000000;
+
 @define-color window_bg_color #000000;
 @define-color window_fg_color #c1c1c1;
+
 @define-color view_bg_color #000000;
 @define-color view_fg_color #c1c1c1;
-@define-color headerbar_bg_color #121212;
+
+@define-color headerbar_bg_color #000000;
 @define-color headerbar_fg_color #c1c1c1;
-@define-color headerbar_border_color rgba(0.07058824, 0.07058824, 0.07058824, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #000000;
+@define-color dialog_fg_color #c1c1c1;
+
+@define-color popover_bg_color #000000;
+@define-color popover_fg_color #c1c1c1;
+
+
 @define-color sidebar_bg_color #121212;
 @define-color sidebar_fg_color #c1c1c1;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #121212;
 @define-color card_fg_color #c1c1c1;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #121212;
-@define-color dialog_fg_color #c1c1c1;
-@define-color popover_bg_color #121212;
-@define-color popover_fg_color #c1c1c1;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #222222;
-@define-color blue_1 #888888;
-@define-color blue_2 #888888;
-@define-color blue_3 #888888;
-@define-color blue_4 #888888;
-@define-color blue_5 #888888;
-@define-color green_1 #ddeecc;
-@define-color green_2 #ddeecc;
-@define-color green_3 #ddeecc;
-@define-color green_4 #ddeecc;
-@define-color green_5 #ddeecc;
-@define-color yellow_1 #99bbaa;
-@define-color yellow_2 #99bbaa;
-@define-color yellow_3 #99bbaa;
-@define-color yellow_4 #99bbaa;
-@define-color yellow_5 #99bbaa;
-@define-color orange_1 #aaaaaa;
-@define-color orange_2 #aaaaaa;
-@define-color orange_3 #aaaaaa;
-@define-color orange_4 #aaaaaa;
-@define-color orange_5 #aaaaaa;
+
+
 @define-color red_1 #5f8787;
-@define-color red_2 #5f8787;
-@define-color red_3 #5f8787;
-@define-color red_4 #5f8787;
-@define-color red_5 #5f8787;
+@define-color green_1 #ddeecc;
+@define-color yellow_1 #99bbaa;
+@define-color blue_1 #888888;
 @define-color purple_1 #999999;
-@define-color purple_2 #999999;
-@define-color purple_3 #999999;
-@define-color purple_4 #999999;
-@define-color purple_5 #999999;
-@define-color brown_1 #444444;
-@define-color brown_2 #444444;
-@define-color brown_3 #444444;
-@define-color brown_4 #444444;
-@define-color brown_5 #444444;
-@define-color light_1 #c1c1c1;
-@define-color light_2 #c1c1c1;
-@define-color light_3 #c1c1c1;
-@define-color light_4 #c1c1c1;
-@define-color light_5 #c1c1c1;
-@define-color dark_1 #c1c1c1;
-@define-color dark_2 #c1c1c1;
-@define-color dark_3 #c1c1c1;
-@define-color dark_4 #c1c1c1;
-@define-color dark_5 #c1c1c1;
+@define-color teal_1 #aaaaaa;
+@define-color orange_1 #aaaaaa;
+@define-color gray_1 #333333;
+
diff --git a/build/base16-black-metal-dark-funeral.css b/build/base16-black-metal-dark-funeral.css
index 9392010..67d4091 100644
--- a/build/base16-black-metal-dark-funeral.css
+++ b/build/base16-black-metal-dark-funeral.css
@@ -1,88 +1,37 @@
 @define-color accent_color #888888;
 @define-color accent_bg_color #888888;
 @define-color accent_fg_color #000000;
-@define-color destructive_color #5f8787;
-@define-color destructive_bg_color #5f8787;
-@define-color destructive_fg_color #000000;
-@define-color success_color #d0dfee;
-@define-color success_bg_color #d0dfee;
-@define-color success_fg_color #000000;
-@define-color warning_color #999999;
-@define-color warning_bg_color #999999;
-@define-color warning_fg_color #000000;
-@define-color error_color #5f8787;
-@define-color error_bg_color #5f8787;
-@define-color error_fg_color #000000;
+
 @define-color window_bg_color #000000;
 @define-color window_fg_color #c1c1c1;
+
 @define-color view_bg_color #000000;
 @define-color view_fg_color #c1c1c1;
-@define-color headerbar_bg_color #121212;
+
+@define-color headerbar_bg_color #000000;
 @define-color headerbar_fg_color #c1c1c1;
-@define-color headerbar_border_color rgba(0.07058824, 0.07058824, 0.07058824, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #000000;
+@define-color dialog_fg_color #c1c1c1;
+
+@define-color popover_bg_color #000000;
+@define-color popover_fg_color #c1c1c1;
+
+
 @define-color sidebar_bg_color #121212;
 @define-color sidebar_fg_color #c1c1c1;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #121212;
 @define-color card_fg_color #c1c1c1;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #121212;
-@define-color dialog_fg_color #c1c1c1;
-@define-color popover_bg_color #121212;
-@define-color popover_fg_color #c1c1c1;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #222222;
-@define-color blue_1 #888888;
-@define-color blue_2 #888888;
-@define-color blue_3 #888888;
-@define-color blue_4 #888888;
-@define-color blue_5 #888888;
-@define-color green_1 #d0dfee;
-@define-color green_2 #d0dfee;
-@define-color green_3 #d0dfee;
-@define-color green_4 #d0dfee;
-@define-color green_5 #d0dfee;
-@define-color yellow_1 #5f81a5;
-@define-color yellow_2 #5f81a5;
-@define-color yellow_3 #5f81a5;
-@define-color yellow_4 #5f81a5;
-@define-color yellow_5 #5f81a5;
-@define-color orange_1 #aaaaaa;
-@define-color orange_2 #aaaaaa;
-@define-color orange_3 #aaaaaa;
-@define-color orange_4 #aaaaaa;
-@define-color orange_5 #aaaaaa;
+
+
 @define-color red_1 #5f8787;
-@define-color red_2 #5f8787;
-@define-color red_3 #5f8787;
-@define-color red_4 #5f8787;
-@define-color red_5 #5f8787;
+@define-color green_1 #d0dfee;
+@define-color yellow_1 #5f81a5;
+@define-color blue_1 #888888;
 @define-color purple_1 #999999;
-@define-color purple_2 #999999;
-@define-color purple_3 #999999;
-@define-color purple_4 #999999;
-@define-color purple_5 #999999;
-@define-color brown_1 #444444;
-@define-color brown_2 #444444;
-@define-color brown_3 #444444;
-@define-color brown_4 #444444;
-@define-color brown_5 #444444;
-@define-color light_1 #c1c1c1;
-@define-color light_2 #c1c1c1;
-@define-color light_3 #c1c1c1;
-@define-color light_4 #c1c1c1;
-@define-color light_5 #c1c1c1;
-@define-color dark_1 #c1c1c1;
-@define-color dark_2 #c1c1c1;
-@define-color dark_3 #c1c1c1;
-@define-color dark_4 #c1c1c1;
-@define-color dark_5 #c1c1c1;
+@define-color teal_1 #aaaaaa;
+@define-color orange_1 #aaaaaa;
+@define-color gray_1 #333333;
+
diff --git a/build/base16-black-metal-gorgoroth.css b/build/base16-black-metal-gorgoroth.css
index 80e62c3..e2dfadb 100644
--- a/build/base16-black-metal-gorgoroth.css
+++ b/build/base16-black-metal-gorgoroth.css
@@ -1,88 +1,37 @@
 @define-color accent_color #888888;
 @define-color accent_bg_color #888888;
 @define-color accent_fg_color #000000;
-@define-color destructive_color #5f8787;
-@define-color destructive_bg_color #5f8787;
-@define-color destructive_fg_color #000000;
-@define-color success_color #9b8d7f;
-@define-color success_bg_color #9b8d7f;
-@define-color success_fg_color #000000;
-@define-color warning_color #999999;
-@define-color warning_bg_color #999999;
-@define-color warning_fg_color #000000;
-@define-color error_color #5f8787;
-@define-color error_bg_color #5f8787;
-@define-color error_fg_color #000000;
+
 @define-color window_bg_color #000000;
 @define-color window_fg_color #c1c1c1;
+
 @define-color view_bg_color #000000;
 @define-color view_fg_color #c1c1c1;
-@define-color headerbar_bg_color #121212;
+
+@define-color headerbar_bg_color #000000;
 @define-color headerbar_fg_color #c1c1c1;
-@define-color headerbar_border_color rgba(0.07058824, 0.07058824, 0.07058824, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #000000;
+@define-color dialog_fg_color #c1c1c1;
+
+@define-color popover_bg_color #000000;
+@define-color popover_fg_color #c1c1c1;
+
+
 @define-color sidebar_bg_color #121212;
 @define-color sidebar_fg_color #c1c1c1;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #121212;
 @define-color card_fg_color #c1c1c1;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #121212;
-@define-color dialog_fg_color #c1c1c1;
-@define-color popover_bg_color #121212;
-@define-color popover_fg_color #c1c1c1;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #222222;
-@define-color blue_1 #888888;
-@define-color blue_2 #888888;
-@define-color blue_3 #888888;
-@define-color blue_4 #888888;
-@define-color blue_5 #888888;
-@define-color green_1 #9b8d7f;
-@define-color green_2 #9b8d7f;
-@define-color green_3 #9b8d7f;
-@define-color green_4 #9b8d7f;
-@define-color green_5 #9b8d7f;
-@define-color yellow_1 #8c7f70;
-@define-color yellow_2 #8c7f70;
-@define-color yellow_3 #8c7f70;
-@define-color yellow_4 #8c7f70;
-@define-color yellow_5 #8c7f70;
-@define-color orange_1 #aaaaaa;
-@define-color orange_2 #aaaaaa;
-@define-color orange_3 #aaaaaa;
-@define-color orange_4 #aaaaaa;
-@define-color orange_5 #aaaaaa;
+
+
 @define-color red_1 #5f8787;
-@define-color red_2 #5f8787;
-@define-color red_3 #5f8787;
-@define-color red_4 #5f8787;
-@define-color red_5 #5f8787;
+@define-color green_1 #9b8d7f;
+@define-color yellow_1 #8c7f70;
+@define-color blue_1 #888888;
 @define-color purple_1 #999999;
-@define-color purple_2 #999999;
-@define-color purple_3 #999999;
-@define-color purple_4 #999999;
-@define-color purple_5 #999999;
-@define-color brown_1 #444444;
-@define-color brown_2 #444444;
-@define-color brown_3 #444444;
-@define-color brown_4 #444444;
-@define-color brown_5 #444444;
-@define-color light_1 #c1c1c1;
-@define-color light_2 #c1c1c1;
-@define-color light_3 #c1c1c1;
-@define-color light_4 #c1c1c1;
-@define-color light_5 #c1c1c1;
-@define-color dark_1 #c1c1c1;
-@define-color dark_2 #c1c1c1;
-@define-color dark_3 #c1c1c1;
-@define-color dark_4 #c1c1c1;
-@define-color dark_5 #c1c1c1;
+@define-color teal_1 #aaaaaa;
+@define-color orange_1 #aaaaaa;
+@define-color gray_1 #333333;
+
diff --git a/build/base16-black-metal-immortal.css b/build/base16-black-metal-immortal.css
index fd84468..030821f 100644
--- a/build/base16-black-metal-immortal.css
+++ b/build/base16-black-metal-immortal.css
@@ -1,88 +1,37 @@
 @define-color accent_color #888888;
 @define-color accent_bg_color #888888;
 @define-color accent_fg_color #000000;
-@define-color destructive_color #5f8787;
-@define-color destructive_bg_color #5f8787;
-@define-color destructive_fg_color #000000;
-@define-color success_color #7799bb;
-@define-color success_bg_color #7799bb;
-@define-color success_fg_color #000000;
-@define-color warning_color #999999;
-@define-color warning_bg_color #999999;
-@define-color warning_fg_color #000000;
-@define-color error_color #5f8787;
-@define-color error_bg_color #5f8787;
-@define-color error_fg_color #000000;
+
 @define-color window_bg_color #000000;
 @define-color window_fg_color #c1c1c1;
+
 @define-color view_bg_color #000000;
 @define-color view_fg_color #c1c1c1;
-@define-color headerbar_bg_color #121212;
+
+@define-color headerbar_bg_color #000000;
 @define-color headerbar_fg_color #c1c1c1;
-@define-color headerbar_border_color rgba(0.07058824, 0.07058824, 0.07058824, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #000000;
+@define-color dialog_fg_color #c1c1c1;
+
+@define-color popover_bg_color #000000;
+@define-color popover_fg_color #c1c1c1;
+
+
 @define-color sidebar_bg_color #121212;
 @define-color sidebar_fg_color #c1c1c1;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #121212;
 @define-color card_fg_color #c1c1c1;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #121212;
-@define-color dialog_fg_color #c1c1c1;
-@define-color popover_bg_color #121212;
-@define-color popover_fg_color #c1c1c1;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #222222;
-@define-color blue_1 #888888;
-@define-color blue_2 #888888;
-@define-color blue_3 #888888;
-@define-color blue_4 #888888;
-@define-color blue_5 #888888;
-@define-color green_1 #7799bb;
-@define-color green_2 #7799bb;
-@define-color green_3 #7799bb;
-@define-color green_4 #7799bb;
-@define-color green_5 #7799bb;
-@define-color yellow_1 #556677;
-@define-color yellow_2 #556677;
-@define-color yellow_3 #556677;
-@define-color yellow_4 #556677;
-@define-color yellow_5 #556677;
-@define-color orange_1 #aaaaaa;
-@define-color orange_2 #aaaaaa;
-@define-color orange_3 #aaaaaa;
-@define-color orange_4 #aaaaaa;
-@define-color orange_5 #aaaaaa;
+
+
 @define-color red_1 #5f8787;
-@define-color red_2 #5f8787;
-@define-color red_3 #5f8787;
-@define-color red_4 #5f8787;
-@define-color red_5 #5f8787;
+@define-color green_1 #7799bb;
+@define-color yellow_1 #556677;
+@define-color blue_1 #888888;
 @define-color purple_1 #999999;
-@define-color purple_2 #999999;
-@define-color purple_3 #999999;
-@define-color purple_4 #999999;
-@define-color purple_5 #999999;
-@define-color brown_1 #444444;
-@define-color brown_2 #444444;
-@define-color brown_3 #444444;
-@define-color brown_4 #444444;
-@define-color brown_5 #444444;
-@define-color light_1 #c1c1c1;
-@define-color light_2 #c1c1c1;
-@define-color light_3 #c1c1c1;
-@define-color light_4 #c1c1c1;
-@define-color light_5 #c1c1c1;
-@define-color dark_1 #c1c1c1;
-@define-color dark_2 #c1c1c1;
-@define-color dark_3 #c1c1c1;
-@define-color dark_4 #c1c1c1;
-@define-color dark_5 #c1c1c1;
+@define-color teal_1 #aaaaaa;
+@define-color orange_1 #aaaaaa;
+@define-color gray_1 #333333;
+
diff --git a/build/base16-black-metal-khold.css b/build/base16-black-metal-khold.css
index a8d964d..14003c4 100644
--- a/build/base16-black-metal-khold.css
+++ b/build/base16-black-metal-khold.css
@@ -1,88 +1,37 @@
 @define-color accent_color #888888;
 @define-color accent_bg_color #888888;
 @define-color accent_fg_color #000000;
-@define-color destructive_color #5f8787;
-@define-color destructive_bg_color #5f8787;
-@define-color destructive_fg_color #000000;
-@define-color success_color #eceee3;
-@define-color success_bg_color #eceee3;
-@define-color success_fg_color #000000;
-@define-color warning_color #999999;
-@define-color warning_bg_color #999999;
-@define-color warning_fg_color #000000;
-@define-color error_color #5f8787;
-@define-color error_bg_color #5f8787;
-@define-color error_fg_color #000000;
+
 @define-color window_bg_color #000000;
 @define-color window_fg_color #c1c1c1;
+
 @define-color view_bg_color #000000;
 @define-color view_fg_color #c1c1c1;
-@define-color headerbar_bg_color #121212;
+
+@define-color headerbar_bg_color #000000;
 @define-color headerbar_fg_color #c1c1c1;
-@define-color headerbar_border_color rgba(0.07058824, 0.07058824, 0.07058824, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #000000;
+@define-color dialog_fg_color #c1c1c1;
+
+@define-color popover_bg_color #000000;
+@define-color popover_fg_color #c1c1c1;
+
+
 @define-color sidebar_bg_color #121212;
 @define-color sidebar_fg_color #c1c1c1;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #121212;
 @define-color card_fg_color #c1c1c1;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #121212;
-@define-color dialog_fg_color #c1c1c1;
-@define-color popover_bg_color #121212;
-@define-color popover_fg_color #c1c1c1;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #222222;
-@define-color blue_1 #888888;
-@define-color blue_2 #888888;
-@define-color blue_3 #888888;
-@define-color blue_4 #888888;
-@define-color blue_5 #888888;
-@define-color green_1 #eceee3;
-@define-color green_2 #eceee3;
-@define-color green_3 #eceee3;
-@define-color green_4 #eceee3;
-@define-color green_5 #eceee3;
-@define-color yellow_1 #974b46;
-@define-color yellow_2 #974b46;
-@define-color yellow_3 #974b46;
-@define-color yellow_4 #974b46;
-@define-color yellow_5 #974b46;
-@define-color orange_1 #aaaaaa;
-@define-color orange_2 #aaaaaa;
-@define-color orange_3 #aaaaaa;
-@define-color orange_4 #aaaaaa;
-@define-color orange_5 #aaaaaa;
+
+
 @define-color red_1 #5f8787;
-@define-color red_2 #5f8787;
-@define-color red_3 #5f8787;
-@define-color red_4 #5f8787;
-@define-color red_5 #5f8787;
+@define-color green_1 #eceee3;
+@define-color yellow_1 #974b46;
+@define-color blue_1 #888888;
 @define-color purple_1 #999999;
-@define-color purple_2 #999999;
-@define-color purple_3 #999999;
-@define-color purple_4 #999999;
-@define-color purple_5 #999999;
-@define-color brown_1 #444444;
-@define-color brown_2 #444444;
-@define-color brown_3 #444444;
-@define-color brown_4 #444444;
-@define-color brown_5 #444444;
-@define-color light_1 #c1c1c1;
-@define-color light_2 #c1c1c1;
-@define-color light_3 #c1c1c1;
-@define-color light_4 #c1c1c1;
-@define-color light_5 #c1c1c1;
-@define-color dark_1 #c1c1c1;
-@define-color dark_2 #c1c1c1;
-@define-color dark_3 #c1c1c1;
-@define-color dark_4 #c1c1c1;
-@define-color dark_5 #c1c1c1;
+@define-color teal_1 #aaaaaa;
+@define-color orange_1 #aaaaaa;
+@define-color gray_1 #333333;
+
diff --git a/build/base16-black-metal-marduk.css b/build/base16-black-metal-marduk.css
index bf3cf92..dfcd9a7 100644
--- a/build/base16-black-metal-marduk.css
+++ b/build/base16-black-metal-marduk.css
@@ -1,88 +1,37 @@
 @define-color accent_color #888888;
 @define-color accent_bg_color #888888;
 @define-color accent_fg_color #000000;
-@define-color destructive_color #5f8787;
-@define-color destructive_bg_color #5f8787;
-@define-color destructive_fg_color #000000;
-@define-color success_color #a5aaa7;
-@define-color success_bg_color #a5aaa7;
-@define-color success_fg_color #000000;
-@define-color warning_color #999999;
-@define-color warning_bg_color #999999;
-@define-color warning_fg_color #000000;
-@define-color error_color #5f8787;
-@define-color error_bg_color #5f8787;
-@define-color error_fg_color #000000;
+
 @define-color window_bg_color #000000;
 @define-color window_fg_color #c1c1c1;
+
 @define-color view_bg_color #000000;
 @define-color view_fg_color #c1c1c1;
-@define-color headerbar_bg_color #121212;
+
+@define-color headerbar_bg_color #000000;
 @define-color headerbar_fg_color #c1c1c1;
-@define-color headerbar_border_color rgba(0.07058824, 0.07058824, 0.07058824, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #000000;
+@define-color dialog_fg_color #c1c1c1;
+
+@define-color popover_bg_color #000000;
+@define-color popover_fg_color #c1c1c1;
+
+
 @define-color sidebar_bg_color #121212;
 @define-color sidebar_fg_color #c1c1c1;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #121212;
 @define-color card_fg_color #c1c1c1;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #121212;
-@define-color dialog_fg_color #c1c1c1;
-@define-color popover_bg_color #121212;
-@define-color popover_fg_color #c1c1c1;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #222222;
-@define-color blue_1 #888888;
-@define-color blue_2 #888888;
-@define-color blue_3 #888888;
-@define-color blue_4 #888888;
-@define-color blue_5 #888888;
-@define-color green_1 #a5aaa7;
-@define-color green_2 #a5aaa7;
-@define-color green_3 #a5aaa7;
-@define-color green_4 #a5aaa7;
-@define-color green_5 #a5aaa7;
-@define-color yellow_1 #626b67;
-@define-color yellow_2 #626b67;
-@define-color yellow_3 #626b67;
-@define-color yellow_4 #626b67;
-@define-color yellow_5 #626b67;
-@define-color orange_1 #aaaaaa;
-@define-color orange_2 #aaaaaa;
-@define-color orange_3 #aaaaaa;
-@define-color orange_4 #aaaaaa;
-@define-color orange_5 #aaaaaa;
+
+
 @define-color red_1 #5f8787;
-@define-color red_2 #5f8787;
-@define-color red_3 #5f8787;
-@define-color red_4 #5f8787;
-@define-color red_5 #5f8787;
+@define-color green_1 #a5aaa7;
+@define-color yellow_1 #626b67;
+@define-color blue_1 #888888;
 @define-color purple_1 #999999;
-@define-color purple_2 #999999;
-@define-color purple_3 #999999;
-@define-color purple_4 #999999;
-@define-color purple_5 #999999;
-@define-color brown_1 #444444;
-@define-color brown_2 #444444;
-@define-color brown_3 #444444;
-@define-color brown_4 #444444;
-@define-color brown_5 #444444;
-@define-color light_1 #c1c1c1;
-@define-color light_2 #c1c1c1;
-@define-color light_3 #c1c1c1;
-@define-color light_4 #c1c1c1;
-@define-color light_5 #c1c1c1;
-@define-color dark_1 #c1c1c1;
-@define-color dark_2 #c1c1c1;
-@define-color dark_3 #c1c1c1;
-@define-color dark_4 #c1c1c1;
-@define-color dark_5 #c1c1c1;
+@define-color teal_1 #aaaaaa;
+@define-color orange_1 #aaaaaa;
+@define-color gray_1 #333333;
+
diff --git a/build/base16-black-metal-mayhem.css b/build/base16-black-metal-mayhem.css
index e69f557..f4735ea 100644
--- a/build/base16-black-metal-mayhem.css
+++ b/build/base16-black-metal-mayhem.css
@@ -1,88 +1,37 @@
 @define-color accent_color #888888;
 @define-color accent_bg_color #888888;
 @define-color accent_fg_color #000000;
-@define-color destructive_color #5f8787;
-@define-color destructive_bg_color #5f8787;
-@define-color destructive_fg_color #000000;
-@define-color success_color #f3ecd4;
-@define-color success_bg_color #f3ecd4;
-@define-color success_fg_color #000000;
-@define-color warning_color #999999;
-@define-color warning_bg_color #999999;
-@define-color warning_fg_color #000000;
-@define-color error_color #5f8787;
-@define-color error_bg_color #5f8787;
-@define-color error_fg_color #000000;
+
 @define-color window_bg_color #000000;
 @define-color window_fg_color #c1c1c1;
+
 @define-color view_bg_color #000000;
 @define-color view_fg_color #c1c1c1;
-@define-color headerbar_bg_color #121212;
+
+@define-color headerbar_bg_color #000000;
 @define-color headerbar_fg_color #c1c1c1;
-@define-color headerbar_border_color rgba(0.07058824, 0.07058824, 0.07058824, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #000000;
+@define-color dialog_fg_color #c1c1c1;
+
+@define-color popover_bg_color #000000;
+@define-color popover_fg_color #c1c1c1;
+
+
 @define-color sidebar_bg_color #121212;
 @define-color sidebar_fg_color #c1c1c1;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #121212;
 @define-color card_fg_color #c1c1c1;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #121212;
-@define-color dialog_fg_color #c1c1c1;
-@define-color popover_bg_color #121212;
-@define-color popover_fg_color #c1c1c1;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #222222;
-@define-color blue_1 #888888;
-@define-color blue_2 #888888;
-@define-color blue_3 #888888;
-@define-color blue_4 #888888;
-@define-color blue_5 #888888;
-@define-color green_1 #f3ecd4;
-@define-color green_2 #f3ecd4;
-@define-color green_3 #f3ecd4;
-@define-color green_4 #f3ecd4;
-@define-color green_5 #f3ecd4;
-@define-color yellow_1 #eecc6c;
-@define-color yellow_2 #eecc6c;
-@define-color yellow_3 #eecc6c;
-@define-color yellow_4 #eecc6c;
-@define-color yellow_5 #eecc6c;
-@define-color orange_1 #aaaaaa;
-@define-color orange_2 #aaaaaa;
-@define-color orange_3 #aaaaaa;
-@define-color orange_4 #aaaaaa;
-@define-color orange_5 #aaaaaa;
+
+
 @define-color red_1 #5f8787;
-@define-color red_2 #5f8787;
-@define-color red_3 #5f8787;
-@define-color red_4 #5f8787;
-@define-color red_5 #5f8787;
+@define-color green_1 #f3ecd4;
+@define-color yellow_1 #eecc6c;
+@define-color blue_1 #888888;
 @define-color purple_1 #999999;
-@define-color purple_2 #999999;
-@define-color purple_3 #999999;
-@define-color purple_4 #999999;
-@define-color purple_5 #999999;
-@define-color brown_1 #444444;
-@define-color brown_2 #444444;
-@define-color brown_3 #444444;
-@define-color brown_4 #444444;
-@define-color brown_5 #444444;
-@define-color light_1 #c1c1c1;
-@define-color light_2 #c1c1c1;
-@define-color light_3 #c1c1c1;
-@define-color light_4 #c1c1c1;
-@define-color light_5 #c1c1c1;
-@define-color dark_1 #c1c1c1;
-@define-color dark_2 #c1c1c1;
-@define-color dark_3 #c1c1c1;
-@define-color dark_4 #c1c1c1;
-@define-color dark_5 #c1c1c1;
+@define-color teal_1 #aaaaaa;
+@define-color orange_1 #aaaaaa;
+@define-color gray_1 #333333;
+
diff --git a/build/base16-black-metal-nile.css b/build/base16-black-metal-nile.css
index 5391210..c10a9ef 100644
--- a/build/base16-black-metal-nile.css
+++ b/build/base16-black-metal-nile.css
@@ -1,88 +1,37 @@
 @define-color accent_color #888888;
 @define-color accent_bg_color #888888;
 @define-color accent_fg_color #000000;
-@define-color destructive_color #5f8787;
-@define-color destructive_bg_color #5f8787;
-@define-color destructive_fg_color #000000;
-@define-color success_color #aa9988;
-@define-color success_bg_color #aa9988;
-@define-color success_fg_color #000000;
-@define-color warning_color #999999;
-@define-color warning_bg_color #999999;
-@define-color warning_fg_color #000000;
-@define-color error_color #5f8787;
-@define-color error_bg_color #5f8787;
-@define-color error_fg_color #000000;
+
 @define-color window_bg_color #000000;
 @define-color window_fg_color #c1c1c1;
+
 @define-color view_bg_color #000000;
 @define-color view_fg_color #c1c1c1;
-@define-color headerbar_bg_color #121212;
+
+@define-color headerbar_bg_color #000000;
 @define-color headerbar_fg_color #c1c1c1;
-@define-color headerbar_border_color rgba(0.07058824, 0.07058824, 0.07058824, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #000000;
+@define-color dialog_fg_color #c1c1c1;
+
+@define-color popover_bg_color #000000;
+@define-color popover_fg_color #c1c1c1;
+
+
 @define-color sidebar_bg_color #121212;
 @define-color sidebar_fg_color #c1c1c1;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #121212;
 @define-color card_fg_color #c1c1c1;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #121212;
-@define-color dialog_fg_color #c1c1c1;
-@define-color popover_bg_color #121212;
-@define-color popover_fg_color #c1c1c1;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #222222;
-@define-color blue_1 #888888;
-@define-color blue_2 #888888;
-@define-color blue_3 #888888;
-@define-color blue_4 #888888;
-@define-color blue_5 #888888;
-@define-color green_1 #aa9988;
-@define-color green_2 #aa9988;
-@define-color green_3 #aa9988;
-@define-color green_4 #aa9988;
-@define-color green_5 #aa9988;
-@define-color yellow_1 #777755;
-@define-color yellow_2 #777755;
-@define-color yellow_3 #777755;
-@define-color yellow_4 #777755;
-@define-color yellow_5 #777755;
-@define-color orange_1 #aaaaaa;
-@define-color orange_2 #aaaaaa;
-@define-color orange_3 #aaaaaa;
-@define-color orange_4 #aaaaaa;
-@define-color orange_5 #aaaaaa;
+
+
 @define-color red_1 #5f8787;
-@define-color red_2 #5f8787;
-@define-color red_3 #5f8787;
-@define-color red_4 #5f8787;
-@define-color red_5 #5f8787;
+@define-color green_1 #aa9988;
+@define-color yellow_1 #777755;
+@define-color blue_1 #888888;
 @define-color purple_1 #999999;
-@define-color purple_2 #999999;
-@define-color purple_3 #999999;
-@define-color purple_4 #999999;
-@define-color purple_5 #999999;
-@define-color brown_1 #444444;
-@define-color brown_2 #444444;
-@define-color brown_3 #444444;
-@define-color brown_4 #444444;
-@define-color brown_5 #444444;
-@define-color light_1 #c1c1c1;
-@define-color light_2 #c1c1c1;
-@define-color light_3 #c1c1c1;
-@define-color light_4 #c1c1c1;
-@define-color light_5 #c1c1c1;
-@define-color dark_1 #c1c1c1;
-@define-color dark_2 #c1c1c1;
-@define-color dark_3 #c1c1c1;
-@define-color dark_4 #c1c1c1;
-@define-color dark_5 #c1c1c1;
+@define-color teal_1 #aaaaaa;
+@define-color orange_1 #aaaaaa;
+@define-color gray_1 #333333;
+
diff --git a/build/base16-black-metal-venom.css b/build/base16-black-metal-venom.css
index bb04682..fe0ca9e 100644
--- a/build/base16-black-metal-venom.css
+++ b/build/base16-black-metal-venom.css
@@ -1,88 +1,37 @@
 @define-color accent_color #888888;
 @define-color accent_bg_color #888888;
 @define-color accent_fg_color #000000;
-@define-color destructive_color #5f8787;
-@define-color destructive_bg_color #5f8787;
-@define-color destructive_fg_color #000000;
-@define-color success_color #f8f7f2;
-@define-color success_bg_color #f8f7f2;
-@define-color success_fg_color #000000;
-@define-color warning_color #999999;
-@define-color warning_bg_color #999999;
-@define-color warning_fg_color #000000;
-@define-color error_color #5f8787;
-@define-color error_bg_color #5f8787;
-@define-color error_fg_color #000000;
+
 @define-color window_bg_color #000000;
 @define-color window_fg_color #c1c1c1;
+
 @define-color view_bg_color #000000;
 @define-color view_fg_color #c1c1c1;
-@define-color headerbar_bg_color #121212;
+
+@define-color headerbar_bg_color #000000;
 @define-color headerbar_fg_color #c1c1c1;
-@define-color headerbar_border_color rgba(0.07058824, 0.07058824, 0.07058824, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #000000;
+@define-color dialog_fg_color #c1c1c1;
+
+@define-color popover_bg_color #000000;
+@define-color popover_fg_color #c1c1c1;
+
+
 @define-color sidebar_bg_color #121212;
 @define-color sidebar_fg_color #c1c1c1;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #121212;
 @define-color card_fg_color #c1c1c1;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #121212;
-@define-color dialog_fg_color #c1c1c1;
-@define-color popover_bg_color #121212;
-@define-color popover_fg_color #c1c1c1;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #222222;
-@define-color blue_1 #888888;
-@define-color blue_2 #888888;
-@define-color blue_3 #888888;
-@define-color blue_4 #888888;
-@define-color blue_5 #888888;
-@define-color green_1 #f8f7f2;
-@define-color green_2 #f8f7f2;
-@define-color green_3 #f8f7f2;
-@define-color green_4 #f8f7f2;
-@define-color green_5 #f8f7f2;
-@define-color yellow_1 #79241f;
-@define-color yellow_2 #79241f;
-@define-color yellow_3 #79241f;
-@define-color yellow_4 #79241f;
-@define-color yellow_5 #79241f;
-@define-color orange_1 #aaaaaa;
-@define-color orange_2 #aaaaaa;
-@define-color orange_3 #aaaaaa;
-@define-color orange_4 #aaaaaa;
-@define-color orange_5 #aaaaaa;
+
+
 @define-color red_1 #5f8787;
-@define-color red_2 #5f8787;
-@define-color red_3 #5f8787;
-@define-color red_4 #5f8787;
-@define-color red_5 #5f8787;
+@define-color green_1 #f8f7f2;
+@define-color yellow_1 #79241f;
+@define-color blue_1 #888888;
 @define-color purple_1 #999999;
-@define-color purple_2 #999999;
-@define-color purple_3 #999999;
-@define-color purple_4 #999999;
-@define-color purple_5 #999999;
-@define-color brown_1 #444444;
-@define-color brown_2 #444444;
-@define-color brown_3 #444444;
-@define-color brown_4 #444444;
-@define-color brown_5 #444444;
-@define-color light_1 #c1c1c1;
-@define-color light_2 #c1c1c1;
-@define-color light_3 #c1c1c1;
-@define-color light_4 #c1c1c1;
-@define-color light_5 #c1c1c1;
-@define-color dark_1 #c1c1c1;
-@define-color dark_2 #c1c1c1;
-@define-color dark_3 #c1c1c1;
-@define-color dark_4 #c1c1c1;
-@define-color dark_5 #c1c1c1;
+@define-color teal_1 #aaaaaa;
+@define-color orange_1 #aaaaaa;
+@define-color gray_1 #333333;
+
diff --git a/build/base16-black-metal.css b/build/base16-black-metal.css
index c4fcc0c..8db7f69 100644
--- a/build/base16-black-metal.css
+++ b/build/base16-black-metal.css
@@ -1,88 +1,37 @@
 @define-color accent_color #888888;
 @define-color accent_bg_color #888888;
 @define-color accent_fg_color #000000;
-@define-color destructive_color #5f8787;
-@define-color destructive_bg_color #5f8787;
-@define-color destructive_fg_color #000000;
-@define-color success_color #dd9999;
-@define-color success_bg_color #dd9999;
-@define-color success_fg_color #000000;
-@define-color warning_color #999999;
-@define-color warning_bg_color #999999;
-@define-color warning_fg_color #000000;
-@define-color error_color #5f8787;
-@define-color error_bg_color #5f8787;
-@define-color error_fg_color #000000;
+
 @define-color window_bg_color #000000;
 @define-color window_fg_color #c1c1c1;
+
 @define-color view_bg_color #000000;
 @define-color view_fg_color #c1c1c1;
-@define-color headerbar_bg_color #121212;
+
+@define-color headerbar_bg_color #000000;
 @define-color headerbar_fg_color #c1c1c1;
-@define-color headerbar_border_color rgba(0.07058824, 0.07058824, 0.07058824, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #000000;
+@define-color dialog_fg_color #c1c1c1;
+
+@define-color popover_bg_color #000000;
+@define-color popover_fg_color #c1c1c1;
+
+
 @define-color sidebar_bg_color #121212;
 @define-color sidebar_fg_color #c1c1c1;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #121212;
 @define-color card_fg_color #c1c1c1;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #121212;
-@define-color dialog_fg_color #c1c1c1;
-@define-color popover_bg_color #121212;
-@define-color popover_fg_color #c1c1c1;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #222222;
-@define-color blue_1 #888888;
-@define-color blue_2 #888888;
-@define-color blue_3 #888888;
-@define-color blue_4 #888888;
-@define-color blue_5 #888888;
-@define-color green_1 #dd9999;
-@define-color green_2 #dd9999;
-@define-color green_3 #dd9999;
-@define-color green_4 #dd9999;
-@define-color green_5 #dd9999;
-@define-color yellow_1 #a06666;
-@define-color yellow_2 #a06666;
-@define-color yellow_3 #a06666;
-@define-color yellow_4 #a06666;
-@define-color yellow_5 #a06666;
-@define-color orange_1 #aaaaaa;
-@define-color orange_2 #aaaaaa;
-@define-color orange_3 #aaaaaa;
-@define-color orange_4 #aaaaaa;
-@define-color orange_5 #aaaaaa;
+
+
 @define-color red_1 #5f8787;
-@define-color red_2 #5f8787;
-@define-color red_3 #5f8787;
-@define-color red_4 #5f8787;
-@define-color red_5 #5f8787;
+@define-color green_1 #dd9999;
+@define-color yellow_1 #a06666;
+@define-color blue_1 #888888;
 @define-color purple_1 #999999;
-@define-color purple_2 #999999;
-@define-color purple_3 #999999;
-@define-color purple_4 #999999;
-@define-color purple_5 #999999;
-@define-color brown_1 #444444;
-@define-color brown_2 #444444;
-@define-color brown_3 #444444;
-@define-color brown_4 #444444;
-@define-color brown_5 #444444;
-@define-color light_1 #c1c1c1;
-@define-color light_2 #c1c1c1;
-@define-color light_3 #c1c1c1;
-@define-color light_4 #c1c1c1;
-@define-color light_5 #c1c1c1;
-@define-color dark_1 #c1c1c1;
-@define-color dark_2 #c1c1c1;
-@define-color dark_3 #c1c1c1;
-@define-color dark_4 #c1c1c1;
-@define-color dark_5 #c1c1c1;
+@define-color teal_1 #aaaaaa;
+@define-color orange_1 #aaaaaa;
+@define-color gray_1 #333333;
+
diff --git a/build/base16-blueforest.css b/build/base16-blueforest.css
index e76419d..e0c20a0 100644
--- a/build/base16-blueforest.css
+++ b/build/base16-blueforest.css
@@ -1,88 +1,37 @@
 @define-color accent_color #a2cff5;
 @define-color accent_bg_color #a2cff5;
 @define-color accent_fg_color #141f2e;
-@define-color destructive_color #fffab1;
-@define-color destructive_bg_color #fffab1;
-@define-color destructive_fg_color #141f2e;
-@define-color success_color #80ff80;
-@define-color success_bg_color #80ff80;
-@define-color success_fg_color #141f2e;
-@define-color warning_color #0099ff;
-@define-color warning_bg_color #0099ff;
-@define-color warning_fg_color #141f2e;
-@define-color error_color #fffab1;
-@define-color error_bg_color #fffab1;
-@define-color error_fg_color #141f2e;
+
 @define-color window_bg_color #141f2e;
 @define-color window_fg_color #ffcc33;
+
 @define-color view_bg_color #141f2e;
 @define-color view_fg_color #ffcc33;
-@define-color headerbar_bg_color #1e5c1e;
+
+@define-color headerbar_bg_color #141f2e;
 @define-color headerbar_fg_color #ffcc33;
-@define-color headerbar_border_color rgba(0.11764706, 0.36078431, 0.11764706, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #141f2e;
+@define-color dialog_fg_color #ffcc33;
+
+@define-color popover_bg_color #141f2e;
+@define-color popover_fg_color #ffcc33;
+
+
 @define-color sidebar_bg_color #1e5c1e;
 @define-color sidebar_fg_color #ffcc33;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #1e5c1e;
 @define-color card_fg_color #ffcc33;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #1e5c1e;
-@define-color dialog_fg_color #ffcc33;
-@define-color popover_bg_color #1e5c1e;
-@define-color popover_fg_color #ffcc33;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #273e5c;
-@define-color blue_1 #a2cff5;
-@define-color blue_2 #a2cff5;
-@define-color blue_3 #a2cff5;
-@define-color blue_4 #a2cff5;
-@define-color blue_5 #a2cff5;
-@define-color green_1 #80ff80;
-@define-color green_2 #80ff80;
-@define-color green_3 #80ff80;
-@define-color green_4 #80ff80;
-@define-color green_5 #80ff80;
-@define-color yellow_1 #91ccff;
-@define-color yellow_2 #91ccff;
-@define-color yellow_3 #91ccff;
-@define-color yellow_4 #91ccff;
-@define-color yellow_5 #91ccff;
-@define-color orange_1 #ff8080;
-@define-color orange_2 #ff8080;
-@define-color orange_3 #ff8080;
-@define-color orange_4 #ff8080;
-@define-color orange_5 #ff8080;
+
+
 @define-color red_1 #fffab1;
-@define-color red_2 #fffab1;
-@define-color red_3 #fffab1;
-@define-color red_4 #fffab1;
-@define-color red_5 #fffab1;
+@define-color green_1 #80ff80;
+@define-color yellow_1 #91ccff;
+@define-color blue_1 #a2cff5;
 @define-color purple_1 #0099ff;
-@define-color purple_2 #0099ff;
-@define-color purple_3 #0099ff;
-@define-color purple_4 #0099ff;
-@define-color purple_5 #0099ff;
-@define-color brown_1 #e7e7e7;
-@define-color brown_2 #e7e7e7;
-@define-color brown_3 #e7e7e7;
-@define-color brown_4 #e7e7e7;
-@define-color brown_5 #e7e7e7;
-@define-color light_1 #ffcc33;
-@define-color light_2 #ffcc33;
-@define-color light_3 #ffcc33;
-@define-color light_4 #ffcc33;
-@define-color light_5 #ffcc33;
-@define-color dark_1 #ffcc33;
-@define-color dark_2 #ffcc33;
-@define-color dark_3 #ffcc33;
-@define-color dark_4 #ffcc33;
-@define-color dark_5 #ffcc33;
+@define-color teal_1 #80ff80;
+@define-color orange_1 #ff8080;
+@define-color gray_1 #a0ffa0;
+
diff --git a/build/base16-blueish.css b/build/base16-blueish.css
index f383963..852cab0 100644
--- a/build/base16-blueish.css
+++ b/build/base16-blueish.css
@@ -1,88 +1,37 @@
 @define-color accent_color #82aaff;
 @define-color accent_bg_color #82aaff;
 @define-color accent_fg_color #182430;
-@define-color destructive_color #4ce587;
-@define-color destructive_bg_color #4ce587;
-@define-color destructive_fg_color #182430;
-@define-color success_color #c3e88d;
-@define-color success_bg_color #c3e88d;
-@define-color success_fg_color #182430;
-@define-color warning_color #ff84dd;
-@define-color warning_bg_color #ff84dd;
-@define-color warning_fg_color #182430;
-@define-color error_color #4ce587;
-@define-color error_bg_color #4ce587;
-@define-color error_fg_color #182430;
+
 @define-color window_bg_color #182430;
 @define-color window_fg_color #c8e1f8;
+
 @define-color view_bg_color #182430;
 @define-color view_fg_color #c8e1f8;
-@define-color headerbar_bg_color #243c54;
+
+@define-color headerbar_bg_color #182430;
 @define-color headerbar_fg_color #c8e1f8;
-@define-color headerbar_border_color rgba(0.14117647, 0.23529412, 0.32941176, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #182430;
+@define-color dialog_fg_color #c8e1f8;
+
+@define-color popover_bg_color #182430;
+@define-color popover_fg_color #c8e1f8;
+
+
 @define-color sidebar_bg_color #243c54;
 @define-color sidebar_fg_color #c8e1f8;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #243c54;
 @define-color card_fg_color #c8e1f8;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #243c54;
-@define-color dialog_fg_color #c8e1f8;
-@define-color popover_bg_color #243c54;
-@define-color popover_fg_color #c8e1f8;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #46290a;
-@define-color blue_1 #82aaff;
-@define-color blue_2 #82aaff;
-@define-color blue_3 #82aaff;
-@define-color blue_4 #82aaff;
-@define-color blue_5 #82aaff;
-@define-color green_1 #c3e88d;
-@define-color green_2 #c3e88d;
-@define-color green_3 #c3e88d;
-@define-color green_4 #c3e88d;
-@define-color green_5 #c3e88d;
-@define-color yellow_1 #f6cd5c;
-@define-color yellow_2 #f6cd5c;
-@define-color yellow_3 #f6cd5c;
-@define-color yellow_4 #f6cd5c;
-@define-color yellow_5 #f6cd5c;
-@define-color orange_1 #f6a85c;
-@define-color orange_2 #f6a85c;
-@define-color orange_3 #f6a85c;
-@define-color orange_4 #f6a85c;
-@define-color orange_5 #f6a85c;
+
+
 @define-color red_1 #4ce587;
-@define-color red_2 #4ce587;
-@define-color red_3 #4ce587;
-@define-color red_4 #4ce587;
-@define-color red_5 #4ce587;
+@define-color green_1 #c3e88d;
+@define-color yellow_1 #f6cd5c;
+@define-color blue_1 #82aaff;
 @define-color purple_1 #ff84dd;
-@define-color purple_2 #ff84dd;
-@define-color purple_3 #ff84dd;
-@define-color purple_4 #ff84dd;
-@define-color purple_5 #ff84dd;
-@define-color brown_1 #bbd2e8;
-@define-color brown_2 #bbd2e8;
-@define-color brown_3 #bbd2e8;
-@define-color brown_4 #bbd2e8;
-@define-color brown_5 #bbd2e8;
-@define-color light_1 #c8e1f8;
-@define-color light_2 #c8e1f8;
-@define-color light_3 #c8e1f8;
-@define-color light_4 #c8e1f8;
-@define-color light_5 #c8e1f8;
-@define-color dark_1 #c8e1f8;
-@define-color dark_2 #c8e1f8;
-@define-color dark_3 #c8e1f8;
-@define-color dark_4 #c8e1f8;
-@define-color dark_5 #c8e1f8;
+@define-color teal_1 #5fd1ff;
+@define-color orange_1 #f6a85c;
+@define-color gray_1 #616d78;
+
diff --git a/build/base16-boo-shnickle-light.css b/build/base16-boo-shnickle-light.css
index df9eabb..84ac165 100644
--- a/build/base16-boo-shnickle-light.css
+++ b/build/base16-boo-shnickle-light.css
@@ -1,88 +1,37 @@
 @define-color accent_color #bfbfd9;
 @define-color accent_bg_color #bfbfd9;
 @define-color accent_fg_color #ffffcc;
-@define-color destructive_color #ffbfa5;
-@define-color destructive_bg_color #ffbfa5;
-@define-color destructive_fg_color #ffffcc;
-@define-color success_color #e7ff99;
-@define-color success_bg_color #e7ff99;
-@define-color success_fg_color #ffffcc;
-@define-color warning_color #f2bfd9;
-@define-color warning_bg_color #f2bfd9;
-@define-color warning_fg_color #ffffcc;
-@define-color error_color #ffbfa5;
-@define-color error_bg_color #ffbfa5;
-@define-color error_fg_color #ffffcc;
+
 @define-color window_bg_color #ffffcc;
 @define-color window_fg_color #5b5b49;
+
 @define-color view_bg_color #ffffcc;
 @define-color view_fg_color #5b5b49;
-@define-color headerbar_bg_color #dedeb2;
+
+@define-color headerbar_bg_color #ffffcc;
 @define-color headerbar_fg_color #5b5b49;
-@define-color headerbar_border_color rgba(0.87058824, 0.87058824, 0.69803922, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #ffffcc;
+@define-color dialog_fg_color #5b5b49;
+
+@define-color popover_bg_color #ffffcc;
+@define-color popover_fg_color #5b5b49;
+
+
 @define-color sidebar_bg_color #dedeb2;
 @define-color sidebar_fg_color #5b5b49;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #dedeb2;
 @define-color card_fg_color #5b5b49;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #dedeb2;
-@define-color dialog_fg_color #5b5b49;
-@define-color popover_bg_color #dedeb2;
-@define-color popover_fg_color #5b5b49;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #bdbd97;
-@define-color blue_1 #bfbfd9;
-@define-color blue_2 #bfbfd9;
-@define-color blue_3 #bfbfd9;
-@define-color blue_4 #bfbfd9;
-@define-color blue_5 #bfbfd9;
-@define-color green_1 #e7ff99;
-@define-color green_2 #e7ff99;
-@define-color green_3 #e7ff99;
-@define-color green_4 #e7ff99;
-@define-color green_5 #e7ff99;
-@define-color yellow_1 #fff299;
-@define-color yellow_2 #fff299;
-@define-color yellow_3 #fff299;
-@define-color yellow_4 #fff299;
-@define-color yellow_5 #fff299;
-@define-color orange_1 #ffdc99;
-@define-color orange_2 #ffdc99;
-@define-color orange_3 #ffdc99;
-@define-color orange_4 #ffdc99;
-@define-color orange_5 #ffdc99;
+
+
 @define-color red_1 #ffbfa5;
-@define-color red_2 #ffbfa5;
-@define-color red_3 #ffbfa5;
-@define-color red_4 #ffbfa5;
-@define-color red_5 #ffbfa5;
+@define-color green_1 #e7ff99;
+@define-color yellow_1 #fff299;
+@define-color blue_1 #bfbfd9;
 @define-color purple_1 #f2bfd9;
-@define-color purple_2 #f2bfd9;
-@define-color purple_3 #f2bfd9;
-@define-color purple_4 #f2bfd9;
-@define-color purple_5 #f2bfd9;
-@define-color brown_1 #e5d6a6;
-@define-color brown_2 #e5d6a6;
-@define-color brown_3 #e5d6a6;
-@define-color brown_4 #e5d6a6;
-@define-color brown_5 #e5d6a6;
-@define-color light_1 #5b5b49;
-@define-color light_2 #5b5b49;
-@define-color light_3 #5b5b49;
-@define-color light_4 #5b5b49;
-@define-color light_5 #5b5b49;
-@define-color dark_1 #5b5b49;
-@define-color dark_2 #5b5b49;
-@define-color dark_3 #5b5b49;
-@define-color dark_4 #5b5b49;
-@define-color dark_5 #5b5b49;
+@define-color teal_1 #bfffc5;
+@define-color orange_1 #ffdc99;
+@define-color gray_1 #9c9c7d;
+
diff --git a/build/base16-boo-shnickle.css b/build/base16-boo-shnickle.css
index a988dbd..6b2821a 100644
--- a/build/base16-boo-shnickle.css
+++ b/build/base16-boo-shnickle.css
@@ -1,88 +1,37 @@
 @define-color accent_color #bfbfd9;
 @define-color accent_bg_color #bfbfd9;
 @define-color accent_fg_color #191914;
-@define-color destructive_color #ffbfa5;
-@define-color destructive_bg_color #ffbfa5;
-@define-color destructive_fg_color #191914;
-@define-color success_color #e7ff99;
-@define-color success_bg_color #e7ff99;
-@define-color success_fg_color #191914;
-@define-color warning_color #f2bfd9;
-@define-color warning_bg_color #f2bfd9;
-@define-color warning_fg_color #191914;
-@define-color error_color #ffbfa5;
-@define-color error_bg_color #ffbfa5;
-@define-color error_fg_color #191914;
+
 @define-color window_bg_color #191914;
 @define-color window_fg_color #bdbd97;
+
 @define-color view_bg_color #191914;
 @define-color view_fg_color #bdbd97;
-@define-color headerbar_bg_color #3a3a2e;
+
+@define-color headerbar_bg_color #191914;
 @define-color headerbar_fg_color #bdbd97;
-@define-color headerbar_border_color rgba(0.22745098, 0.22745098, 0.18039216, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #191914;
+@define-color dialog_fg_color #bdbd97;
+
+@define-color popover_bg_color #191914;
+@define-color popover_fg_color #bdbd97;
+
+
 @define-color sidebar_bg_color #3a3a2e;
 @define-color sidebar_fg_color #bdbd97;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #3a3a2e;
 @define-color card_fg_color #bdbd97;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #3a3a2e;
-@define-color dialog_fg_color #bdbd97;
-@define-color popover_bg_color #3a3a2e;
-@define-color popover_fg_color #bdbd97;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #5b5b49;
-@define-color blue_1 #bfbfd9;
-@define-color blue_2 #bfbfd9;
-@define-color blue_3 #bfbfd9;
-@define-color blue_4 #bfbfd9;
-@define-color blue_5 #bfbfd9;
-@define-color green_1 #e7ff99;
-@define-color green_2 #e7ff99;
-@define-color green_3 #e7ff99;
-@define-color green_4 #e7ff99;
-@define-color green_5 #e7ff99;
-@define-color yellow_1 #fff299;
-@define-color yellow_2 #fff299;
-@define-color yellow_3 #fff299;
-@define-color yellow_4 #fff299;
-@define-color yellow_5 #fff299;
-@define-color orange_1 #ffdc99;
-@define-color orange_2 #ffdc99;
-@define-color orange_3 #ffdc99;
-@define-color orange_4 #ffdc99;
-@define-color orange_5 #ffdc99;
+
+
 @define-color red_1 #ffbfa5;
-@define-color red_2 #ffbfa5;
-@define-color red_3 #ffbfa5;
-@define-color red_4 #ffbfa5;
-@define-color red_5 #ffbfa5;
+@define-color green_1 #e7ff99;
+@define-color yellow_1 #fff299;
+@define-color blue_1 #bfbfd9;
 @define-color purple_1 #f2bfd9;
-@define-color purple_2 #f2bfd9;
-@define-color purple_3 #f2bfd9;
-@define-color purple_4 #f2bfd9;
-@define-color purple_5 #f2bfd9;
-@define-color brown_1 #e5d6a6;
-@define-color brown_2 #e5d6a6;
-@define-color brown_3 #e5d6a6;
-@define-color brown_4 #e5d6a6;
-@define-color brown_5 #e5d6a6;
-@define-color light_1 #bdbd97;
-@define-color light_2 #bdbd97;
-@define-color light_3 #bdbd97;
-@define-color light_4 #bdbd97;
-@define-color light_5 #bdbd97;
-@define-color dark_1 #bdbd97;
-@define-color dark_2 #bdbd97;
-@define-color dark_3 #bdbd97;
-@define-color dark_4 #bdbd97;
-@define-color dark_5 #bdbd97;
+@define-color teal_1 #bfffc5;
+@define-color orange_1 #ffdc99;
+@define-color gray_1 #7c7c63;
+
diff --git a/build/base16-bosque.css b/build/base16-bosque.css
index d4e1469..bdf6312 100644
--- a/build/base16-bosque.css
+++ b/build/base16-bosque.css
@@ -1,88 +1,37 @@
 @define-color accent_color #6dae9e;
 @define-color accent_bg_color #6dae9e;
 @define-color accent_fg_color #0e1410;
-@define-color destructive_color #e2706a;
-@define-color destructive_bg_color #e2706a;
-@define-color destructive_fg_color #0e1410;
-@define-color success_color #6fc56e;
-@define-color success_bg_color #6fc56e;
-@define-color success_fg_color #0e1410;
-@define-color warning_color #b894d0;
-@define-color warning_bg_color #b894d0;
-@define-color warning_fg_color #0e1410;
-@define-color error_color #e2706a;
-@define-color error_bg_color #e2706a;
-@define-color error_fg_color #0e1410;
+
 @define-color window_bg_color #0e1410;
 @define-color window_fg_color #cfe5d2;
+
 @define-color view_bg_color #0e1410;
 @define-color view_fg_color #cfe5d2;
-@define-color headerbar_bg_color #16211a;
+
+@define-color headerbar_bg_color #0e1410;
 @define-color headerbar_fg_color #cfe5d2;
-@define-color headerbar_border_color rgba(0.08627451, 0.12941176, 0.10196078, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #0e1410;
+@define-color dialog_fg_color #cfe5d2;
+
+@define-color popover_bg_color #0e1410;
+@define-color popover_fg_color #cfe5d2;
+
+
 @define-color sidebar_bg_color #16211a;
 @define-color sidebar_fg_color #cfe5d2;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #16211a;
 @define-color card_fg_color #cfe5d2;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #16211a;
-@define-color dialog_fg_color #cfe5d2;
-@define-color popover_bg_color #16211a;
-@define-color popover_fg_color #cfe5d2;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #1e3023;
-@define-color blue_1 #6dae9e;
-@define-color blue_2 #6dae9e;
-@define-color blue_3 #6dae9e;
-@define-color blue_4 #6dae9e;
-@define-color blue_5 #6dae9e;
-@define-color green_1 #6fc56e;
-@define-color green_2 #6fc56e;
-@define-color green_3 #6fc56e;
-@define-color green_4 #6fc56e;
-@define-color green_5 #6fc56e;
-@define-color yellow_1 #c8b84a;
-@define-color yellow_2 #c8b84a;
-@define-color yellow_3 #c8b84a;
-@define-color yellow_4 #c8b84a;
-@define-color yellow_5 #c8b84a;
-@define-color orange_1 #7dc97a;
-@define-color orange_2 #7dc97a;
-@define-color orange_3 #7dc97a;
-@define-color orange_4 #7dc97a;
-@define-color orange_5 #7dc97a;
+
+
 @define-color red_1 #e2706a;
-@define-color red_2 #e2706a;
-@define-color red_3 #e2706a;
-@define-color red_4 #e2706a;
-@define-color red_5 #e2706a;
+@define-color green_1 #6fc56e;
+@define-color yellow_1 #c8b84a;
+@define-color blue_1 #6dae9e;
 @define-color purple_1 #b894d0;
-@define-color purple_2 #b894d0;
-@define-color purple_3 #b894d0;
-@define-color purple_4 #b894d0;
-@define-color purple_5 #b894d0;
-@define-color brown_1 #35503e;
-@define-color brown_2 #35503e;
-@define-color brown_3 #35503e;
-@define-color brown_4 #35503e;
-@define-color brown_5 #35503e;
-@define-color light_1 #cfe5d2;
-@define-color light_2 #cfe5d2;
-@define-color light_3 #cfe5d2;
-@define-color light_4 #cfe5d2;
-@define-color light_5 #cfe5d2;
-@define-color dark_1 #cfe5d2;
-@define-color dark_2 #cfe5d2;
-@define-color dark_3 #cfe5d2;
-@define-color dark_4 #cfe5d2;
-@define-color dark_5 #cfe5d2;
+@define-color teal_1 #5fd0b8;
+@define-color orange_1 #7dc97a;
+@define-color gray_1 #5c6e5e;
+
diff --git a/build/base16-brasa.css b/build/base16-brasa.css
index ee4275d..1d444c7 100644
--- a/build/base16-brasa.css
+++ b/build/base16-brasa.css
@@ -1,88 +1,37 @@
 @define-color accent_color #9aa6e0;
 @define-color accent_bg_color #9aa6e0;
 @define-color accent_fg_color #1a0f0a;
-@define-color destructive_color #f2685a;
-@define-color destructive_bg_color #f2685a;
-@define-color destructive_fg_color #1a0f0a;
-@define-color success_color #b8c24a;
-@define-color success_bg_color #b8c24a;
-@define-color success_fg_color #1a0f0a;
-@define-color warning_color #e68aa2;
-@define-color warning_bg_color #e68aa2;
-@define-color warning_fg_color #1a0f0a;
-@define-color error_color #f2685a;
-@define-color error_bg_color #f2685a;
-@define-color error_fg_color #1a0f0a;
+
 @define-color window_bg_color #1a0f0a;
 @define-color window_fg_color #f0d8c0;
+
 @define-color view_bg_color #1a0f0a;
 @define-color view_fg_color #f0d8c0;
-@define-color headerbar_bg_color #2b1c14;
+
+@define-color headerbar_bg_color #1a0f0a;
 @define-color headerbar_fg_color #f0d8c0;
-@define-color headerbar_border_color rgba(0.16862745, 0.10980392, 0.07843137, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #1a0f0a;
+@define-color dialog_fg_color #f0d8c0;
+
+@define-color popover_bg_color #1a0f0a;
+@define-color popover_fg_color #f0d8c0;
+
+
 @define-color sidebar_bg_color #2b1c14;
 @define-color sidebar_fg_color #f0d8c0;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #2b1c14;
 @define-color card_fg_color #f0d8c0;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #2b1c14;
-@define-color dialog_fg_color #f0d8c0;
-@define-color popover_bg_color #2b1c14;
-@define-color popover_fg_color #f0d8c0;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #45261a;
-@define-color blue_1 #9aa6e0;
-@define-color blue_2 #9aa6e0;
-@define-color blue_3 #9aa6e0;
-@define-color blue_4 #9aa6e0;
-@define-color blue_5 #9aa6e0;
-@define-color green_1 #b8c24a;
-@define-color green_2 #b8c24a;
-@define-color green_3 #b8c24a;
-@define-color green_4 #b8c24a;
-@define-color green_5 #b8c24a;
-@define-color yellow_1 #f0b23a;
-@define-color yellow_2 #f0b23a;
-@define-color yellow_3 #f0b23a;
-@define-color yellow_4 #f0b23a;
-@define-color yellow_5 #f0b23a;
-@define-color orange_1 #ff7a4d;
-@define-color orange_2 #ff7a4d;
-@define-color orange_3 #ff7a4d;
-@define-color orange_4 #ff7a4d;
-@define-color orange_5 #ff7a4d;
+
+
 @define-color red_1 #f2685a;
-@define-color red_2 #f2685a;
-@define-color red_3 #f2685a;
-@define-color red_4 #f2685a;
-@define-color red_5 #f2685a;
+@define-color green_1 #b8c24a;
+@define-color yellow_1 #f0b23a;
+@define-color blue_1 #9aa6e0;
 @define-color purple_1 #e68aa2;
-@define-color purple_2 #e68aa2;
-@define-color purple_3 #e68aa2;
-@define-color purple_4 #e68aa2;
-@define-color purple_5 #e68aa2;
-@define-color brown_1 #5a3a28;
-@define-color brown_2 #5a3a28;
-@define-color brown_3 #5a3a28;
-@define-color brown_4 #5a3a28;
-@define-color brown_5 #5a3a28;
-@define-color light_1 #f0d8c0;
-@define-color light_2 #f0d8c0;
-@define-color light_3 #f0d8c0;
-@define-color light_4 #f0d8c0;
-@define-color light_5 #f0d8c0;
-@define-color dark_1 #f0d8c0;
-@define-color dark_2 #f0d8c0;
-@define-color dark_3 #f0d8c0;
-@define-color dark_4 #f0d8c0;
-@define-color dark_5 #f0d8c0;
+@define-color teal_1 #6bc8b8;
+@define-color orange_1 #ff7a4d;
+@define-color gray_1 #7a6150;
+
diff --git a/build/base16-brewer.css b/build/base16-brewer.css
index 958c1ba..2b5b033 100644
--- a/build/base16-brewer.css
+++ b/build/base16-brewer.css
@@ -1,88 +1,37 @@
 @define-color accent_color #3182bd;
 @define-color accent_bg_color #3182bd;
 @define-color accent_fg_color #0c0d0e;
-@define-color destructive_color #e31a1c;
-@define-color destructive_bg_color #e31a1c;
-@define-color destructive_fg_color #0c0d0e;
-@define-color success_color #31a354;
-@define-color success_bg_color #31a354;
-@define-color success_fg_color #0c0d0e;
-@define-color warning_color #756bb1;
-@define-color warning_bg_color #756bb1;
-@define-color warning_fg_color #0c0d0e;
-@define-color error_color #e31a1c;
-@define-color error_bg_color #e31a1c;
-@define-color error_fg_color #0c0d0e;
+
 @define-color window_bg_color #0c0d0e;
 @define-color window_fg_color #b7b8b9;
+
 @define-color view_bg_color #0c0d0e;
 @define-color view_fg_color #b7b8b9;
-@define-color headerbar_bg_color #2e2f30;
+
+@define-color headerbar_bg_color #0c0d0e;
 @define-color headerbar_fg_color #b7b8b9;
-@define-color headerbar_border_color rgba(0.18039216, 0.18431373, 0.18823529, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #0c0d0e;
+@define-color dialog_fg_color #b7b8b9;
+
+@define-color popover_bg_color #0c0d0e;
+@define-color popover_fg_color #b7b8b9;
+
+
 @define-color sidebar_bg_color #2e2f30;
 @define-color sidebar_fg_color #b7b8b9;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #2e2f30;
 @define-color card_fg_color #b7b8b9;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #2e2f30;
-@define-color dialog_fg_color #b7b8b9;
-@define-color popover_bg_color #2e2f30;
-@define-color popover_fg_color #b7b8b9;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #515253;
-@define-color blue_1 #3182bd;
-@define-color blue_2 #3182bd;
-@define-color blue_3 #3182bd;
-@define-color blue_4 #3182bd;
-@define-color blue_5 #3182bd;
-@define-color green_1 #31a354;
-@define-color green_2 #31a354;
-@define-color green_3 #31a354;
-@define-color green_4 #31a354;
-@define-color green_5 #31a354;
-@define-color yellow_1 #dca060;
-@define-color yellow_2 #dca060;
-@define-color yellow_3 #dca060;
-@define-color yellow_4 #dca060;
-@define-color yellow_5 #dca060;
-@define-color orange_1 #e6550d;
-@define-color orange_2 #e6550d;
-@define-color orange_3 #e6550d;
-@define-color orange_4 #e6550d;
-@define-color orange_5 #e6550d;
+
+
 @define-color red_1 #e31a1c;
-@define-color red_2 #e31a1c;
-@define-color red_3 #e31a1c;
-@define-color red_4 #e31a1c;
-@define-color red_5 #e31a1c;
+@define-color green_1 #31a354;
+@define-color yellow_1 #dca060;
+@define-color blue_1 #3182bd;
 @define-color purple_1 #756bb1;
-@define-color purple_2 #756bb1;
-@define-color purple_3 #756bb1;
-@define-color purple_4 #756bb1;
-@define-color purple_5 #756bb1;
-@define-color brown_1 #b15928;
-@define-color brown_2 #b15928;
-@define-color brown_3 #b15928;
-@define-color brown_4 #b15928;
-@define-color brown_5 #b15928;
-@define-color light_1 #b7b8b9;
-@define-color light_2 #b7b8b9;
-@define-color light_3 #b7b8b9;
-@define-color light_4 #b7b8b9;
-@define-color light_5 #b7b8b9;
-@define-color dark_1 #b7b8b9;
-@define-color dark_2 #b7b8b9;
-@define-color dark_3 #b7b8b9;
-@define-color dark_4 #b7b8b9;
-@define-color dark_5 #b7b8b9;
+@define-color teal_1 #80b1d3;
+@define-color orange_1 #e6550d;
+@define-color gray_1 #737475;
+
diff --git a/build/base16-bright.css b/build/base16-bright.css
index 2a15392..b4c4e79 100644
--- a/build/base16-bright.css
+++ b/build/base16-bright.css
@@ -1,88 +1,37 @@
 @define-color accent_color #6fb3d2;
 @define-color accent_bg_color #6fb3d2;
 @define-color accent_fg_color #000000;
-@define-color destructive_color #fb0120;
-@define-color destructive_bg_color #fb0120;
-@define-color destructive_fg_color #000000;
-@define-color success_color #a1c659;
-@define-color success_bg_color #a1c659;
-@define-color success_fg_color #000000;
-@define-color warning_color #d381c3;
-@define-color warning_bg_color #d381c3;
-@define-color warning_fg_color #000000;
-@define-color error_color #fb0120;
-@define-color error_bg_color #fb0120;
-@define-color error_fg_color #000000;
+
 @define-color window_bg_color #000000;
 @define-color window_fg_color #e0e0e0;
+
 @define-color view_bg_color #000000;
 @define-color view_fg_color #e0e0e0;
-@define-color headerbar_bg_color #303030;
+
+@define-color headerbar_bg_color #000000;
 @define-color headerbar_fg_color #e0e0e0;
-@define-color headerbar_border_color rgba(0.18823529, 0.18823529, 0.18823529, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #000000;
+@define-color dialog_fg_color #e0e0e0;
+
+@define-color popover_bg_color #000000;
+@define-color popover_fg_color #e0e0e0;
+
+
 @define-color sidebar_bg_color #303030;
 @define-color sidebar_fg_color #e0e0e0;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #303030;
 @define-color card_fg_color #e0e0e0;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #303030;
-@define-color dialog_fg_color #e0e0e0;
-@define-color popover_bg_color #303030;
-@define-color popover_fg_color #e0e0e0;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #505050;
-@define-color blue_1 #6fb3d2;
-@define-color blue_2 #6fb3d2;
-@define-color blue_3 #6fb3d2;
-@define-color blue_4 #6fb3d2;
-@define-color blue_5 #6fb3d2;
-@define-color green_1 #a1c659;
-@define-color green_2 #a1c659;
-@define-color green_3 #a1c659;
-@define-color green_4 #a1c659;
-@define-color green_5 #a1c659;
-@define-color yellow_1 #fda331;
-@define-color yellow_2 #fda331;
-@define-color yellow_3 #fda331;
-@define-color yellow_4 #fda331;
-@define-color yellow_5 #fda331;
-@define-color orange_1 #fc6d24;
-@define-color orange_2 #fc6d24;
-@define-color orange_3 #fc6d24;
-@define-color orange_4 #fc6d24;
-@define-color orange_5 #fc6d24;
+
+
 @define-color red_1 #fb0120;
-@define-color red_2 #fb0120;
-@define-color red_3 #fb0120;
-@define-color red_4 #fb0120;
-@define-color red_5 #fb0120;
+@define-color green_1 #a1c659;
+@define-color yellow_1 #fda331;
+@define-color blue_1 #6fb3d2;
 @define-color purple_1 #d381c3;
-@define-color purple_2 #d381c3;
-@define-color purple_3 #d381c3;
-@define-color purple_4 #d381c3;
-@define-color purple_5 #d381c3;
-@define-color brown_1 #be643c;
-@define-color brown_2 #be643c;
-@define-color brown_3 #be643c;
-@define-color brown_4 #be643c;
-@define-color brown_5 #be643c;
-@define-color light_1 #e0e0e0;
-@define-color light_2 #e0e0e0;
-@define-color light_3 #e0e0e0;
-@define-color light_4 #e0e0e0;
-@define-color light_5 #e0e0e0;
-@define-color dark_1 #e0e0e0;
-@define-color dark_2 #e0e0e0;
-@define-color dark_3 #e0e0e0;
-@define-color dark_4 #e0e0e0;
-@define-color dark_5 #e0e0e0;
+@define-color teal_1 #76c7b7;
+@define-color orange_1 #fc6d24;
+@define-color gray_1 #b0b0b0;
+
diff --git a/build/base16-brogrammer.css b/build/base16-brogrammer.css
index e37b3d2..c974c4e 100644
--- a/build/base16-brogrammer.css
+++ b/build/base16-brogrammer.css
@@ -1,88 +1,37 @@
 @define-color accent_color #5350b9;
 @define-color accent_bg_color #5350b9;
 @define-color accent_fg_color #1f1f1f;
-@define-color destructive_color #d6dbe5;
-@define-color destructive_bg_color #d6dbe5;
-@define-color destructive_fg_color #1f1f1f;
-@define-color success_color #f3bd09;
-@define-color success_bg_color #f3bd09;
-@define-color success_fg_color #1f1f1f;
-@define-color warning_color #0f7ddb;
-@define-color warning_bg_color #0f7ddb;
-@define-color warning_fg_color #1f1f1f;
-@define-color error_color #d6dbe5;
-@define-color error_bg_color #d6dbe5;
-@define-color error_fg_color #1f1f1f;
+
 @define-color window_bg_color #1f1f1f;
 @define-color window_fg_color #4e5ab7;
+
 @define-color view_bg_color #1f1f1f;
 @define-color view_fg_color #4e5ab7;
-@define-color headerbar_bg_color #f81118;
+
+@define-color headerbar_bg_color #1f1f1f;
 @define-color headerbar_fg_color #4e5ab7;
-@define-color headerbar_border_color rgba(0.97254902, 0.06666667, 0.09411765, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #1f1f1f;
+@define-color dialog_fg_color #4e5ab7;
+
+@define-color popover_bg_color #1f1f1f;
+@define-color popover_fg_color #4e5ab7;
+
+
 @define-color sidebar_bg_color #f81118;
 @define-color sidebar_fg_color #4e5ab7;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #f81118;
 @define-color card_fg_color #4e5ab7;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #f81118;
-@define-color dialog_fg_color #4e5ab7;
-@define-color popover_bg_color #f81118;
-@define-color popover_fg_color #4e5ab7;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #2dc55e;
-@define-color blue_1 #5350b9;
-@define-color blue_2 #5350b9;
-@define-color blue_3 #5350b9;
-@define-color blue_4 #5350b9;
-@define-color blue_5 #5350b9;
-@define-color green_1 #f3bd09;
-@define-color green_2 #f3bd09;
-@define-color green_3 #f3bd09;
-@define-color green_4 #f3bd09;
-@define-color green_5 #f3bd09;
-@define-color yellow_1 #1dd361;
-@define-color yellow_2 #1dd361;
-@define-color yellow_3 #1dd361;
-@define-color yellow_4 #1dd361;
-@define-color yellow_5 #1dd361;
-@define-color orange_1 #de352e;
-@define-color orange_2 #de352e;
-@define-color orange_3 #de352e;
-@define-color orange_4 #de352e;
-@define-color orange_5 #de352e;
+
+
 @define-color red_1 #d6dbe5;
-@define-color red_2 #d6dbe5;
-@define-color red_3 #d6dbe5;
-@define-color red_4 #d6dbe5;
-@define-color red_5 #d6dbe5;
+@define-color green_1 #f3bd09;
+@define-color yellow_1 #1dd361;
+@define-color blue_1 #5350b9;
 @define-color purple_1 #0f7ddb;
-@define-color purple_2 #0f7ddb;
-@define-color purple_3 #0f7ddb;
-@define-color purple_4 #0f7ddb;
-@define-color purple_5 #0f7ddb;
-@define-color brown_1 #ffffff;
-@define-color brown_2 #ffffff;
-@define-color brown_3 #ffffff;
-@define-color brown_4 #ffffff;
-@define-color brown_5 #ffffff;
-@define-color light_1 #4e5ab7;
-@define-color light_2 #4e5ab7;
-@define-color light_3 #4e5ab7;
-@define-color light_4 #4e5ab7;
-@define-color light_5 #4e5ab7;
-@define-color dark_1 #4e5ab7;
-@define-color dark_2 #4e5ab7;
-@define-color dark_3 #4e5ab7;
-@define-color dark_4 #4e5ab7;
-@define-color dark_5 #4e5ab7;
+@define-color teal_1 #1081d6;
+@define-color orange_1 #de352e;
+@define-color gray_1 #ecba0f;
+
diff --git a/build/base16-brushtrees-dark.css b/build/base16-brushtrees-dark.css
index ec0ed2c..cf99c0f 100644
--- a/build/base16-brushtrees-dark.css
+++ b/build/base16-brushtrees-dark.css
@@ -1,88 +1,37 @@
 @define-color accent_color #868cb3;
 @define-color accent_bg_color #868cb3;
 @define-color accent_fg_color #485867;
-@define-color destructive_color #b38686;
-@define-color destructive_bg_color #b38686;
-@define-color destructive_fg_color #485867;
-@define-color success_color #87b386;
-@define-color success_bg_color #87b386;
-@define-color success_fg_color #485867;
-@define-color warning_color #b386b2;
-@define-color warning_bg_color #b386b2;
-@define-color warning_fg_color #485867;
-@define-color error_color #b38686;
-@define-color error_bg_color #b38686;
-@define-color error_fg_color #485867;
+
 @define-color window_bg_color #485867;
 @define-color window_fg_color #b0c5c8;
+
 @define-color view_bg_color #485867;
 @define-color view_fg_color #b0c5c8;
-@define-color headerbar_bg_color #5a6d7a;
+
+@define-color headerbar_bg_color #485867;
 @define-color headerbar_fg_color #b0c5c8;
-@define-color headerbar_border_color rgba(0.35294118, 0.42745098, 0.47843137, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #485867;
+@define-color dialog_fg_color #b0c5c8;
+
+@define-color popover_bg_color #485867;
+@define-color popover_fg_color #b0c5c8;
+
+
 @define-color sidebar_bg_color #5a6d7a;
 @define-color sidebar_fg_color #b0c5c8;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #5a6d7a;
 @define-color card_fg_color #b0c5c8;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #5a6d7a;
-@define-color dialog_fg_color #b0c5c8;
-@define-color popover_bg_color #5a6d7a;
-@define-color popover_fg_color #b0c5c8;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #6d828e;
-@define-color blue_1 #868cb3;
-@define-color blue_2 #868cb3;
-@define-color blue_3 #868cb3;
-@define-color blue_4 #868cb3;
-@define-color blue_5 #868cb3;
-@define-color green_1 #87b386;
-@define-color green_2 #87b386;
-@define-color green_3 #87b386;
-@define-color green_4 #87b386;
-@define-color green_5 #87b386;
-@define-color yellow_1 #aab386;
-@define-color yellow_2 #aab386;
-@define-color yellow_3 #aab386;
-@define-color yellow_4 #aab386;
-@define-color yellow_5 #aab386;
-@define-color orange_1 #d8bba2;
-@define-color orange_2 #d8bba2;
-@define-color orange_3 #d8bba2;
-@define-color orange_4 #d8bba2;
-@define-color orange_5 #d8bba2;
+
+
 @define-color red_1 #b38686;
-@define-color red_2 #b38686;
-@define-color red_3 #b38686;
-@define-color red_4 #b38686;
-@define-color red_5 #b38686;
+@define-color green_1 #87b386;
+@define-color yellow_1 #aab386;
+@define-color blue_1 #868cb3;
 @define-color purple_1 #b386b2;
-@define-color purple_2 #b386b2;
-@define-color purple_3 #b386b2;
-@define-color purple_4 #b386b2;
-@define-color purple_5 #b386b2;
-@define-color brown_1 #b39f9f;
-@define-color brown_2 #b39f9f;
-@define-color brown_3 #b39f9f;
-@define-color brown_4 #b39f9f;
-@define-color brown_5 #b39f9f;
-@define-color light_1 #b0c5c8;
-@define-color light_2 #b0c5c8;
-@define-color light_3 #b0c5c8;
-@define-color light_4 #b0c5c8;
-@define-color light_5 #b0c5c8;
-@define-color dark_1 #b0c5c8;
-@define-color dark_2 #b0c5c8;
-@define-color dark_3 #b0c5c8;
-@define-color dark_4 #b0c5c8;
-@define-color dark_5 #b0c5c8;
+@define-color teal_1 #86b3b3;
+@define-color orange_1 #d8bba2;
+@define-color gray_1 #8299a1;
+
diff --git a/build/base16-brushtrees.css b/build/base16-brushtrees.css
index 30259ad..0bf80bd 100644
--- a/build/base16-brushtrees.css
+++ b/build/base16-brushtrees.css
@@ -1,88 +1,37 @@
 @define-color accent_color #868cb3;
 @define-color accent_bg_color #868cb3;
 @define-color accent_fg_color #e3efef;
-@define-color destructive_color #b38686;
-@define-color destructive_bg_color #b38686;
-@define-color destructive_fg_color #e3efef;
-@define-color success_color #87b386;
-@define-color success_bg_color #87b386;
-@define-color success_fg_color #e3efef;
-@define-color warning_color #b386b2;
-@define-color warning_bg_color #b386b2;
-@define-color warning_fg_color #e3efef;
-@define-color error_color #b38686;
-@define-color error_bg_color #b38686;
-@define-color error_fg_color #e3efef;
+
 @define-color window_bg_color #e3efef;
 @define-color window_fg_color #6d828e;
+
 @define-color view_bg_color #e3efef;
 @define-color view_fg_color #6d828e;
-@define-color headerbar_bg_color #c9dbdc;
+
+@define-color headerbar_bg_color #e3efef;
 @define-color headerbar_fg_color #6d828e;
-@define-color headerbar_border_color rgba(0.78823529, 0.85882353, 0.86274510, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #e3efef;
+@define-color dialog_fg_color #6d828e;
+
+@define-color popover_bg_color #e3efef;
+@define-color popover_fg_color #6d828e;
+
+
 @define-color sidebar_bg_color #c9dbdc;
 @define-color sidebar_fg_color #6d828e;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #c9dbdc;
 @define-color card_fg_color #6d828e;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #c9dbdc;
-@define-color dialog_fg_color #6d828e;
-@define-color popover_bg_color #c9dbdc;
-@define-color popover_fg_color #6d828e;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #b0c5c8;
-@define-color blue_1 #868cb3;
-@define-color blue_2 #868cb3;
-@define-color blue_3 #868cb3;
-@define-color blue_4 #868cb3;
-@define-color blue_5 #868cb3;
-@define-color green_1 #87b386;
-@define-color green_2 #87b386;
-@define-color green_3 #87b386;
-@define-color green_4 #87b386;
-@define-color green_5 #87b386;
-@define-color yellow_1 #aab386;
-@define-color yellow_2 #aab386;
-@define-color yellow_3 #aab386;
-@define-color yellow_4 #aab386;
-@define-color yellow_5 #aab386;
-@define-color orange_1 #d8bba2;
-@define-color orange_2 #d8bba2;
-@define-color orange_3 #d8bba2;
-@define-color orange_4 #d8bba2;
-@define-color orange_5 #d8bba2;
+
+
 @define-color red_1 #b38686;
-@define-color red_2 #b38686;
-@define-color red_3 #b38686;
-@define-color red_4 #b38686;
-@define-color red_5 #b38686;
+@define-color green_1 #87b386;
+@define-color yellow_1 #aab386;
+@define-color blue_1 #868cb3;
 @define-color purple_1 #b386b2;
-@define-color purple_2 #b386b2;
-@define-color purple_3 #b386b2;
-@define-color purple_4 #b386b2;
-@define-color purple_5 #b386b2;
-@define-color brown_1 #b39f9f;
-@define-color brown_2 #b39f9f;
-@define-color brown_3 #b39f9f;
-@define-color brown_4 #b39f9f;
-@define-color brown_5 #b39f9f;
-@define-color light_1 #6d828e;
-@define-color light_2 #6d828e;
-@define-color light_3 #6d828e;
-@define-color light_4 #6d828e;
-@define-color light_5 #6d828e;
-@define-color dark_1 #6d828e;
-@define-color dark_2 #6d828e;
-@define-color dark_3 #6d828e;
-@define-color dark_4 #6d828e;
-@define-color dark_5 #6d828e;
+@define-color teal_1 #86b3b3;
+@define-color orange_1 #d8bba2;
+@define-color gray_1 #98afb5;
+
diff --git a/build/base16-cacao.css b/build/base16-cacao.css
index 322c1fa..00789f6 100644
--- a/build/base16-cacao.css
+++ b/build/base16-cacao.css
@@ -1,88 +1,37 @@
 @define-color accent_color #a89ad0;
 @define-color accent_bg_color #a89ad0;
 @define-color accent_fg_color #160f0c;
-@define-color destructive_color #e0705c;
-@define-color destructive_bg_color #e0705c;
-@define-color destructive_fg_color #160f0c;
-@define-color success_color #9ac97a;
-@define-color success_bg_color #9ac97a;
-@define-color success_fg_color #160f0c;
-@define-color warning_color #ce8ab0;
-@define-color warning_bg_color #ce8ab0;
-@define-color warning_fg_color #160f0c;
-@define-color error_color #e0705c;
-@define-color error_bg_color #e0705c;
-@define-color error_fg_color #160f0c;
+
 @define-color window_bg_color #160f0c;
 @define-color window_fg_color #e8d6c4;
+
 @define-color view_bg_color #160f0c;
 @define-color view_fg_color #e8d6c4;
-@define-color headerbar_bg_color #241913;
+
+@define-color headerbar_bg_color #160f0c;
 @define-color headerbar_fg_color #e8d6c4;
-@define-color headerbar_border_color rgba(0.14117647, 0.09803922, 0.07450980, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #160f0c;
+@define-color dialog_fg_color #e8d6c4;
+
+@define-color popover_bg_color #160f0c;
+@define-color popover_fg_color #e8d6c4;
+
+
 @define-color sidebar_bg_color #241913;
 @define-color sidebar_fg_color #e8d6c4;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #241913;
 @define-color card_fg_color #e8d6c4;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #241913;
-@define-color dialog_fg_color #e8d6c4;
-@define-color popover_bg_color #241913;
-@define-color popover_fg_color #e8d6c4;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #3a281e;
-@define-color blue_1 #a89ad0;
-@define-color blue_2 #a89ad0;
-@define-color blue_3 #a89ad0;
-@define-color blue_4 #a89ad0;
-@define-color blue_5 #a89ad0;
-@define-color green_1 #9ac97a;
-@define-color green_2 #9ac97a;
-@define-color green_3 #9ac97a;
-@define-color green_4 #9ac97a;
-@define-color green_5 #9ac97a;
-@define-color yellow_1 #e8a84a;
-@define-color yellow_2 #e8a84a;
-@define-color yellow_3 #e8a84a;
-@define-color yellow_4 #e8a84a;
-@define-color yellow_5 #e8a84a;
-@define-color orange_1 #c77b4a;
-@define-color orange_2 #c77b4a;
-@define-color orange_3 #c77b4a;
-@define-color orange_4 #c77b4a;
-@define-color orange_5 #c77b4a;
+
+
 @define-color red_1 #e0705c;
-@define-color red_2 #e0705c;
-@define-color red_3 #e0705c;
-@define-color red_4 #e0705c;
-@define-color red_5 #e0705c;
+@define-color green_1 #9ac97a;
+@define-color yellow_1 #e8a84a;
+@define-color blue_1 #a89ad0;
 @define-color purple_1 #ce8ab0;
-@define-color purple_2 #ce8ab0;
-@define-color purple_3 #ce8ab0;
-@define-color purple_4 #ce8ab0;
-@define-color purple_5 #ce8ab0;
-@define-color brown_1 #4e382a;
-@define-color brown_2 #4e382a;
-@define-color brown_3 #4e382a;
-@define-color brown_4 #4e382a;
-@define-color brown_5 #4e382a;
-@define-color light_1 #e8d6c4;
-@define-color light_2 #e8d6c4;
-@define-color light_3 #e8d6c4;
-@define-color light_4 #e8d6c4;
-@define-color light_5 #e8d6c4;
-@define-color dark_1 #e8d6c4;
-@define-color dark_2 #e8d6c4;
-@define-color dark_3 #e8d6c4;
-@define-color dark_4 #e8d6c4;
-@define-color dark_5 #e8d6c4;
+@define-color teal_1 #74c8b0;
+@define-color orange_1 #c77b4a;
+@define-color gray_1 #766052;
+
diff --git a/build/base16-caroline.css b/build/base16-caroline.css
index 3394016..006e0b3 100644
--- a/build/base16-caroline.css
+++ b/build/base16-caroline.css
@@ -1,88 +1,37 @@
 @define-color accent_color #684c59;
 @define-color accent_bg_color #684c59;
 @define-color accent_fg_color #1c1213;
-@define-color destructive_color #c24f57;
-@define-color destructive_bg_color #c24f57;
-@define-color destructive_fg_color #1c1213;
-@define-color success_color #806c61;
-@define-color success_bg_color #806c61;
-@define-color success_fg_color #1c1213;
-@define-color warning_color #a63650;
-@define-color warning_bg_color #a63650;
-@define-color warning_fg_color #1c1213;
-@define-color error_color #c24f57;
-@define-color error_bg_color #c24f57;
-@define-color error_fg_color #1c1213;
+
 @define-color window_bg_color #1c1213;
 @define-color window_fg_color #a87569;
+
 @define-color view_bg_color #1c1213;
 @define-color view_fg_color #a87569;
-@define-color headerbar_bg_color #3a2425;
+
+@define-color headerbar_bg_color #1c1213;
 @define-color headerbar_fg_color #a87569;
-@define-color headerbar_border_color rgba(0.22745098, 0.14117647, 0.14509804, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #1c1213;
+@define-color dialog_fg_color #a87569;
+
+@define-color popover_bg_color #1c1213;
+@define-color popover_fg_color #a87569;
+
+
 @define-color sidebar_bg_color #3a2425;
 @define-color sidebar_fg_color #a87569;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #3a2425;
 @define-color card_fg_color #a87569;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #3a2425;
-@define-color dialog_fg_color #a87569;
-@define-color popover_bg_color #3a2425;
-@define-color popover_fg_color #a87569;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #563837;
-@define-color blue_1 #684c59;
-@define-color blue_2 #684c59;
-@define-color blue_3 #684c59;
-@define-color blue_4 #684c59;
-@define-color blue_5 #684c59;
-@define-color green_1 #806c61;
-@define-color green_2 #806c61;
-@define-color green_3 #806c61;
-@define-color green_4 #806c61;
-@define-color green_5 #806c61;
-@define-color yellow_1 #f28171;
-@define-color yellow_2 #f28171;
-@define-color yellow_3 #f28171;
-@define-color yellow_4 #f28171;
-@define-color yellow_5 #f28171;
-@define-color orange_1 #a63650;
-@define-color orange_2 #a63650;
-@define-color orange_3 #a63650;
-@define-color orange_4 #a63650;
-@define-color orange_5 #a63650;
+
+
 @define-color red_1 #c24f57;
-@define-color red_2 #c24f57;
-@define-color red_3 #c24f57;
-@define-color red_4 #c24f57;
-@define-color red_5 #c24f57;
+@define-color green_1 #806c61;
+@define-color yellow_1 #f28171;
+@define-color blue_1 #684c59;
 @define-color purple_1 #a63650;
-@define-color purple_2 #a63650;
-@define-color purple_3 #a63650;
-@define-color purple_4 #a63650;
-@define-color purple_5 #a63650;
-@define-color brown_1 #893f45;
-@define-color brown_2 #893f45;
-@define-color brown_3 #893f45;
-@define-color brown_4 #893f45;
-@define-color brown_5 #893f45;
-@define-color light_1 #a87569;
-@define-color light_2 #a87569;
-@define-color light_3 #a87569;
-@define-color light_4 #a87569;
-@define-color light_5 #a87569;
-@define-color dark_1 #a87569;
-@define-color dark_2 #a87569;
-@define-color dark_3 #a87569;
-@define-color dark_4 #a87569;
-@define-color dark_5 #a87569;
+@define-color teal_1 #6b6566;
+@define-color orange_1 #a63650;
+@define-color gray_1 #6d4745;
+
diff --git a/build/base16-catppuccin-frappe.css b/build/base16-catppuccin-frappe.css
index 0e16d05..437357f 100644
--- a/build/base16-catppuccin-frappe.css
+++ b/build/base16-catppuccin-frappe.css
@@ -1,88 +1,37 @@
 @define-color accent_color #8caaee;
 @define-color accent_bg_color #8caaee;
 @define-color accent_fg_color #303446;
-@define-color destructive_color #e78284;
-@define-color destructive_bg_color #e78284;
-@define-color destructive_fg_color #303446;
-@define-color success_color #a6d189;
-@define-color success_bg_color #a6d189;
-@define-color success_fg_color #303446;
-@define-color warning_color #ca9ee6;
-@define-color warning_bg_color #ca9ee6;
-@define-color warning_fg_color #303446;
-@define-color error_color #e78284;
-@define-color error_bg_color #e78284;
-@define-color error_fg_color #303446;
+
 @define-color window_bg_color #303446;
 @define-color window_fg_color #c6d0f5;
+
 @define-color view_bg_color #303446;
 @define-color view_fg_color #c6d0f5;
-@define-color headerbar_bg_color #292c3c;
+
+@define-color headerbar_bg_color #303446;
 @define-color headerbar_fg_color #c6d0f5;
-@define-color headerbar_border_color rgba(0.16078431, 0.17254902, 0.23529412, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #303446;
+@define-color dialog_fg_color #c6d0f5;
+
+@define-color popover_bg_color #303446;
+@define-color popover_fg_color #c6d0f5;
+
+
 @define-color sidebar_bg_color #292c3c;
 @define-color sidebar_fg_color #c6d0f5;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #292c3c;
 @define-color card_fg_color #c6d0f5;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #292c3c;
-@define-color dialog_fg_color #c6d0f5;
-@define-color popover_bg_color #292c3c;
-@define-color popover_fg_color #c6d0f5;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #414559;
-@define-color blue_1 #8caaee;
-@define-color blue_2 #8caaee;
-@define-color blue_3 #8caaee;
-@define-color blue_4 #8caaee;
-@define-color blue_5 #8caaee;
-@define-color green_1 #a6d189;
-@define-color green_2 #a6d189;
-@define-color green_3 #a6d189;
-@define-color green_4 #a6d189;
-@define-color green_5 #a6d189;
-@define-color yellow_1 #e5c890;
-@define-color yellow_2 #e5c890;
-@define-color yellow_3 #e5c890;
-@define-color yellow_4 #e5c890;
-@define-color yellow_5 #e5c890;
-@define-color orange_1 #ef9f76;
-@define-color orange_2 #ef9f76;
-@define-color orange_3 #ef9f76;
-@define-color orange_4 #ef9f76;
-@define-color orange_5 #ef9f76;
+
+
 @define-color red_1 #e78284;
-@define-color red_2 #e78284;
-@define-color red_3 #e78284;
-@define-color red_4 #e78284;
-@define-color red_5 #e78284;
+@define-color green_1 #a6d189;
+@define-color yellow_1 #e5c890;
+@define-color blue_1 #8caaee;
 @define-color purple_1 #ca9ee6;
-@define-color purple_2 #ca9ee6;
-@define-color purple_3 #ca9ee6;
-@define-color purple_4 #ca9ee6;
-@define-color purple_5 #ca9ee6;
-@define-color brown_1 #eebebe;
-@define-color brown_2 #eebebe;
-@define-color brown_3 #eebebe;
-@define-color brown_4 #eebebe;
-@define-color brown_5 #eebebe;
-@define-color light_1 #c6d0f5;
-@define-color light_2 #c6d0f5;
-@define-color light_3 #c6d0f5;
-@define-color light_4 #c6d0f5;
-@define-color light_5 #c6d0f5;
-@define-color dark_1 #c6d0f5;
-@define-color dark_2 #c6d0f5;
-@define-color dark_3 #c6d0f5;
-@define-color dark_4 #c6d0f5;
-@define-color dark_5 #c6d0f5;
+@define-color teal_1 #81c8be;
+@define-color orange_1 #ef9f76;
+@define-color gray_1 #51576d;
+
diff --git a/build/base16-catppuccin-latte.css b/build/base16-catppuccin-latte.css
index 1cdf27e..6ce212c 100644
--- a/build/base16-catppuccin-latte.css
+++ b/build/base16-catppuccin-latte.css
@@ -1,88 +1,37 @@
 @define-color accent_color #1e66f5;
 @define-color accent_bg_color #1e66f5;
 @define-color accent_fg_color #eff1f5;
-@define-color destructive_color #d20f39;
-@define-color destructive_bg_color #d20f39;
-@define-color destructive_fg_color #eff1f5;
-@define-color success_color #40a02b;
-@define-color success_bg_color #40a02b;
-@define-color success_fg_color #eff1f5;
-@define-color warning_color #8839ef;
-@define-color warning_bg_color #8839ef;
-@define-color warning_fg_color #eff1f5;
-@define-color error_color #d20f39;
-@define-color error_bg_color #d20f39;
-@define-color error_fg_color #eff1f5;
+
 @define-color window_bg_color #eff1f5;
 @define-color window_fg_color #4c4f69;
+
 @define-color view_bg_color #eff1f5;
 @define-color view_fg_color #4c4f69;
-@define-color headerbar_bg_color #e6e9ef;
+
+@define-color headerbar_bg_color #eff1f5;
 @define-color headerbar_fg_color #4c4f69;
-@define-color headerbar_border_color rgba(0.90196078, 0.91372549, 0.93725490, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #eff1f5;
+@define-color dialog_fg_color #4c4f69;
+
+@define-color popover_bg_color #eff1f5;
+@define-color popover_fg_color #4c4f69;
+
+
 @define-color sidebar_bg_color #e6e9ef;
 @define-color sidebar_fg_color #4c4f69;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #e6e9ef;
 @define-color card_fg_color #4c4f69;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #e6e9ef;
-@define-color dialog_fg_color #4c4f69;
-@define-color popover_bg_color #e6e9ef;
-@define-color popover_fg_color #4c4f69;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #ccd0da;
-@define-color blue_1 #1e66f5;
-@define-color blue_2 #1e66f5;
-@define-color blue_3 #1e66f5;
-@define-color blue_4 #1e66f5;
-@define-color blue_5 #1e66f5;
-@define-color green_1 #40a02b;
-@define-color green_2 #40a02b;
-@define-color green_3 #40a02b;
-@define-color green_4 #40a02b;
-@define-color green_5 #40a02b;
-@define-color yellow_1 #df8e1d;
-@define-color yellow_2 #df8e1d;
-@define-color yellow_3 #df8e1d;
-@define-color yellow_4 #df8e1d;
-@define-color yellow_5 #df8e1d;
-@define-color orange_1 #fe640b;
-@define-color orange_2 #fe640b;
-@define-color orange_3 #fe640b;
-@define-color orange_4 #fe640b;
-@define-color orange_5 #fe640b;
+
+
 @define-color red_1 #d20f39;
-@define-color red_2 #d20f39;
-@define-color red_3 #d20f39;
-@define-color red_4 #d20f39;
-@define-color red_5 #d20f39;
+@define-color green_1 #40a02b;
+@define-color yellow_1 #df8e1d;
+@define-color blue_1 #1e66f5;
 @define-color purple_1 #8839ef;
-@define-color purple_2 #8839ef;
-@define-color purple_3 #8839ef;
-@define-color purple_4 #8839ef;
-@define-color purple_5 #8839ef;
-@define-color brown_1 #dd7878;
-@define-color brown_2 #dd7878;
-@define-color brown_3 #dd7878;
-@define-color brown_4 #dd7878;
-@define-color brown_5 #dd7878;
-@define-color light_1 #4c4f69;
-@define-color light_2 #4c4f69;
-@define-color light_3 #4c4f69;
-@define-color light_4 #4c4f69;
-@define-color light_5 #4c4f69;
-@define-color dark_1 #4c4f69;
-@define-color dark_2 #4c4f69;
-@define-color dark_3 #4c4f69;
-@define-color dark_4 #4c4f69;
-@define-color dark_5 #4c4f69;
+@define-color teal_1 #179299;
+@define-color orange_1 #fe640b;
+@define-color gray_1 #bcc0cc;
+
diff --git a/build/base16-catppuccin-macchiato.css b/build/base16-catppuccin-macchiato.css
index e4b80e5..acbbb49 100644
--- a/build/base16-catppuccin-macchiato.css
+++ b/build/base16-catppuccin-macchiato.css
@@ -1,88 +1,37 @@
 @define-color accent_color #8aadf4;
 @define-color accent_bg_color #8aadf4;
 @define-color accent_fg_color #24273a;
-@define-color destructive_color #ed8796;
-@define-color destructive_bg_color #ed8796;
-@define-color destructive_fg_color #24273a;
-@define-color success_color #a6da95;
-@define-color success_bg_color #a6da95;
-@define-color success_fg_color #24273a;
-@define-color warning_color #c6a0f6;
-@define-color warning_bg_color #c6a0f6;
-@define-color warning_fg_color #24273a;
-@define-color error_color #ed8796;
-@define-color error_bg_color #ed8796;
-@define-color error_fg_color #24273a;
+
 @define-color window_bg_color #24273a;
 @define-color window_fg_color #cad3f5;
+
 @define-color view_bg_color #24273a;
 @define-color view_fg_color #cad3f5;
-@define-color headerbar_bg_color #1e2030;
+
+@define-color headerbar_bg_color #24273a;
 @define-color headerbar_fg_color #cad3f5;
-@define-color headerbar_border_color rgba(0.11764706, 0.12549020, 0.18823529, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #24273a;
+@define-color dialog_fg_color #cad3f5;
+
+@define-color popover_bg_color #24273a;
+@define-color popover_fg_color #cad3f5;
+
+
 @define-color sidebar_bg_color #1e2030;
 @define-color sidebar_fg_color #cad3f5;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #1e2030;
 @define-color card_fg_color #cad3f5;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #1e2030;
-@define-color dialog_fg_color #cad3f5;
-@define-color popover_bg_color #1e2030;
-@define-color popover_fg_color #cad3f5;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #363a4f;
-@define-color blue_1 #8aadf4;
-@define-color blue_2 #8aadf4;
-@define-color blue_3 #8aadf4;
-@define-color blue_4 #8aadf4;
-@define-color blue_5 #8aadf4;
-@define-color green_1 #a6da95;
-@define-color green_2 #a6da95;
-@define-color green_3 #a6da95;
-@define-color green_4 #a6da95;
-@define-color green_5 #a6da95;
-@define-color yellow_1 #eed49f;
-@define-color yellow_2 #eed49f;
-@define-color yellow_3 #eed49f;
-@define-color yellow_4 #eed49f;
-@define-color yellow_5 #eed49f;
-@define-color orange_1 #f5a97f;
-@define-color orange_2 #f5a97f;
-@define-color orange_3 #f5a97f;
-@define-color orange_4 #f5a97f;
-@define-color orange_5 #f5a97f;
+
+
 @define-color red_1 #ed8796;
-@define-color red_2 #ed8796;
-@define-color red_3 #ed8796;
-@define-color red_4 #ed8796;
-@define-color red_5 #ed8796;
+@define-color green_1 #a6da95;
+@define-color yellow_1 #eed49f;
+@define-color blue_1 #8aadf4;
 @define-color purple_1 #c6a0f6;
-@define-color purple_2 #c6a0f6;
-@define-color purple_3 #c6a0f6;
-@define-color purple_4 #c6a0f6;
-@define-color purple_5 #c6a0f6;
-@define-color brown_1 #f0c6c6;
-@define-color brown_2 #f0c6c6;
-@define-color brown_3 #f0c6c6;
-@define-color brown_4 #f0c6c6;
-@define-color brown_5 #f0c6c6;
-@define-color light_1 #cad3f5;
-@define-color light_2 #cad3f5;
-@define-color light_3 #cad3f5;
-@define-color light_4 #cad3f5;
-@define-color light_5 #cad3f5;
-@define-color dark_1 #cad3f5;
-@define-color dark_2 #cad3f5;
-@define-color dark_3 #cad3f5;
-@define-color dark_4 #cad3f5;
-@define-color dark_5 #cad3f5;
+@define-color teal_1 #8bd5ca;
+@define-color orange_1 #f5a97f;
+@define-color gray_1 #494d64;
+
diff --git a/build/base16-catppuccin-mocha.css b/build/base16-catppuccin-mocha.css
index e553bb4..35ae1c0 100644
--- a/build/base16-catppuccin-mocha.css
+++ b/build/base16-catppuccin-mocha.css
@@ -1,88 +1,37 @@
 @define-color accent_color #89b4fa;
 @define-color accent_bg_color #89b4fa;
 @define-color accent_fg_color #1e1e2e;
-@define-color destructive_color #f38ba8;
-@define-color destructive_bg_color #f38ba8;
-@define-color destructive_fg_color #1e1e2e;
-@define-color success_color #a6e3a1;
-@define-color success_bg_color #a6e3a1;
-@define-color success_fg_color #1e1e2e;
-@define-color warning_color #cba6f7;
-@define-color warning_bg_color #cba6f7;
-@define-color warning_fg_color #1e1e2e;
-@define-color error_color #f38ba8;
-@define-color error_bg_color #f38ba8;
-@define-color error_fg_color #1e1e2e;
+
 @define-color window_bg_color #1e1e2e;
 @define-color window_fg_color #cdd6f4;
+
 @define-color view_bg_color #1e1e2e;
 @define-color view_fg_color #cdd6f4;
-@define-color headerbar_bg_color #181825;
+
+@define-color headerbar_bg_color #1e1e2e;
 @define-color headerbar_fg_color #cdd6f4;
-@define-color headerbar_border_color rgba(0.09411765, 0.09411765, 0.14509804, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #1e1e2e;
+@define-color dialog_fg_color #cdd6f4;
+
+@define-color popover_bg_color #1e1e2e;
+@define-color popover_fg_color #cdd6f4;
+
+
 @define-color sidebar_bg_color #181825;
 @define-color sidebar_fg_color #cdd6f4;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #181825;
 @define-color card_fg_color #cdd6f4;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #181825;
-@define-color dialog_fg_color #cdd6f4;
-@define-color popover_bg_color #181825;
-@define-color popover_fg_color #cdd6f4;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #313244;
-@define-color blue_1 #89b4fa;
-@define-color blue_2 #89b4fa;
-@define-color blue_3 #89b4fa;
-@define-color blue_4 #89b4fa;
-@define-color blue_5 #89b4fa;
-@define-color green_1 #a6e3a1;
-@define-color green_2 #a6e3a1;
-@define-color green_3 #a6e3a1;
-@define-color green_4 #a6e3a1;
-@define-color green_5 #a6e3a1;
-@define-color yellow_1 #f9e2af;
-@define-color yellow_2 #f9e2af;
-@define-color yellow_3 #f9e2af;
-@define-color yellow_4 #f9e2af;
-@define-color yellow_5 #f9e2af;
-@define-color orange_1 #fab387;
-@define-color orange_2 #fab387;
-@define-color orange_3 #fab387;
-@define-color orange_4 #fab387;
-@define-color orange_5 #fab387;
+
+
 @define-color red_1 #f38ba8;
-@define-color red_2 #f38ba8;
-@define-color red_3 #f38ba8;
-@define-color red_4 #f38ba8;
-@define-color red_5 #f38ba8;
+@define-color green_1 #a6e3a1;
+@define-color yellow_1 #f9e2af;
+@define-color blue_1 #89b4fa;
 @define-color purple_1 #cba6f7;
-@define-color purple_2 #cba6f7;
-@define-color purple_3 #cba6f7;
-@define-color purple_4 #cba6f7;
-@define-color purple_5 #cba6f7;
-@define-color brown_1 #f2cdcd;
-@define-color brown_2 #f2cdcd;
-@define-color brown_3 #f2cdcd;
-@define-color brown_4 #f2cdcd;
-@define-color brown_5 #f2cdcd;
-@define-color light_1 #cdd6f4;
-@define-color light_2 #cdd6f4;
-@define-color light_3 #cdd6f4;
-@define-color light_4 #cdd6f4;
-@define-color light_5 #cdd6f4;
-@define-color dark_1 #cdd6f4;
-@define-color dark_2 #cdd6f4;
-@define-color dark_3 #cdd6f4;
-@define-color dark_4 #cdd6f4;
-@define-color dark_5 #cdd6f4;
+@define-color teal_1 #94e2d5;
+@define-color orange_1 #fab387;
+@define-color gray_1 #45475a;
+
diff --git a/build/base16-cerulean-signal-dark.css b/build/base16-cerulean-signal-dark.css
index d1ba7d4..22653be 100644
--- a/build/base16-cerulean-signal-dark.css
+++ b/build/base16-cerulean-signal-dark.css
@@ -1,88 +1,37 @@
 @define-color accent_color #7dd3ff;
 @define-color accent_bg_color #7dd3ff;
 @define-color accent_fg_color #101722;
-@define-color destructive_color #ff8a9a;
-@define-color destructive_bg_color #ff8a9a;
-@define-color destructive_fg_color #101722;
-@define-color success_color #70e1b0;
-@define-color success_bg_color #70e1b0;
-@define-color success_fg_color #101722;
-@define-color warning_color #ff74d4;
-@define-color warning_bg_color #ff74d4;
-@define-color warning_fg_color #101722;
-@define-color error_color #ff8a9a;
-@define-color error_bg_color #ff8a9a;
-@define-color error_fg_color #101722;
+
 @define-color window_bg_color #101722;
 @define-color window_fg_color #dce6f2;
+
 @define-color view_bg_color #101722;
 @define-color view_fg_color #dce6f2;
-@define-color headerbar_bg_color #131c29;
+
+@define-color headerbar_bg_color #101722;
 @define-color headerbar_fg_color #dce6f2;
-@define-color headerbar_border_color rgba(0.07450980, 0.10980392, 0.16078431, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #101722;
+@define-color dialog_fg_color #dce6f2;
+
+@define-color popover_bg_color #101722;
+@define-color popover_fg_color #dce6f2;
+
+
 @define-color sidebar_bg_color #131c29;
 @define-color sidebar_fg_color #dce6f2;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #131c29;
 @define-color card_fg_color #dce6f2;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #131c29;
-@define-color dialog_fg_color #dce6f2;
-@define-color popover_bg_color #131c29;
-@define-color popover_fg_color #dce6f2;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #173a5a;
-@define-color blue_1 #7dd3ff;
-@define-color blue_2 #7dd3ff;
-@define-color blue_3 #7dd3ff;
-@define-color blue_4 #7dd3ff;
-@define-color blue_5 #7dd3ff;
-@define-color green_1 #70e1b0;
-@define-color green_2 #70e1b0;
-@define-color green_3 #70e1b0;
-@define-color green_4 #70e1b0;
-@define-color green_5 #70e1b0;
-@define-color yellow_1 #e2c85f;
-@define-color yellow_2 #e2c85f;
-@define-color yellow_3 #e2c85f;
-@define-color yellow_4 #e2c85f;
-@define-color yellow_5 #e2c85f;
-@define-color orange_1 #f5a35c;
-@define-color orange_2 #f5a35c;
-@define-color orange_3 #f5a35c;
-@define-color orange_4 #f5a35c;
-@define-color orange_5 #f5a35c;
+
+
 @define-color red_1 #ff8a9a;
-@define-color red_2 #ff8a9a;
-@define-color red_3 #ff8a9a;
-@define-color red_4 #ff8a9a;
-@define-color red_5 #ff8a9a;
+@define-color green_1 #70e1b0;
+@define-color yellow_1 #e2c85f;
+@define-color blue_1 #7dd3ff;
 @define-color purple_1 #ff74d4;
-@define-color purple_2 #ff74d4;
-@define-color purple_3 #ff74d4;
-@define-color purple_4 #ff74d4;
-@define-color purple_5 #ff74d4;
-@define-color brown_1 #d59b7d;
-@define-color brown_2 #d59b7d;
-@define-color brown_3 #d59b7d;
-@define-color brown_4 #d59b7d;
-@define-color brown_5 #d59b7d;
-@define-color light_1 #dce6f2;
-@define-color light_2 #dce6f2;
-@define-color light_3 #dce6f2;
-@define-color light_4 #dce6f2;
-@define-color light_5 #dce6f2;
-@define-color dark_1 #dce6f2;
-@define-color dark_2 #dce6f2;
-@define-color dark_3 #dce6f2;
-@define-color dark_4 #dce6f2;
-@define-color dark_5 #dce6f2;
+@define-color teal_1 #58d9df;
+@define-color orange_1 #f5a35c;
+@define-color gray_1 #8fa0b5;
+
diff --git a/build/base16-cerulean-signal-light.css b/build/base16-cerulean-signal-light.css
index 6dd7d03..03583bf 100644
--- a/build/base16-cerulean-signal-light.css
+++ b/build/base16-cerulean-signal-light.css
@@ -1,88 +1,37 @@
 @define-color accent_color #006fa8;
 @define-color accent_bg_color #006fa8;
 @define-color accent_fg_color #f7f9fc;
-@define-color destructive_color #b4233d;
-@define-color destructive_bg_color #b4233d;
-@define-color destructive_fg_color #f7f9fc;
-@define-color success_color #17795e;
-@define-color success_bg_color #17795e;
-@define-color success_fg_color #f7f9fc;
-@define-color warning_color #a0007d;
-@define-color warning_bg_color #a0007d;
-@define-color warning_fg_color #f7f9fc;
-@define-color error_color #b4233d;
-@define-color error_bg_color #b4233d;
-@define-color error_fg_color #f7f9fc;
+
 @define-color window_bg_color #f7f9fc;
 @define-color window_fg_color #232b38;
+
 @define-color view_bg_color #f7f9fc;
 @define-color view_fg_color #232b38;
-@define-color headerbar_bg_color #eef4fb;
+
+@define-color headerbar_bg_color #f7f9fc;
 @define-color headerbar_fg_color #232b38;
-@define-color headerbar_border_color rgba(0.93333333, 0.95686275, 0.98431373, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #f7f9fc;
+@define-color dialog_fg_color #232b38;
+
+@define-color popover_bg_color #f7f9fc;
+@define-color popover_fg_color #232b38;
+
+
 @define-color sidebar_bg_color #eef4fb;
 @define-color sidebar_fg_color #232b38;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #eef4fb;
 @define-color card_fg_color #232b38;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #eef4fb;
-@define-color dialog_fg_color #232b38;
-@define-color popover_bg_color #eef4fb;
-@define-color popover_fg_color #232b38;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #dde7f1;
-@define-color blue_1 #006fa8;
-@define-color blue_2 #006fa8;
-@define-color blue_3 #006fa8;
-@define-color blue_4 #006fa8;
-@define-color blue_5 #006fa8;
-@define-color green_1 #17795e;
-@define-color green_2 #17795e;
-@define-color green_3 #17795e;
-@define-color green_4 #17795e;
-@define-color green_5 #17795e;
-@define-color yellow_1 #6f6300;
-@define-color yellow_2 #6f6300;
-@define-color yellow_3 #6f6300;
-@define-color yellow_4 #6f6300;
-@define-color yellow_5 #6f6300;
-@define-color orange_1 #9a4f00;
-@define-color orange_2 #9a4f00;
-@define-color orange_3 #9a4f00;
-@define-color orange_4 #9a4f00;
-@define-color orange_5 #9a4f00;
+
+
 @define-color red_1 #b4233d;
-@define-color red_2 #b4233d;
-@define-color red_3 #b4233d;
-@define-color red_4 #b4233d;
-@define-color red_5 #b4233d;
+@define-color green_1 #17795e;
+@define-color yellow_1 #6f6300;
+@define-color blue_1 #006fa8;
 @define-color purple_1 #a0007d;
-@define-color purple_2 #a0007d;
-@define-color purple_3 #a0007d;
-@define-color purple_4 #a0007d;
-@define-color purple_5 #a0007d;
-@define-color brown_1 #7a4e3c;
-@define-color brown_2 #7a4e3c;
-@define-color brown_3 #7a4e3c;
-@define-color brown_4 #7a4e3c;
-@define-color brown_5 #7a4e3c;
-@define-color light_1 #232b38;
-@define-color light_2 #232b38;
-@define-color light_3 #232b38;
-@define-color light_4 #232b38;
-@define-color light_5 #232b38;
-@define-color dark_1 #232b38;
-@define-color dark_2 #232b38;
-@define-color dark_3 #232b38;
-@define-color dark_4 #232b38;
-@define-color dark_5 #232b38;
+@define-color teal_1 #00727e;
+@define-color orange_1 #9a4f00;
+@define-color gray_1 #637287;
+
diff --git a/build/base16-chalk.css b/build/base16-chalk.css
index 5073117..5ad4e9f 100644
--- a/build/base16-chalk.css
+++ b/build/base16-chalk.css
@@ -1,88 +1,37 @@
 @define-color accent_color #6fc2ef;
 @define-color accent_bg_color #6fc2ef;
 @define-color accent_fg_color #151515;
-@define-color destructive_color #fb9fb1;
-@define-color destructive_bg_color #fb9fb1;
-@define-color destructive_fg_color #151515;
-@define-color success_color #acc267;
-@define-color success_bg_color #acc267;
-@define-color success_fg_color #151515;
-@define-color warning_color #e1a3ee;
-@define-color warning_bg_color #e1a3ee;
-@define-color warning_fg_color #151515;
-@define-color error_color #fb9fb1;
-@define-color error_bg_color #fb9fb1;
-@define-color error_fg_color #151515;
+
 @define-color window_bg_color #151515;
 @define-color window_fg_color #d0d0d0;
+
 @define-color view_bg_color #151515;
 @define-color view_fg_color #d0d0d0;
-@define-color headerbar_bg_color #202020;
+
+@define-color headerbar_bg_color #151515;
 @define-color headerbar_fg_color #d0d0d0;
-@define-color headerbar_border_color rgba(0.12549020, 0.12549020, 0.12549020, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #151515;
+@define-color dialog_fg_color #d0d0d0;
+
+@define-color popover_bg_color #151515;
+@define-color popover_fg_color #d0d0d0;
+
+
 @define-color sidebar_bg_color #202020;
 @define-color sidebar_fg_color #d0d0d0;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #202020;
 @define-color card_fg_color #d0d0d0;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #202020;
-@define-color dialog_fg_color #d0d0d0;
-@define-color popover_bg_color #202020;
-@define-color popover_fg_color #d0d0d0;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #303030;
-@define-color blue_1 #6fc2ef;
-@define-color blue_2 #6fc2ef;
-@define-color blue_3 #6fc2ef;
-@define-color blue_4 #6fc2ef;
-@define-color blue_5 #6fc2ef;
-@define-color green_1 #acc267;
-@define-color green_2 #acc267;
-@define-color green_3 #acc267;
-@define-color green_4 #acc267;
-@define-color green_5 #acc267;
-@define-color yellow_1 #ddb26f;
-@define-color yellow_2 #ddb26f;
-@define-color yellow_3 #ddb26f;
-@define-color yellow_4 #ddb26f;
-@define-color yellow_5 #ddb26f;
-@define-color orange_1 #eda987;
-@define-color orange_2 #eda987;
-@define-color orange_3 #eda987;
-@define-color orange_4 #eda987;
-@define-color orange_5 #eda987;
+
+
 @define-color red_1 #fb9fb1;
-@define-color red_2 #fb9fb1;
-@define-color red_3 #fb9fb1;
-@define-color red_4 #fb9fb1;
-@define-color red_5 #fb9fb1;
+@define-color green_1 #acc267;
+@define-color yellow_1 #ddb26f;
+@define-color blue_1 #6fc2ef;
 @define-color purple_1 #e1a3ee;
-@define-color purple_2 #e1a3ee;
-@define-color purple_3 #e1a3ee;
-@define-color purple_4 #e1a3ee;
-@define-color purple_5 #e1a3ee;
-@define-color brown_1 #deaf8f;
-@define-color brown_2 #deaf8f;
-@define-color brown_3 #deaf8f;
-@define-color brown_4 #deaf8f;
-@define-color brown_5 #deaf8f;
-@define-color light_1 #d0d0d0;
-@define-color light_2 #d0d0d0;
-@define-color light_3 #d0d0d0;
-@define-color light_4 #d0d0d0;
-@define-color light_5 #d0d0d0;
-@define-color dark_1 #d0d0d0;
-@define-color dark_2 #d0d0d0;
-@define-color dark_3 #d0d0d0;
-@define-color dark_4 #d0d0d0;
-@define-color dark_5 #d0d0d0;
+@define-color teal_1 #12cfc0;
+@define-color orange_1 #eda987;
+@define-color gray_1 #505050;
+
diff --git a/build/base16-charcoal-dark.css b/build/base16-charcoal-dark.css
index a229681..c6a0c5e 100644
--- a/build/base16-charcoal-dark.css
+++ b/build/base16-charcoal-dark.css
@@ -1,88 +1,37 @@
 @define-color accent_color #c3a983;
 @define-color accent_bg_color #c3a983;
 @define-color accent_fg_color #0f0b05;
-@define-color destructive_color #a88c62;
-@define-color destructive_bg_color #a88c62;
-@define-color destructive_fg_color #0f0b05;
-@define-color success_color #dec8a7;
-@define-color success_bg_color #dec8a7;
-@define-color success_fg_color #0f0b05;
-@define-color warning_color #a88c62;
-@define-color warning_bg_color #a88c62;
-@define-color warning_fg_color #0f0b05;
-@define-color error_color #a88c62;
-@define-color error_bg_color #a88c62;
-@define-color error_fg_color #0f0b05;
+
 @define-color window_bg_color #0f0b05;
 @define-color window_fg_color #c3a983;
+
 @define-color view_bg_color #0f0b05;
 @define-color view_fg_color #c3a983;
-@define-color headerbar_bg_color #231b0e;
+
+@define-color headerbar_bg_color #0f0b05;
 @define-color headerbar_fg_color #c3a983;
-@define-color headerbar_border_color rgba(0.13725490, 0.10588235, 0.05490196, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #0f0b05;
+@define-color dialog_fg_color #c3a983;
+
+@define-color popover_bg_color #0f0b05;
+@define-color popover_fg_color #c3a983;
+
+
 @define-color sidebar_bg_color #231b0e;
 @define-color sidebar_fg_color #c3a983;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #231b0e;
 @define-color card_fg_color #c3a983;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #231b0e;
-@define-color dialog_fg_color #c3a983;
-@define-color popover_bg_color #231b0e;
-@define-color popover_fg_color #c3a983;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #2a2012;
-@define-color blue_1 #c3a983;
-@define-color blue_2 #c3a983;
-@define-color blue_3 #c3a983;
-@define-color blue_4 #c3a983;
-@define-color blue_5 #c3a983;
-@define-color green_1 #dec8a7;
-@define-color green_2 #dec8a7;
-@define-color green_3 #dec8a7;
-@define-color green_4 #dec8a7;
-@define-color green_5 #dec8a7;
-@define-color yellow_1 #dec8a7;
-@define-color yellow_2 #dec8a7;
-@define-color yellow_3 #dec8a7;
-@define-color yellow_4 #dec8a7;
-@define-color yellow_5 #dec8a7;
-@define-color orange_1 #dec8a7;
-@define-color orange_2 #dec8a7;
-@define-color orange_3 #dec8a7;
-@define-color orange_4 #dec8a7;
-@define-color orange_5 #dec8a7;
+
+
 @define-color red_1 #a88c62;
-@define-color red_2 #a88c62;
-@define-color red_3 #a88c62;
-@define-color red_4 #a88c62;
-@define-color red_5 #a88c62;
+@define-color green_1 #dec8a7;
+@define-color yellow_1 #dec8a7;
+@define-color blue_1 #c3a983;
 @define-color purple_1 #a88c62;
-@define-color purple_2 #a88c62;
-@define-color purple_3 #a88c62;
-@define-color purple_4 #a88c62;
-@define-color purple_5 #a88c62;
-@define-color brown_1 #876e48;
-@define-color brown_2 #876e48;
-@define-color brown_3 #876e48;
-@define-color brown_4 #876e48;
-@define-color brown_5 #876e48;
-@define-color light_1 #c3a983;
-@define-color light_2 #c3a983;
-@define-color light_3 #c3a983;
-@define-color light_4 #c3a983;
-@define-color light_5 #c3a983;
-@define-color dark_1 #c3a983;
-@define-color dark_2 #c3a983;
-@define-color dark_3 #c3a983;
-@define-color dark_4 #c3a983;
-@define-color dark_5 #c3a983;
+@define-color teal_1 #dec8a7;
+@define-color orange_1 #dec8a7;
+@define-color gray_1 #57462c;
+
diff --git a/build/base16-charcoal-light.css b/build/base16-charcoal-light.css
index 3b1293c..4a72da8 100644
--- a/build/base16-charcoal-light.css
+++ b/build/base16-charcoal-light.css
@@ -1,88 +1,37 @@
 @define-color accent_color #251e0f;
 @define-color accent_bg_color #251e0f;
 @define-color accent_fg_color #cabda0;
-@define-color destructive_color #382e1b;
-@define-color destructive_bg_color #382e1b;
-@define-color destructive_fg_color #cabda0;
-@define-color success_color #110e06;
-@define-color success_bg_color #110e06;
-@define-color success_fg_color #cabda0;
-@define-color warning_color #382e1b;
-@define-color warning_bg_color #382e1b;
-@define-color warning_fg_color #cabda0;
-@define-color error_color #382e1b;
-@define-color error_bg_color #382e1b;
-@define-color error_fg_color #cabda0;
+
 @define-color window_bg_color #cabda0;
 @define-color window_fg_color #382e1b;
+
 @define-color view_bg_color #cabda0;
 @define-color view_fg_color #382e1b;
-@define-color headerbar_bg_color #bcad8c;
+
+@define-color headerbar_bg_color #cabda0;
 @define-color headerbar_fg_color #382e1b;
-@define-color headerbar_border_color rgba(0.73725490, 0.67843137, 0.54901961, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #cabda0;
+@define-color dialog_fg_color #382e1b;
+
+@define-color popover_bg_color #cabda0;
+@define-color popover_fg_color #382e1b;
+
+
 @define-color sidebar_bg_color #bcad8c;
 @define-color sidebar_fg_color #382e1b;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #bcad8c;
 @define-color card_fg_color #382e1b;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #bcad8c;
-@define-color dialog_fg_color #382e1b;
-@define-color popover_bg_color #bcad8c;
-@define-color popover_fg_color #382e1b;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #af9f7d;
-@define-color blue_1 #251e0f;
-@define-color blue_2 #251e0f;
-@define-color blue_3 #251e0f;
-@define-color blue_4 #251e0f;
-@define-color blue_5 #251e0f;
-@define-color green_1 #110e06;
-@define-color green_2 #110e06;
-@define-color green_3 #110e06;
-@define-color green_4 #110e06;
-@define-color green_5 #110e06;
-@define-color yellow_1 #110e06;
-@define-color yellow_2 #110e06;
-@define-color yellow_3 #110e06;
-@define-color yellow_4 #110e06;
-@define-color yellow_5 #110e06;
-@define-color orange_1 #110e06;
-@define-color orange_2 #110e06;
-@define-color orange_3 #110e06;
-@define-color orange_4 #110e06;
-@define-color orange_5 #110e06;
+
+
 @define-color red_1 #382e1b;
-@define-color red_2 #382e1b;
-@define-color red_3 #382e1b;
-@define-color red_4 #382e1b;
-@define-color red_5 #382e1b;
+@define-color green_1 #110e06;
+@define-color yellow_1 #110e06;
+@define-color blue_1 #251e0f;
 @define-color purple_1 #382e1b;
-@define-color purple_2 #382e1b;
-@define-color purple_3 #382e1b;
-@define-color purple_4 #382e1b;
-@define-color purple_5 #382e1b;
-@define-color brown_1 #4b3e26;
-@define-color brown_2 #4b3e26;
-@define-color brown_3 #4b3e26;
-@define-color brown_4 #4b3e26;
-@define-color brown_5 #4b3e26;
-@define-color light_1 #382e1b;
-@define-color light_2 #382e1b;
-@define-color light_3 #382e1b;
-@define-color light_4 #382e1b;
-@define-color light_5 #382e1b;
-@define-color dark_1 #382e1b;
-@define-color dark_2 #382e1b;
-@define-color dark_3 #382e1b;
-@define-color dark_4 #382e1b;
-@define-color dark_5 #382e1b;
+@define-color teal_1 #110e06;
+@define-color orange_1 #110e06;
+@define-color gray_1 #645538;
+
diff --git a/build/base16-chicago-day.css b/build/base16-chicago-day.css
index a830fe7..566c4b4 100644
--- a/build/base16-chicago-day.css
+++ b/build/base16-chicago-day.css
@@ -1,88 +1,37 @@
 @define-color accent_color #522398;
 @define-color accent_bg_color #522398;
 @define-color accent_fg_color #e8f0ea;
-@define-color destructive_color #c60c30;
-@define-color destructive_bg_color #c60c30;
-@define-color destructive_fg_color #e8f0ea;
-@define-color success_color #009b3a;
-@define-color success_bg_color #009b3a;
-@define-color success_fg_color #e8f0ea;
-@define-color warning_color #e27ea6;
-@define-color warning_bg_color #e27ea6;
-@define-color warning_fg_color #e8f0ea;
-@define-color error_color #c60c30;
-@define-color error_bg_color #c60c30;
-@define-color error_fg_color #e8f0ea;
+
 @define-color window_bg_color #e8f0ea;
 @define-color window_fg_color #364c40;
+
 @define-color view_bg_color #e8f0ea;
 @define-color view_fg_color #364c40;
-@define-color headerbar_bg_color #d1e0d7;
+
+@define-color headerbar_bg_color #e8f0ea;
 @define-color headerbar_fg_color #364c40;
-@define-color headerbar_border_color rgba(0.81960784, 0.87843137, 0.84313725, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #e8f0ea;
+@define-color dialog_fg_color #364c40;
+
+@define-color popover_bg_color #e8f0ea;
+@define-color popover_fg_color #364c40;
+
+
 @define-color sidebar_bg_color #d1e0d7;
 @define-color sidebar_fg_color #364c40;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #d1e0d7;
 @define-color card_fg_color #364c40;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #d1e0d7;
-@define-color dialog_fg_color #364c40;
-@define-color popover_bg_color #d1e0d7;
-@define-color popover_fg_color #364c40;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #b9d0c3;
-@define-color blue_1 #522398;
-@define-color blue_2 #522398;
-@define-color blue_3 #522398;
-@define-color blue_4 #522398;
-@define-color blue_5 #522398;
-@define-color green_1 #009b3a;
-@define-color green_2 #009b3a;
-@define-color green_3 #009b3a;
-@define-color green_4 #009b3a;
-@define-color green_5 #009b3a;
-@define-color yellow_1 #968400;
-@define-color yellow_2 #968400;
-@define-color yellow_3 #968400;
-@define-color yellow_4 #968400;
-@define-color yellow_5 #968400;
-@define-color orange_1 #f9461c;
-@define-color orange_2 #f9461c;
-@define-color orange_3 #f9461c;
-@define-color orange_4 #f9461c;
-@define-color orange_5 #f9461c;
+
+
 @define-color red_1 #c60c30;
-@define-color red_2 #c60c30;
-@define-color red_3 #c60c30;
-@define-color red_4 #c60c30;
-@define-color red_5 #c60c30;
+@define-color green_1 #009b3a;
+@define-color yellow_1 #968400;
+@define-color blue_1 #522398;
 @define-color purple_1 #e27ea6;
-@define-color purple_2 #e27ea6;
-@define-color purple_3 #e27ea6;
-@define-color purple_4 #e27ea6;
-@define-color purple_5 #e27ea6;
-@define-color brown_1 #62361b;
-@define-color brown_2 #62361b;
-@define-color brown_3 #62361b;
-@define-color brown_4 #62361b;
-@define-color brown_5 #62361b;
-@define-color light_1 #364c40;
-@define-color light_2 #364c40;
-@define-color light_3 #364c40;
-@define-color light_4 #364c40;
-@define-color light_5 #364c40;
-@define-color dark_1 #364c40;
-@define-color dark_2 #364c40;
-@define-color dark_3 #364c40;
-@define-color dark_4 #364c40;
-@define-color dark_5 #364c40;
+@define-color teal_1 #00a1de;
+@define-color orange_1 #f9461c;
+@define-color gray_1 #8a9a91;
+
diff --git a/build/base16-chicago-night.css b/build/base16-chicago-night.css
index 7a7eb59..a66d666 100644
--- a/build/base16-chicago-night.css
+++ b/build/base16-chicago-night.css
@@ -1,88 +1,37 @@
 @define-color accent_color #522398;
 @define-color accent_bg_color #522398;
 @define-color accent_fg_color #1e2a24;
-@define-color destructive_color #c60c30;
-@define-color destructive_bg_color #c60c30;
-@define-color destructive_fg_color #1e2a24;
-@define-color success_color #009b3a;
-@define-color success_bg_color #009b3a;
-@define-color success_fg_color #1e2a24;
-@define-color warning_color #e27ea6;
-@define-color warning_bg_color #e27ea6;
-@define-color warning_fg_color #1e2a24;
-@define-color error_color #c60c30;
-@define-color error_bg_color #c60c30;
-@define-color error_fg_color #1e2a24;
+
 @define-color window_bg_color #1e2a24;
 @define-color window_fg_color #a7b8af;
+
 @define-color view_bg_color #1e2a24;
 @define-color view_fg_color #a7b8af;
-@define-color headerbar_bg_color #2a3b32;
+
+@define-color headerbar_bg_color #1e2a24;
 @define-color headerbar_fg_color #a7b8af;
-@define-color headerbar_border_color rgba(0.16470588, 0.23137255, 0.19607843, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #1e2a24;
+@define-color dialog_fg_color #a7b8af;
+
+@define-color popover_bg_color #1e2a24;
+@define-color popover_fg_color #a7b8af;
+
+
 @define-color sidebar_bg_color #2a3b32;
 @define-color sidebar_fg_color #a7b8af;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #2a3b32;
 @define-color card_fg_color #a7b8af;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #2a3b32;
-@define-color dialog_fg_color #a7b8af;
-@define-color popover_bg_color #2a3b32;
-@define-color popover_fg_color #a7b8af;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #364c40;
-@define-color blue_1 #522398;
-@define-color blue_2 #522398;
-@define-color blue_3 #522398;
-@define-color blue_4 #522398;
-@define-color blue_5 #522398;
-@define-color green_1 #009b3a;
-@define-color green_2 #009b3a;
-@define-color green_3 #009b3a;
-@define-color green_4 #009b3a;
-@define-color green_5 #009b3a;
-@define-color yellow_1 #f9e300;
-@define-color yellow_2 #f9e300;
-@define-color yellow_3 #f9e300;
-@define-color yellow_4 #f9e300;
-@define-color yellow_5 #f9e300;
-@define-color orange_1 #f9461c;
-@define-color orange_2 #f9461c;
-@define-color orange_3 #f9461c;
-@define-color orange_4 #f9461c;
-@define-color orange_5 #f9461c;
+
+
 @define-color red_1 #c60c30;
-@define-color red_2 #c60c30;
-@define-color red_3 #c60c30;
-@define-color red_4 #c60c30;
-@define-color red_5 #c60c30;
+@define-color green_1 #009b3a;
+@define-color yellow_1 #f9e300;
+@define-color blue_1 #522398;
 @define-color purple_1 #e27ea6;
-@define-color purple_2 #e27ea6;
-@define-color purple_3 #e27ea6;
-@define-color purple_4 #e27ea6;
-@define-color purple_5 #e27ea6;
-@define-color brown_1 #62361b;
-@define-color brown_2 #62361b;
-@define-color brown_3 #62361b;
-@define-color brown_4 #62361b;
-@define-color brown_5 #62361b;
-@define-color light_1 #a7b8af;
-@define-color light_2 #a7b8af;
-@define-color light_3 #a7b8af;
-@define-color light_4 #a7b8af;
-@define-color light_5 #a7b8af;
-@define-color dark_1 #a7b8af;
-@define-color dark_2 #a7b8af;
-@define-color dark_3 #a7b8af;
-@define-color dark_4 #a7b8af;
-@define-color dark_5 #a7b8af;
+@define-color teal_1 #00a1de;
+@define-color orange_1 #f9461c;
+@define-color gray_1 #5f7368;
+
diff --git a/build/base16-chinoiserie-midnight.css b/build/base16-chinoiserie-midnight.css
index 2e91615..01bb7a9 100644
--- a/build/base16-chinoiserie-midnight.css
+++ b/build/base16-chinoiserie-midnight.css
@@ -1,88 +1,37 @@
 @define-color accent_color #81a2a2;
 @define-color accent_bg_color #81a2a2;
 @define-color accent_fg_color #1d1d1d;
-@define-color destructive_color #ed5a56;
-@define-color destructive_bg_color #ed5a56;
-@define-color destructive_fg_color #1d1d1d;
-@define-color success_color #aeb831;
-@define-color success_bg_color #aeb831;
-@define-color success_fg_color #1d1d1d;
-@define-color warning_color #cf8997;
-@define-color warning_bg_color #cf8997;
-@define-color warning_fg_color #1d1d1d;
-@define-color error_color #ed5a56;
-@define-color error_bg_color #ed5a56;
-@define-color error_fg_color #1d1d1d;
+
 @define-color window_bg_color #1d1d1d;
 @define-color window_fg_color #c4cbcf;
+
 @define-color view_bg_color #1d1d1d;
 @define-color view_fg_color #c4cbcf;
-@define-color headerbar_bg_color #282828;
+
+@define-color headerbar_bg_color #1d1d1d;
 @define-color headerbar_fg_color #c4cbcf;
-@define-color headerbar_border_color rgba(0.15686275, 0.15686275, 0.15686275, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #1d1d1d;
+@define-color dialog_fg_color #c4cbcf;
+
+@define-color popover_bg_color #1d1d1d;
+@define-color popover_fg_color #c4cbcf;
+
+
 @define-color sidebar_bg_color #282828;
 @define-color sidebar_fg_color #c4cbcf;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #282828;
 @define-color card_fg_color #c4cbcf;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #282828;
-@define-color dialog_fg_color #c4cbcf;
-@define-color popover_bg_color #282828;
-@define-color popover_fg_color #c4cbcf;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #373737;
-@define-color blue_1 #81a2a2;
-@define-color blue_2 #81a2a2;
-@define-color blue_3 #81a2a2;
-@define-color blue_4 #81a2a2;
-@define-color blue_5 #81a2a2;
-@define-color green_1 #aeb831;
-@define-color green_2 #aeb831;
-@define-color green_3 #aeb831;
-@define-color green_4 #aeb831;
-@define-color green_5 #aeb831;
-@define-color yellow_1 #fbb957;
-@define-color yellow_2 #fbb957;
-@define-color yellow_3 #fbb957;
-@define-color yellow_4 #fbb957;
-@define-color yellow_5 #fbb957;
-@define-color orange_1 #fc8c23;
-@define-color orange_2 #fc8c23;
-@define-color orange_3 #fc8c23;
-@define-color orange_4 #fc8c23;
-@define-color orange_5 #fc8c23;
+
+
 @define-color red_1 #ed5a56;
-@define-color red_2 #ed5a56;
-@define-color red_3 #ed5a56;
-@define-color red_4 #ed5a56;
-@define-color red_5 #ed5a56;
+@define-color green_1 #aeb831;
+@define-color yellow_1 #fbb957;
+@define-color blue_1 #81a2a2;
 @define-color purple_1 #cf8997;
-@define-color purple_2 #cf8997;
-@define-color purple_3 #cf8997;
-@define-color purple_4 #cf8997;
-@define-color purple_5 #cf8997;
-@define-color brown_1 #cd6227;
-@define-color brown_2 #cd6227;
-@define-color brown_3 #cd6227;
-@define-color brown_4 #cd6227;
-@define-color brown_5 #cd6227;
-@define-color light_1 #c4cbcf;
-@define-color light_2 #c4cbcf;
-@define-color light_3 #c4cbcf;
-@define-color light_4 #c4cbcf;
-@define-color light_5 #c4cbcf;
-@define-color dark_1 #c4cbcf;
-@define-color dark_2 #c4cbcf;
-@define-color dark_3 #c4cbcf;
-@define-color dark_4 #c4cbcf;
-@define-color dark_5 #c4cbcf;
+@define-color teal_1 #88b68d;
+@define-color orange_1 #fc8c23;
+@define-color gray_1 #918072;
+
diff --git a/build/base16-chinoiserie-morandi.css b/build/base16-chinoiserie-morandi.css
index 5f47082..06cf491 100644
--- a/build/base16-chinoiserie-morandi.css
+++ b/build/base16-chinoiserie-morandi.css
@@ -1,88 +1,37 @@
 @define-color accent_color #839ec9;
 @define-color accent_bg_color #839ec9;
 @define-color accent_fg_color #1d1d1d;
-@define-color destructive_color #c06061;
-@define-color destructive_bg_color #c06061;
-@define-color destructive_fg_color #1d1d1d;
-@define-color success_color #8ca07b;
-@define-color success_bg_color #8ca07b;
-@define-color success_fg_color #1d1d1d;
-@define-color warning_color #98a1d8;
-@define-color warning_bg_color #98a1d8;
-@define-color warning_fg_color #1d1d1d;
-@define-color error_color #c06061;
-@define-color error_bg_color #c06061;
-@define-color error_fg_color #1d1d1d;
+
 @define-color window_bg_color #1d1d1d;
 @define-color window_fg_color #c4cbcf;
+
 @define-color view_bg_color #1d1d1d;
 @define-color view_fg_color #c4cbcf;
-@define-color headerbar_bg_color #282828;
+
+@define-color headerbar_bg_color #1d1d1d;
 @define-color headerbar_fg_color #c4cbcf;
-@define-color headerbar_border_color rgba(0.15686275, 0.15686275, 0.15686275, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #1d1d1d;
+@define-color dialog_fg_color #c4cbcf;
+
+@define-color popover_bg_color #1d1d1d;
+@define-color popover_fg_color #c4cbcf;
+
+
 @define-color sidebar_bg_color #282828;
 @define-color sidebar_fg_color #c4cbcf;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #282828;
 @define-color card_fg_color #c4cbcf;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #282828;
-@define-color dialog_fg_color #c4cbcf;
-@define-color popover_bg_color #282828;
-@define-color popover_fg_color #c4cbcf;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #373737;
-@define-color blue_1 #839ec9;
-@define-color blue_2 #839ec9;
-@define-color blue_3 #839ec9;
-@define-color blue_4 #839ec9;
-@define-color blue_5 #839ec9;
-@define-color green_1 #8ca07b;
-@define-color green_2 #8ca07b;
-@define-color green_3 #8ca07b;
-@define-color green_4 #8ca07b;
-@define-color green_5 #8ca07b;
-@define-color yellow_1 #e5bc84;
-@define-color yellow_2 #e5bc84;
-@define-color yellow_3 #e5bc84;
-@define-color yellow_4 #e5bc84;
-@define-color yellow_5 #e5bc84;
-@define-color orange_1 #ff937f;
-@define-color orange_2 #ff937f;
-@define-color orange_3 #ff937f;
-@define-color orange_4 #ff937f;
-@define-color orange_5 #ff937f;
+
+
 @define-color red_1 #c06061;
-@define-color red_2 #c06061;
-@define-color red_3 #c06061;
-@define-color red_4 #c06061;
-@define-color red_5 #c06061;
+@define-color green_1 #8ca07b;
+@define-color yellow_1 #e5bc84;
+@define-color blue_1 #839ec9;
 @define-color purple_1 #98a1d8;
-@define-color purple_2 #98a1d8;
-@define-color purple_3 #98a1d8;
-@define-color purple_4 #98a1d8;
-@define-color purple_5 #98a1d8;
-@define-color brown_1 #d9cdb4;
-@define-color brown_2 #d9cdb4;
-@define-color brown_3 #d9cdb4;
-@define-color brown_4 #d9cdb4;
-@define-color brown_5 #d9cdb4;
-@define-color light_1 #c4cbcf;
-@define-color light_2 #c4cbcf;
-@define-color light_3 #c4cbcf;
-@define-color light_4 #c4cbcf;
-@define-color light_5 #c4cbcf;
-@define-color dark_1 #c4cbcf;
-@define-color dark_2 #c4cbcf;
-@define-color dark_3 #c4cbcf;
-@define-color dark_4 #c4cbcf;
-@define-color dark_5 #c4cbcf;
+@define-color teal_1 #5e8c9b;
+@define-color orange_1 #ff937f;
+@define-color gray_1 #918072;
+
diff --git a/build/base16-chinoiserie-night.css b/build/base16-chinoiserie-night.css
index 2a72c49..746a62e 100644
--- a/build/base16-chinoiserie-night.css
+++ b/build/base16-chinoiserie-night.css
@@ -1,88 +1,37 @@
 @define-color accent_color #8fb2c9;
 @define-color accent_bg_color #8fb2c9;
 @define-color accent_fg_color #1d1d1d;
-@define-color destructive_color #f07c82;
-@define-color destructive_bg_color #f07c82;
-@define-color destructive_fg_color #1d1d1d;
-@define-color success_color #b2cf87;
-@define-color success_bg_color #b2cf87;
-@define-color success_fg_color #1d1d1d;
-@define-color warning_color #be9db9;
-@define-color warning_bg_color #be9db9;
-@define-color warning_fg_color #1d1d1d;
-@define-color error_color #f07c82;
-@define-color error_bg_color #f07c82;
-@define-color error_fg_color #1d1d1d;
+
 @define-color window_bg_color #1d1d1d;
 @define-color window_fg_color #c4cbcf;
+
 @define-color view_bg_color #1d1d1d;
 @define-color view_fg_color #c4cbcf;
-@define-color headerbar_bg_color #282828;
+
+@define-color headerbar_bg_color #1d1d1d;
 @define-color headerbar_fg_color #c4cbcf;
-@define-color headerbar_border_color rgba(0.15686275, 0.15686275, 0.15686275, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #1d1d1d;
+@define-color dialog_fg_color #c4cbcf;
+
+@define-color popover_bg_color #1d1d1d;
+@define-color popover_fg_color #c4cbcf;
+
+
 @define-color sidebar_bg_color #282828;
 @define-color sidebar_fg_color #c4cbcf;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #282828;
 @define-color card_fg_color #c4cbcf;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #282828;
-@define-color dialog_fg_color #c4cbcf;
-@define-color popover_bg_color #282828;
-@define-color popover_fg_color #c4cbcf;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #373737;
-@define-color blue_1 #8fb2c9;
-@define-color blue_2 #8fb2c9;
-@define-color blue_3 #8fb2c9;
-@define-color blue_4 #8fb2c9;
-@define-color blue_5 #8fb2c9;
-@define-color green_1 #b2cf87;
-@define-color green_2 #b2cf87;
-@define-color green_3 #b2cf87;
-@define-color green_4 #b2cf87;
-@define-color green_5 #b2cf87;
-@define-color yellow_1 #f4ce69;
-@define-color yellow_2 #f4ce69;
-@define-color yellow_3 #f4ce69;
-@define-color yellow_4 #f4ce69;
-@define-color yellow_5 #f4ce69;
-@define-color orange_1 #f4a83a;
-@define-color orange_2 #f4a83a;
-@define-color orange_3 #f4a83a;
-@define-color orange_4 #f4a83a;
-@define-color orange_5 #f4a83a;
+
+
 @define-color red_1 #f07c82;
-@define-color red_2 #f07c82;
-@define-color red_3 #f07c82;
-@define-color red_4 #f07c82;
-@define-color red_5 #f07c82;
+@define-color green_1 #b2cf87;
+@define-color yellow_1 #f4ce69;
+@define-color blue_1 #8fb2c9;
 @define-color purple_1 #be9db9;
-@define-color purple_2 #be9db9;
-@define-color purple_3 #be9db9;
-@define-color purple_4 #be9db9;
-@define-color purple_5 #be9db9;
-@define-color brown_1 #b89485;
-@define-color brown_2 #b89485;
-@define-color brown_3 #b89485;
-@define-color brown_4 #b89485;
-@define-color brown_5 #b89485;
-@define-color light_1 #c4cbcf;
-@define-color light_2 #c4cbcf;
-@define-color light_3 #c4cbcf;
-@define-color light_4 #c4cbcf;
-@define-color light_5 #c4cbcf;
-@define-color dark_1 #c4cbcf;
-@define-color dark_2 #c4cbcf;
-@define-color dark_3 #c4cbcf;
-@define-color dark_4 #c4cbcf;
-@define-color dark_5 #c4cbcf;
+@define-color teal_1 #b0d5df;
+@define-color orange_1 #f4a83a;
+@define-color gray_1 #918072;
+
diff --git a/build/base16-chinoiserie.css b/build/base16-chinoiserie.css
index 59e5f72..36ef845 100644
--- a/build/base16-chinoiserie.css
+++ b/build/base16-chinoiserie.css
@@ -1,88 +1,37 @@
 @define-color accent_color #815c94;
 @define-color accent_bg_color #815c94;
 @define-color accent_fg_color #ffffff;
-@define-color destructive_color #c04851;
-@define-color destructive_bg_color #c04851;
-@define-color destructive_fg_color #ffffff;
-@define-color success_color #428675;
-@define-color success_bg_color #428675;
-@define-color success_fg_color #ffffff;
-@define-color warning_color #c08eaf;
-@define-color warning_bg_color #c08eaf;
-@define-color warning_fg_color #ffffff;
-@define-color error_color #c04851;
-@define-color error_bg_color #c04851;
-@define-color error_fg_color #ffffff;
+
 @define-color window_bg_color #ffffff;
 @define-color window_fg_color #4a4035;
+
 @define-color view_bg_color #ffffff;
 @define-color view_fg_color #4a4035;
-@define-color headerbar_bg_color #e0e0e0;
+
+@define-color headerbar_bg_color #ffffff;
 @define-color headerbar_fg_color #4a4035;
-@define-color headerbar_border_color rgba(0.87843137, 0.87843137, 0.87843137, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #ffffff;
+@define-color dialog_fg_color #4a4035;
+
+@define-color popover_bg_color #ffffff;
+@define-color popover_fg_color #4a4035;
+
+
 @define-color sidebar_bg_color #e0e0e0;
 @define-color sidebar_fg_color #4a4035;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #e0e0e0;
 @define-color card_fg_color #4a4035;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #e0e0e0;
-@define-color dialog_fg_color #4a4035;
-@define-color popover_bg_color #e0e0e0;
-@define-color popover_fg_color #4a4035;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #d6d6d6;
-@define-color blue_1 #815c94;
-@define-color blue_2 #815c94;
-@define-color blue_3 #815c94;
-@define-color blue_4 #815c94;
-@define-color blue_5 #815c94;
-@define-color green_1 #428675;
-@define-color green_2 #428675;
-@define-color green_3 #428675;
-@define-color green_4 #428675;
-@define-color green_5 #428675;
-@define-color yellow_1 #d6a01d;
-@define-color yellow_2 #d6a01d;
-@define-color yellow_3 #d6a01d;
-@define-color yellow_4 #d6a01d;
-@define-color yellow_5 #d6a01d;
-@define-color orange_1 #fb8b05;
-@define-color orange_2 #fb8b05;
-@define-color orange_3 #fb8b05;
-@define-color orange_4 #fb8b05;
-@define-color orange_5 #fb8b05;
+
+
 @define-color red_1 #c04851;
-@define-color red_2 #c04851;
-@define-color red_3 #c04851;
-@define-color red_4 #c04851;
-@define-color red_5 #c04851;
+@define-color green_1 #428675;
+@define-color yellow_1 #d6a01d;
+@define-color blue_1 #815c94;
 @define-color purple_1 #c08eaf;
-@define-color purple_2 #c08eaf;
-@define-color purple_3 #c08eaf;
-@define-color purple_4 #c08eaf;
-@define-color purple_5 #c08eaf;
-@define-color brown_1 #945833;
-@define-color brown_2 #945833;
-@define-color brown_3 #945833;
-@define-color brown_4 #945833;
-@define-color brown_5 #945833;
-@define-color light_1 #4a4035;
-@define-color light_2 #4a4035;
-@define-color light_3 #4a4035;
-@define-color light_4 #4a4035;
-@define-color light_5 #4a4035;
-@define-color dark_1 #4a4035;
-@define-color dark_2 #4a4035;
-@define-color dark_3 #4a4035;
-@define-color dark_4 #4a4035;
-@define-color dark_5 #4a4035;
+@define-color teal_1 #2b73af;
+@define-color orange_1 #fb8b05;
+@define-color gray_1 #80766e;
+
diff --git a/build/base16-circus.css b/build/base16-circus.css
index 8d6a72e..64c3686 100644
--- a/build/base16-circus.css
+++ b/build/base16-circus.css
@@ -1,88 +1,37 @@
 @define-color accent_color #639ee4;
 @define-color accent_bg_color #639ee4;
 @define-color accent_fg_color #191919;
-@define-color destructive_color #dc657d;
-@define-color destructive_bg_color #dc657d;
-@define-color destructive_fg_color #191919;
-@define-color success_color #84b97c;
-@define-color success_bg_color #84b97c;
-@define-color success_fg_color #191919;
-@define-color warning_color #b888e2;
-@define-color warning_bg_color #b888e2;
-@define-color warning_fg_color #191919;
-@define-color error_color #dc657d;
-@define-color error_bg_color #dc657d;
-@define-color error_fg_color #191919;
+
 @define-color window_bg_color #191919;
 @define-color window_fg_color #a7a7a7;
+
 @define-color view_bg_color #191919;
 @define-color view_fg_color #a7a7a7;
-@define-color headerbar_bg_color #202020;
+
+@define-color headerbar_bg_color #191919;
 @define-color headerbar_fg_color #a7a7a7;
-@define-color headerbar_border_color rgba(0.12549020, 0.12549020, 0.12549020, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #191919;
+@define-color dialog_fg_color #a7a7a7;
+
+@define-color popover_bg_color #191919;
+@define-color popover_fg_color #a7a7a7;
+
+
 @define-color sidebar_bg_color #202020;
 @define-color sidebar_fg_color #a7a7a7;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #202020;
 @define-color card_fg_color #a7a7a7;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #202020;
-@define-color dialog_fg_color #a7a7a7;
-@define-color popover_bg_color #202020;
-@define-color popover_fg_color #a7a7a7;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #303030;
-@define-color blue_1 #639ee4;
-@define-color blue_2 #639ee4;
-@define-color blue_3 #639ee4;
-@define-color blue_4 #639ee4;
-@define-color blue_5 #639ee4;
-@define-color green_1 #84b97c;
-@define-color green_2 #84b97c;
-@define-color green_3 #84b97c;
-@define-color green_4 #84b97c;
-@define-color green_5 #84b97c;
-@define-color yellow_1 #c3ba63;
-@define-color yellow_2 #c3ba63;
-@define-color yellow_3 #c3ba63;
-@define-color yellow_4 #c3ba63;
-@define-color yellow_5 #c3ba63;
-@define-color orange_1 #4bb1a7;
-@define-color orange_2 #4bb1a7;
-@define-color orange_3 #4bb1a7;
-@define-color orange_4 #4bb1a7;
-@define-color orange_5 #4bb1a7;
+
+
 @define-color red_1 #dc657d;
-@define-color red_2 #dc657d;
-@define-color red_3 #dc657d;
-@define-color red_4 #dc657d;
-@define-color red_5 #dc657d;
+@define-color green_1 #84b97c;
+@define-color yellow_1 #c3ba63;
+@define-color blue_1 #639ee4;
 @define-color purple_1 #b888e2;
-@define-color purple_2 #b888e2;
-@define-color purple_3 #b888e2;
-@define-color purple_4 #b888e2;
-@define-color purple_5 #b888e2;
-@define-color brown_1 #b888e2;
-@define-color brown_2 #b888e2;
-@define-color brown_3 #b888e2;
-@define-color brown_4 #b888e2;
-@define-color brown_5 #b888e2;
-@define-color light_1 #a7a7a7;
-@define-color light_2 #a7a7a7;
-@define-color light_3 #a7a7a7;
-@define-color light_4 #a7a7a7;
-@define-color light_5 #a7a7a7;
-@define-color dark_1 #a7a7a7;
-@define-color dark_2 #a7a7a7;
-@define-color dark_3 #a7a7a7;
-@define-color dark_4 #a7a7a7;
-@define-color dark_5 #a7a7a7;
+@define-color teal_1 #4bb1a7;
+@define-color orange_1 #4bb1a7;
+@define-color gray_1 #5f5a60;
+
diff --git a/build/base16-classic-dark.css b/build/base16-classic-dark.css
index 854c3bd..068858b 100644
--- a/build/base16-classic-dark.css
+++ b/build/base16-classic-dark.css
@@ -1,88 +1,37 @@
 @define-color accent_color #6a9fb5;
 @define-color accent_bg_color #6a9fb5;
 @define-color accent_fg_color #151515;
-@define-color destructive_color #ac4142;
-@define-color destructive_bg_color #ac4142;
-@define-color destructive_fg_color #151515;
-@define-color success_color #90a959;
-@define-color success_bg_color #90a959;
-@define-color success_fg_color #151515;
-@define-color warning_color #aa759f;
-@define-color warning_bg_color #aa759f;
-@define-color warning_fg_color #151515;
-@define-color error_color #ac4142;
-@define-color error_bg_color #ac4142;
-@define-color error_fg_color #151515;
+
 @define-color window_bg_color #151515;
 @define-color window_fg_color #d0d0d0;
+
 @define-color view_bg_color #151515;
 @define-color view_fg_color #d0d0d0;
-@define-color headerbar_bg_color #202020;
+
+@define-color headerbar_bg_color #151515;
 @define-color headerbar_fg_color #d0d0d0;
-@define-color headerbar_border_color rgba(0.12549020, 0.12549020, 0.12549020, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #151515;
+@define-color dialog_fg_color #d0d0d0;
+
+@define-color popover_bg_color #151515;
+@define-color popover_fg_color #d0d0d0;
+
+
 @define-color sidebar_bg_color #202020;
 @define-color sidebar_fg_color #d0d0d0;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #202020;
 @define-color card_fg_color #d0d0d0;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #202020;
-@define-color dialog_fg_color #d0d0d0;
-@define-color popover_bg_color #202020;
-@define-color popover_fg_color #d0d0d0;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #303030;
-@define-color blue_1 #6a9fb5;
-@define-color blue_2 #6a9fb5;
-@define-color blue_3 #6a9fb5;
-@define-color blue_4 #6a9fb5;
-@define-color blue_5 #6a9fb5;
-@define-color green_1 #90a959;
-@define-color green_2 #90a959;
-@define-color green_3 #90a959;
-@define-color green_4 #90a959;
-@define-color green_5 #90a959;
-@define-color yellow_1 #f4bf75;
-@define-color yellow_2 #f4bf75;
-@define-color yellow_3 #f4bf75;
-@define-color yellow_4 #f4bf75;
-@define-color yellow_5 #f4bf75;
-@define-color orange_1 #d28445;
-@define-color orange_2 #d28445;
-@define-color orange_3 #d28445;
-@define-color orange_4 #d28445;
-@define-color orange_5 #d28445;
+
+
 @define-color red_1 #ac4142;
-@define-color red_2 #ac4142;
-@define-color red_3 #ac4142;
-@define-color red_4 #ac4142;
-@define-color red_5 #ac4142;
+@define-color green_1 #90a959;
+@define-color yellow_1 #f4bf75;
+@define-color blue_1 #6a9fb5;
 @define-color purple_1 #aa759f;
-@define-color purple_2 #aa759f;
-@define-color purple_3 #aa759f;
-@define-color purple_4 #aa759f;
-@define-color purple_5 #aa759f;
-@define-color brown_1 #8f5536;
-@define-color brown_2 #8f5536;
-@define-color brown_3 #8f5536;
-@define-color brown_4 #8f5536;
-@define-color brown_5 #8f5536;
-@define-color light_1 #d0d0d0;
-@define-color light_2 #d0d0d0;
-@define-color light_3 #d0d0d0;
-@define-color light_4 #d0d0d0;
-@define-color light_5 #d0d0d0;
-@define-color dark_1 #d0d0d0;
-@define-color dark_2 #d0d0d0;
-@define-color dark_3 #d0d0d0;
-@define-color dark_4 #d0d0d0;
-@define-color dark_5 #d0d0d0;
+@define-color teal_1 #75b5aa;
+@define-color orange_1 #d28445;
+@define-color gray_1 #505050;
+
diff --git a/build/base16-classic-light.css b/build/base16-classic-light.css
index cec1002..46ac1f7 100644
--- a/build/base16-classic-light.css
+++ b/build/base16-classic-light.css
@@ -1,88 +1,37 @@
 @define-color accent_color #6a9fb5;
 @define-color accent_bg_color #6a9fb5;
 @define-color accent_fg_color #f5f5f5;
-@define-color destructive_color #ac4142;
-@define-color destructive_bg_color #ac4142;
-@define-color destructive_fg_color #f5f5f5;
-@define-color success_color #90a959;
-@define-color success_bg_color #90a959;
-@define-color success_fg_color #f5f5f5;
-@define-color warning_color #aa759f;
-@define-color warning_bg_color #aa759f;
-@define-color warning_fg_color #f5f5f5;
-@define-color error_color #ac4142;
-@define-color error_bg_color #ac4142;
-@define-color error_fg_color #f5f5f5;
+
 @define-color window_bg_color #f5f5f5;
 @define-color window_fg_color #303030;
+
 @define-color view_bg_color #f5f5f5;
 @define-color view_fg_color #303030;
-@define-color headerbar_bg_color #e0e0e0;
+
+@define-color headerbar_bg_color #f5f5f5;
 @define-color headerbar_fg_color #303030;
-@define-color headerbar_border_color rgba(0.87843137, 0.87843137, 0.87843137, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #f5f5f5;
+@define-color dialog_fg_color #303030;
+
+@define-color popover_bg_color #f5f5f5;
+@define-color popover_fg_color #303030;
+
+
 @define-color sidebar_bg_color #e0e0e0;
 @define-color sidebar_fg_color #303030;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #e0e0e0;
 @define-color card_fg_color #303030;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #e0e0e0;
-@define-color dialog_fg_color #303030;
-@define-color popover_bg_color #e0e0e0;
-@define-color popover_fg_color #303030;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #d0d0d0;
-@define-color blue_1 #6a9fb5;
-@define-color blue_2 #6a9fb5;
-@define-color blue_3 #6a9fb5;
-@define-color blue_4 #6a9fb5;
-@define-color blue_5 #6a9fb5;
-@define-color green_1 #90a959;
-@define-color green_2 #90a959;
-@define-color green_3 #90a959;
-@define-color green_4 #90a959;
-@define-color green_5 #90a959;
-@define-color yellow_1 #f4bf75;
-@define-color yellow_2 #f4bf75;
-@define-color yellow_3 #f4bf75;
-@define-color yellow_4 #f4bf75;
-@define-color yellow_5 #f4bf75;
-@define-color orange_1 #d28445;
-@define-color orange_2 #d28445;
-@define-color orange_3 #d28445;
-@define-color orange_4 #d28445;
-@define-color orange_5 #d28445;
+
+
 @define-color red_1 #ac4142;
-@define-color red_2 #ac4142;
-@define-color red_3 #ac4142;
-@define-color red_4 #ac4142;
-@define-color red_5 #ac4142;
+@define-color green_1 #90a959;
+@define-color yellow_1 #f4bf75;
+@define-color blue_1 #6a9fb5;
 @define-color purple_1 #aa759f;
-@define-color purple_2 #aa759f;
-@define-color purple_3 #aa759f;
-@define-color purple_4 #aa759f;
-@define-color purple_5 #aa759f;
-@define-color brown_1 #8f5536;
-@define-color brown_2 #8f5536;
-@define-color brown_3 #8f5536;
-@define-color brown_4 #8f5536;
-@define-color brown_5 #8f5536;
-@define-color light_1 #303030;
-@define-color light_2 #303030;
-@define-color light_3 #303030;
-@define-color light_4 #303030;
-@define-color light_5 #303030;
-@define-color dark_1 #303030;
-@define-color dark_2 #303030;
-@define-color dark_3 #303030;
-@define-color dark_4 #303030;
-@define-color dark_5 #303030;
+@define-color teal_1 #75b5aa;
+@define-color orange_1 #d28445;
+@define-color gray_1 #b0b0b0;
+
diff --git a/build/base16-codeschool.css b/build/base16-codeschool.css
index 7d40306..b94d471 100644
--- a/build/base16-codeschool.css
+++ b/build/base16-codeschool.css
@@ -1,88 +1,37 @@
 @define-color accent_color #484d79;
 @define-color accent_bg_color #484d79;
 @define-color accent_fg_color #232c31;
-@define-color destructive_color #2a5491;
-@define-color destructive_bg_color #2a5491;
-@define-color destructive_fg_color #232c31;
-@define-color success_color #237986;
-@define-color success_bg_color #237986;
-@define-color success_fg_color #232c31;
-@define-color warning_color #c59820;
-@define-color warning_bg_color #c59820;
-@define-color warning_fg_color #232c31;
-@define-color error_color #2a5491;
-@define-color error_bg_color #2a5491;
-@define-color error_fg_color #232c31;
+
 @define-color window_bg_color #232c31;
 @define-color window_fg_color #9ea7a6;
+
 @define-color view_bg_color #232c31;
 @define-color view_fg_color #9ea7a6;
-@define-color headerbar_bg_color #1c3657;
+
+@define-color headerbar_bg_color #232c31;
 @define-color headerbar_fg_color #9ea7a6;
-@define-color headerbar_border_color rgba(0.10980392, 0.21176471, 0.34117647, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #232c31;
+@define-color dialog_fg_color #9ea7a6;
+
+@define-color popover_bg_color #232c31;
+@define-color popover_fg_color #9ea7a6;
+
+
 @define-color sidebar_bg_color #1c3657;
 @define-color sidebar_fg_color #9ea7a6;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #1c3657;
 @define-color card_fg_color #9ea7a6;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #1c3657;
-@define-color dialog_fg_color #9ea7a6;
-@define-color popover_bg_color #1c3657;
-@define-color popover_fg_color #9ea7a6;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #2a343a;
-@define-color blue_1 #484d79;
-@define-color blue_2 #484d79;
-@define-color blue_3 #484d79;
-@define-color blue_4 #484d79;
-@define-color blue_5 #484d79;
-@define-color green_1 #237986;
-@define-color green_2 #237986;
-@define-color green_3 #237986;
-@define-color green_4 #237986;
-@define-color green_5 #237986;
-@define-color yellow_1 #a03b1e;
-@define-color yellow_2 #a03b1e;
-@define-color yellow_3 #a03b1e;
-@define-color yellow_4 #a03b1e;
-@define-color yellow_5 #a03b1e;
-@define-color orange_1 #43820d;
-@define-color orange_2 #43820d;
-@define-color orange_3 #43820d;
-@define-color orange_4 #43820d;
-@define-color orange_5 #43820d;
+
+
 @define-color red_1 #2a5491;
-@define-color red_2 #2a5491;
-@define-color red_3 #2a5491;
-@define-color red_4 #2a5491;
-@define-color red_5 #2a5491;
+@define-color green_1 #237986;
+@define-color yellow_1 #a03b1e;
+@define-color blue_1 #484d79;
 @define-color purple_1 #c59820;
-@define-color purple_2 #c59820;
-@define-color purple_3 #c59820;
-@define-color purple_4 #c59820;
-@define-color purple_5 #c59820;
-@define-color brown_1 #c98344;
-@define-color brown_2 #c98344;
-@define-color brown_3 #c98344;
-@define-color brown_4 #c98344;
-@define-color brown_5 #c98344;
-@define-color light_1 #9ea7a6;
-@define-color light_2 #9ea7a6;
-@define-color light_3 #9ea7a6;
-@define-color light_4 #9ea7a6;
-@define-color light_5 #9ea7a6;
-@define-color dark_1 #9ea7a6;
-@define-color dark_2 #9ea7a6;
-@define-color dark_3 #9ea7a6;
-@define-color dark_4 #9ea7a6;
-@define-color dark_5 #9ea7a6;
+@define-color teal_1 #b02f30;
+@define-color orange_1 #43820d;
+@define-color gray_1 #3f4944;
+
diff --git a/build/base16-colors.css b/build/base16-colors.css
index f670dab..200cb85 100644
--- a/build/base16-colors.css
+++ b/build/base16-colors.css
@@ -1,88 +1,37 @@
 @define-color accent_color #0074d9;
 @define-color accent_bg_color #0074d9;
 @define-color accent_fg_color #111111;
-@define-color destructive_color #ff4136;
-@define-color destructive_bg_color #ff4136;
-@define-color destructive_fg_color #111111;
-@define-color success_color #2ecc40;
-@define-color success_bg_color #2ecc40;
-@define-color success_fg_color #111111;
-@define-color warning_color #b10dc9;
-@define-color warning_bg_color #b10dc9;
-@define-color warning_fg_color #111111;
-@define-color error_color #ff4136;
-@define-color error_bg_color #ff4136;
-@define-color error_fg_color #111111;
+
 @define-color window_bg_color #111111;
 @define-color window_fg_color #bbbbbb;
+
 @define-color view_bg_color #111111;
 @define-color view_fg_color #bbbbbb;
-@define-color headerbar_bg_color #333333;
+
+@define-color headerbar_bg_color #111111;
 @define-color headerbar_fg_color #bbbbbb;
-@define-color headerbar_border_color rgba(0.20000000, 0.20000000, 0.20000000, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #111111;
+@define-color dialog_fg_color #bbbbbb;
+
+@define-color popover_bg_color #111111;
+@define-color popover_fg_color #bbbbbb;
+
+
 @define-color sidebar_bg_color #333333;
 @define-color sidebar_fg_color #bbbbbb;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #333333;
 @define-color card_fg_color #bbbbbb;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #333333;
-@define-color dialog_fg_color #bbbbbb;
-@define-color popover_bg_color #333333;
-@define-color popover_fg_color #bbbbbb;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #555555;
-@define-color blue_1 #0074d9;
-@define-color blue_2 #0074d9;
-@define-color blue_3 #0074d9;
-@define-color blue_4 #0074d9;
-@define-color blue_5 #0074d9;
-@define-color green_1 #2ecc40;
-@define-color green_2 #2ecc40;
-@define-color green_3 #2ecc40;
-@define-color green_4 #2ecc40;
-@define-color green_5 #2ecc40;
-@define-color yellow_1 #ffdc00;
-@define-color yellow_2 #ffdc00;
-@define-color yellow_3 #ffdc00;
-@define-color yellow_4 #ffdc00;
-@define-color yellow_5 #ffdc00;
-@define-color orange_1 #ff851b;
-@define-color orange_2 #ff851b;
-@define-color orange_3 #ff851b;
-@define-color orange_4 #ff851b;
-@define-color orange_5 #ff851b;
+
+
 @define-color red_1 #ff4136;
-@define-color red_2 #ff4136;
-@define-color red_3 #ff4136;
-@define-color red_4 #ff4136;
-@define-color red_5 #ff4136;
+@define-color green_1 #2ecc40;
+@define-color yellow_1 #ffdc00;
+@define-color blue_1 #0074d9;
 @define-color purple_1 #b10dc9;
-@define-color purple_2 #b10dc9;
-@define-color purple_3 #b10dc9;
-@define-color purple_4 #b10dc9;
-@define-color purple_5 #b10dc9;
-@define-color brown_1 #85144b;
-@define-color brown_2 #85144b;
-@define-color brown_3 #85144b;
-@define-color brown_4 #85144b;
-@define-color brown_5 #85144b;
-@define-color light_1 #bbbbbb;
-@define-color light_2 #bbbbbb;
-@define-color light_3 #bbbbbb;
-@define-color light_4 #bbbbbb;
-@define-color light_5 #bbbbbb;
-@define-color dark_1 #bbbbbb;
-@define-color dark_2 #bbbbbb;
-@define-color dark_3 #bbbbbb;
-@define-color dark_4 #bbbbbb;
-@define-color dark_5 #bbbbbb;
+@define-color teal_1 #7fdbff;
+@define-color orange_1 #ff851b;
+@define-color gray_1 #777777;
+
diff --git a/build/base16-corduroy-dark.css b/build/base16-corduroy-dark.css
index ccaedd3..5077ad5 100644
--- a/build/base16-corduroy-dark.css
+++ b/build/base16-corduroy-dark.css
@@ -1,88 +1,37 @@
 @define-color accent_color #dc92a3;
 @define-color accent_bg_color #dc92a3;
 @define-color accent_fg_color #141016;
-@define-color destructive_color #e8758a;
-@define-color destructive_bg_color #e8758a;
-@define-color destructive_fg_color #141016;
-@define-color success_color #55a0a0;
-@define-color success_bg_color #55a0a0;
-@define-color success_fg_color #141016;
-@define-color warning_color #cf98c4;
-@define-color warning_bg_color #cf98c4;
-@define-color warning_fg_color #141016;
-@define-color error_color #e8758a;
-@define-color error_bg_color #e8758a;
-@define-color error_fg_color #141016;
+
 @define-color window_bg_color #141016;
 @define-color window_fg_color #ddd8df;
+
 @define-color view_bg_color #141016;
 @define-color view_fg_color #ddd8df;
-@define-color headerbar_bg_color #1b151e;
+
+@define-color headerbar_bg_color #141016;
 @define-color headerbar_fg_color #ddd8df;
-@define-color headerbar_border_color rgba(0.10588235, 0.08235294, 0.11764706, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #141016;
+@define-color dialog_fg_color #ddd8df;
+
+@define-color popover_bg_color #141016;
+@define-color popover_fg_color #ddd8df;
+
+
 @define-color sidebar_bg_color #1b151e;
 @define-color sidebar_fg_color #ddd8df;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #1b151e;
 @define-color card_fg_color #ddd8df;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #1b151e;
-@define-color dialog_fg_color #ddd8df;
-@define-color popover_bg_color #1b151e;
-@define-color popover_fg_color #ddd8df;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #221a26;
-@define-color blue_1 #dc92a3;
-@define-color blue_2 #dc92a3;
-@define-color blue_3 #dc92a3;
-@define-color blue_4 #dc92a3;
-@define-color blue_5 #dc92a3;
-@define-color green_1 #55a0a0;
-@define-color green_2 #55a0a0;
-@define-color green_3 #55a0a0;
-@define-color green_4 #55a0a0;
-@define-color green_5 #55a0a0;
-@define-color yellow_1 #f0bd9c;
-@define-color yellow_2 #f0bd9c;
-@define-color yellow_3 #f0bd9c;
-@define-color yellow_4 #f0bd9c;
-@define-color yellow_5 #f0bd9c;
-@define-color orange_1 #f0a89b;
-@define-color orange_2 #f0a89b;
-@define-color orange_3 #f0a89b;
-@define-color orange_4 #f0a89b;
-@define-color orange_5 #f0a89b;
+
+
 @define-color red_1 #e8758a;
-@define-color red_2 #e8758a;
-@define-color red_3 #e8758a;
-@define-color red_4 #e8758a;
-@define-color red_5 #e8758a;
+@define-color green_1 #55a0a0;
+@define-color yellow_1 #f0bd9c;
+@define-color blue_1 #dc92a3;
 @define-color purple_1 #cf98c4;
-@define-color purple_2 #cf98c4;
-@define-color purple_3 #cf98c4;
-@define-color purple_4 #cf98c4;
-@define-color purple_5 #cf98c4;
-@define-color brown_1 #9a8d9e;
-@define-color brown_2 #9a8d9e;
-@define-color brown_3 #9a8d9e;
-@define-color brown_4 #9a8d9e;
-@define-color brown_5 #9a8d9e;
-@define-color light_1 #ddd8df;
-@define-color light_2 #ddd8df;
-@define-color light_3 #ddd8df;
-@define-color light_4 #ddd8df;
-@define-color light_5 #ddd8df;
-@define-color dark_1 #ddd8df;
-@define-color dark_2 #ddd8df;
-@define-color dark_3 #ddd8df;
-@define-color dark_4 #ddd8df;
-@define-color dark_5 #ddd8df;
+@define-color teal_1 #f0a89b;
+@define-color orange_1 #f0a89b;
+@define-color gray_1 #7d7082;
+
diff --git a/build/base16-corduroy.css b/build/base16-corduroy.css
index db8a9e0..912be9d 100644
--- a/build/base16-corduroy.css
+++ b/build/base16-corduroy.css
@@ -1,88 +1,37 @@
 @define-color accent_color #d27f91;
 @define-color accent_bg_color #d27f91;
 @define-color accent_fg_color #1d1920;
-@define-color destructive_color #e06278;
-@define-color destructive_bg_color #e06278;
-@define-color destructive_fg_color #1d1920;
-@define-color success_color #4b8686;
-@define-color success_bg_color #4b8686;
-@define-color success_fg_color #1d1920;
-@define-color warning_color #c285b2;
-@define-color warning_bg_color #c285b2;
-@define-color warning_fg_color #1d1920;
-@define-color error_color #e06278;
-@define-color error_bg_color #e06278;
-@define-color error_fg_color #1d1920;
+
 @define-color window_bg_color #1d1920;
 @define-color window_fg_color #cdc8d0;
+
 @define-color view_bg_color #1d1920;
 @define-color view_fg_color #cdc8d0;
-@define-color headerbar_bg_color #261e2a;
+
+@define-color headerbar_bg_color #1d1920;
 @define-color headerbar_fg_color #cdc8d0;
-@define-color headerbar_border_color rgba(0.14901961, 0.11764706, 0.16470588, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #1d1920;
+@define-color dialog_fg_color #cdc8d0;
+
+@define-color popover_bg_color #1d1920;
+@define-color popover_fg_color #cdc8d0;
+
+
 @define-color sidebar_bg_color #261e2a;
 @define-color sidebar_fg_color #cdc8d0;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #261e2a;
 @define-color card_fg_color #cdc8d0;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #261e2a;
-@define-color dialog_fg_color #cdc8d0;
-@define-color popover_bg_color #261e2a;
-@define-color popover_fg_color #cdc8d0;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #2e2533;
-@define-color blue_1 #d27f91;
-@define-color blue_2 #d27f91;
-@define-color blue_3 #d27f91;
-@define-color blue_4 #d27f91;
-@define-color blue_5 #d27f91;
-@define-color green_1 #4b8686;
-@define-color green_2 #4b8686;
-@define-color green_3 #4b8686;
-@define-color green_4 #4b8686;
-@define-color green_5 #4b8686;
-@define-color yellow_1 #edb392;
-@define-color yellow_2 #edb392;
-@define-color yellow_3 #edb392;
-@define-color yellow_4 #edb392;
-@define-color yellow_5 #edb392;
-@define-color orange_1 #e99d90;
-@define-color orange_2 #e99d90;
-@define-color orange_3 #e99d90;
-@define-color orange_4 #e99d90;
-@define-color orange_5 #e99d90;
+
+
 @define-color red_1 #e06278;
-@define-color red_2 #e06278;
-@define-color red_3 #e06278;
-@define-color red_4 #e06278;
-@define-color red_5 #e06278;
+@define-color green_1 #4b8686;
+@define-color yellow_1 #edb392;
+@define-color blue_1 #d27f91;
 @define-color purple_1 #c285b2;
-@define-color purple_2 #c285b2;
-@define-color purple_3 #c285b2;
-@define-color purple_4 #c285b2;
-@define-color purple_5 #c285b2;
-@define-color brown_1 #887b8c;
-@define-color brown_2 #887b8c;
-@define-color brown_3 #887b8c;
-@define-color brown_4 #887b8c;
-@define-color brown_5 #887b8c;
-@define-color light_1 #cdc8d0;
-@define-color light_2 #cdc8d0;
-@define-color light_3 #cdc8d0;
-@define-color light_4 #cdc8d0;
-@define-color light_5 #cdc8d0;
-@define-color dark_1 #cdc8d0;
-@define-color dark_2 #cdc8d0;
-@define-color dark_3 #cdc8d0;
-@define-color dark_4 #cdc8d0;
-@define-color dark_5 #cdc8d0;
+@define-color teal_1 #e99d90;
+@define-color orange_1 #e99d90;
+@define-color gray_1 #6f6373;
+
diff --git a/build/base16-cupcake.css b/build/base16-cupcake.css
index e7814e8..6fbb683 100644
--- a/build/base16-cupcake.css
+++ b/build/base16-cupcake.css
@@ -1,88 +1,37 @@
 @define-color accent_color #7297b9;
 @define-color accent_bg_color #7297b9;
 @define-color accent_fg_color #fbf1f2;
-@define-color destructive_color #d57e85;
-@define-color destructive_bg_color #d57e85;
-@define-color destructive_fg_color #fbf1f2;
-@define-color success_color #a3b367;
-@define-color success_bg_color #a3b367;
-@define-color success_fg_color #fbf1f2;
-@define-color warning_color #bb99b4;
-@define-color warning_bg_color #bb99b4;
-@define-color warning_fg_color #fbf1f2;
-@define-color error_color #d57e85;
-@define-color error_bg_color #d57e85;
-@define-color error_fg_color #fbf1f2;
+
 @define-color window_bg_color #fbf1f2;
 @define-color window_fg_color #8b8198;
+
 @define-color view_bg_color #fbf1f2;
 @define-color view_fg_color #8b8198;
-@define-color headerbar_bg_color #f2f1f4;
+
+@define-color headerbar_bg_color #fbf1f2;
 @define-color headerbar_fg_color #8b8198;
-@define-color headerbar_border_color rgba(0.94901961, 0.94509804, 0.95686275, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #fbf1f2;
+@define-color dialog_fg_color #8b8198;
+
+@define-color popover_bg_color #fbf1f2;
+@define-color popover_fg_color #8b8198;
+
+
 @define-color sidebar_bg_color #f2f1f4;
 @define-color sidebar_fg_color #8b8198;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #f2f1f4;
 @define-color card_fg_color #8b8198;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #f2f1f4;
-@define-color dialog_fg_color #8b8198;
-@define-color popover_bg_color #f2f1f4;
-@define-color popover_fg_color #8b8198;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #d8d5dd;
-@define-color blue_1 #7297b9;
-@define-color blue_2 #7297b9;
-@define-color blue_3 #7297b9;
-@define-color blue_4 #7297b9;
-@define-color blue_5 #7297b9;
-@define-color green_1 #a3b367;
-@define-color green_2 #a3b367;
-@define-color green_3 #a3b367;
-@define-color green_4 #a3b367;
-@define-color green_5 #a3b367;
-@define-color yellow_1 #dcb16c;
-@define-color yellow_2 #dcb16c;
-@define-color yellow_3 #dcb16c;
-@define-color yellow_4 #dcb16c;
-@define-color yellow_5 #dcb16c;
-@define-color orange_1 #ebb790;
-@define-color orange_2 #ebb790;
-@define-color orange_3 #ebb790;
-@define-color orange_4 #ebb790;
-@define-color orange_5 #ebb790;
+
+
 @define-color red_1 #d57e85;
-@define-color red_2 #d57e85;
-@define-color red_3 #d57e85;
-@define-color red_4 #d57e85;
-@define-color red_5 #d57e85;
+@define-color green_1 #a3b367;
+@define-color yellow_1 #dcb16c;
+@define-color blue_1 #7297b9;
 @define-color purple_1 #bb99b4;
-@define-color purple_2 #bb99b4;
-@define-color purple_3 #bb99b4;
-@define-color purple_4 #bb99b4;
-@define-color purple_5 #bb99b4;
-@define-color brown_1 #baa58c;
-@define-color brown_2 #baa58c;
-@define-color brown_3 #baa58c;
-@define-color brown_4 #baa58c;
-@define-color brown_5 #baa58c;
-@define-color light_1 #8b8198;
-@define-color light_2 #8b8198;
-@define-color light_3 #8b8198;
-@define-color light_4 #8b8198;
-@define-color light_5 #8b8198;
-@define-color dark_1 #8b8198;
-@define-color dark_2 #8b8198;
-@define-color dark_3 #8b8198;
-@define-color dark_4 #8b8198;
-@define-color dark_5 #8b8198;
+@define-color teal_1 #69a9a7;
+@define-color orange_1 #ebb790;
+@define-color gray_1 #bfb9c6;
+
diff --git a/build/base16-cupertino.css b/build/base16-cupertino.css
index 3f1b119..9b217c0 100644
--- a/build/base16-cupertino.css
+++ b/build/base16-cupertino.css
@@ -1,88 +1,37 @@
 @define-color accent_color #0000ff;
 @define-color accent_bg_color #0000ff;
 @define-color accent_fg_color #ffffff;
-@define-color destructive_color #c41a15;
-@define-color destructive_bg_color #c41a15;
-@define-color destructive_fg_color #ffffff;
-@define-color success_color #007400;
-@define-color success_bg_color #007400;
-@define-color success_fg_color #ffffff;
-@define-color warning_color #a90d91;
-@define-color warning_bg_color #a90d91;
-@define-color warning_fg_color #ffffff;
-@define-color error_color #c41a15;
-@define-color error_bg_color #c41a15;
-@define-color error_fg_color #ffffff;
+
 @define-color window_bg_color #ffffff;
 @define-color window_fg_color #404040;
+
 @define-color view_bg_color #ffffff;
 @define-color view_fg_color #404040;
-@define-color headerbar_bg_color #c0c0c0;
+
+@define-color headerbar_bg_color #ffffff;
 @define-color headerbar_fg_color #404040;
-@define-color headerbar_border_color rgba(0.75294118, 0.75294118, 0.75294118, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #ffffff;
+@define-color dialog_fg_color #404040;
+
+@define-color popover_bg_color #ffffff;
+@define-color popover_fg_color #404040;
+
+
 @define-color sidebar_bg_color #c0c0c0;
 @define-color sidebar_fg_color #404040;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #c0c0c0;
 @define-color card_fg_color #404040;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #c0c0c0;
-@define-color dialog_fg_color #404040;
-@define-color popover_bg_color #c0c0c0;
-@define-color popover_fg_color #404040;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #c0c0c0;
-@define-color blue_1 #0000ff;
-@define-color blue_2 #0000ff;
-@define-color blue_3 #0000ff;
-@define-color blue_4 #0000ff;
-@define-color blue_5 #0000ff;
-@define-color green_1 #007400;
-@define-color green_2 #007400;
-@define-color green_3 #007400;
-@define-color green_4 #007400;
-@define-color green_5 #007400;
-@define-color yellow_1 #826b28;
-@define-color yellow_2 #826b28;
-@define-color yellow_3 #826b28;
-@define-color yellow_4 #826b28;
-@define-color yellow_5 #826b28;
-@define-color orange_1 #eb8500;
-@define-color orange_2 #eb8500;
-@define-color orange_3 #eb8500;
-@define-color orange_4 #eb8500;
-@define-color orange_5 #eb8500;
+
+
 @define-color red_1 #c41a15;
-@define-color red_2 #c41a15;
-@define-color red_3 #c41a15;
-@define-color red_4 #c41a15;
-@define-color red_5 #c41a15;
+@define-color green_1 #007400;
+@define-color yellow_1 #826b28;
+@define-color blue_1 #0000ff;
 @define-color purple_1 #a90d91;
-@define-color purple_2 #a90d91;
-@define-color purple_3 #a90d91;
-@define-color purple_4 #a90d91;
-@define-color purple_5 #a90d91;
-@define-color brown_1 #826b28;
-@define-color brown_2 #826b28;
-@define-color brown_3 #826b28;
-@define-color brown_4 #826b28;
-@define-color brown_5 #826b28;
-@define-color light_1 #404040;
-@define-color light_2 #404040;
-@define-color light_3 #404040;
-@define-color light_4 #404040;
-@define-color light_5 #404040;
-@define-color dark_1 #404040;
-@define-color dark_2 #404040;
-@define-color dark_3 #404040;
-@define-color dark_4 #404040;
-@define-color dark_5 #404040;
+@define-color teal_1 #318495;
+@define-color orange_1 #eb8500;
+@define-color gray_1 #808080;
+
diff --git a/build/base16-cyberpunk.css b/build/base16-cyberpunk.css
index 5d9dbbe..35e7571 100644
--- a/build/base16-cyberpunk.css
+++ b/build/base16-cyberpunk.css
@@ -1,88 +1,37 @@
 @define-color accent_color #4c83ff;
 @define-color accent_bg_color #4c83ff;
 @define-color accent_fg_color #000000;
-@define-color destructive_color #ff0000;
-@define-color destructive_bg_color #ff0000;
-@define-color destructive_fg_color #000000;
-@define-color success_color #61ce3c;
-@define-color success_bg_color #61ce3c;
-@define-color success_fg_color #000000;
-@define-color warning_color #ff1493;
-@define-color warning_bg_color #ff1493;
-@define-color warning_fg_color #000000;
-@define-color error_color #ff0000;
-@define-color error_bg_color #ff0000;
-@define-color error_fg_color #000000;
+
 @define-color window_bg_color #000000;
 @define-color window_fg_color #dcdccc;
+
 @define-color view_bg_color #000000;
 @define-color view_fg_color #dcdccc;
-@define-color headerbar_bg_color #2b2b2b;
+
+@define-color headerbar_bg_color #000000;
 @define-color headerbar_fg_color #dcdccc;
-@define-color headerbar_border_color rgba(0.16862745, 0.16862745, 0.16862745, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #000000;
+@define-color dialog_fg_color #dcdccc;
+
+@define-color popover_bg_color #000000;
+@define-color popover_fg_color #dcdccc;
+
+
 @define-color sidebar_bg_color #2b2b2b;
 @define-color sidebar_fg_color #dcdccc;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #2b2b2b;
 @define-color card_fg_color #dcdccc;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #2b2b2b;
-@define-color dialog_fg_color #dcdccc;
-@define-color popover_bg_color #2b2b2b;
-@define-color popover_fg_color #dcdccc;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #383838;
-@define-color blue_1 #4c83ff;
-@define-color blue_2 #4c83ff;
-@define-color blue_3 #4c83ff;
-@define-color blue_4 #4c83ff;
-@define-color blue_5 #4c83ff;
-@define-color green_1 #61ce3c;
-@define-color green_2 #61ce3c;
-@define-color green_3 #61ce3c;
-@define-color green_4 #61ce3c;
-@define-color green_5 #61ce3c;
-@define-color yellow_1 #ffff00;
-@define-color yellow_2 #ffff00;
-@define-color yellow_3 #ffff00;
-@define-color yellow_4 #ffff00;
-@define-color yellow_5 #ffff00;
-@define-color orange_1 #ffa500;
-@define-color orange_2 #ffa500;
-@define-color orange_3 #ffa500;
-@define-color orange_4 #ffa500;
-@define-color orange_5 #ffa500;
+
+
 @define-color red_1 #ff0000;
-@define-color red_2 #ff0000;
-@define-color red_3 #ff0000;
-@define-color red_4 #ff0000;
-@define-color red_5 #ff0000;
+@define-color green_1 #61ce3c;
+@define-color yellow_1 #ffff00;
+@define-color blue_1 #4c83ff;
 @define-color purple_1 #ff1493;
-@define-color purple_2 #ff1493;
-@define-color purple_3 #ff1493;
-@define-color purple_4 #ff1493;
-@define-color purple_5 #ff1493;
-@define-color brown_1 #ff8c00;
-@define-color brown_2 #ff8c00;
-@define-color brown_3 #ff8c00;
-@define-color brown_4 #ff8c00;
-@define-color brown_5 #ff8c00;
-@define-color light_1 #dcdccc;
-@define-color light_2 #dcdccc;
-@define-color light_3 #dcdccc;
-@define-color light_4 #dcdccc;
-@define-color light_5 #dcdccc;
-@define-color dark_1 #dcdccc;
-@define-color dark_2 #dcdccc;
-@define-color dark_3 #dcdccc;
-@define-color dark_4 #dcdccc;
-@define-color dark_5 #dcdccc;
+@define-color teal_1 #93e0e3;
+@define-color orange_1 #ffa500;
+@define-color gray_1 #4f4f4f;
+
diff --git a/build/base16-da-one-black.css b/build/base16-da-one-black.css
index 0b925b3..de4d6c9 100644
--- a/build/base16-da-one-black.css
+++ b/build/base16-da-one-black.css
@@ -1,88 +1,37 @@
 @define-color accent_color #6bb8ff;
 @define-color accent_bg_color #6bb8ff;
 @define-color accent_fg_color #000000;
-@define-color destructive_color #fa7883;
-@define-color destructive_bg_color #fa7883;
-@define-color destructive_fg_color #000000;
-@define-color success_color #98c379;
-@define-color success_bg_color #98c379;
-@define-color success_fg_color #000000;
-@define-color warning_color #e799ff;
-@define-color warning_bg_color #e799ff;
-@define-color warning_fg_color #000000;
-@define-color error_color #fa7883;
-@define-color error_bg_color #fa7883;
-@define-color error_fg_color #000000;
+
 @define-color window_bg_color #000000;
 @define-color window_fg_color #ffffff;
+
 @define-color view_bg_color #000000;
 @define-color view_fg_color #ffffff;
-@define-color headerbar_bg_color #282828;
+
+@define-color headerbar_bg_color #000000;
 @define-color headerbar_fg_color #ffffff;
-@define-color headerbar_border_color rgba(0.15686275, 0.15686275, 0.15686275, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #000000;
+@define-color dialog_fg_color #ffffff;
+
+@define-color popover_bg_color #000000;
+@define-color popover_fg_color #ffffff;
+
+
 @define-color sidebar_bg_color #282828;
 @define-color sidebar_fg_color #ffffff;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #282828;
 @define-color card_fg_color #ffffff;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #282828;
-@define-color dialog_fg_color #ffffff;
-@define-color popover_bg_color #282828;
-@define-color popover_fg_color #ffffff;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #585858;
-@define-color blue_1 #6bb8ff;
-@define-color blue_2 #6bb8ff;
-@define-color blue_3 #6bb8ff;
-@define-color blue_4 #6bb8ff;
-@define-color blue_5 #6bb8ff;
-@define-color green_1 #98c379;
-@define-color green_2 #98c379;
-@define-color green_3 #98c379;
-@define-color green_4 #98c379;
-@define-color green_5 #98c379;
-@define-color yellow_1 #ff9470;
-@define-color yellow_2 #ff9470;
-@define-color yellow_3 #ff9470;
-@define-color yellow_4 #ff9470;
-@define-color yellow_5 #ff9470;
-@define-color orange_1 #ffc387;
-@define-color orange_2 #ffc387;
-@define-color orange_3 #ffc387;
-@define-color orange_4 #ffc387;
-@define-color orange_5 #ffc387;
+
+
 @define-color red_1 #fa7883;
-@define-color red_2 #fa7883;
-@define-color red_3 #fa7883;
-@define-color red_4 #fa7883;
-@define-color red_5 #fa7883;
+@define-color green_1 #98c379;
+@define-color yellow_1 #ff9470;
+@define-color blue_1 #6bb8ff;
 @define-color purple_1 #e799ff;
-@define-color purple_2 #e799ff;
-@define-color purple_3 #e799ff;
-@define-color purple_4 #e799ff;
-@define-color purple_5 #e799ff;
-@define-color brown_1 #b3684f;
-@define-color brown_2 #b3684f;
-@define-color brown_3 #b3684f;
-@define-color brown_4 #b3684f;
-@define-color brown_5 #b3684f;
-@define-color light_1 #ffffff;
-@define-color light_2 #ffffff;
-@define-color light_3 #ffffff;
-@define-color light_4 #ffffff;
-@define-color light_5 #ffffff;
-@define-color dark_1 #ffffff;
-@define-color dark_2 #ffffff;
-@define-color dark_3 #ffffff;
-@define-color dark_4 #ffffff;
-@define-color dark_5 #ffffff;
+@define-color teal_1 #8af5ff;
+@define-color orange_1 #ffc387;
+@define-color gray_1 #888888;
+
diff --git a/build/base16-da-one-gray.css b/build/base16-da-one-gray.css
index 1272a73..eeaa81d 100644
--- a/build/base16-da-one-gray.css
+++ b/build/base16-da-one-gray.css
@@ -1,88 +1,37 @@
 @define-color accent_color #6bb8ff;
 @define-color accent_bg_color #6bb8ff;
 @define-color accent_fg_color #181818;
-@define-color destructive_color #fa7883;
-@define-color destructive_bg_color #fa7883;
-@define-color destructive_fg_color #181818;
-@define-color success_color #98c379;
-@define-color success_bg_color #98c379;
-@define-color success_fg_color #181818;
-@define-color warning_color #e799ff;
-@define-color warning_bg_color #e799ff;
-@define-color warning_fg_color #181818;
-@define-color error_color #fa7883;
-@define-color error_bg_color #fa7883;
-@define-color error_fg_color #181818;
+
 @define-color window_bg_color #181818;
 @define-color window_fg_color #ffffff;
+
 @define-color view_bg_color #181818;
 @define-color view_fg_color #ffffff;
-@define-color headerbar_bg_color #282828;
+
+@define-color headerbar_bg_color #181818;
 @define-color headerbar_fg_color #ffffff;
-@define-color headerbar_border_color rgba(0.15686275, 0.15686275, 0.15686275, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #181818;
+@define-color dialog_fg_color #ffffff;
+
+@define-color popover_bg_color #181818;
+@define-color popover_fg_color #ffffff;
+
+
 @define-color sidebar_bg_color #282828;
 @define-color sidebar_fg_color #ffffff;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #282828;
 @define-color card_fg_color #ffffff;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #282828;
-@define-color dialog_fg_color #ffffff;
-@define-color popover_bg_color #282828;
-@define-color popover_fg_color #ffffff;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #585858;
-@define-color blue_1 #6bb8ff;
-@define-color blue_2 #6bb8ff;
-@define-color blue_3 #6bb8ff;
-@define-color blue_4 #6bb8ff;
-@define-color blue_5 #6bb8ff;
-@define-color green_1 #98c379;
-@define-color green_2 #98c379;
-@define-color green_3 #98c379;
-@define-color green_4 #98c379;
-@define-color green_5 #98c379;
-@define-color yellow_1 #ff9470;
-@define-color yellow_2 #ff9470;
-@define-color yellow_3 #ff9470;
-@define-color yellow_4 #ff9470;
-@define-color yellow_5 #ff9470;
-@define-color orange_1 #ffc387;
-@define-color orange_2 #ffc387;
-@define-color orange_3 #ffc387;
-@define-color orange_4 #ffc387;
-@define-color orange_5 #ffc387;
+
+
 @define-color red_1 #fa7883;
-@define-color red_2 #fa7883;
-@define-color red_3 #fa7883;
-@define-color red_4 #fa7883;
-@define-color red_5 #fa7883;
+@define-color green_1 #98c379;
+@define-color yellow_1 #ff9470;
+@define-color blue_1 #6bb8ff;
 @define-color purple_1 #e799ff;
-@define-color purple_2 #e799ff;
-@define-color purple_3 #e799ff;
-@define-color purple_4 #e799ff;
-@define-color purple_5 #e799ff;
-@define-color brown_1 #b3684f;
-@define-color brown_2 #b3684f;
-@define-color brown_3 #b3684f;
-@define-color brown_4 #b3684f;
-@define-color brown_5 #b3684f;
-@define-color light_1 #ffffff;
-@define-color light_2 #ffffff;
-@define-color light_3 #ffffff;
-@define-color light_4 #ffffff;
-@define-color light_5 #ffffff;
-@define-color dark_1 #ffffff;
-@define-color dark_2 #ffffff;
-@define-color dark_3 #ffffff;
-@define-color dark_4 #ffffff;
-@define-color dark_5 #ffffff;
+@define-color teal_1 #8af5ff;
+@define-color orange_1 #ffc387;
+@define-color gray_1 #888888;
+
diff --git a/build/base16-da-one-ocean.css b/build/base16-da-one-ocean.css
index a28362a..8187b78 100644
--- a/build/base16-da-one-ocean.css
+++ b/build/base16-da-one-ocean.css
@@ -1,88 +1,37 @@
 @define-color accent_color #6bb8ff;
 @define-color accent_bg_color #6bb8ff;
 @define-color accent_fg_color #171726;
-@define-color destructive_color #fa7883;
-@define-color destructive_bg_color #fa7883;
-@define-color destructive_fg_color #171726;
-@define-color success_color #98c379;
-@define-color success_bg_color #98c379;
-@define-color success_fg_color #171726;
-@define-color warning_color #e799ff;
-@define-color warning_bg_color #e799ff;
-@define-color warning_fg_color #171726;
-@define-color error_color #fa7883;
-@define-color error_bg_color #fa7883;
-@define-color error_fg_color #171726;
+
 @define-color window_bg_color #171726;
 @define-color window_fg_color #ffffff;
+
 @define-color view_bg_color #171726;
 @define-color view_fg_color #ffffff;
-@define-color headerbar_bg_color #22273d;
+
+@define-color headerbar_bg_color #171726;
 @define-color headerbar_fg_color #ffffff;
-@define-color headerbar_border_color rgba(0.13333333, 0.15294118, 0.23921569, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #171726;
+@define-color dialog_fg_color #ffffff;
+
+@define-color popover_bg_color #171726;
+@define-color popover_fg_color #ffffff;
+
+
 @define-color sidebar_bg_color #22273d;
 @define-color sidebar_fg_color #ffffff;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #22273d;
 @define-color card_fg_color #ffffff;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #22273d;
-@define-color dialog_fg_color #ffffff;
-@define-color popover_bg_color #22273d;
-@define-color popover_fg_color #ffffff;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #525866;
-@define-color blue_1 #6bb8ff;
-@define-color blue_2 #6bb8ff;
-@define-color blue_3 #6bb8ff;
-@define-color blue_4 #6bb8ff;
-@define-color blue_5 #6bb8ff;
-@define-color green_1 #98c379;
-@define-color green_2 #98c379;
-@define-color green_3 #98c379;
-@define-color green_4 #98c379;
-@define-color green_5 #98c379;
-@define-color yellow_1 #ff9470;
-@define-color yellow_2 #ff9470;
-@define-color yellow_3 #ff9470;
-@define-color yellow_4 #ff9470;
-@define-color yellow_5 #ff9470;
-@define-color orange_1 #ffc387;
-@define-color orange_2 #ffc387;
-@define-color orange_3 #ffc387;
-@define-color orange_4 #ffc387;
-@define-color orange_5 #ffc387;
+
+
 @define-color red_1 #fa7883;
-@define-color red_2 #fa7883;
-@define-color red_3 #fa7883;
-@define-color red_4 #fa7883;
-@define-color red_5 #fa7883;
+@define-color green_1 #98c379;
+@define-color yellow_1 #ff9470;
+@define-color blue_1 #6bb8ff;
 @define-color purple_1 #e799ff;
-@define-color purple_2 #e799ff;
-@define-color purple_3 #e799ff;
-@define-color purple_4 #e799ff;
-@define-color purple_5 #e799ff;
-@define-color brown_1 #b3684f;
-@define-color brown_2 #b3684f;
-@define-color brown_3 #b3684f;
-@define-color brown_4 #b3684f;
-@define-color brown_5 #b3684f;
-@define-color light_1 #ffffff;
-@define-color light_2 #ffffff;
-@define-color light_3 #ffffff;
-@define-color light_4 #ffffff;
-@define-color light_5 #ffffff;
-@define-color dark_1 #ffffff;
-@define-color dark_2 #ffffff;
-@define-color dark_3 #ffffff;
-@define-color dark_4 #ffffff;
-@define-color dark_5 #ffffff;
+@define-color teal_1 #8af5ff;
+@define-color orange_1 #ffc387;
+@define-color gray_1 #878d96;
+
diff --git a/build/base16-da-one-paper.css b/build/base16-da-one-paper.css
index ec102c2..d181128 100644
--- a/build/base16-da-one-paper.css
+++ b/build/base16-da-one-paper.css
@@ -1,88 +1,37 @@
 @define-color accent_color #5890f8;
 @define-color accent_bg_color #5890f8;
 @define-color accent_fg_color #faf0dc;
-@define-color destructive_color #de5d6e;
-@define-color destructive_bg_color #de5d6e;
-@define-color destructive_fg_color #faf0dc;
-@define-color success_color #76a85d;
-@define-color success_bg_color #76a85d;
-@define-color success_fg_color #faf0dc;
-@define-color warning_color #c173d1;
-@define-color warning_bg_color #c173d1;
-@define-color warning_fg_color #faf0dc;
-@define-color error_color #de5d6e;
-@define-color error_bg_color #de5d6e;
-@define-color error_fg_color #faf0dc;
+
 @define-color window_bg_color #faf0dc;
 @define-color window_fg_color #181818;
+
 @define-color view_bg_color #faf0dc;
 @define-color view_fg_color #181818;
-@define-color headerbar_bg_color #c8c8c8;
+
+@define-color headerbar_bg_color #faf0dc;
 @define-color headerbar_fg_color #181818;
-@define-color headerbar_border_color rgba(0.78431373, 0.78431373, 0.78431373, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #faf0dc;
+@define-color dialog_fg_color #181818;
+
+@define-color popover_bg_color #faf0dc;
+@define-color popover_fg_color #181818;
+
+
 @define-color sidebar_bg_color #c8c8c8;
 @define-color sidebar_fg_color #181818;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #c8c8c8;
 @define-color card_fg_color #181818;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #c8c8c8;
-@define-color dialog_fg_color #181818;
-@define-color popover_bg_color #c8c8c8;
-@define-color popover_fg_color #181818;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #888888;
-@define-color blue_1 #5890f8;
-@define-color blue_2 #5890f8;
-@define-color blue_3 #5890f8;
-@define-color blue_4 #5890f8;
-@define-color blue_5 #5890f8;
-@define-color green_1 #76a85d;
-@define-color green_2 #76a85d;
-@define-color green_3 #76a85d;
-@define-color green_4 #76a85d;
-@define-color green_5 #76a85d;
-@define-color yellow_1 #b3684f;
-@define-color yellow_2 #b3684f;
-@define-color yellow_3 #b3684f;
-@define-color yellow_4 #b3684f;
-@define-color yellow_5 #b3684f;
-@define-color orange_1 #ff9470;
-@define-color orange_2 #ff9470;
-@define-color orange_3 #ff9470;
-@define-color orange_4 #ff9470;
-@define-color orange_5 #ff9470;
+
+
 @define-color red_1 #de5d6e;
-@define-color red_2 #de5d6e;
-@define-color red_3 #de5d6e;
-@define-color red_4 #de5d6e;
-@define-color red_5 #de5d6e;
+@define-color green_1 #76a85d;
+@define-color yellow_1 #b3684f;
+@define-color blue_1 #5890f8;
 @define-color purple_1 #c173d1;
-@define-color purple_2 #c173d1;
-@define-color purple_3 #c173d1;
-@define-color purple_4 #c173d1;
-@define-color purple_5 #c173d1;
-@define-color brown_1 #b3684f;
-@define-color brown_2 #b3684f;
-@define-color brown_3 #b3684f;
-@define-color brown_4 #b3684f;
-@define-color brown_5 #b3684f;
-@define-color light_1 #181818;
-@define-color light_2 #181818;
-@define-color light_3 #181818;
-@define-color light_4 #181818;
-@define-color light_5 #181818;
-@define-color dark_1 #181818;
-@define-color dark_2 #181818;
-@define-color dark_3 #181818;
-@define-color dark_4 #181818;
-@define-color dark_5 #181818;
+@define-color teal_1 #64b5a7;
+@define-color orange_1 #ff9470;
+@define-color gray_1 #585858;
+
diff --git a/build/base16-da-one-sea.css b/build/base16-da-one-sea.css
index d9203c7..01a1e9f 100644
--- a/build/base16-da-one-sea.css
+++ b/build/base16-da-one-sea.css
@@ -1,88 +1,37 @@
 @define-color accent_color #6bb8ff;
 @define-color accent_bg_color #6bb8ff;
 @define-color accent_fg_color #22273d;
-@define-color destructive_color #fa7883;
-@define-color destructive_bg_color #fa7883;
-@define-color destructive_fg_color #22273d;
-@define-color success_color #98c379;
-@define-color success_bg_color #98c379;
-@define-color success_fg_color #22273d;
-@define-color warning_color #e799ff;
-@define-color warning_bg_color #e799ff;
-@define-color warning_fg_color #22273d;
-@define-color error_color #fa7883;
-@define-color error_bg_color #fa7883;
-@define-color error_fg_color #22273d;
+
 @define-color window_bg_color #22273d;
 @define-color window_fg_color #ffffff;
+
 @define-color view_bg_color #22273d;
 @define-color view_fg_color #ffffff;
-@define-color headerbar_bg_color #374059;
+
+@define-color headerbar_bg_color #22273d;
 @define-color headerbar_fg_color #ffffff;
-@define-color headerbar_border_color rgba(0.21568627, 0.25098039, 0.34901961, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #22273d;
+@define-color dialog_fg_color #ffffff;
+
+@define-color popover_bg_color #22273d;
+@define-color popover_fg_color #ffffff;
+
+
 @define-color sidebar_bg_color #374059;
 @define-color sidebar_fg_color #ffffff;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #374059;
 @define-color card_fg_color #ffffff;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #374059;
-@define-color dialog_fg_color #ffffff;
-@define-color popover_bg_color #374059;
-@define-color popover_fg_color #ffffff;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #525866;
-@define-color blue_1 #6bb8ff;
-@define-color blue_2 #6bb8ff;
-@define-color blue_3 #6bb8ff;
-@define-color blue_4 #6bb8ff;
-@define-color blue_5 #6bb8ff;
-@define-color green_1 #98c379;
-@define-color green_2 #98c379;
-@define-color green_3 #98c379;
-@define-color green_4 #98c379;
-@define-color green_5 #98c379;
-@define-color yellow_1 #ff9470;
-@define-color yellow_2 #ff9470;
-@define-color yellow_3 #ff9470;
-@define-color yellow_4 #ff9470;
-@define-color yellow_5 #ff9470;
-@define-color orange_1 #ffc387;
-@define-color orange_2 #ffc387;
-@define-color orange_3 #ffc387;
-@define-color orange_4 #ffc387;
-@define-color orange_5 #ffc387;
+
+
 @define-color red_1 #fa7883;
-@define-color red_2 #fa7883;
-@define-color red_3 #fa7883;
-@define-color red_4 #fa7883;
-@define-color red_5 #fa7883;
+@define-color green_1 #98c379;
+@define-color yellow_1 #ff9470;
+@define-color blue_1 #6bb8ff;
 @define-color purple_1 #e799ff;
-@define-color purple_2 #e799ff;
-@define-color purple_3 #e799ff;
-@define-color purple_4 #e799ff;
-@define-color purple_5 #e799ff;
-@define-color brown_1 #b3684f;
-@define-color brown_2 #b3684f;
-@define-color brown_3 #b3684f;
-@define-color brown_4 #b3684f;
-@define-color brown_5 #b3684f;
-@define-color light_1 #ffffff;
-@define-color light_2 #ffffff;
-@define-color light_3 #ffffff;
-@define-color light_4 #ffffff;
-@define-color light_5 #ffffff;
-@define-color dark_1 #ffffff;
-@define-color dark_2 #ffffff;
-@define-color dark_3 #ffffff;
-@define-color dark_4 #ffffff;
-@define-color dark_5 #ffffff;
+@define-color teal_1 #8af5ff;
+@define-color orange_1 #ffc387;
+@define-color gray_1 #878d96;
+
diff --git a/build/base16-da-one-white.css b/build/base16-da-one-white.css
index 71c149c..8c63993 100644
--- a/build/base16-da-one-white.css
+++ b/build/base16-da-one-white.css
@@ -1,88 +1,37 @@
 @define-color accent_color #5890f8;
 @define-color accent_bg_color #5890f8;
 @define-color accent_fg_color #ffffff;
-@define-color destructive_color #de5d6e;
-@define-color destructive_bg_color #de5d6e;
-@define-color destructive_fg_color #ffffff;
-@define-color success_color #76a85d;
-@define-color success_bg_color #76a85d;
-@define-color success_fg_color #ffffff;
-@define-color warning_color #c173d1;
-@define-color warning_bg_color #c173d1;
-@define-color warning_fg_color #ffffff;
-@define-color error_color #de5d6e;
-@define-color error_bg_color #de5d6e;
-@define-color error_fg_color #ffffff;
+
 @define-color window_bg_color #ffffff;
 @define-color window_fg_color #181818;
+
 @define-color view_bg_color #ffffff;
 @define-color view_fg_color #181818;
-@define-color headerbar_bg_color #c8c8c8;
+
+@define-color headerbar_bg_color #ffffff;
 @define-color headerbar_fg_color #181818;
-@define-color headerbar_border_color rgba(0.78431373, 0.78431373, 0.78431373, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #ffffff;
+@define-color dialog_fg_color #181818;
+
+@define-color popover_bg_color #ffffff;
+@define-color popover_fg_color #181818;
+
+
 @define-color sidebar_bg_color #c8c8c8;
 @define-color sidebar_fg_color #181818;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #c8c8c8;
 @define-color card_fg_color #181818;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #c8c8c8;
-@define-color dialog_fg_color #181818;
-@define-color popover_bg_color #c8c8c8;
-@define-color popover_fg_color #181818;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #888888;
-@define-color blue_1 #5890f8;
-@define-color blue_2 #5890f8;
-@define-color blue_3 #5890f8;
-@define-color blue_4 #5890f8;
-@define-color blue_5 #5890f8;
-@define-color green_1 #76a85d;
-@define-color green_2 #76a85d;
-@define-color green_3 #76a85d;
-@define-color green_4 #76a85d;
-@define-color green_5 #76a85d;
-@define-color yellow_1 #b3684f;
-@define-color yellow_2 #b3684f;
-@define-color yellow_3 #b3684f;
-@define-color yellow_4 #b3684f;
-@define-color yellow_5 #b3684f;
-@define-color orange_1 #ff9470;
-@define-color orange_2 #ff9470;
-@define-color orange_3 #ff9470;
-@define-color orange_4 #ff9470;
-@define-color orange_5 #ff9470;
+
+
 @define-color red_1 #de5d6e;
-@define-color red_2 #de5d6e;
-@define-color red_3 #de5d6e;
-@define-color red_4 #de5d6e;
-@define-color red_5 #de5d6e;
+@define-color green_1 #76a85d;
+@define-color yellow_1 #b3684f;
+@define-color blue_1 #5890f8;
 @define-color purple_1 #c173d1;
-@define-color purple_2 #c173d1;
-@define-color purple_3 #c173d1;
-@define-color purple_4 #c173d1;
-@define-color purple_5 #c173d1;
-@define-color brown_1 #b3684f;
-@define-color brown_2 #b3684f;
-@define-color brown_3 #b3684f;
-@define-color brown_4 #b3684f;
-@define-color brown_5 #b3684f;
-@define-color light_1 #181818;
-@define-color light_2 #181818;
-@define-color light_3 #181818;
-@define-color light_4 #181818;
-@define-color light_5 #181818;
-@define-color dark_1 #181818;
-@define-color dark_2 #181818;
-@define-color dark_3 #181818;
-@define-color dark_4 #181818;
-@define-color dark_5 #181818;
+@define-color teal_1 #64b5a7;
+@define-color orange_1 #ff9470;
+@define-color gray_1 #585858;
+
diff --git a/build/base16-danqing-light.css b/build/base16-danqing-light.css
index 0ab4277..6c4f117 100644
--- a/build/base16-danqing-light.css
+++ b/build/base16-danqing-light.css
@@ -1,88 +1,37 @@
 @define-color accent_color #b0a4e3;
 @define-color accent_bg_color #b0a4e3;
 @define-color accent_fg_color #fcfefd;
-@define-color destructive_color #f9906f;
-@define-color destructive_bg_color #f9906f;
-@define-color destructive_fg_color #fcfefd;
-@define-color success_color #8ab361;
-@define-color success_bg_color #8ab361;
-@define-color success_fg_color #fcfefd;
-@define-color warning_color #cca4e3;
-@define-color warning_bg_color #cca4e3;
-@define-color warning_fg_color #fcfefd;
-@define-color error_color #f9906f;
-@define-color error_bg_color #f9906f;
-@define-color error_fg_color #fcfefd;
+
 @define-color window_bg_color #fcfefd;
 @define-color window_fg_color #5a605d;
+
 @define-color view_bg_color #fcfefd;
 @define-color view_fg_color #5a605d;
-@define-color headerbar_bg_color #ecf6f2;
+
+@define-color headerbar_bg_color #fcfefd;
 @define-color headerbar_fg_color #5a605d;
-@define-color headerbar_border_color rgba(0.92549020, 0.96470588, 0.94901961, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #fcfefd;
+@define-color dialog_fg_color #5a605d;
+
+@define-color popover_bg_color #fcfefd;
+@define-color popover_fg_color #5a605d;
+
+
 @define-color sidebar_bg_color #ecf6f2;
 @define-color sidebar_fg_color #5a605d;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #ecf6f2;
 @define-color card_fg_color #5a605d;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #ecf6f2;
-@define-color dialog_fg_color #5a605d;
-@define-color popover_bg_color #ecf6f2;
-@define-color popover_fg_color #5a605d;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #e0f0ef;
-@define-color blue_1 #b0a4e3;
-@define-color blue_2 #b0a4e3;
-@define-color blue_3 #b0a4e3;
-@define-color blue_4 #b0a4e3;
-@define-color blue_5 #b0a4e3;
-@define-color green_1 #8ab361;
-@define-color green_2 #8ab361;
-@define-color green_3 #8ab361;
-@define-color green_4 #8ab361;
-@define-color green_5 #8ab361;
-@define-color yellow_1 #f0c239;
-@define-color yellow_2 #f0c239;
-@define-color yellow_3 #f0c239;
-@define-color yellow_4 #f0c239;
-@define-color yellow_5 #f0c239;
-@define-color orange_1 #b38a61;
-@define-color orange_2 #b38a61;
-@define-color orange_3 #b38a61;
-@define-color orange_4 #b38a61;
-@define-color orange_5 #b38a61;
+
+
 @define-color red_1 #f9906f;
-@define-color red_2 #f9906f;
-@define-color red_3 #f9906f;
-@define-color red_4 #f9906f;
-@define-color red_5 #f9906f;
+@define-color green_1 #8ab361;
+@define-color yellow_1 #f0c239;
+@define-color blue_1 #b0a4e3;
 @define-color purple_1 #cca4e3;
-@define-color purple_2 #cca4e3;
-@define-color purple_3 #cca4e3;
-@define-color purple_4 #cca4e3;
-@define-color purple_5 #cca4e3;
-@define-color brown_1 #ca6924;
-@define-color brown_2 #ca6924;
-@define-color brown_3 #ca6924;
-@define-color brown_4 #ca6924;
-@define-color brown_5 #ca6924;
-@define-color light_1 #5a605d;
-@define-color light_2 #5a605d;
-@define-color light_3 #5a605d;
-@define-color light_4 #5a605d;
-@define-color light_5 #5a605d;
-@define-color dark_1 #5a605d;
-@define-color dark_2 #5a605d;
-@define-color dark_3 #5a605d;
-@define-color dark_4 #5a605d;
-@define-color dark_5 #5a605d;
+@define-color teal_1 #30dff3;
+@define-color orange_1 #b38a61;
+@define-color gray_1 #cad8d2;
+
diff --git a/build/base16-danqing.css b/build/base16-danqing.css
index ca3f061..1bf080d 100644
--- a/build/base16-danqing.css
+++ b/build/base16-danqing.css
@@ -1,88 +1,37 @@
 @define-color accent_color #b0a4e3;
 @define-color accent_bg_color #b0a4e3;
 @define-color accent_fg_color #2d302f;
-@define-color destructive_color #f9906f;
-@define-color destructive_bg_color #f9906f;
-@define-color destructive_fg_color #2d302f;
-@define-color success_color #8ab361;
-@define-color success_bg_color #8ab361;
-@define-color success_fg_color #2d302f;
-@define-color warning_color #cca4e3;
-@define-color warning_bg_color #cca4e3;
-@define-color warning_fg_color #2d302f;
-@define-color error_color #f9906f;
-@define-color error_bg_color #f9906f;
-@define-color error_fg_color #2d302f;
+
 @define-color window_bg_color #2d302f;
 @define-color window_fg_color #e0f0ef;
+
 @define-color view_bg_color #2d302f;
 @define-color view_fg_color #e0f0ef;
-@define-color headerbar_bg_color #434846;
+
+@define-color headerbar_bg_color #2d302f;
 @define-color headerbar_fg_color #e0f0ef;
-@define-color headerbar_border_color rgba(0.26274510, 0.28235294, 0.27450980, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #2d302f;
+@define-color dialog_fg_color #e0f0ef;
+
+@define-color popover_bg_color #2d302f;
+@define-color popover_fg_color #e0f0ef;
+
+
 @define-color sidebar_bg_color #434846;
 @define-color sidebar_fg_color #e0f0ef;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #434846;
 @define-color card_fg_color #e0f0ef;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #434846;
-@define-color dialog_fg_color #e0f0ef;
-@define-color popover_bg_color #434846;
-@define-color popover_fg_color #e0f0ef;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #5a605d;
-@define-color blue_1 #b0a4e3;
-@define-color blue_2 #b0a4e3;
-@define-color blue_3 #b0a4e3;
-@define-color blue_4 #b0a4e3;
-@define-color blue_5 #b0a4e3;
-@define-color green_1 #8ab361;
-@define-color green_2 #8ab361;
-@define-color green_3 #8ab361;
-@define-color green_4 #8ab361;
-@define-color green_5 #8ab361;
-@define-color yellow_1 #f0c239;
-@define-color yellow_2 #f0c239;
-@define-color yellow_3 #f0c239;
-@define-color yellow_4 #f0c239;
-@define-color yellow_5 #f0c239;
-@define-color orange_1 #b38a61;
-@define-color orange_2 #b38a61;
-@define-color orange_3 #b38a61;
-@define-color orange_4 #b38a61;
-@define-color orange_5 #b38a61;
+
+
 @define-color red_1 #f9906f;
-@define-color red_2 #f9906f;
-@define-color red_3 #f9906f;
-@define-color red_4 #f9906f;
-@define-color red_5 #f9906f;
+@define-color green_1 #8ab361;
+@define-color yellow_1 #f0c239;
+@define-color blue_1 #b0a4e3;
 @define-color purple_1 #cca4e3;
-@define-color purple_2 #cca4e3;
-@define-color purple_3 #cca4e3;
-@define-color purple_4 #cca4e3;
-@define-color purple_5 #cca4e3;
-@define-color brown_1 #ca6924;
-@define-color brown_2 #ca6924;
-@define-color brown_3 #ca6924;
-@define-color brown_4 #ca6924;
-@define-color brown_5 #ca6924;
-@define-color light_1 #e0f0ef;
-@define-color light_2 #e0f0ef;
-@define-color light_3 #e0f0ef;
-@define-color light_4 #e0f0ef;
-@define-color light_5 #e0f0ef;
-@define-color dark_1 #e0f0ef;
-@define-color dark_2 #e0f0ef;
-@define-color dark_3 #e0f0ef;
-@define-color dark_4 #e0f0ef;
-@define-color dark_5 #e0f0ef;
+@define-color teal_1 #30dff3;
+@define-color orange_1 #b38a61;
+@define-color gray_1 #9da8a3;
+
diff --git a/build/base16-darcula.css b/build/base16-darcula.css
index 0c668f1..d878f93 100644
--- a/build/base16-darcula.css
+++ b/build/base16-darcula.css
@@ -1,88 +1,37 @@
 @define-color accent_color #9876aa;
 @define-color accent_bg_color #9876aa;
 @define-color accent_fg_color #2b2b2b;
-@define-color destructive_color #4eade5;
-@define-color destructive_bg_color #4eade5;
-@define-color destructive_fg_color #2b2b2b;
-@define-color success_color #6a8759;
-@define-color success_bg_color #6a8759;
-@define-color success_fg_color #2b2b2b;
-@define-color warning_color #cc7832;
-@define-color warning_bg_color #cc7832;
-@define-color warning_fg_color #2b2b2b;
-@define-color error_color #4eade5;
-@define-color error_bg_color #4eade5;
-@define-color error_fg_color #2b2b2b;
+
 @define-color window_bg_color #2b2b2b;
 @define-color window_fg_color #a9b7c6;
+
 @define-color view_bg_color #2b2b2b;
 @define-color view_fg_color #a9b7c6;
-@define-color headerbar_bg_color #323232;
+
+@define-color headerbar_bg_color #2b2b2b;
 @define-color headerbar_fg_color #a9b7c6;
-@define-color headerbar_border_color rgba(0.19607843, 0.19607843, 0.19607843, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #2b2b2b;
+@define-color dialog_fg_color #a9b7c6;
+
+@define-color popover_bg_color #2b2b2b;
+@define-color popover_fg_color #a9b7c6;
+
+
 @define-color sidebar_bg_color #323232;
 @define-color sidebar_fg_color #a9b7c6;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #323232;
 @define-color card_fg_color #a9b7c6;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #323232;
-@define-color dialog_fg_color #a9b7c6;
-@define-color popover_bg_color #323232;
-@define-color popover_fg_color #a9b7c6;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #323232;
-@define-color blue_1 #9876aa;
-@define-color blue_2 #9876aa;
-@define-color blue_3 #9876aa;
-@define-color blue_4 #9876aa;
-@define-color blue_5 #9876aa;
-@define-color green_1 #6a8759;
-@define-color green_2 #6a8759;
-@define-color green_3 #6a8759;
-@define-color green_4 #6a8759;
-@define-color green_5 #6a8759;
-@define-color yellow_1 #bbb529;
-@define-color yellow_2 #bbb529;
-@define-color yellow_3 #bbb529;
-@define-color yellow_4 #bbb529;
-@define-color yellow_5 #bbb529;
-@define-color orange_1 #689757;
-@define-color orange_2 #689757;
-@define-color orange_3 #689757;
-@define-color orange_4 #689757;
-@define-color orange_5 #689757;
+
+
 @define-color red_1 #4eade5;
-@define-color red_2 #4eade5;
-@define-color red_3 #4eade5;
-@define-color red_4 #4eade5;
-@define-color red_5 #4eade5;
+@define-color green_1 #6a8759;
+@define-color yellow_1 #bbb529;
+@define-color blue_1 #9876aa;
 @define-color purple_1 #cc7832;
-@define-color purple_2 #cc7832;
-@define-color purple_3 #cc7832;
-@define-color purple_4 #cc7832;
-@define-color purple_5 #cc7832;
-@define-color brown_1 #808080;
-@define-color brown_2 #808080;
-@define-color brown_3 #808080;
-@define-color brown_4 #808080;
-@define-color brown_5 #808080;
-@define-color light_1 #a9b7c6;
-@define-color light_2 #a9b7c6;
-@define-color light_3 #a9b7c6;
-@define-color light_4 #a9b7c6;
-@define-color light_5 #a9b7c6;
-@define-color dark_1 #a9b7c6;
-@define-color dark_2 #a9b7c6;
-@define-color dark_3 #a9b7c6;
-@define-color dark_4 #a9b7c6;
-@define-color dark_5 #a9b7c6;
+@define-color teal_1 #629755;
+@define-color orange_1 #689757;
+@define-color gray_1 #606366;
+
diff --git a/build/base16-darkmoss.css b/build/base16-darkmoss.css
index b9eab9b..ea7de7d 100644
--- a/build/base16-darkmoss.css
+++ b/build/base16-darkmoss.css
@@ -1,88 +1,37 @@
 @define-color accent_color #498091;
 @define-color accent_bg_color #498091;
 @define-color accent_fg_color #171e1f;
-@define-color destructive_color #ff4658;
-@define-color destructive_bg_color #ff4658;
-@define-color destructive_fg_color #171e1f;
-@define-color success_color #499180;
-@define-color success_bg_color #499180;
-@define-color success_fg_color #171e1f;
-@define-color warning_color #9bc0c8;
-@define-color warning_bg_color #9bc0c8;
-@define-color warning_fg_color #171e1f;
-@define-color error_color #ff4658;
-@define-color error_bg_color #ff4658;
-@define-color error_fg_color #171e1f;
+
 @define-color window_bg_color #171e1f;
 @define-color window_fg_color #c7c7a5;
+
 @define-color view_bg_color #171e1f;
 @define-color view_fg_color #c7c7a5;
-@define-color headerbar_bg_color #252c2d;
+
+@define-color headerbar_bg_color #171e1f;
 @define-color headerbar_fg_color #c7c7a5;
-@define-color headerbar_border_color rgba(0.14509804, 0.17254902, 0.17647059, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #171e1f;
+@define-color dialog_fg_color #c7c7a5;
+
+@define-color popover_bg_color #171e1f;
+@define-color popover_fg_color #c7c7a5;
+
+
 @define-color sidebar_bg_color #252c2d;
 @define-color sidebar_fg_color #c7c7a5;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #252c2d;
 @define-color card_fg_color #c7c7a5;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #252c2d;
-@define-color dialog_fg_color #c7c7a5;
-@define-color popover_bg_color #252c2d;
-@define-color popover_fg_color #c7c7a5;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #373c3d;
-@define-color blue_1 #498091;
-@define-color blue_2 #498091;
-@define-color blue_3 #498091;
-@define-color blue_4 #498091;
-@define-color blue_5 #498091;
-@define-color green_1 #499180;
-@define-color green_2 #499180;
-@define-color green_3 #499180;
-@define-color green_4 #499180;
-@define-color green_5 #499180;
-@define-color yellow_1 #fdb11f;
-@define-color yellow_2 #fdb11f;
-@define-color yellow_3 #fdb11f;
-@define-color yellow_4 #fdb11f;
-@define-color yellow_5 #fdb11f;
-@define-color orange_1 #e6db74;
-@define-color orange_2 #e6db74;
-@define-color orange_3 #e6db74;
-@define-color orange_4 #e6db74;
-@define-color orange_5 #e6db74;
+
+
 @define-color red_1 #ff4658;
-@define-color red_2 #ff4658;
-@define-color red_3 #ff4658;
-@define-color red_4 #ff4658;
-@define-color red_5 #ff4658;
+@define-color green_1 #499180;
+@define-color yellow_1 #fdb11f;
+@define-color blue_1 #498091;
 @define-color purple_1 #9bc0c8;
-@define-color purple_2 #9bc0c8;
-@define-color purple_3 #9bc0c8;
-@define-color purple_4 #9bc0c8;
-@define-color purple_5 #9bc0c8;
-@define-color brown_1 #d27b53;
-@define-color brown_2 #d27b53;
-@define-color brown_3 #d27b53;
-@define-color brown_4 #d27b53;
-@define-color brown_5 #d27b53;
-@define-color light_1 #c7c7a5;
-@define-color light_2 #c7c7a5;
-@define-color light_3 #c7c7a5;
-@define-color light_4 #c7c7a5;
-@define-color light_5 #c7c7a5;
-@define-color dark_1 #c7c7a5;
-@define-color dark_2 #c7c7a5;
-@define-color dark_3 #c7c7a5;
-@define-color dark_4 #c7c7a5;
-@define-color dark_5 #c7c7a5;
+@define-color teal_1 #66d9ef;
+@define-color orange_1 #e6db74;
+@define-color gray_1 #555e5f;
+
diff --git a/build/base16-darktooth.css b/build/base16-darktooth.css
index 03b99b6..0f68167 100644
--- a/build/base16-darktooth.css
+++ b/build/base16-darktooth.css
@@ -1,88 +1,37 @@
 @define-color accent_color #0d6678;
 @define-color accent_bg_color #0d6678;
 @define-color accent_fg_color #1d2021;
-@define-color destructive_color #fb543f;
-@define-color destructive_bg_color #fb543f;
-@define-color destructive_fg_color #1d2021;
-@define-color success_color #95c085;
-@define-color success_bg_color #95c085;
-@define-color success_fg_color #1d2021;
-@define-color warning_color #8f4673;
-@define-color warning_bg_color #8f4673;
-@define-color warning_fg_color #1d2021;
-@define-color error_color #fb543f;
-@define-color error_bg_color #fb543f;
-@define-color error_fg_color #1d2021;
+
 @define-color window_bg_color #1d2021;
 @define-color window_fg_color #a89984;
+
 @define-color view_bg_color #1d2021;
 @define-color view_fg_color #a89984;
-@define-color headerbar_bg_color #32302f;
+
+@define-color headerbar_bg_color #1d2021;
 @define-color headerbar_fg_color #a89984;
-@define-color headerbar_border_color rgba(0.19607843, 0.18823529, 0.18431373, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #1d2021;
+@define-color dialog_fg_color #a89984;
+
+@define-color popover_bg_color #1d2021;
+@define-color popover_fg_color #a89984;
+
+
 @define-color sidebar_bg_color #32302f;
 @define-color sidebar_fg_color #a89984;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #32302f;
 @define-color card_fg_color #a89984;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #32302f;
-@define-color dialog_fg_color #a89984;
-@define-color popover_bg_color #32302f;
-@define-color popover_fg_color #a89984;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #504945;
-@define-color blue_1 #0d6678;
-@define-color blue_2 #0d6678;
-@define-color blue_3 #0d6678;
-@define-color blue_4 #0d6678;
-@define-color blue_5 #0d6678;
-@define-color green_1 #95c085;
-@define-color green_2 #95c085;
-@define-color green_3 #95c085;
-@define-color green_4 #95c085;
-@define-color green_5 #95c085;
-@define-color yellow_1 #fac03b;
-@define-color yellow_2 #fac03b;
-@define-color yellow_3 #fac03b;
-@define-color yellow_4 #fac03b;
-@define-color yellow_5 #fac03b;
-@define-color orange_1 #fe8625;
-@define-color orange_2 #fe8625;
-@define-color orange_3 #fe8625;
-@define-color orange_4 #fe8625;
-@define-color orange_5 #fe8625;
+
+
 @define-color red_1 #fb543f;
-@define-color red_2 #fb543f;
-@define-color red_3 #fb543f;
-@define-color red_4 #fb543f;
-@define-color red_5 #fb543f;
+@define-color green_1 #95c085;
+@define-color yellow_1 #fac03b;
+@define-color blue_1 #0d6678;
 @define-color purple_1 #8f4673;
-@define-color purple_2 #8f4673;
-@define-color purple_3 #8f4673;
-@define-color purple_4 #8f4673;
-@define-color purple_5 #8f4673;
-@define-color brown_1 #a87322;
-@define-color brown_2 #a87322;
-@define-color brown_3 #a87322;
-@define-color brown_4 #a87322;
-@define-color brown_5 #a87322;
-@define-color light_1 #a89984;
-@define-color light_2 #a89984;
-@define-color light_3 #a89984;
-@define-color light_4 #a89984;
-@define-color light_5 #a89984;
-@define-color dark_1 #a89984;
-@define-color dark_2 #a89984;
-@define-color dark_3 #a89984;
-@define-color dark_4 #a89984;
-@define-color dark_5 #a89984;
+@define-color teal_1 #8ba59b;
+@define-color orange_1 #fe8625;
+@define-color gray_1 #665c54;
+
diff --git a/build/base16-darkviolet.css b/build/base16-darkviolet.css
index c7e4643..13c79ec 100644
--- a/build/base16-darkviolet.css
+++ b/build/base16-darkviolet.css
@@ -1,88 +1,37 @@
 @define-color accent_color #4136d9;
 @define-color accent_bg_color #4136d9;
 @define-color accent_fg_color #000000;
-@define-color destructive_color #a82ee6;
-@define-color destructive_bg_color #a82ee6;
-@define-color destructive_fg_color #000000;
-@define-color success_color #4595e6;
-@define-color success_bg_color #4595e6;
-@define-color success_fg_color #000000;
-@define-color warning_color #7e5ce6;
-@define-color warning_bg_color #7e5ce6;
-@define-color warning_fg_color #000000;
-@define-color error_color #a82ee6;
-@define-color error_bg_color #a82ee6;
-@define-color error_fg_color #000000;
+
 @define-color window_bg_color #000000;
 @define-color window_fg_color #b08ae6;
+
 @define-color view_bg_color #000000;
 @define-color view_fg_color #b08ae6;
-@define-color headerbar_bg_color #231a40;
+
+@define-color headerbar_bg_color #000000;
 @define-color headerbar_fg_color #b08ae6;
-@define-color headerbar_border_color rgba(0.13725490, 0.10196078, 0.25098039, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #000000;
+@define-color dialog_fg_color #b08ae6;
+
+@define-color popover_bg_color #000000;
+@define-color popover_fg_color #b08ae6;
+
+
 @define-color sidebar_bg_color #231a40;
 @define-color sidebar_fg_color #b08ae6;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #231a40;
 @define-color card_fg_color #b08ae6;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #231a40;
-@define-color dialog_fg_color #b08ae6;
-@define-color popover_bg_color #231a40;
-@define-color popover_fg_color #b08ae6;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #432d59;
-@define-color blue_1 #4136d9;
-@define-color blue_2 #4136d9;
-@define-color blue_3 #4136d9;
-@define-color blue_4 #4136d9;
-@define-color blue_5 #4136d9;
-@define-color green_1 #4595e6;
-@define-color green_2 #4595e6;
-@define-color green_3 #4595e6;
-@define-color green_4 #4595e6;
-@define-color green_5 #4595e6;
-@define-color yellow_1 #f29df2;
-@define-color yellow_2 #f29df2;
-@define-color yellow_3 #f29df2;
-@define-color yellow_4 #f29df2;
-@define-color yellow_5 #f29df2;
-@define-color orange_1 #bb66cc;
-@define-color orange_2 #bb66cc;
-@define-color orange_3 #bb66cc;
-@define-color orange_4 #bb66cc;
-@define-color orange_5 #bb66cc;
+
+
 @define-color red_1 #a82ee6;
-@define-color red_2 #a82ee6;
-@define-color red_3 #a82ee6;
-@define-color red_4 #a82ee6;
-@define-color red_5 #a82ee6;
+@define-color green_1 #4595e6;
+@define-color yellow_1 #f29df2;
+@define-color blue_1 #4136d9;
 @define-color purple_1 #7e5ce6;
-@define-color purple_2 #7e5ce6;
-@define-color purple_3 #7e5ce6;
-@define-color purple_4 #7e5ce6;
-@define-color purple_5 #7e5ce6;
-@define-color brown_1 #a886bf;
-@define-color brown_2 #a886bf;
-@define-color brown_3 #a886bf;
-@define-color brown_4 #a886bf;
-@define-color brown_5 #a886bf;
-@define-color light_1 #b08ae6;
-@define-color light_2 #b08ae6;
-@define-color light_3 #b08ae6;
-@define-color light_4 #b08ae6;
-@define-color light_5 #b08ae6;
-@define-color dark_1 #b08ae6;
-@define-color dark_2 #b08ae6;
-@define-color dark_3 #b08ae6;
-@define-color dark_4 #b08ae6;
-@define-color dark_5 #b08ae6;
+@define-color teal_1 #40dfff;
+@define-color orange_1 #bb66cc;
+@define-color gray_1 #593380;
+
diff --git a/build/base16-decaf.css b/build/base16-decaf.css
index a12fe9f..8dd0159 100644
--- a/build/base16-decaf.css
+++ b/build/base16-decaf.css
@@ -1,88 +1,37 @@
 @define-color accent_color #90bee1;
 @define-color accent_bg_color #90bee1;
 @define-color accent_fg_color #2d2d2d;
-@define-color destructive_color #ff7f7b;
-@define-color destructive_bg_color #ff7f7b;
-@define-color destructive_fg_color #2d2d2d;
-@define-color success_color #beda78;
-@define-color success_bg_color #beda78;
-@define-color success_fg_color #2d2d2d;
-@define-color warning_color #efb3f7;
-@define-color warning_bg_color #efb3f7;
-@define-color warning_fg_color #2d2d2d;
-@define-color error_color #ff7f7b;
-@define-color error_bg_color #ff7f7b;
-@define-color error_fg_color #2d2d2d;
+
 @define-color window_bg_color #2d2d2d;
 @define-color window_fg_color #cccccc;
+
 @define-color view_bg_color #2d2d2d;
 @define-color view_fg_color #cccccc;
-@define-color headerbar_bg_color #393939;
+
+@define-color headerbar_bg_color #2d2d2d;
 @define-color headerbar_fg_color #cccccc;
-@define-color headerbar_border_color rgba(0.22352941, 0.22352941, 0.22352941, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #2d2d2d;
+@define-color dialog_fg_color #cccccc;
+
+@define-color popover_bg_color #2d2d2d;
+@define-color popover_fg_color #cccccc;
+
+
 @define-color sidebar_bg_color #393939;
 @define-color sidebar_fg_color #cccccc;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #393939;
 @define-color card_fg_color #cccccc;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #393939;
-@define-color dialog_fg_color #cccccc;
-@define-color popover_bg_color #393939;
-@define-color popover_fg_color #cccccc;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #515151;
-@define-color blue_1 #90bee1;
-@define-color blue_2 #90bee1;
-@define-color blue_3 #90bee1;
-@define-color blue_4 #90bee1;
-@define-color blue_5 #90bee1;
-@define-color green_1 #beda78;
-@define-color green_2 #beda78;
-@define-color green_3 #beda78;
-@define-color green_4 #beda78;
-@define-color green_5 #beda78;
-@define-color yellow_1 #ffd67c;
-@define-color yellow_2 #ffd67c;
-@define-color yellow_3 #ffd67c;
-@define-color yellow_4 #ffd67c;
-@define-color yellow_5 #ffd67c;
-@define-color orange_1 #ffbf70;
-@define-color orange_2 #ffbf70;
-@define-color orange_3 #ffbf70;
-@define-color orange_4 #ffbf70;
-@define-color orange_5 #ffbf70;
+
+
 @define-color red_1 #ff7f7b;
-@define-color red_2 #ff7f7b;
-@define-color red_3 #ff7f7b;
-@define-color red_4 #ff7f7b;
-@define-color red_5 #ff7f7b;
+@define-color green_1 #beda78;
+@define-color yellow_1 #ffd67c;
+@define-color blue_1 #90bee1;
 @define-color purple_1 #efb3f7;
-@define-color purple_2 #efb3f7;
-@define-color purple_3 #efb3f7;
-@define-color purple_4 #efb3f7;
-@define-color purple_5 #efb3f7;
-@define-color brown_1 #ff93b3;
-@define-color brown_2 #ff93b3;
-@define-color brown_3 #ff93b3;
-@define-color brown_4 #ff93b3;
-@define-color brown_5 #ff93b3;
-@define-color light_1 #cccccc;
-@define-color light_2 #cccccc;
-@define-color light_3 #cccccc;
-@define-color light_4 #cccccc;
-@define-color light_5 #cccccc;
-@define-color dark_1 #cccccc;
-@define-color dark_2 #cccccc;
-@define-color dark_3 #cccccc;
-@define-color dark_4 #cccccc;
-@define-color dark_5 #cccccc;
+@define-color teal_1 #bed6ff;
+@define-color orange_1 #ffbf70;
+@define-color gray_1 #777777;
+
diff --git a/build/base16-deep-oceanic-next.css b/build/base16-deep-oceanic-next.css
index 5f0cf75..9cdd582 100644
--- a/build/base16-deep-oceanic-next.css
+++ b/build/base16-deep-oceanic-next.css
@@ -1,88 +1,37 @@
 @define-color accent_color #568ccf;
 @define-color accent_bg_color #568ccf;
 @define-color accent_fg_color #001c1f;
-@define-color destructive_color #d3464d;
-@define-color destructive_bg_color #d3464d;
-@define-color destructive_fg_color #001c1f;
-@define-color success_color #63b784;
-@define-color success_bg_color #63b784;
-@define-color success_fg_color #001c1f;
-@define-color warning_color #8b66d6;
-@define-color warning_bg_color #8b66d6;
-@define-color warning_fg_color #001c1f;
-@define-color error_color #d3464d;
-@define-color error_bg_color #d3464d;
-@define-color error_fg_color #001c1f;
+
 @define-color window_bg_color #001c1f;
 @define-color window_fg_color #d4e1e8;
+
 @define-color view_bg_color #001c1f;
 @define-color view_fg_color #d4e1e8;
-@define-color headerbar_bg_color #002931;
+
+@define-color headerbar_bg_color #001c1f;
 @define-color headerbar_fg_color #d4e1e8;
-@define-color headerbar_border_color rgba(0.00000000, 0.16078431, 0.19215686, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #001c1f;
+@define-color dialog_fg_color #d4e1e8;
+
+@define-color popover_bg_color #001c1f;
+@define-color popover_fg_color #d4e1e8;
+
+
 @define-color sidebar_bg_color #002931;
 @define-color sidebar_fg_color #d4e1e8;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #002931;
 @define-color card_fg_color #d4e1e8;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #002931;
-@define-color dialog_fg_color #d4e1e8;
-@define-color popover_bg_color #002931;
-@define-color popover_fg_color #d4e1e8;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #003640;
-@define-color blue_1 #568ccf;
-@define-color blue_2 #568ccf;
-@define-color blue_3 #568ccf;
-@define-color blue_4 #568ccf;
-@define-color blue_5 #568ccf;
-@define-color green_1 #63b784;
-@define-color green_2 #63b784;
-@define-color green_3 #63b784;
-@define-color green_4 #63b784;
-@define-color green_5 #63b784;
-@define-color yellow_1 #f3b863;
-@define-color yellow_2 #f3b863;
-@define-color yellow_3 #f3b863;
-@define-color yellow_4 #f3b863;
-@define-color yellow_5 #f3b863;
-@define-color orange_1 #e37552;
-@define-color orange_2 #e37552;
-@define-color orange_3 #e37552;
-@define-color orange_4 #e37552;
-@define-color orange_5 #e37552;
+
+
 @define-color red_1 #d3464d;
-@define-color red_2 #d3464d;
-@define-color red_3 #d3464d;
-@define-color red_4 #d3464d;
-@define-color red_5 #d3464d;
+@define-color green_1 #63b784;
+@define-color yellow_1 #f3b863;
+@define-color blue_1 #568ccf;
 @define-color purple_1 #8b66d6;
-@define-color purple_2 #8b66d6;
-@define-color purple_3 #8b66d6;
-@define-color purple_4 #8b66d6;
-@define-color purple_5 #8b66d6;
-@define-color brown_1 #d0658e;
-@define-color brown_2 #d0658e;
-@define-color brown_3 #d0658e;
-@define-color brown_4 #d0658e;
-@define-color brown_5 #d0658e;
-@define-color light_1 #d4e1e8;
-@define-color light_2 #d4e1e8;
-@define-color light_3 #d4e1e8;
-@define-color light_4 #d4e1e8;
-@define-color light_5 #d4e1e8;
-@define-color dark_1 #d4e1e8;
-@define-color dark_2 #d4e1e8;
-@define-color dark_3 #d4e1e8;
-@define-color dark_4 #d4e1e8;
-@define-color dark_5 #d4e1e8;
+@define-color teal_1 #4fb7ae;
+@define-color orange_1 #e37552;
+@define-color gray_1 #004852;
+
diff --git a/build/base16-default-dark.css b/build/base16-default-dark.css
index acd4b56..ff7fcb1 100644
--- a/build/base16-default-dark.css
+++ b/build/base16-default-dark.css
@@ -1,88 +1,37 @@
 @define-color accent_color #7cafc2;
 @define-color accent_bg_color #7cafc2;
 @define-color accent_fg_color #181818;
-@define-color destructive_color #ab4642;
-@define-color destructive_bg_color #ab4642;
-@define-color destructive_fg_color #181818;
-@define-color success_color #a1b56c;
-@define-color success_bg_color #a1b56c;
-@define-color success_fg_color #181818;
-@define-color warning_color #ba8baf;
-@define-color warning_bg_color #ba8baf;
-@define-color warning_fg_color #181818;
-@define-color error_color #ab4642;
-@define-color error_bg_color #ab4642;
-@define-color error_fg_color #181818;
+
 @define-color window_bg_color #181818;
 @define-color window_fg_color #d8d8d8;
+
 @define-color view_bg_color #181818;
 @define-color view_fg_color #d8d8d8;
-@define-color headerbar_bg_color #282828;
+
+@define-color headerbar_bg_color #181818;
 @define-color headerbar_fg_color #d8d8d8;
-@define-color headerbar_border_color rgba(0.15686275, 0.15686275, 0.15686275, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #181818;
+@define-color dialog_fg_color #d8d8d8;
+
+@define-color popover_bg_color #181818;
+@define-color popover_fg_color #d8d8d8;
+
+
 @define-color sidebar_bg_color #282828;
 @define-color sidebar_fg_color #d8d8d8;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #282828;
 @define-color card_fg_color #d8d8d8;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #282828;
-@define-color dialog_fg_color #d8d8d8;
-@define-color popover_bg_color #282828;
-@define-color popover_fg_color #d8d8d8;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #383838;
-@define-color blue_1 #7cafc2;
-@define-color blue_2 #7cafc2;
-@define-color blue_3 #7cafc2;
-@define-color blue_4 #7cafc2;
-@define-color blue_5 #7cafc2;
-@define-color green_1 #a1b56c;
-@define-color green_2 #a1b56c;
-@define-color green_3 #a1b56c;
-@define-color green_4 #a1b56c;
-@define-color green_5 #a1b56c;
-@define-color yellow_1 #f7ca88;
-@define-color yellow_2 #f7ca88;
-@define-color yellow_3 #f7ca88;
-@define-color yellow_4 #f7ca88;
-@define-color yellow_5 #f7ca88;
-@define-color orange_1 #dc9656;
-@define-color orange_2 #dc9656;
-@define-color orange_3 #dc9656;
-@define-color orange_4 #dc9656;
-@define-color orange_5 #dc9656;
+
+
 @define-color red_1 #ab4642;
-@define-color red_2 #ab4642;
-@define-color red_3 #ab4642;
-@define-color red_4 #ab4642;
-@define-color red_5 #ab4642;
+@define-color green_1 #a1b56c;
+@define-color yellow_1 #f7ca88;
+@define-color blue_1 #7cafc2;
 @define-color purple_1 #ba8baf;
-@define-color purple_2 #ba8baf;
-@define-color purple_3 #ba8baf;
-@define-color purple_4 #ba8baf;
-@define-color purple_5 #ba8baf;
-@define-color brown_1 #a16946;
-@define-color brown_2 #a16946;
-@define-color brown_3 #a16946;
-@define-color brown_4 #a16946;
-@define-color brown_5 #a16946;
-@define-color light_1 #d8d8d8;
-@define-color light_2 #d8d8d8;
-@define-color light_3 #d8d8d8;
-@define-color light_4 #d8d8d8;
-@define-color light_5 #d8d8d8;
-@define-color dark_1 #d8d8d8;
-@define-color dark_2 #d8d8d8;
-@define-color dark_3 #d8d8d8;
-@define-color dark_4 #d8d8d8;
-@define-color dark_5 #d8d8d8;
+@define-color teal_1 #86c1b9;
+@define-color orange_1 #dc9656;
+@define-color gray_1 #585858;
+
diff --git a/build/base16-default-light.css b/build/base16-default-light.css
index 0418957..0ccf592 100644
--- a/build/base16-default-light.css
+++ b/build/base16-default-light.css
@@ -1,88 +1,37 @@
 @define-color accent_color #7cafc2;
 @define-color accent_bg_color #7cafc2;
 @define-color accent_fg_color #f8f8f8;
-@define-color destructive_color #ab4642;
-@define-color destructive_bg_color #ab4642;
-@define-color destructive_fg_color #f8f8f8;
-@define-color success_color #a1b56c;
-@define-color success_bg_color #a1b56c;
-@define-color success_fg_color #f8f8f8;
-@define-color warning_color #ba8baf;
-@define-color warning_bg_color #ba8baf;
-@define-color warning_fg_color #f8f8f8;
-@define-color error_color #ab4642;
-@define-color error_bg_color #ab4642;
-@define-color error_fg_color #f8f8f8;
+
 @define-color window_bg_color #f8f8f8;
 @define-color window_fg_color #383838;
+
 @define-color view_bg_color #f8f8f8;
 @define-color view_fg_color #383838;
-@define-color headerbar_bg_color #e8e8e8;
+
+@define-color headerbar_bg_color #f8f8f8;
 @define-color headerbar_fg_color #383838;
-@define-color headerbar_border_color rgba(0.90980392, 0.90980392, 0.90980392, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #f8f8f8;
+@define-color dialog_fg_color #383838;
+
+@define-color popover_bg_color #f8f8f8;
+@define-color popover_fg_color #383838;
+
+
 @define-color sidebar_bg_color #e8e8e8;
 @define-color sidebar_fg_color #383838;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #e8e8e8;
 @define-color card_fg_color #383838;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #e8e8e8;
-@define-color dialog_fg_color #383838;
-@define-color popover_bg_color #e8e8e8;
-@define-color popover_fg_color #383838;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #d8d8d8;
-@define-color blue_1 #7cafc2;
-@define-color blue_2 #7cafc2;
-@define-color blue_3 #7cafc2;
-@define-color blue_4 #7cafc2;
-@define-color blue_5 #7cafc2;
-@define-color green_1 #a1b56c;
-@define-color green_2 #a1b56c;
-@define-color green_3 #a1b56c;
-@define-color green_4 #a1b56c;
-@define-color green_5 #a1b56c;
-@define-color yellow_1 #f7ca88;
-@define-color yellow_2 #f7ca88;
-@define-color yellow_3 #f7ca88;
-@define-color yellow_4 #f7ca88;
-@define-color yellow_5 #f7ca88;
-@define-color orange_1 #dc9656;
-@define-color orange_2 #dc9656;
-@define-color orange_3 #dc9656;
-@define-color orange_4 #dc9656;
-@define-color orange_5 #dc9656;
+
+
 @define-color red_1 #ab4642;
-@define-color red_2 #ab4642;
-@define-color red_3 #ab4642;
-@define-color red_4 #ab4642;
-@define-color red_5 #ab4642;
+@define-color green_1 #a1b56c;
+@define-color yellow_1 #f7ca88;
+@define-color blue_1 #7cafc2;
 @define-color purple_1 #ba8baf;
-@define-color purple_2 #ba8baf;
-@define-color purple_3 #ba8baf;
-@define-color purple_4 #ba8baf;
-@define-color purple_5 #ba8baf;
-@define-color brown_1 #a16946;
-@define-color brown_2 #a16946;
-@define-color brown_3 #a16946;
-@define-color brown_4 #a16946;
-@define-color brown_5 #a16946;
-@define-color light_1 #383838;
-@define-color light_2 #383838;
-@define-color light_3 #383838;
-@define-color light_4 #383838;
-@define-color light_5 #383838;
-@define-color dark_1 #383838;
-@define-color dark_2 #383838;
-@define-color dark_3 #383838;
-@define-color dark_4 #383838;
-@define-color dark_5 #383838;
+@define-color teal_1 #86c1b9;
+@define-color orange_1 #dc9656;
+@define-color gray_1 #b8b8b8;
+
diff --git a/build/base16-digital-rain.css b/build/base16-digital-rain.css
index 85f14c5..630752c 100644
--- a/build/base16-digital-rain.css
+++ b/build/base16-digital-rain.css
@@ -1,88 +1,37 @@
 @define-color accent_color #5482af;
 @define-color accent_bg_color #5482af;
 @define-color accent_fg_color #000000;
-@define-color destructive_color #c85a46;
-@define-color destructive_bg_color #c85a46;
-@define-color destructive_fg_color #000000;
-@define-color success_color #64c83c;
-@define-color success_bg_color #64c83c;
-@define-color success_fg_color #000000;
-@define-color warning_color #9472b4;
-@define-color warning_bg_color #9472b4;
-@define-color warning_fg_color #000000;
-@define-color error_color #c85a46;
-@define-color error_bg_color #c85a46;
-@define-color error_fg_color #000000;
+
 @define-color window_bg_color #000000;
 @define-color window_fg_color #00ff00;
+
 @define-color view_bg_color #000000;
 @define-color view_fg_color #00ff00;
-@define-color headerbar_bg_color #4a806c;
+
+@define-color headerbar_bg_color #000000;
 @define-color headerbar_fg_color #00ff00;
-@define-color headerbar_border_color rgba(0.29019608, 0.50196078, 0.42352941, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #000000;
+@define-color dialog_fg_color #00ff00;
+
+@define-color popover_bg_color #000000;
+@define-color popover_fg_color #00ff00;
+
+
 @define-color sidebar_bg_color #4a806c;
 @define-color sidebar_fg_color #00ff00;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #4a806c;
 @define-color card_fg_color #00ff00;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #4a806c;
-@define-color dialog_fg_color #00ff00;
-@define-color popover_bg_color #4a806c;
-@define-color popover_fg_color #00ff00;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #4a8d7e;
-@define-color blue_1 #5482af;
-@define-color blue_2 #5482af;
-@define-color blue_3 #5482af;
-@define-color blue_4 #5482af;
-@define-color blue_5 #5482af;
-@define-color green_1 #64c83c;
-@define-color green_2 #64c83c;
-@define-color green_3 #64c83c;
-@define-color green_4 #64c83c;
-@define-color green_5 #64c83c;
-@define-color yellow_1 #a67a50;
-@define-color yellow_2 #a67a50;
-@define-color yellow_3 #a67a50;
-@define-color yellow_4 #a67a50;
-@define-color yellow_5 #a67a50;
-@define-color orange_1 #c86428;
-@define-color orange_2 #c86428;
-@define-color orange_3 #c86428;
-@define-color orange_4 #c86428;
-@define-color orange_5 #c86428;
+
+
 @define-color red_1 #c85a46;
-@define-color red_2 #c85a46;
-@define-color red_3 #c85a46;
-@define-color red_4 #c85a46;
-@define-color red_5 #c85a46;
+@define-color green_1 #64c83c;
+@define-color yellow_1 #a67a50;
+@define-color blue_1 #5482af;
 @define-color purple_1 #9472b4;
-@define-color purple_2 #9472b4;
-@define-color purple_3 #9472b4;
-@define-color purple_4 #9472b4;
-@define-color purple_5 #9472b4;
-@define-color brown_1 #b37c5e;
-@define-color brown_2 #b37c5e;
-@define-color brown_3 #b37c5e;
-@define-color brown_4 #b37c5e;
-@define-color brown_5 #b37c5e;
-@define-color light_1 #00ff00;
-@define-color light_2 #00ff00;
-@define-color light_3 #00ff00;
-@define-color light_4 #00ff00;
-@define-color light_5 #00ff00;
-@define-color dark_1 #00ff00;
-@define-color dark_2 #00ff00;
-@define-color dark_3 #00ff00;
-@define-color dark_4 #00ff00;
-@define-color dark_5 #00ff00;
+@define-color teal_1 #468c78;
+@define-color orange_1 #c86428;
+@define-color gray_1 #7c8d7c;
+
diff --git a/build/base16-dirtysea.css b/build/base16-dirtysea.css
index 18acdfe..77e89eb 100644
--- a/build/base16-dirtysea.css
+++ b/build/base16-dirtysea.css
@@ -1,88 +1,37 @@
 @define-color accent_color #007300;
 @define-color accent_bg_color #007300;
 @define-color accent_fg_color #e0e0e0;
-@define-color destructive_color #840000;
-@define-color destructive_bg_color #840000;
-@define-color destructive_fg_color #e0e0e0;
-@define-color success_color #730073;
-@define-color success_bg_color #730073;
-@define-color success_fg_color #e0e0e0;
-@define-color warning_color #000090;
-@define-color warning_bg_color #000090;
-@define-color warning_fg_color #e0e0e0;
-@define-color error_color #840000;
-@define-color error_bg_color #840000;
-@define-color error_fg_color #e0e0e0;
+
 @define-color window_bg_color #e0e0e0;
 @define-color window_fg_color #000000;
+
 @define-color view_bg_color #e0e0e0;
 @define-color view_fg_color #000000;
-@define-color headerbar_bg_color #d0dad0;
+
+@define-color headerbar_bg_color #e0e0e0;
 @define-color headerbar_fg_color #000000;
-@define-color headerbar_border_color rgba(0.81568627, 0.85490196, 0.81568627, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #e0e0e0;
+@define-color dialog_fg_color #000000;
+
+@define-color popover_bg_color #e0e0e0;
+@define-color popover_fg_color #000000;
+
+
 @define-color sidebar_bg_color #d0dad0;
 @define-color sidebar_fg_color #000000;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #d0dad0;
 @define-color card_fg_color #000000;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #d0dad0;
-@define-color dialog_fg_color #000000;
-@define-color popover_bg_color #d0dad0;
-@define-color popover_fg_color #000000;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #d0d0d0;
-@define-color blue_1 #007300;
-@define-color blue_2 #007300;
-@define-color blue_3 #007300;
-@define-color blue_4 #007300;
-@define-color blue_5 #007300;
-@define-color green_1 #730073;
-@define-color green_2 #730073;
-@define-color green_3 #730073;
-@define-color green_4 #730073;
-@define-color green_5 #730073;
-@define-color yellow_1 #755b00;
-@define-color yellow_2 #755b00;
-@define-color yellow_3 #755b00;
-@define-color yellow_4 #755b00;
-@define-color yellow_5 #755b00;
-@define-color orange_1 #006565;
-@define-color orange_2 #006565;
-@define-color orange_3 #006565;
-@define-color orange_4 #006565;
-@define-color orange_5 #006565;
+
+
 @define-color red_1 #840000;
-@define-color red_2 #840000;
-@define-color red_3 #840000;
-@define-color red_4 #840000;
-@define-color red_5 #840000;
+@define-color green_1 #730073;
+@define-color yellow_1 #755b00;
+@define-color blue_1 #007300;
 @define-color purple_1 #000090;
-@define-color purple_2 #000090;
-@define-color purple_3 #000090;
-@define-color purple_4 #000090;
-@define-color purple_5 #000090;
-@define-color brown_1 #755b00;
-@define-color brown_2 #755b00;
-@define-color brown_3 #755b00;
-@define-color brown_4 #755b00;
-@define-color brown_5 #755b00;
-@define-color light_1 #000000;
-@define-color light_2 #000000;
-@define-color light_3 #000000;
-@define-color light_4 #000000;
-@define-color light_5 #000000;
-@define-color dark_1 #000000;
-@define-color dark_2 #000000;
-@define-color dark_3 #000000;
-@define-color dark_4 #000000;
-@define-color dark_5 #000000;
+@define-color teal_1 #755b00;
+@define-color orange_1 #006565;
+@define-color gray_1 #707070;
+
diff --git a/build/base16-dracula.css b/build/base16-dracula.css
index 4458d3f..f61bfb1 100644
--- a/build/base16-dracula.css
+++ b/build/base16-dracula.css
@@ -1,88 +1,37 @@
 @define-color accent_color #bd93f9;
 @define-color accent_bg_color #bd93f9;
 @define-color accent_fg_color #282a36;
-@define-color destructive_color #ff5555;
-@define-color destructive_bg_color #ff5555;
-@define-color destructive_fg_color #282a36;
-@define-color success_color #50fa7b;
-@define-color success_bg_color #50fa7b;
-@define-color success_fg_color #282a36;
-@define-color warning_color #ff79c6;
-@define-color warning_bg_color #ff79c6;
-@define-color warning_fg_color #282a36;
-@define-color error_color #ff5555;
-@define-color error_bg_color #ff5555;
-@define-color error_fg_color #282a36;
+
 @define-color window_bg_color #282a36;
 @define-color window_fg_color #f8f8f2;
+
 @define-color view_bg_color #282a36;
 @define-color view_fg_color #f8f8f2;
-@define-color headerbar_bg_color #21222c;
+
+@define-color headerbar_bg_color #282a36;
 @define-color headerbar_fg_color #f8f8f2;
-@define-color headerbar_border_color rgba(0.12941176, 0.13333333, 0.17254902, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #282a36;
+@define-color dialog_fg_color #f8f8f2;
+
+@define-color popover_bg_color #282a36;
+@define-color popover_fg_color #f8f8f2;
+
+
 @define-color sidebar_bg_color #21222c;
 @define-color sidebar_fg_color #f8f8f2;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #21222c;
 @define-color card_fg_color #f8f8f2;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #21222c;
-@define-color dialog_fg_color #f8f8f2;
-@define-color popover_bg_color #21222c;
-@define-color popover_fg_color #f8f8f2;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #44475a;
-@define-color blue_1 #bd93f9;
-@define-color blue_2 #bd93f9;
-@define-color blue_3 #bd93f9;
-@define-color blue_4 #bd93f9;
-@define-color blue_5 #bd93f9;
-@define-color green_1 #50fa7b;
-@define-color green_2 #50fa7b;
-@define-color green_3 #50fa7b;
-@define-color green_4 #50fa7b;
-@define-color green_5 #50fa7b;
-@define-color yellow_1 #f1fa8c;
-@define-color yellow_2 #f1fa8c;
-@define-color yellow_3 #f1fa8c;
-@define-color yellow_4 #f1fa8c;
-@define-color yellow_5 #f1fa8c;
-@define-color orange_1 #ffb86c;
-@define-color orange_2 #ffb86c;
-@define-color orange_3 #ffb86c;
-@define-color orange_4 #ffb86c;
-@define-color orange_5 #ffb86c;
+
+
 @define-color red_1 #ff5555;
-@define-color red_2 #ff5555;
-@define-color red_3 #ff5555;
-@define-color red_4 #ff5555;
-@define-color red_5 #ff5555;
+@define-color green_1 #50fa7b;
+@define-color yellow_1 #f1fa8c;
+@define-color blue_1 #bd93f9;
 @define-color purple_1 #ff79c6;
-@define-color purple_2 #ff79c6;
-@define-color purple_3 #ff79c6;
-@define-color purple_4 #ff79c6;
-@define-color purple_5 #ff79c6;
-@define-color brown_1 #993333;
-@define-color brown_2 #993333;
-@define-color brown_3 #993333;
-@define-color brown_4 #993333;
-@define-color brown_5 #993333;
-@define-color light_1 #f8f8f2;
-@define-color light_2 #f8f8f2;
-@define-color light_3 #f8f8f2;
-@define-color light_4 #f8f8f2;
-@define-color light_5 #f8f8f2;
-@define-color dark_1 #f8f8f2;
-@define-color dark_2 #f8f8f2;
-@define-color dark_3 #f8f8f2;
-@define-color dark_4 #f8f8f2;
-@define-color dark_5 #f8f8f2;
+@define-color teal_1 #8be9fd;
+@define-color orange_1 #ffb86c;
+@define-color gray_1 #6272a4;
+
diff --git a/build/base16-edge-dark.css b/build/base16-edge-dark.css
index c129add..a79d565 100644
--- a/build/base16-edge-dark.css
+++ b/build/base16-edge-dark.css
@@ -1,88 +1,37 @@
 @define-color accent_color #73b3e7;
 @define-color accent_bg_color #73b3e7;
 @define-color accent_fg_color #262729;
-@define-color destructive_color #e77171;
-@define-color destructive_bg_color #e77171;
-@define-color destructive_fg_color #262729;
-@define-color success_color #a1bf78;
-@define-color success_bg_color #a1bf78;
-@define-color success_fg_color #262729;
-@define-color warning_color #d390e7;
-@define-color warning_bg_color #d390e7;
-@define-color warning_fg_color #262729;
-@define-color error_color #e77171;
-@define-color error_bg_color #e77171;
-@define-color error_fg_color #262729;
+
 @define-color window_bg_color #262729;
 @define-color window_fg_color #afb2b5;
+
 @define-color view_bg_color #262729;
 @define-color view_fg_color #afb2b5;
-@define-color headerbar_bg_color #313235;
+
+@define-color headerbar_bg_color #262729;
 @define-color headerbar_fg_color #afb2b5;
-@define-color headerbar_border_color rgba(0.19215686, 0.19607843, 0.20784314, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #262729;
+@define-color dialog_fg_color #afb2b5;
+
+@define-color popover_bg_color #262729;
+@define-color popover_fg_color #afb2b5;
+
+
 @define-color sidebar_bg_color #313235;
 @define-color sidebar_fg_color #afb2b5;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #313235;
 @define-color card_fg_color #afb2b5;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #313235;
-@define-color dialog_fg_color #afb2b5;
-@define-color popover_bg_color #313235;
-@define-color popover_fg_color #afb2b5;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #3d3f42;
-@define-color blue_1 #73b3e7;
-@define-color blue_2 #73b3e7;
-@define-color blue_3 #73b3e7;
-@define-color blue_4 #73b3e7;
-@define-color blue_5 #73b3e7;
-@define-color green_1 #a1bf78;
-@define-color green_2 #a1bf78;
-@define-color green_3 #a1bf78;
-@define-color green_4 #a1bf78;
-@define-color green_5 #a1bf78;
-@define-color yellow_1 #dbb774;
-@define-color yellow_2 #dbb774;
-@define-color yellow_3 #dbb774;
-@define-color yellow_4 #dbb774;
-@define-color yellow_5 #dbb774;
-@define-color orange_1 #eba31a;
-@define-color orange_2 #eba31a;
-@define-color orange_3 #eba31a;
-@define-color orange_4 #eba31a;
-@define-color orange_5 #eba31a;
+
+
 @define-color red_1 #e77171;
-@define-color red_2 #e77171;
-@define-color red_3 #e77171;
-@define-color red_4 #e77171;
-@define-color red_5 #e77171;
+@define-color green_1 #a1bf78;
+@define-color yellow_1 #dbb774;
+@define-color blue_1 #73b3e7;
 @define-color purple_1 #d390e7;
-@define-color purple_2 #d390e7;
-@define-color purple_3 #d390e7;
-@define-color purple_4 #d390e7;
-@define-color purple_5 #d390e7;
-@define-color brown_1 #5ebaa5;
-@define-color brown_2 #5ebaa5;
-@define-color brown_3 #5ebaa5;
-@define-color brown_4 #5ebaa5;
-@define-color brown_5 #5ebaa5;
-@define-color light_1 #afb2b5;
-@define-color light_2 #afb2b5;
-@define-color light_3 #afb2b5;
-@define-color light_4 #afb2b5;
-@define-color light_5 #afb2b5;
-@define-color dark_1 #afb2b5;
-@define-color dark_2 #afb2b5;
-@define-color dark_3 #afb2b5;
-@define-color dark_4 #afb2b5;
-@define-color dark_5 #afb2b5;
+@define-color teal_1 #5ebaa5;
+@define-color orange_1 #eba31a;
+@define-color gray_1 #4a4c4f;
+
diff --git a/build/base16-edge-light.css b/build/base16-edge-light.css
index 6436bdd..a61c5a8 100644
--- a/build/base16-edge-light.css
+++ b/build/base16-edge-light.css
@@ -1,88 +1,37 @@
 @define-color accent_color #6587bf;
 @define-color accent_bg_color #6587bf;
 @define-color accent_fg_color #fafafa;
-@define-color destructive_color #db7070;
-@define-color destructive_bg_color #db7070;
-@define-color destructive_fg_color #fafafa;
-@define-color success_color #7c9f4b;
-@define-color success_bg_color #7c9f4b;
-@define-color success_fg_color #fafafa;
-@define-color warning_color #b870ce;
-@define-color warning_bg_color #b870ce;
-@define-color warning_fg_color #fafafa;
-@define-color error_color #db7070;
-@define-color error_bg_color #db7070;
-@define-color error_fg_color #fafafa;
+
 @define-color window_bg_color #fafafa;
 @define-color window_fg_color #474752;
+
 @define-color view_bg_color #fafafa;
 @define-color view_fg_color #474752;
-@define-color headerbar_bg_color #e3e5e8;
+
+@define-color headerbar_bg_color #fafafa;
 @define-color headerbar_fg_color #474752;
-@define-color headerbar_border_color rgba(0.89019608, 0.89803922, 0.90980392, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #fafafa;
+@define-color dialog_fg_color #474752;
+
+@define-color popover_bg_color #fafafa;
+@define-color popover_fg_color #474752;
+
+
 @define-color sidebar_bg_color #e3e5e8;
 @define-color sidebar_fg_color #474752;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #e3e5e8;
 @define-color card_fg_color #474752;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #e3e5e8;
-@define-color dialog_fg_color #474752;
-@define-color popover_bg_color #e3e5e8;
-@define-color popover_fg_color #474752;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #acb1b9;
-@define-color blue_1 #6587bf;
-@define-color blue_2 #6587bf;
-@define-color blue_3 #6587bf;
-@define-color blue_4 #6587bf;
-@define-color blue_5 #6587bf;
-@define-color green_1 #7c9f4b;
-@define-color green_2 #7c9f4b;
-@define-color green_3 #7c9f4b;
-@define-color green_4 #7c9f4b;
-@define-color green_5 #7c9f4b;
-@define-color yellow_1 #ebcc1a;
-@define-color yellow_2 #ebcc1a;
-@define-color yellow_3 #ebcc1a;
-@define-color yellow_4 #ebcc1a;
-@define-color yellow_5 #ebcc1a;
-@define-color orange_1 #eba31a;
-@define-color orange_2 #eba31a;
-@define-color orange_3 #eba31a;
-@define-color orange_4 #eba31a;
-@define-color orange_5 #eba31a;
+
+
 @define-color red_1 #db7070;
-@define-color red_2 #db7070;
-@define-color red_3 #db7070;
-@define-color red_4 #db7070;
-@define-color red_5 #db7070;
+@define-color green_1 #7c9f4b;
+@define-color yellow_1 #ebcc1a;
+@define-color blue_1 #6587bf;
 @define-color purple_1 #b870ce;
-@define-color purple_2 #b870ce;
-@define-color purple_3 #b870ce;
-@define-color purple_4 #b870ce;
-@define-color purple_5 #b870ce;
-@define-color brown_1 #509c93;
-@define-color brown_2 #509c93;
-@define-color brown_3 #509c93;
-@define-color brown_4 #509c93;
-@define-color brown_5 #509c93;
-@define-color light_1 #474752;
-@define-color light_2 #474752;
-@define-color light_3 #474752;
-@define-color light_4 #474752;
-@define-color light_5 #474752;
-@define-color dark_1 #474752;
-@define-color dark_2 #474752;
-@define-color dark_3 #474752;
-@define-color dark_4 #474752;
-@define-color dark_5 #474752;
+@define-color teal_1 #509c93;
+@define-color orange_1 #eba31a;
+@define-color gray_1 #9197a1;
+
diff --git a/build/base16-eighties.css b/build/base16-eighties.css
index 442bde7..7e2ba94 100644
--- a/build/base16-eighties.css
+++ b/build/base16-eighties.css
@@ -1,88 +1,37 @@
 @define-color accent_color #6699cc;
 @define-color accent_bg_color #6699cc;
 @define-color accent_fg_color #2d2d2d;
-@define-color destructive_color #f2777a;
-@define-color destructive_bg_color #f2777a;
-@define-color destructive_fg_color #2d2d2d;
-@define-color success_color #99cc99;
-@define-color success_bg_color #99cc99;
-@define-color success_fg_color #2d2d2d;
-@define-color warning_color #cc99cc;
-@define-color warning_bg_color #cc99cc;
-@define-color warning_fg_color #2d2d2d;
-@define-color error_color #f2777a;
-@define-color error_bg_color #f2777a;
-@define-color error_fg_color #2d2d2d;
+
 @define-color window_bg_color #2d2d2d;
 @define-color window_fg_color #d3d0c8;
+
 @define-color view_bg_color #2d2d2d;
 @define-color view_fg_color #d3d0c8;
-@define-color headerbar_bg_color #393939;
+
+@define-color headerbar_bg_color #2d2d2d;
 @define-color headerbar_fg_color #d3d0c8;
-@define-color headerbar_border_color rgba(0.22352941, 0.22352941, 0.22352941, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #2d2d2d;
+@define-color dialog_fg_color #d3d0c8;
+
+@define-color popover_bg_color #2d2d2d;
+@define-color popover_fg_color #d3d0c8;
+
+
 @define-color sidebar_bg_color #393939;
 @define-color sidebar_fg_color #d3d0c8;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #393939;
 @define-color card_fg_color #d3d0c8;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #393939;
-@define-color dialog_fg_color #d3d0c8;
-@define-color popover_bg_color #393939;
-@define-color popover_fg_color #d3d0c8;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #515151;
-@define-color blue_1 #6699cc;
-@define-color blue_2 #6699cc;
-@define-color blue_3 #6699cc;
-@define-color blue_4 #6699cc;
-@define-color blue_5 #6699cc;
-@define-color green_1 #99cc99;
-@define-color green_2 #99cc99;
-@define-color green_3 #99cc99;
-@define-color green_4 #99cc99;
-@define-color green_5 #99cc99;
-@define-color yellow_1 #ffcc66;
-@define-color yellow_2 #ffcc66;
-@define-color yellow_3 #ffcc66;
-@define-color yellow_4 #ffcc66;
-@define-color yellow_5 #ffcc66;
-@define-color orange_1 #f99157;
-@define-color orange_2 #f99157;
-@define-color orange_3 #f99157;
-@define-color orange_4 #f99157;
-@define-color orange_5 #f99157;
+
+
 @define-color red_1 #f2777a;
-@define-color red_2 #f2777a;
-@define-color red_3 #f2777a;
-@define-color red_4 #f2777a;
-@define-color red_5 #f2777a;
+@define-color green_1 #99cc99;
+@define-color yellow_1 #ffcc66;
+@define-color blue_1 #6699cc;
 @define-color purple_1 #cc99cc;
-@define-color purple_2 #cc99cc;
-@define-color purple_3 #cc99cc;
-@define-color purple_4 #cc99cc;
-@define-color purple_5 #cc99cc;
-@define-color brown_1 #d27b53;
-@define-color brown_2 #d27b53;
-@define-color brown_3 #d27b53;
-@define-color brown_4 #d27b53;
-@define-color brown_5 #d27b53;
-@define-color light_1 #d3d0c8;
-@define-color light_2 #d3d0c8;
-@define-color light_3 #d3d0c8;
-@define-color light_4 #d3d0c8;
-@define-color light_5 #d3d0c8;
-@define-color dark_1 #d3d0c8;
-@define-color dark_2 #d3d0c8;
-@define-color dark_3 #d3d0c8;
-@define-color dark_4 #d3d0c8;
-@define-color dark_5 #d3d0c8;
+@define-color teal_1 #66cccc;
+@define-color orange_1 #f99157;
+@define-color gray_1 #747369;
+
diff --git a/build/base16-eldritch.css b/build/base16-eldritch.css
index 119cb25..10cdad4 100644
--- a/build/base16-eldritch.css
+++ b/build/base16-eldritch.css
@@ -1,88 +1,37 @@
 @define-color accent_color #39ddfd;
 @define-color accent_bg_color #39ddfd;
 @define-color accent_fg_color #212337;
-@define-color destructive_color #f16c75;
-@define-color destructive_bg_color #f16c75;
-@define-color destructive_fg_color #212337;
-@define-color success_color #37f499;
-@define-color success_bg_color #37f499;
-@define-color success_fg_color #212337;
-@define-color warning_color #a48cf2;
-@define-color warning_bg_color #a48cf2;
-@define-color warning_fg_color #212337;
-@define-color error_color #f16c75;
-@define-color error_bg_color #f16c75;
-@define-color error_fg_color #212337;
+
 @define-color window_bg_color #212337;
 @define-color window_fg_color #ebfafa;
+
 @define-color view_bg_color #212337;
 @define-color view_fg_color #ebfafa;
-@define-color headerbar_bg_color #323449;
+
+@define-color headerbar_bg_color #212337;
 @define-color headerbar_fg_color #ebfafa;
-@define-color headerbar_border_color rgba(0.19607843, 0.20392157, 0.28627451, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #212337;
+@define-color dialog_fg_color #ebfafa;
+
+@define-color popover_bg_color #212337;
+@define-color popover_fg_color #ebfafa;
+
+
 @define-color sidebar_bg_color #323449;
 @define-color sidebar_fg_color #ebfafa;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #323449;
 @define-color card_fg_color #ebfafa;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #323449;
-@define-color dialog_fg_color #ebfafa;
-@define-color popover_bg_color #323449;
-@define-color popover_fg_color #ebfafa;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #3b4261;
-@define-color blue_1 #39ddfd;
-@define-color blue_2 #39ddfd;
-@define-color blue_3 #39ddfd;
-@define-color blue_4 #39ddfd;
-@define-color blue_5 #39ddfd;
-@define-color green_1 #37f499;
-@define-color green_2 #37f499;
-@define-color green_3 #37f499;
-@define-color green_4 #37f499;
-@define-color green_5 #37f499;
-@define-color yellow_1 #f1fc79;
-@define-color yellow_2 #f1fc79;
-@define-color yellow_3 #f1fc79;
-@define-color yellow_4 #f1fc79;
-@define-color yellow_5 #f1fc79;
-@define-color orange_1 #f7c67f;
-@define-color orange_2 #f7c67f;
-@define-color orange_3 #f7c67f;
-@define-color orange_4 #f7c67f;
-@define-color orange_5 #f7c67f;
+
+
 @define-color red_1 #f16c75;
-@define-color red_2 #f16c75;
-@define-color red_3 #f16c75;
-@define-color red_4 #f16c75;
-@define-color red_5 #f16c75;
+@define-color green_1 #37f499;
+@define-color yellow_1 #f1fc79;
+@define-color blue_1 #39ddfd;
 @define-color purple_1 #a48cf2;
-@define-color purple_2 #a48cf2;
-@define-color purple_3 #a48cf2;
-@define-color purple_4 #a48cf2;
-@define-color purple_5 #a48cf2;
-@define-color brown_1 #f265b5;
-@define-color brown_2 #f265b5;
-@define-color brown_3 #f265b5;
-@define-color brown_4 #f265b5;
-@define-color brown_5 #f265b5;
-@define-color light_1 #ebfafa;
-@define-color light_2 #ebfafa;
-@define-color light_3 #ebfafa;
-@define-color light_4 #ebfafa;
-@define-color light_5 #ebfafa;
-@define-color dark_1 #ebfafa;
-@define-color dark_2 #ebfafa;
-@define-color dark_3 #ebfafa;
-@define-color dark_4 #ebfafa;
-@define-color dark_5 #ebfafa;
+@define-color teal_1 #04d1f9;
+@define-color orange_1 #f7c67f;
+@define-color gray_1 #7081d0;
+
diff --git a/build/base16-embers-light.css b/build/base16-embers-light.css
index 4207aa7..774bf2a 100644
--- a/build/base16-embers-light.css
+++ b/build/base16-embers-light.css
@@ -1,88 +1,37 @@
 @define-color accent_color #6d5782;
 @define-color accent_bg_color #6d5782;
 @define-color accent_fg_color #dbd6d1;
-@define-color destructive_color #826d57;
-@define-color destructive_bg_color #826d57;
-@define-color destructive_fg_color #dbd6d1;
-@define-color success_color #57826d;
-@define-color success_bg_color #57826d;
-@define-color success_fg_color #dbd6d1;
-@define-color warning_color #82576d;
-@define-color warning_bg_color #82576d;
-@define-color warning_fg_color #dbd6d1;
-@define-color error_color #826d57;
-@define-color error_bg_color #826d57;
-@define-color error_fg_color #dbd6d1;
+
 @define-color window_bg_color #dbd6d1;
 @define-color window_fg_color #433b32;
+
 @define-color view_bg_color #dbd6d1;
 @define-color view_fg_color #433b32;
-@define-color headerbar_bg_color #beb6ae;
+
+@define-color headerbar_bg_color #dbd6d1;
 @define-color headerbar_fg_color #433b32;
-@define-color headerbar_border_color rgba(0.74509804, 0.71372549, 0.68235294, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #dbd6d1;
+@define-color dialog_fg_color #433b32;
+
+@define-color popover_bg_color #dbd6d1;
+@define-color popover_fg_color #433b32;
+
+
 @define-color sidebar_bg_color #beb6ae;
 @define-color sidebar_fg_color #433b32;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #beb6ae;
 @define-color card_fg_color #433b32;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #beb6ae;
-@define-color dialog_fg_color #433b32;
-@define-color popover_bg_color #beb6ae;
-@define-color popover_fg_color #433b32;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #a39a90;
-@define-color blue_1 #6d5782;
-@define-color blue_2 #6d5782;
-@define-color blue_3 #6d5782;
-@define-color blue_4 #6d5782;
-@define-color blue_5 #6d5782;
-@define-color green_1 #57826d;
-@define-color green_2 #57826d;
-@define-color green_3 #57826d;
-@define-color green_4 #57826d;
-@define-color green_5 #57826d;
-@define-color yellow_1 #6d8257;
-@define-color yellow_2 #6d8257;
-@define-color yellow_3 #6d8257;
-@define-color yellow_4 #6d8257;
-@define-color yellow_5 #6d8257;
-@define-color orange_1 #828257;
-@define-color orange_2 #828257;
-@define-color orange_3 #828257;
-@define-color orange_4 #828257;
-@define-color orange_5 #828257;
+
+
 @define-color red_1 #826d57;
-@define-color red_2 #826d57;
-@define-color red_3 #826d57;
-@define-color red_4 #826d57;
-@define-color red_5 #826d57;
+@define-color green_1 #57826d;
+@define-color yellow_1 #6d8257;
+@define-color blue_1 #6d5782;
 @define-color purple_1 #82576d;
-@define-color purple_2 #82576d;
-@define-color purple_3 #82576d;
-@define-color purple_4 #82576d;
-@define-color purple_5 #82576d;
-@define-color brown_1 #825757;
-@define-color brown_2 #825757;
-@define-color brown_3 #825757;
-@define-color brown_4 #825757;
-@define-color brown_5 #825757;
-@define-color light_1 #433b32;
-@define-color light_2 #433b32;
-@define-color light_3 #433b32;
-@define-color light_4 #433b32;
-@define-color light_5 #433b32;
-@define-color dark_1 #433b32;
-@define-color dark_2 #433b32;
-@define-color dark_3 #433b32;
-@define-color dark_4 #433b32;
-@define-color dark_5 #433b32;
+@define-color teal_1 #576d82;
+@define-color orange_1 #828257;
+@define-color gray_1 #8a8075;
+
diff --git a/build/base16-embers.css b/build/base16-embers.css
index 614052d..44a2caf 100644
--- a/build/base16-embers.css
+++ b/build/base16-embers.css
@@ -1,88 +1,37 @@
 @define-color accent_color #6d5782;
 @define-color accent_bg_color #6d5782;
 @define-color accent_fg_color #16130f;
-@define-color destructive_color #826d57;
-@define-color destructive_bg_color #826d57;
-@define-color destructive_fg_color #16130f;
-@define-color success_color #57826d;
-@define-color success_bg_color #57826d;
-@define-color success_fg_color #16130f;
-@define-color warning_color #82576d;
-@define-color warning_bg_color #82576d;
-@define-color warning_fg_color #16130f;
-@define-color error_color #826d57;
-@define-color error_bg_color #826d57;
-@define-color error_fg_color #16130f;
+
 @define-color window_bg_color #16130f;
 @define-color window_fg_color #a39a90;
+
 @define-color view_bg_color #16130f;
 @define-color view_fg_color #a39a90;
-@define-color headerbar_bg_color #2c2620;
+
+@define-color headerbar_bg_color #16130f;
 @define-color headerbar_fg_color #a39a90;
-@define-color headerbar_border_color rgba(0.17254902, 0.14901961, 0.12549020, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #16130f;
+@define-color dialog_fg_color #a39a90;
+
+@define-color popover_bg_color #16130f;
+@define-color popover_fg_color #a39a90;
+
+
 @define-color sidebar_bg_color #2c2620;
 @define-color sidebar_fg_color #a39a90;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #2c2620;
 @define-color card_fg_color #a39a90;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #2c2620;
-@define-color dialog_fg_color #a39a90;
-@define-color popover_bg_color #2c2620;
-@define-color popover_fg_color #a39a90;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #433b32;
-@define-color blue_1 #6d5782;
-@define-color blue_2 #6d5782;
-@define-color blue_3 #6d5782;
-@define-color blue_4 #6d5782;
-@define-color blue_5 #6d5782;
-@define-color green_1 #57826d;
-@define-color green_2 #57826d;
-@define-color green_3 #57826d;
-@define-color green_4 #57826d;
-@define-color green_5 #57826d;
-@define-color yellow_1 #6d8257;
-@define-color yellow_2 #6d8257;
-@define-color yellow_3 #6d8257;
-@define-color yellow_4 #6d8257;
-@define-color yellow_5 #6d8257;
-@define-color orange_1 #828257;
-@define-color orange_2 #828257;
-@define-color orange_3 #828257;
-@define-color orange_4 #828257;
-@define-color orange_5 #828257;
+
+
 @define-color red_1 #826d57;
-@define-color red_2 #826d57;
-@define-color red_3 #826d57;
-@define-color red_4 #826d57;
-@define-color red_5 #826d57;
+@define-color green_1 #57826d;
+@define-color yellow_1 #6d8257;
+@define-color blue_1 #6d5782;
 @define-color purple_1 #82576d;
-@define-color purple_2 #82576d;
-@define-color purple_3 #82576d;
-@define-color purple_4 #82576d;
-@define-color purple_5 #82576d;
-@define-color brown_1 #825757;
-@define-color brown_2 #825757;
-@define-color brown_3 #825757;
-@define-color brown_4 #825757;
-@define-color brown_5 #825757;
-@define-color light_1 #a39a90;
-@define-color light_2 #a39a90;
-@define-color light_3 #a39a90;
-@define-color light_4 #a39a90;
-@define-color light_5 #a39a90;
-@define-color dark_1 #a39a90;
-@define-color dark_2 #a39a90;
-@define-color dark_3 #a39a90;
-@define-color dark_4 #a39a90;
-@define-color dark_5 #a39a90;
+@define-color teal_1 #576d82;
+@define-color orange_1 #828257;
+@define-color gray_1 #5a5047;
+
diff --git a/build/base16-emil.css b/build/base16-emil.css
index 931dad2..57b58b6 100644
--- a/build/base16-emil.css
+++ b/build/base16-emil.css
@@ -1,88 +1,37 @@
 @define-color accent_color #471397;
 @define-color accent_bg_color #471397;
 @define-color accent_fg_color #efefef;
-@define-color destructive_color #f43979;
-@define-color destructive_bg_color #f43979;
-@define-color destructive_fg_color #efefef;
-@define-color success_color #0073a8;
-@define-color success_bg_color #0073a8;
-@define-color success_fg_color #efefef;
-@define-color warning_color #6916b6;
-@define-color warning_bg_color #6916b6;
-@define-color warning_fg_color #efefef;
-@define-color error_color #f43979;
-@define-color error_bg_color #f43979;
-@define-color error_fg_color #efefef;
+
 @define-color window_bg_color #efefef;
 @define-color window_fg_color #313145;
+
 @define-color view_bg_color #efefef;
 @define-color view_fg_color #313145;
-@define-color headerbar_bg_color #bebed2;
+
+@define-color headerbar_bg_color #efefef;
 @define-color headerbar_fg_color #313145;
-@define-color headerbar_border_color rgba(0.74509804, 0.74509804, 0.82352941, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #efefef;
+@define-color dialog_fg_color #313145;
+
+@define-color popover_bg_color #efefef;
+@define-color popover_fg_color #313145;
+
+
 @define-color sidebar_bg_color #bebed2;
 @define-color sidebar_fg_color #313145;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #bebed2;
 @define-color card_fg_color #313145;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #bebed2;
-@define-color dialog_fg_color #313145;
-@define-color popover_bg_color #bebed2;
-@define-color popover_fg_color #313145;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #9e9eaf;
-@define-color blue_1 #471397;
-@define-color blue_2 #471397;
-@define-color blue_3 #471397;
-@define-color blue_4 #471397;
-@define-color blue_5 #471397;
-@define-color green_1 #0073a8;
-@define-color green_2 #0073a8;
-@define-color green_3 #0073a8;
-@define-color green_4 #0073a8;
-@define-color green_5 #0073a8;
-@define-color yellow_1 #ff669b;
-@define-color yellow_2 #ff669b;
-@define-color yellow_3 #ff669b;
-@define-color yellow_4 #ff669b;
-@define-color yellow_5 #ff669b;
-@define-color orange_1 #d22a8b;
-@define-color orange_2 #d22a8b;
-@define-color orange_3 #d22a8b;
-@define-color orange_4 #d22a8b;
-@define-color orange_5 #d22a8b;
+
+
 @define-color red_1 #f43979;
-@define-color red_2 #f43979;
-@define-color red_3 #f43979;
-@define-color red_4 #f43979;
-@define-color red_5 #f43979;
+@define-color green_1 #0073a8;
+@define-color yellow_1 #ff669b;
+@define-color blue_1 #471397;
 @define-color purple_1 #6916b6;
-@define-color purple_2 #6916b6;
-@define-color purple_3 #6916b6;
-@define-color purple_4 #6916b6;
-@define-color purple_5 #6916b6;
-@define-color brown_1 #8d17a5;
-@define-color brown_2 #8d17a5;
-@define-color brown_3 #8d17a5;
-@define-color brown_4 #8d17a5;
-@define-color brown_5 #8d17a5;
-@define-color light_1 #313145;
-@define-color light_2 #313145;
-@define-color light_3 #313145;
-@define-color light_4 #313145;
-@define-color light_5 #313145;
-@define-color dark_1 #313145;
-@define-color dark_2 #313145;
-@define-color dark_3 #313145;
-@define-color dark_4 #313145;
-@define-color dark_5 #313145;
+@define-color teal_1 #2155d6;
+@define-color orange_1 #d22a8b;
+@define-color gray_1 #7c7c98;
+
diff --git a/build/base16-equilibrium-dark.css b/build/base16-equilibrium-dark.css
index 34de7ad..a2ccb84 100644
--- a/build/base16-equilibrium-dark.css
+++ b/build/base16-equilibrium-dark.css
@@ -1,88 +1,37 @@
 @define-color accent_color #008dd1;
 @define-color accent_bg_color #008dd1;
 @define-color accent_fg_color #0c1118;
-@define-color destructive_color #f04339;
-@define-color destructive_bg_color #f04339;
-@define-color destructive_fg_color #0c1118;
-@define-color success_color #7f8b00;
-@define-color success_bg_color #7f8b00;
-@define-color success_fg_color #0c1118;
-@define-color warning_color #6a7fd2;
-@define-color warning_bg_color #6a7fd2;
-@define-color warning_fg_color #0c1118;
-@define-color error_color #f04339;
-@define-color error_bg_color #f04339;
-@define-color error_fg_color #0c1118;
+
 @define-color window_bg_color #0c1118;
 @define-color window_fg_color #afaba2;
+
 @define-color view_bg_color #0c1118;
 @define-color view_fg_color #afaba2;
-@define-color headerbar_bg_color #181c22;
+
+@define-color headerbar_bg_color #0c1118;
 @define-color headerbar_fg_color #afaba2;
-@define-color headerbar_border_color rgba(0.09411765, 0.10980392, 0.13333333, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #0c1118;
+@define-color dialog_fg_color #afaba2;
+
+@define-color popover_bg_color #0c1118;
+@define-color popover_fg_color #afaba2;
+
+
 @define-color sidebar_bg_color #181c22;
 @define-color sidebar_fg_color #afaba2;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #181c22;
 @define-color card_fg_color #afaba2;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #181c22;
-@define-color dialog_fg_color #afaba2;
-@define-color popover_bg_color #181c22;
-@define-color popover_fg_color #afaba2;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #22262d;
-@define-color blue_1 #008dd1;
-@define-color blue_2 #008dd1;
-@define-color blue_3 #008dd1;
-@define-color blue_4 #008dd1;
-@define-color blue_5 #008dd1;
-@define-color green_1 #7f8b00;
-@define-color green_2 #7f8b00;
-@define-color green_3 #7f8b00;
-@define-color green_4 #7f8b00;
-@define-color green_5 #7f8b00;
-@define-color yellow_1 #bb8801;
-@define-color yellow_2 #bb8801;
-@define-color yellow_3 #bb8801;
-@define-color yellow_4 #bb8801;
-@define-color yellow_5 #bb8801;
-@define-color orange_1 #df5923;
-@define-color orange_2 #df5923;
-@define-color orange_3 #df5923;
-@define-color orange_4 #df5923;
-@define-color orange_5 #df5923;
+
+
 @define-color red_1 #f04339;
-@define-color red_2 #f04339;
-@define-color red_3 #f04339;
-@define-color red_4 #f04339;
-@define-color red_5 #f04339;
+@define-color green_1 #7f8b00;
+@define-color yellow_1 #bb8801;
+@define-color blue_1 #008dd1;
 @define-color purple_1 #6a7fd2;
-@define-color purple_2 #6a7fd2;
-@define-color purple_3 #6a7fd2;
-@define-color purple_4 #6a7fd2;
-@define-color purple_5 #6a7fd2;
-@define-color brown_1 #e3488e;
-@define-color brown_2 #e3488e;
-@define-color brown_3 #e3488e;
-@define-color brown_4 #e3488e;
-@define-color brown_5 #e3488e;
-@define-color light_1 #afaba2;
-@define-color light_2 #afaba2;
-@define-color light_3 #afaba2;
-@define-color light_4 #afaba2;
-@define-color light_5 #afaba2;
-@define-color dark_1 #afaba2;
-@define-color dark_2 #afaba2;
-@define-color dark_3 #afaba2;
-@define-color dark_4 #afaba2;
-@define-color dark_5 #afaba2;
+@define-color teal_1 #00948b;
+@define-color orange_1 #df5923;
+@define-color gray_1 #7b776e;
+
diff --git a/build/base16-equilibrium-gray-dark.css b/build/base16-equilibrium-gray-dark.css
index 9bfee5e..818576a 100644
--- a/build/base16-equilibrium-gray-dark.css
+++ b/build/base16-equilibrium-gray-dark.css
@@ -1,88 +1,37 @@
 @define-color accent_color #008dd1;
 @define-color accent_bg_color #008dd1;
 @define-color accent_fg_color #111111;
-@define-color destructive_color #f04339;
-@define-color destructive_bg_color #f04339;
-@define-color destructive_fg_color #111111;
-@define-color success_color #7f8b00;
-@define-color success_bg_color #7f8b00;
-@define-color success_fg_color #111111;
-@define-color warning_color #6a7fd2;
-@define-color warning_bg_color #6a7fd2;
-@define-color warning_fg_color #111111;
-@define-color error_color #f04339;
-@define-color error_bg_color #f04339;
-@define-color error_fg_color #111111;
+
 @define-color window_bg_color #111111;
 @define-color window_fg_color #ababab;
+
 @define-color view_bg_color #111111;
 @define-color view_fg_color #ababab;
-@define-color headerbar_bg_color #1b1b1b;
+
+@define-color headerbar_bg_color #111111;
 @define-color headerbar_fg_color #ababab;
-@define-color headerbar_border_color rgba(0.10588235, 0.10588235, 0.10588235, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #111111;
+@define-color dialog_fg_color #ababab;
+
+@define-color popover_bg_color #111111;
+@define-color popover_fg_color #ababab;
+
+
 @define-color sidebar_bg_color #1b1b1b;
 @define-color sidebar_fg_color #ababab;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #1b1b1b;
 @define-color card_fg_color #ababab;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #1b1b1b;
-@define-color dialog_fg_color #ababab;
-@define-color popover_bg_color #1b1b1b;
-@define-color popover_fg_color #ababab;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #262626;
-@define-color blue_1 #008dd1;
-@define-color blue_2 #008dd1;
-@define-color blue_3 #008dd1;
-@define-color blue_4 #008dd1;
-@define-color blue_5 #008dd1;
-@define-color green_1 #7f8b00;
-@define-color green_2 #7f8b00;
-@define-color green_3 #7f8b00;
-@define-color green_4 #7f8b00;
-@define-color green_5 #7f8b00;
-@define-color yellow_1 #bb8801;
-@define-color yellow_2 #bb8801;
-@define-color yellow_3 #bb8801;
-@define-color yellow_4 #bb8801;
-@define-color yellow_5 #bb8801;
-@define-color orange_1 #df5923;
-@define-color orange_2 #df5923;
-@define-color orange_3 #df5923;
-@define-color orange_4 #df5923;
-@define-color orange_5 #df5923;
+
+
 @define-color red_1 #f04339;
-@define-color red_2 #f04339;
-@define-color red_3 #f04339;
-@define-color red_4 #f04339;
-@define-color red_5 #f04339;
+@define-color green_1 #7f8b00;
+@define-color yellow_1 #bb8801;
+@define-color blue_1 #008dd1;
 @define-color purple_1 #6a7fd2;
-@define-color purple_2 #6a7fd2;
-@define-color purple_3 #6a7fd2;
-@define-color purple_4 #6a7fd2;
-@define-color purple_5 #6a7fd2;
-@define-color brown_1 #e3488e;
-@define-color brown_2 #e3488e;
-@define-color brown_3 #e3488e;
-@define-color brown_4 #e3488e;
-@define-color brown_5 #e3488e;
-@define-color light_1 #ababab;
-@define-color light_2 #ababab;
-@define-color light_3 #ababab;
-@define-color light_4 #ababab;
-@define-color light_5 #ababab;
-@define-color dark_1 #ababab;
-@define-color dark_2 #ababab;
-@define-color dark_3 #ababab;
-@define-color dark_4 #ababab;
-@define-color dark_5 #ababab;
+@define-color teal_1 #00948b;
+@define-color orange_1 #df5923;
+@define-color gray_1 #777777;
+
diff --git a/build/base16-equilibrium-gray-light.css b/build/base16-equilibrium-gray-light.css
index 89fafb8..e289c9c 100644
--- a/build/base16-equilibrium-gray-light.css
+++ b/build/base16-equilibrium-gray-light.css
@@ -1,88 +1,37 @@
 @define-color accent_color #0073b5;
 @define-color accent_bg_color #0073b5;
 @define-color accent_fg_color #f1f1f1;
-@define-color destructive_color #d02023;
-@define-color destructive_bg_color #d02023;
-@define-color destructive_fg_color #f1f1f1;
-@define-color success_color #637200;
-@define-color success_bg_color #637200;
-@define-color success_fg_color #f1f1f1;
-@define-color warning_color #4e66b6;
-@define-color warning_bg_color #4e66b6;
-@define-color warning_fg_color #f1f1f1;
-@define-color error_color #d02023;
-@define-color error_bg_color #d02023;
-@define-color error_fg_color #f1f1f1;
+
 @define-color window_bg_color #f1f1f1;
 @define-color window_fg_color #474747;
+
 @define-color view_bg_color #f1f1f1;
 @define-color view_fg_color #474747;
-@define-color headerbar_bg_color #e2e2e2;
+
+@define-color headerbar_bg_color #f1f1f1;
 @define-color headerbar_fg_color #474747;
-@define-color headerbar_border_color rgba(0.88627451, 0.88627451, 0.88627451, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #f1f1f1;
+@define-color dialog_fg_color #474747;
+
+@define-color popover_bg_color #f1f1f1;
+@define-color popover_fg_color #474747;
+
+
 @define-color sidebar_bg_color #e2e2e2;
 @define-color sidebar_fg_color #474747;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #e2e2e2;
 @define-color card_fg_color #474747;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #e2e2e2;
-@define-color dialog_fg_color #474747;
-@define-color popover_bg_color #e2e2e2;
-@define-color popover_fg_color #474747;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #d4d4d4;
-@define-color blue_1 #0073b5;
-@define-color blue_2 #0073b5;
-@define-color blue_3 #0073b5;
-@define-color blue_4 #0073b5;
-@define-color blue_5 #0073b5;
-@define-color green_1 #637200;
-@define-color green_2 #637200;
-@define-color green_3 #637200;
-@define-color green_4 #637200;
-@define-color green_5 #637200;
-@define-color yellow_1 #9d6f00;
-@define-color yellow_2 #9d6f00;
-@define-color yellow_3 #9d6f00;
-@define-color yellow_4 #9d6f00;
-@define-color yellow_5 #9d6f00;
-@define-color orange_1 #bf3e05;
-@define-color orange_2 #bf3e05;
-@define-color orange_3 #bf3e05;
-@define-color orange_4 #bf3e05;
-@define-color orange_5 #bf3e05;
+
+
 @define-color red_1 #d02023;
-@define-color red_2 #d02023;
-@define-color red_3 #d02023;
-@define-color red_4 #d02023;
-@define-color red_5 #d02023;
+@define-color green_1 #637200;
+@define-color yellow_1 #9d6f00;
+@define-color blue_1 #0073b5;
 @define-color purple_1 #4e66b6;
-@define-color purple_2 #4e66b6;
-@define-color purple_3 #4e66b6;
-@define-color purple_4 #4e66b6;
-@define-color purple_5 #4e66b6;
-@define-color brown_1 #c42775;
-@define-color brown_2 #c42775;
-@define-color brown_3 #c42775;
-@define-color brown_4 #c42775;
-@define-color brown_5 #c42775;
-@define-color light_1 #474747;
-@define-color light_2 #474747;
-@define-color light_3 #474747;
-@define-color light_4 #474747;
-@define-color light_5 #474747;
-@define-color dark_1 #474747;
-@define-color dark_2 #474747;
-@define-color dark_3 #474747;
-@define-color dark_4 #474747;
-@define-color dark_5 #474747;
+@define-color teal_1 #007a72;
+@define-color orange_1 #bf3e05;
+@define-color gray_1 #777777;
+
diff --git a/build/base16-equilibrium-light.css b/build/base16-equilibrium-light.css
index 6c34681..50f8a96 100644
--- a/build/base16-equilibrium-light.css
+++ b/build/base16-equilibrium-light.css
@@ -1,88 +1,37 @@
 @define-color accent_color #0073b5;
 @define-color accent_bg_color #0073b5;
 @define-color accent_fg_color #f5f0e7;
-@define-color destructive_color #d02023;
-@define-color destructive_bg_color #d02023;
-@define-color destructive_fg_color #f5f0e7;
-@define-color success_color #637200;
-@define-color success_bg_color #637200;
-@define-color success_fg_color #f5f0e7;
-@define-color warning_color #4e66b6;
-@define-color warning_bg_color #4e66b6;
-@define-color warning_fg_color #f5f0e7;
-@define-color error_color #d02023;
-@define-color error_bg_color #d02023;
-@define-color error_fg_color #f5f0e7;
+
 @define-color window_bg_color #f5f0e7;
 @define-color window_fg_color #43474e;
+
 @define-color view_bg_color #f5f0e7;
 @define-color view_fg_color #43474e;
-@define-color headerbar_bg_color #e7e2d9;
+
+@define-color headerbar_bg_color #f5f0e7;
 @define-color headerbar_fg_color #43474e;
-@define-color headerbar_border_color rgba(0.90588235, 0.88627451, 0.85098039, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #f5f0e7;
+@define-color dialog_fg_color #43474e;
+
+@define-color popover_bg_color #f5f0e7;
+@define-color popover_fg_color #43474e;
+
+
 @define-color sidebar_bg_color #e7e2d9;
 @define-color sidebar_fg_color #43474e;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #e7e2d9;
 @define-color card_fg_color #43474e;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #e7e2d9;
-@define-color dialog_fg_color #43474e;
-@define-color popover_bg_color #e7e2d9;
-@define-color popover_fg_color #43474e;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #d8d4cb;
-@define-color blue_1 #0073b5;
-@define-color blue_2 #0073b5;
-@define-color blue_3 #0073b5;
-@define-color blue_4 #0073b5;
-@define-color blue_5 #0073b5;
-@define-color green_1 #637200;
-@define-color green_2 #637200;
-@define-color green_3 #637200;
-@define-color green_4 #637200;
-@define-color green_5 #637200;
-@define-color yellow_1 #9d6f00;
-@define-color yellow_2 #9d6f00;
-@define-color yellow_3 #9d6f00;
-@define-color yellow_4 #9d6f00;
-@define-color yellow_5 #9d6f00;
-@define-color orange_1 #bf3e05;
-@define-color orange_2 #bf3e05;
-@define-color orange_3 #bf3e05;
-@define-color orange_4 #bf3e05;
-@define-color orange_5 #bf3e05;
+
+
 @define-color red_1 #d02023;
-@define-color red_2 #d02023;
-@define-color red_3 #d02023;
-@define-color red_4 #d02023;
-@define-color red_5 #d02023;
+@define-color green_1 #637200;
+@define-color yellow_1 #9d6f00;
+@define-color blue_1 #0073b5;
 @define-color purple_1 #4e66b6;
-@define-color purple_2 #4e66b6;
-@define-color purple_3 #4e66b6;
-@define-color purple_4 #4e66b6;
-@define-color purple_5 #4e66b6;
-@define-color brown_1 #c42775;
-@define-color brown_2 #c42775;
-@define-color brown_3 #c42775;
-@define-color brown_4 #c42775;
-@define-color brown_5 #c42775;
-@define-color light_1 #43474e;
-@define-color light_2 #43474e;
-@define-color light_3 #43474e;
-@define-color light_4 #43474e;
-@define-color light_5 #43474e;
-@define-color dark_1 #43474e;
-@define-color dark_2 #43474e;
-@define-color dark_3 #43474e;
-@define-color dark_4 #43474e;
-@define-color dark_5 #43474e;
+@define-color teal_1 #007a72;
+@define-color orange_1 #bf3e05;
+@define-color gray_1 #73777f;
+
diff --git a/build/base16-eris.css b/build/base16-eris.css
index 417df6b..c368713 100644
--- a/build/base16-eris.css
+++ b/build/base16-eris.css
@@ -1,88 +1,37 @@
 @define-color accent_color #258fc4;
 @define-color accent_bg_color #258fc4;
 @define-color accent_fg_color #0a0920;
-@define-color destructive_color #f768a3;
-@define-color destructive_bg_color #f768a3;
-@define-color destructive_fg_color #0a0920;
-@define-color success_color #a2faa8;
-@define-color success_bg_color #a2faa8;
-@define-color success_fg_color #0a0920;
-@define-color warning_color #c368f7;
-@define-color warning_bg_color #c368f7;
-@define-color warning_fg_color #0a0920;
-@define-color error_color #f768a3;
-@define-color error_bg_color #f768a3;
-@define-color error_fg_color #0a0920;
+
 @define-color window_bg_color #0a0920;
 @define-color window_fg_color #606bac;
+
 @define-color view_bg_color #0a0920;
 @define-color view_fg_color #606bac;
-@define-color headerbar_bg_color #13133a;
+
+@define-color headerbar_bg_color #0a0920;
 @define-color headerbar_fg_color #606bac;
-@define-color headerbar_border_color rgba(0.07450980, 0.07450980, 0.22745098, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #0a0920;
+@define-color dialog_fg_color #606bac;
+
+@define-color popover_bg_color #0a0920;
+@define-color popover_fg_color #606bac;
+
+
 @define-color sidebar_bg_color #13133a;
 @define-color sidebar_fg_color #606bac;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #13133a;
 @define-color card_fg_color #606bac;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #13133a;
-@define-color dialog_fg_color #606bac;
-@define-color popover_bg_color #13133a;
-@define-color popover_fg_color #606bac;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #23255a;
-@define-color blue_1 #258fc4;
-@define-color blue_2 #258fc4;
-@define-color blue_3 #258fc4;
-@define-color blue_4 #258fc4;
-@define-color blue_5 #258fc4;
-@define-color green_1 #a2faa8;
-@define-color green_2 #a2faa8;
-@define-color green_3 #a2faa8;
-@define-color green_4 #a2faa8;
-@define-color green_5 #a2faa8;
-@define-color yellow_1 #f7d668;
-@define-color yellow_2 #f7d668;
-@define-color yellow_3 #f7d668;
-@define-color yellow_4 #f7d668;
-@define-color yellow_5 #f7d668;
-@define-color orange_1 #f78968;
-@define-color orange_2 #f78968;
-@define-color orange_3 #f78968;
-@define-color orange_4 #f78968;
-@define-color orange_5 #f78968;
+
+
 @define-color red_1 #f768a3;
-@define-color red_2 #f768a3;
-@define-color red_3 #f768a3;
-@define-color red_4 #f768a3;
-@define-color red_5 #f768a3;
+@define-color green_1 #a2faa8;
+@define-color yellow_1 #f7d668;
+@define-color blue_1 #258fc4;
 @define-color purple_1 #c368f7;
-@define-color purple_2 #c368f7;
-@define-color purple_3 #c368f7;
-@define-color purple_4 #c368f7;
-@define-color purple_5 #c368f7;
-@define-color brown_1 #b85600;
-@define-color brown_2 #b85600;
-@define-color brown_3 #b85600;
-@define-color brown_4 #b85600;
-@define-color brown_5 #b85600;
-@define-color light_1 #606bac;
-@define-color light_2 #606bac;
-@define-color light_3 #606bac;
-@define-color light_4 #606bac;
-@define-color light_5 #606bac;
-@define-color dark_1 #606bac;
-@define-color dark_2 #606bac;
-@define-color dark_3 #606bac;
-@define-color dark_4 #606bac;
-@define-color dark_5 #606bac;
+@define-color teal_1 #a2faf0;
+@define-color orange_1 #f78968;
+@define-color gray_1 #333773;
+
diff --git a/build/base16-espresso.css b/build/base16-espresso.css
index d846634..d9281b8 100644
--- a/build/base16-espresso.css
+++ b/build/base16-espresso.css
@@ -1,88 +1,37 @@
 @define-color accent_color #6c99bb;
 @define-color accent_bg_color #6c99bb;
 @define-color accent_fg_color #2d2d2d;
-@define-color destructive_color #d25252;
-@define-color destructive_bg_color #d25252;
-@define-color destructive_fg_color #2d2d2d;
-@define-color success_color #a5c261;
-@define-color success_bg_color #a5c261;
-@define-color success_fg_color #2d2d2d;
-@define-color warning_color #d197d9;
-@define-color warning_bg_color #d197d9;
-@define-color warning_fg_color #2d2d2d;
-@define-color error_color #d25252;
-@define-color error_bg_color #d25252;
-@define-color error_fg_color #2d2d2d;
+
 @define-color window_bg_color #2d2d2d;
 @define-color window_fg_color #cccccc;
+
 @define-color view_bg_color #2d2d2d;
 @define-color view_fg_color #cccccc;
-@define-color headerbar_bg_color #393939;
+
+@define-color headerbar_bg_color #2d2d2d;
 @define-color headerbar_fg_color #cccccc;
-@define-color headerbar_border_color rgba(0.22352941, 0.22352941, 0.22352941, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #2d2d2d;
+@define-color dialog_fg_color #cccccc;
+
+@define-color popover_bg_color #2d2d2d;
+@define-color popover_fg_color #cccccc;
+
+
 @define-color sidebar_bg_color #393939;
 @define-color sidebar_fg_color #cccccc;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #393939;
 @define-color card_fg_color #cccccc;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #393939;
-@define-color dialog_fg_color #cccccc;
-@define-color popover_bg_color #393939;
-@define-color popover_fg_color #cccccc;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #515151;
-@define-color blue_1 #6c99bb;
-@define-color blue_2 #6c99bb;
-@define-color blue_3 #6c99bb;
-@define-color blue_4 #6c99bb;
-@define-color blue_5 #6c99bb;
-@define-color green_1 #a5c261;
-@define-color green_2 #a5c261;
-@define-color green_3 #a5c261;
-@define-color green_4 #a5c261;
-@define-color green_5 #a5c261;
-@define-color yellow_1 #ffc66d;
-@define-color yellow_2 #ffc66d;
-@define-color yellow_3 #ffc66d;
-@define-color yellow_4 #ffc66d;
-@define-color yellow_5 #ffc66d;
-@define-color orange_1 #f9a959;
-@define-color orange_2 #f9a959;
-@define-color orange_3 #f9a959;
-@define-color orange_4 #f9a959;
-@define-color orange_5 #f9a959;
+
+
 @define-color red_1 #d25252;
-@define-color red_2 #d25252;
-@define-color red_3 #d25252;
-@define-color red_4 #d25252;
-@define-color red_5 #d25252;
+@define-color green_1 #a5c261;
+@define-color yellow_1 #ffc66d;
+@define-color blue_1 #6c99bb;
 @define-color purple_1 #d197d9;
-@define-color purple_2 #d197d9;
-@define-color purple_3 #d197d9;
-@define-color purple_4 #d197d9;
-@define-color purple_5 #d197d9;
-@define-color brown_1 #f97394;
-@define-color brown_2 #f97394;
-@define-color brown_3 #f97394;
-@define-color brown_4 #f97394;
-@define-color brown_5 #f97394;
-@define-color light_1 #cccccc;
-@define-color light_2 #cccccc;
-@define-color light_3 #cccccc;
-@define-color light_4 #cccccc;
-@define-color light_5 #cccccc;
-@define-color dark_1 #cccccc;
-@define-color dark_2 #cccccc;
-@define-color dark_3 #cccccc;
-@define-color dark_4 #cccccc;
-@define-color dark_5 #cccccc;
+@define-color teal_1 #bed6ff;
+@define-color orange_1 #f9a959;
+@define-color gray_1 #777777;
+
diff --git a/build/base16-eva-dim.css b/build/base16-eva-dim.css
index 21d0293..94641c1 100644
--- a/build/base16-eva-dim.css
+++ b/build/base16-eva-dim.css
@@ -1,88 +1,37 @@
 @define-color accent_color #1ae1dc;
 @define-color accent_bg_color #1ae1dc;
 @define-color accent_fg_color #2a3b4d;
-@define-color destructive_color #c4676c;
-@define-color destructive_bg_color #c4676c;
-@define-color destructive_fg_color #2a3b4d;
-@define-color success_color #5de561;
-@define-color success_bg_color #5de561;
-@define-color success_fg_color #2a3b4d;
-@define-color warning_color #9c6cd3;
-@define-color warning_bg_color #9c6cd3;
-@define-color warning_fg_color #2a3b4d;
-@define-color error_color #c4676c;
-@define-color error_bg_color #c4676c;
-@define-color error_fg_color #2a3b4d;
+
 @define-color window_bg_color #2a3b4d;
 @define-color window_fg_color #9fa2a6;
+
 @define-color view_bg_color #2a3b4d;
 @define-color view_fg_color #9fa2a6;
-@define-color headerbar_bg_color #3d566f;
+
+@define-color headerbar_bg_color #2a3b4d;
 @define-color headerbar_fg_color #9fa2a6;
-@define-color headerbar_border_color rgba(0.23921569, 0.33725490, 0.43529412, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #2a3b4d;
+@define-color dialog_fg_color #9fa2a6;
+
+@define-color popover_bg_color #2a3b4d;
+@define-color popover_fg_color #9fa2a6;
+
+
 @define-color sidebar_bg_color #3d566f;
 @define-color sidebar_fg_color #9fa2a6;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #3d566f;
 @define-color card_fg_color #9fa2a6;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #3d566f;
-@define-color dialog_fg_color #9fa2a6;
-@define-color popover_bg_color #3d566f;
-@define-color popover_fg_color #9fa2a6;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #4b6988;
-@define-color blue_1 #1ae1dc;
-@define-color blue_2 #1ae1dc;
-@define-color blue_3 #1ae1dc;
-@define-color blue_4 #1ae1dc;
-@define-color blue_5 #1ae1dc;
-@define-color green_1 #5de561;
-@define-color green_2 #5de561;
-@define-color green_3 #5de561;
-@define-color green_4 #5de561;
-@define-color green_5 #5de561;
-@define-color yellow_1 #cfd05d;
-@define-color yellow_2 #cfd05d;
-@define-color yellow_3 #cfd05d;
-@define-color yellow_4 #cfd05d;
-@define-color yellow_5 #cfd05d;
-@define-color orange_1 #ff9966;
-@define-color orange_2 #ff9966;
-@define-color orange_3 #ff9966;
-@define-color orange_4 #ff9966;
-@define-color orange_5 #ff9966;
+
+
 @define-color red_1 #c4676c;
-@define-color red_2 #c4676c;
-@define-color red_3 #c4676c;
-@define-color red_4 #c4676c;
-@define-color red_5 #c4676c;
+@define-color green_1 #5de561;
+@define-color yellow_1 #cfd05d;
+@define-color blue_1 #1ae1dc;
 @define-color purple_1 #9c6cd3;
-@define-color purple_2 #9c6cd3;
-@define-color purple_3 #9c6cd3;
-@define-color purple_4 #9c6cd3;
-@define-color purple_5 #9c6cd3;
-@define-color brown_1 #bb64a9;
-@define-color brown_2 #bb64a9;
-@define-color brown_3 #bb64a9;
-@define-color brown_4 #bb64a9;
-@define-color brown_5 #bb64a9;
-@define-color light_1 #9fa2a6;
-@define-color light_2 #9fa2a6;
-@define-color light_3 #9fa2a6;
-@define-color light_4 #9fa2a6;
-@define-color light_5 #9fa2a6;
-@define-color dark_1 #9fa2a6;
-@define-color dark_2 #9fa2a6;
-@define-color dark_3 #9fa2a6;
-@define-color dark_4 #9fa2a6;
-@define-color dark_5 #9fa2a6;
+@define-color teal_1 #4b8f77;
+@define-color orange_1 #ff9966;
+@define-color gray_1 #55799c;
+
diff --git a/build/base16-eva.css b/build/base16-eva.css
index 1d7a910..93d38ea 100644
--- a/build/base16-eva.css
+++ b/build/base16-eva.css
@@ -1,88 +1,37 @@
 @define-color accent_color #15f4ee;
 @define-color accent_bg_color #15f4ee;
 @define-color accent_fg_color #2a3b4d;
-@define-color destructive_color #c4676c;
-@define-color destructive_bg_color #c4676c;
-@define-color destructive_fg_color #2a3b4d;
-@define-color success_color #66ff66;
-@define-color success_bg_color #66ff66;
-@define-color success_fg_color #2a3b4d;
-@define-color warning_color #9c6cd3;
-@define-color warning_bg_color #9c6cd3;
-@define-color warning_fg_color #2a3b4d;
-@define-color error_color #c4676c;
-@define-color error_bg_color #c4676c;
-@define-color error_fg_color #2a3b4d;
+
 @define-color window_bg_color #2a3b4d;
 @define-color window_fg_color #9fa2a6;
+
 @define-color view_bg_color #2a3b4d;
 @define-color view_fg_color #9fa2a6;
-@define-color headerbar_bg_color #3d566f;
+
+@define-color headerbar_bg_color #2a3b4d;
 @define-color headerbar_fg_color #9fa2a6;
-@define-color headerbar_border_color rgba(0.23921569, 0.33725490, 0.43529412, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #2a3b4d;
+@define-color dialog_fg_color #9fa2a6;
+
+@define-color popover_bg_color #2a3b4d;
+@define-color popover_fg_color #9fa2a6;
+
+
 @define-color sidebar_bg_color #3d566f;
 @define-color sidebar_fg_color #9fa2a6;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #3d566f;
 @define-color card_fg_color #9fa2a6;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #3d566f;
-@define-color dialog_fg_color #9fa2a6;
-@define-color popover_bg_color #3d566f;
-@define-color popover_fg_color #9fa2a6;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #4b6988;
-@define-color blue_1 #15f4ee;
-@define-color blue_2 #15f4ee;
-@define-color blue_3 #15f4ee;
-@define-color blue_4 #15f4ee;
-@define-color blue_5 #15f4ee;
-@define-color green_1 #66ff66;
-@define-color green_2 #66ff66;
-@define-color green_3 #66ff66;
-@define-color green_4 #66ff66;
-@define-color green_5 #66ff66;
-@define-color yellow_1 #ffff66;
-@define-color yellow_2 #ffff66;
-@define-color yellow_3 #ffff66;
-@define-color yellow_4 #ffff66;
-@define-color yellow_5 #ffff66;
-@define-color orange_1 #ff9966;
-@define-color orange_2 #ff9966;
-@define-color orange_3 #ff9966;
-@define-color orange_4 #ff9966;
-@define-color orange_5 #ff9966;
+
+
 @define-color red_1 #c4676c;
-@define-color red_2 #c4676c;
-@define-color red_3 #c4676c;
-@define-color red_4 #c4676c;
-@define-color red_5 #c4676c;
+@define-color green_1 #66ff66;
+@define-color yellow_1 #ffff66;
+@define-color blue_1 #15f4ee;
 @define-color purple_1 #9c6cd3;
-@define-color purple_2 #9c6cd3;
-@define-color purple_3 #9c6cd3;
-@define-color purple_4 #9c6cd3;
-@define-color purple_5 #9c6cd3;
-@define-color brown_1 #bb64a9;
-@define-color brown_2 #bb64a9;
-@define-color brown_3 #bb64a9;
-@define-color brown_4 #bb64a9;
-@define-color brown_5 #bb64a9;
-@define-color light_1 #9fa2a6;
-@define-color light_2 #9fa2a6;
-@define-color light_3 #9fa2a6;
-@define-color light_4 #9fa2a6;
-@define-color light_5 #9fa2a6;
-@define-color dark_1 #9fa2a6;
-@define-color dark_2 #9fa2a6;
-@define-color dark_3 #9fa2a6;
-@define-color dark_4 #9fa2a6;
-@define-color dark_5 #9fa2a6;
+@define-color teal_1 #4b8f77;
+@define-color orange_1 #ff9966;
+@define-color gray_1 #55799c;
+
diff --git a/build/base16-evenok-dark.css b/build/base16-evenok-dark.css
index 8b99484..b116693 100644
--- a/build/base16-evenok-dark.css
+++ b/build/base16-evenok-dark.css
@@ -1,88 +1,37 @@
 @define-color accent_color #00aff2;
 @define-color accent_bg_color #00aff2;
 @define-color accent_fg_color #000000;
-@define-color destructive_color #f5708a;
-@define-color destructive_bg_color #f5708a;
-@define-color destructive_fg_color #000000;
-@define-color success_color #54bc5c;
-@define-color success_bg_color #54bc5c;
-@define-color success_fg_color #000000;
-@define-color warning_color #9095ff;
-@define-color warning_bg_color #9095ff;
-@define-color warning_fg_color #000000;
-@define-color error_color #f5708a;
-@define-color error_bg_color #f5708a;
-@define-color error_fg_color #000000;
+
 @define-color window_bg_color #000000;
 @define-color window_fg_color #d0d0d0;
+
 @define-color view_bg_color #000000;
 @define-color view_fg_color #d0d0d0;
-@define-color headerbar_bg_color #202020;
+
+@define-color headerbar_bg_color #000000;
 @define-color headerbar_fg_color #d0d0d0;
-@define-color headerbar_border_color rgba(0.12549020, 0.12549020, 0.12549020, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #000000;
+@define-color dialog_fg_color #d0d0d0;
+
+@define-color popover_bg_color #000000;
+@define-color popover_fg_color #d0d0d0;
+
+
 @define-color sidebar_bg_color #202020;
 @define-color sidebar_fg_color #d0d0d0;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #202020;
 @define-color card_fg_color #d0d0d0;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #202020;
-@define-color dialog_fg_color #d0d0d0;
-@define-color popover_bg_color #202020;
-@define-color popover_fg_color #d0d0d0;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #303030;
-@define-color blue_1 #00aff2;
-@define-color blue_2 #00aff2;
-@define-color blue_3 #00aff2;
-@define-color blue_4 #00aff2;
-@define-color blue_5 #00aff2;
-@define-color green_1 #54bc5c;
-@define-color green_2 #54bc5c;
-@define-color green_3 #54bc5c;
-@define-color green_4 #54bc5c;
-@define-color green_5 #54bc5c;
-@define-color yellow_1 #b8a300;
-@define-color yellow_2 #b8a300;
-@define-color yellow_3 #b8a300;
-@define-color yellow_4 #b8a300;
-@define-color yellow_5 #b8a300;
-@define-color orange_1 #ee8122;
-@define-color orange_2 #ee8122;
-@define-color orange_3 #ee8122;
-@define-color orange_4 #ee8122;
-@define-color orange_5 #ee8122;
+
+
 @define-color red_1 #f5708a;
-@define-color red_2 #f5708a;
-@define-color red_3 #f5708a;
-@define-color red_4 #f5708a;
-@define-color red_5 #f5708a;
+@define-color green_1 #54bc5c;
+@define-color yellow_1 #b8a300;
+@define-color blue_1 #00aff2;
 @define-color purple_1 #9095ff;
-@define-color purple_2 #9095ff;
-@define-color purple_3 #9095ff;
-@define-color purple_4 #9095ff;
-@define-color purple_5 #9095ff;
-@define-color brown_1 #d47ada;
-@define-color brown_2 #d47ada;
-@define-color brown_3 #d47ada;
-@define-color brown_4 #d47ada;
-@define-color brown_5 #d47ada;
-@define-color light_1 #d0d0d0;
-@define-color light_2 #d0d0d0;
-@define-color light_3 #d0d0d0;
-@define-color light_4 #d0d0d0;
-@define-color light_5 #d0d0d0;
-@define-color dark_1 #d0d0d0;
-@define-color dark_2 #d0d0d0;
-@define-color dark_3 #d0d0d0;
-@define-color dark_4 #d0d0d0;
-@define-color dark_5 #d0d0d0;
+@define-color teal_1 #00bab3;
+@define-color orange_1 #ee8122;
+@define-color gray_1 #505050;
+
diff --git a/build/base16-everforest-dark-hard.css b/build/base16-everforest-dark-hard.css
index e7ab965..25402a0 100644
--- a/build/base16-everforest-dark-hard.css
+++ b/build/base16-everforest-dark-hard.css
@@ -1,88 +1,37 @@
 @define-color accent_color #7fbbb3;
 @define-color accent_bg_color #7fbbb3;
 @define-color accent_fg_color #272e33;
-@define-color destructive_color #e67e80;
-@define-color destructive_bg_color #e67e80;
-@define-color destructive_fg_color #272e33;
-@define-color success_color #a7c080;
-@define-color success_bg_color #a7c080;
-@define-color success_fg_color #272e33;
-@define-color warning_color #d699b6;
-@define-color warning_bg_color #d699b6;
-@define-color warning_fg_color #272e33;
-@define-color error_color #e67e80;
-@define-color error_bg_color #e67e80;
-@define-color error_fg_color #272e33;
+
 @define-color window_bg_color #272e33;
 @define-color window_fg_color #d3c6aa;
+
 @define-color view_bg_color #272e33;
 @define-color view_fg_color #d3c6aa;
-@define-color headerbar_bg_color #2e383c;
+
+@define-color headerbar_bg_color #272e33;
 @define-color headerbar_fg_color #d3c6aa;
-@define-color headerbar_border_color rgba(0.18039216, 0.21960784, 0.23529412, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #272e33;
+@define-color dialog_fg_color #d3c6aa;
+
+@define-color popover_bg_color #272e33;
+@define-color popover_fg_color #d3c6aa;
+
+
 @define-color sidebar_bg_color #2e383c;
 @define-color sidebar_fg_color #d3c6aa;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #2e383c;
 @define-color card_fg_color #d3c6aa;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #2e383c;
-@define-color dialog_fg_color #d3c6aa;
-@define-color popover_bg_color #2e383c;
-@define-color popover_fg_color #d3c6aa;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #414b50;
-@define-color blue_1 #7fbbb3;
-@define-color blue_2 #7fbbb3;
-@define-color blue_3 #7fbbb3;
-@define-color blue_4 #7fbbb3;
-@define-color blue_5 #7fbbb3;
-@define-color green_1 #a7c080;
-@define-color green_2 #a7c080;
-@define-color green_3 #a7c080;
-@define-color green_4 #a7c080;
-@define-color green_5 #a7c080;
-@define-color yellow_1 #dbbc7f;
-@define-color yellow_2 #dbbc7f;
-@define-color yellow_3 #dbbc7f;
-@define-color yellow_4 #dbbc7f;
-@define-color yellow_5 #dbbc7f;
-@define-color orange_1 #e69875;
-@define-color orange_2 #e69875;
-@define-color orange_3 #e69875;
-@define-color orange_4 #e69875;
-@define-color orange_5 #e69875;
+
+
 @define-color red_1 #e67e80;
-@define-color red_2 #e67e80;
-@define-color red_3 #e67e80;
-@define-color red_4 #e67e80;
-@define-color red_5 #e67e80;
+@define-color green_1 #a7c080;
+@define-color yellow_1 #dbbc7f;
+@define-color blue_1 #7fbbb3;
 @define-color purple_1 #d699b6;
-@define-color purple_2 #d699b6;
-@define-color purple_3 #d699b6;
-@define-color purple_4 #d699b6;
-@define-color purple_5 #d699b6;
-@define-color brown_1 #9da9a0;
-@define-color brown_2 #9da9a0;
-@define-color brown_3 #9da9a0;
-@define-color brown_4 #9da9a0;
-@define-color brown_5 #9da9a0;
-@define-color light_1 #d3c6aa;
-@define-color light_2 #d3c6aa;
-@define-color light_3 #d3c6aa;
-@define-color light_4 #d3c6aa;
-@define-color light_5 #d3c6aa;
-@define-color dark_1 #d3c6aa;
-@define-color dark_2 #d3c6aa;
-@define-color dark_3 #d3c6aa;
-@define-color dark_4 #d3c6aa;
-@define-color dark_5 #d3c6aa;
+@define-color teal_1 #83c092;
+@define-color orange_1 #e69875;
+@define-color gray_1 #859289;
+
diff --git a/build/base16-everforest-dark-medium.css b/build/base16-everforest-dark-medium.css
index 0a61d7f..c3b688c 100644
--- a/build/base16-everforest-dark-medium.css
+++ b/build/base16-everforest-dark-medium.css
@@ -1,88 +1,37 @@
 @define-color accent_color #7fbbb3;
 @define-color accent_bg_color #7fbbb3;
 @define-color accent_fg_color #2d353b;
-@define-color destructive_color #e67e80;
-@define-color destructive_bg_color #e67e80;
-@define-color destructive_fg_color #2d353b;
-@define-color success_color #a7c080;
-@define-color success_bg_color #a7c080;
-@define-color success_fg_color #2d353b;
-@define-color warning_color #d699b6;
-@define-color warning_bg_color #d699b6;
-@define-color warning_fg_color #2d353b;
-@define-color error_color #e67e80;
-@define-color error_bg_color #e67e80;
-@define-color error_fg_color #2d353b;
+
 @define-color window_bg_color #2d353b;
 @define-color window_fg_color #859289;
+
 @define-color view_bg_color #2d353b;
 @define-color view_fg_color #859289;
-@define-color headerbar_bg_color #343f44;
+
+@define-color headerbar_bg_color #2d353b;
 @define-color headerbar_fg_color #859289;
-@define-color headerbar_border_color rgba(0.20392157, 0.24705882, 0.26666667, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #2d353b;
+@define-color dialog_fg_color #859289;
+
+@define-color popover_bg_color #2d353b;
+@define-color popover_fg_color #859289;
+
+
 @define-color sidebar_bg_color #343f44;
 @define-color sidebar_fg_color #859289;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #343f44;
 @define-color card_fg_color #859289;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #343f44;
-@define-color dialog_fg_color #859289;
-@define-color popover_bg_color #343f44;
-@define-color popover_fg_color #859289;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #3d484d;
-@define-color blue_1 #7fbbb3;
-@define-color blue_2 #7fbbb3;
-@define-color blue_3 #7fbbb3;
-@define-color blue_4 #7fbbb3;
-@define-color blue_5 #7fbbb3;
-@define-color green_1 #a7c080;
-@define-color green_2 #a7c080;
-@define-color green_3 #a7c080;
-@define-color green_4 #a7c080;
-@define-color green_5 #a7c080;
-@define-color yellow_1 #dbbc7f;
-@define-color yellow_2 #dbbc7f;
-@define-color yellow_3 #dbbc7f;
-@define-color yellow_4 #dbbc7f;
-@define-color yellow_5 #dbbc7f;
-@define-color orange_1 #e69875;
-@define-color orange_2 #e69875;
-@define-color orange_3 #e69875;
-@define-color orange_4 #e69875;
-@define-color orange_5 #e69875;
+
+
 @define-color red_1 #e67e80;
-@define-color red_2 #e67e80;
-@define-color red_3 #e67e80;
-@define-color red_4 #e67e80;
-@define-color red_5 #e67e80;
+@define-color green_1 #a7c080;
+@define-color yellow_1 #dbbc7f;
+@define-color blue_1 #7fbbb3;
 @define-color purple_1 #d699b6;
-@define-color purple_2 #d699b6;
-@define-color purple_3 #d699b6;
-@define-color purple_4 #d699b6;
-@define-color purple_5 #d699b6;
-@define-color brown_1 #514045;
-@define-color brown_2 #514045;
-@define-color brown_3 #514045;
-@define-color brown_4 #514045;
-@define-color brown_5 #514045;
-@define-color light_1 #859289;
-@define-color light_2 #859289;
-@define-color light_3 #859289;
-@define-color light_4 #859289;
-@define-color light_5 #859289;
-@define-color dark_1 #859289;
-@define-color dark_2 #859289;
-@define-color dark_3 #859289;
-@define-color dark_4 #859289;
-@define-color dark_5 #859289;
+@define-color teal_1 #83c092;
+@define-color orange_1 #e69875;
+@define-color gray_1 #475258;
+
diff --git a/build/base16-everforest-dark-soft.css b/build/base16-everforest-dark-soft.css
index 3037ddd..1a6a6f4 100644
--- a/build/base16-everforest-dark-soft.css
+++ b/build/base16-everforest-dark-soft.css
@@ -1,88 +1,37 @@
 @define-color accent_color #7fbbb3;
 @define-color accent_bg_color #7fbbb3;
 @define-color accent_fg_color #333c43;
-@define-color destructive_color #e67e80;
-@define-color destructive_bg_color #e67e80;
-@define-color destructive_fg_color #333c43;
-@define-color success_color #a7c080;
-@define-color success_bg_color #a7c080;
-@define-color success_fg_color #333c43;
-@define-color warning_color #d699b6;
-@define-color warning_bg_color #d699b6;
-@define-color warning_fg_color #333c43;
-@define-color error_color #e67e80;
-@define-color error_bg_color #e67e80;
-@define-color error_fg_color #333c43;
+
 @define-color window_bg_color #333c43;
 @define-color window_fg_color #d3c6aa;
+
 @define-color view_bg_color #333c43;
 @define-color view_fg_color #d3c6aa;
-@define-color headerbar_bg_color #3a464c;
+
+@define-color headerbar_bg_color #333c43;
 @define-color headerbar_fg_color #d3c6aa;
-@define-color headerbar_border_color rgba(0.22745098, 0.27450980, 0.29803922, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #333c43;
+@define-color dialog_fg_color #d3c6aa;
+
+@define-color popover_bg_color #333c43;
+@define-color popover_fg_color #d3c6aa;
+
+
 @define-color sidebar_bg_color #3a464c;
 @define-color sidebar_fg_color #d3c6aa;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #3a464c;
 @define-color card_fg_color #d3c6aa;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #3a464c;
-@define-color dialog_fg_color #d3c6aa;
-@define-color popover_bg_color #3a464c;
-@define-color popover_fg_color #d3c6aa;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #4d5960;
-@define-color blue_1 #7fbbb3;
-@define-color blue_2 #7fbbb3;
-@define-color blue_3 #7fbbb3;
-@define-color blue_4 #7fbbb3;
-@define-color blue_5 #7fbbb3;
-@define-color green_1 #a7c080;
-@define-color green_2 #a7c080;
-@define-color green_3 #a7c080;
-@define-color green_4 #a7c080;
-@define-color green_5 #a7c080;
-@define-color yellow_1 #dbbc7f;
-@define-color yellow_2 #dbbc7f;
-@define-color yellow_3 #dbbc7f;
-@define-color yellow_4 #dbbc7f;
-@define-color yellow_5 #dbbc7f;
-@define-color orange_1 #e69875;
-@define-color orange_2 #e69875;
-@define-color orange_3 #e69875;
-@define-color orange_4 #e69875;
-@define-color orange_5 #e69875;
+
+
 @define-color red_1 #e67e80;
-@define-color red_2 #e67e80;
-@define-color red_3 #e67e80;
-@define-color red_4 #e67e80;
-@define-color red_5 #e67e80;
+@define-color green_1 #a7c080;
+@define-color yellow_1 #dbbc7f;
+@define-color blue_1 #7fbbb3;
 @define-color purple_1 #d699b6;
-@define-color purple_2 #d699b6;
-@define-color purple_3 #d699b6;
-@define-color purple_4 #d699b6;
-@define-color purple_5 #d699b6;
-@define-color brown_1 #9da9a0;
-@define-color brown_2 #9da9a0;
-@define-color brown_3 #9da9a0;
-@define-color brown_4 #9da9a0;
-@define-color brown_5 #9da9a0;
-@define-color light_1 #d3c6aa;
-@define-color light_2 #d3c6aa;
-@define-color light_3 #d3c6aa;
-@define-color light_4 #d3c6aa;
-@define-color light_5 #d3c6aa;
-@define-color dark_1 #d3c6aa;
-@define-color dark_2 #d3c6aa;
-@define-color dark_3 #d3c6aa;
-@define-color dark_4 #d3c6aa;
-@define-color dark_5 #d3c6aa;
+@define-color teal_1 #83c092;
+@define-color orange_1 #e69875;
+@define-color gray_1 #859289;
+
diff --git a/build/base16-everforest-light-hard.css b/build/base16-everforest-light-hard.css
index 8b43beb..ac6ec45 100644
--- a/build/base16-everforest-light-hard.css
+++ b/build/base16-everforest-light-hard.css
@@ -1,88 +1,37 @@
 @define-color accent_color #3a94c5;
 @define-color accent_bg_color #3a94c5;
 @define-color accent_fg_color #fffbef;
-@define-color destructive_color #f85552;
-@define-color destructive_bg_color #f85552;
-@define-color destructive_fg_color #fffbef;
-@define-color success_color #8da101;
-@define-color success_bg_color #8da101;
-@define-color success_fg_color #fffbef;
-@define-color warning_color #df69ba;
-@define-color warning_bg_color #df69ba;
-@define-color warning_fg_color #fffbef;
-@define-color error_color #f85552;
-@define-color error_bg_color #f85552;
-@define-color error_fg_color #fffbef;
+
 @define-color window_bg_color #fffbef;
 @define-color window_fg_color #5c6a72;
+
 @define-color view_bg_color #fffbef;
 @define-color view_fg_color #5c6a72;
-@define-color headerbar_bg_color #f8f5e4;
+
+@define-color headerbar_bg_color #fffbef;
 @define-color headerbar_fg_color #5c6a72;
-@define-color headerbar_border_color rgba(0.97254902, 0.96078431, 0.89411765, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #fffbef;
+@define-color dialog_fg_color #5c6a72;
+
+@define-color popover_bg_color #fffbef;
+@define-color popover_fg_color #5c6a72;
+
+
 @define-color sidebar_bg_color #f8f5e4;
 @define-color sidebar_fg_color #5c6a72;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #f8f5e4;
 @define-color card_fg_color #5c6a72;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #f8f5e4;
-@define-color dialog_fg_color #5c6a72;
-@define-color popover_bg_color #f8f5e4;
-@define-color popover_fg_color #5c6a72;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #edeada;
-@define-color blue_1 #3a94c5;
-@define-color blue_2 #3a94c5;
-@define-color blue_3 #3a94c5;
-@define-color blue_4 #3a94c5;
-@define-color blue_5 #3a94c5;
-@define-color green_1 #8da101;
-@define-color green_2 #8da101;
-@define-color green_3 #8da101;
-@define-color green_4 #8da101;
-@define-color green_5 #8da101;
-@define-color yellow_1 #dfa000;
-@define-color yellow_2 #dfa000;
-@define-color yellow_3 #dfa000;
-@define-color yellow_4 #dfa000;
-@define-color yellow_5 #dfa000;
-@define-color orange_1 #f57d26;
-@define-color orange_2 #f57d26;
-@define-color orange_3 #f57d26;
-@define-color orange_4 #f57d26;
-@define-color orange_5 #f57d26;
+
+
 @define-color red_1 #f85552;
-@define-color red_2 #f85552;
-@define-color red_3 #f85552;
-@define-color red_4 #f85552;
-@define-color red_5 #f85552;
+@define-color green_1 #8da101;
+@define-color yellow_1 #dfa000;
+@define-color blue_1 #3a94c5;
 @define-color purple_1 #df69ba;
-@define-color purple_2 #df69ba;
-@define-color purple_3 #df69ba;
-@define-color purple_4 #df69ba;
-@define-color purple_5 #df69ba;
-@define-color brown_1 #829181;
-@define-color brown_2 #829181;
-@define-color brown_3 #829181;
-@define-color brown_4 #829181;
-@define-color brown_5 #829181;
-@define-color light_1 #5c6a72;
-@define-color light_2 #5c6a72;
-@define-color light_3 #5c6a72;
-@define-color light_4 #5c6a72;
-@define-color light_5 #5c6a72;
-@define-color dark_1 #5c6a72;
-@define-color dark_2 #5c6a72;
-@define-color dark_3 #5c6a72;
-@define-color dark_4 #5c6a72;
-@define-color dark_5 #5c6a72;
+@define-color teal_1 #35a77c;
+@define-color orange_1 #f57d26;
+@define-color gray_1 #939f91;
+
diff --git a/build/base16-everforest-light-medium.css b/build/base16-everforest-light-medium.css
index 627d4be..485ca29 100644
--- a/build/base16-everforest-light-medium.css
+++ b/build/base16-everforest-light-medium.css
@@ -1,88 +1,37 @@
 @define-color accent_color #3a94c5;
 @define-color accent_bg_color #3a94c5;
 @define-color accent_fg_color #fdf6e3;
-@define-color destructive_color #f85552;
-@define-color destructive_bg_color #f85552;
-@define-color destructive_fg_color #fdf6e3;
-@define-color success_color #8da101;
-@define-color success_bg_color #8da101;
-@define-color success_fg_color #fdf6e3;
-@define-color warning_color #df69ba;
-@define-color warning_bg_color #df69ba;
-@define-color warning_fg_color #fdf6e3;
-@define-color error_color #f85552;
-@define-color error_bg_color #f85552;
-@define-color error_fg_color #fdf6e3;
+
 @define-color window_bg_color #fdf6e3;
 @define-color window_fg_color #5c6a72;
+
 @define-color view_bg_color #fdf6e3;
 @define-color view_fg_color #5c6a72;
-@define-color headerbar_bg_color #f4f0d9;
+
+@define-color headerbar_bg_color #fdf6e3;
 @define-color headerbar_fg_color #5c6a72;
-@define-color headerbar_border_color rgba(0.95686275, 0.94117647, 0.85098039, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #fdf6e3;
+@define-color dialog_fg_color #5c6a72;
+
+@define-color popover_bg_color #fdf6e3;
+@define-color popover_fg_color #5c6a72;
+
+
 @define-color sidebar_bg_color #f4f0d9;
 @define-color sidebar_fg_color #5c6a72;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #f4f0d9;
 @define-color card_fg_color #5c6a72;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #f4f0d9;
-@define-color dialog_fg_color #5c6a72;
-@define-color popover_bg_color #f4f0d9;
-@define-color popover_fg_color #5c6a72;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #e6e2cc;
-@define-color blue_1 #3a94c5;
-@define-color blue_2 #3a94c5;
-@define-color blue_3 #3a94c5;
-@define-color blue_4 #3a94c5;
-@define-color blue_5 #3a94c5;
-@define-color green_1 #8da101;
-@define-color green_2 #8da101;
-@define-color green_3 #8da101;
-@define-color green_4 #8da101;
-@define-color green_5 #8da101;
-@define-color yellow_1 #dfa000;
-@define-color yellow_2 #dfa000;
-@define-color yellow_3 #dfa000;
-@define-color yellow_4 #dfa000;
-@define-color yellow_5 #dfa000;
-@define-color orange_1 #f57d26;
-@define-color orange_2 #f57d26;
-@define-color orange_3 #f57d26;
-@define-color orange_4 #f57d26;
-@define-color orange_5 #f57d26;
+
+
 @define-color red_1 #f85552;
-@define-color red_2 #f85552;
-@define-color red_3 #f85552;
-@define-color red_4 #f85552;
-@define-color red_5 #f85552;
+@define-color green_1 #8da101;
+@define-color yellow_1 #dfa000;
+@define-color blue_1 #3a94c5;
 @define-color purple_1 #df69ba;
-@define-color purple_2 #df69ba;
-@define-color purple_3 #df69ba;
-@define-color purple_4 #df69ba;
-@define-color purple_5 #df69ba;
-@define-color brown_1 #829181;
-@define-color brown_2 #829181;
-@define-color brown_3 #829181;
-@define-color brown_4 #829181;
-@define-color brown_5 #829181;
-@define-color light_1 #5c6a72;
-@define-color light_2 #5c6a72;
-@define-color light_3 #5c6a72;
-@define-color light_4 #5c6a72;
-@define-color light_5 #5c6a72;
-@define-color dark_1 #5c6a72;
-@define-color dark_2 #5c6a72;
-@define-color dark_3 #5c6a72;
-@define-color dark_4 #5c6a72;
-@define-color dark_5 #5c6a72;
+@define-color teal_1 #35a77c;
+@define-color orange_1 #f57d26;
+@define-color gray_1 #939f91;
+
diff --git a/build/base16-everforest-light-soft.css b/build/base16-everforest-light-soft.css
index f1f405b..82e4b02 100644
--- a/build/base16-everforest-light-soft.css
+++ b/build/base16-everforest-light-soft.css
@@ -1,88 +1,37 @@
 @define-color accent_color #3a94c5;
 @define-color accent_bg_color #3a94c5;
 @define-color accent_fg_color #f3ead3;
-@define-color destructive_color #f85552;
-@define-color destructive_bg_color #f85552;
-@define-color destructive_fg_color #f3ead3;
-@define-color success_color #8da101;
-@define-color success_bg_color #8da101;
-@define-color success_fg_color #f3ead3;
-@define-color warning_color #df69ba;
-@define-color warning_bg_color #df69ba;
-@define-color warning_fg_color #f3ead3;
-@define-color error_color #f85552;
-@define-color error_bg_color #f85552;
-@define-color error_fg_color #f3ead3;
+
 @define-color window_bg_color #f3ead3;
 @define-color window_fg_color #5c6a72;
+
 @define-color view_bg_color #f3ead3;
 @define-color view_fg_color #5c6a72;
-@define-color headerbar_bg_color #eae4ca;
+
+@define-color headerbar_bg_color #f3ead3;
 @define-color headerbar_fg_color #5c6a72;
-@define-color headerbar_border_color rgba(0.91764706, 0.89411765, 0.79215686, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #f3ead3;
+@define-color dialog_fg_color #5c6a72;
+
+@define-color popover_bg_color #f3ead3;
+@define-color popover_fg_color #5c6a72;
+
+
 @define-color sidebar_bg_color #eae4ca;
 @define-color sidebar_fg_color #5c6a72;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #eae4ca;
 @define-color card_fg_color #5c6a72;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #eae4ca;
-@define-color dialog_fg_color #5c6a72;
-@define-color popover_bg_color #eae4ca;
-@define-color popover_fg_color #5c6a72;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #ddd8be;
-@define-color blue_1 #3a94c5;
-@define-color blue_2 #3a94c5;
-@define-color blue_3 #3a94c5;
-@define-color blue_4 #3a94c5;
-@define-color blue_5 #3a94c5;
-@define-color green_1 #8da101;
-@define-color green_2 #8da101;
-@define-color green_3 #8da101;
-@define-color green_4 #8da101;
-@define-color green_5 #8da101;
-@define-color yellow_1 #dfa000;
-@define-color yellow_2 #dfa000;
-@define-color yellow_3 #dfa000;
-@define-color yellow_4 #dfa000;
-@define-color yellow_5 #dfa000;
-@define-color orange_1 #f57d26;
-@define-color orange_2 #f57d26;
-@define-color orange_3 #f57d26;
-@define-color orange_4 #f57d26;
-@define-color orange_5 #f57d26;
+
+
 @define-color red_1 #f85552;
-@define-color red_2 #f85552;
-@define-color red_3 #f85552;
-@define-color red_4 #f85552;
-@define-color red_5 #f85552;
+@define-color green_1 #8da101;
+@define-color yellow_1 #dfa000;
+@define-color blue_1 #3a94c5;
 @define-color purple_1 #df69ba;
-@define-color purple_2 #df69ba;
-@define-color purple_3 #df69ba;
-@define-color purple_4 #df69ba;
-@define-color purple_5 #df69ba;
-@define-color brown_1 #829181;
-@define-color brown_2 #829181;
-@define-color brown_3 #829181;
-@define-color brown_4 #829181;
-@define-color brown_5 #829181;
-@define-color light_1 #5c6a72;
-@define-color light_2 #5c6a72;
-@define-color light_3 #5c6a72;
-@define-color light_4 #5c6a72;
-@define-color light_5 #5c6a72;
-@define-color dark_1 #5c6a72;
-@define-color dark_2 #5c6a72;
-@define-color dark_3 #5c6a72;
-@define-color dark_4 #5c6a72;
-@define-color dark_5 #5c6a72;
+@define-color teal_1 #35a77c;
+@define-color orange_1 #f57d26;
+@define-color gray_1 #939f91;
+
diff --git a/build/base16-everforest.css b/build/base16-everforest.css
index 5da6893..2817676 100644
--- a/build/base16-everforest.css
+++ b/build/base16-everforest.css
@@ -1,88 +1,37 @@
 @define-color accent_color #7fbbb3;
 @define-color accent_bg_color #7fbbb3;
 @define-color accent_fg_color #2d353b;
-@define-color destructive_color #e67e80;
-@define-color destructive_bg_color #e67e80;
-@define-color destructive_fg_color #2d353b;
-@define-color success_color #a7c080;
-@define-color success_bg_color #a7c080;
-@define-color success_fg_color #2d353b;
-@define-color warning_color #d699b6;
-@define-color warning_bg_color #d699b6;
-@define-color warning_fg_color #2d353b;
-@define-color error_color #e67e80;
-@define-color error_bg_color #e67e80;
-@define-color error_fg_color #2d353b;
+
 @define-color window_bg_color #2d353b;
 @define-color window_fg_color #d3c6aa;
+
 @define-color view_bg_color #2d353b;
 @define-color view_fg_color #d3c6aa;
-@define-color headerbar_bg_color #343f44;
+
+@define-color headerbar_bg_color #2d353b;
 @define-color headerbar_fg_color #d3c6aa;
-@define-color headerbar_border_color rgba(0.20392157, 0.24705882, 0.26666667, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #2d353b;
+@define-color dialog_fg_color #d3c6aa;
+
+@define-color popover_bg_color #2d353b;
+@define-color popover_fg_color #d3c6aa;
+
+
 @define-color sidebar_bg_color #343f44;
 @define-color sidebar_fg_color #d3c6aa;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #343f44;
 @define-color card_fg_color #d3c6aa;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #343f44;
-@define-color dialog_fg_color #d3c6aa;
-@define-color popover_bg_color #343f44;
-@define-color popover_fg_color #d3c6aa;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #475258;
-@define-color blue_1 #7fbbb3;
-@define-color blue_2 #7fbbb3;
-@define-color blue_3 #7fbbb3;
-@define-color blue_4 #7fbbb3;
-@define-color blue_5 #7fbbb3;
-@define-color green_1 #a7c080;
-@define-color green_2 #a7c080;
-@define-color green_3 #a7c080;
-@define-color green_4 #a7c080;
-@define-color green_5 #a7c080;
-@define-color yellow_1 #dbbc7f;
-@define-color yellow_2 #dbbc7f;
-@define-color yellow_3 #dbbc7f;
-@define-color yellow_4 #dbbc7f;
-@define-color yellow_5 #dbbc7f;
-@define-color orange_1 #e69875;
-@define-color orange_2 #e69875;
-@define-color orange_3 #e69875;
-@define-color orange_4 #e69875;
-@define-color orange_5 #e69875;
+
+
 @define-color red_1 #e67e80;
-@define-color red_2 #e67e80;
-@define-color red_3 #e67e80;
-@define-color red_4 #e67e80;
-@define-color red_5 #e67e80;
+@define-color green_1 #a7c080;
+@define-color yellow_1 #dbbc7f;
+@define-color blue_1 #7fbbb3;
 @define-color purple_1 #d699b6;
-@define-color purple_2 #d699b6;
-@define-color purple_3 #d699b6;
-@define-color purple_4 #d699b6;
-@define-color purple_5 #d699b6;
-@define-color brown_1 #9da9a0;
-@define-color brown_2 #9da9a0;
-@define-color brown_3 #9da9a0;
-@define-color brown_4 #9da9a0;
-@define-color brown_5 #9da9a0;
-@define-color light_1 #d3c6aa;
-@define-color light_2 #d3c6aa;
-@define-color light_3 #d3c6aa;
-@define-color light_4 #d3c6aa;
-@define-color light_5 #d3c6aa;
-@define-color dark_1 #d3c6aa;
-@define-color dark_2 #d3c6aa;
-@define-color dark_3 #d3c6aa;
-@define-color dark_4 #d3c6aa;
-@define-color dark_5 #d3c6aa;
+@define-color teal_1 #83c092;
+@define-color orange_1 #e69875;
+@define-color gray_1 #859289;
+
diff --git a/build/base16-flat.css b/build/base16-flat.css
index bb41a27..082af4e 100644
--- a/build/base16-flat.css
+++ b/build/base16-flat.css
@@ -1,88 +1,37 @@
 @define-color accent_color #3498db;
 @define-color accent_bg_color #3498db;
 @define-color accent_fg_color #2c3e50;
-@define-color destructive_color #e74c3c;
-@define-color destructive_bg_color #e74c3c;
-@define-color destructive_fg_color #2c3e50;
-@define-color success_color #2ecc71;
-@define-color success_bg_color #2ecc71;
-@define-color success_fg_color #2c3e50;
-@define-color warning_color #9b59b6;
-@define-color warning_bg_color #9b59b6;
-@define-color warning_fg_color #2c3e50;
-@define-color error_color #e74c3c;
-@define-color error_bg_color #e74c3c;
-@define-color error_fg_color #2c3e50;
+
 @define-color window_bg_color #2c3e50;
 @define-color window_fg_color #e0e0e0;
+
 @define-color view_bg_color #2c3e50;
 @define-color view_fg_color #e0e0e0;
-@define-color headerbar_bg_color #34495e;
+
+@define-color headerbar_bg_color #2c3e50;
 @define-color headerbar_fg_color #e0e0e0;
-@define-color headerbar_border_color rgba(0.20392157, 0.28627451, 0.36862745, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #2c3e50;
+@define-color dialog_fg_color #e0e0e0;
+
+@define-color popover_bg_color #2c3e50;
+@define-color popover_fg_color #e0e0e0;
+
+
 @define-color sidebar_bg_color #34495e;
 @define-color sidebar_fg_color #e0e0e0;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #34495e;
 @define-color card_fg_color #e0e0e0;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #34495e;
-@define-color dialog_fg_color #e0e0e0;
-@define-color popover_bg_color #34495e;
-@define-color popover_fg_color #e0e0e0;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #7f8c8d;
-@define-color blue_1 #3498db;
-@define-color blue_2 #3498db;
-@define-color blue_3 #3498db;
-@define-color blue_4 #3498db;
-@define-color blue_5 #3498db;
-@define-color green_1 #2ecc71;
-@define-color green_2 #2ecc71;
-@define-color green_3 #2ecc71;
-@define-color green_4 #2ecc71;
-@define-color green_5 #2ecc71;
-@define-color yellow_1 #f1c40f;
-@define-color yellow_2 #f1c40f;
-@define-color yellow_3 #f1c40f;
-@define-color yellow_4 #f1c40f;
-@define-color yellow_5 #f1c40f;
-@define-color orange_1 #e67e22;
-@define-color orange_2 #e67e22;
-@define-color orange_3 #e67e22;
-@define-color orange_4 #e67e22;
-@define-color orange_5 #e67e22;
+
+
 @define-color red_1 #e74c3c;
-@define-color red_2 #e74c3c;
-@define-color red_3 #e74c3c;
-@define-color red_4 #e74c3c;
-@define-color red_5 #e74c3c;
+@define-color green_1 #2ecc71;
+@define-color yellow_1 #f1c40f;
+@define-color blue_1 #3498db;
 @define-color purple_1 #9b59b6;
-@define-color purple_2 #9b59b6;
-@define-color purple_3 #9b59b6;
-@define-color purple_4 #9b59b6;
-@define-color purple_5 #9b59b6;
-@define-color brown_1 #be643c;
-@define-color brown_2 #be643c;
-@define-color brown_3 #be643c;
-@define-color brown_4 #be643c;
-@define-color brown_5 #be643c;
-@define-color light_1 #e0e0e0;
-@define-color light_2 #e0e0e0;
-@define-color light_3 #e0e0e0;
-@define-color light_4 #e0e0e0;
-@define-color light_5 #e0e0e0;
-@define-color dark_1 #e0e0e0;
-@define-color dark_2 #e0e0e0;
-@define-color dark_3 #e0e0e0;
-@define-color dark_4 #e0e0e0;
-@define-color dark_5 #e0e0e0;
+@define-color teal_1 #1abc9c;
+@define-color orange_1 #e67e22;
+@define-color gray_1 #95a5a6;
+
diff --git a/build/base16-flexoki-dark.css b/build/base16-flexoki-dark.css
index 8253fc4..2ad109e 100644
--- a/build/base16-flexoki-dark.css
+++ b/build/base16-flexoki-dark.css
@@ -1,88 +1,37 @@
 @define-color accent_color #4385be;
 @define-color accent_bg_color #4385be;
 @define-color accent_fg_color #100f0f;
-@define-color destructive_color #d14d41;
-@define-color destructive_bg_color #d14d41;
-@define-color destructive_fg_color #100f0f;
-@define-color success_color #879a39;
-@define-color success_bg_color #879a39;
-@define-color success_fg_color #100f0f;
-@define-color warning_color #8b7ec8;
-@define-color warning_bg_color #8b7ec8;
-@define-color warning_fg_color #100f0f;
-@define-color error_color #d14d41;
-@define-color error_bg_color #d14d41;
-@define-color error_fg_color #100f0f;
+
 @define-color window_bg_color #100f0f;
 @define-color window_fg_color #cecdc3;
+
 @define-color view_bg_color #100f0f;
 @define-color view_fg_color #cecdc3;
-@define-color headerbar_bg_color #1c1b1a;
+
+@define-color headerbar_bg_color #100f0f;
 @define-color headerbar_fg_color #cecdc3;
-@define-color headerbar_border_color rgba(0.10980392, 0.10588235, 0.10196078, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #100f0f;
+@define-color dialog_fg_color #cecdc3;
+
+@define-color popover_bg_color #100f0f;
+@define-color popover_fg_color #cecdc3;
+
+
 @define-color sidebar_bg_color #1c1b1a;
 @define-color sidebar_fg_color #cecdc3;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #1c1b1a;
 @define-color card_fg_color #cecdc3;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #1c1b1a;
-@define-color dialog_fg_color #cecdc3;
-@define-color popover_bg_color #1c1b1a;
-@define-color popover_fg_color #cecdc3;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #282726;
-@define-color blue_1 #4385be;
-@define-color blue_2 #4385be;
-@define-color blue_3 #4385be;
-@define-color blue_4 #4385be;
-@define-color blue_5 #4385be;
-@define-color green_1 #879a39;
-@define-color green_2 #879a39;
-@define-color green_3 #879a39;
-@define-color green_4 #879a39;
-@define-color green_5 #879a39;
-@define-color yellow_1 #d0a215;
-@define-color yellow_2 #d0a215;
-@define-color yellow_3 #d0a215;
-@define-color yellow_4 #d0a215;
-@define-color yellow_5 #d0a215;
-@define-color orange_1 #da702c;
-@define-color orange_2 #da702c;
-@define-color orange_3 #da702c;
-@define-color orange_4 #da702c;
-@define-color orange_5 #da702c;
+
+
 @define-color red_1 #d14d41;
-@define-color red_2 #d14d41;
-@define-color red_3 #d14d41;
-@define-color red_4 #d14d41;
-@define-color red_5 #d14d41;
+@define-color green_1 #879a39;
+@define-color yellow_1 #d0a215;
+@define-color blue_1 #4385be;
 @define-color purple_1 #8b7ec8;
-@define-color purple_2 #8b7ec8;
-@define-color purple_3 #8b7ec8;
-@define-color purple_4 #8b7ec8;
-@define-color purple_5 #8b7ec8;
-@define-color brown_1 #ce5d97;
-@define-color brown_2 #ce5d97;
-@define-color brown_3 #ce5d97;
-@define-color brown_4 #ce5d97;
-@define-color brown_5 #ce5d97;
-@define-color light_1 #cecdc3;
-@define-color light_2 #cecdc3;
-@define-color light_3 #cecdc3;
-@define-color light_4 #cecdc3;
-@define-color light_5 #cecdc3;
-@define-color dark_1 #cecdc3;
-@define-color dark_2 #cecdc3;
-@define-color dark_3 #cecdc3;
-@define-color dark_4 #cecdc3;
-@define-color dark_5 #cecdc3;
+@define-color teal_1 #3aa99f;
+@define-color orange_1 #da702c;
+@define-color gray_1 #575653;
+
diff --git a/build/base16-flexoki-light.css b/build/base16-flexoki-light.css
index ae48634..c1505df 100644
--- a/build/base16-flexoki-light.css
+++ b/build/base16-flexoki-light.css
@@ -1,88 +1,37 @@
 @define-color accent_color #205ea6;
 @define-color accent_bg_color #205ea6;
 @define-color accent_fg_color #fffcf0;
-@define-color destructive_color #af3029;
-@define-color destructive_bg_color #af3029;
-@define-color destructive_fg_color #fffcf0;
-@define-color success_color #66800b;
-@define-color success_bg_color #66800b;
-@define-color success_fg_color #fffcf0;
-@define-color warning_color #5e409d;
-@define-color warning_bg_color #5e409d;
-@define-color warning_fg_color #fffcf0;
-@define-color error_color #af3029;
-@define-color error_bg_color #af3029;
-@define-color error_fg_color #fffcf0;
+
 @define-color window_bg_color #fffcf0;
 @define-color window_fg_color #403e3c;
+
 @define-color view_bg_color #fffcf0;
 @define-color view_fg_color #403e3c;
-@define-color headerbar_bg_color #f2f0e5;
+
+@define-color headerbar_bg_color #fffcf0;
 @define-color headerbar_fg_color #403e3c;
-@define-color headerbar_border_color rgba(0.94901961, 0.94117647, 0.89803922, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #fffcf0;
+@define-color dialog_fg_color #403e3c;
+
+@define-color popover_bg_color #fffcf0;
+@define-color popover_fg_color #403e3c;
+
+
 @define-color sidebar_bg_color #f2f0e5;
 @define-color sidebar_fg_color #403e3c;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #f2f0e5;
 @define-color card_fg_color #403e3c;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #f2f0e5;
-@define-color dialog_fg_color #403e3c;
-@define-color popover_bg_color #f2f0e5;
-@define-color popover_fg_color #403e3c;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #e6e4d9;
-@define-color blue_1 #205ea6;
-@define-color blue_2 #205ea6;
-@define-color blue_3 #205ea6;
-@define-color blue_4 #205ea6;
-@define-color blue_5 #205ea6;
-@define-color green_1 #66800b;
-@define-color green_2 #66800b;
-@define-color green_3 #66800b;
-@define-color green_4 #66800b;
-@define-color green_5 #66800b;
-@define-color yellow_1 #ad8301;
-@define-color yellow_2 #ad8301;
-@define-color yellow_3 #ad8301;
-@define-color yellow_4 #ad8301;
-@define-color yellow_5 #ad8301;
-@define-color orange_1 #bc5215;
-@define-color orange_2 #bc5215;
-@define-color orange_3 #bc5215;
-@define-color orange_4 #bc5215;
-@define-color orange_5 #bc5215;
+
+
 @define-color red_1 #af3029;
-@define-color red_2 #af3029;
-@define-color red_3 #af3029;
-@define-color red_4 #af3029;
-@define-color red_5 #af3029;
+@define-color green_1 #66800b;
+@define-color yellow_1 #ad8301;
+@define-color blue_1 #205ea6;
 @define-color purple_1 #5e409d;
-@define-color purple_2 #5e409d;
-@define-color purple_3 #5e409d;
-@define-color purple_4 #5e409d;
-@define-color purple_5 #5e409d;
-@define-color brown_1 #a02f6f;
-@define-color brown_2 #a02f6f;
-@define-color brown_3 #a02f6f;
-@define-color brown_4 #a02f6f;
-@define-color brown_5 #a02f6f;
-@define-color light_1 #403e3c;
-@define-color light_2 #403e3c;
-@define-color light_3 #403e3c;
-@define-color light_4 #403e3c;
-@define-color light_5 #403e3c;
-@define-color dark_1 #403e3c;
-@define-color dark_2 #403e3c;
-@define-color dark_3 #403e3c;
-@define-color dark_4 #403e3c;
-@define-color dark_5 #403e3c;
+@define-color teal_1 #24837b;
+@define-color orange_1 #bc5215;
+@define-color gray_1 #cecdc3;
+
diff --git a/build/base16-framer.css b/build/base16-framer.css
index 82afede..30f6d29 100644
--- a/build/base16-framer.css
+++ b/build/base16-framer.css
@@ -1,88 +1,37 @@
 @define-color accent_color #20bcfc;
 @define-color accent_bg_color #20bcfc;
 @define-color accent_fg_color #181818;
-@define-color destructive_color #fd886b;
-@define-color destructive_bg_color #fd886b;
-@define-color destructive_fg_color #181818;
-@define-color success_color #32ccdc;
-@define-color success_bg_color #32ccdc;
-@define-color success_fg_color #181818;
-@define-color warning_color #ba8cfc;
-@define-color warning_bg_color #ba8cfc;
-@define-color warning_fg_color #181818;
-@define-color error_color #fd886b;
-@define-color error_bg_color #fd886b;
-@define-color error_fg_color #181818;
+
 @define-color window_bg_color #181818;
 @define-color window_fg_color #d0d0d0;
+
 @define-color view_bg_color #181818;
 @define-color view_fg_color #d0d0d0;
-@define-color headerbar_bg_color #151515;
+
+@define-color headerbar_bg_color #181818;
 @define-color headerbar_fg_color #d0d0d0;
-@define-color headerbar_border_color rgba(0.08235294, 0.08235294, 0.08235294, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #181818;
+@define-color dialog_fg_color #d0d0d0;
+
+@define-color popover_bg_color #181818;
+@define-color popover_fg_color #d0d0d0;
+
+
 @define-color sidebar_bg_color #151515;
 @define-color sidebar_fg_color #d0d0d0;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #151515;
 @define-color card_fg_color #d0d0d0;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #151515;
-@define-color dialog_fg_color #d0d0d0;
-@define-color popover_bg_color #151515;
-@define-color popover_fg_color #d0d0d0;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #464646;
-@define-color blue_1 #20bcfc;
-@define-color blue_2 #20bcfc;
-@define-color blue_3 #20bcfc;
-@define-color blue_4 #20bcfc;
-@define-color blue_5 #20bcfc;
-@define-color green_1 #32ccdc;
-@define-color green_2 #32ccdc;
-@define-color green_3 #32ccdc;
-@define-color green_4 #32ccdc;
-@define-color green_5 #32ccdc;
-@define-color yellow_1 #fecb6e;
-@define-color yellow_2 #fecb6e;
-@define-color yellow_3 #fecb6e;
-@define-color yellow_4 #fecb6e;
-@define-color yellow_5 #fecb6e;
-@define-color orange_1 #fc4769;
-@define-color orange_2 #fc4769;
-@define-color orange_3 #fc4769;
-@define-color orange_4 #fc4769;
-@define-color orange_5 #fc4769;
+
+
 @define-color red_1 #fd886b;
-@define-color red_2 #fd886b;
-@define-color red_3 #fd886b;
-@define-color red_4 #fd886b;
-@define-color red_5 #fd886b;
+@define-color green_1 #32ccdc;
+@define-color yellow_1 #fecb6e;
+@define-color blue_1 #20bcfc;
 @define-color purple_1 #ba8cfc;
-@define-color purple_2 #ba8cfc;
-@define-color purple_3 #ba8cfc;
-@define-color purple_4 #ba8cfc;
-@define-color purple_5 #ba8cfc;
-@define-color brown_1 #b15f4a;
-@define-color brown_2 #b15f4a;
-@define-color brown_3 #b15f4a;
-@define-color brown_4 #b15f4a;
-@define-color brown_5 #b15f4a;
-@define-color light_1 #d0d0d0;
-@define-color light_2 #d0d0d0;
-@define-color light_3 #d0d0d0;
-@define-color light_4 #d0d0d0;
-@define-color light_5 #d0d0d0;
-@define-color dark_1 #d0d0d0;
-@define-color dark_2 #d0d0d0;
-@define-color dark_3 #d0d0d0;
-@define-color dark_4 #d0d0d0;
-@define-color dark_5 #d0d0d0;
+@define-color teal_1 #acddfd;
+@define-color orange_1 #fc4769;
+@define-color gray_1 #747474;
+
diff --git a/build/base16-fruit-soda.css b/build/base16-fruit-soda.css
index 7e7ba0e..5f4f508 100644
--- a/build/base16-fruit-soda.css
+++ b/build/base16-fruit-soda.css
@@ -1,88 +1,37 @@
 @define-color accent_color #2931df;
 @define-color accent_bg_color #2931df;
 @define-color accent_fg_color #f1ecf1;
-@define-color destructive_color #fe3e31;
-@define-color destructive_bg_color #fe3e31;
-@define-color destructive_fg_color #f1ecf1;
-@define-color success_color #47f74c;
-@define-color success_bg_color #47f74c;
-@define-color success_fg_color #f1ecf1;
-@define-color warning_color #611fce;
-@define-color warning_bg_color #611fce;
-@define-color warning_fg_color #f1ecf1;
-@define-color error_color #fe3e31;
-@define-color error_bg_color #fe3e31;
-@define-color error_fg_color #f1ecf1;
+
 @define-color window_bg_color #f1ecf1;
 @define-color window_fg_color #515151;
+
 @define-color view_bg_color #f1ecf1;
 @define-color view_fg_color #515151;
-@define-color headerbar_bg_color #e0dee0;
+
+@define-color headerbar_bg_color #f1ecf1;
 @define-color headerbar_fg_color #515151;
-@define-color headerbar_border_color rgba(0.87843137, 0.87058824, 0.87843137, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #f1ecf1;
+@define-color dialog_fg_color #515151;
+
+@define-color popover_bg_color #f1ecf1;
+@define-color popover_fg_color #515151;
+
+
 @define-color sidebar_bg_color #e0dee0;
 @define-color sidebar_fg_color #515151;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #e0dee0;
 @define-color card_fg_color #515151;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #e0dee0;
-@define-color dialog_fg_color #515151;
-@define-color popover_bg_color #e0dee0;
-@define-color popover_fg_color #515151;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #d8d5d5;
-@define-color blue_1 #2931df;
-@define-color blue_2 #2931df;
-@define-color blue_3 #2931df;
-@define-color blue_4 #2931df;
-@define-color blue_5 #2931df;
-@define-color green_1 #47f74c;
-@define-color green_2 #47f74c;
-@define-color green_3 #47f74c;
-@define-color green_4 #47f74c;
-@define-color green_5 #47f74c;
-@define-color yellow_1 #f7e203;
-@define-color yellow_2 #f7e203;
-@define-color yellow_3 #f7e203;
-@define-color yellow_4 #f7e203;
-@define-color yellow_5 #f7e203;
-@define-color orange_1 #fe6d08;
-@define-color orange_2 #fe6d08;
-@define-color orange_3 #fe6d08;
-@define-color orange_4 #fe6d08;
-@define-color orange_5 #fe6d08;
+
+
 @define-color red_1 #fe3e31;
-@define-color red_2 #fe3e31;
-@define-color red_3 #fe3e31;
-@define-color red_4 #fe3e31;
-@define-color red_5 #fe3e31;
+@define-color green_1 #47f74c;
+@define-color yellow_1 #f7e203;
+@define-color blue_1 #2931df;
 @define-color purple_1 #611fce;
-@define-color purple_2 #611fce;
-@define-color purple_3 #611fce;
-@define-color purple_4 #611fce;
-@define-color purple_5 #611fce;
-@define-color brown_1 #b16f40;
-@define-color brown_2 #b16f40;
-@define-color brown_3 #b16f40;
-@define-color brown_4 #b16f40;
-@define-color brown_5 #b16f40;
-@define-color light_1 #515151;
-@define-color light_2 #515151;
-@define-color light_3 #515151;
-@define-color light_4 #515151;
-@define-color light_5 #515151;
-@define-color dark_1 #515151;
-@define-color dark_2 #515151;
-@define-color dark_3 #515151;
-@define-color dark_4 #515151;
-@define-color dark_5 #515151;
+@define-color teal_1 #0f9cfd;
+@define-color orange_1 #fe6d08;
+@define-color gray_1 #b5b4b6;
+
diff --git a/build/base16-gigavolt.css b/build/base16-gigavolt.css
index 61f4c26..e31fd5a 100644
--- a/build/base16-gigavolt.css
+++ b/build/base16-gigavolt.css
@@ -1,88 +1,37 @@
 @define-color accent_color #40bfff;
 @define-color accent_bg_color #40bfff;
 @define-color accent_fg_color #202126;
-@define-color destructive_color #ff661a;
-@define-color destructive_bg_color #ff661a;
-@define-color destructive_fg_color #202126;
-@define-color success_color #f2e6a9;
-@define-color success_bg_color #f2e6a9;
-@define-color success_fg_color #202126;
-@define-color warning_color #ae94f9;
-@define-color warning_bg_color #ae94f9;
-@define-color warning_fg_color #202126;
-@define-color error_color #ff661a;
-@define-color error_bg_color #ff661a;
-@define-color error_fg_color #202126;
+
 @define-color window_bg_color #202126;
 @define-color window_fg_color #e9e7e1;
+
 @define-color view_bg_color #202126;
 @define-color view_fg_color #e9e7e1;
-@define-color headerbar_bg_color #2d303d;
+
+@define-color headerbar_bg_color #202126;
 @define-color headerbar_fg_color #e9e7e1;
-@define-color headerbar_border_color rgba(0.17647059, 0.18823529, 0.23921569, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #202126;
+@define-color dialog_fg_color #e9e7e1;
+
+@define-color popover_bg_color #202126;
+@define-color popover_fg_color #e9e7e1;
+
+
 @define-color sidebar_bg_color #2d303d;
 @define-color sidebar_fg_color #e9e7e1;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #2d303d;
 @define-color card_fg_color #e9e7e1;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #2d303d;
-@define-color dialog_fg_color #e9e7e1;
-@define-color popover_bg_color #2d303d;
-@define-color popover_fg_color #e9e7e1;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #5a576e;
-@define-color blue_1 #40bfff;
-@define-color blue_2 #40bfff;
-@define-color blue_3 #40bfff;
-@define-color blue_4 #40bfff;
-@define-color blue_5 #40bfff;
-@define-color green_1 #f2e6a9;
-@define-color green_2 #f2e6a9;
-@define-color green_3 #f2e6a9;
-@define-color green_4 #f2e6a9;
-@define-color green_5 #f2e6a9;
-@define-color yellow_1 #ffdc2d;
-@define-color yellow_2 #ffdc2d;
-@define-color yellow_3 #ffdc2d;
-@define-color yellow_4 #ffdc2d;
-@define-color yellow_5 #ffdc2d;
-@define-color orange_1 #19f988;
-@define-color orange_2 #19f988;
-@define-color orange_3 #19f988;
-@define-color orange_4 #19f988;
-@define-color orange_5 #19f988;
+
+
 @define-color red_1 #ff661a;
-@define-color red_2 #ff661a;
-@define-color red_3 #ff661a;
-@define-color red_4 #ff661a;
-@define-color red_5 #ff661a;
+@define-color green_1 #f2e6a9;
+@define-color yellow_1 #ffdc2d;
+@define-color blue_1 #40bfff;
 @define-color purple_1 #ae94f9;
-@define-color purple_2 #ae94f9;
-@define-color purple_3 #ae94f9;
-@define-color purple_4 #ae94f9;
-@define-color purple_5 #ae94f9;
-@define-color brown_1 #6187ff;
-@define-color brown_2 #6187ff;
-@define-color brown_3 #6187ff;
-@define-color brown_4 #6187ff;
-@define-color brown_5 #6187ff;
-@define-color light_1 #e9e7e1;
-@define-color light_2 #e9e7e1;
-@define-color light_3 #e9e7e1;
-@define-color light_4 #e9e7e1;
-@define-color light_5 #e9e7e1;
-@define-color dark_1 #e9e7e1;
-@define-color dark_2 #e9e7e1;
-@define-color dark_3 #e9e7e1;
-@define-color dark_4 #e9e7e1;
-@define-color dark_5 #e9e7e1;
+@define-color teal_1 #fb6acb;
+@define-color orange_1 #19f988;
+@define-color gray_1 #a1d2e6;
+
diff --git a/build/base16-github-dark-colorblind.css b/build/base16-github-dark-colorblind.css
index 762582a..4e61e37 100644
--- a/build/base16-github-dark-colorblind.css
+++ b/build/base16-github-dark-colorblind.css
@@ -1,88 +1,37 @@
 @define-color accent_color #d2a8ff;
 @define-color accent_bg_color #d2a8ff;
 @define-color accent_fg_color #0d1117;
-@define-color destructive_color #fdac54;
-@define-color destructive_bg_color #fdac54;
-@define-color destructive_fg_color #0d1117;
-@define-color success_color #a5d6ff;
-@define-color success_bg_color #a5d6ff;
-@define-color success_fg_color #0d1117;
-@define-color warning_color #ec8e2c;
-@define-color warning_bg_color #ec8e2c;
-@define-color warning_fg_color #0d1117;
-@define-color error_color #fdac54;
-@define-color error_bg_color #fdac54;
-@define-color error_fg_color #0d1117;
+
 @define-color window_bg_color #0d1117;
 @define-color window_fg_color #c9d1d9;
+
 @define-color view_bg_color #0d1117;
 @define-color view_fg_color #c9d1d9;
-@define-color headerbar_bg_color #161b22;
+
+@define-color headerbar_bg_color #0d1117;
 @define-color headerbar_fg_color #c9d1d9;
-@define-color headerbar_border_color rgba(0.08627451, 0.10588235, 0.13333333, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #0d1117;
+@define-color dialog_fg_color #c9d1d9;
+
+@define-color popover_bg_color #0d1117;
+@define-color popover_fg_color #c9d1d9;
+
+
 @define-color sidebar_bg_color #161b22;
 @define-color sidebar_fg_color #c9d1d9;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #161b22;
 @define-color card_fg_color #c9d1d9;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #161b22;
-@define-color dialog_fg_color #c9d1d9;
-@define-color popover_bg_color #161b22;
-@define-color popover_fg_color #c9d1d9;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #484f58;
-@define-color blue_1 #d2a8ff;
-@define-color blue_2 #d2a8ff;
-@define-color blue_3 #d2a8ff;
-@define-color blue_4 #d2a8ff;
-@define-color blue_5 #d2a8ff;
-@define-color green_1 #a5d6ff;
-@define-color green_2 #a5d6ff;
-@define-color green_3 #a5d6ff;
-@define-color green_4 #a5d6ff;
-@define-color green_5 #a5d6ff;
-@define-color yellow_1 #bb8009;
-@define-color yellow_2 #bb8009;
-@define-color yellow_3 #bb8009;
-@define-color yellow_4 #bb8009;
-@define-color yellow_5 #bb8009;
-@define-color orange_1 #79c0ff;
-@define-color orange_2 #79c0ff;
-@define-color orange_3 #79c0ff;
-@define-color orange_4 #79c0ff;
-@define-color orange_5 #79c0ff;
+
+
 @define-color red_1 #fdac54;
-@define-color red_2 #fdac54;
-@define-color red_3 #fdac54;
-@define-color red_4 #fdac54;
-@define-color red_5 #fdac54;
+@define-color green_1 #a5d6ff;
+@define-color yellow_1 #bb8009;
+@define-color blue_1 #d2a8ff;
 @define-color purple_1 #ec8e2c;
-@define-color purple_2 #ec8e2c;
-@define-color purple_3 #ec8e2c;
-@define-color purple_4 #ec8e2c;
-@define-color purple_5 #ec8e2c;
-@define-color brown_1 #fdac54;
-@define-color brown_2 #fdac54;
-@define-color brown_3 #fdac54;
-@define-color brown_4 #fdac54;
-@define-color brown_5 #fdac54;
-@define-color light_1 #c9d1d9;
-@define-color light_2 #c9d1d9;
-@define-color light_3 #c9d1d9;
-@define-color light_4 #c9d1d9;
-@define-color light_5 #c9d1d9;
-@define-color dark_1 #c9d1d9;
-@define-color dark_2 #c9d1d9;
-@define-color dark_3 #c9d1d9;
-@define-color dark_4 #c9d1d9;
-@define-color dark_5 #c9d1d9;
+@define-color teal_1 #a5d6ff;
+@define-color orange_1 #79c0ff;
+@define-color gray_1 #6e7681;
+
diff --git a/build/base16-github-dark-dimmed.css b/build/base16-github-dark-dimmed.css
index 2046fa8..cb4510d 100644
--- a/build/base16-github-dark-dimmed.css
+++ b/build/base16-github-dark-dimmed.css
@@ -1,88 +1,37 @@
 @define-color accent_color #dcbdfb;
 @define-color accent_bg_color #dcbdfb;
 @define-color accent_fg_color #22272e;
-@define-color destructive_color #f69d50;
-@define-color destructive_bg_color #f69d50;
-@define-color destructive_fg_color #22272e;
-@define-color success_color #96d0ff;
-@define-color success_bg_color #96d0ff;
-@define-color success_fg_color #22272e;
-@define-color warning_color #f47067;
-@define-color warning_bg_color #f47067;
-@define-color warning_fg_color #22272e;
-@define-color error_color #f69d50;
-@define-color error_bg_color #f69d50;
-@define-color error_fg_color #22272e;
+
 @define-color window_bg_color #22272e;
 @define-color window_fg_color #adbac7;
+
 @define-color view_bg_color #22272e;
 @define-color view_fg_color #adbac7;
-@define-color headerbar_bg_color #2d333b;
+
+@define-color headerbar_bg_color #22272e;
 @define-color headerbar_fg_color #adbac7;
-@define-color headerbar_border_color rgba(0.17647059, 0.20000000, 0.23137255, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #22272e;
+@define-color dialog_fg_color #adbac7;
+
+@define-color popover_bg_color #22272e;
+@define-color popover_fg_color #adbac7;
+
+
 @define-color sidebar_bg_color #2d333b;
 @define-color sidebar_fg_color #adbac7;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #2d333b;
 @define-color card_fg_color #adbac7;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #2d333b;
-@define-color dialog_fg_color #adbac7;
-@define-color popover_bg_color #2d333b;
-@define-color popover_fg_color #adbac7;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #545d68;
-@define-color blue_1 #dcbdfb;
-@define-color blue_2 #dcbdfb;
-@define-color blue_3 #dcbdfb;
-@define-color blue_4 #dcbdfb;
-@define-color blue_5 #dcbdfb;
-@define-color green_1 #96d0ff;
-@define-color green_2 #96d0ff;
-@define-color green_3 #96d0ff;
-@define-color green_4 #96d0ff;
-@define-color green_5 #96d0ff;
-@define-color yellow_1 #ae7c14;
-@define-color yellow_2 #ae7c14;
-@define-color yellow_3 #ae7c14;
-@define-color yellow_4 #ae7c14;
-@define-color yellow_5 #ae7c14;
-@define-color orange_1 #6cb6ff;
-@define-color orange_2 #6cb6ff;
-@define-color orange_3 #6cb6ff;
-@define-color orange_4 #6cb6ff;
-@define-color orange_5 #6cb6ff;
+
+
 @define-color red_1 #f69d50;
-@define-color red_2 #f69d50;
-@define-color red_3 #f69d50;
-@define-color red_4 #f69d50;
-@define-color red_5 #f69d50;
+@define-color green_1 #96d0ff;
+@define-color yellow_1 #ae7c14;
+@define-color blue_1 #dcbdfb;
 @define-color purple_1 #f47067;
-@define-color purple_2 #f47067;
-@define-color purple_3 #f47067;
-@define-color purple_4 #f47067;
-@define-color purple_5 #f47067;
-@define-color brown_1 #ff938a;
-@define-color brown_2 #ff938a;
-@define-color brown_3 #ff938a;
-@define-color brown_4 #ff938a;
-@define-color brown_5 #ff938a;
-@define-color light_1 #adbac7;
-@define-color light_2 #adbac7;
-@define-color light_3 #adbac7;
-@define-color light_4 #adbac7;
-@define-color light_5 #adbac7;
-@define-color dark_1 #adbac7;
-@define-color dark_2 #adbac7;
-@define-color dark_3 #adbac7;
-@define-color dark_4 #adbac7;
-@define-color dark_5 #adbac7;
+@define-color teal_1 #8ddb8c;
+@define-color orange_1 #6cb6ff;
+@define-color gray_1 #636e7b;
+
diff --git a/build/base16-github-dark-high-contrast.css b/build/base16-github-dark-high-contrast.css
index bc617fc..c922cf9 100644
--- a/build/base16-github-dark-high-contrast.css
+++ b/build/base16-github-dark-high-contrast.css
@@ -1,88 +1,37 @@
 @define-color accent_color #dbb7ff;
 @define-color accent_bg_color #dbb7ff;
 @define-color accent_fg_color #0a0c10;
-@define-color destructive_color #ffb757;
-@define-color destructive_bg_color #ffb757;
-@define-color destructive_fg_color #0a0c10;
-@define-color success_color #addcff;
-@define-color success_bg_color #addcff;
-@define-color success_fg_color #0a0c10;
-@define-color warning_color #ff9492;
-@define-color warning_bg_color #ff9492;
-@define-color warning_fg_color #0a0c10;
-@define-color error_color #ffb757;
-@define-color error_bg_color #ffb757;
-@define-color error_fg_color #0a0c10;
+
 @define-color window_bg_color #0a0c10;
 @define-color window_fg_color #f0f3f6;
+
 @define-color view_bg_color #0a0c10;
 @define-color view_fg_color #f0f3f6;
-@define-color headerbar_bg_color #272b33;
+
+@define-color headerbar_bg_color #0a0c10;
 @define-color headerbar_fg_color #f0f3f6;
-@define-color headerbar_border_color rgba(0.15294118, 0.16862745, 0.20000000, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #0a0c10;
+@define-color dialog_fg_color #f0f3f6;
+
+@define-color popover_bg_color #0a0c10;
+@define-color popover_fg_color #f0f3f6;
+
+
 @define-color sidebar_bg_color #272b33;
 @define-color sidebar_fg_color #f0f3f6;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #272b33;
 @define-color card_fg_color #f0f3f6;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #272b33;
-@define-color dialog_fg_color #f0f3f6;
-@define-color popover_bg_color #272b33;
-@define-color popover_fg_color #f0f3f6;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #7a828e;
-@define-color blue_1 #dbb7ff;
-@define-color blue_2 #dbb7ff;
-@define-color blue_3 #dbb7ff;
-@define-color blue_4 #dbb7ff;
-@define-color blue_5 #dbb7ff;
-@define-color green_1 #addcff;
-@define-color green_2 #addcff;
-@define-color green_3 #addcff;
-@define-color green_4 #addcff;
-@define-color green_5 #addcff;
-@define-color yellow_1 #e09b13;
-@define-color yellow_2 #e09b13;
-@define-color yellow_3 #e09b13;
-@define-color yellow_4 #e09b13;
-@define-color yellow_5 #e09b13;
-@define-color orange_1 #91cbff;
-@define-color orange_2 #91cbff;
-@define-color orange_3 #91cbff;
-@define-color orange_4 #91cbff;
-@define-color orange_5 #91cbff;
+
+
 @define-color red_1 #ffb757;
-@define-color red_2 #ffb757;
-@define-color red_3 #ffb757;
-@define-color red_4 #ffb757;
-@define-color red_5 #ffb757;
+@define-color green_1 #addcff;
+@define-color yellow_1 #e09b13;
+@define-color blue_1 #dbb7ff;
 @define-color purple_1 #ff9492;
-@define-color purple_2 #ff9492;
-@define-color purple_3 #ff9492;
-@define-color purple_4 #ff9492;
-@define-color purple_5 #ff9492;
-@define-color brown_1 #ffb1af;
-@define-color brown_2 #ffb1af;
-@define-color brown_3 #ffb1af;
-@define-color brown_4 #ffb1af;
-@define-color brown_5 #ffb1af;
-@define-color light_1 #f0f3f6;
-@define-color light_2 #f0f3f6;
-@define-color light_3 #f0f3f6;
-@define-color light_4 #f0f3f6;
-@define-color light_5 #f0f3f6;
-@define-color dark_1 #f0f3f6;
-@define-color dark_2 #f0f3f6;
-@define-color dark_3 #f0f3f6;
-@define-color dark_4 #f0f3f6;
-@define-color dark_5 #f0f3f6;
+@define-color teal_1 #72f088;
+@define-color orange_1 #91cbff;
+@define-color gray_1 #9ea7b3;
+
diff --git a/build/base16-github-dark.css b/build/base16-github-dark.css
index b73167b..d4882e8 100644
--- a/build/base16-github-dark.css
+++ b/build/base16-github-dark.css
@@ -1,88 +1,37 @@
 @define-color accent_color #d2a8ff;
 @define-color accent_bg_color #d2a8ff;
 @define-color accent_fg_color #0d1117;
-@define-color destructive_color #ffa657;
-@define-color destructive_bg_color #ffa657;
-@define-color destructive_fg_color #0d1117;
-@define-color success_color #a5d6ff;
-@define-color success_bg_color #a5d6ff;
-@define-color success_fg_color #0d1117;
-@define-color warning_color #ff7b72;
-@define-color warning_bg_color #ff7b72;
-@define-color warning_fg_color #0d1117;
-@define-color error_color #ffa657;
-@define-color error_bg_color #ffa657;
-@define-color error_fg_color #0d1117;
+
 @define-color window_bg_color #0d1117;
 @define-color window_fg_color #c9d1d9;
+
 @define-color view_bg_color #0d1117;
 @define-color view_fg_color #c9d1d9;
-@define-color headerbar_bg_color #161b22;
+
+@define-color headerbar_bg_color #0d1117;
 @define-color headerbar_fg_color #c9d1d9;
-@define-color headerbar_border_color rgba(0.08627451, 0.10588235, 0.13333333, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #0d1117;
+@define-color dialog_fg_color #c9d1d9;
+
+@define-color popover_bg_color #0d1117;
+@define-color popover_fg_color #c9d1d9;
+
+
 @define-color sidebar_bg_color #161b22;
 @define-color sidebar_fg_color #c9d1d9;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #161b22;
 @define-color card_fg_color #c9d1d9;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #161b22;
-@define-color dialog_fg_color #c9d1d9;
-@define-color popover_bg_color #161b22;
-@define-color popover_fg_color #c9d1d9;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #484f58;
-@define-color blue_1 #d2a8ff;
-@define-color blue_2 #d2a8ff;
-@define-color blue_3 #d2a8ff;
-@define-color blue_4 #d2a8ff;
-@define-color blue_5 #d2a8ff;
-@define-color green_1 #a5d6ff;
-@define-color green_2 #a5d6ff;
-@define-color green_3 #a5d6ff;
-@define-color green_4 #a5d6ff;
-@define-color green_5 #a5d6ff;
-@define-color yellow_1 #bb8009;
-@define-color yellow_2 #bb8009;
-@define-color yellow_3 #bb8009;
-@define-color yellow_4 #bb8009;
-@define-color yellow_5 #bb8009;
-@define-color orange_1 #79c0ff;
-@define-color orange_2 #79c0ff;
-@define-color orange_3 #79c0ff;
-@define-color orange_4 #79c0ff;
-@define-color orange_5 #79c0ff;
+
+
 @define-color red_1 #ffa657;
-@define-color red_2 #ffa657;
-@define-color red_3 #ffa657;
-@define-color red_4 #ffa657;
-@define-color red_5 #ffa657;
+@define-color green_1 #a5d6ff;
+@define-color yellow_1 #bb8009;
+@define-color blue_1 #d2a8ff;
 @define-color purple_1 #ff7b72;
-@define-color purple_2 #ff7b72;
-@define-color purple_3 #ff7b72;
-@define-color purple_4 #ff7b72;
-@define-color purple_5 #ff7b72;
-@define-color brown_1 #ffa198;
-@define-color brown_2 #ffa198;
-@define-color brown_3 #ffa198;
-@define-color brown_4 #ffa198;
-@define-color brown_5 #ffa198;
-@define-color light_1 #c9d1d9;
-@define-color light_2 #c9d1d9;
-@define-color light_3 #c9d1d9;
-@define-color light_4 #c9d1d9;
-@define-color light_5 #c9d1d9;
-@define-color dark_1 #c9d1d9;
-@define-color dark_2 #c9d1d9;
-@define-color dark_3 #c9d1d9;
-@define-color dark_4 #c9d1d9;
-@define-color dark_5 #c9d1d9;
+@define-color teal_1 #7ee787;
+@define-color orange_1 #79c0ff;
+@define-color gray_1 #6e7681;
+
diff --git a/build/base16-github-light-colorblind.css b/build/base16-github-light-colorblind.css
index 0f0fd79..d9c60da 100644
--- a/build/base16-github-light-colorblind.css
+++ b/build/base16-github-light-colorblind.css
@@ -1,88 +1,37 @@
 @define-color accent_color #8250df;
 @define-color accent_bg_color #8250df;
 @define-color accent_fg_color #ffffff;
-@define-color destructive_color #8a4600;
-@define-color destructive_bg_color #8a4600;
-@define-color destructive_fg_color #ffffff;
-@define-color success_color #0a3069;
-@define-color success_bg_color #0a3069;
-@define-color success_fg_color #ffffff;
-@define-color warning_color #b35900;
-@define-color warning_bg_color #b35900;
-@define-color warning_fg_color #ffffff;
-@define-color error_color #8a4600;
-@define-color error_bg_color #8a4600;
-@define-color error_fg_color #ffffff;
+
 @define-color window_bg_color #ffffff;
 @define-color window_fg_color #424a53;
+
 @define-color view_bg_color #ffffff;
 @define-color view_fg_color #424a53;
-@define-color headerbar_bg_color #f6f8fa;
+
+@define-color headerbar_bg_color #ffffff;
 @define-color headerbar_fg_color #424a53;
-@define-color headerbar_border_color rgba(0.96470588, 0.97254902, 0.98039216, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #ffffff;
+@define-color dialog_fg_color #424a53;
+
+@define-color popover_bg_color #ffffff;
+@define-color popover_fg_color #424a53;
+
+
 @define-color sidebar_bg_color #f6f8fa;
 @define-color sidebar_fg_color #424a53;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #f6f8fa;
 @define-color card_fg_color #424a53;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #f6f8fa;
-@define-color dialog_fg_color #424a53;
-@define-color popover_bg_color #f6f8fa;
-@define-color popover_fg_color #424a53;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #afb8c1;
-@define-color blue_1 #8250df;
-@define-color blue_2 #8250df;
-@define-color blue_3 #8250df;
-@define-color blue_4 #8250df;
-@define-color blue_5 #8250df;
-@define-color green_1 #0a3069;
-@define-color green_2 #0a3069;
-@define-color green_3 #0a3069;
-@define-color green_4 #0a3069;
-@define-color green_5 #0a3069;
-@define-color yellow_1 #bf8700;
-@define-color yellow_2 #bf8700;
-@define-color yellow_3 #bf8700;
-@define-color yellow_4 #bf8700;
-@define-color yellow_5 #bf8700;
-@define-color orange_1 #0550ae;
-@define-color orange_2 #0550ae;
-@define-color orange_3 #0550ae;
-@define-color orange_4 #0550ae;
-@define-color orange_5 #0550ae;
+
+
 @define-color red_1 #8a4600;
-@define-color red_2 #8a4600;
-@define-color red_3 #8a4600;
-@define-color red_4 #8a4600;
-@define-color red_5 #8a4600;
+@define-color green_1 #0a3069;
+@define-color yellow_1 #bf8700;
+@define-color blue_1 #8250df;
 @define-color purple_1 #b35900;
-@define-color purple_2 #b35900;
-@define-color purple_3 #b35900;
-@define-color purple_4 #b35900;
-@define-color purple_5 #b35900;
-@define-color brown_1 #6f3800;
-@define-color brown_2 #6f3800;
-@define-color brown_3 #6f3800;
-@define-color brown_4 #6f3800;
-@define-color brown_5 #6f3800;
-@define-color light_1 #424a53;
-@define-color light_2 #424a53;
-@define-color light_3 #424a53;
-@define-color light_4 #424a53;
-@define-color light_5 #424a53;
-@define-color dark_1 #424a53;
-@define-color dark_2 #424a53;
-@define-color dark_3 #424a53;
-@define-color dark_4 #424a53;
-@define-color dark_5 #424a53;
+@define-color teal_1 #0550ae;
+@define-color orange_1 #0550ae;
+@define-color gray_1 #8c959f;
+
diff --git a/build/base16-github-light-high-contrast.css b/build/base16-github-light-high-contrast.css
index e08da4a..f283df4 100644
--- a/build/base16-github-light-high-contrast.css
+++ b/build/base16-github-light-high-contrast.css
@@ -1,88 +1,37 @@
 @define-color accent_color #622cbc;
 @define-color accent_bg_color #622cbc;
 @define-color accent_fg_color #ffffff;
-@define-color destructive_color #702c00;
-@define-color destructive_bg_color #702c00;
-@define-color destructive_fg_color #ffffff;
-@define-color success_color #032563;
-@define-color success_bg_color #032563;
-@define-color success_fg_color #ffffff;
-@define-color warning_color #a0111f;
-@define-color warning_bg_color #a0111f;
-@define-color warning_fg_color #ffffff;
-@define-color error_color #702c00;
-@define-color error_bg_color #702c00;
-@define-color error_fg_color #ffffff;
+
 @define-color window_bg_color #ffffff;
 @define-color window_fg_color #343b43;
+
 @define-color view_bg_color #ffffff;
 @define-color view_fg_color #343b43;
-@define-color headerbar_bg_color #e7ecf0;
+
+@define-color headerbar_bg_color #ffffff;
 @define-color headerbar_fg_color #343b43;
-@define-color headerbar_border_color rgba(0.90588235, 0.92549020, 0.94117647, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #ffffff;
+@define-color dialog_fg_color #343b43;
+
+@define-color popover_bg_color #ffffff;
+@define-color popover_fg_color #343b43;
+
+
 @define-color sidebar_bg_color #e7ecf0;
 @define-color sidebar_fg_color #343b43;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #e7ecf0;
 @define-color card_fg_color #343b43;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #e7ecf0;
-@define-color dialog_fg_color #343b43;
-@define-color popover_bg_color #e7ecf0;
-@define-color popover_fg_color #343b43;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #acb6c0;
-@define-color blue_1 #622cbc;
-@define-color blue_2 #622cbc;
-@define-color blue_3 #622cbc;
-@define-color blue_4 #622cbc;
-@define-color blue_5 #622cbc;
-@define-color green_1 #032563;
-@define-color green_2 #032563;
-@define-color green_3 #032563;
-@define-color green_4 #032563;
-@define-color green_5 #032563;
-@define-color yellow_1 #956400;
-@define-color yellow_2 #956400;
-@define-color yellow_3 #956400;
-@define-color yellow_4 #956400;
-@define-color yellow_5 #956400;
-@define-color orange_1 #023b95;
-@define-color orange_2 #023b95;
-@define-color orange_3 #023b95;
-@define-color orange_4 #023b95;
-@define-color orange_5 #023b95;
+
+
 @define-color red_1 #702c00;
-@define-color red_2 #702c00;
-@define-color red_3 #702c00;
-@define-color red_4 #702c00;
-@define-color red_5 #702c00;
+@define-color green_1 #032563;
+@define-color yellow_1 #956400;
+@define-color blue_1 #622cbc;
 @define-color purple_1 #a0111f;
-@define-color purple_2 #a0111f;
-@define-color purple_3 #a0111f;
-@define-color purple_4 #a0111f;
-@define-color purple_5 #a0111f;
-@define-color brown_1 #6e011a;
-@define-color brown_2 #6e011a;
-@define-color brown_3 #6e011a;
-@define-color brown_4 #6e011a;
-@define-color brown_5 #6e011a;
-@define-color light_1 #343b43;
-@define-color light_2 #343b43;
-@define-color light_3 #343b43;
-@define-color light_4 #343b43;
-@define-color light_5 #343b43;
-@define-color dark_1 #343b43;
-@define-color dark_2 #343b43;
-@define-color dark_3 #343b43;
-@define-color dark_4 #343b43;
-@define-color dark_5 #343b43;
+@define-color teal_1 #024c1a;
+@define-color orange_1 #023b95;
+@define-color gray_1 #88929d;
+
diff --git a/build/base16-github.css b/build/base16-github.css
index 17bf6db..9b28cad 100644
--- a/build/base16-github.css
+++ b/build/base16-github.css
@@ -1,88 +1,37 @@
 @define-color accent_color #8250df;
 @define-color accent_bg_color #8250df;
 @define-color accent_fg_color #ffffff;
-@define-color destructive_color #953800;
-@define-color destructive_bg_color #953800;
-@define-color destructive_fg_color #ffffff;
-@define-color success_color #0a3069;
-@define-color success_bg_color #0a3069;
-@define-color success_fg_color #ffffff;
-@define-color warning_color #cf222e;
-@define-color warning_bg_color #cf222e;
-@define-color warning_fg_color #ffffff;
-@define-color error_color #953800;
-@define-color error_bg_color #953800;
-@define-color error_fg_color #ffffff;
+
 @define-color window_bg_color #ffffff;
 @define-color window_fg_color #424a53;
+
 @define-color view_bg_color #ffffff;
 @define-color view_fg_color #424a53;
-@define-color headerbar_bg_color #f6f8fa;
+
+@define-color headerbar_bg_color #ffffff;
 @define-color headerbar_fg_color #424a53;
-@define-color headerbar_border_color rgba(0.96470588, 0.97254902, 0.98039216, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #ffffff;
+@define-color dialog_fg_color #424a53;
+
+@define-color popover_bg_color #ffffff;
+@define-color popover_fg_color #424a53;
+
+
 @define-color sidebar_bg_color #f6f8fa;
 @define-color sidebar_fg_color #424a53;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #f6f8fa;
 @define-color card_fg_color #424a53;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #f6f8fa;
-@define-color dialog_fg_color #424a53;
-@define-color popover_bg_color #f6f8fa;
-@define-color popover_fg_color #424a53;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #afb8c1;
-@define-color blue_1 #8250df;
-@define-color blue_2 #8250df;
-@define-color blue_3 #8250df;
-@define-color blue_4 #8250df;
-@define-color blue_5 #8250df;
-@define-color green_1 #0a3069;
-@define-color green_2 #0a3069;
-@define-color green_3 #0a3069;
-@define-color green_4 #0a3069;
-@define-color green_5 #0a3069;
-@define-color yellow_1 #bf8700;
-@define-color yellow_2 #bf8700;
-@define-color yellow_3 #bf8700;
-@define-color yellow_4 #bf8700;
-@define-color yellow_5 #bf8700;
-@define-color orange_1 #0550ae;
-@define-color orange_2 #0550ae;
-@define-color orange_3 #0550ae;
-@define-color orange_4 #0550ae;
-@define-color orange_5 #0550ae;
+
+
 @define-color red_1 #953800;
-@define-color red_2 #953800;
-@define-color red_3 #953800;
-@define-color red_4 #953800;
-@define-color red_5 #953800;
+@define-color green_1 #0a3069;
+@define-color yellow_1 #bf8700;
+@define-color blue_1 #8250df;
 @define-color purple_1 #cf222e;
-@define-color purple_2 #cf222e;
-@define-color purple_3 #cf222e;
-@define-color purple_4 #cf222e;
-@define-color purple_5 #cf222e;
-@define-color brown_1 #82071e;
-@define-color brown_2 #82071e;
-@define-color brown_3 #82071e;
-@define-color brown_4 #82071e;
-@define-color brown_5 #82071e;
-@define-color light_1 #424a53;
-@define-color light_2 #424a53;
-@define-color light_3 #424a53;
-@define-color light_4 #424a53;
-@define-color light_5 #424a53;
-@define-color dark_1 #424a53;
-@define-color dark_2 #424a53;
-@define-color dark_3 #424a53;
-@define-color dark_4 #424a53;
-@define-color dark_5 #424a53;
+@define-color teal_1 #116329;
+@define-color orange_1 #0550ae;
+@define-color gray_1 #8c959f;
+
diff --git a/build/base16-google-dark.css b/build/base16-google-dark.css
index 8effe50..ef8ee7e 100644
--- a/build/base16-google-dark.css
+++ b/build/base16-google-dark.css
@@ -1,88 +1,37 @@
 @define-color accent_color #3971ed;
 @define-color accent_bg_color #3971ed;
 @define-color accent_fg_color #1d1f21;
-@define-color destructive_color #cc342b;
-@define-color destructive_bg_color #cc342b;
-@define-color destructive_fg_color #1d1f21;
-@define-color success_color #198844;
-@define-color success_bg_color #198844;
-@define-color success_fg_color #1d1f21;
-@define-color warning_color #a36ac7;
-@define-color warning_bg_color #a36ac7;
-@define-color warning_fg_color #1d1f21;
-@define-color error_color #cc342b;
-@define-color error_bg_color #cc342b;
-@define-color error_fg_color #1d1f21;
+
 @define-color window_bg_color #1d1f21;
 @define-color window_fg_color #c5c8c6;
+
 @define-color view_bg_color #1d1f21;
 @define-color view_fg_color #c5c8c6;
-@define-color headerbar_bg_color #282a2e;
+
+@define-color headerbar_bg_color #1d1f21;
 @define-color headerbar_fg_color #c5c8c6;
-@define-color headerbar_border_color rgba(0.15686275, 0.16470588, 0.18039216, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #1d1f21;
+@define-color dialog_fg_color #c5c8c6;
+
+@define-color popover_bg_color #1d1f21;
+@define-color popover_fg_color #c5c8c6;
+
+
 @define-color sidebar_bg_color #282a2e;
 @define-color sidebar_fg_color #c5c8c6;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #282a2e;
 @define-color card_fg_color #c5c8c6;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #282a2e;
-@define-color dialog_fg_color #c5c8c6;
-@define-color popover_bg_color #282a2e;
-@define-color popover_fg_color #c5c8c6;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #373b41;
-@define-color blue_1 #3971ed;
-@define-color blue_2 #3971ed;
-@define-color blue_3 #3971ed;
-@define-color blue_4 #3971ed;
-@define-color blue_5 #3971ed;
-@define-color green_1 #198844;
-@define-color green_2 #198844;
-@define-color green_3 #198844;
-@define-color green_4 #198844;
-@define-color green_5 #198844;
-@define-color yellow_1 #fba922;
-@define-color yellow_2 #fba922;
-@define-color yellow_3 #fba922;
-@define-color yellow_4 #fba922;
-@define-color yellow_5 #fba922;
-@define-color orange_1 #f96a38;
-@define-color orange_2 #f96a38;
-@define-color orange_3 #f96a38;
-@define-color orange_4 #f96a38;
-@define-color orange_5 #f96a38;
+
+
 @define-color red_1 #cc342b;
-@define-color red_2 #cc342b;
-@define-color red_3 #cc342b;
-@define-color red_4 #cc342b;
-@define-color red_5 #cc342b;
+@define-color green_1 #198844;
+@define-color yellow_1 #fba922;
+@define-color blue_1 #3971ed;
 @define-color purple_1 #a36ac7;
-@define-color purple_2 #a36ac7;
-@define-color purple_3 #a36ac7;
-@define-color purple_4 #a36ac7;
-@define-color purple_5 #a36ac7;
-@define-color brown_1 #3971ed;
-@define-color brown_2 #3971ed;
-@define-color brown_3 #3971ed;
-@define-color brown_4 #3971ed;
-@define-color brown_5 #3971ed;
-@define-color light_1 #c5c8c6;
-@define-color light_2 #c5c8c6;
-@define-color light_3 #c5c8c6;
-@define-color light_4 #c5c8c6;
-@define-color light_5 #c5c8c6;
-@define-color dark_1 #c5c8c6;
-@define-color dark_2 #c5c8c6;
-@define-color dark_3 #c5c8c6;
-@define-color dark_4 #c5c8c6;
-@define-color dark_5 #c5c8c6;
+@define-color teal_1 #3971ed;
+@define-color orange_1 #f96a38;
+@define-color gray_1 #969896;
+
diff --git a/build/base16-google-light.css b/build/base16-google-light.css
index 24477c7..00604b2 100644
--- a/build/base16-google-light.css
+++ b/build/base16-google-light.css
@@ -1,88 +1,37 @@
 @define-color accent_color #3971ed;
 @define-color accent_bg_color #3971ed;
 @define-color accent_fg_color #ffffff;
-@define-color destructive_color #cc342b;
-@define-color destructive_bg_color #cc342b;
-@define-color destructive_fg_color #ffffff;
-@define-color success_color #198844;
-@define-color success_bg_color #198844;
-@define-color success_fg_color #ffffff;
-@define-color warning_color #a36ac7;
-@define-color warning_bg_color #a36ac7;
-@define-color warning_fg_color #ffffff;
-@define-color error_color #cc342b;
-@define-color error_bg_color #cc342b;
-@define-color error_fg_color #ffffff;
+
 @define-color window_bg_color #ffffff;
 @define-color window_fg_color #373b41;
+
 @define-color view_bg_color #ffffff;
 @define-color view_fg_color #373b41;
-@define-color headerbar_bg_color #e0e0e0;
+
+@define-color headerbar_bg_color #ffffff;
 @define-color headerbar_fg_color #373b41;
-@define-color headerbar_border_color rgba(0.87843137, 0.87843137, 0.87843137, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #ffffff;
+@define-color dialog_fg_color #373b41;
+
+@define-color popover_bg_color #ffffff;
+@define-color popover_fg_color #373b41;
+
+
 @define-color sidebar_bg_color #e0e0e0;
 @define-color sidebar_fg_color #373b41;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #e0e0e0;
 @define-color card_fg_color #373b41;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #e0e0e0;
-@define-color dialog_fg_color #373b41;
-@define-color popover_bg_color #e0e0e0;
-@define-color popover_fg_color #373b41;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #c5c8c6;
-@define-color blue_1 #3971ed;
-@define-color blue_2 #3971ed;
-@define-color blue_3 #3971ed;
-@define-color blue_4 #3971ed;
-@define-color blue_5 #3971ed;
-@define-color green_1 #198844;
-@define-color green_2 #198844;
-@define-color green_3 #198844;
-@define-color green_4 #198844;
-@define-color green_5 #198844;
-@define-color yellow_1 #fba922;
-@define-color yellow_2 #fba922;
-@define-color yellow_3 #fba922;
-@define-color yellow_4 #fba922;
-@define-color yellow_5 #fba922;
-@define-color orange_1 #f96a38;
-@define-color orange_2 #f96a38;
-@define-color orange_3 #f96a38;
-@define-color orange_4 #f96a38;
-@define-color orange_5 #f96a38;
+
+
 @define-color red_1 #cc342b;
-@define-color red_2 #cc342b;
-@define-color red_3 #cc342b;
-@define-color red_4 #cc342b;
-@define-color red_5 #cc342b;
+@define-color green_1 #198844;
+@define-color yellow_1 #fba922;
+@define-color blue_1 #3971ed;
 @define-color purple_1 #a36ac7;
-@define-color purple_2 #a36ac7;
-@define-color purple_3 #a36ac7;
-@define-color purple_4 #a36ac7;
-@define-color purple_5 #a36ac7;
-@define-color brown_1 #3971ed;
-@define-color brown_2 #3971ed;
-@define-color brown_3 #3971ed;
-@define-color brown_4 #3971ed;
-@define-color brown_5 #3971ed;
-@define-color light_1 #373b41;
-@define-color light_2 #373b41;
-@define-color light_3 #373b41;
-@define-color light_4 #373b41;
-@define-color light_5 #373b41;
-@define-color dark_1 #373b41;
-@define-color dark_2 #373b41;
-@define-color dark_3 #373b41;
-@define-color dark_4 #373b41;
-@define-color dark_5 #373b41;
+@define-color teal_1 #3971ed;
+@define-color orange_1 #f96a38;
+@define-color gray_1 #b4b7b4;
+
diff --git a/build/base16-gotham.css b/build/base16-gotham.css
index d174008..1c5eb3b 100644
--- a/build/base16-gotham.css
+++ b/build/base16-gotham.css
@@ -1,88 +1,37 @@
 @define-color accent_color #195466;
 @define-color accent_bg_color #195466;
 @define-color accent_fg_color #0c1014;
-@define-color destructive_color #c23127;
-@define-color destructive_bg_color #c23127;
-@define-color destructive_fg_color #0c1014;
-@define-color success_color #33859e;
-@define-color success_bg_color #33859e;
-@define-color success_fg_color #0c1014;
-@define-color warning_color #888ca6;
-@define-color warning_bg_color #888ca6;
-@define-color warning_fg_color #0c1014;
-@define-color error_color #c23127;
-@define-color error_bg_color #c23127;
-@define-color error_fg_color #0c1014;
+
 @define-color window_bg_color #0c1014;
 @define-color window_fg_color #599cab;
+
 @define-color view_bg_color #0c1014;
 @define-color view_fg_color #599cab;
-@define-color headerbar_bg_color #11151c;
+
+@define-color headerbar_bg_color #0c1014;
 @define-color headerbar_fg_color #599cab;
-@define-color headerbar_border_color rgba(0.06666667, 0.08235294, 0.10980392, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #0c1014;
+@define-color dialog_fg_color #599cab;
+
+@define-color popover_bg_color #0c1014;
+@define-color popover_fg_color #599cab;
+
+
 @define-color sidebar_bg_color #11151c;
 @define-color sidebar_fg_color #599cab;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #11151c;
 @define-color card_fg_color #599cab;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #11151c;
-@define-color dialog_fg_color #599cab;
-@define-color popover_bg_color #11151c;
-@define-color popover_fg_color #599cab;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #091f2e;
-@define-color blue_1 #195466;
-@define-color blue_2 #195466;
-@define-color blue_3 #195466;
-@define-color blue_4 #195466;
-@define-color blue_5 #195466;
-@define-color green_1 #33859e;
-@define-color green_2 #33859e;
-@define-color green_3 #33859e;
-@define-color green_4 #33859e;
-@define-color green_5 #33859e;
-@define-color yellow_1 #edb443;
-@define-color yellow_2 #edb443;
-@define-color yellow_3 #edb443;
-@define-color yellow_4 #edb443;
-@define-color yellow_5 #edb443;
-@define-color orange_1 #d26937;
-@define-color orange_2 #d26937;
-@define-color orange_3 #d26937;
-@define-color orange_4 #d26937;
-@define-color orange_5 #d26937;
+
+
 @define-color red_1 #c23127;
-@define-color red_2 #c23127;
-@define-color red_3 #c23127;
-@define-color red_4 #c23127;
-@define-color red_5 #c23127;
+@define-color green_1 #33859e;
+@define-color yellow_1 #edb443;
+@define-color blue_1 #195466;
 @define-color purple_1 #888ca6;
-@define-color purple_2 #888ca6;
-@define-color purple_3 #888ca6;
-@define-color purple_4 #888ca6;
-@define-color purple_5 #888ca6;
-@define-color brown_1 #4e5166;
-@define-color brown_2 #4e5166;
-@define-color brown_3 #4e5166;
-@define-color brown_4 #4e5166;
-@define-color brown_5 #4e5166;
-@define-color light_1 #599cab;
-@define-color light_2 #599cab;
-@define-color light_3 #599cab;
-@define-color light_4 #599cab;
-@define-color light_5 #599cab;
-@define-color dark_1 #599cab;
-@define-color dark_2 #599cab;
-@define-color dark_3 #599cab;
-@define-color dark_4 #599cab;
-@define-color dark_5 #599cab;
+@define-color teal_1 #2aa889;
+@define-color orange_1 #d26937;
+@define-color gray_1 #0a3749;
+
diff --git a/build/base16-grayscale-dark.css b/build/base16-grayscale-dark.css
index ece6408..c506f56 100644
--- a/build/base16-grayscale-dark.css
+++ b/build/base16-grayscale-dark.css
@@ -1,88 +1,37 @@
 @define-color accent_color #686868;
 @define-color accent_bg_color #686868;
 @define-color accent_fg_color #101010;
-@define-color destructive_color #7c7c7c;
-@define-color destructive_bg_color #7c7c7c;
-@define-color destructive_fg_color #101010;
-@define-color success_color #8e8e8e;
-@define-color success_bg_color #8e8e8e;
-@define-color success_fg_color #101010;
-@define-color warning_color #747474;
-@define-color warning_bg_color #747474;
-@define-color warning_fg_color #101010;
-@define-color error_color #7c7c7c;
-@define-color error_bg_color #7c7c7c;
-@define-color error_fg_color #101010;
+
 @define-color window_bg_color #101010;
 @define-color window_fg_color #b9b9b9;
+
 @define-color view_bg_color #101010;
 @define-color view_fg_color #b9b9b9;
-@define-color headerbar_bg_color #252525;
+
+@define-color headerbar_bg_color #101010;
 @define-color headerbar_fg_color #b9b9b9;
-@define-color headerbar_border_color rgba(0.14509804, 0.14509804, 0.14509804, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #101010;
+@define-color dialog_fg_color #b9b9b9;
+
+@define-color popover_bg_color #101010;
+@define-color popover_fg_color #b9b9b9;
+
+
 @define-color sidebar_bg_color #252525;
 @define-color sidebar_fg_color #b9b9b9;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #252525;
 @define-color card_fg_color #b9b9b9;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #252525;
-@define-color dialog_fg_color #b9b9b9;
-@define-color popover_bg_color #252525;
-@define-color popover_fg_color #b9b9b9;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #464646;
-@define-color blue_1 #686868;
-@define-color blue_2 #686868;
-@define-color blue_3 #686868;
-@define-color blue_4 #686868;
-@define-color blue_5 #686868;
-@define-color green_1 #8e8e8e;
-@define-color green_2 #8e8e8e;
-@define-color green_3 #8e8e8e;
-@define-color green_4 #8e8e8e;
-@define-color green_5 #8e8e8e;
-@define-color yellow_1 #a0a0a0;
-@define-color yellow_2 #a0a0a0;
-@define-color yellow_3 #a0a0a0;
-@define-color yellow_4 #a0a0a0;
-@define-color yellow_5 #a0a0a0;
-@define-color orange_1 #999999;
-@define-color orange_2 #999999;
-@define-color orange_3 #999999;
-@define-color orange_4 #999999;
-@define-color orange_5 #999999;
+
+
 @define-color red_1 #7c7c7c;
-@define-color red_2 #7c7c7c;
-@define-color red_3 #7c7c7c;
-@define-color red_4 #7c7c7c;
-@define-color red_5 #7c7c7c;
+@define-color green_1 #8e8e8e;
+@define-color yellow_1 #a0a0a0;
+@define-color blue_1 #686868;
 @define-color purple_1 #747474;
-@define-color purple_2 #747474;
-@define-color purple_3 #747474;
-@define-color purple_4 #747474;
-@define-color purple_5 #747474;
-@define-color brown_1 #5e5e5e;
-@define-color brown_2 #5e5e5e;
-@define-color brown_3 #5e5e5e;
-@define-color brown_4 #5e5e5e;
-@define-color brown_5 #5e5e5e;
-@define-color light_1 #b9b9b9;
-@define-color light_2 #b9b9b9;
-@define-color light_3 #b9b9b9;
-@define-color light_4 #b9b9b9;
-@define-color light_5 #b9b9b9;
-@define-color dark_1 #b9b9b9;
-@define-color dark_2 #b9b9b9;
-@define-color dark_3 #b9b9b9;
-@define-color dark_4 #b9b9b9;
-@define-color dark_5 #b9b9b9;
+@define-color teal_1 #868686;
+@define-color orange_1 #999999;
+@define-color gray_1 #525252;
+
diff --git a/build/base16-grayscale-light.css b/build/base16-grayscale-light.css
index 453cbde..382b293 100644
--- a/build/base16-grayscale-light.css
+++ b/build/base16-grayscale-light.css
@@ -1,88 +1,37 @@
 @define-color accent_color #686868;
 @define-color accent_bg_color #686868;
 @define-color accent_fg_color #f7f7f7;
-@define-color destructive_color #7c7c7c;
-@define-color destructive_bg_color #7c7c7c;
-@define-color destructive_fg_color #f7f7f7;
-@define-color success_color #8e8e8e;
-@define-color success_bg_color #8e8e8e;
-@define-color success_fg_color #f7f7f7;
-@define-color warning_color #747474;
-@define-color warning_bg_color #747474;
-@define-color warning_fg_color #f7f7f7;
-@define-color error_color #7c7c7c;
-@define-color error_bg_color #7c7c7c;
-@define-color error_fg_color #f7f7f7;
+
 @define-color window_bg_color #f7f7f7;
 @define-color window_fg_color #464646;
+
 @define-color view_bg_color #f7f7f7;
 @define-color view_fg_color #464646;
-@define-color headerbar_bg_color #e3e3e3;
+
+@define-color headerbar_bg_color #f7f7f7;
 @define-color headerbar_fg_color #464646;
-@define-color headerbar_border_color rgba(0.89019608, 0.89019608, 0.89019608, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #f7f7f7;
+@define-color dialog_fg_color #464646;
+
+@define-color popover_bg_color #f7f7f7;
+@define-color popover_fg_color #464646;
+
+
 @define-color sidebar_bg_color #e3e3e3;
 @define-color sidebar_fg_color #464646;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #e3e3e3;
 @define-color card_fg_color #464646;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #e3e3e3;
-@define-color dialog_fg_color #464646;
-@define-color popover_bg_color #e3e3e3;
-@define-color popover_fg_color #464646;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #b9b9b9;
-@define-color blue_1 #686868;
-@define-color blue_2 #686868;
-@define-color blue_3 #686868;
-@define-color blue_4 #686868;
-@define-color blue_5 #686868;
-@define-color green_1 #8e8e8e;
-@define-color green_2 #8e8e8e;
-@define-color green_3 #8e8e8e;
-@define-color green_4 #8e8e8e;
-@define-color green_5 #8e8e8e;
-@define-color yellow_1 #a0a0a0;
-@define-color yellow_2 #a0a0a0;
-@define-color yellow_3 #a0a0a0;
-@define-color yellow_4 #a0a0a0;
-@define-color yellow_5 #a0a0a0;
-@define-color orange_1 #999999;
-@define-color orange_2 #999999;
-@define-color orange_3 #999999;
-@define-color orange_4 #999999;
-@define-color orange_5 #999999;
+
+
 @define-color red_1 #7c7c7c;
-@define-color red_2 #7c7c7c;
-@define-color red_3 #7c7c7c;
-@define-color red_4 #7c7c7c;
-@define-color red_5 #7c7c7c;
+@define-color green_1 #8e8e8e;
+@define-color yellow_1 #a0a0a0;
+@define-color blue_1 #686868;
 @define-color purple_1 #747474;
-@define-color purple_2 #747474;
-@define-color purple_3 #747474;
-@define-color purple_4 #747474;
-@define-color purple_5 #747474;
-@define-color brown_1 #5e5e5e;
-@define-color brown_2 #5e5e5e;
-@define-color brown_3 #5e5e5e;
-@define-color brown_4 #5e5e5e;
-@define-color brown_5 #5e5e5e;
-@define-color light_1 #464646;
-@define-color light_2 #464646;
-@define-color light_3 #464646;
-@define-color light_4 #464646;
-@define-color light_5 #464646;
-@define-color dark_1 #464646;
-@define-color dark_2 #464646;
-@define-color dark_3 #464646;
-@define-color dark_4 #464646;
-@define-color dark_5 #464646;
+@define-color teal_1 #868686;
+@define-color orange_1 #999999;
+@define-color gray_1 #ababab;
+
diff --git a/build/base16-greenscreen.css b/build/base16-greenscreen.css
index 1762e80..0d4939a 100644
--- a/build/base16-greenscreen.css
+++ b/build/base16-greenscreen.css
@@ -1,88 +1,37 @@
 @define-color accent_color #009900;
 @define-color accent_bg_color #009900;
 @define-color accent_fg_color #001100;
-@define-color destructive_color #007700;
-@define-color destructive_bg_color #007700;
-@define-color destructive_fg_color #001100;
-@define-color success_color #00bb00;
-@define-color success_bg_color #00bb00;
-@define-color success_fg_color #001100;
-@define-color warning_color #00bb00;
-@define-color warning_bg_color #00bb00;
-@define-color warning_fg_color #001100;
-@define-color error_color #007700;
-@define-color error_bg_color #007700;
-@define-color error_fg_color #001100;
+
 @define-color window_bg_color #001100;
 @define-color window_fg_color #00bb00;
+
 @define-color view_bg_color #001100;
 @define-color view_fg_color #00bb00;
-@define-color headerbar_bg_color #003300;
+
+@define-color headerbar_bg_color #001100;
 @define-color headerbar_fg_color #00bb00;
-@define-color headerbar_border_color rgba(0.00000000, 0.20000000, 0.00000000, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #001100;
+@define-color dialog_fg_color #00bb00;
+
+@define-color popover_bg_color #001100;
+@define-color popover_fg_color #00bb00;
+
+
 @define-color sidebar_bg_color #003300;
 @define-color sidebar_fg_color #00bb00;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #003300;
 @define-color card_fg_color #00bb00;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #003300;
-@define-color dialog_fg_color #00bb00;
-@define-color popover_bg_color #003300;
-@define-color popover_fg_color #00bb00;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #005500;
-@define-color blue_1 #009900;
-@define-color blue_2 #009900;
-@define-color blue_3 #009900;
-@define-color blue_4 #009900;
-@define-color blue_5 #009900;
-@define-color green_1 #00bb00;
-@define-color green_2 #00bb00;
-@define-color green_3 #00bb00;
-@define-color green_4 #00bb00;
-@define-color green_5 #00bb00;
-@define-color yellow_1 #007700;
-@define-color yellow_2 #007700;
-@define-color yellow_3 #007700;
-@define-color yellow_4 #007700;
-@define-color yellow_5 #007700;
-@define-color orange_1 #009900;
-@define-color orange_2 #009900;
-@define-color orange_3 #009900;
-@define-color orange_4 #009900;
-@define-color orange_5 #009900;
+
+
 @define-color red_1 #007700;
-@define-color red_2 #007700;
-@define-color red_3 #007700;
-@define-color red_4 #007700;
-@define-color red_5 #007700;
+@define-color green_1 #00bb00;
+@define-color yellow_1 #007700;
+@define-color blue_1 #009900;
 @define-color purple_1 #00bb00;
-@define-color purple_2 #00bb00;
-@define-color purple_3 #00bb00;
-@define-color purple_4 #00bb00;
-@define-color purple_5 #00bb00;
-@define-color brown_1 #005500;
-@define-color brown_2 #005500;
-@define-color brown_3 #005500;
-@define-color brown_4 #005500;
-@define-color brown_5 #005500;
-@define-color light_1 #00bb00;
-@define-color light_2 #00bb00;
-@define-color light_3 #00bb00;
-@define-color light_4 #00bb00;
-@define-color light_5 #00bb00;
-@define-color dark_1 #00bb00;
-@define-color dark_2 #00bb00;
-@define-color dark_3 #00bb00;
-@define-color dark_4 #00bb00;
-@define-color dark_5 #00bb00;
+@define-color teal_1 #005500;
+@define-color orange_1 #009900;
+@define-color gray_1 #007700;
+
diff --git a/build/base16-gruber.css b/build/base16-gruber.css
index a5635e3..e983650 100644
--- a/build/base16-gruber.css
+++ b/build/base16-gruber.css
@@ -1,88 +1,37 @@
 @define-color accent_color #96a6c8;
 @define-color accent_bg_color #96a6c8;
 @define-color accent_fg_color #181818;
-@define-color destructive_color #f43841;
-@define-color destructive_bg_color #f43841;
-@define-color destructive_fg_color #181818;
-@define-color success_color #73c936;
-@define-color success_bg_color #73c936;
-@define-color success_fg_color #181818;
-@define-color warning_color #9e95c7;
-@define-color warning_bg_color #9e95c7;
-@define-color warning_fg_color #181818;
-@define-color error_color #f43841;
-@define-color error_bg_color #f43841;
-@define-color error_fg_color #181818;
+
 @define-color window_bg_color #181818;
 @define-color window_fg_color #f4f4ff;
+
 @define-color view_bg_color #181818;
 @define-color view_fg_color #f4f4ff;
-@define-color headerbar_bg_color #453d41;
+
+@define-color headerbar_bg_color #181818;
 @define-color headerbar_fg_color #f4f4ff;
-@define-color headerbar_border_color rgba(0.27058824, 0.23921569, 0.25490196, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #181818;
+@define-color dialog_fg_color #f4f4ff;
+
+@define-color popover_bg_color #181818;
+@define-color popover_fg_color #f4f4ff;
+
+
 @define-color sidebar_bg_color #453d41;
 @define-color sidebar_fg_color #f4f4ff;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #453d41;
 @define-color card_fg_color #f4f4ff;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #453d41;
-@define-color dialog_fg_color #f4f4ff;
-@define-color popover_bg_color #453d41;
-@define-color popover_fg_color #f4f4ff;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #484848;
-@define-color blue_1 #96a6c8;
-@define-color blue_2 #96a6c8;
-@define-color blue_3 #96a6c8;
-@define-color blue_4 #96a6c8;
-@define-color blue_5 #96a6c8;
-@define-color green_1 #73c936;
-@define-color green_2 #73c936;
-@define-color green_3 #73c936;
-@define-color green_4 #73c936;
-@define-color green_5 #73c936;
-@define-color yellow_1 #ffdd33;
-@define-color yellow_2 #ffdd33;
-@define-color yellow_3 #ffdd33;
-@define-color yellow_4 #ffdd33;
-@define-color yellow_5 #ffdd33;
-@define-color orange_1 #c73c3f;
-@define-color orange_2 #c73c3f;
-@define-color orange_3 #c73c3f;
-@define-color orange_4 #c73c3f;
-@define-color orange_5 #c73c3f;
+
+
 @define-color red_1 #f43841;
-@define-color red_2 #f43841;
-@define-color red_3 #f43841;
-@define-color red_4 #f43841;
-@define-color red_5 #f43841;
+@define-color green_1 #73c936;
+@define-color yellow_1 #ffdd33;
+@define-color blue_1 #96a6c8;
 @define-color purple_1 #9e95c7;
-@define-color purple_2 #9e95c7;
-@define-color purple_3 #9e95c7;
-@define-color purple_4 #9e95c7;
-@define-color purple_5 #9e95c7;
-@define-color brown_1 #cc8c3c;
-@define-color brown_2 #cc8c3c;
-@define-color brown_3 #cc8c3c;
-@define-color brown_4 #cc8c3c;
-@define-color brown_5 #cc8c3c;
-@define-color light_1 #f4f4ff;
-@define-color light_2 #f4f4ff;
-@define-color light_3 #f4f4ff;
-@define-color light_4 #f4f4ff;
-@define-color light_5 #f4f4ff;
-@define-color dark_1 #f4f4ff;
-@define-color dark_2 #f4f4ff;
-@define-color dark_3 #f4f4ff;
-@define-color dark_4 #f4f4ff;
-@define-color dark_5 #f4f4ff;
+@define-color teal_1 #95a99f;
+@define-color orange_1 #c73c3f;
+@define-color gray_1 #52494e;
+
diff --git a/build/base16-gruvbox-dark-hard.css b/build/base16-gruvbox-dark-hard.css
index 021b427..933584e 100644
--- a/build/base16-gruvbox-dark-hard.css
+++ b/build/base16-gruvbox-dark-hard.css
@@ -1,88 +1,37 @@
 @define-color accent_color #83a598;
 @define-color accent_bg_color #83a598;
 @define-color accent_fg_color #1d2021;
-@define-color destructive_color #fb4934;
-@define-color destructive_bg_color #fb4934;
-@define-color destructive_fg_color #1d2021;
-@define-color success_color #b8bb26;
-@define-color success_bg_color #b8bb26;
-@define-color success_fg_color #1d2021;
-@define-color warning_color #d3869b;
-@define-color warning_bg_color #d3869b;
-@define-color warning_fg_color #1d2021;
-@define-color error_color #fb4934;
-@define-color error_bg_color #fb4934;
-@define-color error_fg_color #1d2021;
+
 @define-color window_bg_color #1d2021;
 @define-color window_fg_color #d5c4a1;
+
 @define-color view_bg_color #1d2021;
 @define-color view_fg_color #d5c4a1;
-@define-color headerbar_bg_color #3c3836;
+
+@define-color headerbar_bg_color #1d2021;
 @define-color headerbar_fg_color #d5c4a1;
-@define-color headerbar_border_color rgba(0.23529412, 0.21960784, 0.21176471, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #1d2021;
+@define-color dialog_fg_color #d5c4a1;
+
+@define-color popover_bg_color #1d2021;
+@define-color popover_fg_color #d5c4a1;
+
+
 @define-color sidebar_bg_color #3c3836;
 @define-color sidebar_fg_color #d5c4a1;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #3c3836;
 @define-color card_fg_color #d5c4a1;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #3c3836;
-@define-color dialog_fg_color #d5c4a1;
-@define-color popover_bg_color #3c3836;
-@define-color popover_fg_color #d5c4a1;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #504945;
-@define-color blue_1 #83a598;
-@define-color blue_2 #83a598;
-@define-color blue_3 #83a598;
-@define-color blue_4 #83a598;
-@define-color blue_5 #83a598;
-@define-color green_1 #b8bb26;
-@define-color green_2 #b8bb26;
-@define-color green_3 #b8bb26;
-@define-color green_4 #b8bb26;
-@define-color green_5 #b8bb26;
-@define-color yellow_1 #fabd2f;
-@define-color yellow_2 #fabd2f;
-@define-color yellow_3 #fabd2f;
-@define-color yellow_4 #fabd2f;
-@define-color yellow_5 #fabd2f;
-@define-color orange_1 #fe8019;
-@define-color orange_2 #fe8019;
-@define-color orange_3 #fe8019;
-@define-color orange_4 #fe8019;
-@define-color orange_5 #fe8019;
+
+
 @define-color red_1 #fb4934;
-@define-color red_2 #fb4934;
-@define-color red_3 #fb4934;
-@define-color red_4 #fb4934;
-@define-color red_5 #fb4934;
+@define-color green_1 #b8bb26;
+@define-color yellow_1 #fabd2f;
+@define-color blue_1 #83a598;
 @define-color purple_1 #d3869b;
-@define-color purple_2 #d3869b;
-@define-color purple_3 #d3869b;
-@define-color purple_4 #d3869b;
-@define-color purple_5 #d3869b;
-@define-color brown_1 #d65d0e;
-@define-color brown_2 #d65d0e;
-@define-color brown_3 #d65d0e;
-@define-color brown_4 #d65d0e;
-@define-color brown_5 #d65d0e;
-@define-color light_1 #d5c4a1;
-@define-color light_2 #d5c4a1;
-@define-color light_3 #d5c4a1;
-@define-color light_4 #d5c4a1;
-@define-color light_5 #d5c4a1;
-@define-color dark_1 #d5c4a1;
-@define-color dark_2 #d5c4a1;
-@define-color dark_3 #d5c4a1;
-@define-color dark_4 #d5c4a1;
-@define-color dark_5 #d5c4a1;
+@define-color teal_1 #8ec07c;
+@define-color orange_1 #fe8019;
+@define-color gray_1 #665c54;
+
diff --git a/build/base16-gruvbox-dark-medium-forest.css b/build/base16-gruvbox-dark-medium-forest.css
index efa4854..2009792 100644
--- a/build/base16-gruvbox-dark-medium-forest.css
+++ b/build/base16-gruvbox-dark-medium-forest.css
@@ -1,88 +1,37 @@
 @define-color accent_color #b8bb26;
 @define-color accent_bg_color #b8bb26;
 @define-color accent_fg_color #282828;
-@define-color destructive_color #fb4934;
-@define-color destructive_bg_color #fb4934;
-@define-color destructive_fg_color #282828;
-@define-color success_color #b8bb26;
-@define-color success_bg_color #b8bb26;
-@define-color success_fg_color #282828;
-@define-color warning_color #96bda2;
-@define-color warning_bg_color #96bda2;
-@define-color warning_fg_color #282828;
-@define-color error_color #fb4934;
-@define-color error_bg_color #fb4934;
-@define-color error_fg_color #282828;
+
 @define-color window_bg_color #282828;
 @define-color window_fg_color #d5c4a1;
+
 @define-color view_bg_color #282828;
 @define-color view_fg_color #d5c4a1;
-@define-color headerbar_bg_color #3c3836;
+
+@define-color headerbar_bg_color #282828;
 @define-color headerbar_fg_color #d5c4a1;
-@define-color headerbar_border_color rgba(0.23529412, 0.21960784, 0.21176471, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #282828;
+@define-color dialog_fg_color #d5c4a1;
+
+@define-color popover_bg_color #282828;
+@define-color popover_fg_color #d5c4a1;
+
+
 @define-color sidebar_bg_color #3c3836;
 @define-color sidebar_fg_color #d5c4a1;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #3c3836;
 @define-color card_fg_color #d5c4a1;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #3c3836;
-@define-color dialog_fg_color #d5c4a1;
-@define-color popover_bg_color #3c3836;
-@define-color popover_fg_color #d5c4a1;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #504945;
-@define-color blue_1 #b8bb26;
-@define-color blue_2 #b8bb26;
-@define-color blue_3 #b8bb26;
-@define-color blue_4 #b8bb26;
-@define-color blue_5 #b8bb26;
-@define-color green_1 #b8bb26;
-@define-color green_2 #b8bb26;
-@define-color green_3 #b8bb26;
-@define-color green_4 #b8bb26;
-@define-color green_5 #b8bb26;
-@define-color yellow_1 #fabd2f;
-@define-color yellow_2 #fabd2f;
-@define-color yellow_3 #fabd2f;
-@define-color yellow_4 #fabd2f;
-@define-color yellow_5 #fabd2f;
-@define-color orange_1 #fe8019;
-@define-color orange_2 #fe8019;
-@define-color orange_3 #fe8019;
-@define-color orange_4 #fe8019;
-@define-color orange_5 #fe8019;
+
+
 @define-color red_1 #fb4934;
-@define-color red_2 #fb4934;
-@define-color red_3 #fb4934;
-@define-color red_4 #fb4934;
-@define-color red_5 #fb4934;
+@define-color green_1 #b8bb26;
+@define-color yellow_1 #fabd2f;
+@define-color blue_1 #b8bb26;
 @define-color purple_1 #96bda2;
-@define-color purple_2 #96bda2;
-@define-color purple_3 #96bda2;
-@define-color purple_4 #96bda2;
-@define-color purple_5 #96bda2;
-@define-color brown_1 #d65d0e;
-@define-color brown_2 #d65d0e;
-@define-color brown_3 #d65d0e;
-@define-color brown_4 #d65d0e;
-@define-color brown_5 #d65d0e;
-@define-color light_1 #d5c4a1;
-@define-color light_2 #d5c4a1;
-@define-color light_3 #d5c4a1;
-@define-color light_4 #d5c4a1;
-@define-color light_5 #d5c4a1;
-@define-color dark_1 #d5c4a1;
-@define-color dark_2 #d5c4a1;
-@define-color dark_3 #d5c4a1;
-@define-color dark_4 #d5c4a1;
-@define-color dark_5 #d5c4a1;
+@define-color teal_1 #5f6c1f;
+@define-color orange_1 #fe8019;
+@define-color gray_1 #665c50;
+
diff --git a/build/base16-gruvbox-dark-medium.css b/build/base16-gruvbox-dark-medium.css
index be7818c..b85162f 100644
--- a/build/base16-gruvbox-dark-medium.css
+++ b/build/base16-gruvbox-dark-medium.css
@@ -1,88 +1,37 @@
 @define-color accent_color #83a598;
 @define-color accent_bg_color #83a598;
 @define-color accent_fg_color #282828;
-@define-color destructive_color #fb4934;
-@define-color destructive_bg_color #fb4934;
-@define-color destructive_fg_color #282828;
-@define-color success_color #b8bb26;
-@define-color success_bg_color #b8bb26;
-@define-color success_fg_color #282828;
-@define-color warning_color #d3869b;
-@define-color warning_bg_color #d3869b;
-@define-color warning_fg_color #282828;
-@define-color error_color #fb4934;
-@define-color error_bg_color #fb4934;
-@define-color error_fg_color #282828;
+
 @define-color window_bg_color #282828;
 @define-color window_fg_color #d5c4a1;
+
 @define-color view_bg_color #282828;
 @define-color view_fg_color #d5c4a1;
-@define-color headerbar_bg_color #3c3836;
+
+@define-color headerbar_bg_color #282828;
 @define-color headerbar_fg_color #d5c4a1;
-@define-color headerbar_border_color rgba(0.23529412, 0.21960784, 0.21176471, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #282828;
+@define-color dialog_fg_color #d5c4a1;
+
+@define-color popover_bg_color #282828;
+@define-color popover_fg_color #d5c4a1;
+
+
 @define-color sidebar_bg_color #3c3836;
 @define-color sidebar_fg_color #d5c4a1;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #3c3836;
 @define-color card_fg_color #d5c4a1;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #3c3836;
-@define-color dialog_fg_color #d5c4a1;
-@define-color popover_bg_color #3c3836;
-@define-color popover_fg_color #d5c4a1;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #504945;
-@define-color blue_1 #83a598;
-@define-color blue_2 #83a598;
-@define-color blue_3 #83a598;
-@define-color blue_4 #83a598;
-@define-color blue_5 #83a598;
-@define-color green_1 #b8bb26;
-@define-color green_2 #b8bb26;
-@define-color green_3 #b8bb26;
-@define-color green_4 #b8bb26;
-@define-color green_5 #b8bb26;
-@define-color yellow_1 #fabd2f;
-@define-color yellow_2 #fabd2f;
-@define-color yellow_3 #fabd2f;
-@define-color yellow_4 #fabd2f;
-@define-color yellow_5 #fabd2f;
-@define-color orange_1 #fe8019;
-@define-color orange_2 #fe8019;
-@define-color orange_3 #fe8019;
-@define-color orange_4 #fe8019;
-@define-color orange_5 #fe8019;
+
+
 @define-color red_1 #fb4934;
-@define-color red_2 #fb4934;
-@define-color red_3 #fb4934;
-@define-color red_4 #fb4934;
-@define-color red_5 #fb4934;
+@define-color green_1 #b8bb26;
+@define-color yellow_1 #fabd2f;
+@define-color blue_1 #83a598;
 @define-color purple_1 #d3869b;
-@define-color purple_2 #d3869b;
-@define-color purple_3 #d3869b;
-@define-color purple_4 #d3869b;
-@define-color purple_5 #d3869b;
-@define-color brown_1 #d65d0e;
-@define-color brown_2 #d65d0e;
-@define-color brown_3 #d65d0e;
-@define-color brown_4 #d65d0e;
-@define-color brown_5 #d65d0e;
-@define-color light_1 #d5c4a1;
-@define-color light_2 #d5c4a1;
-@define-color light_3 #d5c4a1;
-@define-color light_4 #d5c4a1;
-@define-color light_5 #d5c4a1;
-@define-color dark_1 #d5c4a1;
-@define-color dark_2 #d5c4a1;
-@define-color dark_3 #d5c4a1;
-@define-color dark_4 #d5c4a1;
-@define-color dark_5 #d5c4a1;
+@define-color teal_1 #8ec07c;
+@define-color orange_1 #fe8019;
+@define-color gray_1 #665c54;
+
diff --git a/build/base16-gruvbox-dark-pale.css b/build/base16-gruvbox-dark-pale.css
index e32beee..656c04e 100644
--- a/build/base16-gruvbox-dark-pale.css
+++ b/build/base16-gruvbox-dark-pale.css
@@ -1,88 +1,37 @@
 @define-color accent_color #83adad;
 @define-color accent_bg_color #83adad;
 @define-color accent_fg_color #262626;
-@define-color destructive_color #d75f5f;
-@define-color destructive_bg_color #d75f5f;
-@define-color destructive_fg_color #262626;
-@define-color success_color #afaf00;
-@define-color success_bg_color #afaf00;
-@define-color success_fg_color #262626;
-@define-color warning_color #d485ad;
-@define-color warning_bg_color #d485ad;
-@define-color warning_fg_color #262626;
-@define-color error_color #d75f5f;
-@define-color error_bg_color #d75f5f;
-@define-color error_fg_color #262626;
+
 @define-color window_bg_color #262626;
 @define-color window_fg_color #dab997;
+
 @define-color view_bg_color #262626;
 @define-color view_fg_color #dab997;
-@define-color headerbar_bg_color #3a3a3a;
+
+@define-color headerbar_bg_color #262626;
 @define-color headerbar_fg_color #dab997;
-@define-color headerbar_border_color rgba(0.22745098, 0.22745098, 0.22745098, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #262626;
+@define-color dialog_fg_color #dab997;
+
+@define-color popover_bg_color #262626;
+@define-color popover_fg_color #dab997;
+
+
 @define-color sidebar_bg_color #3a3a3a;
 @define-color sidebar_fg_color #dab997;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #3a3a3a;
 @define-color card_fg_color #dab997;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #3a3a3a;
-@define-color dialog_fg_color #dab997;
-@define-color popover_bg_color #3a3a3a;
-@define-color popover_fg_color #dab997;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #4e4e4e;
-@define-color blue_1 #83adad;
-@define-color blue_2 #83adad;
-@define-color blue_3 #83adad;
-@define-color blue_4 #83adad;
-@define-color blue_5 #83adad;
-@define-color green_1 #afaf00;
-@define-color green_2 #afaf00;
-@define-color green_3 #afaf00;
-@define-color green_4 #afaf00;
-@define-color green_5 #afaf00;
-@define-color yellow_1 #ffaf00;
-@define-color yellow_2 #ffaf00;
-@define-color yellow_3 #ffaf00;
-@define-color yellow_4 #ffaf00;
-@define-color yellow_5 #ffaf00;
-@define-color orange_1 #ff8700;
-@define-color orange_2 #ff8700;
-@define-color orange_3 #ff8700;
-@define-color orange_4 #ff8700;
-@define-color orange_5 #ff8700;
+
+
 @define-color red_1 #d75f5f;
-@define-color red_2 #d75f5f;
-@define-color red_3 #d75f5f;
-@define-color red_4 #d75f5f;
-@define-color red_5 #d75f5f;
+@define-color green_1 #afaf00;
+@define-color yellow_1 #ffaf00;
+@define-color blue_1 #83adad;
 @define-color purple_1 #d485ad;
-@define-color purple_2 #d485ad;
-@define-color purple_3 #d485ad;
-@define-color purple_4 #d485ad;
-@define-color purple_5 #d485ad;
-@define-color brown_1 #d65d0e;
-@define-color brown_2 #d65d0e;
-@define-color brown_3 #d65d0e;
-@define-color brown_4 #d65d0e;
-@define-color brown_5 #d65d0e;
-@define-color light_1 #dab997;
-@define-color light_2 #dab997;
-@define-color light_3 #dab997;
-@define-color light_4 #dab997;
-@define-color light_5 #dab997;
-@define-color dark_1 #dab997;
-@define-color dark_2 #dab997;
-@define-color dark_3 #dab997;
-@define-color dark_4 #dab997;
-@define-color dark_5 #dab997;
+@define-color teal_1 #85ad85;
+@define-color orange_1 #ff8700;
+@define-color gray_1 #8a8a8a;
+
diff --git a/build/base16-gruvbox-dark-soft.css b/build/base16-gruvbox-dark-soft.css
index e8a98de..0edc8e5 100644
--- a/build/base16-gruvbox-dark-soft.css
+++ b/build/base16-gruvbox-dark-soft.css
@@ -1,88 +1,37 @@
 @define-color accent_color #83a598;
 @define-color accent_bg_color #83a598;
 @define-color accent_fg_color #32302f;
-@define-color destructive_color #fb4934;
-@define-color destructive_bg_color #fb4934;
-@define-color destructive_fg_color #32302f;
-@define-color success_color #b8bb26;
-@define-color success_bg_color #b8bb26;
-@define-color success_fg_color #32302f;
-@define-color warning_color #d3869b;
-@define-color warning_bg_color #d3869b;
-@define-color warning_fg_color #32302f;
-@define-color error_color #fb4934;
-@define-color error_bg_color #fb4934;
-@define-color error_fg_color #32302f;
+
 @define-color window_bg_color #32302f;
 @define-color window_fg_color #d5c4a1;
+
 @define-color view_bg_color #32302f;
 @define-color view_fg_color #d5c4a1;
-@define-color headerbar_bg_color #3c3836;
+
+@define-color headerbar_bg_color #32302f;
 @define-color headerbar_fg_color #d5c4a1;
-@define-color headerbar_border_color rgba(0.23529412, 0.21960784, 0.21176471, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #32302f;
+@define-color dialog_fg_color #d5c4a1;
+
+@define-color popover_bg_color #32302f;
+@define-color popover_fg_color #d5c4a1;
+
+
 @define-color sidebar_bg_color #3c3836;
 @define-color sidebar_fg_color #d5c4a1;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #3c3836;
 @define-color card_fg_color #d5c4a1;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #3c3836;
-@define-color dialog_fg_color #d5c4a1;
-@define-color popover_bg_color #3c3836;
-@define-color popover_fg_color #d5c4a1;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #504945;
-@define-color blue_1 #83a598;
-@define-color blue_2 #83a598;
-@define-color blue_3 #83a598;
-@define-color blue_4 #83a598;
-@define-color blue_5 #83a598;
-@define-color green_1 #b8bb26;
-@define-color green_2 #b8bb26;
-@define-color green_3 #b8bb26;
-@define-color green_4 #b8bb26;
-@define-color green_5 #b8bb26;
-@define-color yellow_1 #fabd2f;
-@define-color yellow_2 #fabd2f;
-@define-color yellow_3 #fabd2f;
-@define-color yellow_4 #fabd2f;
-@define-color yellow_5 #fabd2f;
-@define-color orange_1 #fe8019;
-@define-color orange_2 #fe8019;
-@define-color orange_3 #fe8019;
-@define-color orange_4 #fe8019;
-@define-color orange_5 #fe8019;
+
+
 @define-color red_1 #fb4934;
-@define-color red_2 #fb4934;
-@define-color red_3 #fb4934;
-@define-color red_4 #fb4934;
-@define-color red_5 #fb4934;
+@define-color green_1 #b8bb26;
+@define-color yellow_1 #fabd2f;
+@define-color blue_1 #83a598;
 @define-color purple_1 #d3869b;
-@define-color purple_2 #d3869b;
-@define-color purple_3 #d3869b;
-@define-color purple_4 #d3869b;
-@define-color purple_5 #d3869b;
-@define-color brown_1 #d65d0e;
-@define-color brown_2 #d65d0e;
-@define-color brown_3 #d65d0e;
-@define-color brown_4 #d65d0e;
-@define-color brown_5 #d65d0e;
-@define-color light_1 #d5c4a1;
-@define-color light_2 #d5c4a1;
-@define-color light_3 #d5c4a1;
-@define-color light_4 #d5c4a1;
-@define-color light_5 #d5c4a1;
-@define-color dark_1 #d5c4a1;
-@define-color dark_2 #d5c4a1;
-@define-color dark_3 #d5c4a1;
-@define-color dark_4 #d5c4a1;
-@define-color dark_5 #d5c4a1;
+@define-color teal_1 #8ec07c;
+@define-color orange_1 #fe8019;
+@define-color gray_1 #665c54;
+
diff --git a/build/base16-gruvbox-dark.css b/build/base16-gruvbox-dark.css
index abd5110..47ffd4c 100644
--- a/build/base16-gruvbox-dark.css
+++ b/build/base16-gruvbox-dark.css
@@ -1,88 +1,37 @@
 @define-color accent_color #458588;
 @define-color accent_bg_color #458588;
 @define-color accent_fg_color #282828;
-@define-color destructive_color #cc241d;
-@define-color destructive_bg_color #cc241d;
-@define-color destructive_fg_color #282828;
-@define-color success_color #98971a;
-@define-color success_bg_color #98971a;
-@define-color success_fg_color #282828;
-@define-color warning_color #b16286;
-@define-color warning_bg_color #b16286;
-@define-color warning_fg_color #282828;
-@define-color error_color #cc241d;
-@define-color error_bg_color #cc241d;
-@define-color error_fg_color #282828;
+
 @define-color window_bg_color #282828;
 @define-color window_fg_color #ebdbb2;
+
 @define-color view_bg_color #282828;
 @define-color view_fg_color #ebdbb2;
-@define-color headerbar_bg_color #3c3836;
+
+@define-color headerbar_bg_color #282828;
 @define-color headerbar_fg_color #ebdbb2;
-@define-color headerbar_border_color rgba(0.23529412, 0.21960784, 0.21176471, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #282828;
+@define-color dialog_fg_color #ebdbb2;
+
+@define-color popover_bg_color #282828;
+@define-color popover_fg_color #ebdbb2;
+
+
 @define-color sidebar_bg_color #3c3836;
 @define-color sidebar_fg_color #ebdbb2;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #3c3836;
 @define-color card_fg_color #ebdbb2;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #3c3836;
-@define-color dialog_fg_color #ebdbb2;
-@define-color popover_bg_color #3c3836;
-@define-color popover_fg_color #ebdbb2;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #504945;
-@define-color blue_1 #458588;
-@define-color blue_2 #458588;
-@define-color blue_3 #458588;
-@define-color blue_4 #458588;
-@define-color blue_5 #458588;
-@define-color green_1 #98971a;
-@define-color green_2 #98971a;
-@define-color green_3 #98971a;
-@define-color green_4 #98971a;
-@define-color green_5 #98971a;
-@define-color yellow_1 #d79921;
-@define-color yellow_2 #d79921;
-@define-color yellow_3 #d79921;
-@define-color yellow_4 #d79921;
-@define-color yellow_5 #d79921;
-@define-color orange_1 #d65d0e;
-@define-color orange_2 #d65d0e;
-@define-color orange_3 #d65d0e;
-@define-color orange_4 #d65d0e;
-@define-color orange_5 #d65d0e;
+
+
 @define-color red_1 #cc241d;
-@define-color red_2 #cc241d;
-@define-color red_3 #cc241d;
-@define-color red_4 #cc241d;
-@define-color red_5 #cc241d;
+@define-color green_1 #98971a;
+@define-color yellow_1 #d79921;
+@define-color blue_1 #458588;
 @define-color purple_1 #b16286;
-@define-color purple_2 #b16286;
-@define-color purple_3 #b16286;
-@define-color purple_4 #b16286;
-@define-color purple_5 #b16286;
-@define-color brown_1 #9d0006;
-@define-color brown_2 #9d0006;
-@define-color brown_3 #9d0006;
-@define-color brown_4 #9d0006;
-@define-color brown_5 #9d0006;
-@define-color light_1 #ebdbb2;
-@define-color light_2 #ebdbb2;
-@define-color light_3 #ebdbb2;
-@define-color light_4 #ebdbb2;
-@define-color light_5 #ebdbb2;
-@define-color dark_1 #ebdbb2;
-@define-color dark_2 #ebdbb2;
-@define-color dark_3 #ebdbb2;
-@define-color dark_4 #ebdbb2;
-@define-color dark_5 #ebdbb2;
+@define-color teal_1 #689d6a;
+@define-color orange_1 #d65d0e;
+@define-color gray_1 #665c54;
+
diff --git a/build/base16-gruvbox-light-hard.css b/build/base16-gruvbox-light-hard.css
index a03c39a..bec9f8d 100644
--- a/build/base16-gruvbox-light-hard.css
+++ b/build/base16-gruvbox-light-hard.css
@@ -1,88 +1,37 @@
 @define-color accent_color #076678;
 @define-color accent_bg_color #076678;
 @define-color accent_fg_color #f9f5d7;
-@define-color destructive_color #9d0006;
-@define-color destructive_bg_color #9d0006;
-@define-color destructive_fg_color #f9f5d7;
-@define-color success_color #79740e;
-@define-color success_bg_color #79740e;
-@define-color success_fg_color #f9f5d7;
-@define-color warning_color #8f3f71;
-@define-color warning_bg_color #8f3f71;
-@define-color warning_fg_color #f9f5d7;
-@define-color error_color #9d0006;
-@define-color error_bg_color #9d0006;
-@define-color error_fg_color #f9f5d7;
+
 @define-color window_bg_color #f9f5d7;
 @define-color window_fg_color #504945;
+
 @define-color view_bg_color #f9f5d7;
 @define-color view_fg_color #504945;
-@define-color headerbar_bg_color #ebdbb2;
+
+@define-color headerbar_bg_color #f9f5d7;
 @define-color headerbar_fg_color #504945;
-@define-color headerbar_border_color rgba(0.92156863, 0.85882353, 0.69803922, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #f9f5d7;
+@define-color dialog_fg_color #504945;
+
+@define-color popover_bg_color #f9f5d7;
+@define-color popover_fg_color #504945;
+
+
 @define-color sidebar_bg_color #ebdbb2;
 @define-color sidebar_fg_color #504945;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #ebdbb2;
 @define-color card_fg_color #504945;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #ebdbb2;
-@define-color dialog_fg_color #504945;
-@define-color popover_bg_color #ebdbb2;
-@define-color popover_fg_color #504945;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #d5c4a1;
-@define-color blue_1 #076678;
-@define-color blue_2 #076678;
-@define-color blue_3 #076678;
-@define-color blue_4 #076678;
-@define-color blue_5 #076678;
-@define-color green_1 #79740e;
-@define-color green_2 #79740e;
-@define-color green_3 #79740e;
-@define-color green_4 #79740e;
-@define-color green_5 #79740e;
-@define-color yellow_1 #b57614;
-@define-color yellow_2 #b57614;
-@define-color yellow_3 #b57614;
-@define-color yellow_4 #b57614;
-@define-color yellow_5 #b57614;
-@define-color orange_1 #af3a03;
-@define-color orange_2 #af3a03;
-@define-color orange_3 #af3a03;
-@define-color orange_4 #af3a03;
-@define-color orange_5 #af3a03;
+
+
 @define-color red_1 #9d0006;
-@define-color red_2 #9d0006;
-@define-color red_3 #9d0006;
-@define-color red_4 #9d0006;
-@define-color red_5 #9d0006;
+@define-color green_1 #79740e;
+@define-color yellow_1 #b57614;
+@define-color blue_1 #076678;
 @define-color purple_1 #8f3f71;
-@define-color purple_2 #8f3f71;
-@define-color purple_3 #8f3f71;
-@define-color purple_4 #8f3f71;
-@define-color purple_5 #8f3f71;
-@define-color brown_1 #d65d0e;
-@define-color brown_2 #d65d0e;
-@define-color brown_3 #d65d0e;
-@define-color brown_4 #d65d0e;
-@define-color brown_5 #d65d0e;
-@define-color light_1 #504945;
-@define-color light_2 #504945;
-@define-color light_3 #504945;
-@define-color light_4 #504945;
-@define-color light_5 #504945;
-@define-color dark_1 #504945;
-@define-color dark_2 #504945;
-@define-color dark_3 #504945;
-@define-color dark_4 #504945;
-@define-color dark_5 #504945;
+@define-color teal_1 #427b58;
+@define-color orange_1 #af3a03;
+@define-color gray_1 #bdae93;
+
diff --git a/build/base16-gruvbox-light-medium.css b/build/base16-gruvbox-light-medium.css
index badfba0..e1b48d3 100644
--- a/build/base16-gruvbox-light-medium.css
+++ b/build/base16-gruvbox-light-medium.css
@@ -1,88 +1,37 @@
 @define-color accent_color #076678;
 @define-color accent_bg_color #076678;
 @define-color accent_fg_color #fbf1c7;
-@define-color destructive_color #9d0006;
-@define-color destructive_bg_color #9d0006;
-@define-color destructive_fg_color #fbf1c7;
-@define-color success_color #79740e;
-@define-color success_bg_color #79740e;
-@define-color success_fg_color #fbf1c7;
-@define-color warning_color #8f3f71;
-@define-color warning_bg_color #8f3f71;
-@define-color warning_fg_color #fbf1c7;
-@define-color error_color #9d0006;
-@define-color error_bg_color #9d0006;
-@define-color error_fg_color #fbf1c7;
+
 @define-color window_bg_color #fbf1c7;
 @define-color window_fg_color #504945;
+
 @define-color view_bg_color #fbf1c7;
 @define-color view_fg_color #504945;
-@define-color headerbar_bg_color #ebdbb2;
+
+@define-color headerbar_bg_color #fbf1c7;
 @define-color headerbar_fg_color #504945;
-@define-color headerbar_border_color rgba(0.92156863, 0.85882353, 0.69803922, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #fbf1c7;
+@define-color dialog_fg_color #504945;
+
+@define-color popover_bg_color #fbf1c7;
+@define-color popover_fg_color #504945;
+
+
 @define-color sidebar_bg_color #ebdbb2;
 @define-color sidebar_fg_color #504945;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #ebdbb2;
 @define-color card_fg_color #504945;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #ebdbb2;
-@define-color dialog_fg_color #504945;
-@define-color popover_bg_color #ebdbb2;
-@define-color popover_fg_color #504945;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #d5c4a1;
-@define-color blue_1 #076678;
-@define-color blue_2 #076678;
-@define-color blue_3 #076678;
-@define-color blue_4 #076678;
-@define-color blue_5 #076678;
-@define-color green_1 #79740e;
-@define-color green_2 #79740e;
-@define-color green_3 #79740e;
-@define-color green_4 #79740e;
-@define-color green_5 #79740e;
-@define-color yellow_1 #b57614;
-@define-color yellow_2 #b57614;
-@define-color yellow_3 #b57614;
-@define-color yellow_4 #b57614;
-@define-color yellow_5 #b57614;
-@define-color orange_1 #af3a03;
-@define-color orange_2 #af3a03;
-@define-color orange_3 #af3a03;
-@define-color orange_4 #af3a03;
-@define-color orange_5 #af3a03;
+
+
 @define-color red_1 #9d0006;
-@define-color red_2 #9d0006;
-@define-color red_3 #9d0006;
-@define-color red_4 #9d0006;
-@define-color red_5 #9d0006;
+@define-color green_1 #79740e;
+@define-color yellow_1 #b57614;
+@define-color blue_1 #076678;
 @define-color purple_1 #8f3f71;
-@define-color purple_2 #8f3f71;
-@define-color purple_3 #8f3f71;
-@define-color purple_4 #8f3f71;
-@define-color purple_5 #8f3f71;
-@define-color brown_1 #d65d0e;
-@define-color brown_2 #d65d0e;
-@define-color brown_3 #d65d0e;
-@define-color brown_4 #d65d0e;
-@define-color brown_5 #d65d0e;
-@define-color light_1 #504945;
-@define-color light_2 #504945;
-@define-color light_3 #504945;
-@define-color light_4 #504945;
-@define-color light_5 #504945;
-@define-color dark_1 #504945;
-@define-color dark_2 #504945;
-@define-color dark_3 #504945;
-@define-color dark_4 #504945;
-@define-color dark_5 #504945;
+@define-color teal_1 #427b58;
+@define-color orange_1 #af3a03;
+@define-color gray_1 #bdae93;
+
diff --git a/build/base16-gruvbox-light-soft.css b/build/base16-gruvbox-light-soft.css
index adb8368..1e1b4da 100644
--- a/build/base16-gruvbox-light-soft.css
+++ b/build/base16-gruvbox-light-soft.css
@@ -1,88 +1,37 @@
 @define-color accent_color #076678;
 @define-color accent_bg_color #076678;
 @define-color accent_fg_color #f2e5bc;
-@define-color destructive_color #9d0006;
-@define-color destructive_bg_color #9d0006;
-@define-color destructive_fg_color #f2e5bc;
-@define-color success_color #79740e;
-@define-color success_bg_color #79740e;
-@define-color success_fg_color #f2e5bc;
-@define-color warning_color #8f3f71;
-@define-color warning_bg_color #8f3f71;
-@define-color warning_fg_color #f2e5bc;
-@define-color error_color #9d0006;
-@define-color error_bg_color #9d0006;
-@define-color error_fg_color #f2e5bc;
+
 @define-color window_bg_color #f2e5bc;
 @define-color window_fg_color #504945;
+
 @define-color view_bg_color #f2e5bc;
 @define-color view_fg_color #504945;
-@define-color headerbar_bg_color #ebdbb2;
+
+@define-color headerbar_bg_color #f2e5bc;
 @define-color headerbar_fg_color #504945;
-@define-color headerbar_border_color rgba(0.92156863, 0.85882353, 0.69803922, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #f2e5bc;
+@define-color dialog_fg_color #504945;
+
+@define-color popover_bg_color #f2e5bc;
+@define-color popover_fg_color #504945;
+
+
 @define-color sidebar_bg_color #ebdbb2;
 @define-color sidebar_fg_color #504945;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #ebdbb2;
 @define-color card_fg_color #504945;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #ebdbb2;
-@define-color dialog_fg_color #504945;
-@define-color popover_bg_color #ebdbb2;
-@define-color popover_fg_color #504945;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #d5c4a1;
-@define-color blue_1 #076678;
-@define-color blue_2 #076678;
-@define-color blue_3 #076678;
-@define-color blue_4 #076678;
-@define-color blue_5 #076678;
-@define-color green_1 #79740e;
-@define-color green_2 #79740e;
-@define-color green_3 #79740e;
-@define-color green_4 #79740e;
-@define-color green_5 #79740e;
-@define-color yellow_1 #b57614;
-@define-color yellow_2 #b57614;
-@define-color yellow_3 #b57614;
-@define-color yellow_4 #b57614;
-@define-color yellow_5 #b57614;
-@define-color orange_1 #af3a03;
-@define-color orange_2 #af3a03;
-@define-color orange_3 #af3a03;
-@define-color orange_4 #af3a03;
-@define-color orange_5 #af3a03;
+
+
 @define-color red_1 #9d0006;
-@define-color red_2 #9d0006;
-@define-color red_3 #9d0006;
-@define-color red_4 #9d0006;
-@define-color red_5 #9d0006;
+@define-color green_1 #79740e;
+@define-color yellow_1 #b57614;
+@define-color blue_1 #076678;
 @define-color purple_1 #8f3f71;
-@define-color purple_2 #8f3f71;
-@define-color purple_3 #8f3f71;
-@define-color purple_4 #8f3f71;
-@define-color purple_5 #8f3f71;
-@define-color brown_1 #d65d0e;
-@define-color brown_2 #d65d0e;
-@define-color brown_3 #d65d0e;
-@define-color brown_4 #d65d0e;
-@define-color brown_5 #d65d0e;
-@define-color light_1 #504945;
-@define-color light_2 #504945;
-@define-color light_3 #504945;
-@define-color light_4 #504945;
-@define-color light_5 #504945;
-@define-color dark_1 #504945;
-@define-color dark_2 #504945;
-@define-color dark_3 #504945;
-@define-color dark_4 #504945;
-@define-color dark_5 #504945;
+@define-color teal_1 #427b58;
+@define-color orange_1 #af3a03;
+@define-color gray_1 #bdae93;
+
diff --git a/build/base16-gruvbox-light.css b/build/base16-gruvbox-light.css
index 51ca361..0ed552a 100644
--- a/build/base16-gruvbox-light.css
+++ b/build/base16-gruvbox-light.css
@@ -1,88 +1,37 @@
 @define-color accent_color #458588;
 @define-color accent_bg_color #458588;
 @define-color accent_fg_color #fbf1c7;
-@define-color destructive_color #cc241d;
-@define-color destructive_bg_color #cc241d;
-@define-color destructive_fg_color #fbf1c7;
-@define-color success_color #98971a;
-@define-color success_bg_color #98971a;
-@define-color success_fg_color #fbf1c7;
-@define-color warning_color #b16286;
-@define-color warning_bg_color #b16286;
-@define-color warning_fg_color #fbf1c7;
-@define-color error_color #cc241d;
-@define-color error_bg_color #cc241d;
-@define-color error_fg_color #fbf1c7;
+
 @define-color window_bg_color #fbf1c7;
 @define-color window_fg_color #3c3836;
+
 @define-color view_bg_color #fbf1c7;
 @define-color view_fg_color #3c3836;
-@define-color headerbar_bg_color #ebdbb2;
+
+@define-color headerbar_bg_color #fbf1c7;
 @define-color headerbar_fg_color #3c3836;
-@define-color headerbar_border_color rgba(0.92156863, 0.85882353, 0.69803922, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #fbf1c7;
+@define-color dialog_fg_color #3c3836;
+
+@define-color popover_bg_color #fbf1c7;
+@define-color popover_fg_color #3c3836;
+
+
 @define-color sidebar_bg_color #ebdbb2;
 @define-color sidebar_fg_color #3c3836;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #ebdbb2;
 @define-color card_fg_color #3c3836;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #ebdbb2;
-@define-color dialog_fg_color #3c3836;
-@define-color popover_bg_color #ebdbb2;
-@define-color popover_fg_color #3c3836;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #d5c4a1;
-@define-color blue_1 #458588;
-@define-color blue_2 #458588;
-@define-color blue_3 #458588;
-@define-color blue_4 #458588;
-@define-color blue_5 #458588;
-@define-color green_1 #98971a;
-@define-color green_2 #98971a;
-@define-color green_3 #98971a;
-@define-color green_4 #98971a;
-@define-color green_5 #98971a;
-@define-color yellow_1 #d79921;
-@define-color yellow_2 #d79921;
-@define-color yellow_3 #d79921;
-@define-color yellow_4 #d79921;
-@define-color yellow_5 #d79921;
-@define-color orange_1 #d65d0e;
-@define-color orange_2 #d65d0e;
-@define-color orange_3 #d65d0e;
-@define-color orange_4 #d65d0e;
-@define-color orange_5 #d65d0e;
+
+
 @define-color red_1 #cc241d;
-@define-color red_2 #cc241d;
-@define-color red_3 #cc241d;
-@define-color red_4 #cc241d;
-@define-color red_5 #cc241d;
+@define-color green_1 #98971a;
+@define-color yellow_1 #d79921;
+@define-color blue_1 #458588;
 @define-color purple_1 #b16286;
-@define-color purple_2 #b16286;
-@define-color purple_3 #b16286;
-@define-color purple_4 #b16286;
-@define-color purple_5 #b16286;
-@define-color brown_1 #9d0006;
-@define-color brown_2 #9d0006;
-@define-color brown_3 #9d0006;
-@define-color brown_4 #9d0006;
-@define-color brown_5 #9d0006;
-@define-color light_1 #3c3836;
-@define-color light_2 #3c3836;
-@define-color light_3 #3c3836;
-@define-color light_4 #3c3836;
-@define-color light_5 #3c3836;
-@define-color dark_1 #3c3836;
-@define-color dark_2 #3c3836;
-@define-color dark_3 #3c3836;
-@define-color dark_4 #3c3836;
-@define-color dark_5 #3c3836;
+@define-color teal_1 #689d6a;
+@define-color orange_1 #d65d0e;
+@define-color gray_1 #bdae93;
+
diff --git a/build/base16-gruvbox-material-dark-hard.css b/build/base16-gruvbox-material-dark-hard.css
index f33f096..f41fe84 100644
--- a/build/base16-gruvbox-material-dark-hard.css
+++ b/build/base16-gruvbox-material-dark-hard.css
@@ -1,88 +1,37 @@
 @define-color accent_color #7daea3;
 @define-color accent_bg_color #7daea3;
 @define-color accent_fg_color #202020;
-@define-color destructive_color #ea6962;
-@define-color destructive_bg_color #ea6962;
-@define-color destructive_fg_color #202020;
-@define-color success_color #a9b665;
-@define-color success_bg_color #a9b665;
-@define-color success_fg_color #202020;
-@define-color warning_color #d3869b;
-@define-color warning_bg_color #d3869b;
-@define-color warning_fg_color #202020;
-@define-color error_color #ea6962;
-@define-color error_bg_color #ea6962;
-@define-color error_fg_color #202020;
+
 @define-color window_bg_color #202020;
 @define-color window_fg_color #ddc7a1;
+
 @define-color view_bg_color #202020;
 @define-color view_fg_color #ddc7a1;
-@define-color headerbar_bg_color #2a2827;
+
+@define-color headerbar_bg_color #202020;
 @define-color headerbar_fg_color #ddc7a1;
-@define-color headerbar_border_color rgba(0.16470588, 0.15686275, 0.15294118, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #202020;
+@define-color dialog_fg_color #ddc7a1;
+
+@define-color popover_bg_color #202020;
+@define-color popover_fg_color #ddc7a1;
+
+
 @define-color sidebar_bg_color #2a2827;
 @define-color sidebar_fg_color #ddc7a1;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #2a2827;
 @define-color card_fg_color #ddc7a1;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #2a2827;
-@define-color dialog_fg_color #ddc7a1;
-@define-color popover_bg_color #2a2827;
-@define-color popover_fg_color #ddc7a1;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #504945;
-@define-color blue_1 #7daea3;
-@define-color blue_2 #7daea3;
-@define-color blue_3 #7daea3;
-@define-color blue_4 #7daea3;
-@define-color blue_5 #7daea3;
-@define-color green_1 #a9b665;
-@define-color green_2 #a9b665;
-@define-color green_3 #a9b665;
-@define-color green_4 #a9b665;
-@define-color green_5 #a9b665;
-@define-color yellow_1 #d8a657;
-@define-color yellow_2 #d8a657;
-@define-color yellow_3 #d8a657;
-@define-color yellow_4 #d8a657;
-@define-color yellow_5 #d8a657;
-@define-color orange_1 #e78a4e;
-@define-color orange_2 #e78a4e;
-@define-color orange_3 #e78a4e;
-@define-color orange_4 #e78a4e;
-@define-color orange_5 #e78a4e;
+
+
 @define-color red_1 #ea6962;
-@define-color red_2 #ea6962;
-@define-color red_3 #ea6962;
-@define-color red_4 #ea6962;
-@define-color red_5 #ea6962;
+@define-color green_1 #a9b665;
+@define-color yellow_1 #d8a657;
+@define-color blue_1 #7daea3;
 @define-color purple_1 #d3869b;
-@define-color purple_2 #d3869b;
-@define-color purple_3 #d3869b;
-@define-color purple_4 #d3869b;
-@define-color purple_5 #d3869b;
-@define-color brown_1 #bd6f3e;
-@define-color brown_2 #bd6f3e;
-@define-color brown_3 #bd6f3e;
-@define-color brown_4 #bd6f3e;
-@define-color brown_5 #bd6f3e;
-@define-color light_1 #ddc7a1;
-@define-color light_2 #ddc7a1;
-@define-color light_3 #ddc7a1;
-@define-color light_4 #ddc7a1;
-@define-color light_5 #ddc7a1;
-@define-color dark_1 #ddc7a1;
-@define-color dark_2 #ddc7a1;
-@define-color dark_3 #ddc7a1;
-@define-color dark_4 #ddc7a1;
-@define-color dark_5 #ddc7a1;
+@define-color teal_1 #89b482;
+@define-color orange_1 #e78a4e;
+@define-color gray_1 #5a524c;
+
diff --git a/build/base16-gruvbox-material-dark-medium.css b/build/base16-gruvbox-material-dark-medium.css
index ace5d4e..b5f5864 100644
--- a/build/base16-gruvbox-material-dark-medium.css
+++ b/build/base16-gruvbox-material-dark-medium.css
@@ -1,88 +1,37 @@
 @define-color accent_color #7daea3;
 @define-color accent_bg_color #7daea3;
 @define-color accent_fg_color #292828;
-@define-color destructive_color #ea6962;
-@define-color destructive_bg_color #ea6962;
-@define-color destructive_fg_color #292828;
-@define-color success_color #a9b665;
-@define-color success_bg_color #a9b665;
-@define-color success_fg_color #292828;
-@define-color warning_color #d3869b;
-@define-color warning_bg_color #d3869b;
-@define-color warning_fg_color #292828;
-@define-color error_color #ea6962;
-@define-color error_bg_color #ea6962;
-@define-color error_fg_color #292828;
+
 @define-color window_bg_color #292828;
 @define-color window_fg_color #ddc7a1;
+
 @define-color view_bg_color #292828;
 @define-color view_fg_color #ddc7a1;
-@define-color headerbar_bg_color #32302f;
+
+@define-color headerbar_bg_color #292828;
 @define-color headerbar_fg_color #ddc7a1;
-@define-color headerbar_border_color rgba(0.19607843, 0.18823529, 0.18431373, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #292828;
+@define-color dialog_fg_color #ddc7a1;
+
+@define-color popover_bg_color #292828;
+@define-color popover_fg_color #ddc7a1;
+
+
 @define-color sidebar_bg_color #32302f;
 @define-color sidebar_fg_color #ddc7a1;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #32302f;
 @define-color card_fg_color #ddc7a1;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #32302f;
-@define-color dialog_fg_color #ddc7a1;
-@define-color popover_bg_color #32302f;
-@define-color popover_fg_color #ddc7a1;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #504945;
-@define-color blue_1 #7daea3;
-@define-color blue_2 #7daea3;
-@define-color blue_3 #7daea3;
-@define-color blue_4 #7daea3;
-@define-color blue_5 #7daea3;
-@define-color green_1 #a9b665;
-@define-color green_2 #a9b665;
-@define-color green_3 #a9b665;
-@define-color green_4 #a9b665;
-@define-color green_5 #a9b665;
-@define-color yellow_1 #d8a657;
-@define-color yellow_2 #d8a657;
-@define-color yellow_3 #d8a657;
-@define-color yellow_4 #d8a657;
-@define-color yellow_5 #d8a657;
-@define-color orange_1 #e78a4e;
-@define-color orange_2 #e78a4e;
-@define-color orange_3 #e78a4e;
-@define-color orange_4 #e78a4e;
-@define-color orange_5 #e78a4e;
+
+
 @define-color red_1 #ea6962;
-@define-color red_2 #ea6962;
-@define-color red_3 #ea6962;
-@define-color red_4 #ea6962;
-@define-color red_5 #ea6962;
+@define-color green_1 #a9b665;
+@define-color yellow_1 #d8a657;
+@define-color blue_1 #7daea3;
 @define-color purple_1 #d3869b;
-@define-color purple_2 #d3869b;
-@define-color purple_3 #d3869b;
-@define-color purple_4 #d3869b;
-@define-color purple_5 #d3869b;
-@define-color brown_1 #bd6f3e;
-@define-color brown_2 #bd6f3e;
-@define-color brown_3 #bd6f3e;
-@define-color brown_4 #bd6f3e;
-@define-color brown_5 #bd6f3e;
-@define-color light_1 #ddc7a1;
-@define-color light_2 #ddc7a1;
-@define-color light_3 #ddc7a1;
-@define-color light_4 #ddc7a1;
-@define-color light_5 #ddc7a1;
-@define-color dark_1 #ddc7a1;
-@define-color dark_2 #ddc7a1;
-@define-color dark_3 #ddc7a1;
-@define-color dark_4 #ddc7a1;
-@define-color dark_5 #ddc7a1;
+@define-color teal_1 #89b482;
+@define-color orange_1 #e78a4e;
+@define-color gray_1 #665c54;
+
diff --git a/build/base16-gruvbox-material-dark-soft.css b/build/base16-gruvbox-material-dark-soft.css
index ae85c07..2f60678 100644
--- a/build/base16-gruvbox-material-dark-soft.css
+++ b/build/base16-gruvbox-material-dark-soft.css
@@ -1,88 +1,37 @@
 @define-color accent_color #7daea3;
 @define-color accent_bg_color #7daea3;
 @define-color accent_fg_color #32302f;
-@define-color destructive_color #ea6962;
-@define-color destructive_bg_color #ea6962;
-@define-color destructive_fg_color #32302f;
-@define-color success_color #a9b665;
-@define-color success_bg_color #a9b665;
-@define-color success_fg_color #32302f;
-@define-color warning_color #d3869b;
-@define-color warning_bg_color #d3869b;
-@define-color warning_fg_color #32302f;
-@define-color error_color #ea6962;
-@define-color error_bg_color #ea6962;
-@define-color error_fg_color #32302f;
+
 @define-color window_bg_color #32302f;
 @define-color window_fg_color #ddc7a1;
+
 @define-color view_bg_color #32302f;
 @define-color view_fg_color #ddc7a1;
-@define-color headerbar_bg_color #3c3836;
+
+@define-color headerbar_bg_color #32302f;
 @define-color headerbar_fg_color #ddc7a1;
-@define-color headerbar_border_color rgba(0.23529412, 0.21960784, 0.21176471, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #32302f;
+@define-color dialog_fg_color #ddc7a1;
+
+@define-color popover_bg_color #32302f;
+@define-color popover_fg_color #ddc7a1;
+
+
 @define-color sidebar_bg_color #3c3836;
 @define-color sidebar_fg_color #ddc7a1;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #3c3836;
 @define-color card_fg_color #ddc7a1;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #3c3836;
-@define-color dialog_fg_color #ddc7a1;
-@define-color popover_bg_color #3c3836;
-@define-color popover_fg_color #ddc7a1;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #5a524c;
-@define-color blue_1 #7daea3;
-@define-color blue_2 #7daea3;
-@define-color blue_3 #7daea3;
-@define-color blue_4 #7daea3;
-@define-color blue_5 #7daea3;
-@define-color green_1 #a9b665;
-@define-color green_2 #a9b665;
-@define-color green_3 #a9b665;
-@define-color green_4 #a9b665;
-@define-color green_5 #a9b665;
-@define-color yellow_1 #d8a657;
-@define-color yellow_2 #d8a657;
-@define-color yellow_3 #d8a657;
-@define-color yellow_4 #d8a657;
-@define-color yellow_5 #d8a657;
-@define-color orange_1 #e78a4e;
-@define-color orange_2 #e78a4e;
-@define-color orange_3 #e78a4e;
-@define-color orange_4 #e78a4e;
-@define-color orange_5 #e78a4e;
+
+
 @define-color red_1 #ea6962;
-@define-color red_2 #ea6962;
-@define-color red_3 #ea6962;
-@define-color red_4 #ea6962;
-@define-color red_5 #ea6962;
+@define-color green_1 #a9b665;
+@define-color yellow_1 #d8a657;
+@define-color blue_1 #7daea3;
 @define-color purple_1 #d3869b;
-@define-color purple_2 #d3869b;
-@define-color purple_3 #d3869b;
-@define-color purple_4 #d3869b;
-@define-color purple_5 #d3869b;
-@define-color brown_1 #bd6f3e;
-@define-color brown_2 #bd6f3e;
-@define-color brown_3 #bd6f3e;
-@define-color brown_4 #bd6f3e;
-@define-color brown_5 #bd6f3e;
-@define-color light_1 #ddc7a1;
-@define-color light_2 #ddc7a1;
-@define-color light_3 #ddc7a1;
-@define-color light_4 #ddc7a1;
-@define-color light_5 #ddc7a1;
-@define-color dark_1 #ddc7a1;
-@define-color dark_2 #ddc7a1;
-@define-color dark_3 #ddc7a1;
-@define-color dark_4 #ddc7a1;
-@define-color dark_5 #ddc7a1;
+@define-color teal_1 #89b482;
+@define-color orange_1 #e78a4e;
+@define-color gray_1 #7c6f64;
+
diff --git a/build/base16-gruvbox-material-light-hard.css b/build/base16-gruvbox-material-light-hard.css
index ab9eb64..2bb23ec 100644
--- a/build/base16-gruvbox-material-light-hard.css
+++ b/build/base16-gruvbox-material-light-hard.css
@@ -1,88 +1,37 @@
 @define-color accent_color #45707a;
 @define-color accent_bg_color #45707a;
 @define-color accent_fg_color #f9f5d7;
-@define-color destructive_color #c14a4a;
-@define-color destructive_bg_color #c14a4a;
-@define-color destructive_fg_color #f9f5d7;
-@define-color success_color #6c782e;
-@define-color success_bg_color #6c782e;
-@define-color success_fg_color #f9f5d7;
-@define-color warning_color #945e80;
-@define-color warning_bg_color #945e80;
-@define-color warning_fg_color #f9f5d7;
-@define-color error_color #c14a4a;
-@define-color error_bg_color #c14a4a;
-@define-color error_fg_color #f9f5d7;
+
 @define-color window_bg_color #f9f5d7;
 @define-color window_fg_color #654735;
+
 @define-color view_bg_color #f9f5d7;
 @define-color view_fg_color #654735;
-@define-color headerbar_bg_color #fbf1c7;
+
+@define-color headerbar_bg_color #f9f5d7;
 @define-color headerbar_fg_color #654735;
-@define-color headerbar_border_color rgba(0.98431373, 0.94509804, 0.78039216, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #f9f5d7;
+@define-color dialog_fg_color #654735;
+
+@define-color popover_bg_color #f9f5d7;
+@define-color popover_fg_color #654735;
+
+
 @define-color sidebar_bg_color #fbf1c7;
 @define-color sidebar_fg_color #654735;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #fbf1c7;
 @define-color card_fg_color #654735;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #fbf1c7;
-@define-color dialog_fg_color #654735;
-@define-color popover_bg_color #fbf1c7;
-@define-color popover_fg_color #654735;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #e0cfa9;
-@define-color blue_1 #45707a;
-@define-color blue_2 #45707a;
-@define-color blue_3 #45707a;
-@define-color blue_4 #45707a;
-@define-color blue_5 #45707a;
-@define-color green_1 #6c782e;
-@define-color green_2 #6c782e;
-@define-color green_3 #6c782e;
-@define-color green_4 #6c782e;
-@define-color green_5 #6c782e;
-@define-color yellow_1 #b47109;
-@define-color yellow_2 #b47109;
-@define-color yellow_3 #b47109;
-@define-color yellow_4 #b47109;
-@define-color yellow_5 #b47109;
-@define-color orange_1 #c35e0a;
-@define-color orange_2 #c35e0a;
-@define-color orange_3 #c35e0a;
-@define-color orange_4 #c35e0a;
-@define-color orange_5 #c35e0a;
+
+
 @define-color red_1 #c14a4a;
-@define-color red_2 #c14a4a;
-@define-color red_3 #c14a4a;
-@define-color red_4 #c14a4a;
-@define-color red_5 #c14a4a;
+@define-color green_1 #6c782e;
+@define-color yellow_1 #b47109;
+@define-color blue_1 #45707a;
 @define-color purple_1 #945e80;
-@define-color purple_2 #945e80;
-@define-color purple_3 #945e80;
-@define-color purple_4 #945e80;
-@define-color purple_5 #945e80;
-@define-color brown_1 #e78a4e;
-@define-color brown_2 #e78a4e;
-@define-color brown_3 #e78a4e;
-@define-color brown_4 #e78a4e;
-@define-color brown_5 #e78a4e;
-@define-color light_1 #654735;
-@define-color light_2 #654735;
-@define-color light_3 #654735;
-@define-color light_4 #654735;
-@define-color light_5 #654735;
-@define-color dark_1 #654735;
-@define-color dark_2 #654735;
-@define-color dark_3 #654735;
-@define-color dark_4 #654735;
-@define-color dark_5 #654735;
+@define-color teal_1 #4c7a5d;
+@define-color orange_1 #c35e0a;
+@define-color gray_1 #a89984;
+
diff --git a/build/base16-gruvbox-material-light-medium.css b/build/base16-gruvbox-material-light-medium.css
index 65eac5a..3a92dcf 100644
--- a/build/base16-gruvbox-material-light-medium.css
+++ b/build/base16-gruvbox-material-light-medium.css
@@ -1,88 +1,37 @@
 @define-color accent_color #45707a;
 @define-color accent_bg_color #45707a;
 @define-color accent_fg_color #fbf1c7;
-@define-color destructive_color #c14a4a;
-@define-color destructive_bg_color #c14a4a;
-@define-color destructive_fg_color #fbf1c7;
-@define-color success_color #6c782e;
-@define-color success_bg_color #6c782e;
-@define-color success_fg_color #fbf1c7;
-@define-color warning_color #945e80;
-@define-color warning_bg_color #945e80;
-@define-color warning_fg_color #fbf1c7;
-@define-color error_color #c14a4a;
-@define-color error_bg_color #c14a4a;
-@define-color error_fg_color #fbf1c7;
+
 @define-color window_bg_color #fbf1c7;
 @define-color window_fg_color #654735;
+
 @define-color view_bg_color #fbf1c7;
 @define-color view_fg_color #654735;
-@define-color headerbar_bg_color #f2e5bc;
+
+@define-color headerbar_bg_color #fbf1c7;
 @define-color headerbar_fg_color #654735;
-@define-color headerbar_border_color rgba(0.94901961, 0.89803922, 0.73725490, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #fbf1c7;
+@define-color dialog_fg_color #654735;
+
+@define-color popover_bg_color #fbf1c7;
+@define-color popover_fg_color #654735;
+
+
 @define-color sidebar_bg_color #f2e5bc;
 @define-color sidebar_fg_color #654735;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #f2e5bc;
 @define-color card_fg_color #654735;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #f2e5bc;
-@define-color dialog_fg_color #654735;
-@define-color popover_bg_color #f2e5bc;
-@define-color popover_fg_color #654735;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #d5c4a1;
-@define-color blue_1 #45707a;
-@define-color blue_2 #45707a;
-@define-color blue_3 #45707a;
-@define-color blue_4 #45707a;
-@define-color blue_5 #45707a;
-@define-color green_1 #6c782e;
-@define-color green_2 #6c782e;
-@define-color green_3 #6c782e;
-@define-color green_4 #6c782e;
-@define-color green_5 #6c782e;
-@define-color yellow_1 #b47109;
-@define-color yellow_2 #b47109;
-@define-color yellow_3 #b47109;
-@define-color yellow_4 #b47109;
-@define-color yellow_5 #b47109;
-@define-color orange_1 #c35e0a;
-@define-color orange_2 #c35e0a;
-@define-color orange_3 #c35e0a;
-@define-color orange_4 #c35e0a;
-@define-color orange_5 #c35e0a;
+
+
 @define-color red_1 #c14a4a;
-@define-color red_2 #c14a4a;
-@define-color red_3 #c14a4a;
-@define-color red_4 #c14a4a;
-@define-color red_5 #c14a4a;
+@define-color green_1 #6c782e;
+@define-color yellow_1 #b47109;
+@define-color blue_1 #45707a;
 @define-color purple_1 #945e80;
-@define-color purple_2 #945e80;
-@define-color purple_3 #945e80;
-@define-color purple_4 #945e80;
-@define-color purple_5 #945e80;
-@define-color brown_1 #e78a4e;
-@define-color brown_2 #e78a4e;
-@define-color brown_3 #e78a4e;
-@define-color brown_4 #e78a4e;
-@define-color brown_5 #e78a4e;
-@define-color light_1 #654735;
-@define-color light_2 #654735;
-@define-color light_3 #654735;
-@define-color light_4 #654735;
-@define-color light_5 #654735;
-@define-color dark_1 #654735;
-@define-color dark_2 #654735;
-@define-color dark_3 #654735;
-@define-color dark_4 #654735;
-@define-color dark_5 #654735;
+@define-color teal_1 #4c7a5d;
+@define-color orange_1 #c35e0a;
+@define-color gray_1 #bdae93;
+
diff --git a/build/base16-gruvbox-material-light-soft.css b/build/base16-gruvbox-material-light-soft.css
index 30e17f7..b4ab531 100644
--- a/build/base16-gruvbox-material-light-soft.css
+++ b/build/base16-gruvbox-material-light-soft.css
@@ -1,88 +1,37 @@
 @define-color accent_color #45707a;
 @define-color accent_bg_color #45707a;
 @define-color accent_fg_color #f2e5bc;
-@define-color destructive_color #c14a4a;
-@define-color destructive_bg_color #c14a4a;
-@define-color destructive_fg_color #f2e5bc;
-@define-color success_color #6c782e;
-@define-color success_bg_color #6c782e;
-@define-color success_fg_color #f2e5bc;
-@define-color warning_color #945e80;
-@define-color warning_bg_color #945e80;
-@define-color warning_fg_color #f2e5bc;
-@define-color error_color #c14a4a;
-@define-color error_bg_color #c14a4a;
-@define-color error_fg_color #f2e5bc;
+
 @define-color window_bg_color #f2e5bc;
 @define-color window_fg_color #654735;
+
 @define-color view_bg_color #f2e5bc;
 @define-color view_fg_color #654735;
-@define-color headerbar_bg_color #ebdbb2;
+
+@define-color headerbar_bg_color #f2e5bc;
 @define-color headerbar_fg_color #654735;
-@define-color headerbar_border_color rgba(0.92156863, 0.85882353, 0.69803922, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #f2e5bc;
+@define-color dialog_fg_color #654735;
+
+@define-color popover_bg_color #f2e5bc;
+@define-color popover_fg_color #654735;
+
+
 @define-color sidebar_bg_color #ebdbb2;
 @define-color sidebar_fg_color #654735;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #ebdbb2;
 @define-color card_fg_color #654735;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #ebdbb2;
-@define-color dialog_fg_color #654735;
-@define-color popover_bg_color #ebdbb2;
-@define-color popover_fg_color #654735;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #c9b99a;
-@define-color blue_1 #45707a;
-@define-color blue_2 #45707a;
-@define-color blue_3 #45707a;
-@define-color blue_4 #45707a;
-@define-color blue_5 #45707a;
-@define-color green_1 #6c782e;
-@define-color green_2 #6c782e;
-@define-color green_3 #6c782e;
-@define-color green_4 #6c782e;
-@define-color green_5 #6c782e;
-@define-color yellow_1 #b47109;
-@define-color yellow_2 #b47109;
-@define-color yellow_3 #b47109;
-@define-color yellow_4 #b47109;
-@define-color yellow_5 #b47109;
-@define-color orange_1 #c35e0a;
-@define-color orange_2 #c35e0a;
-@define-color orange_3 #c35e0a;
-@define-color orange_4 #c35e0a;
-@define-color orange_5 #c35e0a;
+
+
 @define-color red_1 #c14a4a;
-@define-color red_2 #c14a4a;
-@define-color red_3 #c14a4a;
-@define-color red_4 #c14a4a;
-@define-color red_5 #c14a4a;
+@define-color green_1 #6c782e;
+@define-color yellow_1 #b47109;
+@define-color blue_1 #45707a;
 @define-color purple_1 #945e80;
-@define-color purple_2 #945e80;
-@define-color purple_3 #945e80;
-@define-color purple_4 #945e80;
-@define-color purple_5 #945e80;
-@define-color brown_1 #e78a4e;
-@define-color brown_2 #e78a4e;
-@define-color brown_3 #e78a4e;
-@define-color brown_4 #e78a4e;
-@define-color brown_5 #e78a4e;
-@define-color light_1 #654735;
-@define-color light_2 #654735;
-@define-color light_3 #654735;
-@define-color light_4 #654735;
-@define-color light_5 #654735;
-@define-color dark_1 #654735;
-@define-color dark_2 #654735;
-@define-color dark_3 #654735;
-@define-color dark_4 #654735;
-@define-color dark_5 #654735;
+@define-color teal_1 #4c7a5d;
+@define-color orange_1 #c35e0a;
+@define-color gray_1 #a89984;
+
diff --git a/build/base16-hardcore.css b/build/base16-hardcore.css
index 16d26c2..0ad1c92 100644
--- a/build/base16-hardcore.css
+++ b/build/base16-hardcore.css
@@ -1,88 +1,37 @@
 @define-color accent_color #66d9ef;
 @define-color accent_bg_color #66d9ef;
 @define-color accent_fg_color #212121;
-@define-color destructive_color #f92672;
-@define-color destructive_bg_color #f92672;
-@define-color destructive_fg_color #212121;
-@define-color success_color #a6e22e;
-@define-color success_bg_color #a6e22e;
-@define-color success_fg_color #212121;
-@define-color warning_color #9e6ffe;
-@define-color warning_bg_color #9e6ffe;
-@define-color warning_fg_color #212121;
-@define-color error_color #f92672;
-@define-color error_bg_color #f92672;
-@define-color error_fg_color #212121;
+
 @define-color window_bg_color #212121;
 @define-color window_fg_color #cdcdcd;
+
 @define-color view_bg_color #212121;
 @define-color view_fg_color #cdcdcd;
-@define-color headerbar_bg_color #303030;
+
+@define-color headerbar_bg_color #212121;
 @define-color headerbar_fg_color #cdcdcd;
-@define-color headerbar_border_color rgba(0.18823529, 0.18823529, 0.18823529, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #212121;
+@define-color dialog_fg_color #cdcdcd;
+
+@define-color popover_bg_color #212121;
+@define-color popover_fg_color #cdcdcd;
+
+
 @define-color sidebar_bg_color #303030;
 @define-color sidebar_fg_color #cdcdcd;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #303030;
 @define-color card_fg_color #cdcdcd;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #303030;
-@define-color dialog_fg_color #cdcdcd;
-@define-color popover_bg_color #303030;
-@define-color popover_fg_color #cdcdcd;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #353535;
-@define-color blue_1 #66d9ef;
-@define-color blue_2 #66d9ef;
-@define-color blue_3 #66d9ef;
-@define-color blue_4 #66d9ef;
-@define-color blue_5 #66d9ef;
-@define-color green_1 #a6e22e;
-@define-color green_2 #a6e22e;
-@define-color green_3 #a6e22e;
-@define-color green_4 #a6e22e;
-@define-color green_5 #a6e22e;
-@define-color yellow_1 #e6db74;
-@define-color yellow_2 #e6db74;
-@define-color yellow_3 #e6db74;
-@define-color yellow_4 #e6db74;
-@define-color yellow_5 #e6db74;
-@define-color orange_1 #fd971f;
-@define-color orange_2 #fd971f;
-@define-color orange_3 #fd971f;
-@define-color orange_4 #fd971f;
-@define-color orange_5 #fd971f;
+
+
 @define-color red_1 #f92672;
-@define-color red_2 #f92672;
-@define-color red_3 #f92672;
-@define-color red_4 #f92672;
-@define-color red_5 #f92672;
+@define-color green_1 #a6e22e;
+@define-color yellow_1 #e6db74;
+@define-color blue_1 #66d9ef;
 @define-color purple_1 #9e6ffe;
-@define-color purple_2 #9e6ffe;
-@define-color purple_3 #9e6ffe;
-@define-color purple_4 #9e6ffe;
-@define-color purple_5 #9e6ffe;
-@define-color brown_1 #e8b882;
-@define-color brown_2 #e8b882;
-@define-color brown_3 #e8b882;
-@define-color brown_4 #e8b882;
-@define-color brown_5 #e8b882;
-@define-color light_1 #cdcdcd;
-@define-color light_2 #cdcdcd;
-@define-color light_3 #cdcdcd;
-@define-color light_4 #cdcdcd;
-@define-color light_5 #cdcdcd;
-@define-color dark_1 #cdcdcd;
-@define-color dark_2 #cdcdcd;
-@define-color dark_3 #cdcdcd;
-@define-color dark_4 #cdcdcd;
-@define-color dark_5 #cdcdcd;
+@define-color teal_1 #708387;
+@define-color orange_1 #fd971f;
+@define-color gray_1 #4a4a4a;
+
diff --git a/build/base16-hardhacker.css b/build/base16-hardhacker.css
index 1937cbf..45f74d0 100644
--- a/build/base16-hardhacker.css
+++ b/build/base16-hardhacker.css
@@ -1,88 +1,37 @@
 @define-color accent_color #95a6f4;
 @define-color accent_bg_color #95a6f4;
 @define-color accent_fg_color #211e2a;
-@define-color destructive_color #e965a5;
-@define-color destructive_bg_color #e965a5;
-@define-color destructive_fg_color #211e2a;
-@define-color success_color #b1f2a7;
-@define-color success_bg_color #b1f2a7;
-@define-color success_fg_color #211e2a;
-@define-color warning_color #ff79c6;
-@define-color warning_bg_color #ff79c6;
-@define-color warning_fg_color #211e2a;
-@define-color error_color #e965a5;
-@define-color error_bg_color #e965a5;
-@define-color error_fg_color #211e2a;
+
 @define-color window_bg_color #211e2a;
 @define-color window_fg_color #e4dee9;
+
 @define-color view_bg_color #211e2a;
 @define-color view_fg_color #e4dee9;
-@define-color headerbar_bg_color #2c2737;
+
+@define-color headerbar_bg_color #211e2a;
 @define-color headerbar_fg_color #e4dee9;
-@define-color headerbar_border_color rgba(0.17254902, 0.15294118, 0.21568627, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #211e2a;
+@define-color dialog_fg_color #e4dee9;
+
+@define-color popover_bg_color #211e2a;
+@define-color popover_fg_color #e4dee9;
+
+
 @define-color sidebar_bg_color #2c2737;
 @define-color sidebar_fg_color #e4dee9;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #2c2737;
 @define-color card_fg_color #e4dee9;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #2c2737;
-@define-color dialog_fg_color #e4dee9;
-@define-color popover_bg_color #2c2737;
-@define-color popover_fg_color #e4dee9;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #3f3951;
-@define-color blue_1 #95a6f4;
-@define-color blue_2 #95a6f4;
-@define-color blue_3 #95a6f4;
-@define-color blue_4 #95a6f4;
-@define-color blue_5 #95a6f4;
-@define-color green_1 #b1f2a7;
-@define-color green_2 #b1f2a7;
-@define-color green_3 #b1f2a7;
-@define-color green_4 #b1f2a7;
-@define-color green_5 #b1f2a7;
-@define-color yellow_1 #ebde76;
-@define-color yellow_2 #ebde76;
-@define-color yellow_3 #ebde76;
-@define-color yellow_4 #ebde76;
-@define-color yellow_5 #ebde76;
-@define-color orange_1 #f4b870;
-@define-color orange_2 #f4b870;
-@define-color orange_3 #f4b870;
-@define-color orange_4 #f4b870;
-@define-color orange_5 #f4b870;
+
+
 @define-color red_1 #e965a5;
-@define-color red_2 #e965a5;
-@define-color red_3 #e965a5;
-@define-color red_4 #e965a5;
-@define-color red_5 #e965a5;
+@define-color green_1 #b1f2a7;
+@define-color yellow_1 #ebde76;
+@define-color blue_1 #95a6f4;
 @define-color purple_1 #ff79c6;
-@define-color purple_2 #ff79c6;
-@define-color purple_3 #ff79c6;
-@define-color purple_4 #ff79c6;
-@define-color purple_5 #ff79c6;
-@define-color brown_1 #bd93f9;
-@define-color brown_2 #bd93f9;
-@define-color brown_3 #bd93f9;
-@define-color brown_4 #bd93f9;
-@define-color brown_5 #bd93f9;
-@define-color light_1 #e4dee9;
-@define-color light_2 #e4dee9;
-@define-color light_3 #e4dee9;
-@define-color light_4 #e4dee9;
-@define-color light_5 #e4dee9;
-@define-color dark_1 #e4dee9;
-@define-color dark_2 #e4dee9;
-@define-color dark_3 #e4dee9;
-@define-color dark_4 #e4dee9;
-@define-color dark_5 #e4dee9;
+@define-color teal_1 #b3f4f3;
+@define-color orange_1 #f4b870;
+@define-color gray_1 #6e6780;
+
diff --git a/build/base16-harmonic16-dark.css b/build/base16-harmonic16-dark.css
index 19fde8c..127398e 100644
--- a/build/base16-harmonic16-dark.css
+++ b/build/base16-harmonic16-dark.css
@@ -1,88 +1,37 @@
 @define-color accent_color #8b56bf;
 @define-color accent_bg_color #8b56bf;
 @define-color accent_fg_color #0b1c2c;
-@define-color destructive_color #bf8b56;
-@define-color destructive_bg_color #bf8b56;
-@define-color destructive_fg_color #0b1c2c;
-@define-color success_color #56bf8b;
-@define-color success_bg_color #56bf8b;
-@define-color success_fg_color #0b1c2c;
-@define-color warning_color #bf568b;
-@define-color warning_bg_color #bf568b;
-@define-color warning_fg_color #0b1c2c;
-@define-color error_color #bf8b56;
-@define-color error_bg_color #bf8b56;
-@define-color error_fg_color #0b1c2c;
+
 @define-color window_bg_color #0b1c2c;
 @define-color window_fg_color #cbd6e2;
+
 @define-color view_bg_color #0b1c2c;
 @define-color view_fg_color #cbd6e2;
-@define-color headerbar_bg_color #223b54;
+
+@define-color headerbar_bg_color #0b1c2c;
 @define-color headerbar_fg_color #cbd6e2;
-@define-color headerbar_border_color rgba(0.13333333, 0.23137255, 0.32941176, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #0b1c2c;
+@define-color dialog_fg_color #cbd6e2;
+
+@define-color popover_bg_color #0b1c2c;
+@define-color popover_fg_color #cbd6e2;
+
+
 @define-color sidebar_bg_color #223b54;
 @define-color sidebar_fg_color #cbd6e2;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #223b54;
 @define-color card_fg_color #cbd6e2;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #223b54;
-@define-color dialog_fg_color #cbd6e2;
-@define-color popover_bg_color #223b54;
-@define-color popover_fg_color #cbd6e2;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #405c79;
-@define-color blue_1 #8b56bf;
-@define-color blue_2 #8b56bf;
-@define-color blue_3 #8b56bf;
-@define-color blue_4 #8b56bf;
-@define-color blue_5 #8b56bf;
-@define-color green_1 #56bf8b;
-@define-color green_2 #56bf8b;
-@define-color green_3 #56bf8b;
-@define-color green_4 #56bf8b;
-@define-color green_5 #56bf8b;
-@define-color yellow_1 #8bbf56;
-@define-color yellow_2 #8bbf56;
-@define-color yellow_3 #8bbf56;
-@define-color yellow_4 #8bbf56;
-@define-color yellow_5 #8bbf56;
-@define-color orange_1 #bfbf56;
-@define-color orange_2 #bfbf56;
-@define-color orange_3 #bfbf56;
-@define-color orange_4 #bfbf56;
-@define-color orange_5 #bfbf56;
+
+
 @define-color red_1 #bf8b56;
-@define-color red_2 #bf8b56;
-@define-color red_3 #bf8b56;
-@define-color red_4 #bf8b56;
-@define-color red_5 #bf8b56;
+@define-color green_1 #56bf8b;
+@define-color yellow_1 #8bbf56;
+@define-color blue_1 #8b56bf;
 @define-color purple_1 #bf568b;
-@define-color purple_2 #bf568b;
-@define-color purple_3 #bf568b;
-@define-color purple_4 #bf568b;
-@define-color purple_5 #bf568b;
-@define-color brown_1 #bf5656;
-@define-color brown_2 #bf5656;
-@define-color brown_3 #bf5656;
-@define-color brown_4 #bf5656;
-@define-color brown_5 #bf5656;
-@define-color light_1 #cbd6e2;
-@define-color light_2 #cbd6e2;
-@define-color light_3 #cbd6e2;
-@define-color light_4 #cbd6e2;
-@define-color light_5 #cbd6e2;
-@define-color dark_1 #cbd6e2;
-@define-color dark_2 #cbd6e2;
-@define-color dark_3 #cbd6e2;
-@define-color dark_4 #cbd6e2;
-@define-color dark_5 #cbd6e2;
+@define-color teal_1 #568bbf;
+@define-color orange_1 #bfbf56;
+@define-color gray_1 #627e99;
+
diff --git a/build/base16-harmonic16-light.css b/build/base16-harmonic16-light.css
index 74e6a57..09e2044 100644
--- a/build/base16-harmonic16-light.css
+++ b/build/base16-harmonic16-light.css
@@ -1,88 +1,37 @@
 @define-color accent_color #8b56bf;
 @define-color accent_bg_color #8b56bf;
 @define-color accent_fg_color #f7f9fb;
-@define-color destructive_color #bf8b56;
-@define-color destructive_bg_color #bf8b56;
-@define-color destructive_fg_color #f7f9fb;
-@define-color success_color #56bf8b;
-@define-color success_bg_color #56bf8b;
-@define-color success_fg_color #f7f9fb;
-@define-color warning_color #bf568b;
-@define-color warning_bg_color #bf568b;
-@define-color warning_fg_color #f7f9fb;
-@define-color error_color #bf8b56;
-@define-color error_bg_color #bf8b56;
-@define-color error_fg_color #f7f9fb;
+
 @define-color window_bg_color #f7f9fb;
 @define-color window_fg_color #405c79;
+
 @define-color view_bg_color #f7f9fb;
 @define-color view_fg_color #405c79;
-@define-color headerbar_bg_color #e5ebf1;
+
+@define-color headerbar_bg_color #f7f9fb;
 @define-color headerbar_fg_color #405c79;
-@define-color headerbar_border_color rgba(0.89803922, 0.92156863, 0.94509804, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #f7f9fb;
+@define-color dialog_fg_color #405c79;
+
+@define-color popover_bg_color #f7f9fb;
+@define-color popover_fg_color #405c79;
+
+
 @define-color sidebar_bg_color #e5ebf1;
 @define-color sidebar_fg_color #405c79;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #e5ebf1;
 @define-color card_fg_color #405c79;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #e5ebf1;
-@define-color dialog_fg_color #405c79;
-@define-color popover_bg_color #e5ebf1;
-@define-color popover_fg_color #405c79;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #cbd6e2;
-@define-color blue_1 #8b56bf;
-@define-color blue_2 #8b56bf;
-@define-color blue_3 #8b56bf;
-@define-color blue_4 #8b56bf;
-@define-color blue_5 #8b56bf;
-@define-color green_1 #56bf8b;
-@define-color green_2 #56bf8b;
-@define-color green_3 #56bf8b;
-@define-color green_4 #56bf8b;
-@define-color green_5 #56bf8b;
-@define-color yellow_1 #8bbf56;
-@define-color yellow_2 #8bbf56;
-@define-color yellow_3 #8bbf56;
-@define-color yellow_4 #8bbf56;
-@define-color yellow_5 #8bbf56;
-@define-color orange_1 #bfbf56;
-@define-color orange_2 #bfbf56;
-@define-color orange_3 #bfbf56;
-@define-color orange_4 #bfbf56;
-@define-color orange_5 #bfbf56;
+
+
 @define-color red_1 #bf8b56;
-@define-color red_2 #bf8b56;
-@define-color red_3 #bf8b56;
-@define-color red_4 #bf8b56;
-@define-color red_5 #bf8b56;
+@define-color green_1 #56bf8b;
+@define-color yellow_1 #8bbf56;
+@define-color blue_1 #8b56bf;
 @define-color purple_1 #bf568b;
-@define-color purple_2 #bf568b;
-@define-color purple_3 #bf568b;
-@define-color purple_4 #bf568b;
-@define-color purple_5 #bf568b;
-@define-color brown_1 #bf5656;
-@define-color brown_2 #bf5656;
-@define-color brown_3 #bf5656;
-@define-color brown_4 #bf5656;
-@define-color brown_5 #bf5656;
-@define-color light_1 #405c79;
-@define-color light_2 #405c79;
-@define-color light_3 #405c79;
-@define-color light_4 #405c79;
-@define-color light_5 #405c79;
-@define-color dark_1 #405c79;
-@define-color dark_2 #405c79;
-@define-color dark_3 #405c79;
-@define-color dark_4 #405c79;
-@define-color dark_5 #405c79;
+@define-color teal_1 #568bbf;
+@define-color orange_1 #bfbf56;
+@define-color gray_1 #aabcce;
+
diff --git a/build/base16-heetch-light.css b/build/base16-heetch-light.css
index f89dcb7..e7349c6 100644
--- a/build/base16-heetch-light.css
+++ b/build/base16-heetch-light.css
@@ -1,88 +1,37 @@
 @define-color accent_color #5ba2b6;
 @define-color accent_bg_color #5ba2b6;
 @define-color accent_fg_color #feffff;
-@define-color destructive_color #f80059;
-@define-color destructive_bg_color #f80059;
-@define-color destructive_fg_color #feffff;
-@define-color success_color #5bb66a;
-@define-color success_bg_color #5bb66a;
-@define-color success_fg_color #feffff;
-@define-color warning_color #8f6c97;
-@define-color warning_bg_color #8f6c97;
-@define-color warning_fg_color #feffff;
-@define-color error_color #f80059;
-@define-color error_bg_color #f80059;
-@define-color error_fg_color #feffff;
+
 @define-color window_bg_color #feffff;
 @define-color window_fg_color #5a496e;
+
 @define-color view_bg_color #feffff;
 @define-color view_fg_color #5a496e;
-@define-color headerbar_bg_color #dedae2;
+
+@define-color headerbar_bg_color #feffff;
 @define-color headerbar_fg_color #5a496e;
-@define-color headerbar_border_color rgba(0.87058824, 0.85490196, 0.88627451, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #feffff;
+@define-color dialog_fg_color #5a496e;
+
+@define-color popover_bg_color #feffff;
+@define-color popover_fg_color #5a496e;
+
+
 @define-color sidebar_bg_color #dedae2;
 @define-color sidebar_fg_color #5a496e;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #dedae2;
 @define-color card_fg_color #5a496e;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #dedae2;
-@define-color dialog_fg_color #5a496e;
-@define-color popover_bg_color #dedae2;
-@define-color popover_fg_color #5a496e;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #bdb6c5;
-@define-color blue_1 #5ba2b6;
-@define-color blue_2 #5ba2b6;
-@define-color blue_3 #5ba2b6;
-@define-color blue_4 #5ba2b6;
-@define-color blue_5 #5ba2b6;
-@define-color green_1 #5bb66a;
-@define-color green_2 #5bb66a;
-@define-color green_3 #5bb66a;
-@define-color green_4 #5bb66a;
-@define-color green_5 #5bb66a;
-@define-color yellow_1 #bd9701;
-@define-color yellow_2 #bd9701;
-@define-color yellow_3 #bd9701;
-@define-color yellow_4 #bd9701;
-@define-color yellow_5 #bd9701;
-@define-color orange_1 #bd0152;
-@define-color orange_2 #bd0152;
-@define-color orange_3 #bd0152;
-@define-color orange_4 #bd0152;
-@define-color orange_5 #bd0152;
+
+
 @define-color red_1 #f80059;
-@define-color red_2 #f80059;
-@define-color red_3 #f80059;
-@define-color red_4 #f80059;
-@define-color red_5 #f80059;
+@define-color green_1 #5bb66a;
+@define-color yellow_1 #bd9701;
+@define-color blue_1 #5ba2b6;
 @define-color purple_1 #8f6c97;
-@define-color purple_2 #8f6c97;
-@define-color purple_3 #8f6c97;
-@define-color purple_4 #8f6c97;
-@define-color purple_5 #8f6c97;
-@define-color brown_1 #58425d;
-@define-color brown_2 #58425d;
-@define-color brown_3 #58425d;
-@define-color brown_4 #58425d;
-@define-color brown_5 #58425d;
-@define-color light_1 #5a496e;
-@define-color light_2 #5a496e;
-@define-color light_3 #5a496e;
-@define-color light_4 #5a496e;
-@define-color light_5 #5a496e;
-@define-color dark_1 #5a496e;
-@define-color dark_2 #5a496e;
-@define-color dark_3 #5a496e;
-@define-color dark_4 #5a496e;
-@define-color dark_5 #5a496e;
+@define-color teal_1 #47f9f5;
+@define-color orange_1 #bd0152;
+@define-color gray_1 #9c92a8;
+
diff --git a/build/base16-heetch.css b/build/base16-heetch.css
index 75d69c9..e68c084 100644
--- a/build/base16-heetch.css
+++ b/build/base16-heetch.css
@@ -1,88 +1,37 @@
 @define-color accent_color #bd0152;
 @define-color accent_bg_color #bd0152;
 @define-color accent_fg_color #190134;
-@define-color destructive_color #27d9d5;
-@define-color destructive_bg_color #27d9d5;
-@define-color destructive_fg_color #190134;
-@define-color success_color #c33678;
-@define-color success_bg_color #c33678;
-@define-color success_fg_color #190134;
-@define-color warning_color #82034c;
-@define-color warning_bg_color #82034c;
-@define-color warning_fg_color #190134;
-@define-color error_color #27d9d5;
-@define-color error_bg_color #27d9d5;
-@define-color error_fg_color #190134;
+
 @define-color window_bg_color #190134;
 @define-color window_fg_color #bdb6c5;
+
 @define-color view_bg_color #190134;
 @define-color view_fg_color #bdb6c5;
-@define-color headerbar_bg_color #392551;
+
+@define-color headerbar_bg_color #190134;
 @define-color headerbar_fg_color #bdb6c5;
-@define-color headerbar_border_color rgba(0.22352941, 0.14509804, 0.31764706, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #190134;
+@define-color dialog_fg_color #bdb6c5;
+
+@define-color popover_bg_color #190134;
+@define-color popover_fg_color #bdb6c5;
+
+
 @define-color sidebar_bg_color #392551;
 @define-color sidebar_fg_color #bdb6c5;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #392551;
 @define-color card_fg_color #bdb6c5;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #392551;
-@define-color dialog_fg_color #bdb6c5;
-@define-color popover_bg_color #392551;
-@define-color popover_fg_color #bdb6c5;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #5a496e;
-@define-color blue_1 #bd0152;
-@define-color blue_2 #bd0152;
-@define-color blue_3 #bd0152;
-@define-color blue_4 #bd0152;
-@define-color blue_5 #bd0152;
-@define-color green_1 #c33678;
-@define-color green_2 #c33678;
-@define-color green_3 #c33678;
-@define-color green_4 #c33678;
-@define-color green_5 #c33678;
-@define-color yellow_1 #8f6c97;
-@define-color yellow_2 #8f6c97;
-@define-color yellow_3 #8f6c97;
-@define-color yellow_4 #8f6c97;
-@define-color yellow_5 #8f6c97;
-@define-color orange_1 #5ba2b6;
-@define-color orange_2 #5ba2b6;
-@define-color orange_3 #5ba2b6;
-@define-color orange_4 #5ba2b6;
-@define-color orange_5 #5ba2b6;
+
+
 @define-color red_1 #27d9d5;
-@define-color red_2 #27d9d5;
-@define-color red_3 #27d9d5;
-@define-color red_4 #27d9d5;
-@define-color red_5 #27d9d5;
+@define-color green_1 #c33678;
+@define-color yellow_1 #8f6c97;
+@define-color blue_1 #bd0152;
 @define-color purple_1 #82034c;
-@define-color purple_2 #82034c;
-@define-color purple_3 #82034c;
-@define-color purple_4 #82034c;
-@define-color purple_5 #82034c;
-@define-color brown_1 #470546;
-@define-color brown_2 #470546;
-@define-color brown_3 #470546;
-@define-color brown_4 #470546;
-@define-color brown_5 #470546;
-@define-color light_1 #bdb6c5;
-@define-color light_2 #bdb6c5;
-@define-color light_3 #bdb6c5;
-@define-color light_4 #bdb6c5;
-@define-color light_5 #bdb6c5;
-@define-color dark_1 #bdb6c5;
-@define-color dark_2 #bdb6c5;
-@define-color dark_3 #bdb6c5;
-@define-color dark_4 #bdb6c5;
-@define-color dark_5 #bdb6c5;
+@define-color teal_1 #f80059;
+@define-color orange_1 #5ba2b6;
+@define-color gray_1 #7b6d8b;
+
diff --git a/build/base16-helios.css b/build/base16-helios.css
index 9d95f83..95e4091 100644
--- a/build/base16-helios.css
+++ b/build/base16-helios.css
@@ -1,88 +1,37 @@
 @define-color accent_color #1e8bac;
 @define-color accent_bg_color #1e8bac;
 @define-color accent_fg_color #1d2021;
-@define-color destructive_color #d72638;
-@define-color destructive_bg_color #d72638;
-@define-color destructive_fg_color #1d2021;
-@define-color success_color #88b92d;
-@define-color success_bg_color #88b92d;
-@define-color success_fg_color #1d2021;
-@define-color warning_color #be4264;
-@define-color warning_bg_color #be4264;
-@define-color warning_fg_color #1d2021;
-@define-color error_color #d72638;
-@define-color error_bg_color #d72638;
-@define-color error_fg_color #1d2021;
+
 @define-color window_bg_color #1d2021;
 @define-color window_fg_color #d5d5d5;
+
 @define-color view_bg_color #1d2021;
 @define-color view_fg_color #d5d5d5;
-@define-color headerbar_bg_color #383c3e;
+
+@define-color headerbar_bg_color #1d2021;
 @define-color headerbar_fg_color #d5d5d5;
-@define-color headerbar_border_color rgba(0.21960784, 0.23529412, 0.24313725, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #1d2021;
+@define-color dialog_fg_color #d5d5d5;
+
+@define-color popover_bg_color #1d2021;
+@define-color popover_fg_color #d5d5d5;
+
+
 @define-color sidebar_bg_color #383c3e;
 @define-color sidebar_fg_color #d5d5d5;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #383c3e;
 @define-color card_fg_color #d5d5d5;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #383c3e;
-@define-color dialog_fg_color #d5d5d5;
-@define-color popover_bg_color #383c3e;
-@define-color popover_fg_color #d5d5d5;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #53585b;
-@define-color blue_1 #1e8bac;
-@define-color blue_2 #1e8bac;
-@define-color blue_3 #1e8bac;
-@define-color blue_4 #1e8bac;
-@define-color blue_5 #1e8bac;
-@define-color green_1 #88b92d;
-@define-color green_2 #88b92d;
-@define-color green_3 #88b92d;
-@define-color green_4 #88b92d;
-@define-color green_5 #88b92d;
-@define-color yellow_1 #f19d1a;
-@define-color yellow_2 #f19d1a;
-@define-color yellow_3 #f19d1a;
-@define-color yellow_4 #f19d1a;
-@define-color yellow_5 #f19d1a;
-@define-color orange_1 #eb8413;
-@define-color orange_2 #eb8413;
-@define-color orange_3 #eb8413;
-@define-color orange_4 #eb8413;
-@define-color orange_5 #eb8413;
+
+
 @define-color red_1 #d72638;
-@define-color red_2 #d72638;
-@define-color red_3 #d72638;
-@define-color red_4 #d72638;
-@define-color red_5 #d72638;
+@define-color green_1 #88b92d;
+@define-color yellow_1 #f19d1a;
+@define-color blue_1 #1e8bac;
 @define-color purple_1 #be4264;
-@define-color purple_2 #be4264;
-@define-color purple_3 #be4264;
-@define-color purple_4 #be4264;
-@define-color purple_5 #be4264;
-@define-color brown_1 #c85e0d;
-@define-color brown_2 #c85e0d;
-@define-color brown_3 #c85e0d;
-@define-color brown_4 #c85e0d;
-@define-color brown_5 #c85e0d;
-@define-color light_1 #d5d5d5;
-@define-color light_2 #d5d5d5;
-@define-color light_3 #d5d5d5;
-@define-color light_4 #d5d5d5;
-@define-color light_5 #d5d5d5;
-@define-color dark_1 #d5d5d5;
-@define-color dark_2 #d5d5d5;
-@define-color dark_3 #d5d5d5;
-@define-color dark_4 #d5d5d5;
-@define-color dark_5 #d5d5d5;
+@define-color teal_1 #1ba595;
+@define-color orange_1 #eb8413;
+@define-color gray_1 #6f7579;
+
diff --git a/build/base16-hopscotch.css b/build/base16-hopscotch.css
index 2db704b..09a23c4 100644
--- a/build/base16-hopscotch.css
+++ b/build/base16-hopscotch.css
@@ -1,88 +1,37 @@
 @define-color accent_color #1290bf;
 @define-color accent_bg_color #1290bf;
 @define-color accent_fg_color #322931;
-@define-color destructive_color #dd464c;
-@define-color destructive_bg_color #dd464c;
-@define-color destructive_fg_color #322931;
-@define-color success_color #8fc13e;
-@define-color success_bg_color #8fc13e;
-@define-color success_fg_color #322931;
-@define-color warning_color #c85e7c;
-@define-color warning_bg_color #c85e7c;
-@define-color warning_fg_color #322931;
-@define-color error_color #dd464c;
-@define-color error_bg_color #dd464c;
-@define-color error_fg_color #322931;
+
 @define-color window_bg_color #322931;
 @define-color window_fg_color #b9b5b8;
+
 @define-color view_bg_color #322931;
 @define-color view_fg_color #b9b5b8;
-@define-color headerbar_bg_color #433b42;
+
+@define-color headerbar_bg_color #322931;
 @define-color headerbar_fg_color #b9b5b8;
-@define-color headerbar_border_color rgba(0.26274510, 0.23137255, 0.25882353, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #322931;
+@define-color dialog_fg_color #b9b5b8;
+
+@define-color popover_bg_color #322931;
+@define-color popover_fg_color #b9b5b8;
+
+
 @define-color sidebar_bg_color #433b42;
 @define-color sidebar_fg_color #b9b5b8;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #433b42;
 @define-color card_fg_color #b9b5b8;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #433b42;
-@define-color dialog_fg_color #b9b5b8;
-@define-color popover_bg_color #433b42;
-@define-color popover_fg_color #b9b5b8;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #5c545b;
-@define-color blue_1 #1290bf;
-@define-color blue_2 #1290bf;
-@define-color blue_3 #1290bf;
-@define-color blue_4 #1290bf;
-@define-color blue_5 #1290bf;
-@define-color green_1 #8fc13e;
-@define-color green_2 #8fc13e;
-@define-color green_3 #8fc13e;
-@define-color green_4 #8fc13e;
-@define-color green_5 #8fc13e;
-@define-color yellow_1 #fdcc59;
-@define-color yellow_2 #fdcc59;
-@define-color yellow_3 #fdcc59;
-@define-color yellow_4 #fdcc59;
-@define-color yellow_5 #fdcc59;
-@define-color orange_1 #fd8b19;
-@define-color orange_2 #fd8b19;
-@define-color orange_3 #fd8b19;
-@define-color orange_4 #fd8b19;
-@define-color orange_5 #fd8b19;
+
+
 @define-color red_1 #dd464c;
-@define-color red_2 #dd464c;
-@define-color red_3 #dd464c;
-@define-color red_4 #dd464c;
-@define-color red_5 #dd464c;
+@define-color green_1 #8fc13e;
+@define-color yellow_1 #fdcc59;
+@define-color blue_1 #1290bf;
 @define-color purple_1 #c85e7c;
-@define-color purple_2 #c85e7c;
-@define-color purple_3 #c85e7c;
-@define-color purple_4 #c85e7c;
-@define-color purple_5 #c85e7c;
-@define-color brown_1 #b33508;
-@define-color brown_2 #b33508;
-@define-color brown_3 #b33508;
-@define-color brown_4 #b33508;
-@define-color brown_5 #b33508;
-@define-color light_1 #b9b5b8;
-@define-color light_2 #b9b5b8;
-@define-color light_3 #b9b5b8;
-@define-color light_4 #b9b5b8;
-@define-color light_5 #b9b5b8;
-@define-color dark_1 #b9b5b8;
-@define-color dark_2 #b9b5b8;
-@define-color dark_3 #b9b5b8;
-@define-color dark_4 #b9b5b8;
-@define-color dark_5 #b9b5b8;
+@define-color teal_1 #149b93;
+@define-color orange_1 #fd8b19;
+@define-color gray_1 #797379;
+
diff --git a/build/base16-horizon-dark.css b/build/base16-horizon-dark.css
index 3332474..3c8697c 100644
--- a/build/base16-horizon-dark.css
+++ b/build/base16-horizon-dark.css
@@ -1,88 +1,37 @@
 @define-color accent_color #df5273;
 @define-color accent_bg_color #df5273;
 @define-color accent_fg_color #1c1e26;
-@define-color destructive_color #e93c58;
-@define-color destructive_bg_color #e93c58;
-@define-color destructive_fg_color #1c1e26;
-@define-color success_color #efaf8e;
-@define-color success_bg_color #efaf8e;
-@define-color success_fg_color #1c1e26;
-@define-color warning_color #b072d1;
-@define-color warning_bg_color #b072d1;
-@define-color warning_fg_color #1c1e26;
-@define-color error_color #e93c58;
-@define-color error_bg_color #e93c58;
-@define-color error_fg_color #1c1e26;
+
 @define-color window_bg_color #1c1e26;
 @define-color window_fg_color #cbced0;
+
 @define-color view_bg_color #1c1e26;
 @define-color view_fg_color #cbced0;
-@define-color headerbar_bg_color #232530;
+
+@define-color headerbar_bg_color #1c1e26;
 @define-color headerbar_fg_color #cbced0;
-@define-color headerbar_border_color rgba(0.13725490, 0.14509804, 0.18823529, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #1c1e26;
+@define-color dialog_fg_color #cbced0;
+
+@define-color popover_bg_color #1c1e26;
+@define-color popover_fg_color #cbced0;
+
+
 @define-color sidebar_bg_color #232530;
 @define-color sidebar_fg_color #cbced0;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #232530;
 @define-color card_fg_color #cbced0;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #232530;
-@define-color dialog_fg_color #cbced0;
-@define-color popover_bg_color #232530;
-@define-color popover_fg_color #cbced0;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #2e303e;
-@define-color blue_1 #df5273;
-@define-color blue_2 #df5273;
-@define-color blue_3 #df5273;
-@define-color blue_4 #df5273;
-@define-color blue_5 #df5273;
-@define-color green_1 #efaf8e;
-@define-color green_2 #efaf8e;
-@define-color green_3 #efaf8e;
-@define-color green_4 #efaf8e;
-@define-color green_5 #efaf8e;
-@define-color yellow_1 #efb993;
-@define-color yellow_2 #efb993;
-@define-color yellow_3 #efb993;
-@define-color yellow_4 #efb993;
-@define-color yellow_5 #efb993;
-@define-color orange_1 #e58d7d;
-@define-color orange_2 #e58d7d;
-@define-color orange_3 #e58d7d;
-@define-color orange_4 #e58d7d;
-@define-color orange_5 #e58d7d;
+
+
 @define-color red_1 #e93c58;
-@define-color red_2 #e93c58;
-@define-color red_3 #e93c58;
-@define-color red_4 #e93c58;
-@define-color red_5 #e93c58;
+@define-color green_1 #efaf8e;
+@define-color yellow_1 #efb993;
+@define-color blue_1 #df5273;
 @define-color purple_1 #b072d1;
-@define-color purple_2 #b072d1;
-@define-color purple_3 #b072d1;
-@define-color purple_4 #b072d1;
-@define-color purple_5 #b072d1;
-@define-color brown_1 #e4a382;
-@define-color brown_2 #e4a382;
-@define-color brown_3 #e4a382;
-@define-color brown_4 #e4a382;
-@define-color brown_5 #e4a382;
-@define-color light_1 #cbced0;
-@define-color light_2 #cbced0;
-@define-color light_3 #cbced0;
-@define-color light_4 #cbced0;
-@define-color light_5 #cbced0;
-@define-color dark_1 #cbced0;
-@define-color dark_2 #cbced0;
-@define-color dark_3 #cbced0;
-@define-color dark_4 #cbced0;
-@define-color dark_5 #cbced0;
+@define-color teal_1 #24a8b4;
+@define-color orange_1 #e58d7d;
+@define-color gray_1 #6f6f70;
+
diff --git a/build/base16-horizon-light.css b/build/base16-horizon-light.css
index f916d94..062db5d 100644
--- a/build/base16-horizon-light.css
+++ b/build/base16-horizon-light.css
@@ -1,88 +1,37 @@
 @define-color accent_color #da103f;
 @define-color accent_bg_color #da103f;
 @define-color accent_fg_color #fdf0ed;
-@define-color destructive_color #f7939b;
-@define-color destructive_bg_color #f7939b;
-@define-color destructive_fg_color #fdf0ed;
-@define-color success_color #94e1b0;
-@define-color success_bg_color #94e1b0;
-@define-color success_fg_color #fdf0ed;
-@define-color warning_color #1d8991;
-@define-color warning_bg_color #1d8991;
-@define-color warning_fg_color #fdf0ed;
-@define-color error_color #f7939b;
-@define-color error_bg_color #f7939b;
-@define-color error_fg_color #fdf0ed;
+
 @define-color window_bg_color #fdf0ed;
 @define-color window_fg_color #403c3d;
+
 @define-color view_bg_color #fdf0ed;
 @define-color view_fg_color #403c3d;
-@define-color headerbar_bg_color #fadad1;
+
+@define-color headerbar_bg_color #fdf0ed;
 @define-color headerbar_fg_color #403c3d;
-@define-color headerbar_border_color rgba(0.98039216, 0.85490196, 0.81960784, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #fdf0ed;
+@define-color dialog_fg_color #403c3d;
+
+@define-color popover_bg_color #fdf0ed;
+@define-color popover_fg_color #403c3d;
+
+
 @define-color sidebar_bg_color #fadad1;
 @define-color sidebar_fg_color #403c3d;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #fadad1;
 @define-color card_fg_color #403c3d;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #fadad1;
-@define-color dialog_fg_color #403c3d;
-@define-color popover_bg_color #fadad1;
-@define-color popover_fg_color #403c3d;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #f9cbbe;
-@define-color blue_1 #da103f;
-@define-color blue_2 #da103f;
-@define-color blue_3 #da103f;
-@define-color blue_4 #da103f;
-@define-color blue_5 #da103f;
-@define-color green_1 #94e1b0;
-@define-color green_2 #94e1b0;
-@define-color green_3 #94e1b0;
-@define-color green_4 #94e1b0;
-@define-color green_5 #94e1b0;
-@define-color yellow_1 #fbe0d9;
-@define-color yellow_2 #fbe0d9;
-@define-color yellow_3 #fbe0d9;
-@define-color yellow_4 #fbe0d9;
-@define-color yellow_5 #fbe0d9;
-@define-color orange_1 #f6661e;
-@define-color orange_2 #f6661e;
-@define-color orange_3 #f6661e;
-@define-color orange_4 #f6661e;
-@define-color orange_5 #f6661e;
+
+
 @define-color red_1 #f7939b;
-@define-color red_2 #f7939b;
-@define-color red_3 #f7939b;
-@define-color red_4 #f7939b;
-@define-color red_5 #f7939b;
+@define-color green_1 #94e1b0;
+@define-color yellow_1 #fbe0d9;
+@define-color blue_1 #da103f;
 @define-color purple_1 #1d8991;
-@define-color purple_2 #1d8991;
-@define-color purple_3 #1d8991;
-@define-color purple_4 #1d8991;
-@define-color purple_5 #1d8991;
-@define-color brown_1 #e58c92;
-@define-color brown_2 #e58c92;
-@define-color brown_3 #e58c92;
-@define-color brown_4 #e58c92;
-@define-color brown_5 #e58c92;
-@define-color light_1 #403c3d;
-@define-color light_2 #403c3d;
-@define-color light_3 #403c3d;
-@define-color light_4 #403c3d;
-@define-color light_5 #403c3d;
-@define-color dark_1 #403c3d;
-@define-color dark_2 #403c3d;
-@define-color dark_3 #403c3d;
-@define-color dark_4 #403c3d;
-@define-color dark_5 #403c3d;
+@define-color teal_1 #dc3318;
+@define-color orange_1 #f6661e;
+@define-color gray_1 #bdb3b1;
+
diff --git a/build/base16-horizon-terminal-dark.css b/build/base16-horizon-terminal-dark.css
index b9b5762..4d878ed 100644
--- a/build/base16-horizon-terminal-dark.css
+++ b/build/base16-horizon-terminal-dark.css
@@ -1,88 +1,37 @@
 @define-color accent_color #26bbd9;
 @define-color accent_bg_color #26bbd9;
 @define-color accent_fg_color #1c1e26;
-@define-color destructive_color #e95678;
-@define-color destructive_bg_color #e95678;
-@define-color destructive_fg_color #1c1e26;
-@define-color success_color #29d398;
-@define-color success_bg_color #29d398;
-@define-color success_fg_color #1c1e26;
-@define-color warning_color #ee64ac;
-@define-color warning_bg_color #ee64ac;
-@define-color warning_fg_color #1c1e26;
-@define-color error_color #e95678;
-@define-color error_bg_color #e95678;
-@define-color error_fg_color #1c1e26;
+
 @define-color window_bg_color #1c1e26;
 @define-color window_fg_color #cbced0;
+
 @define-color view_bg_color #1c1e26;
 @define-color view_fg_color #cbced0;
-@define-color headerbar_bg_color #232530;
+
+@define-color headerbar_bg_color #1c1e26;
 @define-color headerbar_fg_color #cbced0;
-@define-color headerbar_border_color rgba(0.13725490, 0.14509804, 0.18823529, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #1c1e26;
+@define-color dialog_fg_color #cbced0;
+
+@define-color popover_bg_color #1c1e26;
+@define-color popover_fg_color #cbced0;
+
+
 @define-color sidebar_bg_color #232530;
 @define-color sidebar_fg_color #cbced0;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #232530;
 @define-color card_fg_color #cbced0;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #232530;
-@define-color dialog_fg_color #cbced0;
-@define-color popover_bg_color #232530;
-@define-color popover_fg_color #cbced0;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #2e303e;
-@define-color blue_1 #26bbd9;
-@define-color blue_2 #26bbd9;
-@define-color blue_3 #26bbd9;
-@define-color blue_4 #26bbd9;
-@define-color blue_5 #26bbd9;
-@define-color green_1 #29d398;
-@define-color green_2 #29d398;
-@define-color green_3 #29d398;
-@define-color green_4 #29d398;
-@define-color green_5 #29d398;
-@define-color yellow_1 #fac29a;
-@define-color yellow_2 #fac29a;
-@define-color yellow_3 #fac29a;
-@define-color yellow_4 #fac29a;
-@define-color yellow_5 #fac29a;
-@define-color orange_1 #fab795;
-@define-color orange_2 #fab795;
-@define-color orange_3 #fab795;
-@define-color orange_4 #fab795;
-@define-color orange_5 #fab795;
+
+
 @define-color red_1 #e95678;
-@define-color red_2 #e95678;
-@define-color red_3 #e95678;
-@define-color red_4 #e95678;
-@define-color red_5 #e95678;
+@define-color green_1 #29d398;
+@define-color yellow_1 #fac29a;
+@define-color blue_1 #26bbd9;
 @define-color purple_1 #ee64ac;
-@define-color purple_2 #ee64ac;
-@define-color purple_3 #ee64ac;
-@define-color purple_4 #ee64ac;
-@define-color purple_5 #ee64ac;
-@define-color brown_1 #f09383;
-@define-color brown_2 #f09383;
-@define-color brown_3 #f09383;
-@define-color brown_4 #f09383;
-@define-color brown_5 #f09383;
-@define-color light_1 #cbced0;
-@define-color light_2 #cbced0;
-@define-color light_3 #cbced0;
-@define-color light_4 #cbced0;
-@define-color light_5 #cbced0;
-@define-color dark_1 #cbced0;
-@define-color dark_2 #cbced0;
-@define-color dark_3 #cbced0;
-@define-color dark_4 #cbced0;
-@define-color dark_5 #cbced0;
+@define-color teal_1 #59e1e3;
+@define-color orange_1 #fab795;
+@define-color gray_1 #6f6f70;
+
diff --git a/build/base16-horizon-terminal-light.css b/build/base16-horizon-terminal-light.css
index 3c6f16b..d7c08d9 100644
--- a/build/base16-horizon-terminal-light.css
+++ b/build/base16-horizon-terminal-light.css
@@ -1,88 +1,37 @@
 @define-color accent_color #26bbd9;
 @define-color accent_bg_color #26bbd9;
 @define-color accent_fg_color #fdf0ed;
-@define-color destructive_color #e95678;
-@define-color destructive_bg_color #e95678;
-@define-color destructive_fg_color #fdf0ed;
-@define-color success_color #29d398;
-@define-color success_bg_color #29d398;
-@define-color success_fg_color #fdf0ed;
-@define-color warning_color #ee64ac;
-@define-color warning_bg_color #ee64ac;
-@define-color warning_fg_color #fdf0ed;
-@define-color error_color #e95678;
-@define-color error_bg_color #e95678;
-@define-color error_fg_color #fdf0ed;
+
 @define-color window_bg_color #fdf0ed;
 @define-color window_fg_color #403c3d;
+
 @define-color view_bg_color #fdf0ed;
 @define-color view_fg_color #403c3d;
-@define-color headerbar_bg_color #fadad1;
+
+@define-color headerbar_bg_color #fdf0ed;
 @define-color headerbar_fg_color #403c3d;
-@define-color headerbar_border_color rgba(0.98039216, 0.85490196, 0.81960784, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #fdf0ed;
+@define-color dialog_fg_color #403c3d;
+
+@define-color popover_bg_color #fdf0ed;
+@define-color popover_fg_color #403c3d;
+
+
 @define-color sidebar_bg_color #fadad1;
 @define-color sidebar_fg_color #403c3d;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #fadad1;
 @define-color card_fg_color #403c3d;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #fadad1;
-@define-color dialog_fg_color #403c3d;
-@define-color popover_bg_color #fadad1;
-@define-color popover_fg_color #403c3d;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #f9cbbe;
-@define-color blue_1 #26bbd9;
-@define-color blue_2 #26bbd9;
-@define-color blue_3 #26bbd9;
-@define-color blue_4 #26bbd9;
-@define-color blue_5 #26bbd9;
-@define-color green_1 #29d398;
-@define-color green_2 #29d398;
-@define-color green_3 #29d398;
-@define-color green_4 #29d398;
-@define-color green_5 #29d398;
-@define-color yellow_1 #fadad1;
-@define-color yellow_2 #fadad1;
-@define-color yellow_3 #fadad1;
-@define-color yellow_4 #fadad1;
-@define-color yellow_5 #fadad1;
-@define-color orange_1 #f9cec3;
-@define-color orange_2 #f9cec3;
-@define-color orange_3 #f9cec3;
-@define-color orange_4 #f9cec3;
-@define-color orange_5 #f9cec3;
+
+
 @define-color red_1 #e95678;
-@define-color red_2 #e95678;
-@define-color red_3 #e95678;
-@define-color red_4 #e95678;
-@define-color red_5 #e95678;
+@define-color green_1 #29d398;
+@define-color yellow_1 #fadad1;
+@define-color blue_1 #26bbd9;
 @define-color purple_1 #ee64ac;
-@define-color purple_2 #ee64ac;
-@define-color purple_3 #ee64ac;
-@define-color purple_4 #ee64ac;
-@define-color purple_5 #ee64ac;
-@define-color brown_1 #f9cbbe;
-@define-color brown_2 #f9cbbe;
-@define-color brown_3 #f9cbbe;
-@define-color brown_4 #f9cbbe;
-@define-color brown_5 #f9cbbe;
-@define-color light_1 #403c3d;
-@define-color light_2 #403c3d;
-@define-color light_3 #403c3d;
-@define-color light_4 #403c3d;
-@define-color light_5 #403c3d;
-@define-color dark_1 #403c3d;
-@define-color dark_2 #403c3d;
-@define-color dark_3 #403c3d;
-@define-color dark_4 #403c3d;
-@define-color dark_5 #403c3d;
+@define-color teal_1 #59e1e3;
+@define-color orange_1 #f9cec3;
+@define-color gray_1 #bdb3b1;
+
diff --git a/build/base16-humanoid-dark.css b/build/base16-humanoid-dark.css
index e427703..8e09d05 100644
--- a/build/base16-humanoid-dark.css
+++ b/build/base16-humanoid-dark.css
@@ -1,88 +1,37 @@
 @define-color accent_color #00a6fb;
 @define-color accent_bg_color #00a6fb;
 @define-color accent_fg_color #232629;
-@define-color destructive_color #f11235;
-@define-color destructive_bg_color #f11235;
-@define-color destructive_fg_color #232629;
-@define-color success_color #02d849;
-@define-color success_bg_color #02d849;
-@define-color success_fg_color #232629;
-@define-color warning_color #f15ee3;
-@define-color warning_bg_color #f15ee3;
-@define-color warning_fg_color #232629;
-@define-color error_color #f11235;
-@define-color error_bg_color #f11235;
-@define-color error_fg_color #232629;
+
 @define-color window_bg_color #232629;
 @define-color window_fg_color #f8f8f2;
+
 @define-color view_bg_color #232629;
 @define-color view_fg_color #f8f8f2;
-@define-color headerbar_bg_color #333b3d;
+
+@define-color headerbar_bg_color #232629;
 @define-color headerbar_fg_color #f8f8f2;
-@define-color headerbar_border_color rgba(0.20000000, 0.23137255, 0.23921569, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #232629;
+@define-color dialog_fg_color #f8f8f2;
+
+@define-color popover_bg_color #232629;
+@define-color popover_fg_color #f8f8f2;
+
+
 @define-color sidebar_bg_color #333b3d;
 @define-color sidebar_fg_color #f8f8f2;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #333b3d;
 @define-color card_fg_color #f8f8f2;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #333b3d;
-@define-color dialog_fg_color #f8f8f2;
-@define-color popover_bg_color #333b3d;
-@define-color popover_fg_color #f8f8f2;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #484e54;
-@define-color blue_1 #00a6fb;
-@define-color blue_2 #00a6fb;
-@define-color blue_3 #00a6fb;
-@define-color blue_4 #00a6fb;
-@define-color blue_5 #00a6fb;
-@define-color green_1 #02d849;
-@define-color green_2 #02d849;
-@define-color green_3 #02d849;
-@define-color green_4 #02d849;
-@define-color green_5 #02d849;
-@define-color yellow_1 #ffb627;
-@define-color yellow_2 #ffb627;
-@define-color yellow_3 #ffb627;
-@define-color yellow_4 #ffb627;
-@define-color yellow_5 #ffb627;
-@define-color orange_1 #ff9505;
-@define-color orange_2 #ff9505;
-@define-color orange_3 #ff9505;
-@define-color orange_4 #ff9505;
-@define-color orange_5 #ff9505;
+
+
 @define-color red_1 #f11235;
-@define-color red_2 #f11235;
-@define-color red_3 #f11235;
-@define-color red_4 #f11235;
-@define-color red_5 #f11235;
+@define-color green_1 #02d849;
+@define-color yellow_1 #ffb627;
+@define-color blue_1 #00a6fb;
 @define-color purple_1 #f15ee3;
-@define-color purple_2 #f15ee3;
-@define-color purple_3 #f15ee3;
-@define-color purple_4 #f15ee3;
-@define-color purple_5 #f15ee3;
-@define-color brown_1 #b27701;
-@define-color brown_2 #b27701;
-@define-color brown_3 #b27701;
-@define-color brown_4 #b27701;
-@define-color brown_5 #b27701;
-@define-color light_1 #f8f8f2;
-@define-color light_2 #f8f8f2;
-@define-color light_3 #f8f8f2;
-@define-color light_4 #f8f8f2;
-@define-color light_5 #f8f8f2;
-@define-color dark_1 #f8f8f2;
-@define-color dark_2 #f8f8f2;
-@define-color dark_3 #f8f8f2;
-@define-color dark_4 #f8f8f2;
-@define-color dark_5 #f8f8f2;
+@define-color teal_1 #0dd9d6;
+@define-color orange_1 #ff9505;
+@define-color gray_1 #60615d;
+
diff --git a/build/base16-humanoid-light.css b/build/base16-humanoid-light.css
index cae42b4..4b747a1 100644
--- a/build/base16-humanoid-light.css
+++ b/build/base16-humanoid-light.css
@@ -1,88 +1,37 @@
 @define-color accent_color #0082c9;
 @define-color accent_bg_color #0082c9;
 @define-color accent_fg_color #f8f8f2;
-@define-color destructive_color #b0151a;
-@define-color destructive_bg_color #b0151a;
-@define-color destructive_fg_color #f8f8f2;
-@define-color success_color #388e3c;
-@define-color success_bg_color #388e3c;
-@define-color success_fg_color #f8f8f2;
-@define-color warning_color #700f98;
-@define-color warning_bg_color #700f98;
-@define-color warning_fg_color #f8f8f2;
-@define-color error_color #b0151a;
-@define-color error_bg_color #b0151a;
-@define-color error_fg_color #f8f8f2;
+
 @define-color window_bg_color #f8f8f2;
 @define-color window_fg_color #232629;
+
 @define-color view_bg_color #f8f8f2;
 @define-color view_fg_color #232629;
-@define-color headerbar_bg_color #efefe9;
+
+@define-color headerbar_bg_color #f8f8f2;
 @define-color headerbar_fg_color #232629;
-@define-color headerbar_border_color rgba(0.93725490, 0.93725490, 0.91372549, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #f8f8f2;
+@define-color dialog_fg_color #232629;
+
+@define-color popover_bg_color #f8f8f2;
+@define-color popover_fg_color #232629;
+
+
 @define-color sidebar_bg_color #efefe9;
 @define-color sidebar_fg_color #232629;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #efefe9;
 @define-color card_fg_color #232629;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #efefe9;
-@define-color dialog_fg_color #232629;
-@define-color popover_bg_color #efefe9;
-@define-color popover_fg_color #232629;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #deded8;
-@define-color blue_1 #0082c9;
-@define-color blue_2 #0082c9;
-@define-color blue_3 #0082c9;
-@define-color blue_4 #0082c9;
-@define-color blue_5 #0082c9;
-@define-color green_1 #388e3c;
-@define-color green_2 #388e3c;
-@define-color green_3 #388e3c;
-@define-color green_4 #388e3c;
-@define-color green_5 #388e3c;
-@define-color yellow_1 #ffb627;
-@define-color yellow_2 #ffb627;
-@define-color yellow_3 #ffb627;
-@define-color yellow_4 #ffb627;
-@define-color yellow_5 #ffb627;
-@define-color orange_1 #ff3d00;
-@define-color orange_2 #ff3d00;
-@define-color orange_3 #ff3d00;
-@define-color orange_4 #ff3d00;
-@define-color orange_5 #ff3d00;
+
+
 @define-color red_1 #b0151a;
-@define-color red_2 #b0151a;
-@define-color red_3 #b0151a;
-@define-color red_4 #b0151a;
-@define-color red_5 #b0151a;
+@define-color green_1 #388e3c;
+@define-color yellow_1 #ffb627;
+@define-color blue_1 #0082c9;
 @define-color purple_1 #700f98;
-@define-color purple_2 #700f98;
-@define-color purple_3 #700f98;
-@define-color purple_4 #700f98;
-@define-color purple_5 #700f98;
-@define-color brown_1 #b27701;
-@define-color brown_2 #b27701;
-@define-color brown_3 #b27701;
-@define-color brown_4 #b27701;
-@define-color brown_5 #b27701;
-@define-color light_1 #232629;
-@define-color light_2 #232629;
-@define-color light_3 #232629;
-@define-color light_4 #232629;
-@define-color light_5 #232629;
-@define-color dark_1 #232629;
-@define-color dark_2 #232629;
-@define-color dark_3 #232629;
-@define-color dark_4 #232629;
-@define-color dark_5 #232629;
+@define-color teal_1 #008e8e;
+@define-color orange_1 #ff3d00;
+@define-color gray_1 #c0c0bd;
+
diff --git a/build/base16-ia-dark.css b/build/base16-ia-dark.css
index e8ce85d..675f705 100644
--- a/build/base16-ia-dark.css
+++ b/build/base16-ia-dark.css
@@ -1,88 +1,37 @@
 @define-color accent_color #8eccdd;
 @define-color accent_bg_color #8eccdd;
 @define-color accent_fg_color #1a1a1a;
-@define-color destructive_color #d88568;
-@define-color destructive_bg_color #d88568;
-@define-color destructive_fg_color #1a1a1a;
-@define-color success_color #83a471;
-@define-color success_bg_color #83a471;
-@define-color success_fg_color #1a1a1a;
-@define-color warning_color #b98eb2;
-@define-color warning_bg_color #b98eb2;
-@define-color warning_fg_color #1a1a1a;
-@define-color error_color #d88568;
-@define-color error_bg_color #d88568;
-@define-color error_fg_color #1a1a1a;
+
 @define-color window_bg_color #1a1a1a;
 @define-color window_fg_color #cccccc;
+
 @define-color view_bg_color #1a1a1a;
 @define-color view_fg_color #cccccc;
-@define-color headerbar_bg_color #222222;
+
+@define-color headerbar_bg_color #1a1a1a;
 @define-color headerbar_fg_color #cccccc;
-@define-color headerbar_border_color rgba(0.13333333, 0.13333333, 0.13333333, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #1a1a1a;
+@define-color dialog_fg_color #cccccc;
+
+@define-color popover_bg_color #1a1a1a;
+@define-color popover_fg_color #cccccc;
+
+
 @define-color sidebar_bg_color #222222;
 @define-color sidebar_fg_color #cccccc;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #222222;
 @define-color card_fg_color #cccccc;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #222222;
-@define-color dialog_fg_color #cccccc;
-@define-color popover_bg_color #222222;
-@define-color popover_fg_color #cccccc;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #1d414d;
-@define-color blue_1 #8eccdd;
-@define-color blue_2 #8eccdd;
-@define-color blue_3 #8eccdd;
-@define-color blue_4 #8eccdd;
-@define-color blue_5 #8eccdd;
-@define-color green_1 #83a471;
-@define-color green_2 #83a471;
-@define-color green_3 #83a471;
-@define-color green_4 #83a471;
-@define-color green_5 #83a471;
-@define-color yellow_1 #b99353;
-@define-color yellow_2 #b99353;
-@define-color yellow_3 #b99353;
-@define-color yellow_4 #b99353;
-@define-color yellow_5 #b99353;
-@define-color orange_1 #d86868;
-@define-color orange_2 #d86868;
-@define-color orange_3 #d86868;
-@define-color orange_4 #d86868;
-@define-color orange_5 #d86868;
+
+
 @define-color red_1 #d88568;
-@define-color red_2 #d88568;
-@define-color red_3 #d88568;
-@define-color red_4 #d88568;
-@define-color red_5 #d88568;
+@define-color green_1 #83a471;
+@define-color yellow_1 #b99353;
+@define-color blue_1 #8eccdd;
 @define-color purple_1 #b98eb2;
-@define-color purple_2 #b98eb2;
-@define-color purple_3 #b98eb2;
-@define-color purple_4 #b98eb2;
-@define-color purple_5 #b98eb2;
-@define-color brown_1 #8b6c37;
-@define-color brown_2 #8b6c37;
-@define-color brown_3 #8b6c37;
-@define-color brown_4 #8b6c37;
-@define-color brown_5 #8b6c37;
-@define-color light_1 #cccccc;
-@define-color light_2 #cccccc;
-@define-color light_3 #cccccc;
-@define-color light_4 #cccccc;
-@define-color light_5 #cccccc;
-@define-color dark_1 #cccccc;
-@define-color dark_2 #cccccc;
-@define-color dark_3 #cccccc;
-@define-color dark_4 #cccccc;
-@define-color dark_5 #cccccc;
+@define-color teal_1 #7c9cae;
+@define-color orange_1 #d86868;
+@define-color gray_1 #767676;
+
diff --git a/build/base16-ia-light.css b/build/base16-ia-light.css
index d193e4b..28a7e83 100644
--- a/build/base16-ia-light.css
+++ b/build/base16-ia-light.css
@@ -1,88 +1,37 @@
 @define-color accent_color #48bac2;
 @define-color accent_bg_color #48bac2;
 @define-color accent_fg_color #f6f6f6;
-@define-color destructive_color #9c5a02;
-@define-color destructive_bg_color #9c5a02;
-@define-color destructive_fg_color #f6f6f6;
-@define-color success_color #38781c;
-@define-color success_bg_color #38781c;
-@define-color success_fg_color #f6f6f6;
-@define-color warning_color #a94598;
-@define-color warning_bg_color #a94598;
-@define-color warning_fg_color #f6f6f6;
-@define-color error_color #9c5a02;
-@define-color error_bg_color #9c5a02;
-@define-color error_fg_color #f6f6f6;
+
 @define-color window_bg_color #f6f6f6;
 @define-color window_fg_color #181818;
+
 @define-color view_bg_color #f6f6f6;
 @define-color view_fg_color #181818;
-@define-color headerbar_bg_color #dedede;
+
+@define-color headerbar_bg_color #f6f6f6;
 @define-color headerbar_fg_color #181818;
-@define-color headerbar_border_color rgba(0.87058824, 0.87058824, 0.87058824, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #f6f6f6;
+@define-color dialog_fg_color #181818;
+
+@define-color popover_bg_color #f6f6f6;
+@define-color popover_fg_color #181818;
+
+
 @define-color sidebar_bg_color #dedede;
 @define-color sidebar_fg_color #181818;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #dedede;
 @define-color card_fg_color #181818;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #dedede;
-@define-color dialog_fg_color #181818;
-@define-color popover_bg_color #dedede;
-@define-color popover_fg_color #181818;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #bde5f2;
-@define-color blue_1 #48bac2;
-@define-color blue_2 #48bac2;
-@define-color blue_3 #48bac2;
-@define-color blue_4 #48bac2;
-@define-color blue_5 #48bac2;
-@define-color green_1 #38781c;
-@define-color green_2 #38781c;
-@define-color green_3 #38781c;
-@define-color green_4 #38781c;
-@define-color green_5 #38781c;
-@define-color yellow_1 #c48218;
-@define-color yellow_2 #c48218;
-@define-color yellow_3 #c48218;
-@define-color yellow_4 #c48218;
-@define-color yellow_5 #c48218;
-@define-color orange_1 #c43e18;
-@define-color orange_2 #c43e18;
-@define-color orange_3 #c43e18;
-@define-color orange_4 #c43e18;
-@define-color orange_5 #c43e18;
+
+
 @define-color red_1 #9c5a02;
-@define-color red_2 #9c5a02;
-@define-color red_3 #9c5a02;
-@define-color red_4 #9c5a02;
-@define-color red_5 #9c5a02;
+@define-color green_1 #38781c;
+@define-color yellow_1 #c48218;
+@define-color blue_1 #48bac2;
 @define-color purple_1 #a94598;
-@define-color purple_2 #a94598;
-@define-color purple_3 #a94598;
-@define-color purple_4 #a94598;
-@define-color purple_5 #a94598;
-@define-color brown_1 #8b6c37;
-@define-color brown_2 #8b6c37;
-@define-color brown_3 #8b6c37;
-@define-color brown_4 #8b6c37;
-@define-color brown_5 #8b6c37;
-@define-color light_1 #181818;
-@define-color light_2 #181818;
-@define-color light_3 #181818;
-@define-color light_4 #181818;
-@define-color light_5 #181818;
-@define-color dark_1 #181818;
-@define-color dark_2 #181818;
-@define-color dark_3 #181818;
-@define-color dark_4 #181818;
-@define-color dark_5 #181818;
+@define-color teal_1 #2d6bb1;
+@define-color orange_1 #c43e18;
+@define-color gray_1 #898989;
+
diff --git a/build/base16-icy.css b/build/base16-icy.css
index 80b5e9e..50d29c2 100644
--- a/build/base16-icy.css
+++ b/build/base16-icy.css
@@ -1,88 +1,37 @@
 @define-color accent_color #00bcd4;
 @define-color accent_bg_color #00bcd4;
 @define-color accent_fg_color #021012;
-@define-color destructive_color #16c1d9;
-@define-color destructive_bg_color #16c1d9;
-@define-color destructive_fg_color #021012;
-@define-color success_color #4dd0e1;
-@define-color success_bg_color #4dd0e1;
-@define-color success_fg_color #021012;
-@define-color warning_color #00acc1;
-@define-color warning_bg_color #00acc1;
-@define-color warning_fg_color #021012;
-@define-color error_color #16c1d9;
-@define-color error_bg_color #16c1d9;
-@define-color error_fg_color #021012;
+
 @define-color window_bg_color #021012;
 @define-color window_fg_color #095b67;
+
 @define-color view_bg_color #021012;
 @define-color view_fg_color #095b67;
-@define-color headerbar_bg_color #031619;
+
+@define-color headerbar_bg_color #021012;
 @define-color headerbar_fg_color #095b67;
-@define-color headerbar_border_color rgba(0.01176471, 0.08627451, 0.09803922, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #021012;
+@define-color dialog_fg_color #095b67;
+
+@define-color popover_bg_color #021012;
+@define-color popover_fg_color #095b67;
+
+
 @define-color sidebar_bg_color #031619;
 @define-color sidebar_fg_color #095b67;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #031619;
 @define-color card_fg_color #095b67;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #031619;
-@define-color dialog_fg_color #095b67;
-@define-color popover_bg_color #031619;
-@define-color popover_fg_color #095b67;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #041f23;
-@define-color blue_1 #00bcd4;
-@define-color blue_2 #00bcd4;
-@define-color blue_3 #00bcd4;
-@define-color blue_4 #00bcd4;
-@define-color blue_5 #00bcd4;
-@define-color green_1 #4dd0e1;
-@define-color green_2 #4dd0e1;
-@define-color green_3 #4dd0e1;
-@define-color green_4 #4dd0e1;
-@define-color green_5 #4dd0e1;
-@define-color yellow_1 #80deea;
-@define-color yellow_2 #80deea;
-@define-color yellow_3 #80deea;
-@define-color yellow_4 #80deea;
-@define-color yellow_5 #80deea;
-@define-color orange_1 #b3ebf2;
-@define-color orange_2 #b3ebf2;
-@define-color orange_3 #b3ebf2;
-@define-color orange_4 #b3ebf2;
-@define-color orange_5 #b3ebf2;
+
+
 @define-color red_1 #16c1d9;
-@define-color red_2 #16c1d9;
-@define-color red_3 #16c1d9;
-@define-color red_4 #16c1d9;
-@define-color red_5 #16c1d9;
+@define-color green_1 #4dd0e1;
+@define-color yellow_1 #80deea;
+@define-color blue_1 #00bcd4;
 @define-color purple_1 #00acc1;
-@define-color purple_2 #00acc1;
-@define-color purple_3 #00acc1;
-@define-color purple_4 #00acc1;
-@define-color purple_5 #00acc1;
-@define-color brown_1 #0097a7;
-@define-color brown_2 #0097a7;
-@define-color brown_3 #0097a7;
-@define-color brown_4 #0097a7;
-@define-color brown_5 #0097a7;
-@define-color light_1 #095b67;
-@define-color light_2 #095b67;
-@define-color light_3 #095b67;
-@define-color light_4 #095b67;
-@define-color light_5 #095b67;
-@define-color dark_1 #095b67;
-@define-color dark_2 #095b67;
-@define-color dark_3 #095b67;
-@define-color dark_4 #095b67;
-@define-color dark_5 #095b67;
+@define-color teal_1 #26c6da;
+@define-color orange_1 #b3ebf2;
+@define-color gray_1 #052e34;
+
diff --git a/build/base16-irblack.css b/build/base16-irblack.css
index 60902f2..0d88f7d 100644
--- a/build/base16-irblack.css
+++ b/build/base16-irblack.css
@@ -1,88 +1,37 @@
 @define-color accent_color #96cbfe;
 @define-color accent_bg_color #96cbfe;
 @define-color accent_fg_color #000000;
-@define-color destructive_color #ff6c60;
-@define-color destructive_bg_color #ff6c60;
-@define-color destructive_fg_color #000000;
-@define-color success_color #a8ff60;
-@define-color success_bg_color #a8ff60;
-@define-color success_fg_color #000000;
-@define-color warning_color #ff73fd;
-@define-color warning_bg_color #ff73fd;
-@define-color warning_fg_color #000000;
-@define-color error_color #ff6c60;
-@define-color error_bg_color #ff6c60;
-@define-color error_fg_color #000000;
+
 @define-color window_bg_color #000000;
 @define-color window_fg_color #b5b3aa;
+
 @define-color view_bg_color #000000;
 @define-color view_fg_color #b5b3aa;
-@define-color headerbar_bg_color #242422;
+
+@define-color headerbar_bg_color #000000;
 @define-color headerbar_fg_color #b5b3aa;
-@define-color headerbar_border_color rgba(0.14117647, 0.14117647, 0.13333333, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #000000;
+@define-color dialog_fg_color #b5b3aa;
+
+@define-color popover_bg_color #000000;
+@define-color popover_fg_color #b5b3aa;
+
+
 @define-color sidebar_bg_color #242422;
 @define-color sidebar_fg_color #b5b3aa;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #242422;
 @define-color card_fg_color #b5b3aa;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #242422;
-@define-color dialog_fg_color #b5b3aa;
-@define-color popover_bg_color #242422;
-@define-color popover_fg_color #b5b3aa;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #484844;
-@define-color blue_1 #96cbfe;
-@define-color blue_2 #96cbfe;
-@define-color blue_3 #96cbfe;
-@define-color blue_4 #96cbfe;
-@define-color blue_5 #96cbfe;
-@define-color green_1 #a8ff60;
-@define-color green_2 #a8ff60;
-@define-color green_3 #a8ff60;
-@define-color green_4 #a8ff60;
-@define-color green_5 #a8ff60;
-@define-color yellow_1 #ffffb6;
-@define-color yellow_2 #ffffb6;
-@define-color yellow_3 #ffffb6;
-@define-color yellow_4 #ffffb6;
-@define-color yellow_5 #ffffb6;
-@define-color orange_1 #e9c062;
-@define-color orange_2 #e9c062;
-@define-color orange_3 #e9c062;
-@define-color orange_4 #e9c062;
-@define-color orange_5 #e9c062;
+
+
 @define-color red_1 #ff6c60;
-@define-color red_2 #ff6c60;
-@define-color red_3 #ff6c60;
-@define-color red_4 #ff6c60;
-@define-color red_5 #ff6c60;
+@define-color green_1 #a8ff60;
+@define-color yellow_1 #ffffb6;
+@define-color blue_1 #96cbfe;
 @define-color purple_1 #ff73fd;
-@define-color purple_2 #ff73fd;
-@define-color purple_3 #ff73fd;
-@define-color purple_4 #ff73fd;
-@define-color purple_5 #ff73fd;
-@define-color brown_1 #b18a3d;
-@define-color brown_2 #b18a3d;
-@define-color brown_3 #b18a3d;
-@define-color brown_4 #b18a3d;
-@define-color brown_5 #b18a3d;
-@define-color light_1 #b5b3aa;
-@define-color light_2 #b5b3aa;
-@define-color light_3 #b5b3aa;
-@define-color light_4 #b5b3aa;
-@define-color light_5 #b5b3aa;
-@define-color dark_1 #b5b3aa;
-@define-color dark_2 #b5b3aa;
-@define-color dark_3 #b5b3aa;
-@define-color dark_4 #b5b3aa;
-@define-color dark_5 #b5b3aa;
+@define-color teal_1 #c6c5fe;
+@define-color orange_1 #e9c062;
+@define-color gray_1 #6c6c66;
+
diff --git a/build/base16-isotope.css b/build/base16-isotope.css
index 6837513..824a314 100644
--- a/build/base16-isotope.css
+++ b/build/base16-isotope.css
@@ -1,88 +1,37 @@
 @define-color accent_color #0066ff;
 @define-color accent_bg_color #0066ff;
 @define-color accent_fg_color #000000;
-@define-color destructive_color #ff0000;
-@define-color destructive_bg_color #ff0000;
-@define-color destructive_fg_color #000000;
-@define-color success_color #33ff00;
-@define-color success_bg_color #33ff00;
-@define-color success_fg_color #000000;
-@define-color warning_color #cc00ff;
-@define-color warning_bg_color #cc00ff;
-@define-color warning_fg_color #000000;
-@define-color error_color #ff0000;
-@define-color error_bg_color #ff0000;
-@define-color error_fg_color #000000;
+
 @define-color window_bg_color #000000;
 @define-color window_fg_color #d0d0d0;
+
 @define-color view_bg_color #000000;
 @define-color view_fg_color #d0d0d0;
-@define-color headerbar_bg_color #404040;
+
+@define-color headerbar_bg_color #000000;
 @define-color headerbar_fg_color #d0d0d0;
-@define-color headerbar_border_color rgba(0.25098039, 0.25098039, 0.25098039, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #000000;
+@define-color dialog_fg_color #d0d0d0;
+
+@define-color popover_bg_color #000000;
+@define-color popover_fg_color #d0d0d0;
+
+
 @define-color sidebar_bg_color #404040;
 @define-color sidebar_fg_color #d0d0d0;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #404040;
 @define-color card_fg_color #d0d0d0;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #404040;
-@define-color dialog_fg_color #d0d0d0;
-@define-color popover_bg_color #404040;
-@define-color popover_fg_color #d0d0d0;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #606060;
-@define-color blue_1 #0066ff;
-@define-color blue_2 #0066ff;
-@define-color blue_3 #0066ff;
-@define-color blue_4 #0066ff;
-@define-color blue_5 #0066ff;
-@define-color green_1 #33ff00;
-@define-color green_2 #33ff00;
-@define-color green_3 #33ff00;
-@define-color green_4 #33ff00;
-@define-color green_5 #33ff00;
-@define-color yellow_1 #ff0099;
-@define-color yellow_2 #ff0099;
-@define-color yellow_3 #ff0099;
-@define-color yellow_4 #ff0099;
-@define-color yellow_5 #ff0099;
-@define-color orange_1 #ff9900;
-@define-color orange_2 #ff9900;
-@define-color orange_3 #ff9900;
-@define-color orange_4 #ff9900;
-@define-color orange_5 #ff9900;
+
+
 @define-color red_1 #ff0000;
-@define-color red_2 #ff0000;
-@define-color red_3 #ff0000;
-@define-color red_4 #ff0000;
-@define-color red_5 #ff0000;
+@define-color green_1 #33ff00;
+@define-color yellow_1 #ff0099;
+@define-color blue_1 #0066ff;
 @define-color purple_1 #cc00ff;
-@define-color purple_2 #cc00ff;
-@define-color purple_3 #cc00ff;
-@define-color purple_4 #cc00ff;
-@define-color purple_5 #cc00ff;
-@define-color brown_1 #3300ff;
-@define-color brown_2 #3300ff;
-@define-color brown_3 #3300ff;
-@define-color brown_4 #3300ff;
-@define-color brown_5 #3300ff;
-@define-color light_1 #d0d0d0;
-@define-color light_2 #d0d0d0;
-@define-color light_3 #d0d0d0;
-@define-color light_4 #d0d0d0;
-@define-color light_5 #d0d0d0;
-@define-color dark_1 #d0d0d0;
-@define-color dark_2 #d0d0d0;
-@define-color dark_3 #d0d0d0;
-@define-color dark_4 #d0d0d0;
-@define-color dark_5 #d0d0d0;
+@define-color teal_1 #00ffff;
+@define-color orange_1 #ff9900;
+@define-color gray_1 #808080;
+
diff --git a/build/base16-jabuti.css b/build/base16-jabuti.css
index 11884cc..4c31d94 100644
--- a/build/base16-jabuti.css
+++ b/build/base16-jabuti.css
@@ -1,88 +1,37 @@
 @define-color accent_color #3fc6de;
 @define-color accent_bg_color #3fc6de;
 @define-color accent_fg_color #292a37;
-@define-color destructive_color #ec6a88;
-@define-color destructive_bg_color #ec6a88;
-@define-color destructive_fg_color #292a37;
-@define-color success_color #3fdaa4;
-@define-color success_bg_color #3fdaa4;
-@define-color success_fg_color #292a37;
-@define-color warning_color #be95ff;
-@define-color warning_bg_color #be95ff;
-@define-color warning_fg_color #292a37;
-@define-color error_color #ec6a88;
-@define-color error_bg_color #ec6a88;
-@define-color error_fg_color #292a37;
+
 @define-color window_bg_color #292a37;
 @define-color window_fg_color #c0cbe3;
+
 @define-color view_bg_color #292a37;
 @define-color view_fg_color #c0cbe3;
-@define-color headerbar_bg_color #343545;
+
+@define-color headerbar_bg_color #292a37;
 @define-color headerbar_fg_color #c0cbe3;
-@define-color headerbar_border_color rgba(0.20392157, 0.20784314, 0.27058824, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #292a37;
+@define-color dialog_fg_color #c0cbe3;
+
+@define-color popover_bg_color #292a37;
+@define-color popover_fg_color #c0cbe3;
+
+
 @define-color sidebar_bg_color #343545;
 @define-color sidebar_fg_color #c0cbe3;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #343545;
 @define-color card_fg_color #c0cbe3;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #343545;
-@define-color dialog_fg_color #c0cbe3;
-@define-color popover_bg_color #343545;
-@define-color popover_fg_color #c0cbe3;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #3c3e51;
-@define-color blue_1 #3fc6de;
-@define-color blue_2 #3fc6de;
-@define-color blue_3 #3fc6de;
-@define-color blue_4 #3fc6de;
-@define-color blue_5 #3fc6de;
-@define-color green_1 #3fdaa4;
-@define-color green_2 #3fdaa4;
-@define-color green_3 #3fdaa4;
-@define-color green_4 #3fdaa4;
-@define-color green_5 #3fdaa4;
-@define-color yellow_1 #e1c697;
-@define-color yellow_2 #e1c697;
-@define-color yellow_3 #e1c697;
-@define-color yellow_4 #e1c697;
-@define-color yellow_5 #e1c697;
-@define-color orange_1 #efb993;
-@define-color orange_2 #efb993;
-@define-color orange_3 #efb993;
-@define-color orange_4 #efb993;
-@define-color orange_5 #efb993;
+
+
 @define-color red_1 #ec6a88;
-@define-color red_2 #ec6a88;
-@define-color red_3 #ec6a88;
-@define-color red_4 #ec6a88;
-@define-color red_5 #ec6a88;
+@define-color green_1 #3fdaa4;
+@define-color yellow_1 #e1c697;
+@define-color blue_1 #3fc6de;
 @define-color purple_1 #be95ff;
-@define-color purple_2 #be95ff;
-@define-color purple_3 #be95ff;
-@define-color purple_4 #be95ff;
-@define-color purple_5 #be95ff;
-@define-color brown_1 #8b8da9;
-@define-color brown_2 #8b8da9;
-@define-color brown_3 #8b8da9;
-@define-color brown_4 #8b8da9;
-@define-color brown_5 #8b8da9;
-@define-color light_1 #c0cbe3;
-@define-color light_2 #c0cbe3;
-@define-color light_3 #c0cbe3;
-@define-color light_4 #c0cbe3;
-@define-color light_5 #c0cbe3;
-@define-color dark_1 #c0cbe3;
-@define-color dark_2 #c0cbe3;
-@define-color dark_3 #c0cbe3;
-@define-color dark_4 #c0cbe3;
-@define-color dark_5 #c0cbe3;
+@define-color teal_1 #ff7eb6;
+@define-color orange_1 #efb993;
+@define-color gray_1 #45475d;
+
diff --git a/build/base16-jellybeans.css b/build/base16-jellybeans.css
index d3f4920..0e322a3 100644
--- a/build/base16-jellybeans.css
+++ b/build/base16-jellybeans.css
@@ -1,88 +1,37 @@
 @define-color accent_color #b1d8f6;
 @define-color accent_bg_color #b1d8f6;
 @define-color accent_fg_color #121212;
-@define-color destructive_color #ffa1a1;
-@define-color destructive_bg_color #ffa1a1;
-@define-color destructive_fg_color #121212;
-@define-color success_color #bddeab;
-@define-color success_bg_color #bddeab;
-@define-color success_fg_color #121212;
-@define-color warning_color #fbdaff;
-@define-color warning_bg_color #fbdaff;
-@define-color warning_fg_color #121212;
-@define-color error_color #ffa1a1;
-@define-color error_bg_color #ffa1a1;
-@define-color error_fg_color #121212;
+
 @define-color window_bg_color #121212;
 @define-color window_fg_color #d5d5d5;
+
 @define-color view_bg_color #121212;
 @define-color view_fg_color #d5d5d5;
-@define-color headerbar_bg_color #929292;
+
+@define-color headerbar_bg_color #121212;
 @define-color headerbar_fg_color #d5d5d5;
-@define-color headerbar_border_color rgba(0.57254902, 0.57254902, 0.57254902, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #121212;
+@define-color dialog_fg_color #d5d5d5;
+
+@define-color popover_bg_color #121212;
+@define-color popover_fg_color #d5d5d5;
+
+
 @define-color sidebar_bg_color #929292;
 @define-color sidebar_fg_color #d5d5d5;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #929292;
 @define-color card_fg_color #d5d5d5;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #929292;
-@define-color dialog_fg_color #d5d5d5;
-@define-color popover_bg_color #929292;
-@define-color popover_fg_color #d5d5d5;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #bdbdbd;
-@define-color blue_1 #b1d8f6;
-@define-color blue_2 #b1d8f6;
-@define-color blue_3 #b1d8f6;
-@define-color blue_4 #b1d8f6;
-@define-color blue_5 #b1d8f6;
-@define-color green_1 #bddeab;
-@define-color green_2 #bddeab;
-@define-color green_3 #bddeab;
-@define-color green_4 #bddeab;
-@define-color green_5 #bddeab;
-@define-color yellow_1 #ffdca0;
-@define-color yellow_2 #ffdca0;
-@define-color yellow_3 #ffdca0;
-@define-color yellow_4 #ffdca0;
-@define-color yellow_5 #ffdca0;
-@define-color orange_1 #ffba7b;
-@define-color orange_2 #ffba7b;
-@define-color orange_3 #ffba7b;
-@define-color orange_4 #ffba7b;
-@define-color orange_5 #ffba7b;
+
+
 @define-color red_1 #ffa1a1;
-@define-color red_2 #ffa1a1;
-@define-color red_3 #ffa1a1;
-@define-color red_4 #ffa1a1;
-@define-color red_5 #ffa1a1;
+@define-color green_1 #bddeab;
+@define-color yellow_1 #ffdca0;
+@define-color blue_1 #b1d8f6;
 @define-color purple_1 #fbdaff;
-@define-color purple_2 #fbdaff;
-@define-color purple_3 #fbdaff;
-@define-color purple_4 #fbdaff;
-@define-color purple_5 #fbdaff;
-@define-color brown_1 #713939;
-@define-color brown_2 #713939;
-@define-color brown_3 #713939;
-@define-color brown_4 #713939;
-@define-color brown_5 #713939;
-@define-color light_1 #d5d5d5;
-@define-color light_2 #d5d5d5;
-@define-color light_3 #d5d5d5;
-@define-color light_4 #d5d5d5;
-@define-color light_5 #d5d5d5;
-@define-color dark_1 #d5d5d5;
-@define-color dark_2 #d5d5d5;
-@define-color dark_3 #d5d5d5;
-@define-color dark_4 #d5d5d5;
-@define-color dark_5 #d5d5d5;
+@define-color teal_1 #1ab2a8;
+@define-color orange_1 #ffba7b;
+@define-color gray_1 #c5c5c5;
+
diff --git a/build/base16-kanagawa-dragon.css b/build/base16-kanagawa-dragon.css
index 0589efe..8a37183 100644
--- a/build/base16-kanagawa-dragon.css
+++ b/build/base16-kanagawa-dragon.css
@@ -1,88 +1,37 @@
 @define-color accent_color #8ba4b0;
 @define-color accent_bg_color #8ba4b0;
 @define-color accent_fg_color #181616;
-@define-color destructive_color #c4746e;
-@define-color destructive_bg_color #c4746e;
-@define-color destructive_fg_color #181616;
-@define-color success_color #8a9a7b;
-@define-color success_bg_color #8a9a7b;
-@define-color success_fg_color #181616;
-@define-color warning_color #a292a3;
-@define-color warning_bg_color #a292a3;
-@define-color warning_fg_color #181616;
-@define-color error_color #c4746e;
-@define-color error_bg_color #c4746e;
-@define-color error_fg_color #181616;
+
 @define-color window_bg_color #181616;
 @define-color window_fg_color #c5c9c5;
+
 @define-color view_bg_color #181616;
 @define-color view_fg_color #c5c9c5;
-@define-color headerbar_bg_color #282727;
+
+@define-color headerbar_bg_color #181616;
 @define-color headerbar_fg_color #c5c9c5;
-@define-color headerbar_border_color rgba(0.15686275, 0.15294118, 0.15294118, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #181616;
+@define-color dialog_fg_color #c5c9c5;
+
+@define-color popover_bg_color #181616;
+@define-color popover_fg_color #c5c9c5;
+
+
 @define-color sidebar_bg_color #282727;
 @define-color sidebar_fg_color #c5c9c5;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #282727;
 @define-color card_fg_color #c5c9c5;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #282727;
-@define-color dialog_fg_color #c5c9c5;
-@define-color popover_bg_color #282727;
-@define-color popover_fg_color #c5c9c5;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #393836;
-@define-color blue_1 #8ba4b0;
-@define-color blue_2 #8ba4b0;
-@define-color blue_3 #8ba4b0;
-@define-color blue_4 #8ba4b0;
-@define-color blue_5 #8ba4b0;
-@define-color green_1 #8a9a7b;
-@define-color green_2 #8a9a7b;
-@define-color green_3 #8a9a7b;
-@define-color green_4 #8a9a7b;
-@define-color green_5 #8a9a7b;
-@define-color yellow_1 #c4b28a;
-@define-color yellow_2 #c4b28a;
-@define-color yellow_3 #c4b28a;
-@define-color yellow_4 #c4b28a;
-@define-color yellow_5 #c4b28a;
-@define-color orange_1 #b6927b;
-@define-color orange_2 #b6927b;
-@define-color orange_3 #b6927b;
-@define-color orange_4 #b6927b;
-@define-color orange_5 #b6927b;
+
+
 @define-color red_1 #c4746e;
-@define-color red_2 #c4746e;
-@define-color red_3 #c4746e;
-@define-color red_4 #c4746e;
-@define-color red_5 #c4746e;
+@define-color green_1 #8a9a7b;
+@define-color yellow_1 #c4b28a;
+@define-color blue_1 #8ba4b0;
 @define-color purple_1 #a292a3;
-@define-color purple_2 #a292a3;
-@define-color purple_3 #a292a3;
-@define-color purple_4 #a292a3;
-@define-color purple_5 #a292a3;
-@define-color brown_1 #b98d7b;
-@define-color brown_2 #b98d7b;
-@define-color brown_3 #b98d7b;
-@define-color brown_4 #b98d7b;
-@define-color brown_5 #b98d7b;
-@define-color light_1 #c5c9c5;
-@define-color light_2 #c5c9c5;
-@define-color light_3 #c5c9c5;
-@define-color light_4 #c5c9c5;
-@define-color light_5 #c5c9c5;
-@define-color dark_1 #c5c9c5;
-@define-color dark_2 #c5c9c5;
-@define-color dark_3 #c5c9c5;
-@define-color dark_4 #c5c9c5;
-@define-color dark_5 #c5c9c5;
+@define-color teal_1 #8ea4a2;
+@define-color orange_1 #b6927b;
+@define-color gray_1 #625e5a;
+
diff --git a/build/base16-kanagawa.css b/build/base16-kanagawa.css
index 1d84fbf..4e3b120 100644
--- a/build/base16-kanagawa.css
+++ b/build/base16-kanagawa.css
@@ -1,88 +1,37 @@
 @define-color accent_color #7e9cd8;
 @define-color accent_bg_color #7e9cd8;
 @define-color accent_fg_color #1f1f28;
-@define-color destructive_color #c34043;
-@define-color destructive_bg_color #c34043;
-@define-color destructive_fg_color #1f1f28;
-@define-color success_color #76946a;
-@define-color success_bg_color #76946a;
-@define-color success_fg_color #1f1f28;
-@define-color warning_color #957fb8;
-@define-color warning_bg_color #957fb8;
-@define-color warning_fg_color #1f1f28;
-@define-color error_color #c34043;
-@define-color error_bg_color #c34043;
-@define-color error_fg_color #1f1f28;
+
 @define-color window_bg_color #1f1f28;
 @define-color window_fg_color #dcd7ba;
+
 @define-color view_bg_color #1f1f28;
 @define-color view_fg_color #dcd7ba;
-@define-color headerbar_bg_color #16161d;
+
+@define-color headerbar_bg_color #1f1f28;
 @define-color headerbar_fg_color #dcd7ba;
-@define-color headerbar_border_color rgba(0.08627451, 0.08627451, 0.11372549, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #1f1f28;
+@define-color dialog_fg_color #dcd7ba;
+
+@define-color popover_bg_color #1f1f28;
+@define-color popover_fg_color #dcd7ba;
+
+
 @define-color sidebar_bg_color #16161d;
 @define-color sidebar_fg_color #dcd7ba;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #16161d;
 @define-color card_fg_color #dcd7ba;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #16161d;
-@define-color dialog_fg_color #dcd7ba;
-@define-color popover_bg_color #16161d;
-@define-color popover_fg_color #dcd7ba;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #223249;
-@define-color blue_1 #7e9cd8;
-@define-color blue_2 #7e9cd8;
-@define-color blue_3 #7e9cd8;
-@define-color blue_4 #7e9cd8;
-@define-color blue_5 #7e9cd8;
-@define-color green_1 #76946a;
-@define-color green_2 #76946a;
-@define-color green_3 #76946a;
-@define-color green_4 #76946a;
-@define-color green_5 #76946a;
-@define-color yellow_1 #c0a36e;
-@define-color yellow_2 #c0a36e;
-@define-color yellow_3 #c0a36e;
-@define-color yellow_4 #c0a36e;
-@define-color yellow_5 #c0a36e;
-@define-color orange_1 #ffa066;
-@define-color orange_2 #ffa066;
-@define-color orange_3 #ffa066;
-@define-color orange_4 #ffa066;
-@define-color orange_5 #ffa066;
+
+
 @define-color red_1 #c34043;
-@define-color red_2 #c34043;
-@define-color red_3 #c34043;
-@define-color red_4 #c34043;
-@define-color red_5 #c34043;
+@define-color green_1 #76946a;
+@define-color yellow_1 #c0a36e;
+@define-color blue_1 #7e9cd8;
 @define-color purple_1 #957fb8;
-@define-color purple_2 #957fb8;
-@define-color purple_3 #957fb8;
-@define-color purple_4 #957fb8;
-@define-color purple_5 #957fb8;
-@define-color brown_1 #d27e99;
-@define-color brown_2 #d27e99;
-@define-color brown_3 #d27e99;
-@define-color brown_4 #d27e99;
-@define-color brown_5 #d27e99;
-@define-color light_1 #dcd7ba;
-@define-color light_2 #dcd7ba;
-@define-color light_3 #dcd7ba;
-@define-color light_4 #dcd7ba;
-@define-color light_5 #dcd7ba;
-@define-color dark_1 #dcd7ba;
-@define-color dark_2 #dcd7ba;
-@define-color dark_3 #dcd7ba;
-@define-color dark_4 #dcd7ba;
-@define-color dark_5 #dcd7ba;
+@define-color teal_1 #6a9589;
+@define-color orange_1 #ffa066;
+@define-color gray_1 #54546d;
+
diff --git a/build/base16-katy.css b/build/base16-katy.css
index 5a262f8..10c70a7 100644
--- a/build/base16-katy.css
+++ b/build/base16-katy.css
@@ -1,88 +1,37 @@
 @define-color accent_color #82aaff;
 @define-color accent_bg_color #82aaff;
 @define-color accent_fg_color #292d3e;
-@define-color destructive_color #6e98e1;
-@define-color destructive_bg_color #6e98e1;
-@define-color destructive_fg_color #292d3e;
-@define-color success_color #78c06e;
-@define-color success_bg_color #78c06e;
-@define-color success_fg_color #292d3e;
-@define-color warning_color #c792ea;
-@define-color warning_bg_color #c792ea;
-@define-color warning_fg_color #292d3e;
-@define-color error_color #6e98e1;
-@define-color error_bg_color #6e98e1;
-@define-color error_fg_color #292d3e;
+
 @define-color window_bg_color #292d3e;
 @define-color window_fg_color #959dcb;
+
 @define-color view_bg_color #292d3e;
 @define-color view_fg_color #959dcb;
-@define-color headerbar_bg_color #444267;
+
+@define-color headerbar_bg_color #292d3e;
 @define-color headerbar_fg_color #959dcb;
-@define-color headerbar_border_color rgba(0.26666667, 0.25882353, 0.40392157, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #292d3e;
+@define-color dialog_fg_color #959dcb;
+
+@define-color popover_bg_color #292d3e;
+@define-color popover_fg_color #959dcb;
+
+
 @define-color sidebar_bg_color #444267;
 @define-color sidebar_fg_color #959dcb;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #444267;
 @define-color card_fg_color #959dcb;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #444267;
-@define-color dialog_fg_color #959dcb;
-@define-color popover_bg_color #444267;
-@define-color popover_fg_color #959dcb;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #5c598b;
-@define-color blue_1 #82aaff;
-@define-color blue_2 #82aaff;
-@define-color blue_3 #82aaff;
-@define-color blue_4 #82aaff;
-@define-color blue_5 #82aaff;
-@define-color green_1 #78c06e;
-@define-color green_2 #78c06e;
-@define-color green_3 #78c06e;
-@define-color green_4 #78c06e;
-@define-color green_5 #78c06e;
-@define-color yellow_1 #e0a557;
-@define-color yellow_2 #e0a557;
-@define-color yellow_3 #e0a557;
-@define-color yellow_4 #e0a557;
-@define-color yellow_5 #e0a557;
-@define-color orange_1 #f78c6c;
-@define-color orange_2 #f78c6c;
-@define-color orange_3 #f78c6c;
-@define-color orange_4 #f78c6c;
-@define-color orange_5 #f78c6c;
+
+
 @define-color red_1 #6e98e1;
-@define-color red_2 #6e98e1;
-@define-color red_3 #6e98e1;
-@define-color red_4 #6e98e1;
-@define-color red_5 #6e98e1;
+@define-color green_1 #78c06e;
+@define-color yellow_1 #e0a557;
+@define-color blue_1 #82aaff;
 @define-color purple_1 #c792ea;
-@define-color purple_2 #c792ea;
-@define-color purple_3 #c792ea;
-@define-color purple_4 #c792ea;
-@define-color purple_5 #c792ea;
-@define-color brown_1 #ff5370;
-@define-color brown_2 #ff5370;
-@define-color brown_3 #ff5370;
-@define-color brown_4 #ff5370;
-@define-color brown_5 #ff5370;
-@define-color light_1 #959dcb;
-@define-color light_2 #959dcb;
-@define-color light_3 #959dcb;
-@define-color light_4 #959dcb;
-@define-color light_5 #959dcb;
-@define-color dark_1 #959dcb;
-@define-color dark_2 #959dcb;
-@define-color dark_3 #959dcb;
-@define-color dark_4 #959dcb;
-@define-color dark_5 #959dcb;
+@define-color teal_1 #83b7e5;
+@define-color orange_1 #f78c6c;
+@define-color gray_1 #676e95;
+
diff --git a/build/base16-kimber.css b/build/base16-kimber.css
index 2efb38f..086a644 100644
--- a/build/base16-kimber.css
+++ b/build/base16-kimber.css
@@ -1,88 +1,37 @@
 @define-color accent_color #537c9c;
 @define-color accent_bg_color #537c9c;
 @define-color accent_fg_color #222222;
-@define-color destructive_color #c88c8c;
-@define-color destructive_bg_color #c88c8c;
-@define-color destructive_fg_color #222222;
-@define-color success_color #99c899;
-@define-color success_bg_color #99c899;
-@define-color success_fg_color #222222;
-@define-color warning_color #86cacd;
-@define-color warning_bg_color #86cacd;
-@define-color warning_fg_color #222222;
-@define-color error_color #c88c8c;
-@define-color error_bg_color #c88c8c;
-@define-color error_fg_color #222222;
+
 @define-color window_bg_color #222222;
 @define-color window_fg_color #dedee7;
+
 @define-color view_bg_color #222222;
 @define-color view_fg_color #dedee7;
-@define-color headerbar_bg_color #313131;
+
+@define-color headerbar_bg_color #222222;
 @define-color headerbar_fg_color #dedee7;
-@define-color headerbar_border_color rgba(0.19215686, 0.19215686, 0.19215686, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #222222;
+@define-color dialog_fg_color #dedee7;
+
+@define-color popover_bg_color #222222;
+@define-color popover_fg_color #dedee7;
+
+
 @define-color sidebar_bg_color #313131;
 @define-color sidebar_fg_color #dedee7;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #313131;
 @define-color card_fg_color #dedee7;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #313131;
-@define-color dialog_fg_color #dedee7;
-@define-color popover_bg_color #313131;
-@define-color popover_fg_color #dedee7;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #555d55;
-@define-color blue_1 #537c9c;
-@define-color blue_2 #537c9c;
-@define-color blue_3 #537c9c;
-@define-color blue_4 #537c9c;
-@define-color blue_5 #537c9c;
-@define-color green_1 #99c899;
-@define-color green_2 #99c899;
-@define-color green_3 #99c899;
-@define-color green_4 #99c899;
-@define-color green_5 #99c899;
-@define-color yellow_1 #d8b56d;
-@define-color yellow_2 #d8b56d;
-@define-color yellow_3 #d8b56d;
-@define-color yellow_4 #d8b56d;
-@define-color yellow_5 #d8b56d;
-@define-color orange_1 #476c88;
-@define-color orange_2 #476c88;
-@define-color orange_3 #476c88;
-@define-color orange_4 #476c88;
-@define-color orange_5 #476c88;
+
+
 @define-color red_1 #c88c8c;
-@define-color red_2 #c88c8c;
-@define-color red_3 #c88c8c;
-@define-color red_4 #c88c8c;
-@define-color red_5 #c88c8c;
+@define-color green_1 #99c899;
+@define-color yellow_1 #d8b56d;
+@define-color blue_1 #537c9c;
 @define-color purple_1 #86cacd;
-@define-color purple_2 #86cacd;
-@define-color purple_3 #86cacd;
-@define-color purple_4 #86cacd;
-@define-color purple_5 #86cacd;
-@define-color brown_1 #704f4f;
-@define-color brown_2 #704f4f;
-@define-color brown_3 #704f4f;
-@define-color brown_4 #704f4f;
-@define-color brown_5 #704f4f;
-@define-color light_1 #dedee7;
-@define-color light_2 #dedee7;
-@define-color light_3 #dedee7;
-@define-color light_4 #dedee7;
-@define-color light_5 #dedee7;
-@define-color dark_1 #dedee7;
-@define-color dark_2 #dedee7;
-@define-color dark_3 #dedee7;
-@define-color dark_4 #dedee7;
-@define-color dark_5 #dedee7;
+@define-color teal_1 #78b4b4;
+@define-color orange_1 #476c88;
+@define-color gray_1 #644646;
+
diff --git a/build/base16-kissa-latte.css b/build/base16-kissa-latte.css
index e6c807d..d99df0f 100644
--- a/build/base16-kissa-latte.css
+++ b/build/base16-kissa-latte.css
@@ -1,88 +1,37 @@
 @define-color accent_color #3468a8;
 @define-color accent_bg_color #3468a8;
 @define-color accent_fg_color #f5f4f0;
-@define-color destructive_color #9e3e3e;
-@define-color destructive_bg_color #9e3e3e;
-@define-color destructive_fg_color #f5f4f0;
-@define-color success_color #387050;
-@define-color success_bg_color #387050;
-@define-color success_fg_color #f5f4f0;
-@define-color warning_color #6438a0;
-@define-color warning_bg_color #6438a0;
-@define-color warning_fg_color #f5f4f0;
-@define-color error_color #9e3e3e;
-@define-color error_bg_color #9e3e3e;
-@define-color error_fg_color #f5f4f0;
+
 @define-color window_bg_color #f5f4f0;
 @define-color window_fg_color #1f1c16;
+
 @define-color view_bg_color #f5f4f0;
 @define-color view_fg_color #1f1c16;
-@define-color headerbar_bg_color #e8e7e3;
+
+@define-color headerbar_bg_color #f5f4f0;
 @define-color headerbar_fg_color #1f1c16;
-@define-color headerbar_border_color rgba(0.90980392, 0.90588235, 0.89019608, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #f5f4f0;
+@define-color dialog_fg_color #1f1c16;
+
+@define-color popover_bg_color #f5f4f0;
+@define-color popover_fg_color #1f1c16;
+
+
 @define-color sidebar_bg_color #e8e7e3;
 @define-color sidebar_fg_color #1f1c16;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #e8e7e3;
 @define-color card_fg_color #1f1c16;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #e8e7e3;
-@define-color dialog_fg_color #1f1c16;
-@define-color popover_bg_color #e8e7e3;
-@define-color popover_fg_color #1f1c16;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #d5d2cb;
-@define-color blue_1 #3468a8;
-@define-color blue_2 #3468a8;
-@define-color blue_3 #3468a8;
-@define-color blue_4 #3468a8;
-@define-color blue_5 #3468a8;
-@define-color green_1 #387050;
-@define-color green_2 #387050;
-@define-color green_3 #387050;
-@define-color green_4 #387050;
-@define-color green_5 #387050;
-@define-color yellow_1 #7d6820;
-@define-color yellow_2 #7d6820;
-@define-color yellow_3 #7d6820;
-@define-color yellow_4 #7d6820;
-@define-color yellow_5 #7d6820;
-@define-color orange_1 #8f5d22;
-@define-color orange_2 #8f5d22;
-@define-color orange_3 #8f5d22;
-@define-color orange_4 #8f5d22;
-@define-color orange_5 #8f5d22;
+
+
 @define-color red_1 #9e3e3e;
-@define-color red_2 #9e3e3e;
-@define-color red_3 #9e3e3e;
-@define-color red_4 #9e3e3e;
-@define-color red_5 #9e3e3e;
+@define-color green_1 #387050;
+@define-color yellow_1 #7d6820;
+@define-color blue_1 #3468a8;
 @define-color purple_1 #6438a0;
-@define-color purple_2 #6438a0;
-@define-color purple_3 #6438a0;
-@define-color purple_4 #6438a0;
-@define-color purple_5 #6438a0;
-@define-color brown_1 #943a68;
-@define-color brown_2 #943a68;
-@define-color brown_3 #943a68;
-@define-color brown_4 #943a68;
-@define-color brown_5 #943a68;
-@define-color light_1 #1f1c16;
-@define-color light_2 #1f1c16;
-@define-color light_3 #1f1c16;
-@define-color light_4 #1f1c16;
-@define-color light_5 #1f1c16;
-@define-color dark_1 #1f1c16;
-@define-color dark_2 #1f1c16;
-@define-color dark_3 #1f1c16;
-@define-color dark_4 #1f1c16;
-@define-color dark_5 #1f1c16;
+@define-color teal_1 #287070;
+@define-color orange_1 #8f5d22;
+@define-color gray_1 #91887d;
+
diff --git a/build/base16-kissa-macchiato.css b/build/base16-kissa-macchiato.css
index a1172dc..9be4194 100644
--- a/build/base16-kissa-macchiato.css
+++ b/build/base16-kissa-macchiato.css
@@ -1,88 +1,37 @@
 @define-color accent_color #7fa8d4;
 @define-color accent_bg_color #7fa8d4;
 @define-color accent_fg_color #1f1c16;
-@define-color destructive_color #e87777;
-@define-color destructive_bg_color #e87777;
-@define-color destructive_fg_color #1f1c16;
-@define-color success_color #8cb870;
-@define-color success_bg_color #8cb870;
-@define-color success_fg_color #1f1c16;
-@define-color warning_color #b094cc;
-@define-color warning_bg_color #b094cc;
-@define-color warning_fg_color #1f1c16;
-@define-color error_color #e87777;
-@define-color error_bg_color #e87777;
-@define-color error_fg_color #1f1c16;
+
 @define-color window_bg_color #1f1c16;
 @define-color window_fg_color #faf0e6;
+
 @define-color view_bg_color #1f1c16;
 @define-color view_fg_color #faf0e6;
-@define-color headerbar_bg_color #35322d;
+
+@define-color headerbar_bg_color #1f1c16;
 @define-color headerbar_fg_color #faf0e6;
-@define-color headerbar_border_color rgba(0.20784314, 0.19607843, 0.17647059, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #1f1c16;
+@define-color dialog_fg_color #faf0e6;
+
+@define-color popover_bg_color #1f1c16;
+@define-color popover_fg_color #faf0e6;
+
+
 @define-color sidebar_bg_color #35322d;
 @define-color sidebar_fg_color #faf0e6;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #35322d;
 @define-color card_fg_color #faf0e6;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #35322d;
-@define-color dialog_fg_color #faf0e6;
-@define-color popover_bg_color #35322d;
-@define-color popover_fg_color #faf0e6;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #47443f;
-@define-color blue_1 #7fa8d4;
-@define-color blue_2 #7fa8d4;
-@define-color blue_3 #7fa8d4;
-@define-color blue_4 #7fa8d4;
-@define-color blue_5 #7fa8d4;
-@define-color green_1 #8cb870;
-@define-color green_2 #8cb870;
-@define-color green_3 #8cb870;
-@define-color green_4 #8cb870;
-@define-color green_5 #8cb870;
-@define-color yellow_1 #eac67a;
-@define-color yellow_2 #eac67a;
-@define-color yellow_3 #eac67a;
-@define-color yellow_4 #eac67a;
-@define-color yellow_5 #eac67a;
-@define-color orange_1 #da9050;
-@define-color orange_2 #da9050;
-@define-color orange_3 #da9050;
-@define-color orange_4 #da9050;
-@define-color orange_5 #da9050;
+
+
 @define-color red_1 #e87777;
-@define-color red_2 #e87777;
-@define-color red_3 #e87777;
-@define-color red_4 #e87777;
-@define-color red_5 #e87777;
+@define-color green_1 #8cb870;
+@define-color yellow_1 #eac67a;
+@define-color blue_1 #7fa8d4;
 @define-color purple_1 #b094cc;
-@define-color purple_2 #b094cc;
-@define-color purple_3 #b094cc;
-@define-color purple_4 #b094cc;
-@define-color purple_5 #b094cc;
-@define-color brown_1 #cc88aa;
-@define-color brown_2 #cc88aa;
-@define-color brown_3 #cc88aa;
-@define-color brown_4 #cc88aa;
-@define-color brown_5 #cc88aa;
-@define-color light_1 #faf0e6;
-@define-color light_2 #faf0e6;
-@define-color light_3 #faf0e6;
-@define-color light_4 #faf0e6;
-@define-color light_5 #faf0e6;
-@define-color dark_1 #faf0e6;
-@define-color dark_2 #faf0e6;
-@define-color dark_3 #faf0e6;
-@define-color dark_4 #faf0e6;
-@define-color dark_5 #faf0e6;
+@define-color teal_1 #6ab8b0;
+@define-color orange_1 #da9050;
+@define-color gray_1 #b8a48c;
+
diff --git a/build/base16-lichen-chartreuse-dark.css b/build/base16-lichen-chartreuse-dark.css
index b94f1c4..dd1684c 100644
--- a/build/base16-lichen-chartreuse-dark.css
+++ b/build/base16-lichen-chartreuse-dark.css
@@ -1,88 +1,37 @@
 @define-color accent_color #78adc4;
 @define-color accent_bg_color #78adc4;
 @define-color accent_fg_color #151613;
-@define-color destructive_color #e28b82;
-@define-color destructive_bg_color #e28b82;
-@define-color destructive_fg_color #151613;
-@define-color success_color #83bda5;
-@define-color success_bg_color #83bda5;
-@define-color success_fg_color #151613;
-@define-color warning_color #bfa6d4;
-@define-color warning_bg_color #bfa6d4;
-@define-color warning_fg_color #151613;
-@define-color error_color #e28b82;
-@define-color error_bg_color #e28b82;
-@define-color error_fg_color #151613;
+
 @define-color window_bg_color #151613;
 @define-color window_fg_color #e0e5da;
+
 @define-color view_bg_color #151613;
 @define-color view_fg_color #e0e5da;
-@define-color headerbar_bg_color #1c1e1a;
+
+@define-color headerbar_bg_color #151613;
 @define-color headerbar_fg_color #e0e5da;
-@define-color headerbar_border_color rgba(0.10980392, 0.11764706, 0.10196078, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #151613;
+@define-color dialog_fg_color #e0e5da;
+
+@define-color popover_bg_color #151613;
+@define-color popover_fg_color #e0e5da;
+
+
 @define-color sidebar_bg_color #1c1e1a;
 @define-color sidebar_fg_color #e0e5da;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #1c1e1a;
 @define-color card_fg_color #e0e5da;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #1c1e1a;
-@define-color dialog_fg_color #e0e5da;
-@define-color popover_bg_color #1c1e1a;
-@define-color popover_fg_color #e0e5da;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #3e5123;
-@define-color blue_1 #78adc4;
-@define-color blue_2 #78adc4;
-@define-color blue_3 #78adc4;
-@define-color blue_4 #78adc4;
-@define-color blue_5 #78adc4;
-@define-color green_1 #83bda5;
-@define-color green_2 #83bda5;
-@define-color green_3 #83bda5;
-@define-color green_4 #83bda5;
-@define-color green_5 #83bda5;
-@define-color yellow_1 #b2d084;
-@define-color yellow_2 #b2d084;
-@define-color yellow_3 #b2d084;
-@define-color yellow_4 #b2d084;
-@define-color yellow_5 #b2d084;
-@define-color orange_1 #d5ad73;
-@define-color orange_2 #d5ad73;
-@define-color orange_3 #d5ad73;
-@define-color orange_4 #d5ad73;
-@define-color orange_5 #d5ad73;
+
+
 @define-color red_1 #e28b82;
-@define-color red_2 #e28b82;
-@define-color red_3 #e28b82;
-@define-color red_4 #e28b82;
-@define-color red_5 #e28b82;
+@define-color green_1 #83bda5;
+@define-color yellow_1 #b2d084;
+@define-color blue_1 #78adc4;
 @define-color purple_1 #bfa6d4;
-@define-color purple_2 #bfa6d4;
-@define-color purple_3 #bfa6d4;
-@define-color purple_4 #bfa6d4;
-@define-color purple_5 #bfa6d4;
-@define-color brown_1 #d2a0b2;
-@define-color brown_2 #d2a0b2;
-@define-color brown_3 #d2a0b2;
-@define-color brown_4 #d2a0b2;
-@define-color brown_5 #d2a0b2;
-@define-color light_1 #e0e5da;
-@define-color light_2 #e0e5da;
-@define-color light_3 #e0e5da;
-@define-color light_4 #e0e5da;
-@define-color light_5 #e0e5da;
-@define-color dark_1 #e0e5da;
-@define-color dark_2 #e0e5da;
-@define-color dark_3 #e0e5da;
-@define-color dark_4 #e0e5da;
-@define-color dark_5 #e0e5da;
+@define-color teal_1 #9cc6c9;
+@define-color orange_1 #d5ad73;
+@define-color gray_1 #899282;
+
diff --git a/build/base16-lichen-chartreuse-light.css b/build/base16-lichen-chartreuse-light.css
index 08a18d2..a31b18d 100644
--- a/build/base16-lichen-chartreuse-light.css
+++ b/build/base16-lichen-chartreuse-light.css
@@ -1,88 +1,37 @@
 @define-color accent_color #356e8a;
 @define-color accent_bg_color #356e8a;
 @define-color accent_fg_color #f5f7f2;
-@define-color destructive_color #a34740;
-@define-color destructive_bg_color #a34740;
-@define-color destructive_fg_color #f5f7f2;
-@define-color success_color #2f7462;
-@define-color success_bg_color #2f7462;
-@define-color success_fg_color #f5f7f2;
-@define-color warning_color #6e5689;
-@define-color warning_bg_color #6e5689;
-@define-color warning_fg_color #f5f7f2;
-@define-color error_color #a34740;
-@define-color error_bg_color #a34740;
-@define-color error_fg_color #f5f7f2;
+
 @define-color window_bg_color #f5f7f2;
 @define-color window_fg_color #2d302b;
+
 @define-color view_bg_color #f5f7f2;
 @define-color view_fg_color #2d302b;
-@define-color headerbar_bg_color #ecefe7;
+
+@define-color headerbar_bg_color #f5f7f2;
 @define-color headerbar_fg_color #2d302b;
-@define-color headerbar_border_color rgba(0.92549020, 0.93725490, 0.90588235, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #f5f7f2;
+@define-color dialog_fg_color #2d302b;
+
+@define-color popover_bg_color #f5f7f2;
+@define-color popover_fg_color #2d302b;
+
+
 @define-color sidebar_bg_color #ecefe7;
 @define-color sidebar_fg_color #2d302b;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #ecefe7;
 @define-color card_fg_color #2d302b;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #ecefe7;
-@define-color dialog_fg_color #2d302b;
-@define-color popover_bg_color #ecefe7;
-@define-color popover_fg_color #2d302b;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #cfe4ae;
-@define-color blue_1 #356e8a;
-@define-color blue_2 #356e8a;
-@define-color blue_3 #356e8a;
-@define-color blue_4 #356e8a;
-@define-color blue_5 #356e8a;
-@define-color green_1 #2f7462;
-@define-color green_2 #2f7462;
-@define-color green_3 #2f7462;
-@define-color green_4 #2f7462;
-@define-color green_5 #2f7462;
-@define-color yellow_1 #506b29;
-@define-color yellow_2 #506b29;
-@define-color yellow_3 #506b29;
-@define-color yellow_4 #506b29;
-@define-color yellow_5 #506b29;
-@define-color orange_1 #8b5d27;
-@define-color orange_2 #8b5d27;
-@define-color orange_3 #8b5d27;
-@define-color orange_4 #8b5d27;
-@define-color orange_5 #8b5d27;
+
+
 @define-color red_1 #a34740;
-@define-color red_2 #a34740;
-@define-color red_3 #a34740;
-@define-color red_4 #a34740;
-@define-color red_5 #a34740;
+@define-color green_1 #2f7462;
+@define-color yellow_1 #506b29;
+@define-color blue_1 #356e8a;
 @define-color purple_1 #6e5689;
-@define-color purple_2 #6e5689;
-@define-color purple_3 #6e5689;
-@define-color purple_4 #6e5689;
-@define-color purple_5 #6e5689;
-@define-color brown_1 #8a4f67;
-@define-color brown_2 #8a4f67;
-@define-color brown_3 #8a4f67;
-@define-color brown_4 #8a4f67;
-@define-color brown_5 #8a4f67;
-@define-color light_1 #2d302b;
-@define-color light_2 #2d302b;
-@define-color light_3 #2d302b;
-@define-color light_4 #2d302b;
-@define-color light_5 #2d302b;
-@define-color dark_1 #2d302b;
-@define-color dark_2 #2d302b;
-@define-color dark_3 #2d302b;
-@define-color dark_4 #2d302b;
-@define-color dark_5 #2d302b;
+@define-color teal_1 #356569;
+@define-color orange_1 #8b5d27;
+@define-color gray_1 #687161;
+
diff --git a/build/base16-lime.css b/build/base16-lime.css
index 3a6fc5d..7f05abd 100644
--- a/build/base16-lime.css
+++ b/build/base16-lime.css
@@ -1,88 +1,37 @@
 @define-color accent_color #2b926f;
 @define-color accent_bg_color #2b926f;
 @define-color accent_fg_color #1a1a2f;
-@define-color destructive_color #ff662a;
-@define-color destructive_bg_color #ff662a;
-@define-color destructive_fg_color #1a1a2f;
-@define-color success_color #8cd97c;
-@define-color success_bg_color #8cd97c;
-@define-color success_fg_color #1a1a2f;
-@define-color warning_color #1b825f;
-@define-color warning_bg_color #1b825f;
-@define-color warning_fg_color #1a1a2f;
-@define-color error_color #ff662a;
-@define-color error_bg_color #ff662a;
-@define-color error_fg_color #1a1a2f;
+
 @define-color window_bg_color #1a1a2f;
 @define-color window_fg_color #818175;
+
 @define-color view_bg_color #1a1a2f;
 @define-color view_fg_color #818175;
-@define-color headerbar_bg_color #202030;
+
+@define-color headerbar_bg_color #1a1a2f;
 @define-color headerbar_fg_color #818175;
-@define-color headerbar_border_color rgba(0.12549020, 0.12549020, 0.18823529, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #1a1a2f;
+@define-color dialog_fg_color #818175;
+
+@define-color popover_bg_color #1a1a2f;
+@define-color popover_fg_color #818175;
+
+
 @define-color sidebar_bg_color #202030;
 @define-color sidebar_fg_color #818175;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #202030;
 @define-color card_fg_color #818175;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #202030;
-@define-color dialog_fg_color #818175;
-@define-color popover_bg_color #202030;
-@define-color popover_fg_color #818175;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #2a2a3f;
-@define-color blue_1 #2b926f;
-@define-color blue_2 #2b926f;
-@define-color blue_3 #2b926f;
-@define-color blue_4 #2b926f;
-@define-color blue_5 #2b926f;
-@define-color green_1 #8cd97c;
-@define-color green_2 #8cd97c;
-@define-color green_3 #8cd97c;
-@define-color green_4 #8cd97c;
-@define-color green_5 #8cd97c;
-@define-color yellow_1 #ffd15e;
-@define-color yellow_2 #ffd15e;
-@define-color yellow_3 #ffd15e;
-@define-color yellow_4 #ffd15e;
-@define-color yellow_5 #ffd15e;
-@define-color orange_1 #ff773a;
-@define-color orange_2 #ff773a;
-@define-color orange_3 #ff773a;
-@define-color orange_4 #ff773a;
-@define-color orange_5 #ff773a;
+
+
 @define-color red_1 #ff662a;
-@define-color red_2 #ff662a;
-@define-color red_3 #ff662a;
-@define-color red_4 #ff662a;
-@define-color red_5 #ff662a;
+@define-color green_1 #8cd97c;
+@define-color yellow_1 #ffd15e;
+@define-color blue_1 #2b926f;
 @define-color purple_1 #1b825f;
-@define-color purple_2 #1b825f;
-@define-color purple_3 #1b825f;
-@define-color purple_4 #1b825f;
-@define-color purple_5 #1b825f;
-@define-color brown_1 #b4d97c;
-@define-color brown_2 #b4d97c;
-@define-color brown_3 #b4d97c;
-@define-color brown_4 #b4d97c;
-@define-color brown_5 #b4d97c;
-@define-color light_1 #818175;
-@define-color light_2 #818175;
-@define-color light_3 #818175;
-@define-color light_4 #818175;
-@define-color light_5 #818175;
-@define-color dark_1 #818175;
-@define-color dark_2 #818175;
-@define-color dark_3 #818175;
-@define-color dark_4 #818175;
-@define-color dark_5 #818175;
+@define-color teal_1 #4cad83;
+@define-color orange_1 #ff773a;
+@define-color gray_1 #313140;
+
diff --git a/build/base16-linux-vt.css b/build/base16-linux-vt.css
index aa07760..7f4e8f8 100644
--- a/build/base16-linux-vt.css
+++ b/build/base16-linux-vt.css
@@ -1,88 +1,37 @@
 @define-color accent_color #5555ff;
 @define-color accent_bg_color #5555ff;
 @define-color accent_fg_color #000000;
-@define-color destructive_color #aa0000;
-@define-color destructive_bg_color #aa0000;
-@define-color destructive_fg_color #000000;
-@define-color success_color #00aa00;
-@define-color success_bg_color #00aa00;
-@define-color success_fg_color #000000;
-@define-color warning_color #ff55ff;
-@define-color warning_bg_color #ff55ff;
-@define-color warning_fg_color #000000;
-@define-color error_color #aa0000;
-@define-color error_bg_color #aa0000;
-@define-color error_fg_color #000000;
+
 @define-color window_bg_color #000000;
 @define-color window_fg_color #aaaaaa;
+
 @define-color view_bg_color #000000;
 @define-color view_fg_color #aaaaaa;
-@define-color headerbar_bg_color #333333;
+
+@define-color headerbar_bg_color #000000;
 @define-color headerbar_fg_color #aaaaaa;
-@define-color headerbar_border_color rgba(0.20000000, 0.20000000, 0.20000000, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #000000;
+@define-color dialog_fg_color #aaaaaa;
+
+@define-color popover_bg_color #000000;
+@define-color popover_fg_color #aaaaaa;
+
+
 @define-color sidebar_bg_color #333333;
 @define-color sidebar_fg_color #aaaaaa;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #333333;
 @define-color card_fg_color #aaaaaa;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #333333;
-@define-color dialog_fg_color #aaaaaa;
-@define-color popover_bg_color #333333;
-@define-color popover_fg_color #aaaaaa;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #444444;
-@define-color blue_1 #5555ff;
-@define-color blue_2 #5555ff;
-@define-color blue_3 #5555ff;
-@define-color blue_4 #5555ff;
-@define-color blue_5 #5555ff;
-@define-color green_1 #00aa00;
-@define-color green_2 #00aa00;
-@define-color green_3 #00aa00;
-@define-color green_4 #00aa00;
-@define-color green_5 #00aa00;
-@define-color yellow_1 #ffff55;
-@define-color yellow_2 #ffff55;
-@define-color yellow_3 #ffff55;
-@define-color yellow_4 #ffff55;
-@define-color yellow_5 #ffff55;
-@define-color orange_1 #ff5555;
-@define-color orange_2 #ff5555;
-@define-color orange_3 #ff5555;
-@define-color orange_4 #ff5555;
-@define-color orange_5 #ff5555;
+
+
 @define-color red_1 #aa0000;
-@define-color red_2 #aa0000;
-@define-color red_3 #aa0000;
-@define-color red_4 #aa0000;
-@define-color red_5 #aa0000;
+@define-color green_1 #00aa00;
+@define-color yellow_1 #ffff55;
+@define-color blue_1 #5555ff;
 @define-color purple_1 #ff55ff;
-@define-color purple_2 #ff55ff;
-@define-color purple_3 #ff55ff;
-@define-color purple_4 #ff55ff;
-@define-color purple_5 #ff55ff;
-@define-color brown_1 #aa5500;
-@define-color brown_2 #aa5500;
-@define-color brown_3 #aa5500;
-@define-color brown_4 #aa5500;
-@define-color brown_5 #aa5500;
-@define-color light_1 #aaaaaa;
-@define-color light_2 #aaaaaa;
-@define-color light_3 #aaaaaa;
-@define-color light_4 #aaaaaa;
-@define-color light_5 #aaaaaa;
-@define-color dark_1 #aaaaaa;
-@define-color dark_2 #aaaaaa;
-@define-color dark_3 #aaaaaa;
-@define-color dark_4 #aaaaaa;
-@define-color dark_5 #aaaaaa;
+@define-color teal_1 #00aaaa;
+@define-color orange_1 #ff5555;
+@define-color gray_1 #555555;
+
diff --git a/build/base16-macintosh.css b/build/base16-macintosh.css
index 7b48a83..1d11959 100644
--- a/build/base16-macintosh.css
+++ b/build/base16-macintosh.css
@@ -1,88 +1,37 @@
 @define-color accent_color #0000d3;
 @define-color accent_bg_color #0000d3;
 @define-color accent_fg_color #000000;
-@define-color destructive_color #dd0907;
-@define-color destructive_bg_color #dd0907;
-@define-color destructive_fg_color #000000;
-@define-color success_color #1fb714;
-@define-color success_bg_color #1fb714;
-@define-color success_fg_color #000000;
-@define-color warning_color #4700a5;
-@define-color warning_bg_color #4700a5;
-@define-color warning_fg_color #000000;
-@define-color error_color #dd0907;
-@define-color error_bg_color #dd0907;
-@define-color error_fg_color #000000;
+
 @define-color window_bg_color #000000;
 @define-color window_fg_color #c0c0c0;
+
 @define-color view_bg_color #000000;
 @define-color view_fg_color #c0c0c0;
-@define-color headerbar_bg_color #404040;
+
+@define-color headerbar_bg_color #000000;
 @define-color headerbar_fg_color #c0c0c0;
-@define-color headerbar_border_color rgba(0.25098039, 0.25098039, 0.25098039, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #000000;
+@define-color dialog_fg_color #c0c0c0;
+
+@define-color popover_bg_color #000000;
+@define-color popover_fg_color #c0c0c0;
+
+
 @define-color sidebar_bg_color #404040;
 @define-color sidebar_fg_color #c0c0c0;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #404040;
 @define-color card_fg_color #c0c0c0;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #404040;
-@define-color dialog_fg_color #c0c0c0;
-@define-color popover_bg_color #404040;
-@define-color popover_fg_color #c0c0c0;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #404040;
-@define-color blue_1 #0000d3;
-@define-color blue_2 #0000d3;
-@define-color blue_3 #0000d3;
-@define-color blue_4 #0000d3;
-@define-color blue_5 #0000d3;
-@define-color green_1 #1fb714;
-@define-color green_2 #1fb714;
-@define-color green_3 #1fb714;
-@define-color green_4 #1fb714;
-@define-color green_5 #1fb714;
-@define-color yellow_1 #fbf305;
-@define-color yellow_2 #fbf305;
-@define-color yellow_3 #fbf305;
-@define-color yellow_4 #fbf305;
-@define-color yellow_5 #fbf305;
-@define-color orange_1 #ff6403;
-@define-color orange_2 #ff6403;
-@define-color orange_3 #ff6403;
-@define-color orange_4 #ff6403;
-@define-color orange_5 #ff6403;
+
+
 @define-color red_1 #dd0907;
-@define-color red_2 #dd0907;
-@define-color red_3 #dd0907;
-@define-color red_4 #dd0907;
-@define-color red_5 #dd0907;
+@define-color green_1 #1fb714;
+@define-color yellow_1 #fbf305;
+@define-color blue_1 #0000d3;
 @define-color purple_1 #4700a5;
-@define-color purple_2 #4700a5;
-@define-color purple_3 #4700a5;
-@define-color purple_4 #4700a5;
-@define-color purple_5 #4700a5;
-@define-color brown_1 #90713a;
-@define-color brown_2 #90713a;
-@define-color brown_3 #90713a;
-@define-color brown_4 #90713a;
-@define-color brown_5 #90713a;
-@define-color light_1 #c0c0c0;
-@define-color light_2 #c0c0c0;
-@define-color light_3 #c0c0c0;
-@define-color light_4 #c0c0c0;
-@define-color light_5 #c0c0c0;
-@define-color dark_1 #c0c0c0;
-@define-color dark_2 #c0c0c0;
-@define-color dark_3 #c0c0c0;
-@define-color dark_4 #c0c0c0;
-@define-color dark_5 #c0c0c0;
+@define-color teal_1 #02abea;
+@define-color orange_1 #ff6403;
+@define-color gray_1 #808080;
+
diff --git a/build/base16-marrakesh.css b/build/base16-marrakesh.css
index ebff360..f0f711f 100644
--- a/build/base16-marrakesh.css
+++ b/build/base16-marrakesh.css
@@ -1,88 +1,37 @@
 @define-color accent_color #477ca1;
 @define-color accent_bg_color #477ca1;
 @define-color accent_fg_color #201602;
-@define-color destructive_color #c35359;
-@define-color destructive_bg_color #c35359;
-@define-color destructive_fg_color #201602;
-@define-color success_color #18974e;
-@define-color success_bg_color #18974e;
-@define-color success_fg_color #201602;
-@define-color warning_color #8868b3;
-@define-color warning_bg_color #8868b3;
-@define-color warning_fg_color #201602;
-@define-color error_color #c35359;
-@define-color error_bg_color #c35359;
-@define-color error_fg_color #201602;
+
 @define-color window_bg_color #201602;
 @define-color window_fg_color #948e48;
+
 @define-color view_bg_color #201602;
 @define-color view_fg_color #948e48;
-@define-color headerbar_bg_color #302e00;
+
+@define-color headerbar_bg_color #201602;
 @define-color headerbar_fg_color #948e48;
-@define-color headerbar_border_color rgba(0.18823529, 0.18039216, 0.00000000, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #201602;
+@define-color dialog_fg_color #948e48;
+
+@define-color popover_bg_color #201602;
+@define-color popover_fg_color #948e48;
+
+
 @define-color sidebar_bg_color #302e00;
 @define-color sidebar_fg_color #948e48;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #302e00;
 @define-color card_fg_color #948e48;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #302e00;
-@define-color dialog_fg_color #948e48;
-@define-color popover_bg_color #302e00;
-@define-color popover_fg_color #948e48;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #5f5b17;
-@define-color blue_1 #477ca1;
-@define-color blue_2 #477ca1;
-@define-color blue_3 #477ca1;
-@define-color blue_4 #477ca1;
-@define-color blue_5 #477ca1;
-@define-color green_1 #18974e;
-@define-color green_2 #18974e;
-@define-color green_3 #18974e;
-@define-color green_4 #18974e;
-@define-color green_5 #18974e;
-@define-color yellow_1 #a88339;
-@define-color yellow_2 #a88339;
-@define-color yellow_3 #a88339;
-@define-color yellow_4 #a88339;
-@define-color yellow_5 #a88339;
-@define-color orange_1 #b36144;
-@define-color orange_2 #b36144;
-@define-color orange_3 #b36144;
-@define-color orange_4 #b36144;
-@define-color orange_5 #b36144;
+
+
 @define-color red_1 #c35359;
-@define-color red_2 #c35359;
-@define-color red_3 #c35359;
-@define-color red_4 #c35359;
-@define-color red_5 #c35359;
+@define-color green_1 #18974e;
+@define-color yellow_1 #a88339;
+@define-color blue_1 #477ca1;
 @define-color purple_1 #8868b3;
-@define-color purple_2 #8868b3;
-@define-color purple_3 #8868b3;
-@define-color purple_4 #8868b3;
-@define-color purple_5 #8868b3;
-@define-color brown_1 #b3588e;
-@define-color brown_2 #b3588e;
-@define-color brown_3 #b3588e;
-@define-color brown_4 #b3588e;
-@define-color brown_5 #b3588e;
-@define-color light_1 #948e48;
-@define-color light_2 #948e48;
-@define-color light_3 #948e48;
-@define-color light_4 #948e48;
-@define-color light_5 #948e48;
-@define-color dark_1 #948e48;
-@define-color dark_2 #948e48;
-@define-color dark_3 #948e48;
-@define-color dark_4 #948e48;
-@define-color dark_5 #948e48;
+@define-color teal_1 #75a738;
+@define-color orange_1 #b36144;
+@define-color gray_1 #6c6823;
+
diff --git a/build/base16-materia.css b/build/base16-materia.css
index 33376b4..1a1e0f1 100644
--- a/build/base16-materia.css
+++ b/build/base16-materia.css
@@ -1,88 +1,37 @@
 @define-color accent_color #89ddff;
 @define-color accent_bg_color #89ddff;
 @define-color accent_fg_color #263238;
-@define-color destructive_color #ec5f67;
-@define-color destructive_bg_color #ec5f67;
-@define-color destructive_fg_color #263238;
-@define-color success_color #8bd649;
-@define-color success_bg_color #8bd649;
-@define-color success_fg_color #263238;
-@define-color warning_color #82aaff;
-@define-color warning_bg_color #82aaff;
-@define-color warning_fg_color #263238;
-@define-color error_color #ec5f67;
-@define-color error_bg_color #ec5f67;
-@define-color error_fg_color #263238;
+
 @define-color window_bg_color #263238;
 @define-color window_fg_color #cdd3de;
+
 @define-color view_bg_color #263238;
 @define-color view_fg_color #cdd3de;
-@define-color headerbar_bg_color #2c393f;
+
+@define-color headerbar_bg_color #263238;
 @define-color headerbar_fg_color #cdd3de;
-@define-color headerbar_border_color rgba(0.17254902, 0.22352941, 0.24705882, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #263238;
+@define-color dialog_fg_color #cdd3de;
+
+@define-color popover_bg_color #263238;
+@define-color popover_fg_color #cdd3de;
+
+
 @define-color sidebar_bg_color #2c393f;
 @define-color sidebar_fg_color #cdd3de;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #2c393f;
 @define-color card_fg_color #cdd3de;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #2c393f;
-@define-color dialog_fg_color #cdd3de;
-@define-color popover_bg_color #2c393f;
-@define-color popover_fg_color #cdd3de;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #37474f;
-@define-color blue_1 #89ddff;
-@define-color blue_2 #89ddff;
-@define-color blue_3 #89ddff;
-@define-color blue_4 #89ddff;
-@define-color blue_5 #89ddff;
-@define-color green_1 #8bd649;
-@define-color green_2 #8bd649;
-@define-color green_3 #8bd649;
-@define-color green_4 #8bd649;
-@define-color green_5 #8bd649;
-@define-color yellow_1 #ffcc00;
-@define-color yellow_2 #ffcc00;
-@define-color yellow_3 #ffcc00;
-@define-color yellow_4 #ffcc00;
-@define-color yellow_5 #ffcc00;
-@define-color orange_1 #ea9560;
-@define-color orange_2 #ea9560;
-@define-color orange_3 #ea9560;
-@define-color orange_4 #ea9560;
-@define-color orange_5 #ea9560;
+
+
 @define-color red_1 #ec5f67;
-@define-color red_2 #ec5f67;
-@define-color red_3 #ec5f67;
-@define-color red_4 #ec5f67;
-@define-color red_5 #ec5f67;
+@define-color green_1 #8bd649;
+@define-color yellow_1 #ffcc00;
+@define-color blue_1 #89ddff;
 @define-color purple_1 #82aaff;
-@define-color purple_2 #82aaff;
-@define-color purple_3 #82aaff;
-@define-color purple_4 #82aaff;
-@define-color purple_5 #82aaff;
-@define-color brown_1 #ec5f67;
-@define-color brown_2 #ec5f67;
-@define-color brown_3 #ec5f67;
-@define-color brown_4 #ec5f67;
-@define-color brown_5 #ec5f67;
-@define-color light_1 #cdd3de;
-@define-color light_2 #cdd3de;
-@define-color light_3 #cdd3de;
-@define-color light_4 #cdd3de;
-@define-color light_5 #cdd3de;
-@define-color dark_1 #cdd3de;
-@define-color dark_2 #cdd3de;
-@define-color dark_3 #cdd3de;
-@define-color dark_4 #cdd3de;
-@define-color dark_5 #cdd3de;
+@define-color teal_1 #80cbc4;
+@define-color orange_1 #ea9560;
+@define-color gray_1 #707880;
+
diff --git a/build/base16-material-darker.css b/build/base16-material-darker.css
index ca5aab2..694a1dd 100644
--- a/build/base16-material-darker.css
+++ b/build/base16-material-darker.css
@@ -1,88 +1,37 @@
 @define-color accent_color #82aaff;
 @define-color accent_bg_color #82aaff;
 @define-color accent_fg_color #212121;
-@define-color destructive_color #f07178;
-@define-color destructive_bg_color #f07178;
-@define-color destructive_fg_color #212121;
-@define-color success_color #c3e88d;
-@define-color success_bg_color #c3e88d;
-@define-color success_fg_color #212121;
-@define-color warning_color #c792ea;
-@define-color warning_bg_color #c792ea;
-@define-color warning_fg_color #212121;
-@define-color error_color #f07178;
-@define-color error_bg_color #f07178;
-@define-color error_fg_color #212121;
+
 @define-color window_bg_color #212121;
 @define-color window_fg_color #eeffff;
+
 @define-color view_bg_color #212121;
 @define-color view_fg_color #eeffff;
-@define-color headerbar_bg_color #303030;
+
+@define-color headerbar_bg_color #212121;
 @define-color headerbar_fg_color #eeffff;
-@define-color headerbar_border_color rgba(0.18823529, 0.18823529, 0.18823529, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #212121;
+@define-color dialog_fg_color #eeffff;
+
+@define-color popover_bg_color #212121;
+@define-color popover_fg_color #eeffff;
+
+
 @define-color sidebar_bg_color #303030;
 @define-color sidebar_fg_color #eeffff;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #303030;
 @define-color card_fg_color #eeffff;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #303030;
-@define-color dialog_fg_color #eeffff;
-@define-color popover_bg_color #303030;
-@define-color popover_fg_color #eeffff;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #353535;
-@define-color blue_1 #82aaff;
-@define-color blue_2 #82aaff;
-@define-color blue_3 #82aaff;
-@define-color blue_4 #82aaff;
-@define-color blue_5 #82aaff;
-@define-color green_1 #c3e88d;
-@define-color green_2 #c3e88d;
-@define-color green_3 #c3e88d;
-@define-color green_4 #c3e88d;
-@define-color green_5 #c3e88d;
-@define-color yellow_1 #ffcb6b;
-@define-color yellow_2 #ffcb6b;
-@define-color yellow_3 #ffcb6b;
-@define-color yellow_4 #ffcb6b;
-@define-color yellow_5 #ffcb6b;
-@define-color orange_1 #f78c6c;
-@define-color orange_2 #f78c6c;
-@define-color orange_3 #f78c6c;
-@define-color orange_4 #f78c6c;
-@define-color orange_5 #f78c6c;
+
+
 @define-color red_1 #f07178;
-@define-color red_2 #f07178;
-@define-color red_3 #f07178;
-@define-color red_4 #f07178;
-@define-color red_5 #f07178;
+@define-color green_1 #c3e88d;
+@define-color yellow_1 #ffcb6b;
+@define-color blue_1 #82aaff;
 @define-color purple_1 #c792ea;
-@define-color purple_2 #c792ea;
-@define-color purple_3 #c792ea;
-@define-color purple_4 #c792ea;
-@define-color purple_5 #c792ea;
-@define-color brown_1 #ff5370;
-@define-color brown_2 #ff5370;
-@define-color brown_3 #ff5370;
-@define-color brown_4 #ff5370;
-@define-color brown_5 #ff5370;
-@define-color light_1 #eeffff;
-@define-color light_2 #eeffff;
-@define-color light_3 #eeffff;
-@define-color light_4 #eeffff;
-@define-color light_5 #eeffff;
-@define-color dark_1 #eeffff;
-@define-color dark_2 #eeffff;
-@define-color dark_3 #eeffff;
-@define-color dark_4 #eeffff;
-@define-color dark_5 #eeffff;
+@define-color teal_1 #89ddff;
+@define-color orange_1 #f78c6c;
+@define-color gray_1 #4a4a4a;
+
diff --git a/build/base16-material-lighter.css b/build/base16-material-lighter.css
index 2ad3731..de455e9 100644
--- a/build/base16-material-lighter.css
+++ b/build/base16-material-lighter.css
@@ -1,88 +1,37 @@
 @define-color accent_color #6182b8;
 @define-color accent_bg_color #6182b8;
 @define-color accent_fg_color #fafafa;
-@define-color destructive_color #ff5370;
-@define-color destructive_bg_color #ff5370;
-@define-color destructive_fg_color #fafafa;
-@define-color success_color #91b859;
-@define-color success_bg_color #91b859;
-@define-color success_fg_color #fafafa;
-@define-color warning_color #7c4dff;
-@define-color warning_bg_color #7c4dff;
-@define-color warning_fg_color #fafafa;
-@define-color error_color #ff5370;
-@define-color error_bg_color #ff5370;
-@define-color error_fg_color #fafafa;
+
 @define-color window_bg_color #fafafa;
 @define-color window_fg_color #80cbc4;
+
 @define-color view_bg_color #fafafa;
 @define-color view_fg_color #80cbc4;
-@define-color headerbar_bg_color #e7eaec;
+
+@define-color headerbar_bg_color #fafafa;
 @define-color headerbar_fg_color #80cbc4;
-@define-color headerbar_border_color rgba(0.90588235, 0.91764706, 0.92549020, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #fafafa;
+@define-color dialog_fg_color #80cbc4;
+
+@define-color popover_bg_color #fafafa;
+@define-color popover_fg_color #80cbc4;
+
+
 @define-color sidebar_bg_color #e7eaec;
 @define-color sidebar_fg_color #80cbc4;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #e7eaec;
 @define-color card_fg_color #80cbc4;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #e7eaec;
-@define-color dialog_fg_color #80cbc4;
-@define-color popover_bg_color #e7eaec;
-@define-color popover_fg_color #80cbc4;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #cceae7;
-@define-color blue_1 #6182b8;
-@define-color blue_2 #6182b8;
-@define-color blue_3 #6182b8;
-@define-color blue_4 #6182b8;
-@define-color blue_5 #6182b8;
-@define-color green_1 #91b859;
-@define-color green_2 #91b859;
-@define-color green_3 #91b859;
-@define-color green_4 #91b859;
-@define-color green_5 #91b859;
-@define-color yellow_1 #ffb62c;
-@define-color yellow_2 #ffb62c;
-@define-color yellow_3 #ffb62c;
-@define-color yellow_4 #ffb62c;
-@define-color yellow_5 #ffb62c;
-@define-color orange_1 #f76d47;
-@define-color orange_2 #f76d47;
-@define-color orange_3 #f76d47;
-@define-color orange_4 #f76d47;
-@define-color orange_5 #f76d47;
+
+
 @define-color red_1 #ff5370;
-@define-color red_2 #ff5370;
-@define-color red_3 #ff5370;
-@define-color red_4 #ff5370;
-@define-color red_5 #ff5370;
+@define-color green_1 #91b859;
+@define-color yellow_1 #ffb62c;
+@define-color blue_1 #6182b8;
 @define-color purple_1 #7c4dff;
-@define-color purple_2 #7c4dff;
-@define-color purple_3 #7c4dff;
-@define-color purple_4 #7c4dff;
-@define-color purple_5 #7c4dff;
-@define-color brown_1 #e53935;
-@define-color brown_2 #e53935;
-@define-color brown_3 #e53935;
-@define-color brown_4 #e53935;
-@define-color brown_5 #e53935;
-@define-color light_1 #80cbc4;
-@define-color light_2 #80cbc4;
-@define-color light_3 #80cbc4;
-@define-color light_4 #80cbc4;
-@define-color light_5 #80cbc4;
-@define-color dark_1 #80cbc4;
-@define-color dark_2 #80cbc4;
-@define-color dark_3 #80cbc4;
-@define-color dark_4 #80cbc4;
-@define-color dark_5 #80cbc4;
+@define-color teal_1 #39adb5;
+@define-color orange_1 #f76d47;
+@define-color gray_1 #ccd7da;
+
diff --git a/build/base16-material-palenight.css b/build/base16-material-palenight.css
index 1968ae9..36b8b76 100644
--- a/build/base16-material-palenight.css
+++ b/build/base16-material-palenight.css
@@ -1,88 +1,37 @@
 @define-color accent_color #82aaff;
 @define-color accent_bg_color #82aaff;
 @define-color accent_fg_color #292d3e;
-@define-color destructive_color #f07178;
-@define-color destructive_bg_color #f07178;
-@define-color destructive_fg_color #292d3e;
-@define-color success_color #c3e88d;
-@define-color success_bg_color #c3e88d;
-@define-color success_fg_color #292d3e;
-@define-color warning_color #c792ea;
-@define-color warning_bg_color #c792ea;
-@define-color warning_fg_color #292d3e;
-@define-color error_color #f07178;
-@define-color error_bg_color #f07178;
-@define-color error_fg_color #292d3e;
+
 @define-color window_bg_color #292d3e;
 @define-color window_fg_color #959dcb;
+
 @define-color view_bg_color #292d3e;
 @define-color view_fg_color #959dcb;
-@define-color headerbar_bg_color #444267;
+
+@define-color headerbar_bg_color #292d3e;
 @define-color headerbar_fg_color #959dcb;
-@define-color headerbar_border_color rgba(0.26666667, 0.25882353, 0.40392157, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #292d3e;
+@define-color dialog_fg_color #959dcb;
+
+@define-color popover_bg_color #292d3e;
+@define-color popover_fg_color #959dcb;
+
+
 @define-color sidebar_bg_color #444267;
 @define-color sidebar_fg_color #959dcb;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #444267;
 @define-color card_fg_color #959dcb;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #444267;
-@define-color dialog_fg_color #959dcb;
-@define-color popover_bg_color #444267;
-@define-color popover_fg_color #959dcb;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #32374d;
-@define-color blue_1 #82aaff;
-@define-color blue_2 #82aaff;
-@define-color blue_3 #82aaff;
-@define-color blue_4 #82aaff;
-@define-color blue_5 #82aaff;
-@define-color green_1 #c3e88d;
-@define-color green_2 #c3e88d;
-@define-color green_3 #c3e88d;
-@define-color green_4 #c3e88d;
-@define-color green_5 #c3e88d;
-@define-color yellow_1 #ffcb6b;
-@define-color yellow_2 #ffcb6b;
-@define-color yellow_3 #ffcb6b;
-@define-color yellow_4 #ffcb6b;
-@define-color yellow_5 #ffcb6b;
-@define-color orange_1 #f78c6c;
-@define-color orange_2 #f78c6c;
-@define-color orange_3 #f78c6c;
-@define-color orange_4 #f78c6c;
-@define-color orange_5 #f78c6c;
+
+
 @define-color red_1 #f07178;
-@define-color red_2 #f07178;
-@define-color red_3 #f07178;
-@define-color red_4 #f07178;
-@define-color red_5 #f07178;
+@define-color green_1 #c3e88d;
+@define-color yellow_1 #ffcb6b;
+@define-color blue_1 #82aaff;
 @define-color purple_1 #c792ea;
-@define-color purple_2 #c792ea;
-@define-color purple_3 #c792ea;
-@define-color purple_4 #c792ea;
-@define-color purple_5 #c792ea;
-@define-color brown_1 #ff5370;
-@define-color brown_2 #ff5370;
-@define-color brown_3 #ff5370;
-@define-color brown_4 #ff5370;
-@define-color brown_5 #ff5370;
-@define-color light_1 #959dcb;
-@define-color light_2 #959dcb;
-@define-color light_3 #959dcb;
-@define-color light_4 #959dcb;
-@define-color light_5 #959dcb;
-@define-color dark_1 #959dcb;
-@define-color dark_2 #959dcb;
-@define-color dark_3 #959dcb;
-@define-color dark_4 #959dcb;
-@define-color dark_5 #959dcb;
+@define-color teal_1 #89ddff;
+@define-color orange_1 #f78c6c;
+@define-color gray_1 #676e95;
+
diff --git a/build/base16-material-vivid.css b/build/base16-material-vivid.css
index f4251bc..0d30538 100644
--- a/build/base16-material-vivid.css
+++ b/build/base16-material-vivid.css
@@ -1,88 +1,37 @@
 @define-color accent_color #2196f3;
 @define-color accent_bg_color #2196f3;
 @define-color accent_fg_color #202124;
-@define-color destructive_color #f44336;
-@define-color destructive_bg_color #f44336;
-@define-color destructive_fg_color #202124;
-@define-color success_color #00e676;
-@define-color success_bg_color #00e676;
-@define-color success_fg_color #202124;
-@define-color warning_color #673ab7;
-@define-color warning_bg_color #673ab7;
-@define-color warning_fg_color #202124;
-@define-color error_color #f44336;
-@define-color error_bg_color #f44336;
-@define-color error_fg_color #202124;
+
 @define-color window_bg_color #202124;
 @define-color window_fg_color #80868b;
+
 @define-color view_bg_color #202124;
 @define-color view_fg_color #80868b;
-@define-color headerbar_bg_color #27292c;
+
+@define-color headerbar_bg_color #202124;
 @define-color headerbar_fg_color #80868b;
-@define-color headerbar_border_color rgba(0.15294118, 0.16078431, 0.17254902, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #202124;
+@define-color dialog_fg_color #80868b;
+
+@define-color popover_bg_color #202124;
+@define-color popover_fg_color #80868b;
+
+
 @define-color sidebar_bg_color #27292c;
 @define-color sidebar_fg_color #80868b;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #27292c;
 @define-color card_fg_color #80868b;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #27292c;
-@define-color dialog_fg_color #80868b;
-@define-color popover_bg_color #27292c;
-@define-color popover_fg_color #80868b;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #323639;
-@define-color blue_1 #2196f3;
-@define-color blue_2 #2196f3;
-@define-color blue_3 #2196f3;
-@define-color blue_4 #2196f3;
-@define-color blue_5 #2196f3;
-@define-color green_1 #00e676;
-@define-color green_2 #00e676;
-@define-color green_3 #00e676;
-@define-color green_4 #00e676;
-@define-color green_5 #00e676;
-@define-color yellow_1 #ffeb3b;
-@define-color yellow_2 #ffeb3b;
-@define-color yellow_3 #ffeb3b;
-@define-color yellow_4 #ffeb3b;
-@define-color yellow_5 #ffeb3b;
-@define-color orange_1 #ff9800;
-@define-color orange_2 #ff9800;
-@define-color orange_3 #ff9800;
-@define-color orange_4 #ff9800;
-@define-color orange_5 #ff9800;
+
+
 @define-color red_1 #f44336;
-@define-color red_2 #f44336;
-@define-color red_3 #f44336;
-@define-color red_4 #f44336;
-@define-color red_5 #f44336;
+@define-color green_1 #00e676;
+@define-color yellow_1 #ffeb3b;
+@define-color blue_1 #2196f3;
 @define-color purple_1 #673ab7;
-@define-color purple_2 #673ab7;
-@define-color purple_3 #673ab7;
-@define-color purple_4 #673ab7;
-@define-color purple_5 #673ab7;
-@define-color brown_1 #8d6e63;
-@define-color brown_2 #8d6e63;
-@define-color brown_3 #8d6e63;
-@define-color brown_4 #8d6e63;
-@define-color brown_5 #8d6e63;
-@define-color light_1 #80868b;
-@define-color light_2 #80868b;
-@define-color light_3 #80868b;
-@define-color light_4 #80868b;
-@define-color light_5 #80868b;
-@define-color dark_1 #80868b;
-@define-color dark_2 #80868b;
-@define-color dark_3 #80868b;
-@define-color dark_4 #80868b;
-@define-color dark_5 #80868b;
+@define-color teal_1 #00bcd4;
+@define-color orange_1 #ff9800;
+@define-color gray_1 #44464d;
+
diff --git a/build/base16-material.css b/build/base16-material.css
index 82681ce..681c692 100644
--- a/build/base16-material.css
+++ b/build/base16-material.css
@@ -1,88 +1,37 @@
 @define-color accent_color #82aaff;
 @define-color accent_bg_color #82aaff;
 @define-color accent_fg_color #263238;
-@define-color destructive_color #f07178;
-@define-color destructive_bg_color #f07178;
-@define-color destructive_fg_color #263238;
-@define-color success_color #c3e88d;
-@define-color success_bg_color #c3e88d;
-@define-color success_fg_color #263238;
-@define-color warning_color #c792ea;
-@define-color warning_bg_color #c792ea;
-@define-color warning_fg_color #263238;
-@define-color error_color #f07178;
-@define-color error_bg_color #f07178;
-@define-color error_fg_color #263238;
+
 @define-color window_bg_color #263238;
 @define-color window_fg_color #eeffff;
+
 @define-color view_bg_color #263238;
 @define-color view_fg_color #eeffff;
-@define-color headerbar_bg_color #2e3c43;
+
+@define-color headerbar_bg_color #263238;
 @define-color headerbar_fg_color #eeffff;
-@define-color headerbar_border_color rgba(0.18039216, 0.23529412, 0.26274510, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #263238;
+@define-color dialog_fg_color #eeffff;
+
+@define-color popover_bg_color #263238;
+@define-color popover_fg_color #eeffff;
+
+
 @define-color sidebar_bg_color #2e3c43;
 @define-color sidebar_fg_color #eeffff;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #2e3c43;
 @define-color card_fg_color #eeffff;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #2e3c43;
-@define-color dialog_fg_color #eeffff;
-@define-color popover_bg_color #2e3c43;
-@define-color popover_fg_color #eeffff;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #314549;
-@define-color blue_1 #82aaff;
-@define-color blue_2 #82aaff;
-@define-color blue_3 #82aaff;
-@define-color blue_4 #82aaff;
-@define-color blue_5 #82aaff;
-@define-color green_1 #c3e88d;
-@define-color green_2 #c3e88d;
-@define-color green_3 #c3e88d;
-@define-color green_4 #c3e88d;
-@define-color green_5 #c3e88d;
-@define-color yellow_1 #ffcb6b;
-@define-color yellow_2 #ffcb6b;
-@define-color yellow_3 #ffcb6b;
-@define-color yellow_4 #ffcb6b;
-@define-color yellow_5 #ffcb6b;
-@define-color orange_1 #f78c6c;
-@define-color orange_2 #f78c6c;
-@define-color orange_3 #f78c6c;
-@define-color orange_4 #f78c6c;
-@define-color orange_5 #f78c6c;
+
+
 @define-color red_1 #f07178;
-@define-color red_2 #f07178;
-@define-color red_3 #f07178;
-@define-color red_4 #f07178;
-@define-color red_5 #f07178;
+@define-color green_1 #c3e88d;
+@define-color yellow_1 #ffcb6b;
+@define-color blue_1 #82aaff;
 @define-color purple_1 #c792ea;
-@define-color purple_2 #c792ea;
-@define-color purple_3 #c792ea;
-@define-color purple_4 #c792ea;
-@define-color purple_5 #c792ea;
-@define-color brown_1 #ff5370;
-@define-color brown_2 #ff5370;
-@define-color brown_3 #ff5370;
-@define-color brown_4 #ff5370;
-@define-color brown_5 #ff5370;
-@define-color light_1 #eeffff;
-@define-color light_2 #eeffff;
-@define-color light_3 #eeffff;
-@define-color light_4 #eeffff;
-@define-color light_5 #eeffff;
-@define-color dark_1 #eeffff;
-@define-color dark_2 #eeffff;
-@define-color dark_3 #eeffff;
-@define-color dark_4 #eeffff;
-@define-color dark_5 #eeffff;
+@define-color teal_1 #89ddff;
+@define-color orange_1 #f78c6c;
+@define-color gray_1 #546e7a;
+
diff --git a/build/base16-measured-dark.css b/build/base16-measured-dark.css
index 905b2de..a5fe14c 100644
--- a/build/base16-measured-dark.css
+++ b/build/base16-measured-dark.css
@@ -1,88 +1,37 @@
 @define-color accent_color #88b0da;
 @define-color accent_bg_color #88b0da;
 @define-color accent_fg_color #00211f;
-@define-color destructive_color #ce7e8e;
-@define-color destructive_bg_color #ce7e8e;
-@define-color destructive_fg_color #00211f;
-@define-color success_color #56c16f;
-@define-color success_bg_color #56c16f;
-@define-color success_fg_color #00211f;
-@define-color warning_color #b39be0;
-@define-color warning_bg_color #b39be0;
-@define-color warning_fg_color #00211f;
-@define-color error_color #ce7e8e;
-@define-color error_bg_color #ce7e8e;
-@define-color error_fg_color #00211f;
+
 @define-color window_bg_color #00211f;
 @define-color window_fg_color #dcdcdc;
+
 @define-color view_bg_color #00211f;
 @define-color view_fg_color #dcdcdc;
-@define-color headerbar_bg_color #003a38;
+
+@define-color headerbar_bg_color #00211f;
 @define-color headerbar_fg_color #dcdcdc;
-@define-color headerbar_border_color rgba(0.00000000, 0.22745098, 0.21960784, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #00211f;
+@define-color dialog_fg_color #dcdcdc;
+
+@define-color popover_bg_color #00211f;
+@define-color popover_fg_color #dcdcdc;
+
+
 @define-color sidebar_bg_color #003a38;
 @define-color sidebar_fg_color #dcdcdc;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #003a38;
 @define-color card_fg_color #dcdcdc;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #003a38;
-@define-color dialog_fg_color #dcdcdc;
-@define-color popover_bg_color #003a38;
-@define-color popover_fg_color #dcdcdc;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #005453;
-@define-color blue_1 #88b0da;
-@define-color blue_2 #88b0da;
-@define-color blue_3 #88b0da;
-@define-color blue_4 #88b0da;
-@define-color blue_5 #88b0da;
-@define-color green_1 #56c16f;
-@define-color green_2 #56c16f;
-@define-color green_3 #56c16f;
-@define-color green_4 #56c16f;
-@define-color green_5 #56c16f;
-@define-color yellow_1 #bfac4e;
-@define-color yellow_2 #bfac4e;
-@define-color yellow_3 #bfac4e;
-@define-color yellow_4 #bfac4e;
-@define-color yellow_5 #bfac4e;
-@define-color orange_1 #dca37c;
-@define-color orange_2 #dca37c;
-@define-color orange_3 #dca37c;
-@define-color orange_4 #dca37c;
-@define-color orange_5 #dca37c;
+
+
 @define-color red_1 #ce7e8e;
-@define-color red_2 #ce7e8e;
-@define-color red_3 #ce7e8e;
-@define-color red_4 #ce7e8e;
-@define-color red_5 #ce7e8e;
+@define-color green_1 #56c16f;
+@define-color yellow_1 #bfac4e;
+@define-color blue_1 #88b0da;
 @define-color purple_1 #b39be0;
-@define-color purple_2 #b39be0;
-@define-color purple_3 #b39be0;
-@define-color purple_4 #b39be0;
-@define-color purple_5 #b39be0;
-@define-color brown_1 #d89aba;
-@define-color brown_2 #d89aba;
-@define-color brown_3 #d89aba;
-@define-color brown_4 #d89aba;
-@define-color brown_5 #d89aba;
-@define-color light_1 #dcdcdc;
-@define-color light_2 #dcdcdc;
-@define-color light_3 #dcdcdc;
-@define-color light_4 #dcdcdc;
-@define-color light_5 #dcdcdc;
-@define-color dark_1 #dcdcdc;
-@define-color dark_2 #dcdcdc;
-@define-color dark_3 #dcdcdc;
-@define-color dark_4 #dcdcdc;
-@define-color dark_5 #dcdcdc;
+@define-color teal_1 #62c0be;
+@define-color orange_1 #dca37c;
+@define-color gray_1 #ababab;
+
diff --git a/build/base16-measured-light.css b/build/base16-measured-light.css
index afb6e33..94eccae 100644
--- a/build/base16-measured-light.css
+++ b/build/base16-measured-light.css
@@ -1,88 +1,37 @@
 @define-color accent_color #0158ad;
 @define-color accent_bg_color #0158ad;
 @define-color accent_fg_color #fdf9f5;
-@define-color destructive_color #ac1f35;
-@define-color destructive_bg_color #ac1f35;
-@define-color destructive_fg_color #fdf9f5;
-@define-color success_color #0c680c;
-@define-color success_bg_color #0c680c;
-@define-color success_fg_color #fdf9f5;
-@define-color warning_color #6645c2;
-@define-color warning_bg_color #6645c2;
-@define-color warning_fg_color #fdf9f5;
-@define-color error_color #ac1f35;
-@define-color error_bg_color #ac1f35;
-@define-color error_fg_color #fdf9f5;
+
 @define-color window_bg_color #fdf9f5;
 @define-color window_fg_color #292929;
+
 @define-color view_bg_color #fdf9f5;
 @define-color view_fg_color #292929;
-@define-color headerbar_bg_color #f9f5f1;
+
+@define-color headerbar_bg_color #fdf9f5;
 @define-color headerbar_fg_color #292929;
-@define-color headerbar_border_color rgba(0.97647059, 0.96078431, 0.94509804, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #fdf9f5;
+@define-color dialog_fg_color #292929;
+
+@define-color popover_bg_color #fdf9f5;
+@define-color popover_fg_color #292929;
+
+
 @define-color sidebar_bg_color #f9f5f1;
 @define-color sidebar_fg_color #292929;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #f9f5f1;
 @define-color card_fg_color #292929;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #f9f5f1;
-@define-color dialog_fg_color #292929;
-@define-color popover_bg_color #f9f5f1;
-@define-color popover_fg_color #292929;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #ffeada;
-@define-color blue_1 #0158ad;
-@define-color blue_2 #0158ad;
-@define-color blue_3 #0158ad;
-@define-color blue_4 #0158ad;
-@define-color blue_5 #0158ad;
-@define-color green_1 #0c680c;
-@define-color green_2 #0c680c;
-@define-color green_3 #0c680c;
-@define-color green_4 #0c680c;
-@define-color green_5 #0c680c;
-@define-color yellow_1 #645a00;
-@define-color yellow_2 #645a00;
-@define-color yellow_3 #645a00;
-@define-color yellow_4 #645a00;
-@define-color yellow_5 #645a00;
-@define-color orange_1 #ad5601;
-@define-color orange_2 #ad5601;
-@define-color orange_3 #ad5601;
-@define-color orange_4 #ad5601;
-@define-color orange_5 #ad5601;
+
+
 @define-color red_1 #ac1f35;
-@define-color red_2 #ac1f35;
-@define-color red_3 #ac1f35;
-@define-color red_4 #ac1f35;
-@define-color red_5 #ac1f35;
+@define-color green_1 #0c680c;
+@define-color yellow_1 #645a00;
+@define-color blue_1 #0158ad;
 @define-color purple_1 #6645c2;
-@define-color purple_2 #6645c2;
-@define-color purple_3 #6645c2;
-@define-color purple_4 #6645c2;
-@define-color purple_5 #6645c2;
-@define-color brown_1 #a81a66;
-@define-color brown_2 #a81a66;
-@define-color brown_3 #a81a66;
-@define-color brown_4 #a81a66;
-@define-color brown_5 #a81a66;
-@define-color light_1 #292929;
-@define-color light_2 #292929;
-@define-color light_3 #292929;
-@define-color light_4 #292929;
-@define-color light_5 #292929;
-@define-color dark_1 #292929;
-@define-color dark_2 #292929;
-@define-color dark_3 #292929;
-@define-color dark_4 #292929;
-@define-color dark_5 #292929;
+@define-color teal_1 #01716f;
+@define-color orange_1 #ad5601;
+@define-color gray_1 #5a5a5a;
+
diff --git a/build/base16-mellow-purple.css b/build/base16-mellow-purple.css
index d7e2542..4f58489 100644
--- a/build/base16-mellow-purple.css
+++ b/build/base16-mellow-purple.css
@@ -1,88 +1,37 @@
 @define-color accent_color #550068;
 @define-color accent_bg_color #550068;
 @define-color accent_fg_color #1e0528;
-@define-color destructive_color #00d9e9;
-@define-color destructive_bg_color #00d9e9;
-@define-color destructive_fg_color #1e0528;
-@define-color success_color #05cb0d;
-@define-color success_bg_color #05cb0d;
-@define-color success_fg_color #1e0528;
-@define-color warning_color #8991bb;
-@define-color warning_bg_color #8991bb;
-@define-color warning_fg_color #1e0528;
-@define-color error_color #00d9e9;
-@define-color error_bg_color #00d9e9;
-@define-color error_fg_color #1e0528;
+
 @define-color window_bg_color #1e0528;
 @define-color window_fg_color #ffeeff;
+
 @define-color view_bg_color #1e0528;
 @define-color view_fg_color #ffeeff;
-@define-color headerbar_bg_color #1a092d;
+
+@define-color headerbar_bg_color #1e0528;
 @define-color headerbar_fg_color #ffeeff;
-@define-color headerbar_border_color rgba(0.10196078, 0.03529412, 0.17647059, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #1e0528;
+@define-color dialog_fg_color #ffeeff;
+
+@define-color popover_bg_color #1e0528;
+@define-color popover_fg_color #ffeeff;
+
+
 @define-color sidebar_bg_color #1a092d;
 @define-color sidebar_fg_color #ffeeff;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #1a092d;
 @define-color card_fg_color #ffeeff;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #1a092d;
-@define-color dialog_fg_color #ffeeff;
-@define-color popover_bg_color #1a092d;
-@define-color popover_fg_color #ffeeff;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #331354;
-@define-color blue_1 #550068;
-@define-color blue_2 #550068;
-@define-color blue_3 #550068;
-@define-color blue_4 #550068;
-@define-color blue_5 #550068;
-@define-color green_1 #05cb0d;
-@define-color green_2 #05cb0d;
-@define-color green_3 #05cb0d;
-@define-color green_4 #05cb0d;
-@define-color green_5 #05cb0d;
-@define-color yellow_1 #955ae7;
-@define-color yellow_2 #955ae7;
-@define-color yellow_3 #955ae7;
-@define-color yellow_4 #955ae7;
-@define-color yellow_5 #955ae7;
-@define-color orange_1 #aa00a3;
-@define-color orange_2 #aa00a3;
-@define-color orange_3 #aa00a3;
-@define-color orange_4 #aa00a3;
-@define-color orange_5 #aa00a3;
+
+
 @define-color red_1 #00d9e9;
-@define-color red_2 #00d9e9;
-@define-color red_3 #00d9e9;
-@define-color red_4 #00d9e9;
-@define-color red_5 #00d9e9;
+@define-color green_1 #05cb0d;
+@define-color yellow_1 #955ae7;
+@define-color blue_1 #550068;
 @define-color purple_1 #8991bb;
-@define-color purple_2 #8991bb;
-@define-color purple_3 #8991bb;
-@define-color purple_4 #8991bb;
-@define-color purple_5 #8991bb;
-@define-color brown_1 #4d6fff;
-@define-color brown_2 #4d6fff;
-@define-color brown_3 #4d6fff;
-@define-color brown_4 #4d6fff;
-@define-color brown_5 #4d6fff;
-@define-color light_1 #ffeeff;
-@define-color light_2 #ffeeff;
-@define-color light_3 #ffeeff;
-@define-color light_4 #ffeeff;
-@define-color light_5 #ffeeff;
-@define-color dark_1 #ffeeff;
-@define-color dark_2 #ffeeff;
-@define-color dark_3 #ffeeff;
-@define-color dark_4 #ffeeff;
-@define-color dark_5 #ffeeff;
+@define-color teal_1 #b900b1;
+@define-color orange_1 #aa00a3;
+@define-color gray_1 #320f55;
+
diff --git a/build/base16-mexico-light.css b/build/base16-mexico-light.css
index f438f5e..2466603 100644
--- a/build/base16-mexico-light.css
+++ b/build/base16-mexico-light.css
@@ -1,88 +1,37 @@
 @define-color accent_color #7cafc2;
 @define-color accent_bg_color #7cafc2;
 @define-color accent_fg_color #f8f8f8;
-@define-color destructive_color #ab4642;
-@define-color destructive_bg_color #ab4642;
-@define-color destructive_fg_color #f8f8f8;
-@define-color success_color #538947;
-@define-color success_bg_color #538947;
-@define-color success_fg_color #f8f8f8;
-@define-color warning_color #96609e;
-@define-color warning_bg_color #96609e;
-@define-color warning_fg_color #f8f8f8;
-@define-color error_color #ab4642;
-@define-color error_bg_color #ab4642;
-@define-color error_fg_color #f8f8f8;
+
 @define-color window_bg_color #f8f8f8;
 @define-color window_fg_color #383838;
+
 @define-color view_bg_color #f8f8f8;
 @define-color view_fg_color #383838;
-@define-color headerbar_bg_color #e8e8e8;
+
+@define-color headerbar_bg_color #f8f8f8;
 @define-color headerbar_fg_color #383838;
-@define-color headerbar_border_color rgba(0.90980392, 0.90980392, 0.90980392, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #f8f8f8;
+@define-color dialog_fg_color #383838;
+
+@define-color popover_bg_color #f8f8f8;
+@define-color popover_fg_color #383838;
+
+
 @define-color sidebar_bg_color #e8e8e8;
 @define-color sidebar_fg_color #383838;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #e8e8e8;
 @define-color card_fg_color #383838;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #e8e8e8;
-@define-color dialog_fg_color #383838;
-@define-color popover_bg_color #e8e8e8;
-@define-color popover_fg_color #383838;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #d8d8d8;
-@define-color blue_1 #7cafc2;
-@define-color blue_2 #7cafc2;
-@define-color blue_3 #7cafc2;
-@define-color blue_4 #7cafc2;
-@define-color blue_5 #7cafc2;
-@define-color green_1 #538947;
-@define-color green_2 #538947;
-@define-color green_3 #538947;
-@define-color green_4 #538947;
-@define-color green_5 #538947;
-@define-color yellow_1 #f79a0e;
-@define-color yellow_2 #f79a0e;
-@define-color yellow_3 #f79a0e;
-@define-color yellow_4 #f79a0e;
-@define-color yellow_5 #f79a0e;
-@define-color orange_1 #dc9656;
-@define-color orange_2 #dc9656;
-@define-color orange_3 #dc9656;
-@define-color orange_4 #dc9656;
-@define-color orange_5 #dc9656;
+
+
 @define-color red_1 #ab4642;
-@define-color red_2 #ab4642;
-@define-color red_3 #ab4642;
-@define-color red_4 #ab4642;
-@define-color red_5 #ab4642;
+@define-color green_1 #538947;
+@define-color yellow_1 #f79a0e;
+@define-color blue_1 #7cafc2;
 @define-color purple_1 #96609e;
-@define-color purple_2 #96609e;
-@define-color purple_3 #96609e;
-@define-color purple_4 #96609e;
-@define-color purple_5 #96609e;
-@define-color brown_1 #a16946;
-@define-color brown_2 #a16946;
-@define-color brown_3 #a16946;
-@define-color brown_4 #a16946;
-@define-color brown_5 #a16946;
-@define-color light_1 #383838;
-@define-color light_2 #383838;
-@define-color light_3 #383838;
-@define-color light_4 #383838;
-@define-color light_5 #383838;
-@define-color dark_1 #383838;
-@define-color dark_2 #383838;
-@define-color dark_3 #383838;
-@define-color dark_4 #383838;
-@define-color dark_5 #383838;
+@define-color teal_1 #4b8093;
+@define-color orange_1 #dc9656;
+@define-color gray_1 #b8b8b8;
+
diff --git a/build/base16-mezcal.css b/build/base16-mezcal.css
index ece6c45..307cb35 100644
--- a/build/base16-mezcal.css
+++ b/build/base16-mezcal.css
@@ -1,88 +1,37 @@
 @define-color accent_color #8aa6c0;
 @define-color accent_bg_color #8aa6c0;
 @define-color accent_fg_color #13110e;
-@define-color destructive_color #da6e54;
-@define-color destructive_bg_color #da6e54;
-@define-color destructive_fg_color #13110e;
-@define-color success_color #a8b84a;
-@define-color success_bg_color #a8b84a;
-@define-color success_fg_color #13110e;
-@define-color warning_color #c28aa8;
-@define-color warning_bg_color #c28aa8;
-@define-color warning_fg_color #13110e;
-@define-color error_color #da6e54;
-@define-color error_bg_color #da6e54;
-@define-color error_fg_color #13110e;
+
 @define-color window_bg_color #13110e;
 @define-color window_fg_color #e0d8c8;
+
 @define-color view_bg_color #13110e;
 @define-color view_fg_color #e0d8c8;
-@define-color headerbar_bg_color #221f14;
+
+@define-color headerbar_bg_color #13110e;
 @define-color headerbar_fg_color #e0d8c8;
-@define-color headerbar_border_color rgba(0.13333333, 0.12156863, 0.07843137, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #13110e;
+@define-color dialog_fg_color #e0d8c8;
+
+@define-color popover_bg_color #13110e;
+@define-color popover_fg_color #e0d8c8;
+
+
 @define-color sidebar_bg_color #221f14;
 @define-color sidebar_fg_color #e0d8c8;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #221f14;
 @define-color card_fg_color #e0d8c8;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #221f14;
-@define-color dialog_fg_color #e0d8c8;
-@define-color popover_bg_color #221f14;
-@define-color popover_fg_color #e0d8c8;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #36301e;
-@define-color blue_1 #8aa6c0;
-@define-color blue_2 #8aa6c0;
-@define-color blue_3 #8aa6c0;
-@define-color blue_4 #8aa6c0;
-@define-color blue_5 #8aa6c0;
-@define-color green_1 #a8b84a;
-@define-color green_2 #a8b84a;
-@define-color green_3 #a8b84a;
-@define-color green_4 #a8b84a;
-@define-color green_5 #a8b84a;
-@define-color yellow_1 #d9a441;
-@define-color yellow_2 #d9a441;
-@define-color yellow_3 #d9a441;
-@define-color yellow_4 #d9a441;
-@define-color yellow_5 #d9a441;
-@define-color orange_1 #d9a441;
-@define-color orange_2 #d9a441;
-@define-color orange_3 #d9a441;
-@define-color orange_4 #d9a441;
-@define-color orange_5 #d9a441;
+
+
 @define-color red_1 #da6e54;
-@define-color red_2 #da6e54;
-@define-color red_3 #da6e54;
-@define-color red_4 #da6e54;
-@define-color red_5 #da6e54;
+@define-color green_1 #a8b84a;
+@define-color yellow_1 #d9a441;
+@define-color blue_1 #8aa6c0;
 @define-color purple_1 #c28aa8;
-@define-color purple_2 #c28aa8;
-@define-color purple_3 #c28aa8;
-@define-color purple_4 #c28aa8;
-@define-color purple_5 #c28aa8;
-@define-color brown_1 #4e462c;
-@define-color brown_2 #4e462c;
-@define-color brown_3 #4e462c;
-@define-color brown_4 #4e462c;
-@define-color brown_5 #4e462c;
-@define-color light_1 #e0d8c8;
-@define-color light_2 #e0d8c8;
-@define-color light_3 #e0d8c8;
-@define-color light_4 #e0d8c8;
-@define-color light_5 #e0d8c8;
-@define-color dark_1 #e0d8c8;
-@define-color dark_2 #e0d8c8;
-@define-color dark_3 #e0d8c8;
-@define-color dark_4 #e0d8c8;
-@define-color dark_5 #e0d8c8;
+@define-color teal_1 #6fc8ae;
+@define-color orange_1 #d9a441;
+@define-color gray_1 #6e6450;
+
diff --git a/build/base16-mocha.css b/build/base16-mocha.css
index f612172..6dbad44 100644
--- a/build/base16-mocha.css
+++ b/build/base16-mocha.css
@@ -1,88 +1,37 @@
 @define-color accent_color #8ab3b5;
 @define-color accent_bg_color #8ab3b5;
 @define-color accent_fg_color #3b3228;
-@define-color destructive_color #cb6077;
-@define-color destructive_bg_color #cb6077;
-@define-color destructive_fg_color #3b3228;
-@define-color success_color #beb55b;
-@define-color success_bg_color #beb55b;
-@define-color success_fg_color #3b3228;
-@define-color warning_color #a89bb9;
-@define-color warning_bg_color #a89bb9;
-@define-color warning_fg_color #3b3228;
-@define-color error_color #cb6077;
-@define-color error_bg_color #cb6077;
-@define-color error_fg_color #3b3228;
+
 @define-color window_bg_color #3b3228;
 @define-color window_fg_color #d0c8c6;
+
 @define-color view_bg_color #3b3228;
 @define-color view_fg_color #d0c8c6;
-@define-color headerbar_bg_color #534636;
+
+@define-color headerbar_bg_color #3b3228;
 @define-color headerbar_fg_color #d0c8c6;
-@define-color headerbar_border_color rgba(0.32549020, 0.27450980, 0.21176471, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #3b3228;
+@define-color dialog_fg_color #d0c8c6;
+
+@define-color popover_bg_color #3b3228;
+@define-color popover_fg_color #d0c8c6;
+
+
 @define-color sidebar_bg_color #534636;
 @define-color sidebar_fg_color #d0c8c6;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #534636;
 @define-color card_fg_color #d0c8c6;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #534636;
-@define-color dialog_fg_color #d0c8c6;
-@define-color popover_bg_color #534636;
-@define-color popover_fg_color #d0c8c6;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #645240;
-@define-color blue_1 #8ab3b5;
-@define-color blue_2 #8ab3b5;
-@define-color blue_3 #8ab3b5;
-@define-color blue_4 #8ab3b5;
-@define-color blue_5 #8ab3b5;
-@define-color green_1 #beb55b;
-@define-color green_2 #beb55b;
-@define-color green_3 #beb55b;
-@define-color green_4 #beb55b;
-@define-color green_5 #beb55b;
-@define-color yellow_1 #f4bc87;
-@define-color yellow_2 #f4bc87;
-@define-color yellow_3 #f4bc87;
-@define-color yellow_4 #f4bc87;
-@define-color yellow_5 #f4bc87;
-@define-color orange_1 #d28b71;
-@define-color orange_2 #d28b71;
-@define-color orange_3 #d28b71;
-@define-color orange_4 #d28b71;
-@define-color orange_5 #d28b71;
+
+
 @define-color red_1 #cb6077;
-@define-color red_2 #cb6077;
-@define-color red_3 #cb6077;
-@define-color red_4 #cb6077;
-@define-color red_5 #cb6077;
+@define-color green_1 #beb55b;
+@define-color yellow_1 #f4bc87;
+@define-color blue_1 #8ab3b5;
 @define-color purple_1 #a89bb9;
-@define-color purple_2 #a89bb9;
-@define-color purple_3 #a89bb9;
-@define-color purple_4 #a89bb9;
-@define-color purple_5 #a89bb9;
-@define-color brown_1 #bb9584;
-@define-color brown_2 #bb9584;
-@define-color brown_3 #bb9584;
-@define-color brown_4 #bb9584;
-@define-color brown_5 #bb9584;
-@define-color light_1 #d0c8c6;
-@define-color light_2 #d0c8c6;
-@define-color light_3 #d0c8c6;
-@define-color light_4 #d0c8c6;
-@define-color light_5 #d0c8c6;
-@define-color dark_1 #d0c8c6;
-@define-color dark_2 #d0c8c6;
-@define-color dark_3 #d0c8c6;
-@define-color dark_4 #d0c8c6;
-@define-color dark_5 #d0c8c6;
+@define-color teal_1 #7bbda4;
+@define-color orange_1 #d28b71;
+@define-color gray_1 #7e705a;
+
diff --git a/build/base16-monokai.css b/build/base16-monokai.css
index d0614d7..591b807 100644
--- a/build/base16-monokai.css
+++ b/build/base16-monokai.css
@@ -1,88 +1,37 @@
 @define-color accent_color #66d9ef;
 @define-color accent_bg_color #66d9ef;
 @define-color accent_fg_color #272822;
-@define-color destructive_color #f92672;
-@define-color destructive_bg_color #f92672;
-@define-color destructive_fg_color #272822;
-@define-color success_color #a6e22e;
-@define-color success_bg_color #a6e22e;
-@define-color success_fg_color #272822;
-@define-color warning_color #ae81ff;
-@define-color warning_bg_color #ae81ff;
-@define-color warning_fg_color #272822;
-@define-color error_color #f92672;
-@define-color error_bg_color #f92672;
-@define-color error_fg_color #272822;
+
 @define-color window_bg_color #272822;
 @define-color window_fg_color #f8f8f2;
+
 @define-color view_bg_color #272822;
 @define-color view_fg_color #f8f8f2;
-@define-color headerbar_bg_color #383830;
+
+@define-color headerbar_bg_color #272822;
 @define-color headerbar_fg_color #f8f8f2;
-@define-color headerbar_border_color rgba(0.21960784, 0.21960784, 0.18823529, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #272822;
+@define-color dialog_fg_color #f8f8f2;
+
+@define-color popover_bg_color #272822;
+@define-color popover_fg_color #f8f8f2;
+
+
 @define-color sidebar_bg_color #383830;
 @define-color sidebar_fg_color #f8f8f2;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #383830;
 @define-color card_fg_color #f8f8f2;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #383830;
-@define-color dialog_fg_color #f8f8f2;
-@define-color popover_bg_color #383830;
-@define-color popover_fg_color #f8f8f2;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #49483e;
-@define-color blue_1 #66d9ef;
-@define-color blue_2 #66d9ef;
-@define-color blue_3 #66d9ef;
-@define-color blue_4 #66d9ef;
-@define-color blue_5 #66d9ef;
-@define-color green_1 #a6e22e;
-@define-color green_2 #a6e22e;
-@define-color green_3 #a6e22e;
-@define-color green_4 #a6e22e;
-@define-color green_5 #a6e22e;
-@define-color yellow_1 #f4bf75;
-@define-color yellow_2 #f4bf75;
-@define-color yellow_3 #f4bf75;
-@define-color yellow_4 #f4bf75;
-@define-color yellow_5 #f4bf75;
-@define-color orange_1 #fd971f;
-@define-color orange_2 #fd971f;
-@define-color orange_3 #fd971f;
-@define-color orange_4 #fd971f;
-@define-color orange_5 #fd971f;
+
+
 @define-color red_1 #f92672;
-@define-color red_2 #f92672;
-@define-color red_3 #f92672;
-@define-color red_4 #f92672;
-@define-color red_5 #f92672;
+@define-color green_1 #a6e22e;
+@define-color yellow_1 #f4bf75;
+@define-color blue_1 #66d9ef;
 @define-color purple_1 #ae81ff;
-@define-color purple_2 #ae81ff;
-@define-color purple_3 #ae81ff;
-@define-color purple_4 #ae81ff;
-@define-color purple_5 #ae81ff;
-@define-color brown_1 #cc6633;
-@define-color brown_2 #cc6633;
-@define-color brown_3 #cc6633;
-@define-color brown_4 #cc6633;
-@define-color brown_5 #cc6633;
-@define-color light_1 #f8f8f2;
-@define-color light_2 #f8f8f2;
-@define-color light_3 #f8f8f2;
-@define-color light_4 #f8f8f2;
-@define-color light_5 #f8f8f2;
-@define-color dark_1 #f8f8f2;
-@define-color dark_2 #f8f8f2;
-@define-color dark_3 #f8f8f2;
-@define-color dark_4 #f8f8f2;
-@define-color dark_5 #f8f8f2;
+@define-color teal_1 #a1efe4;
+@define-color orange_1 #fd971f;
+@define-color gray_1 #75715e;
+
diff --git a/build/base16-moonlight.css b/build/base16-moonlight.css
index 073a80c..0d184ef 100644
--- a/build/base16-moonlight.css
+++ b/build/base16-moonlight.css
@@ -1,88 +1,37 @@
 @define-color accent_color #40ffff;
 @define-color accent_bg_color #40ffff;
 @define-color accent_fg_color #212337;
-@define-color destructive_color #ff5370;
-@define-color destructive_bg_color #ff5370;
-@define-color destructive_fg_color #212337;
-@define-color success_color #2df4c0;
-@define-color success_bg_color #2df4c0;
-@define-color success_fg_color #212337;
-@define-color warning_color #b994f1;
-@define-color warning_bg_color #b994f1;
-@define-color warning_fg_color #212337;
-@define-color error_color #ff5370;
-@define-color error_bg_color #ff5370;
-@define-color error_fg_color #212337;
+
 @define-color window_bg_color #212337;
 @define-color window_fg_color #a3ace1;
+
 @define-color view_bg_color #212337;
 @define-color view_fg_color #a3ace1;
-@define-color headerbar_bg_color #403c64;
+
+@define-color headerbar_bg_color #212337;
 @define-color headerbar_fg_color #a3ace1;
-@define-color headerbar_border_color rgba(0.25098039, 0.23529412, 0.39215686, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #212337;
+@define-color dialog_fg_color #a3ace1;
+
+@define-color popover_bg_color #212337;
+@define-color popover_fg_color #a3ace1;
+
+
 @define-color sidebar_bg_color #403c64;
 @define-color sidebar_fg_color #a3ace1;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #403c64;
 @define-color card_fg_color #a3ace1;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #403c64;
-@define-color dialog_fg_color #a3ace1;
-@define-color popover_bg_color #403c64;
-@define-color popover_fg_color #a3ace1;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #596399;
-@define-color blue_1 #40ffff;
-@define-color blue_2 #40ffff;
-@define-color blue_3 #40ffff;
-@define-color blue_4 #40ffff;
-@define-color blue_5 #40ffff;
-@define-color green_1 #2df4c0;
-@define-color green_2 #2df4c0;
-@define-color green_3 #2df4c0;
-@define-color green_4 #2df4c0;
-@define-color green_5 #2df4c0;
-@define-color yellow_1 #ffc777;
-@define-color yellow_2 #ffc777;
-@define-color yellow_3 #ffc777;
-@define-color yellow_4 #ffc777;
-@define-color yellow_5 #ffc777;
-@define-color orange_1 #f67f81;
-@define-color orange_2 #f67f81;
-@define-color orange_3 #f67f81;
-@define-color orange_4 #f67f81;
-@define-color orange_5 #f67f81;
+
+
 @define-color red_1 #ff5370;
-@define-color red_2 #ff5370;
-@define-color red_3 #ff5370;
-@define-color red_4 #ff5370;
-@define-color red_5 #ff5370;
+@define-color green_1 #2df4c0;
+@define-color yellow_1 #ffc777;
+@define-color blue_1 #40ffff;
 @define-color purple_1 #b994f1;
-@define-color purple_2 #b994f1;
-@define-color purple_3 #b994f1;
-@define-color purple_4 #b994f1;
-@define-color purple_5 #b994f1;
-@define-color brown_1 #ecb2f0;
-@define-color brown_2 #ecb2f0;
-@define-color brown_3 #ecb2f0;
-@define-color brown_4 #ecb2f0;
-@define-color brown_5 #ecb2f0;
-@define-color light_1 #a3ace1;
-@define-color light_2 #a3ace1;
-@define-color light_3 #a3ace1;
-@define-color light_4 #a3ace1;
-@define-color light_5 #a3ace1;
-@define-color dark_1 #a3ace1;
-@define-color dark_2 #a3ace1;
-@define-color dark_3 #a3ace1;
-@define-color dark_4 #a3ace1;
-@define-color dark_5 #a3ace1;
+@define-color teal_1 #04d1f9;
+@define-color orange_1 #f67f81;
+@define-color gray_1 #748cd6;
+
diff --git a/build/base16-mountain.css b/build/base16-mountain.css
index f4abf35..9055bef 100644
--- a/build/base16-mountain.css
+++ b/build/base16-mountain.css
@@ -1,88 +1,37 @@
 @define-color accent_color #8f8aac;
 @define-color accent_bg_color #8f8aac;
 @define-color accent_fg_color #0f0f0f;
-@define-color destructive_color #ac8a8c;
-@define-color destructive_bg_color #ac8a8c;
-@define-color destructive_fg_color #0f0f0f;
-@define-color success_color #8aac8b;
-@define-color success_bg_color #8aac8b;
-@define-color success_fg_color #0f0f0f;
-@define-color warning_color #ac8aac;
-@define-color warning_bg_color #ac8aac;
-@define-color warning_fg_color #0f0f0f;
-@define-color error_color #ac8a8c;
-@define-color error_bg_color #ac8a8c;
-@define-color error_fg_color #0f0f0f;
+
 @define-color window_bg_color #0f0f0f;
 @define-color window_fg_color #cacaca;
+
 @define-color view_bg_color #0f0f0f;
 @define-color view_fg_color #cacaca;
-@define-color headerbar_bg_color #191919;
+
+@define-color headerbar_bg_color #0f0f0f;
 @define-color headerbar_fg_color #cacaca;
-@define-color headerbar_border_color rgba(0.09803922, 0.09803922, 0.09803922, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #0f0f0f;
+@define-color dialog_fg_color #cacaca;
+
+@define-color popover_bg_color #0f0f0f;
+@define-color popover_fg_color #cacaca;
+
+
 @define-color sidebar_bg_color #191919;
 @define-color sidebar_fg_color #cacaca;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #191919;
 @define-color card_fg_color #cacaca;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #191919;
-@define-color dialog_fg_color #cacaca;
-@define-color popover_bg_color #191919;
-@define-color popover_fg_color #cacaca;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #262626;
-@define-color blue_1 #8f8aac;
-@define-color blue_2 #8f8aac;
-@define-color blue_3 #8f8aac;
-@define-color blue_4 #8f8aac;
-@define-color blue_5 #8f8aac;
-@define-color green_1 #8aac8b;
-@define-color green_2 #8aac8b;
-@define-color green_3 #8aac8b;
-@define-color green_4 #8aac8b;
-@define-color green_5 #8aac8b;
-@define-color yellow_1 #aca98a;
-@define-color yellow_2 #aca98a;
-@define-color yellow_3 #aca98a;
-@define-color yellow_4 #aca98a;
-@define-color yellow_5 #aca98a;
-@define-color orange_1 #ceb188;
-@define-color orange_2 #ceb188;
-@define-color orange_3 #ceb188;
-@define-color orange_4 #ceb188;
-@define-color orange_5 #ceb188;
+
+
 @define-color red_1 #ac8a8c;
-@define-color red_2 #ac8a8c;
-@define-color red_3 #ac8a8c;
-@define-color red_4 #ac8a8c;
-@define-color red_5 #ac8a8c;
+@define-color green_1 #8aac8b;
+@define-color yellow_1 #aca98a;
+@define-color blue_1 #8f8aac;
 @define-color purple_1 #ac8aac;
-@define-color purple_2 #ac8aac;
-@define-color purple_3 #ac8aac;
-@define-color purple_4 #ac8aac;
-@define-color purple_5 #ac8aac;
-@define-color brown_1 #ac8a8c;
-@define-color brown_2 #ac8a8c;
-@define-color brown_3 #ac8a8c;
-@define-color brown_4 #ac8a8c;
-@define-color brown_5 #ac8a8c;
-@define-color light_1 #cacaca;
-@define-color light_2 #cacaca;
-@define-color light_3 #cacaca;
-@define-color light_4 #cacaca;
-@define-color light_5 #cacaca;
-@define-color dark_1 #cacaca;
-@define-color dark_2 #cacaca;
-@define-color dark_3 #cacaca;
-@define-color dark_4 #cacaca;
-@define-color dark_5 #cacaca;
+@define-color teal_1 #8aabac;
+@define-color orange_1 #ceb188;
+@define-color gray_1 #393939;
+
diff --git a/build/base16-nebula.css b/build/base16-nebula.css
index 7f172ab..618d365 100644
--- a/build/base16-nebula.css
+++ b/build/base16-nebula.css
@@ -1,88 +1,37 @@
 @define-color accent_color #4d6bb6;
 @define-color accent_bg_color #4d6bb6;
 @define-color accent_fg_color #22273b;
-@define-color destructive_color #777abc;
-@define-color destructive_bg_color #777abc;
-@define-color destructive_fg_color #22273b;
-@define-color success_color #6562a8;
-@define-color success_bg_color #6562a8;
-@define-color success_fg_color #22273b;
-@define-color warning_color #716cae;
-@define-color warning_bg_color #716cae;
-@define-color warning_fg_color #22273b;
-@define-color error_color #777abc;
-@define-color error_bg_color #777abc;
-@define-color error_fg_color #22273b;
+
 @define-color window_bg_color #22273b;
 @define-color window_fg_color #a4a6a9;
+
 @define-color view_bg_color #22273b;
 @define-color view_fg_color #a4a6a9;
-@define-color headerbar_bg_color #414f60;
+
+@define-color headerbar_bg_color #22273b;
 @define-color headerbar_fg_color #a4a6a9;
-@define-color headerbar_border_color rgba(0.25490196, 0.30980392, 0.37647059, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #22273b;
+@define-color dialog_fg_color #a4a6a9;
+
+@define-color popover_bg_color #22273b;
+@define-color popover_fg_color #a4a6a9;
+
+
 @define-color sidebar_bg_color #414f60;
 @define-color sidebar_fg_color #a4a6a9;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #414f60;
 @define-color card_fg_color #a4a6a9;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #414f60;
-@define-color dialog_fg_color #a4a6a9;
-@define-color popover_bg_color #414f60;
-@define-color popover_fg_color #a4a6a9;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #5a8380;
-@define-color blue_1 #4d6bb6;
-@define-color blue_2 #4d6bb6;
-@define-color blue_3 #4d6bb6;
-@define-color blue_4 #4d6bb6;
-@define-color blue_5 #4d6bb6;
-@define-color green_1 #6562a8;
-@define-color green_2 #6562a8;
-@define-color green_3 #6562a8;
-@define-color green_4 #6562a8;
-@define-color green_5 #6562a8;
-@define-color yellow_1 #4f9062;
-@define-color yellow_2 #4f9062;
-@define-color yellow_3 #4f9062;
-@define-color yellow_4 #4f9062;
-@define-color yellow_5 #4f9062;
-@define-color orange_1 #94929e;
-@define-color orange_2 #94929e;
-@define-color orange_3 #94929e;
-@define-color orange_4 #94929e;
-@define-color orange_5 #94929e;
+
+
 @define-color red_1 #777abc;
-@define-color red_2 #777abc;
-@define-color red_3 #777abc;
-@define-color red_4 #777abc;
-@define-color red_5 #777abc;
+@define-color green_1 #6562a8;
+@define-color yellow_1 #4f9062;
+@define-color blue_1 #4d6bb6;
 @define-color purple_1 #716cae;
-@define-color purple_2 #716cae;
-@define-color purple_3 #716cae;
-@define-color purple_4 #716cae;
-@define-color purple_5 #716cae;
-@define-color brown_1 #8c70a7;
-@define-color brown_2 #8c70a7;
-@define-color brown_3 #8c70a7;
-@define-color brown_4 #8c70a7;
-@define-color brown_5 #8c70a7;
-@define-color light_1 #a4a6a9;
-@define-color light_2 #a4a6a9;
-@define-color light_3 #a4a6a9;
-@define-color light_4 #a4a6a9;
-@define-color light_5 #a4a6a9;
-@define-color dark_1 #a4a6a9;
-@define-color dark_2 #a4a6a9;
-@define-color dark_3 #a4a6a9;
-@define-color dark_4 #a4a6a9;
-@define-color dark_5 #a4a6a9;
+@define-color teal_1 #226f68;
+@define-color orange_1 #94929e;
+@define-color gray_1 #6e6f72;
+
diff --git a/build/base16-neovim-dark.css b/build/base16-neovim-dark.css
index f48db50..9417dfe 100644
--- a/build/base16-neovim-dark.css
+++ b/build/base16-neovim-dark.css
@@ -1,88 +1,37 @@
 @define-color accent_color #a6dbff;
 @define-color accent_bg_color #a6dbff;
 @define-color accent_fg_color #14161b;
-@define-color destructive_color #ffc0b9;
-@define-color destructive_bg_color #ffc0b9;
-@define-color destructive_fg_color #14161b;
-@define-color success_color #b3f6c0;
-@define-color success_bg_color #b3f6c0;
-@define-color success_fg_color #14161b;
-@define-color warning_color #ffcaff;
-@define-color warning_bg_color #ffcaff;
-@define-color warning_fg_color #14161b;
-@define-color error_color #ffc0b9;
-@define-color error_bg_color #ffc0b9;
-@define-color error_fg_color #14161b;
+
 @define-color window_bg_color #14161b;
 @define-color window_fg_color #e0e2ea;
+
 @define-color view_bg_color #14161b;
 @define-color view_fg_color #e0e2ea;
-@define-color headerbar_bg_color #07080d;
+
+@define-color headerbar_bg_color #14161b;
 @define-color headerbar_fg_color #e0e2ea;
-@define-color headerbar_border_color rgba(0.02745098, 0.03137255, 0.05098039, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #14161b;
+@define-color dialog_fg_color #e0e2ea;
+
+@define-color popover_bg_color #14161b;
+@define-color popover_fg_color #e0e2ea;
+
+
 @define-color sidebar_bg_color #07080d;
 @define-color sidebar_fg_color #e0e2ea;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #07080d;
 @define-color card_fg_color #e0e2ea;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #07080d;
-@define-color dialog_fg_color #e0e2ea;
-@define-color popover_bg_color #07080d;
-@define-color popover_fg_color #e0e2ea;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #4f5258;
-@define-color blue_1 #a6dbff;
-@define-color blue_2 #a6dbff;
-@define-color blue_3 #a6dbff;
-@define-color blue_4 #a6dbff;
-@define-color blue_5 #a6dbff;
-@define-color green_1 #b3f6c0;
-@define-color green_2 #b3f6c0;
-@define-color green_3 #b3f6c0;
-@define-color green_4 #b3f6c0;
-@define-color green_5 #b3f6c0;
-@define-color yellow_1 #fce094;
-@define-color yellow_2 #fce094;
-@define-color yellow_3 #fce094;
-@define-color yellow_4 #fce094;
-@define-color yellow_5 #fce094;
-@define-color orange_1 #ffa500;
-@define-color orange_2 #ffa500;
-@define-color orange_3 #ffa500;
-@define-color orange_4 #ffa500;
-@define-color orange_5 #ffa500;
+
+
 @define-color red_1 #ffc0b9;
-@define-color red_2 #ffc0b9;
-@define-color red_3 #ffc0b9;
-@define-color red_4 #ffc0b9;
-@define-color red_5 #ffc0b9;
+@define-color green_1 #b3f6c0;
+@define-color yellow_1 #fce094;
+@define-color blue_1 #a6dbff;
 @define-color purple_1 #ffcaff;
-@define-color purple_2 #ffcaff;
-@define-color purple_3 #ffcaff;
-@define-color purple_4 #ffcaff;
-@define-color purple_5 #ffcaff;
-@define-color brown_1 #cd853f;
-@define-color brown_2 #cd853f;
-@define-color brown_3 #cd853f;
-@define-color brown_4 #cd853f;
-@define-color brown_5 #cd853f;
-@define-color light_1 #e0e2ea;
-@define-color light_2 #e0e2ea;
-@define-color light_3 #e0e2ea;
-@define-color light_4 #e0e2ea;
-@define-color light_5 #e0e2ea;
-@define-color dark_1 #e0e2ea;
-@define-color dark_2 #e0e2ea;
-@define-color dark_3 #e0e2ea;
-@define-color dark_4 #e0e2ea;
-@define-color dark_5 #e0e2ea;
+@define-color teal_1 #8cf8f7;
+@define-color orange_1 #ffa500;
+@define-color gray_1 #9b9ea4;
+
diff --git a/build/base16-neovim-light.css b/build/base16-neovim-light.css
index 5a6c7a8..72f95f8 100644
--- a/build/base16-neovim-light.css
+++ b/build/base16-neovim-light.css
@@ -1,88 +1,37 @@
 @define-color accent_color #004c73;
 @define-color accent_bg_color #004c73;
 @define-color accent_fg_color #e0e2ea;
-@define-color destructive_color #590008;
-@define-color destructive_bg_color #590008;
-@define-color destructive_fg_color #e0e2ea;
-@define-color success_color #005523;
-@define-color success_bg_color #005523;
-@define-color success_fg_color #e0e2ea;
-@define-color warning_color #470045;
-@define-color warning_bg_color #470045;
-@define-color warning_fg_color #e0e2ea;
-@define-color error_color #590008;
-@define-color error_bg_color #590008;
-@define-color error_fg_color #e0e2ea;
+
 @define-color window_bg_color #e0e2ea;
 @define-color window_fg_color #14161b;
+
 @define-color view_bg_color #e0e2ea;
 @define-color view_fg_color #14161b;
-@define-color headerbar_bg_color #eef1f8;
+
+@define-color headerbar_bg_color #e0e2ea;
 @define-color headerbar_fg_color #14161b;
-@define-color headerbar_border_color rgba(0.93333333, 0.94509804, 0.97254902, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #e0e2ea;
+@define-color dialog_fg_color #14161b;
+
+@define-color popover_bg_color #e0e2ea;
+@define-color popover_fg_color #14161b;
+
+
 @define-color sidebar_bg_color #eef1f8;
 @define-color sidebar_fg_color #14161b;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #eef1f8;
 @define-color card_fg_color #14161b;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #eef1f8;
-@define-color dialog_fg_color #14161b;
-@define-color popover_bg_color #eef1f8;
-@define-color popover_fg_color #14161b;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #9b9ea4;
-@define-color blue_1 #004c73;
-@define-color blue_2 #004c73;
-@define-color blue_3 #004c73;
-@define-color blue_4 #004c73;
-@define-color blue_5 #004c73;
-@define-color green_1 #005523;
-@define-color green_2 #005523;
-@define-color green_3 #005523;
-@define-color green_4 #005523;
-@define-color green_5 #005523;
-@define-color yellow_1 #6b5300;
-@define-color yellow_2 #6b5300;
-@define-color yellow_3 #6b5300;
-@define-color yellow_4 #6b5300;
-@define-color yellow_5 #6b5300;
-@define-color orange_1 #8b4513;
-@define-color orange_2 #8b4513;
-@define-color orange_3 #8b4513;
-@define-color orange_4 #8b4513;
-@define-color orange_5 #8b4513;
+
+
 @define-color red_1 #590008;
-@define-color red_2 #590008;
-@define-color red_3 #590008;
-@define-color red_4 #590008;
-@define-color red_5 #590008;
+@define-color green_1 #005523;
+@define-color yellow_1 #6b5300;
+@define-color blue_1 #004c73;
 @define-color purple_1 #470045;
-@define-color purple_2 #470045;
-@define-color purple_3 #470045;
-@define-color purple_4 #470045;
-@define-color purple_5 #470045;
-@define-color brown_1 #a52a2a;
-@define-color brown_2 #a52a2a;
-@define-color brown_3 #a52a2a;
-@define-color brown_4 #a52a2a;
-@define-color brown_5 #a52a2a;
-@define-color light_1 #14161b;
-@define-color light_2 #14161b;
-@define-color light_3 #14161b;
-@define-color light_4 #14161b;
-@define-color light_5 #14161b;
-@define-color dark_1 #14161b;
-@define-color dark_2 #14161b;
-@define-color dark_3 #14161b;
-@define-color dark_4 #14161b;
-@define-color dark_5 #14161b;
+@define-color teal_1 #007373;
+@define-color orange_1 #8b4513;
+@define-color gray_1 #4f5258;
+
diff --git a/build/base16-noche.css b/build/base16-noche.css
index a6752c4..3c0e24b 100644
--- a/build/base16-noche.css
+++ b/build/base16-noche.css
@@ -1,88 +1,37 @@
 @define-color accent_color #7aa0e8;
 @define-color accent_bg_color #7aa0e8;
 @define-color accent_fg_color #0c0e16;
-@define-color destructive_color #e2727e;
-@define-color destructive_bg_color #e2727e;
-@define-color destructive_fg_color #0c0e16;
-@define-color success_color #7cc596;
-@define-color success_bg_color #7cc596;
-@define-color success_fg_color #0c0e16;
-@define-color warning_color #b79ae0;
-@define-color warning_bg_color #b79ae0;
-@define-color warning_fg_color #0c0e16;
-@define-color error_color #e2727e;
-@define-color error_bg_color #e2727e;
-@define-color error_fg_color #0c0e16;
+
 @define-color window_bg_color #0c0e16;
 @define-color window_fg_color #cbd4ec;
+
 @define-color view_bg_color #0c0e16;
 @define-color view_fg_color #cbd4ec;
-@define-color headerbar_bg_color #181c2c;
+
+@define-color headerbar_bg_color #0c0e16;
 @define-color headerbar_fg_color #cbd4ec;
-@define-color headerbar_border_color rgba(0.09411765, 0.10980392, 0.17254902, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #0c0e16;
+@define-color dialog_fg_color #cbd4ec;
+
+@define-color popover_bg_color #0c0e16;
+@define-color popover_fg_color #cbd4ec;
+
+
 @define-color sidebar_bg_color #181c2c;
 @define-color sidebar_fg_color #cbd4ec;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #181c2c;
 @define-color card_fg_color #cbd4ec;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #181c2c;
-@define-color dialog_fg_color #cbd4ec;
-@define-color popover_bg_color #181c2c;
-@define-color popover_fg_color #cbd4ec;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #232a40;
-@define-color blue_1 #7aa0e8;
-@define-color blue_2 #7aa0e8;
-@define-color blue_3 #7aa0e8;
-@define-color blue_4 #7aa0e8;
-@define-color blue_5 #7aa0e8;
-@define-color green_1 #7cc596;
-@define-color green_2 #7cc596;
-@define-color green_3 #7cc596;
-@define-color green_4 #7cc596;
-@define-color green_5 #7cc596;
-@define-color yellow_1 #d8c062;
-@define-color yellow_2 #d8c062;
-@define-color yellow_3 #d8c062;
-@define-color yellow_4 #d8c062;
-@define-color yellow_5 #d8c062;
-@define-color orange_1 #82a6e0;
-@define-color orange_2 #82a6e0;
-@define-color orange_3 #82a6e0;
-@define-color orange_4 #82a6e0;
-@define-color orange_5 #82a6e0;
+
+
 @define-color red_1 #e2727e;
-@define-color red_2 #e2727e;
-@define-color red_3 #e2727e;
-@define-color red_4 #e2727e;
-@define-color red_5 #e2727e;
+@define-color green_1 #7cc596;
+@define-color yellow_1 #d8c062;
+@define-color blue_1 #7aa0e8;
 @define-color purple_1 #b79ae0;
-@define-color purple_2 #b79ae0;
-@define-color purple_3 #b79ae0;
-@define-color purple_4 #b79ae0;
-@define-color purple_5 #b79ae0;
-@define-color brown_1 #3a4260;
-@define-color brown_2 #3a4260;
-@define-color brown_3 #3a4260;
-@define-color brown_4 #3a4260;
-@define-color brown_5 #3a4260;
-@define-color light_1 #cbd4ec;
-@define-color light_2 #cbd4ec;
-@define-color light_3 #cbd4ec;
-@define-color light_4 #cbd4ec;
-@define-color light_5 #cbd4ec;
-@define-color dark_1 #cbd4ec;
-@define-color dark_2 #cbd4ec;
-@define-color dark_3 #cbd4ec;
-@define-color dark_4 #cbd4ec;
-@define-color dark_5 #cbd4ec;
+@define-color teal_1 #6dd8d0;
+@define-color orange_1 #82a6e0;
+@define-color gray_1 #5a6178;
+
diff --git a/build/base16-nord-light.css b/build/base16-nord-light.css
index 54456fd..928c407 100644
--- a/build/base16-nord-light.css
+++ b/build/base16-nord-light.css
@@ -1,88 +1,37 @@
 @define-color accent_color #3b6ea8;
 @define-color accent_bg_color #3b6ea8;
 @define-color accent_fg_color #e5e9f0;
-@define-color destructive_color #99324b;
-@define-color destructive_bg_color #99324b;
-@define-color destructive_fg_color #e5e9f0;
-@define-color success_color #4f894c;
-@define-color success_bg_color #4f894c;
-@define-color success_fg_color #e5e9f0;
-@define-color warning_color #97365b;
-@define-color warning_bg_color #97365b;
-@define-color warning_fg_color #e5e9f0;
-@define-color error_color #99324b;
-@define-color error_bg_color #99324b;
-@define-color error_fg_color #e5e9f0;
+
 @define-color window_bg_color #e5e9f0;
 @define-color window_fg_color #2e3440;
+
 @define-color view_bg_color #e5e9f0;
 @define-color view_fg_color #2e3440;
-@define-color headerbar_bg_color #c2d0e7;
+
+@define-color headerbar_bg_color #e5e9f0;
 @define-color headerbar_fg_color #2e3440;
-@define-color headerbar_border_color rgba(0.76078431, 0.81568627, 0.90588235, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #e5e9f0;
+@define-color dialog_fg_color #2e3440;
+
+@define-color popover_bg_color #e5e9f0;
+@define-color popover_fg_color #2e3440;
+
+
 @define-color sidebar_bg_color #c2d0e7;
 @define-color sidebar_fg_color #2e3440;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #c2d0e7;
 @define-color card_fg_color #2e3440;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #c2d0e7;
-@define-color dialog_fg_color #2e3440;
-@define-color popover_bg_color #c2d0e7;
-@define-color popover_fg_color #2e3440;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #b8c5db;
-@define-color blue_1 #3b6ea8;
-@define-color blue_2 #3b6ea8;
-@define-color blue_3 #3b6ea8;
-@define-color blue_4 #3b6ea8;
-@define-color blue_5 #3b6ea8;
-@define-color green_1 #4f894c;
-@define-color green_2 #4f894c;
-@define-color green_3 #4f894c;
-@define-color green_4 #4f894c;
-@define-color green_5 #4f894c;
-@define-color yellow_1 #9a7500;
-@define-color yellow_2 #9a7500;
-@define-color yellow_3 #9a7500;
-@define-color yellow_4 #9a7500;
-@define-color yellow_5 #9a7500;
-@define-color orange_1 #ac4426;
-@define-color orange_2 #ac4426;
-@define-color orange_3 #ac4426;
-@define-color orange_4 #ac4426;
-@define-color orange_5 #ac4426;
+
+
 @define-color red_1 #99324b;
-@define-color red_2 #99324b;
-@define-color red_3 #99324b;
-@define-color red_4 #99324b;
-@define-color red_5 #99324b;
+@define-color green_1 #4f894c;
+@define-color yellow_1 #9a7500;
+@define-color blue_1 #3b6ea8;
 @define-color purple_1 #97365b;
-@define-color purple_2 #97365b;
-@define-color purple_3 #97365b;
-@define-color purple_4 #97365b;
-@define-color purple_5 #97365b;
-@define-color brown_1 #5272af;
-@define-color brown_2 #5272af;
-@define-color brown_3 #5272af;
-@define-color brown_4 #5272af;
-@define-color brown_5 #5272af;
-@define-color light_1 #2e3440;
-@define-color light_2 #2e3440;
-@define-color light_3 #2e3440;
-@define-color light_4 #2e3440;
-@define-color light_5 #2e3440;
-@define-color dark_1 #2e3440;
-@define-color dark_2 #2e3440;
-@define-color dark_3 #2e3440;
-@define-color dark_4 #2e3440;
-@define-color dark_5 #2e3440;
+@define-color teal_1 #398eac;
+@define-color orange_1 #ac4426;
+@define-color gray_1 #aebacf;
+
diff --git a/build/base16-nord.css b/build/base16-nord.css
index 6dfc748..b0808fd 100644
--- a/build/base16-nord.css
+++ b/build/base16-nord.css
@@ -1,88 +1,37 @@
 @define-color accent_color #81a1c1;
 @define-color accent_bg_color #81a1c1;
 @define-color accent_fg_color #2e3440;
-@define-color destructive_color #bf616a;
-@define-color destructive_bg_color #bf616a;
-@define-color destructive_fg_color #2e3440;
-@define-color success_color #a3be8c;
-@define-color success_bg_color #a3be8c;
-@define-color success_fg_color #2e3440;
-@define-color warning_color #b48ead;
-@define-color warning_bg_color #b48ead;
-@define-color warning_fg_color #2e3440;
-@define-color error_color #bf616a;
-@define-color error_bg_color #bf616a;
-@define-color error_fg_color #2e3440;
+
 @define-color window_bg_color #2e3440;
 @define-color window_fg_color #e5e9f0;
+
 @define-color view_bg_color #2e3440;
 @define-color view_fg_color #e5e9f0;
-@define-color headerbar_bg_color #3b4252;
+
+@define-color headerbar_bg_color #2e3440;
 @define-color headerbar_fg_color #e5e9f0;
-@define-color headerbar_border_color rgba(0.23137255, 0.25882353, 0.32156863, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #2e3440;
+@define-color dialog_fg_color #e5e9f0;
+
+@define-color popover_bg_color #2e3440;
+@define-color popover_fg_color #e5e9f0;
+
+
 @define-color sidebar_bg_color #3b4252;
 @define-color sidebar_fg_color #e5e9f0;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #3b4252;
 @define-color card_fg_color #e5e9f0;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #3b4252;
-@define-color dialog_fg_color #e5e9f0;
-@define-color popover_bg_color #3b4252;
-@define-color popover_fg_color #e5e9f0;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #434c5e;
-@define-color blue_1 #81a1c1;
-@define-color blue_2 #81a1c1;
-@define-color blue_3 #81a1c1;
-@define-color blue_4 #81a1c1;
-@define-color blue_5 #81a1c1;
-@define-color green_1 #a3be8c;
-@define-color green_2 #a3be8c;
-@define-color green_3 #a3be8c;
-@define-color green_4 #a3be8c;
-@define-color green_5 #a3be8c;
-@define-color yellow_1 #ebcb8b;
-@define-color yellow_2 #ebcb8b;
-@define-color yellow_3 #ebcb8b;
-@define-color yellow_4 #ebcb8b;
-@define-color yellow_5 #ebcb8b;
-@define-color orange_1 #d08770;
-@define-color orange_2 #d08770;
-@define-color orange_3 #d08770;
-@define-color orange_4 #d08770;
-@define-color orange_5 #d08770;
+
+
 @define-color red_1 #bf616a;
-@define-color red_2 #bf616a;
-@define-color red_3 #bf616a;
-@define-color red_4 #bf616a;
-@define-color red_5 #bf616a;
+@define-color green_1 #a3be8c;
+@define-color yellow_1 #ebcb8b;
+@define-color blue_1 #81a1c1;
 @define-color purple_1 #b48ead;
-@define-color purple_2 #b48ead;
-@define-color purple_3 #b48ead;
-@define-color purple_4 #b48ead;
-@define-color purple_5 #b48ead;
-@define-color brown_1 #5e81ac;
-@define-color brown_2 #5e81ac;
-@define-color brown_3 #5e81ac;
-@define-color brown_4 #5e81ac;
-@define-color brown_5 #5e81ac;
-@define-color light_1 #e5e9f0;
-@define-color light_2 #e5e9f0;
-@define-color light_3 #e5e9f0;
-@define-color light_4 #e5e9f0;
-@define-color light_5 #e5e9f0;
-@define-color dark_1 #e5e9f0;
-@define-color dark_2 #e5e9f0;
-@define-color dark_3 #e5e9f0;
-@define-color dark_4 #e5e9f0;
-@define-color dark_5 #e5e9f0;
+@define-color teal_1 #88c0d0;
+@define-color orange_1 #d08770;
+@define-color gray_1 #4c566a;
+
diff --git a/build/base16-nova.css b/build/base16-nova.css
index 3ba8015..6de51f6 100644
--- a/build/base16-nova.css
+++ b/build/base16-nova.css
@@ -1,88 +1,37 @@
 @define-color accent_color #83afe5;
 @define-color accent_bg_color #83afe5;
 @define-color accent_fg_color #3c4c55;
-@define-color destructive_color #83afe5;
-@define-color destructive_bg_color #83afe5;
-@define-color destructive_fg_color #3c4c55;
-@define-color success_color #7fc1ca;
-@define-color success_bg_color #7fc1ca;
-@define-color success_fg_color #3c4c55;
-@define-color warning_color #9a93e1;
-@define-color warning_bg_color #9a93e1;
-@define-color warning_fg_color #3c4c55;
-@define-color error_color #83afe5;
-@define-color error_bg_color #83afe5;
-@define-color error_fg_color #3c4c55;
+
 @define-color window_bg_color #3c4c55;
 @define-color window_fg_color #c5d4dd;
+
 @define-color view_bg_color #3c4c55;
 @define-color view_fg_color #c5d4dd;
-@define-color headerbar_bg_color #556873;
+
+@define-color headerbar_bg_color #3c4c55;
 @define-color headerbar_fg_color #c5d4dd;
-@define-color headerbar_border_color rgba(0.33333333, 0.40784314, 0.45098039, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #3c4c55;
+@define-color dialog_fg_color #c5d4dd;
+
+@define-color popover_bg_color #3c4c55;
+@define-color popover_fg_color #c5d4dd;
+
+
 @define-color sidebar_bg_color #556873;
 @define-color sidebar_fg_color #c5d4dd;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #556873;
 @define-color card_fg_color #c5d4dd;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #556873;
-@define-color dialog_fg_color #c5d4dd;
-@define-color popover_bg_color #556873;
-@define-color popover_fg_color #c5d4dd;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #6a7d89;
-@define-color blue_1 #83afe5;
-@define-color blue_2 #83afe5;
-@define-color blue_3 #83afe5;
-@define-color blue_4 #83afe5;
-@define-color blue_5 #83afe5;
-@define-color green_1 #7fc1ca;
-@define-color green_2 #7fc1ca;
-@define-color green_3 #7fc1ca;
-@define-color green_4 #7fc1ca;
-@define-color green_5 #7fc1ca;
-@define-color yellow_1 #a8ce93;
-@define-color yellow_2 #a8ce93;
-@define-color yellow_3 #a8ce93;
-@define-color yellow_4 #a8ce93;
-@define-color yellow_5 #a8ce93;
-@define-color orange_1 #7fc1ca;
-@define-color orange_2 #7fc1ca;
-@define-color orange_3 #7fc1ca;
-@define-color orange_4 #7fc1ca;
-@define-color orange_5 #7fc1ca;
+
+
 @define-color red_1 #83afe5;
-@define-color red_2 #83afe5;
-@define-color red_3 #83afe5;
-@define-color red_4 #83afe5;
-@define-color red_5 #83afe5;
+@define-color green_1 #7fc1ca;
+@define-color yellow_1 #a8ce93;
+@define-color blue_1 #83afe5;
 @define-color purple_1 #9a93e1;
-@define-color purple_2 #9a93e1;
-@define-color purple_3 #9a93e1;
-@define-color purple_4 #9a93e1;
-@define-color purple_5 #9a93e1;
-@define-color brown_1 #f2c38f;
-@define-color brown_2 #f2c38f;
-@define-color brown_3 #f2c38f;
-@define-color brown_4 #f2c38f;
-@define-color brown_5 #f2c38f;
-@define-color light_1 #c5d4dd;
-@define-color light_2 #c5d4dd;
-@define-color light_3 #c5d4dd;
-@define-color light_4 #c5d4dd;
-@define-color light_5 #c5d4dd;
-@define-color dark_1 #c5d4dd;
-@define-color dark_2 #c5d4dd;
-@define-color dark_3 #c5d4dd;
-@define-color dark_4 #c5d4dd;
-@define-color dark_5 #c5d4dd;
+@define-color teal_1 #f2c38f;
+@define-color orange_1 #7fc1ca;
+@define-color gray_1 #899ba6;
+
diff --git a/build/base16-ocean.css b/build/base16-ocean.css
index 4bcb998..0daa210 100644
--- a/build/base16-ocean.css
+++ b/build/base16-ocean.css
@@ -1,88 +1,37 @@
 @define-color accent_color #8fa1b3;
 @define-color accent_bg_color #8fa1b3;
 @define-color accent_fg_color #2b303b;
-@define-color destructive_color #bf616a;
-@define-color destructive_bg_color #bf616a;
-@define-color destructive_fg_color #2b303b;
-@define-color success_color #a3be8c;
-@define-color success_bg_color #a3be8c;
-@define-color success_fg_color #2b303b;
-@define-color warning_color #b48ead;
-@define-color warning_bg_color #b48ead;
-@define-color warning_fg_color #2b303b;
-@define-color error_color #bf616a;
-@define-color error_bg_color #bf616a;
-@define-color error_fg_color #2b303b;
+
 @define-color window_bg_color #2b303b;
 @define-color window_fg_color #c0c5ce;
+
 @define-color view_bg_color #2b303b;
 @define-color view_fg_color #c0c5ce;
-@define-color headerbar_bg_color #343d46;
+
+@define-color headerbar_bg_color #2b303b;
 @define-color headerbar_fg_color #c0c5ce;
-@define-color headerbar_border_color rgba(0.20392157, 0.23921569, 0.27450980, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #2b303b;
+@define-color dialog_fg_color #c0c5ce;
+
+@define-color popover_bg_color #2b303b;
+@define-color popover_fg_color #c0c5ce;
+
+
 @define-color sidebar_bg_color #343d46;
 @define-color sidebar_fg_color #c0c5ce;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #343d46;
 @define-color card_fg_color #c0c5ce;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #343d46;
-@define-color dialog_fg_color #c0c5ce;
-@define-color popover_bg_color #343d46;
-@define-color popover_fg_color #c0c5ce;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #4f5b66;
-@define-color blue_1 #8fa1b3;
-@define-color blue_2 #8fa1b3;
-@define-color blue_3 #8fa1b3;
-@define-color blue_4 #8fa1b3;
-@define-color blue_5 #8fa1b3;
-@define-color green_1 #a3be8c;
-@define-color green_2 #a3be8c;
-@define-color green_3 #a3be8c;
-@define-color green_4 #a3be8c;
-@define-color green_5 #a3be8c;
-@define-color yellow_1 #ebcb8b;
-@define-color yellow_2 #ebcb8b;
-@define-color yellow_3 #ebcb8b;
-@define-color yellow_4 #ebcb8b;
-@define-color yellow_5 #ebcb8b;
-@define-color orange_1 #d08770;
-@define-color orange_2 #d08770;
-@define-color orange_3 #d08770;
-@define-color orange_4 #d08770;
-@define-color orange_5 #d08770;
+
+
 @define-color red_1 #bf616a;
-@define-color red_2 #bf616a;
-@define-color red_3 #bf616a;
-@define-color red_4 #bf616a;
-@define-color red_5 #bf616a;
+@define-color green_1 #a3be8c;
+@define-color yellow_1 #ebcb8b;
+@define-color blue_1 #8fa1b3;
 @define-color purple_1 #b48ead;
-@define-color purple_2 #b48ead;
-@define-color purple_3 #b48ead;
-@define-color purple_4 #b48ead;
-@define-color purple_5 #b48ead;
-@define-color brown_1 #ab7967;
-@define-color brown_2 #ab7967;
-@define-color brown_3 #ab7967;
-@define-color brown_4 #ab7967;
-@define-color brown_5 #ab7967;
-@define-color light_1 #c0c5ce;
-@define-color light_2 #c0c5ce;
-@define-color light_3 #c0c5ce;
-@define-color light_4 #c0c5ce;
-@define-color light_5 #c0c5ce;
-@define-color dark_1 #c0c5ce;
-@define-color dark_2 #c0c5ce;
-@define-color dark_3 #c0c5ce;
-@define-color dark_4 #c0c5ce;
-@define-color dark_5 #c0c5ce;
+@define-color teal_1 #96b5b4;
+@define-color orange_1 #d08770;
+@define-color gray_1 #65737e;
+
diff --git a/build/base16-oceanicnext.css b/build/base16-oceanicnext.css
index cecbdcf..5d015fe 100644
--- a/build/base16-oceanicnext.css
+++ b/build/base16-oceanicnext.css
@@ -1,88 +1,37 @@
 @define-color accent_color #6699cc;
 @define-color accent_bg_color #6699cc;
 @define-color accent_fg_color #1b2b34;
-@define-color destructive_color #ec5f67;
-@define-color destructive_bg_color #ec5f67;
-@define-color destructive_fg_color #1b2b34;
-@define-color success_color #99c794;
-@define-color success_bg_color #99c794;
-@define-color success_fg_color #1b2b34;
-@define-color warning_color #c594c5;
-@define-color warning_bg_color #c594c5;
-@define-color warning_fg_color #1b2b34;
-@define-color error_color #ec5f67;
-@define-color error_bg_color #ec5f67;
-@define-color error_fg_color #1b2b34;
+
 @define-color window_bg_color #1b2b34;
 @define-color window_fg_color #c0c5ce;
+
 @define-color view_bg_color #1b2b34;
 @define-color view_fg_color #c0c5ce;
-@define-color headerbar_bg_color #343d46;
+
+@define-color headerbar_bg_color #1b2b34;
 @define-color headerbar_fg_color #c0c5ce;
-@define-color headerbar_border_color rgba(0.20392157, 0.23921569, 0.27450980, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #1b2b34;
+@define-color dialog_fg_color #c0c5ce;
+
+@define-color popover_bg_color #1b2b34;
+@define-color popover_fg_color #c0c5ce;
+
+
 @define-color sidebar_bg_color #343d46;
 @define-color sidebar_fg_color #c0c5ce;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #343d46;
 @define-color card_fg_color #c0c5ce;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #343d46;
-@define-color dialog_fg_color #c0c5ce;
-@define-color popover_bg_color #343d46;
-@define-color popover_fg_color #c0c5ce;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #4f5b66;
-@define-color blue_1 #6699cc;
-@define-color blue_2 #6699cc;
-@define-color blue_3 #6699cc;
-@define-color blue_4 #6699cc;
-@define-color blue_5 #6699cc;
-@define-color green_1 #99c794;
-@define-color green_2 #99c794;
-@define-color green_3 #99c794;
-@define-color green_4 #99c794;
-@define-color green_5 #99c794;
-@define-color yellow_1 #fac863;
-@define-color yellow_2 #fac863;
-@define-color yellow_3 #fac863;
-@define-color yellow_4 #fac863;
-@define-color yellow_5 #fac863;
-@define-color orange_1 #f99157;
-@define-color orange_2 #f99157;
-@define-color orange_3 #f99157;
-@define-color orange_4 #f99157;
-@define-color orange_5 #f99157;
+
+
 @define-color red_1 #ec5f67;
-@define-color red_2 #ec5f67;
-@define-color red_3 #ec5f67;
-@define-color red_4 #ec5f67;
-@define-color red_5 #ec5f67;
+@define-color green_1 #99c794;
+@define-color yellow_1 #fac863;
+@define-color blue_1 #6699cc;
 @define-color purple_1 #c594c5;
-@define-color purple_2 #c594c5;
-@define-color purple_3 #c594c5;
-@define-color purple_4 #c594c5;
-@define-color purple_5 #c594c5;
-@define-color brown_1 #ab7967;
-@define-color brown_2 #ab7967;
-@define-color brown_3 #ab7967;
-@define-color brown_4 #ab7967;
-@define-color brown_5 #ab7967;
-@define-color light_1 #c0c5ce;
-@define-color light_2 #c0c5ce;
-@define-color light_3 #c0c5ce;
-@define-color light_4 #c0c5ce;
-@define-color light_5 #c0c5ce;
-@define-color dark_1 #c0c5ce;
-@define-color dark_2 #c0c5ce;
-@define-color dark_3 #c0c5ce;
-@define-color dark_4 #c0c5ce;
-@define-color dark_5 #c0c5ce;
+@define-color teal_1 #5fb3b3;
+@define-color orange_1 #f99157;
+@define-color gray_1 #65737e;
+
diff --git a/build/base16-ocote.css b/build/base16-ocote.css
index 0d7491e..4341902 100644
--- a/build/base16-ocote.css
+++ b/build/base16-ocote.css
@@ -1,88 +1,37 @@
 @define-color accent_color #82a6e0;
 @define-color accent_bg_color #82a6e0;
 @define-color accent_fg_color #14100c;
-@define-color destructive_color #e8635a;
-@define-color destructive_bg_color #e8635a;
-@define-color destructive_fg_color #14100c;
-@define-color success_color #7dc97a;
-@define-color success_bg_color #7dc97a;
-@define-color success_fg_color #14100c;
-@define-color warning_color #c58ae0;
-@define-color warning_bg_color #c58ae0;
-@define-color warning_fg_color #14100c;
-@define-color error_color #e8635a;
-@define-color error_bg_color #e8635a;
-@define-color error_fg_color #14100c;
+
 @define-color window_bg_color #14100c;
 @define-color window_fg_color #e7dcc6;
+
 @define-color view_bg_color #14100c;
 @define-color view_fg_color #e7dcc6;
-@define-color headerbar_bg_color #211b13;
+
+@define-color headerbar_bg_color #14100c;
 @define-color headerbar_fg_color #e7dcc6;
-@define-color headerbar_border_color rgba(0.12941176, 0.10588235, 0.07450980, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #14100c;
+@define-color dialog_fg_color #e7dcc6;
+
+@define-color popover_bg_color #14100c;
+@define-color popover_fg_color #e7dcc6;
+
+
 @define-color sidebar_bg_color #211b13;
 @define-color sidebar_fg_color #e7dcc6;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #211b13;
 @define-color card_fg_color #e7dcc6;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #211b13;
-@define-color dialog_fg_color #e7dcc6;
-@define-color popover_bg_color #211b13;
-@define-color popover_fg_color #e7dcc6;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #3a2e1c;
-@define-color blue_1 #82a6e0;
-@define-color blue_2 #82a6e0;
-@define-color blue_3 #82a6e0;
-@define-color blue_4 #82a6e0;
-@define-color blue_5 #82a6e0;
-@define-color green_1 #7dc97a;
-@define-color green_2 #7dc97a;
-@define-color green_3 #7dc97a;
-@define-color green_4 #7dc97a;
-@define-color green_5 #7dc97a;
-@define-color yellow_1 #e8b43a;
-@define-color yellow_2 #e8b43a;
-@define-color yellow_3 #e8b43a;
-@define-color yellow_4 #e8b43a;
-@define-color yellow_5 #e8b43a;
-@define-color orange_1 #e8843a;
-@define-color orange_2 #e8843a;
-@define-color orange_3 #e8843a;
-@define-color orange_4 #e8843a;
-@define-color orange_5 #e8843a;
+
+
 @define-color red_1 #e8635a;
-@define-color red_2 #e8635a;
-@define-color red_3 #e8635a;
-@define-color red_4 #e8635a;
-@define-color red_5 #e8635a;
+@define-color green_1 #7dc97a;
+@define-color yellow_1 #e8b43a;
+@define-color blue_1 #82a6e0;
 @define-color purple_1 #c58ae0;
-@define-color purple_2 #c58ae0;
-@define-color purple_3 #c58ae0;
-@define-color purple_4 #c58ae0;
-@define-color purple_5 #c58ae0;
-@define-color brown_1 #4a3e2c;
-@define-color brown_2 #4a3e2c;
-@define-color brown_3 #4a3e2c;
-@define-color brown_4 #4a3e2c;
-@define-color brown_5 #4a3e2c;
-@define-color light_1 #e7dcc6;
-@define-color light_2 #e7dcc6;
-@define-color light_3 #e7dcc6;
-@define-color light_4 #e7dcc6;
-@define-color light_5 #e7dcc6;
-@define-color dark_1 #e7dcc6;
-@define-color dark_2 #e7dcc6;
-@define-color dark_3 #e7dcc6;
-@define-color dark_4 #e7dcc6;
-@define-color dark_5 #e7dcc6;
+@define-color teal_1 #6dd8c8;
+@define-color orange_1 #e8843a;
+@define-color gray_1 #6b6253;
+
diff --git a/build/base16-one-light.css b/build/base16-one-light.css
index 9918997..4291add 100644
--- a/build/base16-one-light.css
+++ b/build/base16-one-light.css
@@ -1,88 +1,37 @@
 @define-color accent_color #4078f2;
 @define-color accent_bg_color #4078f2;
 @define-color accent_fg_color #fafafa;
-@define-color destructive_color #ca1243;
-@define-color destructive_bg_color #ca1243;
-@define-color destructive_fg_color #fafafa;
-@define-color success_color #50a14f;
-@define-color success_bg_color #50a14f;
-@define-color success_fg_color #fafafa;
-@define-color warning_color #a626a4;
-@define-color warning_bg_color #a626a4;
-@define-color warning_fg_color #fafafa;
-@define-color error_color #ca1243;
-@define-color error_bg_color #ca1243;
-@define-color error_fg_color #fafafa;
+
 @define-color window_bg_color #fafafa;
 @define-color window_fg_color #383a42;
+
 @define-color view_bg_color #fafafa;
 @define-color view_fg_color #383a42;
-@define-color headerbar_bg_color #f0f0f1;
+
+@define-color headerbar_bg_color #fafafa;
 @define-color headerbar_fg_color #383a42;
-@define-color headerbar_border_color rgba(0.94117647, 0.94117647, 0.94509804, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #fafafa;
+@define-color dialog_fg_color #383a42;
+
+@define-color popover_bg_color #fafafa;
+@define-color popover_fg_color #383a42;
+
+
 @define-color sidebar_bg_color #f0f0f1;
 @define-color sidebar_fg_color #383a42;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #f0f0f1;
 @define-color card_fg_color #383a42;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #f0f0f1;
-@define-color dialog_fg_color #383a42;
-@define-color popover_bg_color #f0f0f1;
-@define-color popover_fg_color #383a42;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #e5e5e6;
-@define-color blue_1 #4078f2;
-@define-color blue_2 #4078f2;
-@define-color blue_3 #4078f2;
-@define-color blue_4 #4078f2;
-@define-color blue_5 #4078f2;
-@define-color green_1 #50a14f;
-@define-color green_2 #50a14f;
-@define-color green_3 #50a14f;
-@define-color green_4 #50a14f;
-@define-color green_5 #50a14f;
-@define-color yellow_1 #c18401;
-@define-color yellow_2 #c18401;
-@define-color yellow_3 #c18401;
-@define-color yellow_4 #c18401;
-@define-color yellow_5 #c18401;
-@define-color orange_1 #d75f00;
-@define-color orange_2 #d75f00;
-@define-color orange_3 #d75f00;
-@define-color orange_4 #d75f00;
-@define-color orange_5 #d75f00;
+
+
 @define-color red_1 #ca1243;
-@define-color red_2 #ca1243;
-@define-color red_3 #ca1243;
-@define-color red_4 #ca1243;
-@define-color red_5 #ca1243;
+@define-color green_1 #50a14f;
+@define-color yellow_1 #c18401;
+@define-color blue_1 #4078f2;
 @define-color purple_1 #a626a4;
-@define-color purple_2 #a626a4;
-@define-color purple_3 #a626a4;
-@define-color purple_4 #a626a4;
-@define-color purple_5 #a626a4;
-@define-color brown_1 #986801;
-@define-color brown_2 #986801;
-@define-color brown_3 #986801;
-@define-color brown_4 #986801;
-@define-color brown_5 #986801;
-@define-color light_1 #383a42;
-@define-color light_2 #383a42;
-@define-color light_3 #383a42;
-@define-color light_4 #383a42;
-@define-color light_5 #383a42;
-@define-color dark_1 #383a42;
-@define-color dark_2 #383a42;
-@define-color dark_3 #383a42;
-@define-color dark_4 #383a42;
-@define-color dark_5 #383a42;
+@define-color teal_1 #0184bc;
+@define-color orange_1 #d75f00;
+@define-color gray_1 #a0a1a7;
+
diff --git a/build/base16-onedark-dark.css b/build/base16-onedark-dark.css
index ef4d937..4580c29 100644
--- a/build/base16-onedark-dark.css
+++ b/build/base16-onedark-dark.css
@@ -1,88 +1,37 @@
 @define-color accent_color #61afef;
 @define-color accent_bg_color #61afef;
 @define-color accent_fg_color #000000;
-@define-color destructive_color #ef596f;
-@define-color destructive_bg_color #ef596f;
-@define-color destructive_fg_color #000000;
-@define-color success_color #89ca78;
-@define-color success_bg_color #89ca78;
-@define-color success_fg_color #000000;
-@define-color warning_color #d55fde;
-@define-color warning_bg_color #d55fde;
-@define-color warning_fg_color #000000;
-@define-color error_color #ef596f;
-@define-color error_bg_color #ef596f;
-@define-color error_fg_color #000000;
+
 @define-color window_bg_color #000000;
 @define-color window_fg_color #abb2bf;
+
 @define-color view_bg_color #000000;
 @define-color view_fg_color #abb2bf;
-@define-color headerbar_bg_color #1c1f24;
+
+@define-color headerbar_bg_color #000000;
 @define-color headerbar_fg_color #abb2bf;
-@define-color headerbar_border_color rgba(0.10980392, 0.12156863, 0.14117647, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #000000;
+@define-color dialog_fg_color #abb2bf;
+
+@define-color popover_bg_color #000000;
+@define-color popover_fg_color #abb2bf;
+
+
 @define-color sidebar_bg_color #1c1f24;
 @define-color sidebar_fg_color #abb2bf;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #1c1f24;
 @define-color card_fg_color #abb2bf;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #1c1f24;
-@define-color dialog_fg_color #abb2bf;
-@define-color popover_bg_color #1c1f24;
-@define-color popover_fg_color #abb2bf;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #2c313a;
-@define-color blue_1 #61afef;
-@define-color blue_2 #61afef;
-@define-color blue_3 #61afef;
-@define-color blue_4 #61afef;
-@define-color blue_5 #61afef;
-@define-color green_1 #89ca78;
-@define-color green_2 #89ca78;
-@define-color green_3 #89ca78;
-@define-color green_4 #89ca78;
-@define-color green_5 #89ca78;
-@define-color yellow_1 #e5c07b;
-@define-color yellow_2 #e5c07b;
-@define-color yellow_3 #e5c07b;
-@define-color yellow_4 #e5c07b;
-@define-color yellow_5 #e5c07b;
-@define-color orange_1 #d19a66;
-@define-color orange_2 #d19a66;
-@define-color orange_3 #d19a66;
-@define-color orange_4 #d19a66;
-@define-color orange_5 #d19a66;
+
+
 @define-color red_1 #ef596f;
-@define-color red_2 #ef596f;
-@define-color red_3 #ef596f;
-@define-color red_4 #ef596f;
-@define-color red_5 #ef596f;
+@define-color green_1 #89ca78;
+@define-color yellow_1 #e5c07b;
+@define-color blue_1 #61afef;
 @define-color purple_1 #d55fde;
-@define-color purple_2 #d55fde;
-@define-color purple_3 #d55fde;
-@define-color purple_4 #d55fde;
-@define-color purple_5 #d55fde;
-@define-color brown_1 #be5046;
-@define-color brown_2 #be5046;
-@define-color brown_3 #be5046;
-@define-color brown_4 #be5046;
-@define-color brown_5 #be5046;
-@define-color light_1 #abb2bf;
-@define-color light_2 #abb2bf;
-@define-color light_3 #abb2bf;
-@define-color light_4 #abb2bf;
-@define-color light_5 #abb2bf;
-@define-color dark_1 #abb2bf;
-@define-color dark_2 #abb2bf;
-@define-color dark_3 #abb2bf;
-@define-color dark_4 #abb2bf;
-@define-color dark_5 #abb2bf;
+@define-color teal_1 #2bbac5;
+@define-color orange_1 #d19a66;
+@define-color gray_1 #434852;
+
diff --git a/build/base16-onedark.css b/build/base16-onedark.css
index a679e7d..9d2fc0f 100644
--- a/build/base16-onedark.css
+++ b/build/base16-onedark.css
@@ -1,88 +1,37 @@
 @define-color accent_color #61afef;
 @define-color accent_bg_color #61afef;
 @define-color accent_fg_color #282c34;
-@define-color destructive_color #e06c75;
-@define-color destructive_bg_color #e06c75;
-@define-color destructive_fg_color #282c34;
-@define-color success_color #98c379;
-@define-color success_bg_color #98c379;
-@define-color success_fg_color #282c34;
-@define-color warning_color #c678dd;
-@define-color warning_bg_color #c678dd;
-@define-color warning_fg_color #282c34;
-@define-color error_color #e06c75;
-@define-color error_bg_color #e06c75;
-@define-color error_fg_color #282c34;
+
 @define-color window_bg_color #282c34;
 @define-color window_fg_color #abb2bf;
+
 @define-color view_bg_color #282c34;
 @define-color view_fg_color #abb2bf;
-@define-color headerbar_bg_color #353b45;
+
+@define-color headerbar_bg_color #282c34;
 @define-color headerbar_fg_color #abb2bf;
-@define-color headerbar_border_color rgba(0.20784314, 0.23137255, 0.27058824, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #282c34;
+@define-color dialog_fg_color #abb2bf;
+
+@define-color popover_bg_color #282c34;
+@define-color popover_fg_color #abb2bf;
+
+
 @define-color sidebar_bg_color #353b45;
 @define-color sidebar_fg_color #abb2bf;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #353b45;
 @define-color card_fg_color #abb2bf;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #353b45;
-@define-color dialog_fg_color #abb2bf;
-@define-color popover_bg_color #353b45;
-@define-color popover_fg_color #abb2bf;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #3e4451;
-@define-color blue_1 #61afef;
-@define-color blue_2 #61afef;
-@define-color blue_3 #61afef;
-@define-color blue_4 #61afef;
-@define-color blue_5 #61afef;
-@define-color green_1 #98c379;
-@define-color green_2 #98c379;
-@define-color green_3 #98c379;
-@define-color green_4 #98c379;
-@define-color green_5 #98c379;
-@define-color yellow_1 #e5c07b;
-@define-color yellow_2 #e5c07b;
-@define-color yellow_3 #e5c07b;
-@define-color yellow_4 #e5c07b;
-@define-color yellow_5 #e5c07b;
-@define-color orange_1 #d19a66;
-@define-color orange_2 #d19a66;
-@define-color orange_3 #d19a66;
-@define-color orange_4 #d19a66;
-@define-color orange_5 #d19a66;
+
+
 @define-color red_1 #e06c75;
-@define-color red_2 #e06c75;
-@define-color red_3 #e06c75;
-@define-color red_4 #e06c75;
-@define-color red_5 #e06c75;
+@define-color green_1 #98c379;
+@define-color yellow_1 #e5c07b;
+@define-color blue_1 #61afef;
 @define-color purple_1 #c678dd;
-@define-color purple_2 #c678dd;
-@define-color purple_3 #c678dd;
-@define-color purple_4 #c678dd;
-@define-color purple_5 #c678dd;
-@define-color brown_1 #be5046;
-@define-color brown_2 #be5046;
-@define-color brown_3 #be5046;
-@define-color brown_4 #be5046;
-@define-color brown_5 #be5046;
-@define-color light_1 #abb2bf;
-@define-color light_2 #abb2bf;
-@define-color light_3 #abb2bf;
-@define-color light_4 #abb2bf;
-@define-color light_5 #abb2bf;
-@define-color dark_1 #abb2bf;
-@define-color dark_2 #abb2bf;
-@define-color dark_3 #abb2bf;
-@define-color dark_4 #abb2bf;
-@define-color dark_5 #abb2bf;
+@define-color teal_1 #56b6c2;
+@define-color orange_1 #d19a66;
+@define-color gray_1 #545862;
+
diff --git a/build/base16-outrun-dark.css b/build/base16-outrun-dark.css
index 5ce31ea..b5cad2c 100644
--- a/build/base16-outrun-dark.css
+++ b/build/base16-outrun-dark.css
@@ -1,88 +1,37 @@
 @define-color accent_color #66b0ff;
 @define-color accent_bg_color #66b0ff;
 @define-color accent_fg_color #00002a;
-@define-color destructive_color #ff4242;
-@define-color destructive_bg_color #ff4242;
-@define-color destructive_fg_color #00002a;
-@define-color success_color #59f176;
-@define-color success_bg_color #59f176;
-@define-color success_fg_color #00002a;
-@define-color warning_color #f10596;
-@define-color warning_bg_color #f10596;
-@define-color warning_fg_color #00002a;
-@define-color error_color #ff4242;
-@define-color error_bg_color #ff4242;
-@define-color error_fg_color #00002a;
+
 @define-color window_bg_color #00002a;
 @define-color window_fg_color #d0d0fa;
+
 @define-color view_bg_color #00002a;
 @define-color view_fg_color #d0d0fa;
-@define-color headerbar_bg_color #20204a;
+
+@define-color headerbar_bg_color #00002a;
 @define-color headerbar_fg_color #d0d0fa;
-@define-color headerbar_border_color rgba(0.12549020, 0.12549020, 0.29019608, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #00002a;
+@define-color dialog_fg_color #d0d0fa;
+
+@define-color popover_bg_color #00002a;
+@define-color popover_fg_color #d0d0fa;
+
+
 @define-color sidebar_bg_color #20204a;
 @define-color sidebar_fg_color #d0d0fa;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #20204a;
 @define-color card_fg_color #d0d0fa;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #20204a;
-@define-color dialog_fg_color #d0d0fa;
-@define-color popover_bg_color #20204a;
-@define-color popover_fg_color #d0d0fa;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #30305a;
-@define-color blue_1 #66b0ff;
-@define-color blue_2 #66b0ff;
-@define-color blue_3 #66b0ff;
-@define-color blue_4 #66b0ff;
-@define-color blue_5 #66b0ff;
-@define-color green_1 #59f176;
-@define-color green_2 #59f176;
-@define-color green_3 #59f176;
-@define-color green_4 #59f176;
-@define-color green_5 #59f176;
-@define-color yellow_1 #f3e877;
-@define-color yellow_2 #f3e877;
-@define-color yellow_3 #f3e877;
-@define-color yellow_4 #f3e877;
-@define-color yellow_5 #f3e877;
-@define-color orange_1 #fc8d28;
-@define-color orange_2 #fc8d28;
-@define-color orange_3 #fc8d28;
-@define-color orange_4 #fc8d28;
-@define-color orange_5 #fc8d28;
+
+
 @define-color red_1 #ff4242;
-@define-color red_2 #ff4242;
-@define-color red_3 #ff4242;
-@define-color red_4 #ff4242;
-@define-color red_5 #ff4242;
+@define-color green_1 #59f176;
+@define-color yellow_1 #f3e877;
+@define-color blue_1 #66b0ff;
 @define-color purple_1 #f10596;
-@define-color purple_2 #f10596;
-@define-color purple_3 #f10596;
-@define-color purple_4 #f10596;
-@define-color purple_5 #f10596;
-@define-color brown_1 #f003ef;
-@define-color brown_2 #f003ef;
-@define-color brown_3 #f003ef;
-@define-color brown_4 #f003ef;
-@define-color brown_5 #f003ef;
-@define-color light_1 #d0d0fa;
-@define-color light_2 #d0d0fa;
-@define-color light_3 #d0d0fa;
-@define-color light_4 #d0d0fa;
-@define-color light_5 #d0d0fa;
-@define-color dark_1 #d0d0fa;
-@define-color dark_2 #d0d0fa;
-@define-color dark_3 #d0d0fa;
-@define-color dark_4 #d0d0fa;
-@define-color dark_5 #d0d0fa;
+@define-color teal_1 #0ef0f0;
+@define-color orange_1 #fc8d28;
+@define-color gray_1 #50507a;
+
diff --git a/build/base16-oxocarbon-dark.css b/build/base16-oxocarbon-dark.css
index 0e83b93..23b40a5 100644
--- a/build/base16-oxocarbon-dark.css
+++ b/build/base16-oxocarbon-dark.css
@@ -1,88 +1,37 @@
 @define-color accent_color #33b1ff;
 @define-color accent_bg_color #33b1ff;
 @define-color accent_fg_color #161616;
-@define-color destructive_color #ee5396;
-@define-color destructive_bg_color #ee5396;
-@define-color destructive_fg_color #161616;
-@define-color success_color #42be65;
-@define-color success_bg_color #42be65;
-@define-color success_fg_color #161616;
-@define-color warning_color #be95ff;
-@define-color warning_bg_color #be95ff;
-@define-color warning_fg_color #161616;
-@define-color error_color #ee5396;
-@define-color error_bg_color #ee5396;
-@define-color error_fg_color #161616;
+
 @define-color window_bg_color #161616;
 @define-color window_fg_color #f2f4f8;
+
 @define-color view_bg_color #161616;
 @define-color view_fg_color #f2f4f8;
-@define-color headerbar_bg_color #262626;
+
+@define-color headerbar_bg_color #161616;
 @define-color headerbar_fg_color #f2f4f8;
-@define-color headerbar_border_color rgba(0.14901961, 0.14901961, 0.14901961, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #161616;
+@define-color dialog_fg_color #f2f4f8;
+
+@define-color popover_bg_color #161616;
+@define-color popover_fg_color #f2f4f8;
+
+
 @define-color sidebar_bg_color #262626;
 @define-color sidebar_fg_color #f2f4f8;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #262626;
 @define-color card_fg_color #f2f4f8;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #262626;
-@define-color dialog_fg_color #f2f4f8;
-@define-color popover_bg_color #262626;
-@define-color popover_fg_color #f2f4f8;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #393939;
-@define-color blue_1 #33b1ff;
-@define-color blue_2 #33b1ff;
-@define-color blue_3 #33b1ff;
-@define-color blue_4 #33b1ff;
-@define-color blue_5 #33b1ff;
-@define-color green_1 #42be65;
-@define-color green_2 #42be65;
-@define-color green_3 #42be65;
-@define-color green_4 #42be65;
-@define-color green_5 #42be65;
-@define-color yellow_1 #ff6f00;
-@define-color yellow_2 #ff6f00;
-@define-color yellow_3 #ff6f00;
-@define-color yellow_4 #ff6f00;
-@define-color yellow_5 #ff6f00;
-@define-color orange_1 #ff7eb6;
-@define-color orange_2 #ff7eb6;
-@define-color orange_3 #ff7eb6;
-@define-color orange_4 #ff7eb6;
-@define-color orange_5 #ff7eb6;
+
+
 @define-color red_1 #ee5396;
-@define-color red_2 #ee5396;
-@define-color red_3 #ee5396;
-@define-color red_4 #ee5396;
-@define-color red_5 #ee5396;
+@define-color green_1 #42be65;
+@define-color yellow_1 #ff6f00;
+@define-color blue_1 #33b1ff;
 @define-color purple_1 #be95ff;
-@define-color purple_2 #be95ff;
-@define-color purple_3 #be95ff;
-@define-color purple_4 #be95ff;
-@define-color purple_5 #be95ff;
-@define-color brown_1 #82cfff;
-@define-color brown_2 #82cfff;
-@define-color brown_3 #82cfff;
-@define-color brown_4 #82cfff;
-@define-color brown_5 #82cfff;
-@define-color light_1 #f2f4f8;
-@define-color light_2 #f2f4f8;
-@define-color light_3 #f2f4f8;
-@define-color light_4 #f2f4f8;
-@define-color light_5 #f2f4f8;
-@define-color dark_1 #f2f4f8;
-@define-color dark_2 #f2f4f8;
-@define-color dark_3 #f2f4f8;
-@define-color dark_4 #f2f4f8;
-@define-color dark_5 #f2f4f8;
+@define-color teal_1 #3ddbd9;
+@define-color orange_1 #ff7eb6;
+@define-color gray_1 #525252;
+
diff --git a/build/base16-oxocarbon-light.css b/build/base16-oxocarbon-light.css
index 31bb2b0..086249e 100644
--- a/build/base16-oxocarbon-light.css
+++ b/build/base16-oxocarbon-light.css
@@ -1,88 +1,37 @@
 @define-color accent_color #0f62fe;
 @define-color accent_bg_color #0f62fe;
 @define-color accent_fg_color #f2f4f8;
-@define-color destructive_color #ff7eb6;
-@define-color destructive_bg_color #ff7eb6;
-@define-color destructive_fg_color #f2f4f8;
-@define-color success_color #42be65;
-@define-color success_bg_color #42be65;
-@define-color success_fg_color #f2f4f8;
-@define-color warning_color #be95ff;
-@define-color warning_bg_color #be95ff;
-@define-color warning_fg_color #f2f4f8;
-@define-color error_color #ff7eb6;
-@define-color error_bg_color #ff7eb6;
-@define-color error_fg_color #f2f4f8;
+
 @define-color window_bg_color #f2f4f8;
 @define-color window_fg_color #525f70;
+
 @define-color view_bg_color #f2f4f8;
 @define-color view_fg_color #525f70;
-@define-color headerbar_bg_color #dde1e6;
+
+@define-color headerbar_bg_color #f2f4f8;
 @define-color headerbar_fg_color #525f70;
-@define-color headerbar_border_color rgba(0.86666667, 0.88235294, 0.90196078, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #f2f4f8;
+@define-color dialog_fg_color #525f70;
+
+@define-color popover_bg_color #f2f4f8;
+@define-color popover_fg_color #525f70;
+
+
 @define-color sidebar_bg_color #dde1e6;
 @define-color sidebar_fg_color #525f70;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #dde1e6;
 @define-color card_fg_color #525f70;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #dde1e6;
-@define-color dialog_fg_color #525f70;
-@define-color popover_bg_color #dde1e6;
-@define-color popover_fg_color #525f70;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #bec6cf;
-@define-color blue_1 #0f62fe;
-@define-color blue_2 #0f62fe;
-@define-color blue_3 #0f62fe;
-@define-color blue_4 #0f62fe;
-@define-color blue_5 #0f62fe;
-@define-color green_1 #42be65;
-@define-color green_2 #42be65;
-@define-color green_3 #42be65;
-@define-color green_4 #42be65;
-@define-color green_5 #42be65;
-@define-color yellow_1 #ff6f00;
-@define-color yellow_2 #ff6f00;
-@define-color yellow_3 #ff6f00;
-@define-color yellow_4 #ff6f00;
-@define-color yellow_5 #ff6f00;
-@define-color orange_1 #ee5396;
-@define-color orange_2 #ee5396;
-@define-color orange_3 #ee5396;
-@define-color orange_4 #ee5396;
-@define-color orange_5 #ee5396;
+
+
 @define-color red_1 #ff7eb6;
-@define-color red_2 #ff7eb6;
-@define-color red_3 #ff7eb6;
-@define-color red_4 #ff7eb6;
-@define-color red_5 #ff7eb6;
+@define-color green_1 #42be65;
+@define-color yellow_1 #ff6f00;
+@define-color blue_1 #0f62fe;
 @define-color purple_1 #be95ff;
-@define-color purple_2 #be95ff;
-@define-color purple_3 #be95ff;
-@define-color purple_4 #be95ff;
-@define-color purple_5 #be95ff;
-@define-color brown_1 #803800;
-@define-color brown_2 #803800;
-@define-color brown_3 #803800;
-@define-color brown_4 #803800;
-@define-color brown_5 #803800;
-@define-color light_1 #525f70;
-@define-color light_2 #525f70;
-@define-color light_3 #525f70;
-@define-color light_4 #525f70;
-@define-color light_5 #525f70;
-@define-color dark_1 #525f70;
-@define-color dark_2 #525f70;
-@define-color dark_3 #525f70;
-@define-color dark_4 #525f70;
-@define-color dark_5 #525f70;
+@define-color teal_1 #673ab7;
+@define-color orange_1 #ee5396;
+@define-color gray_1 #a1acba;
+
diff --git a/build/base16-pandora.css b/build/base16-pandora.css
index f027851..3312df0 100644
--- a/build/base16-pandora.css
+++ b/build/base16-pandora.css
@@ -1,88 +1,37 @@
 @define-color accent_color #008080;
 @define-color accent_bg_color #008080;
 @define-color accent_fg_color #131213;
-@define-color destructive_color #b00b69;
-@define-color destructive_bg_color #b00b69;
-@define-color destructive_fg_color #131213;
-@define-color success_color #9ddf69;
-@define-color success_bg_color #9ddf69;
-@define-color success_fg_color #131213;
-@define-color warning_color #a24030;
-@define-color warning_bg_color #a24030;
-@define-color warning_fg_color #131213;
-@define-color error_color #b00b69;
-@define-color error_bg_color #b00b69;
-@define-color error_fg_color #131213;
+
 @define-color window_bg_color #131213;
 @define-color window_fg_color #f15c99;
+
 @define-color view_bg_color #131213;
 @define-color view_fg_color #f15c99;
-@define-color headerbar_bg_color #2f1823;
+
+@define-color headerbar_bg_color #131213;
 @define-color headerbar_fg_color #f15c99;
-@define-color headerbar_border_color rgba(0.18431373, 0.09411765, 0.13725490, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #131213;
+@define-color dialog_fg_color #f15c99;
+
+@define-color popover_bg_color #131213;
+@define-color popover_fg_color #f15c99;
+
+
 @define-color sidebar_bg_color #2f1823;
 @define-color sidebar_fg_color #f15c99;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #2f1823;
 @define-color card_fg_color #f15c99;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #2f1823;
-@define-color dialog_fg_color #f15c99;
-@define-color popover_bg_color #2f1823;
-@define-color popover_fg_color #f15c99;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #472234;
-@define-color blue_1 #008080;
-@define-color blue_2 #008080;
-@define-color blue_3 #008080;
-@define-color blue_4 #008080;
-@define-color blue_5 #008080;
-@define-color green_1 #9ddf69;
-@define-color green_2 #9ddf69;
-@define-color green_3 #9ddf69;
-@define-color green_4 #9ddf69;
-@define-color green_5 #9ddf69;
-@define-color yellow_1 #ffcc00;
-@define-color yellow_2 #ffcc00;
-@define-color yellow_3 #ffcc00;
-@define-color yellow_4 #ffcc00;
-@define-color yellow_5 #ffcc00;
-@define-color orange_1 #ff9153;
-@define-color orange_2 #ff9153;
-@define-color orange_3 #ff9153;
-@define-color orange_4 #ff9153;
-@define-color orange_5 #ff9153;
+
+
 @define-color red_1 #b00b69;
-@define-color red_2 #b00b69;
-@define-color red_3 #b00b69;
-@define-color red_4 #b00b69;
-@define-color red_5 #b00b69;
+@define-color green_1 #9ddf69;
+@define-color yellow_1 #ffcc00;
+@define-color blue_1 #008080;
 @define-color purple_1 #a24030;
-@define-color purple_2 #a24030;
-@define-color purple_3 #a24030;
-@define-color purple_4 #a24030;
-@define-color purple_5 #a24030;
-@define-color brown_1 #a24030;
-@define-color brown_2 #a24030;
-@define-color brown_3 #a24030;
-@define-color brown_4 #a24030;
-@define-color brown_5 #a24030;
-@define-color light_1 #f15c99;
-@define-color light_2 #f15c99;
-@define-color light_3 #f15c99;
-@define-color light_4 #f15c99;
-@define-color light_5 #f15c99;
-@define-color dark_1 #f15c99;
-@define-color dark_2 #f15c99;
-@define-color dark_3 #f15c99;
-@define-color dark_4 #f15c99;
-@define-color dark_5 #f15c99;
+@define-color teal_1 #714ca6;
+@define-color orange_1 #ff9153;
+@define-color gray_1 #ffbee3;
+
diff --git a/build/base16-papel.css b/build/base16-papel.css
index 03fb940..92b8d14 100644
--- a/build/base16-papel.css
+++ b/build/base16-papel.css
@@ -1,88 +1,37 @@
 @define-color accent_color #2c6ca0;
 @define-color accent_bg_color #2c6ca0;
 @define-color accent_fg_color #f5efe2;
-@define-color destructive_color #c0392b;
-@define-color destructive_bg_color #c0392b;
-@define-color destructive_fg_color #f5efe2;
-@define-color success_color #5e7a28;
-@define-color success_bg_color #5e7a28;
-@define-color success_fg_color #f5efe2;
-@define-color warning_color #9b4d8e;
-@define-color warning_bg_color #9b4d8e;
-@define-color warning_fg_color #f5efe2;
-@define-color error_color #c0392b;
-@define-color error_bg_color #c0392b;
-@define-color error_fg_color #f5efe2;
+
 @define-color window_bg_color #f5efe2;
 @define-color window_fg_color #3a2e20;
+
 @define-color view_bg_color #f5efe2;
 @define-color view_fg_color #3a2e20;
-@define-color headerbar_bg_color #8e8576;
+
+@define-color headerbar_bg_color #f5efe2;
 @define-color headerbar_fg_color #3a2e20;
-@define-color headerbar_border_color rgba(0.55686275, 0.52156863, 0.46274510, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #f5efe2;
+@define-color dialog_fg_color #3a2e20;
+
+@define-color popover_bg_color #f5efe2;
+@define-color popover_fg_color #3a2e20;
+
+
 @define-color sidebar_bg_color #8e8576;
 @define-color sidebar_fg_color #3a2e20;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #8e8576;
 @define-color card_fg_color #3a2e20;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #8e8576;
-@define-color dialog_fg_color #3a2e20;
-@define-color popover_bg_color #8e8576;
-@define-color popover_fg_color #3a2e20;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #e0d0ac;
-@define-color blue_1 #2c6ca0;
-@define-color blue_2 #2c6ca0;
-@define-color blue_3 #2c6ca0;
-@define-color blue_4 #2c6ca0;
-@define-color blue_5 #2c6ca0;
-@define-color green_1 #5e7a28;
-@define-color green_2 #5e7a28;
-@define-color green_3 #5e7a28;
-@define-color green_4 #5e7a28;
-@define-color green_5 #5e7a28;
-@define-color yellow_1 #a8761a;
-@define-color yellow_2 #a8761a;
-@define-color yellow_3 #a8761a;
-@define-color yellow_4 #a8761a;
-@define-color yellow_5 #a8761a;
-@define-color orange_1 #c25c1f;
-@define-color orange_2 #c25c1f;
-@define-color orange_3 #c25c1f;
-@define-color orange_4 #c25c1f;
-@define-color orange_5 #c25c1f;
+
+
 @define-color red_1 #c0392b;
-@define-color red_2 #c0392b;
-@define-color red_3 #c0392b;
-@define-color red_4 #c0392b;
-@define-color red_5 #c0392b;
+@define-color green_1 #5e7a28;
+@define-color yellow_1 #a8761a;
+@define-color blue_1 #2c6ca0;
 @define-color purple_1 #9b4d8e;
-@define-color purple_2 #9b4d8e;
-@define-color purple_3 #9b4d8e;
-@define-color purple_4 #9b4d8e;
-@define-color purple_5 #9b4d8e;
-@define-color brown_1 #6e6353;
-@define-color brown_2 #6e6353;
-@define-color brown_3 #6e6353;
-@define-color brown_4 #6e6353;
-@define-color brown_5 #6e6353;
-@define-color light_1 #3a2e20;
-@define-color light_2 #3a2e20;
-@define-color light_3 #3a2e20;
-@define-color light_4 #3a2e20;
-@define-color light_5 #3a2e20;
-@define-color dark_1 #3a2e20;
-@define-color dark_2 #3a2e20;
-@define-color dark_3 #3a2e20;
-@define-color dark_4 #3a2e20;
-@define-color dark_5 #3a2e20;
+@define-color teal_1 #2a8a7a;
+@define-color orange_1 #c25c1f;
+@define-color gray_1 #9a8c76;
+
diff --git a/build/base16-papercolor-dark.css b/build/base16-papercolor-dark.css
index 243d437..cdac601 100644
--- a/build/base16-papercolor-dark.css
+++ b/build/base16-papercolor-dark.css
@@ -1,88 +1,37 @@
 @define-color accent_color #5fafd7;
 @define-color accent_bg_color #5fafd7;
 @define-color accent_fg_color #1c1c1c;
-@define-color destructive_color #ff5faf;
-@define-color destructive_bg_color #ff5faf;
-@define-color destructive_fg_color #1c1c1c;
-@define-color success_color #5faf5f;
-@define-color success_bg_color #5faf5f;
-@define-color success_fg_color #1c1c1c;
-@define-color warning_color #af87d7;
-@define-color warning_bg_color #af87d7;
-@define-color warning_fg_color #1c1c1c;
-@define-color error_color #ff5faf;
-@define-color error_bg_color #ff5faf;
-@define-color error_fg_color #1c1c1c;
+
 @define-color window_bg_color #1c1c1c;
 @define-color window_fg_color #9e9e9e;
+
 @define-color view_bg_color #1c1c1c;
 @define-color view_fg_color #9e9e9e;
-@define-color headerbar_bg_color #363636;
+
+@define-color headerbar_bg_color #1c1c1c;
 @define-color headerbar_fg_color #9e9e9e;
-@define-color headerbar_border_color rgba(0.21176471, 0.21176471, 0.21176471, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #1c1c1c;
+@define-color dialog_fg_color #9e9e9e;
+
+@define-color popover_bg_color #1c1c1c;
+@define-color popover_fg_color #9e9e9e;
+
+
 @define-color sidebar_bg_color #363636;
 @define-color sidebar_fg_color #9e9e9e;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #363636;
 @define-color card_fg_color #9e9e9e;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #363636;
-@define-color dialog_fg_color #9e9e9e;
-@define-color popover_bg_color #363636;
-@define-color popover_fg_color #9e9e9e;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #424242;
-@define-color blue_1 #5fafd7;
-@define-color blue_2 #5fafd7;
-@define-color blue_3 #5fafd7;
-@define-color blue_4 #5fafd7;
-@define-color blue_5 #5fafd7;
-@define-color green_1 #5faf5f;
-@define-color green_2 #5faf5f;
-@define-color green_3 #5faf5f;
-@define-color green_4 #5faf5f;
-@define-color green_5 #5faf5f;
-@define-color yellow_1 #ffaf00;
-@define-color yellow_2 #ffaf00;
-@define-color yellow_3 #ffaf00;
-@define-color yellow_4 #ffaf00;
-@define-color yellow_5 #ffaf00;
-@define-color orange_1 #d7af5f;
-@define-color orange_2 #d7af5f;
-@define-color orange_3 #d7af5f;
-@define-color orange_4 #d7af5f;
-@define-color orange_5 #d7af5f;
+
+
 @define-color red_1 #ff5faf;
-@define-color red_2 #ff5faf;
-@define-color red_3 #ff5faf;
-@define-color red_4 #ff5faf;
-@define-color red_5 #ff5faf;
+@define-color green_1 #5faf5f;
+@define-color yellow_1 #ffaf00;
+@define-color blue_1 #5fafd7;
 @define-color purple_1 #af87d7;
-@define-color purple_2 #af87d7;
-@define-color purple_3 #af87d7;
-@define-color purple_4 #af87d7;
-@define-color purple_5 #af87d7;
-@define-color brown_1 #af005f;
-@define-color brown_2 #af005f;
-@define-color brown_3 #af005f;
-@define-color brown_4 #af005f;
-@define-color brown_5 #af005f;
-@define-color light_1 #9e9e9e;
-@define-color light_2 #9e9e9e;
-@define-color light_3 #9e9e9e;
-@define-color light_4 #9e9e9e;
-@define-color light_5 #9e9e9e;
-@define-color dark_1 #9e9e9e;
-@define-color dark_2 #9e9e9e;
-@define-color dark_3 #9e9e9e;
-@define-color dark_4 #9e9e9e;
-@define-color dark_5 #9e9e9e;
+@define-color teal_1 #00afaf;
+@define-color orange_1 #d7af5f;
+@define-color gray_1 #585858;
+
diff --git a/build/base16-papercolor-light.css b/build/base16-papercolor-light.css
index 9ea2137..01e66b3 100644
--- a/build/base16-papercolor-light.css
+++ b/build/base16-papercolor-light.css
@@ -1,88 +1,37 @@
 @define-color accent_color #005f87;
 @define-color accent_bg_color #005f87;
 @define-color accent_fg_color #eeeeee;
-@define-color destructive_color #d70000;
-@define-color destructive_bg_color #d70000;
-@define-color destructive_fg_color #eeeeee;
-@define-color success_color #008700;
-@define-color success_bg_color #008700;
-@define-color success_fg_color #eeeeee;
-@define-color warning_color #8700af;
-@define-color warning_bg_color #8700af;
-@define-color warning_fg_color #eeeeee;
-@define-color error_color #d70000;
-@define-color error_bg_color #d70000;
-@define-color error_fg_color #eeeeee;
+
 @define-color window_bg_color #eeeeee;
 @define-color window_fg_color #5e5e5e;
+
 @define-color view_bg_color #eeeeee;
 @define-color view_fg_color #5e5e5e;
-@define-color headerbar_bg_color #c4c4c4;
+
+@define-color headerbar_bg_color #eeeeee;
 @define-color headerbar_fg_color #5e5e5e;
-@define-color headerbar_border_color rgba(0.76862745, 0.76862745, 0.76862745, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #eeeeee;
+@define-color dialog_fg_color #5e5e5e;
+
+@define-color popover_bg_color #eeeeee;
+@define-color popover_fg_color #5e5e5e;
+
+
 @define-color sidebar_bg_color #c4c4c4;
 @define-color sidebar_fg_color #5e5e5e;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #c4c4c4;
 @define-color card_fg_color #5e5e5e;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #c4c4c4;
-@define-color dialog_fg_color #5e5e5e;
-@define-color popover_bg_color #c4c4c4;
-@define-color popover_fg_color #5e5e5e;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #9e9e9e;
-@define-color blue_1 #005f87;
-@define-color blue_2 #005f87;
-@define-color blue_3 #005f87;
-@define-color blue_4 #005f87;
-@define-color blue_5 #005f87;
-@define-color green_1 #008700;
-@define-color green_2 #008700;
-@define-color green_3 #008700;
-@define-color green_4 #008700;
-@define-color green_5 #008700;
-@define-color yellow_1 #d75f00;
-@define-color yellow_2 #d75f00;
-@define-color yellow_3 #d75f00;
-@define-color yellow_4 #d75f00;
-@define-color yellow_5 #d75f00;
-@define-color orange_1 #d75f00;
-@define-color orange_2 #d75f00;
-@define-color orange_3 #d75f00;
-@define-color orange_4 #d75f00;
-@define-color orange_5 #d75f00;
+
+
 @define-color red_1 #d70000;
-@define-color red_2 #d70000;
-@define-color red_3 #d70000;
-@define-color red_4 #d70000;
-@define-color red_5 #d70000;
+@define-color green_1 #008700;
+@define-color yellow_1 #d75f00;
+@define-color blue_1 #005f87;
 @define-color purple_1 #8700af;
-@define-color purple_2 #8700af;
-@define-color purple_3 #8700af;
-@define-color purple_4 #8700af;
-@define-color purple_5 #8700af;
-@define-color brown_1 #af0000;
-@define-color brown_2 #af0000;
-@define-color brown_3 #af0000;
-@define-color brown_4 #af0000;
-@define-color brown_5 #af0000;
-@define-color light_1 #5e5e5e;
-@define-color light_2 #5e5e5e;
-@define-color light_3 #5e5e5e;
-@define-color light_4 #5e5e5e;
-@define-color light_5 #5e5e5e;
-@define-color dark_1 #5e5e5e;
-@define-color dark_2 #5e5e5e;
-@define-color dark_3 #5e5e5e;
-@define-color dark_4 #5e5e5e;
-@define-color dark_5 #5e5e5e;
+@define-color teal_1 #0087af;
+@define-color orange_1 #d75f00;
+@define-color gray_1 #858585;
+
diff --git a/build/base16-paraiso.css b/build/base16-paraiso.css
index 57bb784..14b7453 100644
--- a/build/base16-paraiso.css
+++ b/build/base16-paraiso.css
@@ -1,88 +1,37 @@
 @define-color accent_color #06b6ef;
 @define-color accent_bg_color #06b6ef;
 @define-color accent_fg_color #2f1e2e;
-@define-color destructive_color #ef6155;
-@define-color destructive_bg_color #ef6155;
-@define-color destructive_fg_color #2f1e2e;
-@define-color success_color #48b685;
-@define-color success_bg_color #48b685;
-@define-color success_fg_color #2f1e2e;
-@define-color warning_color #815ba4;
-@define-color warning_bg_color #815ba4;
-@define-color warning_fg_color #2f1e2e;
-@define-color error_color #ef6155;
-@define-color error_bg_color #ef6155;
-@define-color error_fg_color #2f1e2e;
+
 @define-color window_bg_color #2f1e2e;
 @define-color window_fg_color #a39e9b;
+
 @define-color view_bg_color #2f1e2e;
 @define-color view_fg_color #a39e9b;
-@define-color headerbar_bg_color #41323f;
+
+@define-color headerbar_bg_color #2f1e2e;
 @define-color headerbar_fg_color #a39e9b;
-@define-color headerbar_border_color rgba(0.25490196, 0.19607843, 0.24705882, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #2f1e2e;
+@define-color dialog_fg_color #a39e9b;
+
+@define-color popover_bg_color #2f1e2e;
+@define-color popover_fg_color #a39e9b;
+
+
 @define-color sidebar_bg_color #41323f;
 @define-color sidebar_fg_color #a39e9b;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #41323f;
 @define-color card_fg_color #a39e9b;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #41323f;
-@define-color dialog_fg_color #a39e9b;
-@define-color popover_bg_color #41323f;
-@define-color popover_fg_color #a39e9b;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #4f424c;
-@define-color blue_1 #06b6ef;
-@define-color blue_2 #06b6ef;
-@define-color blue_3 #06b6ef;
-@define-color blue_4 #06b6ef;
-@define-color blue_5 #06b6ef;
-@define-color green_1 #48b685;
-@define-color green_2 #48b685;
-@define-color green_3 #48b685;
-@define-color green_4 #48b685;
-@define-color green_5 #48b685;
-@define-color yellow_1 #fec418;
-@define-color yellow_2 #fec418;
-@define-color yellow_3 #fec418;
-@define-color yellow_4 #fec418;
-@define-color yellow_5 #fec418;
-@define-color orange_1 #f99b15;
-@define-color orange_2 #f99b15;
-@define-color orange_3 #f99b15;
-@define-color orange_4 #f99b15;
-@define-color orange_5 #f99b15;
+
+
 @define-color red_1 #ef6155;
-@define-color red_2 #ef6155;
-@define-color red_3 #ef6155;
-@define-color red_4 #ef6155;
-@define-color red_5 #ef6155;
+@define-color green_1 #48b685;
+@define-color yellow_1 #fec418;
+@define-color blue_1 #06b6ef;
 @define-color purple_1 #815ba4;
-@define-color purple_2 #815ba4;
-@define-color purple_3 #815ba4;
-@define-color purple_4 #815ba4;
-@define-color purple_5 #815ba4;
-@define-color brown_1 #e96ba8;
-@define-color brown_2 #e96ba8;
-@define-color brown_3 #e96ba8;
-@define-color brown_4 #e96ba8;
-@define-color brown_5 #e96ba8;
-@define-color light_1 #a39e9b;
-@define-color light_2 #a39e9b;
-@define-color light_3 #a39e9b;
-@define-color light_4 #a39e9b;
-@define-color light_5 #a39e9b;
-@define-color dark_1 #a39e9b;
-@define-color dark_2 #a39e9b;
-@define-color dark_3 #a39e9b;
-@define-color dark_4 #a39e9b;
-@define-color dark_5 #a39e9b;
+@define-color teal_1 #5bc4bf;
+@define-color orange_1 #f99b15;
+@define-color gray_1 #776e71;
+
diff --git a/build/base16-pasque.css b/build/base16-pasque.css
index a70491b..6077f58 100644
--- a/build/base16-pasque.css
+++ b/build/base16-pasque.css
@@ -1,88 +1,37 @@
 @define-color accent_color #8e7dc6;
 @define-color accent_bg_color #8e7dc6;
 @define-color accent_fg_color #271c3a;
-@define-color destructive_color #a92258;
-@define-color destructive_bg_color #a92258;
-@define-color destructive_fg_color #271c3a;
-@define-color success_color #c6914b;
-@define-color success_bg_color #c6914b;
-@define-color success_fg_color #271c3a;
-@define-color warning_color #953b9d;
-@define-color warning_bg_color #953b9d;
-@define-color warning_fg_color #271c3a;
-@define-color error_color #a92258;
-@define-color error_bg_color #a92258;
-@define-color error_fg_color #271c3a;
+
 @define-color window_bg_color #271c3a;
 @define-color window_fg_color #dedcdf;
+
 @define-color view_bg_color #271c3a;
 @define-color view_fg_color #dedcdf;
-@define-color headerbar_bg_color #100323;
+
+@define-color headerbar_bg_color #271c3a;
 @define-color headerbar_fg_color #dedcdf;
-@define-color headerbar_border_color rgba(0.06274510, 0.01176471, 0.13725490, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #271c3a;
+@define-color dialog_fg_color #dedcdf;
+
+@define-color popover_bg_color #271c3a;
+@define-color popover_fg_color #dedcdf;
+
+
 @define-color sidebar_bg_color #100323;
 @define-color sidebar_fg_color #dedcdf;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #100323;
 @define-color card_fg_color #dedcdf;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #100323;
-@define-color dialog_fg_color #dedcdf;
-@define-color popover_bg_color #100323;
-@define-color popover_fg_color #dedcdf;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #3e2d5c;
-@define-color blue_1 #8e7dc6;
-@define-color blue_2 #8e7dc6;
-@define-color blue_3 #8e7dc6;
-@define-color blue_4 #8e7dc6;
-@define-color blue_5 #8e7dc6;
-@define-color green_1 #c6914b;
-@define-color green_2 #c6914b;
-@define-color green_3 #c6914b;
-@define-color green_4 #c6914b;
-@define-color green_5 #c6914b;
-@define-color yellow_1 #804ead;
-@define-color yellow_2 #804ead;
-@define-color yellow_3 #804ead;
-@define-color yellow_4 #804ead;
-@define-color yellow_5 #804ead;
-@define-color orange_1 #918889;
-@define-color orange_2 #918889;
-@define-color orange_3 #918889;
-@define-color orange_4 #918889;
-@define-color orange_5 #918889;
+
+
 @define-color red_1 #a92258;
-@define-color red_2 #a92258;
-@define-color red_3 #a92258;
-@define-color red_4 #a92258;
-@define-color red_5 #a92258;
+@define-color green_1 #c6914b;
+@define-color yellow_1 #804ead;
+@define-color blue_1 #8e7dc6;
 @define-color purple_1 #953b9d;
-@define-color purple_2 #953b9d;
-@define-color purple_3 #953b9d;
-@define-color purple_4 #953b9d;
-@define-color purple_5 #953b9d;
-@define-color brown_1 #59325c;
-@define-color brown_2 #59325c;
-@define-color brown_3 #59325c;
-@define-color brown_4 #59325c;
-@define-color brown_5 #59325c;
-@define-color light_1 #dedcdf;
-@define-color light_2 #dedcdf;
-@define-color light_3 #dedcdf;
-@define-color light_4 #dedcdf;
-@define-color light_5 #dedcdf;
-@define-color dark_1 #dedcdf;
-@define-color dark_2 #dedcdf;
-@define-color dark_3 #dedcdf;
-@define-color dark_4 #dedcdf;
-@define-color dark_5 #dedcdf;
+@define-color teal_1 #7263aa;
+@define-color orange_1 #918889;
+@define-color gray_1 #5d5766;
+
diff --git a/build/base16-pastelon-de-amarillos-dark.css b/build/base16-pastelon-de-amarillos-dark.css
index 1280dd1..29280c2 100644
--- a/build/base16-pastelon-de-amarillos-dark.css
+++ b/build/base16-pastelon-de-amarillos-dark.css
@@ -1,88 +1,37 @@
 @define-color accent_color #5a9fe6;
 @define-color accent_bg_color #5a9fe6;
 @define-color accent_fg_color #180d18;
-@define-color destructive_color #ff646a;
-@define-color destructive_bg_color #ff646a;
-@define-color destructive_fg_color #180d18;
-@define-color success_color #3ccb83;
-@define-color success_bg_color #3ccb83;
-@define-color success_fg_color #180d18;
-@define-color warning_color #d978cf;
-@define-color warning_bg_color #d978cf;
-@define-color warning_fg_color #180d18;
-@define-color error_color #ff646a;
-@define-color error_bg_color #ff646a;
-@define-color error_fg_color #180d18;
+
 @define-color window_bg_color #180d18;
 @define-color window_fg_color #ffe0a3;
+
 @define-color view_bg_color #180d18;
 @define-color view_fg_color #ffe0a3;
-@define-color headerbar_bg_color #2a1424;
+
+@define-color headerbar_bg_color #180d18;
 @define-color headerbar_fg_color #ffe0a3;
-@define-color headerbar_border_color rgba(0.16470588, 0.07843137, 0.14117647, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #180d18;
+@define-color dialog_fg_color #ffe0a3;
+
+@define-color popover_bg_color #180d18;
+@define-color popover_fg_color #ffe0a3;
+
+
 @define-color sidebar_bg_color #2a1424;
 @define-color sidebar_fg_color #ffe0a3;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #2a1424;
 @define-color card_fg_color #ffe0a3;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #2a1424;
-@define-color dialog_fg_color #ffe0a3;
-@define-color popover_bg_color #2a1424;
-@define-color popover_fg_color #ffe0a3;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #432031;
-@define-color blue_1 #5a9fe6;
-@define-color blue_2 #5a9fe6;
-@define-color blue_3 #5a9fe6;
-@define-color blue_4 #5a9fe6;
-@define-color blue_5 #5a9fe6;
-@define-color green_1 #3ccb83;
-@define-color green_2 #3ccb83;
-@define-color green_3 #3ccb83;
-@define-color green_4 #3ccb83;
-@define-color green_5 #3ccb83;
-@define-color yellow_1 #ffc84a;
-@define-color yellow_2 #ffc84a;
-@define-color yellow_3 #ffc84a;
-@define-color yellow_4 #ffc84a;
-@define-color yellow_5 #ffc84a;
-@define-color orange_1 #f99a32;
-@define-color orange_2 #f99a32;
-@define-color orange_3 #f99a32;
-@define-color orange_4 #f99a32;
-@define-color orange_5 #f99a32;
+
+
 @define-color red_1 #ff646a;
-@define-color red_2 #ff646a;
-@define-color red_3 #ff646a;
-@define-color red_4 #ff646a;
-@define-color red_5 #ff646a;
+@define-color green_1 #3ccb83;
+@define-color yellow_1 #ffc84a;
+@define-color blue_1 #5a9fe6;
 @define-color purple_1 #d978cf;
-@define-color purple_2 #d978cf;
-@define-color purple_3 #d978cf;
-@define-color purple_4 #d978cf;
-@define-color purple_5 #d978cf;
-@define-color brown_1 #e2764a;
-@define-color brown_2 #e2764a;
-@define-color brown_3 #e2764a;
-@define-color brown_4 #e2764a;
-@define-color brown_5 #e2764a;
-@define-color light_1 #ffe0a3;
-@define-color light_2 #ffe0a3;
-@define-color light_3 #ffe0a3;
-@define-color light_4 #ffe0a3;
-@define-color light_5 #ffe0a3;
-@define-color dark_1 #ffe0a3;
-@define-color dark_2 #ffe0a3;
-@define-color dark_3 #ffe0a3;
-@define-color dark_4 #ffe0a3;
-@define-color dark_5 #ffe0a3;
+@define-color teal_1 #35c4b6;
+@define-color orange_1 #f99a32;
+@define-color gray_1 #a0747c;
+
diff --git a/build/base16-pastelon-de-amarillos.css b/build/base16-pastelon-de-amarillos.css
index a504cff..39b0430 100644
--- a/build/base16-pastelon-de-amarillos.css
+++ b/build/base16-pastelon-de-amarillos.css
@@ -1,88 +1,37 @@
 @define-color accent_color #1e5da8;
 @define-color accent_bg_color #1e5da8;
 @define-color accent_fg_color #fff4d6;
-@define-color destructive_color #bd3548;
-@define-color destructive_bg_color #bd3548;
-@define-color destructive_fg_color #fff4d6;
-@define-color success_color #167451;
-@define-color success_bg_color #167451;
-@define-color success_fg_color #fff4d6;
-@define-color warning_color #8d3f89;
-@define-color warning_bg_color #8d3f89;
-@define-color warning_fg_color #fff4d6;
-@define-color error_color #bd3548;
-@define-color error_bg_color #bd3548;
-@define-color error_fg_color #fff4d6;
+
 @define-color window_bg_color #fff4d6;
 @define-color window_fg_color #432c3b;
+
 @define-color view_bg_color #fff4d6;
 @define-color view_fg_color #432c3b;
-@define-color headerbar_bg_color #f2d083;
+
+@define-color headerbar_bg_color #fff4d6;
 @define-color headerbar_fg_color #432c3b;
-@define-color headerbar_border_color rgba(0.94901961, 0.81568627, 0.51372549, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #fff4d6;
+@define-color dialog_fg_color #432c3b;
+
+@define-color popover_bg_color #fff4d6;
+@define-color popover_fg_color #432c3b;
+
+
 @define-color sidebar_bg_color #f2d083;
 @define-color sidebar_fg_color #432c3b;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #f2d083;
 @define-color card_fg_color #432c3b;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #f2d083;
-@define-color dialog_fg_color #432c3b;
-@define-color popover_bg_color #f2d083;
-@define-color popover_fg_color #432c3b;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #d69b45;
-@define-color blue_1 #1e5da8;
-@define-color blue_2 #1e5da8;
-@define-color blue_3 #1e5da8;
-@define-color blue_4 #1e5da8;
-@define-color blue_5 #1e5da8;
-@define-color green_1 #167451;
-@define-color green_2 #167451;
-@define-color green_3 #167451;
-@define-color green_4 #167451;
-@define-color green_5 #167451;
-@define-color yellow_1 #946400;
-@define-color yellow_2 #946400;
-@define-color yellow_3 #946400;
-@define-color yellow_4 #946400;
-@define-color yellow_5 #946400;
-@define-color orange_1 #ad570f;
-@define-color orange_2 #ad570f;
-@define-color orange_3 #ad570f;
-@define-color orange_4 #ad570f;
-@define-color orange_5 #ad570f;
+
+
 @define-color red_1 #bd3548;
-@define-color red_2 #bd3548;
-@define-color red_3 #bd3548;
-@define-color red_4 #bd3548;
-@define-color red_5 #bd3548;
+@define-color green_1 #167451;
+@define-color yellow_1 #946400;
+@define-color blue_1 #1e5da8;
 @define-color purple_1 #8d3f89;
-@define-color purple_2 #8d3f89;
-@define-color purple_3 #8d3f89;
-@define-color purple_4 #8d3f89;
-@define-color purple_5 #8d3f89;
-@define-color brown_1 #7c3528;
-@define-color brown_2 #7c3528;
-@define-color brown_3 #7c3528;
-@define-color brown_4 #7c3528;
-@define-color brown_5 #7c3528;
-@define-color light_1 #432c3b;
-@define-color light_2 #432c3b;
-@define-color light_3 #432c3b;
-@define-color light_4 #432c3b;
-@define-color light_5 #432c3b;
-@define-color dark_1 #432c3b;
-@define-color dark_2 #432c3b;
-@define-color dark_3 #432c3b;
-@define-color dark_4 #432c3b;
-@define-color dark_5 #432c3b;
+@define-color teal_1 #007270;
+@define-color orange_1 #ad570f;
+@define-color gray_1 #80616b;
+
diff --git a/build/base16-penumbra-dark-contrast-plus-plus.css b/build/base16-penumbra-dark-contrast-plus-plus.css
index d03a356..dff3176 100644
--- a/build/base16-penumbra-dark-contrast-plus-plus.css
+++ b/build/base16-penumbra-dark-contrast-plus-plus.css
@@ -1,88 +1,37 @@
 @define-color accent_color #6eb2fd;
 @define-color accent_bg_color #6eb2fd;
 @define-color accent_fg_color #0d0f13;
-@define-color destructive_color #f58c81;
-@define-color destructive_bg_color #f58c81;
-@define-color destructive_fg_color #0d0f13;
-@define-color success_color #54c794;
-@define-color success_bg_color #54c794;
-@define-color success_fg_color #0d0f13;
-@define-color warning_color #b69cf6;
-@define-color warning_bg_color #b69cf6;
-@define-color warning_fg_color #0d0f13;
-@define-color error_color #f58c81;
-@define-color error_bg_color #f58c81;
-@define-color error_fg_color #0d0f13;
+
 @define-color window_bg_color #0d0f13;
 @define-color window_fg_color #dedede;
+
 @define-color view_bg_color #0d0f13;
 @define-color view_fg_color #dedede;
-@define-color headerbar_bg_color #181b1f;
+
+@define-color headerbar_bg_color #0d0f13;
 @define-color headerbar_fg_color #dedede;
-@define-color headerbar_border_color rgba(0.09411765, 0.10588235, 0.12156863, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #0d0f13;
+@define-color dialog_fg_color #dedede;
+
+@define-color popover_bg_color #0d0f13;
+@define-color popover_fg_color #dedede;
+
+
 @define-color sidebar_bg_color #181b1f;
 @define-color sidebar_fg_color #dedede;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #181b1f;
 @define-color card_fg_color #dedede;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #181b1f;
-@define-color dialog_fg_color #dedede;
-@define-color popover_bg_color #181b1f;
-@define-color popover_fg_color #dedede;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #3e4044;
-@define-color blue_1 #6eb2fd;
-@define-color blue_2 #6eb2fd;
-@define-color blue_3 #6eb2fd;
-@define-color blue_4 #6eb2fd;
-@define-color blue_5 #6eb2fd;
-@define-color green_1 #54c794;
-@define-color green_2 #54c794;
-@define-color green_3 #54c794;
-@define-color green_4 #54c794;
-@define-color green_5 #54c794;
-@define-color yellow_1 #a9b852;
-@define-color yellow_2 #a9b852;
-@define-color yellow_3 #a9b852;
-@define-color yellow_4 #a9b852;
-@define-color yellow_5 #a9b852;
-@define-color orange_1 #e09f47;
-@define-color orange_2 #e09f47;
-@define-color orange_3 #e09f47;
-@define-color orange_4 #e09f47;
-@define-color orange_5 #e09f47;
+
+
 @define-color red_1 #f58c81;
-@define-color red_2 #f58c81;
-@define-color red_3 #f58c81;
-@define-color red_4 #f58c81;
-@define-color red_5 #f58c81;
+@define-color green_1 #54c794;
+@define-color yellow_1 #a9b852;
+@define-color blue_1 #6eb2fd;
 @define-color purple_1 #b69cf6;
-@define-color purple_2 #b69cf6;
-@define-color purple_3 #b69cf6;
-@define-color purple_4 #b69cf6;
-@define-color purple_5 #b69cf6;
-@define-color brown_1 #e58cc5;
-@define-color brown_2 #e58cc5;
-@define-color brown_3 #e58cc5;
-@define-color brown_4 #e58cc5;
-@define-color brown_5 #e58cc5;
-@define-color light_1 #dedede;
-@define-color light_2 #dedede;
-@define-color light_3 #dedede;
-@define-color light_4 #dedede;
-@define-color light_5 #dedede;
-@define-color dark_1 #dedede;
-@define-color dark_2 #dedede;
-@define-color dark_3 #dedede;
-@define-color dark_4 #dedede;
-@define-color dark_5 #dedede;
+@define-color teal_1 #00c4d7;
+@define-color orange_1 #e09f47;
+@define-color gray_1 #636363;
+
diff --git a/build/base16-penumbra-dark-contrast-plus.css b/build/base16-penumbra-dark-contrast-plus.css
index 277510d..7d141f3 100644
--- a/build/base16-penumbra-dark-contrast-plus.css
+++ b/build/base16-penumbra-dark-contrast-plus.css
@@ -1,88 +1,37 @@
 @define-color accent_color #61a3e6;
 @define-color accent_bg_color #61a3e6;
 @define-color accent_fg_color #181b1f;
-@define-color destructive_color #df7f78;
-@define-color destructive_bg_color #df7f78;
-@define-color destructive_fg_color #181b1f;
-@define-color success_color #50b584;
-@define-color success_bg_color #50b584;
-@define-color success_fg_color #181b1f;
-@define-color warning_color #a48fe1;
-@define-color warning_bg_color #a48fe1;
-@define-color warning_fg_color #181b1f;
-@define-color error_color #df7f78;
-@define-color error_bg_color #df7f78;
-@define-color error_fg_color #181b1f;
+
 @define-color window_bg_color #181b1f;
 @define-color window_fg_color #cecece;
+
 @define-color view_bg_color #181b1f;
 @define-color view_fg_color #cecece;
-@define-color headerbar_bg_color #24272b;
+
+@define-color headerbar_bg_color #181b1f;
 @define-color headerbar_fg_color #cecece;
-@define-color headerbar_border_color rgba(0.14117647, 0.15294118, 0.16862745, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #181b1f;
+@define-color dialog_fg_color #cecece;
+
+@define-color popover_bg_color #181b1f;
+@define-color popover_fg_color #cecece;
+
+
 @define-color sidebar_bg_color #24272b;
 @define-color sidebar_fg_color #cecece;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #24272b;
 @define-color card_fg_color #cecece;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #24272b;
-@define-color dialog_fg_color #cecece;
-@define-color popover_bg_color #24272b;
-@define-color popover_fg_color #cecece;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #3e4044;
-@define-color blue_1 #61a3e6;
-@define-color blue_2 #61a3e6;
-@define-color blue_3 #61a3e6;
-@define-color blue_4 #61a3e6;
-@define-color blue_5 #61a3e6;
-@define-color green_1 #50b584;
-@define-color green_2 #50b584;
-@define-color green_3 #50b584;
-@define-color green_4 #50b584;
-@define-color green_5 #50b584;
-@define-color yellow_1 #9ca748;
-@define-color yellow_2 #9ca748;
-@define-color yellow_3 #9ca748;
-@define-color yellow_4 #9ca748;
-@define-color yellow_5 #9ca748;
-@define-color orange_1 #ce9042;
-@define-color orange_2 #ce9042;
-@define-color orange_3 #ce9042;
-@define-color orange_4 #ce9042;
-@define-color orange_5 #ce9042;
+
+
 @define-color red_1 #df7f78;
-@define-color red_2 #df7f78;
-@define-color red_3 #df7f78;
-@define-color red_4 #df7f78;
-@define-color red_5 #df7f78;
+@define-color green_1 #50b584;
+@define-color yellow_1 #9ca748;
+@define-color blue_1 #61a3e6;
 @define-color purple_1 #a48fe1;
-@define-color purple_2 #a48fe1;
-@define-color purple_3 #a48fe1;
-@define-color purple_4 #a48fe1;
-@define-color purple_5 #a48fe1;
-@define-color brown_1 #d080b6;
-@define-color brown_2 #d080b6;
-@define-color brown_3 #d080b6;
-@define-color brown_4 #d080b6;
-@define-color brown_5 #d080b6;
-@define-color light_1 #cecece;
-@define-color light_2 #cecece;
-@define-color light_3 #cecece;
-@define-color light_4 #cecece;
-@define-color light_5 #cecece;
-@define-color dark_1 #cecece;
-@define-color dark_2 #cecece;
-@define-color dark_3 #cecece;
-@define-color dark_4 #cecece;
-@define-color dark_5 #cecece;
+@define-color teal_1 #00b3c2;
+@define-color orange_1 #ce9042;
+@define-color gray_1 #636363;
+
diff --git a/build/base16-penumbra-dark.css b/build/base16-penumbra-dark.css
index 5753daf..3249152 100644
--- a/build/base16-penumbra-dark.css
+++ b/build/base16-penumbra-dark.css
@@ -1,88 +1,37 @@
 @define-color accent_color #5794d0;
 @define-color accent_bg_color #5794d0;
 @define-color accent_fg_color #24272b;
-@define-color destructive_color #ca736c;
-@define-color destructive_bg_color #ca736c;
-@define-color destructive_fg_color #24272b;
-@define-color success_color #47a477;
-@define-color success_bg_color #47a477;
-@define-color success_fg_color #24272b;
-@define-color warning_color #9481cc;
-@define-color warning_bg_color #9481cc;
-@define-color warning_fg_color #24272b;
-@define-color error_color #ca736c;
-@define-color error_bg_color #ca736c;
-@define-color error_fg_color #24272b;
+
 @define-color window_bg_color #24272b;
 @define-color window_fg_color #bebebe;
+
 @define-color view_bg_color #24272b;
 @define-color view_fg_color #bebebe;
-@define-color headerbar_bg_color #303338;
+
+@define-color headerbar_bg_color #24272b;
 @define-color headerbar_fg_color #bebebe;
-@define-color headerbar_border_color rgba(0.18823529, 0.20000000, 0.21960784, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #24272b;
+@define-color dialog_fg_color #bebebe;
+
+@define-color popover_bg_color #24272b;
+@define-color popover_fg_color #bebebe;
+
+
 @define-color sidebar_bg_color #303338;
 @define-color sidebar_fg_color #bebebe;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #303338;
 @define-color card_fg_color #bebebe;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #303338;
-@define-color dialog_fg_color #bebebe;
-@define-color popover_bg_color #303338;
-@define-color popover_fg_color #bebebe;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #3e4044;
-@define-color blue_1 #5794d0;
-@define-color blue_2 #5794d0;
-@define-color blue_3 #5794d0;
-@define-color blue_4 #5794d0;
-@define-color blue_5 #5794d0;
-@define-color green_1 #47a477;
-@define-color green_2 #47a477;
-@define-color green_3 #47a477;
-@define-color green_4 #47a477;
-@define-color green_5 #47a477;
-@define-color yellow_1 #8d9741;
-@define-color yellow_2 #8d9741;
-@define-color yellow_3 #8d9741;
-@define-color yellow_4 #8d9741;
-@define-color yellow_5 #8d9741;
-@define-color orange_1 #ba823a;
-@define-color orange_2 #ba823a;
-@define-color orange_3 #ba823a;
-@define-color orange_4 #ba823a;
-@define-color orange_5 #ba823a;
+
+
 @define-color red_1 #ca736c;
-@define-color red_2 #ca736c;
-@define-color red_3 #ca736c;
-@define-color red_4 #ca736c;
-@define-color red_5 #ca736c;
+@define-color green_1 #47a477;
+@define-color yellow_1 #8d9741;
+@define-color blue_1 #5794d0;
 @define-color purple_1 #9481cc;
-@define-color purple_2 #9481cc;
-@define-color purple_3 #9481cc;
-@define-color purple_4 #9481cc;
-@define-color purple_5 #9481cc;
-@define-color brown_1 #bc73a4;
-@define-color brown_2 #bc73a4;
-@define-color brown_3 #bc73a4;
-@define-color brown_4 #bc73a4;
-@define-color brown_5 #bc73a4;
-@define-color light_1 #bebebe;
-@define-color light_2 #bebebe;
-@define-color light_3 #bebebe;
-@define-color light_4 #bebebe;
-@define-color light_5 #bebebe;
-@define-color dark_1 #bebebe;
-@define-color dark_2 #bebebe;
-@define-color dark_3 #bebebe;
-@define-color dark_4 #bebebe;
-@define-color dark_5 #bebebe;
+@define-color teal_1 #00a2af;
+@define-color orange_1 #ba823a;
+@define-color gray_1 #636363;
+
diff --git a/build/base16-penumbra-light-contrast-plus-plus.css b/build/base16-penumbra-light-contrast-plus-plus.css
index 3bd3534..024065f 100644
--- a/build/base16-penumbra-light-contrast-plus-plus.css
+++ b/build/base16-penumbra-light-contrast-plus-plus.css
@@ -1,88 +1,37 @@
 @define-color accent_color #6eb2fd;
 @define-color accent_bg_color #6eb2fd;
 @define-color accent_fg_color #fffdfb;
-@define-color destructive_color #f58c81;
-@define-color destructive_bg_color #f58c81;
-@define-color destructive_fg_color #fffdfb;
-@define-color success_color #54c794;
-@define-color success_bg_color #54c794;
-@define-color success_fg_color #fffdfb;
-@define-color warning_color #b69cf6;
-@define-color warning_bg_color #b69cf6;
-@define-color warning_fg_color #fffdfb;
-@define-color error_color #f58c81;
-@define-color error_bg_color #f58c81;
-@define-color error_fg_color #fffdfb;
+
 @define-color window_bg_color #fffdfb;
 @define-color window_fg_color #636363;
+
 @define-color view_bg_color #fffdfb;
 @define-color view_fg_color #636363;
-@define-color headerbar_bg_color #fff7ed;
+
+@define-color headerbar_bg_color #fffdfb;
 @define-color headerbar_fg_color #636363;
-@define-color headerbar_border_color rgba(1.00000000, 0.96862745, 0.92941176, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #fffdfb;
+@define-color dialog_fg_color #636363;
+
+@define-color popover_bg_color #fffdfb;
+@define-color popover_fg_color #636363;
+
+
 @define-color sidebar_bg_color #fff7ed;
 @define-color sidebar_fg_color #636363;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #fff7ed;
 @define-color card_fg_color #636363;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #fff7ed;
-@define-color dialog_fg_color #636363;
-@define-color popover_bg_color #fff7ed;
-@define-color popover_fg_color #636363;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #f2e6d4;
-@define-color blue_1 #6eb2fd;
-@define-color blue_2 #6eb2fd;
-@define-color blue_3 #6eb2fd;
-@define-color blue_4 #6eb2fd;
-@define-color blue_5 #6eb2fd;
-@define-color green_1 #54c794;
-@define-color green_2 #54c794;
-@define-color green_3 #54c794;
-@define-color green_4 #54c794;
-@define-color green_5 #54c794;
-@define-color yellow_1 #a9b852;
-@define-color yellow_2 #a9b852;
-@define-color yellow_3 #a9b852;
-@define-color yellow_4 #a9b852;
-@define-color yellow_5 #a9b852;
-@define-color orange_1 #e09f47;
-@define-color orange_2 #e09f47;
-@define-color orange_3 #e09f47;
-@define-color orange_4 #e09f47;
-@define-color orange_5 #e09f47;
+
+
 @define-color red_1 #f58c81;
-@define-color red_2 #f58c81;
-@define-color red_3 #f58c81;
-@define-color red_4 #f58c81;
-@define-color red_5 #f58c81;
+@define-color green_1 #54c794;
+@define-color yellow_1 #a9b852;
+@define-color blue_1 #6eb2fd;
 @define-color purple_1 #b69cf6;
-@define-color purple_2 #b69cf6;
-@define-color purple_3 #b69cf6;
-@define-color purple_4 #b69cf6;
-@define-color purple_5 #b69cf6;
-@define-color brown_1 #e58cc5;
-@define-color brown_2 #e58cc5;
-@define-color brown_3 #e58cc5;
-@define-color brown_4 #e58cc5;
-@define-color brown_5 #e58cc5;
-@define-color light_1 #636363;
-@define-color light_2 #636363;
-@define-color light_3 #636363;
-@define-color light_4 #636363;
-@define-color light_5 #636363;
-@define-color dark_1 #636363;
-@define-color dark_2 #636363;
-@define-color dark_3 #636363;
-@define-color dark_4 #636363;
-@define-color dark_5 #636363;
+@define-color teal_1 #00c4d7;
+@define-color orange_1 #e09f47;
+@define-color gray_1 #dedede;
+
diff --git a/build/base16-penumbra-light-contrast-plus.css b/build/base16-penumbra-light-contrast-plus.css
index 8a1a276..40a937d 100644
--- a/build/base16-penumbra-light-contrast-plus.css
+++ b/build/base16-penumbra-light-contrast-plus.css
@@ -1,88 +1,37 @@
 @define-color accent_color #61a3e6;
 @define-color accent_bg_color #61a3e6;
 @define-color accent_fg_color #fffdfb;
-@define-color destructive_color #df7f78;
-@define-color destructive_bg_color #df7f78;
-@define-color destructive_fg_color #fffdfb;
-@define-color success_color #50b584;
-@define-color success_bg_color #50b584;
-@define-color success_fg_color #fffdfb;
-@define-color warning_color #a48fe1;
-@define-color warning_bg_color #a48fe1;
-@define-color warning_fg_color #fffdfb;
-@define-color error_color #df7f78;
-@define-color error_bg_color #df7f78;
-@define-color error_fg_color #fffdfb;
+
 @define-color window_bg_color #fffdfb;
 @define-color window_fg_color #636363;
+
 @define-color view_bg_color #fffdfb;
 @define-color view_fg_color #636363;
-@define-color headerbar_bg_color #fff7ed;
+
+@define-color headerbar_bg_color #fffdfb;
 @define-color headerbar_fg_color #636363;
-@define-color headerbar_border_color rgba(1.00000000, 0.96862745, 0.92941176, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #fffdfb;
+@define-color dialog_fg_color #636363;
+
+@define-color popover_bg_color #fffdfb;
+@define-color popover_fg_color #636363;
+
+
 @define-color sidebar_bg_color #fff7ed;
 @define-color sidebar_fg_color #636363;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #fff7ed;
 @define-color card_fg_color #636363;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #fff7ed;
-@define-color dialog_fg_color #636363;
-@define-color popover_bg_color #fff7ed;
-@define-color popover_fg_color #636363;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #f2e6d4;
-@define-color blue_1 #61a3e6;
-@define-color blue_2 #61a3e6;
-@define-color blue_3 #61a3e6;
-@define-color blue_4 #61a3e6;
-@define-color blue_5 #61a3e6;
-@define-color green_1 #50b584;
-@define-color green_2 #50b584;
-@define-color green_3 #50b584;
-@define-color green_4 #50b584;
-@define-color green_5 #50b584;
-@define-color yellow_1 #9ca748;
-@define-color yellow_2 #9ca748;
-@define-color yellow_3 #9ca748;
-@define-color yellow_4 #9ca748;
-@define-color yellow_5 #9ca748;
-@define-color orange_1 #ce9042;
-@define-color orange_2 #ce9042;
-@define-color orange_3 #ce9042;
-@define-color orange_4 #ce9042;
-@define-color orange_5 #ce9042;
+
+
 @define-color red_1 #df7f78;
-@define-color red_2 #df7f78;
-@define-color red_3 #df7f78;
-@define-color red_4 #df7f78;
-@define-color red_5 #df7f78;
+@define-color green_1 #50b584;
+@define-color yellow_1 #9ca748;
+@define-color blue_1 #61a3e6;
 @define-color purple_1 #a48fe1;
-@define-color purple_2 #a48fe1;
-@define-color purple_3 #a48fe1;
-@define-color purple_4 #a48fe1;
-@define-color purple_5 #a48fe1;
-@define-color brown_1 #d080b6;
-@define-color brown_2 #d080b6;
-@define-color brown_3 #d080b6;
-@define-color brown_4 #d080b6;
-@define-color brown_5 #d080b6;
-@define-color light_1 #636363;
-@define-color light_2 #636363;
-@define-color light_3 #636363;
-@define-color light_4 #636363;
-@define-color light_5 #636363;
-@define-color dark_1 #636363;
-@define-color dark_2 #636363;
-@define-color dark_3 #636363;
-@define-color dark_4 #636363;
-@define-color dark_5 #636363;
+@define-color teal_1 #00b3c2;
+@define-color orange_1 #ce9042;
+@define-color gray_1 #cecece;
+
diff --git a/build/base16-penumbra-light.css b/build/base16-penumbra-light.css
index 78fecc8..63543a6 100644
--- a/build/base16-penumbra-light.css
+++ b/build/base16-penumbra-light.css
@@ -1,88 +1,37 @@
 @define-color accent_color #5794d0;
 @define-color accent_bg_color #5794d0;
 @define-color accent_fg_color #fffdfb;
-@define-color destructive_color #ca736c;
-@define-color destructive_bg_color #ca736c;
-@define-color destructive_fg_color #fffdfb;
-@define-color success_color #47a477;
-@define-color success_bg_color #47a477;
-@define-color success_fg_color #fffdfb;
-@define-color warning_color #9481cc;
-@define-color warning_bg_color #9481cc;
-@define-color warning_fg_color #fffdfb;
-@define-color error_color #ca736c;
-@define-color error_bg_color #ca736c;
-@define-color error_fg_color #fffdfb;
+
 @define-color window_bg_color #fffdfb;
 @define-color window_fg_color #636363;
+
 @define-color view_bg_color #fffdfb;
 @define-color view_fg_color #636363;
-@define-color headerbar_bg_color #fff7ed;
+
+@define-color headerbar_bg_color #fffdfb;
 @define-color headerbar_fg_color #636363;
-@define-color headerbar_border_color rgba(1.00000000, 0.96862745, 0.92941176, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #fffdfb;
+@define-color dialog_fg_color #636363;
+
+@define-color popover_bg_color #fffdfb;
+@define-color popover_fg_color #636363;
+
+
 @define-color sidebar_bg_color #fff7ed;
 @define-color sidebar_fg_color #636363;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #fff7ed;
 @define-color card_fg_color #636363;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #fff7ed;
-@define-color dialog_fg_color #636363;
-@define-color popover_bg_color #fff7ed;
-@define-color popover_fg_color #636363;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #f2e6d4;
-@define-color blue_1 #5794d0;
-@define-color blue_2 #5794d0;
-@define-color blue_3 #5794d0;
-@define-color blue_4 #5794d0;
-@define-color blue_5 #5794d0;
-@define-color green_1 #47a477;
-@define-color green_2 #47a477;
-@define-color green_3 #47a477;
-@define-color green_4 #47a477;
-@define-color green_5 #47a477;
-@define-color yellow_1 #8d9741;
-@define-color yellow_2 #8d9741;
-@define-color yellow_3 #8d9741;
-@define-color yellow_4 #8d9741;
-@define-color yellow_5 #8d9741;
-@define-color orange_1 #ba823a;
-@define-color orange_2 #ba823a;
-@define-color orange_3 #ba823a;
-@define-color orange_4 #ba823a;
-@define-color orange_5 #ba823a;
+
+
 @define-color red_1 #ca736c;
-@define-color red_2 #ca736c;
-@define-color red_3 #ca736c;
-@define-color red_4 #ca736c;
-@define-color red_5 #ca736c;
+@define-color green_1 #47a477;
+@define-color yellow_1 #8d9741;
+@define-color blue_1 #5794d0;
 @define-color purple_1 #9481cc;
-@define-color purple_2 #9481cc;
-@define-color purple_3 #9481cc;
-@define-color purple_4 #9481cc;
-@define-color purple_5 #9481cc;
-@define-color brown_1 #bc73a4;
-@define-color brown_2 #bc73a4;
-@define-color brown_3 #bc73a4;
-@define-color brown_4 #bc73a4;
-@define-color brown_5 #bc73a4;
-@define-color light_1 #636363;
-@define-color light_2 #636363;
-@define-color light_3 #636363;
-@define-color light_4 #636363;
-@define-color light_5 #636363;
-@define-color dark_1 #636363;
-@define-color dark_2 #636363;
-@define-color dark_3 #636363;
-@define-color dark_4 #636363;
-@define-color dark_5 #636363;
+@define-color teal_1 #00a2af;
+@define-color orange_1 #ba823a;
+@define-color gray_1 #bebebe;
+
diff --git a/build/base16-phd.css b/build/base16-phd.css
index 868f2ec..ee4e239 100644
--- a/build/base16-phd.css
+++ b/build/base16-phd.css
@@ -1,88 +1,37 @@
 @define-color accent_color #5299bf;
 @define-color accent_bg_color #5299bf;
 @define-color accent_fg_color #061229;
-@define-color destructive_color #d07346;
-@define-color destructive_bg_color #d07346;
-@define-color destructive_fg_color #061229;
-@define-color success_color #99bf52;
-@define-color success_bg_color #99bf52;
-@define-color success_fg_color #061229;
-@define-color warning_color #9989cc;
-@define-color warning_bg_color #9989cc;
-@define-color warning_fg_color #061229;
-@define-color error_color #d07346;
-@define-color error_bg_color #d07346;
-@define-color error_fg_color #061229;
+
 @define-color window_bg_color #061229;
 @define-color window_fg_color #b8bbc2;
+
 @define-color view_bg_color #061229;
 @define-color view_fg_color #b8bbc2;
-@define-color headerbar_bg_color #2a3448;
+
+@define-color headerbar_bg_color #061229;
 @define-color headerbar_fg_color #b8bbc2;
-@define-color headerbar_border_color rgba(0.16470588, 0.20392157, 0.28235294, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #061229;
+@define-color dialog_fg_color #b8bbc2;
+
+@define-color popover_bg_color #061229;
+@define-color popover_fg_color #b8bbc2;
+
+
 @define-color sidebar_bg_color #2a3448;
 @define-color sidebar_fg_color #b8bbc2;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #2a3448;
 @define-color card_fg_color #b8bbc2;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #2a3448;
-@define-color dialog_fg_color #b8bbc2;
-@define-color popover_bg_color #2a3448;
-@define-color popover_fg_color #b8bbc2;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #4d5666;
-@define-color blue_1 #5299bf;
-@define-color blue_2 #5299bf;
-@define-color blue_3 #5299bf;
-@define-color blue_4 #5299bf;
-@define-color blue_5 #5299bf;
-@define-color green_1 #99bf52;
-@define-color green_2 #99bf52;
-@define-color green_3 #99bf52;
-@define-color green_4 #99bf52;
-@define-color green_5 #99bf52;
-@define-color yellow_1 #fbd461;
-@define-color yellow_2 #fbd461;
-@define-color yellow_3 #fbd461;
-@define-color yellow_4 #fbd461;
-@define-color yellow_5 #fbd461;
-@define-color orange_1 #f0a000;
-@define-color orange_2 #f0a000;
-@define-color orange_3 #f0a000;
-@define-color orange_4 #f0a000;
-@define-color orange_5 #f0a000;
+
+
 @define-color red_1 #d07346;
-@define-color red_2 #d07346;
-@define-color red_3 #d07346;
-@define-color red_4 #d07346;
-@define-color red_5 #d07346;
+@define-color green_1 #99bf52;
+@define-color yellow_1 #fbd461;
+@define-color blue_1 #5299bf;
 @define-color purple_1 #9989cc;
-@define-color purple_2 #9989cc;
-@define-color purple_3 #9989cc;
-@define-color purple_4 #9989cc;
-@define-color purple_5 #9989cc;
-@define-color brown_1 #b08060;
-@define-color brown_2 #b08060;
-@define-color brown_3 #b08060;
-@define-color brown_4 #b08060;
-@define-color brown_5 #b08060;
-@define-color light_1 #b8bbc2;
-@define-color light_2 #b8bbc2;
-@define-color light_3 #b8bbc2;
-@define-color light_4 #b8bbc2;
-@define-color light_5 #b8bbc2;
-@define-color dark_1 #b8bbc2;
-@define-color dark_2 #b8bbc2;
-@define-color dark_3 #b8bbc2;
-@define-color dark_4 #b8bbc2;
-@define-color dark_5 #b8bbc2;
+@define-color teal_1 #72b9bf;
+@define-color orange_1 #f0a000;
+@define-color gray_1 #717885;
+
diff --git a/build/base16-pico.css b/build/base16-pico.css
index 92e9105..498f6c8 100644
--- a/build/base16-pico.css
+++ b/build/base16-pico.css
@@ -1,88 +1,37 @@
 @define-color accent_color #83769c;
 @define-color accent_bg_color #83769c;
 @define-color accent_fg_color #000000;
-@define-color destructive_color #ff004d;
-@define-color destructive_bg_color #ff004d;
-@define-color destructive_fg_color #000000;
-@define-color success_color #00e756;
-@define-color success_bg_color #00e756;
-@define-color success_fg_color #000000;
-@define-color warning_color #ff77a8;
-@define-color warning_bg_color #ff77a8;
-@define-color warning_fg_color #000000;
-@define-color error_color #ff004d;
-@define-color error_bg_color #ff004d;
-@define-color error_fg_color #000000;
+
 @define-color window_bg_color #000000;
 @define-color window_fg_color #5f574f;
+
 @define-color view_bg_color #000000;
 @define-color view_fg_color #5f574f;
-@define-color headerbar_bg_color #1d2b53;
+
+@define-color headerbar_bg_color #000000;
 @define-color headerbar_fg_color #5f574f;
-@define-color headerbar_border_color rgba(0.11372549, 0.16862745, 0.32549020, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #000000;
+@define-color dialog_fg_color #5f574f;
+
+@define-color popover_bg_color #000000;
+@define-color popover_fg_color #5f574f;
+
+
 @define-color sidebar_bg_color #1d2b53;
 @define-color sidebar_fg_color #5f574f;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #1d2b53;
 @define-color card_fg_color #5f574f;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #1d2b53;
-@define-color dialog_fg_color #5f574f;
-@define-color popover_bg_color #1d2b53;
-@define-color popover_fg_color #5f574f;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #7e2553;
-@define-color blue_1 #83769c;
-@define-color blue_2 #83769c;
-@define-color blue_3 #83769c;
-@define-color blue_4 #83769c;
-@define-color blue_5 #83769c;
-@define-color green_1 #00e756;
-@define-color green_2 #00e756;
-@define-color green_3 #00e756;
-@define-color green_4 #00e756;
-@define-color green_5 #00e756;
-@define-color yellow_1 #fff024;
-@define-color yellow_2 #fff024;
-@define-color yellow_3 #fff024;
-@define-color yellow_4 #fff024;
-@define-color yellow_5 #fff024;
-@define-color orange_1 #ffa300;
-@define-color orange_2 #ffa300;
-@define-color orange_3 #ffa300;
-@define-color orange_4 #ffa300;
-@define-color orange_5 #ffa300;
+
+
 @define-color red_1 #ff004d;
-@define-color red_2 #ff004d;
-@define-color red_3 #ff004d;
-@define-color red_4 #ff004d;
-@define-color red_5 #ff004d;
+@define-color green_1 #00e756;
+@define-color yellow_1 #fff024;
+@define-color blue_1 #83769c;
 @define-color purple_1 #ff77a8;
-@define-color purple_2 #ff77a8;
-@define-color purple_3 #ff77a8;
-@define-color purple_4 #ff77a8;
-@define-color purple_5 #ff77a8;
-@define-color brown_1 #ffccaa;
-@define-color brown_2 #ffccaa;
-@define-color brown_3 #ffccaa;
-@define-color brown_4 #ffccaa;
-@define-color brown_5 #ffccaa;
-@define-color light_1 #5f574f;
-@define-color light_2 #5f574f;
-@define-color light_3 #5f574f;
-@define-color light_4 #5f574f;
-@define-color light_5 #5f574f;
-@define-color dark_1 #5f574f;
-@define-color dark_2 #5f574f;
-@define-color dark_3 #5f574f;
-@define-color dark_4 #5f574f;
-@define-color dark_5 #5f574f;
+@define-color teal_1 #29adff;
+@define-color orange_1 #ffa300;
+@define-color gray_1 #008751;
+
diff --git a/build/base16-pinky.css b/build/base16-pinky.css
index 3ded38e..7aee088 100644
--- a/build/base16-pinky.css
+++ b/build/base16-pinky.css
@@ -1,88 +1,37 @@
 @define-color accent_color #00ffff;
 @define-color accent_bg_color #00ffff;
 @define-color accent_fg_color #171517;
-@define-color destructive_color #ffa600;
-@define-color destructive_bg_color #ffa600;
-@define-color destructive_fg_color #171517;
-@define-color success_color #ff0066;
-@define-color success_bg_color #ff0066;
-@define-color success_fg_color #171517;
-@define-color warning_color #007fff;
-@define-color warning_bg_color #007fff;
-@define-color warning_fg_color #171517;
-@define-color error_color #ffa600;
-@define-color error_bg_color #ffa600;
-@define-color error_fg_color #171517;
+
 @define-color window_bg_color #171517;
 @define-color window_fg_color #f5f5f5;
+
 @define-color view_bg_color #171517;
 @define-color view_fg_color #f5f5f5;
-@define-color headerbar_bg_color #1b181b;
+
+@define-color headerbar_bg_color #171517;
 @define-color headerbar_fg_color #f5f5f5;
-@define-color headerbar_border_color rgba(0.10588235, 0.09411765, 0.10588235, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #171517;
+@define-color dialog_fg_color #f5f5f5;
+
+@define-color popover_bg_color #171517;
+@define-color popover_fg_color #f5f5f5;
+
+
 @define-color sidebar_bg_color #1b181b;
 @define-color sidebar_fg_color #f5f5f5;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #1b181b;
 @define-color card_fg_color #f5f5f5;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #1b181b;
-@define-color dialog_fg_color #f5f5f5;
-@define-color popover_bg_color #1b181b;
-@define-color popover_fg_color #f5f5f5;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #1d1b1d;
-@define-color blue_1 #00ffff;
-@define-color blue_2 #00ffff;
-@define-color blue_3 #00ffff;
-@define-color blue_4 #00ffff;
-@define-color blue_5 #00ffff;
-@define-color green_1 #ff0066;
-@define-color green_2 #ff0066;
-@define-color green_3 #ff0066;
-@define-color green_4 #ff0066;
-@define-color green_5 #ff0066;
-@define-color yellow_1 #20df6c;
-@define-color yellow_2 #20df6c;
-@define-color yellow_3 #20df6c;
-@define-color yellow_4 #20df6c;
-@define-color yellow_5 #20df6c;
-@define-color orange_1 #00ff66;
-@define-color orange_2 #00ff66;
-@define-color orange_3 #00ff66;
-@define-color orange_4 #00ff66;
-@define-color orange_5 #00ff66;
+
+
 @define-color red_1 #ffa600;
-@define-color red_2 #ffa600;
-@define-color red_3 #ffa600;
-@define-color red_4 #ffa600;
-@define-color red_5 #ffa600;
+@define-color green_1 #ff0066;
+@define-color yellow_1 #20df6c;
+@define-color blue_1 #00ffff;
 @define-color purple_1 #007fff;
-@define-color purple_2 #007fff;
-@define-color purple_3 #007fff;
-@define-color purple_4 #007fff;
-@define-color purple_5 #007fff;
-@define-color brown_1 #df206c;
-@define-color brown_2 #df206c;
-@define-color brown_3 #df206c;
-@define-color brown_4 #df206c;
-@define-color brown_5 #df206c;
-@define-color light_1 #f5f5f5;
-@define-color light_2 #f5f5f5;
-@define-color light_3 #f5f5f5;
-@define-color light_4 #f5f5f5;
-@define-color light_5 #f5f5f5;
-@define-color dark_1 #f5f5f5;
-@define-color dark_2 #f5f5f5;
-@define-color dark_3 #f5f5f5;
-@define-color dark_4 #f5f5f5;
-@define-color dark_5 #f5f5f5;
+@define-color teal_1 #6600ff;
+@define-color orange_1 #00ff66;
+@define-color gray_1 #383338;
+
diff --git a/build/base16-pop.css b/build/base16-pop.css
index ef19a17..81227bb 100644
--- a/build/base16-pop.css
+++ b/build/base16-pop.css
@@ -1,88 +1,37 @@
 @define-color accent_color #0e5a94;
 @define-color accent_bg_color #0e5a94;
 @define-color accent_fg_color #000000;
-@define-color destructive_color #eb008a;
-@define-color destructive_bg_color #eb008a;
-@define-color destructive_fg_color #000000;
-@define-color success_color #37b349;
-@define-color success_bg_color #37b349;
-@define-color success_fg_color #000000;
-@define-color warning_color #b31e8d;
-@define-color warning_bg_color #b31e8d;
-@define-color warning_fg_color #000000;
-@define-color error_color #eb008a;
-@define-color error_bg_color #eb008a;
-@define-color error_fg_color #000000;
+
 @define-color window_bg_color #000000;
 @define-color window_fg_color #d0d0d0;
+
 @define-color view_bg_color #000000;
 @define-color view_fg_color #d0d0d0;
-@define-color headerbar_bg_color #202020;
+
+@define-color headerbar_bg_color #000000;
 @define-color headerbar_fg_color #d0d0d0;
-@define-color headerbar_border_color rgba(0.12549020, 0.12549020, 0.12549020, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #000000;
+@define-color dialog_fg_color #d0d0d0;
+
+@define-color popover_bg_color #000000;
+@define-color popover_fg_color #d0d0d0;
+
+
 @define-color sidebar_bg_color #202020;
 @define-color sidebar_fg_color #d0d0d0;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #202020;
 @define-color card_fg_color #d0d0d0;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #202020;
-@define-color dialog_fg_color #d0d0d0;
-@define-color popover_bg_color #202020;
-@define-color popover_fg_color #d0d0d0;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #303030;
-@define-color blue_1 #0e5a94;
-@define-color blue_2 #0e5a94;
-@define-color blue_3 #0e5a94;
-@define-color blue_4 #0e5a94;
-@define-color blue_5 #0e5a94;
-@define-color green_1 #37b349;
-@define-color green_2 #37b349;
-@define-color green_3 #37b349;
-@define-color green_4 #37b349;
-@define-color green_5 #37b349;
-@define-color yellow_1 #f8ca12;
-@define-color yellow_2 #f8ca12;
-@define-color yellow_3 #f8ca12;
-@define-color yellow_4 #f8ca12;
-@define-color yellow_5 #f8ca12;
-@define-color orange_1 #f29333;
-@define-color orange_2 #f29333;
-@define-color orange_3 #f29333;
-@define-color orange_4 #f29333;
-@define-color orange_5 #f29333;
+
+
 @define-color red_1 #eb008a;
-@define-color red_2 #eb008a;
-@define-color red_3 #eb008a;
-@define-color red_4 #eb008a;
-@define-color red_5 #eb008a;
+@define-color green_1 #37b349;
+@define-color yellow_1 #f8ca12;
+@define-color blue_1 #0e5a94;
 @define-color purple_1 #b31e8d;
-@define-color purple_2 #b31e8d;
-@define-color purple_3 #b31e8d;
-@define-color purple_4 #b31e8d;
-@define-color purple_5 #b31e8d;
-@define-color brown_1 #7a2d00;
-@define-color brown_2 #7a2d00;
-@define-color brown_3 #7a2d00;
-@define-color brown_4 #7a2d00;
-@define-color brown_5 #7a2d00;
-@define-color light_1 #d0d0d0;
-@define-color light_2 #d0d0d0;
-@define-color light_3 #d0d0d0;
-@define-color light_4 #d0d0d0;
-@define-color light_5 #d0d0d0;
-@define-color dark_1 #d0d0d0;
-@define-color dark_2 #d0d0d0;
-@define-color dark_3 #d0d0d0;
-@define-color dark_4 #d0d0d0;
-@define-color dark_5 #d0d0d0;
+@define-color teal_1 #00aabb;
+@define-color orange_1 #f29333;
+@define-color gray_1 #505050;
+
diff --git a/build/base16-porple.css b/build/base16-porple.css
index f80d910..17aaa18 100644
--- a/build/base16-porple.css
+++ b/build/base16-porple.css
@@ -1,88 +1,37 @@
 @define-color accent_color #8485ce;
 @define-color accent_bg_color #8485ce;
 @define-color accent_fg_color #292c36;
-@define-color destructive_color #f84547;
-@define-color destructive_bg_color #f84547;
-@define-color destructive_fg_color #292c36;
-@define-color success_color #95c76f;
-@define-color success_bg_color #95c76f;
-@define-color success_fg_color #292c36;
-@define-color warning_color #b74989;
-@define-color warning_bg_color #b74989;
-@define-color warning_fg_color #292c36;
-@define-color error_color #f84547;
-@define-color error_bg_color #f84547;
-@define-color error_fg_color #292c36;
+
 @define-color window_bg_color #292c36;
 @define-color window_fg_color #d8d8d8;
+
 @define-color view_bg_color #292c36;
 @define-color view_fg_color #d8d8d8;
-@define-color headerbar_bg_color #333344;
+
+@define-color headerbar_bg_color #292c36;
 @define-color headerbar_fg_color #d8d8d8;
-@define-color headerbar_border_color rgba(0.20000000, 0.20000000, 0.26666667, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #292c36;
+@define-color dialog_fg_color #d8d8d8;
+
+@define-color popover_bg_color #292c36;
+@define-color popover_fg_color #d8d8d8;
+
+
 @define-color sidebar_bg_color #333344;
 @define-color sidebar_fg_color #d8d8d8;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #333344;
 @define-color card_fg_color #d8d8d8;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #333344;
-@define-color dialog_fg_color #d8d8d8;
-@define-color popover_bg_color #333344;
-@define-color popover_fg_color #d8d8d8;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #474160;
-@define-color blue_1 #8485ce;
-@define-color blue_2 #8485ce;
-@define-color blue_3 #8485ce;
-@define-color blue_4 #8485ce;
-@define-color blue_5 #8485ce;
-@define-color green_1 #95c76f;
-@define-color green_2 #95c76f;
-@define-color green_3 #95c76f;
-@define-color green_4 #95c76f;
-@define-color green_5 #95c76f;
-@define-color yellow_1 #efa16b;
-@define-color yellow_2 #efa16b;
-@define-color yellow_3 #efa16b;
-@define-color yellow_4 #efa16b;
-@define-color yellow_5 #efa16b;
-@define-color orange_1 #d28e5d;
-@define-color orange_2 #d28e5d;
-@define-color orange_3 #d28e5d;
-@define-color orange_4 #d28e5d;
-@define-color orange_5 #d28e5d;
+
+
 @define-color red_1 #f84547;
-@define-color red_2 #f84547;
-@define-color red_3 #f84547;
-@define-color red_4 #f84547;
-@define-color red_5 #f84547;
+@define-color green_1 #95c76f;
+@define-color yellow_1 #efa16b;
+@define-color blue_1 #8485ce;
 @define-color purple_1 #b74989;
-@define-color purple_2 #b74989;
-@define-color purple_3 #b74989;
-@define-color purple_4 #b74989;
-@define-color purple_5 #b74989;
-@define-color brown_1 #986841;
-@define-color brown_2 #986841;
-@define-color brown_3 #986841;
-@define-color brown_4 #986841;
-@define-color brown_5 #986841;
-@define-color light_1 #d8d8d8;
-@define-color light_2 #d8d8d8;
-@define-color light_3 #d8d8d8;
-@define-color light_4 #d8d8d8;
-@define-color light_5 #d8d8d8;
-@define-color dark_1 #d8d8d8;
-@define-color dark_2 #d8d8d8;
-@define-color dark_3 #d8d8d8;
-@define-color dark_4 #d8d8d8;
-@define-color dark_5 #d8d8d8;
+@define-color teal_1 #64878f;
+@define-color orange_1 #d28e5d;
+@define-color gray_1 #65568a;
+
diff --git a/build/base16-precious-dark-eleven.css b/build/base16-precious-dark-eleven.css
index 63baefd..1a92c41 100644
--- a/build/base16-precious-dark-eleven.css
+++ b/build/base16-precious-dark-eleven.css
@@ -1,88 +1,37 @@
 @define-color accent_color #68b0ee;
 @define-color accent_bg_color #68b0ee;
 @define-color accent_fg_color #1c1e20;
-@define-color destructive_color #ff8782;
-@define-color destructive_bg_color #ff8782;
-@define-color destructive_fg_color #1c1e20;
-@define-color success_color #95b658;
-@define-color success_bg_color #95b658;
-@define-color success_fg_color #1c1e20;
-@define-color warning_color #b799fe;
-@define-color warning_bg_color #b799fe;
-@define-color warning_fg_color #1c1e20;
-@define-color error_color #ff8782;
-@define-color error_bg_color #ff8782;
-@define-color error_fg_color #1c1e20;
+
 @define-color window_bg_color #1c1e20;
 @define-color window_fg_color #b8b7b6;
+
 @define-color view_bg_color #1c1e20;
 @define-color view_fg_color #b8b7b6;
-@define-color headerbar_bg_color #292b2d;
+
+@define-color headerbar_bg_color #1c1e20;
 @define-color headerbar_fg_color #b8b7b6;
-@define-color headerbar_border_color rgba(0.16078431, 0.16862745, 0.17647059, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #1c1e20;
+@define-color dialog_fg_color #b8b7b6;
+
+@define-color popover_bg_color #1c1e20;
+@define-color popover_fg_color #b8b7b6;
+
+
 @define-color sidebar_bg_color #292b2d;
 @define-color sidebar_fg_color #b8b7b6;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #292b2d;
 @define-color card_fg_color #b8b7b6;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #292b2d;
-@define-color dialog_fg_color #b8b7b6;
-@define-color popover_bg_color #292b2d;
-@define-color popover_fg_color #b8b7b6;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #37393a;
-@define-color blue_1 #68b0ee;
-@define-color blue_2 #68b0ee;
-@define-color blue_3 #68b0ee;
-@define-color blue_4 #68b0ee;
-@define-color blue_5 #68b0ee;
-@define-color green_1 #95b658;
-@define-color green_2 #95b658;
-@define-color green_3 #95b658;
-@define-color green_4 #95b658;
-@define-color green_5 #95b658;
-@define-color yellow_1 #d0a543;
-@define-color yellow_2 #d0a543;
-@define-color yellow_3 #d0a543;
-@define-color yellow_4 #d0a543;
-@define-color yellow_5 #d0a543;
-@define-color orange_1 #ea9755;
-@define-color orange_2 #ea9755;
-@define-color orange_3 #ea9755;
-@define-color orange_4 #ea9755;
-@define-color orange_5 #ea9755;
+
+
 @define-color red_1 #ff8782;
-@define-color red_2 #ff8782;
-@define-color red_3 #ff8782;
-@define-color red_4 #ff8782;
-@define-color red_5 #ff8782;
+@define-color green_1 #95b658;
+@define-color yellow_1 #d0a543;
+@define-color blue_1 #68b0ee;
 @define-color purple_1 #b799fe;
-@define-color purple_2 #b799fe;
-@define-color purple_3 #b799fe;
-@define-color purple_4 #b799fe;
-@define-color purple_5 #b799fe;
-@define-color brown_1 #f382d8;
-@define-color brown_2 #f382d8;
-@define-color brown_3 #f382d8;
-@define-color brown_4 #f382d8;
-@define-color brown_5 #f382d8;
-@define-color light_1 #b8b7b6;
-@define-color light_2 #b8b7b6;
-@define-color light_3 #b8b7b6;
-@define-color light_4 #b8b7b6;
-@define-color light_5 #b8b7b6;
-@define-color dark_1 #b8b7b6;
-@define-color dark_2 #b8b7b6;
-@define-color dark_3 #b8b7b6;
-@define-color dark_4 #b8b7b6;
-@define-color dark_5 #b8b7b6;
+@define-color teal_1 #42bda7;
+@define-color orange_1 #ea9755;
+@define-color gray_1 #858585;
+
diff --git a/build/base16-precious-dark-fifteen.css b/build/base16-precious-dark-fifteen.css
index e001130..7c60ae7 100644
--- a/build/base16-precious-dark-fifteen.css
+++ b/build/base16-precious-dark-fifteen.css
@@ -1,88 +1,37 @@
 @define-color accent_color #66b0ef;
 @define-color accent_bg_color #66b0ef;
 @define-color accent_fg_color #23262b;
-@define-color destructive_color #ff8782;
-@define-color destructive_bg_color #ff8782;
-@define-color destructive_fg_color #23262b;
-@define-color success_color #95b659;
-@define-color success_bg_color #95b659;
-@define-color success_fg_color #23262b;
-@define-color warning_color #b799ff;
-@define-color warning_bg_color #b799ff;
-@define-color warning_fg_color #23262b;
-@define-color error_color #ff8782;
-@define-color error_bg_color #ff8782;
-@define-color error_fg_color #23262b;
+
 @define-color window_bg_color #23262b;
 @define-color window_fg_color #bab9b6;
+
 @define-color view_bg_color #23262b;
 @define-color view_fg_color #bab9b6;
-@define-color headerbar_bg_color #303337;
+
+@define-color headerbar_bg_color #23262b;
 @define-color headerbar_fg_color #bab9b6;
-@define-color headerbar_border_color rgba(0.18823529, 0.20000000, 0.21568627, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #23262b;
+@define-color dialog_fg_color #bab9b6;
+
+@define-color popover_bg_color #23262b;
+@define-color popover_fg_color #bab9b6;
+
+
 @define-color sidebar_bg_color #303337;
 @define-color sidebar_fg_color #bab9b6;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #303337;
 @define-color card_fg_color #bab9b6;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #303337;
-@define-color dialog_fg_color #bab9b6;
-@define-color popover_bg_color #303337;
-@define-color popover_fg_color #bab9b6;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #3e4044;
-@define-color blue_1 #66b0ef;
-@define-color blue_2 #66b0ef;
-@define-color blue_3 #66b0ef;
-@define-color blue_4 #66b0ef;
-@define-color blue_5 #66b0ef;
-@define-color green_1 #95b659;
-@define-color green_2 #95b659;
-@define-color green_3 #95b659;
-@define-color green_4 #95b659;
-@define-color green_5 #95b659;
-@define-color yellow_1 #cfa546;
-@define-color yellow_2 #cfa546;
-@define-color yellow_3 #cfa546;
-@define-color yellow_4 #cfa546;
-@define-color yellow_5 #cfa546;
-@define-color orange_1 #e99857;
-@define-color orange_2 #e99857;
-@define-color orange_3 #e99857;
-@define-color orange_4 #e99857;
-@define-color orange_5 #e99857;
+
+
 @define-color red_1 #ff8782;
-@define-color red_2 #ff8782;
-@define-color red_3 #ff8782;
-@define-color red_4 #ff8782;
-@define-color red_5 #ff8782;
+@define-color green_1 #95b659;
+@define-color yellow_1 #cfa546;
+@define-color blue_1 #66b0ef;
 @define-color purple_1 #b799ff;
-@define-color purple_2 #b799ff;
-@define-color purple_3 #b799ff;
-@define-color purple_4 #b799ff;
-@define-color purple_5 #b799ff;
-@define-color brown_1 #f382d8;
-@define-color brown_2 #f382d8;
-@define-color brown_3 #f382d8;
-@define-color brown_4 #f382d8;
-@define-color brown_5 #f382d8;
-@define-color light_1 #bab9b6;
-@define-color light_2 #bab9b6;
-@define-color light_3 #bab9b6;
-@define-color light_4 #bab9b6;
-@define-color light_5 #bab9b6;
-@define-color dark_1 #bab9b6;
-@define-color dark_2 #bab9b6;
-@define-color dark_3 #bab9b6;
-@define-color dark_4 #bab9b6;
-@define-color dark_5 #bab9b6;
+@define-color teal_1 #42bda7;
+@define-color orange_1 #e99857;
+@define-color gray_1 #898989;
+
diff --git a/build/base16-precious-light-warm.css b/build/base16-precious-light-warm.css
index e42da2d..e78f701 100644
--- a/build/base16-precious-light-warm.css
+++ b/build/base16-precious-light-warm.css
@@ -1,88 +1,37 @@
 @define-color accent_color #246da5;
 @define-color accent_bg_color #246da5;
 @define-color accent_fg_color #fff5e5;
-@define-color destructive_color #b14745;
-@define-color destructive_bg_color #b14745;
-@define-color destructive_fg_color #fff5e5;
-@define-color success_color #557300;
-@define-color success_bg_color #557300;
-@define-color success_fg_color #fff5e5;
-@define-color warning_color #7a50c6;
-@define-color warning_bg_color #7a50c6;
-@define-color warning_fg_color #fff5e5;
-@define-color error_color #b14745;
-@define-color error_bg_color #b14745;
-@define-color error_fg_color #fff5e5;
+
 @define-color window_bg_color #fff5e5;
 @define-color window_fg_color #4e5359;
+
 @define-color view_bg_color #fff5e5;
 @define-color view_fg_color #4e5359;
-@define-color headerbar_bg_color #ece4d6;
+
+@define-color headerbar_bg_color #fff5e5;
 @define-color headerbar_fg_color #4e5359;
-@define-color headerbar_border_color rgba(0.92549020, 0.89411765, 0.83921569, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #fff5e5;
+@define-color dialog_fg_color #4e5359;
+
+@define-color popover_bg_color #fff5e5;
+@define-color popover_fg_color #4e5359;
+
+
 @define-color sidebar_bg_color #ece4d6;
 @define-color sidebar_fg_color #4e5359;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #ece4d6;
 @define-color card_fg_color #4e5359;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #ece4d6;
-@define-color dialog_fg_color #4e5359;
-@define-color popover_bg_color #ece4d6;
-@define-color popover_fg_color #4e5359;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #d9d3c8;
-@define-color blue_1 #246da5;
-@define-color blue_2 #246da5;
-@define-color blue_3 #246da5;
-@define-color blue_4 #246da5;
-@define-color blue_5 #246da5;
-@define-color green_1 #557300;
-@define-color green_2 #557300;
-@define-color green_3 #557300;
-@define-color green_4 #557300;
-@define-color green_5 #557300;
-@define-color yellow_1 #876500;
-@define-color yellow_2 #876500;
-@define-color yellow_3 #876500;
-@define-color yellow_4 #876500;
-@define-color yellow_5 #876500;
-@define-color orange_1 #a25600;
-@define-color orange_2 #a25600;
-@define-color orange_3 #a25600;
-@define-color orange_4 #a25600;
-@define-color orange_5 #a25600;
+
+
 @define-color red_1 #b14745;
-@define-color red_2 #b14745;
-@define-color red_3 #b14745;
-@define-color red_4 #b14745;
-@define-color red_5 #b14745;
+@define-color green_1 #557300;
+@define-color yellow_1 #876500;
+@define-color blue_1 #246da5;
 @define-color purple_1 #7a50c6;
-@define-color purple_2 #7a50c6;
-@define-color purple_3 #7a50c6;
-@define-color purple_4 #7a50c6;
-@define-color purple_5 #7a50c6;
-@define-color brown_1 #a83f92;
-@define-color brown_2 #a83f92;
-@define-color brown_3 #a83f92;
-@define-color brown_4 #a83f92;
-@define-color brown_5 #a83f92;
-@define-color light_1 #4e5359;
-@define-color light_2 #4e5359;
-@define-color light_3 #4e5359;
-@define-color light_4 #4e5359;
-@define-color light_5 #4e5359;
-@define-color dark_1 #4e5359;
-@define-color dark_2 #4e5359;
-@define-color dark_3 #4e5359;
-@define-color dark_4 #4e5359;
-@define-color dark_5 #4e5359;
+@define-color teal_1 #0e7767;
+@define-color orange_1 #a25600;
+@define-color gray_1 #7f8080;
+
diff --git a/build/base16-precious-light-white.css b/build/base16-precious-light-white.css
index b535ab4..b4f9a20 100644
--- a/build/base16-precious-light-white.css
+++ b/build/base16-precious-light-white.css
@@ -1,88 +1,37 @@
 @define-color accent_color #186daa;
 @define-color accent_bg_color #186daa;
 @define-color accent_fg_color #ffffff;
-@define-color destructive_color #af4947;
-@define-color destructive_bg_color #af4947;
-@define-color destructive_fg_color #ffffff;
-@define-color success_color #557301;
-@define-color success_bg_color #557301;
-@define-color success_fg_color #ffffff;
-@define-color warning_color #7b4ecb;
-@define-color warning_bg_color #7b4ecb;
-@define-color warning_fg_color #ffffff;
-@define-color error_color #af4947;
-@define-color error_bg_color #af4947;
-@define-color error_fg_color #ffffff;
+
 @define-color window_bg_color #ffffff;
 @define-color window_fg_color #555555;
+
 @define-color view_bg_color #ffffff;
 @define-color view_fg_color #555555;
-@define-color headerbar_bg_color #ededed;
+
+@define-color headerbar_bg_color #ffffff;
 @define-color headerbar_fg_color #555555;
-@define-color headerbar_border_color rgba(0.92941176, 0.92941176, 0.92941176, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #ffffff;
+@define-color dialog_fg_color #555555;
+
+@define-color popover_bg_color #ffffff;
+@define-color popover_fg_color #555555;
+
+
 @define-color sidebar_bg_color #ededed;
 @define-color sidebar_fg_color #555555;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #ededed;
 @define-color card_fg_color #555555;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #ededed;
-@define-color dialog_fg_color #555555;
-@define-color popover_bg_color #ededed;
-@define-color popover_fg_color #555555;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #dbdbdb;
-@define-color blue_1 #186daa;
-@define-color blue_2 #186daa;
-@define-color blue_3 #186daa;
-@define-color blue_4 #186daa;
-@define-color blue_5 #186daa;
-@define-color green_1 #557301;
-@define-color green_2 #557301;
-@define-color green_3 #557301;
-@define-color green_4 #557301;
-@define-color green_5 #557301;
-@define-color yellow_1 #876500;
-@define-color yellow_2 #876500;
-@define-color yellow_3 #876500;
-@define-color yellow_4 #876500;
-@define-color yellow_5 #876500;
-@define-color orange_1 #a0570d;
-@define-color orange_2 #a0570d;
-@define-color orange_3 #a0570d;
-@define-color orange_4 #a0570d;
-@define-color orange_5 #a0570d;
+
+
 @define-color red_1 #af4947;
-@define-color red_2 #af4947;
-@define-color red_3 #af4947;
-@define-color red_4 #af4947;
-@define-color red_5 #af4947;
+@define-color green_1 #557301;
+@define-color yellow_1 #876500;
+@define-color blue_1 #186daa;
 @define-color purple_1 #7b4ecb;
-@define-color purple_2 #7b4ecb;
-@define-color purple_3 #7b4ecb;
-@define-color purple_4 #7b4ecb;
-@define-color purple_5 #7b4ecb;
-@define-color brown_1 #a93e93;
-@define-color brown_2 #a93e93;
-@define-color brown_3 #a93e93;
-@define-color brown_4 #a93e93;
-@define-color brown_5 #a93e93;
-@define-color light_1 #555555;
-@define-color light_2 #555555;
-@define-color light_3 #555555;
-@define-color light_4 #555555;
-@define-color light_5 #555555;
-@define-color dark_1 #555555;
-@define-color dark_2 #555555;
-@define-color dark_3 #555555;
-@define-color dark_4 #555555;
-@define-color dark_5 #555555;
+@define-color teal_1 #087767;
+@define-color orange_1 #a0570d;
+@define-color gray_1 #848484;
+
diff --git a/build/base16-primer-dark-dimmed.css b/build/base16-primer-dark-dimmed.css
index b19fbcd..f5ece2e 100644
--- a/build/base16-primer-dark-dimmed.css
+++ b/build/base16-primer-dark-dimmed.css
@@ -1,88 +1,37 @@
 @define-color accent_color #539bf5;
 @define-color accent_bg_color #539bf5;
 @define-color accent_fg_color #1c2128;
-@define-color destructive_color #f47067;
-@define-color destructive_bg_color #f47067;
-@define-color destructive_fg_color #1c2128;
-@define-color success_color #57ab5a;
-@define-color success_bg_color #57ab5a;
-@define-color success_fg_color #1c2128;
-@define-color warning_color #e275ad;
-@define-color warning_bg_color #e275ad;
-@define-color warning_fg_color #1c2128;
-@define-color error_color #f47067;
-@define-color error_bg_color #f47067;
-@define-color error_fg_color #1c2128;
+
 @define-color window_bg_color #1c2128;
 @define-color window_fg_color #909dab;
+
 @define-color view_bg_color #1c2128;
 @define-color view_fg_color #909dab;
-@define-color headerbar_bg_color #373e47;
+
+@define-color headerbar_bg_color #1c2128;
 @define-color headerbar_fg_color #909dab;
-@define-color headerbar_border_color rgba(0.21568627, 0.24313725, 0.27843137, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #1c2128;
+@define-color dialog_fg_color #909dab;
+
+@define-color popover_bg_color #1c2128;
+@define-color popover_fg_color #909dab;
+
+
 @define-color sidebar_bg_color #373e47;
 @define-color sidebar_fg_color #909dab;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #373e47;
 @define-color card_fg_color #909dab;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #373e47;
-@define-color dialog_fg_color #909dab;
-@define-color popover_bg_color #373e47;
-@define-color popover_fg_color #909dab;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #444c56;
-@define-color blue_1 #539bf5;
-@define-color blue_2 #539bf5;
-@define-color blue_3 #539bf5;
-@define-color blue_4 #539bf5;
-@define-color blue_5 #539bf5;
-@define-color green_1 #57ab5a;
-@define-color green_2 #57ab5a;
-@define-color green_3 #57ab5a;
-@define-color green_4 #57ab5a;
-@define-color green_5 #57ab5a;
-@define-color yellow_1 #c69026;
-@define-color yellow_2 #c69026;
-@define-color yellow_3 #c69026;
-@define-color yellow_4 #c69026;
-@define-color yellow_5 #c69026;
-@define-color orange_1 #e0823d;
-@define-color orange_2 #e0823d;
-@define-color orange_3 #e0823d;
-@define-color orange_4 #e0823d;
-@define-color orange_5 #e0823d;
+
+
 @define-color red_1 #f47067;
-@define-color red_2 #f47067;
-@define-color red_3 #f47067;
-@define-color red_4 #f47067;
-@define-color red_5 #f47067;
+@define-color green_1 #57ab5a;
+@define-color yellow_1 #c69026;
+@define-color blue_1 #539bf5;
 @define-color purple_1 #e275ad;
-@define-color purple_2 #e275ad;
-@define-color purple_3 #e275ad;
-@define-color purple_4 #e275ad;
-@define-color purple_5 #e275ad;
-@define-color brown_1 #ae5622;
-@define-color brown_2 #ae5622;
-@define-color brown_3 #ae5622;
-@define-color brown_4 #ae5622;
-@define-color brown_5 #ae5622;
-@define-color light_1 #909dab;
-@define-color light_2 #909dab;
-@define-color light_3 #909dab;
-@define-color light_4 #909dab;
-@define-color light_5 #909dab;
-@define-color dark_1 #909dab;
-@define-color dark_2 #909dab;
-@define-color dark_3 #909dab;
-@define-color dark_4 #909dab;
-@define-color dark_5 #909dab;
+@define-color teal_1 #96d0ff;
+@define-color orange_1 #e0823d;
+@define-color gray_1 #545d68;
+
diff --git a/build/base16-primer-dark.css b/build/base16-primer-dark.css
index e556870..dddf876 100644
--- a/build/base16-primer-dark.css
+++ b/build/base16-primer-dark.css
@@ -1,88 +1,37 @@
 @define-color accent_color #58a6ff;
 @define-color accent_bg_color #58a6ff;
 @define-color accent_fg_color #010409;
-@define-color destructive_color #ff7b72;
-@define-color destructive_bg_color #ff7b72;
-@define-color destructive_fg_color #010409;
-@define-color success_color #3fb950;
-@define-color success_bg_color #3fb950;
-@define-color success_fg_color #010409;
-@define-color warning_color #f778ba;
-@define-color warning_bg_color #f778ba;
-@define-color warning_fg_color #010409;
-@define-color error_color #ff7b72;
-@define-color error_bg_color #ff7b72;
-@define-color error_fg_color #010409;
+
 @define-color window_bg_color #010409;
 @define-color window_fg_color #b1bac4;
+
 @define-color view_bg_color #010409;
 @define-color view_fg_color #b1bac4;
-@define-color headerbar_bg_color #21262d;
+
+@define-color headerbar_bg_color #010409;
 @define-color headerbar_fg_color #b1bac4;
-@define-color headerbar_border_color rgba(0.12941176, 0.14901961, 0.17647059, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #010409;
+@define-color dialog_fg_color #b1bac4;
+
+@define-color popover_bg_color #010409;
+@define-color popover_fg_color #b1bac4;
+
+
 @define-color sidebar_bg_color #21262d;
 @define-color sidebar_fg_color #b1bac4;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #21262d;
 @define-color card_fg_color #b1bac4;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #21262d;
-@define-color dialog_fg_color #b1bac4;
-@define-color popover_bg_color #21262d;
-@define-color popover_fg_color #b1bac4;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #30363d;
-@define-color blue_1 #58a6ff;
-@define-color blue_2 #58a6ff;
-@define-color blue_3 #58a6ff;
-@define-color blue_4 #58a6ff;
-@define-color blue_5 #58a6ff;
-@define-color green_1 #3fb950;
-@define-color green_2 #3fb950;
-@define-color green_3 #3fb950;
-@define-color green_4 #3fb950;
-@define-color green_5 #3fb950;
-@define-color yellow_1 #d29922;
-@define-color yellow_2 #d29922;
-@define-color yellow_3 #d29922;
-@define-color yellow_4 #d29922;
-@define-color yellow_5 #d29922;
-@define-color orange_1 #f0883e;
-@define-color orange_2 #f0883e;
-@define-color orange_3 #f0883e;
-@define-color orange_4 #f0883e;
-@define-color orange_5 #f0883e;
+
+
 @define-color red_1 #ff7b72;
-@define-color red_2 #ff7b72;
-@define-color red_3 #ff7b72;
-@define-color red_4 #ff7b72;
-@define-color red_5 #ff7b72;
+@define-color green_1 #3fb950;
+@define-color yellow_1 #d29922;
+@define-color blue_1 #58a6ff;
 @define-color purple_1 #f778ba;
-@define-color purple_2 #f778ba;
-@define-color purple_3 #f778ba;
-@define-color purple_4 #f778ba;
-@define-color purple_5 #f778ba;
-@define-color brown_1 #bd561d;
-@define-color brown_2 #bd561d;
-@define-color brown_3 #bd561d;
-@define-color brown_4 #bd561d;
-@define-color brown_5 #bd561d;
-@define-color light_1 #b1bac4;
-@define-color light_2 #b1bac4;
-@define-color light_3 #b1bac4;
-@define-color light_4 #b1bac4;
-@define-color light_5 #b1bac4;
-@define-color dark_1 #b1bac4;
-@define-color dark_2 #b1bac4;
-@define-color dark_3 #b1bac4;
-@define-color dark_4 #b1bac4;
-@define-color dark_5 #b1bac4;
+@define-color teal_1 #a5d6ff;
+@define-color orange_1 #f0883e;
+@define-color gray_1 #484f58;
+
diff --git a/build/base16-primer-light.css b/build/base16-primer-light.css
index 56d0610..8204faa 100644
--- a/build/base16-primer-light.css
+++ b/build/base16-primer-light.css
@@ -1,88 +1,37 @@
 @define-color accent_color #0366d6;
 @define-color accent_bg_color #0366d6;
 @define-color accent_fg_color #fafbfc;
-@define-color destructive_color #d73a49;
-@define-color destructive_bg_color #d73a49;
-@define-color destructive_fg_color #fafbfc;
-@define-color success_color #28a745;
-@define-color success_bg_color #28a745;
-@define-color success_fg_color #fafbfc;
-@define-color warning_color #ea4aaa;
-@define-color warning_bg_color #ea4aaa;
-@define-color warning_fg_color #fafbfc;
-@define-color error_color #d73a49;
-@define-color error_bg_color #d73a49;
-@define-color error_fg_color #fafbfc;
+
 @define-color window_bg_color #fafbfc;
 @define-color window_fg_color #2f363d;
+
 @define-color view_bg_color #fafbfc;
 @define-color view_fg_color #2f363d;
-@define-color headerbar_bg_color #e1e4e8;
+
+@define-color headerbar_bg_color #fafbfc;
 @define-color headerbar_fg_color #2f363d;
-@define-color headerbar_border_color rgba(0.88235294, 0.89411765, 0.90980392, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #fafbfc;
+@define-color dialog_fg_color #2f363d;
+
+@define-color popover_bg_color #fafbfc;
+@define-color popover_fg_color #2f363d;
+
+
 @define-color sidebar_bg_color #e1e4e8;
 @define-color sidebar_fg_color #2f363d;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #e1e4e8;
 @define-color card_fg_color #2f363d;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #e1e4e8;
-@define-color dialog_fg_color #2f363d;
-@define-color popover_bg_color #e1e4e8;
-@define-color popover_fg_color #2f363d;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #d1d5da;
-@define-color blue_1 #0366d6;
-@define-color blue_2 #0366d6;
-@define-color blue_3 #0366d6;
-@define-color blue_4 #0366d6;
-@define-color blue_5 #0366d6;
-@define-color green_1 #28a745;
-@define-color green_2 #28a745;
-@define-color green_3 #28a745;
-@define-color green_4 #28a745;
-@define-color green_5 #28a745;
-@define-color yellow_1 #ffd33d;
-@define-color yellow_2 #ffd33d;
-@define-color yellow_3 #ffd33d;
-@define-color yellow_4 #ffd33d;
-@define-color yellow_5 #ffd33d;
-@define-color orange_1 #f66a0a;
-@define-color orange_2 #f66a0a;
-@define-color orange_3 #f66a0a;
-@define-color orange_4 #f66a0a;
-@define-color orange_5 #f66a0a;
+
+
 @define-color red_1 #d73a49;
-@define-color red_2 #d73a49;
-@define-color red_3 #d73a49;
-@define-color red_4 #d73a49;
-@define-color red_5 #d73a49;
+@define-color green_1 #28a745;
+@define-color yellow_1 #ffd33d;
+@define-color blue_1 #0366d6;
 @define-color purple_1 #ea4aaa;
-@define-color purple_2 #ea4aaa;
-@define-color purple_3 #ea4aaa;
-@define-color purple_4 #ea4aaa;
-@define-color purple_5 #ea4aaa;
-@define-color brown_1 #a04100;
-@define-color brown_2 #a04100;
-@define-color brown_3 #a04100;
-@define-color brown_4 #a04100;
-@define-color brown_5 #a04100;
-@define-color light_1 #2f363d;
-@define-color light_2 #2f363d;
-@define-color light_3 #2f363d;
-@define-color light_4 #2f363d;
-@define-color light_5 #2f363d;
-@define-color dark_1 #2f363d;
-@define-color dark_2 #2f363d;
-@define-color dark_3 #2f363d;
-@define-color dark_4 #2f363d;
-@define-color dark_5 #2f363d;
+@define-color teal_1 #79b8ff;
+@define-color orange_1 #f66a0a;
+@define-color gray_1 #959da5;
+
diff --git a/build/base16-purpledream.css b/build/base16-purpledream.css
index ffaad84..17fd363 100644
--- a/build/base16-purpledream.css
+++ b/build/base16-purpledream.css
@@ -1,88 +1,37 @@
 @define-color accent_color #00a0f0;
 @define-color accent_bg_color #00a0f0;
 @define-color accent_fg_color #100510;
-@define-color destructive_color #ff1d0d;
-@define-color destructive_bg_color #ff1d0d;
-@define-color destructive_fg_color #100510;
-@define-color success_color #14cc64;
-@define-color success_bg_color #14cc64;
-@define-color success_fg_color #100510;
-@define-color warning_color #b000d0;
-@define-color warning_bg_color #b000d0;
-@define-color warning_fg_color #100510;
-@define-color error_color #ff1d0d;
-@define-color error_bg_color #ff1d0d;
-@define-color error_fg_color #100510;
+
 @define-color window_bg_color #100510;
 @define-color window_fg_color #ddd0dd;
+
 @define-color view_bg_color #100510;
 @define-color view_fg_color #ddd0dd;
-@define-color headerbar_bg_color #302030;
+
+@define-color headerbar_bg_color #100510;
 @define-color headerbar_fg_color #ddd0dd;
-@define-color headerbar_border_color rgba(0.18823529, 0.12549020, 0.18823529, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #100510;
+@define-color dialog_fg_color #ddd0dd;
+
+@define-color popover_bg_color #100510;
+@define-color popover_fg_color #ddd0dd;
+
+
 @define-color sidebar_bg_color #302030;
 @define-color sidebar_fg_color #ddd0dd;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #302030;
 @define-color card_fg_color #ddd0dd;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #302030;
-@define-color dialog_fg_color #ddd0dd;
-@define-color popover_bg_color #302030;
-@define-color popover_fg_color #ddd0dd;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #403040;
-@define-color blue_1 #00a0f0;
-@define-color blue_2 #00a0f0;
-@define-color blue_3 #00a0f0;
-@define-color blue_4 #00a0f0;
-@define-color blue_5 #00a0f0;
-@define-color green_1 #14cc64;
-@define-color green_2 #14cc64;
-@define-color green_3 #14cc64;
-@define-color green_4 #14cc64;
-@define-color green_5 #14cc64;
-@define-color yellow_1 #f000a0;
-@define-color yellow_2 #f000a0;
-@define-color yellow_3 #f000a0;
-@define-color yellow_4 #f000a0;
-@define-color yellow_5 #f000a0;
-@define-color orange_1 #ccae14;
-@define-color orange_2 #ccae14;
-@define-color orange_3 #ccae14;
-@define-color orange_4 #ccae14;
-@define-color orange_5 #ccae14;
+
+
 @define-color red_1 #ff1d0d;
-@define-color red_2 #ff1d0d;
-@define-color red_3 #ff1d0d;
-@define-color red_4 #ff1d0d;
-@define-color red_5 #ff1d0d;
+@define-color green_1 #14cc64;
+@define-color yellow_1 #f000a0;
+@define-color blue_1 #00a0f0;
 @define-color purple_1 #b000d0;
-@define-color purple_2 #b000d0;
-@define-color purple_3 #b000d0;
-@define-color purple_4 #b000d0;
-@define-color purple_5 #b000d0;
-@define-color brown_1 #6a2a3c;
-@define-color brown_2 #6a2a3c;
-@define-color brown_3 #6a2a3c;
-@define-color brown_4 #6a2a3c;
-@define-color brown_5 #6a2a3c;
-@define-color light_1 #ddd0dd;
-@define-color light_2 #ddd0dd;
-@define-color light_3 #ddd0dd;
-@define-color light_4 #ddd0dd;
-@define-color light_5 #ddd0dd;
-@define-color dark_1 #ddd0dd;
-@define-color dark_2 #ddd0dd;
-@define-color dark_3 #ddd0dd;
-@define-color dark_4 #ddd0dd;
-@define-color dark_5 #ddd0dd;
+@define-color teal_1 #0075b0;
+@define-color orange_1 #ccae14;
+@define-color gray_1 #605060;
+
diff --git a/build/base16-qualia.css b/build/base16-qualia.css
index ee28708..1509e7e 100644
--- a/build/base16-qualia.css
+++ b/build/base16-qualia.css
@@ -1,88 +1,37 @@
 @define-color accent_color #50cacd;
 @define-color accent_bg_color #50cacd;
 @define-color accent_fg_color #101010;
-@define-color destructive_color #efa6a2;
-@define-color destructive_bg_color #efa6a2;
-@define-color destructive_fg_color #101010;
-@define-color success_color #80c990;
-@define-color success_bg_color #80c990;
-@define-color success_fg_color #101010;
-@define-color warning_color #e0af85;
-@define-color warning_bg_color #e0af85;
-@define-color warning_fg_color #101010;
-@define-color error_color #efa6a2;
-@define-color error_bg_color #efa6a2;
-@define-color error_fg_color #101010;
+
 @define-color window_bg_color #101010;
 @define-color window_fg_color #c0c0c0;
+
 @define-color view_bg_color #101010;
 @define-color view_fg_color #c0c0c0;
-@define-color headerbar_bg_color #454545;
+
+@define-color headerbar_bg_color #101010;
 @define-color headerbar_fg_color #c0c0c0;
-@define-color headerbar_border_color rgba(0.27058824, 0.27058824, 0.27058824, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #101010;
+@define-color dialog_fg_color #c0c0c0;
+
+@define-color popover_bg_color #101010;
+@define-color popover_fg_color #c0c0c0;
+
+
 @define-color sidebar_bg_color #454545;
 @define-color sidebar_fg_color #c0c0c0;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #454545;
 @define-color card_fg_color #c0c0c0;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #454545;
-@define-color dialog_fg_color #c0c0c0;
-@define-color popover_bg_color #454545;
-@define-color popover_fg_color #c0c0c0;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #454545;
-@define-color blue_1 #50cacd;
-@define-color blue_2 #50cacd;
-@define-color blue_3 #50cacd;
-@define-color blue_4 #50cacd;
-@define-color blue_5 #50cacd;
-@define-color green_1 #80c990;
-@define-color green_2 #80c990;
-@define-color green_3 #80c990;
-@define-color green_4 #80c990;
-@define-color green_5 #80c990;
-@define-color yellow_1 #e6a3dc;
-@define-color yellow_2 #e6a3dc;
-@define-color yellow_3 #e6a3dc;
-@define-color yellow_4 #e6a3dc;
-@define-color yellow_5 #e6a3dc;
-@define-color orange_1 #a3b8ef;
-@define-color orange_2 #a3b8ef;
-@define-color orange_3 #a3b8ef;
-@define-color orange_4 #a3b8ef;
-@define-color orange_5 #a3b8ef;
+
+
 @define-color red_1 #efa6a2;
-@define-color red_2 #efa6a2;
-@define-color red_3 #efa6a2;
-@define-color red_4 #efa6a2;
-@define-color red_5 #efa6a2;
+@define-color green_1 #80c990;
+@define-color yellow_1 #e6a3dc;
+@define-color blue_1 #50cacd;
 @define-color purple_1 #e0af85;
-@define-color purple_2 #e0af85;
-@define-color purple_3 #e0af85;
-@define-color purple_4 #e0af85;
-@define-color purple_5 #e0af85;
-@define-color brown_1 #808080;
-@define-color brown_2 #808080;
-@define-color brown_3 #808080;
-@define-color brown_4 #808080;
-@define-color brown_5 #808080;
-@define-color light_1 #c0c0c0;
-@define-color light_2 #c0c0c0;
-@define-color light_3 #c0c0c0;
-@define-color light_4 #c0c0c0;
-@define-color light_5 #c0c0c0;
-@define-color dark_1 #c0c0c0;
-@define-color dark_2 #c0c0c0;
-@define-color dark_3 #c0c0c0;
-@define-color dark_4 #c0c0c0;
-@define-color dark_5 #c0c0c0;
+@define-color teal_1 #c8c874;
+@define-color orange_1 #a3b8ef;
+@define-color gray_1 #454545;
+
diff --git a/build/base16-railscasts.css b/build/base16-railscasts.css
index 0c4e356..0f7a9e3 100644
--- a/build/base16-railscasts.css
+++ b/build/base16-railscasts.css
@@ -1,88 +1,37 @@
 @define-color accent_color #6d9cbe;
 @define-color accent_bg_color #6d9cbe;
 @define-color accent_fg_color #2b2b2b;
-@define-color destructive_color #da4939;
-@define-color destructive_bg_color #da4939;
-@define-color destructive_fg_color #2b2b2b;
-@define-color success_color #a5c261;
-@define-color success_bg_color #a5c261;
-@define-color success_fg_color #2b2b2b;
-@define-color warning_color #b6b3eb;
-@define-color warning_bg_color #b6b3eb;
-@define-color warning_fg_color #2b2b2b;
-@define-color error_color #da4939;
-@define-color error_bg_color #da4939;
-@define-color error_fg_color #2b2b2b;
+
 @define-color window_bg_color #2b2b2b;
 @define-color window_fg_color #e6e1dc;
+
 @define-color view_bg_color #2b2b2b;
 @define-color view_fg_color #e6e1dc;
-@define-color headerbar_bg_color #272935;
+
+@define-color headerbar_bg_color #2b2b2b;
 @define-color headerbar_fg_color #e6e1dc;
-@define-color headerbar_border_color rgba(0.15294118, 0.16078431, 0.20784314, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #2b2b2b;
+@define-color dialog_fg_color #e6e1dc;
+
+@define-color popover_bg_color #2b2b2b;
+@define-color popover_fg_color #e6e1dc;
+
+
 @define-color sidebar_bg_color #272935;
 @define-color sidebar_fg_color #e6e1dc;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #272935;
 @define-color card_fg_color #e6e1dc;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #272935;
-@define-color dialog_fg_color #e6e1dc;
-@define-color popover_bg_color #272935;
-@define-color popover_fg_color #e6e1dc;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #3a4055;
-@define-color blue_1 #6d9cbe;
-@define-color blue_2 #6d9cbe;
-@define-color blue_3 #6d9cbe;
-@define-color blue_4 #6d9cbe;
-@define-color blue_5 #6d9cbe;
-@define-color green_1 #a5c261;
-@define-color green_2 #a5c261;
-@define-color green_3 #a5c261;
-@define-color green_4 #a5c261;
-@define-color green_5 #a5c261;
-@define-color yellow_1 #ffc66d;
-@define-color yellow_2 #ffc66d;
-@define-color yellow_3 #ffc66d;
-@define-color yellow_4 #ffc66d;
-@define-color yellow_5 #ffc66d;
-@define-color orange_1 #cc7833;
-@define-color orange_2 #cc7833;
-@define-color orange_3 #cc7833;
-@define-color orange_4 #cc7833;
-@define-color orange_5 #cc7833;
+
+
 @define-color red_1 #da4939;
-@define-color red_2 #da4939;
-@define-color red_3 #da4939;
-@define-color red_4 #da4939;
-@define-color red_5 #da4939;
+@define-color green_1 #a5c261;
+@define-color yellow_1 #ffc66d;
+@define-color blue_1 #6d9cbe;
 @define-color purple_1 #b6b3eb;
-@define-color purple_2 #b6b3eb;
-@define-color purple_3 #b6b3eb;
-@define-color purple_4 #b6b3eb;
-@define-color purple_5 #b6b3eb;
-@define-color brown_1 #bc9458;
-@define-color brown_2 #bc9458;
-@define-color brown_3 #bc9458;
-@define-color brown_4 #bc9458;
-@define-color brown_5 #bc9458;
-@define-color light_1 #e6e1dc;
-@define-color light_2 #e6e1dc;
-@define-color light_3 #e6e1dc;
-@define-color light_4 #e6e1dc;
-@define-color light_5 #e6e1dc;
-@define-color dark_1 #e6e1dc;
-@define-color dark_2 #e6e1dc;
-@define-color dark_3 #e6e1dc;
-@define-color dark_4 #e6e1dc;
-@define-color dark_5 #e6e1dc;
+@define-color teal_1 #519f50;
+@define-color orange_1 #cc7833;
+@define-color gray_1 #5a647e;
+
diff --git a/build/base16-rebecca.css b/build/base16-rebecca.css
index 3409701..f10373d 100644
--- a/build/base16-rebecca.css
+++ b/build/base16-rebecca.css
@@ -1,88 +1,37 @@
 @define-color accent_color #2de0a7;
 @define-color accent_bg_color #2de0a7;
 @define-color accent_fg_color #292a44;
-@define-color destructive_color #a0a0c5;
-@define-color destructive_bg_color #a0a0c5;
-@define-color destructive_fg_color #292a44;
-@define-color success_color #6dfedf;
-@define-color success_bg_color #6dfedf;
-@define-color success_fg_color #292a44;
-@define-color warning_color #7aa5ff;
-@define-color warning_bg_color #7aa5ff;
-@define-color warning_fg_color #292a44;
-@define-color error_color #a0a0c5;
-@define-color error_bg_color #a0a0c5;
-@define-color error_fg_color #292a44;
+
 @define-color window_bg_color #292a44;
 @define-color window_fg_color #f1eff8;
+
 @define-color view_bg_color #292a44;
 @define-color view_fg_color #f1eff8;
-@define-color headerbar_bg_color #663399;
+
+@define-color headerbar_bg_color #292a44;
 @define-color headerbar_fg_color #f1eff8;
-@define-color headerbar_border_color rgba(0.40000000, 0.20000000, 0.60000000, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #292a44;
+@define-color dialog_fg_color #f1eff8;
+
+@define-color popover_bg_color #292a44;
+@define-color popover_fg_color #f1eff8;
+
+
 @define-color sidebar_bg_color #663399;
 @define-color sidebar_fg_color #f1eff8;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #663399;
 @define-color card_fg_color #f1eff8;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #663399;
-@define-color dialog_fg_color #f1eff8;
-@define-color popover_bg_color #663399;
-@define-color popover_fg_color #f1eff8;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #383a62;
-@define-color blue_1 #2de0a7;
-@define-color blue_2 #2de0a7;
-@define-color blue_3 #2de0a7;
-@define-color blue_4 #2de0a7;
-@define-color blue_5 #2de0a7;
-@define-color green_1 #6dfedf;
-@define-color green_2 #6dfedf;
-@define-color green_3 #6dfedf;
-@define-color green_4 #6dfedf;
-@define-color green_5 #6dfedf;
-@define-color yellow_1 #ae81ff;
-@define-color yellow_2 #ae81ff;
-@define-color yellow_3 #ae81ff;
-@define-color yellow_4 #ae81ff;
-@define-color yellow_5 #ae81ff;
-@define-color orange_1 #efe4a1;
-@define-color orange_2 #efe4a1;
-@define-color orange_3 #efe4a1;
-@define-color orange_4 #efe4a1;
-@define-color orange_5 #efe4a1;
+
+
 @define-color red_1 #a0a0c5;
-@define-color red_2 #a0a0c5;
-@define-color red_3 #a0a0c5;
-@define-color red_4 #a0a0c5;
-@define-color red_5 #a0a0c5;
+@define-color green_1 #6dfedf;
+@define-color yellow_1 #ae81ff;
+@define-color blue_1 #2de0a7;
 @define-color purple_1 #7aa5ff;
-@define-color purple_2 #7aa5ff;
-@define-color purple_3 #7aa5ff;
-@define-color purple_4 #7aa5ff;
-@define-color purple_5 #7aa5ff;
-@define-color brown_1 #ff79c6;
-@define-color brown_2 #ff79c6;
-@define-color brown_3 #ff79c6;
-@define-color brown_4 #ff79c6;
-@define-color brown_5 #ff79c6;
-@define-color light_1 #f1eff8;
-@define-color light_2 #f1eff8;
-@define-color light_3 #f1eff8;
-@define-color light_4 #f1eff8;
-@define-color light_5 #f1eff8;
-@define-color dark_1 #f1eff8;
-@define-color dark_2 #f1eff8;
-@define-color dark_3 #f1eff8;
-@define-color dark_4 #f1eff8;
-@define-color dark_5 #f1eff8;
+@define-color teal_1 #8eaee0;
+@define-color orange_1 #efe4a1;
+@define-color gray_1 #666699;
+
diff --git a/build/base16-rose-pine-dawn.css b/build/base16-rose-pine-dawn.css
index 885bfad..c563603 100644
--- a/build/base16-rose-pine-dawn.css
+++ b/build/base16-rose-pine-dawn.css
@@ -1,88 +1,37 @@
 @define-color accent_color #907aa9;
 @define-color accent_bg_color #907aa9;
 @define-color accent_fg_color #faf4ed;
-@define-color destructive_color #b4637a;
-@define-color destructive_bg_color #b4637a;
-@define-color destructive_fg_color #faf4ed;
-@define-color success_color #286983;
-@define-color success_bg_color #286983;
-@define-color success_fg_color #faf4ed;
-@define-color warning_color #ea9d34;
-@define-color warning_bg_color #ea9d34;
-@define-color warning_fg_color #faf4ed;
-@define-color error_color #b4637a;
-@define-color error_bg_color #b4637a;
-@define-color error_fg_color #faf4ed;
+
 @define-color window_bg_color #faf4ed;
 @define-color window_fg_color #575279;
+
 @define-color view_bg_color #faf4ed;
 @define-color view_fg_color #575279;
-@define-color headerbar_bg_color #fffaf3;
+
+@define-color headerbar_bg_color #faf4ed;
 @define-color headerbar_fg_color #575279;
-@define-color headerbar_border_color rgba(1.00000000, 0.98039216, 0.95294118, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #faf4ed;
+@define-color dialog_fg_color #575279;
+
+@define-color popover_bg_color #faf4ed;
+@define-color popover_fg_color #575279;
+
+
 @define-color sidebar_bg_color #fffaf3;
 @define-color sidebar_fg_color #575279;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #fffaf3;
 @define-color card_fg_color #575279;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #fffaf3;
-@define-color dialog_fg_color #575279;
-@define-color popover_bg_color #fffaf3;
-@define-color popover_fg_color #575279;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #f2e9de;
-@define-color blue_1 #907aa9;
-@define-color blue_2 #907aa9;
-@define-color blue_3 #907aa9;
-@define-color blue_4 #907aa9;
-@define-color blue_5 #907aa9;
-@define-color green_1 #286983;
-@define-color green_2 #286983;
-@define-color green_3 #286983;
-@define-color green_4 #286983;
-@define-color green_5 #286983;
-@define-color yellow_1 #d7827e;
-@define-color yellow_2 #d7827e;
-@define-color yellow_3 #d7827e;
-@define-color yellow_4 #d7827e;
-@define-color yellow_5 #d7827e;
-@define-color orange_1 #ea9d34;
-@define-color orange_2 #ea9d34;
-@define-color orange_3 #ea9d34;
-@define-color orange_4 #ea9d34;
-@define-color orange_5 #ea9d34;
+
+
 @define-color red_1 #b4637a;
-@define-color red_2 #b4637a;
-@define-color red_3 #b4637a;
-@define-color red_4 #b4637a;
-@define-color red_5 #b4637a;
+@define-color green_1 #286983;
+@define-color yellow_1 #d7827e;
+@define-color blue_1 #907aa9;
 @define-color purple_1 #ea9d34;
-@define-color purple_2 #ea9d34;
-@define-color purple_3 #ea9d34;
-@define-color purple_4 #ea9d34;
-@define-color purple_5 #ea9d34;
-@define-color brown_1 #cecacd;
-@define-color brown_2 #cecacd;
-@define-color brown_3 #cecacd;
-@define-color brown_4 #cecacd;
-@define-color brown_5 #cecacd;
-@define-color light_1 #575279;
-@define-color light_2 #575279;
-@define-color light_3 #575279;
-@define-color light_4 #575279;
-@define-color light_5 #575279;
-@define-color dark_1 #575279;
-@define-color dark_2 #575279;
-@define-color dark_3 #575279;
-@define-color dark_4 #575279;
-@define-color dark_5 #575279;
+@define-color teal_1 #56949f;
+@define-color orange_1 #ea9d34;
+@define-color gray_1 #9893a5;
+
diff --git a/build/base16-rose-pine-moon.css b/build/base16-rose-pine-moon.css
index 306ea97..9064af5 100644
--- a/build/base16-rose-pine-moon.css
+++ b/build/base16-rose-pine-moon.css
@@ -1,88 +1,37 @@
 @define-color accent_color #c4a7e7;
 @define-color accent_bg_color #c4a7e7;
 @define-color accent_fg_color #232136;
-@define-color destructive_color #eb6f92;
-@define-color destructive_bg_color #eb6f92;
-@define-color destructive_fg_color #232136;
-@define-color success_color #3e8fb0;
-@define-color success_bg_color #3e8fb0;
-@define-color success_fg_color #232136;
-@define-color warning_color #f6c177;
-@define-color warning_bg_color #f6c177;
-@define-color warning_fg_color #232136;
-@define-color error_color #eb6f92;
-@define-color error_bg_color #eb6f92;
-@define-color error_fg_color #232136;
+
 @define-color window_bg_color #232136;
 @define-color window_fg_color #e0def4;
+
 @define-color view_bg_color #232136;
 @define-color view_fg_color #e0def4;
-@define-color headerbar_bg_color #2a273f;
+
+@define-color headerbar_bg_color #232136;
 @define-color headerbar_fg_color #e0def4;
-@define-color headerbar_border_color rgba(0.16470588, 0.15294118, 0.24705882, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #232136;
+@define-color dialog_fg_color #e0def4;
+
+@define-color popover_bg_color #232136;
+@define-color popover_fg_color #e0def4;
+
+
 @define-color sidebar_bg_color #2a273f;
 @define-color sidebar_fg_color #e0def4;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #2a273f;
 @define-color card_fg_color #e0def4;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #2a273f;
-@define-color dialog_fg_color #e0def4;
-@define-color popover_bg_color #2a273f;
-@define-color popover_fg_color #e0def4;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #393552;
-@define-color blue_1 #c4a7e7;
-@define-color blue_2 #c4a7e7;
-@define-color blue_3 #c4a7e7;
-@define-color blue_4 #c4a7e7;
-@define-color blue_5 #c4a7e7;
-@define-color green_1 #3e8fb0;
-@define-color green_2 #3e8fb0;
-@define-color green_3 #3e8fb0;
-@define-color green_4 #3e8fb0;
-@define-color green_5 #3e8fb0;
-@define-color yellow_1 #ea9a97;
-@define-color yellow_2 #ea9a97;
-@define-color yellow_3 #ea9a97;
-@define-color yellow_4 #ea9a97;
-@define-color yellow_5 #ea9a97;
-@define-color orange_1 #f6c177;
-@define-color orange_2 #f6c177;
-@define-color orange_3 #f6c177;
-@define-color orange_4 #f6c177;
-@define-color orange_5 #f6c177;
+
+
 @define-color red_1 #eb6f92;
-@define-color red_2 #eb6f92;
-@define-color red_3 #eb6f92;
-@define-color red_4 #eb6f92;
-@define-color red_5 #eb6f92;
+@define-color green_1 #3e8fb0;
+@define-color yellow_1 #ea9a97;
+@define-color blue_1 #c4a7e7;
 @define-color purple_1 #f6c177;
-@define-color purple_2 #f6c177;
-@define-color purple_3 #f6c177;
-@define-color purple_4 #f6c177;
-@define-color purple_5 #f6c177;
-@define-color brown_1 #56526e;
-@define-color brown_2 #56526e;
-@define-color brown_3 #56526e;
-@define-color brown_4 #56526e;
-@define-color brown_5 #56526e;
-@define-color light_1 #e0def4;
-@define-color light_2 #e0def4;
-@define-color light_3 #e0def4;
-@define-color light_4 #e0def4;
-@define-color light_5 #e0def4;
-@define-color dark_1 #e0def4;
-@define-color dark_2 #e0def4;
-@define-color dark_3 #e0def4;
-@define-color dark_4 #e0def4;
-@define-color dark_5 #e0def4;
+@define-color teal_1 #9ccfd8;
+@define-color orange_1 #f6c177;
+@define-color gray_1 #6e6a86;
+
diff --git a/build/base16-rose-pine.css b/build/base16-rose-pine.css
index 4ca1fbb..ed93726 100644
--- a/build/base16-rose-pine.css
+++ b/build/base16-rose-pine.css
@@ -1,88 +1,37 @@
 @define-color accent_color #c4a7e7;
 @define-color accent_bg_color #c4a7e7;
 @define-color accent_fg_color #191724;
-@define-color destructive_color #eb6f92;
-@define-color destructive_bg_color #eb6f92;
-@define-color destructive_fg_color #191724;
-@define-color success_color #31748f;
-@define-color success_bg_color #31748f;
-@define-color success_fg_color #191724;
-@define-color warning_color #f6c177;
-@define-color warning_bg_color #f6c177;
-@define-color warning_fg_color #191724;
-@define-color error_color #eb6f92;
-@define-color error_bg_color #eb6f92;
-@define-color error_fg_color #191724;
+
 @define-color window_bg_color #191724;
 @define-color window_fg_color #e0def4;
+
 @define-color view_bg_color #191724;
 @define-color view_fg_color #e0def4;
-@define-color headerbar_bg_color #1f1d2e;
+
+@define-color headerbar_bg_color #191724;
 @define-color headerbar_fg_color #e0def4;
-@define-color headerbar_border_color rgba(0.12156863, 0.11372549, 0.18039216, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #191724;
+@define-color dialog_fg_color #e0def4;
+
+@define-color popover_bg_color #191724;
+@define-color popover_fg_color #e0def4;
+
+
 @define-color sidebar_bg_color #1f1d2e;
 @define-color sidebar_fg_color #e0def4;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #1f1d2e;
 @define-color card_fg_color #e0def4;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #1f1d2e;
-@define-color dialog_fg_color #e0def4;
-@define-color popover_bg_color #1f1d2e;
-@define-color popover_fg_color #e0def4;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #26233a;
-@define-color blue_1 #c4a7e7;
-@define-color blue_2 #c4a7e7;
-@define-color blue_3 #c4a7e7;
-@define-color blue_4 #c4a7e7;
-@define-color blue_5 #c4a7e7;
-@define-color green_1 #31748f;
-@define-color green_2 #31748f;
-@define-color green_3 #31748f;
-@define-color green_4 #31748f;
-@define-color green_5 #31748f;
-@define-color yellow_1 #ebbcba;
-@define-color yellow_2 #ebbcba;
-@define-color yellow_3 #ebbcba;
-@define-color yellow_4 #ebbcba;
-@define-color yellow_5 #ebbcba;
-@define-color orange_1 #f6c177;
-@define-color orange_2 #f6c177;
-@define-color orange_3 #f6c177;
-@define-color orange_4 #f6c177;
-@define-color orange_5 #f6c177;
+
+
 @define-color red_1 #eb6f92;
-@define-color red_2 #eb6f92;
-@define-color red_3 #eb6f92;
-@define-color red_4 #eb6f92;
-@define-color red_5 #eb6f92;
+@define-color green_1 #31748f;
+@define-color yellow_1 #ebbcba;
+@define-color blue_1 #c4a7e7;
 @define-color purple_1 #f6c177;
-@define-color purple_2 #f6c177;
-@define-color purple_3 #f6c177;
-@define-color purple_4 #f6c177;
-@define-color purple_5 #f6c177;
-@define-color brown_1 #524f67;
-@define-color brown_2 #524f67;
-@define-color brown_3 #524f67;
-@define-color brown_4 #524f67;
-@define-color brown_5 #524f67;
-@define-color light_1 #e0def4;
-@define-color light_2 #e0def4;
-@define-color light_3 #e0def4;
-@define-color light_4 #e0def4;
-@define-color light_5 #e0def4;
-@define-color dark_1 #e0def4;
-@define-color dark_2 #e0def4;
-@define-color dark_3 #e0def4;
-@define-color dark_4 #e0def4;
-@define-color dark_5 #e0def4;
+@define-color teal_1 #9ccfd8;
+@define-color orange_1 #f6c177;
+@define-color gray_1 #6e6a86;
+
diff --git a/build/base16-saga.css b/build/base16-saga.css
index 06551ab..0201cc8 100644
--- a/build/base16-saga.css
+++ b/build/base16-saga.css
@@ -1,88 +1,37 @@
 @define-color accent_color #c9fff7;
 @define-color accent_bg_color #c9fff7;
 @define-color accent_fg_color #05080a;
-@define-color destructive_color #ffd4e9;
-@define-color destructive_bg_color #ffd4e9;
-@define-color destructive_fg_color #05080a;
-@define-color success_color #f7ddff;
-@define-color success_bg_color #f7ddff;
-@define-color success_fg_color #05080a;
-@define-color warning_color #dcc3f9;
-@define-color warning_bg_color #dcc3f9;
-@define-color warning_fg_color #05080a;
-@define-color error_color #ffd4e9;
-@define-color error_bg_color #ffd4e9;
-@define-color error_fg_color #05080a;
+
 @define-color window_bg_color #05080a;
 @define-color window_fg_color #dce2f7;
+
 @define-color view_bg_color #05080a;
 @define-color view_fg_color #dce2f7;
-@define-color headerbar_bg_color #0a1014;
+
+@define-color headerbar_bg_color #05080a;
 @define-color headerbar_fg_color #dce2f7;
-@define-color headerbar_border_color rgba(0.03921569, 0.06274510, 0.07843137, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #05080a;
+@define-color dialog_fg_color #dce2f7;
+
+@define-color popover_bg_color #05080a;
+@define-color popover_fg_color #dce2f7;
+
+
 @define-color sidebar_bg_color #0a1014;
 @define-color sidebar_fg_color #dce2f7;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #0a1014;
 @define-color card_fg_color #dce2f7;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #0a1014;
-@define-color dialog_fg_color #dce2f7;
-@define-color popover_bg_color #0a1014;
-@define-color popover_fg_color #dce2f7;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #0f181e;
-@define-color blue_1 #c9fff7;
-@define-color blue_2 #c9fff7;
-@define-color blue_3 #c9fff7;
-@define-color blue_4 #c9fff7;
-@define-color blue_5 #c9fff7;
-@define-color green_1 #f7ddff;
-@define-color green_2 #f7ddff;
-@define-color green_3 #f7ddff;
-@define-color green_4 #f7ddff;
-@define-color green_5 #f7ddff;
-@define-color yellow_1 #fbebc8;
-@define-color yellow_2 #fbebc8;
-@define-color yellow_3 #fbebc8;
-@define-color yellow_4 #fbebc8;
-@define-color yellow_5 #fbebc8;
-@define-color orange_1 #fbcbae;
-@define-color orange_2 #fbcbae;
-@define-color orange_3 #fbcbae;
-@define-color orange_4 #fbcbae;
-@define-color orange_5 #fbcbae;
+
+
 @define-color red_1 #ffd4e9;
-@define-color red_2 #ffd4e9;
-@define-color red_3 #ffd4e9;
-@define-color red_4 #ffd4e9;
-@define-color red_5 #ffd4e9;
+@define-color green_1 #f7ddff;
+@define-color yellow_1 #fbebc8;
+@define-color blue_1 #c9fff7;
 @define-color purple_1 #dcc3f9;
-@define-color purple_2 #dcc3f9;
-@define-color purple_3 #dcc3f9;
-@define-color purple_4 #dcc3f9;
-@define-color purple_5 #dcc3f9;
-@define-color brown_1 #f6dddd;
-@define-color brown_2 #f6dddd;
-@define-color brown_3 #f6dddd;
-@define-color brown_4 #f6dddd;
-@define-color brown_5 #f6dddd;
-@define-color light_1 #dce2f7;
-@define-color light_2 #dce2f7;
-@define-color light_3 #dce2f7;
-@define-color light_4 #dce2f7;
-@define-color light_5 #dce2f7;
-@define-color dark_1 #dce2f7;
-@define-color dark_2 #dce2f7;
-@define-color dark_3 #dce2f7;
-@define-color dark_4 #dce2f7;
-@define-color dark_5 #dce2f7;
+@define-color teal_1 #c5edc1;
+@define-color orange_1 #fbcbae;
+@define-color gray_1 #141f27;
+
diff --git a/build/base16-sagelight.css b/build/base16-sagelight.css
index 45fdd46..23391e9 100644
--- a/build/base16-sagelight.css
+++ b/build/base16-sagelight.css
@@ -1,88 +1,37 @@
 @define-color accent_color #a0a7d2;
 @define-color accent_bg_color #a0a7d2;
 @define-color accent_fg_color #f8f8f8;
-@define-color destructive_color #fa8480;
-@define-color destructive_bg_color #fa8480;
-@define-color destructive_fg_color #f8f8f8;
-@define-color success_color #a0d2c8;
-@define-color success_bg_color #a0d2c8;
-@define-color success_fg_color #f8f8f8;
-@define-color warning_color #c8a0d2;
-@define-color warning_bg_color #c8a0d2;
-@define-color warning_fg_color #f8f8f8;
-@define-color error_color #fa8480;
-@define-color error_bg_color #fa8480;
-@define-color error_fg_color #f8f8f8;
+
 @define-color window_bg_color #f8f8f8;
 @define-color window_fg_color #383838;
+
 @define-color view_bg_color #f8f8f8;
 @define-color view_fg_color #383838;
-@define-color headerbar_bg_color #e8e8e8;
+
+@define-color headerbar_bg_color #f8f8f8;
 @define-color headerbar_fg_color #383838;
-@define-color headerbar_border_color rgba(0.90980392, 0.90980392, 0.90980392, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #f8f8f8;
+@define-color dialog_fg_color #383838;
+
+@define-color popover_bg_color #f8f8f8;
+@define-color popover_fg_color #383838;
+
+
 @define-color sidebar_bg_color #e8e8e8;
 @define-color sidebar_fg_color #383838;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #e8e8e8;
 @define-color card_fg_color #383838;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #e8e8e8;
-@define-color dialog_fg_color #383838;
-@define-color popover_bg_color #e8e8e8;
-@define-color popover_fg_color #383838;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #d8d8d8;
-@define-color blue_1 #a0a7d2;
-@define-color blue_2 #a0a7d2;
-@define-color blue_3 #a0a7d2;
-@define-color blue_4 #a0a7d2;
-@define-color blue_5 #a0a7d2;
-@define-color green_1 #a0d2c8;
-@define-color green_2 #a0d2c8;
-@define-color green_3 #a0d2c8;
-@define-color green_4 #a0d2c8;
-@define-color green_5 #a0d2c8;
-@define-color yellow_1 #ffdc61;
-@define-color yellow_2 #ffdc61;
-@define-color yellow_3 #ffdc61;
-@define-color yellow_4 #ffdc61;
-@define-color yellow_5 #ffdc61;
-@define-color orange_1 #ffaa61;
-@define-color orange_2 #ffaa61;
-@define-color orange_3 #ffaa61;
-@define-color orange_4 #ffaa61;
-@define-color orange_5 #ffaa61;
+
+
 @define-color red_1 #fa8480;
-@define-color red_2 #fa8480;
-@define-color red_3 #fa8480;
-@define-color red_4 #fa8480;
-@define-color red_5 #fa8480;
+@define-color green_1 #a0d2c8;
+@define-color yellow_1 #ffdc61;
+@define-color blue_1 #a0a7d2;
 @define-color purple_1 #c8a0d2;
-@define-color purple_2 #c8a0d2;
-@define-color purple_3 #c8a0d2;
-@define-color purple_4 #c8a0d2;
-@define-color purple_5 #c8a0d2;
-@define-color brown_1 #d2b2a0;
-@define-color brown_2 #d2b2a0;
-@define-color brown_3 #d2b2a0;
-@define-color brown_4 #d2b2a0;
-@define-color brown_5 #d2b2a0;
-@define-color light_1 #383838;
-@define-color light_2 #383838;
-@define-color light_3 #383838;
-@define-color light_4 #383838;
-@define-color light_5 #383838;
-@define-color dark_1 #383838;
-@define-color dark_2 #383838;
-@define-color dark_3 #383838;
-@define-color dark_4 #383838;
-@define-color dark_5 #383838;
+@define-color teal_1 #a2d6f5;
+@define-color orange_1 #ffaa61;
+@define-color gray_1 #b8b8b8;
+
diff --git a/build/base16-sakura.css b/build/base16-sakura.css
index c35a856..f6d0a40 100644
--- a/build/base16-sakura.css
+++ b/build/base16-sakura.css
@@ -1,88 +1,37 @@
 @define-color accent_color #006e93;
 @define-color accent_bg_color #006e93;
 @define-color accent_fg_color #feedf3;
-@define-color destructive_color #df2d52;
-@define-color destructive_bg_color #df2d52;
-@define-color destructive_fg_color #feedf3;
-@define-color success_color #2e916d;
-@define-color success_bg_color #2e916d;
-@define-color success_fg_color #feedf3;
-@define-color warning_color #5e2180;
-@define-color warning_bg_color #5e2180;
-@define-color warning_fg_color #feedf3;
-@define-color error_color #df2d52;
-@define-color error_bg_color #df2d52;
-@define-color error_fg_color #feedf3;
+
 @define-color window_bg_color #feedf3;
 @define-color window_fg_color #564448;
+
 @define-color view_bg_color #feedf3;
 @define-color view_fg_color #564448;
-@define-color headerbar_bg_color #f8e2e7;
+
+@define-color headerbar_bg_color #feedf3;
 @define-color headerbar_fg_color #564448;
-@define-color headerbar_border_color rgba(0.97254902, 0.88627451, 0.90588235, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #feedf3;
+@define-color dialog_fg_color #564448;
+
+@define-color popover_bg_color #feedf3;
+@define-color popover_fg_color #564448;
+
+
 @define-color sidebar_bg_color #f8e2e7;
 @define-color sidebar_fg_color #564448;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #f8e2e7;
 @define-color card_fg_color #564448;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #f8e2e7;
-@define-color dialog_fg_color #564448;
-@define-color popover_bg_color #f8e2e7;
-@define-color popover_fg_color #564448;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #e0ccd1;
-@define-color blue_1 #006e93;
-@define-color blue_2 #006e93;
-@define-color blue_3 #006e93;
-@define-color blue_4 #006e93;
-@define-color blue_5 #006e93;
-@define-color green_1 #2e916d;
-@define-color green_2 #2e916d;
-@define-color green_3 #2e916d;
-@define-color green_4 #2e916d;
-@define-color green_5 #2e916d;
-@define-color yellow_1 #c29461;
-@define-color yellow_2 #c29461;
-@define-color yellow_3 #c29461;
-@define-color yellow_4 #c29461;
-@define-color yellow_5 #c29461;
-@define-color orange_1 #f6661e;
-@define-color orange_2 #f6661e;
-@define-color orange_3 #f6661e;
-@define-color orange_4 #f6661e;
-@define-color orange_5 #f6661e;
+
+
 @define-color red_1 #df2d52;
-@define-color red_2 #df2d52;
-@define-color red_3 #df2d52;
-@define-color red_4 #df2d52;
-@define-color red_5 #df2d52;
+@define-color green_1 #2e916d;
+@define-color yellow_1 #c29461;
+@define-color blue_1 #006e93;
 @define-color purple_1 #5e2180;
-@define-color purple_2 #5e2180;
-@define-color purple_3 #5e2180;
-@define-color purple_4 #5e2180;
-@define-color purple_5 #5e2180;
-@define-color brown_1 #ba0d35;
-@define-color brown_2 #ba0d35;
-@define-color brown_3 #ba0d35;
-@define-color brown_4 #ba0d35;
-@define-color brown_5 #ba0d35;
-@define-color light_1 #564448;
-@define-color light_2 #564448;
-@define-color light_3 #564448;
-@define-color light_4 #564448;
-@define-color light_5 #564448;
-@define-color dark_1 #564448;
-@define-color dark_2 #564448;
-@define-color dark_3 #564448;
-@define-color dark_4 #564448;
-@define-color dark_5 #564448;
+@define-color teal_1 #1d8991;
+@define-color orange_1 #f6661e;
+@define-color gray_1 #755f64;
+
diff --git a/build/base16-sandcastle.css b/build/base16-sandcastle.css
index cc2f129..aaedd0e 100644
--- a/build/base16-sandcastle.css
+++ b/build/base16-sandcastle.css
@@ -1,88 +1,37 @@
 @define-color accent_color #83a598;
 @define-color accent_bg_color #83a598;
 @define-color accent_fg_color #282c34;
-@define-color destructive_color #83a598;
-@define-color destructive_bg_color #83a598;
-@define-color destructive_fg_color #282c34;
-@define-color success_color #528b8b;
-@define-color success_bg_color #528b8b;
-@define-color success_fg_color #282c34;
-@define-color warning_color #d75f5f;
-@define-color warning_bg_color #d75f5f;
-@define-color warning_fg_color #282c34;
-@define-color error_color #83a598;
-@define-color error_bg_color #83a598;
-@define-color error_fg_color #282c34;
+
 @define-color window_bg_color #282c34;
 @define-color window_fg_color #a89984;
+
 @define-color view_bg_color #282c34;
 @define-color view_fg_color #a89984;
-@define-color headerbar_bg_color #2c323b;
+
+@define-color headerbar_bg_color #282c34;
 @define-color headerbar_fg_color #a89984;
-@define-color headerbar_border_color rgba(0.17254902, 0.19607843, 0.23137255, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #282c34;
+@define-color dialog_fg_color #a89984;
+
+@define-color popover_bg_color #282c34;
+@define-color popover_fg_color #a89984;
+
+
 @define-color sidebar_bg_color #2c323b;
 @define-color sidebar_fg_color #a89984;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #2c323b;
 @define-color card_fg_color #a89984;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #2c323b;
-@define-color dialog_fg_color #a89984;
-@define-color popover_bg_color #2c323b;
-@define-color popover_fg_color #a89984;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #3e4451;
-@define-color blue_1 #83a598;
-@define-color blue_2 #83a598;
-@define-color blue_3 #83a598;
-@define-color blue_4 #83a598;
-@define-color blue_5 #83a598;
-@define-color green_1 #528b8b;
-@define-color green_2 #528b8b;
-@define-color green_3 #528b8b;
-@define-color green_4 #528b8b;
-@define-color green_5 #528b8b;
-@define-color yellow_1 #a07e3b;
-@define-color yellow_2 #a07e3b;
-@define-color yellow_3 #a07e3b;
-@define-color yellow_4 #a07e3b;
-@define-color yellow_5 #a07e3b;
-@define-color orange_1 #a07e3b;
-@define-color orange_2 #a07e3b;
-@define-color orange_3 #a07e3b;
-@define-color orange_4 #a07e3b;
-@define-color orange_5 #a07e3b;
+
+
 @define-color red_1 #83a598;
-@define-color red_2 #83a598;
-@define-color red_3 #83a598;
-@define-color red_4 #83a598;
-@define-color red_5 #83a598;
+@define-color green_1 #528b8b;
+@define-color yellow_1 #a07e3b;
+@define-color blue_1 #83a598;
 @define-color purple_1 #d75f5f;
-@define-color purple_2 #d75f5f;
-@define-color purple_3 #d75f5f;
-@define-color purple_4 #d75f5f;
-@define-color purple_5 #d75f5f;
-@define-color brown_1 #a87322;
-@define-color brown_2 #a87322;
-@define-color brown_3 #a87322;
-@define-color brown_4 #a87322;
-@define-color brown_5 #a87322;
-@define-color light_1 #a89984;
-@define-color light_2 #a89984;
-@define-color light_3 #a89984;
-@define-color light_4 #a89984;
-@define-color light_5 #a89984;
-@define-color dark_1 #a89984;
-@define-color dark_2 #a89984;
-@define-color dark_3 #a89984;
-@define-color dark_4 #a89984;
-@define-color dark_5 #a89984;
+@define-color teal_1 #83a598;
+@define-color orange_1 #a07e3b;
+@define-color gray_1 #665c54;
+
diff --git a/build/base16-selenized-black.css b/build/base16-selenized-black.css
index 1ffc84d..c0cb633 100644
--- a/build/base16-selenized-black.css
+++ b/build/base16-selenized-black.css
@@ -1,88 +1,37 @@
 @define-color accent_color #368aeb;
 @define-color accent_bg_color #368aeb;
 @define-color accent_fg_color #181818;
-@define-color destructive_color #ed4a46;
-@define-color destructive_bg_color #ed4a46;
-@define-color destructive_fg_color #181818;
-@define-color success_color #70b433;
-@define-color success_bg_color #70b433;
-@define-color success_fg_color #181818;
-@define-color warning_color #a580e2;
-@define-color warning_bg_color #a580e2;
-@define-color warning_fg_color #181818;
-@define-color error_color #ed4a46;
-@define-color error_bg_color #ed4a46;
-@define-color error_fg_color #181818;
+
 @define-color window_bg_color #181818;
 @define-color window_fg_color #b9b9b9;
+
 @define-color view_bg_color #181818;
 @define-color view_fg_color #b9b9b9;
-@define-color headerbar_bg_color #252525;
+
+@define-color headerbar_bg_color #181818;
 @define-color headerbar_fg_color #b9b9b9;
-@define-color headerbar_border_color rgba(0.14509804, 0.14509804, 0.14509804, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #181818;
+@define-color dialog_fg_color #b9b9b9;
+
+@define-color popover_bg_color #181818;
+@define-color popover_fg_color #b9b9b9;
+
+
 @define-color sidebar_bg_color #252525;
 @define-color sidebar_fg_color #b9b9b9;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #252525;
 @define-color card_fg_color #b9b9b9;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #252525;
-@define-color dialog_fg_color #b9b9b9;
-@define-color popover_bg_color #252525;
-@define-color popover_fg_color #b9b9b9;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #3b3b3b;
-@define-color blue_1 #368aeb;
-@define-color blue_2 #368aeb;
-@define-color blue_3 #368aeb;
-@define-color blue_4 #368aeb;
-@define-color blue_5 #368aeb;
-@define-color green_1 #70b433;
-@define-color green_2 #70b433;
-@define-color green_3 #70b433;
-@define-color green_4 #70b433;
-@define-color green_5 #70b433;
-@define-color yellow_1 #dbb32d;
-@define-color yellow_2 #dbb32d;
-@define-color yellow_3 #dbb32d;
-@define-color yellow_4 #dbb32d;
-@define-color yellow_5 #dbb32d;
-@define-color orange_1 #e67f43;
-@define-color orange_2 #e67f43;
-@define-color orange_3 #e67f43;
-@define-color orange_4 #e67f43;
-@define-color orange_5 #e67f43;
+
+
 @define-color red_1 #ed4a46;
-@define-color red_2 #ed4a46;
-@define-color red_3 #ed4a46;
-@define-color red_4 #ed4a46;
-@define-color red_5 #ed4a46;
+@define-color green_1 #70b433;
+@define-color yellow_1 #dbb32d;
+@define-color blue_1 #368aeb;
 @define-color purple_1 #a580e2;
-@define-color purple_2 #a580e2;
-@define-color purple_3 #a580e2;
-@define-color purple_4 #a580e2;
-@define-color purple_5 #a580e2;
-@define-color brown_1 #eb6eb7;
-@define-color brown_2 #eb6eb7;
-@define-color brown_3 #eb6eb7;
-@define-color brown_4 #eb6eb7;
-@define-color brown_5 #eb6eb7;
-@define-color light_1 #b9b9b9;
-@define-color light_2 #b9b9b9;
-@define-color light_3 #b9b9b9;
-@define-color light_4 #b9b9b9;
-@define-color light_5 #b9b9b9;
-@define-color dark_1 #b9b9b9;
-@define-color dark_2 #b9b9b9;
-@define-color dark_3 #b9b9b9;
-@define-color dark_4 #b9b9b9;
-@define-color dark_5 #b9b9b9;
+@define-color teal_1 #3fc5b7;
+@define-color orange_1 #e67f43;
+@define-color gray_1 #777777;
+
diff --git a/build/base16-selenized-dark.css b/build/base16-selenized-dark.css
index 9a48898..708513b 100644
--- a/build/base16-selenized-dark.css
+++ b/build/base16-selenized-dark.css
@@ -1,88 +1,37 @@
 @define-color accent_color #4695f7;
 @define-color accent_bg_color #4695f7;
 @define-color accent_fg_color #103c48;
-@define-color destructive_color #fa5750;
-@define-color destructive_bg_color #fa5750;
-@define-color destructive_fg_color #103c48;
-@define-color success_color #75b938;
-@define-color success_bg_color #75b938;
-@define-color success_fg_color #103c48;
-@define-color warning_color #af88eb;
-@define-color warning_bg_color #af88eb;
-@define-color warning_fg_color #103c48;
-@define-color error_color #fa5750;
-@define-color error_bg_color #fa5750;
-@define-color error_fg_color #103c48;
+
 @define-color window_bg_color #103c48;
 @define-color window_fg_color #adbcbc;
+
 @define-color view_bg_color #103c48;
 @define-color view_fg_color #adbcbc;
-@define-color headerbar_bg_color #184956;
+
+@define-color headerbar_bg_color #103c48;
 @define-color headerbar_fg_color #adbcbc;
-@define-color headerbar_border_color rgba(0.09411765, 0.28627451, 0.33725490, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #103c48;
+@define-color dialog_fg_color #adbcbc;
+
+@define-color popover_bg_color #103c48;
+@define-color popover_fg_color #adbcbc;
+
+
 @define-color sidebar_bg_color #184956;
 @define-color sidebar_fg_color #adbcbc;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #184956;
 @define-color card_fg_color #adbcbc;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #184956;
-@define-color dialog_fg_color #adbcbc;
-@define-color popover_bg_color #184956;
-@define-color popover_fg_color #adbcbc;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #2d5b69;
-@define-color blue_1 #4695f7;
-@define-color blue_2 #4695f7;
-@define-color blue_3 #4695f7;
-@define-color blue_4 #4695f7;
-@define-color blue_5 #4695f7;
-@define-color green_1 #75b938;
-@define-color green_2 #75b938;
-@define-color green_3 #75b938;
-@define-color green_4 #75b938;
-@define-color green_5 #75b938;
-@define-color yellow_1 #dbb32d;
-@define-color yellow_2 #dbb32d;
-@define-color yellow_3 #dbb32d;
-@define-color yellow_4 #dbb32d;
-@define-color yellow_5 #dbb32d;
-@define-color orange_1 #ed8649;
-@define-color orange_2 #ed8649;
-@define-color orange_3 #ed8649;
-@define-color orange_4 #ed8649;
-@define-color orange_5 #ed8649;
+
+
 @define-color red_1 #fa5750;
-@define-color red_2 #fa5750;
-@define-color red_3 #fa5750;
-@define-color red_4 #fa5750;
-@define-color red_5 #fa5750;
+@define-color green_1 #75b938;
+@define-color yellow_1 #dbb32d;
+@define-color blue_1 #4695f7;
 @define-color purple_1 #af88eb;
-@define-color purple_2 #af88eb;
-@define-color purple_3 #af88eb;
-@define-color purple_4 #af88eb;
-@define-color purple_5 #af88eb;
-@define-color brown_1 #f275be;
-@define-color brown_2 #f275be;
-@define-color brown_3 #f275be;
-@define-color brown_4 #f275be;
-@define-color brown_5 #f275be;
-@define-color light_1 #adbcbc;
-@define-color light_2 #adbcbc;
-@define-color light_3 #adbcbc;
-@define-color light_4 #adbcbc;
-@define-color light_5 #adbcbc;
-@define-color dark_1 #adbcbc;
-@define-color dark_2 #adbcbc;
-@define-color dark_3 #adbcbc;
-@define-color dark_4 #adbcbc;
-@define-color dark_5 #adbcbc;
+@define-color teal_1 #41c7b9;
+@define-color orange_1 #ed8649;
+@define-color gray_1 #72898f;
+
diff --git a/build/base16-selenized-light.css b/build/base16-selenized-light.css
index e1e636d..d749942 100644
--- a/build/base16-selenized-light.css
+++ b/build/base16-selenized-light.css
@@ -1,88 +1,37 @@
 @define-color accent_color #006dce;
 @define-color accent_bg_color #006dce;
 @define-color accent_fg_color #fbf3db;
-@define-color destructive_color #cc1729;
-@define-color destructive_bg_color #cc1729;
-@define-color destructive_fg_color #fbf3db;
-@define-color success_color #428b00;
-@define-color success_bg_color #428b00;
-@define-color success_fg_color #fbf3db;
-@define-color warning_color #825dc0;
-@define-color warning_bg_color #825dc0;
-@define-color warning_fg_color #fbf3db;
-@define-color error_color #cc1729;
-@define-color error_bg_color #cc1729;
-@define-color error_fg_color #fbf3db;
+
 @define-color window_bg_color #fbf3db;
 @define-color window_fg_color #53676d;
+
 @define-color view_bg_color #fbf3db;
 @define-color view_fg_color #53676d;
-@define-color headerbar_bg_color #ece3cc;
+
+@define-color headerbar_bg_color #fbf3db;
 @define-color headerbar_fg_color #53676d;
-@define-color headerbar_border_color rgba(0.92549020, 0.89019608, 0.80000000, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #fbf3db;
+@define-color dialog_fg_color #53676d;
+
+@define-color popover_bg_color #fbf3db;
+@define-color popover_fg_color #53676d;
+
+
 @define-color sidebar_bg_color #ece3cc;
 @define-color sidebar_fg_color #53676d;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #ece3cc;
 @define-color card_fg_color #53676d;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #ece3cc;
-@define-color dialog_fg_color #53676d;
-@define-color popover_bg_color #ece3cc;
-@define-color popover_fg_color #53676d;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #d5cdb6;
-@define-color blue_1 #006dce;
-@define-color blue_2 #006dce;
-@define-color blue_3 #006dce;
-@define-color blue_4 #006dce;
-@define-color blue_5 #006dce;
-@define-color green_1 #428b00;
-@define-color green_2 #428b00;
-@define-color green_3 #428b00;
-@define-color green_4 #428b00;
-@define-color green_5 #428b00;
-@define-color yellow_1 #a78300;
-@define-color yellow_2 #a78300;
-@define-color yellow_3 #a78300;
-@define-color yellow_4 #a78300;
-@define-color yellow_5 #a78300;
-@define-color orange_1 #bc5819;
-@define-color orange_2 #bc5819;
-@define-color orange_3 #bc5819;
-@define-color orange_4 #bc5819;
-@define-color orange_5 #bc5819;
+
+
 @define-color red_1 #cc1729;
-@define-color red_2 #cc1729;
-@define-color red_3 #cc1729;
-@define-color red_4 #cc1729;
-@define-color red_5 #cc1729;
+@define-color green_1 #428b00;
+@define-color yellow_1 #a78300;
+@define-color blue_1 #006dce;
 @define-color purple_1 #825dc0;
-@define-color purple_2 #825dc0;
-@define-color purple_3 #825dc0;
-@define-color purple_4 #825dc0;
-@define-color purple_5 #825dc0;
-@define-color brown_1 #c44392;
-@define-color brown_2 #c44392;
-@define-color brown_3 #c44392;
-@define-color brown_4 #c44392;
-@define-color brown_5 #c44392;
-@define-color light_1 #53676d;
-@define-color light_2 #53676d;
-@define-color light_3 #53676d;
-@define-color light_4 #53676d;
-@define-color light_5 #53676d;
-@define-color dark_1 #53676d;
-@define-color dark_2 #53676d;
-@define-color dark_3 #53676d;
-@define-color dark_4 #53676d;
-@define-color dark_5 #53676d;
+@define-color teal_1 #00978a;
+@define-color orange_1 #bc5819;
+@define-color gray_1 #909995;
+
diff --git a/build/base16-selenized-white.css b/build/base16-selenized-white.css
index d834330..bb77551 100644
--- a/build/base16-selenized-white.css
+++ b/build/base16-selenized-white.css
@@ -1,88 +1,37 @@
 @define-color accent_color #0054cf;
 @define-color accent_bg_color #0054cf;
 @define-color accent_fg_color #ffffff;
-@define-color destructive_color #bf0000;
-@define-color destructive_bg_color #bf0000;
-@define-color destructive_fg_color #ffffff;
-@define-color success_color #008400;
-@define-color success_bg_color #008400;
-@define-color success_fg_color #ffffff;
-@define-color warning_color #6b40c3;
-@define-color warning_bg_color #6b40c3;
-@define-color warning_fg_color #ffffff;
-@define-color error_color #bf0000;
-@define-color error_bg_color #bf0000;
-@define-color error_fg_color #ffffff;
+
 @define-color window_bg_color #ffffff;
 @define-color window_fg_color #474747;
+
 @define-color view_bg_color #ffffff;
 @define-color view_fg_color #474747;
-@define-color headerbar_bg_color #ebebeb;
+
+@define-color headerbar_bg_color #ffffff;
 @define-color headerbar_fg_color #474747;
-@define-color headerbar_border_color rgba(0.92156863, 0.92156863, 0.92156863, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #ffffff;
+@define-color dialog_fg_color #474747;
+
+@define-color popover_bg_color #ffffff;
+@define-color popover_fg_color #474747;
+
+
 @define-color sidebar_bg_color #ebebeb;
 @define-color sidebar_fg_color #474747;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #ebebeb;
 @define-color card_fg_color #474747;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #ebebeb;
-@define-color dialog_fg_color #474747;
-@define-color popover_bg_color #ebebeb;
-@define-color popover_fg_color #474747;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #cdcdcd;
-@define-color blue_1 #0054cf;
-@define-color blue_2 #0054cf;
-@define-color blue_3 #0054cf;
-@define-color blue_4 #0054cf;
-@define-color blue_5 #0054cf;
-@define-color green_1 #008400;
-@define-color green_2 #008400;
-@define-color green_3 #008400;
-@define-color green_4 #008400;
-@define-color green_5 #008400;
-@define-color yellow_1 #af8500;
-@define-color yellow_2 #af8500;
-@define-color yellow_3 #af8500;
-@define-color yellow_4 #af8500;
-@define-color yellow_5 #af8500;
-@define-color orange_1 #ba3700;
-@define-color orange_2 #ba3700;
-@define-color orange_3 #ba3700;
-@define-color orange_4 #ba3700;
-@define-color orange_5 #ba3700;
+
+
 @define-color red_1 #bf0000;
-@define-color red_2 #bf0000;
-@define-color red_3 #bf0000;
-@define-color red_4 #bf0000;
-@define-color red_5 #bf0000;
+@define-color green_1 #008400;
+@define-color yellow_1 #af8500;
+@define-color blue_1 #0054cf;
 @define-color purple_1 #6b40c3;
-@define-color purple_2 #6b40c3;
-@define-color purple_3 #6b40c3;
-@define-color purple_4 #6b40c3;
-@define-color purple_5 #6b40c3;
-@define-color brown_1 #dd0f9d;
-@define-color brown_2 #dd0f9d;
-@define-color brown_3 #dd0f9d;
-@define-color brown_4 #dd0f9d;
-@define-color brown_5 #dd0f9d;
-@define-color light_1 #474747;
-@define-color light_2 #474747;
-@define-color light_3 #474747;
-@define-color light_4 #474747;
-@define-color light_5 #474747;
-@define-color dark_1 #474747;
-@define-color dark_2 #474747;
-@define-color dark_3 #474747;
-@define-color dark_4 #474747;
-@define-color dark_5 #474747;
+@define-color teal_1 #009a8a;
+@define-color orange_1 #ba3700;
+@define-color gray_1 #878787;
+
diff --git a/build/base16-seti.css b/build/base16-seti.css
index 5443309..b36f2e1 100644
--- a/build/base16-seti.css
+++ b/build/base16-seti.css
@@ -1,88 +1,37 @@
 @define-color accent_color #55b5db;
 @define-color accent_bg_color #55b5db;
 @define-color accent_fg_color #151718;
-@define-color destructive_color #cd3f45;
-@define-color destructive_bg_color #cd3f45;
-@define-color destructive_fg_color #151718;
-@define-color success_color #9fca56;
-@define-color success_bg_color #9fca56;
-@define-color success_fg_color #151718;
-@define-color warning_color #a074c4;
-@define-color warning_bg_color #a074c4;
-@define-color warning_fg_color #151718;
-@define-color error_color #cd3f45;
-@define-color error_bg_color #cd3f45;
-@define-color error_fg_color #151718;
+
 @define-color window_bg_color #151718;
 @define-color window_fg_color #d6d6d6;
+
 @define-color view_bg_color #151718;
 @define-color view_fg_color #d6d6d6;
-@define-color headerbar_bg_color #282a2b;
+
+@define-color headerbar_bg_color #151718;
 @define-color headerbar_fg_color #d6d6d6;
-@define-color headerbar_border_color rgba(0.15686275, 0.16470588, 0.16862745, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #151718;
+@define-color dialog_fg_color #d6d6d6;
+
+@define-color popover_bg_color #151718;
+@define-color popover_fg_color #d6d6d6;
+
+
 @define-color sidebar_bg_color #282a2b;
 @define-color sidebar_fg_color #d6d6d6;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #282a2b;
 @define-color card_fg_color #d6d6d6;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #282a2b;
-@define-color dialog_fg_color #d6d6d6;
-@define-color popover_bg_color #282a2b;
-@define-color popover_fg_color #d6d6d6;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #3b758c;
-@define-color blue_1 #55b5db;
-@define-color blue_2 #55b5db;
-@define-color blue_3 #55b5db;
-@define-color blue_4 #55b5db;
-@define-color blue_5 #55b5db;
-@define-color green_1 #9fca56;
-@define-color green_2 #9fca56;
-@define-color green_3 #9fca56;
-@define-color green_4 #9fca56;
-@define-color green_5 #9fca56;
-@define-color yellow_1 #e6cd69;
-@define-color yellow_2 #e6cd69;
-@define-color yellow_3 #e6cd69;
-@define-color yellow_4 #e6cd69;
-@define-color yellow_5 #e6cd69;
-@define-color orange_1 #db7b55;
-@define-color orange_2 #db7b55;
-@define-color orange_3 #db7b55;
-@define-color orange_4 #db7b55;
-@define-color orange_5 #db7b55;
+
+
 @define-color red_1 #cd3f45;
-@define-color red_2 #cd3f45;
-@define-color red_3 #cd3f45;
-@define-color red_4 #cd3f45;
-@define-color red_5 #cd3f45;
+@define-color green_1 #9fca56;
+@define-color yellow_1 #e6cd69;
+@define-color blue_1 #55b5db;
 @define-color purple_1 #a074c4;
-@define-color purple_2 #a074c4;
-@define-color purple_3 #a074c4;
-@define-color purple_4 #a074c4;
-@define-color purple_5 #a074c4;
-@define-color brown_1 #8a553f;
-@define-color brown_2 #8a553f;
-@define-color brown_3 #8a553f;
-@define-color brown_4 #8a553f;
-@define-color brown_5 #8a553f;
-@define-color light_1 #d6d6d6;
-@define-color light_2 #d6d6d6;
-@define-color light_3 #d6d6d6;
-@define-color light_4 #d6d6d6;
-@define-color light_5 #d6d6d6;
-@define-color dark_1 #d6d6d6;
-@define-color dark_2 #d6d6d6;
-@define-color dark_3 #d6d6d6;
-@define-color dark_4 #d6d6d6;
-@define-color dark_5 #d6d6d6;
+@define-color teal_1 #55dbbe;
+@define-color orange_1 #db7b55;
+@define-color gray_1 #41535b;
+
diff --git a/build/base16-shades-of-purple.css b/build/base16-shades-of-purple.css
index 66a30af..b248613 100644
--- a/build/base16-shades-of-purple.css
+++ b/build/base16-shades-of-purple.css
@@ -1,88 +1,37 @@
 @define-color accent_color #6943ff;
 @define-color accent_bg_color #6943ff;
 @define-color accent_fg_color #1e1e3f;
-@define-color destructive_color #d90429;
-@define-color destructive_bg_color #d90429;
-@define-color destructive_fg_color #1e1e3f;
-@define-color success_color #3ad900;
-@define-color success_bg_color #3ad900;
-@define-color success_fg_color #1e1e3f;
-@define-color warning_color #ff2c70;
-@define-color warning_bg_color #ff2c70;
-@define-color warning_fg_color #1e1e3f;
-@define-color error_color #d90429;
-@define-color error_bg_color #d90429;
-@define-color error_fg_color #1e1e3f;
+
 @define-color window_bg_color #1e1e3f;
 @define-color window_fg_color #c7c7c7;
+
 @define-color view_bg_color #1e1e3f;
 @define-color view_fg_color #c7c7c7;
-@define-color headerbar_bg_color #43d426;
+
+@define-color headerbar_bg_color #1e1e3f;
 @define-color headerbar_fg_color #c7c7c7;
-@define-color headerbar_border_color rgba(0.26274510, 0.83137255, 0.14901961, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #1e1e3f;
+@define-color dialog_fg_color #c7c7c7;
+
+@define-color popover_bg_color #1e1e3f;
+@define-color popover_fg_color #c7c7c7;
+
+
 @define-color sidebar_bg_color #43d426;
 @define-color sidebar_fg_color #c7c7c7;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #43d426;
 @define-color card_fg_color #c7c7c7;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #43d426;
-@define-color dialog_fg_color #c7c7c7;
-@define-color popover_bg_color #43d426;
-@define-color popover_fg_color #c7c7c7;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #f1d000;
-@define-color blue_1 #6943ff;
-@define-color blue_2 #6943ff;
-@define-color blue_3 #6943ff;
-@define-color blue_4 #6943ff;
-@define-color blue_5 #6943ff;
-@define-color green_1 #3ad900;
-@define-color green_2 #3ad900;
-@define-color green_3 #3ad900;
-@define-color green_4 #3ad900;
-@define-color green_5 #3ad900;
-@define-color yellow_1 #ffe700;
-@define-color yellow_2 #ffe700;
-@define-color yellow_3 #ffe700;
-@define-color yellow_4 #ffe700;
-@define-color yellow_5 #ffe700;
-@define-color orange_1 #f92a1c;
-@define-color orange_2 #f92a1c;
-@define-color orange_3 #f92a1c;
-@define-color orange_4 #f92a1c;
-@define-color orange_5 #f92a1c;
+
+
 @define-color red_1 #d90429;
-@define-color red_2 #d90429;
-@define-color red_3 #d90429;
-@define-color red_4 #d90429;
-@define-color red_5 #d90429;
+@define-color green_1 #3ad900;
+@define-color yellow_1 #ffe700;
+@define-color blue_1 #6943ff;
 @define-color purple_1 #ff2c70;
-@define-color purple_2 #ff2c70;
-@define-color purple_3 #ff2c70;
-@define-color purple_4 #ff2c70;
-@define-color purple_5 #ff2c70;
-@define-color brown_1 #79e8fb;
-@define-color brown_2 #79e8fb;
-@define-color brown_3 #79e8fb;
-@define-color brown_4 #79e8fb;
-@define-color brown_5 #79e8fb;
-@define-color light_1 #c7c7c7;
-@define-color light_2 #c7c7c7;
-@define-color light_3 #c7c7c7;
-@define-color light_4 #c7c7c7;
-@define-color light_5 #c7c7c7;
-@define-color dark_1 #c7c7c7;
-@define-color dark_2 #c7c7c7;
-@define-color dark_3 #c7c7c7;
-@define-color dark_4 #c7c7c7;
-@define-color dark_5 #c7c7c7;
+@define-color teal_1 #00c5c7;
+@define-color orange_1 #f92a1c;
+@define-color gray_1 #808080;
+
diff --git a/build/base16-shadesmear-dark.css b/build/base16-shadesmear-dark.css
index 9abcbde..9e795be 100644
--- a/build/base16-shadesmear-dark.css
+++ b/build/base16-shadesmear-dark.css
@@ -1,88 +1,37 @@
 @define-color accent_color #376388;
 @define-color accent_bg_color #376388;
 @define-color accent_fg_color #232323;
-@define-color destructive_color #cc5450;
-@define-color destructive_bg_color #cc5450;
-@define-color destructive_fg_color #232323;
-@define-color success_color #71983b;
-@define-color success_bg_color #71983b;
-@define-color success_fg_color #232323;
-@define-color warning_color #d7ab54;
-@define-color warning_bg_color #d7ab54;
-@define-color warning_fg_color #232323;
-@define-color error_color #cc5450;
-@define-color error_bg_color #cc5450;
-@define-color error_fg_color #232323;
+
 @define-color window_bg_color #232323;
 @define-color window_fg_color #dbdbdb;
+
 @define-color view_bg_color #232323;
 @define-color view_fg_color #dbdbdb;
-@define-color headerbar_bg_color #1c1c1c;
+
+@define-color headerbar_bg_color #232323;
 @define-color headerbar_fg_color #dbdbdb;
-@define-color headerbar_border_color rgba(0.10980392, 0.10980392, 0.10980392, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #232323;
+@define-color dialog_fg_color #dbdbdb;
+
+@define-color popover_bg_color #232323;
+@define-color popover_fg_color #dbdbdb;
+
+
 @define-color sidebar_bg_color #1c1c1c;
 @define-color sidebar_fg_color #dbdbdb;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #1c1c1c;
 @define-color card_fg_color #dbdbdb;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #1c1c1c;
-@define-color dialog_fg_color #dbdbdb;
-@define-color popover_bg_color #1c1c1c;
-@define-color popover_fg_color #dbdbdb;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #4e4e4e;
-@define-color blue_1 #376388;
-@define-color blue_2 #376388;
-@define-color blue_3 #376388;
-@define-color blue_4 #376388;
-@define-color blue_5 #376388;
-@define-color green_1 #71983b;
-@define-color green_2 #71983b;
-@define-color green_3 #71983b;
-@define-color green_4 #71983b;
-@define-color green_5 #71983b;
-@define-color yellow_1 #307878;
-@define-color yellow_2 #307878;
-@define-color yellow_3 #307878;
-@define-color yellow_4 #307878;
-@define-color yellow_5 #307878;
-@define-color orange_1 #a64270;
-@define-color orange_2 #a64270;
-@define-color orange_3 #a64270;
-@define-color orange_4 #a64270;
-@define-color orange_5 #a64270;
+
+
 @define-color red_1 #cc5450;
-@define-color red_2 #cc5450;
-@define-color red_3 #cc5450;
-@define-color red_4 #cc5450;
-@define-color red_5 #cc5450;
+@define-color green_1 #71983b;
+@define-color yellow_1 #307878;
+@define-color blue_1 #376388;
 @define-color purple_1 #d7ab54;
-@define-color purple_2 #d7ab54;
-@define-color purple_3 #d7ab54;
-@define-color purple_4 #d7ab54;
-@define-color purple_5 #d7ab54;
-@define-color brown_1 #6d6d6d;
-@define-color brown_2 #6d6d6d;
-@define-color brown_3 #6d6d6d;
-@define-color brown_4 #6d6d6d;
-@define-color brown_5 #6d6d6d;
-@define-color light_1 #dbdbdb;
-@define-color light_2 #dbdbdb;
-@define-color light_3 #dbdbdb;
-@define-color light_4 #dbdbdb;
-@define-color light_5 #dbdbdb;
-@define-color dark_1 #dbdbdb;
-@define-color dark_2 #dbdbdb;
-@define-color dark_3 #dbdbdb;
-@define-color dark_4 #dbdbdb;
-@define-color dark_5 #dbdbdb;
+@define-color teal_1 #c57d42;
+@define-color orange_1 #a64270;
+@define-color gray_1 #c0c0c0;
+
diff --git a/build/base16-shadesmear-light.css b/build/base16-shadesmear-light.css
index ab2aec5..ba82109 100644
--- a/build/base16-shadesmear-light.css
+++ b/build/base16-shadesmear-light.css
@@ -1,88 +1,37 @@
 @define-color accent_color #376388;
 @define-color accent_bg_color #376388;
 @define-color accent_fg_color #dbdbdb;
-@define-color destructive_color #cc5450;
-@define-color destructive_bg_color #cc5450;
-@define-color destructive_fg_color #dbdbdb;
-@define-color success_color #71983b;
-@define-color success_bg_color #71983b;
-@define-color success_fg_color #dbdbdb;
-@define-color warning_color #d7ab54;
-@define-color warning_bg_color #d7ab54;
-@define-color warning_fg_color #dbdbdb;
-@define-color error_color #cc5450;
-@define-color error_bg_color #cc5450;
-@define-color error_fg_color #dbdbdb;
+
 @define-color window_bg_color #dbdbdb;
 @define-color window_fg_color #232323;
+
 @define-color view_bg_color #dbdbdb;
 @define-color view_fg_color #232323;
-@define-color headerbar_bg_color #e4e4e4;
+
+@define-color headerbar_bg_color #dbdbdb;
 @define-color headerbar_fg_color #232323;
-@define-color headerbar_border_color rgba(0.89411765, 0.89411765, 0.89411765, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #dbdbdb;
+@define-color dialog_fg_color #232323;
+
+@define-color popover_bg_color #dbdbdb;
+@define-color popover_fg_color #232323;
+
+
 @define-color sidebar_bg_color #e4e4e4;
 @define-color sidebar_fg_color #232323;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #e4e4e4;
 @define-color card_fg_color #232323;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #e4e4e4;
-@define-color dialog_fg_color #232323;
-@define-color popover_bg_color #e4e4e4;
-@define-color popover_fg_color #232323;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #c0c0c0;
-@define-color blue_1 #376388;
-@define-color blue_2 #376388;
-@define-color blue_3 #376388;
-@define-color blue_4 #376388;
-@define-color blue_5 #376388;
-@define-color green_1 #71983b;
-@define-color green_2 #71983b;
-@define-color green_3 #71983b;
-@define-color green_4 #71983b;
-@define-color green_5 #71983b;
-@define-color yellow_1 #307878;
-@define-color yellow_2 #307878;
-@define-color yellow_3 #307878;
-@define-color yellow_4 #307878;
-@define-color yellow_5 #307878;
-@define-color orange_1 #a64270;
-@define-color orange_2 #a64270;
-@define-color orange_3 #a64270;
-@define-color orange_4 #a64270;
-@define-color orange_5 #a64270;
+
+
 @define-color red_1 #cc5450;
-@define-color red_2 #cc5450;
-@define-color red_3 #cc5450;
-@define-color red_4 #cc5450;
-@define-color red_5 #cc5450;
+@define-color green_1 #71983b;
+@define-color yellow_1 #307878;
+@define-color blue_1 #376388;
 @define-color purple_1 #d7ab54;
-@define-color purple_2 #d7ab54;
-@define-color purple_3 #d7ab54;
-@define-color purple_4 #d7ab54;
-@define-color purple_5 #d7ab54;
-@define-color brown_1 #6d6d6d;
-@define-color brown_2 #6d6d6d;
-@define-color brown_3 #6d6d6d;
-@define-color brown_4 #6d6d6d;
-@define-color brown_5 #6d6d6d;
-@define-color light_1 #232323;
-@define-color light_2 #232323;
-@define-color light_3 #232323;
-@define-color light_4 #232323;
-@define-color light_5 #232323;
-@define-color dark_1 #232323;
-@define-color dark_2 #232323;
-@define-color dark_3 #232323;
-@define-color dark_4 #232323;
-@define-color dark_5 #232323;
+@define-color teal_1 #c57d42;
+@define-color orange_1 #a64270;
+@define-color gray_1 #4e4e4e;
+
diff --git a/build/base16-shapeshifter.css b/build/base16-shapeshifter.css
index 18550d7..3a751f1 100644
--- a/build/base16-shapeshifter.css
+++ b/build/base16-shapeshifter.css
@@ -1,88 +1,37 @@
 @define-color accent_color #3b48e3;
 @define-color accent_bg_color #3b48e3;
 @define-color accent_fg_color #f9f9f9;
-@define-color destructive_color #e92f2f;
-@define-color destructive_bg_color #e92f2f;
-@define-color destructive_fg_color #f9f9f9;
-@define-color success_color #0ed839;
-@define-color success_bg_color #0ed839;
-@define-color success_fg_color #f9f9f9;
-@define-color warning_color #f996e2;
-@define-color warning_bg_color #f996e2;
-@define-color warning_fg_color #f9f9f9;
-@define-color error_color #e92f2f;
-@define-color error_bg_color #e92f2f;
-@define-color error_fg_color #f9f9f9;
+
 @define-color window_bg_color #f9f9f9;
 @define-color window_fg_color #102015;
+
 @define-color view_bg_color #f9f9f9;
 @define-color view_fg_color #102015;
-@define-color headerbar_bg_color #e0e0e0;
+
+@define-color headerbar_bg_color #f9f9f9;
 @define-color headerbar_fg_color #102015;
-@define-color headerbar_border_color rgba(0.87843137, 0.87843137, 0.87843137, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #f9f9f9;
+@define-color dialog_fg_color #102015;
+
+@define-color popover_bg_color #f9f9f9;
+@define-color popover_fg_color #102015;
+
+
 @define-color sidebar_bg_color #e0e0e0;
 @define-color sidebar_fg_color #102015;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #e0e0e0;
 @define-color card_fg_color #102015;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #e0e0e0;
-@define-color dialog_fg_color #102015;
-@define-color popover_bg_color #e0e0e0;
-@define-color popover_fg_color #102015;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #ababab;
-@define-color blue_1 #3b48e3;
-@define-color blue_2 #3b48e3;
-@define-color blue_3 #3b48e3;
-@define-color blue_4 #3b48e3;
-@define-color blue_5 #3b48e3;
-@define-color green_1 #0ed839;
-@define-color green_2 #0ed839;
-@define-color green_3 #0ed839;
-@define-color green_4 #0ed839;
-@define-color green_5 #0ed839;
-@define-color yellow_1 #dddd13;
-@define-color yellow_2 #dddd13;
-@define-color yellow_3 #dddd13;
-@define-color yellow_4 #dddd13;
-@define-color yellow_5 #dddd13;
-@define-color orange_1 #e09448;
-@define-color orange_2 #e09448;
-@define-color orange_3 #e09448;
-@define-color orange_4 #e09448;
-@define-color orange_5 #e09448;
+
+
 @define-color red_1 #e92f2f;
-@define-color red_2 #e92f2f;
-@define-color red_3 #e92f2f;
-@define-color red_4 #e92f2f;
-@define-color red_5 #e92f2f;
+@define-color green_1 #0ed839;
+@define-color yellow_1 #dddd13;
+@define-color blue_1 #3b48e3;
 @define-color purple_1 #f996e2;
-@define-color purple_2 #f996e2;
-@define-color purple_3 #f996e2;
-@define-color purple_4 #f996e2;
-@define-color purple_5 #f996e2;
-@define-color brown_1 #69542d;
-@define-color brown_2 #69542d;
-@define-color brown_3 #69542d;
-@define-color brown_4 #69542d;
-@define-color brown_5 #69542d;
-@define-color light_1 #102015;
-@define-color light_2 #102015;
-@define-color light_3 #102015;
-@define-color light_4 #102015;
-@define-color light_5 #102015;
-@define-color dark_1 #102015;
-@define-color dark_2 #102015;
-@define-color dark_3 #102015;
-@define-color dark_4 #102015;
-@define-color dark_5 #102015;
+@define-color teal_1 #23edda;
+@define-color orange_1 #e09448;
+@define-color gray_1 #555555;
+
diff --git a/build/base16-silk-dark.css b/build/base16-silk-dark.css
index 5fe0c28..c8912f4 100644
--- a/build/base16-silk-dark.css
+++ b/build/base16-silk-dark.css
@@ -1,88 +1,37 @@
 @define-color accent_color #46bddd;
 @define-color accent_bg_color #46bddd;
 @define-color accent_fg_color #0e3c46;
-@define-color destructive_color #fb6953;
-@define-color destructive_bg_color #fb6953;
-@define-color destructive_fg_color #0e3c46;
-@define-color success_color #73d8ad;
-@define-color success_bg_color #73d8ad;
-@define-color success_fg_color #0e3c46;
-@define-color warning_color #756b8a;
-@define-color warning_bg_color #756b8a;
-@define-color warning_fg_color #0e3c46;
-@define-color error_color #fb6953;
-@define-color error_bg_color #fb6953;
-@define-color error_fg_color #0e3c46;
+
 @define-color window_bg_color #0e3c46;
 @define-color window_fg_color #c7dbdd;
+
 @define-color view_bg_color #0e3c46;
 @define-color view_fg_color #c7dbdd;
-@define-color headerbar_bg_color #1d494e;
+
+@define-color headerbar_bg_color #0e3c46;
 @define-color headerbar_fg_color #c7dbdd;
-@define-color headerbar_border_color rgba(0.11372549, 0.28627451, 0.30588235, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #0e3c46;
+@define-color dialog_fg_color #c7dbdd;
+
+@define-color popover_bg_color #0e3c46;
+@define-color popover_fg_color #c7dbdd;
+
+
 @define-color sidebar_bg_color #1d494e;
 @define-color sidebar_fg_color #c7dbdd;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #1d494e;
 @define-color card_fg_color #c7dbdd;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #1d494e;
-@define-color dialog_fg_color #c7dbdd;
-@define-color popover_bg_color #1d494e;
-@define-color popover_fg_color #c7dbdd;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #2a5054;
-@define-color blue_1 #46bddd;
-@define-color blue_2 #46bddd;
-@define-color blue_3 #46bddd;
-@define-color blue_4 #46bddd;
-@define-color blue_5 #46bddd;
-@define-color green_1 #73d8ad;
-@define-color green_2 #73d8ad;
-@define-color green_3 #73d8ad;
-@define-color green_4 #73d8ad;
-@define-color green_5 #73d8ad;
-@define-color yellow_1 #fce380;
-@define-color yellow_2 #fce380;
-@define-color yellow_3 #fce380;
-@define-color yellow_4 #fce380;
-@define-color yellow_5 #fce380;
-@define-color orange_1 #fcab74;
-@define-color orange_2 #fcab74;
-@define-color orange_3 #fcab74;
-@define-color orange_4 #fcab74;
-@define-color orange_5 #fcab74;
+
+
 @define-color red_1 #fb6953;
-@define-color red_2 #fb6953;
-@define-color red_3 #fb6953;
-@define-color red_4 #fb6953;
-@define-color red_5 #fb6953;
+@define-color green_1 #73d8ad;
+@define-color yellow_1 #fce380;
+@define-color blue_1 #46bddd;
 @define-color purple_1 #756b8a;
-@define-color purple_2 #756b8a;
-@define-color purple_3 #756b8a;
-@define-color purple_4 #756b8a;
-@define-color purple_5 #756b8a;
-@define-color brown_1 #9b647b;
-@define-color brown_2 #9b647b;
-@define-color brown_3 #9b647b;
-@define-color brown_4 #9b647b;
-@define-color brown_5 #9b647b;
-@define-color light_1 #c7dbdd;
-@define-color light_2 #c7dbdd;
-@define-color light_3 #c7dbdd;
-@define-color light_4 #c7dbdd;
-@define-color light_5 #c7dbdd;
-@define-color dark_1 #c7dbdd;
-@define-color dark_2 #c7dbdd;
-@define-color dark_3 #c7dbdd;
-@define-color dark_4 #c7dbdd;
-@define-color dark_5 #c7dbdd;
+@define-color teal_1 #3fb2b9;
+@define-color orange_1 #fcab74;
+@define-color gray_1 #587073;
+
diff --git a/build/base16-silk-light.css b/build/base16-silk-light.css
index b952875..49a1611 100644
--- a/build/base16-silk-light.css
+++ b/build/base16-silk-light.css
@@ -1,88 +1,37 @@
 @define-color accent_color #39aac9;
 @define-color accent_bg_color #39aac9;
 @define-color accent_fg_color #e9f1ef;
-@define-color destructive_color #cf432e;
-@define-color destructive_bg_color #cf432e;
-@define-color destructive_fg_color #e9f1ef;
-@define-color success_color #6ca38c;
-@define-color success_bg_color #6ca38c;
-@define-color success_fg_color #e9f1ef;
-@define-color warning_color #6e6582;
-@define-color warning_bg_color #6e6582;
-@define-color warning_fg_color #e9f1ef;
-@define-color error_color #cf432e;
-@define-color error_bg_color #cf432e;
-@define-color error_fg_color #e9f1ef;
+
 @define-color window_bg_color #e9f1ef;
 @define-color window_fg_color #385156;
+
 @define-color view_bg_color #e9f1ef;
 @define-color view_fg_color #385156;
-@define-color headerbar_bg_color #ccd4d3;
+
+@define-color headerbar_bg_color #e9f1ef;
 @define-color headerbar_fg_color #385156;
-@define-color headerbar_border_color rgba(0.80000000, 0.83137255, 0.82745098, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #e9f1ef;
+@define-color dialog_fg_color #385156;
+
+@define-color popover_bg_color #e9f1ef;
+@define-color popover_fg_color #385156;
+
+
 @define-color sidebar_bg_color #ccd4d3;
 @define-color sidebar_fg_color #385156;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #ccd4d3;
 @define-color card_fg_color #385156;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #ccd4d3;
-@define-color dialog_fg_color #385156;
-@define-color popover_bg_color #ccd4d3;
-@define-color popover_fg_color #385156;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #90b7b6;
-@define-color blue_1 #39aac9;
-@define-color blue_2 #39aac9;
-@define-color blue_3 #39aac9;
-@define-color blue_4 #39aac9;
-@define-color blue_5 #39aac9;
-@define-color green_1 #6ca38c;
-@define-color green_2 #6ca38c;
-@define-color green_3 #6ca38c;
-@define-color green_4 #6ca38c;
-@define-color green_5 #6ca38c;
-@define-color yellow_1 #cfad25;
-@define-color yellow_2 #cfad25;
-@define-color yellow_3 #cfad25;
-@define-color yellow_4 #cfad25;
-@define-color yellow_5 #cfad25;
-@define-color orange_1 #d27f46;
-@define-color orange_2 #d27f46;
-@define-color orange_3 #d27f46;
-@define-color orange_4 #d27f46;
-@define-color orange_5 #d27f46;
+
+
 @define-color red_1 #cf432e;
-@define-color red_2 #cf432e;
-@define-color red_3 #cf432e;
-@define-color red_4 #cf432e;
-@define-color red_5 #cf432e;
+@define-color green_1 #6ca38c;
+@define-color yellow_1 #cfad25;
+@define-color blue_1 #39aac9;
 @define-color purple_1 #6e6582;
-@define-color purple_2 #6e6582;
-@define-color purple_3 #6e6582;
-@define-color purple_4 #6e6582;
-@define-color purple_5 #6e6582;
-@define-color brown_1 #865369;
-@define-color brown_2 #865369;
-@define-color brown_3 #865369;
-@define-color brown_4 #865369;
-@define-color brown_5 #865369;
-@define-color light_1 #385156;
-@define-color light_2 #385156;
-@define-color light_3 #385156;
-@define-color light_4 #385156;
-@define-color light_5 #385156;
-@define-color dark_1 #385156;
-@define-color dark_2 #385156;
-@define-color dark_3 #385156;
-@define-color dark_4 #385156;
-@define-color dark_5 #385156;
+@define-color teal_1 #329ca2;
+@define-color orange_1 #d27f46;
+@define-color gray_1 #5c787b;
+
diff --git a/build/base16-snazzy.css b/build/base16-snazzy.css
index 7133437..d08bc5d 100644
--- a/build/base16-snazzy.css
+++ b/build/base16-snazzy.css
@@ -1,88 +1,37 @@
 @define-color accent_color #57c7ff;
 @define-color accent_bg_color #57c7ff;
 @define-color accent_fg_color #282a36;
-@define-color destructive_color #ff5c57;
-@define-color destructive_bg_color #ff5c57;
-@define-color destructive_fg_color #282a36;
-@define-color success_color #5af78e;
-@define-color success_bg_color #5af78e;
-@define-color success_fg_color #282a36;
-@define-color warning_color #ff6ac1;
-@define-color warning_bg_color #ff6ac1;
-@define-color warning_fg_color #282a36;
-@define-color error_color #ff5c57;
-@define-color error_bg_color #ff5c57;
-@define-color error_fg_color #282a36;
+
 @define-color window_bg_color #282a36;
 @define-color window_fg_color #e2e4e5;
+
 @define-color view_bg_color #282a36;
 @define-color view_fg_color #e2e4e5;
-@define-color headerbar_bg_color #34353e;
+
+@define-color headerbar_bg_color #282a36;
 @define-color headerbar_fg_color #e2e4e5;
-@define-color headerbar_border_color rgba(0.20392157, 0.20784314, 0.24313725, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #282a36;
+@define-color dialog_fg_color #e2e4e5;
+
+@define-color popover_bg_color #282a36;
+@define-color popover_fg_color #e2e4e5;
+
+
 @define-color sidebar_bg_color #34353e;
 @define-color sidebar_fg_color #e2e4e5;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #34353e;
 @define-color card_fg_color #e2e4e5;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #34353e;
-@define-color dialog_fg_color #e2e4e5;
-@define-color popover_bg_color #34353e;
-@define-color popover_fg_color #e2e4e5;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #43454f;
-@define-color blue_1 #57c7ff;
-@define-color blue_2 #57c7ff;
-@define-color blue_3 #57c7ff;
-@define-color blue_4 #57c7ff;
-@define-color blue_5 #57c7ff;
-@define-color green_1 #5af78e;
-@define-color green_2 #5af78e;
-@define-color green_3 #5af78e;
-@define-color green_4 #5af78e;
-@define-color green_5 #5af78e;
-@define-color yellow_1 #f3f99d;
-@define-color yellow_2 #f3f99d;
-@define-color yellow_3 #f3f99d;
-@define-color yellow_4 #f3f99d;
-@define-color yellow_5 #f3f99d;
-@define-color orange_1 #ff9f43;
-@define-color orange_2 #ff9f43;
-@define-color orange_3 #ff9f43;
-@define-color orange_4 #ff9f43;
-@define-color orange_5 #ff9f43;
+
+
 @define-color red_1 #ff5c57;
-@define-color red_2 #ff5c57;
-@define-color red_3 #ff5c57;
-@define-color red_4 #ff5c57;
-@define-color red_5 #ff5c57;
+@define-color green_1 #5af78e;
+@define-color yellow_1 #f3f99d;
+@define-color blue_1 #57c7ff;
 @define-color purple_1 #ff6ac1;
-@define-color purple_2 #ff6ac1;
-@define-color purple_3 #ff6ac1;
-@define-color purple_4 #ff6ac1;
-@define-color purple_5 #ff6ac1;
-@define-color brown_1 #b2643c;
-@define-color brown_2 #b2643c;
-@define-color brown_3 #b2643c;
-@define-color brown_4 #b2643c;
-@define-color brown_5 #b2643c;
-@define-color light_1 #e2e4e5;
-@define-color light_2 #e2e4e5;
-@define-color light_3 #e2e4e5;
-@define-color light_4 #e2e4e5;
-@define-color light_5 #e2e4e5;
-@define-color dark_1 #e2e4e5;
-@define-color dark_2 #e2e4e5;
-@define-color dark_3 #e2e4e5;
-@define-color dark_4 #e2e4e5;
-@define-color dark_5 #e2e4e5;
+@define-color teal_1 #9aedfe;
+@define-color orange_1 #ff9f43;
+@define-color gray_1 #78787e;
+
diff --git a/build/base16-soft-server.css b/build/base16-soft-server.css
index 1937cbf..45f74d0 100644
--- a/build/base16-soft-server.css
+++ b/build/base16-soft-server.css
@@ -1,88 +1,37 @@
 @define-color accent_color #95a6f4;
 @define-color accent_bg_color #95a6f4;
 @define-color accent_fg_color #211e2a;
-@define-color destructive_color #e965a5;
-@define-color destructive_bg_color #e965a5;
-@define-color destructive_fg_color #211e2a;
-@define-color success_color #b1f2a7;
-@define-color success_bg_color #b1f2a7;
-@define-color success_fg_color #211e2a;
-@define-color warning_color #ff79c6;
-@define-color warning_bg_color #ff79c6;
-@define-color warning_fg_color #211e2a;
-@define-color error_color #e965a5;
-@define-color error_bg_color #e965a5;
-@define-color error_fg_color #211e2a;
+
 @define-color window_bg_color #211e2a;
 @define-color window_fg_color #e4dee9;
+
 @define-color view_bg_color #211e2a;
 @define-color view_fg_color #e4dee9;
-@define-color headerbar_bg_color #2c2737;
+
+@define-color headerbar_bg_color #211e2a;
 @define-color headerbar_fg_color #e4dee9;
-@define-color headerbar_border_color rgba(0.17254902, 0.15294118, 0.21568627, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #211e2a;
+@define-color dialog_fg_color #e4dee9;
+
+@define-color popover_bg_color #211e2a;
+@define-color popover_fg_color #e4dee9;
+
+
 @define-color sidebar_bg_color #2c2737;
 @define-color sidebar_fg_color #e4dee9;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #2c2737;
 @define-color card_fg_color #e4dee9;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #2c2737;
-@define-color dialog_fg_color #e4dee9;
-@define-color popover_bg_color #2c2737;
-@define-color popover_fg_color #e4dee9;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #3f3951;
-@define-color blue_1 #95a6f4;
-@define-color blue_2 #95a6f4;
-@define-color blue_3 #95a6f4;
-@define-color blue_4 #95a6f4;
-@define-color blue_5 #95a6f4;
-@define-color green_1 #b1f2a7;
-@define-color green_2 #b1f2a7;
-@define-color green_3 #b1f2a7;
-@define-color green_4 #b1f2a7;
-@define-color green_5 #b1f2a7;
-@define-color yellow_1 #ebde76;
-@define-color yellow_2 #ebde76;
-@define-color yellow_3 #ebde76;
-@define-color yellow_4 #ebde76;
-@define-color yellow_5 #ebde76;
-@define-color orange_1 #f4b870;
-@define-color orange_2 #f4b870;
-@define-color orange_3 #f4b870;
-@define-color orange_4 #f4b870;
-@define-color orange_5 #f4b870;
+
+
 @define-color red_1 #e965a5;
-@define-color red_2 #e965a5;
-@define-color red_3 #e965a5;
-@define-color red_4 #e965a5;
-@define-color red_5 #e965a5;
+@define-color green_1 #b1f2a7;
+@define-color yellow_1 #ebde76;
+@define-color blue_1 #95a6f4;
 @define-color purple_1 #ff79c6;
-@define-color purple_2 #ff79c6;
-@define-color purple_3 #ff79c6;
-@define-color purple_4 #ff79c6;
-@define-color purple_5 #ff79c6;
-@define-color brown_1 #bd93f9;
-@define-color brown_2 #bd93f9;
-@define-color brown_3 #bd93f9;
-@define-color brown_4 #bd93f9;
-@define-color brown_5 #bd93f9;
-@define-color light_1 #e4dee9;
-@define-color light_2 #e4dee9;
-@define-color light_3 #e4dee9;
-@define-color light_4 #e4dee9;
-@define-color light_5 #e4dee9;
-@define-color dark_1 #e4dee9;
-@define-color dark_2 #e4dee9;
-@define-color dark_3 #e4dee9;
-@define-color dark_4 #e4dee9;
-@define-color dark_5 #e4dee9;
+@define-color teal_1 #b3f4f3;
+@define-color orange_1 #f4b870;
+@define-color gray_1 #6e6780;
+
diff --git a/build/base16-solarflare-light.css b/build/base16-solarflare-light.css
index 52a3ce1..03e82dc 100644
--- a/build/base16-solarflare-light.css
+++ b/build/base16-solarflare-light.css
@@ -1,88 +1,37 @@
 @define-color accent_color #33b5e1;
 @define-color accent_bg_color #33b5e1;
 @define-color accent_fg_color #f5f7fa;
-@define-color destructive_color #ef5253;
-@define-color destructive_bg_color #ef5253;
-@define-color destructive_fg_color #f5f7fa;
-@define-color success_color #7cc844;
-@define-color success_bg_color #7cc844;
-@define-color success_fg_color #f5f7fa;
-@define-color warning_color #a363d5;
-@define-color warning_bg_color #a363d5;
-@define-color warning_fg_color #f5f7fa;
-@define-color error_color #ef5253;
-@define-color error_bg_color #ef5253;
-@define-color error_fg_color #f5f7fa;
+
 @define-color window_bg_color #f5f7fa;
 @define-color window_fg_color #586875;
+
 @define-color view_bg_color #f5f7fa;
 @define-color view_fg_color #586875;
-@define-color headerbar_bg_color #e8e9ed;
+
+@define-color headerbar_bg_color #f5f7fa;
 @define-color headerbar_fg_color #586875;
-@define-color headerbar_border_color rgba(0.90980392, 0.91372549, 0.92941176, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #f5f7fa;
+@define-color dialog_fg_color #586875;
+
+@define-color popover_bg_color #f5f7fa;
+@define-color popover_fg_color #586875;
+
+
 @define-color sidebar_bg_color #e8e9ed;
 @define-color sidebar_fg_color #586875;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #e8e9ed;
 @define-color card_fg_color #586875;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #e8e9ed;
-@define-color dialog_fg_color #586875;
-@define-color popover_bg_color #e8e9ed;
-@define-color popover_fg_color #586875;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #a6afb8;
-@define-color blue_1 #33b5e1;
-@define-color blue_2 #33b5e1;
-@define-color blue_3 #33b5e1;
-@define-color blue_4 #33b5e1;
-@define-color blue_5 #33b5e1;
-@define-color green_1 #7cc844;
-@define-color green_2 #7cc844;
-@define-color green_3 #7cc844;
-@define-color green_4 #7cc844;
-@define-color green_5 #7cc844;
-@define-color yellow_1 #e4b51c;
-@define-color yellow_2 #e4b51c;
-@define-color yellow_3 #e4b51c;
-@define-color yellow_4 #e4b51c;
-@define-color yellow_5 #e4b51c;
-@define-color orange_1 #e66b2b;
-@define-color orange_2 #e66b2b;
-@define-color orange_3 #e66b2b;
-@define-color orange_4 #e66b2b;
-@define-color orange_5 #e66b2b;
+
+
 @define-color red_1 #ef5253;
-@define-color red_2 #ef5253;
-@define-color red_3 #ef5253;
-@define-color red_4 #ef5253;
-@define-color red_5 #ef5253;
+@define-color green_1 #7cc844;
+@define-color yellow_1 #e4b51c;
+@define-color blue_1 #33b5e1;
 @define-color purple_1 #a363d5;
-@define-color purple_2 #a363d5;
-@define-color purple_3 #a363d5;
-@define-color purple_4 #a363d5;
-@define-color purple_5 #a363d5;
-@define-color brown_1 #d73c9a;
-@define-color brown_2 #d73c9a;
-@define-color brown_3 #d73c9a;
-@define-color brown_4 #d73c9a;
-@define-color brown_5 #d73c9a;
-@define-color light_1 #586875;
-@define-color light_2 #586875;
-@define-color light_3 #586875;
-@define-color light_4 #586875;
-@define-color light_5 #586875;
-@define-color dark_1 #586875;
-@define-color dark_2 #586875;
-@define-color dark_3 #586875;
-@define-color dark_4 #586875;
-@define-color dark_5 #586875;
+@define-color teal_1 #52cbb0;
+@define-color orange_1 #e66b2b;
+@define-color gray_1 #85939e;
+
diff --git a/build/base16-solarflare.css b/build/base16-solarflare.css
index 775e510..7d9b5d2 100644
--- a/build/base16-solarflare.css
+++ b/build/base16-solarflare.css
@@ -1,88 +1,37 @@
 @define-color accent_color #33b5e1;
 @define-color accent_bg_color #33b5e1;
 @define-color accent_fg_color #18262f;
-@define-color destructive_color #ef5253;
-@define-color destructive_bg_color #ef5253;
-@define-color destructive_fg_color #18262f;
-@define-color success_color #7cc844;
-@define-color success_bg_color #7cc844;
-@define-color success_fg_color #18262f;
-@define-color warning_color #a363d5;
-@define-color warning_bg_color #a363d5;
-@define-color warning_fg_color #18262f;
-@define-color error_color #ef5253;
-@define-color error_bg_color #ef5253;
-@define-color error_fg_color #18262f;
+
 @define-color window_bg_color #18262f;
 @define-color window_fg_color #a6afb8;
+
 @define-color view_bg_color #18262f;
 @define-color view_fg_color #a6afb8;
-@define-color headerbar_bg_color #222e38;
+
+@define-color headerbar_bg_color #18262f;
 @define-color headerbar_fg_color #a6afb8;
-@define-color headerbar_border_color rgba(0.13333333, 0.18039216, 0.21960784, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #18262f;
+@define-color dialog_fg_color #a6afb8;
+
+@define-color popover_bg_color #18262f;
+@define-color popover_fg_color #a6afb8;
+
+
 @define-color sidebar_bg_color #222e38;
 @define-color sidebar_fg_color #a6afb8;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #222e38;
 @define-color card_fg_color #a6afb8;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #222e38;
-@define-color dialog_fg_color #a6afb8;
-@define-color popover_bg_color #222e38;
-@define-color popover_fg_color #a6afb8;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #586875;
-@define-color blue_1 #33b5e1;
-@define-color blue_2 #33b5e1;
-@define-color blue_3 #33b5e1;
-@define-color blue_4 #33b5e1;
-@define-color blue_5 #33b5e1;
-@define-color green_1 #7cc844;
-@define-color green_2 #7cc844;
-@define-color green_3 #7cc844;
-@define-color green_4 #7cc844;
-@define-color green_5 #7cc844;
-@define-color yellow_1 #e4b51c;
-@define-color yellow_2 #e4b51c;
-@define-color yellow_3 #e4b51c;
-@define-color yellow_4 #e4b51c;
-@define-color yellow_5 #e4b51c;
-@define-color orange_1 #e66b2b;
-@define-color orange_2 #e66b2b;
-@define-color orange_3 #e66b2b;
-@define-color orange_4 #e66b2b;
-@define-color orange_5 #e66b2b;
+
+
 @define-color red_1 #ef5253;
-@define-color red_2 #ef5253;
-@define-color red_3 #ef5253;
-@define-color red_4 #ef5253;
-@define-color red_5 #ef5253;
+@define-color green_1 #7cc844;
+@define-color yellow_1 #e4b51c;
+@define-color blue_1 #33b5e1;
 @define-color purple_1 #a363d5;
-@define-color purple_2 #a363d5;
-@define-color purple_3 #a363d5;
-@define-color purple_4 #a363d5;
-@define-color purple_5 #a363d5;
-@define-color brown_1 #d73c9a;
-@define-color brown_2 #d73c9a;
-@define-color brown_3 #d73c9a;
-@define-color brown_4 #d73c9a;
-@define-color brown_5 #d73c9a;
-@define-color light_1 #a6afb8;
-@define-color light_2 #a6afb8;
-@define-color light_3 #a6afb8;
-@define-color light_4 #a6afb8;
-@define-color light_5 #a6afb8;
-@define-color dark_1 #a6afb8;
-@define-color dark_2 #a6afb8;
-@define-color dark_3 #a6afb8;
-@define-color dark_4 #a6afb8;
-@define-color dark_5 #a6afb8;
+@define-color teal_1 #52cbb0;
+@define-color orange_1 #e66b2b;
+@define-color gray_1 #667581;
+
diff --git a/build/base16-solarized-dark.css b/build/base16-solarized-dark.css
index 754d542..403af99 100644
--- a/build/base16-solarized-dark.css
+++ b/build/base16-solarized-dark.css
@@ -1,88 +1,37 @@
 @define-color accent_color #268bd2;
 @define-color accent_bg_color #268bd2;
 @define-color accent_fg_color #002b36;
-@define-color destructive_color #dc322f;
-@define-color destructive_bg_color #dc322f;
-@define-color destructive_fg_color #002b36;
-@define-color success_color #859900;
-@define-color success_bg_color #859900;
-@define-color success_fg_color #002b36;
-@define-color warning_color #6c71c4;
-@define-color warning_bg_color #6c71c4;
-@define-color warning_fg_color #002b36;
-@define-color error_color #dc322f;
-@define-color error_bg_color #dc322f;
-@define-color error_fg_color #002b36;
+
 @define-color window_bg_color #002b36;
 @define-color window_fg_color #93a1a1;
+
 @define-color view_bg_color #002b36;
 @define-color view_fg_color #93a1a1;
-@define-color headerbar_bg_color #073642;
+
+@define-color headerbar_bg_color #002b36;
 @define-color headerbar_fg_color #93a1a1;
-@define-color headerbar_border_color rgba(0.02745098, 0.21176471, 0.25882353, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #002b36;
+@define-color dialog_fg_color #93a1a1;
+
+@define-color popover_bg_color #002b36;
+@define-color popover_fg_color #93a1a1;
+
+
 @define-color sidebar_bg_color #073642;
 @define-color sidebar_fg_color #93a1a1;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #073642;
 @define-color card_fg_color #93a1a1;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #073642;
-@define-color dialog_fg_color #93a1a1;
-@define-color popover_bg_color #073642;
-@define-color popover_fg_color #93a1a1;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #586e75;
-@define-color blue_1 #268bd2;
-@define-color blue_2 #268bd2;
-@define-color blue_3 #268bd2;
-@define-color blue_4 #268bd2;
-@define-color blue_5 #268bd2;
-@define-color green_1 #859900;
-@define-color green_2 #859900;
-@define-color green_3 #859900;
-@define-color green_4 #859900;
-@define-color green_5 #859900;
-@define-color yellow_1 #b58900;
-@define-color yellow_2 #b58900;
-@define-color yellow_3 #b58900;
-@define-color yellow_4 #b58900;
-@define-color yellow_5 #b58900;
-@define-color orange_1 #cb4b16;
-@define-color orange_2 #cb4b16;
-@define-color orange_3 #cb4b16;
-@define-color orange_4 #cb4b16;
-@define-color orange_5 #cb4b16;
+
+
 @define-color red_1 #dc322f;
-@define-color red_2 #dc322f;
-@define-color red_3 #dc322f;
-@define-color red_4 #dc322f;
-@define-color red_5 #dc322f;
+@define-color green_1 #859900;
+@define-color yellow_1 #b58900;
+@define-color blue_1 #268bd2;
 @define-color purple_1 #6c71c4;
-@define-color purple_2 #6c71c4;
-@define-color purple_3 #6c71c4;
-@define-color purple_4 #6c71c4;
-@define-color purple_5 #6c71c4;
-@define-color brown_1 #d33682;
-@define-color brown_2 #d33682;
-@define-color brown_3 #d33682;
-@define-color brown_4 #d33682;
-@define-color brown_5 #d33682;
-@define-color light_1 #93a1a1;
-@define-color light_2 #93a1a1;
-@define-color light_3 #93a1a1;
-@define-color light_4 #93a1a1;
-@define-color light_5 #93a1a1;
-@define-color dark_1 #93a1a1;
-@define-color dark_2 #93a1a1;
-@define-color dark_3 #93a1a1;
-@define-color dark_4 #93a1a1;
-@define-color dark_5 #93a1a1;
+@define-color teal_1 #2aa198;
+@define-color orange_1 #cb4b16;
+@define-color gray_1 #657b83;
+
diff --git a/build/base16-solarized-light.css b/build/base16-solarized-light.css
index 82ec347..1363e33 100644
--- a/build/base16-solarized-light.css
+++ b/build/base16-solarized-light.css
@@ -1,88 +1,37 @@
 @define-color accent_color #268bd2;
 @define-color accent_bg_color #268bd2;
 @define-color accent_fg_color #fdf6e3;
-@define-color destructive_color #dc322f;
-@define-color destructive_bg_color #dc322f;
-@define-color destructive_fg_color #fdf6e3;
-@define-color success_color #859900;
-@define-color success_bg_color #859900;
-@define-color success_fg_color #fdf6e3;
-@define-color warning_color #6c71c4;
-@define-color warning_bg_color #6c71c4;
-@define-color warning_fg_color #fdf6e3;
-@define-color error_color #dc322f;
-@define-color error_bg_color #dc322f;
-@define-color error_fg_color #fdf6e3;
+
 @define-color window_bg_color #fdf6e3;
 @define-color window_fg_color #586e75;
+
 @define-color view_bg_color #fdf6e3;
 @define-color view_fg_color #586e75;
-@define-color headerbar_bg_color #eee8d5;
+
+@define-color headerbar_bg_color #fdf6e3;
 @define-color headerbar_fg_color #586e75;
-@define-color headerbar_border_color rgba(0.93333333, 0.90980392, 0.83529412, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #fdf6e3;
+@define-color dialog_fg_color #586e75;
+
+@define-color popover_bg_color #fdf6e3;
+@define-color popover_fg_color #586e75;
+
+
 @define-color sidebar_bg_color #eee8d5;
 @define-color sidebar_fg_color #586e75;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #eee8d5;
 @define-color card_fg_color #586e75;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #eee8d5;
-@define-color dialog_fg_color #586e75;
-@define-color popover_bg_color #eee8d5;
-@define-color popover_fg_color #586e75;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #93a1a1;
-@define-color blue_1 #268bd2;
-@define-color blue_2 #268bd2;
-@define-color blue_3 #268bd2;
-@define-color blue_4 #268bd2;
-@define-color blue_5 #268bd2;
-@define-color green_1 #859900;
-@define-color green_2 #859900;
-@define-color green_3 #859900;
-@define-color green_4 #859900;
-@define-color green_5 #859900;
-@define-color yellow_1 #b58900;
-@define-color yellow_2 #b58900;
-@define-color yellow_3 #b58900;
-@define-color yellow_4 #b58900;
-@define-color yellow_5 #b58900;
-@define-color orange_1 #cb4b16;
-@define-color orange_2 #cb4b16;
-@define-color orange_3 #cb4b16;
-@define-color orange_4 #cb4b16;
-@define-color orange_5 #cb4b16;
+
+
 @define-color red_1 #dc322f;
-@define-color red_2 #dc322f;
-@define-color red_3 #dc322f;
-@define-color red_4 #dc322f;
-@define-color red_5 #dc322f;
+@define-color green_1 #859900;
+@define-color yellow_1 #b58900;
+@define-color blue_1 #268bd2;
 @define-color purple_1 #6c71c4;
-@define-color purple_2 #6c71c4;
-@define-color purple_3 #6c71c4;
-@define-color purple_4 #6c71c4;
-@define-color purple_5 #6c71c4;
-@define-color brown_1 #d33682;
-@define-color brown_2 #d33682;
-@define-color brown_3 #d33682;
-@define-color brown_4 #d33682;
-@define-color brown_5 #d33682;
-@define-color light_1 #586e75;
-@define-color light_2 #586e75;
-@define-color light_3 #586e75;
-@define-color light_4 #586e75;
-@define-color light_5 #586e75;
-@define-color dark_1 #586e75;
-@define-color dark_2 #586e75;
-@define-color dark_3 #586e75;
-@define-color dark_4 #586e75;
-@define-color dark_5 #586e75;
+@define-color teal_1 #2aa198;
+@define-color orange_1 #cb4b16;
+@define-color gray_1 #839496;
+
diff --git a/build/base16-spaceduck.css b/build/base16-spaceduck.css
index 1f43cbb..4d8f87a 100644
--- a/build/base16-spaceduck.css
+++ b/build/base16-spaceduck.css
@@ -1,88 +1,37 @@
 @define-color accent_color #7a5ccc;
 @define-color accent_bg_color #7a5ccc;
 @define-color accent_fg_color #16172d;
-@define-color destructive_color #e33400;
-@define-color destructive_bg_color #e33400;
-@define-color destructive_fg_color #16172d;
-@define-color success_color #5ccc96;
-@define-color success_bg_color #5ccc96;
-@define-color success_fg_color #16172d;
-@define-color warning_color #b3a1e6;
-@define-color warning_bg_color #b3a1e6;
-@define-color warning_fg_color #16172d;
-@define-color error_color #e33400;
-@define-color error_bg_color #e33400;
-@define-color error_fg_color #16172d;
+
 @define-color window_bg_color #16172d;
 @define-color window_fg_color #ecf0c1;
+
 @define-color view_bg_color #16172d;
 @define-color view_fg_color #ecf0c1;
-@define-color headerbar_bg_color #1b1c36;
+
+@define-color headerbar_bg_color #16172d;
 @define-color headerbar_fg_color #ecf0c1;
-@define-color headerbar_border_color rgba(0.10588235, 0.10980392, 0.21176471, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #16172d;
+@define-color dialog_fg_color #ecf0c1;
+
+@define-color popover_bg_color #16172d;
+@define-color popover_fg_color #ecf0c1;
+
+
 @define-color sidebar_bg_color #1b1c36;
 @define-color sidebar_fg_color #ecf0c1;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #1b1c36;
 @define-color card_fg_color #ecf0c1;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #1b1c36;
-@define-color dialog_fg_color #ecf0c1;
-@define-color popover_bg_color #1b1c36;
-@define-color popover_fg_color #ecf0c1;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #30365f;
-@define-color blue_1 #7a5ccc;
-@define-color blue_2 #7a5ccc;
-@define-color blue_3 #7a5ccc;
-@define-color blue_4 #7a5ccc;
-@define-color blue_5 #7a5ccc;
-@define-color green_1 #5ccc96;
-@define-color green_2 #5ccc96;
-@define-color green_3 #5ccc96;
-@define-color green_4 #5ccc96;
-@define-color green_5 #5ccc96;
-@define-color yellow_1 #f2ce00;
-@define-color yellow_2 #f2ce00;
-@define-color yellow_3 #f2ce00;
-@define-color yellow_4 #f2ce00;
-@define-color yellow_5 #f2ce00;
-@define-color orange_1 #e39400;
-@define-color orange_2 #e39400;
-@define-color orange_3 #e39400;
-@define-color orange_4 #e39400;
-@define-color orange_5 #e39400;
+
+
 @define-color red_1 #e33400;
-@define-color red_2 #e33400;
-@define-color red_3 #e33400;
-@define-color red_4 #e33400;
-@define-color red_5 #e33400;
+@define-color green_1 #5ccc96;
+@define-color yellow_1 #f2ce00;
+@define-color blue_1 #7a5ccc;
 @define-color purple_1 #b3a1e6;
-@define-color purple_2 #b3a1e6;
-@define-color purple_3 #b3a1e6;
-@define-color purple_4 #b3a1e6;
-@define-color purple_5 #b3a1e6;
-@define-color brown_1 #ce6f8f;
-@define-color brown_2 #ce6f8f;
-@define-color brown_3 #ce6f8f;
-@define-color brown_4 #ce6f8f;
-@define-color brown_5 #ce6f8f;
-@define-color light_1 #ecf0c1;
-@define-color light_2 #ecf0c1;
-@define-color light_3 #ecf0c1;
-@define-color light_4 #ecf0c1;
-@define-color light_5 #ecf0c1;
-@define-color dark_1 #ecf0c1;
-@define-color dark_2 #ecf0c1;
-@define-color dark_3 #ecf0c1;
-@define-color dark_4 #ecf0c1;
-@define-color dark_5 #ecf0c1;
+@define-color teal_1 #00a3cc;
+@define-color orange_1 #e39400;
+@define-color gray_1 #686f9a;
+
diff --git a/build/base16-spacemacs.css b/build/base16-spacemacs.css
index 32f2ed9..3a92c1d 100644
--- a/build/base16-spacemacs.css
+++ b/build/base16-spacemacs.css
@@ -1,88 +1,37 @@
 @define-color accent_color #4f97d7;
 @define-color accent_bg_color #4f97d7;
 @define-color accent_fg_color #1f2022;
-@define-color destructive_color #f2241f;
-@define-color destructive_bg_color #f2241f;
-@define-color destructive_fg_color #1f2022;
-@define-color success_color #67b11d;
-@define-color success_bg_color #67b11d;
-@define-color success_fg_color #1f2022;
-@define-color warning_color #a31db1;
-@define-color warning_bg_color #a31db1;
-@define-color warning_fg_color #1f2022;
-@define-color error_color #f2241f;
-@define-color error_bg_color #f2241f;
-@define-color error_fg_color #1f2022;
+
 @define-color window_bg_color #1f2022;
 @define-color window_fg_color #a3a3a3;
+
 @define-color view_bg_color #1f2022;
 @define-color view_fg_color #a3a3a3;
-@define-color headerbar_bg_color #282828;
+
+@define-color headerbar_bg_color #1f2022;
 @define-color headerbar_fg_color #a3a3a3;
-@define-color headerbar_border_color rgba(0.15686275, 0.15686275, 0.15686275, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #1f2022;
+@define-color dialog_fg_color #a3a3a3;
+
+@define-color popover_bg_color #1f2022;
+@define-color popover_fg_color #a3a3a3;
+
+
 @define-color sidebar_bg_color #282828;
 @define-color sidebar_fg_color #a3a3a3;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #282828;
 @define-color card_fg_color #a3a3a3;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #282828;
-@define-color dialog_fg_color #a3a3a3;
-@define-color popover_bg_color #282828;
-@define-color popover_fg_color #a3a3a3;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #444155;
-@define-color blue_1 #4f97d7;
-@define-color blue_2 #4f97d7;
-@define-color blue_3 #4f97d7;
-@define-color blue_4 #4f97d7;
-@define-color blue_5 #4f97d7;
-@define-color green_1 #67b11d;
-@define-color green_2 #67b11d;
-@define-color green_3 #67b11d;
-@define-color green_4 #67b11d;
-@define-color green_5 #67b11d;
-@define-color yellow_1 #b1951d;
-@define-color yellow_2 #b1951d;
-@define-color yellow_3 #b1951d;
-@define-color yellow_4 #b1951d;
-@define-color yellow_5 #b1951d;
-@define-color orange_1 #ffa500;
-@define-color orange_2 #ffa500;
-@define-color orange_3 #ffa500;
-@define-color orange_4 #ffa500;
-@define-color orange_5 #ffa500;
+
+
 @define-color red_1 #f2241f;
-@define-color red_2 #f2241f;
-@define-color red_3 #f2241f;
-@define-color red_4 #f2241f;
-@define-color red_5 #f2241f;
+@define-color green_1 #67b11d;
+@define-color yellow_1 #b1951d;
+@define-color blue_1 #4f97d7;
 @define-color purple_1 #a31db1;
-@define-color purple_2 #a31db1;
-@define-color purple_3 #a31db1;
-@define-color purple_4 #a31db1;
-@define-color purple_5 #a31db1;
-@define-color brown_1 #b03060;
-@define-color brown_2 #b03060;
-@define-color brown_3 #b03060;
-@define-color brown_4 #b03060;
-@define-color brown_5 #b03060;
-@define-color light_1 #a3a3a3;
-@define-color light_2 #a3a3a3;
-@define-color light_3 #a3a3a3;
-@define-color light_4 #a3a3a3;
-@define-color light_5 #a3a3a3;
-@define-color dark_1 #a3a3a3;
-@define-color dark_2 #a3a3a3;
-@define-color dark_3 #a3a3a3;
-@define-color dark_4 #a3a3a3;
-@define-color dark_5 #a3a3a3;
+@define-color teal_1 #2d9574;
+@define-color orange_1 #ffa500;
+@define-color gray_1 #585858;
+
diff --git a/build/base16-sparky.css b/build/base16-sparky.css
index e13e620..65fd0e2 100644
--- a/build/base16-sparky.css
+++ b/build/base16-sparky.css
@@ -1,88 +1,37 @@
 @define-color accent_color #4698cb;
 @define-color accent_bg_color #4698cb;
 @define-color accent_fg_color #072b31;
-@define-color destructive_color #ff585d;
-@define-color destructive_bg_color #ff585d;
-@define-color destructive_fg_color #072b31;
-@define-color success_color #78d64b;
-@define-color success_bg_color #78d64b;
-@define-color success_fg_color #072b31;
-@define-color warning_color #d59ed7;
-@define-color warning_bg_color #d59ed7;
-@define-color warning_fg_color #072b31;
-@define-color error_color #ff585d;
-@define-color error_bg_color #ff585d;
-@define-color error_fg_color #072b31;
+
 @define-color window_bg_color #072b31;
 @define-color window_fg_color #f4f5f0;
+
 @define-color view_bg_color #072b31;
 @define-color view_fg_color #f4f5f0;
-@define-color headerbar_bg_color #00313c;
+
+@define-color headerbar_bg_color #072b31;
 @define-color headerbar_fg_color #f4f5f0;
-@define-color headerbar_border_color rgba(0.00000000, 0.19215686, 0.23529412, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #072b31;
+@define-color dialog_fg_color #f4f5f0;
+
+@define-color popover_bg_color #072b31;
+@define-color popover_fg_color #f4f5f0;
+
+
 @define-color sidebar_bg_color #00313c;
 @define-color sidebar_fg_color #f4f5f0;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #00313c;
 @define-color card_fg_color #f4f5f0;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #00313c;
-@define-color dialog_fg_color #f4f5f0;
-@define-color popover_bg_color #00313c;
-@define-color popover_fg_color #f4f5f0;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #003c46;
-@define-color blue_1 #4698cb;
-@define-color blue_2 #4698cb;
-@define-color blue_3 #4698cb;
-@define-color blue_4 #4698cb;
-@define-color blue_5 #4698cb;
-@define-color green_1 #78d64b;
-@define-color green_2 #78d64b;
-@define-color green_3 #78d64b;
-@define-color green_4 #78d64b;
-@define-color green_5 #78d64b;
-@define-color yellow_1 #fbdd40;
-@define-color yellow_2 #fbdd40;
-@define-color yellow_3 #fbdd40;
-@define-color yellow_4 #fbdd40;
-@define-color yellow_5 #fbdd40;
-@define-color orange_1 #ff8f1c;
-@define-color orange_2 #ff8f1c;
-@define-color orange_3 #ff8f1c;
-@define-color orange_4 #ff8f1c;
-@define-color orange_5 #ff8f1c;
+
+
 @define-color red_1 #ff585d;
-@define-color red_2 #ff585d;
-@define-color red_3 #ff585d;
-@define-color red_4 #ff585d;
-@define-color red_5 #ff585d;
+@define-color green_1 #78d64b;
+@define-color yellow_1 #fbdd40;
+@define-color blue_1 #4698cb;
 @define-color purple_1 #d59ed7;
-@define-color purple_2 #d59ed7;
-@define-color purple_3 #d59ed7;
-@define-color purple_4 #d59ed7;
-@define-color purple_5 #d59ed7;
-@define-color brown_1 #9b704d;
-@define-color brown_2 #9b704d;
-@define-color brown_3 #9b704d;
-@define-color brown_4 #9b704d;
-@define-color brown_5 #9b704d;
-@define-color light_1 #f4f5f0;
-@define-color light_2 #f4f5f0;
-@define-color light_3 #f4f5f0;
-@define-color light_4 #f4f5f0;
-@define-color light_5 #f4f5f0;
-@define-color dark_1 #f4f5f0;
-@define-color dark_2 #f4f5f0;
-@define-color dark_3 #f4f5f0;
-@define-color dark_4 #f4f5f0;
-@define-color dark_5 #f4f5f0;
+@define-color teal_1 #2dccd3;
+@define-color orange_1 #ff8f1c;
+@define-color gray_1 #003b49;
+
diff --git a/build/base16-standardized-dark.css b/build/base16-standardized-dark.css
index 8621b0e..ce0d488 100644
--- a/build/base16-standardized-dark.css
+++ b/build/base16-standardized-dark.css
@@ -1,88 +1,37 @@
 @define-color accent_color #00a3f2;
 @define-color accent_bg_color #00a3f2;
 @define-color accent_fg_color #222222;
-@define-color destructive_color #e15d67;
-@define-color destructive_bg_color #e15d67;
-@define-color destructive_fg_color #222222;
-@define-color success_color #5db129;
-@define-color success_bg_color #5db129;
-@define-color success_fg_color #222222;
-@define-color warning_color #b46ee0;
-@define-color warning_bg_color #b46ee0;
-@define-color warning_fg_color #222222;
-@define-color error_color #e15d67;
-@define-color error_bg_color #e15d67;
-@define-color error_fg_color #222222;
+
 @define-color window_bg_color #222222;
 @define-color window_fg_color #c0c0c0;
+
 @define-color view_bg_color #222222;
 @define-color view_fg_color #c0c0c0;
-@define-color headerbar_bg_color #303030;
+
+@define-color headerbar_bg_color #222222;
 @define-color headerbar_fg_color #c0c0c0;
-@define-color headerbar_border_color rgba(0.18823529, 0.18823529, 0.18823529, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #222222;
+@define-color dialog_fg_color #c0c0c0;
+
+@define-color popover_bg_color #222222;
+@define-color popover_fg_color #c0c0c0;
+
+
 @define-color sidebar_bg_color #303030;
 @define-color sidebar_fg_color #c0c0c0;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #303030;
 @define-color card_fg_color #c0c0c0;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #303030;
-@define-color dialog_fg_color #c0c0c0;
-@define-color popover_bg_color #303030;
-@define-color popover_fg_color #c0c0c0;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #555555;
-@define-color blue_1 #00a3f2;
-@define-color blue_2 #00a3f2;
-@define-color blue_3 #00a3f2;
-@define-color blue_4 #00a3f2;
-@define-color blue_5 #00a3f2;
-@define-color green_1 #5db129;
-@define-color green_2 #5db129;
-@define-color green_3 #5db129;
-@define-color green_4 #5db129;
-@define-color green_5 #5db129;
-@define-color yellow_1 #e1b31a;
-@define-color yellow_2 #e1b31a;
-@define-color yellow_3 #e1b31a;
-@define-color yellow_4 #e1b31a;
-@define-color yellow_5 #e1b31a;
-@define-color orange_1 #fc804e;
-@define-color orange_2 #fc804e;
-@define-color orange_3 #fc804e;
-@define-color orange_4 #fc804e;
-@define-color orange_5 #fc804e;
+
+
 @define-color red_1 #e15d67;
-@define-color red_2 #e15d67;
-@define-color red_3 #e15d67;
-@define-color red_4 #e15d67;
-@define-color red_5 #e15d67;
+@define-color green_1 #5db129;
+@define-color yellow_1 #e1b31a;
+@define-color blue_1 #00a3f2;
 @define-color purple_1 #b46ee0;
-@define-color purple_2 #b46ee0;
-@define-color purple_3 #b46ee0;
-@define-color purple_4 #b46ee0;
-@define-color purple_5 #b46ee0;
-@define-color brown_1 #b87d28;
-@define-color brown_2 #b87d28;
-@define-color brown_3 #b87d28;
-@define-color brown_4 #b87d28;
-@define-color brown_5 #b87d28;
-@define-color light_1 #c0c0c0;
-@define-color light_2 #c0c0c0;
-@define-color light_3 #c0c0c0;
-@define-color light_4 #c0c0c0;
-@define-color light_5 #c0c0c0;
-@define-color dark_1 #c0c0c0;
-@define-color dark_2 #c0c0c0;
-@define-color dark_3 #c0c0c0;
-@define-color dark_4 #c0c0c0;
-@define-color dark_5 #c0c0c0;
+@define-color teal_1 #21c992;
+@define-color orange_1 #fc804e;
+@define-color gray_1 #898989;
+
diff --git a/build/base16-standardized-light.css b/build/base16-standardized-light.css
index e027f0d..9cf2407 100644
--- a/build/base16-standardized-light.css
+++ b/build/base16-standardized-light.css
@@ -1,88 +1,37 @@
 @define-color accent_color #3173c5;
 @define-color accent_bg_color #3173c5;
 @define-color accent_fg_color #ffffff;
-@define-color destructive_color #d03e3e;
-@define-color destructive_bg_color #d03e3e;
-@define-color destructive_fg_color #ffffff;
-@define-color success_color #31861f;
-@define-color success_bg_color #31861f;
-@define-color success_fg_color #ffffff;
-@define-color warning_color #9e57c2;
-@define-color warning_bg_color #9e57c2;
-@define-color warning_fg_color #ffffff;
-@define-color error_color #d03e3e;
-@define-color error_bg_color #d03e3e;
-@define-color error_fg_color #ffffff;
+
 @define-color window_bg_color #ffffff;
 @define-color window_fg_color #444444;
+
 @define-color view_bg_color #ffffff;
 @define-color view_fg_color #444444;
-@define-color headerbar_bg_color #eeeeee;
+
+@define-color headerbar_bg_color #ffffff;
 @define-color headerbar_fg_color #444444;
-@define-color headerbar_border_color rgba(0.93333333, 0.93333333, 0.93333333, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #ffffff;
+@define-color dialog_fg_color #444444;
+
+@define-color popover_bg_color #ffffff;
+@define-color popover_fg_color #444444;
+
+
 @define-color sidebar_bg_color #eeeeee;
 @define-color sidebar_fg_color #444444;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #eeeeee;
 @define-color card_fg_color #444444;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #eeeeee;
-@define-color dialog_fg_color #444444;
-@define-color popover_bg_color #eeeeee;
-@define-color popover_fg_color #444444;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #cccccc;
-@define-color blue_1 #3173c5;
-@define-color blue_2 #3173c5;
-@define-color blue_3 #3173c5;
-@define-color blue_4 #3173c5;
-@define-color blue_5 #3173c5;
-@define-color green_1 #31861f;
-@define-color green_2 #31861f;
-@define-color green_3 #31861f;
-@define-color green_4 #31861f;
-@define-color green_5 #31861f;
-@define-color yellow_1 #ad8200;
-@define-color yellow_2 #ad8200;
-@define-color yellow_3 #ad8200;
-@define-color yellow_4 #ad8200;
-@define-color yellow_5 #ad8200;
-@define-color orange_1 #d7691d;
-@define-color orange_2 #d7691d;
-@define-color orange_3 #d7691d;
-@define-color orange_4 #d7691d;
-@define-color orange_5 #d7691d;
+
+
 @define-color red_1 #d03e3e;
-@define-color red_2 #d03e3e;
-@define-color red_3 #d03e3e;
-@define-color red_4 #d03e3e;
-@define-color red_5 #d03e3e;
+@define-color green_1 #31861f;
+@define-color yellow_1 #ad8200;
+@define-color blue_1 #3173c5;
 @define-color purple_1 #9e57c2;
-@define-color purple_2 #9e57c2;
-@define-color purple_3 #9e57c2;
-@define-color purple_4 #9e57c2;
-@define-color purple_5 #9e57c2;
-@define-color brown_1 #895025;
-@define-color brown_2 #895025;
-@define-color brown_3 #895025;
-@define-color brown_4 #895025;
-@define-color brown_5 #895025;
-@define-color light_1 #444444;
-@define-color light_2 #444444;
-@define-color light_3 #444444;
-@define-color light_4 #444444;
-@define-color light_5 #444444;
-@define-color dark_1 #444444;
-@define-color dark_2 #444444;
-@define-color dark_3 #444444;
-@define-color dark_4 #444444;
-@define-color dark_5 #444444;
+@define-color teal_1 #00998f;
+@define-color orange_1 #d7691d;
+@define-color gray_1 #767676;
+
diff --git a/build/base16-stella.css b/build/base16-stella.css
index 1771cab..da5ed46 100644
--- a/build/base16-stella.css
+++ b/build/base16-stella.css
@@ -1,88 +1,37 @@
 @define-color accent_color #a5aad4;
 @define-color accent_bg_color #a5aad4;
 @define-color accent_fg_color #2b213c;
-@define-color destructive_color #c79987;
-@define-color destructive_bg_color #c79987;
-@define-color destructive_fg_color #2b213c;
-@define-color success_color #acc79b;
-@define-color success_bg_color #acc79b;
-@define-color success_fg_color #2b213c;
-@define-color warning_color #c594ff;
-@define-color warning_bg_color #c594ff;
-@define-color warning_fg_color #2b213c;
-@define-color error_color #c79987;
-@define-color error_bg_color #c79987;
-@define-color error_fg_color #2b213c;
+
 @define-color window_bg_color #2b213c;
 @define-color window_fg_color #998bad;
+
 @define-color view_bg_color #2b213c;
 @define-color view_fg_color #998bad;
-@define-color headerbar_bg_color #362b48;
+
+@define-color headerbar_bg_color #2b213c;
 @define-color headerbar_fg_color #998bad;
-@define-color headerbar_border_color rgba(0.21176471, 0.16862745, 0.28235294, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #2b213c;
+@define-color dialog_fg_color #998bad;
+
+@define-color popover_bg_color #2b213c;
+@define-color popover_fg_color #998bad;
+
+
 @define-color sidebar_bg_color #362b48;
 @define-color sidebar_fg_color #998bad;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #362b48;
 @define-color card_fg_color #998bad;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #362b48;
-@define-color dialog_fg_color #998bad;
-@define-color popover_bg_color #362b48;
-@define-color popover_fg_color #998bad;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #4d4160;
-@define-color blue_1 #a5aad4;
-@define-color blue_2 #a5aad4;
-@define-color blue_3 #a5aad4;
-@define-color blue_4 #a5aad4;
-@define-color blue_5 #a5aad4;
-@define-color green_1 #acc79b;
-@define-color green_2 #acc79b;
-@define-color green_3 #acc79b;
-@define-color green_4 #acc79b;
-@define-color green_5 #acc79b;
-@define-color yellow_1 #c7c691;
-@define-color yellow_2 #c7c691;
-@define-color yellow_3 #c7c691;
-@define-color yellow_4 #c7c691;
-@define-color yellow_5 #c7c691;
-@define-color orange_1 #8865c6;
-@define-color orange_2 #8865c6;
-@define-color orange_3 #8865c6;
-@define-color orange_4 #8865c6;
-@define-color orange_5 #8865c6;
+
+
 @define-color red_1 #c79987;
-@define-color red_2 #c79987;
-@define-color red_3 #c79987;
-@define-color red_4 #c79987;
-@define-color red_5 #c79987;
+@define-color green_1 #acc79b;
+@define-color yellow_1 #c7c691;
+@define-color blue_1 #a5aad4;
 @define-color purple_1 #c594ff;
-@define-color purple_2 #c594ff;
-@define-color purple_3 #c594ff;
-@define-color purple_4 #c594ff;
-@define-color purple_5 #c594ff;
-@define-color brown_1 #c7ab87;
-@define-color brown_2 #c7ab87;
-@define-color brown_3 #c7ab87;
-@define-color brown_4 #c7ab87;
-@define-color brown_5 #c7ab87;
-@define-color light_1 #998bad;
-@define-color light_2 #998bad;
-@define-color light_3 #998bad;
-@define-color light_4 #998bad;
-@define-color light_5 #998bad;
-@define-color dark_1 #998bad;
-@define-color dark_2 #998bad;
-@define-color dark_3 #998bad;
-@define-color dark_4 #998bad;
-@define-color dark_5 #998bad;
+@define-color teal_1 #9bc7bf;
+@define-color orange_1 #8865c6;
+@define-color gray_1 #655978;
+
diff --git a/build/base16-still-alive.css b/build/base16-still-alive.css
index f47e574..315f639 100644
--- a/build/base16-still-alive.css
+++ b/build/base16-still-alive.css
@@ -1,88 +1,37 @@
 @define-color accent_color #365eff;
 @define-color accent_bg_color #365eff;
 @define-color accent_fg_color #f0f0f0;
-@define-color destructive_color #d80000;
-@define-color destructive_bg_color #d80000;
-@define-color destructive_fg_color #f0f0f0;
-@define-color success_color #30a860;
-@define-color success_bg_color #30a860;
-@define-color success_fg_color #f0f0f0;
-@define-color warning_color #9036ff;
-@define-color warning_bg_color #9036ff;
-@define-color warning_fg_color #f0f0f0;
-@define-color error_color #d80000;
-@define-color error_bg_color #d80000;
-@define-color error_fg_color #f0f0f0;
+
 @define-color window_bg_color #f0f0f0;
 @define-color window_fg_color #4c383b;
+
 @define-color view_bg_color #f0f0f0;
 @define-color view_fg_color #4c383b;
-@define-color headerbar_bg_color #d6d6d6;
+
+@define-color headerbar_bg_color #f0f0f0;
 @define-color headerbar_fg_color #4c383b;
-@define-color headerbar_border_color rgba(0.83921569, 0.83921569, 0.83921569, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #f0f0f0;
+@define-color dialog_fg_color #4c383b;
+
+@define-color popover_bg_color #f0f0f0;
+@define-color popover_fg_color #4c383b;
+
+
 @define-color sidebar_bg_color #d6d6d6;
 @define-color sidebar_fg_color #4c383b;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #d6d6d6;
 @define-color card_fg_color #4c383b;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #d6d6d6;
-@define-color dialog_fg_color #4c383b;
-@define-color popover_bg_color #d6d6d6;
-@define-color popover_fg_color #4c383b;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #bdbdbd;
-@define-color blue_1 #365eff;
-@define-color blue_2 #365eff;
-@define-color blue_3 #365eff;
-@define-color blue_4 #365eff;
-@define-color blue_5 #365eff;
-@define-color green_1 #30a860;
-@define-color green_2 #30a860;
-@define-color green_3 #30a860;
-@define-color green_4 #30a860;
-@define-color green_5 #30a860;
-@define-color yellow_1 #fff018;
-@define-color yellow_2 #fff018;
-@define-color yellow_3 #fff018;
-@define-color yellow_4 #fff018;
-@define-color yellow_5 #fff018;
-@define-color orange_1 #f0d848;
-@define-color orange_2 #f0d848;
-@define-color orange_3 #f0d848;
-@define-color orange_4 #f0d848;
-@define-color orange_5 #f0d848;
+
+
 @define-color red_1 #d80000;
-@define-color red_2 #d80000;
-@define-color red_3 #d80000;
-@define-color red_4 #d80000;
-@define-color red_5 #d80000;
+@define-color green_1 #30a860;
+@define-color yellow_1 #fff018;
+@define-color blue_1 #365eff;
 @define-color purple_1 #9036ff;
-@define-color purple_2 #9036ff;
-@define-color purple_3 #9036ff;
-@define-color purple_4 #9036ff;
-@define-color purple_5 #9036ff;
-@define-color brown_1 #140c0d;
-@define-color brown_2 #140c0d;
-@define-color brown_3 #140c0d;
-@define-color brown_4 #140c0d;
-@define-color brown_5 #140c0d;
-@define-color light_1 #4c383b;
-@define-color light_2 #4c383b;
-@define-color light_3 #4c383b;
-@define-color light_4 #4c383b;
-@define-color light_5 #4c383b;
-@define-color dark_1 #4c383b;
-@define-color dark_2 #4c383b;
-@define-color dark_3 #4c383b;
-@define-color dark_4 #4c383b;
-@define-color dark_5 #4c383b;
+@define-color teal_1 #36d3ff;
+@define-color orange_1 #f0d848;
+@define-color gray_1 #a3a3a3;
+
diff --git a/build/base16-summercamp.css b/build/base16-summercamp.css
index 96d5c4b..454f504 100644
--- a/build/base16-summercamp.css
+++ b/build/base16-summercamp.css
@@ -1,88 +1,37 @@
 @define-color accent_color #489bf0;
 @define-color accent_bg_color #489bf0;
 @define-color accent_fg_color #1c1810;
-@define-color destructive_color #e35142;
-@define-color destructive_bg_color #e35142;
-@define-color destructive_fg_color #1c1810;
-@define-color success_color #5ceb5a;
-@define-color success_bg_color #5ceb5a;
-@define-color success_fg_color #1c1810;
-@define-color warning_color #ff8080;
-@define-color warning_bg_color #ff8080;
-@define-color warning_fg_color #1c1810;
-@define-color error_color #e35142;
-@define-color error_bg_color #e35142;
-@define-color error_fg_color #1c1810;
+
 @define-color window_bg_color #1c1810;
 @define-color window_fg_color #736e55;
+
 @define-color view_bg_color #1c1810;
 @define-color view_fg_color #736e55;
-@define-color headerbar_bg_color #2a261c;
+
+@define-color headerbar_bg_color #1c1810;
 @define-color headerbar_fg_color #736e55;
-@define-color headerbar_border_color rgba(0.16470588, 0.14901961, 0.10980392, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #1c1810;
+@define-color dialog_fg_color #736e55;
+
+@define-color popover_bg_color #1c1810;
+@define-color popover_fg_color #736e55;
+
+
 @define-color sidebar_bg_color #2a261c;
 @define-color sidebar_fg_color #736e55;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #2a261c;
 @define-color card_fg_color #736e55;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #2a261c;
-@define-color dialog_fg_color #736e55;
-@define-color popover_bg_color #2a261c;
-@define-color popover_fg_color #736e55;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #3a3527;
-@define-color blue_1 #489bf0;
-@define-color blue_2 #489bf0;
-@define-color blue_3 #489bf0;
-@define-color blue_4 #489bf0;
-@define-color blue_5 #489bf0;
-@define-color green_1 #5ceb5a;
-@define-color green_2 #5ceb5a;
-@define-color green_3 #5ceb5a;
-@define-color green_4 #5ceb5a;
-@define-color green_5 #5ceb5a;
-@define-color yellow_1 #f2ff27;
-@define-color yellow_2 #f2ff27;
-@define-color yellow_3 #f2ff27;
-@define-color yellow_4 #f2ff27;
-@define-color yellow_5 #f2ff27;
-@define-color orange_1 #fba11b;
-@define-color orange_2 #fba11b;
-@define-color orange_3 #fba11b;
-@define-color orange_4 #fba11b;
-@define-color orange_5 #fba11b;
+
+
 @define-color red_1 #e35142;
-@define-color red_2 #e35142;
-@define-color red_3 #e35142;
-@define-color red_4 #e35142;
-@define-color red_5 #e35142;
+@define-color green_1 #5ceb5a;
+@define-color yellow_1 #f2ff27;
+@define-color blue_1 #489bf0;
 @define-color purple_1 #ff8080;
-@define-color purple_2 #ff8080;
-@define-color purple_3 #ff8080;
-@define-color purple_4 #ff8080;
-@define-color purple_5 #ff8080;
-@define-color brown_1 #f69be7;
-@define-color brown_2 #f69be7;
-@define-color brown_3 #f69be7;
-@define-color brown_4 #f69be7;
-@define-color brown_5 #f69be7;
-@define-color light_1 #736e55;
-@define-color light_2 #736e55;
-@define-color light_3 #736e55;
-@define-color light_4 #736e55;
-@define-color light_5 #736e55;
-@define-color dark_1 #736e55;
-@define-color dark_2 #736e55;
-@define-color dark_3 #736e55;
-@define-color dark_4 #736e55;
-@define-color dark_5 #736e55;
+@define-color teal_1 #5aebbc;
+@define-color orange_1 #fba11b;
+@define-color gray_1 #504b38;
+
diff --git a/build/base16-summerfruit-dark.css b/build/base16-summerfruit-dark.css
index a01a845..290273d 100644
--- a/build/base16-summerfruit-dark.css
+++ b/build/base16-summerfruit-dark.css
@@ -1,88 +1,37 @@
 @define-color accent_color #3777e6;
 @define-color accent_bg_color #3777e6;
 @define-color accent_fg_color #151515;
-@define-color destructive_color #ff0086;
-@define-color destructive_bg_color #ff0086;
-@define-color destructive_fg_color #151515;
-@define-color success_color #00c918;
-@define-color success_bg_color #00c918;
-@define-color success_fg_color #151515;
-@define-color warning_color #ad00a1;
-@define-color warning_bg_color #ad00a1;
-@define-color warning_fg_color #151515;
-@define-color error_color #ff0086;
-@define-color error_bg_color #ff0086;
-@define-color error_fg_color #151515;
+
 @define-color window_bg_color #151515;
 @define-color window_fg_color #d0d0d0;
+
 @define-color view_bg_color #151515;
 @define-color view_fg_color #d0d0d0;
-@define-color headerbar_bg_color #202020;
+
+@define-color headerbar_bg_color #151515;
 @define-color headerbar_fg_color #d0d0d0;
-@define-color headerbar_border_color rgba(0.12549020, 0.12549020, 0.12549020, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #151515;
+@define-color dialog_fg_color #d0d0d0;
+
+@define-color popover_bg_color #151515;
+@define-color popover_fg_color #d0d0d0;
+
+
 @define-color sidebar_bg_color #202020;
 @define-color sidebar_fg_color #d0d0d0;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #202020;
 @define-color card_fg_color #d0d0d0;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #202020;
-@define-color dialog_fg_color #d0d0d0;
-@define-color popover_bg_color #202020;
-@define-color popover_fg_color #d0d0d0;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #303030;
-@define-color blue_1 #3777e6;
-@define-color blue_2 #3777e6;
-@define-color blue_3 #3777e6;
-@define-color blue_4 #3777e6;
-@define-color blue_5 #3777e6;
-@define-color green_1 #00c918;
-@define-color green_2 #00c918;
-@define-color green_3 #00c918;
-@define-color green_4 #00c918;
-@define-color green_5 #00c918;
-@define-color yellow_1 #aba800;
-@define-color yellow_2 #aba800;
-@define-color yellow_3 #aba800;
-@define-color yellow_4 #aba800;
-@define-color yellow_5 #aba800;
-@define-color orange_1 #fd8900;
-@define-color orange_2 #fd8900;
-@define-color orange_3 #fd8900;
-@define-color orange_4 #fd8900;
-@define-color orange_5 #fd8900;
+
+
 @define-color red_1 #ff0086;
-@define-color red_2 #ff0086;
-@define-color red_3 #ff0086;
-@define-color red_4 #ff0086;
-@define-color red_5 #ff0086;
+@define-color green_1 #00c918;
+@define-color yellow_1 #aba800;
+@define-color blue_1 #3777e6;
 @define-color purple_1 #ad00a1;
-@define-color purple_2 #ad00a1;
-@define-color purple_3 #ad00a1;
-@define-color purple_4 #ad00a1;
-@define-color purple_5 #ad00a1;
-@define-color brown_1 #cc6633;
-@define-color brown_2 #cc6633;
-@define-color brown_3 #cc6633;
-@define-color brown_4 #cc6633;
-@define-color brown_5 #cc6633;
-@define-color light_1 #d0d0d0;
-@define-color light_2 #d0d0d0;
-@define-color light_3 #d0d0d0;
-@define-color light_4 #d0d0d0;
-@define-color light_5 #d0d0d0;
-@define-color dark_1 #d0d0d0;
-@define-color dark_2 #d0d0d0;
-@define-color dark_3 #d0d0d0;
-@define-color dark_4 #d0d0d0;
-@define-color dark_5 #d0d0d0;
+@define-color teal_1 #1faaaa;
+@define-color orange_1 #fd8900;
+@define-color gray_1 #505050;
+
diff --git a/build/base16-summerfruit-light.css b/build/base16-summerfruit-light.css
index 433e5f6..135692e 100644
--- a/build/base16-summerfruit-light.css
+++ b/build/base16-summerfruit-light.css
@@ -1,88 +1,37 @@
 @define-color accent_color #3777e6;
 @define-color accent_bg_color #3777e6;
 @define-color accent_fg_color #ffffff;
-@define-color destructive_color #ff0086;
-@define-color destructive_bg_color #ff0086;
-@define-color destructive_fg_color #ffffff;
-@define-color success_color #00c918;
-@define-color success_bg_color #00c918;
-@define-color success_fg_color #ffffff;
-@define-color warning_color #ad00a1;
-@define-color warning_bg_color #ad00a1;
-@define-color warning_fg_color #ffffff;
-@define-color error_color #ff0086;
-@define-color error_bg_color #ff0086;
-@define-color error_fg_color #ffffff;
+
 @define-color window_bg_color #ffffff;
 @define-color window_fg_color #101010;
+
 @define-color view_bg_color #ffffff;
 @define-color view_fg_color #101010;
-@define-color headerbar_bg_color #e0e0e0;
+
+@define-color headerbar_bg_color #ffffff;
 @define-color headerbar_fg_color #101010;
-@define-color headerbar_border_color rgba(0.87843137, 0.87843137, 0.87843137, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #ffffff;
+@define-color dialog_fg_color #101010;
+
+@define-color popover_bg_color #ffffff;
+@define-color popover_fg_color #101010;
+
+
 @define-color sidebar_bg_color #e0e0e0;
 @define-color sidebar_fg_color #101010;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #e0e0e0;
 @define-color card_fg_color #101010;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #e0e0e0;
-@define-color dialog_fg_color #101010;
-@define-color popover_bg_color #e0e0e0;
-@define-color popover_fg_color #101010;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #d0d0d0;
-@define-color blue_1 #3777e6;
-@define-color blue_2 #3777e6;
-@define-color blue_3 #3777e6;
-@define-color blue_4 #3777e6;
-@define-color blue_5 #3777e6;
-@define-color green_1 #00c918;
-@define-color green_2 #00c918;
-@define-color green_3 #00c918;
-@define-color green_4 #00c918;
-@define-color green_5 #00c918;
-@define-color yellow_1 #aba800;
-@define-color yellow_2 #aba800;
-@define-color yellow_3 #aba800;
-@define-color yellow_4 #aba800;
-@define-color yellow_5 #aba800;
-@define-color orange_1 #fd8900;
-@define-color orange_2 #fd8900;
-@define-color orange_3 #fd8900;
-@define-color orange_4 #fd8900;
-@define-color orange_5 #fd8900;
+
+
 @define-color red_1 #ff0086;
-@define-color red_2 #ff0086;
-@define-color red_3 #ff0086;
-@define-color red_4 #ff0086;
-@define-color red_5 #ff0086;
+@define-color green_1 #00c918;
+@define-color yellow_1 #aba800;
+@define-color blue_1 #3777e6;
 @define-color purple_1 #ad00a1;
-@define-color purple_2 #ad00a1;
-@define-color purple_3 #ad00a1;
-@define-color purple_4 #ad00a1;
-@define-color purple_5 #ad00a1;
-@define-color brown_1 #cc6633;
-@define-color brown_2 #cc6633;
-@define-color brown_3 #cc6633;
-@define-color brown_4 #cc6633;
-@define-color brown_5 #cc6633;
-@define-color light_1 #101010;
-@define-color light_2 #101010;
-@define-color light_3 #101010;
-@define-color light_4 #101010;
-@define-color light_5 #101010;
-@define-color dark_1 #101010;
-@define-color dark_2 #101010;
-@define-color dark_3 #101010;
-@define-color dark_4 #101010;
-@define-color dark_5 #101010;
+@define-color teal_1 #1faaaa;
+@define-color orange_1 #fd8900;
+@define-color gray_1 #b0b0b0;
+
diff --git a/build/base16-swamp-dark.css b/build/base16-swamp-dark.css
index 71a9057..244d915 100644
--- a/build/base16-swamp-dark.css
+++ b/build/base16-swamp-dark.css
@@ -1,88 +1,37 @@
 @define-color accent_color #c1666b;
 @define-color accent_bg_color #c1666b;
 @define-color accent_fg_color #242015;
-@define-color destructive_color #db930d;
-@define-color destructive_bg_color #db930d;
-@define-color destructive_fg_color #242015;
-@define-color success_color #7a7653;
-@define-color success_bg_color #7a7653;
-@define-color success_fg_color #242015;
-@define-color warning_color #91506c;
-@define-color warning_bg_color #91506c;
-@define-color warning_fg_color #242015;
-@define-color error_color #db930d;
-@define-color error_bg_color #db930d;
-@define-color error_fg_color #242015;
+
 @define-color window_bg_color #242015;
 @define-color window_fg_color #d2c3a4;
+
 @define-color view_bg_color #242015;
 @define-color view_fg_color #d2c3a4;
-@define-color headerbar_bg_color #3a3124;
+
+@define-color headerbar_bg_color #242015;
 @define-color headerbar_fg_color #d2c3a4;
-@define-color headerbar_border_color rgba(0.22745098, 0.19215686, 0.14117647, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #242015;
+@define-color dialog_fg_color #d2c3a4;
+
+@define-color popover_bg_color #242015;
+@define-color popover_fg_color #d2c3a4;
+
+
 @define-color sidebar_bg_color #3a3124;
 @define-color sidebar_fg_color #d2c3a4;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #3a3124;
 @define-color card_fg_color #d2c3a4;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #3a3124;
-@define-color dialog_fg_color #d2c3a4;
-@define-color popover_bg_color #3a3124;
-@define-color popover_fg_color #d2c3a4;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #4d3f32;
-@define-color blue_1 #c1666b;
-@define-color blue_2 #c1666b;
-@define-color blue_3 #c1666b;
-@define-color blue_4 #c1666b;
-@define-color blue_5 #c1666b;
-@define-color green_1 #7a7653;
-@define-color green_2 #7a7653;
-@define-color green_3 #7a7653;
-@define-color green_4 #7a7653;
-@define-color green_5 #7a7653;
-@define-color yellow_1 #a82d56;
-@define-color yellow_2 #a82d56;
-@define-color yellow_3 #a82d56;
-@define-color yellow_4 #a82d56;
-@define-color yellow_5 #a82d56;
-@define-color orange_1 #ebe0bb;
-@define-color orange_2 #ebe0bb;
-@define-color orange_3 #ebe0bb;
-@define-color orange_4 #ebe0bb;
-@define-color orange_5 #ebe0bb;
+
+
 @define-color red_1 #db930d;
-@define-color red_2 #db930d;
-@define-color red_3 #db930d;
-@define-color red_4 #db930d;
-@define-color red_5 #db930d;
+@define-color green_1 #7a7653;
+@define-color yellow_1 #a82d56;
+@define-color blue_1 #c1666b;
 @define-color purple_1 #91506c;
-@define-color purple_2 #91506c;
-@define-color purple_3 #91506c;
-@define-color purple_4 #91506c;
-@define-color purple_5 #91506c;
-@define-color brown_1 #61a0a8;
-@define-color brown_2 #61a0a8;
-@define-color brown_3 #61a0a8;
-@define-color brown_4 #61a0a8;
-@define-color brown_5 #61a0a8;
-@define-color light_1 #d2c3a4;
-@define-color light_2 #d2c3a4;
-@define-color light_3 #d2c3a4;
-@define-color light_4 #d2c3a4;
-@define-color light_5 #d2c3a4;
-@define-color dark_1 #d2c3a4;
-@define-color dark_2 #d2c3a4;
-@define-color dark_3 #d2c3a4;
-@define-color dark_4 #d2c3a4;
-@define-color dark_5 #d2c3a4;
+@define-color teal_1 #db930d;
+@define-color orange_1 #ebe0bb;
+@define-color gray_1 #5f4e41;
+
diff --git a/build/base16-swamp-light.css b/build/base16-swamp-light.css
index 025e438..0f297e0 100644
--- a/build/base16-swamp-light.css
+++ b/build/base16-swamp-light.css
@@ -1,88 +1,37 @@
 @define-color accent_color #bf7979;
 @define-color accent_bg_color #bf7979;
 @define-color accent_fg_color #f1e3d1;
-@define-color destructive_color #d09700;
-@define-color destructive_bg_color #d09700;
-@define-color destructive_fg_color #f1e3d1;
-@define-color success_color #908d6a;
-@define-color success_bg_color #908d6a;
-@define-color success_fg_color #f1e3d1;
-@define-color warning_color #9e5581;
-@define-color warning_bg_color #9e5581;
-@define-color warning_fg_color #f1e3d1;
-@define-color error_color #d09700;
-@define-color error_bg_color #d09700;
-@define-color error_fg_color #f1e3d1;
+
 @define-color window_bg_color #f1e3d1;
 @define-color window_fg_color #64513e;
+
 @define-color view_bg_color #f1e3d1;
 @define-color view_fg_color #64513e;
-@define-color headerbar_bg_color #ddcebc;
+
+@define-color headerbar_bg_color #f1e3d1;
 @define-color headerbar_fg_color #64513e;
-@define-color headerbar_border_color rgba(0.86666667, 0.80784314, 0.73725490, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #f1e3d1;
+@define-color dialog_fg_color #64513e;
+
+@define-color popover_bg_color #f1e3d1;
+@define-color popover_fg_color #64513e;
+
+
 @define-color sidebar_bg_color #ddcebc;
 @define-color sidebar_fg_color #64513e;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #ddcebc;
 @define-color card_fg_color #64513e;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #ddcebc;
-@define-color dialog_fg_color #64513e;
-@define-color popover_bg_color #ddcebc;
-@define-color popover_fg_color #64513e;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #c9b9a7;
-@define-color blue_1 #bf7979;
-@define-color blue_2 #bf7979;
-@define-color blue_3 #bf7979;
-@define-color blue_4 #bf7979;
-@define-color blue_5 #bf7979;
-@define-color green_1 #908d6a;
-@define-color green_2 #908d6a;
-@define-color green_3 #908d6a;
-@define-color green_4 #908d6a;
-@define-color green_5 #908d6a;
-@define-color yellow_1 #993333;
-@define-color yellow_2 #993333;
-@define-color yellow_3 #993333;
-@define-color yellow_4 #993333;
-@define-color yellow_5 #993333;
-@define-color orange_1 #64513e;
-@define-color orange_2 #64513e;
-@define-color orange_3 #64513e;
-@define-color orange_4 #64513e;
-@define-color orange_5 #64513e;
+
+
 @define-color red_1 #d09700;
-@define-color red_2 #d09700;
-@define-color red_3 #d09700;
-@define-color red_4 #d09700;
-@define-color red_5 #d09700;
+@define-color green_1 #908d6a;
+@define-color yellow_1 #993333;
+@define-color blue_1 #bf7979;
 @define-color purple_1 #9e5581;
-@define-color purple_2 #9e5581;
-@define-color purple_3 #9e5581;
-@define-color purple_4 #9e5581;
-@define-color purple_5 #9e5581;
-@define-color brown_1 #75858c;
-@define-color brown_2 #75858c;
-@define-color brown_3 #75858c;
-@define-color brown_4 #75858c;
-@define-color brown_5 #75858c;
-@define-color light_1 #64513e;
-@define-color light_2 #64513e;
-@define-color light_3 #64513e;
-@define-color light_4 #64513e;
-@define-color light_5 #64513e;
-@define-color dark_1 #64513e;
-@define-color dark_2 #64513e;
-@define-color dark_3 #64513e;
-@define-color dark_4 #64513e;
-@define-color dark_5 #64513e;
+@define-color teal_1 #d09700;
+@define-color orange_1 #64513e;
+@define-color gray_1 #b5a492;
+
diff --git a/build/base16-synth-midnight-dark.css b/build/base16-synth-midnight-dark.css
index 48b8d01..d236b50 100644
--- a/build/base16-synth-midnight-dark.css
+++ b/build/base16-synth-midnight-dark.css
@@ -1,88 +1,37 @@
 @define-color accent_color #03aeff;
 @define-color accent_bg_color #03aeff;
 @define-color accent_fg_color #050608;
-@define-color destructive_color #b53b50;
-@define-color destructive_bg_color #b53b50;
-@define-color destructive_fg_color #050608;
-@define-color success_color #06ea61;
-@define-color success_bg_color #06ea61;
-@define-color success_fg_color #050608;
-@define-color warning_color #ea5ce2;
-@define-color warning_bg_color #ea5ce2;
-@define-color warning_fg_color #050608;
-@define-color error_color #b53b50;
-@define-color error_bg_color #b53b50;
-@define-color error_fg_color #050608;
+
 @define-color window_bg_color #050608;
 @define-color window_fg_color #c1c3c4;
+
 @define-color view_bg_color #050608;
 @define-color view_fg_color #c1c3c4;
-@define-color headerbar_bg_color #1a1b1c;
+
+@define-color headerbar_bg_color #050608;
 @define-color headerbar_fg_color #c1c3c4;
-@define-color headerbar_border_color rgba(0.10196078, 0.10588235, 0.10980392, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #050608;
+@define-color dialog_fg_color #c1c3c4;
+
+@define-color popover_bg_color #050608;
+@define-color popover_fg_color #c1c3c4;
+
+
 @define-color sidebar_bg_color #1a1b1c;
 @define-color sidebar_fg_color #c1c3c4;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #1a1b1c;
 @define-color card_fg_color #c1c3c4;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #1a1b1c;
-@define-color dialog_fg_color #c1c3c4;
-@define-color popover_bg_color #1a1b1c;
-@define-color popover_fg_color #c1c3c4;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #28292a;
-@define-color blue_1 #03aeff;
-@define-color blue_2 #03aeff;
-@define-color blue_3 #03aeff;
-@define-color blue_4 #03aeff;
-@define-color blue_5 #03aeff;
-@define-color green_1 #06ea61;
-@define-color green_2 #06ea61;
-@define-color green_3 #06ea61;
-@define-color green_4 #06ea61;
-@define-color green_5 #06ea61;
-@define-color yellow_1 #c9d364;
-@define-color yellow_2 #c9d364;
-@define-color yellow_3 #c9d364;
-@define-color yellow_4 #c9d364;
-@define-color yellow_5 #c9d364;
-@define-color orange_1 #ea770d;
-@define-color orange_2 #ea770d;
-@define-color orange_3 #ea770d;
-@define-color orange_4 #ea770d;
-@define-color orange_5 #ea770d;
+
+
 @define-color red_1 #b53b50;
-@define-color red_2 #b53b50;
-@define-color red_3 #b53b50;
-@define-color red_4 #b53b50;
-@define-color red_5 #b53b50;
+@define-color green_1 #06ea61;
+@define-color yellow_1 #c9d364;
+@define-color blue_1 #03aeff;
 @define-color purple_1 #ea5ce2;
-@define-color purple_2 #ea5ce2;
-@define-color purple_3 #ea5ce2;
-@define-color purple_4 #ea5ce2;
-@define-color purple_5 #ea5ce2;
-@define-color brown_1 #cd6320;
-@define-color brown_2 #cd6320;
-@define-color brown_3 #cd6320;
-@define-color brown_4 #cd6320;
-@define-color brown_5 #cd6320;
-@define-color light_1 #c1c3c4;
-@define-color light_2 #c1c3c4;
-@define-color light_3 #c1c3c4;
-@define-color light_4 #c1c3c4;
-@define-color light_5 #c1c3c4;
-@define-color dark_1 #c1c3c4;
-@define-color dark_2 #c1c3c4;
-@define-color dark_3 #c1c3c4;
-@define-color dark_4 #c1c3c4;
-@define-color dark_5 #c1c3c4;
+@define-color teal_1 #42fff9;
+@define-color orange_1 #ea770d;
+@define-color gray_1 #474849;
+
diff --git a/build/base16-synth-midnight-light.css b/build/base16-synth-midnight-light.css
index f8b3b4a..9f6940b 100644
--- a/build/base16-synth-midnight-light.css
+++ b/build/base16-synth-midnight-light.css
@@ -1,88 +1,37 @@
 @define-color accent_color #03aeff;
 @define-color accent_bg_color #03aeff;
 @define-color accent_fg_color #dddfe0;
-@define-color destructive_color #b53b50;
-@define-color destructive_bg_color #b53b50;
-@define-color destructive_fg_color #dddfe0;
-@define-color success_color #06ea61;
-@define-color success_bg_color #06ea61;
-@define-color success_fg_color #dddfe0;
-@define-color warning_color #ea5ce2;
-@define-color warning_bg_color #ea5ce2;
-@define-color warning_fg_color #dddfe0;
-@define-color error_color #b53b50;
-@define-color error_bg_color #b53b50;
-@define-color error_fg_color #dddfe0;
+
 @define-color window_bg_color #dddfe0;
 @define-color window_fg_color #28292a;
+
 @define-color view_bg_color #dddfe0;
 @define-color view_fg_color #28292a;
-@define-color headerbar_bg_color #cfd1d2;
+
+@define-color headerbar_bg_color #dddfe0;
 @define-color headerbar_fg_color #28292a;
-@define-color headerbar_border_color rgba(0.81176471, 0.81960784, 0.82352941, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #dddfe0;
+@define-color dialog_fg_color #28292a;
+
+@define-color popover_bg_color #dddfe0;
+@define-color popover_fg_color #28292a;
+
+
 @define-color sidebar_bg_color #cfd1d2;
 @define-color sidebar_fg_color #28292a;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #cfd1d2;
 @define-color card_fg_color #28292a;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #cfd1d2;
-@define-color dialog_fg_color #28292a;
-@define-color popover_bg_color #cfd1d2;
-@define-color popover_fg_color #28292a;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #c1c3c4;
-@define-color blue_1 #03aeff;
-@define-color blue_2 #03aeff;
-@define-color blue_3 #03aeff;
-@define-color blue_4 #03aeff;
-@define-color blue_5 #03aeff;
-@define-color green_1 #06ea61;
-@define-color green_2 #06ea61;
-@define-color green_3 #06ea61;
-@define-color green_4 #06ea61;
-@define-color green_5 #06ea61;
-@define-color yellow_1 #c9d364;
-@define-color yellow_2 #c9d364;
-@define-color yellow_3 #c9d364;
-@define-color yellow_4 #c9d364;
-@define-color yellow_5 #c9d364;
-@define-color orange_1 #ea770d;
-@define-color orange_2 #ea770d;
-@define-color orange_3 #ea770d;
-@define-color orange_4 #ea770d;
-@define-color orange_5 #ea770d;
+
+
 @define-color red_1 #b53b50;
-@define-color red_2 #b53b50;
-@define-color red_3 #b53b50;
-@define-color red_4 #b53b50;
-@define-color red_5 #b53b50;
+@define-color green_1 #06ea61;
+@define-color yellow_1 #c9d364;
+@define-color blue_1 #03aeff;
 @define-color purple_1 #ea5ce2;
-@define-color purple_2 #ea5ce2;
-@define-color purple_3 #ea5ce2;
-@define-color purple_4 #ea5ce2;
-@define-color purple_5 #ea5ce2;
-@define-color brown_1 #cd6320;
-@define-color brown_2 #cd6320;
-@define-color brown_3 #cd6320;
-@define-color brown_4 #cd6320;
-@define-color brown_5 #cd6320;
-@define-color light_1 #28292a;
-@define-color light_2 #28292a;
-@define-color light_3 #28292a;
-@define-color light_4 #28292a;
-@define-color light_5 #28292a;
-@define-color dark_1 #28292a;
-@define-color dark_2 #28292a;
-@define-color dark_3 #28292a;
-@define-color dark_4 #28292a;
-@define-color dark_5 #28292a;
+@define-color teal_1 #42fff9;
+@define-color orange_1 #ea770d;
+@define-color gray_1 #a3a5a6;
+
diff --git a/build/base16-tango.css b/build/base16-tango.css
index 910b672..1d4f41c 100644
--- a/build/base16-tango.css
+++ b/build/base16-tango.css
@@ -1,88 +1,37 @@
 @define-color accent_color #3465a4;
 @define-color accent_bg_color #3465a4;
 @define-color accent_fg_color #2e3436;
-@define-color destructive_color #cc0000;
-@define-color destructive_bg_color #cc0000;
-@define-color destructive_fg_color #2e3436;
-@define-color success_color #4e9a06;
-@define-color success_bg_color #4e9a06;
-@define-color success_fg_color #2e3436;
-@define-color warning_color #75507b;
-@define-color warning_bg_color #75507b;
-@define-color warning_fg_color #2e3436;
-@define-color error_color #cc0000;
-@define-color error_bg_color #cc0000;
-@define-color error_fg_color #2e3436;
+
 @define-color window_bg_color #2e3436;
 @define-color window_fg_color #d3d7cf;
+
 @define-color view_bg_color #2e3436;
 @define-color view_fg_color #d3d7cf;
-@define-color headerbar_bg_color #8ae234;
+
+@define-color headerbar_bg_color #2e3436;
 @define-color headerbar_fg_color #d3d7cf;
-@define-color headerbar_border_color rgba(0.54117647, 0.88627451, 0.20392157, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #2e3436;
+@define-color dialog_fg_color #d3d7cf;
+
+@define-color popover_bg_color #2e3436;
+@define-color popover_fg_color #d3d7cf;
+
+
 @define-color sidebar_bg_color #8ae234;
 @define-color sidebar_fg_color #d3d7cf;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #8ae234;
 @define-color card_fg_color #d3d7cf;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #8ae234;
-@define-color dialog_fg_color #d3d7cf;
-@define-color popover_bg_color #8ae234;
-@define-color popover_fg_color #d3d7cf;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #fce94f;
-@define-color blue_1 #3465a4;
-@define-color blue_2 #3465a4;
-@define-color blue_3 #3465a4;
-@define-color blue_4 #3465a4;
-@define-color blue_5 #3465a4;
-@define-color green_1 #4e9a06;
-@define-color green_2 #4e9a06;
-@define-color green_3 #4e9a06;
-@define-color green_4 #4e9a06;
-@define-color green_5 #4e9a06;
-@define-color yellow_1 #c4a000;
-@define-color yellow_2 #c4a000;
-@define-color yellow_3 #c4a000;
-@define-color yellow_4 #c4a000;
-@define-color yellow_5 #c4a000;
-@define-color orange_1 #ef2929;
-@define-color orange_2 #ef2929;
-@define-color orange_3 #ef2929;
-@define-color orange_4 #ef2929;
-@define-color orange_5 #ef2929;
+
+
 @define-color red_1 #cc0000;
-@define-color red_2 #cc0000;
-@define-color red_3 #cc0000;
-@define-color red_4 #cc0000;
-@define-color red_5 #cc0000;
+@define-color green_1 #4e9a06;
+@define-color yellow_1 #c4a000;
+@define-color blue_1 #3465a4;
 @define-color purple_1 #75507b;
-@define-color purple_2 #75507b;
-@define-color purple_3 #75507b;
-@define-color purple_4 #75507b;
-@define-color purple_5 #75507b;
-@define-color brown_1 #34e2e2;
-@define-color brown_2 #34e2e2;
-@define-color brown_3 #34e2e2;
-@define-color brown_4 #34e2e2;
-@define-color brown_5 #34e2e2;
-@define-color light_1 #d3d7cf;
-@define-color light_2 #d3d7cf;
-@define-color light_3 #d3d7cf;
-@define-color light_4 #d3d7cf;
-@define-color light_5 #d3d7cf;
-@define-color dark_1 #d3d7cf;
-@define-color dark_2 #d3d7cf;
-@define-color dark_3 #d3d7cf;
-@define-color dark_4 #d3d7cf;
-@define-color dark_5 #d3d7cf;
+@define-color teal_1 #06989a;
+@define-color orange_1 #ef2929;
+@define-color gray_1 #555753;
+
diff --git a/build/base16-tarot.css b/build/base16-tarot.css
index 5e1d815..70a55aa 100644
--- a/build/base16-tarot.css
+++ b/build/base16-tarot.css
@@ -1,88 +1,37 @@
 @define-color accent_color #6e6080;
 @define-color accent_bg_color #6e6080;
 @define-color accent_fg_color #0e091d;
-@define-color destructive_color #c53253;
-@define-color destructive_bg_color #c53253;
-@define-color destructive_fg_color #0e091d;
-@define-color success_color #a68e5a;
-@define-color success_bg_color #a68e5a;
-@define-color success_fg_color #0e091d;
-@define-color warning_color #a45782;
-@define-color warning_bg_color #a45782;
-@define-color warning_fg_color #0e091d;
-@define-color error_color #c53253;
-@define-color error_bg_color #c53253;
-@define-color error_fg_color #0e091d;
+
 @define-color window_bg_color #0e091d;
 @define-color window_fg_color #aa556f;
+
 @define-color view_bg_color #0e091d;
 @define-color view_fg_color #aa556f;
-@define-color headerbar_bg_color #2a153c;
+
+@define-color headerbar_bg_color #0e091d;
 @define-color headerbar_fg_color #aa556f;
-@define-color headerbar_border_color rgba(0.16470588, 0.08235294, 0.23529412, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #0e091d;
+@define-color dialog_fg_color #aa556f;
+
+@define-color popover_bg_color #0e091d;
+@define-color popover_fg_color #aa556f;
+
+
 @define-color sidebar_bg_color #2a153c;
 @define-color sidebar_fg_color #aa556f;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #2a153c;
 @define-color card_fg_color #aa556f;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #2a153c;
-@define-color dialog_fg_color #aa556f;
-@define-color popover_bg_color #2a153c;
-@define-color popover_fg_color #aa556f;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #4b2054;
-@define-color blue_1 #6e6080;
-@define-color blue_2 #6e6080;
-@define-color blue_3 #6e6080;
-@define-color blue_4 #6e6080;
-@define-color blue_5 #6e6080;
-@define-color green_1 #a68e5a;
-@define-color green_2 #a68e5a;
-@define-color green_3 #a68e5a;
-@define-color green_4 #a68e5a;
-@define-color green_5 #a68e5a;
-@define-color yellow_1 #ff6565;
-@define-color yellow_2 #ff6565;
-@define-color yellow_3 #ff6565;
-@define-color yellow_4 #ff6565;
-@define-color yellow_5 #ff6565;
-@define-color orange_1 #ea4d60;
-@define-color orange_2 #ea4d60;
-@define-color orange_3 #ea4d60;
-@define-color orange_4 #ea4d60;
-@define-color orange_5 #ea4d60;
+
+
 @define-color red_1 #c53253;
-@define-color red_2 #c53253;
-@define-color red_3 #c53253;
-@define-color red_4 #c53253;
-@define-color red_5 #c53253;
+@define-color green_1 #a68e5a;
+@define-color yellow_1 #ff6565;
+@define-color blue_1 #6e6080;
 @define-color purple_1 #a45782;
-@define-color purple_2 #a45782;
-@define-color purple_3 #a45782;
-@define-color purple_4 #a45782;
-@define-color purple_5 #a45782;
-@define-color brown_1 #984d51;
-@define-color brown_2 #984d51;
-@define-color brown_3 #984d51;
-@define-color brown_4 #984d51;
-@define-color brown_5 #984d51;
-@define-color light_1 #aa556f;
-@define-color light_2 #aa556f;
-@define-color light_3 #aa556f;
-@define-color light_4 #aa556f;
-@define-color light_5 #aa556f;
-@define-color dark_1 #aa556f;
-@define-color dark_2 #aa556f;
-@define-color dark_3 #aa556f;
-@define-color dark_4 #aa556f;
-@define-color dark_5 #aa556f;
+@define-color teal_1 #8c9785;
+@define-color orange_1 #ea4d60;
+@define-color gray_1 #74316b;
+
diff --git a/build/base16-tender.css b/build/base16-tender.css
index e77b4c5..870faf9 100644
--- a/build/base16-tender.css
+++ b/build/base16-tender.css
@@ -1,88 +1,37 @@
 @define-color accent_color #b3deef;
 @define-color accent_bg_color #b3deef;
 @define-color accent_fg_color #282828;
-@define-color destructive_color #f43753;
-@define-color destructive_bg_color #f43753;
-@define-color destructive_fg_color #282828;
-@define-color success_color #c9d05c;
-@define-color success_bg_color #c9d05c;
-@define-color success_fg_color #282828;
-@define-color warning_color #d3b987;
-@define-color warning_bg_color #d3b987;
-@define-color warning_fg_color #282828;
-@define-color error_color #f43753;
-@define-color error_bg_color #f43753;
-@define-color error_fg_color #282828;
+
 @define-color window_bg_color #282828;
 @define-color window_fg_color #eeeeee;
+
 @define-color view_bg_color #282828;
 @define-color view_fg_color #eeeeee;
-@define-color headerbar_bg_color #383838;
+
+@define-color headerbar_bg_color #282828;
 @define-color headerbar_fg_color #eeeeee;
-@define-color headerbar_border_color rgba(0.21960784, 0.21960784, 0.21960784, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #282828;
+@define-color dialog_fg_color #eeeeee;
+
+@define-color popover_bg_color #282828;
+@define-color popover_fg_color #eeeeee;
+
+
 @define-color sidebar_bg_color #383838;
 @define-color sidebar_fg_color #eeeeee;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #383838;
 @define-color card_fg_color #eeeeee;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #383838;
-@define-color dialog_fg_color #eeeeee;
-@define-color popover_bg_color #383838;
-@define-color popover_fg_color #eeeeee;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #484848;
-@define-color blue_1 #b3deef;
-@define-color blue_2 #b3deef;
-@define-color blue_3 #b3deef;
-@define-color blue_4 #b3deef;
-@define-color blue_5 #b3deef;
-@define-color green_1 #c9d05c;
-@define-color green_2 #c9d05c;
-@define-color green_3 #c9d05c;
-@define-color green_4 #c9d05c;
-@define-color green_5 #c9d05c;
-@define-color yellow_1 #ffc24b;
-@define-color yellow_2 #ffc24b;
-@define-color yellow_3 #ffc24b;
-@define-color yellow_4 #ffc24b;
-@define-color yellow_5 #ffc24b;
-@define-color orange_1 #dc9656;
-@define-color orange_2 #dc9656;
-@define-color orange_3 #dc9656;
-@define-color orange_4 #dc9656;
-@define-color orange_5 #dc9656;
+
+
 @define-color red_1 #f43753;
-@define-color red_2 #f43753;
-@define-color red_3 #f43753;
-@define-color red_4 #f43753;
-@define-color red_5 #f43753;
+@define-color green_1 #c9d05c;
+@define-color yellow_1 #ffc24b;
+@define-color blue_1 #b3deef;
 @define-color purple_1 #d3b987;
-@define-color purple_2 #d3b987;
-@define-color purple_3 #d3b987;
-@define-color purple_4 #d3b987;
-@define-color purple_5 #d3b987;
-@define-color brown_1 #a16946;
-@define-color brown_2 #a16946;
-@define-color brown_3 #a16946;
-@define-color brown_4 #a16946;
-@define-color brown_5 #a16946;
-@define-color light_1 #eeeeee;
-@define-color light_2 #eeeeee;
-@define-color light_3 #eeeeee;
-@define-color light_4 #eeeeee;
-@define-color light_5 #eeeeee;
-@define-color dark_1 #eeeeee;
-@define-color dark_2 #eeeeee;
-@define-color dark_3 #eeeeee;
-@define-color dark_4 #eeeeee;
-@define-color dark_5 #eeeeee;
+@define-color teal_1 #73cef4;
+@define-color orange_1 #dc9656;
+@define-color gray_1 #4c4c4c;
+
diff --git a/build/base16-terracotta-dark.css b/build/base16-terracotta-dark.css
index f4d388a..66ecb38 100644
--- a/build/base16-terracotta-dark.css
+++ b/build/base16-terracotta-dark.css
@@ -1,88 +1,37 @@
 @define-color accent_color #b0a4c3;
 @define-color accent_bg_color #b0a4c3;
 @define-color accent_fg_color #241d1a;
-@define-color destructive_color #f6998f;
-@define-color destructive_bg_color #f6998f;
-@define-color destructive_fg_color #241d1a;
-@define-color success_color #b6c68a;
-@define-color success_bg_color #b6c68a;
-@define-color success_fg_color #241d1a;
-@define-color warning_color #d8a2b0;
-@define-color warning_bg_color #d8a2b0;
-@define-color warning_fg_color #241d1a;
-@define-color error_color #f6998f;
-@define-color error_bg_color #f6998f;
-@define-color error_fg_color #241d1a;
+
 @define-color window_bg_color #241d1a;
 @define-color window_fg_color #b8a59d;
+
 @define-color view_bg_color #241d1a;
 @define-color view_fg_color #b8a59d;
-@define-color headerbar_bg_color #362b27;
+
+@define-color headerbar_bg_color #241d1a;
 @define-color headerbar_fg_color #b8a59d;
-@define-color headerbar_border_color rgba(0.21176471, 0.16862745, 0.15294118, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #241d1a;
+@define-color dialog_fg_color #b8a59d;
+
+@define-color popover_bg_color #241d1a;
+@define-color popover_fg_color #b8a59d;
+
+
 @define-color sidebar_bg_color #362b27;
 @define-color sidebar_fg_color #b8a59d;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #362b27;
 @define-color card_fg_color #b8a59d;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #362b27;
-@define-color dialog_fg_color #b8a59d;
-@define-color popover_bg_color #362b27;
-@define-color popover_fg_color #b8a59d;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #473933;
-@define-color blue_1 #b0a4c3;
-@define-color blue_2 #b0a4c3;
-@define-color blue_3 #b0a4c3;
-@define-color blue_4 #b0a4c3;
-@define-color blue_5 #b0a4c3;
-@define-color green_1 #b6c68a;
-@define-color green_2 #b6c68a;
-@define-color green_3 #b6c68a;
-@define-color green_4 #b6c68a;
-@define-color green_5 #b6c68a;
-@define-color yellow_1 #ffc37a;
-@define-color yellow_2 #ffc37a;
-@define-color yellow_3 #ffc37a;
-@define-color yellow_4 #ffc37a;
-@define-color yellow_5 #ffc37a;
-@define-color orange_1 #ffa888;
-@define-color orange_2 #ffa888;
-@define-color orange_3 #ffa888;
-@define-color orange_4 #ffa888;
-@define-color orange_5 #ffa888;
+
+
 @define-color red_1 #f6998f;
-@define-color red_2 #f6998f;
-@define-color red_3 #f6998f;
-@define-color red_4 #f6998f;
-@define-color red_5 #f6998f;
+@define-color green_1 #b6c68a;
+@define-color yellow_1 #ffc37a;
+@define-color blue_1 #b0a4c3;
 @define-color purple_1 #d8a2b0;
-@define-color purple_2 #d8a2b0;
-@define-color purple_3 #d8a2b0;
-@define-color purple_4 #d8a2b0;
-@define-color purple_5 #d8a2b0;
-@define-color brown_1 #f1ae97;
-@define-color brown_2 #f1ae97;
-@define-color brown_3 #f1ae97;
-@define-color brown_4 #f1ae97;
-@define-color brown_5 #f1ae97;
-@define-color light_1 #b8a59d;
-@define-color light_2 #b8a59d;
-@define-color light_3 #b8a59d;
-@define-color light_4 #b8a59d;
-@define-color light_5 #b8a59d;
-@define-color dark_1 #b8a59d;
-@define-color dark_2 #b8a59d;
-@define-color dark_3 #b8a59d;
-@define-color dark_4 #b8a59d;
-@define-color dark_5 #b8a59d;
+@define-color teal_1 #c0bcdb;
+@define-color orange_1 #ffa888;
+@define-color gray_1 #594740;
+
diff --git a/build/base16-terracotta.css b/build/base16-terracotta.css
index ef78f31..77a34e3 100644
--- a/build/base16-terracotta.css
+++ b/build/base16-terracotta.css
@@ -1,88 +1,37 @@
 @define-color accent_color #625574;
 @define-color accent_bg_color #625574;
 @define-color accent_fg_color #efeae8;
-@define-color destructive_color #a75045;
-@define-color destructive_bg_color #a75045;
-@define-color destructive_fg_color #efeae8;
-@define-color success_color #7a894a;
-@define-color success_bg_color #7a894a;
-@define-color success_fg_color #efeae8;
-@define-color warning_color #8d5968;
-@define-color warning_bg_color #8d5968;
-@define-color warning_fg_color #efeae8;
-@define-color error_color #a75045;
-@define-color error_bg_color #a75045;
-@define-color error_fg_color #efeae8;
+
 @define-color window_bg_color #efeae8;
 @define-color window_fg_color #473731;
+
 @define-color view_bg_color #efeae8;
 @define-color view_fg_color #473731;
-@define-color headerbar_bg_color #dfd6d1;
+
+@define-color headerbar_bg_color #efeae8;
 @define-color headerbar_fg_color #473731;
-@define-color headerbar_border_color rgba(0.87450980, 0.83921569, 0.81960784, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #efeae8;
+@define-color dialog_fg_color #473731;
+
+@define-color popover_bg_color #efeae8;
+@define-color popover_fg_color #473731;
+
+
 @define-color sidebar_bg_color #dfd6d1;
 @define-color sidebar_fg_color #473731;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #dfd6d1;
 @define-color card_fg_color #473731;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #dfd6d1;
-@define-color dialog_fg_color #473731;
-@define-color popover_bg_color #dfd6d1;
-@define-color popover_fg_color #473731;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #d0c1bb;
-@define-color blue_1 #625574;
-@define-color blue_2 #625574;
-@define-color blue_3 #625574;
-@define-color blue_4 #625574;
-@define-color blue_5 #625574;
-@define-color green_1 #7a894a;
-@define-color green_2 #7a894a;
-@define-color green_3 #7a894a;
-@define-color green_4 #7a894a;
-@define-color green_5 #7a894a;
-@define-color yellow_1 #ce943e;
-@define-color yellow_2 #ce943e;
-@define-color yellow_3 #ce943e;
-@define-color yellow_4 #ce943e;
-@define-color yellow_5 #ce943e;
-@define-color orange_1 #bd6942;
-@define-color orange_2 #bd6942;
-@define-color orange_3 #bd6942;
-@define-color orange_4 #bd6942;
-@define-color orange_5 #bd6942;
+
+
 @define-color red_1 #a75045;
-@define-color red_2 #a75045;
-@define-color red_3 #a75045;
-@define-color red_4 #a75045;
-@define-color red_5 #a75045;
+@define-color green_1 #7a894a;
+@define-color yellow_1 #ce943e;
+@define-color blue_1 #625574;
 @define-color purple_1 #8d5968;
-@define-color purple_2 #8d5968;
-@define-color purple_3 #8d5968;
-@define-color purple_4 #8d5968;
-@define-color purple_5 #8d5968;
-@define-color brown_1 #b07158;
-@define-color brown_2 #b07158;
-@define-color brown_3 #b07158;
-@define-color brown_4 #b07158;
-@define-color brown_5 #b07158;
-@define-color light_1 #473731;
-@define-color light_2 #473731;
-@define-color light_3 #473731;
-@define-color light_4 #473731;
-@define-color light_5 #473731;
-@define-color dark_1 #473731;
-@define-color dark_2 #473731;
-@define-color dark_3 #473731;
-@define-color dark_4 #473731;
-@define-color dark_5 #473731;
+@define-color teal_1 #847f9e;
+@define-color orange_1 #bd6942;
+@define-color gray_1 #c0aca4;
+
diff --git a/build/base16-tinta.css b/build/base16-tinta.css
index ada07c7..a17aacc 100644
--- a/build/base16-tinta.css
+++ b/build/base16-tinta.css
@@ -1,88 +1,37 @@
 @define-color accent_color #8a9ab0;
 @define-color accent_bg_color #8a9ab0;
 @define-color accent_fg_color #101012;
-@define-color destructive_color #d0726a;
-@define-color destructive_bg_color #d0726a;
-@define-color destructive_fg_color #101012;
-@define-color success_color #9aa890;
-@define-color success_bg_color #9aa890;
-@define-color success_fg_color #101012;
-@define-color warning_color #b0a0b8;
-@define-color warning_bg_color #b0a0b8;
-@define-color warning_fg_color #101012;
-@define-color error_color #d0726a;
-@define-color error_bg_color #d0726a;
-@define-color error_fg_color #101012;
+
 @define-color window_bg_color #101012;
 @define-color window_fg_color #d8d6d0;
+
 @define-color view_bg_color #101012;
 @define-color view_fg_color #d8d6d0;
-@define-color headerbar_bg_color #202023;
+
+@define-color headerbar_bg_color #101012;
 @define-color headerbar_fg_color #d8d6d0;
-@define-color headerbar_border_color rgba(0.12549020, 0.12549020, 0.13725490, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #101012;
+@define-color dialog_fg_color #d8d6d0;
+
+@define-color popover_bg_color #101012;
+@define-color popover_fg_color #d8d6d0;
+
+
 @define-color sidebar_bg_color #202023;
 @define-color sidebar_fg_color #d8d6d0;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #202023;
 @define-color card_fg_color #d8d6d0;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #202023;
-@define-color dialog_fg_color #d8d6d0;
-@define-color popover_bg_color #202023;
-@define-color popover_fg_color #d8d6d0;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #2c2c30;
-@define-color blue_1 #8a9ab0;
-@define-color blue_2 #8a9ab0;
-@define-color blue_3 #8a9ab0;
-@define-color blue_4 #8a9ab0;
-@define-color blue_5 #8a9ab0;
-@define-color green_1 #9aa890;
-@define-color green_2 #9aa890;
-@define-color green_3 #9aa890;
-@define-color green_4 #9aa890;
-@define-color green_5 #9aa890;
-@define-color yellow_1 #c8b86a;
-@define-color yellow_2 #c8b86a;
-@define-color yellow_3 #c8b86a;
-@define-color yellow_4 #c8b86a;
-@define-color yellow_5 #c8b86a;
-@define-color orange_1 #e8843a;
-@define-color orange_2 #e8843a;
-@define-color orange_3 #e8843a;
-@define-color orange_4 #e8843a;
-@define-color orange_5 #e8843a;
+
+
 @define-color red_1 #d0726a;
-@define-color red_2 #d0726a;
-@define-color red_3 #d0726a;
-@define-color red_4 #d0726a;
-@define-color red_5 #d0726a;
+@define-color green_1 #9aa890;
+@define-color yellow_1 #c8b86a;
+@define-color blue_1 #8a9ab0;
 @define-color purple_1 #b0a0b8;
-@define-color purple_2 #b0a0b8;
-@define-color purple_3 #b0a0b8;
-@define-color purple_4 #b0a0b8;
-@define-color purple_5 #b0a0b8;
-@define-color brown_1 #4a4a50;
-@define-color brown_2 #4a4a50;
-@define-color brown_3 #4a4a50;
-@define-color brown_4 #4a4a50;
-@define-color brown_5 #4a4a50;
-@define-color light_1 #d8d6d0;
-@define-color light_2 #d8d6d0;
-@define-color light_3 #d8d6d0;
-@define-color light_4 #d8d6d0;
-@define-color light_5 #d8d6d0;
-@define-color dark_1 #d8d6d0;
-@define-color dark_2 #d8d6d0;
-@define-color dark_3 #d8d6d0;
-@define-color dark_4 #d8d6d0;
-@define-color dark_5 #d8d6d0;
+@define-color teal_1 #80b8b4;
+@define-color orange_1 #e8843a;
+@define-color gray_1 #62626a;
+
diff --git a/build/base16-tokyo-city-dark.css b/build/base16-tokyo-city-dark.css
index fd4aecb..57b2652 100644
--- a/build/base16-tokyo-city-dark.css
+++ b/build/base16-tokyo-city-dark.css
@@ -1,88 +1,37 @@
 @define-color accent_color #7aa2f7;
 @define-color accent_bg_color #7aa2f7;
 @define-color accent_fg_color #171d23;
-@define-color destructive_color #f7768e;
-@define-color destructive_bg_color #f7768e;
-@define-color destructive_fg_color #171d23;
-@define-color success_color #9ece6a;
-@define-color success_bg_color #9ece6a;
-@define-color success_fg_color #171d23;
-@define-color warning_color #bb9af7;
-@define-color warning_bg_color #bb9af7;
-@define-color warning_fg_color #171d23;
-@define-color error_color #f7768e;
-@define-color error_bg_color #f7768e;
-@define-color error_fg_color #171d23;
+
 @define-color window_bg_color #171d23;
 @define-color window_fg_color #d8e2ec;
+
 @define-color view_bg_color #171d23;
 @define-color view_fg_color #d8e2ec;
-@define-color headerbar_bg_color #1d252c;
+
+@define-color headerbar_bg_color #171d23;
 @define-color headerbar_fg_color #d8e2ec;
-@define-color headerbar_border_color rgba(0.11372549, 0.14509804, 0.17254902, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #171d23;
+@define-color dialog_fg_color #d8e2ec;
+
+@define-color popover_bg_color #171d23;
+@define-color popover_fg_color #d8e2ec;
+
+
 @define-color sidebar_bg_color #1d252c;
 @define-color sidebar_fg_color #d8e2ec;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #1d252c;
 @define-color card_fg_color #d8e2ec;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #1d252c;
-@define-color dialog_fg_color #d8e2ec;
-@define-color popover_bg_color #1d252c;
-@define-color popover_fg_color #d8e2ec;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #28323a;
-@define-color blue_1 #7aa2f7;
-@define-color blue_2 #7aa2f7;
-@define-color blue_3 #7aa2f7;
-@define-color blue_4 #7aa2f7;
-@define-color blue_5 #7aa2f7;
-@define-color green_1 #9ece6a;
-@define-color green_2 #9ece6a;
-@define-color green_3 #9ece6a;
-@define-color green_4 #9ece6a;
-@define-color green_5 #9ece6a;
-@define-color yellow_1 #b7c5d3;
-@define-color yellow_2 #b7c5d3;
-@define-color yellow_3 #b7c5d3;
-@define-color yellow_4 #b7c5d3;
-@define-color yellow_5 #b7c5d3;
-@define-color orange_1 #ff9e64;
-@define-color orange_2 #ff9e64;
-@define-color orange_3 #ff9e64;
-@define-color orange_4 #ff9e64;
-@define-color orange_5 #ff9e64;
+
+
 @define-color red_1 #f7768e;
-@define-color red_2 #f7768e;
-@define-color red_3 #f7768e;
-@define-color red_4 #f7768e;
-@define-color red_5 #f7768e;
+@define-color green_1 #9ece6a;
+@define-color yellow_1 #b7c5d3;
+@define-color blue_1 #7aa2f7;
 @define-color purple_1 #bb9af7;
-@define-color purple_2 #bb9af7;
-@define-color purple_3 #bb9af7;
-@define-color purple_4 #bb9af7;
-@define-color purple_5 #bb9af7;
-@define-color brown_1 #bb9af7;
-@define-color brown_2 #bb9af7;
-@define-color brown_3 #bb9af7;
-@define-color brown_4 #bb9af7;
-@define-color brown_5 #bb9af7;
-@define-color light_1 #d8e2ec;
-@define-color light_2 #d8e2ec;
-@define-color light_3 #d8e2ec;
-@define-color light_4 #d8e2ec;
-@define-color light_5 #d8e2ec;
-@define-color dark_1 #d8e2ec;
-@define-color dark_2 #d8e2ec;
-@define-color dark_3 #d8e2ec;
-@define-color dark_4 #d8e2ec;
-@define-color dark_5 #d8e2ec;
+@define-color teal_1 #89ddff;
+@define-color orange_1 #ff9e64;
+@define-color gray_1 #526270;
+
diff --git a/build/base16-tokyo-city-light.css b/build/base16-tokyo-city-light.css
index 892b7d4..86aa88d 100644
--- a/build/base16-tokyo-city-light.css
+++ b/build/base16-tokyo-city-light.css
@@ -1,88 +1,37 @@
 @define-color accent_color #34548a;
 @define-color accent_bg_color #34548a;
 @define-color accent_fg_color #fbfbfd;
-@define-color destructive_color #8c4351;
-@define-color destructive_bg_color #8c4351;
-@define-color destructive_fg_color #fbfbfd;
-@define-color success_color #485e30;
-@define-color success_bg_color #485e30;
-@define-color success_fg_color #fbfbfd;
-@define-color warning_color #5a4a78;
-@define-color warning_bg_color #5a4a78;
-@define-color warning_fg_color #fbfbfd;
-@define-color error_color #8c4351;
-@define-color error_bg_color #8c4351;
-@define-color error_fg_color #fbfbfd;
+
 @define-color window_bg_color #fbfbfd;
 @define-color window_fg_color #343b59;
+
 @define-color view_bg_color #fbfbfd;
 @define-color view_fg_color #343b59;
-@define-color headerbar_bg_color #f6f6f8;
+
+@define-color headerbar_bg_color #fbfbfd;
 @define-color headerbar_fg_color #343b59;
-@define-color headerbar_border_color rgba(0.96470588, 0.96470588, 0.97254902, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #fbfbfd;
+@define-color dialog_fg_color #343b59;
+
+@define-color popover_bg_color #fbfbfd;
+@define-color popover_fg_color #343b59;
+
+
 @define-color sidebar_bg_color #f6f6f8;
 @define-color sidebar_fg_color #343b59;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #f6f6f8;
 @define-color card_fg_color #343b59;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #f6f6f8;
-@define-color dialog_fg_color #343b59;
-@define-color popover_bg_color #f6f6f8;
-@define-color popover_fg_color #343b59;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #edeff6;
-@define-color blue_1 #34548a;
-@define-color blue_2 #34548a;
-@define-color blue_3 #34548a;
-@define-color blue_4 #34548a;
-@define-color blue_5 #34548a;
-@define-color green_1 #485e30;
-@define-color green_2 #485e30;
-@define-color green_3 #485e30;
-@define-color green_4 #485e30;
-@define-color green_5 #485e30;
-@define-color yellow_1 #4c505e;
-@define-color yellow_2 #4c505e;
-@define-color yellow_3 #4c505e;
-@define-color yellow_4 #4c505e;
-@define-color yellow_5 #4c505e;
-@define-color orange_1 #965027;
-@define-color orange_2 #965027;
-@define-color orange_3 #965027;
-@define-color orange_4 #965027;
-@define-color orange_5 #965027;
+
+
 @define-color red_1 #8c4351;
-@define-color red_2 #8c4351;
-@define-color red_3 #8c4351;
-@define-color red_4 #8c4351;
-@define-color red_5 #8c4351;
+@define-color green_1 #485e30;
+@define-color yellow_1 #4c505e;
+@define-color blue_1 #34548a;
 @define-color purple_1 #5a4a78;
-@define-color purple_2 #5a4a78;
-@define-color purple_3 #5a4a78;
-@define-color purple_4 #5a4a78;
-@define-color purple_5 #5a4a78;
-@define-color brown_1 #5a4a78;
-@define-color brown_2 #5a4a78;
-@define-color brown_3 #5a4a78;
-@define-color brown_4 #5a4a78;
-@define-color brown_5 #5a4a78;
-@define-color light_1 #343b59;
-@define-color light_2 #343b59;
-@define-color light_3 #343b59;
-@define-color light_4 #343b59;
-@define-color light_5 #343b59;
-@define-color dark_1 #343b59;
-@define-color dark_2 #343b59;
-@define-color dark_3 #343b59;
-@define-color dark_4 #343b59;
-@define-color dark_5 #343b59;
+@define-color teal_1 #4c505e;
+@define-color orange_1 #965027;
+@define-color gray_1 #9699a3;
+
diff --git a/build/base16-tokyo-city-terminal-dark.css b/build/base16-tokyo-city-terminal-dark.css
index 3d02176..4819dea 100644
--- a/build/base16-tokyo-city-terminal-dark.css
+++ b/build/base16-tokyo-city-terminal-dark.css
@@ -1,88 +1,37 @@
 @define-color accent_color #539afc;
 @define-color accent_bg_color #539afc;
 @define-color accent_fg_color #171d23;
-@define-color destructive_color #d95468;
-@define-color destructive_bg_color #d95468;
-@define-color destructive_fg_color #171d23;
-@define-color success_color #8bd49c;
-@define-color success_bg_color #8bd49c;
-@define-color success_fg_color #171d23;
-@define-color warning_color #b62d65;
-@define-color warning_bg_color #b62d65;
-@define-color warning_fg_color #171d23;
-@define-color error_color #d95468;
-@define-color error_bg_color #d95468;
-@define-color error_fg_color #171d23;
+
 @define-color window_bg_color #171d23;
 @define-color window_fg_color #d8e2ec;
+
 @define-color view_bg_color #171d23;
 @define-color view_fg_color #d8e2ec;
-@define-color headerbar_bg_color #1d252c;
+
+@define-color headerbar_bg_color #171d23;
 @define-color headerbar_fg_color #d8e2ec;
-@define-color headerbar_border_color rgba(0.11372549, 0.14509804, 0.17254902, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #171d23;
+@define-color dialog_fg_color #d8e2ec;
+
+@define-color popover_bg_color #171d23;
+@define-color popover_fg_color #d8e2ec;
+
+
 @define-color sidebar_bg_color #1d252c;
 @define-color sidebar_fg_color #d8e2ec;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #1d252c;
 @define-color card_fg_color #d8e2ec;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #1d252c;
-@define-color dialog_fg_color #d8e2ec;
-@define-color popover_bg_color #1d252c;
-@define-color popover_fg_color #d8e2ec;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #28323a;
-@define-color blue_1 #539afc;
-@define-color blue_2 #539afc;
-@define-color blue_3 #539afc;
-@define-color blue_4 #539afc;
-@define-color blue_5 #539afc;
-@define-color green_1 #8bd49c;
-@define-color green_2 #8bd49c;
-@define-color green_3 #8bd49c;
-@define-color green_4 #8bd49c;
-@define-color green_5 #8bd49c;
-@define-color yellow_1 #ebbf83;
-@define-color yellow_2 #ebbf83;
-@define-color yellow_3 #ebbf83;
-@define-color yellow_4 #ebbf83;
-@define-color yellow_5 #ebbf83;
-@define-color orange_1 #ff9e64;
-@define-color orange_2 #ff9e64;
-@define-color orange_3 #ff9e64;
-@define-color orange_4 #ff9e64;
-@define-color orange_5 #ff9e64;
+
+
 @define-color red_1 #d95468;
-@define-color red_2 #d95468;
-@define-color red_3 #d95468;
-@define-color red_4 #d95468;
-@define-color red_5 #d95468;
+@define-color green_1 #8bd49c;
+@define-color yellow_1 #ebbf83;
+@define-color blue_1 #539afc;
 @define-color purple_1 #b62d65;
-@define-color purple_2 #b62d65;
-@define-color purple_3 #b62d65;
-@define-color purple_4 #b62d65;
-@define-color purple_5 #b62d65;
-@define-color brown_1 #dd9d82;
-@define-color brown_2 #dd9d82;
-@define-color brown_3 #dd9d82;
-@define-color brown_4 #dd9d82;
-@define-color brown_5 #dd9d82;
-@define-color light_1 #d8e2ec;
-@define-color light_2 #d8e2ec;
-@define-color light_3 #d8e2ec;
-@define-color light_4 #d8e2ec;
-@define-color light_5 #d8e2ec;
-@define-color dark_1 #d8e2ec;
-@define-color dark_2 #d8e2ec;
-@define-color dark_3 #d8e2ec;
-@define-color dark_4 #d8e2ec;
-@define-color dark_5 #d8e2ec;
+@define-color teal_1 #70e1e8;
+@define-color orange_1 #ff9e64;
+@define-color gray_1 #526270;
+
diff --git a/build/base16-tokyo-city-terminal-light.css b/build/base16-tokyo-city-terminal-light.css
index 46518a9..95b9e0b 100644
--- a/build/base16-tokyo-city-terminal-light.css
+++ b/build/base16-tokyo-city-terminal-light.css
@@ -1,88 +1,37 @@
 @define-color accent_color #34548a;
 @define-color accent_bg_color #34548a;
 @define-color accent_fg_color #fbfbfd;
-@define-color destructive_color #8c4351;
-@define-color destructive_bg_color #8c4351;
-@define-color destructive_fg_color #fbfbfd;
-@define-color success_color #33635c;
-@define-color success_bg_color #33635c;
-@define-color success_fg_color #fbfbfd;
-@define-color warning_color #5a4a78;
-@define-color warning_bg_color #5a4a78;
-@define-color warning_fg_color #fbfbfd;
-@define-color error_color #8c4351;
-@define-color error_bg_color #8c4351;
-@define-color error_fg_color #fbfbfd;
+
 @define-color window_bg_color #fbfbfd;
 @define-color window_fg_color #28323a;
+
 @define-color view_bg_color #fbfbfd;
 @define-color view_fg_color #28323a;
-@define-color headerbar_bg_color #f6f6f8;
+
+@define-color headerbar_bg_color #fbfbfd;
 @define-color headerbar_fg_color #28323a;
-@define-color headerbar_border_color rgba(0.96470588, 0.96470588, 0.97254902, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #fbfbfd;
+@define-color dialog_fg_color #28323a;
+
+@define-color popover_bg_color #fbfbfd;
+@define-color popover_fg_color #28323a;
+
+
 @define-color sidebar_bg_color #f6f6f8;
 @define-color sidebar_fg_color #28323a;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #f6f6f8;
 @define-color card_fg_color #28323a;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #f6f6f8;
-@define-color dialog_fg_color #28323a;
-@define-color popover_bg_color #f6f6f8;
-@define-color popover_fg_color #28323a;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #d8e2ec;
-@define-color blue_1 #34548a;
-@define-color blue_2 #34548a;
-@define-color blue_3 #34548a;
-@define-color blue_4 #34548a;
-@define-color blue_5 #34548a;
-@define-color green_1 #33635c;
-@define-color green_2 #33635c;
-@define-color green_3 #33635c;
-@define-color green_4 #33635c;
-@define-color green_5 #33635c;
-@define-color yellow_1 #8f5e15;
-@define-color yellow_2 #8f5e15;
-@define-color yellow_3 #8f5e15;
-@define-color yellow_4 #8f5e15;
-@define-color yellow_5 #8f5e15;
-@define-color orange_1 #965027;
-@define-color orange_2 #965027;
-@define-color orange_3 #965027;
-@define-color orange_4 #965027;
-@define-color orange_5 #965027;
+
+
 @define-color red_1 #8c4351;
-@define-color red_2 #8c4351;
-@define-color red_3 #8c4351;
-@define-color red_4 #8c4351;
-@define-color red_5 #8c4351;
+@define-color green_1 #33635c;
+@define-color yellow_1 #8f5e15;
+@define-color blue_1 #34548a;
 @define-color purple_1 #5a4a78;
-@define-color purple_2 #5a4a78;
-@define-color purple_3 #5a4a78;
-@define-color purple_4 #5a4a78;
-@define-color purple_5 #5a4a78;
-@define-color brown_1 #7e5140;
-@define-color brown_2 #7e5140;
-@define-color brown_3 #7e5140;
-@define-color brown_4 #7e5140;
-@define-color brown_5 #7e5140;
-@define-color light_1 #28323a;
-@define-color light_2 #28323a;
-@define-color light_3 #28323a;
-@define-color light_4 #28323a;
-@define-color light_5 #28323a;
-@define-color dark_1 #28323a;
-@define-color dark_2 #28323a;
-@define-color dark_3 #28323a;
-@define-color dark_4 #28323a;
-@define-color dark_5 #28323a;
+@define-color teal_1 #0f4b6e;
+@define-color orange_1 #965027;
+@define-color gray_1 #b7c5d3;
+
diff --git a/build/base16-tokyo-night-dark.css b/build/base16-tokyo-night-dark.css
index 90cc9d9..f746818 100644
--- a/build/base16-tokyo-night-dark.css
+++ b/build/base16-tokyo-night-dark.css
@@ -1,88 +1,37 @@
 @define-color accent_color #2ac3de;
 @define-color accent_bg_color #2ac3de;
 @define-color accent_fg_color #1a1b26;
-@define-color destructive_color #c0caf5;
-@define-color destructive_bg_color #c0caf5;
-@define-color destructive_fg_color #1a1b26;
-@define-color success_color #9ece6a;
-@define-color success_bg_color #9ece6a;
-@define-color success_fg_color #1a1b26;
-@define-color warning_color #bb9af7;
-@define-color warning_bg_color #bb9af7;
-@define-color warning_fg_color #1a1b26;
-@define-color error_color #c0caf5;
-@define-color error_bg_color #c0caf5;
-@define-color error_fg_color #1a1b26;
+
 @define-color window_bg_color #1a1b26;
 @define-color window_fg_color #a9b1d6;
+
 @define-color view_bg_color #1a1b26;
 @define-color view_fg_color #a9b1d6;
-@define-color headerbar_bg_color #16161e;
+
+@define-color headerbar_bg_color #1a1b26;
 @define-color headerbar_fg_color #a9b1d6;
-@define-color headerbar_border_color rgba(0.08627451, 0.08627451, 0.11764706, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #1a1b26;
+@define-color dialog_fg_color #a9b1d6;
+
+@define-color popover_bg_color #1a1b26;
+@define-color popover_fg_color #a9b1d6;
+
+
 @define-color sidebar_bg_color #16161e;
 @define-color sidebar_fg_color #a9b1d6;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #16161e;
 @define-color card_fg_color #a9b1d6;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #16161e;
-@define-color dialog_fg_color #a9b1d6;
-@define-color popover_bg_color #16161e;
-@define-color popover_fg_color #a9b1d6;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #2f3549;
-@define-color blue_1 #2ac3de;
-@define-color blue_2 #2ac3de;
-@define-color blue_3 #2ac3de;
-@define-color blue_4 #2ac3de;
-@define-color blue_5 #2ac3de;
-@define-color green_1 #9ece6a;
-@define-color green_2 #9ece6a;
-@define-color green_3 #9ece6a;
-@define-color green_4 #9ece6a;
-@define-color green_5 #9ece6a;
-@define-color yellow_1 #0db9d7;
-@define-color yellow_2 #0db9d7;
-@define-color yellow_3 #0db9d7;
-@define-color yellow_4 #0db9d7;
-@define-color yellow_5 #0db9d7;
-@define-color orange_1 #a9b1d6;
-@define-color orange_2 #a9b1d6;
-@define-color orange_3 #a9b1d6;
-@define-color orange_4 #a9b1d6;
-@define-color orange_5 #a9b1d6;
+
+
 @define-color red_1 #c0caf5;
-@define-color red_2 #c0caf5;
-@define-color red_3 #c0caf5;
-@define-color red_4 #c0caf5;
-@define-color red_5 #c0caf5;
+@define-color green_1 #9ece6a;
+@define-color yellow_1 #0db9d7;
+@define-color blue_1 #2ac3de;
 @define-color purple_1 #bb9af7;
-@define-color purple_2 #bb9af7;
-@define-color purple_3 #bb9af7;
-@define-color purple_4 #bb9af7;
-@define-color purple_5 #bb9af7;
-@define-color brown_1 #f7768e;
-@define-color brown_2 #f7768e;
-@define-color brown_3 #f7768e;
-@define-color brown_4 #f7768e;
-@define-color brown_5 #f7768e;
-@define-color light_1 #a9b1d6;
-@define-color light_2 #a9b1d6;
-@define-color light_3 #a9b1d6;
-@define-color light_4 #a9b1d6;
-@define-color light_5 #a9b1d6;
-@define-color dark_1 #a9b1d6;
-@define-color dark_2 #a9b1d6;
-@define-color dark_3 #a9b1d6;
-@define-color dark_4 #a9b1d6;
-@define-color dark_5 #a9b1d6;
+@define-color teal_1 #b4f9f8;
+@define-color orange_1 #a9b1d6;
+@define-color gray_1 #444b6a;
+
diff --git a/build/base16-tokyo-night-light.css b/build/base16-tokyo-night-light.css
index 1f32972..b577c4f 100644
--- a/build/base16-tokyo-night-light.css
+++ b/build/base16-tokyo-night-light.css
@@ -1,88 +1,37 @@
 @define-color accent_color #34548a;
 @define-color accent_bg_color #34548a;
 @define-color accent_fg_color #d5d6db;
-@define-color destructive_color #343b58;
-@define-color destructive_bg_color #343b58;
-@define-color destructive_fg_color #d5d6db;
-@define-color success_color #485e30;
-@define-color success_bg_color #485e30;
-@define-color success_fg_color #d5d6db;
-@define-color warning_color #5a4a78;
-@define-color warning_bg_color #5a4a78;
-@define-color warning_fg_color #d5d6db;
-@define-color error_color #343b58;
-@define-color error_bg_color #343b58;
-@define-color error_fg_color #d5d6db;
+
 @define-color window_bg_color #d5d6db;
 @define-color window_fg_color #343b59;
+
 @define-color view_bg_color #d5d6db;
 @define-color view_fg_color #343b59;
-@define-color headerbar_bg_color #cbccd1;
+
+@define-color headerbar_bg_color #d5d6db;
 @define-color headerbar_fg_color #343b59;
-@define-color headerbar_border_color rgba(0.79607843, 0.80000000, 0.81960784, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #d5d6db;
+@define-color dialog_fg_color #343b59;
+
+@define-color popover_bg_color #d5d6db;
+@define-color popover_fg_color #343b59;
+
+
 @define-color sidebar_bg_color #cbccd1;
 @define-color sidebar_fg_color #343b59;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #cbccd1;
 @define-color card_fg_color #343b59;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #cbccd1;
-@define-color dialog_fg_color #343b59;
-@define-color popover_bg_color #cbccd1;
-@define-color popover_fg_color #343b59;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #dfe0e5;
-@define-color blue_1 #34548a;
-@define-color blue_2 #34548a;
-@define-color blue_3 #34548a;
-@define-color blue_4 #34548a;
-@define-color blue_5 #34548a;
-@define-color green_1 #485e30;
-@define-color green_2 #485e30;
-@define-color green_3 #485e30;
-@define-color green_4 #485e30;
-@define-color green_5 #485e30;
-@define-color yellow_1 #166775;
-@define-color yellow_2 #166775;
-@define-color yellow_3 #166775;
-@define-color yellow_4 #166775;
-@define-color yellow_5 #166775;
-@define-color orange_1 #965027;
-@define-color orange_2 #965027;
-@define-color orange_3 #965027;
-@define-color orange_4 #965027;
-@define-color orange_5 #965027;
+
+
 @define-color red_1 #343b58;
-@define-color red_2 #343b58;
-@define-color red_3 #343b58;
-@define-color red_4 #343b58;
-@define-color red_5 #343b58;
+@define-color green_1 #485e30;
+@define-color yellow_1 #166775;
+@define-color blue_1 #34548a;
 @define-color purple_1 #5a4a78;
-@define-color purple_2 #5a4a78;
-@define-color purple_3 #5a4a78;
-@define-color purple_4 #5a4a78;
-@define-color purple_5 #5a4a78;
-@define-color brown_1 #8c4351;
-@define-color brown_2 #8c4351;
-@define-color brown_3 #8c4351;
-@define-color brown_4 #8c4351;
-@define-color brown_5 #8c4351;
-@define-color light_1 #343b59;
-@define-color light_2 #343b59;
-@define-color light_3 #343b59;
-@define-color light_4 #343b59;
-@define-color light_5 #343b59;
-@define-color dark_1 #343b59;
-@define-color dark_2 #343b59;
-@define-color dark_3 #343b59;
-@define-color dark_4 #343b59;
-@define-color dark_5 #343b59;
+@define-color teal_1 #3e6968;
+@define-color orange_1 #965027;
+@define-color gray_1 #9699a3;
+
diff --git a/build/base16-tokyo-night-moon.css b/build/base16-tokyo-night-moon.css
index 625ea4f..638b587 100644
--- a/build/base16-tokyo-night-moon.css
+++ b/build/base16-tokyo-night-moon.css
@@ -1,88 +1,37 @@
 @define-color accent_color #82aaff;
 @define-color accent_bg_color #82aaff;
 @define-color accent_fg_color #222436;
-@define-color destructive_color #ff757f;
-@define-color destructive_bg_color #ff757f;
-@define-color destructive_fg_color #222436;
-@define-color success_color #c3e88d;
-@define-color success_bg_color #c3e88d;
-@define-color success_fg_color #222436;
-@define-color warning_color #fca7ea;
-@define-color warning_bg_color #fca7ea;
-@define-color warning_fg_color #222436;
-@define-color error_color #ff757f;
-@define-color error_bg_color #ff757f;
-@define-color error_fg_color #222436;
+
 @define-color window_bg_color #222436;
 @define-color window_fg_color #828bb8;
+
 @define-color view_bg_color #222436;
 @define-color view_fg_color #828bb8;
-@define-color headerbar_bg_color #1e2030;
+
+@define-color headerbar_bg_color #222436;
 @define-color headerbar_fg_color #828bb8;
-@define-color headerbar_border_color rgba(0.11764706, 0.12549020, 0.18823529, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #222436;
+@define-color dialog_fg_color #828bb8;
+
+@define-color popover_bg_color #222436;
+@define-color popover_fg_color #828bb8;
+
+
 @define-color sidebar_bg_color #1e2030;
 @define-color sidebar_fg_color #828bb8;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #1e2030;
 @define-color card_fg_color #828bb8;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #1e2030;
-@define-color dialog_fg_color #828bb8;
-@define-color popover_bg_color #1e2030;
-@define-color popover_fg_color #828bb8;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #2d3f76;
-@define-color blue_1 #82aaff;
-@define-color blue_2 #82aaff;
-@define-color blue_3 #82aaff;
-@define-color blue_4 #82aaff;
-@define-color blue_5 #82aaff;
-@define-color green_1 #c3e88d;
-@define-color green_2 #c3e88d;
-@define-color green_3 #c3e88d;
-@define-color green_4 #c3e88d;
-@define-color green_5 #c3e88d;
-@define-color yellow_1 #ffdf77;
-@define-color yellow_2 #ffdf77;
-@define-color yellow_3 #ffdf77;
-@define-color yellow_4 #ffdf77;
-@define-color yellow_5 #ffdf77;
-@define-color orange_1 #ffc777;
-@define-color orange_2 #ffc777;
-@define-color orange_3 #ffc777;
-@define-color orange_4 #ffc777;
-@define-color orange_5 #ffc777;
+
+
 @define-color red_1 #ff757f;
-@define-color red_2 #ff757f;
-@define-color red_3 #ff757f;
-@define-color red_4 #ff757f;
-@define-color red_5 #ff757f;
+@define-color green_1 #c3e88d;
+@define-color yellow_1 #ffdf77;
+@define-color blue_1 #82aaff;
 @define-color purple_1 #fca7ea;
-@define-color purple_2 #fca7ea;
-@define-color purple_3 #fca7ea;
-@define-color purple_4 #fca7ea;
-@define-color purple_5 #fca7ea;
-@define-color brown_1 #c53b53;
-@define-color brown_2 #c53b53;
-@define-color brown_3 #c53b53;
-@define-color brown_4 #c53b53;
-@define-color brown_5 #c53b53;
-@define-color light_1 #828bb8;
-@define-color light_2 #828bb8;
-@define-color light_3 #828bb8;
-@define-color light_4 #828bb8;
-@define-color light_5 #828bb8;
-@define-color dark_1 #828bb8;
-@define-color dark_2 #828bb8;
-@define-color dark_3 #828bb8;
-@define-color dark_4 #828bb8;
-@define-color dark_5 #828bb8;
+@define-color teal_1 #86e1fc;
+@define-color orange_1 #ffc777;
+@define-color gray_1 #3b4261;
+
diff --git a/build/base16-tokyo-night-storm.css b/build/base16-tokyo-night-storm.css
index 3802af6..35ae48d 100644
--- a/build/base16-tokyo-night-storm.css
+++ b/build/base16-tokyo-night-storm.css
@@ -1,88 +1,37 @@
 @define-color accent_color #2ac3de;
 @define-color accent_bg_color #2ac3de;
 @define-color accent_fg_color #24283b;
-@define-color destructive_color #c0caf5;
-@define-color destructive_bg_color #c0caf5;
-@define-color destructive_fg_color #24283b;
-@define-color success_color #9ece6a;
-@define-color success_bg_color #9ece6a;
-@define-color success_fg_color #24283b;
-@define-color warning_color #bb9af7;
-@define-color warning_bg_color #bb9af7;
-@define-color warning_fg_color #24283b;
-@define-color error_color #c0caf5;
-@define-color error_bg_color #c0caf5;
-@define-color error_fg_color #24283b;
+
 @define-color window_bg_color #24283b;
 @define-color window_fg_color #a9b1d6;
+
 @define-color view_bg_color #24283b;
 @define-color view_fg_color #a9b1d6;
-@define-color headerbar_bg_color #16161e;
+
+@define-color headerbar_bg_color #24283b;
 @define-color headerbar_fg_color #a9b1d6;
-@define-color headerbar_border_color rgba(0.08627451, 0.08627451, 0.11764706, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #24283b;
+@define-color dialog_fg_color #a9b1d6;
+
+@define-color popover_bg_color #24283b;
+@define-color popover_fg_color #a9b1d6;
+
+
 @define-color sidebar_bg_color #16161e;
 @define-color sidebar_fg_color #a9b1d6;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #16161e;
 @define-color card_fg_color #a9b1d6;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #16161e;
-@define-color dialog_fg_color #a9b1d6;
-@define-color popover_bg_color #16161e;
-@define-color popover_fg_color #a9b1d6;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #343a52;
-@define-color blue_1 #2ac3de;
-@define-color blue_2 #2ac3de;
-@define-color blue_3 #2ac3de;
-@define-color blue_4 #2ac3de;
-@define-color blue_5 #2ac3de;
-@define-color green_1 #9ece6a;
-@define-color green_2 #9ece6a;
-@define-color green_3 #9ece6a;
-@define-color green_4 #9ece6a;
-@define-color green_5 #9ece6a;
-@define-color yellow_1 #0db9d7;
-@define-color yellow_2 #0db9d7;
-@define-color yellow_3 #0db9d7;
-@define-color yellow_4 #0db9d7;
-@define-color yellow_5 #0db9d7;
-@define-color orange_1 #a9b1d6;
-@define-color orange_2 #a9b1d6;
-@define-color orange_3 #a9b1d6;
-@define-color orange_4 #a9b1d6;
-@define-color orange_5 #a9b1d6;
+
+
 @define-color red_1 #c0caf5;
-@define-color red_2 #c0caf5;
-@define-color red_3 #c0caf5;
-@define-color red_4 #c0caf5;
-@define-color red_5 #c0caf5;
+@define-color green_1 #9ece6a;
+@define-color yellow_1 #0db9d7;
+@define-color blue_1 #2ac3de;
 @define-color purple_1 #bb9af7;
-@define-color purple_2 #bb9af7;
-@define-color purple_3 #bb9af7;
-@define-color purple_4 #bb9af7;
-@define-color purple_5 #bb9af7;
-@define-color brown_1 #f7768e;
-@define-color brown_2 #f7768e;
-@define-color brown_3 #f7768e;
-@define-color brown_4 #f7768e;
-@define-color brown_5 #f7768e;
-@define-color light_1 #a9b1d6;
-@define-color light_2 #a9b1d6;
-@define-color light_3 #a9b1d6;
-@define-color light_4 #a9b1d6;
-@define-color light_5 #a9b1d6;
-@define-color dark_1 #a9b1d6;
-@define-color dark_2 #a9b1d6;
-@define-color dark_3 #a9b1d6;
-@define-color dark_4 #a9b1d6;
-@define-color dark_5 #a9b1d6;
+@define-color teal_1 #b4f9f8;
+@define-color orange_1 #a9b1d6;
+@define-color gray_1 #444b6a;
+
diff --git a/build/base16-tokyo-night-terminal-dark.css b/build/base16-tokyo-night-terminal-dark.css
index 54b316f..4d37cba 100644
--- a/build/base16-tokyo-night-terminal-dark.css
+++ b/build/base16-tokyo-night-terminal-dark.css
@@ -1,88 +1,37 @@
 @define-color accent_color #7aa2f7;
 @define-color accent_bg_color #7aa2f7;
 @define-color accent_fg_color #16161e;
-@define-color destructive_color #f7768e;
-@define-color destructive_bg_color #f7768e;
-@define-color destructive_fg_color #16161e;
-@define-color success_color #41a6b5;
-@define-color success_bg_color #41a6b5;
-@define-color success_fg_color #16161e;
-@define-color warning_color #bb9af7;
-@define-color warning_bg_color #bb9af7;
-@define-color warning_fg_color #16161e;
-@define-color error_color #f7768e;
-@define-color error_bg_color #f7768e;
-@define-color error_fg_color #16161e;
+
 @define-color window_bg_color #16161e;
 @define-color window_fg_color #787c99;
+
 @define-color view_bg_color #16161e;
 @define-color view_fg_color #787c99;
-@define-color headerbar_bg_color #1a1b26;
+
+@define-color headerbar_bg_color #16161e;
 @define-color headerbar_fg_color #787c99;
-@define-color headerbar_border_color rgba(0.10196078, 0.10588235, 0.14901961, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #16161e;
+@define-color dialog_fg_color #787c99;
+
+@define-color popover_bg_color #16161e;
+@define-color popover_fg_color #787c99;
+
+
 @define-color sidebar_bg_color #1a1b26;
 @define-color sidebar_fg_color #787c99;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #1a1b26;
 @define-color card_fg_color #787c99;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #1a1b26;
-@define-color dialog_fg_color #787c99;
-@define-color popover_bg_color #1a1b26;
-@define-color popover_fg_color #787c99;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #2f3549;
-@define-color blue_1 #7aa2f7;
-@define-color blue_2 #7aa2f7;
-@define-color blue_3 #7aa2f7;
-@define-color blue_4 #7aa2f7;
-@define-color blue_5 #7aa2f7;
-@define-color green_1 #41a6b5;
-@define-color green_2 #41a6b5;
-@define-color green_3 #41a6b5;
-@define-color green_4 #41a6b5;
-@define-color green_5 #41a6b5;
-@define-color yellow_1 #e0af68;
-@define-color yellow_2 #e0af68;
-@define-color yellow_3 #e0af68;
-@define-color yellow_4 #e0af68;
-@define-color yellow_5 #e0af68;
-@define-color orange_1 #ff9e64;
-@define-color orange_2 #ff9e64;
-@define-color orange_3 #ff9e64;
-@define-color orange_4 #ff9e64;
-@define-color orange_5 #ff9e64;
+
+
 @define-color red_1 #f7768e;
-@define-color red_2 #f7768e;
-@define-color red_3 #f7768e;
-@define-color red_4 #f7768e;
-@define-color red_5 #f7768e;
+@define-color green_1 #41a6b5;
+@define-color yellow_1 #e0af68;
+@define-color blue_1 #7aa2f7;
 @define-color purple_1 #bb9af7;
-@define-color purple_2 #bb9af7;
-@define-color purple_3 #bb9af7;
-@define-color purple_4 #bb9af7;
-@define-color purple_5 #bb9af7;
-@define-color brown_1 #d18616;
-@define-color brown_2 #d18616;
-@define-color brown_3 #d18616;
-@define-color brown_4 #d18616;
-@define-color brown_5 #d18616;
-@define-color light_1 #787c99;
-@define-color light_2 #787c99;
-@define-color light_3 #787c99;
-@define-color light_4 #787c99;
-@define-color light_5 #787c99;
-@define-color dark_1 #787c99;
-@define-color dark_2 #787c99;
-@define-color dark_3 #787c99;
-@define-color dark_4 #787c99;
-@define-color dark_5 #787c99;
+@define-color teal_1 #7dcfff;
+@define-color orange_1 #ff9e64;
+@define-color gray_1 #444b6a;
+
diff --git a/build/base16-tokyo-night-terminal-light.css b/build/base16-tokyo-night-terminal-light.css
index 2a33310..5f1bc0f 100644
--- a/build/base16-tokyo-night-terminal-light.css
+++ b/build/base16-tokyo-night-terminal-light.css
@@ -1,88 +1,37 @@
 @define-color accent_color #34548a;
 @define-color accent_bg_color #34548a;
 @define-color accent_fg_color #d5d6db;
-@define-color destructive_color #8c4351;
-@define-color destructive_bg_color #8c4351;
-@define-color destructive_fg_color #d5d6db;
-@define-color success_color #33635c;
-@define-color success_bg_color #33635c;
-@define-color success_fg_color #d5d6db;
-@define-color warning_color #5a4a78;
-@define-color warning_bg_color #5a4a78;
-@define-color warning_fg_color #d5d6db;
-@define-color error_color #8c4351;
-@define-color error_bg_color #8c4351;
-@define-color error_fg_color #d5d6db;
+
 @define-color window_bg_color #d5d6db;
 @define-color window_fg_color #4c505e;
+
 @define-color view_bg_color #d5d6db;
 @define-color view_fg_color #4c505e;
-@define-color headerbar_bg_color #cbccd1;
+
+@define-color headerbar_bg_color #d5d6db;
 @define-color headerbar_fg_color #4c505e;
-@define-color headerbar_border_color rgba(0.79607843, 0.80000000, 0.81960784, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #d5d6db;
+@define-color dialog_fg_color #4c505e;
+
+@define-color popover_bg_color #d5d6db;
+@define-color popover_fg_color #4c505e;
+
+
 @define-color sidebar_bg_color #cbccd1;
 @define-color sidebar_fg_color #4c505e;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #cbccd1;
 @define-color card_fg_color #4c505e;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #cbccd1;
-@define-color dialog_fg_color #4c505e;
-@define-color popover_bg_color #cbccd1;
-@define-color popover_fg_color #4c505e;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #dfe0e5;
-@define-color blue_1 #34548a;
-@define-color blue_2 #34548a;
-@define-color blue_3 #34548a;
-@define-color blue_4 #34548a;
-@define-color blue_5 #34548a;
-@define-color green_1 #33635c;
-@define-color green_2 #33635c;
-@define-color green_3 #33635c;
-@define-color green_4 #33635c;
-@define-color green_5 #33635c;
-@define-color yellow_1 #8f5e15;
-@define-color yellow_2 #8f5e15;
-@define-color yellow_3 #8f5e15;
-@define-color yellow_4 #8f5e15;
-@define-color yellow_5 #8f5e15;
-@define-color orange_1 #965027;
-@define-color orange_2 #965027;
-@define-color orange_3 #965027;
-@define-color orange_4 #965027;
-@define-color orange_5 #965027;
+
+
 @define-color red_1 #8c4351;
-@define-color red_2 #8c4351;
-@define-color red_3 #8c4351;
-@define-color red_4 #8c4351;
-@define-color red_5 #8c4351;
+@define-color green_1 #33635c;
+@define-color yellow_1 #8f5e15;
+@define-color blue_1 #34548a;
 @define-color purple_1 #5a4a78;
-@define-color purple_2 #5a4a78;
-@define-color purple_3 #5a4a78;
-@define-color purple_4 #5a4a78;
-@define-color purple_5 #5a4a78;
-@define-color brown_1 #655259;
-@define-color brown_2 #655259;
-@define-color brown_3 #655259;
-@define-color brown_4 #655259;
-@define-color brown_5 #655259;
-@define-color light_1 #4c505e;
-@define-color light_2 #4c505e;
-@define-color light_3 #4c505e;
-@define-color light_4 #4c505e;
-@define-color light_5 #4c505e;
-@define-color dark_1 #4c505e;
-@define-color dark_2 #4c505e;
-@define-color dark_3 #4c505e;
-@define-color dark_4 #4c505e;
-@define-color dark_5 #4c505e;
+@define-color teal_1 #0f4b6e;
+@define-color orange_1 #965027;
+@define-color gray_1 #9699a3;
+
diff --git a/build/base16-tokyo-night-terminal-storm.css b/build/base16-tokyo-night-terminal-storm.css
index 1fc0ee4..a524e0f 100644
--- a/build/base16-tokyo-night-terminal-storm.css
+++ b/build/base16-tokyo-night-terminal-storm.css
@@ -1,88 +1,37 @@
 @define-color accent_color #7aa2f7;
 @define-color accent_bg_color #7aa2f7;
 @define-color accent_fg_color #24283b;
-@define-color destructive_color #f7768e;
-@define-color destructive_bg_color #f7768e;
-@define-color destructive_fg_color #24283b;
-@define-color success_color #41a6b5;
-@define-color success_bg_color #41a6b5;
-@define-color success_fg_color #24283b;
-@define-color warning_color #bb9af7;
-@define-color warning_bg_color #bb9af7;
-@define-color warning_fg_color #24283b;
-@define-color error_color #f7768e;
-@define-color error_bg_color #f7768e;
-@define-color error_fg_color #24283b;
+
 @define-color window_bg_color #24283b;
 @define-color window_fg_color #787c99;
+
 @define-color view_bg_color #24283b;
 @define-color view_fg_color #787c99;
-@define-color headerbar_bg_color #1a1b26;
+
+@define-color headerbar_bg_color #24283b;
 @define-color headerbar_fg_color #787c99;
-@define-color headerbar_border_color rgba(0.10196078, 0.10588235, 0.14901961, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #24283b;
+@define-color dialog_fg_color #787c99;
+
+@define-color popover_bg_color #24283b;
+@define-color popover_fg_color #787c99;
+
+
 @define-color sidebar_bg_color #1a1b26;
 @define-color sidebar_fg_color #787c99;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #1a1b26;
 @define-color card_fg_color #787c99;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #1a1b26;
-@define-color dialog_fg_color #787c99;
-@define-color popover_bg_color #1a1b26;
-@define-color popover_fg_color #787c99;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #343a52;
-@define-color blue_1 #7aa2f7;
-@define-color blue_2 #7aa2f7;
-@define-color blue_3 #7aa2f7;
-@define-color blue_4 #7aa2f7;
-@define-color blue_5 #7aa2f7;
-@define-color green_1 #41a6b5;
-@define-color green_2 #41a6b5;
-@define-color green_3 #41a6b5;
-@define-color green_4 #41a6b5;
-@define-color green_5 #41a6b5;
-@define-color yellow_1 #e0af68;
-@define-color yellow_2 #e0af68;
-@define-color yellow_3 #e0af68;
-@define-color yellow_4 #e0af68;
-@define-color yellow_5 #e0af68;
-@define-color orange_1 #ff9e64;
-@define-color orange_2 #ff9e64;
-@define-color orange_3 #ff9e64;
-@define-color orange_4 #ff9e64;
-@define-color orange_5 #ff9e64;
+
+
 @define-color red_1 #f7768e;
-@define-color red_2 #f7768e;
-@define-color red_3 #f7768e;
-@define-color red_4 #f7768e;
-@define-color red_5 #f7768e;
+@define-color green_1 #41a6b5;
+@define-color yellow_1 #e0af68;
+@define-color blue_1 #7aa2f7;
 @define-color purple_1 #bb9af7;
-@define-color purple_2 #bb9af7;
-@define-color purple_3 #bb9af7;
-@define-color purple_4 #bb9af7;
-@define-color purple_5 #bb9af7;
-@define-color brown_1 #d18616;
-@define-color brown_2 #d18616;
-@define-color brown_3 #d18616;
-@define-color brown_4 #d18616;
-@define-color brown_5 #d18616;
-@define-color light_1 #787c99;
-@define-color light_2 #787c99;
-@define-color light_3 #787c99;
-@define-color light_4 #787c99;
-@define-color light_5 #787c99;
-@define-color dark_1 #787c99;
-@define-color dark_2 #787c99;
-@define-color dark_3 #787c99;
-@define-color dark_4 #787c99;
-@define-color dark_5 #787c99;
+@define-color teal_1 #7dcfff;
+@define-color orange_1 #ff9e64;
+@define-color gray_1 #444b6a;
+
diff --git a/build/base16-tokyodark-terminal.css b/build/base16-tokyodark-terminal.css
index d158514..000434c 100644
--- a/build/base16-tokyodark-terminal.css
+++ b/build/base16-tokyodark-terminal.css
@@ -1,88 +1,37 @@
 @define-color accent_color #7199ee;
 @define-color accent_bg_color #7199ee;
 @define-color accent_fg_color #11121d;
-@define-color destructive_color #ee6d85;
-@define-color destructive_bg_color #ee6d85;
-@define-color destructive_fg_color #11121d;
-@define-color success_color #95c561;
-@define-color success_bg_color #95c561;
-@define-color success_fg_color #11121d;
-@define-color warning_color #a485dd;
-@define-color warning_bg_color #a485dd;
-@define-color warning_fg_color #11121d;
-@define-color error_color #ee6d85;
-@define-color error_bg_color #ee6d85;
-@define-color error_fg_color #11121d;
+
 @define-color window_bg_color #11121d;
 @define-color window_fg_color #a0a8cd;
+
 @define-color view_bg_color #11121d;
 @define-color view_fg_color #a0a8cd;
-@define-color headerbar_bg_color #1a1b2a;
+
+@define-color headerbar_bg_color #11121d;
 @define-color headerbar_fg_color #a0a8cd;
-@define-color headerbar_border_color rgba(0.10196078, 0.10588235, 0.16470588, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #11121d;
+@define-color dialog_fg_color #a0a8cd;
+
+@define-color popover_bg_color #11121d;
+@define-color popover_fg_color #a0a8cd;
+
+
 @define-color sidebar_bg_color #1a1b2a;
 @define-color sidebar_fg_color #a0a8cd;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #1a1b2a;
 @define-color card_fg_color #a0a8cd;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #1a1b2a;
-@define-color dialog_fg_color #a0a8cd;
-@define-color popover_bg_color #1a1b2a;
-@define-color popover_fg_color #a0a8cd;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #212234;
-@define-color blue_1 #7199ee;
-@define-color blue_2 #7199ee;
-@define-color blue_3 #7199ee;
-@define-color blue_4 #7199ee;
-@define-color blue_5 #7199ee;
-@define-color green_1 #95c561;
-@define-color green_2 #95c561;
-@define-color green_3 #95c561;
-@define-color green_4 #95c561;
-@define-color green_5 #95c561;
-@define-color yellow_1 #d7a65f;
-@define-color yellow_2 #d7a65f;
-@define-color yellow_3 #d7a65f;
-@define-color yellow_4 #d7a65f;
-@define-color yellow_5 #d7a65f;
-@define-color orange_1 #f6955b;
-@define-color orange_2 #f6955b;
-@define-color orange_3 #f6955b;
-@define-color orange_4 #f6955b;
-@define-color orange_5 #f6955b;
+
+
 @define-color red_1 #ee6d85;
-@define-color red_2 #ee6d85;
-@define-color red_3 #ee6d85;
-@define-color red_4 #ee6d85;
-@define-color red_5 #ee6d85;
+@define-color green_1 #95c561;
+@define-color yellow_1 #d7a65f;
+@define-color blue_1 #7199ee;
 @define-color purple_1 #a485dd;
-@define-color purple_2 #a485dd;
-@define-color purple_3 #a485dd;
-@define-color purple_4 #a485dd;
-@define-color purple_5 #a485dd;
-@define-color brown_1 #773440;
-@define-color brown_2 #773440;
-@define-color brown_3 #773440;
-@define-color brown_4 #773440;
-@define-color brown_5 #773440;
-@define-color light_1 #a0a8cd;
-@define-color light_2 #a0a8cd;
-@define-color light_3 #a0a8cd;
-@define-color light_4 #a0a8cd;
-@define-color light_5 #a0a8cd;
-@define-color dark_1 #a0a8cd;
-@define-color dark_2 #a0a8cd;
-@define-color dark_3 #a0a8cd;
-@define-color dark_4 #a0a8cd;
-@define-color dark_5 #a0a8cd;
+@define-color teal_1 #38a89d;
+@define-color orange_1 #f6955b;
+@define-color gray_1 #282c34;
+
diff --git a/build/base16-tokyodark.css b/build/base16-tokyodark.css
index 60af7a9..51a9ab1 100644
--- a/build/base16-tokyodark.css
+++ b/build/base16-tokyodark.css
@@ -1,88 +1,37 @@
 @define-color accent_color #7199ee;
 @define-color accent_bg_color #7199ee;
 @define-color accent_fg_color #11121d;
-@define-color destructive_color #ee6d85;
-@define-color destructive_bg_color #ee6d85;
-@define-color destructive_fg_color #11121d;
-@define-color success_color #95c561;
-@define-color success_bg_color #95c561;
-@define-color success_fg_color #11121d;
-@define-color warning_color #a485dd;
-@define-color warning_bg_color #a485dd;
-@define-color warning_fg_color #11121d;
-@define-color error_color #ee6d85;
-@define-color error_bg_color #ee6d85;
-@define-color error_fg_color #11121d;
+
 @define-color window_bg_color #11121d;
 @define-color window_fg_color #a0a8cd;
+
 @define-color view_bg_color #11121d;
 @define-color view_fg_color #a0a8cd;
-@define-color headerbar_bg_color #212234;
+
+@define-color headerbar_bg_color #11121d;
 @define-color headerbar_fg_color #a0a8cd;
-@define-color headerbar_border_color rgba(0.12941176, 0.13333333, 0.20392157, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #11121d;
+@define-color dialog_fg_color #a0a8cd;
+
+@define-color popover_bg_color #11121d;
+@define-color popover_fg_color #a0a8cd;
+
+
 @define-color sidebar_bg_color #212234;
 @define-color sidebar_fg_color #a0a8cd;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #212234;
 @define-color card_fg_color #a0a8cd;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #212234;
-@define-color dialog_fg_color #a0a8cd;
-@define-color popover_bg_color #212234;
-@define-color popover_fg_color #a0a8cd;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #212234;
-@define-color blue_1 #7199ee;
-@define-color blue_2 #7199ee;
-@define-color blue_3 #7199ee;
-@define-color blue_4 #7199ee;
-@define-color blue_5 #7199ee;
-@define-color green_1 #95c561;
-@define-color green_2 #95c561;
-@define-color green_3 #95c561;
-@define-color green_4 #95c561;
-@define-color green_5 #95c561;
-@define-color yellow_1 #d7a65f;
-@define-color yellow_2 #d7a65f;
-@define-color yellow_3 #d7a65f;
-@define-color yellow_4 #d7a65f;
-@define-color yellow_5 #d7a65f;
-@define-color orange_1 #f6955b;
-@define-color orange_2 #f6955b;
-@define-color orange_3 #f6955b;
-@define-color orange_4 #f6955b;
-@define-color orange_5 #f6955b;
+
+
 @define-color red_1 #ee6d85;
-@define-color red_2 #ee6d85;
-@define-color red_3 #ee6d85;
-@define-color red_4 #ee6d85;
-@define-color red_5 #ee6d85;
+@define-color green_1 #95c561;
+@define-color yellow_1 #d7a65f;
+@define-color blue_1 #7199ee;
 @define-color purple_1 #a485dd;
-@define-color purple_2 #a485dd;
-@define-color purple_3 #a485dd;
-@define-color purple_4 #a485dd;
-@define-color purple_5 #a485dd;
-@define-color brown_1 #773440;
-@define-color brown_2 #773440;
-@define-color brown_3 #773440;
-@define-color brown_4 #773440;
-@define-color brown_5 #773440;
-@define-color light_1 #a0a8cd;
-@define-color light_2 #a0a8cd;
-@define-color light_3 #a0a8cd;
-@define-color light_4 #a0a8cd;
-@define-color light_5 #a0a8cd;
-@define-color dark_1 #a0a8cd;
-@define-color dark_2 #a0a8cd;
-@define-color dark_3 #a0a8cd;
-@define-color dark_4 #a0a8cd;
-@define-color dark_5 #a0a8cd;
+@define-color teal_1 #9fbbf3;
+@define-color orange_1 #f6955b;
+@define-color gray_1 #353945;
+
diff --git a/build/base16-tomorrow-night-eighties.css b/build/base16-tomorrow-night-eighties.css
index 33250f2..36d4c64 100644
--- a/build/base16-tomorrow-night-eighties.css
+++ b/build/base16-tomorrow-night-eighties.css
@@ -1,88 +1,37 @@
 @define-color accent_color #6699cc;
 @define-color accent_bg_color #6699cc;
 @define-color accent_fg_color #2d2d2d;
-@define-color destructive_color #f2777a;
-@define-color destructive_bg_color #f2777a;
-@define-color destructive_fg_color #2d2d2d;
-@define-color success_color #99cc99;
-@define-color success_bg_color #99cc99;
-@define-color success_fg_color #2d2d2d;
-@define-color warning_color #cc99cc;
-@define-color warning_bg_color #cc99cc;
-@define-color warning_fg_color #2d2d2d;
-@define-color error_color #f2777a;
-@define-color error_bg_color #f2777a;
-@define-color error_fg_color #2d2d2d;
+
 @define-color window_bg_color #2d2d2d;
 @define-color window_fg_color #cccccc;
+
 @define-color view_bg_color #2d2d2d;
 @define-color view_fg_color #cccccc;
-@define-color headerbar_bg_color #393939;
+
+@define-color headerbar_bg_color #2d2d2d;
 @define-color headerbar_fg_color #cccccc;
-@define-color headerbar_border_color rgba(0.22352941, 0.22352941, 0.22352941, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #2d2d2d;
+@define-color dialog_fg_color #cccccc;
+
+@define-color popover_bg_color #2d2d2d;
+@define-color popover_fg_color #cccccc;
+
+
 @define-color sidebar_bg_color #393939;
 @define-color sidebar_fg_color #cccccc;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #393939;
 @define-color card_fg_color #cccccc;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #393939;
-@define-color dialog_fg_color #cccccc;
-@define-color popover_bg_color #393939;
-@define-color popover_fg_color #cccccc;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #515151;
-@define-color blue_1 #6699cc;
-@define-color blue_2 #6699cc;
-@define-color blue_3 #6699cc;
-@define-color blue_4 #6699cc;
-@define-color blue_5 #6699cc;
-@define-color green_1 #99cc99;
-@define-color green_2 #99cc99;
-@define-color green_3 #99cc99;
-@define-color green_4 #99cc99;
-@define-color green_5 #99cc99;
-@define-color yellow_1 #ffcc66;
-@define-color yellow_2 #ffcc66;
-@define-color yellow_3 #ffcc66;
-@define-color yellow_4 #ffcc66;
-@define-color yellow_5 #ffcc66;
-@define-color orange_1 #f99157;
-@define-color orange_2 #f99157;
-@define-color orange_3 #f99157;
-@define-color orange_4 #f99157;
-@define-color orange_5 #f99157;
+
+
 @define-color red_1 #f2777a;
-@define-color red_2 #f2777a;
-@define-color red_3 #f2777a;
-@define-color red_4 #f2777a;
-@define-color red_5 #f2777a;
+@define-color green_1 #99cc99;
+@define-color yellow_1 #ffcc66;
+@define-color blue_1 #6699cc;
 @define-color purple_1 #cc99cc;
-@define-color purple_2 #cc99cc;
-@define-color purple_3 #cc99cc;
-@define-color purple_4 #cc99cc;
-@define-color purple_5 #cc99cc;
-@define-color brown_1 #a3685a;
-@define-color brown_2 #a3685a;
-@define-color brown_3 #a3685a;
-@define-color brown_4 #a3685a;
-@define-color brown_5 #a3685a;
-@define-color light_1 #cccccc;
-@define-color light_2 #cccccc;
-@define-color light_3 #cccccc;
-@define-color light_4 #cccccc;
-@define-color light_5 #cccccc;
-@define-color dark_1 #cccccc;
-@define-color dark_2 #cccccc;
-@define-color dark_3 #cccccc;
-@define-color dark_4 #cccccc;
-@define-color dark_5 #cccccc;
+@define-color teal_1 #66cccc;
+@define-color orange_1 #f99157;
+@define-color gray_1 #999999;
+
diff --git a/build/base16-tomorrow-night.css b/build/base16-tomorrow-night.css
index bb39d88..8f820ea 100644
--- a/build/base16-tomorrow-night.css
+++ b/build/base16-tomorrow-night.css
@@ -1,88 +1,37 @@
 @define-color accent_color #81a2be;
 @define-color accent_bg_color #81a2be;
 @define-color accent_fg_color #1d1f21;
-@define-color destructive_color #cc6666;
-@define-color destructive_bg_color #cc6666;
-@define-color destructive_fg_color #1d1f21;
-@define-color success_color #b5bd68;
-@define-color success_bg_color #b5bd68;
-@define-color success_fg_color #1d1f21;
-@define-color warning_color #b294bb;
-@define-color warning_bg_color #b294bb;
-@define-color warning_fg_color #1d1f21;
-@define-color error_color #cc6666;
-@define-color error_bg_color #cc6666;
-@define-color error_fg_color #1d1f21;
+
 @define-color window_bg_color #1d1f21;
 @define-color window_fg_color #c5c8c6;
+
 @define-color view_bg_color #1d1f21;
 @define-color view_fg_color #c5c8c6;
-@define-color headerbar_bg_color #282a2e;
+
+@define-color headerbar_bg_color #1d1f21;
 @define-color headerbar_fg_color #c5c8c6;
-@define-color headerbar_border_color rgba(0.15686275, 0.16470588, 0.18039216, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #1d1f21;
+@define-color dialog_fg_color #c5c8c6;
+
+@define-color popover_bg_color #1d1f21;
+@define-color popover_fg_color #c5c8c6;
+
+
 @define-color sidebar_bg_color #282a2e;
 @define-color sidebar_fg_color #c5c8c6;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #282a2e;
 @define-color card_fg_color #c5c8c6;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #282a2e;
-@define-color dialog_fg_color #c5c8c6;
-@define-color popover_bg_color #282a2e;
-@define-color popover_fg_color #c5c8c6;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #373b41;
-@define-color blue_1 #81a2be;
-@define-color blue_2 #81a2be;
-@define-color blue_3 #81a2be;
-@define-color blue_4 #81a2be;
-@define-color blue_5 #81a2be;
-@define-color green_1 #b5bd68;
-@define-color green_2 #b5bd68;
-@define-color green_3 #b5bd68;
-@define-color green_4 #b5bd68;
-@define-color green_5 #b5bd68;
-@define-color yellow_1 #f0c674;
-@define-color yellow_2 #f0c674;
-@define-color yellow_3 #f0c674;
-@define-color yellow_4 #f0c674;
-@define-color yellow_5 #f0c674;
-@define-color orange_1 #de935f;
-@define-color orange_2 #de935f;
-@define-color orange_3 #de935f;
-@define-color orange_4 #de935f;
-@define-color orange_5 #de935f;
+
+
 @define-color red_1 #cc6666;
-@define-color red_2 #cc6666;
-@define-color red_3 #cc6666;
-@define-color red_4 #cc6666;
-@define-color red_5 #cc6666;
+@define-color green_1 #b5bd68;
+@define-color yellow_1 #f0c674;
+@define-color blue_1 #81a2be;
 @define-color purple_1 #b294bb;
-@define-color purple_2 #b294bb;
-@define-color purple_3 #b294bb;
-@define-color purple_4 #b294bb;
-@define-color purple_5 #b294bb;
-@define-color brown_1 #a3685a;
-@define-color brown_2 #a3685a;
-@define-color brown_3 #a3685a;
-@define-color brown_4 #a3685a;
-@define-color brown_5 #a3685a;
-@define-color light_1 #c5c8c6;
-@define-color light_2 #c5c8c6;
-@define-color light_3 #c5c8c6;
-@define-color light_4 #c5c8c6;
-@define-color light_5 #c5c8c6;
-@define-color dark_1 #c5c8c6;
-@define-color dark_2 #c5c8c6;
-@define-color dark_3 #c5c8c6;
-@define-color dark_4 #c5c8c6;
-@define-color dark_5 #c5c8c6;
+@define-color teal_1 #8abeb7;
+@define-color orange_1 #de935f;
+@define-color gray_1 #969896;
+
diff --git a/build/base16-tomorrow.css b/build/base16-tomorrow.css
index 91704b3..f0370ec 100644
--- a/build/base16-tomorrow.css
+++ b/build/base16-tomorrow.css
@@ -1,88 +1,37 @@
 @define-color accent_color #4271ae;
 @define-color accent_bg_color #4271ae;
 @define-color accent_fg_color #ffffff;
-@define-color destructive_color #c82829;
-@define-color destructive_bg_color #c82829;
-@define-color destructive_fg_color #ffffff;
-@define-color success_color #718c00;
-@define-color success_bg_color #718c00;
-@define-color success_fg_color #ffffff;
-@define-color warning_color #8959a8;
-@define-color warning_bg_color #8959a8;
-@define-color warning_fg_color #ffffff;
-@define-color error_color #c82829;
-@define-color error_bg_color #c82829;
-@define-color error_fg_color #ffffff;
+
 @define-color window_bg_color #ffffff;
 @define-color window_fg_color #373b41;
+
 @define-color view_bg_color #ffffff;
 @define-color view_fg_color #373b41;
-@define-color headerbar_bg_color #e0e0e0;
+
+@define-color headerbar_bg_color #ffffff;
 @define-color headerbar_fg_color #373b41;
-@define-color headerbar_border_color rgba(0.87843137, 0.87843137, 0.87843137, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #ffffff;
+@define-color dialog_fg_color #373b41;
+
+@define-color popover_bg_color #ffffff;
+@define-color popover_fg_color #373b41;
+
+
 @define-color sidebar_bg_color #e0e0e0;
 @define-color sidebar_fg_color #373b41;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #e0e0e0;
 @define-color card_fg_color #373b41;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #e0e0e0;
-@define-color dialog_fg_color #373b41;
-@define-color popover_bg_color #e0e0e0;
-@define-color popover_fg_color #373b41;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #c5c8c6;
-@define-color blue_1 #4271ae;
-@define-color blue_2 #4271ae;
-@define-color blue_3 #4271ae;
-@define-color blue_4 #4271ae;
-@define-color blue_5 #4271ae;
-@define-color green_1 #718c00;
-@define-color green_2 #718c00;
-@define-color green_3 #718c00;
-@define-color green_4 #718c00;
-@define-color green_5 #718c00;
-@define-color yellow_1 #eab700;
-@define-color yellow_2 #eab700;
-@define-color yellow_3 #eab700;
-@define-color yellow_4 #eab700;
-@define-color yellow_5 #eab700;
-@define-color orange_1 #f5871f;
-@define-color orange_2 #f5871f;
-@define-color orange_3 #f5871f;
-@define-color orange_4 #f5871f;
-@define-color orange_5 #f5871f;
+
+
 @define-color red_1 #c82829;
-@define-color red_2 #c82829;
-@define-color red_3 #c82829;
-@define-color red_4 #c82829;
-@define-color red_5 #c82829;
+@define-color green_1 #718c00;
+@define-color yellow_1 #eab700;
+@define-color blue_1 #4271ae;
 @define-color purple_1 #8959a8;
-@define-color purple_2 #8959a8;
-@define-color purple_3 #8959a8;
-@define-color purple_4 #8959a8;
-@define-color purple_5 #8959a8;
-@define-color brown_1 #a3685a;
-@define-color brown_2 #a3685a;
-@define-color brown_3 #a3685a;
-@define-color brown_4 #a3685a;
-@define-color brown_5 #a3685a;
-@define-color light_1 #373b41;
-@define-color light_2 #373b41;
-@define-color light_3 #373b41;
-@define-color light_4 #373b41;
-@define-color light_5 #373b41;
-@define-color dark_1 #373b41;
-@define-color dark_2 #373b41;
-@define-color dark_3 #373b41;
-@define-color dark_4 #373b41;
-@define-color dark_5 #373b41;
+@define-color teal_1 #3e999f;
+@define-color orange_1 #f5871f;
+@define-color gray_1 #b4b7b4;
+
diff --git a/build/base16-tube.css b/build/base16-tube.css
index 7148709..112aa4d 100644
--- a/build/base16-tube.css
+++ b/build/base16-tube.css
@@ -1,88 +1,37 @@
 @define-color accent_color #009ddc;
 @define-color accent_bg_color #009ddc;
 @define-color accent_fg_color #231f20;
-@define-color destructive_color #ee2e24;
-@define-color destructive_bg_color #ee2e24;
-@define-color destructive_fg_color #231f20;
-@define-color success_color #00853e;
-@define-color success_bg_color #00853e;
-@define-color success_fg_color #231f20;
-@define-color warning_color #98005d;
-@define-color warning_bg_color #98005d;
-@define-color warning_fg_color #231f20;
-@define-color error_color #ee2e24;
-@define-color error_bg_color #ee2e24;
-@define-color error_fg_color #231f20;
+
 @define-color window_bg_color #231f20;
 @define-color window_fg_color #d9d8d8;
+
 @define-color view_bg_color #231f20;
 @define-color view_fg_color #d9d8d8;
-@define-color headerbar_bg_color #1c3f95;
+
+@define-color headerbar_bg_color #231f20;
 @define-color headerbar_fg_color #d9d8d8;
-@define-color headerbar_border_color rgba(0.10980392, 0.24705882, 0.58431373, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #231f20;
+@define-color dialog_fg_color #d9d8d8;
+
+@define-color popover_bg_color #231f20;
+@define-color popover_fg_color #d9d8d8;
+
+
 @define-color sidebar_bg_color #1c3f95;
 @define-color sidebar_fg_color #d9d8d8;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #1c3f95;
 @define-color card_fg_color #d9d8d8;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #1c3f95;
-@define-color dialog_fg_color #d9d8d8;
-@define-color popover_bg_color #1c3f95;
-@define-color popover_fg_color #d9d8d8;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #5a5758;
-@define-color blue_1 #009ddc;
-@define-color blue_2 #009ddc;
-@define-color blue_3 #009ddc;
-@define-color blue_4 #009ddc;
-@define-color blue_5 #009ddc;
-@define-color green_1 #00853e;
-@define-color green_2 #00853e;
-@define-color green_3 #00853e;
-@define-color green_4 #00853e;
-@define-color green_5 #00853e;
-@define-color yellow_1 #ffd204;
-@define-color yellow_2 #ffd204;
-@define-color yellow_3 #ffd204;
-@define-color yellow_4 #ffd204;
-@define-color yellow_5 #ffd204;
-@define-color orange_1 #f386a1;
-@define-color orange_2 #f386a1;
-@define-color orange_3 #f386a1;
-@define-color orange_4 #f386a1;
-@define-color orange_5 #f386a1;
+
+
 @define-color red_1 #ee2e24;
-@define-color red_2 #ee2e24;
-@define-color red_3 #ee2e24;
-@define-color red_4 #ee2e24;
-@define-color red_5 #ee2e24;
+@define-color green_1 #00853e;
+@define-color yellow_1 #ffd204;
+@define-color blue_1 #009ddc;
 @define-color purple_1 #98005d;
-@define-color purple_2 #98005d;
-@define-color purple_3 #98005d;
-@define-color purple_4 #98005d;
-@define-color purple_5 #98005d;
-@define-color brown_1 #b06110;
-@define-color brown_2 #b06110;
-@define-color brown_3 #b06110;
-@define-color brown_4 #b06110;
-@define-color brown_5 #b06110;
-@define-color light_1 #d9d8d8;
-@define-color light_2 #d9d8d8;
-@define-color light_3 #d9d8d8;
-@define-color light_4 #d9d8d8;
-@define-color light_5 #d9d8d8;
-@define-color dark_1 #d9d8d8;
-@define-color dark_2 #d9d8d8;
-@define-color dark_3 #d9d8d8;
-@define-color dark_4 #d9d8d8;
-@define-color dark_5 #d9d8d8;
+@define-color teal_1 #85cebc;
+@define-color orange_1 #f386a1;
+@define-color gray_1 #737171;
+
diff --git a/build/base16-twilight.css b/build/base16-twilight.css
index b0d5104..b556130 100644
--- a/build/base16-twilight.css
+++ b/build/base16-twilight.css
@@ -1,88 +1,37 @@
 @define-color accent_color #7587a6;
 @define-color accent_bg_color #7587a6;
 @define-color accent_fg_color #1e1e1e;
-@define-color destructive_color #cf6a4c;
-@define-color destructive_bg_color #cf6a4c;
-@define-color destructive_fg_color #1e1e1e;
-@define-color success_color #8f9d6a;
-@define-color success_bg_color #8f9d6a;
-@define-color success_fg_color #1e1e1e;
-@define-color warning_color #9b859d;
-@define-color warning_bg_color #9b859d;
-@define-color warning_fg_color #1e1e1e;
-@define-color error_color #cf6a4c;
-@define-color error_bg_color #cf6a4c;
-@define-color error_fg_color #1e1e1e;
+
 @define-color window_bg_color #1e1e1e;
 @define-color window_fg_color #a7a7a7;
+
 @define-color view_bg_color #1e1e1e;
 @define-color view_fg_color #a7a7a7;
-@define-color headerbar_bg_color #323537;
+
+@define-color headerbar_bg_color #1e1e1e;
 @define-color headerbar_fg_color #a7a7a7;
-@define-color headerbar_border_color rgba(0.19607843, 0.20784314, 0.21568627, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #1e1e1e;
+@define-color dialog_fg_color #a7a7a7;
+
+@define-color popover_bg_color #1e1e1e;
+@define-color popover_fg_color #a7a7a7;
+
+
 @define-color sidebar_bg_color #323537;
 @define-color sidebar_fg_color #a7a7a7;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #323537;
 @define-color card_fg_color #a7a7a7;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #323537;
-@define-color dialog_fg_color #a7a7a7;
-@define-color popover_bg_color #323537;
-@define-color popover_fg_color #a7a7a7;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #464b50;
-@define-color blue_1 #7587a6;
-@define-color blue_2 #7587a6;
-@define-color blue_3 #7587a6;
-@define-color blue_4 #7587a6;
-@define-color blue_5 #7587a6;
-@define-color green_1 #8f9d6a;
-@define-color green_2 #8f9d6a;
-@define-color green_3 #8f9d6a;
-@define-color green_4 #8f9d6a;
-@define-color green_5 #8f9d6a;
-@define-color yellow_1 #f9ee98;
-@define-color yellow_2 #f9ee98;
-@define-color yellow_3 #f9ee98;
-@define-color yellow_4 #f9ee98;
-@define-color yellow_5 #f9ee98;
-@define-color orange_1 #cda869;
-@define-color orange_2 #cda869;
-@define-color orange_3 #cda869;
-@define-color orange_4 #cda869;
-@define-color orange_5 #cda869;
+
+
 @define-color red_1 #cf6a4c;
-@define-color red_2 #cf6a4c;
-@define-color red_3 #cf6a4c;
-@define-color red_4 #cf6a4c;
-@define-color red_5 #cf6a4c;
+@define-color green_1 #8f9d6a;
+@define-color yellow_1 #f9ee98;
+@define-color blue_1 #7587a6;
 @define-color purple_1 #9b859d;
-@define-color purple_2 #9b859d;
-@define-color purple_3 #9b859d;
-@define-color purple_4 #9b859d;
-@define-color purple_5 #9b859d;
-@define-color brown_1 #9b703f;
-@define-color brown_2 #9b703f;
-@define-color brown_3 #9b703f;
-@define-color brown_4 #9b703f;
-@define-color brown_5 #9b703f;
-@define-color light_1 #a7a7a7;
-@define-color light_2 #a7a7a7;
-@define-color light_3 #a7a7a7;
-@define-color light_4 #a7a7a7;
-@define-color light_5 #a7a7a7;
-@define-color dark_1 #a7a7a7;
-@define-color dark_2 #a7a7a7;
-@define-color dark_3 #a7a7a7;
-@define-color dark_4 #a7a7a7;
-@define-color dark_5 #a7a7a7;
+@define-color teal_1 #afc4db;
+@define-color orange_1 #cda869;
+@define-color gray_1 #5f5a60;
+
diff --git a/build/base16-unikitty-dark.css b/build/base16-unikitty-dark.css
index 87a533c..d28972a 100644
--- a/build/base16-unikitty-dark.css
+++ b/build/base16-unikitty-dark.css
@@ -1,88 +1,37 @@
 @define-color accent_color #796af5;
 @define-color accent_bg_color #796af5;
 @define-color accent_fg_color #2e2a31;
-@define-color destructive_color #d8137f;
-@define-color destructive_bg_color #d8137f;
-@define-color destructive_fg_color #2e2a31;
-@define-color success_color #17ad98;
-@define-color success_bg_color #17ad98;
-@define-color success_fg_color #2e2a31;
-@define-color warning_color #bb60ea;
-@define-color warning_bg_color #bb60ea;
-@define-color warning_fg_color #2e2a31;
-@define-color error_color #d8137f;
-@define-color error_bg_color #d8137f;
-@define-color error_fg_color #2e2a31;
+
 @define-color window_bg_color #2e2a31;
 @define-color window_fg_color #bcbabe;
+
 @define-color view_bg_color #2e2a31;
 @define-color view_fg_color #bcbabe;
-@define-color headerbar_bg_color #4a464d;
+
+@define-color headerbar_bg_color #2e2a31;
 @define-color headerbar_fg_color #bcbabe;
-@define-color headerbar_border_color rgba(0.29019608, 0.27450980, 0.30196078, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #2e2a31;
+@define-color dialog_fg_color #bcbabe;
+
+@define-color popover_bg_color #2e2a31;
+@define-color popover_fg_color #bcbabe;
+
+
 @define-color sidebar_bg_color #4a464d;
 @define-color sidebar_fg_color #bcbabe;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #4a464d;
 @define-color card_fg_color #bcbabe;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #4a464d;
-@define-color dialog_fg_color #bcbabe;
-@define-color popover_bg_color #4a464d;
-@define-color popover_fg_color #bcbabe;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #666369;
-@define-color blue_1 #796af5;
-@define-color blue_2 #796af5;
-@define-color blue_3 #796af5;
-@define-color blue_4 #796af5;
-@define-color blue_5 #796af5;
-@define-color green_1 #17ad98;
-@define-color green_2 #17ad98;
-@define-color green_3 #17ad98;
-@define-color green_4 #17ad98;
-@define-color green_5 #17ad98;
-@define-color yellow_1 #dc8a0e;
-@define-color yellow_2 #dc8a0e;
-@define-color yellow_3 #dc8a0e;
-@define-color yellow_4 #dc8a0e;
-@define-color yellow_5 #dc8a0e;
-@define-color orange_1 #d65407;
-@define-color orange_2 #d65407;
-@define-color orange_3 #d65407;
-@define-color orange_4 #d65407;
-@define-color orange_5 #d65407;
+
+
 @define-color red_1 #d8137f;
-@define-color red_2 #d8137f;
-@define-color red_3 #d8137f;
-@define-color red_4 #d8137f;
-@define-color red_5 #d8137f;
+@define-color green_1 #17ad98;
+@define-color yellow_1 #dc8a0e;
+@define-color blue_1 #796af5;
 @define-color purple_1 #bb60ea;
-@define-color purple_2 #bb60ea;
-@define-color purple_3 #bb60ea;
-@define-color purple_4 #bb60ea;
-@define-color purple_5 #bb60ea;
-@define-color brown_1 #c720ca;
-@define-color brown_2 #c720ca;
-@define-color brown_3 #c720ca;
-@define-color brown_4 #c720ca;
-@define-color brown_5 #c720ca;
-@define-color light_1 #bcbabe;
-@define-color light_2 #bcbabe;
-@define-color light_3 #bcbabe;
-@define-color light_4 #bcbabe;
-@define-color light_5 #bcbabe;
-@define-color dark_1 #bcbabe;
-@define-color dark_2 #bcbabe;
-@define-color dark_3 #bcbabe;
-@define-color dark_4 #bcbabe;
-@define-color dark_5 #bcbabe;
+@define-color teal_1 #149bda;
+@define-color orange_1 #d65407;
+@define-color gray_1 #838085;
+
diff --git a/build/base16-unikitty-light.css b/build/base16-unikitty-light.css
index 01a4358..3a9abea 100644
--- a/build/base16-unikitty-light.css
+++ b/build/base16-unikitty-light.css
@@ -1,88 +1,37 @@
 @define-color accent_color #775dff;
 @define-color accent_bg_color #775dff;
 @define-color accent_fg_color #ffffff;
-@define-color destructive_color #d8137f;
-@define-color destructive_bg_color #d8137f;
-@define-color destructive_fg_color #ffffff;
-@define-color success_color #17ad98;
-@define-color success_bg_color #17ad98;
-@define-color success_fg_color #ffffff;
-@define-color warning_color #aa17e6;
-@define-color warning_bg_color #aa17e6;
-@define-color warning_fg_color #ffffff;
-@define-color error_color #d8137f;
-@define-color error_bg_color #d8137f;
-@define-color error_fg_color #ffffff;
+
 @define-color window_bg_color #ffffff;
 @define-color window_fg_color #6c696e;
+
 @define-color view_bg_color #ffffff;
 @define-color view_fg_color #6c696e;
-@define-color headerbar_bg_color #e1e1e2;
+
+@define-color headerbar_bg_color #ffffff;
 @define-color headerbar_fg_color #6c696e;
-@define-color headerbar_border_color rgba(0.88235294, 0.88235294, 0.88627451, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #ffffff;
+@define-color dialog_fg_color #6c696e;
+
+@define-color popover_bg_color #ffffff;
+@define-color popover_fg_color #6c696e;
+
+
 @define-color sidebar_bg_color #e1e1e2;
 @define-color sidebar_fg_color #6c696e;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #e1e1e2;
 @define-color card_fg_color #6c696e;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #e1e1e2;
-@define-color dialog_fg_color #6c696e;
-@define-color popover_bg_color #e1e1e2;
-@define-color popover_fg_color #6c696e;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #c4c3c5;
-@define-color blue_1 #775dff;
-@define-color blue_2 #775dff;
-@define-color blue_3 #775dff;
-@define-color blue_4 #775dff;
-@define-color blue_5 #775dff;
-@define-color green_1 #17ad98;
-@define-color green_2 #17ad98;
-@define-color green_3 #17ad98;
-@define-color green_4 #17ad98;
-@define-color green_5 #17ad98;
-@define-color yellow_1 #dc8a0e;
-@define-color yellow_2 #dc8a0e;
-@define-color yellow_3 #dc8a0e;
-@define-color yellow_4 #dc8a0e;
-@define-color yellow_5 #dc8a0e;
-@define-color orange_1 #d65407;
-@define-color orange_2 #d65407;
-@define-color orange_3 #d65407;
-@define-color orange_4 #d65407;
-@define-color orange_5 #d65407;
+
+
 @define-color red_1 #d8137f;
-@define-color red_2 #d8137f;
-@define-color red_3 #d8137f;
-@define-color red_4 #d8137f;
-@define-color red_5 #d8137f;
+@define-color green_1 #17ad98;
+@define-color yellow_1 #dc8a0e;
+@define-color blue_1 #775dff;
 @define-color purple_1 #aa17e6;
-@define-color purple_2 #aa17e6;
-@define-color purple_3 #aa17e6;
-@define-color purple_4 #aa17e6;
-@define-color purple_5 #aa17e6;
-@define-color brown_1 #e013d0;
-@define-color brown_2 #e013d0;
-@define-color brown_3 #e013d0;
-@define-color brown_4 #e013d0;
-@define-color brown_5 #e013d0;
-@define-color light_1 #6c696e;
-@define-color light_2 #6c696e;
-@define-color light_3 #6c696e;
-@define-color light_4 #6c696e;
-@define-color light_5 #6c696e;
-@define-color dark_1 #6c696e;
-@define-color dark_2 #6c696e;
-@define-color dark_3 #6c696e;
-@define-color dark_4 #6c696e;
-@define-color dark_5 #6c696e;
+@define-color teal_1 #149bda;
+@define-color orange_1 #d65407;
+@define-color gray_1 #a7a5a8;
+
diff --git a/build/base16-unikitty-reversible.css b/build/base16-unikitty-reversible.css
index 096ce97..45e5033 100644
--- a/build/base16-unikitty-reversible.css
+++ b/build/base16-unikitty-reversible.css
@@ -1,88 +1,37 @@
 @define-color accent_color #7864fa;
 @define-color accent_bg_color #7864fa;
 @define-color accent_fg_color #2e2a31;
-@define-color destructive_color #d8137f;
-@define-color destructive_bg_color #d8137f;
-@define-color destructive_fg_color #2e2a31;
-@define-color success_color #17ad98;
-@define-color success_bg_color #17ad98;
-@define-color success_fg_color #2e2a31;
-@define-color warning_color #b33ce8;
-@define-color warning_bg_color #b33ce8;
-@define-color warning_fg_color #2e2a31;
-@define-color error_color #d8137f;
-@define-color error_bg_color #d8137f;
-@define-color error_fg_color #2e2a31;
+
 @define-color window_bg_color #2e2a31;
 @define-color window_fg_color #c3c2c4;
+
 @define-color view_bg_color #2e2a31;
 @define-color view_fg_color #c3c2c4;
-@define-color headerbar_bg_color #4b484e;
+
+@define-color headerbar_bg_color #2e2a31;
 @define-color headerbar_fg_color #c3c2c4;
-@define-color headerbar_border_color rgba(0.29411765, 0.28235294, 0.30588235, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #2e2a31;
+@define-color dialog_fg_color #c3c2c4;
+
+@define-color popover_bg_color #2e2a31;
+@define-color popover_fg_color #c3c2c4;
+
+
 @define-color sidebar_bg_color #4b484e;
 @define-color sidebar_fg_color #c3c2c4;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #4b484e;
 @define-color card_fg_color #c3c2c4;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #4b484e;
-@define-color dialog_fg_color #c3c2c4;
-@define-color popover_bg_color #4b484e;
-@define-color popover_fg_color #c3c2c4;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #69666b;
-@define-color blue_1 #7864fa;
-@define-color blue_2 #7864fa;
-@define-color blue_3 #7864fa;
-@define-color blue_4 #7864fa;
-@define-color blue_5 #7864fa;
-@define-color green_1 #17ad98;
-@define-color green_2 #17ad98;
-@define-color green_3 #17ad98;
-@define-color green_4 #17ad98;
-@define-color green_5 #17ad98;
-@define-color yellow_1 #dc8a0e;
-@define-color yellow_2 #dc8a0e;
-@define-color yellow_3 #dc8a0e;
-@define-color yellow_4 #dc8a0e;
-@define-color yellow_5 #dc8a0e;
-@define-color orange_1 #d65407;
-@define-color orange_2 #d65407;
-@define-color orange_3 #d65407;
-@define-color orange_4 #d65407;
-@define-color orange_5 #d65407;
+
+
 @define-color red_1 #d8137f;
-@define-color red_2 #d8137f;
-@define-color red_3 #d8137f;
-@define-color red_4 #d8137f;
-@define-color red_5 #d8137f;
+@define-color green_1 #17ad98;
+@define-color yellow_1 #dc8a0e;
+@define-color blue_1 #7864fa;
 @define-color purple_1 #b33ce8;
-@define-color purple_2 #b33ce8;
-@define-color purple_3 #b33ce8;
-@define-color purple_4 #b33ce8;
-@define-color purple_5 #b33ce8;
-@define-color brown_1 #d41acd;
-@define-color brown_2 #d41acd;
-@define-color brown_3 #d41acd;
-@define-color brown_4 #d41acd;
-@define-color brown_5 #d41acd;
-@define-color light_1 #c3c2c4;
-@define-color light_2 #c3c2c4;
-@define-color light_3 #c3c2c4;
-@define-color light_4 #c3c2c4;
-@define-color light_5 #c3c2c4;
-@define-color dark_1 #c3c2c4;
-@define-color dark_2 #c3c2c4;
-@define-color dark_3 #c3c2c4;
-@define-color dark_4 #c3c2c4;
-@define-color dark_5 #c3c2c4;
+@define-color teal_1 #149bda;
+@define-color orange_1 #d65407;
+@define-color gray_1 #878589;
+
diff --git a/build/base16-uwunicorn.css b/build/base16-uwunicorn.css
index 38dbf6f..2629cae 100644
--- a/build/base16-uwunicorn.css
+++ b/build/base16-uwunicorn.css
@@ -1,88 +1,37 @@
 @define-color accent_color #6a9eb5;
 @define-color accent_bg_color #6a9eb5;
 @define-color accent_fg_color #241b26;
-@define-color destructive_color #877bb6;
-@define-color destructive_bg_color #877bb6;
-@define-color destructive_fg_color #241b26;
-@define-color success_color #c965bf;
-@define-color success_bg_color #c965bf;
-@define-color success_fg_color #241b26;
-@define-color warning_color #78a38f;
-@define-color warning_bg_color #78a38f;
-@define-color warning_fg_color #241b26;
-@define-color error_color #877bb6;
-@define-color error_bg_color #877bb6;
-@define-color error_fg_color #241b26;
+
 @define-color window_bg_color #241b26;
 @define-color window_fg_color #eed5d9;
+
 @define-color view_bg_color #241b26;
 @define-color view_fg_color #eed5d9;
-@define-color headerbar_bg_color #2f2a3f;
+
+@define-color headerbar_bg_color #241b26;
 @define-color headerbar_fg_color #eed5d9;
-@define-color headerbar_border_color rgba(0.18431373, 0.16470588, 0.24705882, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #241b26;
+@define-color dialog_fg_color #eed5d9;
+
+@define-color popover_bg_color #241b26;
+@define-color popover_fg_color #eed5d9;
+
+
 @define-color sidebar_bg_color #2f2a3f;
 @define-color sidebar_fg_color #eed5d9;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #2f2a3f;
 @define-color card_fg_color #eed5d9;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #2f2a3f;
-@define-color dialog_fg_color #eed5d9;
-@define-color popover_bg_color #2f2a3f;
-@define-color popover_fg_color #eed5d9;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #46354a;
-@define-color blue_1 #6a9eb5;
-@define-color blue_2 #6a9eb5;
-@define-color blue_3 #6a9eb5;
-@define-color blue_4 #6a9eb5;
-@define-color blue_5 #6a9eb5;
-@define-color green_1 #c965bf;
-@define-color green_2 #c965bf;
-@define-color green_3 #c965bf;
-@define-color green_4 #c965bf;
-@define-color green_5 #c965bf;
-@define-color yellow_1 #a84a73;
-@define-color yellow_2 #a84a73;
-@define-color yellow_3 #a84a73;
-@define-color yellow_4 #a84a73;
-@define-color yellow_5 #a84a73;
-@define-color orange_1 #de5b44;
-@define-color orange_2 #de5b44;
-@define-color orange_3 #de5b44;
-@define-color orange_4 #de5b44;
-@define-color orange_5 #de5b44;
+
+
 @define-color red_1 #877bb6;
-@define-color red_2 #877bb6;
-@define-color red_3 #877bb6;
-@define-color red_4 #877bb6;
-@define-color red_5 #877bb6;
+@define-color green_1 #c965bf;
+@define-color yellow_1 #a84a73;
+@define-color blue_1 #6a9eb5;
 @define-color purple_1 #78a38f;
-@define-color purple_2 #78a38f;
-@define-color purple_3 #78a38f;
-@define-color purple_4 #78a38f;
-@define-color purple_5 #78a38f;
-@define-color brown_1 #a3a079;
-@define-color brown_2 #a3a079;
-@define-color brown_3 #a3a079;
-@define-color brown_4 #a3a079;
-@define-color brown_5 #a3a079;
-@define-color light_1 #eed5d9;
-@define-color light_2 #eed5d9;
-@define-color light_3 #eed5d9;
-@define-color light_4 #eed5d9;
-@define-color light_5 #eed5d9;
-@define-color dark_1 #eed5d9;
-@define-color dark_2 #eed5d9;
-@define-color dark_3 #eed5d9;
-@define-color dark_4 #eed5d9;
-@define-color dark_5 #eed5d9;
+@define-color teal_1 #9c5fce;
+@define-color orange_1 #de5b44;
+@define-color gray_1 #6c3cb2;
+
diff --git a/build/base16-valua.css b/build/base16-valua.css
index c84105b..9b8309e 100644
--- a/build/base16-valua.css
+++ b/build/base16-valua.css
@@ -1,88 +1,37 @@
 @define-color accent_color #4ed2d2;
 @define-color accent_bg_color #4ed2d2;
 @define-color accent_fg_color #131f1f;
-@define-color destructive_color #d7586e;
-@define-color destructive_bg_color #d7586e;
-@define-color destructive_fg_color #131f1f;
-@define-color success_color #59d678;
-@define-color success_bg_color #59d678;
-@define-color success_fg_color #131f1f;
-@define-color warning_color #a874e0;
-@define-color warning_bg_color #a874e0;
-@define-color warning_fg_color #131f1f;
-@define-color error_color #d7586e;
-@define-color error_bg_color #d7586e;
-@define-color error_fg_color #131f1f;
+
 @define-color window_bg_color #131f1f;
 @define-color window_fg_color #98c1a3;
+
 @define-color view_bg_color #131f1f;
 @define-color view_fg_color #98c1a3;
-@define-color headerbar_bg_color #213132;
+
+@define-color headerbar_bg_color #131f1f;
 @define-color headerbar_fg_color #98c1a3;
-@define-color headerbar_border_color rgba(0.12941176, 0.19215686, 0.19607843, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #131f1f;
+@define-color dialog_fg_color #98c1a3;
+
+@define-color popover_bg_color #131f1f;
+@define-color popover_fg_color #98c1a3;
+
+
 @define-color sidebar_bg_color #213132;
 @define-color sidebar_fg_color #98c1a3;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #213132;
 @define-color card_fg_color #98c1a3;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #213132;
-@define-color dialog_fg_color #98c1a3;
-@define-color popover_bg_color #213132;
-@define-color popover_fg_color #98c1a3;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #273d3c;
-@define-color blue_1 #4ed2d2;
-@define-color blue_2 #4ed2d2;
-@define-color blue_3 #4ed2d2;
-@define-color blue_4 #4ed2d2;
-@define-color blue_5 #4ed2d2;
-@define-color green_1 #59d678;
-@define-color green_2 #59d678;
-@define-color green_3 #59d678;
-@define-color green_4 #59d678;
-@define-color green_5 #59d678;
-@define-color yellow_1 #dfe754;
-@define-color yellow_2 #dfe754;
-@define-color yellow_3 #dfe754;
-@define-color yellow_4 #dfe754;
-@define-color yellow_5 #dfe754;
-@define-color orange_1 #e6b466;
-@define-color orange_2 #e6b466;
-@define-color orange_3 #e6b466;
-@define-color orange_4 #e6b466;
-@define-color orange_5 #e6b466;
+
+
 @define-color red_1 #d7586e;
-@define-color red_2 #d7586e;
-@define-color red_3 #d7586e;
-@define-color red_4 #d7586e;
-@define-color red_5 #d7586e;
+@define-color green_1 #59d678;
+@define-color yellow_1 #dfe754;
+@define-color blue_1 #4ed2d2;
 @define-color purple_1 #a874e0;
-@define-color purple_2 #a874e0;
-@define-color purple_3 #a874e0;
-@define-color purple_4 #a874e0;
-@define-color purple_5 #a874e0;
-@define-color brown_1 #c05a8f;
-@define-color brown_2 #c05a8f;
-@define-color brown_3 #c05a8f;
-@define-color brown_4 #c05a8f;
-@define-color brown_5 #c05a8f;
-@define-color light_1 #98c1a3;
-@define-color light_2 #98c1a3;
-@define-color light_3 #98c1a3;
-@define-color light_4 #98c1a3;
-@define-color light_5 #98c1a3;
-@define-color dark_1 #98c1a3;
-@define-color dark_2 #98c1a3;
-@define-color dark_3 #98c1a3;
-@define-color dark_4 #98c1a3;
-@define-color dark_5 #98c1a3;
+@define-color teal_1 #76dbd2;
+@define-color orange_1 #e6b466;
+@define-color gray_1 #3e5c53;
+
diff --git a/build/base16-vesper.css b/build/base16-vesper.css
index 6900024..f6f0fff 100644
--- a/build/base16-vesper.css
+++ b/build/base16-vesper.css
@@ -1,88 +1,37 @@
 @define-color accent_color #8eaaaa;
 @define-color accent_bg_color #8eaaaa;
 @define-color accent_fg_color #101010;
-@define-color destructive_color #de6e6e;
-@define-color destructive_bg_color #de6e6e;
-@define-color destructive_fg_color #101010;
-@define-color success_color #5f8787;
-@define-color success_bg_color #5f8787;
-@define-color success_fg_color #101010;
-@define-color warning_color #d69094;
-@define-color warning_bg_color #d69094;
-@define-color warning_fg_color #101010;
-@define-color error_color #de6e6e;
-@define-color error_bg_color #de6e6e;
-@define-color error_fg_color #101010;
+
 @define-color window_bg_color #101010;
 @define-color window_fg_color #b7b7b7;
+
 @define-color view_bg_color #101010;
 @define-color view_fg_color #b7b7b7;
-@define-color headerbar_bg_color #232323;
+
+@define-color headerbar_bg_color #101010;
 @define-color headerbar_fg_color #b7b7b7;
-@define-color headerbar_border_color rgba(0.13725490, 0.13725490, 0.13725490, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #101010;
+@define-color dialog_fg_color #b7b7b7;
+
+@define-color popover_bg_color #101010;
+@define-color popover_fg_color #b7b7b7;
+
+
 @define-color sidebar_bg_color #232323;
 @define-color sidebar_fg_color #b7b7b7;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #232323;
 @define-color card_fg_color #b7b7b7;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #232323;
-@define-color dialog_fg_color #b7b7b7;
-@define-color popover_bg_color #232323;
-@define-color popover_fg_color #b7b7b7;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #222222;
-@define-color blue_1 #8eaaaa;
-@define-color blue_2 #8eaaaa;
-@define-color blue_3 #8eaaaa;
-@define-color blue_4 #8eaaaa;
-@define-color blue_5 #8eaaaa;
-@define-color green_1 #5f8787;
-@define-color green_2 #5f8787;
-@define-color green_3 #5f8787;
-@define-color green_4 #5f8787;
-@define-color green_5 #5f8787;
-@define-color yellow_1 #ffc799;
-@define-color yellow_2 #ffc799;
-@define-color yellow_3 #ffc799;
-@define-color yellow_4 #ffc799;
-@define-color yellow_5 #ffc799;
-@define-color orange_1 #dab083;
-@define-color orange_2 #dab083;
-@define-color orange_3 #dab083;
-@define-color orange_4 #dab083;
-@define-color orange_5 #dab083;
+
+
 @define-color red_1 #de6e6e;
-@define-color red_2 #de6e6e;
-@define-color red_3 #de6e6e;
-@define-color red_4 #de6e6e;
-@define-color red_5 #de6e6e;
+@define-color green_1 #5f8787;
+@define-color yellow_1 #ffc799;
+@define-color blue_1 #8eaaaa;
 @define-color purple_1 #d69094;
-@define-color purple_2 #d69094;
-@define-color purple_3 #d69094;
-@define-color purple_4 #d69094;
-@define-color purple_5 #d69094;
-@define-color brown_1 #876c4f;
-@define-color brown_2 #876c4f;
-@define-color brown_3 #876c4f;
-@define-color brown_4 #876c4f;
-@define-color brown_5 #876c4f;
-@define-color light_1 #b7b7b7;
-@define-color light_2 #b7b7b7;
-@define-color light_3 #b7b7b7;
-@define-color light_4 #b7b7b7;
-@define-color light_5 #b7b7b7;
-@define-color dark_1 #b7b7b7;
-@define-color dark_2 #b7b7b7;
-@define-color dark_3 #b7b7b7;
-@define-color dark_4 #b7b7b7;
-@define-color dark_5 #b7b7b7;
+@define-color teal_1 #60a592;
+@define-color orange_1 #dab083;
+@define-color gray_1 #333333;
+
diff --git a/build/base16-vice.css b/build/base16-vice.css
index 92a7189..960a853 100644
--- a/build/base16-vice.css
+++ b/build/base16-vice.css
@@ -1,88 +1,37 @@
 @define-color accent_color #00eaff;
 @define-color accent_bg_color #00eaff;
 @define-color accent_fg_color #17191e;
-@define-color destructive_color #ff29a8;
-@define-color destructive_bg_color #ff29a8;
-@define-color destructive_fg_color #17191e;
-@define-color success_color #0badff;
-@define-color success_bg_color #0badff;
-@define-color success_fg_color #17191e;
-@define-color warning_color #00f6d9;
-@define-color warning_bg_color #00f6d9;
-@define-color warning_fg_color #17191e;
-@define-color error_color #ff29a8;
-@define-color error_bg_color #ff29a8;
-@define-color error_fg_color #17191e;
+
 @define-color window_bg_color #17191e;
 @define-color window_fg_color #8b9cbe;
+
 @define-color view_bg_color #17191e;
 @define-color view_fg_color #8b9cbe;
-@define-color headerbar_bg_color #22262d;
+
+@define-color headerbar_bg_color #17191e;
 @define-color headerbar_fg_color #8b9cbe;
-@define-color headerbar_border_color rgba(0.13333333, 0.14901961, 0.17647059, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #17191e;
+@define-color dialog_fg_color #8b9cbe;
+
+@define-color popover_bg_color #17191e;
+@define-color popover_fg_color #8b9cbe;
+
+
 @define-color sidebar_bg_color #22262d;
 @define-color sidebar_fg_color #8b9cbe;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #22262d;
 @define-color card_fg_color #8b9cbe;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #22262d;
-@define-color dialog_fg_color #8b9cbe;
-@define-color popover_bg_color #22262d;
-@define-color popover_fg_color #8b9cbe;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #3c3f4c;
-@define-color blue_1 #00eaff;
-@define-color blue_2 #00eaff;
-@define-color blue_3 #00eaff;
-@define-color blue_4 #00eaff;
-@define-color blue_5 #00eaff;
-@define-color green_1 #0badff;
-@define-color green_2 #0badff;
-@define-color green_3 #0badff;
-@define-color green_4 #0badff;
-@define-color green_5 #0badff;
-@define-color yellow_1 #f0ffaa;
-@define-color yellow_2 #f0ffaa;
-@define-color yellow_3 #f0ffaa;
-@define-color yellow_4 #f0ffaa;
-@define-color yellow_5 #f0ffaa;
-@define-color orange_1 #85ffe0;
-@define-color orange_2 #85ffe0;
-@define-color orange_3 #85ffe0;
-@define-color orange_4 #85ffe0;
-@define-color orange_5 #85ffe0;
+
+
 @define-color red_1 #ff29a8;
-@define-color red_2 #ff29a8;
-@define-color red_3 #ff29a8;
-@define-color red_4 #ff29a8;
-@define-color red_5 #ff29a8;
+@define-color green_1 #0badff;
+@define-color yellow_1 #f0ffaa;
+@define-color blue_1 #00eaff;
 @define-color purple_1 #00f6d9;
-@define-color purple_2 #00f6d9;
-@define-color purple_3 #00f6d9;
-@define-color purple_4 #00f6d9;
-@define-color purple_5 #00f6d9;
-@define-color brown_1 #ff3d81;
-@define-color brown_2 #ff3d81;
-@define-color brown_3 #ff3d81;
-@define-color brown_4 #ff3d81;
-@define-color brown_5 #ff3d81;
-@define-color light_1 #8b9cbe;
-@define-color light_2 #8b9cbe;
-@define-color light_3 #8b9cbe;
-@define-color light_4 #8b9cbe;
-@define-color light_5 #8b9cbe;
-@define-color dark_1 #8b9cbe;
-@define-color dark_2 #8b9cbe;
-@define-color dark_3 #8b9cbe;
-@define-color dark_4 #8b9cbe;
-@define-color dark_5 #8b9cbe;
+@define-color teal_1 #8265ff;
+@define-color orange_1 #85ffe0;
+@define-color gray_1 #383a47;
+
diff --git a/build/base16-vulcan.css b/build/base16-vulcan.css
index 2bff1e5..814f1df 100644
--- a/build/base16-vulcan.css
+++ b/build/base16-vulcan.css
@@ -1,88 +1,37 @@
 @define-color accent_color #977d7c;
 @define-color accent_bg_color #977d7c;
 @define-color accent_fg_color #041523;
-@define-color destructive_color #818591;
-@define-color destructive_bg_color #818591;
-@define-color destructive_fg_color #041523;
-@define-color success_color #977d7c;
-@define-color success_bg_color #977d7c;
-@define-color success_fg_color #041523;
-@define-color warning_color #9198a3;
-@define-color warning_bg_color #9198a3;
-@define-color warning_fg_color #041523;
-@define-color error_color #818591;
-@define-color error_bg_color #818591;
-@define-color error_fg_color #041523;
+
 @define-color window_bg_color #041523;
 @define-color window_fg_color #5b778c;
+
 @define-color view_bg_color #041523;
 @define-color view_fg_color #5b778c;
-@define-color headerbar_bg_color #122339;
+
+@define-color headerbar_bg_color #041523;
 @define-color headerbar_fg_color #5b778c;
-@define-color headerbar_border_color rgba(0.07058824, 0.13725490, 0.22352941, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #041523;
+@define-color dialog_fg_color #5b778c;
+
+@define-color popover_bg_color #041523;
+@define-color popover_fg_color #5b778c;
+
+
 @define-color sidebar_bg_color #122339;
 @define-color sidebar_fg_color #5b778c;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #122339;
 @define-color card_fg_color #5b778c;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #122339;
-@define-color dialog_fg_color #5b778c;
-@define-color popover_bg_color #122339;
-@define-color popover_fg_color #5b778c;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #003552;
-@define-color blue_1 #977d7c;
-@define-color blue_2 #977d7c;
-@define-color blue_3 #977d7c;
-@define-color blue_4 #977d7c;
-@define-color blue_5 #977d7c;
-@define-color green_1 #977d7c;
-@define-color green_2 #977d7c;
-@define-color green_3 #977d7c;
-@define-color green_4 #977d7c;
-@define-color green_5 #977d7c;
-@define-color yellow_1 #adb4b9;
-@define-color yellow_2 #adb4b9;
-@define-color yellow_3 #adb4b9;
-@define-color yellow_4 #adb4b9;
-@define-color yellow_5 #adb4b9;
-@define-color orange_1 #9198a3;
-@define-color orange_2 #9198a3;
-@define-color orange_3 #9198a3;
-@define-color orange_4 #9198a3;
-@define-color orange_5 #9198a3;
+
+
 @define-color red_1 #818591;
-@define-color red_2 #818591;
-@define-color red_3 #818591;
-@define-color red_4 #818591;
-@define-color red_5 #818591;
+@define-color green_1 #977d7c;
+@define-color yellow_1 #adb4b9;
+@define-color blue_1 #977d7c;
 @define-color purple_1 #9198a3;
-@define-color purple_2 #9198a3;
-@define-color purple_3 #9198a3;
-@define-color purple_4 #9198a3;
-@define-color purple_5 #9198a3;
-@define-color brown_1 #977d7c;
-@define-color brown_2 #977d7c;
-@define-color brown_3 #977d7c;
-@define-color brown_4 #977d7c;
-@define-color brown_5 #977d7c;
-@define-color light_1 #5b778c;
-@define-color light_2 #5b778c;
-@define-color light_3 #5b778c;
-@define-color light_4 #5b778c;
-@define-color light_5 #5b778c;
-@define-color dark_1 #5b778c;
-@define-color dark_2 #5b778c;
-@define-color dark_3 #5b778c;
-@define-color dark_4 #5b778c;
-@define-color dark_5 #5b778c;
+@define-color teal_1 #977d7c;
+@define-color orange_1 #9198a3;
+@define-color gray_1 #7a5759;
+
diff --git a/build/base16-windows-10-light.css b/build/base16-windows-10-light.css
index 06fc304..7766a57 100644
--- a/build/base16-windows-10-light.css
+++ b/build/base16-windows-10-light.css
@@ -1,88 +1,37 @@
 @define-color accent_color #0037da;
 @define-color accent_bg_color #0037da;
 @define-color accent_fg_color #f2f2f2;
-@define-color destructive_color #c50f1f;
-@define-color destructive_bg_color #c50f1f;
-@define-color destructive_fg_color #f2f2f2;
-@define-color success_color #13a10e;
-@define-color success_bg_color #13a10e;
-@define-color success_fg_color #f2f2f2;
-@define-color warning_color #881798;
-@define-color warning_bg_color #881798;
-@define-color warning_fg_color #f2f2f2;
-@define-color error_color #c50f1f;
-@define-color error_bg_color #c50f1f;
-@define-color error_fg_color #f2f2f2;
+
 @define-color window_bg_color #f2f2f2;
 @define-color window_fg_color #767676;
+
 @define-color view_bg_color #f2f2f2;
 @define-color view_fg_color #767676;
-@define-color headerbar_bg_color #e5e5e5;
+
+@define-color headerbar_bg_color #f2f2f2;
 @define-color headerbar_fg_color #767676;
-@define-color headerbar_border_color rgba(0.89803922, 0.89803922, 0.89803922, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #f2f2f2;
+@define-color dialog_fg_color #767676;
+
+@define-color popover_bg_color #f2f2f2;
+@define-color popover_fg_color #767676;
+
+
 @define-color sidebar_bg_color #e5e5e5;
 @define-color sidebar_fg_color #767676;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #e5e5e5;
 @define-color card_fg_color #767676;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #e5e5e5;
-@define-color dialog_fg_color #767676;
-@define-color popover_bg_color #e5e5e5;
-@define-color popover_fg_color #767676;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #d9d9d9;
-@define-color blue_1 #0037da;
-@define-color blue_2 #0037da;
-@define-color blue_3 #0037da;
-@define-color blue_4 #0037da;
-@define-color blue_5 #0037da;
-@define-color green_1 #13a10e;
-@define-color green_2 #13a10e;
-@define-color green_3 #13a10e;
-@define-color green_4 #13a10e;
-@define-color green_5 #13a10e;
-@define-color yellow_1 #c19c00;
-@define-color yellow_2 #c19c00;
-@define-color yellow_3 #c19c00;
-@define-color yellow_4 #c19c00;
-@define-color yellow_5 #c19c00;
-@define-color orange_1 #f9f1a5;
-@define-color orange_2 #f9f1a5;
-@define-color orange_3 #f9f1a5;
-@define-color orange_4 #f9f1a5;
-@define-color orange_5 #f9f1a5;
+
+
 @define-color red_1 #c50f1f;
-@define-color red_2 #c50f1f;
-@define-color red_3 #c50f1f;
-@define-color red_4 #c50f1f;
-@define-color red_5 #c50f1f;
+@define-color green_1 #13a10e;
+@define-color yellow_1 #c19c00;
+@define-color blue_1 #0037da;
 @define-color purple_1 #881798;
-@define-color purple_2 #881798;
-@define-color purple_3 #881798;
-@define-color purple_4 #881798;
-@define-color purple_5 #881798;
-@define-color brown_1 #16c60c;
-@define-color brown_2 #16c60c;
-@define-color brown_3 #16c60c;
-@define-color brown_4 #16c60c;
-@define-color brown_5 #16c60c;
-@define-color light_1 #767676;
-@define-color light_2 #767676;
-@define-color light_3 #767676;
-@define-color light_4 #767676;
-@define-color light_5 #767676;
-@define-color dark_1 #767676;
-@define-color dark_2 #767676;
-@define-color dark_3 #767676;
-@define-color dark_4 #767676;
-@define-color dark_5 #767676;
+@define-color teal_1 #3a96dd;
+@define-color orange_1 #f9f1a5;
+@define-color gray_1 #cccccc;
+
diff --git a/build/base16-windows-10.css b/build/base16-windows-10.css
index 8d58ed2..87c0167 100644
--- a/build/base16-windows-10.css
+++ b/build/base16-windows-10.css
@@ -1,88 +1,37 @@
 @define-color accent_color #3b78ff;
 @define-color accent_bg_color #3b78ff;
 @define-color accent_fg_color #0c0c0c;
-@define-color destructive_color #e74856;
-@define-color destructive_bg_color #e74856;
-@define-color destructive_fg_color #0c0c0c;
-@define-color success_color #16c60c;
-@define-color success_bg_color #16c60c;
-@define-color success_fg_color #0c0c0c;
-@define-color warning_color #b4009e;
-@define-color warning_bg_color #b4009e;
-@define-color warning_fg_color #0c0c0c;
-@define-color error_color #e74856;
-@define-color error_bg_color #e74856;
-@define-color error_fg_color #0c0c0c;
+
 @define-color window_bg_color #0c0c0c;
 @define-color window_fg_color #cccccc;
+
 @define-color view_bg_color #0c0c0c;
 @define-color view_fg_color #cccccc;
-@define-color headerbar_bg_color #2f2f2f;
+
+@define-color headerbar_bg_color #0c0c0c;
 @define-color headerbar_fg_color #cccccc;
-@define-color headerbar_border_color rgba(0.18431373, 0.18431373, 0.18431373, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #0c0c0c;
+@define-color dialog_fg_color #cccccc;
+
+@define-color popover_bg_color #0c0c0c;
+@define-color popover_fg_color #cccccc;
+
+
 @define-color sidebar_bg_color #2f2f2f;
 @define-color sidebar_fg_color #cccccc;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #2f2f2f;
 @define-color card_fg_color #cccccc;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #2f2f2f;
-@define-color dialog_fg_color #cccccc;
-@define-color popover_bg_color #2f2f2f;
-@define-color popover_fg_color #cccccc;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #535353;
-@define-color blue_1 #3b78ff;
-@define-color blue_2 #3b78ff;
-@define-color blue_3 #3b78ff;
-@define-color blue_4 #3b78ff;
-@define-color blue_5 #3b78ff;
-@define-color green_1 #16c60c;
-@define-color green_2 #16c60c;
-@define-color green_3 #16c60c;
-@define-color green_4 #16c60c;
-@define-color green_5 #16c60c;
-@define-color yellow_1 #f9f1a5;
-@define-color yellow_2 #f9f1a5;
-@define-color yellow_3 #f9f1a5;
-@define-color yellow_4 #f9f1a5;
-@define-color yellow_5 #f9f1a5;
-@define-color orange_1 #c19c00;
-@define-color orange_2 #c19c00;
-@define-color orange_3 #c19c00;
-@define-color orange_4 #c19c00;
-@define-color orange_5 #c19c00;
+
+
 @define-color red_1 #e74856;
-@define-color red_2 #e74856;
-@define-color red_3 #e74856;
-@define-color red_4 #e74856;
-@define-color red_5 #e74856;
+@define-color green_1 #16c60c;
+@define-color yellow_1 #f9f1a5;
+@define-color blue_1 #3b78ff;
 @define-color purple_1 #b4009e;
-@define-color purple_2 #b4009e;
-@define-color purple_3 #b4009e;
-@define-color purple_4 #b4009e;
-@define-color purple_5 #b4009e;
-@define-color brown_1 #13a10e;
-@define-color brown_2 #13a10e;
-@define-color brown_3 #13a10e;
-@define-color brown_4 #13a10e;
-@define-color brown_5 #13a10e;
-@define-color light_1 #cccccc;
-@define-color light_2 #cccccc;
-@define-color light_3 #cccccc;
-@define-color light_4 #cccccc;
-@define-color light_5 #cccccc;
-@define-color dark_1 #cccccc;
-@define-color dark_2 #cccccc;
-@define-color dark_3 #cccccc;
-@define-color dark_4 #cccccc;
-@define-color dark_5 #cccccc;
+@define-color teal_1 #61d6d6;
+@define-color orange_1 #c19c00;
+@define-color gray_1 #767676;
+
diff --git a/build/base16-windows-95-light.css b/build/base16-windows-95-light.css
index dc209e0..938dd21 100644
--- a/build/base16-windows-95-light.css
+++ b/build/base16-windows-95-light.css
@@ -1,88 +1,37 @@
 @define-color accent_color #0000a8;
 @define-color accent_bg_color #0000a8;
 @define-color accent_fg_color #fcfcfc;
-@define-color destructive_color #a80000;
-@define-color destructive_bg_color #a80000;
-@define-color destructive_fg_color #fcfcfc;
-@define-color success_color #00a800;
-@define-color success_bg_color #00a800;
-@define-color success_fg_color #fcfcfc;
-@define-color warning_color #a800a8;
-@define-color warning_bg_color #a800a8;
-@define-color warning_fg_color #fcfcfc;
-@define-color error_color #a80000;
-@define-color error_bg_color #a80000;
-@define-color error_fg_color #fcfcfc;
+
 @define-color window_bg_color #fcfcfc;
 @define-color window_fg_color #545454;
+
 @define-color view_bg_color #fcfcfc;
 @define-color view_fg_color #545454;
-@define-color headerbar_bg_color #e0e0e0;
+
+@define-color headerbar_bg_color #fcfcfc;
 @define-color headerbar_fg_color #545454;
-@define-color headerbar_border_color rgba(0.87843137, 0.87843137, 0.87843137, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #fcfcfc;
+@define-color dialog_fg_color #545454;
+
+@define-color popover_bg_color #fcfcfc;
+@define-color popover_fg_color #545454;
+
+
 @define-color sidebar_bg_color #e0e0e0;
 @define-color sidebar_fg_color #545454;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #e0e0e0;
 @define-color card_fg_color #545454;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #e0e0e0;
-@define-color dialog_fg_color #545454;
-@define-color popover_bg_color #e0e0e0;
-@define-color popover_fg_color #545454;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #c4c4c4;
-@define-color blue_1 #0000a8;
-@define-color blue_2 #0000a8;
-@define-color blue_3 #0000a8;
-@define-color blue_4 #0000a8;
-@define-color blue_5 #0000a8;
-@define-color green_1 #00a800;
-@define-color green_2 #00a800;
-@define-color green_3 #00a800;
-@define-color green_4 #00a800;
-@define-color green_5 #00a800;
-@define-color yellow_1 #a85400;
-@define-color yellow_2 #a85400;
-@define-color yellow_3 #a85400;
-@define-color yellow_4 #a85400;
-@define-color yellow_5 #a85400;
-@define-color orange_1 #fcfc54;
-@define-color orange_2 #fcfc54;
-@define-color orange_3 #fcfc54;
-@define-color orange_4 #fcfc54;
-@define-color orange_5 #fcfc54;
+
+
 @define-color red_1 #a80000;
-@define-color red_2 #a80000;
-@define-color red_3 #a80000;
-@define-color red_4 #a80000;
-@define-color red_5 #a80000;
+@define-color green_1 #00a800;
+@define-color yellow_1 #a85400;
+@define-color blue_1 #0000a8;
 @define-color purple_1 #a800a8;
-@define-color purple_2 #a800a8;
-@define-color purple_3 #a800a8;
-@define-color purple_4 #a800a8;
-@define-color purple_5 #a800a8;
-@define-color brown_1 #54fc54;
-@define-color brown_2 #54fc54;
-@define-color brown_3 #54fc54;
-@define-color brown_4 #54fc54;
-@define-color brown_5 #54fc54;
-@define-color light_1 #545454;
-@define-color light_2 #545454;
-@define-color light_3 #545454;
-@define-color light_4 #545454;
-@define-color light_5 #545454;
-@define-color dark_1 #545454;
-@define-color dark_2 #545454;
-@define-color dark_3 #545454;
-@define-color dark_4 #545454;
-@define-color dark_5 #545454;
+@define-color teal_1 #00a8a8;
+@define-color orange_1 #fcfc54;
+@define-color gray_1 #a8a8a8;
+
diff --git a/build/base16-windows-95.css b/build/base16-windows-95.css
index c627c85..a91b399 100644
--- a/build/base16-windows-95.css
+++ b/build/base16-windows-95.css
@@ -1,88 +1,37 @@
 @define-color accent_color #5454fc;
 @define-color accent_bg_color #5454fc;
 @define-color accent_fg_color #000000;
-@define-color destructive_color #fc5454;
-@define-color destructive_bg_color #fc5454;
-@define-color destructive_fg_color #000000;
-@define-color success_color #54fc54;
-@define-color success_bg_color #54fc54;
-@define-color success_fg_color #000000;
-@define-color warning_color #fc54fc;
-@define-color warning_bg_color #fc54fc;
-@define-color warning_fg_color #000000;
-@define-color error_color #fc5454;
-@define-color error_bg_color #fc5454;
-@define-color error_fg_color #000000;
+
 @define-color window_bg_color #000000;
 @define-color window_fg_color #a8a8a8;
+
 @define-color view_bg_color #000000;
 @define-color view_fg_color #a8a8a8;
-@define-color headerbar_bg_color #1c1c1c;
+
+@define-color headerbar_bg_color #000000;
 @define-color headerbar_fg_color #a8a8a8;
-@define-color headerbar_border_color rgba(0.10980392, 0.10980392, 0.10980392, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #000000;
+@define-color dialog_fg_color #a8a8a8;
+
+@define-color popover_bg_color #000000;
+@define-color popover_fg_color #a8a8a8;
+
+
 @define-color sidebar_bg_color #1c1c1c;
 @define-color sidebar_fg_color #a8a8a8;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #1c1c1c;
 @define-color card_fg_color #a8a8a8;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #1c1c1c;
-@define-color dialog_fg_color #a8a8a8;
-@define-color popover_bg_color #1c1c1c;
-@define-color popover_fg_color #a8a8a8;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #383838;
-@define-color blue_1 #5454fc;
-@define-color blue_2 #5454fc;
-@define-color blue_3 #5454fc;
-@define-color blue_4 #5454fc;
-@define-color blue_5 #5454fc;
-@define-color green_1 #54fc54;
-@define-color green_2 #54fc54;
-@define-color green_3 #54fc54;
-@define-color green_4 #54fc54;
-@define-color green_5 #54fc54;
-@define-color yellow_1 #fcfc54;
-@define-color yellow_2 #fcfc54;
-@define-color yellow_3 #fcfc54;
-@define-color yellow_4 #fcfc54;
-@define-color yellow_5 #fcfc54;
-@define-color orange_1 #a85400;
-@define-color orange_2 #a85400;
-@define-color orange_3 #a85400;
-@define-color orange_4 #a85400;
-@define-color orange_5 #a85400;
+
+
 @define-color red_1 #fc5454;
-@define-color red_2 #fc5454;
-@define-color red_3 #fc5454;
-@define-color red_4 #fc5454;
-@define-color red_5 #fc5454;
+@define-color green_1 #54fc54;
+@define-color yellow_1 #fcfc54;
+@define-color blue_1 #5454fc;
 @define-color purple_1 #fc54fc;
-@define-color purple_2 #fc54fc;
-@define-color purple_3 #fc54fc;
-@define-color purple_4 #fc54fc;
-@define-color purple_5 #fc54fc;
-@define-color brown_1 #00a800;
-@define-color brown_2 #00a800;
-@define-color brown_3 #00a800;
-@define-color brown_4 #00a800;
-@define-color brown_5 #00a800;
-@define-color light_1 #a8a8a8;
-@define-color light_2 #a8a8a8;
-@define-color light_3 #a8a8a8;
-@define-color light_4 #a8a8a8;
-@define-color light_5 #a8a8a8;
-@define-color dark_1 #a8a8a8;
-@define-color dark_2 #a8a8a8;
-@define-color dark_3 #a8a8a8;
-@define-color dark_4 #a8a8a8;
-@define-color dark_5 #a8a8a8;
+@define-color teal_1 #54fcfc;
+@define-color orange_1 #a85400;
+@define-color gray_1 #545454;
+
diff --git a/build/base16-windows-highcontrast-light.css b/build/base16-windows-highcontrast-light.css
index 477b0f5..f775f0e 100644
--- a/build/base16-windows-highcontrast-light.css
+++ b/build/base16-windows-highcontrast-light.css
@@ -1,88 +1,37 @@
 @define-color accent_color #000080;
 @define-color accent_bg_color #000080;
 @define-color accent_fg_color #fcfcfc;
-@define-color destructive_color #800000;
-@define-color destructive_bg_color #800000;
-@define-color destructive_fg_color #fcfcfc;
-@define-color success_color #008000;
-@define-color success_bg_color #008000;
-@define-color success_fg_color #fcfcfc;
-@define-color warning_color #800080;
-@define-color warning_bg_color #800080;
-@define-color warning_fg_color #fcfcfc;
-@define-color error_color #800000;
-@define-color error_bg_color #800000;
-@define-color error_fg_color #fcfcfc;
+
 @define-color window_bg_color #fcfcfc;
 @define-color window_fg_color #545454;
+
 @define-color view_bg_color #fcfcfc;
 @define-color view_fg_color #545454;
-@define-color headerbar_bg_color #e8e8e8;
+
+@define-color headerbar_bg_color #fcfcfc;
 @define-color headerbar_fg_color #545454;
-@define-color headerbar_border_color rgba(0.90980392, 0.90980392, 0.90980392, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #fcfcfc;
+@define-color dialog_fg_color #545454;
+
+@define-color popover_bg_color #fcfcfc;
+@define-color popover_fg_color #545454;
+
+
 @define-color sidebar_bg_color #e8e8e8;
 @define-color sidebar_fg_color #545454;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #e8e8e8;
 @define-color card_fg_color #545454;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #e8e8e8;
-@define-color dialog_fg_color #545454;
-@define-color popover_bg_color #e8e8e8;
-@define-color popover_fg_color #545454;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #d4d4d4;
-@define-color blue_1 #000080;
-@define-color blue_2 #000080;
-@define-color blue_3 #000080;
-@define-color blue_4 #000080;
-@define-color blue_5 #000080;
-@define-color green_1 #008000;
-@define-color green_2 #008000;
-@define-color green_3 #008000;
-@define-color green_4 #008000;
-@define-color green_5 #008000;
-@define-color yellow_1 #808000;
-@define-color yellow_2 #808000;
-@define-color yellow_3 #808000;
-@define-color yellow_4 #808000;
-@define-color yellow_5 #808000;
-@define-color orange_1 #fcfc54;
-@define-color orange_2 #fcfc54;
-@define-color orange_3 #fcfc54;
-@define-color orange_4 #fcfc54;
-@define-color orange_5 #fcfc54;
+
+
 @define-color red_1 #800000;
-@define-color red_2 #800000;
-@define-color red_3 #800000;
-@define-color red_4 #800000;
-@define-color red_5 #800000;
+@define-color green_1 #008000;
+@define-color yellow_1 #808000;
+@define-color blue_1 #000080;
 @define-color purple_1 #800080;
-@define-color purple_2 #800080;
-@define-color purple_3 #800080;
-@define-color purple_4 #800080;
-@define-color purple_5 #800080;
-@define-color brown_1 #54fc54;
-@define-color brown_2 #54fc54;
-@define-color brown_3 #54fc54;
-@define-color brown_4 #54fc54;
-@define-color brown_5 #54fc54;
-@define-color light_1 #545454;
-@define-color light_2 #545454;
-@define-color light_3 #545454;
-@define-color light_4 #545454;
-@define-color light_5 #545454;
-@define-color dark_1 #545454;
-@define-color dark_2 #545454;
-@define-color dark_3 #545454;
-@define-color dark_4 #545454;
-@define-color dark_5 #545454;
+@define-color teal_1 #008080;
+@define-color orange_1 #fcfc54;
+@define-color gray_1 #c0c0c0;
+
diff --git a/build/base16-windows-highcontrast.css b/build/base16-windows-highcontrast.css
index d923f19..1698227 100644
--- a/build/base16-windows-highcontrast.css
+++ b/build/base16-windows-highcontrast.css
@@ -1,88 +1,37 @@
 @define-color accent_color #5454fc;
 @define-color accent_bg_color #5454fc;
 @define-color accent_fg_color #000000;
-@define-color destructive_color #fc5454;
-@define-color destructive_bg_color #fc5454;
-@define-color destructive_fg_color #000000;
-@define-color success_color #54fc54;
-@define-color success_bg_color #54fc54;
-@define-color success_fg_color #000000;
-@define-color warning_color #fc54fc;
-@define-color warning_bg_color #fc54fc;
-@define-color warning_fg_color #000000;
-@define-color error_color #fc5454;
-@define-color error_bg_color #fc5454;
-@define-color error_fg_color #000000;
+
 @define-color window_bg_color #000000;
 @define-color window_fg_color #c0c0c0;
+
 @define-color view_bg_color #000000;
 @define-color view_fg_color #c0c0c0;
-@define-color headerbar_bg_color #1c1c1c;
+
+@define-color headerbar_bg_color #000000;
 @define-color headerbar_fg_color #c0c0c0;
-@define-color headerbar_border_color rgba(0.10980392, 0.10980392, 0.10980392, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #000000;
+@define-color dialog_fg_color #c0c0c0;
+
+@define-color popover_bg_color #000000;
+@define-color popover_fg_color #c0c0c0;
+
+
 @define-color sidebar_bg_color #1c1c1c;
 @define-color sidebar_fg_color #c0c0c0;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #1c1c1c;
 @define-color card_fg_color #c0c0c0;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #1c1c1c;
-@define-color dialog_fg_color #c0c0c0;
-@define-color popover_bg_color #1c1c1c;
-@define-color popover_fg_color #c0c0c0;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #383838;
-@define-color blue_1 #5454fc;
-@define-color blue_2 #5454fc;
-@define-color blue_3 #5454fc;
-@define-color blue_4 #5454fc;
-@define-color blue_5 #5454fc;
-@define-color green_1 #54fc54;
-@define-color green_2 #54fc54;
-@define-color green_3 #54fc54;
-@define-color green_4 #54fc54;
-@define-color green_5 #54fc54;
-@define-color yellow_1 #fcfc54;
-@define-color yellow_2 #fcfc54;
-@define-color yellow_3 #fcfc54;
-@define-color yellow_4 #fcfc54;
-@define-color yellow_5 #fcfc54;
-@define-color orange_1 #808000;
-@define-color orange_2 #808000;
-@define-color orange_3 #808000;
-@define-color orange_4 #808000;
-@define-color orange_5 #808000;
+
+
 @define-color red_1 #fc5454;
-@define-color red_2 #fc5454;
-@define-color red_3 #fc5454;
-@define-color red_4 #fc5454;
-@define-color red_5 #fc5454;
+@define-color green_1 #54fc54;
+@define-color yellow_1 #fcfc54;
+@define-color blue_1 #5454fc;
 @define-color purple_1 #fc54fc;
-@define-color purple_2 #fc54fc;
-@define-color purple_3 #fc54fc;
-@define-color purple_4 #fc54fc;
-@define-color purple_5 #fc54fc;
-@define-color brown_1 #008000;
-@define-color brown_2 #008000;
-@define-color brown_3 #008000;
-@define-color brown_4 #008000;
-@define-color brown_5 #008000;
-@define-color light_1 #c0c0c0;
-@define-color light_2 #c0c0c0;
-@define-color light_3 #c0c0c0;
-@define-color light_4 #c0c0c0;
-@define-color light_5 #c0c0c0;
-@define-color dark_1 #c0c0c0;
-@define-color dark_2 #c0c0c0;
-@define-color dark_3 #c0c0c0;
-@define-color dark_4 #c0c0c0;
-@define-color dark_5 #c0c0c0;
+@define-color teal_1 #54fcfc;
+@define-color orange_1 #808000;
+@define-color gray_1 #545454;
+
diff --git a/build/base16-windows-nt-light.css b/build/base16-windows-nt-light.css
index 14fbab8..2669b79 100644
--- a/build/base16-windows-nt-light.css
+++ b/build/base16-windows-nt-light.css
@@ -1,88 +1,37 @@
 @define-color accent_color #000080;
 @define-color accent_bg_color #000080;
 @define-color accent_fg_color #ffffff;
-@define-color destructive_color #800000;
-@define-color destructive_bg_color #800000;
-@define-color destructive_fg_color #ffffff;
-@define-color success_color #008000;
-@define-color success_bg_color #008000;
-@define-color success_fg_color #ffffff;
-@define-color warning_color #800080;
-@define-color warning_bg_color #800080;
-@define-color warning_fg_color #ffffff;
-@define-color error_color #800000;
-@define-color error_bg_color #800000;
-@define-color error_fg_color #ffffff;
+
 @define-color window_bg_color #ffffff;
 @define-color window_fg_color #808080;
+
 @define-color view_bg_color #ffffff;
 @define-color view_fg_color #808080;
-@define-color headerbar_bg_color #eaeaea;
+
+@define-color headerbar_bg_color #ffffff;
 @define-color headerbar_fg_color #808080;
-@define-color headerbar_border_color rgba(0.91764706, 0.91764706, 0.91764706, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #ffffff;
+@define-color dialog_fg_color #808080;
+
+@define-color popover_bg_color #ffffff;
+@define-color popover_fg_color #808080;
+
+
 @define-color sidebar_bg_color #eaeaea;
 @define-color sidebar_fg_color #808080;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #eaeaea;
 @define-color card_fg_color #808080;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #eaeaea;
-@define-color dialog_fg_color #808080;
-@define-color popover_bg_color #eaeaea;
-@define-color popover_fg_color #808080;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #d5d5d5;
-@define-color blue_1 #000080;
-@define-color blue_2 #000080;
-@define-color blue_3 #000080;
-@define-color blue_4 #000080;
-@define-color blue_5 #000080;
-@define-color green_1 #008000;
-@define-color green_2 #008000;
-@define-color green_3 #008000;
-@define-color green_4 #008000;
-@define-color green_5 #008000;
-@define-color yellow_1 #808000;
-@define-color yellow_2 #808000;
-@define-color yellow_3 #808000;
-@define-color yellow_4 #808000;
-@define-color yellow_5 #808000;
-@define-color orange_1 #ffff00;
-@define-color orange_2 #ffff00;
-@define-color orange_3 #ffff00;
-@define-color orange_4 #ffff00;
-@define-color orange_5 #ffff00;
+
+
 @define-color red_1 #800000;
-@define-color red_2 #800000;
-@define-color red_3 #800000;
-@define-color red_4 #800000;
-@define-color red_5 #800000;
+@define-color green_1 #008000;
+@define-color yellow_1 #808000;
+@define-color blue_1 #000080;
 @define-color purple_1 #800080;
-@define-color purple_2 #800080;
-@define-color purple_3 #800080;
-@define-color purple_4 #800080;
-@define-color purple_5 #800080;
-@define-color brown_1 #00ff00;
-@define-color brown_2 #00ff00;
-@define-color brown_3 #00ff00;
-@define-color brown_4 #00ff00;
-@define-color brown_5 #00ff00;
-@define-color light_1 #808080;
-@define-color light_2 #808080;
-@define-color light_3 #808080;
-@define-color light_4 #808080;
-@define-color light_5 #808080;
-@define-color dark_1 #808080;
-@define-color dark_2 #808080;
-@define-color dark_3 #808080;
-@define-color dark_4 #808080;
-@define-color dark_5 #808080;
+@define-color teal_1 #008080;
+@define-color orange_1 #ffff00;
+@define-color gray_1 #c0c0c0;
+
diff --git a/build/base16-windows-nt.css b/build/base16-windows-nt.css
index 9e1b137..57cf0ef 100644
--- a/build/base16-windows-nt.css
+++ b/build/base16-windows-nt.css
@@ -1,88 +1,37 @@
 @define-color accent_color #0000ff;
 @define-color accent_bg_color #0000ff;
 @define-color accent_fg_color #000000;
-@define-color destructive_color #ff0000;
-@define-color destructive_bg_color #ff0000;
-@define-color destructive_fg_color #000000;
-@define-color success_color #00ff00;
-@define-color success_bg_color #00ff00;
-@define-color success_fg_color #000000;
-@define-color warning_color #ff00ff;
-@define-color warning_bg_color #ff00ff;
-@define-color warning_fg_color #000000;
-@define-color error_color #ff0000;
-@define-color error_bg_color #ff0000;
-@define-color error_fg_color #000000;
+
 @define-color window_bg_color #000000;
 @define-color window_fg_color #c0c0c0;
+
 @define-color view_bg_color #000000;
 @define-color view_fg_color #c0c0c0;
-@define-color headerbar_bg_color #2a2a2a;
+
+@define-color headerbar_bg_color #000000;
 @define-color headerbar_fg_color #c0c0c0;
-@define-color headerbar_border_color rgba(0.16470588, 0.16470588, 0.16470588, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #000000;
+@define-color dialog_fg_color #c0c0c0;
+
+@define-color popover_bg_color #000000;
+@define-color popover_fg_color #c0c0c0;
+
+
 @define-color sidebar_bg_color #2a2a2a;
 @define-color sidebar_fg_color #c0c0c0;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #2a2a2a;
 @define-color card_fg_color #c0c0c0;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #2a2a2a;
-@define-color dialog_fg_color #c0c0c0;
-@define-color popover_bg_color #2a2a2a;
-@define-color popover_fg_color #c0c0c0;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #555555;
-@define-color blue_1 #0000ff;
-@define-color blue_2 #0000ff;
-@define-color blue_3 #0000ff;
-@define-color blue_4 #0000ff;
-@define-color blue_5 #0000ff;
-@define-color green_1 #00ff00;
-@define-color green_2 #00ff00;
-@define-color green_3 #00ff00;
-@define-color green_4 #00ff00;
-@define-color green_5 #00ff00;
-@define-color yellow_1 #ffff00;
-@define-color yellow_2 #ffff00;
-@define-color yellow_3 #ffff00;
-@define-color yellow_4 #ffff00;
-@define-color yellow_5 #ffff00;
-@define-color orange_1 #808000;
-@define-color orange_2 #808000;
-@define-color orange_3 #808000;
-@define-color orange_4 #808000;
-@define-color orange_5 #808000;
+
+
 @define-color red_1 #ff0000;
-@define-color red_2 #ff0000;
-@define-color red_3 #ff0000;
-@define-color red_4 #ff0000;
-@define-color red_5 #ff0000;
+@define-color green_1 #00ff00;
+@define-color yellow_1 #ffff00;
+@define-color blue_1 #0000ff;
 @define-color purple_1 #ff00ff;
-@define-color purple_2 #ff00ff;
-@define-color purple_3 #ff00ff;
-@define-color purple_4 #ff00ff;
-@define-color purple_5 #ff00ff;
-@define-color brown_1 #008000;
-@define-color brown_2 #008000;
-@define-color brown_3 #008000;
-@define-color brown_4 #008000;
-@define-color brown_5 #008000;
-@define-color light_1 #c0c0c0;
-@define-color light_2 #c0c0c0;
-@define-color light_3 #c0c0c0;
-@define-color light_4 #c0c0c0;
-@define-color light_5 #c0c0c0;
-@define-color dark_1 #c0c0c0;
-@define-color dark_2 #c0c0c0;
-@define-color dark_3 #c0c0c0;
-@define-color dark_4 #c0c0c0;
-@define-color dark_5 #c0c0c0;
+@define-color teal_1 #00ffff;
+@define-color orange_1 #808000;
+@define-color gray_1 #808080;
+
diff --git a/build/base16-woodland.css b/build/base16-woodland.css
index 64ca070..4ad4824 100644
--- a/build/base16-woodland.css
+++ b/build/base16-woodland.css
@@ -1,88 +1,37 @@
 @define-color accent_color #88a4d3;
 @define-color accent_bg_color #88a4d3;
 @define-color accent_fg_color #231e18;
-@define-color destructive_color #d35c5c;
-@define-color destructive_bg_color #d35c5c;
-@define-color destructive_fg_color #231e18;
-@define-color success_color #b7ba53;
-@define-color success_bg_color #b7ba53;
-@define-color success_fg_color #231e18;
-@define-color warning_color #bb90e2;
-@define-color warning_bg_color #bb90e2;
-@define-color warning_fg_color #231e18;
-@define-color error_color #d35c5c;
-@define-color error_bg_color #d35c5c;
-@define-color error_fg_color #231e18;
+
 @define-color window_bg_color #231e18;
 @define-color window_fg_color #cabcb1;
+
 @define-color view_bg_color #231e18;
 @define-color view_fg_color #cabcb1;
-@define-color headerbar_bg_color #302b25;
+
+@define-color headerbar_bg_color #231e18;
 @define-color headerbar_fg_color #cabcb1;
-@define-color headerbar_border_color rgba(0.18823529, 0.16862745, 0.14509804, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #231e18;
+@define-color dialog_fg_color #cabcb1;
+
+@define-color popover_bg_color #231e18;
+@define-color popover_fg_color #cabcb1;
+
+
 @define-color sidebar_bg_color #302b25;
 @define-color sidebar_fg_color #cabcb1;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #302b25;
 @define-color card_fg_color #cabcb1;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #302b25;
-@define-color dialog_fg_color #cabcb1;
-@define-color popover_bg_color #302b25;
-@define-color popover_fg_color #cabcb1;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #48413a;
-@define-color blue_1 #88a4d3;
-@define-color blue_2 #88a4d3;
-@define-color blue_3 #88a4d3;
-@define-color blue_4 #88a4d3;
-@define-color blue_5 #88a4d3;
-@define-color green_1 #b7ba53;
-@define-color green_2 #b7ba53;
-@define-color green_3 #b7ba53;
-@define-color green_4 #b7ba53;
-@define-color green_5 #b7ba53;
-@define-color yellow_1 #e0ac16;
-@define-color yellow_2 #e0ac16;
-@define-color yellow_3 #e0ac16;
-@define-color yellow_4 #e0ac16;
-@define-color yellow_5 #e0ac16;
-@define-color orange_1 #ca7f32;
-@define-color orange_2 #ca7f32;
-@define-color orange_3 #ca7f32;
-@define-color orange_4 #ca7f32;
-@define-color orange_5 #ca7f32;
+
+
 @define-color red_1 #d35c5c;
-@define-color red_2 #d35c5c;
-@define-color red_3 #d35c5c;
-@define-color red_4 #d35c5c;
-@define-color red_5 #d35c5c;
+@define-color green_1 #b7ba53;
+@define-color yellow_1 #e0ac16;
+@define-color blue_1 #88a4d3;
 @define-color purple_1 #bb90e2;
-@define-color purple_2 #bb90e2;
-@define-color purple_3 #bb90e2;
-@define-color purple_4 #bb90e2;
-@define-color purple_5 #bb90e2;
-@define-color brown_1 #b49368;
-@define-color brown_2 #b49368;
-@define-color brown_3 #b49368;
-@define-color brown_4 #b49368;
-@define-color brown_5 #b49368;
-@define-color light_1 #cabcb1;
-@define-color light_2 #cabcb1;
-@define-color light_3 #cabcb1;
-@define-color light_4 #cabcb1;
-@define-color light_5 #cabcb1;
-@define-color dark_1 #cabcb1;
-@define-color dark_2 #cabcb1;
-@define-color dark_3 #cabcb1;
-@define-color dark_4 #cabcb1;
-@define-color dark_5 #cabcb1;
+@define-color teal_1 #6eb958;
+@define-color orange_1 #ca7f32;
+@define-color gray_1 #9d8b70;
+
diff --git a/build/base16-xcode-dusk.css b/build/base16-xcode-dusk.css
index 7c76904..7b4ff5a 100644
--- a/build/base16-xcode-dusk.css
+++ b/build/base16-xcode-dusk.css
@@ -1,88 +1,37 @@
 @define-color accent_color #790ead;
 @define-color accent_bg_color #790ead;
 @define-color accent_fg_color #282b35;
-@define-color destructive_color #b21889;
-@define-color destructive_bg_color #b21889;
-@define-color destructive_fg_color #282b35;
-@define-color success_color #df0002;
-@define-color success_bg_color #df0002;
-@define-color success_fg_color #282b35;
-@define-color warning_color #b21889;
-@define-color warning_bg_color #b21889;
-@define-color warning_fg_color #282b35;
-@define-color error_color #b21889;
-@define-color error_bg_color #b21889;
-@define-color error_fg_color #282b35;
+
 @define-color window_bg_color #282b35;
 @define-color window_fg_color #939599;
+
 @define-color view_bg_color #282b35;
 @define-color view_fg_color #939599;
-@define-color headerbar_bg_color #3d4048;
+
+@define-color headerbar_bg_color #282b35;
 @define-color headerbar_fg_color #939599;
-@define-color headerbar_border_color rgba(0.23921569, 0.25098039, 0.28235294, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #282b35;
+@define-color dialog_fg_color #939599;
+
+@define-color popover_bg_color #282b35;
+@define-color popover_fg_color #939599;
+
+
 @define-color sidebar_bg_color #3d4048;
 @define-color sidebar_fg_color #939599;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #3d4048;
 @define-color card_fg_color #939599;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #3d4048;
-@define-color dialog_fg_color #939599;
-@define-color popover_bg_color #3d4048;
-@define-color popover_fg_color #939599;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #53555d;
-@define-color blue_1 #790ead;
-@define-color blue_2 #790ead;
-@define-color blue_3 #790ead;
-@define-color blue_4 #790ead;
-@define-color blue_5 #790ead;
-@define-color green_1 #df0002;
-@define-color green_2 #df0002;
-@define-color green_3 #df0002;
-@define-color green_4 #df0002;
-@define-color green_5 #df0002;
-@define-color yellow_1 #438288;
-@define-color yellow_2 #438288;
-@define-color yellow_3 #438288;
-@define-color yellow_4 #438288;
-@define-color yellow_5 #438288;
-@define-color orange_1 #786dc5;
-@define-color orange_2 #786dc5;
-@define-color orange_3 #786dc5;
-@define-color orange_4 #786dc5;
-@define-color orange_5 #786dc5;
+
+
 @define-color red_1 #b21889;
-@define-color red_2 #b21889;
-@define-color red_3 #b21889;
-@define-color red_4 #b21889;
-@define-color red_5 #b21889;
+@define-color green_1 #df0002;
+@define-color yellow_1 #438288;
+@define-color blue_1 #790ead;
 @define-color purple_1 #b21889;
-@define-color purple_2 #b21889;
-@define-color purple_3 #b21889;
-@define-color purple_4 #b21889;
-@define-color purple_5 #b21889;
-@define-color brown_1 #c77c48;
-@define-color brown_2 #c77c48;
-@define-color brown_3 #c77c48;
-@define-color brown_4 #c77c48;
-@define-color brown_5 #c77c48;
-@define-color light_1 #939599;
-@define-color light_2 #939599;
-@define-color light_3 #939599;
-@define-color light_4 #939599;
-@define-color light_5 #939599;
-@define-color dark_1 #939599;
-@define-color dark_2 #939599;
-@define-color dark_3 #939599;
-@define-color dark_4 #939599;
-@define-color dark_5 #939599;
+@define-color teal_1 #00a0be;
+@define-color orange_1 #786dc5;
+@define-color gray_1 #686a71;
+
diff --git a/build/base16-yesterday-bright.css b/build/base16-yesterday-bright.css
index d6d84b4..9ec5f5f 100644
--- a/build/base16-yesterday-bright.css
+++ b/build/base16-yesterday-bright.css
@@ -1,88 +1,37 @@
 @define-color accent_color #7aa6da;
 @define-color accent_bg_color #7aa6da;
 @define-color accent_fg_color #343d46;
-@define-color destructive_color #d54e53;
-@define-color destructive_bg_color #d54e53;
-@define-color destructive_fg_color #343d46;
-@define-color success_color #b9ca4a;
-@define-color success_bg_color #b9ca4a;
-@define-color success_fg_color #343d46;
-@define-color warning_color #c397d8;
-@define-color warning_bg_color #c397d8;
-@define-color warning_fg_color #343d46;
-@define-color error_color #d54e53;
-@define-color error_bg_color #d54e53;
-@define-color error_fg_color #343d46;
+
 @define-color window_bg_color #343d46;
 @define-color window_fg_color #dfe1e8;
+
 @define-color view_bg_color #343d46;
 @define-color view_fg_color #dfe1e8;
-@define-color headerbar_bg_color #4f5b66;
+
+@define-color headerbar_bg_color #343d46;
 @define-color headerbar_fg_color #dfe1e8;
-@define-color headerbar_border_color rgba(0.30980392, 0.35686275, 0.40000000, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #343d46;
+@define-color dialog_fg_color #dfe1e8;
+
+@define-color popover_bg_color #343d46;
+@define-color popover_fg_color #dfe1e8;
+
+
 @define-color sidebar_bg_color #4f5b66;
 @define-color sidebar_fg_color #dfe1e8;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #4f5b66;
 @define-color card_fg_color #dfe1e8;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #4f5b66;
-@define-color dialog_fg_color #dfe1e8;
-@define-color popover_bg_color #4f5b66;
-@define-color popover_fg_color #dfe1e8;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #65737e;
-@define-color blue_1 #7aa6da;
-@define-color blue_2 #7aa6da;
-@define-color blue_3 #7aa6da;
-@define-color blue_4 #7aa6da;
-@define-color blue_5 #7aa6da;
-@define-color green_1 #b9ca4a;
-@define-color green_2 #b9ca4a;
-@define-color green_3 #b9ca4a;
-@define-color green_4 #b9ca4a;
-@define-color green_5 #b9ca4a;
-@define-color yellow_1 #e7c547;
-@define-color yellow_2 #e7c547;
-@define-color yellow_3 #e7c547;
-@define-color yellow_4 #e7c547;
-@define-color yellow_5 #e7c547;
-@define-color orange_1 #e78c45;
-@define-color orange_2 #e78c45;
-@define-color orange_3 #e78c45;
-@define-color orange_4 #e78c45;
-@define-color orange_5 #e78c45;
+
+
 @define-color red_1 #d54e53;
-@define-color red_2 #d54e53;
-@define-color red_3 #d54e53;
-@define-color red_4 #d54e53;
-@define-color red_5 #d54e53;
+@define-color green_1 #b9ca4a;
+@define-color yellow_1 #e7c547;
+@define-color blue_1 #7aa6da;
 @define-color purple_1 #c397d8;
-@define-color purple_2 #c397d8;
-@define-color purple_3 #c397d8;
-@define-color purple_4 #c397d8;
-@define-color purple_5 #c397d8;
-@define-color brown_1 #9a806d;
-@define-color brown_2 #9a806d;
-@define-color brown_3 #9a806d;
-@define-color brown_4 #9a806d;
-@define-color brown_5 #9a806d;
-@define-color light_1 #dfe1e8;
-@define-color light_2 #dfe1e8;
-@define-color light_3 #dfe1e8;
-@define-color light_4 #dfe1e8;
-@define-color light_5 #dfe1e8;
-@define-color dark_1 #dfe1e8;
-@define-color dark_2 #dfe1e8;
-@define-color dark_3 #dfe1e8;
-@define-color dark_4 #dfe1e8;
-@define-color dark_5 #dfe1e8;
+@define-color teal_1 #70c0b1;
+@define-color orange_1 #e78c45;
+@define-color gray_1 #a7adba;
+
diff --git a/build/base16-yesterday-night.css b/build/base16-yesterday-night.css
index 159c972..211305e 100644
--- a/build/base16-yesterday-night.css
+++ b/build/base16-yesterday-night.css
@@ -1,88 +1,37 @@
 @define-color accent_color #81a2be;
 @define-color accent_bg_color #81a2be;
 @define-color accent_fg_color #343d46;
-@define-color destructive_color #cc6666;
-@define-color destructive_bg_color #cc6666;
-@define-color destructive_fg_color #343d46;
-@define-color success_color #b5bd68;
-@define-color success_bg_color #b5bd68;
-@define-color success_fg_color #343d46;
-@define-color warning_color #b294bb;
-@define-color warning_bg_color #b294bb;
-@define-color warning_fg_color #343d46;
-@define-color error_color #cc6666;
-@define-color error_bg_color #cc6666;
-@define-color error_fg_color #343d46;
+
 @define-color window_bg_color #343d46;
 @define-color window_fg_color #dfe1e8;
+
 @define-color view_bg_color #343d46;
 @define-color view_fg_color #dfe1e8;
-@define-color headerbar_bg_color #4f5b66;
+
+@define-color headerbar_bg_color #343d46;
 @define-color headerbar_fg_color #dfe1e8;
-@define-color headerbar_border_color rgba(0.30980392, 0.35686275, 0.40000000, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #343d46;
+@define-color dialog_fg_color #dfe1e8;
+
+@define-color popover_bg_color #343d46;
+@define-color popover_fg_color #dfe1e8;
+
+
 @define-color sidebar_bg_color #4f5b66;
 @define-color sidebar_fg_color #dfe1e8;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #4f5b66;
 @define-color card_fg_color #dfe1e8;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #4f5b66;
-@define-color dialog_fg_color #dfe1e8;
-@define-color popover_bg_color #4f5b66;
-@define-color popover_fg_color #dfe1e8;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #65737e;
-@define-color blue_1 #81a2be;
-@define-color blue_2 #81a2be;
-@define-color blue_3 #81a2be;
-@define-color blue_4 #81a2be;
-@define-color blue_5 #81a2be;
-@define-color green_1 #b5bd68;
-@define-color green_2 #b5bd68;
-@define-color green_3 #b5bd68;
-@define-color green_4 #b5bd68;
-@define-color green_5 #b5bd68;
-@define-color yellow_1 #f0c674;
-@define-color yellow_2 #f0c674;
-@define-color yellow_3 #f0c674;
-@define-color yellow_4 #f0c674;
-@define-color yellow_5 #f0c674;
-@define-color orange_1 #de935f;
-@define-color orange_2 #de935f;
-@define-color orange_3 #de935f;
-@define-color orange_4 #de935f;
-@define-color orange_5 #de935f;
+
+
 @define-color red_1 #cc6666;
-@define-color red_2 #cc6666;
-@define-color red_3 #cc6666;
-@define-color red_4 #cc6666;
-@define-color red_5 #cc6666;
+@define-color green_1 #b5bd68;
+@define-color yellow_1 #f0c674;
+@define-color blue_1 #81a2be;
 @define-color purple_1 #b294bb;
-@define-color purple_2 #b294bb;
-@define-color purple_3 #b294bb;
-@define-color purple_4 #b294bb;
-@define-color purple_5 #b294bb;
-@define-color brown_1 #a3685a;
-@define-color brown_2 #a3685a;
-@define-color brown_3 #a3685a;
-@define-color brown_4 #a3685a;
-@define-color brown_5 #a3685a;
-@define-color light_1 #dfe1e8;
-@define-color light_2 #dfe1e8;
-@define-color light_3 #dfe1e8;
-@define-color light_4 #dfe1e8;
-@define-color light_5 #dfe1e8;
-@define-color dark_1 #dfe1e8;
-@define-color dark_2 #dfe1e8;
-@define-color dark_3 #dfe1e8;
-@define-color dark_4 #dfe1e8;
-@define-color dark_5 #dfe1e8;
+@define-color teal_1 #8abeb7;
+@define-color orange_1 #de935f;
+@define-color gray_1 #a7adba;
+
diff --git a/build/base16-yesterday.css b/build/base16-yesterday.css
index 37ac67e..467d07c 100644
--- a/build/base16-yesterday.css
+++ b/build/base16-yesterday.css
@@ -1,88 +1,37 @@
 @define-color accent_color #4271ae;
 @define-color accent_bg_color #4271ae;
 @define-color accent_fg_color #1d1f21;
-@define-color destructive_color #c82829;
-@define-color destructive_bg_color #c82829;
-@define-color destructive_fg_color #1d1f21;
-@define-color success_color #718c00;
-@define-color success_bg_color #718c00;
-@define-color success_fg_color #1d1f21;
-@define-color warning_color #8959a8;
-@define-color warning_bg_color #8959a8;
-@define-color warning_fg_color #1d1f21;
-@define-color error_color #c82829;
-@define-color error_bg_color #c82829;
-@define-color error_fg_color #1d1f21;
+
 @define-color window_bg_color #1d1f21;
 @define-color window_fg_color #d6d6d6;
+
 @define-color view_bg_color #1d1f21;
 @define-color view_fg_color #d6d6d6;
-@define-color headerbar_bg_color #282a2e;
+
+@define-color headerbar_bg_color #1d1f21;
 @define-color headerbar_fg_color #d6d6d6;
-@define-color headerbar_border_color rgba(0.15686275, 0.16470588, 0.18039216, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #1d1f21;
+@define-color dialog_fg_color #d6d6d6;
+
+@define-color popover_bg_color #1d1f21;
+@define-color popover_fg_color #d6d6d6;
+
+
 @define-color sidebar_bg_color #282a2e;
 @define-color sidebar_fg_color #d6d6d6;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #282a2e;
 @define-color card_fg_color #d6d6d6;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #282a2e;
-@define-color dialog_fg_color #d6d6d6;
-@define-color popover_bg_color #282a2e;
-@define-color popover_fg_color #d6d6d6;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #4d4d4c;
-@define-color blue_1 #4271ae;
-@define-color blue_2 #4271ae;
-@define-color blue_3 #4271ae;
-@define-color blue_4 #4271ae;
-@define-color blue_5 #4271ae;
-@define-color green_1 #718c00;
-@define-color green_2 #718c00;
-@define-color green_3 #718c00;
-@define-color green_4 #718c00;
-@define-color green_5 #718c00;
-@define-color yellow_1 #eab700;
-@define-color yellow_2 #eab700;
-@define-color yellow_3 #eab700;
-@define-color yellow_4 #eab700;
-@define-color yellow_5 #eab700;
-@define-color orange_1 #f5871f;
-@define-color orange_2 #f5871f;
-@define-color orange_3 #f5871f;
-@define-color orange_4 #f5871f;
-@define-color orange_5 #f5871f;
+
+
 @define-color red_1 #c82829;
-@define-color red_2 #c82829;
-@define-color red_3 #c82829;
-@define-color red_4 #c82829;
-@define-color red_5 #c82829;
+@define-color green_1 #718c00;
+@define-color yellow_1 #eab700;
+@define-color blue_1 #4271ae;
 @define-color purple_1 #8959a8;
-@define-color purple_2 #8959a8;
-@define-color purple_3 #8959a8;
-@define-color purple_4 #8959a8;
-@define-color purple_5 #8959a8;
-@define-color brown_1 #7f2a1d;
-@define-color brown_2 #7f2a1d;
-@define-color brown_3 #7f2a1d;
-@define-color brown_4 #7f2a1d;
-@define-color brown_5 #7f2a1d;
-@define-color light_1 #d6d6d6;
-@define-color light_2 #d6d6d6;
-@define-color light_3 #d6d6d6;
-@define-color light_4 #d6d6d6;
-@define-color light_5 #d6d6d6;
-@define-color dark_1 #d6d6d6;
-@define-color dark_2 #d6d6d6;
-@define-color dark_3 #d6d6d6;
-@define-color dark_4 #d6d6d6;
-@define-color dark_5 #d6d6d6;
+@define-color teal_1 #3e999f;
+@define-color orange_1 #f5871f;
+@define-color gray_1 #969896;
+
diff --git a/build/base16-zenbones.css b/build/base16-zenbones.css
index d371994..8c6792c 100644
--- a/build/base16-zenbones.css
+++ b/build/base16-zenbones.css
@@ -1,88 +1,37 @@
 @define-color accent_color #cf86c1;
 @define-color accent_bg_color #cf86c1;
 @define-color accent_fg_color #191919;
-@define-color destructive_color #3d3839;
-@define-color destructive_bg_color #3d3839;
-@define-color destructive_fg_color #191919;
-@define-color success_color #d68c67;
-@define-color success_bg_color #d68c67;
-@define-color success_fg_color #191919;
-@define-color warning_color #65b8c1;
-@define-color warning_bg_color #65b8c1;
-@define-color warning_fg_color #191919;
-@define-color error_color #3d3839;
-@define-color error_bg_color #3d3839;
-@define-color error_fg_color #191919;
+
 @define-color window_bg_color #191919;
 @define-color window_fg_color #b279a7;
+
 @define-color view_bg_color #191919;
 @define-color view_fg_color #b279a7;
-@define-color headerbar_bg_color #de6e7c;
+
+@define-color headerbar_bg_color #191919;
 @define-color headerbar_fg_color #b279a7;
-@define-color headerbar_border_color rgba(0.87058824, 0.43137255, 0.48627451, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #191919;
+@define-color dialog_fg_color #b279a7;
+
+@define-color popover_bg_color #191919;
+@define-color popover_fg_color #b279a7;
+
+
 @define-color sidebar_bg_color #de6e7c;
 @define-color sidebar_fg_color #b279a7;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #de6e7c;
 @define-color card_fg_color #b279a7;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #de6e7c;
-@define-color dialog_fg_color #b279a7;
-@define-color popover_bg_color #de6e7c;
-@define-color popover_fg_color #b279a7;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #819b69;
-@define-color blue_1 #cf86c1;
-@define-color blue_2 #cf86c1;
-@define-color blue_3 #cf86c1;
-@define-color blue_4 #cf86c1;
-@define-color blue_5 #cf86c1;
-@define-color green_1 #d68c67;
-@define-color green_2 #d68c67;
-@define-color green_3 #d68c67;
-@define-color green_4 #d68c67;
-@define-color green_5 #d68c67;
-@define-color yellow_1 #8bae68;
-@define-color yellow_2 #8bae68;
-@define-color yellow_3 #8bae68;
-@define-color yellow_4 #8bae68;
-@define-color yellow_5 #8bae68;
-@define-color orange_1 #e8838f;
-@define-color orange_2 #e8838f;
-@define-color orange_3 #e8838f;
-@define-color orange_4 #e8838f;
-@define-color orange_5 #e8838f;
+
+
 @define-color red_1 #3d3839;
-@define-color red_2 #3d3839;
-@define-color red_3 #3d3839;
-@define-color red_4 #3d3839;
-@define-color red_5 #3d3839;
+@define-color green_1 #d68c67;
+@define-color yellow_1 #8bae68;
+@define-color blue_1 #cf86c1;
 @define-color purple_1 #65b8c1;
-@define-color purple_2 #65b8c1;
-@define-color purple_3 #65b8c1;
-@define-color purple_4 #65b8c1;
-@define-color purple_5 #65b8c1;
-@define-color brown_1 #8e8e8e;
-@define-color brown_2 #8e8e8e;
-@define-color brown_3 #8e8e8e;
-@define-color brown_4 #8e8e8e;
-@define-color brown_5 #8e8e8e;
-@define-color light_1 #b279a7;
-@define-color light_2 #b279a7;
-@define-color light_3 #b279a7;
-@define-color light_4 #b279a7;
-@define-color light_5 #b279a7;
-@define-color dark_1 #b279a7;
-@define-color dark_2 #b279a7;
-@define-color dark_3 #b279a7;
-@define-color dark_4 #b279a7;
-@define-color dark_5 #b279a7;
+@define-color teal_1 #61abda;
+@define-color orange_1 #e8838f;
+@define-color gray_1 #b77e64;
+
diff --git a/build/base16-zenburn.css b/build/base16-zenburn.css
index 1a2a82f..adf6ef4 100644
--- a/build/base16-zenburn.css
+++ b/build/base16-zenburn.css
@@ -1,88 +1,37 @@
 @define-color accent_color #7cb8bb;
 @define-color accent_bg_color #7cb8bb;
 @define-color accent_fg_color #383838;
-@define-color destructive_color #dca3a3;
-@define-color destructive_bg_color #dca3a3;
-@define-color destructive_fg_color #383838;
-@define-color success_color #5f7f5f;
-@define-color success_bg_color #5f7f5f;
-@define-color success_fg_color #383838;
-@define-color warning_color #dc8cc3;
-@define-color warning_bg_color #dc8cc3;
-@define-color warning_fg_color #383838;
-@define-color error_color #dca3a3;
-@define-color error_bg_color #dca3a3;
-@define-color error_fg_color #383838;
+
 @define-color window_bg_color #383838;
 @define-color window_fg_color #dcdccc;
+
 @define-color view_bg_color #383838;
 @define-color view_fg_color #dcdccc;
-@define-color headerbar_bg_color #404040;
+
+@define-color headerbar_bg_color #383838;
 @define-color headerbar_fg_color #dcdccc;
-@define-color headerbar_border_color rgba(0.25098039, 0.25098039, 0.25098039, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #383838;
+@define-color dialog_fg_color #dcdccc;
+
+@define-color popover_bg_color #383838;
+@define-color popover_fg_color #dcdccc;
+
+
 @define-color sidebar_bg_color #404040;
 @define-color sidebar_fg_color #dcdccc;
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #404040;
 @define-color card_fg_color #dcdccc;
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #404040;
-@define-color dialog_fg_color #dcdccc;
-@define-color popover_bg_color #404040;
-@define-color popover_fg_color #dcdccc;
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #606060;
-@define-color blue_1 #7cb8bb;
-@define-color blue_2 #7cb8bb;
-@define-color blue_3 #7cb8bb;
-@define-color blue_4 #7cb8bb;
-@define-color blue_5 #7cb8bb;
-@define-color green_1 #5f7f5f;
-@define-color green_2 #5f7f5f;
-@define-color green_3 #5f7f5f;
-@define-color green_4 #5f7f5f;
-@define-color green_5 #5f7f5f;
-@define-color yellow_1 #e0cf9f;
-@define-color yellow_2 #e0cf9f;
-@define-color yellow_3 #e0cf9f;
-@define-color yellow_4 #e0cf9f;
-@define-color yellow_5 #e0cf9f;
-@define-color orange_1 #dfaf8f;
-@define-color orange_2 #dfaf8f;
-@define-color orange_3 #dfaf8f;
-@define-color orange_4 #dfaf8f;
-@define-color orange_5 #dfaf8f;
+
+
 @define-color red_1 #dca3a3;
-@define-color red_2 #dca3a3;
-@define-color red_3 #dca3a3;
-@define-color red_4 #dca3a3;
-@define-color red_5 #dca3a3;
+@define-color green_1 #5f7f5f;
+@define-color yellow_1 #e0cf9f;
+@define-color blue_1 #7cb8bb;
 @define-color purple_1 #dc8cc3;
-@define-color purple_2 #dc8cc3;
-@define-color purple_3 #dc8cc3;
-@define-color purple_4 #dc8cc3;
-@define-color purple_5 #dc8cc3;
-@define-color brown_1 #000000;
-@define-color brown_2 #000000;
-@define-color brown_3 #000000;
-@define-color brown_4 #000000;
-@define-color brown_5 #000000;
-@define-color light_1 #dcdccc;
-@define-color light_2 #dcdccc;
-@define-color light_3 #dcdccc;
-@define-color light_4 #dcdccc;
-@define-color light_5 #dcdccc;
-@define-color dark_1 #dcdccc;
-@define-color dark_2 #dcdccc;
-@define-color dark_3 #dcdccc;
-@define-color dark_4 #dcdccc;
-@define-color dark_5 #dcdccc;
+@define-color teal_1 #93e0e3;
+@define-color orange_1 #dfaf8f;
+@define-color gray_1 #6f6f6f;
+
diff --git a/templates/default.mustache b/templates/default.mustache
index 3b2e922..0f5eb34 100644
--- a/templates/default.mustache
+++ b/templates/default.mustache
@@ -1,88 +1,37 @@
 @define-color accent_color #{{base0D-hex}};
 @define-color accent_bg_color #{{base0D-hex}};
 @define-color accent_fg_color #{{base00-hex}};
-@define-color destructive_color #{{base08-hex}};
-@define-color destructive_bg_color #{{base08-hex}};
-@define-color destructive_fg_color #{{base00-hex}};
-@define-color success_color #{{base0B-hex}};
-@define-color success_bg_color #{{base0B-hex}};
-@define-color success_fg_color #{{base00-hex}};
-@define-color warning_color #{{base0E-hex}};
-@define-color warning_bg_color #{{base0E-hex}};
-@define-color warning_fg_color #{{base00-hex}};
-@define-color error_color #{{base08-hex}};
-@define-color error_bg_color #{{base08-hex}};
-@define-color error_fg_color #{{base00-hex}};
+
 @define-color window_bg_color #{{base00-hex}};
 @define-color window_fg_color #{{base05-hex}};
+
 @define-color view_bg_color #{{base00-hex}};
 @define-color view_fg_color #{{base05-hex}};
-@define-color headerbar_bg_color #{{base01-hex}};
+
+@define-color headerbar_bg_color #{{base00-hex}};
 @define-color headerbar_fg_color #{{base05-hex}};
-@define-color headerbar_border_color rgba({{base01-dec-r}}, {{base01-dec-g}}, {{base01-dec-b}}, 0.7);
-@define-color headerbar_backdrop_color @window_bg_color;
-@define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
+
+@define-color dialog_bg_color #{{base00-hex}};
+@define-color dialog_fg_color #{{base05-hex}};
+
+@define-color popover_bg_color #{{base00-hex}};
+@define-color popover_fg_color #{{base05-hex}};
+
+
 @define-color sidebar_bg_color #{{base01-hex}};
 @define-color sidebar_fg_color #{{base05-hex}};
-@define-color sidebar_backdrop_color @window_bg_color;
-@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-@define-color secondary_sidebar_bg_color @sidebar_bg_color;
-@define-color secondary_sidebar_fg_color @sidebar_fg_color;
-@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+
+
 @define-color card_bg_color #{{base01-hex}};
 @define-color card_fg_color #{{base05-hex}};
-@define-color card_shade_color rgba(0, 0, 0, 0.07);
-@define-color dialog_bg_color #{{base01-hex}};
-@define-color dialog_fg_color #{{base05-hex}};
-@define-color popover_bg_color #{{base01-hex}};
-@define-color popover_fg_color #{{base05-hex}};
-@define-color popover_shade_color rgba(0, 0, 0, 0.07);
-@define-color shade_color rgba(0, 0, 0, 0.07);
-@define-color scrollbar_outline_color #{{base02-hex}};
-@define-color blue_1 #{{base0D-hex}};
-@define-color blue_2 #{{base0D-hex}};
-@define-color blue_3 #{{base0D-hex}};
-@define-color blue_4 #{{base0D-hex}};
-@define-color blue_5 #{{base0D-hex}};
-@define-color green_1 #{{base0B-hex}};
-@define-color green_2 #{{base0B-hex}};
-@define-color green_3 #{{base0B-hex}};
-@define-color green_4 #{{base0B-hex}};
-@define-color green_5 #{{base0B-hex}};
-@define-color yellow_1 #{{base0A-hex}};
-@define-color yellow_2 #{{base0A-hex}};
-@define-color yellow_3 #{{base0A-hex}};
-@define-color yellow_4 #{{base0A-hex}};
-@define-color yellow_5 #{{base0A-hex}};
-@define-color orange_1 #{{base09-hex}};
-@define-color orange_2 #{{base09-hex}};
-@define-color orange_3 #{{base09-hex}};
-@define-color orange_4 #{{base09-hex}};
-@define-color orange_5 #{{base09-hex}};
+
+
 @define-color red_1 #{{base08-hex}};
-@define-color red_2 #{{base08-hex}};
-@define-color red_3 #{{base08-hex}};
-@define-color red_4 #{{base08-hex}};
-@define-color red_5 #{{base08-hex}};
+@define-color green_1 #{{base0B-hex}};
+@define-color yellow_1 #{{base0A-hex}};
+@define-color blue_1 #{{base0D-hex}};
 @define-color purple_1 #{{base0E-hex}};
-@define-color purple_2 #{{base0E-hex}};
-@define-color purple_3 #{{base0E-hex}};
-@define-color purple_4 #{{base0E-hex}};
-@define-color purple_5 #{{base0E-hex}};
-@define-color brown_1 #{{base0F-hex}};
-@define-color brown_2 #{{base0F-hex}};
-@define-color brown_3 #{{base0F-hex}};
-@define-color brown_4 #{{base0F-hex}};
-@define-color brown_5 #{{base0F-hex}};
-@define-color light_1 #{{base05-hex}};
-@define-color light_2 #{{base05-hex}};
-@define-color light_3 #{{base05-hex}};
-@define-color light_4 #{{base05-hex}};
-@define-color light_5 #{{base05-hex}};
-@define-color dark_1 #{{base05-hex}};
-@define-color dark_2 #{{base05-hex}};
-@define-color dark_3 #{{base05-hex}};
-@define-color dark_4 #{{base05-hex}};
-@define-color dark_5 #{{base05-hex}};
+@define-color teal_1 #{{base0C-hex}};
+@define-color orange_1 #{{base09-hex}};
+@define-color gray_1 #{{base03-hex}};
+