24 files changed, 75 insertions, 147 deletions
diff --git a/album/catch-322.yaml b/album/catch-322.yaml
index 2f2bf013..3ca2bf33 100644
--- a/album/catch-322.yaml
+++ b/album/catch-322.yaml
@@ -1,5 +1,4 @@
 Album: Catch 322
-Directory: catch-322
 Date: August 13, 2019
 Date Added: October 25, 2023
 URLs:
diff --git a/album/corporate-holiday-hits.yaml b/album/corporate-holiday-hits.yaml
index 6e1d06b7..60aedb6d 100644
--- a/album/corporate-holiday-hits.yaml
+++ b/album/corporate-holiday-hits.yaml
@@ -1,5 +1,4 @@
 Album: Corporate Holiday Hits
-Directory: corporate-holiday-hits
 Date: December 25, 2020
 Date Added: October 25, 2023
 URLs:
diff --git a/album/dead-shufflers-anything-goes.yaml b/album/dead-shufflers-anything-goes.yaml
index bb5dc00e..6fc8e171 100644
--- a/album/dead-shufflers-anything-goes.yaml
+++ b/album/dead-shufflers-anything-goes.yaml
@@ -1,5 +1,4 @@
 Album: 'Dead Shufflers: Anything Goes'
-Directory: dead-shufflers-anything-goes
 Date: May 23, 2020
 Date Added: October 25, 2023
 URLs:
diff --git a/album/empyreal-rhapsody.yaml b/album/empyreal-rhapsody.yaml
index 2ff6e4db..40208e9f 100644
--- a/album/empyreal-rhapsody.yaml
+++ b/album/empyreal-rhapsody.yaml
@@ -1,5 +1,4 @@
 Album: Empyreal Rhapsody
-Directory: empyreal-rhapsody
 Date: October 12, 2021
 Date Added: October 25, 2023
 URLs:
diff --git a/album/farewell-to-all-the-fish.yaml b/album/farewell-to-all-the-fish.yaml
index 6738aab9..e9bfb97e 100644
--- a/album/farewell-to-all-the-fish.yaml
+++ b/album/farewell-to-all-the-fish.yaml
@@ -13,7 +13,6 @@ Groups:
 - Fandom
 - Beyond
 Cover Art File Extension: png
-# TODO: replace external links with wiki links as these albums get added
 Commentary: |-
     <i>artist:kobacat:</i> (Bandcamp about blurb)
 
diff --git a/album/fighting-further.yaml b/album/fighting-further.yaml
index 9843fe05..e6a2c7fb 100644
--- a/album/fighting-further.yaml
+++ b/album/fighting-further.yaml
@@ -1,5 +1,4 @@
 Album: Fighting Further
-Directory: fighting-further
 Date: November 4, 2023
 Date Added: April 13, 2024
 URLs:
diff --git a/album/homestuck-vol-6.yaml b/album/homestuck-vol-6.yaml
index 5a25c7d0..41a4f467 100644
--- a/album/homestuck-vol-6.yaml
+++ b/album/homestuck-vol-6.yaml
@@ -142,6 +142,7 @@ Referenced Tracks:
 - Penumbra Phantasm
 - An Unbreakable Union
 - Courser
+- track:sburban-jungle
 - track:carefree-action
 - Homestuck Anthem
 Sheet Music Files:
diff --git a/album/magnum-opus.yaml b/album/magnum-opus.yaml
index ab77fc68..fc6621f8 100644
--- a/album/magnum-opus.yaml
+++ b/album/magnum-opus.yaml
@@ -1,5 +1,4 @@
 Album: Magnum Opus
-Directory: magnum-opus
 Date: March 22, 2023
 Date Added: April 13, 2024
 URLs:
diff --git a/album/midworld-merriment.yaml b/album/midworld-merriment.yaml
index 325cca26..a6c31ff9 100644
--- a/album/midworld-merriment.yaml
+++ b/album/midworld-merriment.yaml
@@ -70,6 +70,8 @@ URLs:
 - https://nightslights.bandcamp.com/track/lotsa-presents
 ---
 Track: Wieczna Zimny
+Additional Names:
+- Eternal Cold (English)
 Artists:
 - leiirue
 Duration: '1:52' 
