diff --git a/etc/X11/xorg.conf.d/00-keyboard.conf b/etc/X11/xorg.conf.d/00-keyboard.conf
new file mode 100644
index 0000000..f4ac972
--- /dev/null
+++ b/etc/X11/xorg.conf.d/00-keyboard.conf
@@ -0,0 +1,10 @@
+# Written by systemd-localed(8), read by systemd-localed and Xorg. It's
+# probably wise not to edit this file manually. Use localectl(1) to
+# instruct systemd-localed to update it.
+Section "InputClass"
+        Identifier "system-keyboard"
+        MatchIsKeyboard "on"
+        Option "XkbLayout" "latam"
+        Option "XkbModel" "pc105"
+        Option "XkbOptions" "terminate:ctrl_alt_bksp"
+EndSection
diff --git a/etc/X11/xorg.conf.d/20-intel.conf b/etc/X11/xorg.conf.d/20-intel.conf
index 5001a26..70e73e7 100644
--- a/etc/X11/xorg.conf.d/20-intel.conf
+++ b/etc/X11/xorg.conf.d/20-intel.conf
@@ -1,12 +1,5 @@
-#Section "Device"
-#	Identifier  "Intel Graphics"
-#	Driver      "intel"
-#	Option	    "DRI"	"false"
-#EndSection
 Section "Device"
-	Identifier  "Intel Graphics"
-	Driver      "intel"
-	Option      "DRI" "3"
-	Option      "AccelMethod"  "sna" # fallback
-	Option      "TearFree" "true"
+  Identifier  "Intel Graphics"
+  Driver      "intel"
+  Option      "TearFree" "true"
 EndSection
diff --git a/etc/X11/xorg.conf.d/40-libinput.conf b/etc/X11/xorg.conf.d/40-libinput.conf
new file mode 100644
index 0000000..79e4aa7
--- /dev/null
+++ b/etc/X11/xorg.conf.d/40-libinput.conf
@@ -0,0 +1,7 @@
+Section "InputClass"
+        Identifier "libinput touchpad catchall"
+        MatchIsTouchpad "on"
+        MatchDevicePath "/dev/input/event*"
+        Driver "libinput"
+        Option "Tapping" "on"
+EndSection
diff --git a/etc/X11/xorg.conf.d/41-wired-mouse.conf b/etc/X11/xorg.conf.d/41-wired-mouse.conf
new file mode 100644
index 0000000..a00d9ab
--- /dev/null
+++ b/etc/X11/xorg.conf.d/41-wired-mouse.conf
@@ -0,0 +1,6 @@
+Section "InputClass"
+  Identifier "Wired Mouse"
+  MatchDriver "libinput"
+  MatchIsPointer "yes"
+  Option "AccelSpeed" "1.0"
+EndSection