diff --git a/main/nnd-s6-services/APKBUILD b/main/nnd-s6-services/APKBUILD
index cbf77c6..93fedcc 100644
--- a/main/nnd-s6-services/APKBUILD
+++ b/main/nnd-s6-services/APKBUILD
@@ -3,7 +3,7 @@
 . ../../APKBUILD.template
 
 pkgname=nnd-s6-services
-pkgver=1.16
+pkgver=1.17
 pkgrel=0
 pkgdesc="Base services for s6"
 depends="s6-rc s6-portable-utils s6-linux-utils"
diff --git a/main/nnd-s6-services/env/ceph/CONFIG b/main/nnd-s6-services/env/ceph/CONFIG
new file mode 100644
index 0000000..db90000
--- /dev/null
+++ b/main/nnd-s6-services/env/ceph/CONFIG
@@ -0,0 +1 @@
+/etc/ceph/ceph.conf
diff --git a/main/nnd-s6-services/env/sshd.1/SSHDCFG b/main/nnd-s6-services/env/sshd.1/SSHDCFG
new file mode 100644
index 0000000..d8ea5df
--- /dev/null
+++ b/main/nnd-s6-services/env/sshd.1/SSHDCFG
@@ -0,0 +1 @@
+/etc/ssh/sshd_config
diff --git a/main/nnd-s6-services/env/virtinterfaced/CONFIG b/main/nnd-s6-services/env/virtinterfaced/CONFIG
new file mode 100644
index 0000000..9a1a82d
--- /dev/null
+++ b/main/nnd-s6-services/env/virtinterfaced/CONFIG
@@ -0,0 +1 @@
+/etc/libvirt/virtinterfaced
diff --git a/main/nnd-s6-services/env/virtlockd/CONFIG b/main/nnd-s6-services/env/virtlockd/CONFIG
new file mode 100644
index 0000000..d5a9cfe
--- /dev/null
+++ b/main/nnd-s6-services/env/virtlockd/CONFIG
@@ -0,0 +1 @@
+/etc/libvirt/virtlockd
diff --git a/main/nnd-s6-services/env/virtlogd/CONFIG b/main/nnd-s6-services/env/virtlogd/CONFIG
new file mode 100644
index 0000000..ee21207
--- /dev/null
+++ b/main/nnd-s6-services/env/virtlogd/CONFIG
@@ -0,0 +1 @@
+/etc/libvirt/virtlogd
diff --git a/main/nnd-s6-services/env/virtnetworkd/CONFIG b/main/nnd-s6-services/env/virtnetworkd/CONFIG
new file mode 100644
index 0000000..10b74b2
--- /dev/null
+++ b/main/nnd-s6-services/env/virtnetworkd/CONFIG
@@ -0,0 +1 @@
+/etc/libvirt/virtnetworkd
diff --git a/main/nnd-s6-services/env/virtnodedevd/CONFIG b/main/nnd-s6-services/env/virtnodedevd/CONFIG
new file mode 100644
index 0000000..c83d5f9
--- /dev/null
+++ b/main/nnd-s6-services/env/virtnodedevd/CONFIG
@@ -0,0 +1 @@
+/etc/libvirt/virtnodedevd
diff --git a/main/nnd-s6-services/env/virtproxyd/CONFIG b/main/nnd-s6-services/env/virtproxyd/CONFIG
new file mode 100644
index 0000000..0484b7d
--- /dev/null
+++ b/main/nnd-s6-services/env/virtproxyd/CONFIG
@@ -0,0 +1 @@
+/etc/libvirt/virtproxyd
diff --git a/main/nnd-s6-services/env/virtqemud/CONFIG b/main/nnd-s6-services/env/virtqemud/CONFIG
new file mode 100644
index 0000000..9ba3aeb
--- /dev/null
+++ b/main/nnd-s6-services/env/virtqemud/CONFIG
@@ -0,0 +1 @@
+/etc/libvirt/virtqemud
diff --git a/main/nnd-s6-services/env/virtstoraged/CONFIG b/main/nnd-s6-services/env/virtstoraged/CONFIG
new file mode 100644
index 0000000..50f3539
--- /dev/null
+++ b/main/nnd-s6-services/env/virtstoraged/CONFIG
@@ -0,0 +1 @@
+/etc/libvirt/virtstoraged
diff --git a/main/nnd-s6-services/manage.sh b/main/nnd-s6-services/manage.sh
index a89bd4e..ffe4b7c 100755
--- a/main/nnd-s6-services/manage.sh
+++ b/main/nnd-s6-services/manage.sh
@@ -42,11 +42,9 @@ update() {
 }
 
 swap() {
-	if [ -d "$S6_SV_PATH/current.$DB_FRESH_NAC" ]; then
-		ln -sfn "current.$DB_FRESH_NAC" "$S6_SV_PATH/current" || ERR="$?" error "Failed to update A/B current symlink"
-	else
-		error "There's no database to switch to"
-	fi
+	[ -d "$S6_SV_PATH/current.$DB_FRESH_NAC" ] || error "There's no database to switch to"
+
+	ln -sfn "current.$DB_FRESH_NAC" "$S6_SV_PATH/current" || ERR="$?" error "Failed to update A/B current symlink"
 }
 
 dist() {
@@ -66,6 +64,13 @@ distdefs() {
 	done
 }
 
+custom() {
+	local SVC="$1"
+	[ -h "$S6_RC_PATH/$SVC" ] || error "Service $SVC is already a custom instance"
+	rm -rf "$S6_RC_PATH/$SVC"
+	cp -r "$S6_DIST_PATH/rc/$SVC" "$S6_RC_PATH/$SVC"
+}
+
 for act in $@; do
 	cstate
 	case "$act" in
diff --git a/main/nnd-s6-services/rc/bundle.desktop/type b/main/nnd-s6-services/rc/bundle.desktop/type
deleted file mode 100644
index 757b422..0000000
--- a/main/nnd-s6-services/rc/bundle.desktop/type
+++ /dev/null
@@ -1 +0,0 @@
-bundle
diff --git a/main/nnd-s6-services/rc/bundle.graphical.0/type b/main/nnd-s6-services/rc/bundle.graphical.0/type
deleted file mode 100644
index 757b422..0000000
--- a/main/nnd-s6-services/rc/bundle.graphical.0/type
+++ /dev/null
@@ -1 +0,0 @@
-bundle
diff --git a/main/nnd-s6-services/rc/bundle.desktop/contents.d/bundle.graphical.0 b/main/nnd-s6-services/rc/ceph.mds.0/flag-essential
similarity index 100%
rename from main/nnd-s6-services/rc/bundle.desktop/contents.d/bundle.graphical.0
rename to main/nnd-s6-services/rc/ceph.mds.0/flag-essential
diff --git a/main/nnd-s6-services/rc/ceph.mds.0/run b/main/nnd-s6-services/rc/ceph.mds.0/run
new file mode 100755
index 0000000..e997dd6
--- /dev/null
+++ b/main/nnd-s6-services/rc/ceph.mds.0/run
@@ -0,0 +1,15 @@
+#!/bin/execlineb -P
+define ID 0
+define DAEMON mds
+
+s6-envdir -i /etc/s6/env/path
+importas -i PATH PATH
+
+s6-envdir -i /etc/s6/env/ceph
+importas -i CONFIG CONFIG
+
+emptyenv
+
+export PATH $PATH
+
+exec ceph-${DAEMON} -d -i $ID -c $CONFIG
diff --git a/main/nnd-s6-services/rc/dwm.0/type b/main/nnd-s6-services/rc/ceph.mds.0/type
similarity index 100%
rename from main/nnd-s6-services/rc/dwm.0/type
rename to main/nnd-s6-services/rc/ceph.mds.0/type
diff --git a/main/nnd-s6-services/rc/bundle.graphical.0/contents.d/dwm.0 b/main/nnd-s6-services/rc/ceph.mgr.0/flag-essential
similarity index 100%
rename from main/nnd-s6-services/rc/bundle.graphical.0/contents.d/dwm.0
rename to main/nnd-s6-services/rc/ceph.mgr.0/flag-essential
diff --git a/main/nnd-s6-services/rc/ceph.mgr.0/run b/main/nnd-s6-services/rc/ceph.mgr.0/run
new file mode 100755
index 0000000..cabd1d8
--- /dev/null
+++ b/main/nnd-s6-services/rc/ceph.mgr.0/run
@@ -0,0 +1,15 @@
+#!/bin/execlineb -P
+define ID 0
+define DAEMON mgr
+
+s6-envdir -i /etc/s6/env/path
+importas -i PATH PATH
+
+s6-envdir -i /etc/s6/env/ceph
+importas -i CONFIG CONFIG
+
+emptyenv
+
+export PATH $PATH
+
+exec ceph-${DAEMON} -d -i $ID -c $CONFIG
diff --git a/main/nnd-s6-services/rc/logger.dwm/type b/main/nnd-s6-services/rc/ceph.mgr.0/type
similarity index 100%
rename from main/nnd-s6-services/rc/logger.dwm/type
rename to main/nnd-s6-services/rc/ceph.mgr.0/type
diff --git a/main/nnd-s6-services/rc/dwm.0/dependencies.d/xorg.0 b/main/nnd-s6-services/rc/ceph.mon.0/flag-essential
similarity index 100%
rename from main/nnd-s6-services/rc/dwm.0/dependencies.d/xorg.0
rename to main/nnd-s6-services/rc/ceph.mon.0/flag-essential
diff --git a/main/nnd-s6-services/rc/ceph.mon.0/run b/main/nnd-s6-services/rc/ceph.mon.0/run
new file mode 100755
index 0000000..cddcf4d
--- /dev/null
+++ b/main/nnd-s6-services/rc/ceph.mon.0/run
@@ -0,0 +1,15 @@
+#!/bin/execlineb -P
+define ID 0
+define DAEMON mon
+
+s6-envdir -i /etc/s6/env/path
+importas -i PATH PATH
+
+s6-envdir -i /etc/s6/env/ceph
+importas -i CONFIG CONFIG
+
+emptyenv
+
+export PATH $PATH
+
+exec ceph-${DAEMON} -d -i $ID -c $CONFIG
diff --git a/main/nnd-s6-services/rc/logger.udevd/type b/main/nnd-s6-services/rc/ceph.mon.0/type
similarity index 100%
rename from main/nnd-s6-services/rc/logger.udevd/type
rename to main/nnd-s6-services/rc/ceph.mon.0/type
diff --git a/main/nnd-s6-services/rc/logger.dwm/dependencies.d/dir.var-log b/main/nnd-s6-services/rc/ceph.osd.0.bluestore-primer/dependencies.d/mdevd.coldplug
similarity index 100%
rename from main/nnd-s6-services/rc/logger.dwm/dependencies.d/dir.var-log
rename to main/nnd-s6-services/rc/ceph.osd.0.bluestore-primer/dependencies.d/mdevd.coldplug
diff --git a/main/nnd-s6-services/rc/logger.udevd/dependencies.d/dir.var-log b/main/nnd-s6-services/rc/ceph.osd.0.bluestore-primer/dependencies.d/module.dm-mod
similarity index 100%
rename from main/nnd-s6-services/rc/logger.udevd/dependencies.d/dir.var-log
rename to main/nnd-s6-services/rc/ceph.osd.0.bluestore-primer/dependencies.d/module.dm-mod
diff --git a/main/nnd-s6-services/rc/logger.xorg/dependencies.d/dir.var-log b/main/nnd-s6-services/rc/ceph.osd.0.bluestore-primer/flag-essential
similarity index 100%
rename from main/nnd-s6-services/rc/logger.xorg/dependencies.d/dir.var-log
rename to main/nnd-s6-services/rc/ceph.osd.0.bluestore-primer/flag-essential
diff --git a/main/nnd-s6-services/rc/udevd.settle/type b/main/nnd-s6-services/rc/ceph.osd.0.bluestore-primer/type
similarity index 100%
rename from main/nnd-s6-services/rc/udevd.settle/type
rename to main/nnd-s6-services/rc/ceph.osd.0.bluestore-primer/type
diff --git a/main/nnd-s6-services/rc/ceph.osd.0.bluestore-primer/up b/main/nnd-s6-services/rc/ceph.osd.0.bluestore-primer/up
new file mode 100644
index 0000000..9054618
--- /dev/null
+++ b/main/nnd-s6-services/rc/ceph.osd.0.bluestore-primer/up
@@ -0,0 +1,17 @@
+#!/bin/execlineb -P
+define ID 0
+
+s6-envdir -i /etc/s6/env/path
+importas -i PATH PATH
+
+s6-envdir -i /etc/s6/env/ceph.osd.${ID}
+importas -i DEV DEV
+
+emptyenv
+
+export PATH $PATH
+
+fdclose 1
+fdclose 2
+
+exec ceph-bluestore-tool prime-osd-dir --dev $DEV --path /var/lib/ceph/osd/ceph-${ID} --no-mon-config
diff --git a/main/nnd-s6-services/rc/udevd.settle/dependencies.d/udevd.trigger b/main/nnd-s6-services/rc/ceph.osd.0/flag-essential
similarity index 100%
rename from main/nnd-s6-services/rc/udevd.settle/dependencies.d/udevd.trigger
rename to main/nnd-s6-services/rc/ceph.osd.0/flag-essential
diff --git a/main/nnd-s6-services/rc/ceph.osd.0/run b/main/nnd-s6-services/rc/ceph.osd.0/run
new file mode 100755
index 0000000..5ca71c6
--- /dev/null
+++ b/main/nnd-s6-services/rc/ceph.osd.0/run
@@ -0,0 +1,15 @@
+#!/bin/execlineb -P
+define ID 0
+define DAEMON osd
+
+s6-envdir -i /etc/s6/env/path
+importas -i PATH PATH
+
+s6-envdir -i /etc/s6/env/ceph
+importas -i CONFIG CONFIG
+
+emptyenv
+
+export PATH $PATH
+
+exec ceph-${DAEMON} -d -i $ID -c $CONFIG
diff --git a/main/nnd-s6-services/rc/logger.xorg/type b/main/nnd-s6-services/rc/ceph.osd.0/type
similarity index 100%
rename from main/nnd-s6-services/rc/logger.xorg/type
rename to main/nnd-s6-services/rc/ceph.osd.0/type
diff --git a/main/nnd-s6-services/rc/dir.var-empty/down b/main/nnd-s6-services/rc/dir.var-empty/down
index 60a012c..691a0bd 100644
--- a/main/nnd-s6-services/rc/dir.var-empty/down
+++ b/main/nnd-s6-services/rc/dir.var-empty/down
@@ -4,7 +4,7 @@ importas -i PATH PATH
 emptyenv
 
 export PATH $PATH
-# DO NOT LET DIR BE EMPTY, YOU HAVE BEEN WARNED
+# WARNING: DO NOT LET DIR BE EMPTY IN ANY CASE
 define DIR /var/empty
 
 fdclose 1
diff --git a/main/nnd-s6-services/rc/dir.var-lock/down b/main/nnd-s6-services/rc/dir.var-lock/down
index 60a012c..e07dae8 100644
--- a/main/nnd-s6-services/rc/dir.var-lock/down
+++ b/main/nnd-s6-services/rc/dir.var-lock/down
@@ -4,8 +4,8 @@ importas -i PATH PATH
 emptyenv
 
 export PATH $PATH
-# DO NOT LET DIR BE EMPTY, YOU HAVE BEEN WARNED
-define DIR /var/empty
+# WARNING: DO NOT LET DIR BE EMPTY IN ANY CASE
+define DIR /var/lock
 
 fdclose 1
 fdclose 2
diff --git a/main/nnd-s6-services/rc/dwm.0/producer-for b/main/nnd-s6-services/rc/dwm.0/producer-for
deleted file mode 100644
index 56fe5c3..0000000
--- a/main/nnd-s6-services/rc/dwm.0/producer-for
+++ /dev/null
@@ -1 +0,0 @@
-logger.dwm
diff --git a/main/nnd-s6-services/rc/dwm.0/run b/main/nnd-s6-services/rc/dwm.0/run
deleted file mode 100755
index 4bad6c1..0000000
--- a/main/nnd-s6-services/rc/dwm.0/run
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/path
-importas -i PATH PATH
-emptyenv
-
-export PATH $PATH
-export DISPLAY :0
-
-fdmove -c 2 1
-
-exec dwm
diff --git a/main/nnd-s6-services/rc/getty.tty1/run b/main/nnd-s6-services/rc/getty.tty1/run
index cc9b78b..3319fcb 100755
--- a/main/nnd-s6-services/rc/getty.tty1/run
+++ b/main/nnd-s6-services/rc/getty.tty1/run
@@ -1,12 +1,13 @@
 #!/bin/execlineb -P
+define TTY tty1
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
-s6-envdir -i /etc/s6/env/getty.tty1
+s6-envdir -i /etc/s6/env/getty.${TTY}
 importas -i BAUD BAUD
 emptyenv
 
 export PATH $PATH
-define TTY tty1
 
 fdclose 1
 fdclose 2
diff --git a/main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.4/down b/main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.4/down
index fd9a0cb..13007e3 100644
--- a/main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.4/down
+++ b/main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.4/down
@@ -1,12 +1,15 @@
 #!/bin/execlineb -P
+define INTERFACE wg-tunnel
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
-s6-envdir -i /etc/s6/env/interface.wg-tunnel.static.addr.4
+
+s6-envdir -i /etc/s6/env/interface.${INTERFACE}.static.addr.4
 importas -i ADDR ADDR
+
 emptyenv
 
 export PATH $PATH
-define INTERFACE wg-tunnel
 
 fdclose 1
 fdclose 2
diff --git a/main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.4/up b/main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.4/up
index fbfd7cc..30b4ffc 100644
--- a/main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.4/up
+++ b/main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.4/up
@@ -1,12 +1,15 @@
 #!/bin/execlineb -P
+define INTERFACE wg-tunnel
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
-s6-envdir -i /etc/s6/env/interface.wg-tunnel.static.addr.4
+
+s6-envdir -i /etc/s6/env/interface.${INTERFACE}.static.addr.4
 importas -i ADDR ADDR
+
 emptyenv
 
 export PATH $PATH
-define INTERFACE wg-tunnel
 
 fdclose 1
 fdclose 2
diff --git a/main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.6/down b/main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.6/down
index b60ce1e..8234621 100644
--- a/main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.6/down
+++ b/main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.6/down
@@ -1,12 +1,15 @@
 #!/bin/execlineb -P
+define INTERFACE wg-tunnel
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
-s6-envdir -i /etc/s6/env/interface.wg-tunnel.static.addr.6
+
+s6-envdir -i /etc/s6/env/interface.${INTERFACE}.static.addr.6
 importas -i ADDR ADDR
+
 emptyenv
 
 export PATH $PATH
-define INTERFACE wg-tunnel
 
 fdclose 1
 fdclose 2
diff --git a/main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.6/up b/main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.6/up
index 0fb2bd3..27afe27 100644
--- a/main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.6/up
+++ b/main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.6/up
@@ -1,12 +1,15 @@
 #!/bin/execlineb -P
+define INTERFACE wg-tunnel
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
-s6-envdir -i /etc/s6/env/interface.wg-tunnel.static.addr.6
+
+s6-envdir -i /etc/s6/env/interface.${INTERFACE}.static.addr.6
 importas -i ADDR ADDR
+
 emptyenv
 
 export PATH $PATH
-define INTERFACE wg-tunnel
 
 fdclose 1
 fdclose 2
diff --git a/main/nnd-s6-services/rc/interface.wg-tunnel.static.route.4/down b/main/nnd-s6-services/rc/interface.wg-tunnel.static.route.4/down
index a80c74a..7367fc1 100644
--- a/main/nnd-s6-services/rc/interface.wg-tunnel.static.route.4/down
+++ b/main/nnd-s6-services/rc/interface.wg-tunnel.static.route.4/down
@@ -1,12 +1,15 @@
 #!/bin/execlineb -P
+define INTERFACE wg-tunnel
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
-s6-envdir -i /etc/s6/env/interface.wg-tunnel.static.route.4
+
+s6-envdir -i /etc/s6/env/interface.${INTERFACE}.static.route.4
 importas -i ROUTE ROUTE
+
 emptyenv
 
 export PATH $PATH
-define INTERFACE wg-tunnel
 
 fdclose 1
 fdclose 2
diff --git a/main/nnd-s6-services/rc/interface.wg-tunnel.static.route.4/up b/main/nnd-s6-services/rc/interface.wg-tunnel.static.route.4/up
index a6cef1d..5395c86 100644
--- a/main/nnd-s6-services/rc/interface.wg-tunnel.static.route.4/up
+++ b/main/nnd-s6-services/rc/interface.wg-tunnel.static.route.4/up
@@ -1,12 +1,15 @@
 #!/bin/execlineb -P
+define INTERFACE wg-tunnel
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
-s6-envdir -i /etc/s6/env/interface.wg-tunnel.static.route.4
+
+s6-envdir -i /etc/s6/env/interface.${INTERFACE}.static.route.4
 importas -i ROUTE ROUTE
+
 emptyenv
 
 export PATH $PATH
-define INTERFACE wg-tunnel
 
 fdclose 1
 fdclose 2
diff --git a/main/nnd-s6-services/rc/interface.wg-tunnel.static.route.6/down b/main/nnd-s6-services/rc/interface.wg-tunnel.static.route.6/down
index d99e398..ab5501b 100644
--- a/main/nnd-s6-services/rc/interface.wg-tunnel.static.route.6/down
+++ b/main/nnd-s6-services/rc/interface.wg-tunnel.static.route.6/down
@@ -1,12 +1,15 @@
 #!/bin/execlineb -P
+define INTERFACE wg-tunnel
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
-s6-envdir -i /etc/s6/env/interface.wg-tunnel.static.route.6
+
+s6-envdir -i /etc/s6/env/interface.${INTERFACE}.static.route.6
 importas -i ROUTE ROUTE
+
 emptyenv
 
 export PATH $PATH
-define INTERFACE wg-tunnel
 
 fdclose 1
 fdclose 2
diff --git a/main/nnd-s6-services/rc/interface.wg-tunnel.static.route.6/up b/main/nnd-s6-services/rc/interface.wg-tunnel.static.route.6/up
index 9d57313..5f6552b 100644
--- a/main/nnd-s6-services/rc/interface.wg-tunnel.static.route.6/up
+++ b/main/nnd-s6-services/rc/interface.wg-tunnel.static.route.6/up
@@ -1,12 +1,15 @@
 #!/bin/execlineb -P
+define INTERFACE wg-tunnel
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
-s6-envdir -i /etc/s6/env/interface.wg-tunnel.static.route.6
+
+s6-envdir -i /etc/s6/env/interface.${INTERFACE}.static.route.6
 importas -i ROUTE ROUTE
+
 emptyenv
 
 export PATH $PATH
-define INTERFACE wg-tunnel
 
 fdclose 1
 fdclose 2
diff --git a/main/nnd-s6-services/rc/klogd/run b/main/nnd-s6-services/rc/klogd/run
index 17d8725..665ce62 100755
--- a/main/nnd-s6-services/rc/klogd/run
+++ b/main/nnd-s6-services/rc/klogd/run
@@ -6,4 +6,4 @@ emptyenv
 export PATH $PATH
 define READFROM /proc/kmsg
 
-redirfd -r 0 $READFROM ucspilogd
+redirfd -r 0 $READFROM exec ucspilogd
diff --git a/main/nnd-s6-services/rc/kmod.sysfs/up b/main/nnd-s6-services/rc/kmod.sysfs/up
index fc2044f..929acab 100644
--- a/main/nnd-s6-services/rc/kmod.sysfs/up
+++ b/main/nnd-s6-services/rc/kmod.sysfs/up
@@ -12,6 +12,6 @@ if -t {
 	pipeline {
 		pipeline {
 			exec find /sys -name modalias -type f -print0
-		} exec xargs -0 exec sort -u
-	} exec xargs exec modprobe -b -a -s
+		} exec xargs -0 sort -u
+	} exec xargs modprobe -b -a -s
 }
