diff --git a/i3/i3/config b/i3/i3/config
index c7d3500..e5cbfd1 100644
--- a/i3/i3/config
+++ b/i3/i3/config
@@ -15,14 +15,6 @@ set $mod Mod4
 # The default terminal
 set $terminal terminator
 
-# Keyboard options
-set $keyboard_layout de
-set $keyboard_options nodeadkeys
-
-# Mouse options
-set $mouse_repeat_delay 150
-set $mouse_repeat_speed 30
-
 # Path to the exit script
 set $path_i3exit ~/.i3/scripts/i3exit.bash
 
@@ -260,15 +252,6 @@ bar
 # Start the wallpaper changer.
 exec --no-startup-id $path_wallchanger $wallpaper_directory $wallpaper_interval > $wallpaper_logfile
 
-# Set keyboard layout
-exec --no-startup-id setxkbmap $keyboard_layout $keyboard_options
-
-# Set key repeat delay
-exec --no-startup-id xset r rate $mouse_repeat_delay $mouse_repeat_speed
-
-# Enable vertical edge scroll for the touchpad
-exec --no-startup-id synclient VertEdgeScroll=1
-
 # Start wicd in tray
 exec --no-startup-id wicd-gtk --tray
 
diff --git a/scripts/makesymlinks.bash b/scripts/makesymlinks.bash
index 726119c..52690de 100755
--- a/scripts/makesymlinks.bash
+++ b/scripts/makesymlinks.bash
@@ -10,7 +10,7 @@ backup_dir="$HOME/.dotfiles.bak/"
 
 # the following folders inside $config_dir will be inspected and the
 # contents symlinked:
-symlink_folders='bash git i3 vim zsh conky terminator'
+symlink_folders='bash git i3 vim zsh conky terminator x'
 
 MAPPING_SEPARATOR='::'
 
diff --git a/x/xinitrc b/x/xinitrc
new file mode 100755
index 0000000..cc654e1
--- /dev/null
+++ b/x/xinitrc
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+if [ -d /etc/X11/xinit/xinitrc.d ]; then
+  for f in /etc/X11/xinit/xinitrc.d/*; do
+    [ -x "$f" ] && . "$f"
+  done
+  unset f
+fi
+
+[ -f /etc/xprofile ] && source /etc/xprofile
+[ -f ~/.xprofile ] && source ~/.xprofile
+
+# execute the host-specific .xinitrc-addition
+hostfile="$HOME/.xinitrc.d/$(hostname).xinitrc"
+[[ -f "$hostfile" ]] && bash "$hostfile" &
+
+case $1 in
+e17)
+	exec enlightenment_start
+	;;
+i3)
+	exec i3
+	;;
+xfce4) ;;
+*)
+    exec i3
+    ;;
+esac
diff --git a/x/xinitrc.d/netbook.xinitrc b/x/xinitrc.d/netbook.xinitrc
new file mode 100755
index 0000000..a090196
--- /dev/null
+++ b/x/xinitrc.d/netbook.xinitrc
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+# enable vertical edge scrolling
+synclient VertEdgeScroll=1