diff --git a/flake.nix b/flake.nix
index 40d9fdb2..f7feabcc 100644
--- a/flake.nix
+++ b/flake.nix
@@ -24,7 +24,8 @@
     name = "emmet";
     email = "librephoenix@protonmail.com";
     dotfilesDir = "~/dotfiles";
-    theme = "dracula";
+    theme = "atelier-plateau";
+    themePolarity = "dark";
     backgroundUrl = "https://w.wallhaven.cc/full/6d/wallhaven-6d5k6x.jpg";
     backgroundSha256 = "+xl4H3UiVmMRNvMhIlaLdVTYYqnSyCTSX2UOTGsDQ8c=";
 
@@ -53,6 +54,7 @@
             myNixConfigurationFilePath = dotfilesDir+"/system/configuration.nix";
             myHomeManagerFilePath = dotfilesDir+"/user/home.nix";
             myTheme = theme;
+            myThemePolarity = themePolarity;
             myBackgroundUrl = backgroundUrl;
             myBackgroundSha256 = backgroundSha256;
             inherit (inputs) eaf;
diff --git a/themes/ashes.yaml b/themes/ashes.yaml
new file mode 100644
index 00000000..72786672
--- /dev/null
+++ b/themes/ashes.yaml
@@ -0,0 +1,19 @@
+# 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
diff --git a/themes/atelier-cave.yaml b/themes/atelier-cave.yaml
new file mode 100644
index 00000000..725ecb4f
--- /dev/null
+++ b/themes/atelier-cave.yaml
@@ -0,0 +1,18 @@
+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"
diff --git a/themes/atelier-dune.yaml b/themes/atelier-dune.yaml
new file mode 100644
index 00000000..806e20c4
--- /dev/null
+++ b/themes/atelier-dune.yaml
@@ -0,0 +1,18 @@
+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"
diff --git a/themes/atelier-estuary.yaml b/themes/atelier-estuary.yaml
new file mode 100644
index 00000000..90eaf4aa
--- /dev/null
+++ b/themes/atelier-estuary.yaml
@@ -0,0 +1,18 @@
+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"
diff --git a/themes/atelier-forest.yaml b/themes/atelier-forest.yaml
new file mode 100644
index 00000000..9704dfcb
--- /dev/null
+++ b/themes/atelier-forest.yaml
@@ -0,0 +1,18 @@
+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"
diff --git a/themes/atelier-heath.yaml b/themes/atelier-heath.yaml
new file mode 100644
index 00000000..8a711fc5
--- /dev/null
+++ b/themes/atelier-heath.yaml
@@ -0,0 +1,18 @@
+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"
diff --git a/themes/atelier-lakeside.yaml b/themes/atelier-lakeside.yaml
new file mode 100644
index 00000000..6c383d32
--- /dev/null
+++ b/themes/atelier-lakeside.yaml
@@ -0,0 +1,18 @@
+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"
diff --git a/themes/atelier-plateau.yaml b/themes/atelier-plateau.yaml
new file mode 100644
index 00000000..1e81c0a4
--- /dev/null
+++ b/themes/atelier-plateau.yaml
@@ -0,0 +1,18 @@
+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"
diff --git a/themes/atelier-savanna.yaml b/themes/atelier-savanna.yaml
new file mode 100644
index 00000000..0e699540
--- /dev/null
+++ b/themes/atelier-savanna.yaml
@@ -0,0 +1,18 @@
+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"
diff --git a/themes/atelier-seaside.yaml b/themes/atelier-seaside.yaml
new file mode 100644
index 00000000..bcc649f0
--- /dev/null
+++ b/themes/atelier-seaside.yaml
@@ -0,0 +1,18 @@
+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"
diff --git a/themes/atelier-sulphurpool.yaml b/themes/atelier-sulphurpool.yaml
new file mode 100644
index 00000000..c9f0b1f9
--- /dev/null
+++ b/themes/atelier-sulphurpool.yaml
@@ -0,0 +1,18 @@
+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"
diff --git a/themes/ayu-dark.yaml b/themes/ayu-dark.yaml
new file mode 100644
index 00000000..6eeb8b21
--- /dev/null
+++ b/themes/ayu-dark.yaml
@@ -0,0 +1,18 @@
+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"
diff --git a/themes/bespin.yaml b/themes/bespin.yaml
new file mode 100644
index 00000000..bbdd0fd9
--- /dev/null
+++ b/themes/bespin.yaml
@@ -0,0 +1,19 @@
+# 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"
\ No newline at end of file
diff --git a/themes/blueforest.yaml b/themes/blueforest.yaml
new file mode 100644
index 00000000..6c2cce82
--- /dev/null
+++ b/themes/blueforest.yaml
@@ -0,0 +1,18 @@
+scheme: "Blue Forest"
+author: "alonsodomin (https://github.com/alonsodomin)"
+base00: "141F2E"
+base01: "1e5c1e"
+base02: "273e5c"
+base03: "a0ffa0"
+base04: "1e5c1e"
+base05: "FFCC33"
+base06: "91CCFF"
+base07: "375780"
+base08: "fffab1"
+base09: "FF8080"
+base0A: "91CCFF"
+base0B: "80ff80"
+base0C: "80ff80"
+base0D: "a2cff5"
+base0E: "0099FF"
+base0F: "e7e7e7"
diff --git a/themes/brushtrees-dark.yaml b/themes/brushtrees-dark.yaml
new file mode 100644
index 00000000..152ae17e
--- /dev/null
+++ b/themes/brushtrees-dark.yaml
@@ -0,0 +1,18 @@
+scheme: "Brush Trees Dark"
+author: "Abraham White <abelincoln.white@gmail.com>"
+base00: "485867"
+base01: "5A6D7A"
+base02: "6D828E"
+base03: "8299A1"
+base04: "98AFB5"
+base05: "B0C5C8"
+base06: "C9DBDC"
+base07: "E3EFEF"
+base08: "b38686"
+base09: "d8bba2"
+base0A: "aab386"
+base0B: "87b386"
+base0C: "86b3b3"
+base0D: "868cb3"
+base0E: "b386b2"
+base0F: "b39f9f"
diff --git a/themes/brushtrees.yaml b/themes/brushtrees.yaml
new file mode 100644
index 00000000..2b102163
--- /dev/null
+++ b/themes/brushtrees.yaml
@@ -0,0 +1,18 @@
+scheme: "Brush Trees"
+author: "Abraham White <abelincoln.white@gmail.com>"
+base00: "E3EFEF"
+base01: "C9DBDC"
+base02: "B0C5C8"
+base03: "98AFB5"
+base04: "8299A1"
+base05: "6D828E"
+base06: "5A6D7A"
+base07: "485867"
+base08: "b38686"
+base09: "d8bba2"
+base0A: "aab386"
+base0B: "87b386"
+base0C: "86b3b3"
+base0D: "868cb3"
+base0E: "b386b2"
+base0F: "b39f9f"
diff --git a/themes/catppuccin-frappe.yaml b/themes/catppuccin-frappe.yaml
new file mode 100644
index 00000000..9bf10825
--- /dev/null
+++ b/themes/catppuccin-frappe.yaml
@@ -0,0 +1,18 @@
+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
diff --git a/themes/catppuccin-mocha.yaml b/themes/catppuccin-mocha.yaml
new file mode 100644
index 00000000..c2a68ecd
--- /dev/null
+++ b/themes/catppuccin-mocha.yaml
@@ -0,0 +1,18 @@
+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
diff --git a/themes/circus.yaml b/themes/circus.yaml
new file mode 100644
index 00000000..23ec24f8
--- /dev/null
+++ b/themes/circus.yaml
@@ -0,0 +1,18 @@
+scheme: "Circus"
+author: "Stephan Boyer (https://github.com/stepchowfun) and Esther Wang (https://github.com/ewang12)"
+base00: "191919"
+base01: "202020"
+base02: "303030"
+base03: "5f5a60"
+base04: "505050"
+base05: "a7a7a7"
+base06: "808080"
+base07: "ffffff"
+base08: "dc657d"
+base09: "4bb1a7"
+base0A: "c3ba63"
+base0B: "84b97c"
+base0C: "4bb1a7"
+base0D: "639ee4"
+base0E: "b888e2"
+base0F: "b888e2"
diff --git a/themes/darkmoss.yaml b/themes/darkmoss.yaml
new file mode 100644
index 00000000..5a0daec6
--- /dev/null
+++ b/themes/darkmoss.yaml
@@ -0,0 +1,18 @@
+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"
diff --git a/themes/emil.yaml b/themes/emil.yaml
new file mode 100644
index 00000000..4819daf1
--- /dev/null
+++ b/themes/emil.yaml
@@ -0,0 +1,18 @@
+scheme: "emil"
+author: "limelier"
+base00: "efefef"
+base01: "bebed2"
+base02: "9e9eaf"
+base03: "7c7c98"
+base04: "505063"
+base05: "313145"
+base06: "22223a"
+base07: "1a1a2f"
+base08: "f43979"
+base09: "d22a8b"
+base0A: "ff669b"
+base0B: "0073a8"
+base0C: "2155d6"
+base0D: "471397"
+base0E: "6916b6"
+base0F: "8d17a5"
diff --git a/themes/eris.yaml b/themes/eris.yaml
new file mode 100644
index 00000000..a94bd24d
--- /dev/null
+++ b/themes/eris.yaml
@@ -0,0 +1,18 @@
+scheme: "eris"
+author: "ed (https://codeberg.org/ed)"
+base00: "0a0920"
+base01: "13133a"
+base02: "23255a"
+base03: "333773"
+base04: "4a5293"
+base05: "606bac"
+base06: "7986c5"
+base07: "9aaae5"
+base08: "f768a3"
+base09: "f768a3"
+base0A: "faaea2"
+base0B: "faaea2"
+base0C: "258fc4"
+base0D: "258fc4"
+base0E: "f768a3"
+base0F: "f768a3"
diff --git a/themes/eva-dim.yaml b/themes/eva-dim.yaml
new file mode 100644
index 00000000..12c72739
--- /dev/null
+++ b/themes/eva-dim.yaml
@@ -0,0 +1,18 @@
+scheme: "Eva Dim"
+author: "kjakapat (https://github.com/kjakapat)"
+base00: "2a3b4d"  # default background
+base01: "3d566f"
+base02: "4b6988"
+base03: "55799c"  # commments
+base04: "7e90a3"
+base05: "9fa2a6"  # foreground
+base06: "d6d7d9"
+base07: "ffffff"
+base08: "c4676c"  # red
+base09: "ff9966"  # orange
+base0A: "cfd05d"  # yellow, contrast ratio reduced to 7.0
+base0B: "5de561"  # green, contrast ratio reduced to 7.0
+base0C: "4b8f77"  # cyan
+base0D: "1ae1dc"  # blue, contrast ratio reduced to 7.0
+base0E: "9c6cd3"  # purple
+base0F: "bb64a9"  # magenta
diff --git a/themes/eva.yaml b/themes/eva.yaml
new file mode 100644
index 00000000..8f0e563f
--- /dev/null
+++ b/themes/eva.yaml
@@ -0,0 +1,18 @@
+scheme: "Eva"
+author: "kjakapat (https://github.com/kjakapat)"
+base00: "2a3b4d"  # default background
+base01: "3d566f"
+base02: "4b6988"
+base03: "55799c"  # commments
+base04: "7e90a3"
+base05: "9fa2a6"  # foreground
+base06: "d6d7d9"
+base07: "ffffff"
+base08: "c4676c"  # red
+base09: "ff9966"  # orange
+base0A: "ffff66"  # yellow
+base0B: "66ff66"  # green
+base0C: "4b8f77"  # cyan
+base0D: "15f4ee"  # blue
+base0E: "9c6cd3"  # purple
+base0F: "bb64a9"  # magenta
diff --git a/themes/everforest.yaml b/themes/everforest.yaml
new file mode 100644
index 00000000..4545a8a1
--- /dev/null
+++ b/themes/everforest.yaml
@@ -0,0 +1,18 @@
+scheme: "Everforest"
+author: "Sainnhe Park (https://github.com/sainnhe)"
+base00: "2f383e" # bg0,       palette1 dark (medium)
+base01: "374247" # bg1,       palette1 dark (medium)
+base02: "4a555b" # bg3,       palette1 dark (medium)
+base03: "859289" # grey1,     palette2 dark
+base04: "9da9a0" # grey2,     palette2 dark
+base05: "d3c6aa" # fg,        palette2 dark
+base06: "e4e1cd" # bg3,       palette1 light (medium)
+base07: "fdf6e3" # bg0,       palette1 light (medium)
+base08: "7fbbb3" # blue,      palette2 dark
+base09: "d699b6" # purple,    palette2 dark
+base0A: "dbbc7f" # yellow,    palette2 dark
+base0B: "83c092" # aqua,      palette2 dark
+base0C: "e69875" # orange,    palette2 dark
+base0D: "a7c080" # green,     palette2 dark
+base0E: "e67e80" # red,       palette2 dark
+base0F: "eaedc8" # bg_visual, palette1 dark (medium)
diff --git a/themes/gigavolt.yaml b/themes/gigavolt.yaml
new file mode 100644
index 00000000..164bbda0
--- /dev/null
+++ b/themes/gigavolt.yaml
@@ -0,0 +1,18 @@
+scheme: "Gigavolt"
+author: "Aidan Swope (http://github.com/Whillikers)"
+base00: "202126"
+base01: "2d303d"
+base02: "5a576e"
+base03: "a1d2e6"
+base04: "cad3ff"
+base05: "e9e7e1"
+base06: "eff0f9"
+base07: "f2fbff"
+base08: "ff661a"
+base09: "19f988"
+base0A: "ffdc2d"
+base0B: "f2e6a9"
+base0C: "fb6acb"
+base0D: "40bfff"
+base0E: "ae94f9"
+base0F: "6187ff"
diff --git a/themes/gruvbox-dark-hard.yaml b/themes/gruvbox-dark-hard.yaml
new file mode 100644
index 00000000..de8f94dd
--- /dev/null
+++ b/themes/gruvbox-dark-hard.yaml
@@ -0,0 +1,18 @@
+scheme: "Gruvbox dark, hard"
+author: "Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox)"
+base00: "1d2021" # ----
+base01: "3c3836" # ---
+base02: "504945" # --
+base03: "665c54" # -
+base04: "bdae93" # +
+base05: "d5c4a1" # ++
+base06: "ebdbb2" # +++
+base07: "fbf1c7" # ++++
+base08: "fb4934" # red
+base09: "fe8019" # orange
+base0A: "fabd2f" # yellow
+base0B: "b8bb26" # green
+base0C: "8ec07c" # aqua/cyan
+base0D: "83a598" # blue
+base0E: "d3869b" # purple
+base0F: "d65d0e" # brown
diff --git a/themes/gruvbox-dark-medium.yaml b/themes/gruvbox-dark-medium.yaml
new file mode 100644
index 00000000..7104d678
--- /dev/null
+++ b/themes/gruvbox-dark-medium.yaml
@@ -0,0 +1,18 @@
+scheme: "Gruvbox dark, medium"
+author: "Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox)"
+base00: "282828" # ----
+base01: "3c3836" # ---
+base02: "504945" # --
+base03: "665c54" # -
+base04: "bdae93" # +
+base05: "d5c4a1" # ++
+base06: "ebdbb2" # +++
+base07: "fbf1c7" # ++++
+base08: "fb4934" # red
+base09: "fe8019" # orange
+base0A: "fabd2f" # yellow
+base0B: "b8bb26" # green
+base0C: "8ec07c" # aqua/cyan
+base0D: "83a598" # blue
+base0E: "d3869b" # purple
+base0F: "d65d0e" # brown
diff --git a/themes/gruvbox-light-hard.yaml b/themes/gruvbox-light-hard.yaml
new file mode 100644
index 00000000..2b3b8e37
--- /dev/null
+++ b/themes/gruvbox-light-hard.yaml
@@ -0,0 +1,18 @@
+scheme: "Gruvbox light, hard"
+author: "Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox)"
+base00: "f9f5d7" # ----
+base01: "ebdbb2" # ---
+base02: "d5c4a1" # --
+base03: "bdae93" # -
+base04: "665c54" # +
+base05: "504945" # ++
+base06: "3c3836" # +++
+base07: "282828" # ++++
+base08: "9d0006" # red
+base09: "af3a03" # orange
+base0A: "b57614" # yellow
+base0B: "79740e" # green
+base0C: "427b58" # aqua/cyan
+base0D: "076678" # blue
+base0E: "8f3f71" # purple
+base0F: "d65d0e" # brown
diff --git a/themes/gruvbox-light-medium.yaml b/themes/gruvbox-light-medium.yaml
new file mode 100644
index 00000000..9fe060d4
--- /dev/null
+++ b/themes/gruvbox-light-medium.yaml
@@ -0,0 +1,18 @@
+scheme: "Gruvbox light, medium"
+author: "Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox)"
+base00: "fbf1c7" # ----
+base01: "ebdbb2" # ---
+base02: "d5c4a1" # --
+base03: "bdae93" # -
+base04: "665c54" # +
+base05: "504945" # ++
+base06: "3c3836" # +++
+base07: "282828" # ++++
+base08: "9d0006" # red
+base09: "af3a03" # orange
+base0A: "b57614" # yellow
+base0B: "79740e" # green
+base0C: "427b58" # aqua/cyan
+base0D: "076678" # blue
+base0E: "8f3f71" # purple
+base0F: "d65d0e" # brown
diff --git a/themes/helios.yaml b/themes/helios.yaml
new file mode 100644
index 00000000..d1c14452
--- /dev/null
+++ b/themes/helios.yaml
@@ -0,0 +1,19 @@
+scheme: "Helios"
+author: "Alex Meyer (https://github.com/reyemxela)"
+base00: "1d2021" # ----
+base01: "383c3e" # ---
+base02: "53585b" # --
+base03: "6f7579" # -
+base04: "cdcdcd" # +
+base05: "d5d5d5" # ++
+base06: "dddddd" # +++
+base07: "e5e5e5" # ++++
+base08: "d72638" # red
+base09: "eb8413" # orange
+base0A: "f19d1a" # yellow
+base0B: "88b92d" # green
+base0C: "1ba595" # aqua/cyan
+base0D: "1e8bac" # blue
+base0E: "be4264" # purple
+base0F: "c85e0d" # brown
+
diff --git a/themes/horizon-dark.yaml b/themes/horizon-dark.yaml
new file mode 100644
index 00000000..ee7d8df5
--- /dev/null
+++ b/themes/horizon-dark.yaml
@@ -0,0 +1,18 @@
+scheme: "Horizon Dark"
+author: "Michaël Ball (http://github.com/michael-ball/)"
+base00: "1C1E26"
+base01: "232530"
+base02: "2E303E"
+base03: "6F6F70"
+base04: "9DA0A2"
+base05: "CBCED0"
+base06: "DCDFE4"
+base07: "E3E6EE"
+base08: "E93C58"
+base09: "E58D7D"
+base0A: "EFB993"
+base0B: "EFAF8E"
+base0C: "24A8B4"
+base0D: "DF5273"
+base0E: "B072D1"
+base0F: "E4A382"
diff --git a/themes/isotope.yaml b/themes/isotope.yaml
new file mode 100644
index 00000000..7393a52f
--- /dev/null
+++ b/themes/isotope.yaml
@@ -0,0 +1,19 @@
+# Base16 Builder scheme by Jan T. Sott
+scheme: "Isotope"
+author: "Jan T. Sott"
+base00: "000000"
+base01: "404040"
+base02: "606060"
+base03: "808080"
+base04: "c0c0c0"
+base05: "d0d0d0"
+base06: "e0e0e0"
+base07: "ffffff"
+base08: "ff0000"
+base09: "ff9900"
+base0A: "ff0099"
+base0B: "33ff00"
+base0C: "00ffff"
+base0D: "0066ff"
+base0E: "cc00ff"
+base0F: "3300ff"
\ No newline at end of file
diff --git a/themes/material-vivid.yaml b/themes/material-vivid.yaml
new file mode 100644
index 00000000..ed685669
--- /dev/null
+++ b/themes/material-vivid.yaml
@@ -0,0 +1,18 @@
+scheme: "Material Vivid"
+author: "joshyrobot"
+base00: "202124"
+base01: "27292c"
+base02: "323639"
+base03: "44464d"
+base04: "676c71"
+base05: "80868b"
+base06: "9e9e9e"
+base07: "ffffff"
+base08: "f44336"
+base09: "ff9800"
+base0A: "ffeb3b"
+base0B: "00e676"
+base0C: "00bcd4"
+base0D: "2196f3"
+base0E: "673ab7"
+base0F: "8d6e63"
diff --git a/themes/monokai.yaml b/themes/monokai.yaml
new file mode 100644
index 00000000..a97181ca
--- /dev/null
+++ b/themes/monokai.yaml
@@ -0,0 +1,18 @@
+scheme: "Monokai"
+author: "Wimer Hazenberg (http://www.monokai.nl)"
+base00: "272822"
+base01: "383830"
+base02: "49483e"
+base03: "75715e"
+base04: "a59f85"
+base05: "f8f8f2"
+base06: "f5f4f1"
+base07: "f9f8f5"
+base08: "f92672"
+base09: "fd971f"
+base0A: "f4bf75"
+base0B: "a6e22e"
+base0C: "a1efe4"
+base0D: "66d9ef"
+base0E: "ae81ff"
+base0F: "cc6633"
\ No newline at end of file
diff --git a/themes/mountain.yaml b/themes/mountain.yaml
new file mode 100644
index 00000000..9edf0674
--- /dev/null
+++ b/themes/mountain.yaml
@@ -0,0 +1,18 @@
+scheme: "Mountain"
+author: "gnsfujiwara (https://github.com/gnsfujiwara)"
+base00: "0f0f0f"
+base01: "191919"
+base02: "262626"
+base03: "4c4c4c"
+base04: "ac8a8c"
+base05: "cacaca"
+base06: "e7e7e7"
+base07: "f0f0f0"
+base08: "ac8a8c"
+base09: "ceb188"
+base0A: "aca98a"
+base0B: "8aac8b"
+base0C: "8aabac"
+base0D: "8f8aac"
+base0E: "ac8aac"
+base0F: "ac8a8c"
diff --git a/themes/nord.yaml b/themes/nord.yaml
new file mode 100644
index 00000000..1371883f
--- /dev/null
+++ b/themes/nord.yaml
@@ -0,0 +1,18 @@
+scheme: "Nord"
+author: "arcticicestudio"
+base00: "2E3440"
+base01: "3B4252"
+base02: "434C5E"
+base03: "4C566A"
+base04: "D8DEE9"
+base05: "E5E9F0"
+base06: "ECEFF4"
+base07: "8FBCBB"
+base08: "BF616A"
+base09: "D08770"
+base0A: "EBCB8B"
+base0B: "A3BE8C"
+base0C: "88C0D0"
+base0D: "81A1C1"
+base0E: "B48EAD"
+base0F: "5E81AC"
diff --git a/themes/oceanic-next.yaml b/themes/oceanic-next.yaml
new file mode 100644
index 00000000..2c3230f5
--- /dev/null
+++ b/themes/oceanic-next.yaml
@@ -0,0 +1,18 @@
+scheme: "OceanicNext"
+author: "https://github.com/voronianski/oceanic-next-color-scheme"
+base00: "1B2B34"
+base01: "343D46"
+base02: "4F5B66"
+base03: "65737E"
+base04: "A7ADBA"
+base05: "C0C5CE"
+base06: "CDD3DE"
+base07: "D8DEE9"
+base08: "EC5f67"
+base09: "F99157"
+base0A: "FAC863"
+base0B: "99C794"
+base0C: "5FB3B3"
+base0D: "6699CC"
+base0E: "C594C5"
+base0F: "AB7967"
diff --git a/themes/outrun-dark.yaml b/themes/outrun-dark.yaml
new file mode 100644
index 00000000..b6e0c7e0
--- /dev/null
+++ b/themes/outrun-dark.yaml
@@ -0,0 +1,18 @@
+scheme: "Outrun Dark"
+author: "Hugo Delahousse (http://github.com/hugodelahousse/)"
+base00: "00002A"
+base01: "20204A"
+base02: "30305A"
+base03: "50507A"
+base04: "B0B0DA"
+base05: "D0D0FA"
+base06: "E0E0FF"
+base07: "F5F5FF"
+base08: "FF4242"
+base09: "FC8D28"
+base0A: "F3E877"
+base0B: "59F176"
+base0C: "0EF0F0"
+base0D: "66B0FF"
+base0E: "F10596"
+base0F: "F003EF"
diff --git a/themes/selenized-dark.yaml b/themes/selenized-dark.yaml
new file mode 100644
index 00000000..173e8539
--- /dev/null
+++ b/themes/selenized-dark.yaml
@@ -0,0 +1,18 @@
+scheme: "selenized-dark"
+author: "Jan Warchol (https://github.com/jan-warchol/selenized) / adapted to base16 by ali"
+base00: "103c48"
+base01: "184956"
+base02: "2d5b69"
+base03: "72898f"
+base04: "72898f"
+base05: "adbcbc"
+base06: "cad8d9"
+base07: "cad8d9"
+base08: "fa5750"
+base09: "ed8649"
+base0A: "dbb32d"
+base0B: "75b938"
+base0C: "41c7b9"
+base0D: "4695f7"
+base0E: "af88eb"
+base0F: "f275be"
diff --git a/themes/selenized-light.yaml b/themes/selenized-light.yaml
new file mode 100644
index 00000000..0836da63
--- /dev/null
+++ b/themes/selenized-light.yaml
@@ -0,0 +1,18 @@
+scheme: "selenized-light"
+author: "Jan Warchol (https://github.com/jan-warchol/selenized) / adapted to base16 by ali"
+base00: "fbf3db"
+base01: "ece3cc"
+base02: "d5cdb6"
+base03: "909995"
+base04: "909995"
+base05: "53676d"
+base06: "3a4d53"
+base07: "3a4d53"
+base08: "cc1729"
+base09: "bc5819"
+base0A: "a78300"
+base0B: "428b00"
+base0C: "00978a"
+base0D: "006dce"
+base0E: "825dc0"
+base0F: "c44392"
diff --git a/themes/solarized-dark.yaml b/themes/solarized-dark.yaml
new file mode 100644
index 00000000..61f48a51
--- /dev/null
+++ b/themes/solarized-dark.yaml
@@ -0,0 +1,18 @@
+scheme: "Solarized Dark"
+author: "Ethan Schoonover (modified by aramisgithub)"
+base00: "002b36"
+base01: "073642"
+base02: "586e75"
+base03: "657b83"
+base04: "839496"
+base05: "93a1a1"
+base06: "eee8d5"
+base07: "fdf6e3"
+base08: "dc322f"
+base09: "cb4b16"
+base0A: "b58900"
+base0B: "859900"
+base0C: "2aa198"
+base0D: "268bd2"
+base0E: "6c71c4"
+base0F: "d33682"
diff --git a/themes/solarized-light.yaml b/themes/solarized-light.yaml
new file mode 100644
index 00000000..31da6d3a
--- /dev/null
+++ b/themes/solarized-light.yaml
@@ -0,0 +1,18 @@
+scheme: "Solarized Light"
+author: "Ethan Schoonover (modified by aramisgithub)"
+base00: "fdf6e3"
+base01: "eee8d5"
+base02: "93a1a1"
+base03: "839496"
+base04: "657b83"
+base05: "586e75"
+base06: "073642"
+base07: "002b36"
+base08: "dc322f"
+base09: "cb4b16"
+base0A: "b58900"
+base0B: "859900"
+base0C: "2aa198"
+base0D: "268bd2"
+base0E: "6c71c4"
+base0F: "d33682"
diff --git a/themes/spaceduck.yaml b/themes/spaceduck.yaml
new file mode 100644
index 00000000..79cf12d4
--- /dev/null
+++ b/themes/spaceduck.yaml
@@ -0,0 +1,18 @@
+scheme: "Spaceduck"
+author: "Guillermo Rodriguez (https://github.com/pineapplegiant), packaged by Gabriel Fontes (https://github.com/Misterio77)"
+base00: "16172d"
+base01: "1b1c36"
+base02: "30365F"
+base03: "686f9a"
+base04: "818596"
+base05: "ecf0c1"
+base06: "c1c3cc"
+base07: "ffffff"
+base08: "e33400"
+base09: "e39400"
+base0A: "f2ce00"
+base0B: "5ccc96"
+base0C: "00a3cc"
+base0D: "7a5ccc"
+base0E: "b3a1e6"
+base0F: "ce6f8f"
diff --git a/themes/stella.yaml b/themes/stella.yaml
new file mode 100644
index 00000000..8e42d314
--- /dev/null
+++ b/themes/stella.yaml
@@ -0,0 +1,18 @@
+scheme: "Stella"
+author: "Shrimpram"
+base00: "2B213C"
+base01: "362B48"
+base02: "4D4160"
+base03: "655978"
+base04: "7F7192"
+base05: "998BAD"
+base06: "B4A5C8"
+base07: "EBDCFF"
+base08: "C79987"
+base09: "8865C6"
+base0A: "C7C691"
+base0B: "ACC79B"
+base0C: "9BC7BF"
+base0D: "A5AAD4"
+base0E: "C594FF"
+base0F: "C7AB87"
diff --git a/themes/summerfruit-dark.yaml b/themes/summerfruit-dark.yaml
new file mode 100644
index 00000000..99d4894c
--- /dev/null
+++ b/themes/summerfruit-dark.yaml
@@ -0,0 +1,18 @@
+scheme: "Summerfruit Dark"
+author: "Christopher Corley (http://christop.club/)"
+base00: "151515"
+base01: "202020"
+base02: "303030"
+base03: "505050"
+base04: "B0B0B0"
+base05: "D0D0D0"
+base06: "E0E0E0"
+base07: "FFFFFF"
+base08: "FF0086"
+base09: "FD8900"
+base0A: "ABA800"
+base0B: "00C918"
+base0C: "1FAAAA"
+base0D: "3777E6"
+base0E: "AD00A1"
+base0F: "CC6633"
diff --git a/themes/tomorrow-night.yaml b/themes/tomorrow-night.yaml
new file mode 100644
index 00000000..7577258d
--- /dev/null
+++ b/themes/tomorrow-night.yaml
@@ -0,0 +1,18 @@
+scheme: "Tomorrow Night"
+author: "Chris Kempson (http://chriskempson.com)"
+base00: "1d1f21"
+base01: "282a2e"
+base02: "373b41"
+base03: "969896"
+base04: "b4b7b4"
+base05: "c5c8c6"
+base06: "e0e0e0"
+base07: "ffffff"
+base08: "cc6666"
+base09: "de935f"
+base0A: "f0c674"
+base0B: "b5bd68"
+base0C: "8abeb7"
+base0D: "81a2be"
+base0E: "b294bb"
+base0F: "a3685a"
\ No newline at end of file
diff --git a/themes/twilight.yaml b/themes/twilight.yaml
new file mode 100644
index 00000000..2757b89e
--- /dev/null
+++ b/themes/twilight.yaml
@@ -0,0 +1,18 @@
+scheme: "Twilight"
+author: "David Hart (https://github.com/hartbit)"
+base00: "1e1e1e"
+base01: "323537"
+base02: "464b50"
+base03: "5f5a60"
+base04: "838184"
+base05: "a7a7a7"
+base06: "c3c3c3"
+base07: "ffffff"
+base08: "cf6a4c"
+base09: "cda869"
+base0A: "f9ee98"
+base0B: "8f9d6a"
+base0C: "afc4db"
+base0D: "7587a6"
+base0E: "9b859d"
+base0F: "9b703f"
\ No newline at end of file
diff --git a/themes/uwunicorn.yaml b/themes/uwunicorn.yaml
new file mode 100644
index 00000000..9b53f6df
--- /dev/null
+++ b/themes/uwunicorn.yaml
@@ -0,0 +1,18 @@
+scheme: "UwUnicorn"
+author: "Fernando Marques (https://github.com/RakkiUwU) and Gabriel Fontes (https://github.com/Misterio77)"
+base00: "241b26"
+base01: "2f2a3f"
+base02: "46354a"
+base03: "6c3cb2"
+base04: "7e5f83"
+base05: "eed5d9"
+base06: "d9c2c6"
+base07: "e4ccd0"
+base08: "877bb6"
+base09: "de5b44"
+base0A: "a84a73"
+base0B: "c965bf"
+base0C: "9c5fce"
+base0D: "6a9eb5"
+base0E: "78a38f"
+base0F: "a3a079"
diff --git a/themes/windows-95.yaml b/themes/windows-95.yaml
new file mode 100644
index 00000000..5559078c
--- /dev/null
+++ b/themes/windows-95.yaml
@@ -0,0 +1,18 @@
+scheme: "Windows 95"
+author: "Fergus Collins (https://github.com/C-Fergus)"
+base00: "000000" # black
+base01: "1C1C1C" # darkish black
+base02: "383838" # brightish black
+base03: "545454" # bright black
+base04: "7e7e7e" # darker white
+base05: "a8a8a8" # white
+base06: "d2d2d2" # middle white
+base07: "fcfcfc" # bright white
+base08: "fc5454" # bright red
+base09: "a85400" # yellow
+base0A: "fcfc54" # bright yellow
+base0B: "54fc54" # bright green
+base0C: "54fcfc" # bright cyan
+base0D: "5454fc" # bright blue
+base0E: "fc54fc" # bright magenta
+base0F: "00a800" # green
\ No newline at end of file
diff --git a/themes/woodland.yaml b/themes/woodland.yaml
new file mode 100644
index 00000000..6d9f1a9a
--- /dev/null
+++ b/themes/woodland.yaml
@@ -0,0 +1,18 @@
+scheme: "Woodland"
+author: "Jay Cornwall (https://jcornwall.com)"
+base00: "231e18"
+base01: "302b25"
+base02: "48413a"
+base03: "9d8b70"
+base04: "b4a490"
+base05: "cabcb1"
+base06: "d7c8bc"
+base07: "e4d4c8"
+base08: "d35c5c"
+base09: "ca7f32"
+base0A: "e0ac16"
+base0B: "b7ba53"
+base0C: "6eb958"
+base0D: "88a4d3"
+base0E: "bb90e2"
+base0F: "b49368"
diff --git a/themes/xcode-dusk.yaml b/themes/xcode-dusk.yaml
new file mode 100644
index 00000000..71590389
--- /dev/null
+++ b/themes/xcode-dusk.yaml
@@ -0,0 +1,18 @@
+scheme: "XCode Dusk"
+author: "Elsa Gonsiorowski (https://github.com/gonsie)"
+base00: "282B35"
+base01: "3D4048"
+base02: "53555D"
+base03: "686A71"
+base04: "7E8086"
+base05: "939599"
+base06: "A9AAAE"
+base07: "BEBFC2"
+base08: "B21889"
+base09: "786DC5"
+base0A: "438288"
+base0B: "DF0002"
+base0C: "00A0BE"
+base0D: "790EAD"
+base0E: "B21889"
+base0F: "C77C48"
diff --git a/user/style/stylix.nix b/user/style/stylix.nix
index f5eb85e4..6a432986 100644
--- a/user/style/stylix.nix
+++ b/user/style/stylix.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, myTheme, myBackgroundUrl, myBackgroundSha256, ... }:
+{ config, pkgs, myTheme, myThemePolarity, myBackgroundUrl, myBackgroundSha256, ... }:
 
 let
   myFont = "Inconsolata";
@@ -7,7 +7,7 @@ let
 in
 {
   stylix.autoEnable = false;
-  stylix.polarity = "dark";
+  stylix.polarity = myThemePolarity;
   stylix.image = pkgs.fetchurl {
     url = myBackgroundUrl;
     sha256 = myBackgroundSha256;