diff --git a/main/nnd-s6-services/rc/logger.dwm/consumer-for b/main/nnd-s6-services/rc/logger.dwm/consumer-for
deleted file mode 100644
index b131887..0000000
--- a/main/nnd-s6-services/rc/logger.dwm/consumer-for
+++ /dev/null
@@ -1 +0,0 @@
-dwm.0
diff --git a/main/nnd-s6-services/rc/logger.dwm/notification-fd b/main/nnd-s6-services/rc/logger.dwm/notification-fd
deleted file mode 100644
index 00750ed..0000000
--- a/main/nnd-s6-services/rc/logger.dwm/notification-fd
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/main/nnd-s6-services/rc/logger.dwm/run b/main/nnd-s6-services/rc/logger.dwm/run
deleted file mode 100755
index 938c575..0000000
--- a/main/nnd-s6-services/rc/logger.dwm/run
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/path
-importas -i PATH PATH
-s6-envdir /etc/s6/env/logger
-importas -i LOGPREFIX LOGPREFIX
-emptyenv
-
-export PATH $PATH
-define LOGGERNAME dwm
-define LOGSIZE 1000000
-define LOGARCHIVES 20
-
-s6-log -d3 -- t s${LOGSIZE} n${LOGARCHIVES} ${LOGPREFIX}/${LOGGERNAME}
diff --git a/main/nnd-s6-services/rc/logger.klogd/run b/main/nnd-s6-services/rc/logger.klogd/run
index d8c4522..7ac6577 100755
--- a/main/nnd-s6-services/rc/logger.klogd/run
+++ b/main/nnd-s6-services/rc/logger.klogd/run
@@ -1,17 +1,18 @@
 #!/bin/execlineb -P
