diff --git a/merge/x11-drivers/.calculate_directory b/merge/x11-drivers/.calculate_directory
new file mode 100644
index 0000000..fe9987a
--- /dev/null
+++ b/merge/x11-drivers/.calculate_directory
@@ -0,0 +1 @@
+{% calculate append='skip' %}
diff --git a/merge/x11-drivers/nvidia-drivers/.calculate_directory b/merge/x11-drivers/nvidia-drivers/.calculate_directory
new file mode 100644
index 0000000..aac9978
--- /dev/null
+++ b/merge/x11-drivers/nvidia-drivers/.calculate_directory
@@ -0,0 +1,2 @@
+{% calculate path='/etc', name='env.d', package='x11-drivers/nvidia-drivers' %}
+
diff --git a/merge/x11-drivers/nvidia-drivers/99nvidia b/merge/x11-drivers/nvidia-drivers/99nvidia
new file mode 100644
index 0000000..2c60ab5
--- /dev/null
+++ b/merge/x11-drivers/nvidia-drivers/99nvidia
@@ -0,0 +1,11 @@
+{% calculate comment='#' %}
+# discard /usr/lib64/*nvidia*, because prelink call segfault
+# for some applications (chromium,libreoffice and etc)
+{% if install.os.arch.machine == 'x86_64' %}
+PRELINK_PATH_MASK="/usr/lib64/*nvidia*
+-b /usr/lib32/*nvidia*
+-b /usr/lib/*nvidia*"
+{% else %}
+PRELINK_PATH_MASK=/usr/lib/*nvidia*
+{% endif %}
+
diff --git a/merge/x11-drivers/nvidia-drivers/nvidia-drm.conf b/merge/x11-drivers/nvidia-drivers/nvidia-drm.conf
new file mode 100644
index 0000000..688de88
--- /dev/null
+++ b/merge/x11-drivers/nvidia-drivers/nvidia-drm.conf
@@ -0,0 +1,3 @@
+{% calculate path='/etc/modprobe.d', pkg('x11-drivers/nvidia-drivers[kms]') %}
+# Nvidia modeset conf 
+options nvidia-drm modeset=1
diff --git a/merge/x11-drivers/nvidia-drivers/nvidia-remove.start b/merge/x11-drivers/nvidia-drivers/nvidia-remove.start
new file mode 100644
index 0000000..150cd60
--- /dev/null
+++ b/merge/x11-drivers/nvidia-drivers/nvidia-remove.start
@@ -0,0 +1 @@
+{% calculate append='remove', path='/etc/local.d' %}
diff --git a/merge/x11-drivers/nvidia-drivers/nvidia-remove.stop b/merge/x11-drivers/nvidia-drivers/nvidia-remove.stop
new file mode 100644
index 0000000..150cd60
--- /dev/null
+++ b/merge/x11-drivers/nvidia-drivers/nvidia-remove.stop
@@ -0,0 +1 @@
+{% calculate append='remove', path='/etc/local.d' %}
diff --git a/merge/x11-drivers/xf86-input-synaptics/.calculate_directory b/merge/x11-drivers/xf86-input-synaptics/.calculate_directory
new file mode 100644
index 0000000..67c4bbd
--- /dev/null
+++ b/merge/x11-drivers/xf86-input-synaptics/.calculate_directory
@@ -0,0 +1 @@
+{% calculate path='/etc/xdg', name='autostart', package='x11-drivers/xf86-input-synaptics', pkg('gnome-extra/cinnamon-session') or pkg('mate-base/mate-session-manager') %}
diff --git a/merge/x11-drivers/xf86-input-synaptics/fix-touchpad.sh b/merge/x11-drivers/xf86-input-synaptics/fix-touchpad.sh
new file mode 100644
index 0000000..78bb281
--- /dev/null
+++ b/merge/x11-drivers/xf86-input-synaptics/fix-touchpad.sh
@@ -0,0 +1,9 @@
+{% calculate path='/usr/libexec/calculate', chmod='755' %}
+#!/bin/bash
+
+/usr/bin/synclient TapButton2=2 TapButton3=3
+
+/usr/bin/xinput list --name-only | grep -i touchpad | while read line
+do
+	/usr/bin/xinput set-int-prop "$line" "Synaptics Tap Action" 8 0 0 0 0 1 2 3
+done
diff --git a/merge/x11-drivers/xf86-input-synaptics/touchpad-tapfix.desktop b/merge/x11-drivers/xf86-input-synaptics/touchpad-tapfix.desktop
new file mode 100644
index 0000000..d790a06
--- /dev/null
+++ b/merge/x11-drivers/xf86-input-synaptics/touchpad-tapfix.desktop
@@ -0,0 +1,16 @@
+[Desktop Entry]
+Type=Application
+Name=Touchpad Tap fix
+Exec=/usr/libexec/calculate/fix-touchpad.sh
+{% if pkg('mate-base/mate-session-manager') or pkg('gnome-extra/cinnamon-session') or pkg('gnome-base/gnome-session') %}
+OnlyShowIn=MATE;X-Cinnamon;
+{% endif %}
+NoDisplay=true
+{% if pkg('gnome-extra/cinnamon-session') or pkg('gnome-base/gnome-session') %}
+X-GNOME-Autostart-Notify=false
+X-GNOME-AutoRestart=false
+{% endif %}
+{% if pkg('mate-base/mate-session-manager') %}
+X-MATE-Autostart-Notify=false
+X-MATE-AutoRestart=false
+{% endif %}