diff --git a/.config/spectrwm/spectrwm.conf b/.config/spectrwm/spectrwm.conf
index 4151efe..b661ef5 100644
--- a/.config/spectrwm/spectrwm.conf
+++ b/.config/spectrwm/spectrwm.conf
@@ -193,7 +193,6 @@ bind[screenshot_wind]    = Print
 program[lock]       = /usr/bin/false
 
 autorun             = ws[10]:xcons
-autorun             = ws[10]:scratchpad
 
 # +--------------------------------------------------
 # | KEYBOARD MAPPING
diff --git a/.gitconfig b/.gitconfig
index b3b1182..68cd761 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -27,7 +27,7 @@
 [init]
 	defaultBranch = main
 [diff]
-	tool = vimdiff2
+	tool = vimdiff
 	noprefix = true
 [merge]
 	tool = vimdiff2
diff --git a/.kshrc b/.kshrc
index 49065a7..dd5927d 100644
--- a/.kshrc
+++ b/.kshrc
@@ -212,14 +212,6 @@ alias mutt-vorstand="mutt-codevoid vorstand"
 CVSROOT="sdk@cvs.openbsd.org:/cvs"
 export CVSROOT
 
-cvs_update_all() {(
-    set -ex
-    cd /usr/src      && doas -u sdk cvs -d $CVSROOT -z1 -q up -Pd -A
-    cd /usr/xenocara && doas -u sdk cvs -d $CVSROOT -z1 -q up -Pd -A
-    cd /usr/ports    && doas -u sdk cvs -d $CVSROOT -z1 -q up -Pd -A
-    cd /usr/www      && doas -u sdk cvs -d $CVSROOT -z1 -q up -Pd -A
-)}
-
 po() { cd $(make show=WRKSRC); }
 pj() {
     [ -z $1 ] && return 1