diff --git a/xinitrc b/xinitrc
index 7957ac0..4c9e327 100644
--- a/xinitrc
+++ b/xinitrc
@@ -3,10 +3,22 @@
 [ -f ~/.Xresources ] && xrdb -merge .Xresources
 xsetroot -cursor_name left_ptr
 
-#xbindkeys
-#xmodmap ~/.Xmodmap
-#nm-applet &
-#discord &
-#slack &
+HOSTNAME=$(hostname)
+
 compton &
-exec i3
+#com.discordapp.Discord &
+#com.slack.Slack &
+if [ "$HOSTNAME" = cabinet ]; then
+    if [ -d /etc/X11/xinit/xinitrc.d ]; then
+        for f in /etc/X11/xinit/xinitrc.d/*; do
+            [ -x "$f" ] && . "$f"
+        done
+        unset f
+    exec $STARTUP i3
+    fi
+else
+    xbindkeys
+    xmodmap ~/.Xmodmap
+    nm-applet &
+    exec i3
+fi
diff --git a/zshrc b/zshrc
index 264981f..e0cd966 100644
--- a/zshrc
+++ b/zshrc
@@ -34,6 +34,7 @@ if [ -f /etc/os-release ]; then
 fi
 
 # GPG/SSH
+## Void: Install pcsclite, pcsc-ccid, gnupg2-scdaemon
 unset SSH_AGENT_PID
 if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then
   export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"