diff --git a/conf/layer.conf b/conf/layer.conf
index c9f2664..7cb1cf0 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -15,8 +15,8 @@ LAYERSERIES_COMPAT_meta-diya = "walnascar"
 PACKAGE_CLASSES = "package_ipk"
 INHERIT += " rm_work "
 
-DISTRO_FEATURES:append := " opengl pam systemd usrmerge ppp usbgadget wifi vulkan alsa pulseaudio "
-DISTRO_FEATURES:remove = " x11 ptest sysvinit "
+DISTRO_FEATURES:append := " opengl pam systemd usrmerge ppp usbgadget wifi vulkan alsa "
+DISTRO_FEATURES:remove = " x11 ptest sysvinit pulseaudio "
 DISTRO_FEATURES_BACKFILL_CONSIDERED += " sysvinit "
 VIRTUAL-RUNTIME_init_manager = "systemd"
 VIRTUAL-RUNTIME_initscripts = "systemd-compat-units"
diff --git a/recipes-core/base-files/base-files_%.bbappend b/recipes-core/base-files/base-files_%.bbappend
index 27124db..c296d90 100644
--- a/recipes-core/base-files/base-files_%.bbappend
+++ b/recipes-core/base-files/base-files_%.bbappend
@@ -3,15 +3,13 @@ hostname = "diya"
 do_install:append () {
     cat << 'EOF' >> "${D}${sysconfdir}/profile"
 export GDK_BACKEND=wayland
-export XDG_RUNTIME_DIR=/home/$USER/.xdg
+export XDG_RUNTIME_DIR=/run/user/$(id -u)
+export DBUS_SESSION_BUS_ADDRESS=/run/user/$(id -u)/bus
 export XDG_CONFIG_HOME=/home/$USER/.config
 export XDG_CACHE_HOME=/home/$USER/.cache
 export PATH=$PATH:/home/$USER/bin:/home/$USER/.local/bin
 export LD_LIBRARY_PATH=/home/$USER/lib:/home/$USER/.local/lib
 export DBUS_SYSTEM_BUS_ADDRESS=unix:path=/run/dbus/system_bus_socket
-if [ ! -e "$XDG_RUNTIME_DIR" ]; then
-    mkdir -p "$XDG_RUNTIME_DIR"
-fi
 export TERM=xterm-256color
 #if [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
 #    eval $(dbus-launch --auto-syntax)
diff --git a/recipes-core/images/README.md b/recipes-core/images/README.md
index 8623ba8..4726adb 100644
--- a/recipes-core/images/README.md
+++ b/recipes-core/images/README.md
@@ -37,4 +37,11 @@ dtoverlay=vc4-kms-dpi-generic,hactive=480,hfp=26,hsync=16,hbp=10
 dtparam=vactive=640,vfp=25,vsync=10,vbp=16                       
 dtparam=clock-frequency=32000000,rgb666-padhi
 
-Diyas symbolise goodness and purity, and lighting them denotes dispelling darkness and going into light.
\ No newline at end of file
+Diyas symbolise goodness and purity, and lighting them denotes dispelling darkness and going into light.
+
+
+to test enable
+sudo loginctl enable-linger diya
+
+then logout and login
+systemctl --user --now enable wireplumber
\ No newline at end of file
diff --git a/recipes-core/images/base-image.inc b/recipes-core/images/base-image.inc
index 907f4d8..1afd614 100644
--- a/recipes-core/images/base-image.inc
+++ b/recipes-core/images/base-image.inc
@@ -50,15 +50,8 @@ IMAGE_INSTALL:append = "kernel-modules \
                         coreutils \
                         glmark2 \
                         usb-gadget-diya \
-                        pulseaudio \
-                        pulseaudio-server \
                         alsa-utils \
-                        pulseaudio-module-alsa-card \
-                        pulseaudio-module-alsa-source \
-                        pulseaudio-module-alsa-sink \
-                        pulseaudio-module-cli \
-                        pulseaudio-module-echo-cancel \
-                        pulseaudio-misc \
+                        pipewire \
                         " 
 
 # TOOLCHAIN_HOST_TASK:append = " libxkbcommon "
diff --git a/recipes-core/images/core-image-base.bbappend b/recipes-core/images/core-image-base.bbappend
index 6873681..74eb3d6 100644
--- a/recipes-core/images/core-image-base.bbappend
+++ b/recipes-core/images/core-image-base.bbappend
@@ -32,9 +32,11 @@ IMAGE_INSTALL:append = "pango \
                         wlr-randr \
                         diya-session-manager \
                         lua \
+                        mpg123 \
+                        wireplumber \
                         "
 PACKAGE_EXCLUDE = " gtk+ gtk+3 adwaita-icon-theme "
-IMAGE_INSTALL:remove = " gtk+ gtk+3 adwaita-icon-theme python python3 "
+IMAGE_INSTALL:remove = " gtk+ gtk+3 adwaita-icon-theme "
 # wlr-randr l3afpad wlopm cairo-egl  webkitgtk 
 
 # add tools to toolchains