diff --git a/bootstrap/packages_stable.tsv b/bootstrap/packages_stable.tsv
index ce731dd..b1a2864 100644
--- a/bootstrap/packages_stable.tsv
+++ b/bootstrap/packages_stable.tsv
@@ -23,6 +23,7 @@ bash-bats	Bash Automated Testing System	R
 bash-completion	Programmable completion for the bash shell	R	
 bash-language-server	Bash language server implementation based on Tree Sitter and its grammar for Bash	R	
 bat	Cat clone with syntax highlighting and git integration	R	
+bc	An arbitrary precision calculator language	R	
 bearssl	Implementation of the SSL/TLS protocol (RFC 5246) written in C	R	
 bemoji-git	Emoji picker that remembers your favorites.	A	
 bibclean	BibTeX and Scribe bibliography prettyprinter and syntax checker	A	
@@ -115,7 +116,6 @@ kanshi	Dynamic output configuration for Wayland WMs	R
 keyd	A key remapping daemon for linux.	A	
 khal	CLI calendar application build around CalDAV	R	
 khard	Console address book manager	R	
-kitty	A modern, hackable, featureful, OpenGL-based terminal emulator	R	
 kubo	IPFS implementation in Go	R	
 lazygit	Simple terminal UI for git commands	R	
 lib32-gamemode	A daemon/lib combo that allows games to request a set of optimisations be temporarily applied to the host OS	R	
@@ -253,7 +253,7 @@ reflector	A Python 3 module and script to retrieve and filter the latest Pacman
 remind	A sophisticated calendar and alarm program.	R	
 remmina	remote desktop client written in GTK+	R	
 restic	Fast, secure, efficient backup program	R	
-river	A dynamic tiling wayland compositor.	A	
+river	A dynamic tiling wayland compositor	R	
 rivercarro	A slightly modified version of rivertile layout generator for river.	A	
 rng-tools	Random number generator related utilities	R	
 sc-im	A spreadsheet program based on SC	A	
@@ -270,6 +270,7 @@ speedtest-cli	Command line interface for testing internet bandwidth using speedt
 sshfs	FUSE client based on the SSH File Transfer Protocol	R	
 steam	Valve's digital software delivery system	R	
 stow	Manage installation of multiple softwares in the same directory tree	R	
+sudo	Give certain users the ability to run some commands as root	R	
 surfraw	Shell Users' Revolutionary Front Rage Against the Web	R	
 swaybg	Wallpaper tool for Wayland compositors	R	
 swayidle	Idle management daemon for Wayland	R	
@@ -281,10 +282,11 @@ tea	A command line tool to interact with Gitea servers	R
 tex-gyre-fonts	Substitute PostScript fonts in OpenType format	R	
 texlab	A cross-platform implementation of the Language Server Protocol for LaTeX.	R	
 thermald	The Linux Thermal Daemon program from 01.org	R	
+tidy-viewer	CLI csv pretty printer that uses column styling	A	
 timew	Timewarrior, A command line time tracking application	R	
 timg	Terminal Image and Video Viewer	A	
 tlp	Linux Advanced Power Management	R	
-tmux	A terminal multiplexer	R	
+tmux	Terminal multiplexer	R	
 toilet	free replacement for the FIGlet utility.	A	
 topgrade-bin	Invoke the upgrade procedure of multiple package managers	A	
 traceroute	Tracks the route taken by packets over an IP network	R	
diff --git a/bootstrap/packages_testing.tsv b/bootstrap/packages_testing.tsv
index 081b461..f182ca3 100644
--- a/bootstrap/packages_testing.tsv
+++ b/bootstrap/packages_testing.tsv
@@ -1,7 +1,16 @@
 Name	Description	Source	Target
+ddrescue	GNU data recovery tool	R	
+go-mtpfs-git	Simple tool for viewing MTP devices as FUSE filesystems	A	
+libfido2	Library functionality for FIDO 2.0, including communication with a device over USB	R	
 most	A terminal pager similar to 'more' and 'less'	R	
 netbird-bin	A WireGuard-based mesh network that connects your devices into a single private network	A	
 odysseyra1n	Bootstraps Procursus and install Sileo/libhooker on devices jailbroken with checkra1n.	A	
