Updated stylix schema

2025-01-07 14:33:53 -06:00
parent c7a8e44bb6
commit 90d9b7a6b8
293 changed files with 1463 additions and 1259 deletions
--- a/system/style/stylix.nix
+++ b/system/style/stylix.nix
@@ -1,22 +1,19 @@
 { lib, pkgs, inputs, userSettings, ... }:

 let
-  themePath = "../../../themes/"+userSettings.theme+"/"+userSettings.theme+".yaml";
-  themePolarity = lib.removeSuffix "\n" (builtins.readFile (./. + "../../../themes"+("/"+userSettings.theme)+"/polarity.txt"));
-  myLightDMTheme = if themePolarity == "light" then "Adwaita" else "Adwaita-dark";
-  backgroundUrl = builtins.readFile (./. + "../../../themes"+("/"+userSettings.theme)+"/backgroundurl.txt");
-  backgroundSha256 = builtins.readFile (./. + "../../../themes/"+("/"+userSettings.theme)+"/backgroundsha256.txt");
+  theme = import (./. + "../../../themes"+("/"+userSettings.theme));
+  myLightDMTheme = if theme.polarity == "light" then "Adwaita" else "Adwaita-dark";
 in
 {
  imports = [ inputs.stylix.nixosModules.stylix ];

  stylix.autoEnable = false;
-  stylix.polarity = themePolarity;
+  stylix.polarity = theme.polarity;
  stylix.image = pkgs.fetchurl {
-   url = backgroundUrl;
-   sha256 = backgroundSha256;
+   url = theme.backgroundUrl;
+   sha256 = theme.backgroundSha256;
  };
-  stylix.base16Scheme = ./. + themePath;
+  stylix.base16Scheme = ./. + theme;
  stylix.fonts = {
    monospace = {
      name = userSettings.font;
--- a/themes/alph/alph.yaml
+++ b/themes/alph/alph.yaml
@@ -1,18 +0,0 @@
-scheme: "Alph"
-author: "LibrePhoenix"
-base00: "fbfbff"
-base01: "D8E4F4"
-base02: "BCCDE1"
-base03: "9FB4D1"
-base04: "667D9F"
-base05: "444452"
-base06: "333349"
-base07: "141229"
-base08: "AD0617"
-base09: "872626"
-base0A: "AD6A06"
-base0B: "06AD72"
-base0C: "06A3AD"
-base0D: "0A5D97"
-base0E: "5B037A"
-base0F: "87267C"
--- a/themes/alph/backgroundsha256.txt
+++ b/themes/alph/backgroundsha256.txt
@@ -1 +0,0 @@
-sha256-ZM0X0IXsUwAgxdZileDOol8kBANxjW8oGrgha3OFjYE=
--- a/themes/alph/backgroundurl.txt
+++ b/themes/alph/backgroundurl.txt
@@ -1 +0,0 @@
-https://r4.wallpaperflare.com/wallpaper/132/401/75/painting-clouds-sky-landscape-wallpaper-57bfb2f40fd59f8acf4284a1e191c785.jpg
--- a/themes/alph/default.nix
+++ b/themes/alph/default.nix
@@ -0,0 +1,25 @@
+{
+  scheme = "Alph";
+  slug = "alph";
+  author = "LibrePhoenix (https://github.com/librephoenix)";
+  description = "Flagship light theme of the LibrePhoenix Channel";
+  polarity = "light";
+  backgroundUrl = "https://r4.wallpaperflare.com/wallpaper/132/401/75/painting-clouds-sky-landscape-wallpaper-57bfb2f40fd59f8acf4284a1e191c785.jpg";
+  backgroundSha256 = "sha256-ZM0X0IXsUwAgxdZileDOol8kBANxjW8oGrgha3OFjYE=";
+  base00 = "fbfbff";
+  base01 = "D8E4F4";
+  base02 = "BCCDE1";
+  base03 = "9FB4D1";
+  base04 = "667D9F";
+  base05 = "444452";
+  base06 = "333349";
+  base07 = "141229";
+  base08 = "AD0617";
+  base09 = "872626";
+  base0A = "AD6A06";
+  base0B = "06AD72";
+  base0C = "06A3AD";
+  base0D = "0A5D97";
+  base0E = "5B037A";
+  base0F = "87267C";
+}
--- a/themes/alph/polarity.txt
+++ b/themes/alph/polarity.txt
@@ -1 +0,0 @@
-light
--- a/themes/ashes/ashes.yaml
+++ b/themes/ashes/ashes.yaml
@@ -1,19 +0,0 @@
-# Ashes scheme for the Base16 Builder (https://github.com/chriskempson/base16-builder)
-scheme: "Ashes"
-author: "Jannik Siebert (https://github.com/janniks)"
-base00: "1C2023" # ----
-base01: "393F45" # ---
-base02: "565E65" # --
-base03: "747C84" # -
-base04: "ADB3BA" # +
-base05: "C7CCD1" # ++
-base06: "DFE2E5" # +++
-base07: "F3F4F5" # ++++
-base08: "C7AE95" # orange
-base09: "C7C795" # yellow
-base0A: "AEC795" # poison green
-base0B: "95C7AE" # turquois
-base0C: "95AEC7" # aqua
-base0D: "AE95C7" # purple
-base0E: "C795AE" # pink
-base0F: "C79595" # light red
--- a/themes/ashes/backgroundsha256.txt
+++ b/themes/ashes/backgroundsha256.txt
@@ -1 +0,0 @@
-sha256-ul7ecqPw9bSr+JRSd+3OlKwVfB+5378L7ObYydJDsgQ=
--- a/themes/ashes/backgroundurl.txt
+++ b/themes/ashes/backgroundurl.txt
@@ -1 +0,0 @@
-https://images.hdqwalls.com/wallpapers/anime-road-to-city-everlasting-summer-4k-ep.jpg
--- a/themes/ashes/default.nix
+++ b/themes/ashes/default.nix
@@ -0,0 +1,25 @@
+{
+  scheme = "Ashes";
+  slug = "ashes";
+  author = "Jannik Siebert (https://github.com/janniks)";
+  description = "Desaturated dark color scheme";
+  polarity = "dark";
+  backgroundUrl = "https://images.hdqwalls.com/wallpapers/anime-road-to-city-everlasting-summer-4k-ep.jpg";
+  backgroundSha256 = "sha256-ul7ecqPw9bSr+JRSd+3OlKwVfB+5378L7ObYydJDsgQ=";
+  base00 = "1C2023";
+  base01 = "393F45";
+  base02 = "565E65";
+  base03 = "747C84";
+  base04 = "ADB3BA";
+  base05 = "C7CCD1";
+  base06 = "DFE2E5";
+  base07 = "F3F4F5";
+  base08 = "C7AE95";
+  base09 = "C7C795";
+  base0A = "AEC795";
+  base0B = "95C7AE";
+  base0C = "95AEC7";
+  base0D = "AE95C7";
+  base0E = "C795AE";
+  base0F = "C79595";
+}
--- a/themes/ashes/polarity.txt
+++ b/themes/ashes/polarity.txt
@@ -1 +0,0 @@
-dark
--- a/themes/atelier-cave/atelier-cave.yaml
+++ b/themes/atelier-cave/atelier-cave.yaml
@@ -1,18 +0,0 @@
-scheme: "Atelier Cave"
-author: "Bram de Haan (http://atelierbramdehaan.nl)"
-base00: "19171c"
-base01: "26232a"
-base02: "585260"
-base03: "655f6d"
-base04: "7e7887"
-base05: "8b8792"
-base06: "e2dfe7"
-base07: "efecf4"
-base08: "be4678"
-base09: "aa573c"
-base0A: "a06e3b"
-base0B: "2a9292"
-base0C: "398bc6"
-base0D: "576ddb"
-base0E: "955ae7"
-base0F: "bf40bf"
--- a/themes/atelier-cave/backgroundsha256.txt
+++ b/themes/atelier-cave/backgroundsha256.txt
@@ -1 +0,0 @@
-sha256-AVPJYFLEQr9x1V2yQLkMc1g7GqcBPJiKRFuj8MaKe5c=
--- a/themes/atelier-cave/backgroundurl.txt
+++ b/themes/atelier-cave/backgroundurl.txt
@@ -1 +0,0 @@
-https://images.hdqwalls.com/wallpapers/anime-girl-angel-ring-5k-7c.jpg
--- a/themes/atelier-cave/default.nix
+++ b/themes/atelier-cave/default.nix
@@ -0,0 +1,25 @@
+{
+  scheme = "Atelier Cave";
+  slug = "atelier-cave";
+  author = "Bram de Haan (http://atelierbramdehaan.nl)";
+  description = ''A “cool-warm” palette; not for the claustrophobic'';
+  polarity = "dark";
+  backgroundUrl = "https://images.hdqwalls.com/wallpapers/anime-girl-angel-ring-5k-7c.jpg";
+  backgroundUrlSha256 = "sha256-AVPJYFLEQr9x1V2yQLkMc1g7GqcBPJiKRFuj8MaKe5c=";
+  base00 = "19171c";
+  base01 = "26232a";
+  base02 = "585260";
+  base03 = "655f6d";
+  base04 = "7e7887";
+  base05 = "8b8792";
+  base06 = "e2dfe7";
+  base07 = "efecf4";
+  base08 = "be4678";
+  base09 = "aa573c";
+  base0A = "a06e3b";
+  base0B = "2a9292";
+  base0C = "398bc6";
+  base0D = "576ddb";
+  base0E = "955ae7";
+  base0F = "bf40bf";
+}
--- a/themes/atelier-cave/polarity.txt
+++ b/themes/atelier-cave/polarity.txt
@@ -1 +0,0 @@
-dark
--- a/themes/atelier-dune/atelier-dune.yaml
+++ b/themes/atelier-dune/atelier-dune.yaml
@@ -1,18 +0,0 @@
-scheme: "Atelier Dune"
-author: "Bram de Haan (http://atelierbramdehaan.nl)"
-base00: "20201d"
-base01: "292824"
-base02: "6e6b5e"
-base03: "7d7a68"
-base04: "999580"
-base05: "a6a28c"
-base06: "e8e4cf"
-base07: "fefbec"
-base08: "d73737"
-base09: "b65611"
-base0A: "ae9513"
-base0B: "60ac39"
-base0C: "1fad83"
-base0D: "6684e1"
-base0E: "b854d4"
-base0F: "d43552"
--- a/themes/atelier-dune/backgroundsha256.txt
+++ b/themes/atelier-dune/backgroundsha256.txt
@@ -1 +0,0 @@
-sha256-wplFIlIIYHTofJMuBLtpSWwrFyzz8ao1Gq4wGqgz7qY=
--- a/themes/atelier-dune/backgroundurl.txt
+++ b/themes/atelier-dune/backgroundurl.txt
@@ -1 +0,0 @@
-https://images.hdqwalls.com/wallpapers/tengen-toppa-gurren-lagann-4k-1m.jpg
--- a/themes/atelier-dune/default.nix
+++ b/themes/atelier-dune/default.nix
@@ -0,0 +1,25 @@
+{
+  scheme = "Atelier Dune";
+  slug = "atelier-dune";
+  author = "Bram de Haan (http://atelierbramdehaan.nl)";
+  description = "A welcoming, soothing friendly but also bright, colorscheme";
+  polarity = "dark";
+  backgroundUrl = "https://images.hdqwalls.com/wallpapers/tengen-toppa-gurren-lagann-4k-1m.jpg";
+  backgroundSha256 = "sha256-wplFIlIIYHTofJMuBLtpSWwrFyzz8ao1Gq4wGqgz7qY=";
+  base00 = "20201d";
+  base01 = "292824";
+  base02 = "6e6b5e";
+  base03 = "7d7a68";
+  base04 = "999580";
+  base05 = "a6a28c";
+  base06 = "e8e4cf";
+  base07 = "fefbec";
+  base08 = "d73737";
+  base09 = "b65611";
+  base0A = "ae9513";
+  base0B = "60ac39";
+  base0C = "1fad83";
+  base0D = "6684e1";
+  base0E = "b854d4";
+  base0F = "d43552";
+}
--- a/themes/atelier-dune/polarity.txt
+++ b/themes/atelier-dune/polarity.txt
@@ -1 +0,0 @@
-dark
--- a/themes/atelier-estuary/atelier-estuary.yaml
+++ b/themes/atelier-estuary/atelier-estuary.yaml
@@ -1,18 +0,0 @@
-scheme: "Atelier Estuary"
-author: "Bram de Haan (http://atelierbramdehaan.nl)"
-base00: "22221b"
-base01: "302f27"
-base02: "5f5e4e"
-base03: "6c6b5a"
-base04: "878573"
-base05: "929181"
-base06: "e7e6df"
-base07: "f4f3ec"
-base08: "ba6236"
-base09: "ae7313"
-base0A: "a5980d"
-base0B: "7d9726"
-base0C: "5b9d48"
-base0D: "36a166"
-base0E: "5f9182"
-base0F: "9d6c7c"
--- a/themes/atelier-estuary/backgroundsha256.txt
+++ b/themes/atelier-estuary/backgroundsha256.txt
@@ -1 +0,0 @@
-sha256-f97njdnllbsnnIjZnz/j0l2qIFWbEsGF2QtV1JTF2Yg=
--- a/themes/atelier-estuary/backgroundurl.txt
+++ b/themes/atelier-estuary/backgroundurl.txt
@@ -1 +0,0 @@
-https://r4.wallpaperflare.com/wallpaper/352/194/322/digital-art-artwork-dragon-skeleton-wallpaper-15f339ed090d16293ff528ba738d87f9.jpg
--- a/themes/atelier-estuary/default.nix
+++ b/themes/atelier-estuary/default.nix
@@ -0,0 +1,25 @@
+{
+  scheme = "Atelier Estuary";
+  slug = "atelier-estuary";
+  author = "Bram de Haan (http://atelierbramdehaan.nl)";
+  description = "A bit of a poisonous colorscheme, be aware of the crocodiles …, they’re hiding in there";
+  polarity = "dark";
+  backgroundUrl = "https://r4.wallpaperflare.com/wallpaper/352/194/322/digital-art-artwork-dragon-skeleton-wallpaper-15f339ed090d16293ff528ba738d87f9.jpg";
+  backgroundUrlSha256 = "sha256-f97njdnllbsnnIjZnz/j0l2qIFWbEsGF2QtV1JTF2Yg=";
+  base00 = "22221b";
+  base01 = "302f27";
+  base02 = "5f5e4e";
+  base03 = "6c6b5a";
+  base04 = "878573";
+  base05 = "929181";
+  base06 = "e7e6df";
+  base07 = "f4f3ec";
+  base08 = "ba6236";
+  base09 = "ae7313";
+  base0A = "a5980d";
+  base0B = "7d9726";
+  base0C = "5b9d48";
+  base0D = "36a166";
+  base0E = "5f9182";
+  base0F = "9d6c7c";
+}
--- a/themes/atelier-estuary/polarity.txt
+++ b/themes/atelier-estuary/polarity.txt
@@ -1 +0,0 @@
-dark
--- a/themes/atelier-forest/atelier-forest.yaml
+++ b/themes/atelier-forest/atelier-forest.yaml
@@ -1,18 +0,0 @@
-scheme: "Atelier Forest"
-author: "Bram de Haan (http://atelierbramdehaan.nl)"
-base00: "1b1918"
-base01: "2c2421"
-base02: "68615e"
-base03: "766e6b"
-base04: "9c9491"
-base05: "a8a19f"
-base06: "e6e2e0"
-base07: "f1efee"
-base08: "f22c40"
-base09: "df5320"
-base0A: "c38418"
-base0B: "7b9726"
-base0C: "3d97b8"
-base0D: "407ee7"
-base0E: "6666ea"
-base0F: "c33ff3"
--- a/themes/atelier-forest/backgroundsha256.txt
+++ b/themes/atelier-forest/backgroundsha256.txt
@@ -1 +0,0 @@
-sha256-+ayGF3G14PfZwZnIeqCpnV/awnwdpue3OBmJYTirb2U=
--- a/themes/atelier-forest/backgroundurl.txt
+++ b/themes/atelier-forest/backgroundurl.txt
@@ -1 +0,0 @@
-https://w.wallhaven.cc/full/72/wallhaven-72p97v.jpg
--- a/themes/atelier-forest/default.nix
+++ b/themes/atelier-forest/default.nix
@@ -0,0 +1,25 @@
+{
+  scheme = "Atelier Forest";
+  slug = "atelier-forest";
+  author = "Bram de Haan (http://atelierbramdehaan.nl)";
+  description = ''A colorscheme like “Birds of Paradise”, but a bit muddier on the browns, less red and more greyed out, like clay'';
+  polarity = "dark";
+  backgroundUrl = "https://w.wallhaven.cc/full/72/wallhaven-72p97v.jpg";
+  backgroundSha256 = "sha256-+ayGF3G14PfZwZnIeqCpnV/awnwdpue3OBmJYTirb2U=";
+  base00 = "1b1918";
+  base01 = "2c2421";
+  base02 = "68615e";
+  base03 = "766e6b";
+  base04 = "9c9491";
+  base05 = "a8a19f";
+  base06 = "e6e2e0";
+  base07 = "f1efee";
+  base08 = "f22c40";
+  base09 = "df5320";
+  base0A = "c38418";
+  base0B = "7b9726";
+  base0C = "3d97b8";
+  base0D = "407ee7";
+  base0E = "6666ea";
+  base0F = "c33ff3";
+}
--- a/themes/atelier-forest/polarity.txt
+++ b/themes/atelier-forest/polarity.txt
@@ -1 +0,0 @@
-dark
--- a/themes/atelier-heath/atelier-heath.yaml
+++ b/themes/atelier-heath/atelier-heath.yaml
@@ -1,18 +0,0 @@
-scheme: "Atelier Heath"
-author: "Bram de Haan (http://atelierbramdehaan.nl)"
-base00: "1b181b"
-base01: "292329"
-base02: "695d69"
-base03: "776977"
-base04: "9e8f9e"
-base05: "ab9bab"
-base06: "d8cad8"
-base07: "f7f3f7"
-base08: "ca402b"
-base09: "a65926"
-base0A: "bb8a35"
-base0B: "918b3b"
-base0C: "159393"
-base0D: "516aec"
-base0E: "7b59c0"
-base0F: "cc33cc"
--- a/themes/atelier-heath/backgroundsha256.txt
+++ b/themes/atelier-heath/backgroundsha256.txt
@@ -1 +0,0 @@
-sha256-KuPdCD5IT0/LJghqQKuAFiFtztp+FyRJRdsjdrAzPI8=
--- a/themes/atelier-heath/backgroundurl.txt
+++ b/themes/atelier-heath/backgroundurl.txt
@@ -1 +0,0 @@
-https://r4.wallpaperflare.com/wallpaper/861/102/512/moonlight-fantasy-landscape-moon-full-moon-wallpaper-0960b8dd31ca4d2b96b7684fd021067d.jpg
--- a/themes/atelier-heath/default.nix
+++ b/themes/atelier-heath/default.nix
@@ -0,0 +1,25 @@
+{
+  scheme = "Atelier Heath";
+  slug = "atelier-heath";
+  author = "Bram de Haan (http://atelierbramdehaan.nl)";
+  description = "Here the background-colors have these cool-red colors for the background, but then obviously toned down quite a bit…";
+  polarity = "dark";
+  backgroundUrl = "https://r4.wallpaperflare.com/wallpaper/861/102/512/moonlight-fantasy-landscape-moon-full-moon-wallpaper-0960b8dd31ca4d2b96b7684fd021067d.jpg";
+  backgroundSha256 = "sha256-KuPdCD5IT0/LJghqQKuAFiFtztp+FyRJRdsjdrAzPI8=";
+  base00 = "1b181b";
+  base01 = "292329";
+  base02 = "695d69";
+  base03 = "776977";
+  base04 = "9e8f9e";
+  base05 = "ab9bab";
+  base06 = "d8cad8";
+  base07 = "f7f3f7";
+  base08 = "ca402b";
+  base09 = "a65926";
+  base0A = "bb8a35";
+  base0B = "918b3b";
+  base0C = "159393";
+  base0D = "516aec";
+  base0E = "7b59c0";
+  base0F = "cc33cc";
+}
--- a/themes/atelier-heath/polarity.txt
+++ b/themes/atelier-heath/polarity.txt
@@ -1 +0,0 @@
-dark
--- a/themes/atelier-lakeside/atelier-lakeside.yaml
+++ b/themes/atelier-lakeside/atelier-lakeside.yaml
@@ -1,18 +0,0 @@
-scheme: "Atelier Lakeside"
-author: "Bram de Haan (http://atelierbramdehaan.nl)"
-base00: "161b1d"
-base01: "1f292e"
-base02: "516d7b"
-base03: "5a7b8c"
-base04: "7195a8"
-base05: "7ea2b4"
-base06: "c1e4f6"
-base07: "ebf8ff"
-base08: "d22d72"
-base09: "935c25"
-base0A: "8a8a0f"
-base0B: "568c3b"
-base0C: "2d8f6f"
-base0D: "257fad"
-base0E: "6b6bb8"
-base0F: "b72dd2"
--- a/themes/atelier-lakeside/backgroundsha256.txt
+++ b/themes/atelier-lakeside/backgroundsha256.txt
@@ -1 +0,0 @@
-sha256-8ytn00rZUiJxgtjXqTxtR7qusokxjY68u+UiWuwD8Bs=
--- a/themes/atelier-lakeside/backgroundurl.txt
+++ b/themes/atelier-lakeside/backgroundurl.txt
@@ -1 +0,0 @@
-https://r4.wallpaperflare.com/wallpaper/410/867/750/vector-forest-sunset-forest-sunset-forest-wallpaper-b3abc35d0d699b056fa6b247589b18a8.jpg
--- a/themes/atelier-lakeside/default.nix
+++ b/themes/atelier-lakeside/default.nix
@@ -0,0 +1,25 @@
+{
+  scheme = "Atelier Lakeside";
+  slug = "atelier-lakeside";
+  author = "Bram de Haan (http://atelierbramdehaan.nl)";
+  description = "Coolest colorscheme of the (Atelier) bunch";
+  polarity = "dark";
+  backgroundUrl = "https://r4.wallpaperflare.com/wallpaper/410/867/750/vector-forest-sunset-forest-sunset-forest-wallpaper-b3abc35d0d699b056fa6b247589b18a8.jpg";
+  backgroundSha256 = "sha256-8ytn00rZUiJxgtjXqTxtR7qusokxjY68u+UiWuwD8Bs=";
+  base00 = "161b1d";
+  base01 = "1f292e";
+  base02 = "516d7b";
+  base03 = "5a7b8c";
+  base04 = "7195a8";
+  base05 = "7ea2b4";
+  base06 = "c1e4f6";
+  base07 = "ebf8ff";
+  base08 = "d22d72";
+  base09 = "935c25";
+  base0A = "8a8a0f";
+  base0B = "568c3b";
+  base0C = "2d8f6f";
+  base0D = "257fad";
+  base0E = "6b6bb8";
+  base0F = "b72dd2";
+}
--- a/themes/atelier-lakeside/polarity.txt
+++ b/themes/atelier-lakeside/polarity.txt
@@ -1 +0,0 @@
-dark
--- a/themes/atelier-plateau/atelier-plateau.yaml
+++ b/themes/atelier-plateau/atelier-plateau.yaml
@@ -1,18 +0,0 @@
-scheme: "Atelier Plateau"
-author: "Bram de Haan (http://atelierbramdehaan.nl)"
-base00: "1b1818"
-base01: "292424"
-base02: "585050"
-base03: "655d5d"
-base04: "7e7777"
-base05: "8a8585"
-base06: "e7dfdf"
-base07: "f4ecec"
-base08: "ca4949"
-base09: "b45a3c"
-base0A: "a06e3b"
-base0B: "4b8b8b"
-base0C: "5485b6"
-base0D: "7272ca"
-base0E: "8464c4"
-base0F: "bd5187"
--- a/themes/atelier-plateau/backgroundsha256.txt
+++ b/themes/atelier-plateau/backgroundsha256.txt
@@ -1 +0,0 @@
-sha256-GL4QjCZFLAgsMM05cLqAx9Sd293NfU79azFhuzBGhW0=
--- a/themes/atelier-plateau/backgroundurl.txt
+++ b/themes/atelier-plateau/backgroundurl.txt
@@ -1 +0,0 @@
-https://r4.wallpaperflare.com/wallpaper/428/434/322/art-computer-digital-art-concept-art-wallpaper-b9a0c85d016a9d0b66a7b84f509116ad.jpg
--- a/themes/atelier-plateau/default.nix
+++ b/themes/atelier-plateau/default.nix
@@ -0,0 +1,25 @@
+{
+  scheme = "Atelier Plateau";
+  slug = "atelier-plateau";
+  author = "Bram de Haan (http://atelierbramdehaan.nl)";
+  description = "A warm palette; no real green in here";
+  polarity = "dark";
+  backgroundUrl = "https://r4.wallpaperflare.com/wallpaper/428/434/322/art-computer-digital-art-concept-art-wallpaper-b9a0c85d016a9d0b66a7b84f509116ad.jpg";
+  backgroundSha256 = "sha256-GL4QjCZFLAgsMM05cLqAx9Sd293NfU79azFhuzBGhW0=";
+  base00 = "1b1818";
+  base01 = "292424";
+  base02 = "585050";
+  base03 = "655d5d";
+  base04 = "7e7777";
+  base05 = "8a8585";
+  base06 = "e7dfdf";
+  base07 = "f4ecec";
+  base08 = "ca4949";
+  base09 = "b45a3c";
+  base0A = "a06e3b";
+  base0B = "4b8b8b";
+  base0C = "5485b6";
+  base0D = "7272ca";
+  base0E = "8464c4";
+  base0F = "bd5187";
+}
--- a/themes/atelier-plateau/polarity.txt
+++ b/themes/atelier-plateau/polarity.txt
@@ -1 +0,0 @@
-dark
--- a/themes/atelier-savanna/atelier-savanna.yaml
+++ b/themes/atelier-savanna/atelier-savanna.yaml
@@ -1,18 +0,0 @@
-scheme: "Atelier Savanna"
-author: "Bram de Haan (http://atelierbramdehaan.nl)"
-base00: "171c19"
-base01: "232a25"
-base02: "526057"
-base03: "5f6d64"
-base04: "78877d"
-base05: "87928a"
-base06: "dfe7e2"
-base07: "ecf4ee"
-base08: "b16139"
-base09: "9f713c"
-base0A: "a07e3b"
-base0B: "489963"
-base0C: "1c9aa0"
-base0D: "478c90"
-base0E: "55859b"
-base0F: "867469"
--- a/themes/atelier-savanna/backgroundsha256.txt
+++ b/themes/atelier-savanna/backgroundsha256.txt
@@ -1 +0,0 @@
-sha256-0ubzlyIj3Uz9vQa+qvz/+q/1trgbNUEpQysqtEFs54g=
--- a/themes/atelier-savanna/backgroundurl.txt
+++ b/themes/atelier-savanna/backgroundurl.txt
@@ -1 +0,0 @@
-https://r4.wallpaperflare.com/wallpaper/760/955/638/artwork-landscape-sky-mountains-wallpaper-78664db880d01c78404c214e28e2847a.jpg
--- a/themes/atelier-savanna/default.nix
+++ b/themes/atelier-savanna/default.nix
@@ -0,0 +1,25 @@
+{
+  scheme = "Atelier Savanna";
+  slug = "atelier-savanna";
+  author = "Bram de Haan (http://atelierbramdehaan.nl)";
+  description = ''“Color-wheel colors” are desaturated considerably, giving this colorscheme a rather understated appeal and, dear I say it, a ‘natural’ look and feel'';
+  polarity = "dark";
+  backgroundUrl = "https://r4.wallpaperflare.com/wallpaper/760/955/638/artwork-landscape-sky-mountains-wallpaper-78664db880d01c78404c214e28e2847a.jpg";
+  backgroundSha256 = "sha256-0ubzlyIj3Uz9vQa+qvz/+q/1trgbNUEpQysqtEFs54g=";
+  base00 = "171c19";
+  base01 = "232a25";
+  base02 = "526057";
+  base03 = "5f6d64";
+  base04 = "78877d";
+  base05 = "87928a";
+  base06 = "dfe7e2";
+  base07 = "ecf4ee";
+  base08 = "b16139";
+  base09 = "9f713c";
+  base0A = "a07e3b";
+  base0B = "489963";
+  base0C = "1c9aa0";
+  base0D = "478c90";
+  base0E = "55859b";
+  base0F = "867469";
+}
--- a/themes/atelier-savanna/polarity.txt
+++ b/themes/atelier-savanna/polarity.txt
@@ -1 +0,0 @@
-dark
--- a/themes/atelier-seaside/atelier-seaside.yaml
+++ b/themes/atelier-seaside/atelier-seaside.yaml
@@ -1,18 +0,0 @@
-scheme: "Atelier Seaside"
-author: "Bram de Haan (http://atelierbramdehaan.nl)"
-base00: "131513"
-base01: "242924"
-base02: "5e6e5e"
-base03: "687d68"
-base04: "809980"
-base05: "8ca68c"
-base06: "cfe8cf"
-base07: "f4fbf4"
-base08: "e6193c"
-base09: "87711d"
-base0A: "98981b"
-base0B: "29a329"
-base0C: "1999b3"
-base0D: "3d62f5"
-base0E: "ad2bee"
-base0F: "e619c3"
--- a/themes/atelier-seaside/backgroundsha256.txt
+++ b/themes/atelier-seaside/backgroundsha256.txt
@@ -1 +0,0 @@
-sha256-GcHU4qYRGFubobNENwp8prpd/da4tzHwRyN+rsH2dYA=
--- a/themes/atelier-seaside/backgroundurl.txt
+++ b/themes/atelier-seaside/backgroundurl.txt
@@ -1 +0,0 @@
-https://r4.wallpaperflare.com/wallpaper/714/495/609/landscape-artwork-digital-art-fantasy-art-wallpaper-9960e89d112afd2ba6e738ff70b1e63d.jpg
--- a/themes/atelier-seaside/default.nix
+++ b/themes/atelier-seaside/default.nix
@@ -0,0 +1,25 @@
+{
+  scheme = "Atelier Seaside";
+  slug = "atelier-seaside";
+  author = "Bram de Haan (http://atelierbramdehaan.nl)";
+  description = "Very saturated color-palette; comes popping at you";
+  polarity = "dark";
+  backgroundUrl = "https://r4.wallpaperflare.com/wallpaper/714/495/609/landscape-artwork-digital-art-fantasy-art-wallpaper-9960e89d112afd2ba6e738ff70b1e63d.jpg";
+  backgroundSha256 = "sha256-GcHU4qYRGFubobNENwp8prpd/da4tzHwRyN+rsH2dYA=";
+  base00 = "131513";
+  base01 = "242924";
+  base02 = "5e6e5e";
+  base03 = "687d68";
+  base04 = "809980";
+  base05 = "8ca68c";
+  base06 = "cfe8cf";
+  base07 = "f4fbf4";
+  base08 = "e6193c";
+  base09 = "87711d";
+  base0A = "98981b";
+  base0B = "29a329";
+  base0C = "1999b3";
+  base0D = "3d62f5";
+  base0E = "ad2bee";
+  base0F = "e619c3";
+}
--- a/themes/atelier-seaside/polarity.txt
+++ b/themes/atelier-seaside/polarity.txt
@@ -1 +0,0 @@
-dark
--- a/themes/atelier-sulphurpool/atelier-sulphurpool.yaml
+++ b/themes/atelier-sulphurpool/atelier-sulphurpool.yaml
@@ -1,18 +0,0 @@
-scheme: "Atelier Sulphurpool"
-author: "Bram de Haan (http://atelierbramdehaan.nl)"
-base00: "202746"
-base01: "293256"
-base02: "5e6687"
-base03: "6b7394"
-base04: "898ea4"
-base05: "979db4"
-base06: "dfe2f1"
-base07: "f5f7ff"
-base08: "c94922"
-base09: "c76b29"
-base0A: "c08b30"
-base0B: "ac9739"
-base0C: "22a2c9"
-base0D: "3d8fd1"
-base0E: "6679cc"
-base0F: "9c637a"
--- a/themes/atelier-sulphurpool/backgroundsha256.txt
+++ b/themes/atelier-sulphurpool/backgroundsha256.txt
@@ -1 +0,0 @@
-sha256-mnh2uKy3PO0otUdTw4Bv4JDnMYj/m7Gt7P7XDJb2+c0=
--- a/themes/atelier-sulphurpool/backgroundurl.txt
+++ b/themes/atelier-sulphurpool/backgroundurl.txt
@@ -1 +0,0 @@
-https://r4.wallpaperflare.com/wallpaper/13/960/9/digital-art-fantasy-art-colorful-space-art-wallpaper-99330d2ae61a6c661d5ea4793fc17511.jpg
--- a/themes/atelier-sulphurpool/default.nix
+++ b/themes/atelier-sulphurpool/default.nix
@@ -0,0 +1,25 @@
+{
+  scheme = "Atelier Sulphurpool";
+  slug = "atelier-sulphurpool";
+  author = "Bram de Haan (http://atelierbramdehaan.nl)";
+  description = "Purple base color; easy on the eye";
+  polarity = "dark";
+  backgroundUrl = "https://r4.wallpaperflare.com/wallpaper/13/960/9/digital-art-fantasy-art-colorful-space-art-wallpaper-99330d2ae61a6c661d5ea4793fc17511.jpg";
+  backgroundSha256 = "sha256-mnh2uKy3PO0otUdTw4Bv4JDnMYj/m7Gt7P7XDJb2+c0=";
+  base00 = "202746";
+  base01 = "293256";
+  base02 = "5e6687";
+  base03 = "6b7394";
+  base04 = "898ea4";
+  base05 = "979db4";
+  base06 = "dfe2f1";
+  base07 = "f5f7ff";
+  base08 = "c94922";
+  base09 = "c76b29";
+  base0A = "c08b30";
+  base0B = "ac9739";
+  base0C = "22a2c9";
+  base0D = "3d8fd1";
+  base0E = "6679cc";
+  base0F = "9c637a";
+}
--- a/themes/atelier-sulphurpool/polarity.txt
+++ b/themes/atelier-sulphurpool/polarity.txt
@@ -1 +0,0 @@
-dark
--- a/themes/ayu-dark/ayu-dark.yaml
+++ b/themes/ayu-dark/ayu-dark.yaml
@@ -1,18 +0,0 @@
-scheme: "Ayu Dark"
-author: "Khue Nguyen <Z5483Y@gmail.com>"
-base00: "0F1419"
-base01: "131721"
-base02: "272D38"
-base03: "3E4B59"
-base04: "BFBDB6"
-base05: "E6E1CF"
-base06: "E6E1CF"
-base07: "F3F4F5"
-base08: "F07178"
-base09: "FF8F40"
-base0A: "FFB454"
-base0B: "B8CC52"
-base0C: "95E6CB"
-base0D: "59C2FF"
-base0E: "D2A6FF"
-base0F: "E6B673"
--- a/themes/ayu-dark/backgroundsha256.txt
+++ b/themes/ayu-dark/backgroundsha256.txt
@@ -1 +0,0 @@
-sha256-0BiSjEZnwh6KnWuNau+9lf1PVBYRnq228l4OA/nm5YI=
--- a/themes/ayu-dark/backgroundurl.txt
+++ b/themes/ayu-dark/backgroundurl.txt
@@ -1 +0,0 @@
-https://w.wallhaven.cc/full/zy/wallhaven-zy8wwo.jpg
--- a/themes/ayu-dark/default.nix
+++ b/themes/ayu-dark/default.nix
@@ -0,0 +1,25 @@
+{
+  scheme = "Ayu Dark";
+  slug = "ayu-dark";
+  author = "Khue Nguyen <Z5483Y@gmail.com>";
+  description = "Simple, bright and elegant theme";
+  polarity = "dark";
+  backgroundUrl = "https://w.wallhaven.cc/full/zy/wallhaven-zy8wwo.jpg";
+  backgroundSha256 = "sha256-0BiSjEZnwh6KnWuNau+9lf1PVBYRnq228l4OA/nm5YI=";
+  base00 = "0F1419";
+  base01 = "131721";
+  base02 = "272D38";
+  base03 = "3E4B59";
+  base04 = "BFBDB6";
+  base05 = "E6E1CF";
+  base06 = "E6E1CF";
+  base07 = "F3F4F5";
+  base08 = "F07178";
+  base09 = "FF8F40";
+  base0A = "FFB454";
+  base0B = "B8CC52";
+  base0C = "95E6CB";
+  base0D = "59C2FF";
+  base0E = "D2A6FF";
+  base0F = "E6B673";
+}
--- a/themes/ayu-dark/polarity.txt
+++ b/themes/ayu-dark/polarity.txt
@@ -1 +0,0 @@
-dark
--- a/themes/background-test.sh
+++ b/themes/background-test.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 for i in $(ls -d */);
 do
-  if curl --output /dev/null --silent --head --fail $(cat $i/backgroundurl.txt); then
+  if curl --output /dev/null --silent --head --fail $(cat $i/default.nix | grep "backgroundUrl" | cut -d'"' -f 2); then
    echo "$i background successfully downloads";
  else
    echo -e "\033[0;31m$i background download fails\033[0m"
--- a/themes/bespin/backgroundsha256.txt
+++ b/themes/bespin/backgroundsha256.txt
@@ -1 +0,0 @@
-sha256-uVPfyCXyyBVSfgbiQy5rhngNjuAmxk89btary3Iiwq0=
--- a/themes/bespin/backgroundurl.txt
+++ b/themes/bespin/backgroundurl.txt
@@ -1 +0,0 @@
-https://r4.wallpaperflare.com/wallpaper/597/635/621/sword-fantasy-forest-twilight-river-hd-wallpaper-f98078cd21caad7b46d7b83fb021566d.jpg
--- a/themes/bespin/bespin.yaml
+++ b/themes/bespin/bespin.yaml
@@ -1,19 +0,0 @@
-# Base16 Builder scheme by Jan T. Sott
-scheme: "Bespin"
-author: "Jan T. Sott"
-base00: "28211c"
-base01: "36312e"
-base02: "5e5d5c"
-base03: "666666"
-base04: "797977"
-base05: "8a8986"
-base06: "9d9b97"
-base07: "baae9e"
-base08: "cf6a4c"
-base09: "cf7d34"
-base0A: "f9ee98"
-base0B: "54be0d"
-base0C: "afc4db"
-base0D: "5ea6ea"
-base0E: "9b859d"
-base0F: "937121"
--- a/themes/bespin/default.nix
+++ b/themes/bespin/default.nix
@@ -0,0 +1,25 @@
+{
+  scheme = "Bespin";
+  slug = "bespin";
+  author = "Jan T. Sott (https://github.com/idleberg)";
+  description = "Port of the Bespin theme from Sublime Text 2/3";
+  polarity = "dark";
+  backgroundUrl = "https://r4.wallpaperflare.com/wallpaper/597/635/621/sword-fantasy-forest-twilight-river-hd-wallpaper-f98078cd21caad7b46d7b83fb021566d.jpg";
+  backgroundSha256 = "sha256-uVPfyCXyyBVSfgbiQy5rhngNjuAmxk89btary3Iiwq0=";
+  base00 = "28211c";
+  base01 = "36312e";
+  base02 = "5e5d5c";
+  base03 = "666666";
+  base04 = "797977";
+  base05 = "8a8986";
+  base06 = "9d9b97";
+  base07 = "baae9e";
+  base08 = "cf6a4c";
+  base09 = "cf7d34";
+  base0A = "f9ee98";
+  base0B = "54be0d";
+  base0C = "afc4db";
+  base0D = "5ea6ea";
+  base0E = "9b859d";
+  base0F = "937121";
+}
--- a/themes/bespin/polarity.txt
+++ b/themes/bespin/polarity.txt
@@ -1 +0,0 @@
-dark
--- a/themes/caret/backgroundsha256.txt
+++ b/themes/caret/backgroundsha256.txt
@@ -1 +0,0 @@
-sha256-sHr/BFWhRvzr0gVD73E7fSlGG8/9G2D3/M46UNf+qvU=
--- a/themes/caret/backgroundurl.txt
+++ b/themes/caret/backgroundurl.txt
@@ -1 +0,0 @@
-https://raw.githubusercontent.com/D3Ext/aesthetic-wallpapers/main/images/gruvbox_retrocity.png
--- a/themes/caret/caret.yaml
+++ b/themes/caret/caret.yaml
@@ -1,18 +0,0 @@
-scheme: "Caret Dark"
-author: "projekt0n"
-base00: "2a2d25"
-base01: "3f4536"
-base02: "586048"
-base03: "6d7859"
-base04: "9db573"
-base05: "b0c48d"
-base06: "c5d4ab"
-base07: "fdfffa"
-base08: "f18e91"
-base09: "e2a66f"
-base0A: "e0c98a"
-base0B: "a1ea9e"
-base0C: "a1ea93"
-base0D: "67cfa3"
-base0E: "80b7cb"
-base0F: "baacd7"
--- a/themes/caret/default.nix
+++ b/themes/caret/default.nix
@@ -0,0 +1,25 @@
+{
+  scheme = "Caret Dark";
+  slug = "caret-dark";
+  author = "projekt0n (https://github.com/projekt0n)";
+  description = "The timeless colorscheme (originally for the neovim text editor)";
+  polarity = "dark";
+  backgroundUrl = "https://raw.githubusercontent.com/D3Ext/aesthetic-wallpapers/main/images/gruvbox_retrocity.png";
+  backgroundSha256 = "sha256-sHr/BFWhRvzr0gVD73E7fSlGG8/9G2D3/M46UNf+qvU=";
+  base00 = "2a2d25";
+  base01 = "3f4536";
+  base02 = "586048";
+  base03 = "6d7859";
+  base04 = "9db573";
+  base05 = "b0c48d";
+  base06 = "c5d4ab";
+  base07 = "fdfffa";
+  base08 = "f18e91";
+  base09 = "e2a66f";
+  base0A = "e0c98a";
+  base0B = "a1ea9e";
+  base0C = "a1ea93";
+  base0D = "67cfa3";
+  base0E = "80b7cb";
+  base0F = "baacd7";
+}
--- a/themes/caret/polarity.txt
+++ b/themes/caret/polarity.txt
@@ -1 +0,0 @@
-dark
--- a/themes/catppuccin-frappe/backgroundsha256.txt
+++ b/themes/catppuccin-frappe/backgroundsha256.txt
@@ -1 +0,0 @@
-sha256-krJtLOP+9mV87l0/XCkqtk558VeHP3ZjThLEh97ESek=
--- a/themes/catppuccin-frappe/backgroundurl.txt
+++ b/themes/catppuccin-frappe/backgroundurl.txt
@@ -1 +0,0 @@
-https://images3.alphacoders.com/126/1266078.jpg
--- a/themes/catppuccin-frappe/catppuccin-frappe.yaml
+++ b/themes/catppuccin-frappe/catppuccin-frappe.yaml
@@ -1,18 +0,0 @@
-scheme: "Catppuccin Frappe"
-author: "https://github.com/catppuccin/catppuccin"
-base00: "303446" # base
-base01: "292c3c" # mantle
-base02: "414559" # surface0
-base03: "51576d" # surface1
-base04: "626880" # surface2
-base05: "c6d0f5" # text
-base06: "f2d5cf" # rosewater
-base07: "babbf1" # lavender
-base08: "e78284" # red
-base09: "ef9f76" # peach
-base0A: "e5c890" # yellow
-base0B: "a6d189" # green
-base0C: "81c8be" # teal
-base0D: "8caaee" # blue
-base0E: "ca9ee6" # mauve
-base0F: "eebebe" # flamingo
--- a/themes/catppuccin-frappe/default.nix
+++ b/themes/catppuccin-frappe/default.nix
@@ -0,0 +1,25 @@
+{
+  scheme = "Catppuccin Frappe";
+  slug = "catppuccin-frappe";
+  author = "https://catppuccin.com/";
+  description = "Soothing pastel theme for the high-spirited!";
+  polarity = "dark";
+  backgroundUrl = "https://images3.alphacoders.com/126/1266078.jpg";
+  backgroundSha256 = "sha256-krJtLOP+9mV87l0/XCkqtk558VeHP3ZjThLEh97ESek=";
+  base00 = "303446";
+  base01 = "292c3c";
+  base02 = "414559";
+  base03 = "51576d";
+  base04 = "626880";
+  base05 = "c6d0f5";
+  base06 = "f2d5cf";
+  base07 = "babbf1";
+  base08 = "e78284";
+  base09 = "ef9f76";
+  base0A = "e5c890";
+  base0B = "a6d189";
+  base0C = "81c8be";
+  base0D = "8caaee";
+  base0E = "ca9ee6";
+  base0F = "eebebe";
+}
--- a/themes/catppuccin-frappe/polarity.txt
+++ b/themes/catppuccin-frappe/polarity.txt
@@ -1 +0,0 @@
-dark
--- a/themes/catppuccin-mocha/backgroundsha256.txt
+++ b/themes/catppuccin-mocha/backgroundsha256.txt
@@ -1 +0,0 @@
-sha256-wCXKHemZYxVYnWVwh6Ng/nGlUroRotXgvcOdSfqRPeo=
--- a/themes/catppuccin-mocha/backgroundurl.txt
+++ b/themes/catppuccin-mocha/backgroundurl.txt
@@ -1 +0,0 @@
-https://images7.alphacoders.com/126/1266081.jpg
--- a/themes/catppuccin-mocha/catppuccin-mocha.yaml
+++ b/themes/catppuccin-mocha/catppuccin-mocha.yaml
@@ -1,18 +0,0 @@
-scheme: "Catppuccin Mocha"
-author: "https://github.com/catppuccin/catppuccin"
-base00: "1e1e2e" # base
-base01: "181825" # mantle
-base02: "313244" # surface0
-base03: "45475a" # surface1
-base04: "585b70" # surface2
-base05: "cdd6f4" # text
-base06: "f5e0dc" # rosewater
-base07: "b4befe" # lavender
-base08: "f38ba8" # red
-base09: "fab387" # peach
-base0A: "f9e2af" # yellow
-base0B: "a6e3a1" # green
-base0C: "94e2d5" # teal
-base0D: "89b4fa" # blue
-base0E: "cba6f7" # mauve
-base0F: "f2cdcd" # flamingo
--- a/themes/catppuccin-mocha/default.nix
+++ b/themes/catppuccin-mocha/default.nix
@@ -0,0 +1,25 @@
+{
+  scheme = "Catppuccin Mocha";
+  slug = "catppuccin-mocha";
+  author = "https://catppuccin.com/";
+  description = "Soothing pastel theme for the high-spirited!";
+  polarity = "dark";
+  backgroundUrl = "https://images7.alphacoders.com/126/1266081.jpg";
+  backgroundSha256 = "sha256-wCXKHemZYxVYnWVwh6Ng/nGlUroRotXgvcOdSfqRPeo=";
+  base00 = "1e1e2e";
+  base01 = "181825";
+  base02 = "313244";
+  base03 = "45475a";
+  base04 = "585b70";
+  base05 = "cdd6f4";
+  base06 = "f5e0dc";
+  base07 = "b4befe";
+  base08 = "f38ba8";
+  base09 = "fab387";
+  base0A = "f9e2af";
+  base0B = "a6e3a1";
+  base0C = "94e2d5";
+  base0D = "89b4fa";
+  base0E = "cba6f7";
+  base0F = "f2cdcd";
+}
--- a/themes/catppuccin-mocha/polarity.txt
+++ b/themes/catppuccin-mocha/polarity.txt
@@ -1 +0,0 @@
-dark
--- a/themes/darkmoss/backgroundsha256.txt
+++ b/themes/darkmoss/backgroundsha256.txt
@@ -1 +0,0 @@
-sha256-JGEY8mhpXNLCXPoWCXvGWbLkfkpeZRl+hxiLPGwVmSQ=
--- a/themes/darkmoss/backgroundurl.txt
+++ b/themes/darkmoss/backgroundurl.txt
@@ -1 +0,0 @@
-https://w.wallhaven.cc/full/0w/wallhaven-0wrp3p.jpg
--- a/themes/darkmoss/darkmoss.yaml
+++ b/themes/darkmoss/darkmoss.yaml
@@ -1,18 +0,0 @@
-scheme: "darkmoss"
-author: "Gabriel Avanzi (https://github.com/avanzzzi)"
-base00: "171e1f"
-base01: "252c2d"
-base02: "373c3d"
-base03: "555e5f"
-base04: "818f80"
-base05: "c7c7a5"
-base06: "e3e3c8"
-base07: "e1eaef"
-base08: "ff4658"
-base09: "e6db74"
-base0A: "fdb11f"
-base0B: "499180"
-base0C: "66d9ef"
-base0D: "498091"
-base0E: "9bc0c8"
-base0F: "d27b53"
--- a/themes/darkmoss/default.nix
+++ b/themes/darkmoss/default.nix
@@ -0,0 +1,25 @@
+{
+  scheme = "darkmoss";
+  slug = "darkmoss";
+  author = "Gabriel Avanzi (https://github.com/avanzzzi)";
+  description = "A dark color scheme for Base16";
+  polarity = "dark";
+  backgroundUrl = "https://w.wallhaven.cc/full/0w/wallhaven-0wrp3p.jpg";
+  backgroundSha256 = "sha256-JGEY8mhpXNLCXPoWCXvGWbLkfkpeZRl+hxiLPGwVmSQ=";
+  base00 = "171e1f";
+  base01 = "252c2d";
+  base02 = "373c3d";
+  base03 = "555e5f";
+  base04 = "818f80";
+  base05 = "c7c7a5";
+  base06 = "e3e3c8";
+  base07 = "e1eaef";
+  base08 = "ff4658";
+  base09 = "e6db74";
+  base0A = "fdb11f";
+  base0B = "499180";
+  base0C = "66d9ef";
+  base0D = "498091";
+  base0E = "9bc0c8";
+  base0F = "d27b53";
+}
--- a/themes/darkmoss/polarity.txt
+++ b/themes/darkmoss/polarity.txt
@@ -1 +0,0 @@
-dark
--- a/themes/doom-one/backgroundsha256.txt
+++ b/themes/doom-one/backgroundsha256.txt
@@ -1 +0,0 @@
-sha256-gYGwWAgRjpZQGUMZsw5GJ11dKKrU6/bX3xcKXQZVOac=
--- a/themes/doom-one/backgroundurl.txt
+++ b/themes/doom-one/backgroundurl.txt
@@ -1 +0,0 @@
-https://r4.wallpaperflare.com/wallpaper/834/299/692/city-lights-girl-moon-wallpaper-e178a9faa68bf35ee7e3f2afc50e43fc.jpg
--- a/themes/doom-one/default.nix
+++ b/themes/doom-one/default.nix
@@ -0,0 +1,25 @@
+{
+  scheme = "Doom One";
+  slug = "doom-one";
+  author = "hlissner (https://github.com/doomemacs/themes)";
+  description = "Flagship theme of Doom Emacs";
+  polarity = "dark";
+  backgroundUrl = "https://r4.wallpaperflare.com/wallpaper/834/299/692/city-lights-girl-moon-wallpaper-e178a9faa68bf35ee7e3f2afc50e43fc.jpg";
+  backgroundSha256 = "sha256-gYGwWAgRjpZQGUMZsw5GJ11dKKrU6/bX3xcKXQZVOac=";
+  base00 = "1b2229";
+  base01 = "3f444a";
+  base02 = "5B6268";
+  base03 = "202328";
+  base04 = "73797e";
+  base05 = "9ca0a4";
+  base06 = "b1b1b1";
+  base07 = "e6e6e6";
+  base08 = "ff6c6b";
+  base09 = "ECBE7B";
+  base0A = "98be65";
+  base0B = "4db5bd";
+  base0C = "51afef";
+  base0D = "a9a1e1";
+  base0E = "46D9FF";
+  base0F = "5699AF";
+}
--- a/themes/doom-one/doom-one.yaml
+++ b/themes/doom-one/doom-one.yaml
@@ -1,21 +0,0 @@
-# Doom One scheme
-# Based on Doom One by hlissner (https://github.com/doomemacs/themes)
-# With help from doom-one.vim by romgrk (https://github.com/romgrk/doom-one.vim)
-scheme: "Doom One"
-author: "librephoenix (https://gitlab.com/librephoenix)"
-base00: "1b2229" # ----
-base01: "3f444a" # ---
-base02: "5B6268" # --
-base03: "202328" # -
-base04: "73797e" # +
-base05: "9ca0a4" # ++
-base06: "b1b1b1" # +++
-base07: "e6e6e6" # ++++
-base08: "ff6c6b" # red
-base09: "ECBE7B" # yellow
-base0A: "98be65" # green
-base0B: "4db5bd" # teal
-base0C: "51afef" # blue
-base0D: "a9a1e1" # purple
-base0E: "46D9FF" # pink
-base0F: "5699AF" # light red
--- a/themes/doom-one/polarity.txt
+++ b/themes/doom-one/polarity.txt
@@ -1 +0,0 @@
-dark
--- a/themes/dracula/backgroundsha256.txt
+++ b/themes/dracula/backgroundsha256.txt
@@ -1 +0,0 @@
-sha256-rgJkrd7S/uWugPyBVTicbn6HtC8ru5HtEHP426CRSCE=
--- a/themes/dracula/backgroundurl.txt
+++ b/themes/dracula/backgroundurl.txt
@@ -1 +0,0 @@
-https://images.hdqwalls.com/wallpapers/heights-are-not-scary-5k-7s.jpg
--- a/themes/dracula/default.nix
+++ b/themes/dracula/default.nix
@@ -0,0 +1,25 @@
+{
+  scheme = "Dracula";
+  slug = "dracula";
+  author = "Mike Barkmin (http://github.com/mikebarkmin) based on Dracula Theme (https://github.com/dracula)";
+  description = "Dark theme inspired by a certain vampire";
+  polarity = "dark";
+  backgroundUrl = "https://images.hdqwalls.com/wallpapers/heights-are-not-scary-5k-7s.jpg";
+  backgroundSha256 = "sha256-rgJkrd7S/uWugPyBVTicbn6HtC8ru5HtEHP426CRSCE=";
+  base00 = "282936";
+  base01 = "333547";
+  base02 = "4d4f68";
+  base03 = "626483";
+  base04 = "62d6e8";
+  base05 = "e9e9f4";
+  base06 = "f1f2f8";
+  base07 = "f7f7fb";
+  base08 = "ea51b2";
+  base09 = "b45bcf";
+  base0A = "00f769";
+  base0B = "ebff87";
+  base0C = "a1efe4";
+  base0D = "62d6e8";
+  base0E = "b45bcf";
+  base0F = "00f769";
+}
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`sha256-ZM0X0IXsUwAgxdZileDOol8kBANxjW8oGrgha3OFjYE=`
				`@@ -1 +0,0 @@`
				`https://r4.wallpaperflare.com/wallpaper/132/401/75/painting-clouds-sky-landscape-wallpaper-57bfb2f40fd59f8acf4284a1e191c785.jpg`
				`@@ -1 +0,0 @@`
				`sha256-ul7ecqPw9bSr+JRSd+3OlKwVfB+5378L7ObYydJDsgQ=`
				`@@ -1 +0,0 @@`
				`https://images.hdqwalls.com/wallpapers/anime-road-to-city-everlasting-summer-4k-ep.jpg`
				`@@ -1 +0,0 @@`
				`sha256-AVPJYFLEQr9x1V2yQLkMc1g7GqcBPJiKRFuj8MaKe5c=`
				`@@ -1 +0,0 @@`
				`sha256-wplFIlIIYHTofJMuBLtpSWwrFyzz8ao1Gq4wGqgz7qY=`
				`@@ -1 +0,0 @@`
				`sha256-f97njdnllbsnnIjZnz/j0l2qIFWbEsGF2QtV1JTF2Yg=`
				`@@ -1 +0,0 @@`
				`sha256-+ayGF3G14PfZwZnIeqCpnV/awnwdpue3OBmJYTirb2U=`
				`@@ -1 +0,0 @@`
				`https://w.wallhaven.cc/full/72/wallhaven-72p97v.jpg`
				`@@ -1 +0,0 @@`
				`sha256-KuPdCD5IT0/LJghqQKuAFiFtztp+FyRJRdsjdrAzPI8=`