diff --git a/files/.bash_aliases b/files/.bash_aliases
index d78c6d8..41afdae 100644
--- a/files/.bash_aliases
+++ b/files/.bash_aliases
@@ -22,6 +22,7 @@ alias obi='obuild install'
 alias obbi='obuild build && obuild install'
 alias obcb='obuild configure && obuild build'
 alias obcbi='obuild configure && obuild build && obuild install'
+alias venv='source venv/bin/activate'
 
 alias ocaml="/usr/bin/rlwrap ocaml"
 alias coqtop="/usr/bin/rlwrap coqtop"
diff --git a/files/.bashrc b/files/.bashrc
index 2975a1b..5789b49 100644
--- a/files/.bashrc
+++ b/files/.bashrc
@@ -45,8 +45,11 @@ export EDITOR=/usr/bin/vim
 export _JAVA_OPTIONS='-Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel'
 
 export PATH="$PATH:/home/tobast/bin"
+export MANPATH="$MANPATH:$HOME/local/man"
 
 export TERMINAL="/usr/bin/terminator"
 
+export LC_REALUSER='tbastian'
+
 # Opam
 which opam > /dev/null 2>&1 && [ -f ~/.opam ] && eval `opam config env`
diff --git a/files/.config/i3/bin/screenplace b/files/.config/i3/bin/screenplace
new file mode 100755
index 0000000..c3990e3
--- /dev/null
+++ b/files/.config/i3/bin/screenplace
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+dftScreen="LVDS1"
+
+screens=$(xrandr | grep " connected" | cut -f 1 -d ' ' | grep -v "LVDS")
+screen=$(echo $screens | head -n 1)
+
+case "$1" in
+"reset")
+	xrandr --auto
+	;;
+"left")
+	[ -z "$screen" ] && >&2 echo "No screen connected." && exit 1
+	xrandr --output "$screen" --left-of "$dftScreen" --auto
+	;;
+"right")
+	[ -z "$screen" ] && >&2 echo "No screen connected." && exit 1
+	xrandr --output "$screen" --right-of "$dftScreen" --auto
+	;;
+*)
+	>&2 echo -e "Missing argument. Usage:\n$0 [reset|left|right]"
+	;;
+esac
+
diff --git a/files/.config/i3/config b/files/.config/i3/config
index 2c0dd28..a304e32 100644
--- a/files/.config/i3/config
+++ b/files/.config/i3/config
@@ -127,7 +127,7 @@ bindsym $mod+equal workspace 12
 
 # Weechat-like
 workspace_auto_back_and_forth yes
-bindsym $mod+p workspace back_and_forth
+bindsym $mod+grave workspace back_and_forth
 
 # switch to next/prev workspace
 bindsym $mod+Control+Left workspace prev_on_output
@@ -151,6 +151,11 @@ bindsym $mod+Shift+0 move container to workspace 10
 bindsym $mod+Shift+minus move container to workspace 11
 bindsym $mod+Shift+equal move container to workspace 12
 
+# xrandr
+bindsym $mod+Shift+KP_4 exec ~/.config/i3/bin/screenplace left
+bindsym $mod+Shift+KP_5 exec ~/.config/i3/bin/screenplace reset
+bindsym $mod+Shift+KP_6 exec ~/.config/i3/bin/screenplace right
+
 # reload the configuration file
 bindsym $mod+Shift+c reload
 # restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
diff --git a/files/.config/systemd/user/gpg-agent.service b/files/.config/systemd/user/gpg-agent.service
new file mode 100644
index 0000000..69c7bb6
--- /dev/null
+++ b/files/.config/systemd/user/gpg-agent.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=GnuPG private key agent
+IgnoreOnIsolate=true
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/gpg-agent --daemon
+Restart=on-abort
+
+[Install]
+WantedBy=default.target
diff --git a/files/.config/systemd/user/weenotify.service b/files/.config/systemd/user/weenotify.service
index b7667b3..4db8824 100644
--- a/files/.config/systemd/user/weenotify.service
+++ b/files/.config/systemd/user/weenotify.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=Weechat notifications from a distant server
-After=network.target display-manager.service
+After=network.target display-manager.service gpg-agent.service
 
 [Service]
 Type=simple
diff --git a/files/.config/terminator/config b/files/.config/terminator/config
index aa3a641..2ffe337 100644
--- a/files/.config/terminator/config
+++ b/files/.config/terminator/config
@@ -23,6 +23,7 @@
     background_darkness = 0.79
     background_image = None
     background_type = transparent
+    font = Sans 10
     foreground_color = "#fffeab"
     scrollbar_position = hidden
     show_titlebar = False
@@ -49,3 +50,4 @@
     scrollbar_position = hidden
     show_titlebar = False
   [[with_titlebar]]
+    background_image = None
diff --git a/files/.gitignore b/files/.gitignore
index 3c2f83f..b38a469 100644
--- a/files/.gitignore
+++ b/files/.gitignore
@@ -1,2 +1,3 @@
 *.swp
 *.syntastic_*_config
+.vimrc