diff --git a/i3/autostart b/i3/autostart
index 990a7a7..e8339f4 100755
--- a/i3/autostart
+++ b/i3/autostart
@@ -12,6 +12,8 @@ gnome-keyring-daemon --start --daemonize --components=pkcs11,secrets,ssh,gpg &
 xset r rate 400 30
 nm-applet &
 xautolock -secure  -time 15 -locker 'i3lock -b -d' &
-sleep 2 && xmodmap ~/.i3/speedswapper &
+#sleep 2 && xmodmap ~/.i3/speedswapper &
 # disable touchpad
-xinput set-prop 11 "Device Enabled" 0
+for id in $(xinput list | sed -rn 's/.*touchpad.*id=([0-9]+).*/\1/ip'); do
+	xinput set-prop "$id" "Device Enabled" 0
+done
diff --git a/i3/config b/i3/config
index 92adbea..f7fd7b2 100644
--- a/i3/config
+++ b/i3/config
@@ -6,7 +6,7 @@
 # later. It is recommended to set this option to allow i3 to open a terminal
 # containing the introduction on first start.
 # set $terminal /usr/bin/lilyterm -s
-set $terminal /usr/local/bin/evilvte
+set $terminal /usr/bin/evilvte
 set $mod Mod4
 
 client.background #000000
@@ -120,6 +120,8 @@ bindsym Mod4+p exec rofi-pass
 bindsym Mod4+i exec teiler
 bindsym Mod4+v exec rofi -show run
 bindsym Mod4+space exec rofi -show run
+bindsym Mod1+Tab exec rofi -show window
+bindsym Mod4+s exec rofi -show ssh -terminal $terminal
 
 bindsym Mod4+comma split vertical
 bindsym Mod4+period split horizontal