diff --git a/conf/layer.conf b/conf/layer.conf
index 80a0994..67cc442 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -10,7 +10,7 @@ BBFILE_PATTERN_meta-diya = "^${LAYERDIR}/"
 BBFILE_PRIORITY_meta-diya = "11"
 
 LAYERDEPENDS_meta-diya = " core "
-LAYERSERIES_COMPAT_meta-diya = "scarthgap"
+LAYERSERIES_COMPAT_meta-diya = "walnascar"
 
 PACKAGE_CLASSES = "package_ipk"
 
@@ -22,7 +22,7 @@ INHERIT += "rm_work"
 EXTRA_IMAGE_FEATURES ?= " ssh-server-dropbear read-only-rootfs "
 DISTRO_FEATURES:append := " opengl pam "
 DISTRO_FEATURES:remove = " x11 vulkan ptest "
-TOOLCHAIN_TARGET_TASK:append = " libgles3-mesa-dev "
+TOOLCHAIN_TARGET_TASK:append := " libgles3-mesa-dev "
 # DISTRO_FEATURES:append := " vc4-gfx opengl directfb "
 
 WKS_FILE="image.wks.in"
diff --git a/recipes-core/dropbear/dropbear_%.bbappend b/recipes-core/dropbear/dropbear_%.bbappend
index ef85ee1..383f95b 100644
--- a/recipes-core/dropbear/dropbear_%.bbappend
+++ b/recipes-core/dropbear/dropbear_%.bbappend
@@ -3,5 +3,5 @@ SRC_URI += "file://default"
 
 do_install:append () {
     rm -rf ${D}/etc/dropbear
-    install -m 0644 ${WORKDIR}/default ${D}${sysconfdir}/default/dropbear
+    install -m 0644 ${UNPACKDIR}/default ${D}${sysconfdir}/default/dropbear
 }
\ No newline at end of file
diff --git a/recipes-core/images/core-image-base.bbappend b/recipes-core/images/core-image-base.bbappend
index 6569707..23afa9d 100644
--- a/recipes-core/images/core-image-base.bbappend
+++ b/recipes-core/images/core-image-base.bbappend
@@ -22,7 +22,7 @@ IMAGE_INSTALL:append = "pango \
                         gtk4-layer-shell \
                         libadwaita \
                         gobject-introspection \
-                        wayland wayland-protocols wlroots \
+                        wayland wayland-protocols wlroots-0.18 \
                         foot \
                         mc \
                         gdbserver gdb \
diff --git a/recipes-core/init-ifupdown/init-ifupdown_%.bbappend b/recipes-core/init-ifupdown/init-ifupdown_%.bbappend
index 9617860..dc81a74 100644
--- a/recipes-core/init-ifupdown/init-ifupdown_%.bbappend
+++ b/recipes-core/init-ifupdown/init-ifupdown_%.bbappend
@@ -3,5 +3,5 @@ SRC_URI += " file://itf_diya "
 
 do_install:append () {
     rm ${D}/etc/network/interfaces
-    install -m 0644 ${WORKDIR}/itf_diya ${D}/etc/network/interfaces
+    install -m 0644 ${UNPACKDIR}/itf_diya ${D}/etc/network/interfaces
 }
\ No newline at end of file
diff --git a/recipes-diya/diya-overlay/diya-overlay.bb b/recipes-diya/diya-overlay/diya-overlay.bb
index 5c4d1ea..2422394 100644
--- a/recipes-diya/diya-overlay/diya-overlay.bb
+++ b/recipes-diya/diya-overlay/diya-overlay.bb
@@ -12,7 +12,7 @@ SRC_URI += "file://confd \
             file://diya.pam \
             file://xdg-terminal-exec"
 
-
+S = "${UNPACKDIR}"
 inherit update-rc.d useradd
 
 USERADD_PACKAGES = "${PN}"
