diff --git a/applications/vim.sh b/applications/vim.sh
index ac8ec3f..1cce2fe 100755
--- a/applications/vim.sh
+++ b/applications/vim.sh
@@ -1,5 +1,5 @@
 sudo apt-get remove -y vim-tiny vim-common vim-gui-common vim vim-runtime gvim
-sudo apt-get install -y mercurial libncurses5-dev libgnome2-dev libgnomeui-dev libgtk2.0-dev libatk1.0-dev libbonoboui2-dev libcairo2-dev libx11-dev libxpm-dev libxt-dev
+sudo apt-get install -y mercurial libncurses5-dev libgnome2-dev libgnomeui-dev libgtk2.0-dev libatk1.0-dev libbonoboui2-dev libcairo2-dev libx11-dev libxpm-dev libxt-dev python3-dev luajit liblua5.3-dev
 sudo apt-get build-dep -y vim
 mkdir -p /tmp/vim
 cd /tmp/vim
@@ -8,6 +8,6 @@ rm -rf vim
 #(date && hg clone https://vim.googlecode.com/hg/ vim) 2>&1 |tee log
 # Checkout the latest non alpha or beta tag
 git clone https://github.com/vim/vim && cd vim && git checkout $(git tag|sort -n|grep -v '[ab]'|tail -n1)
-./configure --with-features=huge --enable-rubyinterp --enable-pythoninterp --enable-perlinterp --enable-gui=gtk2 --enable-cscope --prefix=/usr --enable-luainterp=dynamic | tee -a log
+./configure --with-features=huge --enable-rubyinterp --enable-pythoninterp --enable-perlinterp --enable-gui=gtk2 --enable-cscope --prefix=/usr --enable-luainterp=dynamic --enable-python3interp=dynamic --with-python3-config-dir="$(python3-config --configdir)" | tee -a log
 make | tee -a log
 sudo make install | tee -a log
diff --git a/i3/Xmodmap b/i3/Xmodmap
index b275bf8..53fe642 100644
--- a/i3/Xmodmap
+++ b/i3/Xmodmap
@@ -1,5 +1,4 @@
-clear Lock
-keysym Caps_Lock = Escape
+remove Lock = Caps_Lock
 keysym Escape = Caps_Lock
+keysym Caps_Lock = Escape
 add Lock = Caps_Lock
-keycode 248 = 
diff --git a/i3/config b/i3/config
index 3ffbc67..ca8093f 100644
--- a/i3/config
+++ b/i3/config
@@ -21,7 +21,7 @@ bindsym $mod+p exec rofi -font "Monospace 12" -show run
 bindsym $mod+shift+p exec "rofi-pass --last-used"
 # Misc shortcuts
 bindsym --release Num_Lock exec "xdotool key --clearmodifiers Shift+Insert;numlockx on"
-bindsym Print exec "bash -c 'DISPLAY=:0.0 xfce4-screenshooter -r -s ~/Pictures'"
+bindsym Print exec "~/.i3/run.sh screenshot"
 # Split in vertical orientation
 bindsym $mod+v split h
 # Split in horizontal orientation
@@ -112,6 +112,7 @@ bindsym $mod+shift+w exec "~/.i3/run.sh wall"
 
 # Visuals
 workspace_layout tabbed
+hide_edge_borders smart
 #smart_borders on
 new_window pixel 1
 
diff --git a/i3/run.sh b/i3/run.sh
index 308a58a..e477c2f 100755
--- a/i3/run.sh
+++ b/i3/run.sh
@@ -91,3 +91,8 @@ fi
 if [ "$1" = "copy" ]; then
   (printf '-chegg ';xsel | perl -pe 's/[^a-zA-Z ]//g;chomp()') | xsel && notify-send "Copied" || notify-send "Error"
 fi
