diff --git a/openembedded/conf/distro/include/shr-autorev-unstable.inc b/openembedded/conf/distro/include/shr-autorev-unstable.inc
index c4b9070..ec9c476 100644
--- a/openembedded/conf/distro/include/shr-autorev-unstable.inc
+++ b/openembedded/conf/distro/include/shr-autorev-unstable.inc
@@ -6,7 +6,7 @@ PREFERRED_VERSION_glib-2.0 = "2.18.3"
 # FSO stuff
 SRCREV_pn-frameworkd = "${AUTOREV}"
 SRCREV_pn-frameworkd-config-shr = "${AUTOREV}"
-SRCREV_pn-libeflvala = "4b7440b08b96831da5cc2ef657af76ae20f3065a"
+SRCREV_pn-libeflvala = "${AUTOREV}"
 SRCREV_pn-frameworkd-config-shr = "${AUTOREV}"
 SRCREV_pn-frameworkd-config-shr_FSO_REV = "${AUTOREV}"
 SRCREV_pn-frameworkd-config-shr_SHR_REV = "${AUTOREV}"
diff --git a/openembedded/conf/distro/include/shr-autorev.inc b/openembedded/conf/distro/include/shr-autorev.inc
index 0e565e6..e3d6288 100644
--- a/openembedded/conf/distro/include/shr-autorev.inc
+++ b/openembedded/conf/distro/include/shr-autorev.inc
@@ -52,6 +52,7 @@ SRCREV_pn-python-pytrc = "${AUTOREV}"
 SRCREV_pn-zhone = "${AUTOREV}"
 
 #SHR stuff
+PREFERRED_PROVIDER_virtual/shr-splash-theme = "shr-splash-theme-simple"
 SRCREV_pn-libhito = "${AUTOREV}"
 SRCREV_pn-neod = "${AUTOREV}"
 SRCREV_pn-shr-settings = "a3e5e3430cf3803e21107e8e83aefdbcab27f56a"
@@ -66,6 +67,7 @@ SRCREV_pn-libframeworkd-phonegui-gtk = "${AUTOREV}"
 SRCREV_pn-libframeworkd-glib = "9765f6989d09d8f9b8676e1ef7e2501fe67fbdbc"
 SRCREV_pn-pyphonelog = "${AUTOREV}"
 SRCREV_pn-shr-theme-brave = "${AUTOREV}"
+SRCREV_pn-shr-splash = "${AUTOREV}"
 SRCREV_pn-shr-splash-theme-simple = "${AUTOREV}"
 SRCREV_pn-shr-splash-theme-dontpanic = "${AUTOREV}"
 
