diff --git a/css/adaptive.css b/css/adaptive.css
deleted file mode 100644
index 2b400e1..0000000
--- a/css/adaptive.css
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Color preference overrides */
-@media (prefers-color-scheme: dark) {
-	:root {
-		--overlay: rgba(40, 40, 40, 0.9);
-		--overlay-highlight: rgb(23, 33, 36);
-		--background: rgb(7, 18, 21);
-		--border: rgb(80, 80, 80);
-	}
-	body {
-		background-color: var(--background);
-		color: #eee;
-	}
-	h1, h2, h3, h4, h5, h6 {
-		color: #eee;
-	}
-}
diff --git a/css/base.css b/css/base.css
index f6a8efe..a5ec91c 100644
--- a/css/base.css
+++ b/css/base.css
@@ -14,6 +14,9 @@
 	--brand-light: hsl(var(--brand-hue), var(--brand-sturation), var(--brand-lightness-light));
 	--brand-dark: hsl(var(--brand-hue), var(--brand-sturation), var(--brand-lightness-dark));
 
+	/* Backgrounds */
+	--background-image: url('https://unikorn-cloud.github.io/assets/images/backgrounds/light/clouds/1000x667.jpg');
+
         /* Generic colors */
         --light-grey: rgb(200, 200, 200);
         --mid-grey: rgb(128, 128, 128);
@@ -152,6 +155,9 @@ dt {
 
 /* Desktop overrides */
 @media only screen and (min-width: 720px) {
+	:root {
+		--background-image: url('https://unikorn-cloud.github.io/assets/images/backgrounds/light/clouds/6144x4096.jpg');
+	}
 	dl {
 		display: grid;
 		grid-template-columns: auto 1fr;
@@ -162,3 +168,29 @@ dt {
 		grid-column-start: 1;
 	}
 }
+
+/* Dark mode preference */
+@media (prefers-color-scheme: dark) {
+	:root {
+		--background-image: url('https://unikorn-cloud.github.io/assets/images/backgrounds/dark/clouds/1000x667.jpg');
+
+		--overlay: rgba(40, 40, 40, 0.9);
+		--overlay-light: rgba(40, 40, 40, 0.7);
+		--background: rgb(7, 18, 21);
+		--border: rgb(80, 80, 80);
+	}
+	body {
+		background-color: var(--background);
+		color: #eee;
+	}
+	h1, h2, h3, h4, h5, h6 {
+		color: #eee;
+	}
+}
+
+/* Darkmode and desktop, note this must come last to override the other non-composite defaults */
+@media only screen and (min-width: 720px) and (prefers-color-scheme: dark) {
+	:root {
+                --background-image: url('https://unikorn-cloud.github.io/assets/images/backgrounds/dark/clouds/5713x3809.jpg');
+        }
+}
diff --git a/images/backgrounds/clouds/2000x1333.jpg b/images/backgrounds/clouds/2000x1333.jpg
deleted file mode 100644
index 2c0a515..0000000
Binary files a/images/backgrounds/clouds/2000x1333.jpg and /dev/null differ
diff --git a/images/backgrounds/dark/clouds/1000x667.jpg b/images/backgrounds/dark/clouds/1000x667.jpg
new file mode 100644
index 0000000..9f14db9
Binary files /dev/null and b/images/backgrounds/dark/clouds/1000x667.jpg differ
diff --git a/images/backgrounds/dark/clouds/3000x2000.jpg b/images/backgrounds/dark/clouds/3000x2000.jpg
new file mode 100644
index 0000000..997c5c2
Binary files /dev/null and b/images/backgrounds/dark/clouds/3000x2000.jpg differ
diff --git a/images/backgrounds/dark/clouds/attribution.html b/images/backgrounds/dark/clouds/attribution.html
new file mode 100644
index 0000000..831f623
--- /dev/null
+++ b/images/backgrounds/dark/clouds/attribution.html
@@ -0,0 +1 @@
+<a href="https://www.freepik.com/free-photo/sunset-white-clouds-blue-sky-from-airplane-window-view-colorful-cloudscape-background_38117316.htm#query=clouds&position=4&from_view=search&track=sph&uuid=4a197f0b-5a76-4778-98db-70e3c7f31837">Image by svstudioart</a> on Freepik
diff --git a/images/backgrounds/light/clouds/1000x667.jpg b/images/backgrounds/light/clouds/1000x667.jpg
new file mode 100644
index 0000000..61250bf
Binary files /dev/null and b/images/backgrounds/light/clouds/1000x667.jpg differ
diff --git a/images/backgrounds/clouds/6144x4096.jpg b/images/backgrounds/light/clouds/6144x4096.jpg
similarity index 100%
rename from images/backgrounds/clouds/6144x4096.jpg
rename to images/backgrounds/light/clouds/6144x4096.jpg
diff --git a/images/backgrounds/clouds/README.md b/images/backgrounds/light/clouds/attribution.html
similarity index 86%
rename from images/backgrounds/clouds/README.md
rename to images/backgrounds/light/clouds/attribution.html
index bf81a67..49d3aa7 100644
--- a/images/backgrounds/clouds/README.md
+++ b/images/backgrounds/light/clouds/attribution.html
@@ -1,5 +1 @@
-# Attribution Notice
-
-```html
 <a href="https://www.freepik.com/free-ai-image/aerial-view-big-white-clouds-blue-sky_92127122.htm#query=clouds&position=7&from_view=search&track=sph&uuid=77e7bc6d-6181-451b-a1cc-f8dc423999a4">Image By chandlervid85</a>
-```