diff --git a/.zshrc b/.zshrc
index 8220be2..98f4131 100644
--- a/.zshrc
+++ b/.zshrc
@@ -425,12 +425,11 @@ whiptail_menu() {
 
 alias -g D='$(date +%Y-%m-%d_%H-%M-%S)'
 alias -g E='2> /dev/null'
-alias -g G='|& grep -i'
+alias -g G='|& rg -i'
 alias -g H='| head'
 alias -g HL='--help |& less -r'
 alias -g L='| less'
 alias -g N='&> /dev/null'
-alias -g P='| peco'
 alias -g S='| sort'
 alias -g T='| tail'
 
@@ -541,7 +540,7 @@ zstyle ':completion:*:-command-:*' tag-order '!parameters'
 ### Welcome Message
 ###
 
-grc --colour=on df -h | grep -v 'tmpfs\|none'
+grc --colour=on df -h --output=source,size,pcent,target | grep -v 'tmpfs\|none'
 echo
 
 if [[ -e .welcome ]]; then
@@ -552,7 +551,6 @@ fi
 
 setopt nullglob
 if (( ${#$(echo ~/QubesIncoming/*(F))} )); then
-  rmdir --ignore-fail-on-non-empty ~/QubesIncoming/*
   find ~/QubesIncoming ! -type d -printf "%5kk  %p\n" |
     sort -k2,9 |
     sed -e "s:$HOME:~:"
diff --git a/bin/once-connected.zsh b/bin/once-connected.zsh
index 9613436..d867ddf 100755
--- a/bin/once-connected.zsh
+++ b/bin/once-connected.zsh
@@ -1,8 +1,6 @@
 #!/bin/zsh
 # vi:spl=en
 
-alias xterm='xterm -bg black -fg white -fa Hack -fs 10'
-
 
 ## Execution Log
 #
@@ -11,20 +9,17 @@ rm -f $LOG
 touch $LOG
 
 
-## Disk Usage
-#
-#xterm -geometry 50x8-99+99 -title "Disk Usage" -hold -e "grc --colour=auto df -h --output=pcent,target,size,used,avail / /rw"
-
-
 ## Versions Check
 #
-#xterm -geometry 100x40-99+99 -title "Versions Check" -hold -e "$HOME/bin/versions_check"
+#xterm -geometry 100x40-99+99 \
+#  -title "Versions Check" -hold \
+#  -e "read 'OK?Launch? '; $HOME/bin/versions_check"
 
 
 ## Qubes: Cleaning
 #
 #sudo apt clean
-rmdir $HOME/QubesIncoming/* --ignore-fail-on-non-empty
+#rmdir $HOME/QubesIncoming/* --ignore-fail-on-non-empty
 
 
 ## Qubes: Split SSH