diff --git a/.config/doom/config.el b/.config/doom/config.el
index 29676c6..a62fe40 100644
--- a/.config/doom/config.el
+++ b/.config/doom/config.el
@@ -200,6 +200,7 @@ Version 2019-11-04 2021-02-16"
 
 (use-package! org
   :bind (:map org-mode-map
+         ("C-c b" . org-cycle-list-bullet)
          ("C-c ." . org-time-stamp-inactive)
          ("C-c C-." . org-time-stamp)
          ("M-C-+" . org-timestamp-up)
@@ -385,6 +386,7 @@ Version 2019-11-04 2021-02-16"
                my/auto-org-roam-db-sync--timer-interval :repeat
                (and 'org-roam-db-sync 'org-roam-update-org-id-locations 'org-mode-restart)))))
     (my/auto-org-roam-db-sync-mode)
+    ;; Prompt after idleness - Focused? ETC? (Pragmatic Programmer) - org-journal
   )
 
 
diff --git a/.config/git/config b/.config/git/config
index ade574a..2d50da6 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -147,6 +147,7 @@
 	cme = commit -v --edit --message # Commit with message but edit it
 
 	cp = cherry-pick
+	cpc = cherry-pick --continue
 	rb = rebase
 	rbi = rebase --interactive
 	rbc = rebase --continue
diff --git a/.config/mimeapps.list b/.config/mimeapps.list
index 048240d..0ec7d96 100644
--- a/.config/mimeapps.list
+++ b/.config/mimeapps.list
@@ -8,6 +8,7 @@ application/x-mswinurl=firefox.desktop;
 application/xhtml+xml=firefox.desktop;
 application/zip=org.kde.ark.desktop;
 audio/flac=mpc.desktop;
+audio/mp4=mpc.desktop;
 audio/mpeg=mpc.desktop;
 audio/x-wav=mpc.desktop;
 image/jpeg=org.kde.showfoto.desktop;
@@ -25,6 +26,7 @@ application/x-mswinurl=firefox.desktop;
 application/xhtml+xml=firefox.desktop;
 application/zip=org.kde.ark.desktop;
 audio/flac=mpc.desktop;
+audio/mp4=mpc.desktop;
 audio/mpeg=mpc.desktop;
 audio/x-wav=mpc.desktop;
 image/jpeg=org.kde.showfoto.desktop;
diff --git a/.config/shell/browse b/.config/shell/browse
index dc43214..cc34244 100644
--- a/.config/shell/browse
+++ b/.config/shell/browse
@@ -26,7 +26,7 @@ cl() {
 
 # cd but search for data dirs and ls in new dir
 cd() {
-  if test -d "$DATA" && test "$1" != "-" -a ! -d "$1" -a $# -eq 1
+  if test -d "$DATA" && test "${1:--}" != "-" -a ! -d "$1" -a $# -eq 1
   then
     dir=$(fd --no-ignore --glob "$1*" "$DATA" --maxdepth 2 --type d --max-results 1)
     test -n "$dir" && cd "$dir"
diff --git a/.config/shell/functions b/.config/shell/functions
index 8341c07..efdeaee 100644
--- a/.config/shell/functions
+++ b/.config/shell/functions
@@ -273,7 +273,9 @@ compdef f=fd
 #alias f1='find -mindepth 1 -maxdepth 1'
 
 lowercase_transliterate="y/A-Z /a-z-/"
-which perl-rename >/dev/null && alias lowercase="perl-rename '$lowercase_transliterate'" || alias lowercase="rename '$lowercase_transliterate'"
+which perl-rename >/dev/null &&
+  alias lowercase="perl-rename -iv '$lowercase_transliterate'" ||
+  alias lowercase="rename -iv '$lowercase_transliterate'"
 
 # rsync directory properly - suffix both dirs with / to act on contents
 alias rc='rsync --recursive --info=progress2,remove,symsafe,flist,del --human-readable --links'
diff --git a/.config/shell/music b/.config/shell/music
index 54ce237..744da38 100644
--- a/.config/shell/music
+++ b/.config/shell/music
@@ -72,7 +72,7 @@ formatsongs() {
 	unset IFS
 }
 
-# Normalize filenames from stding
+# Normalize filenames for files given from stdin
 formatin() {
 	while read song; do
 		new="$(formatsong "$song")"
@@ -80,6 +80,7 @@ formatin() {
 	done
 }
 
+# Normalize the given filename
 formatsong() {
 	echo "$1" | sed -e 's/\b\(ft\|Ft\|Feat\|featuring\)\([ .]\)/feat\2/;
 		s/\bfeat /feat. /;
diff --git a/.local/bin/scripts/barg b/.local/bin/scripts/barg
index 845103b..5c94eb6 100755
--- a/.local/bin/scripts/barg
+++ b/.local/bin/scripts/barg
@@ -7,5 +7,5 @@ esac
 name="/mnt/backup/borg::$(test -n "$name" && echo "$name" || cat /etc/hostname)-${1:-system}-$(date -u +"%y%m%d")"
 echo "Backing up as $name"
 sudo borg create --progress --stats \
-  $(echo $DIRS_IGNORE_SAFE -x 'software-challenge/*/build' -x 'emacs/.local' | sed 's|-x \([^ ]\+\)|-e "*/\1" -e \1|g') \
+  $(echo $DIRS_IGNORE_SAFE -x 'software-challenge/*/build' -x 'emacs/.local' | sed 's|-x \([^ ]\+\)|-e "sh:**/\1"|g') \
   "$name" $(test $# -eq 0 && echo etc home root || test $# -eq 1 && echo $1) "${@:2}"
diff --git a/.local/bin/scripts/git-rmgonebranches b/.local/bin/scripts/git-prunerefs
similarity index 100%
rename from .local/bin/scripts/git-rmgonebranches
rename to .local/bin/scripts/git-prunerefs
diff --git a/README.org b/README.org
index 8fe6d82..fd87aa2 100644
--- a/README.org
+++ b/README.org
@@ -55,7 +55,7 @@ and configuration for ~less~ and ~fzf~.
 - mail :: offlineimap mu
 ** Graphical
 - x :: xorg-xserver xorg-xkill xorg-setxkbmap xorg-xinit xterm xclip xprintidle light
-- music production :: lilypond lilypond-docs timidity++ chordpro-git musescore
+- music production :: lilypond lilypond-docs timidity++ chordpro-git musescore mixxx-beta-git
 - video :: vlc obs-studio kdenlive
 - kde :: plasma-desktop plasma-nm spectacle breeze systemsettings konsole ktorrent dolphin kdeplasma-addons kinfocenter partitionmanager kdeconnect kwallet-pam kwalletmanager ksshaskpass okular bluedevil
 - office :: emacs texlive-core texlive-latexextra context-bin libreoffice-fresh
@@ -78,9 +78,9 @@ https://addons.mozilla.org/firefox/addon/masterpassword-firefox
 *** Dev
 #+begin_source sh
 yays intellij-idea-ultimate-edition intellij-idea-ultimate-edition-jre \
-clion clion-jre cmake gdb \
 jdk-openjdk java-openjfx jdk8-openjdk java8-openjfx
 archlinux-java set jdk8-openjdk
+yays clion clion-jre cmake gdb python-pre-commit
 #+end_source
 **** Android
 : yays android-udev android-tools adbfs-rootless-git android-studio