+define LOGGERNAME klogd
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
 
 s6-envdir -i /etc/s6/env/logger
 importas -i LOGPREFIX LOGPREFIX
 
-s6-envdir -I /etc/s6/env/logger.klogd
+s6-envdir -I /etc/s6/env/logger.${LOGGERNAME}
 importas -i LOGSIZE LOGSIZE
 importas -i LOGARCHIVES LOGARCHIVES
 
 emptyenv
 
 export PATH $PATH
-define LOGGERNAME klogd
 
-s6-log -d3 -- t s${LOGSIZE} n${LOGARCHIVES} ${LOGPREFIX}/${LOGGERNAME}
+exec s6-log -d3 -- t s${LOGSIZE} n${LOGARCHIVES} ${LOGPREFIX}/${LOGGERNAME}
diff --git a/main/nnd-s6-services/rc/logger.mdevd/run b/main/nnd-s6-services/rc/logger.mdevd/run
index 522a6ab..9da745f 100755
--- a/main/nnd-s6-services/rc/logger.mdevd/run
+++ b/main/nnd-s6-services/rc/logger.mdevd/run
@@ -1,17 +1,18 @@
 #!/bin/execlineb -P
+define LOGGERNAME mdevd
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
 
 s6-envdir -i /etc/s6/env/logger
 importas -i LOGPREFIX LOGPREFIX
 
-s6-envdir -I /etc/s6/env/logger.mdevd
+s6-envdir -I /etc/s6/env/logger.${LOGGERNAME}
 importas -i LOGSIZE LOGSIZE
 importas -i LOGARCHIVES LOGARCHIVES
 
 emptyenv
 
 export PATH $PATH
-define LOGGERNAME mdevd
 
-s6-log -d3 -- t s${LOGSIZE} n${LOGARCHIVES} ${LOGPREFIX}/${LOGGERNAME}
+exec s6-log -d3 -- t s${LOGSIZE} n${LOGARCHIVES} ${LOGPREFIX}/${LOGGERNAME}
diff --git a/main/nnd-s6-services/rc/logger.ntpd/run b/main/nnd-s6-services/rc/logger.ntpd/run
index c46cb8e..b7f38db 100755
--- a/main/nnd-s6-services/rc/logger.ntpd/run
+++ b/main/nnd-s6-services/rc/logger.ntpd/run
@@ -1,17 +1,18 @@
 #!/bin/execlineb -P
+define LOGGERNAME ntpd
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
 
 s6-envdir -i /etc/s6/env/logger
 importas -i LOGPREFIX LOGPREFIX
 
-s6-envdir -I /etc/s6/env/logger.ntpd
+s6-envdir -I /etc/s6/env/logger.${LOGGERNAME}
 importas -i LOGSIZE LOGSIZE
 importas -i LOGARCHIVES LOGARCHIVES
 
 emptyenv
 
 export PATH $PATH
-define LOGGERNAME ntpd
 
-s6-log -d3 -- t s${LOGSIZE} n${LOGARCHIVES} ${LOGPREFIX}/${LOGGERNAME}
+exec s6-log -d3 -- t s${LOGSIZE} n${LOGARCHIVES} ${LOGPREFIX}/${LOGGERNAME}
diff --git a/main/nnd-s6-services/rc/logger.qemu-ga/run b/main/nnd-s6-services/rc/logger.qemu-ga/run
index 8800cff..d52d4c9 100755
--- a/main/nnd-s6-services/rc/logger.qemu-ga/run
+++ b/main/nnd-s6-services/rc/logger.qemu-ga/run
@@ -1,17 +1,18 @@
 #!/bin/execlineb -P
