diff --git a/manual-build/create-initramfs.sh b/manual-build/create-initramfs.sh
index 1c494ab..fabbd53 100755
--- a/manual-build/create-initramfs.sh
+++ b/manual-build/create-initramfs.sh
@@ -182,7 +182,7 @@ cp "${search_path}"/systemd-pcrphase.service "${targetdir}"
 cp "${search_path}"/systemd-poweroff.service "${targetdir}"
 cp "${search_path}"/systemd-pstore.service "${targetdir}" # ?
 cp "${search_path}"/systemd-random-seed.service "${targetdir}" # ?
-cp "${search_path}"/systemd-rebbot.service "${targetdir}"
+cp "${search_path}"/systemd-reboot.service "${targetdir}"
 cp "${search_path}"/systemd-remount-fs.service "${targetdir}"
 cp "${search_path}"/systemd-repart.service "${targetdir}"
 cp "${search_path}"/systemd-resolved.service "${targetdir}" # ?
@@ -249,6 +249,37 @@ ln -s ../systemd-battery-check.service "${targetdir}"/systemd-battery-check.serv
 ln -s ../systemd-bsod.service "${targetdir}"/systemd-bsod.service
 ln -s ../systemd-pcrphase-initrd.service "${targetdir}"/systemd-pcrphase-initrd.service
 
+targetdir="${buildroot}/usr/lib/systemd/system/sysinit.target.wants"
+mkdir -p "${targetdir}"
+
+ln -s ../kmod-static-nodes.service "${targetdir}"/kmod-static-nodes.service
+ln -s ../ldconfig.service "${targetdir}"/ldconfig.service
+ln -s ../systemd-binfmt.service "${targetdir}"/systemd-binfmt.service
+ln -s ../systemd-boot-random-seed.service "${targetdir}"/systemd-boot-random-seed.service
+ln -s ../systemd-firstboot.service "${targetdir}"/systemd-firstboot.service
+ln -s ../systemd-hwdb-update.service "${targetdir}"/systemd-hwdb-update.service
+ln -s ../systemd-journal-catalog-update.service "${targetdir}"/systemd-journal-catalog-update.service
+ln -s ../systemd-journald.service "${targetdir}"/systemd-journald.service
+ln -s ../systemd-journal-flush.service "${targetdir}"/systemd-journal-flush.service
+ln -s ../systemd-machine-id-commit.service "${targetdir}"/systemd-machine-id-commit.service
+ln -s ../systemd-modules-load.service "${targetdir}"/systemd-modules-load.service
+ln -s ../systemd-pcrmachine.service "${targetdir}"/systemd-pcrmachine.service
+ln -s ../systemd-pcrphase.service "${targetdir}"/systemd-pcrphase.service
+ln -s ../systemd-pcrphase-sysinit.service "${targetdir}"/systemd-pcrphase-sysinit.service
+ln -s ../systemd-random-seed.service "${targetdir}"/systemd-random-seed.service
+ln -s ../systemd-repart.service "${targetdir}"/systemd-repart.service
+ln -s ../systemd-sysctl.service "${targetdir}"/systemd-sysctl.service
+ln -s ../systemd-sysusers.service "${targetdir}"/systemd-sysusers.service
+ln -s ../systemd-tmpfiles-setup-dev-early.service "${targetdir}"/systemd-tmpfiles-setup-dev-early.service
+ln -s ../systemd-tmpfiles-setup-dev.service "${targetdir}"/systemd-tmpfiles-setup-dev.service
+ln -s ../systemd-tmpfiles-setup.service "${targetdir}"/systemd-tmpfiles-setup.service
+ln -s ../systemd-tpm2-setup-early.service "${targetdir}"/systemd-tpm2-setup-early.service
+ln -s ../systemd-tpm2-setup.service "${targetdir}"/systemd-tpm2-setup.service
+ln -s ../systemd-udevd.service "${targetdir}"/systemd-udevd.service
+ln -s ../systemd-udev-trigger.service "${targetdir}"/systemd-udev-trigger.service
+ln -s ../systemd-update-done.service "${targetdir}"/systemd-update-done.service
+ln -s ../systemd-update-utmp.service "${targetdir}"/systemd-update-utmp.service
+
 # Copy Mounts
 
 echo "Copy Mounts..."
