diff --git a/.config/X11/xmodmap b/.config/X11/xmodmap
index d19a1af..559625d 100644
--- a/.config/X11/xmodmap
+++ b/.config/X11/xmodmap
@@ -1,9 +1,3 @@
-! Make unmodified Caps_Lock Esc, but keep regular Caps behaviour on Shift +
-! Caps_Lock
-remove Lock = Caps_Lock
-keycode 66 =
-keycode 66 = Escape Caps_Lock
-
 ! Do not double assign less and greater on the key right of Shift_L on an ISO
 ! layout
 keycode 94 = grave asciitilde
diff --git a/etc/X11/xorg.conf.d/90-keyboard-layout.conf b/etc/X11/xorg.conf.d/90-keyboard-layout.conf
new file mode 100644
index 0000000..585b274
--- /dev/null
+++ b/etc/X11/xorg.conf.d/90-keyboard-layout.conf
@@ -0,0 +1,10 @@
+# vim: ft=xf86conf
+
+Section "InputClass"
+	Identifier "system-keyboard"
+	MatchIsKeyboard "on"
+	Option "XkbLayout" "us"
+	Option "XkbModel" "pc105"
+	Option "XkbVariant" "alt-intl-unicode"
+	Option "XkbOptions" "caps:swapescape"
+EndSection