diff --git a/i3/run.sh b/i3/run.sh
index 99b046d..fd93f73 100755
--- a/i3/run.sh
+++ b/i3/run.sh
@@ -81,6 +81,10 @@ if [ "$1" = "ip" ]; then
     if  grep -q "$1" < <(ifconfig enp1s0;ifconfig wlp2s0); then
       RET=1
     fi
+  elif [ "$(hostname)" = "SGen" ]; then
+    if  grep -q "$1" < <(ifconfig enp0s25); then
+      RET=1
+    fi
   fi
   echo $RET
 fi
diff --git a/shells/Xresources b/shells/Xresources
index 48acda6..11be160 100644
--- a/shells/Xresources
+++ b/shells/Xresources
@@ -2,6 +2,7 @@
 !URxvt.font: -*-*-*-*-*-*-*-*-*-*-*-*-*-*
 !URxvt.boldFont: -*-*-*-*-*-*-*-*-*-*-*-*-*-*
 !URxvt.font: xft:Fixed:style=SemiCondensed:size=10
+!URxvt.font: xft:Fixed:style=SemiCondensed:size=16
 
 URxvt.urgentOnBell: true
 
diff --git a/shells/zshrc b/shells/zshrc
index 340ed9f..969e21d 100644
--- a/shells/zshrc
+++ b/shells/zshrc
@@ -96,7 +96,7 @@ run(){
 }
 alias nmrestart='nmcli radio wifi off;nmcli radio wifi on'
 alias mtr='mtr -t'
-alias tg='telegram-cli -N -W'
+alias tg='telegram-cli -NWA'
 alias perm='stat -c "%a %n"'
 alias afci='git x ./autoformat.sh;git add --all;git commit -m "Autoformatted"'
 alias eix="eix -F"
@@ -125,7 +125,6 @@ if [ "$(uname)" != "Darwin" ]; then
 else
   # It is a mac
   export PATH="/opt/local/sbin:/opt/local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:~/bin"
-  alias where="echo Can't find mac readlink!"
 fi
 if test -f /etc/gentoo-release; then
   # Gentoo
@@ -140,7 +139,7 @@ if test -f /etc/gentoo-release; then
   upgrade(){
     # Sudo echo so we have immediate results on weather sudo worked
     sudo echo "Args: $*"
-    sudo emerge --update --newuse --with-bdeps=y --deep --verbose --tree --keep-going=y --verbose-conflicts --alert --ask $* @world
+    sudo emerge --update --newuse --deep --verbose --tree --keep-going=y --verbose-conflicts --alert --ask $* @world
     echo "\\a"
   }
   # For emerging with absolute paths
@@ -166,7 +165,7 @@ if test -f /etc/gentoo-release; then
       echo "You're a server. Exiting"
       return
     fi
-    sudo zsh -c "git -C /usr/portage pull&&echo Done pulling&&eix-update&&echo Done with eix"
+    sudo zsh -c "(git -C /usr/portage pull&&(find /usr/portage -type f -exec chmod 644 {} \; ;find /usr/portage -type d -exec chmod 755 {} \;))&&echo Done pulling&&eix-update&&echo Done with eix"
     echo '\a'
   }
 elif test -f /etc/lsb-release; then
@@ -199,9 +198,9 @@ alias g="git"
 alias stdns="sudo sh -c 'echo nameserver 8.8.8.8 > /etc/resolv.conf'"
 alias fvim="vim -u NONE +\"so ~/.vim/plugged/flappyvird-vim/plugin/flappyvird.vim\" +\"so ~/.vim/plugged/flappyvird-vim/autoload/flappyvird.vim\" +\":FlappyVird\" +\":q\""
 alias fk='k `fzf --no-mouse -m -1 -x`'
-alias susp="sudo true&&(slock&echo mem | sudo tee /sys/power/state >/dev/null)"
-alias -g PA='2>&1 | paste'
+alias susp="sudo true&&((slock;sleep 2;nmcli radio wifi off;nmcli radio wifi on)&echo mem | sudo tee /sys/power/state >/dev/null)"
 alias s='sudo -Hu'
+alias -g PA='2>&1 | paste'
 alias -g c='rsync --partial -ha --info=progress2 "$@"'
 alias -g cfat='rsync --partial -hrlc --info=progress2 "$@"'
 alias -g nify=" > /dev/null 2>&1 &"
diff --git a/vim/vimrc b/vim/vimrc
index d5c7964..9fb4991 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -4,14 +4,15 @@ if has('conceal')
 endif
 let g:formatdef_my_custom_cpp = '"astyle --mode=cpp -xc --style=google -j -s2 -xG -S -K -N -xn -xl -n -p -H"'
 let g:formatters_cpp = ['my_custom_cpp']
-let g:formatdef_my_custom_java = '"astyle --mode=java -xc --style=google -j -s3 -xG -S -K -N -xn -xl -n -p -H"'
+let g:formatdef_my_custom_java = '"astyle --mode=java -xc --style=google -j -s2 -xG -S -K -N -xn -xl -n -p -H"'
 let g:formatters_java = ['my_custom_java']
 let g:UltiSnipsUsePythonVersion=3
 command! WW %!sudo tee > /dev/null %
 "TODO: Fix this
 "let g:rbpt_loadcmd_toggle = 1
 let g:indent_guides_auto_colors = 0
-autocmd FileType java set shiftwidth=3 tabstop=3 softtabstop=3 expandtab
+"Required for CSC216, not needed for current classes
+"autocmd FileType java set shiftwidth=3 tabstop=3 softtabstop=3 expandtab
 autocmd VimEnter,Colorscheme * :hi IndentGuidesOdd  guibg=darkgrey ctermbg=darkgrey
 autocmd VimEnter,Colorscheme * :hi IndentGuidesEven guibg=grey ctermbg=grey
 filetype plugin on
diff --git a/vimperator/vimperatorrc b/vimperator/vimperatorrc
index 8318322..a3d7ca7 100644
--- a/vimperator/vimperatorrc
+++ b/vimperator/vimperatorrc
@@ -36,5 +36,5 @@ style -name ublick * #nav-bar * { visibility: visible;  }
 set titlestring=Firefox
 set toolbars=noaddons,nobookmarks,nomenu,tabs,nonavigation
 set newtab=all
-"set complete=
+set complete=slb
 set hintchars=HJKLASDFGYUIOPWERTNMZXCVB
diff --git a/zsh/borg.zsh b/zsh/borg.zsh
index 7ef4603..f5533e6 100644
--- a/zsh/borg.zsh
+++ b/zsh/borg.zsh
@@ -7,9 +7,13 @@ b-list() {
   fi
 }
 b-delete() {
-  if [[ ! -z "$1" ]]; then
-    borg delete "$REPO"::"$1"
-  fi
+  while (( $# > 0 )); do
+    if [[ ! -z "$1" ]]; then
+      echo "Deleting... $1"
+      borg delete "$REPO"::"$1"
+    fi
+    shift
+  done
 }
 b-create() {
   local SUDO=""