diff --git a/README.md b/README.md
index 442b3c1bb..3420cdef1 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,8 @@
 <br>
 
 <p align="center">
-  <img src="data/resources/screenshots/preview.png" alt="Preview"/>
+  <img src="data/screenshots/preview_light.png#gh-light-mode-only" alt="Preview"/>
+  <img src="data/screenshots/preview_dark.png#gh-dark-mode-only" alt="Preview"/>
 </p>
 
 Pods is a frontend for podman. It uses libadwaita for its user interface and strives to meet the design principles of GNOME.
diff --git a/data/com.github.marhkb.Pods.metainfo.xml.in.in b/data/com.github.marhkb.Pods.metainfo.xml.in.in
index 69d48fa6f..5050b2bde 100644
--- a/data/com.github.marhkb.Pods.metainfo.xml.in.in
+++ b/data/com.github.marhkb.Pods.metainfo.xml.in.in
@@ -26,16 +26,16 @@
   </description>
   <screenshots>
     <screenshot type="default">
-      <image>https://github.com/marhkb/pods/raw/main/data/resources/screenshots/screenshot1.png</image>
-      <caption>Images Overview</caption>
+      <image>https://github.com/marhkb/pods/raw/main/data/screenshots/screenshot1_dark.png</image>
+      <caption>Container Overview</caption>
     </screenshot>
     <screenshot>
-      <image>https://github.com/marhkb/pods/raw/main/data/resources/screenshots/screenshot2.png</image>
-      <caption>Containers Overview</caption>
+      <image>https://github.com/marhkb/pods/raw/main/data/screenshots/screenshot2_dark.png</image>
+      <caption>Containers Details in Compact Mode</caption>
     </screenshot>
     <screenshot>
-      <image>https://github.com/marhkb/pods/raw/main/data/resources/screenshots/screenshot3.png</image>
-      <caption>Pods Overview</caption>
+      <image>https://github.com/marhkb/pods/raw/main/data/screenshots/screenshot3_dark.png</image>
+      <caption>Search Results</caption>
     </screenshot>
   </screenshots>
   <url type="homepage">https://github.com/marhkb/pods</url>
diff --git a/data/resources/screenshots/preview.png b/data/resources/screenshots/preview.png
deleted file mode 100644
index 8082032e7..000000000
Binary files a/data/resources/screenshots/preview.png and /dev/null differ
diff --git a/data/resources/screenshots/preview.xcf b/data/resources/screenshots/preview.xcf
deleted file mode 100644
index f6c06bbfe..000000000
Binary files a/data/resources/screenshots/preview.xcf and /dev/null differ
diff --git a/data/resources/screenshots/screenshot1.png b/data/resources/screenshots/screenshot1.png
deleted file mode 100644
index 39692084d..000000000
Binary files a/data/resources/screenshots/screenshot1.png and /dev/null differ
diff --git a/data/resources/screenshots/screenshot2.png b/data/resources/screenshots/screenshot2.png
deleted file mode 100644
index 9592ee7b4..000000000
Binary files a/data/resources/screenshots/screenshot2.png and /dev/null differ
diff --git a/data/resources/screenshots/screenshot3.png b/data/resources/screenshots/screenshot3.png
deleted file mode 100644
index 365326404..000000000
Binary files a/data/resources/screenshots/screenshot3.png and /dev/null differ
diff --git a/data/screenshots/preview_dark.png b/data/screenshots/preview_dark.png
new file mode 100644
index 000000000..efd4ee0a6
Binary files /dev/null and b/data/screenshots/preview_dark.png differ
diff --git a/data/screenshots/preview_dark.xcf b/data/screenshots/preview_dark.xcf
new file mode 100644
index 000000000..aa984498a
Binary files /dev/null and b/data/screenshots/preview_dark.xcf differ
diff --git a/data/screenshots/preview_light.png b/data/screenshots/preview_light.png
new file mode 100644
index 000000000..79c1d7265
Binary files /dev/null and b/data/screenshots/preview_light.png differ
diff --git a/data/screenshots/preview_light.xcf b/data/screenshots/preview_light.xcf
new file mode 100644
index 000000000..068ed090d
Binary files /dev/null and b/data/screenshots/preview_light.xcf differ
diff --git a/data/screenshots/screenshot1_dark.png b/data/screenshots/screenshot1_dark.png
new file mode 100644
index 000000000..e8633543f
Binary files /dev/null and b/data/screenshots/screenshot1_dark.png differ
diff --git a/data/screenshots/screenshot1_light.png b/data/screenshots/screenshot1_light.png
new file mode 100644
index 000000000..6ae3f3c22
Binary files /dev/null and b/data/screenshots/screenshot1_light.png differ
diff --git a/data/screenshots/screenshot2_light.png b/data/screenshots/screenshot2_light.png
new file mode 100644
index 000000000..57a9afd11
Binary files /dev/null and b/data/screenshots/screenshot2_light.png differ
diff --git a/data/screenshots/screenshot3_dark.png b/data/screenshots/screenshot3_dark.png
new file mode 100644
index 000000000..0bb4c034f
Binary files /dev/null and b/data/screenshots/screenshot3_dark.png differ
diff --git a/data/screenshots/screenshot3_light.png b/data/screenshots/screenshot3_light.png
new file mode 100644
index 000000000..25b6f778c
Binary files /dev/null and b/data/screenshots/screenshot3_light.png differ
diff --git a/data/screenshots/screensot2_light.png b/data/screenshots/screensot2_light.png
new file mode 100644
index 000000000..aafae77d4
Binary files /dev/null and b/data/screenshots/screensot2_light.png differ