+if [ "$1" = "screenshot" ]; then
+  rm ~/last-photo/*(N)
+  DISPLAY=:0.0 xfce4-screenshooter -r -s ~/last-photo
+  cp ~/last-photo ~/Pictures
+fi
diff --git a/shells/Xresources b/shells/Xresources
index 11be160..d02bb9d 100644
--- a/shells/Xresources
+++ b/shells/Xresources
@@ -2,6 +2,9 @@
 !URxvt.font: -*-*-*-*-*-*-*-*-*-*-*-*-*-*
 !URxvt.boldFont: -*-*-*-*-*-*-*-*-*-*-*-*-*-*
 !URxvt.font: xft:Fixed:style=SemiCondensed:size=10
+!URxvt.font: xft:Inconsolata:size=12
+URxvt.font: xft:Courier New:size=12
+!URxvt.faceName: -*-*-*-*-*-*-10-*-*-*-*-*-*-*
 !URxvt.font: xft:Fixed:style=SemiCondensed:size=16
 
 URxvt.urgentOnBell: true
@@ -20,11 +23,10 @@ URxvt.borderWidth: 0
 URxvt.charClass: 33:48,35:48,37:48,43:48,45-47:48,64:48,95:48,126:48
 URxvt.eightBitInput: false
 !URxvt.faceName: -misc-fixed-medium-r-semicondensed--13-100-100-100-c-60-iso8859-1
-URxvt.faceName: -*-*-*-*-*-*-8-*-*-*-*-*-*-*
 URxvt.faceSize: 7
 URxvt.hinting: false
 URxvt.internalBorder: 0
-URxvt.letterSpace: 0
+!URxvt.letterSpace: -1
 URxvt.loginShell: true
 URxvt.rgba: rgb
 URxvt.saveLines: 16384
diff --git a/shells/zshrc b/shells/zshrc
index c8669e3..56a29c8 100644
--- a/shells/zshrc
+++ b/shells/zshrc
@@ -127,7 +127,7 @@ update-tool() {
   while [[ "$RESP" != "q" ]]; do
     CMD=${RESP:0:1}
     case "$CMD" in
-      u) update;;
+      u) update -q;;
       l) layman -S ;;
       g) upgrade;;
       e) etc-update;;
@@ -199,7 +199,6 @@ if [ "$(uname)" != "Darwin" ]; then
   # Not Mac
   export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:~/bin"
   alias ls='ls --color=always -F'
-  alias matlab='matlab -glnx86'
   alias where="readlink -m"
 else
   # It is a mac
@@ -256,7 +255,9 @@ if test -f /etc/gentoo-release; then
       sudo emaint sync -a
     fi
     sudo -k
-    echo '\a'
+    if [ "$1" != "-q" ]; then
+      echo '\a'
+    fi
   }
 elif test -f /etc/lsb-release; then
   # Ubuntu
@@ -571,6 +572,7 @@ k(){
       *.tar.bz2)   pv $1|tar -xjf -       ;;
       *.tar.gz)    pv $1|tar -xzf -       ;;
       *.tar)       pv $1|tar -xf  -       ;;
+      *.tbz)       pv $1|tar -xjf -       ;;
       *.tbz2)      pv $1|tar -xjf -       ;;
       *.tgz)       pv $1|tar -xzf -       ;;
       *.lzma)      pv $1|tar --lzma -xf - ;;
diff --git a/tmux/tmux.conf b/tmux/tmux.conf
index 5362905..570a66e 100644
--- a/tmux/tmux.conf
+++ b/tmux/tmux.conf
@@ -6,7 +6,7 @@ set-window-option -g window-status-current-bg red
 setw -g monitor-activity on
 set -g visual-activity on
 setw -g automatic-rename on
-unbind %
+set -sg escape-time 1
 set -g default-terminal "screen-256color"
 set-option -g history-limit 50000
 set -g set-titles-string "tmux.#I.#W"
diff --git a/vim/vimrc b/vim/vimrc
index d8926bd..8e495c7 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -354,6 +354,7 @@ augroup END
 if has('gui_running')
   set guioptions-=T
 else
+  set t_Co=256
   if &term=='xterm' || &term=='screen'
     set t_Co=256
   endif
diff --git a/zsh/borg.zsh b/zsh/borg.zsh
index 8347e2e..839a849 100644
--- a/zsh/borg.zsh
+++ b/zsh/borg.zsh
@@ -19,7 +19,7 @@ b-create() {
   if command -v sudo > /dev/null; then
     SUDO="$(command -v sudo)"
   fi
-  $SUDO /home/stonewareslord/syncthing/me/backup/$(hostname)/backup
+  "$SUDO" "/home/stonewareslord/syncthing/me/backup/$(hostname)/backup"
 }
 b-rename() {
   borg rename -v "$BORG_REPO::$1" "$2"