diff --git a/lain/.config/systemd/user/xmodmap@.service b/lain/.config/systemd/user/xmodmap@.service
new file mode 100644
index 0000000..4ef26cf
--- /dev/null
+++ b/lain/.config/systemd/user/xmodmap@.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=Merge user xmodmap on x11 display %i
+Documentation=man:xmodmap(1)
+After=x11@%i.target
+Requisite=x11@%i.target
+
+[Service]
+Environment=DISPLAY=:%i
+
+Type=oneshot
+ExecStart=-/usr/bin/env xmodmap %E/X11/modmap
+SyslogIdentifier=xmodmap
+
+[Install]
+WantedBy=x11@%i.target
diff --git a/lain/.config/systemd/user/xresources@.service b/lain/.config/systemd/user/xresources@.service
new file mode 100644
index 0000000..2b8c9e7
--- /dev/null
+++ b/lain/.config/systemd/user/xresources@.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=Merge user xrdb on x11 display %i
+Documentation=man:xrdb(1)
+Before=x11@%i.target
+Requisite=x11@%i.target
+
+[Service]
+Environment=DISPLAY=:%i
+
+Type=oneshot
+ExecStart=/usr/bin/env flock %t/x11-xrdb@%i -c 'xrdb -merge %E/X11/resources'
+SyslogIdentifier=xrdb
+
+[Install]
+WantedBy=x11@%i.target
diff --git a/packages.yml b/packages.yml
index 3368dbe..f076659 100644
--- a/packages.yml
+++ b/packages.yml
@@ -2,6 +2,10 @@ Base:
   - fish
   - systemd:
       source: none
+      user-units:
+        - i3@0
+        - xmodmap@0
+        - xresources@0
 
 Terminal:
   - alacritty