diff --git a/openembedded/recipes/shr/shr-splash-theme-dontpanic_git.bb b/openembedded/recipes/shr/shr-splash-theme-dontpanic_git.bb
deleted file mode 100644
index b834874..0000000
--- a/openembedded/recipes/shr/shr-splash-theme-dontpanic_git.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-DESCRIPTION = "SHR splash screen"
-SECTION = "x11/data"
-LICENSE = "MIT BSD"
-PV = "1.1-gitr${SRCPV}"
-PR = "r3"
-DEPENDS += "initscripts"
-
-SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
-
-S = "${WORKDIR}/git/${PN}"
-
-FILES_${PN} = "${datadir}/shr-splash \
-	       ${sysconfdir}/init.d/shr-splash.sh \
-	       ${sysconfdir}/rc0.d/S20shr-splash.sh \
-	       ${sysconfdir}/rc6.d/S20shr-splash.sh \
-	       ${sysconfdir}/rcS.d/S01shr-splash.sh \
-"
-
-do_install() {
-    install -d ${D}${datadir}/shr-splash
-    install -d ${D}${sysconfdir}/init.d
-    install -d ${D}${sysconfdir}/rcS.d
-    install -d ${D}${sysconfdir}/rc0.d
-    install -d ${D}${sysconfdir}/rc6.d
-
-    install -m 0755 ${S}/boot.fb ${D}${datadir}/shr-splash/boot.fb
-    install -m 0755 ${S}/shutdown.fb ${D}${datadir}/shr-splash/shutdown.fb
-    install -m 0755 ${S}/shr-splash.sh        ${D}${sysconfdir}/init.d
-    ln -sf          ../init.d/shr-splash.sh         ${D}${sysconfdir}/rc0.d/S20shr-splash.sh
-    ln -sf          ../init.d/shr-splash.sh         ${D}${sysconfdir}/rc6.d/S20shr-splash.sh
-    ln -sf          ../init.d/shr-splash.sh         ${D}${sysconfdir}/rcS.d/S01shr-splash.sh
-}
diff --git a/openembedded/recipes/shr/shr-splash-theme-simple_git.bb b/openembedded/recipes/shr/shr-splash-theme-simple_git.bb
deleted file mode 100644
index b834874..0000000
--- a/openembedded/recipes/shr/shr-splash-theme-simple_git.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-DESCRIPTION = "SHR splash screen"
-SECTION = "x11/data"
-LICENSE = "MIT BSD"
-PV = "1.1-gitr${SRCPV}"
-PR = "r3"
-DEPENDS += "initscripts"
-
-SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
-
-S = "${WORKDIR}/git/${PN}"
-
-FILES_${PN} = "${datadir}/shr-splash \
-	       ${sysconfdir}/init.d/shr-splash.sh \
-	       ${sysconfdir}/rc0.d/S20shr-splash.sh \
-	       ${sysconfdir}/rc6.d/S20shr-splash.sh \
-	       ${sysconfdir}/rcS.d/S01shr-splash.sh \
-"
-
-do_install() {
-    install -d ${D}${datadir}/shr-splash
-    install -d ${D}${sysconfdir}/init.d
-    install -d ${D}${sysconfdir}/rcS.d
-    install -d ${D}${sysconfdir}/rc0.d
-    install -d ${D}${sysconfdir}/rc6.d
-
-    install -m 0755 ${S}/boot.fb ${D}${datadir}/shr-splash/boot.fb
-    install -m 0755 ${S}/shutdown.fb ${D}${datadir}/shr-splash/shutdown.fb
-    install -m 0755 ${S}/shr-splash.sh        ${D}${sysconfdir}/init.d
-    ln -sf          ../init.d/shr-splash.sh         ${D}${sysconfdir}/rc0.d/S20shr-splash.sh
-    ln -sf          ../init.d/shr-splash.sh         ${D}${sysconfdir}/rc6.d/S20shr-splash.sh
-    ln -sf          ../init.d/shr-splash.sh         ${D}${sysconfdir}/rcS.d/S01shr-splash.sh
-}
diff --git a/openembedded/recipes/shr/shr-splash/shr-splash-theme-dontpanic_git.bb b/openembedded/recipes/shr/shr-splash/shr-splash-theme-dontpanic_git.bb
new file mode 100644
index 0000000..6e909a7
--- /dev/null
+++ b/openembedded/recipes/shr/shr-splash/shr-splash-theme-dontpanic_git.bb
@@ -0,0 +1,7 @@
+DESCRIPTION = "SHR splash screen - DON'T PANIC theme"
+SECTION = "x11/data"
+LICENSE = "MIT BSD"
+PV = "1.2-gitr${SRCPV}"
+PR = "r0"
+
+inherit "shr-splash-theme.inc"
diff --git a/openembedded/recipes/shr/shr-splash/shr-splash-theme-simple_git.bb b/openembedded/recipes/shr/shr-splash/shr-splash-theme-simple_git.bb
new file mode 100644
index 0000000..3288bdf
--- /dev/null
+++ b/openembedded/recipes/shr/shr-splash/shr-splash-theme-simple_git.bb
@@ -0,0 +1,8 @@
+DESCRIPTION = "SHR splash screen - simple SHR theme"
+SECTION = "x11/data"
+LICENSE = "MIT BSD"
+PV = "1.2-gitr${SRCPV}"
+PR = "r0"
+
+inherit "shr-splash-theme.inc"
+
diff --git a/openembedded/recipes/shr/shr-splash/shr-splash-theme.inc b/openembedded/recipes/shr/shr-splash/shr-splash-theme.inc
new file mode 100644
index 0000000..30d65ad
--- /dev/null
+++ b/openembedded/recipes/shr/shr-splash/shr-splash-theme.inc
@@ -0,0 +1,21 @@
+PROVIDES += "virtual/shr-splash-theme"
+RDEPENDS += "shr-splash"
+
+inherit update-alternatives
+
+SRC_URI ?= "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
+
+S ?= "${WORKDIR}/git/shr-splash/${PN}"
+
+FILES_${PN} = "${datadir}/shr-splash/themes/${PN}"
+
+ALTERNATIVE_NAME = "shr-splash-theme"
+ALTERNATIVE_LINK = "${datadir}/shr-splash/theme"
+ALTERNATIVE_PATH = "${datadir}/shr-splash/themes/{$PN}"
+
+do_install() {
+    install -d ${D}${datadir}/shr-splash/themes/${PN}
+
+    install -m 0755 ${S}/boot.fb ${D}${datadir}/shr-splash/themes/${PN}/boot.fb
+    install -m 0755 ${S}/shutdown.fb ${D}${datadir}/shr-splash/themes/${PN}/shutdown.fb
+}
diff --git a/openembedded/recipes/shr/shr-splash/shr-splash_git.bb b/openembedded/recipes/shr/shr-splash/shr-splash_git.bb
new file mode 100644
index 0000000..619e9c1
--- /dev/null
+++ b/openembedded/recipes/shr/shr-splash/shr-splash_git.bb
@@ -0,0 +1,29 @@
+DESCRIPTION = "SHR splash screen"
+SECTION = "x11/data"
+LICENSE = "MIT BSD"
+PV = "1.2-gitr${SRCPV}"
+PR = "r0"
+RDEPENDS += "initscripts"
+RDEPENDS += "virtual/shr-splash-theme"
+
+inherit update-rc.d
+
+SRC_URI = "git://git.shr-project.org/repo/shr.git;protocol=http;branch=master"
+
+S = "${WORKDIR}/git/${PN}"
+
+FILES_${PN} = "${datadir}/shr-splash \
+	       ${sysconfdir}/init.d/shr-splash.sh \
+"
+
+do_install() {
+    install -d ${D}${datadir}/shr-splash
+    install -d ${D}${datadir}/shr-splash/themes
+    install -d ${D}${sysconfdir}/init.d
+
+    install -m 0755 ${S}/shr-splash.sh        ${D}${sysconfdir}/init.d
+
+}
+
+INITSCRIPT_NAME = "shr-splash.sh"
+INITSCRIPT_PARAMS = "start 01 S . stop 20 0 1 6 ."
diff --git a/openembedded/recipes/tasks/task-shr-feed.bb b/openembedded/recipes/tasks/task-shr-feed.bb
index c99ff8d..c6d03ed 100644
--- a/openembedded/recipes/tasks/task-shr-feed.bb
+++ b/openembedded/recipes/tasks/task-shr-feed.bb
@@ -34,6 +34,7 @@ RDEPENDS_${PN} += "\
 		fltk-chess \
 		remoko \
 		shr-config \
+                shr-splash \
 		shr-splash-theme-simple \
                 shr-splash-theme-dontpanic \
 		openbmap-logger \