diff --git a/.local/bin/archlinux-update b/.bin/archlinux-update
similarity index 100%
rename from .local/bin/archlinux-update
rename to .bin/archlinux-update
diff --git a/.local/bin/backlight b/.bin/backlight
similarity index 100%
rename from .local/bin/backlight
rename to .bin/backlight
diff --git a/.local/bin/edit b/.bin/edit
similarity index 100%
rename from .local/bin/edit
rename to .bin/edit
diff --git a/.local/bin/git-fire b/.bin/git-fire
similarity index 100%
rename from .local/bin/git-fire
rename to .bin/git-fire
diff --git a/.local/bin/gpg2-decrypt b/.bin/gpg2-decrypt
similarity index 100%
rename from .local/bin/gpg2-decrypt
rename to .bin/gpg2-decrypt
diff --git a/.local/bin/gpg2-encrypt b/.bin/gpg2-encrypt
similarity index 100%
rename from .local/bin/gpg2-encrypt
rename to .bin/gpg2-encrypt
diff --git a/.local/bin/menu-shutdown b/.bin/menu-shutdown
similarity index 100%
rename from .local/bin/menu-shutdown
rename to .bin/menu-shutdown
diff --git a/.local/bin/passgen b/.bin/passgen
similarity index 100%
rename from .local/bin/passgen
rename to .bin/passgen
diff --git a/.local/bin/rankmirrors-personal-pref b/.bin/rankmirrors-personal-pref
similarity index 100%
rename from .local/bin/rankmirrors-personal-pref
rename to .bin/rankmirrors-personal-pref
diff --git a/.local/bin/screenshot b/.bin/screenshot
similarity index 100%
rename from .local/bin/screenshot
rename to .bin/screenshot
diff --git a/.bin/start_audio b/.bin/start_audio
new file mode 100755
index 0000000..5cb52c0
--- /dev/null
+++ b/.bin/start_audio
@@ -0,0 +1,57 @@
+#!/usr/bin/env sh
+
+start_audio_jack () {
+    wait-for-service --user "puseaudio.socket"
+
+    systemctl --user stop pulseaudio.service
+    systemctl --user stop pulseaudio.socket
+
+    sleep 1
+    jack_control ds alsa
+    jack_control dps device hw:U192k
+    jack_control dps rate 48000
+    jack_control dps nperiods 4
+    jack_control dps period 256
+    jack_control start
+
+    sleep 1
+    systemctl --user start pulseaudio
+
+    sleep 1
+    alsa_out -d hw:PCH -j "Speaker" -c 2 &
+    #alsa_out -d "hdmi:CARD=HDMI,DEV=5" -j "Speaker" -c 2 &
+
+    sleep 1
+    jack_connect "PulseAudio JACK Sink":front-left Speaker:playback_1
+    jack_connect "PulseAudio JACK Sink":front-right Speaker:playback_2
+
+    if [ -x "$(command -v jack-matchmaker)" ]
+    then
+        jack-matchmaker -e \
+            Mopidy:out_jackaudiosink0_1 Speaker:playback_1 \
+            Mopidy:out_jackaudiosink0_2 Speaker:playback_2 &
+    fi
+
+    sleep 3
+}
+
+
+start_audio_pipewire () {
+    wait-for-service --user "pipewire.service"
+    wait-for-service --user "wireplumber.service"
+
+    sleep 5
+
+    pw-link 'default-sink:monitor_FL' 'alsa_output.usb-BEHRINGER_UMC202HD_192k-00.analog-stereo:playback_FL'
+    pw-link 'default-sink:monitor_FR' 'alsa_output.usb-BEHRINGER_UMC202HD_192k-00.analog-stereo:playback_FR'
+
+    pw-link 'default-sink:monitor_FL' 'alsa_output.pci-0000_00_1f.3.analog-stereo:playback_FL'
+    pw-link 'default-sink:monitor_FR' 'alsa_output.pci-0000_00_1f.3.analog-stereo:playback_FR'
+}
+
+
+case $1 in
+    jack)        start_audio_jack ;;
+    pipewire)    start_audio_pipewire ;;
+    *)           echo "'$1' is not valid" ;;
+esac
diff --git a/.local/bin/vim-find b/.bin/vim-find
similarity index 100%
rename from .local/bin/vim-find
rename to .bin/vim-find
diff --git a/.local/bin/vim-grep b/.bin/vim-grep
similarity index 100%
rename from .local/bin/vim-grep
rename to .bin/vim-grep
diff --git a/.local/bin/wait-for-service b/.bin/wait-for-service
similarity index 100%
rename from .local/bin/wait-for-service
rename to .bin/wait-for-service
diff --git a/.config/environment b/.config/environment
index 435c113..0cb203c 100644
--- a/.config/environment
+++ b/.config/environment
@@ -48,7 +48,7 @@ export OPENFAAS_URL="https://faas.serguzim.me"
 export OSH="$XDG_CONFIG_HOME/bash/oh-my-bash"
 
 export PASSWORD_STORE_GENERATED_LENGTH='64'
-export PATH="$HOME/.local/bin:/usr/local/bin:/usr/bin:/usr/sbin:/bin:/sbin:$GOPATH/bin:$HOME/.cargo/bin"
+export PATH="$PATH:$HOME/.local/bin:$GOPATH/bin:$HOME/.cargo/bin:$HOME/.bin"
 
 export QT_QPA_PLATFORM="wayland;xcb"
 export QT_QPA_PLATFORMTHEME="qt5ct"
diff --git a/.local/bin/start_jack b/.local/bin/start_jack
deleted file mode 100755
index 8fab687..0000000
--- a/.local/bin/start_jack
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-until systemctl is-active --quiet --user pulseaudio.socket
-do
-    sleep 0.5
-done
-
-systemctl --user stop pulseaudio.service
-systemctl --user stop pulseaudio.socket
-
-sleep 1
-jack_control ds alsa
-jack_control dps device hw:U192k
-jack_control dps rate 48000
-jack_control dps nperiods 4
-jack_control dps period 256
-jack_control start
-
-sleep 1
-systemctl --user start pulseaudio
-
-sleep 1
-alsa_out -d hw:PCH -j "Speaker" -c 2 &
-#alsa_out -d "hdmi:CARD=HDMI,DEV=5" -j "Speaker" -c 2 &
-
-sleep 1
-jack_connect "PulseAudio JACK Sink":front-left Speaker:playback_1
-jack_connect "PulseAudio JACK Sink":front-right Speaker:playback_2
-
-if [ -x "$(command -v jack-matchmaker)" ]
-then
-    jack-matchmaker -e \
-        Mopidy:out_jackaudiosink0_1 Speaker:playback_1 \
-        Mopidy:out_jackaudiosink0_2 Speaker:playback_2 &
-fi
-
-sleep 3