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/easysplash/easysplash-animation-default_2.0.0.bb b/recipes-core/easysplash/easysplash-animation-default_2.0.0.bb
index 3662505..065798c 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,15 @@ 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 \
 "
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..fa6c2d6 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,15 @@ 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 \
 "
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..15e6093 100644
--- a/recipes-core/easysplash/easysplash-config_2.0.0.bb
+++ b/recipes-core/easysplash/easysplash-config_2.0.0.bb
@@ -4,7 +4,7 @@ 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}"
diff --git a/recipes-core/easysplash/easysplash-crates.inc b/recipes-core/easysplash/easysplash-crates.inc
index d614af3..830d49f 100644
--- a/recipes-core/easysplash/easysplash-crates.inc
+++ b/recipes-core/easysplash/easysplash-crates.inc
@@ -1,7 +1,7 @@
 # Autogenerated with 'bitbake -c update_crates easysplash'
 
 # from Cargo.lock
-SRC_URI += " \
+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..4d35c5f 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,14 @@ 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"
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"