+define LOGGERNAME qemu-ga
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
 
 s6-envdir -i /etc/s6/env/logger
 importas -i LOGPREFIX LOGPREFIX
 
-s6-envdir -I /etc/s6/env/logger.qemu-ga
+s6-envdir -I /etc/s6/env/logger.${LOGGERNAME}
 importas -i LOGSIZE LOGSIZE
 importas -i LOGARCHIVES LOGARCHIVES
 
 emptyenv
 
 export PATH $PATH
-define LOGGERNAME qemu-ga
 
-s6-log -d3 -- t s${LOGSIZE} n${LOGARCHIVES} ${LOGPREFIX}/${LOGGERNAME}
+exec s6-log -d3 -- t s${LOGSIZE} n${LOGARCHIVES} ${LOGPREFIX}/${LOGGERNAME}
diff --git a/main/nnd-s6-services/rc/logger.sshd/run b/main/nnd-s6-services/rc/logger.sshd/run
index 06998e9..ebc500f 100755
--- a/main/nnd-s6-services/rc/logger.sshd/run
+++ b/main/nnd-s6-services/rc/logger.sshd/run
@@ -1,17 +1,18 @@
 #!/bin/execlineb -P
+define LOGGERNAME sshd
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
 
 s6-envdir -i /etc/s6/env/logger
 importas -i LOGPREFIX LOGPREFIX
 
-s6-envdir -I /etc/s6/env/logger.ntpd
+s6-envdir -I /etc/s6/env/logger.${LOGGERNAME}
 importas -i LOGSIZE LOGSIZE
 importas -i LOGARCHIVES LOGARCHIVES
 
 emptyenv
 
 export PATH $PATH
-define LOGGERNAME sshd
 
-s6-log -d3 -- t s${LOGSIZE} n${LOGARCHIVES} ${LOGPREFIX}/${LOGGERNAME}
+exec s6-log -d3 -- t s${LOGSIZE} n${LOGARCHIVES} ${LOGPREFIX}/${LOGGERNAME}
diff --git a/main/nnd-s6-services/rc/logger.syslogd/run b/main/nnd-s6-services/rc/logger.syslogd/run
index 18ddb71..f1e4270 100755
--- a/main/nnd-s6-services/rc/logger.syslogd/run
+++ b/main/nnd-s6-services/rc/logger.syslogd/run
@@ -1,17 +1,18 @@
 #!/bin/execlineb -P
+define LOGGERNAME syslogd
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
 
 s6-envdir -i /etc/s6/env/logger
 importas -i LOGPREFIX LOGPREFIX
 
-s6-envdir -I /etc/s6/env/logger.syslogd
+s6-envdir -I /etc/s6/env/logger.${LOGGERNAME}
 importas -i LOGSIZE LOGSIZE
 importas -i LOGARCHIVES LOGARCHIVES
 
 emptyenv
 
 export PATH $PATH
-define LOGGERNAME syslogd
 
-s6-log -d3 -- t s${LOGSIZE} n${LOGARCHIVES} ${LOGPREFIX}/${LOGGERNAME}
+exec s6-log -d3 -- t s${LOGSIZE} n${LOGARCHIVES} ${LOGPREFIX}/${LOGGERNAME}
diff --git a/main/nnd-s6-services/rc/logger.udevd/consumer-for b/main/nnd-s6-services/rc/logger.udevd/consumer-for
deleted file mode 100644
index 45bd63d..0000000
--- a/main/nnd-s6-services/rc/logger.udevd/consumer-for
+++ /dev/null
@@ -1 +0,0 @@
-udevd
diff --git a/main/nnd-s6-services/rc/logger.udevd/notification-fd b/main/nnd-s6-services/rc/logger.udevd/notification-fd
deleted file mode 100644
index 00750ed..0000000
--- a/main/nnd-s6-services/rc/logger.udevd/notification-fd
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/main/nnd-s6-services/rc/logger.udevd/run b/main/nnd-s6-services/rc/logger.udevd/run
deleted file mode 100755
index 375ffa3..0000000
--- a/main/nnd-s6-services/rc/logger.udevd/run
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/path
-importas -i PATH PATH
-s6-envdir /etc/s6/env/logger
-importas -i LOGPREFIX LOGPREFIX
-emptyenv
-
-export PATH $PATH
-define LOGGERNAME udevd
-define LOGSIZE 1000000
-define LOGARCHIVES 20
-
-s6-log -d3 -- t s${LOGSIZE} n${LOGARCHIVES} ${LOGPREFIX}/${LOGGERNAME}
diff --git a/main/nnd-s6-services/rc/logger.udhcpc/run b/main/nnd-s6-services/rc/logger.udhcpc/run
index 858f47b..4abfdd6 100755
--- a/main/nnd-s6-services/rc/logger.udhcpc/run
+++ b/main/nnd-s6-services/rc/logger.udhcpc/run
@@ -1,17 +1,18 @@
 #!/bin/execlineb -P
+define LOGGERNAME udhcpc
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
 
 s6-envdir -i /etc/s6/env/logger
 importas -i LOGPREFIX LOGPREFIX
 
-s6-envdir -I /etc/s6/env/logger.udhcpc
+s6-envdir -I /etc/s6/env/logger.${LOGGERNAME}
 importas -i LOGSIZE LOGSIZE
 importas -i LOGARCHIVES LOGARCHIVES
 
 emptyenv
 
 export PATH $PATH
-define LOGGERNAME udhcpc
 
-s6-log -d3 -- t s${LOGSIZE} n${LOGARCHIVES} ${LOGPREFIX}/${LOGGERNAME}
+exec s6-log -d3 -- t s${LOGSIZE} n${LOGARCHIVES} ${LOGPREFIX}/${LOGGERNAME}
diff --git a/main/nnd-s6-services/rc/logger.xorg/consumer-for b/main/nnd-s6-services/rc/logger.xorg/consumer-for
deleted file mode 100644
index 30f55d9..0000000
--- a/main/nnd-s6-services/rc/logger.xorg/consumer-for
+++ /dev/null
@@ -1 +0,0 @@
-xorg.0
diff --git a/main/nnd-s6-services/rc/logger.xorg/notification-fd b/main/nnd-s6-services/rc/logger.xorg/notification-fd
deleted file mode 100644
index 00750ed..0000000
--- a/main/nnd-s6-services/rc/logger.xorg/notification-fd
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/main/nnd-s6-services/rc/logger.xorg/run b/main/nnd-s6-services/rc/logger.xorg/run
deleted file mode 100755
index f72d636..0000000
--- a/main/nnd-s6-services/rc/logger.xorg/run
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/path
-importas -i PATH PATH
-s6-envdir /etc/s6/env/logger
-importas -i LOGPREFIX LOGPREFIX
-emptyenv
-
-export PATH $PATH
-define LOGGERNAME xorg
-define LOGSIZE 1000000
-define LOGARCHIVES 20
-
-s6-log -d3 -- t s${LOGSIZE} n${LOGARCHIVES} ${LOGPREFIX}/${LOGGERNAME}
diff --git a/main/nnd-s6-services/rc/mdevd/run b/main/nnd-s6-services/rc/mdevd/run
index 06d6976..024138d 100755
--- a/main/nnd-s6-services/rc/mdevd/run
+++ b/main/nnd-s6-services/rc/mdevd/run
@@ -10,4 +10,4 @@ emptyenv
 export PATH $PATH
 define NOTIFYFD 3
 
-mdevd -D $NOTIFYFD -b $KBUFSZ
+exec mdevd -D $NOTIFYFD -b $KBUFSZ
diff --git a/main/nnd-s6-services/rc/module.apparmor/down b/main/nnd-s6-services/rc/module.apparmor/down
index ef08d9f..5253f71 100644
--- a/main/nnd-s6-services/rc/module.apparmor/down
+++ b/main/nnd-s6-services/rc/module.apparmor/down
@@ -9,4 +9,4 @@ define MODULE apparmor
 fdclose 1
 fdclose 2
 
-exec rmmod ${MODULE}
+exec rmmod $MODULE
diff --git a/main/nnd-s6-services/rc/module.bridge/down b/main/nnd-s6-services/rc/module.bridge/down
index ad9ac2b..1c4ce49 100644
--- a/main/nnd-s6-services/rc/module.bridge/down
+++ b/main/nnd-s6-services/rc/module.bridge/down
@@ -9,4 +9,4 @@ define MODULE bridge
 fdclose 1
 fdclose 2
 
-exec rmmod ${MODULE}
+exec rmmod $MODULE
diff --git a/main/nnd-s6-services/rc/module.bridge/up b/main/nnd-s6-services/rc/module.bridge/up
index 0dcbd55..17317f1 100644
--- a/main/nnd-s6-services/rc/module.bridge/up
+++ b/main/nnd-s6-services/rc/module.bridge/up
@@ -9,4 +9,4 @@ define MODULE bridge
 fdclose 1
 fdclose 2
 
-exec modprobe ${MODULE}
+exec modprobe $MODULE
diff --git a/main/nnd-s6-services/rc/module.dm-mod/down b/main/nnd-s6-services/rc/module.dm-mod/down
index 134c796..5d16d66 100644
--- a/main/nnd-s6-services/rc/module.dm-mod/down
+++ b/main/nnd-s6-services/rc/module.dm-mod/down
@@ -9,4 +9,4 @@ define MODULE dm-mod
 fdclose 1
 fdclose 2
 
-exec rmmod ${MODULE}
+exec rmmod $MODULE
diff --git a/main/nnd-s6-services/rc/module.fuse/down b/main/nnd-s6-services/rc/module.fuse/down
index 77a6493..70d7c57 100644
--- a/main/nnd-s6-services/rc/module.fuse/down
+++ b/main/nnd-s6-services/rc/module.fuse/down
@@ -9,4 +9,4 @@ define MODULE fuse
 fdclose 1
 fdclose 2
 
