diff --git a/.gitignore b/.gitignore
index 26ee879..2bf89cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,7 @@ build-barebone
 build-mainsail
 build-fluidd
 build-octoprint
-images
\ No newline at end of file
+images
+
+# Personal first-boot customization scripts - not meant to be shared/committed.
+user_scripts/
\ No newline at end of file
diff --git a/armbian/customize-image-fluidd.sh b/armbian/customize-image-fluidd.sh
index b2edf97..7f0b53a 100644
--- a/armbian/customize-image-fluidd.sh
+++ b/armbian/customize-image-fluidd.sh
@@ -27,6 +27,7 @@ source /tmp/overlay/install_components/moonraker.sh
 source /tmp/overlay/install_components/nginx.sh
 source /tmp/overlay/install_components/fluidd.sh
 source /tmp/overlay/install_components/klipperscreen.sh
+source /tmp/overlay/install_components/plymouth.sh
 source /tmp/overlay/install_components/recore_binaries.sh
 source /tmp/overlay/install_components/ustreamer.sh
 source /tmp/overlay/install_components/autohotspot.sh
@@ -45,6 +46,7 @@ install_moonraker "fluidd"
 install_nginx "fluidd"
 install_fluidd
 install_klipperscreen
+install_plymouth
 install_ustreamer
 install_bins
 install_autohotspot
diff --git a/armbian/customize-image-mainsail.sh b/armbian/customize-image-mainsail.sh
index 3afcadf..4763796 100644
--- a/armbian/customize-image-mainsail.sh
+++ b/armbian/customize-image-mainsail.sh
@@ -27,6 +27,7 @@ source /tmp/overlay/install_components/moonraker.sh
 source /tmp/overlay/install_components/nginx.sh
 source /tmp/overlay/install_components/mainsail.sh
 source /tmp/overlay/install_components/klipperscreen.sh
+source /tmp/overlay/install_components/plymouth.sh
 source /tmp/overlay/install_components/recore_binaries.sh
 source /tmp/overlay/install_components/ustreamer.sh
 source /tmp/overlay/install_components/autohotspot.sh
@@ -44,6 +45,7 @@ install_moonraker "mainsail"
 install_nginx "mainsail"
 install_mainsail
 install_klipperscreen
+install_plymouth
 install_ustreamer
 install_bins
 install_autohotspot
diff --git a/armbian/customize-image-octoprint.sh b/armbian/customize-image-octoprint.sh
index 0f27a52..f9358a5 100644
--- a/armbian/customize-image-octoprint.sh
+++ b/armbian/customize-image-octoprint.sh
@@ -24,6 +24,7 @@ HOMEDIR="/home/${USER}"
 source /tmp/overlay/install_components/klipper.sh
 source /tmp/overlay/install_components/octoprint.sh
 source /tmp/overlay/install_components/toggle.sh
+source /tmp/overlay/install_components/plymouth.sh
 source /tmp/overlay/install_components/recore_binaries.sh
 source /tmp/overlay/install_components/autohotspot.sh
 source /tmp/overlay/install_components/auto_disable_ssh.sh
@@ -42,6 +43,7 @@ install_klipper
 install_octoprint
 install_weston
 install_toggle
+install_plymouth
 install_ustreamer
 install_bins
 install_autohotspot
diff --git a/armbian/recore.csc b/armbian/recore.csc
index 6de0f1b..6ace206 100644
--- a/armbian/recore.csc
+++ b/armbian/recore.csc
@@ -32,8 +32,3 @@ function format_partitions__make_boot_ro() {
     sed -i -E 's:/boot ext4 defaults,commit=[0-9]+,errors=remount-ro:/boot ext4 ro,defaults:' $SDCARD/etc/fstab
 }
 
-#function extension_finish_config__enable_plymouth() {
-#    echo "🍰Enable Plymouth on minimal build"
-#    PLYMOUTH=yes
-#}
-
diff --git a/rebuild.sh b/rebuild.sh
index ed7c6aa..9e2126f 100755
--- a/rebuild.sh
+++ b/rebuild.sh
@@ -64,8 +64,6 @@ cp armbian/customize-image-"${VERSION}".sh "${BUILD_DIR}"/userpatches/customize-
 cp armbian/recore.csc "${BUILD_DIR}"/config/boards
 rm -f "${BUILD_DIR}/patch/u-boot/u-boot-sunxi/allwinner-boot-splash.patch"
 
-cp armbian/watermark.png "${BUILD_DIR}"/packages/plymouth-theme-armbian/watermark.png
-
 mkdir -p "${BUILD_DIR}"/userpatches/overlay/rebuild/
 echo "${NAME}" >"${BUILD_DIR}"/userpatches/overlay/rebuild/rebuild-version
 echo "${TAG}" >"${BUILD_DIR}"/userpatches/overlay/rebuild/rebuild-tag
diff --git a/userpatches/overlay/install_components/plymouth.sh b/userpatches/overlay/install_components/plymouth.sh
new file mode 100644
index 0000000..e1a09ee
--- /dev/null
+++ b/userpatches/overlay/install_components/plymouth.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+install_plymouth() {
+    echo "🍰 install Plymouth"
+    apt install -y plymouth plymouth-themes
+
+    # Use Recore's own watermark as the spinner theme's logo. The
+    # theme's default WatermarkVerticalAlignment (.96) puts it right
+    # near the bottom of the screen - center it instead.
+    cp /tmp/overlay/plymouth/watermark.png /usr/share/plymouth/themes/spinner/watermark.png
+    sed -i 's/^WatermarkVerticalAlignment=.*/WatermarkVerticalAlignment=.5/' /usr/share/plymouth/themes/spinner/spinner.plymouth
+
+    plymouth-set-default-theme -R spinner
+}
diff --git a/userpatches/overlay/install_components/toggle.sh b/userpatches/overlay/install_components/toggle.sh
index 7c26153..aa75404 100644
--- a/userpatches/overlay/install_components/toggle.sh
+++ b/userpatches/overlay/install_components/toggle.sh
@@ -23,6 +23,7 @@ EOF
 	cat > /etc/systemd/system/weston.service <<EOF
 [Unit]
 Description=Weston Wayland Compositor
+After=plymouth-quit-wait.service
 
 [Service]
 Environment="XDG_RUNTIME_DIR=/tmp"
diff --git a/armbian/watermark.png b/userpatches/overlay/plymouth/watermark.png
similarity index 100%
rename from armbian/watermark.png
rename to userpatches/overlay/plymouth/watermark.png