diff --git a/srcpkgs/dinit/files/dinit.d/agetty-tty1 b/srcpkgs/dinit/files/dinit.d/agetty-tty1
new file mode 100644
index 0000000..1660c17
--- /dev/null
+++ b/srcpkgs/dinit/files/dinit.d/agetty-tty1
@@ -0,0 +1,4 @@
+type = process
+command = /etc/dinit.d/agetty.sh tty1
+restart = true
+depends-on = loginready
diff --git a/srcpkgs/dinit/files/dinit.d/agetty-tty2 b/srcpkgs/dinit/files/dinit.d/agetty-tty2
new file mode 100644
index 0000000..dd59e56
--- /dev/null
+++ b/srcpkgs/dinit/files/dinit.d/agetty-tty2
@@ -0,0 +1,4 @@
+type = process
+command = /etc/dinit.d/agetty.sh tty2
+restart = true
+depends-on = loginready
diff --git a/srcpkgs/dinit/files/dinit.d/agetty-tty3 b/srcpkgs/dinit/files/dinit.d/agetty-tty3
new file mode 100644
index 0000000..689774e
--- /dev/null
+++ b/srcpkgs/dinit/files/dinit.d/agetty-tty3
@@ -0,0 +1,4 @@
+type = process
+command = /etc/dinit.d/agetty.sh tty3
+restart = true
+depends-on = loginready
diff --git a/srcpkgs/dinit/files/dinit.d/agetty-tty4 b/srcpkgs/dinit/files/dinit.d/agetty-tty4
new file mode 100644
index 0000000..480ec2d
--- /dev/null
+++ b/srcpkgs/dinit/files/dinit.d/agetty-tty4
@@ -0,0 +1,4 @@
+type = process
+command = /etc/dinit.d/agetty.sh tty4
+restart = true
+depends-on = loginready
diff --git a/srcpkgs/dinit/files/dinit.d/agetty-tty5 b/srcpkgs/dinit/files/dinit.d/agetty-tty5
new file mode 100644
index 0000000..22bebc0
--- /dev/null
+++ b/srcpkgs/dinit/files/dinit.d/agetty-tty5
@@ -0,0 +1,4 @@
+type = process
+command = /etc/dinit.d/agetty.sh tty5
+restart = true
+depends-on = loginready
diff --git a/srcpkgs/dinit/files/dinit.d/agetty-tty6 b/srcpkgs/dinit/files/dinit.d/agetty-tty6
new file mode 100644
index 0000000..ac32da8
--- /dev/null
+++ b/srcpkgs/dinit/files/dinit.d/agetty-tty6
@@ -0,0 +1,4 @@
+type = process
+command = /etc/dinit.d/agetty.sh tty6
+restart = true
+depends-on = loginready
diff --git a/srcpkgs/dinit/files/dinit.d/agetty-tty7 b/srcpkgs/dinit/files/dinit.d/agetty-tty7
new file mode 100644
index 0000000..137eaca
--- /dev/null
+++ b/srcpkgs/dinit/files/dinit.d/agetty-tty7
@@ -0,0 +1,4 @@
+type = process
+command = /etc/dinit.d/agetty.sh tty7
+restart = true
+depends-on = loginready
diff --git a/srcpkgs/dinit/files/dinit.d/agetty.sh b/srcpkgs/dinit/files/dinit.d/agetty.sh
new file mode 100755
index 0000000..e753273
--- /dev/null
+++ b/srcpkgs/dinit/files/dinit.d/agetty.sh
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+tty=$1
+
+exec ${GETTY} ${GETTY_ARGS} \
+        "${tty}" "${BAUD_RATE}" "${TERM_NAME}"
+
+if [ -x /sbin/agetty -o -x /bin/agetty ]; then
+    # util-linux specific settings
+    if [ "${tty}" = "tty1" ]; then
+        if [ -e /bin/getty ]; then
+            GETTY_ARGS=""
+        else
+            GETTY_ARGS="--noclear"
+        fi
+    fi
+fi
+
+BAUD_RATE=38400
+TERM_NAME=linux
+
+if [ -x /sbin/getty -o -x /bin/getty ]; then
+        # busybox
+        GETTY=getty
+elif [ -x /sbin/agetty -o -x /bin/agetty ]; then
+        # util-linux
+        GETTY=agetty
+fi
diff --git a/srcpkgs/dinit/files/dinit.d/loginready b/srcpkgs/dinit/files/dinit.d/loginready
new file mode 100644
index 0000000..48b81c2
--- /dev/null
+++ b/srcpkgs/dinit/files/dinit.d/loginready
@@ -0,0 +1,8 @@
+# Virtual service run before login is enabled.
+
+type = internal
+restart = false
+options = runs-on-console
+
+depends-on = rcboot
+waits-for = udevd
diff --git a/srcpkgs/dinit/files/drunner b/srcpkgs/dinit/files/drunner
index 246cf5a..c869f80 100755
--- a/srcpkgs/dinit/files/drunner
+++ b/srcpkgs/dinit/files/drunner
@@ -8,7 +8,7 @@ for i in $(ls /etc/sv/); do
       rm -rf /etc/dinit.d/runitb.d/"$i"/log/supervise
       printf "type = process \nworking-dir = /etc/dinit.d/runitb.d/"$i"/log/ \ncommand = /etc/dinit.d/runitb.d/"$i"/log/run" > /etc/dinit.d/"$i"-log
   fi
