diff --git a/flake.nix b/flake.nix
index 0885ee1..43e16d9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -24,8 +24,10 @@
     name = "emmet";
     email = "librephoenix@protonmail.com";
     dotfilesDir = "~/.dotfiles";
-    theme = "ayu-dark";
-    themePolarity = "dark";
+    theme = "ashes";
+
+    themePolarityPath = "/themes/"+theme+"/polarity.txt";
+    themePolarity = builtins.readFile (./. + themePolarityPath);
     backgroundUrlPath = "/themes/"+theme+"/backgroundurl.txt";
     backgroundUrl = builtins.readFile (./. + backgroundUrlPath);
     backgroundSha256Path = "/themes/"+theme+"/backgroundsha256.txt";
diff --git a/themes/ashes.yaml b/themes/ashes/ashes.yaml
similarity index 100%
rename from themes/ashes.yaml
rename to themes/ashes/ashes.yaml
diff --git a/themes/ashes/backgroundsha256.txt b/themes/ashes/backgroundsha256.txt
new file mode 100644
index 0000000..bf464a2
--- /dev/null
+++ b/themes/ashes/backgroundsha256.txt
@@ -0,0 +1 @@
+sha256-ul7ecqPw9bSr+JRSd+3OlKwVfB+5378L7ObYydJDsgQ=
diff --git a/themes/ashes/backgroundurl.txt b/themes/ashes/backgroundurl.txt
new file mode 100644
index 0000000..4efbb1d
--- /dev/null
+++ b/themes/ashes/backgroundurl.txt
@@ -0,0 +1 @@
+https://images.hdqwalls.com/wallpapers/anime-road-to-city-everlasting-summer-4k-ep.jpg
diff --git a/themes/ashes/polarity.txt b/themes/ashes/polarity.txt
new file mode 100644
index 0000000..4520e2f
--- /dev/null
+++ b/themes/ashes/polarity.txt
@@ -0,0 +1 @@
+dark
diff --git a/themes/ayu-dark.yaml b/themes/ayu-dark/ayu-dark.yaml
similarity index 100%
rename from themes/ayu-dark.yaml
rename to themes/ayu-dark/ayu-dark.yaml
diff --git a/themes/ayu-dark/polarity.txt b/themes/ayu-dark/polarity.txt
new file mode 100644
index 0000000..4520e2f
--- /dev/null
+++ b/themes/ayu-dark/polarity.txt
@@ -0,0 +1 @@
+dark
diff --git a/themes/dracula.yaml b/themes/dracula/dracula.yaml
similarity index 100%
rename from themes/dracula.yaml
rename to themes/dracula/dracula.yaml
diff --git a/themes/dracula/polarity.txt b/themes/dracula/polarity.txt
new file mode 100644
index 0000000..4520e2f
--- /dev/null
+++ b/themes/dracula/polarity.txt
@@ -0,0 +1 @@
+dark
diff --git a/themes/emil.yaml b/themes/emil/emil.yaml
similarity index 100%
rename from themes/emil.yaml
rename to themes/emil/emil.yaml
diff --git a/themes/emil/polarity.txt b/themes/emil/polarity.txt
new file mode 100644
index 0000000..162faa6
--- /dev/null
+++ b/themes/emil/polarity.txt
@@ -0,0 +1 @@
+light
diff --git a/themes/everforest.yaml b/themes/everforest/everforest.yaml
similarity index 100%
rename from themes/everforest.yaml
rename to themes/everforest/everforest.yaml
diff --git a/themes/everforest/polarity.txt b/themes/everforest/polarity.txt
new file mode 100644
index 0000000..4520e2f
--- /dev/null
+++ b/themes/everforest/polarity.txt
@@ -0,0 +1 @@
+dark
diff --git a/themes/manegarm.yaml b/themes/manegarm/manegarm.yaml
similarity index 100%
rename from themes/manegarm.yaml
rename to themes/manegarm/manegarm.yaml
diff --git a/themes/manegarm/polarity.txt b/themes/manegarm/polarity.txt
new file mode 100644
index 0000000..4520e2f
--- /dev/null
+++ b/themes/manegarm/polarity.txt
@@ -0,0 +1 @@
+dark
diff --git a/themes/monokai.yaml b/themes/monokai/monokai.yaml
similarity index 100%
rename from themes/monokai.yaml
rename to themes/monokai/monokai.yaml
diff --git a/themes/monokai/polarity.txt b/themes/monokai/polarity.txt
new file mode 100644
index 0000000..4520e2f
--- /dev/null
+++ b/themes/monokai/polarity.txt
@@ -0,0 +1 @@
+dark
diff --git a/themes/something/polarity.txt b/themes/something/polarity.txt
new file mode 100644
index 0000000..4520e2f
--- /dev/null
+++ b/themes/something/polarity.txt
@@ -0,0 +1 @@
+dark
diff --git a/themes/spaceduck/polarity.txt b/themes/spaceduck/polarity.txt
new file mode 100644
index 0000000..4520e2f
--- /dev/null
+++ b/themes/spaceduck/polarity.txt
@@ -0,0 +1 @@
+dark
diff --git a/themes/spaceduck.yaml b/themes/spaceduck/spaceduck.yaml
similarity index 100%
rename from themes/spaceduck.yaml
rename to themes/spaceduck/spaceduck.yaml
diff --git a/themes/tomorrow-night/polarity.txt b/themes/tomorrow-night/polarity.txt
new file mode 100644
index 0000000..4520e2f
--- /dev/null
+++ b/themes/tomorrow-night/polarity.txt
@@ -0,0 +1 @@
+dark
diff --git a/themes/tomorrow-night.yaml b/themes/tomorrow-night/tomorrow-night.yaml
similarity index 100%
rename from themes/tomorrow-night.yaml
rename to themes/tomorrow-night/tomorrow-night.yaml
diff --git a/themes/ubuntu/polarity.txt b/themes/ubuntu/polarity.txt
new file mode 100644
index 0000000..4520e2f
--- /dev/null
+++ b/themes/ubuntu/polarity.txt
@@ -0,0 +1 @@
+dark
diff --git a/themes/ubuntu.yaml b/themes/ubuntu/ubuntu.yaml
similarity index 100%
rename from themes/ubuntu.yaml
rename to themes/ubuntu/ubuntu.yaml
diff --git a/themes/windows-95/polarity.txt b/themes/windows-95/polarity.txt
new file mode 100644
index 0000000..4520e2f
--- /dev/null
+++ b/themes/windows-95/polarity.txt
@@ -0,0 +1 @@
+dark
diff --git a/themes/windows-95.yaml b/themes/windows-95/windows-95.yaml
similarity index 100%
rename from themes/windows-95.yaml
rename to themes/windows-95/windows-95.yaml
diff --git a/user/style/stylix.nix b/user/style/stylix.nix
index 0f57285..22a1377 100644
--- a/user/style/stylix.nix
+++ b/user/style/stylix.nix
@@ -3,7 +3,7 @@
 let
   myFont = "Inconsolata";
   myFontPkg = pkgs.inconsolata;
-  myThemePath = "../../../themes/"+myTheme+".yaml";
+  myThemePath = "../../../themes/"+myTheme+"/"+myTheme+".yaml";
 in
 {
   home.file.".currenttheme".text = myTheme;