diff --git a/album/references-beyond-homestuck.yaml b/album/references-beyond-homestuck.yaml
index 010addc6..f2e7df78 100644
--- a/album/references-beyond-homestuck.yaml
+++ b/album/references-beyond-homestuck.yaml
@@ -15342,8 +15342,8 @@ URLs:
 ---
 Track: Here Comes Santa Claus
 Artists:
-- Oakley Haldeman
-- Gene Autry
+- Gene Autry (lyrics, performance)
+- Oakley Haldeman (composition)
 Duration: '2:34'
 URLs:
 - https://www.youtube.com/watch?v=U6kRYKvWF1E
@@ -16159,59 +16159,6 @@ Artists:
 URLs:
 - https://www.youtube.com/watch?v=quxTnEEETbo
 ---
-Track: Santa Claus Is Comin' to Town
-Artists:
-- John Frederick Coots
-- Haven Gillespie
-URLs:
-- https://www.youtube.com/watch?v=zFSVT8PFyI8
-Lyrics: |-
-    I've just come back from a lovely trip
-    Along the Milky Way
-    I stopped off at the North Pole
-    To spend the holiday
-
-    I called on dear old Santa Claus
-    To see what I could see
-    He took me to his workshop
-    And told his plan to me
-
-    So you better watch out
-    You better not cry
-    You better not pout
-    I'm telling you why
-    Santa Claus is comin' to town
-
-    He's making a list
-    Checking it twice
-    Gonna find out who's naughty or nice
-    Santa Claus is comin' to town
-
-    He sees you when you're sleeping
-    He knows when you're awake
-    He knows if you've been good or bad
-    So be good for goodness' sake
-
-    Oh you better watch out
-    You better not cry
-    You better not pout
-    I'm telling you why
-    Santa Claus is comin' to town
-
-    Oh you better watch out
-    You better not cry
-    You better not pout
-    I'm telling you why
-    Santa Claus is comin' to town
-Commentary: |-
-    <i>Niklink:</i> (wiki editor)
-
-    The lyrics may be a little different to what you're used to, but they correspond to the first recording of this carol by Harry Reser.
-
-    <i>Quasar Nebula:</i> (wiki editor)
-
-    [For a very long time,](https://web.archive.org/web/20130111060110/http://xzazupsilon.webs.com/nsnd.html) listed as referenced during the introduction of [[track:gog-rest-ye-merry-prospitians]]; this appears to be [[track:here-comes-santa-claus]] instead.
----
 Track: Shchedryk
 Artists:
 - Mykola Leontovych
@@ -16792,55 +16739,50 @@ URLs:
 Commentary: |-
     <i>Niklink:</i> (wiki editor)
     Also known as the "Westminster Chimes", "Cambridge Quarters", or "Cambridge Chimes". While the task of composing the chimes was given to Joseph Jowett in 1793, it's believed that he was probably assisted by either John Randall or William Crotch.
-# ---
-# Track: When Johnny Comes Marching Home
-#
-#   # Used to be referenced by Land of Sand and Rails,
-#   # presently orphaned. See #hsmusic-chat:
-#   # https://discord.com/channels/749042497610842152/779895315750715422/1199169695908118600
-#
-# Artists:
-# - Patrick Gilmore
-# URLs:
-# - https://www.youtube.com/watch?v=WtEqgG2EdTs
-# Referenced Tracks:
-# - Johnny Fill Up the Bowl
-# Lyrics: |-
-#     When Johnny comes marching home again
-#     Hurrah! Hurrah!
-#     We'll give him a hearty welcome then
-#     Hurrah! Hurrah!
-#     The men will cheer and the boys will shout
-#     The ladies they will all turn out
-#     And we'll all feel gay
-#     When Johnny comes marching home
-#
-#     The old church bell will peal with joy
-#     Hurrah! Hurrah!
-#     To welcome home our darling boy
-#     Hurrah! Hurrah!
-#     The village lads and lassies say
-#     With roses they will strew the way
-#     And we'll all feel gay
-#     When Johnny comes marching home
-#
-#     Get ready for the Jubilee
-#     Hurrah! Hurrah!
-#     We'll give the hero three times three
-#     Hurrah! Hurrah!
-#     The laurel wreath is ready now
-#     To place upon his loyal brow
-#     And we'll all feel gay
-#     When Johnny comes marching home
-#
-#     Let love and friendship on that day
-#     Hurrah, hurrah!
-#     Their choicest pleasures then display
-#     Hurrah, hurrah!
-#     And let each one perform some part
-#     To fill with joy the warrior's heart
-#     And we'll all feel gay
-#     When Johnny comes marching home
+---
+Track: When Johnny Comes Marching Home
+Artists:
+- Patrick Gilmore
+URLs:
+- https://www.youtube.com/watch?v=WtEqgG2EdTs
+Referenced Tracks:
+- Johnny Fill Up the Bowl
+Lyrics: |-
+    When Johnny comes marching home again
+    Hurrah! Hurrah!
+    We'll give him a hearty welcome then
+    Hurrah! Hurrah!
+    The men will cheer and the boys will shout
+    The ladies they will all turn out
+    And we'll all feel gay
+    When Johnny comes marching home
+
+    The old church bell will peal with joy
+    Hurrah! Hurrah!
+    To welcome home our darling boy
+    Hurrah! Hurrah!
+    The village lads and lassies say
+    With roses they will strew the way
+    And we'll all feel gay
+    When Johnny comes marching home
+
+    Get ready for the Jubilee
+    Hurrah! Hurrah!
+    We'll give the hero three times three
+    Hurrah! Hurrah!
+    The laurel wreath is ready now
+    To place upon his loyal brow
+    And we'll all feel gay
+    When Johnny comes marching home
+
+    Let love and friendship on that day
+    Hurrah, hurrah!
+    Their choicest pleasures then display
+    Hurrah, hurrah!
+    And let each one perform some part
+    To fill with joy the warrior's heart
+    And we'll all feel gay
+    When Johnny comes marching home
 ---
 Track: Yama No Ongakuka
 Artists:
diff --git a/album/reminders-of-you-beta.yaml b/album/reminders-of-you-beta.yaml
index 466c5d8c..517f2d54 100644
--- a/album/reminders-of-you-beta.yaml
+++ b/album/reminders-of-you-beta.yaml
@@ -1,5 +1,4 @@
 Album: 'Reminders Of You [Beta]'
-Directory: reminders-of-you-beta
 Date: March 22, 2021
 Date Added: October 25, 2023
 URLs:
diff --git a/album/repiton.yaml b/album/repiton.yaml
index 123a6c73..4d497de2 100644
--- a/album/repiton.yaml
+++ b/album/repiton.yaml
@@ -1,5 +1,4 @@
 Album: Repiton
-Directory: repiton
 Date: May 25, 2018
 Date Added: October 25, 2023
 Artists:
diff --git a/album/running-for-eons.yaml b/album/running-for-eons.yaml
index ad44c1db..5c8b0d7b 100644
--- a/album/running-for-eons.yaml
+++ b/album/running-for-eons.yaml
@@ -1,5 +1,4 @@
 Album: Running For Eons
-Directory: running-for-eons
 Date: February 2, 2018
 Date Added: October 25, 2023
 URLs:
diff --git a/album/stable-time-loops-and-paradoxes.yaml b/album/stable-time-loops-and-paradoxes.yaml
index faf10228..05a2fe35 100644
--- a/album/stable-time-loops-and-paradoxes.yaml
+++ b/album/stable-time-loops-and-paradoxes.yaml
@@ -7,8 +7,6 @@ URLs:
 Cover Artists:
 - Culdhira
 Track Art File Extension: png
-# started by Celeste (until Delirious Biznasty, but Tranquil Downpour had just been started), continued & finished by Lilith
-# it's fair to say that it's from us both
 Art Tags:
 - John
 - Rose
@@ -19,7 +17,7 @@ Art Tags:
 - Dirk
 - Jake
 - LoWaS
-Color: '#7cf2fc'
+Color: '#77d9f4'
 Groups:
 - The Paradox Music Team
 - Fandom
@@ -139,7 +137,6 @@ Cover Artists:
 Art Tags:
 - Rose
 - Green Sun
-# - Thorns of Oglogoth
 Duration: '2:59'
 URLs:
 - https://www.youtube.com/watch?v=MUUpyZPWbew
@@ -184,7 +181,7 @@ Referenced Tracks:
 - track:beatdown-strider-style
 - track:mutiny
 - track:lotus
-- track:black
+- track:liquid-negrocity
 - Courser
 - track:cascade-beta
 - track:spiders-claw
@@ -193,8 +190,6 @@ Referenced Tracks:
 - Crystalanthemums
 - track:upward-movement-dave-owns
 - Another Jungle
-- track:MeGaLoVania
-#unsure of where Megalovania (or MeGaLoVania is referenced, but everything else should be fine
 Commentary: |-
     <i>apatheticPianist:</i> (composer, booklet commentary)
 
@@ -228,8 +223,6 @@ Cover Artists:
 Art Tags:
 - John
 - Dave
-# - Warhammer of Zillyhoo
-# - Caledfwlch
 Duration: '2:03'
 URLs:
 - https://www.youtube.com/watch?v=JLLIa558rug
@@ -597,13 +590,6 @@ Art Tags:
 - Jade
 - Lord English
 - Victory Platform
-# - Light
-# - Breath
-# - Time
-# - Space
-# - Caledfwlch
-# - Pop-a-matic Vrillyhoo Hammer
-# - Quills of Echidna
 Duration: '6:58'
 URLs:
 - https://www.youtube.com/watch?v=bM-xp_8g62M
@@ -782,15 +768,6 @@ Art Tags:
 - The Condesce
 - Lord English
 - The Felt
-# - Unbreakable Katana
-# - Dragon Cane
-# - Caledfwlch
-# - Pop-a-matic Vrillyhoo Hammer
-# - Quills of Echidna
-# - Chainsaw
-# - Fork
-# - Homes Smell Ya Later
-# - Flintlocks of Zillyhau
 - LoTaK
 - Derse
 - LoFaF
diff --git a/album/team-paradox.yaml b/album/team-paradox.yaml
index e8c89ddd..6071e6d5 100644
--- a/album/team-paradox.yaml
+++ b/album/team-paradox.yaml
@@ -146,6 +146,17 @@ Cover Artists:
 - Team Paradox
 Art Tags:
 - Consorts
+Referenced Tracks:
+- When Johnny Comes Marching Home
+Review Points:
+- Date Recorded: April 10, 2024
+  Field: Referenced Tracks
+  Notes: |-
+    Possibly not referencing When Johnny Comes Marching Home
+  Reference Discussions:
+  - Date: January 22, 2024
+    Annotation: "#hsmusic-chat"
+    URL: https://discord.com/channels/749042497610842152/779895315750715422/1199169695908118600
 ---
 Track: Belt of Venus
 Artists:
diff --git a/album/the-rebornening.yaml b/album/the-rebornening.yaml
index 36057e6f..19a27d1c 100644
--- a/album/the-rebornening.yaml
+++ b/album/the-rebornening.yaml
@@ -1,5 +1,4 @@
 Album: THE REBORNENING
-Directory: the-rebornening
 Date: January 25, 2017
 Date Added: October 25, 2023
 URLs:
diff --git a/album/unbeatable-demo-tapes.yaml b/album/unbeatable-demo-tapes.yaml
index cd8553c7..76a143ec 100644
--- a/album/unbeatable-demo-tapes.yaml
+++ b/album/unbeatable-demo-tapes.yaml
@@ -21,6 +21,7 @@ Additional Files:
   - bg.gif
 Commentary: |-
     <i>peak divide:</i> ([Bandcamp about blurb](https://peakdivide.bandcamp.com/album/unbeatable-demo-tapes))
+
     Includes instrumentals for tracks 2-8 as bonus tracks.
 
     UNBEATABLE: DEMO TAPES is the official soundtrack for UNBEATABLE [white label] - a special episode set in the world of UNBEATABLE. We will be updating DEMO TAPES with new music each time [white label] is updated, so please check back regularly!
@@ -31,6 +32,18 @@ Commentary: |-
     DEMO TAPES is separate from the final UNBEATABLE soundtrack, which will be released when UNBEATABLE is complete. All mixes presented in DEMO TAPES are not final and are subject to change in the full game.
 
     [unbeatablegame.com](https://www.unbeatablegame.com)
+
+    <i>peak divide:</i> ([Bandcamp credits blurb](https://peakdivide.bandcamp.com/album/unbeatable-demo-tapes))
+
+    [[artist:peak-divide|peak divide:]]<br>
+    [[artist:clara-maddux|Clara Maddux]] - composition, arrangement, guitars, bass, drums, lyrics<br>
+    [[artist:vasily-nikolaev|Vasily Nikolaev]] - composition, arrangement, synths, mixing, mastering
+
+    [[artist:rachel-lake|Rachel Lake]] - vocals, composition<br>
+    [[artist:robert-j-lake|RJ Lake]] - music supervision, lyrics, arrangement & composition on track 1 & 8<br>
+    [[artist:andrew-cleveland|Andrew Cleveland]] - guitar solo on track 2<br>
+    [[artist:derrick-lightning|Derrick Lightning]] - saxophone on track 9<br>
+    [[artist:andrew-tsai|Andrew Tsai]] - cover art design
 ---
 Section: Main Album
 ---
diff --git a/album/vast-error-vol-1-3.yaml b/album/vast-error-vol-1-3.yaml
index b270654f..a8015da3 100644
--- a/album/vast-error-vol-1-3.yaml
+++ b/album/vast-error-vol-1-3.yaml
@@ -1,5 +1,4 @@
 Album: Vast Error Vol. 1-3
-Directory: vast-error-vol-1-3
 Date: June 1, 2021
 Date Added: August 18, 2023
 Wallpaper Style: 'opacity: 0.85;'
diff --git a/album/vast-error-vol-1.yaml b/album/vast-error-vol-1.yaml
index bf19bea8..12f27838 100644
--- a/album/vast-error-vol-1.yaml
+++ b/album/vast-error-vol-1.yaml
@@ -1,5 +1,4 @@
 Album: Vast Error Vol. 1
-Directory: vast-error-vol-1
 Date: March 22, 2017
 Date Added: October 25, 2023
 URLs:
diff --git a/album/vast-error-vol-2.yaml b/album/vast-error-vol-2.yaml
index c786c291..1190fa71 100644
--- a/album/vast-error-vol-2.yaml
+++ b/album/vast-error-vol-2.yaml
@@ -1,5 +1,4 @@
 Album: Vast Error Vol. 2
-Directory: vast-error-vol-2
 Date: July 15, 2017
 Date Added: October 25, 2023
 URLs:
diff --git a/album/vast-error-vol-3.yaml b/album/vast-error-vol-3.yaml
index 16cac592..dcb18ba4 100644
--- a/album/vast-error-vol-3.yaml
+++ b/album/vast-error-vol-3.yaml
@@ -1,5 +1,4 @@
 Album: Vast Error Vol. 3
-Directory: vast-error-vol-3
 Date: December 18, 2017
 Date Added: October 25, 2023
 URLs:
diff --git a/album/vast-error-vol-4.yaml b/album/vast-error-vol-4.yaml
index 82031a84..fc15e5a3 100644
--- a/album/vast-error-vol-4.yaml
+++ b/album/vast-error-vol-4.yaml
@@ -1,5 +1,4 @@
 Album: Vast Error Vol. 4
-Directory: vast-error-vol-4
 Date: October 21, 2018
 Date Added: October 25, 2023
 Wallpaper File Extension: jpg
diff --git a/album/vast-error-vol-5-side-1.yaml b/album/vast-error-vol-5-side-1.yaml
index cf244b56..2fd5cf7d 100644
--- a/album/vast-error-vol-5-side-1.yaml
+++ b/album/vast-error-vol-5-side-1.yaml
@@ -1,5 +1,4 @@
 Album: 'Vast Error Vol. 5: Side 1'
-Directory: vast-error-vol-5-side-1
 Date: September 05, 2022
 Date Added: April 13, 2024
 URLs:
diff --git a/album/vast-error-vol-5-side-2.yaml b/album/vast-error-vol-5-side-2.yaml
index 96b7b0a1..10fa285f 100644
--- a/album/vast-error-vol-5-side-2.yaml
+++ b/album/vast-error-vol-5-side-2.yaml
@@ -1,5 +1,4 @@
 Album: 'Vast Error Vol. 5: Side 2'
-Directory: vast-error-vol-5-side-2
 Date: September 12, 2022
 Date Added: April 13, 2024
 URLs: