diff --git a/docker/operations/db_backup.sh b/docker/operations/db_backup.sh
index a64fd99..a8feaf5 100755
--- a/docker/operations/db_backup.sh
+++ b/docker/operations/db_backup.sh
@@ -7,13 +7,12 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 
 # Source the runtime environment for asteroid.radio. creds, paths &c
 
-if [[ -f ${HOME}/SourceCode/lisp/asteroid/docker/environment.sh ]]; then
-    . ${HOME}/SourceCode/lisp/asteroid/docker/environment.sh
-fi
+# if [[ -f "${HOME}"/SourceCode/lisp/asteroid/docker/environment.sh ]]; then
+#     source "${HOME}"/SourceCode/lisp/asteroid/docker/environment.sh
+# fi
 
 BACKUP_DIR=${SCRIPT_DIR}/db_backups
 mkdir -p "$BACKUP_DIR"
 
-docker exec asteroid-postgres sh -c 'pg_dump $POSTGRES_DB -U $POSTGRES_USER -F p' | xz --compress -c > ${BACKUP_DIR}/db_$(date +%Y-%m-%d-%H.%M.%S)_backup.sql.xz
-
+docker exec asteroid-postgres sh -c 'pg_dump $POSTGRES_DB -U $POSTGRES_USER -F p' | xz --compress -c > "${BACKUP_DIR}"/db_"$(date +%Y-%m-%d-%H.%M.%S)"_backup.sql.xz
 