-  printf "type = process \nworking-dir = /etc/dinit.d/runitb.d/"$i"/ \ncommand = /etc/dinit.d/runitb.d/"$i"/run" > /etc/dinit.d/"$i"
+  printf "type = process \nworking-dir = /etc/dinit.d/runitb.d/"$i"/ \nwaits-for = loginready \ncommand = /etc/dinit.d/runitb.d/"$i"/run" > /etc/dinit.d/"$i"
 done
 
 for i in $(ls /etc/runit/runsvdir/default/); do
diff --git a/srcpkgs/dinit/template b/srcpkgs/dinit/template
index 94f8f62..b620b29 100644
--- a/srcpkgs/dinit/template
+++ b/srcpkgs/dinit/template
@@ -1,7 +1,7 @@
 #!/bin/sh
 pkgname=dinit
 version=0.17.1
-revision=3
+revision=4
 short_desc="Simple Linux / BSD init system (NOT MY SOFTWARE)"
 maintainer="Tracker-Friendly <jliwin98@danwin1210.de>"
 homepage="https://github.com/davmac314/dinit"
@@ -32,4 +32,5 @@ do_install() {
     mkdir -p ${DESTDIR}/etc/dinit.d/
     cp -r ${FILESDIR}/dinit.d/* ${DESTDIR}/etc/dinit.d/
     vbin ${FILESDIR}/drunner
+    ln -s /usr/bin/dinit ${DESTDIR}/usr/bin/init
 }
diff --git a/srcpkgs/eudev-libudev b/srcpkgs/eudev-libudev
new file mode 120000
index 0000000..847a5d7
--- /dev/null
+++ b/srcpkgs/eudev-libudev
@@ -0,0 +1 @@
+eudev
\ No newline at end of file
diff --git a/srcpkgs/eudev-libudev-devel b/srcpkgs/eudev-libudev-devel
new file mode 120000
index 0000000..847a5d7
--- /dev/null
+++ b/srcpkgs/eudev-libudev-devel
@@ -0,0 +1 @@
+eudev
\ No newline at end of file
diff --git a/srcpkgs/eudev/INSTALL b/srcpkgs/eudev/INSTALL
new file mode 100644
index 0000000..aa64769
--- /dev/null
+++ b/srcpkgs/eudev/INSTALL
@@ -0,0 +1,10 @@
+case "$ACTION" in
+post)
+	echo "Updating udev(7) hwdb.bin..."
+	usr/bin/udevadm hwdb --update || :
+
+	if [ -d usr/sbin -a ! -L usr/sbin ]; then
+		ln -s ../bin/udevd usr/sbin/udevd
+	fi
+	;;
+esac
diff --git a/srcpkgs/eudev/template b/srcpkgs/eudev/template
new file mode 100644
index 0000000..ed3d731
--- /dev/null
+++ b/srcpkgs/eudev/template
@@ -0,0 +1,54 @@
+# Template file for 'eudev'
+
+_UDEV_VERSION="243" # compatible udev version provided
+
+pkgname=eudev
+version=3.2.12
+revision=2
+build_style=gnu-configure
+configure_args="--enable-hwdb --enable-manpages"
+hostmakedepends="pkg-config gperf"
+makedepends="libblkid-devel libkmod-devel"
+checkdepends="xz tar perl"
+short_desc="Fork of systemd-udev (enhanced userland device daemon)"
+maintainer="Tracker_Friendly <jliwin98@pm.me>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/eudev-project/eudev"
+changelog="https://github.com/eudev-project/eudev/releases"
+distfiles="https://github.com/eudev-project/eudev/releases/download/v${version}/eudev-${version}.tar.gz"
+checksum=ccdd64ec3c381d3c3ed0e99d2e70d1f62988c7763de89ca7bdffafa5eacb9ad8
+conf_files="/etc/udev/udev.conf"
+
+if [ "$XBPS_ALLOW_CHROOT_BREAKOUT" ]; then
+	# requires unshare(2) which is not available in chroot
+	make_check=no
+fi
+
+post_install() {
+	rm -rf ${DESTDIR}/usr/lib/udev
+	mv "${DESTDIR}/etc/udev/hwdb.d" "${DESTDIR}/usr/lib/udev"
+	mkdir -p "${DESTDIR}/etc/dinit.d/"
+	mv "${FILESDIR}/udevd" "${DESTDIR}/etc/dinit.d/udevd"
+	mv "${FILESDIR}/udevd.sh" "${DESTDIR}/etc/dinit.d/udevd.sh"
+}
+
+eudev-libudev-devel_package() {
+	provides="libudev-devel-${_UDEV_VERSION}_${revision}"
+	depends="eudev-libudev>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove usr/share/pkgconfig
+	}
+}
+
+eudev-libudev_package() {
+	provides="libudev-${_UDEV_VERSION}_${revision}"
+	short_desc+=" - runtime library"
+	pkg_install() {
+		vmove "usr/lib/*.so.*"
+	}
+}
diff --git a/srcpkgs/evolution-desktop/INSTALL b/srcpkgs/evolution-desktop/INSTALL
index e1183ba..1f5e087 100644
--- a/srcpkgs/evolution-desktop/INSTALL
+++ b/srcpkgs/evolution-desktop/INSTALL
@@ -13,7 +13,7 @@ post)
         tty="$(cat /sys/class/tty/tty0/active | sed 's/.*\(.\)$/\1/')"
 	echo "chvt 5" >> /etc/rc.local
         chvt "$tty"
-	rm -rf /var/service/agetty-tty5
+	rm -rf /etc/dinit.d/boot.d/agetty-tty5
 	sed -i '/ctrl_interface_group=.*$/d' /etc/wpa_supplicant/wpa_supplicant.conf
 	if [ -d /etc/runit/runsvdir/default/wpa_supplicant ]; then
 	  :
diff --git a/srcpkgs/evolution-desktop/files/bin/Wayfire b/srcpkgs/evolution-desktop/files/bin/Wayfire
index aa3ec39..8b7f3f7 100755
--- a/srcpkgs/evolution-desktop/files/bin/Wayfire
+++ b/srcpkgs/evolution-desktop/files/bin/Wayfire
@@ -1,21 +1,22 @@
-if [[ -x ~/.config ]]; then
+#!/bin/sh
+if [ -e ~/.config ]; then
   :
 else
   mkdir ~/.config
 fi
-if [[ -x ~/.config/wayfire.ini ]]; then
+if [ -e ~/.config/wayfire.ini ]; then
   :
 else
   cp /usr/share/wayfire/wayfire.ini ~/.config/wayfire.ini
 fi
-if [[ -x ~/.config/wf-shell.ini ]]; then
+if [ -e ~/.config/wf-shell.ini ]; then
   :
 else
   cp /usr/share/wayfire/wf-shell.ini ~/.config/wf-shell.ini
 fi
-if [[ -x ~/.config/dconf ]]; then
+if [ -e ~/.config/dconf ]; then
   :
 else
   cp -r /usr/share/wayfire/dconf ~/.config/
 fi
-bash /bin/startsession 
+sh /bin/startsession
diff --git a/srcpkgs/evolution-desktop/files/bin/enabledesktop b/srcpkgs/evolution-desktop/files/bin/enabledesktop
index ab69b7e..c21a35e 100755
--- a/srcpkgs/evolution-desktop/files/bin/enabledesktop
+++ b/srcpkgs/evolution-desktop/files/bin/enabledesktop
@@ -8,14 +8,15 @@ help() {
 }
 
 if [[ "$1" = "" ]]; then
-  ln -s /etc/sv/greetd /etc/runit/runsvdir/default/greetd
+  drunner
+  ln -s /etc/dinit.d/greetd /etc/dinit.d/boot.d/greetd
   echo "Evolution-Desktop will now start at launch."
 elif [[ "$1" = "-h" ]]; then
   help
 elif [[ "$1" = "--help" ]]; then
   help
 elif [[ "$1" = "-r" ]]; then
-  rm -f /etc/runit/runsvdir/default/greetd
+  rm -f /etc/dinit.d/boot.d/greetd
   echo "Evolution-Desktop will no longer start at launch"
 else
   echo "Unregonised option. Use --help for help."
diff --git a/srcpkgs/evolution-desktop/files/bin/startsession b/srcpkgs/evolution-desktop/files/bin/startsession
index b8049a9..fe89e0a 100755
--- a/srcpkgs/evolution-desktop/files/bin/startsession
+++ b/srcpkgs/evolution-desktop/files/bin/startsession
@@ -1,15 +1,15 @@
-C#!/bin/bash
+#!/bin/sh
 
 # Session config
-export XDG_RUNTIME_DIR=/run/user/$(id -u)
-export XDG_SESSION_TYPE=wayland
-export XDG_SESSION_DESKTOP=wayfire
-export XDG_CURRENT_DESKTOP=wayfire
+XDG_RUNTIME_DIR=/run/user/$(id -u)
+XDG_SESSION_TYPE=wayland
+XDG_SESSION_DESKTOP=wayfire
+XDG_CURRENT_DESKTOP=wayfire
 
 # Wayland config
-export MOZ_ENABLE_WAYLAND=1
-export SDL_VIDEODRIVER=wayland
-export _JAVA_AWT_WM_NONREPARENTING=1
+MOZ_ENABLE_WAYLAND=1
+SDL_VIDEODRIVER=wayland
+_JAVA_AWT_WM_NONREPARENTING=1
 
 # Wayfire specific stuff
 CLUTTER_BACKEND=gdk 
diff --git a/srcpkgs/evolution-desktop/template b/srcpkgs/evolution-desktop/template
index 4be96b4..fc76bdc 100644
--- a/srcpkgs/evolution-desktop/template
+++ b/srcpkgs/evolution-desktop/template
@@ -1,6 +1,6 @@
 pkgname=evolution-desktop
 version=1.1
-revision=11
+revision=12
 build_style=meta
 maintainer="Tracker-Friendly <jliwin98@danwin1210.de>"
 short_desc="Desktop and Greeter for EvolutionOS"