-exec rmmod ${MODULE}
+exec rmmod $MODULE
diff --git a/main/nnd-s6-services/rc/module.ipv6/down b/main/nnd-s6-services/rc/module.ipv6/down
index a1a2fdf..76f26f4 100644
--- a/main/nnd-s6-services/rc/module.ipv6/down
+++ b/main/nnd-s6-services/rc/module.ipv6/down
@@ -9,4 +9,4 @@ define MODULE ipv6
 fdclose 1
 fdclose 2
 
-exec rmmod ${MODULE}
+exec rmmod $MODULE
diff --git a/main/nnd-s6-services/rc/module.ipv6/up b/main/nnd-s6-services/rc/module.ipv6/up
index 20a25aa..80c6106 100644
--- a/main/nnd-s6-services/rc/module.ipv6/up
+++ b/main/nnd-s6-services/rc/module.ipv6/up
@@ -9,4 +9,4 @@ define MODULE ipv6
 fdclose 1
 fdclose 2
 
-exec modprobe ${MODULE}
+exec modprobe $MODULE
diff --git a/main/nnd-s6-services/rc/module.kvm/down b/main/nnd-s6-services/rc/module.kvm/down
index e1e307d..f114da0 100644
--- a/main/nnd-s6-services/rc/module.kvm/down
+++ b/main/nnd-s6-services/rc/module.kvm/down
@@ -9,4 +9,4 @@ define MODULE kvm
 fdclose 1
 fdclose 2
 
-exec rmmod ${MODULE}
+exec rmmod $MODULE
diff --git a/main/nnd-s6-services/rc/module.tun/down b/main/nnd-s6-services/rc/module.tun/down
index 523c6e7..1c621c4 100644
--- a/main/nnd-s6-services/rc/module.tun/down
+++ b/main/nnd-s6-services/rc/module.tun/down
@@ -9,4 +9,4 @@ define MODULE tun
 fdclose 1
 fdclose 2
 
-exec rmmod ${MODULE}
+exec rmmod $MODULE
diff --git a/main/nnd-s6-services/rc/module.wireguard/down b/main/nnd-s6-services/rc/module.wireguard/down
index d78c3b4..c9cec27 100644
--- a/main/nnd-s6-services/rc/module.wireguard/down
+++ b/main/nnd-s6-services/rc/module.wireguard/down
@@ -9,4 +9,4 @@ define MODULE wireguard
 fdclose 1
 fdclose 2
 
-exec rmmod ${MODULE}
+exec rmmod $MODULE
diff --git a/main/nnd-s6-services/rc/mount.boot-efi/up b/main/nnd-s6-services/rc/mount.boot-efi/up
index 8f1f750..d4d1510 100644
--- a/main/nnd-s6-services/rc/mount.boot-efi/up
+++ b/main/nnd-s6-services/rc/mount.boot-efi/up
@@ -1,14 +1,18 @@
 #!/bin/execlineb -P
+define DEST /boot/efi
+define CLEANDEST boot-efi
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
-s6-envdir -i /etc/s6/env/mount.boot-efi
+
+s6-envdir -i /etc/s6/env/mount.${CLEANDEST}
 importas -i SRC SRC
 importas -i FSTYPE FSTYPE
 importas -i OPTS OPTS
+
 emptyenv
 
 export PATH $PATH
-define DEST /boot/efi
 
 fdclose 1
 fdclose 2
diff --git a/main/nnd-s6-services/rc/mount.boot/up b/main/nnd-s6-services/rc/mount.boot/up
index d0617b4..b08332d 100644
--- a/main/nnd-s6-services/rc/mount.boot/up
+++ b/main/nnd-s6-services/rc/mount.boot/up
@@ -1,14 +1,18 @@
 #!/bin/execlineb -P
+define DEST /boot
+define CLEANDEST boot
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
-s6-envdir -i /etc/s6/env/mount.boot
+
+s6-envdir -i /etc/s6/env/mount.${CLEANDEST}
 importas -i SRC SRC
 importas -i FSTYPE FSTYPE
 importas -i OPTS OPTS
+
 emptyenv
 
 export PATH $PATH
-define DEST /boot
 
 fdclose 1
 fdclose 2
diff --git a/main/nnd-s6-services/rc/mount.dev-cgroup/up b/main/nnd-s6-services/rc/mount.dev-cgroup/up
index dad4199..0adbaf9 100644
--- a/main/nnd-s6-services/rc/mount.dev-cgroup/up
+++ b/main/nnd-s6-services/rc/mount.dev-cgroup/up
@@ -1,13 +1,17 @@
 #!/bin/execlineb -P
+define DEST /dev/cgroup
+define CLEANDEST dev-cgroup
+define FSTYPE cgroup
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
-s6-envdir -i /etc/s6/env/mount.dev-cgroup
+
+s6-envdir -i /etc/s6/env/mount.${CLEANDEST}
 importas -i OPTS OPTS
+
 emptyenv
 
 export PATH $PATH
-define DEST /dev/cgroup
-define FSTYPE cgroup
 
 fdclose 1
 fdclose 2
diff --git a/main/nnd-s6-services/rc/mount.dev-hugepages/up b/main/nnd-s6-services/rc/mount.dev-hugepages/up
index 99a9dfb..8c2da5e 100644
--- a/main/nnd-s6-services/rc/mount.dev-hugepages/up
+++ b/main/nnd-s6-services/rc/mount.dev-hugepages/up
@@ -1,13 +1,17 @@
 #!/bin/execlineb -P
+define DEST /dev/hugepages
+define CLEANDEST dev-hugepages
+define FSTYPE hugetlbfs
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
-s6-envdir -i /etc/s6/env/mount.dev-hugepages
+
+s6-envdir -i /etc/s6/env/mount.${CLEANDEST}
 importas -i OPTS OPTS
+
 emptyenv
 
 export PATH $PATH
-define DEST /dev/hugepages
-define FSTYPE hugetlbfs
 
 fdclose 1
 fdclose 2
diff --git a/main/nnd-s6-services/rc/mount.dev-mqueue/up b/main/nnd-s6-services/rc/mount.dev-mqueue/up
index 606cbc5..14e8a93 100644
--- a/main/nnd-s6-services/rc/mount.dev-mqueue/up
+++ b/main/nnd-s6-services/rc/mount.dev-mqueue/up
@@ -1,13 +1,17 @@
 #!/bin/execlineb -P
+define DEST /dev/mqueue
+define CLEANDEST dev-mqueue
+define FSTYPE mqueue
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
-s6-envdir -i /etc/s6/env/mount.dev-mqueue
+
+s6-envdir -i /etc/s6/env/mount.${CLEANDEST}
 importas -i OPTS OPTS
+
 emptyenv
 
 export PATH $PATH
-define DEST /dev/mqueue
-define FSTYPE mqueue
 
 fdclose 1
 fdclose 2
diff --git a/main/nnd-s6-services/rc/mount.dev-pts/up b/main/nnd-s6-services/rc/mount.dev-pts/up
index c5d75b2..12e392b 100644
--- a/main/nnd-s6-services/rc/mount.dev-pts/up
+++ b/main/nnd-s6-services/rc/mount.dev-pts/up
@@ -1,17 +1,22 @@
 #!/bin/execlineb -P
+define DEST /dev/pts
+define CLEANDEST dev-pts
+define FSTYPE devpts
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
-s6-envdir -i /etc/s6/env/mount.dev-pts
+
+s6-envdir -i /etc/s6/env/mount.${CLEANDEST}
 importas -i OPTS OPTS
+
 emptyenv
 
 export PATH $PATH
-define DEST /dev/pts
-define FSTYPE devpts
 
 fdclose 1
 fdclose 2
 