diff --git a/playlists/stream-queue.m3u b/playlists/stream-queue.m3u
deleted file mode 100644
index 0f84bed..0000000
--- a/playlists/stream-queue.m3u
+++ /dev/null
@@ -1,207 +0,0 @@
-#EXTM3U
-#PLAYLIST:Morning Drift
-#PHASE:Morning Drift
-#DURATION:6 hours (approx)
-#CURATOR:Asteroid Radio
-#DESCRIPTION:Lighter, awakening ambient for the morning hours (06:00-12:00)
-
-#EXTINF:-1,Brian Eno - Emerald And Lime
-/app/music/Brian Eno/2011 - Small Craft On a Milk Sea/A1 Emerald And Lime.flac
-#EXTINF:-1,Tycho - Glider
-/app/music/Tycho - Epoch (Deluxe Version) (2019) [WEB FLAC16-44.1]/01 - Glider.flac
-#EXTINF:-1,Biosphere - Drifter
-/app/music/Biosphere - The Petrified Forest (2017) - CD FLAC/01. Biosphere - Drifter.flac
-#EXTINF:-1,Four Tet - Alap
-/app/music/Four Tet - New Energy {CD} [FLAC] (2017)/01 Alap.flac
-#EXTINF:-1,Johann Johannsson - Cambridge, 1963
-/app/music/Johann Johannsson - The Theory of Everything (2014) [FLAC]/01 - Cambridge, 1963.flac
-#EXTINF:-1,Ulrich Schnauss - Negative Sunrise (2019 Version)
-/app/music/Ulrich Schnauss - No Further Ahead Than Tomorrow (2020) - WEB FLAC/09. Negative Sunrise (2019 Version).flac
-#EXTINF:-1,Kiasmos - Lit
-/app/music/Kiasmos/2014 - Kiasmos/01 - Lit.flac
-#EXTINF:-1,FSOL - Mountain Path
-/app/music/The Future Sound of London - Environment Six (2016 - WEB - FLAC)/02 - Mountain Path.flac
-#EXTINF:-1,Brian Eno - Garden of Stars
-/app/music/Brian Eno/2022 - ForeverAndEverNoMore/04 Garden of Stars.flac
-#EXTINF:-1,Clark - Kiri's Glee
-/app/music/Clark - Kiri Variations (2019) [WEB FLAC]/04 - Kiri's Glee.flac
-#EXTINF:-1,Tycho - Source
-/app/music/Tycho - Epoch (Deluxe Version) (2019) [WEB FLAC16-44.1]/07 - Source.flac
-#EXTINF:-1,Biosphere - Out Of The Cradle
-/app/music/Biosphere - Departed Glories (2016) - FLAC WEB/01 - Out Of The Cradle.flac
-#EXTINF:-1,Tangerine Dream - Token from Birdland
-/app/music/Tangerine Dream - Ambient Monkeys (flac)/01 Tangerine Dream - Token from Birdland.flac
-#EXTINF:-1,Four Tet - Scientists
-/app/music/Four Tet - New Energy {CD} [FLAC] (2017)/06 Scientists.flac
-#EXTINF:-1,Ulrich Schnauss & Jonas Munk - Solitary Falling
-/app/music/Ulrich Schnauss & Jonas Munk - Eight Fragments Of An Illusion (2021) - WEB FLAC/03. Solitary Falling.flac
-#EXTINF:-1,Proem - Modern Rope
-/app/music/Proem - 2018 Modern Rope (WEB)/05. Modern Rope.flac
-#EXTINF:-1,Johann Johannsson - Rowing
-/app/music/Johann Johannsson - The Theory of Everything (2014) [FLAC]/02 - Rowing.flac
-#EXTINF:-1,Kiasmos - Held
-/app/music/Kiasmos/2014 - Kiasmos/02 - Held.flac
-#EXTINF:-1,Brian Eno - Complex Heaven
-/app/music/Brian Eno/2011 - Small Craft On a Milk Sea/A2 Complex Heaven.flac
-#EXTINF:-1,Biosphere - Skålbrekka
-/app/music/Biosphere - The Senja Recordings (2019) [FLAC]/01 - Skålbrekka.flac
-#EXTINF:-1,FSOL - Thought Pattern
-/app/music/The Future Sound of London - Environment Six (2016 - WEB - FLAC)/03 - Thought Pattern.flac
-#EXTINF:-1,Tycho - Into The Woods
-/app/music/Tycho - Simulcast (2020) [WEB FLAC]/04 - Into The Woods.flac
-#EXTINF:-1,arovane - hymn
-/app/music/arovane - Wirkung (2020) [WEB FLAC16]/12. arovane - hymn.flac
-#EXTINF:-1,Four Tet - Green
-/app/music/Four Tet - Sixteen Oceans (2020) {Text Records - TEXT051} [CD FLAC]/12 - Four Tet - Green.flac
-#EXTINF:-1,Clark - Primary Pluck
-/app/music/Clark - Kiri Variations (2019) [WEB FLAC]/08 - Primary Pluck.flac
-#EXTINF:-1,Biosphere - Strandby
-/app/music/Biosphere - The Senja Recordings (2019) [FLAC]/02 - Strandby.flac
-#EXTINF:-1,Johann Johannsson - The Dreams That Stuff Is Made Of
-/app/music/Johann Johannsson - The Theory of Everything (2014) [FLAC]/11 - The Dreams That Stuff Is Made Of.flac
-#EXTINF:-1,Ulrich Schnauss & Jonas Munk - Polychrome
-/app/music/Ulrich Schnauss & Jonas Munk - Eight Fragments Of An Illusion (2021) - WEB FLAC/08. Polychrome.flac
-#EXTINF:-1,Kiasmos - Swayed
-/app/music/Kiasmos/2014 - Kiasmos/04 - Swayed.flac
-#EXTINF:-1,Brian Eno - These Small Noises
-/app/music/Brian Eno/2022 - ForeverAndEverNoMore/09 These Small Noises.flac
-#EXTINF:-1,Tycho - Ascension
-/app/music/Thievery Corporation and Tycho - Fragments  Ascension EP (flac)/3. Tycho - Ascension.flac
-#EXTINF:-1,FSOL - Imagined Friends
-/app/music/The Future Sound of London - Environment Six (2016 - WEB - FLAC)/15 - Imagined Friends.flac
-#EXTINF:-1,Biosphere - Lysbotn
-/app/music/Biosphere - The Senja Recordings (2019) [FLAC]/11 - Lysbotn.flac
-#EXTINF:-1,Boards of Canada - In a Beautiful Place Out in the Country
-/app/music/Boards of Canada/In a Beautiful Place Out in the Country/01 Kid for Today.flac
-#EXTINF:-1,Brian Eno - Making Gardens Out of Silence
-/app/music/Brian Eno/2022 - ForeverAndEverNoMore/10 Making Gardens Out of Silence.flac
-#EXTINF:-1,Tangerine Dream - Virtue Is Its Own Reward
-/app/music/Tangerine Dream - Ambient Monkeys (flac)/10 Tangerine Dream - Virtue Is Its Own Reward.flac
-#EXTINF:-1,Brian Eno - Small Craft On A Milk Sea
-/app/music/Brian Eno/2011 - Small Craft On a Milk Sea/A3 Small Craft On A Milk Sea.flac
-#EXTINF:-1,Tycho - Horizon
-/app/music/Tycho - Epoch (Deluxe Version) (2019) [WEB FLAC16-44.1]/02 - Horizon.flac
-#EXTINF:-1,Four Tet - Two Thousand And Seventeen
-/app/music/Four Tet - New Energy {CD} [FLAC] (2017)/02 Two Thousand And Seventeen.flac
-#EXTINF:-1,Boards of Canada - Dayvan Cowboy
-/app/music/Boards of Canada/Trans Canada Highway/01 - Dayvan Cowboy.mp3
-#EXTINF:-1,Ulrich Schnauss - Melts into Air (2019 Version)
-/app/music/Ulrich Schnauss - No Further Ahead Than Tomorrow (2020) - WEB FLAC/01. Melts into Air (2019 Version).flac
-#EXTINF:-1,arovane - olopp_eleen
-/app/music/arovane - Wirkung (2020) [WEB FLAC16]/01. arovane - olopp_eleen.flac
-#EXTINF:-1,Biosphere - Bergsbotn
-/app/music/Biosphere - The Senja Recordings (2019) [FLAC]/03 - Bergsbotn.flac
-#EXTINF:-1,F.S.Blumm & Nils Frahm - Perff
-/app/music/F.S Blumm and Nils Frahm - Music For Wobbling Music Versus Gravity (2013 - WEB - FLAC)/02. F.S.Blumm & Nils Frahm - Perff.flac
-#EXTINF:-1,Clark - Simple Homecoming Loop
-/app/music/Clark - Kiri Variations (2019) [WEB FLAC]/02 - Simple Homecoming Loop.flac
-#EXTINF:-1,Tycho - Slack
-/app/music/Tycho - Epoch (Deluxe Version) (2019) [WEB FLAC16-44.1]/03 - Slack.flac
-#EXTINF:-1,Johann Johannsson - A Game Of Croquet
-/app/music/Johann Johannsson - The Theory of Everything (2014) [FLAC]/07 - A Game Of Croquet.flac
-#EXTINF:-1,FSOL - Motioned
-/app/music/The Future Sound of London - Environment Six (2016 - WEB - FLAC)/04 - Motioned.flac
-#EXTINF:-1,Brian Eno - Flint March
-/app/music/Brian Eno/2011 - Small Craft On a Milk Sea/A4 Flint March.flac
-#EXTINF:-1,Four Tet - Lush
-/app/music/Four Tet - New Energy {CD} [FLAC] (2017)/05 Lush.flac
-#EXTINF:-1,Boards of Canada - Turquoise Hexagon Sun
-/app/music/Boards of Canada/Hi Scores/02 - Turquoise Hexagon Sun.mp3
-#EXTINF:-1,Ulrich Schnauss - Love Grows Out of Thin Air (2019 Version)
-/app/music/Ulrich Schnauss - No Further Ahead Than Tomorrow (2020) - WEB FLAC/02. Love Grows Out of Thin Air (2019 Version).flac
-#EXTINF:-1,arovane - wirkung
-/app/music/arovane - Wirkung (2020) [WEB FLAC16]/02. arovane - wirkung.flac
-#EXTINF:-1,Biosphere - Berg
-/app/music/Biosphere - The Senja Recordings (2019) [FLAC]/05 - Berg.flac
-#EXTINF:-1,God is an Astronaut - Komorebi
-/app/music/God is an Astronaut - Epitaph (2018) WEB FLAC/05. Komorebi.flac
-#EXTINF:-1,Tycho - Weather
-/app/music/Tycho - Simulcast (2020) [WEB FLAC]/01 - Weather.flac
-#EXTINF:-1,Port Blue - Sunset Cruiser
-/app/music/Port Blue - The Airship (2007)/04. Sunset Cruiser.flac
-#EXTINF:-1,F.S.Blumm & Nils Frahm - Exercising Levitation
-/app/music/F.S Blumm and Nils Frahm - Music For Wobbling Music Versus Gravity (2013 - WEB - FLAC)/07. F.S.Blumm & Nils Frahm - Exercising Levitation.flac
-#EXTINF:-1,Four Tet - You Are Loved
-/app/music/Four Tet - New Energy {CD} [FLAC] (2017)/08 You Are Loved.flac
-#EXTINF:-1,Ulrich Schnauss & Jonas Munk - Asteroid 2467
-/app/music/Ulrich Schnauss & Jonas Munk - Eight Fragments Of An Illusion (2021) - WEB FLAC/01. Asteroid 2467.flac
-#EXTINF:-1,Boards of Canada - Left Side Drive
-/app/music/Boards of Canada/Trans Canada Highway/02 - Left Side Drive.mp3
-#EXTINF:-1,Brian Eno - Who Gives a Thought
-/app/music/Brian Eno/2022 - ForeverAndEverNoMore/01 Who Gives a Thought.flac
-#EXTINF:-1,arovane - find
-/app/music/arovane - Wirkung (2020) [WEB FLAC16]/03. arovane - find.flac
-#EXTINF:-1,Tycho - Receiver
-/app/music/Tycho - Epoch (Deluxe Version) (2019) [WEB FLAC16-44.1]/04 - Receiver.flac
-#EXTINF:-1,Johann Johannsson - The Origins Of Time
-/app/music/Johann Johannsson - The Theory of Everything (2014) [FLAC]/08 - The Origins Of Time.flac
-#EXTINF:-1,FSOL - Lichaen
-/app/music/The Future Sound of London - Environment Six (2016 - WEB - FLAC)/05 - Lichaen.flac
-#EXTINF:-1,Biosphere - Kyle
-/app/music/Biosphere - The Senja Recordings (2019) [FLAC]/06 - Kyle.flac
-#EXTINF:-1,Port Blue - The Grand Staircase
-/app/music/Port Blue - The Airship (2007)/03. The Grand Staircase.flac
-#EXTINF:-1,Vector Lovers - City Lights From A Train
-/app/music/Vector Lovers/2005 - Capsule For One/01 - City Lights From A Train.mp3
-#EXTINF:-1,Four Tet - Teenage Birdsong
-/app/music/Four Tet - Sixteen Oceans (2020) {Text Records - TEXT051} [CD FLAC]/04 - Four Tet - Teenage Birdsong.flac
-#EXTINF:-1,Ulrich Schnauss - The Magic in You (2019 Version)
-/app/music/Ulrich Schnauss - No Further Ahead Than Tomorrow (2020) - WEB FLAC/03. The Magic in You (2019 Version).flac
-#EXTINF:-1,Boards of Canada - Oirectine
-/app/music/Boards of Canada/Twoism/02 - Oirectine.mp3
-#EXTINF:-1,Clark - Bench
-/app/music/Clark - Kiri Variations (2019) [WEB FLAC]/03 - Bench.flac
-#EXTINF:-1,Tycho - Alright
-/app/music/Tycho - Simulcast (2020) [WEB FLAC]/02 - Alright.flac
-#EXTINF:-1,Brian Eno - Lesser Heaven
-/app/music/Brian Eno/2011 - Small Craft On a Milk Sea/C3 Lesser Heaven.flac
-#EXTINF:-1,arovane - sloon
-/app/music/arovane - Wirkung (2020) [WEB FLAC16]/05. arovane - sloon.flac
-#EXTINF:-1,God is an Astronaut - Epitaph
-/app/music/God is an Astronaut - Epitaph (2018) WEB FLAC/01. Epitaph.flac
-#EXTINF:-1,F.S.Blumm & Nils Frahm - Silently Sharing
-/app/music/F.S Blumm and Nils Frahm - Music For Wobbling Music Versus Gravity (2013 - WEB - FLAC)/10. F.S.Blumm & Nils Frahm - Silently Sharing.flac
-#EXTINF:-1,Biosphere - Fjølhøgget
-/app/music/Biosphere - The Senja Recordings (2019) [FLAC]/07 - Fjølhøgget.flac
-#EXTINF:-1,Port Blue - Over Atlantic City
-/app/music/Port Blue - The Airship (2007)/02. Over Atlantic City.flac
-#EXTINF:-1,Johann Johannsson - Viva Voce
-/app/music/Johann Johannsson - The Theory of Everything (2014) [FLAC]/09 - Viva Voce.flac
-#EXTINF:-1,Tangerine Dream - Symphony in A-minor
-/app/music/Tangerine Dream - Ambient Monkeys (flac)/02 Tangerine Dream - Symphony in A-minor.flac
-#EXTINF:-1,Tycho - Epoch
-/app/music/Tycho - Epoch (Deluxe Version) (2019) [WEB FLAC16-44.1]/05 - Epoch.flac
-#EXTINF:-1,Four Tet - Memories
-/app/music/Four Tet - New Energy {CD} [FLAC] (2017)/11 Memories.flac
-#EXTINF:-1,Ulrich Schnauss & Jonas Munk - Return To Burlington
-/app/music/Ulrich Schnauss & Jonas Munk - Eight Fragments Of An Illusion (2021) - WEB FLAC/02. Return To Burlington.flac
-#EXTINF:-1,Boards of Canada - Skyliner
-/app/music/Boards of Canada/Trans Canada Highway/04 - Skyliner.mp3
-#EXTINF:-1,Vector Lovers - Melodies And Memory
-/app/music/Vector Lovers/2005 - Capsule For One/07 - Melodies And Memory.mp3
-#EXTINF:-1,Brian Eno - Icarus or Blériot
-/app/music/Brian Eno/2022 - ForeverAndEverNoMore/03 Icarus or Blériot.flac
-#EXTINF:-1,arovane - noondt
-/app/music/arovane - Wirkung (2020) [WEB FLAC16]/07. arovane - noondt.flac
-#EXTINF:-1,FSOL - Symphony for Halia
-/app/music/The Future Sound of London - Environment Six (2016 - WEB - FLAC)/14 - Symphony for Halia.flac
-#EXTINF:-1,Biosphere - Straumen
-/app/music/Biosphere - The Senja Recordings (2019) [FLAC]/12 - Straumen.flac
-#EXTINF:-1,Port Blue - The Gentle Descent
-/app/music/Port Blue - The Airship (2007)/12. The Gentle Descent.flac
-#EXTINF:-1,Proem - As They Go
-/app/music/Proem/2019 - As They Go/Proem - As They Go - 01 As They Go.flac
-#EXTINF:-1,Tycho - Outer Sunset
-/app/music/Tycho - Simulcast (2020) [WEB FLAC]/03 - Outer Sunset.flac
-#EXTINF:-1,Four Tet - Planet
-/app/music/Four Tet - New Energy {CD} [FLAC] (2017)/14 Planet.flac
-#EXTINF:-1,Ulrich Schnauss - New Day Starts at Dawn (2019 Version)
-/app/music/Ulrich Schnauss - No Further Ahead Than Tomorrow (2020) - WEB FLAC/07. New Day Starts at Dawn (2019 Version).flac
-#EXTINF:-1,Clark - Goodnight Kiri
-/app/music/Clark - Kiri Variations (2019) [WEB FLAC]/14 - Goodnight Kiri.flac
-#EXTINF:-1,Biosphere - Steinfjord
-/app/music/Biosphere - The Senja Recordings (2019) [FLAC]/13 - Steinfjord.flac
-#EXTINF:-1,Tangerine Dream - Calyx Calamander
-/app/music/Tangerine Dream - Ambient Monkeys (flac)/04 Tangerine Dream - Calyx Calamander.flac
-#EXTINF:-1,Vector Lovers - To The Stars
-/app/music/Vector Lovers/2005 - Capsule For One/12 - To The Stars.mp3