diff --git a/classes/easysplash-animation.bbclass b/classes/easysplash_animation.bbclass
similarity index 100%
rename from classes/easysplash-animation.bbclass
rename to classes/easysplash_animation.bbclass
diff --git a/recipes-core/base-files/base-files_%.bbappend b/recipes-core/base-files/base-files_%.bbappend
index 357c5db..b78fe20 100644
--- a/recipes-core/base-files/base-files_%.bbappend
+++ b/recipes-core/base-files/base-files_%.bbappend
@@ -1,22 +1,12 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend:oel := "${THISDIR}/${PN}:"
 
-SRC_URI += "file://profile.d_locale.sh"
+SRC_URI:append:oel = " file://profile.d_locale.sh"
 
-DEFAULT_SYSTEM_LOCALE ??= ""
-
-do_generate_locale_conf() {
-    if [ "${@d.getVar('DEFAULT_SYSTEM_LOCALE', True)}" != "" ]; then
-        cat > ${WORKDIR}/locale.conf <<EOF
-LANG=${DEFAULT_SYSTEM_LOCALE}
-EOF
-    fi
-}
-addtask do_generate_locale_conf after do_compile before do_install
-
-do_install:append() {
+do_install:append:oel() {
     install -Dm 0644 ${S}/profile.d_locale.sh ${D}${sysconfdir}/profile.d/locale.sh
 
     if [ "${@d.getVar('DEFAULT_SYSTEM_LOCALE', True)}" != "" ]; then
-        install -Dm 0644 ${WORKDIR}/locale.conf ${D}${sysconfdir}/locale.conf
+        install -d ${D}${sysconfdir}
+        printf 'LANG=%s\n' "${DEFAULT_SYSTEM_LOCALE}" > ${D}${sysconfdir}/locale.conf
     fi
 }
diff --git a/recipes-core/busybox/busybox_%.bbappend b/recipes-core/busybox/busybox_%.bbappend
index 9a066d6..5b0e6c8 100644
--- a/recipes-core/busybox/busybox_%.bbappend
+++ b/recipes-core/busybox/busybox_%.bbappend
@@ -1,5 +1,5 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
-SRC_URI:append:oel = "\
+FILESEXTRAPATHS:prepend:oel := "${THISDIR}/files:"
+SRC_URI:append:oel = " \
     file://setsid.cfg \
     file://resize.cfg \
     file://pidof.cfg \
diff --git a/recipes-core/easysplash/easysplash-animation-default_2.0.0.bb b/recipes-core/easysplash/easysplash-animation-default_2.0.0.bb
index 3662505..58efdfa 100644
--- a/recipes-core/easysplash/easysplash-animation-default_2.0.0.bb
+++ b/recipes-core/easysplash/easysplash-animation-default_2.0.0.bb
@@ -1,9 +1,14 @@
 SUMMARY = "Default EasySplash Animation intended for general use"
+DESCRIPTION = "Default EasySplash animation assets intended for general use."
+HOMEPAGE = "https://github.com/OSSystems/EasySplash"
+BUGTRACKER = "https://github.com/OSSystems/EasySplash/issues"
+SECTION = "graphics"
+CVE_PRODUCT = "easysplash"
 LICENSE = "CLOSED"
 
 require easysplash-common-2.0.inc
 
-inherit easysplash-animation
+inherit easysplash_animation
 
 do_configure[noexec] = "1"
 do_compile[noexec] = "1"
@@ -21,15 +26,17 @@ do_install() {
 
 ALTERNATIVE_PRIORITY[animation] = "10"
 
-RDEPENDS:${PN} += " \
+RDEPENDS:${PN} += "\
     gstreamer1.0-libav \
-    gstreamer1.0-plugins-base-playback \
-    gstreamer1.0-plugins-good-isomp4 \
-    gstreamer1.0-plugins-bad-kms \
     gstreamer1.0-plugins-bad-camerabin \
-    gstreamer1.0-plugins-good-videofilter \
+    gstreamer1.0-plugins-bad-kms \
+    gstreamer1.0-plugins-base-playback \
+    gstreamer1.0-plugins-base-typefindfunctions \
     gstreamer1.0-plugins-base-videoconvertscale \
     gstreamer1.0-plugins-good-deinterlace \
+    gstreamer1.0-plugins-good-isomp4 \
     gstreamer1.0-plugins-good-multifile \
-    gstreamer1.0-plugins-base-typefindfunctions \
+    gstreamer1.0-plugins-good-videofilter \
 "
+
+BBCLASSEXTEND = ""
diff --git a/recipes-core/easysplash/easysplash-animation-ossystems_2.0.0.bb b/recipes-core/easysplash/easysplash-animation-ossystems_2.0.0.bb
index 6634176..e410f4b 100644
--- a/recipes-core/easysplash/easysplash-animation-ossystems_2.0.0.bb
+++ b/recipes-core/easysplash/easysplash-animation-ossystems_2.0.0.bb
@@ -1,9 +1,14 @@
 SUMMARY = "O.S. Systems EasySplash Animation"
+DESCRIPTION = "O.S. Systems branded EasySplash animation assets."
+HOMEPAGE = "https://github.com/OSSystems/EasySplash"
+BUGTRACKER = "https://github.com/OSSystems/EasySplash/issues"
+SECTION = "graphics"
+CVE_PRODUCT = "easysplash"
 LICENSE = "CLOSED"
 
 require easysplash-common-2.0.inc
 
-inherit easysplash-animation
+inherit easysplash_animation
 
 do_configure[noexec] = "1"
 do_compile[noexec] = "1"
@@ -19,15 +24,17 @@ do_install() {
     mv ${D}${base_libdir}/easysplash/ossystems-demo ${D}${base_libdir}/easysplash/${PN}
 }
 
-RDEPENDS:${PN} += " \
+RDEPENDS:${PN} += "\
     gstreamer1.0-libav \
-    gstreamer1.0-plugins-base-playback \
-    gstreamer1.0-plugins-good-isomp4 \
-    gstreamer1.0-plugins-bad-kms \
     gstreamer1.0-plugins-bad-camerabin \
-    gstreamer1.0-plugins-good-videofilter \
+    gstreamer1.0-plugins-bad-kms \
+    gstreamer1.0-plugins-base-playback \
+    gstreamer1.0-plugins-base-typefindfunctions \
     gstreamer1.0-plugins-base-videoconvertscale \
     gstreamer1.0-plugins-good-deinterlace \
+    gstreamer1.0-plugins-good-isomp4 \
     gstreamer1.0-plugins-good-multifile \
-    gstreamer1.0-plugins-base-typefindfunctions \
+    gstreamer1.0-plugins-good-videofilter \
 "
+
+BBCLASSEXTEND = ""
diff --git a/recipes-core/easysplash/easysplash-common-2.0.inc b/recipes-core/easysplash/easysplash-common-2.0.inc
index 913cf31..39bb6f8 100644
--- a/recipes-core/easysplash/easysplash-common-2.0.inc
+++ b/recipes-core/easysplash/easysplash-common-2.0.inc
@@ -1,17 +1,9 @@
-LICENSE = "Apache-2.0|MIT"
-LIC_FILES_CHKSUM = "file://LICENSE-APACHE-2.0;md5=1836efb2eb779966696f473ee8540542"
-LIC_FILES_CHKSUM = "file://LICENSE-MIT;md5=b377b220f43d747efdec40d69fcaa69d"
-
-SRCREV = "81a44392efe15fd12ea673f1c828a52e95103eea"
-SRCBRANCH = "master"
-
-SRC_URI = "git://github.com/OSSystems/EasySplash.git;branch=${SRCBRANCH};protocol=https"
-
 PV = "2.0.0"
 
-S = "${WORKDIR}/git"
+SRC_URI = "git://github.com/OSSystems/EasySplash.git;branch=master;protocol=https"
+SRCREV = "81a44392efe15fd12ea673f1c828a52e95103eea"
 
-EXTRA_OEMAKE += " \
+EXTRA_OEMAKE += "\
     prefix=${prefix} \
     sysconfdir=${sysconfdir} \
     sbindir=${bindir} \
diff --git a/recipes-core/easysplash/easysplash-config_2.0.0.bb b/recipes-core/easysplash/easysplash-config_2.0.0.bb
index 8673f5e..5706cf5 100644
--- a/recipes-core/easysplash/easysplash-config_2.0.0.bb
+++ b/recipes-core/easysplash/easysplash-config_2.0.0.bb
@@ -1,10 +1,17 @@
 SUMMARY = "Easysplash Configuration"
+DESCRIPTION = "Default EasySplash configuration installed under /etc/default."
+HOMEPAGE = "https://github.com/OSSystems/EasySplash"
+BUGTRACKER = "https://github.com/OSSystems/EasySplash/issues"
+SECTION = "graphics"
+CVE_PRODUCT = "easysplash"
 LICENSE = "CLOSED"
 
 SRC_URI += "file://easysplash.default"
 
 do_install() {
-    install -Dm 0644 ${WORKDIR}/easysplash.default ${D}${sysconfdir}/default/easysplash
+    install -Dm 0644 ${UNPACKDIR}/easysplash.default ${D}${sysconfdir}/default/easysplash
 }
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+BBCLASSEXTEND = ""
diff --git a/recipes-core/easysplash/easysplash-crates.inc b/recipes-core/easysplash/easysplash-crates.inc
index d614af3..6228666 100644
--- a/recipes-core/easysplash/easysplash-crates.inc
+++ b/recipes-core/easysplash/easysplash-crates.inc
@@ -1,7 +1,8 @@
 # Autogenerated with 'bitbake -c update_crates easysplash'
 
 # from Cargo.lock
-SRC_URI += " \
+# nooelint: oelint.vars.srcuridomains
+SRC_URI += "\
     crate://crates.io/anyhow/1.0.59 \
     crate://crates.io/argh/0.1.8 \
     crate://crates.io/argh_derive/0.1.8 \
diff --git a/recipes-core/easysplash/easysplash_2.0.0.bb b/recipes-core/easysplash/easysplash_2.0.0.bb
index 8b4ac48..86e5397 100644
--- a/recipes-core/easysplash/easysplash_2.0.0.bb
+++ b/recipes-core/easysplash/easysplash_2.0.0.bb
@@ -1,11 +1,23 @@
 # Auto-Generated by cargo-bitbake 0.3.16-alpha.0
 #
 
+SUMMARY = "Graphical boot animation application"
 DESCRIPTION = "EasySplash is an application that runs early the OS boot for showing graphical \
-animation while the boot process itself happens in the background. \
-The app is built on Rust and binds to GStreamer, so it can run in any backend that supports both."
+               animation while the boot process itself happens in the background. \
+               The app is built on Rust and binds to GStreamer, so it can run in any backend that supports both."
+HOMEPAGE = "https://github.com/OSSystems/EasySplash"
+BUGTRACKER = "https://github.com/OSSystems/EasySplash/issues"
+SECTION = "graphics"
+CVE_PRODUCT = "easysplash"
+LICENSE = "Apache-2.0 | MIT"
+LIC_FILES_CHKSUM = "\
+    file://LICENSE-APACHE-2.0;md5=1836efb2eb779966696f473ee8540542 \
+    file://LICENSE-MIT;md5=b377b220f43d747efdec40d69fcaa69d \
+"
+DEPENDS += "glib-2.0 gstreamer1.0"
 
-require easysplash-common-2.0.inc easysplash-crates.inc
+require easysplash-common-2.0.inc
+require easysplash-crates.inc
 
 inherit cargo pkgconfig systemd update-rc.d cargo-update-recipe-crates
 
@@ -13,20 +25,14 @@ inherit cargo pkgconfig systemd update-rc.d cargo-update-recipe-crates
 # DEFAULT_PREFERENCE = "-1"
 
 CARGO_SRC_DIR = ""
-PV:append = ".AUTOINC+724e1c7edc"
-
-LICENSE = "Apache-2.0|MIT"
-LIC_FILES_CHKSUM = "file://LICENSE-APACHE-2.0;md5=1836efb2eb779966696f473ee8540542"
-LIC_FILES_CHKSUM = "file://LICENSE-MIT;md5=b377b220f43d747efdec40d69fcaa69d"
-
-DEPENDS = "glib-2.0 gstreamer1.0"
+PV .= ".AUTOINC+724e1c7edc"
 
 INITSCRIPT_NAME = "${PN}-start"
 INITSCRIPT_PARAMS:${PN} = "start 5 S ."
 
 SYSTEMD_SERVICE:${PN} = "${PN}-start.service ${PN}-quit.service"
 
-EXTRA_CARGO_FLAGS += " \
+CARGO_BUILD_FLAGS += "\
     ${@bb.utils.contains('PACKAGECONFIG', 'systemd', '--features systemd', '', d)} \
 "
 
@@ -35,12 +41,16 @@ PACKAGECONFIG ?= "\
     ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
 "
 
-PACKAGECONFIG[sysvinit] = "INIT=1, INIT=0,"
-PACKAGECONFIG[systemd] = "SYSTEMD=1, SYSTEM=0, systemd"
+PACKAGECONFIG[sysvinit] = ",,"
+PACKAGECONFIG[systemd] = ",, systemd"
 
 do_install:append() {
-    (cd ${S} ; oe_runmake install-service DESTDIR=${D})
-    rm ${D}${sysconfdir}/default/easysplash
+    (cd ${S} ; oe_runmake install-service DESTDIR=${D} \
+          ${@bb.utils.contains('PACKAGECONFIG', 'sysvinit', 'INIT=1', 'INIT=0', d)} \
+          ${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'SYSTEMD=1', 'SYSTEMD=0', d)})
+      rm ${D}${sysconfdir}/default/easysplash
 }
 
 RDEPENDS:${PN} += "easysplash-config"
+
+BBCLASSEXTEND = ""
diff --git a/recipes-core/initrdscripts/initramfs-framework-psplash_1.0.bb b/recipes-core/initrdscripts/initramfs-framework-psplash_1.0.bb
index d5710ee..9344c28 100644
--- a/recipes-core/initrdscripts/initramfs-framework-psplash_1.0.bb
+++ b/recipes-core/initrdscripts/initramfs-framework-psplash_1.0.bb
@@ -13,6 +13,8 @@ SRC_URI = " \
     file://psplash-finish \
 "
 
+S = "${UNPACKDIR}"
+
 do_install() {
     # psplash
     install -Dm 0755 ${S}/psplash ${D}/init.d/11-psplash
diff --git a/recipes-core/os-release/os-release.bbappend b/recipes-core/os-release/os-release.bbappend
index 3825a83..d6d3463 100644
--- a/recipes-core/os-release/os-release.bbappend
+++ b/recipes-core/os-release/os-release.bbappend
@@ -1,4 +1,4 @@
 OS_RELEASE_FIELDS:append:oel = " BUILD_NUMBER"
 
 # Append build number for development builds
-VERSION:append:oel = "${@' (build %s)' % BUILD_NUMBER if 'BUILD_NUMBER' in d and DISTRO_VERSION.endswith('+devel') else ''}"
+VERSION:append:oel = " ${@'(build %s)' % BUILD_NUMBER if 'BUILD_NUMBER' in d and DISTRO_VERSION.endswith('+devel') else ''}"
diff --git a/recipes-core/psplash/psplash_git.bbappend b/recipes-core/psplash/psplash_git.bbappend
index 09fe6aa..4af5d4c 100644
--- a/recipes-core/psplash/psplash_git.bbappend
+++ b/recipes-core/psplash/psplash_git.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend:oel := "${THISDIR}/files:"
 
 SRC_URI:append:oel = " \
     file://psplash-colors.h \
diff --git a/recipes-core/systemd/systemd_%.bbappend b/recipes-core/systemd/systemd_%.bbappend
index 15e476e..3d322a4 100644
--- a/recipes-core/systemd/systemd_%.bbappend
+++ b/recipes-core/systemd/systemd_%.bbappend
@@ -1 +1 @@
-RDEPENDS:${PN} += "util-linux-umount"
+RDEPENDS:${PN}:append:oel = " util-linux-umount"
diff --git a/recipes-core/tiny-init-system/files/COPYING.MIT b/recipes-core/tiny-init-system/files/COPYING.MIT
new file mode 100644
index 0000000..dbcba26
--- /dev/null
+++ b/recipes-core/tiny-init-system/files/COPYING.MIT
@@ -0,0 +1,17 @@
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
diff --git a/recipes-core/tiny-init-system/tiny-init-system.bb b/recipes-core/tiny-init-system/tiny-init-system.bb
deleted file mode 100644
index ffb01b0..0000000
--- a/recipes-core/tiny-init-system/tiny-init-system.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-SUMMARY = "Basic init system for constrained systems"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-
-SRC_URI = "\
-    file://init \
-    file://rc.local.sample \
-"
-
-do_configure[noexec] = "1"
-do_compile[noexec] = "1"
-
-do_install() {
-    install -m 0755 ${S}/init ${D}
-    install -Dm 0755 ${S}/rc.local.sample ${D}${sysconfdir}/rc.local.sample
-}
-
-FILES:${PN} = "/init ${sysconfdir}/rc.local.sample"
-RDEPENDS:${PN} = "busybox"
diff --git a/recipes-core/tiny-init-system/tiny-init-system_1.0.bb b/recipes-core/tiny-init-system/tiny-init-system_1.0.bb
new file mode 100644
index 0000000..ea7ef63
--- /dev/null
+++ b/recipes-core/tiny-init-system/tiny-init-system_1.0.bb
@@ -0,0 +1,29 @@
+SUMMARY = "Basic init system for constrained systems"
+DESCRIPTION = "Tiny init system for constrained systems based on BusyBox."
+HOMEPAGE = "https://github.com/OSSystemsEmbeddedLinux/meta-ossystems-base"
+BUGTRACKER = "https://github.com/OSSystemsEmbeddedLinux/meta-ossystems-base/issues"
+SECTION = "base"
+CVE_PRODUCT = "tiny-init-system"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING.MIT;md5=40eb1f165a0cf177f2660b7d4223cc56"
+
+SRC_URI = "\
+    file://COPYING.MIT \
+    file://init \
+    file://rc.local.sample \
+"
+
+S = "${UNPACKDIR}"
+
+do_configure[noexec] = "1"
+do_compile[noexec] = "1"
+
+do_install() {
+    install -m 0755 ${S}/init ${D}
+    install -Dm 0755 ${S}/rc.local.sample ${D}${sysconfdir}/rc.local.sample
+}
+
+FILES:${PN} += "/init ${sysconfdir}/rc.local.sample"
+RDEPENDS:${PN} = "busybox"
+
+BBCLASSEXTEND = ""
diff --git a/recipes-staging/gstreamer/gstreamer1.0-plugins-bad_%.bbappend b/recipes-staging/gstreamer/gstreamer1.0-plugins-bad_%.bbappend
new file mode 100644
index 0000000..f03aa32
--- /dev/null
+++ b/recipes-staging/gstreamer/gstreamer1.0-plugins-bad_%.bbappend
@@ -0,0 +1 @@
+PACKAGECONFIG:append = " kms"