+# TODO: Handle PTS being potentially mounted ahead of service execution (initrd)
 foreground {
 	foreground {
 		exec mkdir -p $DEST
diff --git a/main/nnd-s6-services/rc/mount.dev-shm/up b/main/nnd-s6-services/rc/mount.dev-shm/up
index 360aba9..8811148 100644
--- a/main/nnd-s6-services/rc/mount.dev-shm/up
+++ b/main/nnd-s6-services/rc/mount.dev-shm/up
@@ -1,13 +1,17 @@
 #!/bin/execlineb -P
+define DEST /dev/shm
+define CLEANDEST dev-shm
+define FSTYPE shm
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
-s6-envdir -i /etc/s6/env/mount.dev-shm
+
+s6-envdir -i /etc/s6/env/mount.${CLEANDEST}
 importas -i OPTS OPTS
+
 emptyenv
 
 export PATH $PATH
-define DEST /dev/shm
-define FSTYPE shm
 
 fdclose 1
 fdclose 2
diff --git a/main/nnd-s6-services/rc/mount.dev/up b/main/nnd-s6-services/rc/mount.dev/up
index ae086e6..5c8e641 100644
--- a/main/nnd-s6-services/rc/mount.dev/up
+++ b/main/nnd-s6-services/rc/mount.dev/up
@@ -1,17 +1,22 @@
 #!/bin/execlineb -P
+define DEST /dev
+define CLEANDEST dev
+define FSTYPE devtmpfs
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
-s6-envdir -i /etc/s6/env/mount.dev
+
+s6-envdir -i /etc/s6/env/mount.${CLEANDEST}
 importas -i OPTS OPTS
+
 emptyenv
 
 export PATH $PATH
-define DEST /dev
-define FSTYPE devtmpfs
 
 fdclose 1
 fdclose 2
 
+# TODO: Handle devtmpfs being potentially mounted ahead of service execution (initrd)
 foreground {
 	foreground {
 		exec mkdir -p $DEST
diff --git a/main/nnd-s6-services/rc/mount.proc/up b/main/nnd-s6-services/rc/mount.proc/up
index ed95d91..92d9a11 100644
--- a/main/nnd-s6-services/rc/mount.proc/up
+++ b/main/nnd-s6-services/rc/mount.proc/up
@@ -1,17 +1,22 @@
 #!/bin/execlineb -P
+define DEST /proc
+define CLEANDEST proc
+define FSTYPE procfs
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
-s6-envdir -i /etc/s6/env/mount.proc
+
+s6-envdir -i /etc/s6/env/mount.${CLEANDEST}
 importas -i OPTS OPTS
+
 emptyenv
 
 export PATH $PATH
-define DEST /proc
-define FSTYPE procfs
 
 fdclose 1
 fdclose 2
 
+# TODO: Handle procfs being potentially mounted ahead of service execution (initrd)
 foreground {
 	foreground {
 		exec mkdir -p $DEST
diff --git a/main/nnd-s6-services/rc/mount.root/down b/main/nnd-s6-services/rc/mount.root/down
index e798d26..575f76a 100644
--- a/main/nnd-s6-services/rc/mount.root/down
+++ b/main/nnd-s6-services/rc/mount.root/down
@@ -5,8 +5,9 @@ emptyenv
 
 export PATH $PATH
 define DEST /
+define OPTS remount,ro
 
 fdclose 1
 fdclose 2
 
-exec mount -o remount,ro none $DEST
+exec mount -o $OPTS none $DEST
diff --git a/main/nnd-s6-services/rc/mount.run/up b/main/nnd-s6-services/rc/mount.run/up
index 34a5903..3c73aca 100644
--- a/main/nnd-s6-services/rc/mount.run/up
+++ b/main/nnd-s6-services/rc/mount.run/up
@@ -1,17 +1,22 @@
 #!/bin/execlineb -P
+define DEST /run
+define CLEANDEST run
+define FSTYPE tmpfs
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
-s6-envdir -i /etc/s6/env/mount.run
+
+s6-envdir -i /etc/s6/env/mount.${CLEANDEST}
 importas -i OPTS OPTS
+
 emptyenv
 
 export PATH $PATH
-define DEST /run
-define FSTYPE tmpfs
 
 fdclose 1
 fdclose 2
 
+# TODO: Handle tmpfs being potentially mounted ahead of service execution (initrd)
 foreground {
 	foreground {
 		exec mkdir -p $DEST
diff --git a/main/nnd-s6-services/rc/mount.sys-firmware-efi-efivars/up b/main/nnd-s6-services/rc/mount.sys-firmware-efi-efivars/up
index 17d9c43..fe07f4f 100644
--- a/main/nnd-s6-services/rc/mount.sys-firmware-efi-efivars/up
+++ b/main/nnd-s6-services/rc/mount.sys-firmware-efi-efivars/up
@@ -1,21 +1,21 @@
 #!/bin/execlineb -P
+define DEST /sys/firmware/efi/efivars
+define CLEANDEST sys-firmware-efi-efivars
+define FSTYPE efivarfs
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
-s6-envdir -i /etc/s6/env/mount.sys-firmware-efi-efivars
+
+s6-envdir -i /etc/s6/env/mount.${CLEANDEST}
 importas -i OPTS OPTS
+
 emptyenv
 
 export PATH $PATH
-define DEST /sys/firmware/efi/efivars
-define FSTYPE efivarfs
 
 fdclose 1
 fdclose 2
 
 foreground {
-	foreground {
-		exec mkdir -p $DEST
-	} exec mount -t $FSTYPE -o $OPTS none $DEST
-} if -nt {
-	importas status ? test $status -eq 1
-}
+	exec mkdir -p $DEST
+} exec mount -t $FSTYPE -o $OPTS none $DEST
diff --git a/main/nnd-s6-services/rc/mount.sys-fs-pstore/up b/main/nnd-s6-services/rc/mount.sys-fs-pstore/up
index e523286..c4a783a 100644
--- a/main/nnd-s6-services/rc/mount.sys-fs-pstore/up
+++ b/main/nnd-s6-services/rc/mount.sys-fs-pstore/up
@@ -1,21 +1,21 @@
 #!/bin/execlineb -P
+define DEST /sys/fs/pstore
+define CLEANDEST sys-fs-pstore
+define FSTYPE pstore
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
-s6-envdir -i /etc/s6/env/mount.sys-fs-pstore
+
+s6-envdir -i /etc/s6/env/mount.${CLEANDEST}
 importas -i OPTS OPTS
+
 emptyenv
 
 export PATH $PATH
-define DEST /sys/fs/pstore
-define FSTYPE pstore
 
 fdclose 1
 fdclose 2
 
 foreground {
-	foreground {
-		exec mkdir -p $DEST
-	} exec mount -t $FSTYPE -o $OPTS none $DEST
-} if -nt {
-	importas status ? test $status -eq 1
-}
+	exec mkdir -p $DEST
+} exec mount -t $FSTYPE -o $OPTS none $DEST
diff --git a/main/nnd-s6-services/rc/mount.sys-kernel-security/up b/main/nnd-s6-services/rc/mount.sys-kernel-security/up
index d40db34..4d73a3c 100644
--- a/main/nnd-s6-services/rc/mount.sys-kernel-security/up
+++ b/main/nnd-s6-services/rc/mount.sys-kernel-security/up
@@ -1,21 +1,21 @@
 #!/bin/execlineb -P
+define DEST /sys/kernel/security
+define CLEANDEST sys-kernel-security
+define FSTYPE securityfs
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
-s6-envdir -i /etc/s6/env/mount.sys-kernel-security
+
+s6-envdir -i /etc/s6/env/mount.${CLEANDEST}
 importas -i OPTS OPTS
+
 emptyenv
 
 export PATH $PATH
-define DEST /sys/kernel/security
-define FSTYPE securityfs
 
 fdclose 1
 fdclose 2
 
 foreground {
-	foreground {
-		exec mkdir -p $DEST
-	} exec mount -t $FSTYPE -o $OPTS none $DEST
-} if -nt {
-	importas status ? test $status -eq 1
-}
+	exec mkdir -p $DEST
+} exec mount -t $FSTYPE -o $OPTS none $DEST
diff --git a/main/nnd-s6-services/rc/mount.sys/up b/main/nnd-s6-services/rc/mount.sys/up
index 7013fc3..80f7c9c 100644
--- a/main/nnd-s6-services/rc/mount.sys/up
+++ b/main/nnd-s6-services/rc/mount.sys/up
@@ -1,17 +1,22 @@
 #!/bin/execlineb -P
+define DEST /sys
+define CLEANDEST sys
+define FSTYPE sysfs
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
-s6-envdir -i /etc/s6/env/mount.sys
+
+s6-envdir -i /etc/s6/env/mount.${CLEANDEST}
 importas -i OPTS OPTS
+
 emptyenv
 
 export PATH $PATH
-define DEST /sys
-define FSTYPE sysfs
 
 fdclose 1
 fdclose 2
 
+# TODO: Handle sysfs being potentially mounted ahead of service execution (initrd)
 foreground {
 	foreground {
 		exec mkdir -p $DEST
diff --git a/main/nnd-s6-services/rc/mount.tmp/up b/main/nnd-s6-services/rc/mount.tmp/up
index 9ae65a6..b8f8fee 100644
--- a/main/nnd-s6-services/rc/mount.tmp/up
+++ b/main/nnd-s6-services/rc/mount.tmp/up
@@ -1,17 +1,22 @@
 #!/bin/execlineb -P
+define DEST /tmp
+define CLEANDEST tmp
+define FSTYPE tmpfs
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
-s6-envdir -i /etc/s6/env/mount.tmp
+
+s6-envdir -i /etc/s6/env/mount.${CLEANDEST}
 importas -i OPTS OPTS
+
 emptyenv
 
 export PATH $PATH
-define DEST /tmp
-define FSTYPE tmpfs
 
 fdclose 1
 fdclose 2
 
+# TODO: Handle tmpfs being potentially mounted ahead of service execution (initrd)
 foreground {
 	foreground {
 		exec mkdir -p $DEST
diff --git a/main/nnd-s6-services/rc/nftables/up b/main/nnd-s6-services/rc/nftables/up
index 6d39029..62ffac5 100644
--- a/main/nnd-s6-services/rc/nftables/up
+++ b/main/nnd-s6-services/rc/nftables/up
@@ -1,9 +1,11 @@
 #!/bin/execlineb -P
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
+
 s6-envdir -i /etc/s6/env/nftables
 importas -i RULESET RULESET
 importas -i RULEDIR RULEDIR
+
 emptyenv
 
 export PATH $PATH
diff --git a/main/nnd-s6-services/rc/ntpd.1/run b/main/nnd-s6-services/rc/ntpd.1/run
index 3d9d664..6d5e355 100755
--- a/main/nnd-s6-services/rc/ntpd.1/run
+++ b/main/nnd-s6-services/rc/ntpd.1/run
@@ -1,8 +1,10 @@
 #!/bin/execlineb -P
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
+
 s6-envdir -i /etc/s6/env/ntpd.1
 importas -i NTPS NTPS
+
 emptyenv
 
 export PATH $PATH
diff --git a/main/nnd-s6-services/rc/qemu-ga/run b/main/nnd-s6-services/rc/qemu-ga/run
index 91c7792..c61c80b 100755
--- a/main/nnd-s6-services/rc/qemu-ga/run
+++ b/main/nnd-s6-services/rc/qemu-ga/run
@@ -7,4 +7,4 @@ export PATH $PATH
 define METHOD virtio-serial
 define COMMPATH /dev/virtio-ports/org.qemu.guest_agent.0
 
-qemu-ga --method $METHOD --path $COMMPATH -r
+exec qemu-ga --method $METHOD --path $COMMPATH -r
diff --git a/main/nnd-s6-services/rc/radvd/run b/main/nnd-s6-services/rc/radvd/run
index fc23082..a3d2ea7 100755
--- a/main/nnd-s6-services/rc/radvd/run
+++ b/main/nnd-s6-services/rc/radvd/run
@@ -9,4 +9,4 @@ emptyenv
 
 export PATH $PATH
 
-radvd -n -m syslog -C $CONFIG
+exec radvd -n -m syslog -C $CONFIG
diff --git a/main/nnd-s6-services/rc/sshd.1/run b/main/nnd-s6-services/rc/sshd.1/run
index 3625a34..da91628 100755
--- a/main/nnd-s6-services/rc/sshd.1/run
+++ b/main/nnd-s6-services/rc/sshd.1/run
@@ -1,13 +1,16 @@
 #!/bin/execlineb -P
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
+
+s6-envdir -i /etc/s6/env/sshd.1
+importas -i SSHDCFG SSHDCFG
+
 emptyenv
 
 export PATH $PATH
-define SSHDCFG /etc/ssh/sshd_config
 
 fdmove -c 2 1
 
 # NOTE: SSHD forks itself and requires the full path
 #       - i don't think this is really a concern that should be forced onto users
-exec /usr/sbin/sshd -D -e -f ${SSHDCFG}
+/usr/sbin/sshd -D -e -f ${SSHDCFG}
diff --git a/main/nnd-s6-services/rc/sys.kernel-mm-ksm-run/up b/main/nnd-s6-services/rc/sys.kernel-mm-ksm-run/up
index 3707cea..6e86528 100644
--- a/main/nnd-s6-services/rc/sys.kernel-mm-ksm-run/up
+++ b/main/nnd-s6-services/rc/sys.kernel-mm-ksm-run/up
@@ -1,14 +1,18 @@
 #!/bin/execlineb -P
+define FPATH kernel/mm/ksm/run
+define CLEANPATH kernel-mm-ksm-run
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
-s6-envdir -i /etc/s6/env/sys.kernel-mm-ksm-run
+
+s6-envdir -i /etc/s6/env/sys.${CLEANPATH}
 importas -i VAL VAL
+
 emptyenv
 
 export PATH $PATH
-define FPATH /sys/kernel/mm/ksm/run
 
 fdclose 1
 fdclose 2
 
-redirfd -w 1 $FPATH echo $VAL
+redirfd -w 1 /sys/${FPATH} echo $VAL
diff --git a/main/nnd-s6-services/rc/sys.kernel-mm-transparent_hugepage-enabled/up b/main/nnd-s6-services/rc/sys.kernel-mm-transparent_hugepage-enabled/up
index 324f88c..2e04d65 100644
--- a/main/nnd-s6-services/rc/sys.kernel-mm-transparent_hugepage-enabled/up
+++ b/main/nnd-s6-services/rc/sys.kernel-mm-transparent_hugepage-enabled/up
@@ -1,14 +1,18 @@
 #!/bin/execlineb -P
+define FPATH kernel/mm/transparent_hugepage/enabled
+define CLEANPATH kernel-mm-transparent_hugepage-enabled
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
-s6-envdir -i /etc/s6/env/sys.kernel-mm-transparent_hugepage-enabled
+
+s6-envdir -i /etc/s6/env/sys.${CLEANPATH}
 importas -i VAL VAL
+
 emptyenv
 
 export PATH $PATH
-define FPATH /sys/kernel/mm/transparent_hugepage/enabled
 
 fdclose 1
 fdclose 2
 
-redirfd -w 1 $FPATH echo $VAL
+redirfd -w 1 /sys/${FPATH} echo $VAL
diff --git a/main/nnd-s6-services/rc/sysctl.vm-nr_hugepages/up b/main/nnd-s6-services/rc/sysctl.vm-nr_hugepages/up
index a2a49ce..5ce54df 100644
--- a/main/nnd-s6-services/rc/sysctl.vm-nr_hugepages/up
+++ b/main/nnd-s6-services/rc/sysctl.vm-nr_hugepages/up
@@ -1,12 +1,16 @@
 #!/bin/execlineb -P
+define SYSCTL vm/nr_hugepages
+define CLEANPATH vm-nr_hugepages
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
-s6-envdir -i /etc/s6/env/sysctl.vm-nr_hugepages
+
+s6-envdir -i /etc/s6/env/sysctl.${CLEANPATH}
 importas -i VAL VAL
+
 emptyenv
 
 export PATH $PATH
-define SYSCTL vm/nr_hugepages
 
 fdclose 1
 fdclose 2
diff --git a/main/nnd-s6-services/rc/syslogd/run b/main/nnd-s6-services/rc/syslogd/run
index fb934ab..c5c5570 100755
--- a/main/nnd-s6-services/rc/syslogd/run
+++ b/main/nnd-s6-services/rc/syslogd/run
@@ -8,4 +8,4 @@ export PATH $PATH
 define RUNAS nobody
 
 s6-envuidgid ${RUNAS}
-s6-socklog -d3 -U -t3000
+exec s6-socklog -d3 -U -t3000
diff --git a/main/nnd-s6-services/rc/udevd.settle/up b/main/nnd-s6-services/rc/udevd.settle/up
deleted file mode 100644
index 5e15468..0000000
--- a/main/nnd-s6-services/rc/udevd.settle/up
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/path
-importas -i PATH PATH
-emptyenv
-
-export PATH $PATH
-
-fdclose 1
-fdclose 2
-
-exec udevadm settle
diff --git a/main/nnd-s6-services/rc/udevd.trigger/dependencies.d/udevd b/main/nnd-s6-services/rc/udevd.trigger/dependencies.d/udevd
deleted file mode 100644
index e69de29..0000000
diff --git a/main/nnd-s6-services/rc/udevd.trigger/type b/main/nnd-s6-services/rc/udevd.trigger/type
deleted file mode 100644
index bdd22a1..0000000
--- a/main/nnd-s6-services/rc/udevd.trigger/type
+++ /dev/null
@@ -1 +0,0 @@
-oneshot
diff --git a/main/nnd-s6-services/rc/udevd.trigger/up b/main/nnd-s6-services/rc/udevd.trigger/up
deleted file mode 100644
index cf1f157..0000000
--- a/main/nnd-s6-services/rc/udevd.trigger/up
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/path
-importas -i PATH PATH
-emptyenv
-
-export PATH $PATH
-
-fdclose 1
-fdclose 2
-
-foreground { exec udevadm trigger --action=add --type=subsystems }
-foreground { exec udevadm trigger --action=add --type=devices }
diff --git a/main/nnd-s6-services/rc/udevd/dependencies.d/mount.dev b/main/nnd-s6-services/rc/udevd/dependencies.d/mount.dev
deleted file mode 100644
index e69de29..0000000
diff --git a/main/nnd-s6-services/rc/udevd/dependencies.d/mount.sys b/main/nnd-s6-services/rc/udevd/dependencies.d/mount.sys
deleted file mode 100644
index e69de29..0000000
diff --git a/main/nnd-s6-services/rc/udevd/producer-for b/main/nnd-s6-services/rc/udevd/producer-for
deleted file mode 100644
index 6de4699..0000000
--- a/main/nnd-s6-services/rc/udevd/producer-for
+++ /dev/null
@@ -1 +0,0 @@
-logger.udevd
diff --git a/main/nnd-s6-services/rc/udevd/run b/main/nnd-s6-services/rc/udevd/run
deleted file mode 100755
index f76f85e..0000000
--- a/main/nnd-s6-services/rc/udevd/run
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/path
-importas -i PATH PATH
-emptyenv
-
-export PATH $PATH
-
-fdmove -c 2 1
-
-exec udevd
diff --git a/main/nnd-s6-services/rc/udevd/type b/main/nnd-s6-services/rc/udevd/type
deleted file mode 100644
index 5883cff..0000000
--- a/main/nnd-s6-services/rc/udevd/type
+++ /dev/null
@@ -1 +0,0 @@
-longrun
diff --git a/main/nnd-s6-services/rc/udhcpc.br0/run b/main/nnd-s6-services/rc/udhcpc.br0/run
index 3d9f5c4..e54fa7c 100755
--- a/main/nnd-s6-services/rc/udhcpc.br0/run
+++ b/main/nnd-s6-services/rc/udhcpc.br0/run
@@ -1,10 +1,11 @@
 #!/bin/execlineb -P
+define INTERFACE br0
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
 emptyenv
 
 export PATH $PATH
-define INTERFACE br0
 
 fdmove -c 2 1
 
diff --git a/main/nnd-s6-services/rc/user.sshd/up b/main/nnd-s6-services/rc/user.sshd/up
index 63095e4..5bdca09 100644
--- a/main/nnd-s6-services/rc/user.sshd/up
+++ b/main/nnd-s6-services/rc/user.sshd/up
@@ -10,6 +10,7 @@ define USER sshd
 fdclose 1
 fdclose 2
 
+# TODO: Handle user already being present
 foreground {
 	exec adduser -s $SHELL -H -D $USER
 } if -nt {
diff --git a/main/nnd-s6-services/rc/utmpd/run b/main/nnd-s6-services/rc/utmpd/run
index 33d9860..3a9c9df 100755
--- a/main/nnd-s6-services/rc/utmpd/run
+++ b/main/nnd-s6-services/rc/utmpd/run
@@ -6,6 +6,7 @@ emptyenv
 export PATH $PATH
 define SOCKET /run/utmps/.utmpd-socket
 
+# TODO: This is ugly and needs fixes
 foreground { touch /var/log/wtmp }
 foreground { chmod 644 /var/log/wtmp }
 foreground { mkdir -p /run/utmps }
@@ -13,4 +14,4 @@ foreground { touch /run/utmps/utmp }
 foreground { chmod 755 /run/utmps }
 foreground { chmod 644 /run/utmps/utmp }
 
-s6-ipcserver /run/utmps/.utmpd-socket utmps-utmpd
+exec s6-ipcserver /run/utmps/.utmpd-socket utmps-utmpd
diff --git a/main/nnd-s6-services/rc/virtinterfaced/run b/main/nnd-s6-services/rc/virtinterfaced/run
index c3d0267..13343b2 100755
--- a/main/nnd-s6-services/rc/virtinterfaced/run
+++ b/main/nnd-s6-services/rc/virtinterfaced/run
@@ -1,13 +1,17 @@
 #!/bin/execlineb -P
+define SERVICE interface
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
+
+s6-envdir -i /etc/s6/env/virt${SERVICE}d
+importas -i CONFIG CONFIG
+
 emptyenv
 
 export PATH $PATH
-define SERVICE interface
-define CONFIG /etc/libvirt/virt${SERVICE}d.conf
 
 fdclose 1
 fdclose 2
 
-virt${SERVICE}d
+exec virt${SERVICE}d
diff --git a/main/nnd-s6-services/rc/virtlockd/run b/main/nnd-s6-services/rc/virtlockd/run
index e7d1c2c..b55e0e0 100755
--- a/main/nnd-s6-services/rc/virtlockd/run
+++ b/main/nnd-s6-services/rc/virtlockd/run
@@ -1,13 +1,17 @@
 #!/bin/execlineb -P
+define SERVICE lock
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
+
+s6-envdir -i /etc/s6/env/virt${SERVICE}d
+importas -i CONFIG CONFIG
+
 emptyenv
 
 export PATH $PATH
-define SERVICE lock
-define CONFIG /etc/libvirt/virt${SERVICE}d.conf
 
 fdclose 1
 fdclose 2
 
-virt${SERVICE}d
+exec virt${SERVICE}d
diff --git a/main/nnd-s6-services/rc/virtlogd/run b/main/nnd-s6-services/rc/virtlogd/run
index d9b3e37..803e8a9 100755
--- a/main/nnd-s6-services/rc/virtlogd/run
+++ b/main/nnd-s6-services/rc/virtlogd/run
@@ -1,13 +1,17 @@
 #!/bin/execlineb -P
+define SERVICE log
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
+
+s6-envdir -i /etc/s6/env/virt${SERVICE}d
+importas -i CONFIG CONFIG
+
 emptyenv
 
 export PATH $PATH
-define SERVICE log
-define CONFIG /etc/libvirt/virt${SERVICE}d.conf
 
 fdclose 1
 fdclose 2
 
-virt${SERVICE}d
+exec virt${SERVICE}d
diff --git a/main/nnd-s6-services/rc/virtlxcd/run b/main/nnd-s6-services/rc/virtlxcd/run
index ba1b9eb..3bba303 100755
--- a/main/nnd-s6-services/rc/virtlxcd/run
+++ b/main/nnd-s6-services/rc/virtlxcd/run
@@ -1,13 +1,17 @@
 #!/bin/execlineb -P
+define SERVICE lxc
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
+
+s6-envdir -i /etc/s6/env/virt${SERVICE}d
+importas -i CONFIG CONFIG
+
 emptyenv
 
 export PATH $PATH
-define SERVICE lxc
-define CONFIG /etc/libvirt/virt${SERVICE}d.conf
 
 fdclose 1
 fdclose 2
 
-virt${SERVICE}d
+exec virt${SERVICE}d
diff --git a/main/nnd-s6-services/rc/virtnetworkd/run b/main/nnd-s6-services/rc/virtnetworkd/run
index 5677105..84dd5dd 100755
--- a/main/nnd-s6-services/rc/virtnetworkd/run
+++ b/main/nnd-s6-services/rc/virtnetworkd/run
@@ -1,13 +1,17 @@
 #!/bin/execlineb -P
+define SERVICE network
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
+
+s6-envdir -i /etc/s6/env/virt${SERVICE}d
+importas -i CONFIG CONFIG
+
 emptyenv
 
 export PATH $PATH
-define SERVICE network
-define CONFIG /etc/libvirt/virt${SERVICE}d.conf
 
 fdclose 1
 fdclose 2
 
-virt${SERVICE}d
+exec virt${SERVICE}d
diff --git a/main/nnd-s6-services/rc/virtnodedevd/run b/main/nnd-s6-services/rc/virtnodedevd/run
index 7555910..1654fe7 100755
--- a/main/nnd-s6-services/rc/virtnodedevd/run
+++ b/main/nnd-s6-services/rc/virtnodedevd/run
@@ -1,13 +1,17 @@
 #!/bin/execlineb -P
+define SERVICE nodedev
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
+
+s6-envdir -i /etc/s6/env/virt${SERVICE}d
+importas -i CONFIG CONFIG
+
 emptyenv
 
 export PATH $PATH
-define SERVICE nodedev
-define CONFIG /etc/libvirt/virt${SERVICE}d.conf
 
 fdclose 1
 fdclose 2
 
-virt${SERVICE}d
+exec virt${SERVICE}d
diff --git a/main/nnd-s6-services/rc/virtproxyd/run b/main/nnd-s6-services/rc/virtproxyd/run
index 919bf12..9d29f6f 100755
--- a/main/nnd-s6-services/rc/virtproxyd/run
+++ b/main/nnd-s6-services/rc/virtproxyd/run
@@ -1,13 +1,17 @@
 #!/bin/execlineb -P
+define SERVICE proxy
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
+
+s6-envdir -i /etc/s6/env/virt${SERVICE}d
+importas -i CONFIG CONFIG
+
 emptyenv
 
 export PATH $PATH
-define SERVICE proxy
-define CONFIG /etc/libvirt/virt${SERVICE}d.conf
 
 fdclose 1
 fdclose 2
 
-virt${SERVICE}d
+exec virt${SERVICE}d
diff --git a/main/nnd-s6-services/rc/virtqemud/run b/main/nnd-s6-services/rc/virtqemud/run
index f47ecb6..6f55d98 100755
--- a/main/nnd-s6-services/rc/virtqemud/run
+++ b/main/nnd-s6-services/rc/virtqemud/run
@@ -1,13 +1,17 @@
 #!/bin/execlineb -P
+define SERVICE qemu
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
+
+s6-envdir -i /etc/s6/env/virt${SERVICE}d
+importas -i CONFIG CONFIG
+
 emptyenv
 
 export PATH $PATH
-define SERVICE qemu
-define CONFIG /etc/libvirt/virt${SERVICE}d.conf
 
 fdclose 1
 fdclose 2
 
-virt${SERVICE}d
+exec virt${SERVICE}d
diff --git a/main/nnd-s6-services/rc/virtstoraged/run b/main/nnd-s6-services/rc/virtstoraged/run
index 5b31ffc..c3625db 100755
--- a/main/nnd-s6-services/rc/virtstoraged/run
+++ b/main/nnd-s6-services/rc/virtstoraged/run
@@ -1,13 +1,17 @@
 #!/bin/execlineb -P
+define SERVICE storage
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
+
+s6-envdir -i /etc/s6/env/virt${SERVICE}d
+importas -i CONFIG CONFIG
+
 emptyenv
 
 export PATH $PATH
-define SERVICE storage
-define CONFIG /etc/libvirt/virt${SERVICE}d.conf
 
 fdclose 1
 fdclose 2
 
-virt${SERVICE}d
+exec virt${SERVICE}d
diff --git a/main/nnd-s6-services/rc/wg-config.wg-tunnel/up b/main/nnd-s6-services/rc/wg-config.wg-tunnel/up
index 8d3d0ad..051b646 100644
--- a/main/nnd-s6-services/rc/wg-config.wg-tunnel/up
+++ b/main/nnd-s6-services/rc/wg-config.wg-tunnel/up
@@ -1,12 +1,15 @@
 #!/bin/execlineb -P
+define INTERFACE wg-tunnel
+
 s6-envdir -i /etc/s6/env/path
 importas -i PATH PATH
-s6-envdir -i /etc/s6/env/wg-config.wg-tunnel
+
+s6-envdir -i /etc/s6/env/wg-config.${INTERFACE}
 importas -i CONFIG CONFIG
+
 emptyenv
 
 export PATH $PATH
-define INTERFACE wg-tunnel
 
 fdclose 1
 fdclose 2
diff --git a/main/nnd-s6-services/rc/xorg.0/dependencies.d/udevd.settle b/main/nnd-s6-services/rc/xorg.0/dependencies.d/udevd.settle
deleted file mode 100644
index e69de29..0000000
diff --git a/main/nnd-s6-services/rc/xorg.0/notification-fd b/main/nnd-s6-services/rc/xorg.0/notification-fd
deleted file mode 100644
index 00750ed..0000000
--- a/main/nnd-s6-services/rc/xorg.0/notification-fd
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/main/nnd-s6-services/rc/xorg.0/producer-for b/main/nnd-s6-services/rc/xorg.0/producer-for
deleted file mode 100644
index 96d5f4b..0000000
--- a/main/nnd-s6-services/rc/xorg.0/producer-for
+++ /dev/null
@@ -1 +0,0 @@
-logger.xorg
diff --git a/main/nnd-s6-services/rc/xorg.0/run b/main/nnd-s6-services/rc/xorg.0/run
deleted file mode 100755
index 49febb0..0000000
--- a/main/nnd-s6-services/rc/xorg.0/run
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/path
-importas -i PATH PATH
-emptyenv
-
-export PATH $PATH
-define DISPLAY :0
-define VTN 2
-
-fdmove -c 2 1
-
-exec Xorg ${DISPLAY} -displayfd 3 -noreset -nolisten tcp -verbose 10 vt${VTN}
diff --git a/main/nnd-s6-services/rc/xorg.0/type b/main/nnd-s6-services/rc/xorg.0/type
deleted file mode 100644
index 5883cff..0000000
--- a/main/nnd-s6-services/rc/xorg.0/type
+++ /dev/null
@@ -1 +0,0 @@
-longrun