diff --git a/main/postmarketos-artwork/APKBUILD b/main/postmarketos-artwork/APKBUILD
index 8e3c3d040..1d9e6eb9f 100644
--- a/main/postmarketos-artwork/APKBUILD
+++ b/main/postmarketos-artwork/APKBUILD
@@ -1,7 +1,7 @@
 maintainer="Oliver Smith <ollieparanoid@postmarketos.org>"
 pkgname=postmarketos-artwork
 pkgver=26.06
-pkgrel=1
+pkgrel=2
 _commit="7ca32b82ec0c2269d5c5e15a32723798a26622c6"
 pkgdesc="Meta package for the postmarketOS artwork"
 url="https://postmarketos.org/"
@@ -35,14 +35,8 @@ makedepends_build="
 options="!check pmb:cross-native2"
 
 package() {
-	mkdir -p "$pkgdir"
-}
-
-wallpapers() {
-	pkgdesc="Wallpapers for postmarketOS"
-
-	mkdir -p "$subpkgdir"/usr/share/wallpapers/postmarketos/contents/images
-	mkdir -p "$subpkgdir"/usr/share/wallpapers/postmarketos/contents/images_dark
+	mkdir -p "$pkgdir"/usr/share/wallpapers/postmarketos/contents/images
+	mkdir -p "$pkgdir"/usr/share/wallpapers/postmarketos/contents/images_dark
 
 	# To avoid complexity, we only package the most recent wallpaper.
 	# Checklist for changing the wallpaper:
@@ -54,17 +48,44 @@ wallpapers() {
 	#     - postmarketos-gnome.xml
 	#     - 10_pmOS-wallpaper.gschema.override
 	install -Dm644 "$srcdir"/"$_wallpaper"-light.png \
-		"$subpkgdir"/usr/share/wallpapers/postmarketos/contents/images/"$_resolution".png
+		"$pkgdir"/usr/share/wallpapers/postmarketos/contents/images/"$_resolution".png
 	install -Dm644 "$srcdir"/"$_wallpaper"-dark.png \
-		"$subpkgdir"/usr/share/wallpapers/postmarketos/contents/images_dark/"$_resolution".png
+		"$pkgdir"/usr/share/wallpapers/postmarketos/contents/images_dark/"$_resolution".png
 	install -Dm644 "$srcdir"/"$_wallpaper"-metadata.json \
-		"$subpkgdir"/usr/share/wallpapers/postmarketos/metadata.json
+		"$pkgdir"/usr/share/wallpapers/postmarketos/metadata.json
 
 	# /usr/share/wallpapers/postmarketos.jpg should always point to the
 	# current wallpaper so we don't break configs
-	magick "$subpkgdir"/usr/share/wallpapers/postmarketos/contents/images/"$_resolution".png \
+	magick "$pkgdir"/usr/share/wallpapers/postmarketos/contents/images/"$_resolution".png \
 		-format jpeg \
-		"$subpkgdir"/usr/share/wallpapers/postmarketos.jpg
+		"$pkgdir"/usr/share/wallpapers/postmarketos.jpg
+
+	# GNOME configuration
+	install -Dm644 "$srcdir"/postmarketos-gnome.xml \
+		-t "$pkgdir"/usr/share/gnome-background-properties/
+	install -Dm644 "$srcdir"/10_pmOS-wallpaper.gschema.override \
+		-t "$pkgdir"/usr/share/glib-2.0/schemas
+
+	# Plasma configuration
+	install -Dm755 "$srcdir"/set-plasma-wallpaper.sh \
+		-t "$pkgdir"/usr/libexec/postmarketos
+
+	install -Dm644 "$srcdir"/set-plasma-wallpaper.desktop \
+		-t "$pkgdir"/etc/skel/.config/autostart
+
+	# icons
+	install -Dm644 "$srcdir"/logo.svg \
+		"$pkgdir"/usr/share/pixmaps/postmarketos-logo.svg
+	install -Dm644 "$srcdir"/logo-phone.svg \
+		"$pkgdir"/usr/share/pixmaps/postmarketos-logo-phone.svg
+	install -Dm644 "$srcdir"/logo_monochrome.svg \
+		"$pkgdir"/usr/share/pixmaps/postmarketos-logo-monochrome.svg
+}
+
+wallpapers() {
+	pkgdesc="Wallpapers for postmarketOS"
+
+	amove usr/share/wallpapers
 }
 
 wallpapers_gnome() {
@@ -72,32 +93,22 @@ wallpapers_gnome() {
 	replaces="postmarketos-base-ui-gnome-wallpaper-pmos"
 	install_if="postmarketos-artwork-wallpapers=$pkgver-r$pkgrel postmarketos-base-ui-gnome"
 
-	install -Dm644 "$srcdir"/postmarketos-gnome.xml \
-		-t "$subpkgdir"/usr/share/gnome-background-properties/
-	install -Dm644 "$srcdir"/10_pmOS-wallpaper.gschema.override \
-		-t "$subpkgdir"/usr/share/glib-2.0/schemas
+	amove usr/share/gnome-background-properties
+	amove usr/share/glib-2.0/schemas
 }
 
 wallpapers_plasma() {
 	pkgdesc="Wallpaper configuration for Plasma-based UIs"
 	install_if="postmarketos-artwork-wallpapers=$pkgver-r$pkgrel postmarketos-base-ui-plasma"
 
-	install -Dm755 "$srcdir"/set-plasma-wallpaper.sh \
-		-t "$subpkgdir"/usr/libexec/postmarketos
-
-	install -Dm644 "$srcdir"/set-plasma-wallpaper.desktop \
-		-t "$subpkgdir"/etc/skel/.config/autostart
+	amove usr/libexec/postmarketos
+	amove etc/skel/.config/autostart
 }
 
 icons() {
 	pkgdesc="Icons for postmarketOS"
 
-	install -Dm644 "$srcdir"/logo.svg \
-		"$subpkgdir"/usr/share/pixmaps/postmarketos-logo.svg
-	install -Dm644 "$srcdir"/logo-phone.svg \
-		"$subpkgdir"/usr/share/pixmaps/postmarketos-logo-phone.svg
-	install -Dm644 "$srcdir"/logo_monochrome.svg \
-		"$subpkgdir"/usr/share/pixmaps/postmarketos-logo-monochrome.svg
+	amove usr/share/pixmaps
 }
 
 sha512sums="