diff --git a/app/arch/unrar/ympbuild b/app/arch/unrar/ympbuild
index 12f4bab5..b716dc68 100644
--- a/app/arch/unrar/ympbuild
+++ b/app/arch/unrar/ympbuild
@@ -24,8 +24,8 @@ setup(){
 build(){
   cp -a unrar libunrar
   export LDFLAGS+=' -pthread'
-  make -C libunrar lib
-  make -C unrar -j1
+  make -C libunrar lib $jobs
+  make -C unrar $jobs
 }
 
 package(){
diff --git a/dev/lang/lua/lua-5.4.7-shared_library-1.patch b/dev/lang/lua/lua-5.4.7-shared_library-1.patch
new file mode 100644
index 00000000..7e956fbf
--- /dev/null
+++ b/dev/lang/lua/lua-5.4.7-shared_library-1.patch
@@ -0,0 +1,83 @@
+Submitted By:            Xi Ruoyao <xry111 at xry111 dot site>
+Date:                    2022-09-16
+Initial Package Version: 5.4.4
+Upstream Status:         Rejected
+Origin:                  Arch Linux, with some modifications
+Description:             2020-06-30 renodr:
+                         Creates a shared liblua library, as well as
+                         removes optimization since it causes SIGBUS errors,
+                         and sets the search path to /usr from /usr/local.
+                         The initial version of this patch was created by
+                         Igor Zivkovic, before being rediffed for 5.4.0 by
+                         myself with some modifications made.
+                         2022-09-16 xry111:
+                         Remove an extra newline before $(MYLDFLAGS).
+                         MYLDFLAGS is empty by default so it does not break
+                         BLFS build, but it may break a custom build with
+                         tuning or hardening.
+
+diff -Naurp lua-5.4.0.orig/Makefile lua-5.4.0/Makefile
+--- lua-5.4.0.orig/Makefile	2020-04-15 07:55:07.000000000 -0500
++++ lua-5.4.0/Makefile	2020-06-30 13:22:00.997938585 -0500
+@@ -52,7 +52,7 @@ R= $V.0
+ all:	$(PLAT)
+ 
+ $(PLATS) help test clean:
+-	@cd src && $(MAKE) $@
++	@cd src && $(MAKE) $@ V=$(V) R=$(R)
+ 
+ install: dummy
+ 	cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD)
+diff -Naurp lua-5.4.0.orig/src/luaconf.h lua-5.4.0/src/luaconf.h
+--- lua-5.4.0.orig/src/luaconf.h	2020-06-18 09:25:54.000000000 -0500
++++ lua-5.4.0/src/luaconf.h	2020-06-30 13:24:59.294932289 -0500
+@@ -227,7 +227,7 @@
+ 
+ #else			/* }{ */
+ 
+-#define LUA_ROOT	"/usr/local/"
++#define LUA_ROOT	"/usr/"
+ #define LUA_LDIR	LUA_ROOT "share/lua/" LUA_VDIR "/"
+ #define LUA_CDIR	LUA_ROOT "lib/lua/" LUA_VDIR "/"
+ 
+diff -Naurp lua-5.4.0.orig/src/Makefile lua-5.4.0/src/Makefile
+--- lua-5.4.0.orig/src/Makefile	2020-04-15 08:00:29.000000000 -0500
++++ lua-5.4.0/src/Makefile	2020-06-30 13:24:15.746933827 -0500
+@@ -7,7 +7,7 @@
+ PLAT= guess
+ 
+ CC= gcc -std=gnu99
+-CFLAGS= -O2 -Wall -Wextra -DLUA_COMPAT_5_3 $(SYSCFLAGS) $(MYCFLAGS)
++CFLAGS= -fPIC -O0 -Wall -Wextra -DLUA_COMPAT_5_3 -DLUA_COMPAT_5_2 -DLUA_COMPAT_5_1 $(SYSCFLAGS) $(MYCFLAGS)
+ LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS)
+ LIBS= -lm $(SYSLIBS) $(MYLIBS)
+ 
+@@ -33,6 +33,7 @@ CMCFLAGS= -Os
+ PLATS= guess aix bsd c89 freebsd generic linux linux-readline macosx mingw posix solaris
+ 
+ LUA_A=	liblua.a
++LUA_SO=  liblua.so
+ CORE_O=	lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o lundump.o lvm.o lzio.o
+ LIB_O=	lauxlib.o lbaselib.o lcorolib.o ldblib.o liolib.o lmathlib.o loadlib.o loslib.o lstrlib.o ltablib.o lutf8lib.o linit.o
+ BASE_O= $(CORE_O) $(LIB_O) $(MYOBJS)
+@@ -44,7 +45,7 @@ LUAC_T=	luac
+ LUAC_O=	luac.o
+ 
+ ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O)
+-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
++ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO)
+ ALL_A= $(LUA_A)
+ 
+ # Targets start here.
+@@ -60,6 +61,11 @@ $(LUA_A): $(BASE_O)
+ 	$(AR) $@ $(BASE_O)
+ 	$(RANLIB) $@
+ 
++$(LUA_SO): $(CORE_O) $(LIB_O)
++	$(CC) -shared -ldl -Wl,--soname,$(LUA_SO).$(V) -o $@.$(R) $? -lm $(MYLDFLAGS)
++	ln -sf $(LUA_SO).$(R) $(LUA_SO).$(V)
++	ln -sf $(LUA_SO).$(R) $(LUA_SO)
++
+ $(LUA_T): $(LUA_O) $(LUA_A)
+ 	$(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
+ 
diff --git a/dev/lang/lua/lua.pc b/dev/lang/lua/lua.pc
new file mode 100644
index 00000000..f6def5af
--- /dev/null
+++ b/dev/lang/lua/lua.pc
@@ -0,0 +1,20 @@
+V=%VER%
+R=%REL%
+
+prefix=/usr
+INSTALL_BIN=${prefix}/bin
+INSTALL_INC=${prefix}/include
+INSTALL_LIB=${prefix}/lib
+INSTALL_MAN=${prefix}/man/man1
+INSTALL_LMOD=${prefix}/share/lua/${V}
+INSTALL_CMOD=${prefix}/lib/lua/${V}
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: Lua
+Description: An Extensible Extension Language
+Version: ${R}
+Requires: 
+Libs: -L${libdir} -llua -lm
+Cflags: -I${includedir} -fPIC
diff --git a/dev/lang/lua/ympbuild b/dev/lang/lua/ympbuild
new file mode 100644
index 00000000..2e93c0e8
--- /dev/null
+++ b/dev/lang/lua/ympbuild
@@ -0,0 +1,44 @@
+#!/usr/bin/env bash
+name='lua'
+release='1'
+version='5.4.7'
+url='https://lua.org'
+description='Powerful lightweight programming language designed for extending applicationsPowerful lightweight programming language designed for extending applications'
+email='parduscix@yandex.ru'
+maintainer='sulincix'
+license=('GPLv3')
+source=("https://www.lua.org/ftp/lua-$version.tar.gz"
+        "lua.pc"
+        "lua-5.4.7-shared_library-1.patch")
+depends=(readline)
+makedepends=()
+sha256sums=('9fbf5e28ef86c69858f6d3d34eccc32e911c1a28b4120ff3e84aaa70cfbf1e30'
+            'SKIP'
+            'SKIP')
+group=(dev.lang)
+uses=()
+arch=('x86_64')
+
+cd $name-$version
+
+prepare(){
+    patch -Np1 -i ../lua-5.4.7-shared_library-1.patch
+}
+
+build () {
+    make $jobs
+}
+
+package () {
+    make install $jobs \
+        INSTALL_TOP="$DESTDIR" \
+        INSTALL_DATA='cp -d' \
+        INSTALL_MAN="$DESTDIR/usr/share/man/man1" \
+        TO_LIB="liblua.so liblua.so.5.4 liblua.so.5.4.7"
+    install -Dm644 ../lua.pc "$DESTDIR"/usr/lib/pkgconfig/lua54.pc
+    ln -sf lua54.pc "$DESTDIR"/usr/lib/pkgconfig/lua.pc
+    ln -sf lua54.pc "$DESTDIR"/usr/lib/pkgconfig/lua5.4.pc
+    ln -sf lua54.pc "$DESTDIR"/usr/lib/pkgconfig/lua-5.4.pc
+    rm -rvf "$DESTDIR"/share
+}
+
diff --git a/media/video/gstreamer/ympbuild b/media/video/gstreamer/ympbuild
index 506e71ce..d4968341 100644
--- a/media/video/gstreamer/ympbuild
+++ b/media/video/gstreamer/ympbuild
@@ -8,9 +8,9 @@ email='akarsu@protonmail.com'
 maintainer='akarsu'
 license=('LGPL')
 source=("https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${version}.tar.xz")
-depends=(glib elfutils libxml2 ocr)
+depends=(glib elfutils libxml2 orc)
 makedepends=(gobject-introspection gtk3 libcap python)
-sha256sums=('779f5ede3016019eec01d64a025583078d3936e35d4288ec2e8433494d757dd9')
+sha256sums=('c0e75b124c52bb7a0c3dcdb734b2ad260ea7286a8745cf2ea629d4c849e6a958')
 group=(media.libs)
 uses=()
 arch=('x86_64')
diff --git a/media/video/wireplumber/ympbuild b/media/video/wireplumber/ympbuild
index 2583a403..6389d956 100644
--- a/media/video/wireplumber/ympbuild
+++ b/media/video/wireplumber/ympbuild
@@ -17,13 +17,18 @@ arch=('x86_64')
 
 cd $name-$version
 
+prepare(){
+    # force disable docs
+    sed -i "s/^subdir('docs')//g" meson.build
+}
+
 setup(){
 	 meson setup build --prefix=/usr \
     --libdir=/usr/lib64 \
+    -Dsystem-lua=true \
 		-Ddoc=disabled \
 		-Dsystemd=disabled \
-		-Dtests=false \
-		--buildtype=release
+		-Dtests=false
 }
 build(){
    ninja -C build
diff --git a/sys/apps/dbus/dbus.sysconf b/sys/apps/dbus/dbus.sysconf
index 3c3ae8f3..0fa0f7e8 100644
--- a/sys/apps/dbus/dbus.sysconf
+++ b/sys/apps/dbus/dbus.sysconf
@@ -1,10 +1,10 @@
 #!/bin/sh
+set -o pipefail
 if [ ! -f /etc/machine-id ] ; then
     dbus-uuidgen --ensure=/etc/machine-id
 fi
-if busybox ls /bin/su -la | grep "^...s" >/dev/null ; then
+if busybox ls /usr/libexec/dbus-daemon-launch-helper -la | grep "^...s" >/dev/null ; then
     chmod 4755 /usr/libexec/dbus-daemon-launch-helper
 fi
 dbus-send --system --type=method_call --dest=org.freedesktop.DBus / \
 	org.freedesktop.DBUS.ReloadConfig >/dev/null 2>&1 || :
-	
diff --git a/sys/apps/dbus/ympbuild b/sys/apps/dbus/ympbuild
index 7496428c..16196767 100644
--- a/sys/apps/dbus/ympbuild
+++ b/sys/apps/dbus/ympbuild
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 name='dbus'
-release='1'
-version='1.15.2'
+release='2'
+version='1.15.10'
 url='https://dbus.freedesktop.org/releases/dbus/'
 description='A message bus system, a simple way for applications to talk to each other'
 email='aliriza.keskin@pardus.org.tr'
@@ -14,7 +14,7 @@ source=("https://dbus.freedesktop.org/releases/dbus/dbus-$version.tar.xz"
         "dbus.xinit")
 depends=(audit expat libcap-ng elogind)
 makedepends=()
-md5sums=('c56de960ea9031b92ee71aaa0e8e72c2'
+sha256sums=('f700f2f1d0473f11e52f3f3e179f577f31b85419f9ae1972af8c3db0bcfde178'
          'SKIP'
          'SKIP'
          'SKIP'
@@ -27,24 +27,25 @@ arch=('x86_64')
 cd $name-$version
 
 setup(){
-    ./configure --prefix=/usr \
+    meson setup build --prefix=/usr \
         --libdir=/usr/lib64/ \
         --localstatedir=/var \
         --sysconfdir=/etc \
-        --disable-xml-docs \
-        --with-system-pid-file=/run/dbus/dbus.pid \
-        $(use_opt x11 --with-x --without-x)
+        -Dxml_docs=disabled \
+        -Dsystem_pid_file=/run/dbus/dbus.pid \
+        -Dx11_autolaunch=$(use_opt x11 enabled disabled)
 }
 
 build(){
-    make
+    ninja -C build $jobs
 }
 
 package(){
-    make $jobs install
+    ninja -C build install $jobs
     mkdir -p "$DESTDIR"/etc/{passwd,group,sysconf,init,conf}.d "$DESTDIR"/etc/X11/xinit/xinitrc.d/
-    echo "messagebus:x:109:" > "$DESTDIR"/etc/group.d/dbus
-    echo "messagebus:x:103:109::/nonexistent:/usr/sbin/nologin" > "$DESTDIR"/etc/passwd.d/dbus
+    # GID: messagebus 103
+    echo "messagebus:x:103:" > "$DESTDIR"/etc/group.d/dbus
+    echo "messagebus:x:103:103::/nonexistent:/usr/sbin/nologin" > "$DESTDIR"/etc/passwd.d/dbus
     install ../dbus.sysconf "$DESTDIR"/etc/sysconf.d/dbus
     install ../dbus.initd "$DESTDIR"/etc/init.d/dbus
     install ../dbus.confd "$DESTDIR"/etc/conf.d/dbus
diff --git a/sys/apps/gawk/gawk b/sys/apps/gawk/gawk
deleted file mode 100644
index b82e0ecb..00000000
Binary files a/sys/apps/gawk/gawk and /dev/null differ
diff --git a/sys/apps/openrc/ympbuild b/sys/apps/openrc/ympbuild
index f189f776..b3b9389f 100644
--- a/sys/apps/openrc/ympbuild
+++ b/sys/apps/openrc/ympbuild
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 name='openrc'
-release='4'
-version='0.54'
+release='5'
+version='0.55.1'
 url='https://github.com/OpenRC/openrc'
 description='The OpenRC init system'
 email='aliriza.keskin@pardus.org.tr'
@@ -16,7 +16,7 @@ source=("https://github.com/OpenRC/openrc/archive/refs/tags/$version.zip"
     "extras/disable-secondary-gpu.sh")
 depends=()
 makedepends=()
-sha256sums=('ad808516cb9b9a6e031ac2faeef88214164db3b11d5659a542501491e48b298d'
+sha256sums=('62e2c72cd3b10a4db2b0cf2ef25a52fc2b269f50c934329ff5f8e973cd81d5a4'
     'SKIP'
     'SKIP'
     'SKIP'
@@ -33,7 +33,7 @@ cd $name-$version
 
 prepare(){
     # hidepid=2 by default
-    sed -i "s/ proc \/proc/,hidepid=2,gid=31&/g" sh/init.sh.Linux.in 
+    sed -i "s/ proc \/proc/,hidepid=2,gid=31&/g" sh/init.sh.Linux.in
 }
 
 setup(){
@@ -52,7 +52,6 @@ build(){
 }
 
 package(){
-    export DESTDIR=${DESTDIR}//
     ninja -C build install
     # disable all services
     rm -f ${DESTDIR}/etc/runlevels/*/*
@@ -63,9 +62,11 @@ package(){
     install ../openrc.sysconf ${DESTDIR}/etc/sysconf.d/openrc
     mkdir -p ${DESTDIR}/etc/group.d
     mkdir -p ${DESTDIR}/etc/passwd.d
-    echo "uucp:x:14:" > ${DESTDIR}/etc/group.d/uucp
-    echo "proc:x:31:" > ${DESTDIR}/etc/group.d/proc
-    echo "uucp:x:10:14:uucp:/var/spool/uucp:/bin/false" > ${DESTDIR}/etc/passwd.d/uucp
+    # GID: uucp 14
+    # GID: proc 31
+    echo "uucp:x:14:" >> ${DESTDIR}/etc/group.d/openrc
+    echo "proc:x:31:" >> ${DESTDIR}/etc/group.d/openrc
+    echo "uucp:x:14:14:uucp:/var/spool/uucp:/bin/false" > ${DESTDIR}/etc/passwd.d/uucp
     # move /share to /usr/share
     mkdir -p ${DESTDIR}/usr ${DESTDIR}/sbin
     mv ${DESTDIR}/{,usr}/share
@@ -76,12 +77,12 @@ package(){
     # install extras
     mkdir -p ${DESTDIR}/usr/libexec
     install ../disable-secondary-gpu.sh ${DESTDIR}/usr/libexec/disable-secondary-gpu
-    install ../disable-secondary-gpu.initd ${DESTDIR}/etc/init.d
-    install ../backlight-restore.initd ${DESTDIR}/etc/init.d
+    install ../disable-secondary-gpu.initd ${DESTDIR}/etc/init.d/disable-secondary-gpu
+    install ../backlight-restore.initd ${DESTDIR}/etc/init.d/backlight-restore
     # systemd /proc/1/comm hack
     # move openrc-run as systemd path and symlink
     mkdir -p $DESTDIR/lib/systemd/
     mv $DESTDIR/sbin/openrc-init $DESTDIR/lib/systemd/systemd
-    ln -s ../lib/systemd/systemd $DESTDIR/sbin/openrc-init 
+    ln -s ../lib/systemd/systemd $DESTDIR/sbin/openrc-init
 }
 
diff --git a/sys/auth/polkit/polkit.groups b/sys/auth/polkit/polkit.groups
deleted file mode 100644
index 3c753abf..00000000
--- a/sys/auth/polkit/polkit.groups
+++ /dev/null
@@ -1 +0,0 @@
-polkitd:x:102:polkitd
diff --git a/sys/auth/polkit/polkit.passwd b/sys/auth/polkit/polkit.passwd
deleted file mode 100644
index 7802cd3d..00000000
--- a/sys/auth/polkit/polkit.passwd
+++ /dev/null
@@ -1 +0,0 @@
-polkitd:x:102:102:User for polkitd:/var/empty:/sbin/nologin
diff --git a/sys/auth/polkit/polkit.sysconf b/sys/auth/polkit/polkit.sysconf
index 320794ad..2a1dd685 100644
--- a/sys/auth/polkit/polkit.sysconf
+++ b/sys/auth/polkit/polkit.sysconf
@@ -6,4 +6,12 @@ if [ ! -f /var/lib/ymp/sysconf/polkit/postinstall.done ] ; then
     chmod -R 700 /etc/polkit-1/rules.d
     chmod -R 700 /usr/share/polkit-1/rules.d
     date > /var/lib/ymp/sysconf/polkit/postinstall.done
+    usermod -aG proc polkitd
 fi
+set -o pipefail
+if ! ls -la /usr/bin/pkexec | grep "^...s" >/dev/null ; then
+    chmod 4755 /usr/bin/pkexec
+fi
+if ! ls -la /usr/lib/polkit-1/polkit-agent-helper-1 | grep "^...s" >/dev/null; then
+    chmod 4755 /usr/lib/polkit-1/polkit-agent-helper-1
+fi
\ No newline at end of file
diff --git a/sys/auth/polkit/ympbuild b/sys/auth/polkit/ympbuild
index f37f566a..09b3c5c8 100644
--- a/sys/auth/polkit/ympbuild
+++ b/sys/auth/polkit/ympbuild
@@ -1,22 +1,18 @@
 #!/usr/bin/env bash
 name='polkit'
-release='2'
-version='123'
+release='3'
+version='125'
 url='https://gitlab.freedesktop.org/polkit/polkit'
 description='Application development toolkit for controlling system-wide privileges'
 email='akarsu@protonmail.com'
 maintainer='akarsu'
 license=('GPLv3')
-source=("https://gitlab.freedesktop.org/polkit/polkit/-/archive/$version/polkit-$version.tar.gz"
-        "polkit.groups"
+source=("https://github.com/polkit-org/polkit/archive/refs/tags/$version.tar.gz"
         "polkit.initd"
-        "polkit.passwd"
         "polkit.sysconf")
 depends=(duktape expat glib pam elogind)
 makedepends=(gobject-introspection gtk-doc meson)
-md5sums=('36540b837c588e1e77145523bb39f511'
-         'SKIP'
-         'SKIP'
+sha256sums=('ea5cd6e6e2afa6bad938ee770bf0c2cd9317910f37956faeba2869adcf3747d1'
          'SKIP'
          'SKIP')
 group=(sys.auth)
@@ -28,7 +24,10 @@ cd $name-$version
 setup(){
     meson setup build --prefix=/usr \
         --libdir=/usr/lib64/ \
-        -Dsession_tracking="libelogind" \
+        -Dsession_tracking="elogind" \
+        -D os_type=redhat \
+        -D polkitd_uid=102 \
+        -D polkitd_user=polkitd \
         -Dsystemdsystemunitdir=/garbage
 }
 
@@ -41,8 +40,9 @@ package(){
     rm -rf $DESTDIR/garbage
     install -d $DESTDIR/etc/{passwd,group,sysconf,init}.d
     install ../polkit.sysconf $DESTDIR/etc/sysconf.d/polkit
-    install ../polkit.groups $DESTDIR/etc/group.d/polkit
-    install ../polkit.passwd $DESTDIR/etc/passwd.d/polkit
     install ../polkit.initd $DESTDIR/etc/init.d/polkit
+    # GID: polkitd 102
+    echo "polkitd:x:102:polkitd" > $DESTDIR/etc/group.d/polkitd
+    echo "polkitd:x:102:102:User for polkitd:/var/empty:/sbin/nologin" > $DESTDIR/etc/passwd.d/polkitd
 }
 
diff --git a/sys/fs/eudev/eudev.groups b/sys/fs/eudev/eudev.groups
index 02d26fbc..20c71aac 100644
--- a/sys/fs/eudev/eudev.groups
+++ b/sys/fs/eudev/eudev.groups
@@ -1,12 +1,12 @@
 tty:x:5:
 dialout:x:20:
 kmem:x:15:
-input:x:104:
+input:x:98:
 video:x:44:
 audio:x:29:
 lp:x:7:
 disk:x:6:
 cdrom:x:24:
 tape:x:26:
-kvm:x:105:
+kvm:x:99:
 
diff --git a/sys/fs/eudev/ympbuild b/sys/fs/eudev/ympbuild
index b90a7037..c99d309c 100644
--- a/sys/fs/eudev/ympbuild
+++ b/sys/fs/eudev/ympbuild
@@ -37,10 +37,10 @@ setup(){
         --with-rootprefix=/ \
         --libdir=/lib64/ \
         --with-rootrundir=/run \
-		--with-rootlibexecdir=/lib64/udev \
-		--enable-split-usr \
-		--disable-selinux \
-		--enable-kmod
+        --with-rootlibexecdir=/lib64/udev \
+        --enable-split-usr \
+        --disable-selinux \
+        --enable-kmod
 }
 
 build(){
diff --git a/x11/misc/lightdm-pardus-greeter/ympbuild b/x11/misc/lightdm-pardus-greeter/ympbuild
index 436bacc0..6299c2b4 100644
--- a/x11/misc/lightdm-pardus-greeter/ympbuild
+++ b/x11/misc/lightdm-pardus-greeter/ympbuild
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 name='lightdm-pardus-greeter'
-release='3'
-version='0.1.0'
+release='4'
+version='0.2.0'
 url='https://github.com/pardus/pardus-lightdm-greeter'
 description='Lightdm greeter for Pardus'
 email='aliriza.keskin@pardus.org.tr'
@@ -10,7 +10,7 @@ license=('GPLv3')
 source=("https://github.com/pardus/pardus-lightdm-greeter/archive/refs/tags/debian/$version.tar.gz")
 depends=(lightdm py3-pygobject py3-cairo)
 makedepends=()
-sha256sums=('987c6a52758e0f232065d1f5332a1f78f019c22b323e55534f128f28e7e714c1')
+sha256sums=('ec73a2140001723ca6080bcf3a2cdcb2685f20fcf6ea4a497f86166878f973c8')
 group=(x11.misc)
 uses=()
 arch=('x86_64')
diff --git a/x11/misc/lightdm/ympbuild b/x11/misc/lightdm/ympbuild
index f19b45ef..32d5ddb2 100644
--- a/x11/misc/lightdm/ympbuild
+++ b/x11/misc/lightdm/ympbuild
@@ -42,7 +42,8 @@ package(){
     # create user and group
     mkdir -p $DESTDIR/etc/group.d
     mkdir -p $DESTDIR/etc/passwd.d
-    echo "lightdm:x:108:118:Lightdm Display Manager:/var/lib/lightdm-data/:/bin/false" > $DESTDIR/etc/passwd.d/lightdm
+    # GID: lightdm 118
+    echo "lightdm:x:118:118:Lightdm Display Manager:/var/lib/lightdm-data/:/bin/sh" > $DESTDIR/etc/passwd.d/lightdm
     echo "lightdm:x:118:" > $DESTDIR/etc/group.d/lightdm
     # install service
     mkdir -p $DESTDIR/etc/init.d
diff --git a/x11/misc/sddm/ympbuild b/x11/misc/sddm/ympbuild
index b0bfb360..7571e804 100644
--- a/x11/misc/sddm/ympbuild
+++ b/x11/misc/sddm/ympbuild
@@ -21,6 +21,7 @@ arch=('x86_64')
 cd $name-$version
 
 export CXXFLAGS="$CXXFLAGS -flto=auto"
+export LANG="en_US.UTF-8"
 
 setup () {
 	cmake -B build -G Ninja \
@@ -44,13 +45,14 @@ build () {
 package () {
     ninja -C build install
     install -Dm755 ../sddm.initd "$DESTDIR"/etc/init.d/sddm
-	install -Dm644 ../sddm.confd "$DESTDIR"/etc/conf.d/sddm
-	# replace pam script
-	install -Dm644 ../sddm.pam "$DESTDIR"/etc/pam.d/sddm
-	mkdir -p $DESTDIR/etc/passwd.d/ $DESTDIR/etc/group.d/
-	echo "sddm:x:109:119:Simple Desktop Display Manager:/var/lib/sddm/:/bin/false" > $DESTDIR/etc/passwd.d/sddm
+    install -Dm644 ../sddm.confd "$DESTDIR"/etc/conf.d/sddm
+    # replace pam script
+    install -Dm644 ../sddm.pam "$DESTDIR"/etc/pam.d/sddm
+    mkdir -p $DESTDIR/etc/passwd.d/ $DESTDIR/etc/group.d/
+    # GID: sddm 119
+    echo "sddm:x:119:119:Simple Desktop Display Manager:/var/lib/sddm/:/bin/sh" > $DESTDIR/etc/passwd.d/sddm
     echo "sddm:x:119:" > $DESTDIR/etc/group.d/sddm
-    
+
     install -d "$DESTDIR"/usr/lib/sddm/sddm.conf.d
     "$DESTDIR"/usr/bin/sddm --example-config > "$DESTDIR"/usr/lib/sddm/sddm.conf.d/default.conf
     # Unset InputMethod https://github.com/sddm/sddm/issues/952
diff --git a/x11/terms/gnome-terminal/01-gnome-terminal-always-headerbar.patch b/x11/terms/gnome-terminal/01-gnome-terminal-always-headerbar.patch
new file mode 100644
index 00000000..b00c5d42
--- /dev/null
+++ b/x11/terms/gnome-terminal/01-gnome-terminal-always-headerbar.patch
@@ -0,0 +1,12 @@
+diff --git a/src/terminal-app.cc b/src/terminal-app.cc
+index ff91e156..c834b314 100644
+--- a/src/terminal-app.cc
++++ b/src/terminal-app.cc
+@@ -236,6 +236,7 @@ strv_contains_gnome (char **strv)
+ static gboolean
+ terminal_app_should_use_headerbar (TerminalApp *app)
+ {
++  return TRUE;
+   gboolean set, use;
+   g_settings_get (app->global_settings, TERMINAL_SETTING_HEADERBAR_KEY, "mb", &set, &use);
+   if (set)
diff --git a/x11/terms/gnome-terminal/ympbuild b/x11/terms/gnome-terminal/ympbuild
index 5bea987d..536b588f 100644
--- a/x11/terms/gnome-terminal/ympbuild
+++ b/x11/terms/gnome-terminal/ympbuild
@@ -8,12 +8,14 @@ email='akarsu@protonmail.com'
 maintainer='akarsu'
 license=('GPLv3')
 source=("https://gitlab.gnome.org/GNOME/gnome-terminal/-/archive/${version}/gnome-terminal-${version}.tar.gz"
-"00-ignore-language-check.patch"
-"gnome-terminal-daemon"
-"gnome-terminal-daemon.desktop")
+    "00-ignore-language-check.patch"
+    "01-gnome-terminal-always-headerbar.patch"
+    "gnome-terminal-daemon"
+    "gnome-terminal-daemon.desktop")
 depends=(dconf gsettings-desktop-schemas itstool libpcre2 vte3)
 makedepends=()
 sha256sums=('77370b4a00d0cda9ef339ff3aa809d266f3b937f00875176904c5bbefb76ae79'
+         'SKIP'
          'SKIP'
          'SKIP'
          'SKIP')
@@ -25,10 +27,11 @@ cd $name-$version
 
 prepare (){
     patch -Np1 -i ../00-ignore-language-check.patch
+    patch -Np1 -i ../01-gnome-terminal-always-headerbar.patch
 }
 
 setup () {
-    meson setup build --prefix=/usr \
+    command meson setup build --prefix=/usr \
 		--libdir=/usr/lib64/ \
 		-Dnautilus_extension=false \
 		-Dsearch_provider=false
diff --git a/x11/terms/xterm/ympbuild b/x11/terms/xterm/ympbuild
index b2efaf64..ff125ae6 100644
--- a/x11/terms/xterm/ympbuild
+++ b/x11/terms/xterm/ympbuild
@@ -50,8 +50,8 @@ package(){
     make install $jobs DESTDIR=${DESTDIR}
     make install-ti $jobs DESTDIR=${DESTDIR}
     mkdir -p "${DESTDIR}"/usr/share/applications
-    mkdir -p "${DESTDIR}"/usr/share/xgreeters
+    mkdir -p "${DESTDIR}"/usr/share/xsessions
     install {xterm,uxterm}.desktop "${DESTDIR}"/usr/share/applications/
-    install ../xterm.desktop "${DESTDIR}"/usr/share/xgreeters/
+    install ../xterm.desktop "${DESTDIR}"/usr/share/xsessions/
 }