diff --git a/bootstrap.sh b/bootstrap.sh
index 05a5a3f..e5ed1d3 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -83,7 +83,7 @@ swapon -L P_SWAP # swap
 sed -e '/## Germany/,+1!d' /etc/pacman.d/mirrorlist
 
 # for server dhcpcd and other programs are not required -> see good2know
-pacstrap /mnt base base-devel linux linux-firmware vi dhcpcd wpa_supplicant dialog git netctl curl
+pacstrap /mnt base base-devel linux-zen linux-firmware vi dhcpcd wpa_supplicant dialog git netctl curl
 genfstab -p /mnt > /mnt/etc/fstab
 
 cat <<EOF > /mnt/root/bootstrap2.sh
@@ -104,15 +104,15 @@ bootctl install
 # MAYBE: add intel-ucode images, check for amd
 cat <<EEE > /boot/loader/entries/arch-uefi.conf
 title	Arch
-linux	/vmlinuz-linux
-initrd	/initramfs-linux.img
+linux	/vmlinuz-linux-zen
+initrd	/initramfs-linux-zen.img
 options	root=LABEL=P_ROOT rw resume=LABEL=P_SWAP
 EEE
 
 cat <<EEE > /boot/loader/entries/arch-uefi-fallback.conf
 title    Arch Linux Fallback
