diff --git a/.gitignore b/.gitignore
index 61e4084..c22dbf2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -131,7 +131,6 @@ vlc/
 lxqt/
 rofi/
 QtProject.conf
-wget/
 java/
 xfce4/
 Thunar/
@@ -235,3 +234,4 @@ notmuch/
 mathematica/
 godot/
 firmadorlibre/
+Upscayl/
diff --git a/scripts/dwm/dwmotp b/scripts/dwm/dwmotp
index 7f11f86..3dd6a2b 100755
--- a/scripts/dwm/dwmotp
+++ b/scripts/dwm/dwmotp
@@ -1,5 +1,6 @@
 #!/bin/sh
 PASSWORD_STORE_DIR="$HOME/.local/share/password-store"
+GNUPGHOME="$HOME/.local/share/gnupg"
 
 password="$(~/.config/scripts/menu/menu-pass)"
 [ -z "$password" ] && exit
diff --git a/scripts/dwm/dwmpass b/scripts/dwm/dwmpass
index fe50caf..eba1946 100755
--- a/scripts/dwm/dwmpass
+++ b/scripts/dwm/dwmpass
@@ -1,5 +1,6 @@
 #!/bin/sh
 PASSWORD_STORE_DIR="$HOME/.local/share/password-store"
+GNUPGHOME="$HOME/.local/share/gnupg"
 
 password="$(~/.config/scripts/menu/menu-pass)"
 [ -z "$password" ] && exit
diff --git a/scripts/status/nettraf b/scripts/status/nettraf
index c9fec03..f9ee7ac 100755
--- a/scripts/status/nettraf
+++ b/scripts/status/nettraf
@@ -1,9 +1,6 @@
 #!/bin/sh
 # Modified version of Luke Smith's network usage script
 
-# Print cache so it doesn't get stuck in dwmblocks
-cat "$XDG_CACHE_HOME"/netstat
-
 # Store transferred and recieved bytes
 rstart="$(($(cat /sys/class/net/[ew]*/statistics/rx_bytes | paste -sd '+')))"
 tstart="$(($(cat /sys/class/net/[ew]*/statistics/tx_bytes | paste -sd '+')))"
@@ -14,4 +11,12 @@ tend="$(($(cat /sys/class/net/[ew]*/statistics/tx_bytes | paste -sd '+')))"
 # Format correctly and print
 dow=$(printf "%2sB\n" "$(numfmt --to=iec $(($rend-$rstart)))")
 up=$(printf "%2sB\n" "$(numfmt --to=iec $(($tend-$tstart)))")
-printf "$dow|$up" | sed 's/ //g' > "$XDG_CACHE_HOME"/netstat
+
+dow="${dow#* }"
+dow="${dow% *}"
+up="${up#* }"
+up="${up% *}"
+
+datestr="$(date '+%F %R:%S')"
+
+printf "\033[2m%s\033[0m | %-12s | %-12s\n" "$datestr" "down: $dow" "up: $up"
diff --git a/shell/env b/shell/env
index 1dc66e7..3ae13c6 100644
--- a/shell/env
+++ b/shell/env
@@ -43,9 +43,11 @@ export \
     QT_QPA_PLATFORMTHEME="qt5ct" \
     CM_SELECTIONS="clipboard" \
     GTK_THEME="Materia:dark" \
+    XCURSOR_THEME="Adwaita" \
     CM_MAX_CLIPS=10 \
 
 export \
     GITLAB="ssh://git@gitlab.com/tavo-wasd" \
+    HOMELAB="ssh://drive:/home/drive/drive" \
     BOOKMARKS="$HOME/Documents/bookmarks" \
     BIB="$HOME/Documents/bibliography" \
diff --git a/snippets/groff_ms.ms b/snippets/groff_ms.ms
new file mode 100644
index 0000000..130acf2
--- /dev/null
+++ b/snippets/groff_ms.ms
@@ -0,0 +1,39 @@
+.\" .ds FAM T       \" H=Helvetica C=Courier
+.\" .nr PS 10p      \" Point size
+.\" .nr VS 12p      \" Line spacing
+.\" .nr PO 1i       \" Page offset
+.\" .nr LL 6i       \" Line length
+.\" .nr LT 6i       \" Header/Footer length
+.\" .nr HM 1i       \" Header margin
+.\" .nr FM 1i       \" Footer margin
+.\" .so letter.tmac \" US letter
+.\" .so report.tmac \" Cover page
+.\" .so utils.tmac  \" General utils
+.\" .so toc.tmac    \" Relocate toc
+.\" .so md.tmac     \" Md-like syntax
+.\" .so math.tmac   \" Math utils
+.\" .so apa.tmac    \" Label & accumulate
+.\" .so es.tmac     \" Spanish
+.
+.TL
+<title>
+.AU
+<author>
+.AI
+<institution>
+.
+.AB
+<abstract>
+.AE
+.
+.NH
+.XN "<numbered heading>"
+.
+.PP
+<indented \f[CW]paragraph\f[] \m[blue]with\m[] \f[B]some\f[] \f[I]formatting\f[]>
+.
+.\" .[
+.\" sample_reference
+.\" .]
+.
+.\" .TC
diff --git a/snippets/groffbib b/snippets/groffbib
new file mode 100644
index 0000000..a366ad7
--- /dev/null
+++ b/snippets/groffbib
@@ -0,0 +1,18 @@
+%K sample_id
+%L sample_reference
+%A sample_author
+%Q sample_no_author
+%T sample_title
+%B sample_article
+%V sample_volume
+%D sample_date
+%C sample_place
+%E sample_editor
+%I sample_publisher
+%P sample_page_or_range
+%J sample_journal
+%N sample_journal_issue_number
+%R sample_technical_report_number
+%S sample_series_name
+%O sample_other_info
+%X sample_anotation
diff --git a/wget/wgetrc b/wget/wgetrc
new file mode 100644
index 0000000..e69de29