@@ -257,6 +288,14 @@ targetdir="${buildroot}/usr/lib/systemd/system/"
 
 cp "${search_path}"/tmp.mount "${targetdir}"
 cp "${search_path}"/var-lib-machines.mount "${targetdir}"
+cp "${search_path}"/dev-hugepages.mount "${targetdir}"
+cp "${search_path}"/dev-mqueue.mount "${targetdir}"
+cp "${search_path}"/proc-sys-fs-binfmt_misc.mount "${targetdir}"
+cp "${search_path}"/proc-sys-fs-binfmt_misc.automount "${targetdir}"
+cp "${search_path}"/sys-fs-fuse-connections.mount "${targetdir}"
+cp "${search_path}"/sys-kernel-config.mount "${targetdir}"
+cp "${search_path}"/sys-kernel-debug.mount "${targetdir}"
+cp "${search_path}"/sys-kernel-tracing.mount "${targetdir}"
 
 # Link Mounts
 
@@ -272,6 +311,17 @@ mkdir -p "${targetdir}"
 
 ln -s ../var-lib-machines.mount "${targetdir}"/var-lib-machines.mount
 
+targetdir="${buildroot}/usr/lib/systemd/system/sysinit.target.wants"
+mkdir -p "${targetdir}"
+
+ln -s ../dev-hugepages.mount "${targetdir}"/dev-hugepages.mount
+ln -s ../dev-mqueue.mount "${targetdir}"/dev-mqueue.mount
+ln -s ../proc-sys-fs-binfmt_misc.automount "${targetdir}"/proc-sys-fs-binfmt_misc.automount
+ln -s ../sys-fs-fuse-connections.mount "${targetdir}"/sys-fs-fuse-connections.mount
+ln -s ../sys-kernel-config.mount "${targetdir}"/sys-kernel-config.mount
+ln -s ../sys-kernel-debug.mount "${targetdir}"/sys-kernel-debug.mount
+ln -s ../sys-kernel-tracing.mount "${targetdir}"/sys-kernel-tracing.mount
+
 # Copy Sockets
 
 echo "Copy Sockets..."
@@ -300,6 +350,41 @@ ln -s ../dm-event.socket "${targetdir}"/dm-event.socket
 ln -s ../systemd-coredump.socket "${targetdir}"/systemd-coredump.socket
 ln -s ../systemd-journald-dev-log.socket "${targetdir}"/systemd-journald-dev-log.socket
 
+# Copy Paths
+
+echo "Copy Paths..."
+
+targetdir="${buildroot}/usr/lib/systemd/system/"
+
+cp "${search_path}"/systemd-ask-password-console.path "${targetdir}"
+cp "${search_path}"/systemd-ask-password-wall.path "${targetdir}"
+
+# Link Paths
+
+echo "Link Paths..."
+
+targetdir="${buildroot}/usr/lib/systemd/system/sysinit.target.wants"
+mkdir -p "${targetdir}"
+
+ln -s ../systemd-ask-password-console.path "${targetdir}"/systemd-ask-password-console.path
+
+# Copy Times
+
+echo "Copy Timers..."
+
+targetdir="${buildroot}/usr/lib/systemd/system/"
+
+cp "${search_path}"/systemd-tmpfiles-clean.timer "${targetdir}"
+
+# Link Timers
+
+echo "Link Timers..."
+
+targetdir="${buildroot}/usr/lib/systemd/system/timers.target.wants"
+mkdir -p "${targetdir}"
+
+ld -s ../systemd-tmpfiles-clean.timer "${targetdir}"/systemd-tmpfiles-clean.timer
+
 # Copy Generators
 
 echo "Copy Generators..."