diff --git a/Makefile.defs b/Makefile.defs
index 4e1718c..151929d 100644
--- a/Makefile.defs
+++ b/Makefile.defs
@@ -216,7 +216,7 @@ xorgdrvvideo = xorg-drv-video-ast xorg-drv-video-ati xorg-drv-video-cirrus xorg-
 bootloader = syslinux
 endif
 
-xorgdrvinput = xorg-drv-input-void xorg-drv-input-synaptics xorg-drv-input-evdev xf86-input-libinput
+xorgdrvinput = xorg-drv-input-void xf86-input-libinput
 # xorg-drv-input-mouse xorg-drv-input-keyboard xorg-drv-input-joystick xorg-drv-input-evtouch xorg-drv-input-vboxmouse
 splashtheme = splash-theme-openmamba
 alsaplayer_output = alsaplayer-output-alsa
diff --git a/platforms/livecd-gnome-root/Makefile b/platforms/livecd-gnome-root/Makefile
index eb12acd..240ed00 100644
--- a/platforms/livecd-gnome-root/Makefile
+++ b/platforms/livecd-gnome-root/Makefile
@@ -5,8 +5,7 @@ $(MAKEDIST_TARGET)-livecd-gnome: \
              openssh-clients binutils telnet ftp debianutils diffutils bluez traceroute \
              timezone sudo openobex liblame expect NetworkManager \
              ModemManager network-manager-applet Mesa-tools \
-             x11vnc xorg-server xorg-drv-video-fbdev xorg-drv-input-evdev xorg-drv-input-keyboard \
-             xorg-drv-input-mouse xorg-drv-input-void \
+             x11vnc xorg-server xorg-drv-video-fbdev \
              rpm dnf desktop-base-openmamba \
              gdm gnome-session gnome-common gnome-control-center gnome-desktop \
              gnome-keyring gnome-menus gnome-mime-data gnome-packagekit gnome-settings-daemon \
@@ -20,7 +19,7 @@ $(MAKEDIST_TARGET)-livecd-gnome-root: \
                   postplug-xorg postplug-sound \
                   $(MAKEDIST_TARGET)-commontools xorg-server \
                   xorg-fonts-100dpi xorg-fonts-Type1 xorg-fonts-TTF \
-                  xorg-drv-input-synaptics xorg-apps-extra xterm \
+                  xorg-apps-extra xterm \
                   ttf-freefont liberation-fonts-ttf \
                   gparted ntfs-3g libdvdcss \
                   chromium totem-mozilla-plugin \
diff --git a/platforms/livecd-light-root/Makefile b/platforms/livecd-light-root/Makefile
index d64b16c..7d759e5 100644
--- a/platforms/livecd-light-root/Makefile
+++ b/platforms/livecd-light-root/Makefile
@@ -5,8 +5,7 @@ $(MAKEDIST_TARGET)-livecd-light: openssh-server usbutils wireless_tools parted i
              lxqt-session openbox lxdm lxqt-archiver lximage-qt timezone sudo vixie-cron logrotate \
              openobex liblame expect NetworkManager ModemManager \
              network-manager-applet Mesa-tools \
-             x11vnc xorg-server xorg-drv-video-fbdev xorg-drv-input-evdev xorg-drv-input-keyboard \
-             xorg-drv-input-mouse xorg-drv-input-void \
+             x11vnc xorg-server xorg-drv-video-fbdev \
              rpm dnf firefox desktop-base-openmamba
 
 $(MAKEDIST_TARGET)-livecd-light-libreoffice: libreoffice-calc libreoffice-writer libreoffice-impress
@@ -17,7 +16,7 @@ $(MAKEDIST_TARGET)-livecd-light-root: \
                   postplug-xorg postplug-sound \
                   $(MAKEDIST_TARGET)-commontools xorg-server \
                   xorg-fonts-100dpi xorg-fonts-Type1 xorg-fonts-TTF \
-                  xorg-drv-input-synaptics xorg-apps-extra xterm \
+                  xorg-apps-extra xterm \
                   ttf-freefont liberation-fonts-ttf \
                   partitionmanager ntfs-3g libdvdcss \
                   livecd-tools \
diff --git a/platforms/livecd-root/Makefile b/platforms/livecd-root/Makefile
index e3385e5..c3d1a98 100644
--- a/platforms/livecd-root/Makefile
+++ b/platforms/livecd-root/Makefile
@@ -7,7 +7,7 @@ $(MAKEDIST_TARGET)-livecd-root: \
                   postplug-xorg postplug-sound openssh-server \
                   $(MAKEDIST_TARGET)-commontools xorg-server \
                   xorg-fonts-100dpi xorg-fonts-Type1 xorg-fonts-TTF \
-                  xorg-drv-input-synaptics xorg-apps-extra xterm \
+                  xorg-apps-extra xterm \
                   ttf-freefont liberation-fonts-ttf \
                   partitionmanager ntfs-3g libdvdcss \
                   NetworkManager ModemManager \
diff --git a/platforms/livedvd-root/Makefile b/platforms/livedvd-root/Makefile
index 6747b4b..27161bf 100644
--- a/platforms/livedvd-root/Makefile
+++ b/platforms/livedvd-root/Makefile
@@ -7,7 +7,7 @@ $(MAKEDIST_TARGET)-livedvd-root: \
                   postplug-xorg postplug-sound openssh-server \
                   $(MAKEDIST_TARGET)-commontools xorg-server \
                   xorg-fonts-100dpi xorg-fonts-Type1 xorg-fonts-TTF \
-                  xorg-drv-input-synaptics xorg-apps-extra xterm \
+                  xorg-apps-extra xterm \
                   ttf-freefont liberation-fonts-ttf \
                   partitionmanager ntfs-3g libdvdcss \
                   firefox kpartsplugin vixie-cron logrotate \
diff --git a/platforms/livegames-root/Makefile b/platforms/livegames-root/Makefile
index 400151c..5293ffb 100644
--- a/platforms/livegames-root/Makefile
+++ b/platforms/livegames-root/Makefile
@@ -12,7 +12,6 @@ $(MAKEDIST_TARGET)-livegames-root: \
                   postplug-xorg postplug-sound openssh-server \
                   $(MAKEDIST_TARGET)-commontools xorg-server \
                   xorg-fonts-100dpi xorg-fonts-Type1 xorg-fonts-TTF \
-                  xorg-drv-input-synaptics \
                   ttf-freefont liberation-fonts-ttf \
                   partitionmanager ntfs-3g samba-server \
                   chromium kpartsplugin \
diff --git a/platforms/testcd-root/Makefile b/platforms/testcd-root/Makefile
index bb16b65..71beeb2 100644
--- a/platforms/testcd-root/Makefile
+++ b/platforms/testcd-root/Makefile
@@ -7,7 +7,7 @@ $(MAKEDIST_TARGET)-testcd-root: \
                   postplug-xorg postplug-sound \
                   $(MAKEDIST_TARGET)-commontools xorg-server \
                   xorg-fonts-100dpi xorg-fonts-Type1 xorg-fonts-TTF \
-                  xorg-drv-input-synaptics xorg-apps-extra xterm \
+                  xorg-apps-extra xterm \
                   ttf-freefont liberation-fonts-ttf \
                   partitionmanager ntfs-3g libdvdcss \
                   chromium \