diff --git a/roles/desktop/files/portage/make.conf b/roles/desktop/files/portage/make.conf
index 912f17e..cadc0e4 100644
--- a/roles/desktop/files/portage/make.conf
+++ b/roles/desktop/files/portage/make.conf
@@ -25,6 +25,7 @@ ACCEPT_LICENSE="*"
 EMERGE_DEFAULT_OPTS="--jobs 10 --tree --keep-going"
 FEATURES="-network-sandbox"
 GENTOO_MIRRORS="http://distfiles.gentoo.org"
+INPUT_DEVICES="libinput"
 VIDEO_CARDS="amdgpu i915 intel qxl radeon"
 
 # Package configuration
diff --git a/roles/desktop/files/portage/package.use/x11-base b/roles/desktop/files/portage/package.use/x11-base
new file mode 100644
index 0000000..61b2494
--- /dev/null
+++ b/roles/desktop/files/portage/package.use/x11-base
@@ -0,0 +1 @@
+x11-base/xorg-server xephyr
diff --git a/roles/desktop/files/portage/sets/ansible b/roles/desktop/files/portage/sets/ansible
index 50bcb26..23d8cfe 100644
--- a/roles/desktop/files/portage/sets/ansible
+++ b/roles/desktop/files/portage/sets/ansible
@@ -82,6 +82,8 @@ app-admin/conky
 media-sound/pavucontrol-qt
 
 x11-apps/xbacklight
+x11-base/xorg-drivers
+x11-base/xorg-server
 x11-misc/dunst
 x11-misc/lightdm
 x11-misc/lightdm-gtk-greeter