@@ -26,17 +26,17 @@ INITSCRIPT_PARAMS = "start 30 S ."
 do_install() {
     install -d ${D}/${sysconfdir}/init.d/
     install -d ${DEPLOY_DIR_IMAGE}
-    install -m 0755 ${WORKDIR}/confd ${D}/${sysconfdir}/init.d/confd
+    install -m 0755 ${UNPACKDIR}/confd ${D}/${sysconfdir}/init.d/confd
     install -d ${D}/sbin/
     install -d ${D}/etc/default/volatiles
-	install -m 0644 ${WORKDIR}/80_diya ${D}${sysconfdir}/default/volatiles
-    install -m 0755 ${WORKDIR}/expandfs.sh ${D}/sbin/expandfs.sh
-    install -m 0755 ${WORKDIR}/boot-to-recovery ${D}/sbin/boot-to-recovery
-    install -m 0755 ${WORKDIR}/fs_resize ${DEPLOY_DIR_IMAGE}/
+	install -m 0644 ${UNPACKDIR}/80_diya ${D}${sysconfdir}/default/volatiles
+    install -m 0755 ${UNPACKDIR}/expandfs.sh ${D}/sbin/expandfs.sh
+    install -m 0755 ${UNPACKDIR}/boot-to-recovery ${D}/sbin/boot-to-recovery
+    install -m 0755 ${UNPACKDIR}/fs_resize ${DEPLOY_DIR_IMAGE}/
     install -d ${D}/etc/pam.d
-    install -m 0644 ${WORKDIR}/diya.pam ${D}${sysconfdir}/pam.d/diya
+    install -m 0644 ${UNPACKDIR}/diya.pam ${D}${sysconfdir}/pam.d/diya
     install -d ${D}/usr/bin
-    install -m 0755 ${WORKDIR}/xdg-terminal-exec ${D}/usr/bin
+    install -m 0755 ${UNPACKDIR}/xdg-terminal-exec ${D}/usr/bin
     cat << EOF > ${DEPLOY_DIR_IMAGE}/diya-config.txt
 recovery=false
 recovery_image=recovery-${MACHINE}.cpio.gz
diff --git a/recipes-diya/diya-session-manager/diya-session-manager_git.bb b/recipes-diya/diya-session-manager/diya-session-manager_git.bb
index 4706812..55ef292 100644
--- a/recipes-diya/diya-session-manager/diya-session-manager_git.bb
+++ b/recipes-diya/diya-session-manager/diya-session-manager_git.bb
@@ -11,7 +11,7 @@ SRC_URI += "git://git.iohub.dev/dany/diya-session-manager.git;protocol=https;bra
 
 SRCREV = "${AUTOREV}"
 PV = "0.1.1+git${SRCPV}"
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 inherit meson pkgconfig
 
@@ -27,10 +27,10 @@ do_install:append() {
     install -d ${D}/etc/dbus-1/system.d
     install -d ${D}/etc/init.d
     install -m 0755 ${WORKDIR}/build/diya-session-manager ${D}/usr/bin/
-    install -m 0755 ${WORKDIR}/diya-sessiond ${D}/etc/init.d/
-    install -m 0755 ${WORKDIR}/diya-session-launch ${D}/usr/bin/
-    install -m 0644 ${WORKDIR}/daemon.conf ${D}/etc/diya/
-    install -m 0644 ${WORKDIR}/dbus-diya.conf ${D}/etc/dbus-1/system.d/
+    install -m 0755 ${UNPACKDIR}/diya-sessiond ${D}/etc/init.d/
+    install -m 0755 ${UNPACKDIR}/diya-session-launch ${D}/usr/bin/
+    install -m 0644 ${UNPACKDIR}/daemon.conf ${D}/etc/diya/
+    install -m 0644 ${UNPACKDIR}/dbus-diya.conf ${D}/etc/dbus-1/system.d/
 }
 
 FILES:${PN} = "/etc/diya \
diff --git a/recipes-diya/initramfs/recovery-boot_0.1.bb b/recipes-diya/initramfs/recovery-boot_0.1.bb
index 33a0552..672df35 100644
--- a/recipes-diya/initramfs/recovery-boot_0.1.bb
+++ b/recipes-diya/initramfs/recovery-boot_0.1.bb
@@ -15,7 +15,7 @@ SRC_URI = "file://init \
            file://diya-update \
           "
 
-S = "${WORKDIR}"
+S = "${UNPACKDIR}"
 
 INITSCRIPT_NAME = "confd"
 INITSCRIPT_PARAMS = "start 30 S ."
@@ -24,12 +24,12 @@ do_install() {
     install -d ${D}/etc/init.d
     install -d ${D}/sbin
     # base
-    install -m 0755 ${WORKDIR}/init ${D}/init
-    install -m 0755 ${WORKDIR}/confd ${D}/etc/init.d/confd
+    install -m 0755 ${UNPACKDIR}/init ${D}/init
+    install -m 0755 ${UNPACKDIR}/confd ${D}/etc/init.d/confd
 cat << EOF >> ${D}/etc/profile
 export MACHINE=${MACHINE}
 EOF
-    install -m 0755 ${WORKDIR}/diya-update ${D}/sbin/
+    install -m 0755 ${UNPACKDIR}/diya-update ${D}/sbin/
     
     # create symlink
     ln -sf /sbin/diya-update ${D}/sbin/diya-update-rootfs
diff --git a/recipes-graphics/mesa/mesa-gl_%.bbappend b/recipes-graphics/mesa/mesa-gl.bbappend
similarity index 100%
rename from recipes-graphics/mesa/mesa-gl_%.bbappend
rename to recipes-graphics/mesa/mesa-gl.bbappend
diff --git a/recipes-graphics/mesa/mesa_%.bbappend b/recipes-graphics/mesa/mesa.bbappend
similarity index 100%
rename from recipes-graphics/mesa/mesa_%.bbappend
rename to recipes-graphics/mesa/mesa.bbappend
diff --git a/recipes-support/l3afpad/l3afpad_0.8.18.bb b/recipes-support/l3afpad/l3afpad_0.8.18.bb
index ba5cf11..24a21a3 100644
--- a/recipes-support/l3afpad/l3afpad_0.8.18.bb
+++ b/recipes-support/l3afpad/l3afpad_0.8.18.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-3.0-only;md5=c79ff39f19dfec
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
-S="${WORKDIR}"
+S = "${UNPACKDIR}"
 
 DEPENDS = "gtk+3 pango cairo harfbuzz gdk-pixbuf  intltool-native"
 
diff --git a/recipes-support/sfwbar/sfwbar_git.bb b/recipes-support/sfwbar/sfwbar_git.bb
index fbf7d72..3766166 100644
--- a/recipes-support/sfwbar/sfwbar_git.bb
+++ b/recipes-support/sfwbar/sfwbar_git.bb
@@ -12,7 +12,7 @@ SRCREV = "${AUTOREV}"
 SRC_URI = "git://github.com/LBCrion/sfwbar.git;protocol=https;branch=main"
 SRC_URI += " file://sfwbar.config "
 
-S="${WORKDIR}/git"
+S="${UNPACKDIR}/git"
 
 inherit meson pkgconfig
 
@@ -21,7 +21,7 @@ EXTRA_OEMESON += "--buildtype release"
 do_install:append () {
     install -d ${D}/${sysconfdir}/xdg/
     install -d ${D}/${sysconfdir}/xdg/sfwbar/
-    install -m 0755 ${WORKDIR}/sfwbar.config ${D}/${sysconfdir}/xdg/sfwbar/
+    install -m 0755 ${UNPACKDIR}/sfwbar.config ${D}/${sysconfdir}/xdg/sfwbar/
 }
 
 FILES:${PN} += "/usr/share/icons/*"
diff --git a/recipes-support/tofi/tofi_git.bb b/recipes-support/tofi/tofi_git.bb
index 8fe5315..0e3387f 100644
--- a/recipes-support/tofi/tofi_git.bb
+++ b/recipes-support/tofi/tofi_git.bb
@@ -12,7 +12,7 @@ SRCREV = "${AUTOREV}"
 SRC_URI = "git://github.com/philj56/tofi.git;protocol=https;branch=master"
 SRC_URI += " file://config file://drun "
 
-S="${WORKDIR}/git"
+S="${UNPACKDIR}/git"
 
 inherit meson pkgconfig
 
@@ -20,8 +20,8 @@ EXTRA_OEMESON += "--buildtype release"
 
 do_install:append () {
     # replace the default config
-    install -m 0755 ${WORKDIR}/drun ${D}/usr/bin/
-    install -m 0755 ${WORKDIR}/config ${D}/${sysconfdir}/xdg/tofi/
+    install -m 0755 ${UNPACKDIR}/drun ${D}/usr/bin/
+    install -m 0755 ${UNPACKDIR}/config ${D}/${sysconfdir}/xdg/tofi/
 }
 
 FILES:${PN} += "/usr/share/*"
diff --git a/recipes-support/wlopm/wlopm_git.bb b/recipes-support/wlopm/wlopm_git.bb
index cd09208..0cde4a1 100644
--- a/recipes-support/wlopm/wlopm_git.bb
+++ b/recipes-support/wlopm/wlopm_git.bb
@@ -10,7 +10,7 @@ SRCREV = "${AUTOREV}"
 
 SRC_URI = "git://git.iohub.dev/dany/wlopm.git;protocol=https;branch=master"
 
-S="${WORKDIR}/git"
+S="${UNPACKDIR}/git"
 
 do_compile () {
     oe_runmake
diff --git a/recipes-support/wtype/wtype_git.bb b/recipes-support/wtype/wtype_git.bb
index ef5d28b..74edaa4 100644
--- a/recipes-support/wtype/wtype_git.bb
+++ b/recipes-support/wtype/wtype_git.bb
@@ -10,7 +10,7 @@ SRCREV = "${AUTOREV}"
 
 SRC_URI = "git://github.com/atx/wtype.git;protocol=https;branch=master"
 
-S="${WORKDIR}/git"
+S="${UNPACKDIR}/git"
 
 inherit meson pkgconfig
 
diff --git a/recipes-wlroots/labwc/labwc_%.bbappend b/recipes-wlroots/labwc/labwc_%.bbappend
index 49eaf49..001e57e 100644
--- a/recipes-wlroots/labwc/labwc_%.bbappend
+++ b/recipes-wlroots/labwc/labwc_%.bbappend
@@ -13,13 +13,13 @@ do_install:append () {
     install -d ${D}/${sysconfdir}/xdg
     install -d ${D}/${sysconfdir}/init.d
     install -d ${D}/${sysconfdir}/xdg/labwc
-    install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/labwc
+    install -m 0755 ${UNPACKDIR}/init ${D}/${sysconfdir}/init.d/labwc
     
-    install -m 0755 ${WORKDIR}/wpp.jpg ${D}/${sysconfdir}/xdg/labwc/
-    install -m 0755 ${WORKDIR}/autostart ${D}/${sysconfdir}/xdg/labwc/
-    install -m 0755 ${WORKDIR}/environment ${D}/${sysconfdir}/xdg/labwc/
-    install -m 0755 ${WORKDIR}/menu.xml ${D}/${sysconfdir}/xdg/labwc/
-    install -m 0755 ${WORKDIR}/rc.xml ${D}/${sysconfdir}/xdg/labwc/
+    install -m 0755 ${UNPACKDIR}/wpp.jpg ${D}/${sysconfdir}/xdg/labwc/
+    install -m 0755 ${UNPACKDIR}/autostart ${D}/${sysconfdir}/xdg/labwc/
+    install -m 0755 ${UNPACKDIR}/environment ${D}/${sysconfdir}/xdg/labwc/
+    install -m 0755 ${UNPACKDIR}/menu.xml ${D}/${sysconfdir}/xdg/labwc/
+    install -m 0755 ${UNPACKDIR}/rc.xml ${D}/${sysconfdir}/xdg/labwc/
     
 }