+papis-zotero	Zotero remote server for papis	A	
+python-whoosh	Fast, pure-Python full text indexing, search, and spell checking library	R	
 shadow-tech	Desktop client for Shadow Tech cloud gaming service.	A	
 signal-desktop	Signal Private Messenger for Linux	R	
+testdisk	Checks and undeletes partitions + PhotoRec, signature based recovery tool	R	
+texlive-latexextra	TeX Live - Large collection of add-on packages for LaTeX	R	
+ttf-iosevka-nerd	Patched font Iosevka from nerd fonts library	R	
 vifm	A file manager with curses interface, which provides Vi[m]-like environment	R	
+yubikey-manager	Python library and command line tool for configuring a YubiKey	R	
diff --git a/desktop/.config/river/init b/desktop/.config/river/init
index 151c69d..7a95637 100755
--- a/desktop/.config/river/init
+++ b/desktop/.config/river/init
@@ -5,7 +5,7 @@ modemod="Mod1"
 term=${TERMINAL:-foot}
 time_to_lockscreen=300
 time_to_screendim=600
-time_to_suspend=1200
+time_to_suspend=900
 
 ## OPTIONS
 riverctl spawn "dbus-update-activation-environment SEATD_SOCK DISPLAY WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=river"
@@ -268,13 +268,13 @@ unset loc
 # start screen idle locking/dimming/sleep tool
 killall swayidle
 riverctl spawn "swayidle \
-    timeout ${time_to_lockscreen} 'pidof waylock || lockscreen' \
-    timeout ${time_to_screendim} 'wlopm --off \"*\"' \
-    timeout ${time_to_suspend} 'systemctl suspend-then-hibernate' \
-    resume 'wlopm --on \"*\"' \
-    after-resume 'wlopm --on \"*\"' \
-    before-sleep 'pidof waylock || lockscreen' &"
-
+    timeout ${time_to_suspend} \"systemctl suspend-then-hibernate\" \
+    timeout ${time_to_suspend} \"[ $(cat /sys/class/power_supply/AC/online) -eq 0 ] && systemctl suspend-then-hibernate\"
+    timeout ${time_to_screendim} \"wlopm --off '*'\" \
+    resume \"wlopm --on '*'\" \
+    timeout ${time_to_lockscreen} \"pidof waylock || lockscreen\" \
+    after-resume \"wlopm --on '*'\" \
+    before-sleep \"pidof waylock || lockscreen\" &"
 killall clipman
 riverctl spawn "wl-paste -t text --watch clipman store"
 # bash ~/.config/bin/gtktheme # setting our gtk variables
diff --git a/sh/.config/sh/alias b/sh/.config/sh/alias
index 5c64994..d26c91e 100644
--- a/sh/.config/sh/alias
+++ b/sh/.config/sh/alias
@@ -107,6 +107,8 @@ if exist imv-folder; then
     }
 else
     for cmd in imv nsxiv vimiv sxiv feh; do
+        # shellcheck disable=SC2139
+        # since we *want* it defined at definition
         if exist "$cmd"; then alias iv="$cmd"; break; fi
     done
 fi
@@ -128,3 +130,9 @@ fi
 if exist sc-im; then
     alias sc=sc-im
 fi
+
+if exist tidy-viewer; then
+    tv() {
+        tidy-viewer -a -e "$@" | less -S -R
+    }
+fi
diff --git a/sh/.config/sh/env b/sh/.config/sh/env
index 0d65e9e..febbaec 100644
--- a/sh/.config/sh/env
+++ b/sh/.config/sh/env
@@ -17,7 +17,7 @@ export LIBRARYROOT="${LIBRARYROOT:-$HOME/documents/library}"
 # the default bibtex file to work on
 # will change over time as primary projects change
 # basically functions as 'default library' variable
-export BIBFILE="${BIBFILE:-$LIBRARYROOT/academia/academia.bib}"
+export BIBFILE="${BIBFILE:-$LIBRARYROOT/library.bib}"
 
 # these are my personal 'important' application settings
 if exist nvim; then