-linux    /vmlinuz-linux
-initrd   /initramfs-linux-fallback.img
+linux    /vmlinuz-linux-zen
+initrd   /initramfs-linux-zen-fallback.img
 options	root=LABEL=P_ROOT rw resume=LABEL=P_SWAP
 EEE
 
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..f5fcedd
--- /dev/null
+++ b/etc/X11/xorg.conf.d/00-keyboard.conf
@@ -0,0 +1,11 @@
+# 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" "us"
+        Option "XkbModel" "pc104"
+        Option "XkbVariant" "altgr-intl"
+        Option "XkbOptions" "caps:escape"
+EndSection
diff --git a/etc/X11/xorg.conf.d/02-tearing.conf b/etc/X11/xorg.conf.d/02-tearing.conf
new file mode 100644
index 0000000..f2350d0
--- /dev/null
+++ b/etc/X11/xorg.conf.d/02-tearing.conf
@@ -0,0 +1,5 @@
+Section "Device"
+        Identifier "Nvidia tearing fix"
+        Driver "nvidia"
+        Option "ForceFullCompositionPipeline" "yes"
+EndSection
\ No newline at end of file
diff --git a/etc/udev/rules.d/50-huion-tablet.rules b/etc/udev/rules.d/50-huion-tablet.rules
index f85eaa7..0316768 100644
--- a/etc/udev/rules.d/50-huion-tablet.rules
+++ b/etc/udev/rules.d/50-huion-tablet.rules
@@ -1 +1 @@
-ACTION=="add",SUBSYSTEM=="usb",ATTRS{idVendor}=="256c",ATTRS{idProduct}=="006e",ENV{XAUTHORITY}="/home/toerd/.Xauthority",RUN+="/home/toerd/.dotfiles/huion/huion_udev.sh",MODE="0666",OWNER="toerd"
\ No newline at end of file
+ACTION=="add",SUBSYSTEM=="usb",ATTRS{idVendor}=="256c",ATTRS{idProduct}=="006e",ENV{XAUTHORITY}="/home/phga/.Xauthority",RUN+="/home/phga/.dotfiles/huion/huion_udev.sh",MODE="0666",OWNER="phga"
\ No newline at end of file
diff --git a/etc/udev/rules.d/50-qmk.rules b/etc/udev/rules.d/50-qmk.rules
new file mode 100644
index 0000000..db27d4d
--- /dev/null
+++ b/etc/udev/rules.d/50-qmk.rules
@@ -0,0 +1,71 @@
+# Atmel DFU
+### ATmega16U2
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2fef", TAG+="uaccess"
+### ATmega32U2
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2ff0", TAG+="uaccess"
+### ATmega16U4
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2ff3", TAG+="uaccess"
+### ATmega32U4
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2ff4", TAG+="uaccess"
+### AT90USB64
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2ff9", TAG+="uaccess"
+### AT90USB162
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2ffa", TAG+="uaccess"
+### AT90USB128
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2ffb", TAG+="uaccess"
+
+# Input Club
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="1c11", ATTRS{idProduct}=="b007", TAG+="uaccess"
+
+# STM32duino
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="1eaf", ATTRS{idProduct}=="0003", TAG+="uaccess"
+# STM32 DFU
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="df11", TAG+="uaccess"
+
+# BootloadHID
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="05df", TAG+="uaccess"
+
+# USBAspLoader
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="05dc", TAG+="uaccess"
+
+# ModemManager should ignore the following devices
+# Atmel SAM-BA (Massdrop)
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="6124", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
+
+# Caterina (Pro Micro)
+## Spark Fun Electronics
+### Pro Micro 3V3/8MHz
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="1b4f", ATTRS{idProduct}=="9203", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
+### Pro Micro 5V/16MHz
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="1b4f", ATTRS{idProduct}=="9205", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
+### LilyPad 3V3/8MHz (and some Pro Micro clones)
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="1b4f", ATTRS{idProduct}=="9207", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
+## Pololu Electronics
+### A-Star 32U4
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="1ffb", ATTRS{idProduct}=="0101", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
+## Arduino SA
+### Leonardo
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="2341", ATTRS{idProduct}=="0036", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
+### Micro
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="2341", ATTRS{idProduct}=="0037", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
+## Adafruit Industries LLC
+### Feather 32U4
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="239a", ATTRS{idProduct}=="000c", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
+### ItsyBitsy 32U4 3V3/8MHz
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="239a", ATTRS{idProduct}=="000d", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
+### ItsyBitsy 32U4 5V/16MHz
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="239a", ATTRS{idProduct}=="000e", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
+## dog hunter AG
+### Leonardo
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="2a03", ATTRS{idProduct}=="0036", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
+### Micro
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="2a03", ATTRS{idProduct}=="0037", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
+
+# hid_listen
+KERNEL=="hidraw*", MODE="0660", GROUP="plugdev", TAG+="uaccess", TAG+="udev-acl"
+
+# hid bootloaders
+## QMK HID
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2067", TAG+="uaccess"
+## PJRC's HalfKay
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="0478", TAG+="uaccess"
diff --git a/etc/udev/rules.d/97-adb.rules b/etc/udev/rules.d/97-adb.rules
new file mode 100644
index 0000000..12ba709
--- /dev/null
+++ b/etc/udev/rules.d/97-adb.rules
@@ -0,0 +1,3 @@
+SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", MODE="0660", GROUP="adbusers"
+SUBSYSTEM=="usb",ATTR{idVendor}=="18d1",ATTR{idProduct}=="4ee7",SYMLINK+="android_adb"
+SUBSYSTEM=="usb",ATTR{idVendor}=="18d1",ATTR{idProduct}=="4ee7",SYMLINK+="android_fastboot"
diff --git a/etc/udev/rules.d/99-keyboard.rules b/etc/udev/rules.d/99-keyboard.rules
index 0ba0646..6532ec5 100644
--- a/etc/udev/rules.d/99-keyboard.rules
+++ b/etc/udev/rules.d/99-keyboard.rules
@@ -1,2 +1,3 @@
-ACTION=="add", ATTRS{idVendor}=="feed", ATTRS{idProduct}=="1307", ENV{XKBMODEL}="evdev", ENV{XKBLAYOUT}="us", ENV{XKBVARIANT}="altgr-intl"
-ACTION=="add", ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="422d", ENV{XKBMODEL}="evdev", ENV{XKBLAYOUT}="us", ENV{XKBVARIANT}="altgr-intl"
\ No newline at end of file
+ACTION=="add", ATTRS{idVendor}=="3297", ATTRS{idProduct}=="4974", ENV{XKBMODEL}="pc104", ENV{XKBLAYOUT}="us", ENV{XKBVARIANT}="altgr-intl"
+ACTION=="add", ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="422d", ENV{XKBMODEL}="pc104", ENV{XKBLAYOUT}="us", ENV{XKBVARIANT}="altgr-intl"
+ACTION=="add", ATTRS{idVendor}=="0c45", ATTRS{idProduct}=="652f", ENV{XKBMODEL}="pc104", ENV{XKBLAYOUT}="de"
diff --git a/etc/udev/rules.d/99-uinput.rules b/etc/udev/rules.d/99-uinput.rules
new file mode 100644
index 0000000..40875dc
--- /dev/null
+++ b/etc/udev/rules.d/99-uinput.rules
@@ -0,0 +1 @@
+KERNEL=="uinput", GROUP="input", MODE:="0660"
diff --git a/fresh.sh b/fresh.sh
index 63f1942..c36ac1a 100755
--- a/fresh.sh
+++ b/fresh.sh
@@ -223,8 +223,12 @@ set_pacman_config() {
 
 set_git_config() {
     sudo -u $uname git config --global user.email "philipg@posteo.de"
-    sudo -u $uname git config --global user.name "phga"
+    sudo -u $uname git config --global user.name "qhga"
     sudo -u $uname git config --global credential.useHttpPath true
+    # gpg --list-keys --keyid-format=long
+    sudo -u $uname git config --global user.signingkey 5249548AA705F019
+    sudo -u $uname git config --global commit.gpgsign true
+
     # sudo -u $uname git config --global credential.helper /usr/bin/pass-git-helper
 }
 
diff --git a/pack.csv b/pack.csv
index 3743667..7ceda34 100644
--- a/pack.csv
+++ b/pack.csv
@@ -16,12 +16,12 @@ L,P,acpi_call,battery recalibration
 L,P,tlp,better battery life
 A,P,openssh,Premier connectivity tool for remote login with the SSH protocol
 A,P,gnupg,Complete and free implementation of the OpenPGP standard
-# A,P,oath-toolkit,library to use OATH-pam auth with yubikeys
-A,P,yubico-pam,Authentication with yubikeys
+A,P,oath-toolkit,library to use OATH-pam auth with yubikeys
+# A,P,yubico-pam,Authentication with yubikeys
 A,P,expac,Pacman Database Extraction Tool (Get Install-Date)
 
 # libraries
-A,M,pyorgmode,lib to create and modify orgmode files used in quteb script
+# A,M,pyorgmode,lib to create and modify orgmode files used in quteb script
 
 # Driver related stuff
 A,P,linux-headers,linux kernel headers
@@ -98,7 +98,7 @@ A,P,python-dbus,Python bindings for DBUS
 
 
 # Text editing
-A,A,emacs-git,The extensible customizable self-documenting real-time display editor
+A,P,emacs,The extensible customizable self-documenting real-time display editor
 A,P,xournalpp,Notetaking and sketching application
 
 # emacs reqs
@@ -146,7 +146,7 @@ A,P,maim,snipping tool for screenshots and stuff
 A,P,peek,record screen to gif/mp4
 
 # Remote assistance
-A,A,anydesk,remote software like teamviewer (but better)
+# A,A,anydesk,remote software like teamviewer (but better)
 
 A,P,syncthing,tool to sync all my docs
 # A,P,nextcloud-client,Client for nextcloud server