diff --git a/README.md b/README.md
index e8662da..f2699ab 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ OliveTin gives **safe** and **simple** access to predefined shell commands from
 [![Go Report Card](https://goreportcard.com/badge/github.com/Olivetin/OliveTin)](https://goreportcard.com/report/github.com/OliveTin/OliveTin)
 [![Build Snapshot](https://github.com/OliveTin/OliveTin/actions/workflows/build-snapshot.yml/badge.svg)](https://github.com/OliveTin/OliveTin/actions/workflows/build-snapshot.yml)
 
-<img alt = "screenshot" src = "https://github.com/OliveTin/OliveTin/blob/main/var/marketing/screenshotDesktop.png" />
+<img alt = "screenshot" src = "https://github.com/OliveTin/OliveTin/blob/main/var/marketing/screenshots/mainpage-laptop_framed.png" />
 <a href = "#screenshots">More screenshots below</a>
 
 All documentation can be found at [docs.olivetin.app](https://docs.olivetin.app). This includes installation and usage guide, etc.
@@ -53,19 +53,19 @@ All documentation can be found at [docs.olivetin.app](https://docs.olivetin.app)
 Desktop web browser;
 
 <p align = "center">
-<img alt = "screenshot" src = "https://github.com/OliveTin/OliveTin/blob/main/var/marketing/screenshotDesktop.png" />
+<img alt = "screenshot" src = "https://github.com/OliveTin/OliveTin/blob/main/var/marketing/screenshots/mainpage-laptop_framed.png" />
 </p>
 
 Desktop web browser (dark mode);
 
 <p align = "center">
-<img alt = "screenshot" src = "https://github.com/OliveTin/OliveTin/blob/main/var/marketing/screenshotDesktopDark.png" />
+<img alt = "screenshot" src = "https://github.com/OliveTin/OliveTin/blob/main/var/marketing/screenshots/mainpage-darkop_framed.png" />
 </p>
 
 Mobile screen size (responsive layout);
 
 <p align = "center">
-<img alt = "screenshot" src = "https://github.com/OliveTin/OliveTin/blob/main/var/marketing/screenshotMobile.png" style = "height: 700px;" />
+<img alt = "screenshot" src = "https://github.com/OliveTin/OliveTin/blob/main/var/marketing/screenshots/mainpage-phone_framed.png" style = "height: 700px;" />
 </p>
 
 ## No-Nonsense Software Principles
diff --git a/var/marketing/Makefile b/var/marketing/Makefile
new file mode 100644
index 0000000..a827093
--- /dev/null
+++ b/var/marketing/Makefile
@@ -0,0 +1,7 @@
+updatescreenshots:
+	repo-common-take-screenshot mainpage-darkop http://localhost:1337/ 1024 680 --dark
+	repo-common-take-screenshot mainpage-laptop http://localhost:1337/ 1024 680
+	repo-common-take-screenshot mainpage-phone http://localhost:1337/ 600 1160
+	repo-common-image-framer
+
+.PHONY: updatescreenshots
diff --git a/var/marketing/screenshotDesktop.png b/var/marketing/screenshotDesktop.png
deleted file mode 100644
index 95d2984..0000000
Binary files a/var/marketing/screenshotDesktop.png and /dev/null differ
diff --git a/var/marketing/screenshotDesktopDark.png b/var/marketing/screenshotDesktopDark.png
deleted file mode 100644
index b758a14..0000000
Binary files a/var/marketing/screenshotDesktopDark.png and /dev/null differ
diff --git a/var/marketing/screenshotDesktopDarkSidebar.png b/var/marketing/screenshotDesktopDarkSidebar.png
deleted file mode 100644
index 4d8f9f2..0000000
Binary files a/var/marketing/screenshotDesktopDarkSidebar.png and /dev/null differ
diff --git a/var/marketing/screenshotMobile.png b/var/marketing/screenshotMobile.png
deleted file mode 100644
index d508c8a..0000000
Binary files a/var/marketing/screenshotMobile.png and /dev/null differ
diff --git a/var/marketing/screenshots/mainpage-darkop.png b/var/marketing/screenshots/mainpage-darkop.png
new file mode 100644
index 0000000..565c932
Binary files /dev/null and b/var/marketing/screenshots/mainpage-darkop.png differ
diff --git a/var/marketing/screenshots/mainpage-darkop_framed.png b/var/marketing/screenshots/mainpage-darkop_framed.png
new file mode 100644
index 0000000..2343a42
Binary files /dev/null and b/var/marketing/screenshots/mainpage-darkop_framed.png differ
diff --git a/var/marketing/screenshots/mainpage-laptop.png b/var/marketing/screenshots/mainpage-laptop.png
new file mode 100644
index 0000000..c96a480
Binary files /dev/null and b/var/marketing/screenshots/mainpage-laptop.png differ
diff --git a/var/marketing/screenshots/mainpage-laptop_framed.png b/var/marketing/screenshots/mainpage-laptop_framed.png
new file mode 100644
index 0000000..c38b5a4
Binary files /dev/null and b/var/marketing/screenshots/mainpage-laptop_framed.png differ
diff --git a/var/marketing/screenshots/mainpage-phone.png b/var/marketing/screenshots/mainpage-phone.png
new file mode 100644
index 0000000..5c42715
Binary files /dev/null and b/var/marketing/screenshots/mainpage-phone.png differ
diff --git a/var/marketing/screenshots/mainpage-phone_framed.png b/var/marketing/screenshots/mainpage-phone_framed.png
new file mode 100644
index 0000000..c0d984f
Binary files /dev/null and b/var/marketing/screenshots/mainpage-phone_framed.png differ