diff --git a/themes/bespin/backgroundsha256.txt b/themes/bespin/backgroundsha256.txt
new file mode 100644
index 00000000..ff230013
--- /dev/null
+++ b/themes/bespin/backgroundsha256.txt
@@ -0,0 +1 @@
+sha256-uVPfyCXyyBVSfgbiQy5rhngNjuAmxk89btary3Iiwq0=
diff --git a/themes/bespin/backgroundurl.txt b/themes/bespin/backgroundurl.txt
new file mode 100644
index 00000000..a6451f4b
--- /dev/null
+++ b/themes/bespin/backgroundurl.txt
@@ -0,0 +1 @@
+https://r4.wallpaperflare.com/wallpaper/597/635/621/sword-fantasy-forest-twilight-river-hd-wallpaper-f98078cd21caad7b46d7b83fb021566d.jpg
diff --git a/themes/bespin.yaml b/themes/bespin/bespin.yaml
similarity index 100%
rename from themes/bespin.yaml
rename to themes/bespin/bespin.yaml
diff --git a/themes/bespin/polarity.txt b/themes/bespin/polarity.txt
new file mode 100644
index 00000000..4520e2f7
--- /dev/null
+++ b/themes/bespin/polarity.txt
@@ -0,0 +1 @@
+dark
diff --git a/themes/brushtrees-dark.yaml b/themes/brushtrees-dark.yaml
deleted file mode 100644
index 152ae17e..00000000
--- a/themes/brushtrees-dark.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-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/catppuccin-frappe/backgroundsha256.txt b/themes/catppuccin-frappe/backgroundsha256.txt
new file mode 100644
index 00000000..61f6058f
--- /dev/null
+++ b/themes/catppuccin-frappe/backgroundsha256.txt
@@ -0,0 +1 @@
+sha256-krJtLOP+9mV87l0/XCkqtk558VeHP3ZjThLEh97ESek=
diff --git a/themes/catppuccin-frappe/backgroundurl.txt b/themes/catppuccin-frappe/backgroundurl.txt
new file mode 100644
index 00000000..343ed5e4
--- /dev/null
+++ b/themes/catppuccin-frappe/backgroundurl.txt
@@ -0,0 +1 @@
+https://images3.alphacoders.com/126/1266078.jpg
diff --git a/themes/catppuccin-frappe.yaml b/themes/catppuccin-frappe/catppuccin-frappe.yaml
similarity index 100%
rename from themes/catppuccin-frappe.yaml
rename to themes/catppuccin-frappe/catppuccin-frappe.yaml
diff --git a/themes/catppuccin-frappe/polarity.txt b/themes/catppuccin-frappe/polarity.txt
new file mode 100644
index 00000000..4520e2f7
--- /dev/null
+++ b/themes/catppuccin-frappe/polarity.txt
@@ -0,0 +1 @@
+dark
diff --git a/themes/catppuccin-mocha/backgroundsha256.txt b/themes/catppuccin-mocha/backgroundsha256.txt
new file mode 100644
index 00000000..89764914
--- /dev/null
+++ b/themes/catppuccin-mocha/backgroundsha256.txt
@@ -0,0 +1 @@
+sha256-wCXKHemZYxVYnWVwh6Ng/nGlUroRotXgvcOdSfqRPeo=
diff --git a/themes/catppuccin-mocha/backgroundurl.txt b/themes/catppuccin-mocha/backgroundurl.txt
new file mode 100644
index 00000000..db3ed322
--- /dev/null
+++ b/themes/catppuccin-mocha/backgroundurl.txt
@@ -0,0 +1 @@
+https://images7.alphacoders.com/126/1266081.jpg
diff --git a/themes/catppuccin-mocha.yaml b/themes/catppuccin-mocha/catppuccin-mocha.yaml
similarity index 100%
rename from themes/catppuccin-mocha.yaml
rename to themes/catppuccin-mocha/catppuccin-mocha.yaml
diff --git a/themes/catppuccin-mocha/polarity.txt b/themes/catppuccin-mocha/polarity.txt
new file mode 100644
index 00000000..4520e2f7
--- /dev/null
+++ b/themes/catppuccin-mocha/polarity.txt
@@ -0,0 +1 @@
+dark