diff --git a/themes/eva-dim.yaml b/themes/eva-dim.yaml
deleted file mode 100644
index 12c7273..0000000
--- a/themes/eva-dim.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-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/backgroundsha256.txt b/themes/eva/backgroundsha256.txt
new file mode 100644
index 0000000..5fed936
--- /dev/null
+++ b/themes/eva/backgroundsha256.txt
@@ -0,0 +1 @@
+sha256-eWXpVrveYCG8cq3Pu/734DbO8tdofjUUIlrSNfOUTlM=
diff --git a/themes/eva/backgroundurl.txt b/themes/eva/backgroundurl.txt
new file mode 100644
index 0000000..c6af0cc
--- /dev/null
+++ b/themes/eva/backgroundurl.txt
@@ -0,0 +1 @@
+https://w.wallhaven.cc/full/13/wallhaven-13m9z9.jpg
diff --git a/themes/eva.yaml b/themes/eva/eva.yaml
similarity index 100%
rename from themes/eva.yaml
rename to themes/eva/eva.yaml
diff --git a/themes/eva/polarity.txt b/themes/eva/polarity.txt
new file mode 100644
index 0000000..4520e2f
--- /dev/null
+++ b/themes/eva/polarity.txt
@@ -0,0 +1 @@
+dark
diff --git a/themes/material-vivid/backgroundsha256.txt b/themes/material-vivid/backgroundsha256.txt
new file mode 100644
index 0000000..bfff7a6
--- /dev/null
+++ b/themes/material-vivid/backgroundsha256.txt
@@ -0,0 +1 @@
+sha256-LBgsEyiFJUv1FT26dq2ACIFtQZXTIeKtEk92cLoNv4g=
diff --git a/themes/material-vivid/backgroundurl.txt b/themes/material-vivid/backgroundurl.txt
new file mode 100644
index 0000000..1d2ce7f
--- /dev/null
+++ b/themes/material-vivid/backgroundurl.txt
@@ -0,0 +1 @@
+https://w.wallhaven.cc/full/e7/wallhaven-e7z71l.jpg
diff --git a/themes/material-vivid.yaml b/themes/material-vivid/material-vivid.yaml
similarity index 100%
rename from themes/material-vivid.yaml
rename to themes/material-vivid/material-vivid.yaml
diff --git a/themes/material-vivid/polarity.txt b/themes/material-vivid/polarity.txt
new file mode 100644
index 0000000..4520e2f
--- /dev/null
+++ b/themes/material-vivid/polarity.txt
@@ -0,0 +1 @@
+dark
diff --git a/themes/xcode-dusk/backgroundsha256.txt b/themes/xcode-dusk/backgroundsha256.txt
new file mode 100644
index 0000000..6f0f773
--- /dev/null
+++ b/themes/xcode-dusk/backgroundsha256.txt
@@ -0,0 +1 @@
+sha256-z/attvjcG1nReBjCVBY/JS2Eu2U44+Pd2OtIF1dPb1M=
diff --git a/themes/xcode-dusk/backgroundurl.txt b/themes/xcode-dusk/backgroundurl.txt
new file mode 100644
index 0000000..87adf1b
--- /dev/null
+++ b/themes/xcode-dusk/backgroundurl.txt
@@ -0,0 +1 @@
+https://w.wallhaven.cc/full/yx/wallhaven-yxe85x.jpg
diff --git a/themes/xcode-dusk/polarity.txt b/themes/xcode-dusk/polarity.txt
new file mode 100644
index 0000000..4520e2f
--- /dev/null
+++ b/themes/xcode-dusk/polarity.txt
@@ -0,0 +1 @@
+dark
diff --git a/themes/xcode-dusk.yaml b/themes/xcode-dusk/xcode-dusk.yaml
similarity index 100%
rename from themes/xcode-dusk.yaml
rename to themes/xcode-dusk/xcode-dusk.yaml