Merge remote-tracking branch 'niklink/staging' into staging

22 files changed, 181 insertions, 26 deletions

diff --git a/album/comfortable-bugs.yaml b/album/comfortable-bugs.yaml
index b9afa04..4268a19 100644
--- a/album/comfortable-bugs.yaml
+++ b/album/comfortable-bugs.yaml
@@ -275,6 +275,9 @@ Lyrics: |-
     Of all the errors I knew at the moment they were made
     Of the times that I left when I really should have stayed
     Of the secret inside that I'm still afraid
+Commentary: |-
+    <i>Michael Guy Bowman:</i>
+    (<a href="https://www.youtube.com/watch?v=_3xgvhsPJgA">Music video!</a>)
 ---
 Track: Three Small Words
 Duration: '4:04'
diff --git a/album/cosmic-caretakers.yaml b/album/cosmic-caretakers.yaml
index fdfb28f..8723d10 100644
--- a/album/cosmic-caretakers.yaml
+++ b/album/cosmic-caretakers.yaml
@@ -46,7 +46,7 @@ Commentary: |-
     <center>I AM SO, SO PROUD OF YOU.</center>
     <hr>
     <i>Quasar Nebula:</i>
-    (per [[track:jungle|LoFaM 4 standard]], ive highlighted commentary from people besides the original musicians or cover artists in bold!)
+    (per [[track:jungle-3|LoFaM 4 standard]], ive highlighted commentary from people besides the original musicians or cover artists in bold!)
 Banner Artists:
 - melodiousDiscord
 - Niklink (edits for wiki)
diff --git a/album/deltarune-ch2-ost.yaml b/album/deltarune-ch2-ost.yaml
index 819d678..9d224b4 100644
--- a/album/deltarune-ch2-ost.yaml
+++ b/album/deltarune-ch2-ost.yaml
@@ -65,6 +65,8 @@ Track: A Simple Diversion
 Duration: 0:31
 URLs:
 - https://tobyfox.bandcamp.com/track/a-simple-diversion
+Referenced Tracks:
+- Queen
 ---
 Track: Almost To The Guys!
 Duration: 0:17
@@ -80,6 +82,8 @@ Track: When I Get Mad I Dance Like This
 Duration: 0:10
 URLs:
 - https://tobyfox.bandcamp.com/track/when-i-get-mad-i-dance-like-this
+Referenced Tracks:
+- Casio VL-1 Demo
 ---
 Track: Cyber Battle (Solo)
 Directory: cyber-battle
@@ -128,11 +132,15 @@ Directory: faint-courage
 Duration: 0:52
 URLs:
 - https://tobyfox.bandcamp.com/track/faint-courage-game-over
+Referenced Tracks:
+- Darkness Falls
 ---
 Track: WELCOME TO THE CITY
 Duration: '1:54'
 URLs:
 - https://tobyfox.bandcamp.com/track/welcome-to-the-city
+Referenced Tracks:
+- Almost To The Guys!
 ---
 Track: Mini Studio
 Duration: 0:51
@@ -180,6 +188,8 @@ Track: Elegant Entrance
 Duration: '1:18'
 URLs:
 - https://tobyfox.bandcamp.com/track/elegant-entrance
+Referenced Tracks:
+- Queen
 ---
 Track: Bluebird of Misfortune
 Duration: 0:49
@@ -204,11 +214,15 @@ Track: Acid Tunnel of Love
 Duration: '1:30'
 URLs:
 - https://tobyfox.bandcamp.com/track/acid-tunnel-of-love
+Referenced Tracks:
+- track:lancer-deltarune
 ---
 Track: It's Pronounced "Rules"
 Duration: '1:01'
 URLs:
 - https://tobyfox.bandcamp.com/track/its-pronounced-rules
+Referenced Tracks:
+- Rouxls Kaard
 ---
 Track: Lost Girl
 Duration: '1:20'
@@ -219,6 +233,8 @@ Track: Ferris Wheel
 Duration: '1:19'
 URLs:
 - https://tobyfox.bandcamp.com/track/ferris-wheel
+Referenced Tracks:
+- Lost Girl
 ---
 Track: Attack of the Killer Queen
 Artists:
@@ -265,6 +281,8 @@ Track: Digital Roots
 Duration: 0:33
 URLs:
 - https://tobyfox.bandcamp.com/track/digital-roots
+Referenced Tracks:
+- Your Best Nightmare
 ---
 Track: Deal Gone Wrong
 Duration: 0:31
@@ -300,7 +318,6 @@ URLs:
 Referenced Tracks:
 - Spamton
 - The Circus
-- THE WORLD REVOLVING
 ---
 Track: sans.
 Directory: sans-deltarune-ch2
@@ -314,7 +331,6 @@ Duration: 0:24
 URLs:
 - https://tobyfox.bandcamp.com/track/chill-jailbreak-alarm-to-study-and-relax-to
 Referenced Tracks:
-- Spider Dance
 - Pathetic House
 ---
 Track: You Can Always Come Home
@@ -323,6 +339,10 @@ Originally Released As: track:you-can-always-come-home
 Duration: '1:43'
 URLs:
 - https://tobyfox.bandcamp.com/track/you-can-always-come-home-2
+Referenced Tracks:
+- track:home-undertale
+- Once Upon a Time
+- Don't Forget
 ---
 Track: Until Next Time
 Duration: '1:02'
@@ -345,3 +365,5 @@ Originally Released As: track:before-the-story
 Duration: '1:30'
 URLs:
 - https://tobyfox.bandcamp.com/track/before-the-story-2
+Referenced Tracks:
+- Once Upon a Time
diff --git a/album/electric-daydreams.yaml b/album/electric-daydreams.yaml
index 871e44c..ffd0907 100644
--- a/album/electric-daydreams.yaml
+++ b/album/electric-daydreams.yaml
@@ -266,6 +266,9 @@ Lyrics: |-
     Wherever we go, we go, oh no
     Whatever we know, we know, oh no
     Wherever we go, we go, we go
+Commentary: |-
+    <i>Michael Guy Bowman:</i>
+    (<a href="https://www.youtube.com/watch?v=2r_oulVo9nY">Music video!</a>)
 ---
 Track: I'm Seeing Everything
 Duration: '3:25'
@@ -401,6 +404,9 @@ Lyrics: |-
     I should just wait there, but I won't
     Suicide Hotline
     It's more than I can bear
+Commentary: |-
+    <i>Michael Guy Bowman:</i>
+    (<a href="https://www.youtube.com/watch?v=fqfLWlC7X6U">Music video!</a>)
 ---
 Track: Tomorrow's Gonna Come
 Duration: '3:04'
@@ -444,12 +450,17 @@ Lyrics: |-
     And if you don't believe, just look around and see
     Heaven only knows which way it's coming from
     But tomorrow's gonna come real soon
+Commentary: |-
+    <i>Michael Guy Bowman:</i>
+    (<a href="https://www.youtube.com/watch?v=pnVW71lwybY">Music video!</a>)
 ---
 Track: Purgatory
 Duration: '5:20'
 URLs:
 - https://bowman.bandcamp.com/track/purgatory
 - https://www.youtube.com/watch?v=x1zvH8JiPY4
+Cover Artists:
+- Hieronymous Bosch (original artwork)
 Lyrics: |-
     Oh Muses guide me, please provide me with your hallowed song
     I’ve been to Hell and back, I’m losing track of the road I’m on
diff --git a/album/gravity-makes-the-flame-rise.yaml b/album/gravity-makes-the-flame-rise.yaml
index 33ddda4..c9b3e4c 100644
--- a/album/gravity-makes-the-flame-rise.yaml
+++ b/album/gravity-makes-the-flame-rise.yaml
@@ -137,6 +137,9 @@ Lyrics: |-
     We're running back in time, yeah
     We're running back in time, yeah
     We're running back in time, yeah
+Commentary: |-
+    <i>Michael Guy Bowman:</i>
+    (<a href="https://www.youtube.com/watch?v=tl6xxSx9-Ww">Music video!</a>)
 ---
 Track: They Want To Live Forever
 Contributors:
@@ -238,6 +241,9 @@ Lyrics: |-
     If you really want to rule the world
     You're gonna have to burn it down
     Baby, you'll be burning out
+Commentary: |-
+    <i>Michael Guy Bowman:</i>
+    (<a href="https://www.youtube.com/watch?v=_LJ6poFhBJI">Music video!</a>)
 ---
 Track: Get Tough
 Contributors:
@@ -297,6 +303,9 @@ Lyrics: |-
     And just a little bit wiser
     For just a little bit longer
     We'll get a little bit higher
+Commentary: |-
+    <i>Michael Guy Bowman:</i>
+    (<a href="https://www.youtube.com/watch?v=_qvyplr1Z3A">Music video!</a>)
 ---
 Track: The Real Thing
 Contributors:
diff --git a/album/homestuck-for-the-holidays.yaml b/album/homestuck-for-the-holidays.yaml
index ee63070..e6277b6 100644
--- a/album/homestuck-for-the-holidays.yaml
+++ b/album/homestuck-for-the-holidays.yaml
@@ -392,6 +392,8 @@ Lyrics: |-
     Babies babies babies babies babies babies Christmas babies
 
     [Indecipherable Christmassy sentence mixing]
+Referenced Tracks:
+- Time for a Story
 Sampled Tracks:
 - Time for a Story
 ---
diff --git a/album/homestuck-vol-1-4.yaml b/album/homestuck-vol-1-4.yaml
index a47c991..d785225 100644
--- a/album/homestuck-vol-1-4.yaml
+++ b/album/homestuck-vol-1-4.yaml
@@ -574,6 +574,7 @@ URLs:
 - https://youtu.be/dJ7H7MkL1Yk
 Referenced Tracks:
 - track:liquid-negrocity
+- track:im-a-member-of-the-midnight-crew
 Sampled Tracks:
 - track:im-a-member-of-the-midnight-crew
 Lyrics: |-
diff --git a/album/homestuck-vol-4.yaml b/album/homestuck-vol-4.yaml
index 51b763d..975d005 100644
--- a/album/homestuck-vol-4.yaml
+++ b/album/homestuck-vol-4.yaml
@@ -218,6 +218,7 @@ URLs:
 - https://youtu.be/5NACWZBDtN8
 Referenced Tracks:
 - track:liquid-negrocity
+- track:im-a-member-of-the-midnight-crew
 Sampled Tracks:
 - track:im-a-member-of-the-midnight-crew
 Lyrics: |-
diff --git a/album/homestuck-vol-5.yaml b/album/homestuck-vol-5.yaml
index d692d32..be145b4 100644
--- a/album/homestuck-vol-5.yaml
+++ b/album/homestuck-vol-5.yaml
@@ -263,9 +263,11 @@ Referenced Tracks:
 - Liquid Negrocity
 - track:the-ballad-of-jack-noir
 - Non Compos Mentis
+- track:im-a-member-of-the-midnight-crew
 Sampled Tracks:
-- I'm a Member of the Midnight Crew
-Lyrics: Make her a member of the Midnight Crew!
+- track:im-a-member-of-the-midnight-crew
+Lyrics: |-
+    Make her a member of the Midnight Crew!
 ---
 Track: Pumpkin Cravings
 Artists:
@@ -607,11 +609,13 @@ Art Tags:
 - LoHaC
 Referenced Tracks:
 - track:atomyk-ebonpyre
+- Drop It Like It's Hot
 - track:beatdown-strider-style
 Sampled Tracks:
 - Drop It Like It's Hot
 Lyrics: |-
     Ready
+
     Drop it like it's hot<br>Drop it like it's hot
     Drop it like it's hot<br>Drop it like it's hot<br>Drop it like it's hot<br>Drop it like it's hot<br>Drop it like it's hot<br>Drop it like it's hot<br>Drop it like it's hot<br>Drop it like it's hot
     Drop it like it's hot<br>Drop it like it's hot
diff --git a/album/homestuck-vol-8.yaml b/album/homestuck-vol-8.yaml
index cc16e3b..eb99423 100644
--- a/album/homestuck-vol-8.yaml
+++ b/album/homestuck-vol-8.yaml
@@ -771,7 +771,7 @@ Contributors:
 Duration: '3:23'
 URLs:
 - https://homestuck.bandcamp.com/track/how-do-i-live-d8-night-version-2
-- https://youtu.be/Svy9DBBZKpk
+- https://youtu.be/tJWO4WaQh_Y
 Cover Artists:
 - Victoria Grace Elliott
 Art Tags:
diff --git a/album/hush.yaml b/album/hush.yaml
index b9c7c6c..e173891 100644
--- a/album/hush.yaml
+++ b/album/hush.yaml
@@ -458,6 +458,9 @@ Lyrics: |-
     Oooh, fall in the HUSH
     Oooh, fall in the HUSH
     Oooh, fall in the HUSH
+Commentary: |-
+    <i>Michael Guy Bowman:</i>
+    (<a href="https://www.youtube.com/watch?v=SD5i7HfQYPc">Music video!</a>)
 ---
 Track: Chameleon
 Duration: '4:08'
@@ -494,3 +497,6 @@ Lyrics: |-
     We leave behind the lie
     Let it be, what once was me
     CHAMELEON am I
+Commentary: |-
+    <i>Michael Guy Bowman:</i>
+    (<a href="https://www.youtube.com/watch?v=i46w0v3_C6c">Music video!</a>)
diff --git a/album/ithaca.yaml b/album/ithaca.yaml
index c484b3f..dea66a7 100644
--- a/album/ithaca.yaml
+++ b/album/ithaca.yaml
@@ -46,7 +46,7 @@ Contributors:
 - Luke Benjamins (eight bit sequencing)
 - Andrew Huo (violin)
 - Solatrus (lead synth)
-- Peter Turner (synth solo)
+- Paige Turner (synth solo)
 Duration: '3:55'
 URLs:
 - https://bowman.bandcamp.com/track/ascension
diff --git a/album/jailbreak-vol-1.yaml b/album/jailbreak-vol-1.yaml
index 998997c..a2686d4 100644
--- a/album/jailbreak-vol-1.yaml
+++ b/album/jailbreak-vol-1.yaml
@@ -69,7 +69,7 @@ URLs:
 - https://homestuckgaiden.bandcamp.com/track/title-screen
 - https://youtu.be/6cpKRI9eeUs
 Cover Artists:
-- Peter Turner
+- Paige Turner
 ---
 Track: Logorg
 Artists:
@@ -79,7 +79,7 @@ URLs:
 - https://homestuckgaiden.bandcamp.com/track/logorg
 - https://youtu.be/5B9lCnQcvTY
 Cover Artists:
-- Peter Turner
+- Paige Turner
 ---
 Track: Elf Shanty
 Artists:
@@ -126,13 +126,13 @@ Referenced Tracks:
 ---
 Track: Rising Water (Oh, Shit!)
 Artists:
-- Peter Turner
+- Paige Turner
 Duration: '1:02'
 URLs:
 - https://homestuckgaiden.bandcamp.com/track/rising-water-oh-shit
 - https://youtu.be/q8V8ekHyA98
 Cover Artists:
-- Peter Turner
+- Paige Turner
 ---
 Track: Moment of Pause
 Artists:
@@ -167,13 +167,13 @@ Cover Artists:
 ---
 Track: Intestinal Fortification
 Artists:
-- Peter Turner
+- Paige Turner
 Duration: '2:05'
 URLs:
 - https://homestuckgaiden.bandcamp.com/track/intestinal-fortification
 - https://youtu.be/RjIFBWSxM2I
 Cover Artists:
-- Peter Turner
+- Paige Turner
 ---
 Track: Console Thunder
 Artists:
@@ -220,7 +220,7 @@ URLs:
 - https://homestuckgaiden.bandcamp.com/track/drillgorg
 - https://youtu.be/ddseVIfXERU
 Cover Artists:
-- Peter Turner
+- Paige Turner
 Lyrics: |-
     I, am
     Drillgorg Drillgorg Drill-Drill-Drill-Drill-Drillgorg
@@ -297,9 +297,11 @@ URLs:
 - https://youtu.be/tdTjk-HX2rw
 Has Cover Art: false
 Referenced Tracks:
+- Retrobution
+- Drillgorg
 - Gust of Heir
 Sampled Tracks:
-- Meet the Spy
+- Meet the Spy (from Retrobution)
 - Drillgorg
 - Your Bed
 Lyrics: |-
diff --git a/album/lofam2.yaml b/album/lofam2.yaml
index 5f79787..8d464c7 100644
--- a/album/lofam2.yaml
+++ b/album/lofam2.yaml
@@ -160,7 +160,7 @@ Commentary: |-
     SCREW THAT.
     I'm gonna fill these empty pages with a story, just for you. I haven't written anything since high school English class. You're in for a treat. It's gonna be<br>S<br>T<br>U<br>P<br>I<br>D
     <i>Quasar Nebula:</i>
-    (per [[track:jungle|LoFaM 4 standard]], ive highlighted commentary from people besides the original musicians or cover artists in bold!)
+    (per [[track:jungle-3|LoFaM 4 standard]], ive highlighted commentary from people besides the original musicians or cover artists in bold!)
     <i><b>Brad Griffin:</b></i>
     <i>DUSK FALLS ACROSS A SAFFROWN MEADOW. A SINGLE BLADE OF CRABGRASS UNDULATES VOLUMINOUSLY AMIDST THE RAPTUROUS BREEZE, ONLY TO HALT ITS SWAY SUDDENLY AND CRUNCHINGLY AS IT IS CRASSLY CRUSHED UNDERFOOT BY AN IMMENSE FOOT (SPECIFICALLY THE UNDERNEATH PART OF THAT FOOT). THE OWNER OF THE AFOREMENTIONED FOOT LOOKS DOWNWARD WITH AN AIR OF BAFFLED ASTONISHMENT, IN A SIMILAR FASHION TO HOW A MOOSE CAUGHT IN A UFO TRACTOR BEAM MIGHT LOOK AT A BLADE OF CRABGRASS IT HAD JUST TRODDEN ON. THIS ISN'T A SIMILE.</i>
     <i>"EUUUUUUUUNGH," GROANS THE ABDUCTEE MOOSE AS IT RISES.</i>
@@ -1678,6 +1678,7 @@ Artists:
 Duration: '3:13'
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/planetarium
+- https://www.youtube.com/watch?v=sGfi96uva5Q
 Cover Artists:
 - Spectrumfizz
 Art Tags:
diff --git a/album/lofam3.yaml b/album/lofam3.yaml
index 435ce76..f6fb27d 100644
--- a/album/lofam3.yaml
+++ b/album/lofam3.yaml
@@ -73,7 +73,7 @@ Commentary: |-
     Hi there. I am the guy doing the commentary booklet again. This is one of the few tracks where either the musician or artist didn't leave commentary. Though there aren't enough free pages for an epic tale like last time, I figure I can find something to put to fill in the blanks.
     Some cool time-reversal effects in this track. Very reminiscent of the Felt album. Cool art, too. Always like Ella's stuff.
     <i>Quasar Nebula:</i>
-    (per [[track:jungle|LoFaM 4 standard]], ive highlighted commentary from people besides the original musicians or cover artists in bold!)
+    (per [[track:jungle-3|LoFaM 4 standard]], ive highlighted commentary from people besides the original musicians or cover artists in bold!)
 ---
 Track: Bite the Apple
 Artists:
diff --git a/album/lofam4.yaml b/album/lofam4.yaml
index 77e0ec5..d6900d3 100644
--- a/album/lofam4.yaml
+++ b/album/lofam4.yaml
@@ -95,7 +95,7 @@ Commentary: |-
     <i>Circlejourney:</i>
     I drew this immediately following [S] Collide. Kouta later asked to use it as the track cover for Merge on SoundCloud, and I was happy to oblige. I'm honoured that they saw it as a fitting image to accompany their (very impressive) track.
 ---
-Track: Jungle
+Track: 'Jungle #3'
 Artists:
 - cookiefonster
 Duration: '4:05'
@@ -1259,7 +1259,7 @@ Referenced Tracks:
 - Hate You
 - track:upward-movement-dave-owns
 - track:MeGaLoVania
-- Jungle
+- 'Jungle #3'
 - Sburban Resolution
 - track:showtime-original-mix
 Commentary: |-
@@ -2827,7 +2827,7 @@ Referenced Tracks:
 - CONTACT
 - track:upward-movement-dave-owns
 - Formation
-- Jungle
+- 'Jungle #3'
 - Muse of Nanchos
 - Meet the Flintstones
 - Intro
@@ -2861,7 +2861,7 @@ Commentary: |-
     - [[CONTACT]] - 3:20-3:50
     - [[track:upward-movement-dave-owns|Upward Movement (Dave Owns)]] - 3:35-3:50
     - [[Formation]] - 3:50-4:20
-    - [[track:jungle]] - 4:13-4:20, 4:28-4:35
+    - [[track:jungle-3]] - 4:13-4:20, 4:28-4:35
     - [[Muse of Nanchos]] - 4:20-4:35
     - [[Meet the Flintstones]] - 4:35-4:49
     - [[Intro]] - 4:50-5:29
diff --git a/album/look-on-my-works-ye-mighty-and-despair.yaml b/album/look-on-my-works-ye-mighty-and-despair.yaml
index 7d8c02b..6a4341c 100644
--- a/album/look-on-my-works-ye-mighty-and-despair.yaml
+++ b/album/look-on-my-works-ye-mighty-and-despair.yaml
@@ -160,6 +160,9 @@ Lyrics: |-
     We walk away just when the mood is right
     Oh wait for me, you know I need you now
     Show me your heart and I will show you how
+Commentary: |-
+    <i>Michael Guy Bowman:</i>
+    (<a href="https://www.youtube.com/watch?v=MlWdWFD8t6U">Music video!</a>)
 ---
 Track: Like Angels
 Duration: '2:50'
@@ -219,6 +222,9 @@ Lyrics: |-
     We want to be like like like angels
     We want to be like like like angels
     And we won’t even touch the ground
+Commentary: |-
+    <i>Michael Guy Bowman:</i>
+    (<a href="https://www.youtube.com/watch?v=TGQn4ZUgHa4">Music video!</a>)
 ---
 Track: Unstoppable
 Duration: '5:03'
@@ -546,6 +552,9 @@ Lyrics: |-
     Don't you feel lucky when there's no one but us
     To hear the six o'clock alarm?
     You should feel lucky, 'cuz I'm your lucky charm.
+Commentary: |-
+    <i>Michael Guy Bowman:</i>
+    (<a href="https://www.youtube.com/watch?v=pdAcoQgCX8c">Music video!</a>)
 ---
 Track: Back To The Jungle
 Duration: '5:24'
@@ -668,6 +677,9 @@ Lyrics: |-
     So you know where i will be
     I'm moving back to the jungle
     Where i'm gonna eat dirt
+Commentary: |-
+    <i>Michael Guy Bowman:</i>
+    (<a href="https://www.youtube.com/watch?v=5rbQPtjXUww">Music video!</a>)
 ---
 Track: Night Terrors
 Duration: '3:09'
diff --git a/album/pantheon.yaml b/album/pantheon.yaml
index 48cdfeb..35d1348 100644
--- a/album/pantheon.yaml
+++ b/album/pantheon.yaml
@@ -134,7 +134,7 @@ Referenced Tracks:
 Track: Tsukuyomi (Remix)
 Duration: '1:41'
 URLs:
-- https://www.youtube.com/watch?v=Oho1XAj3L8Q
+- https://www.youtube.com/watch?v=wb91nZJc5qE
 Cover Artists:
 - Dizzims
 Art Tags:
@@ -147,7 +147,7 @@ Referenced Tracks:
 Track: AUTOMATA
 Duration: '1:13'
 URLs:
-- https://www.youtube.com/watch?v=Oho1XAj3L8Q
+- https://www.youtube.com/watch?v=TbYNB-UWIG0
 Cover Artists:
 - Dizzims
 Art Tags:
@@ -167,7 +167,7 @@ Lyrics: |-
 Track: Josh's Theme
 Duration: '2:33'
 URLs:
-- https://www.youtube.com/watch?v=Oho1XAj3L8Q
+- https://www.youtube.com/watch?v=3VHyQhqLlYk
 Cover Artists:
 - Dizzims
 Art Tags:
@@ -179,7 +179,7 @@ Referenced Tracks:
 Track: Breakdown
 Duration: '2:01'
 URLs:
-- https://www.youtube.com/watch?v=Oho1XAj3L8Q
+- https://www.youtube.com/watch?v=nsHHVTfndH0
 Cover Artists:
 - Dizzims
 Art Tags:
diff --git a/album/references-beyond-homestuck.yaml b/album/references-beyond-homestuck.yaml
index a2736d5..422249b 100644
--- a/album/references-beyond-homestuck.yaml
+++ b/album/references-beyond-homestuck.yaml
@@ -308,6 +308,8 @@ Artists:
 Duration: '2:21'
 URLs:
 - https://www.youtube.com/watch?v=pA9uy3KdeEU
+Referenced Tracks:
+- Bro Hop
 Lyrics: |-
     (Ready?) (Yeah.) (Okay.)
 
@@ -4760,6 +4762,40 @@ Commentary: |-
     <i>Niklink:</i>
     Originally published as "The Celebrated Chop Waltz".
 ---
+Track: Das Lied vom Musikanten
+Artists:
+- Traditional
+URLs:
+- https://www.youtube.com/watch?v=3k7gyQVF0bE
+Lyrics: |-
+    Ich bin ein Musikant, ich bin ein Musikant! (<i>I am a musician, I am a musician!</i>)
+    Ich kann auch spielen auf meiner Geige (<i>I can also play on my violin</i>)
+    Di de schum schum schum, di de schum schum schum
+    Auf meiner Geige (<i>On my violin</i>)
+
+    Ich bin ein Musikant, ich bin ein Musikant! (<i>I am a musician, I am a musician!</i>)
+    Ich kann auch spielen auf meiner Clarinette (<i>I can also play on my clarinet</i>)
+    Pä de wäpp wäpp wäpp, pä de wäpp wäpp wäpp
+    Auf meiner Clarinette (<i>On my clarinet</i>)
+
+    Ich bin ein Musikant, ich bin ein Musikant! (<i>I am a musician, I am a musician!</i>)
+    Ich kann auch spielen auf meiner Flöte (<i>I can also play on my flute</i>)
+    [Peeping]
+    Auf meiner Flöte (<i>On my flute</i>)
+
+    Ich bin ein Musikant, ich bin ein Musikant! (<i>I am a musician, I am a musician!</i>)
+    Ich kann auch spielen auf meiner Guitarre  (<i>I can also play on my guitar</i>)
+    Tim tim ter lim, tim tim ter lim
+    Auf meiner Guitarre (<i>On my guitar</i>)
+
+    Ich bin ein Musikant, ich bin ein Musikant! (<i>I am a musician, I am a musician!</i>)
+    Ich kann auch spielen auf meiner Fagott (<i>I can also play on my bassoon</i>)
+    [Purring with lips]
+    Auf meiner Fagott (<i>On my bassoon</i>)
+Commentary: |-
+    <i>Niklink:</i>
+    Title is lit. "The song of the musician". Some versions are known as "Ich bin ein Musikanten", lit. "I am a musician". This folk song originated in northwestern Germany sometime in the early 19th century. As with most folk music, it evolved from a shifting amalgamation of various earlier melodies— one notable one being a 1761 melody by Leopold Mozart, father of Wolfgang Amadeus Mozart. It's since spread in a variety of forms throughout eastern Europe, and in the 21st century, through China, Korea, and most importantly Japan, where it became a popular children's song. Lyrics here are based on a 19th century songbook.
+---
 Track: Deck the Halls
 Artists:
 - Thomas Oliphant
@@ -6407,6 +6443,33 @@ Lyrics: |-
     And we'll all feel gay
     When Johnny comes marching home
 ---
+Track: Yama No Ongakuka
+Artists:
+- Katsuhisa Hattori (arrangement)
+- Takatomo Kurosawa (lyrics)
+URLs:
+- https://www.youtube.com/watch?v=L06HFBrNhXk
+Referenced Tracks:
+- Das Lied vom Musikanten
+Lyrics: |-
+    Watasha on ga ku kayama no ko risu (<i>I'm a musician, a mountain squirrel</i>)
+    Jōzu ni baiorin o hīte mimashou (<i>Let's find a violin</i>)
+    Kyukyukyukkyukkyukkyukyukyukkyukkyukkyukyukyukkyukkyukkyukyukyukkyukkyu
+    Ikagadesu (<i>How is it?</i>)
+
+    Watasha on ga ku ka yama no usagi (<i>I'm a musician, a mountain rabbit</i>)
+    Jōzu ni piano o hīte mimashi yō (<i>Let's play the piano well</i>)
+    Popoporonporonporon popoporonporonporon popoporonporonporon popoporonporonporon
+    Ikagadesu (<i>How is it?</i>)
+
+    Watasha on ga ku ka yama no kotori (<i>I'm a musician, a mountain bird</i>)
+    Jōzu ni furūto fuite mimashou (<i>Let's blow the flute</i>)
+    Pipipippippippipipippippippipipippippippipipippippi
+    Ikagadesu (<i>How is it?</i>)
+Commentary: |-
+    <i>Niklink:</i>
+    Original title is "山の音楽家" (lit. Mountain Musicians). The earliest known version was played on Japanese public broadcaster NHK from April-May 1964, however the URL is for a different cover of the song. The provided lyrics are for the linked version as well.
+---
 Group: Other music originating outside Homestuck
 ---
 Track: リサフランク420 / 現代のコンピュー
@@ -7451,6 +7514,18 @@ Lyrics: |-
     Was what I did so wrong, so wrong
     That you had to leave me alone?
 ---
+Track: Casio VL-1 Demo
+Artists:
+- Unknown Artist
+Duration: '1:16'
+URLs:
+- https://www.youtube.com/watch?v=yMMnj5FfgHU
+Referenced Tracks:
+- Yama No Ongakuka
+Commentary: |-
+    <i>Niklink:</i>
+    This demo was reused for many other Casio devices. Manuals and literature sometimes refer to it as "German Folk Song" (partially correct) or "Unterlanders Heimweh" (lit. "Lowlander's Homesickness") (which is a different German folk song, although later Casio devices actually used the correct song instead). Japanese materials correctly refer to it as a version of "Yama No Ongakuka".
+---
 Track: CAT NO BANANA
 Artists:
 - JOSHDUB
diff --git a/album/skaias-the-limit.yaml b/album/skaias-the-limit.yaml
index d68fe7e..0c8fb34 100644
--- a/album/skaias-the-limit.yaml
+++ b/album/skaias-the-limit.yaml
@@ -201,6 +201,8 @@ Artists:
 - Sonnivate
 URLs:
 - https://sahcon.bandcamp.com/track/im-a-member-of-the-midnight-crew
+Referenced Tracks:
+- track:im-a-member-of-the-midnight-crew
 Lyrics: |-
     I hate a moral coward, one who lacks a manly spark
     I just detest a man afraid to go home in the dark
diff --git a/album/the-baby-is-you.yaml b/album/the-baby-is-you.yaml
index ae99f50..edfecaa 100644
--- a/album/the-baby-is-you.yaml
+++ b/album/the-baby-is-you.yaml
@@ -168,7 +168,9 @@ URLs:
 - https://youtu.be/o3rJTGHgYTk
 Referenced Tracks:
 - Lose Yourself
+- rose pragnant
 - track:miracles-icp
+- bootes
 Sampled Tracks:
 - rose pragnant
 - bootes
@@ -300,6 +302,8 @@ Contributors:
 Duration: '1:30'
 URLs:
 - https://youtu.be/jCfE_6pTN8A
+Referenced Tracks:
+- rose pragnant
 Sampled Tracks:
 - rose pragnant
 Lyrics: |-
diff --git a/album/xenoplanetarium.yaml b/album/xenoplanetarium.yaml
index 12a71eb..647d993 100644
--- a/album/xenoplanetarium.yaml
+++ b/album/xenoplanetarium.yaml
@@ -52,7 +52,7 @@ Commentary: |-
     I've redrawn this piece 3 times, two were sketches and the third was completed, but I felt it didn't make for a good cover. (Shown <s>on facing page</s> below - It makes for a pretty bangin' wallpaper though!) I tried to stuff as much symbolism in this piece as possible. This is also full of new experiences for me, 'cause it was pretty much the first time I've drawn this many varied characters all in one canvas. It's also the first time I've drawn some of the trolls, too. All in all, it was an absolute delight to work on it and see everything come together, I'm raelly happy for the chance to help with this album.
     <img src="media/misc/xenoplanetarium-alt.jpg" width="1400" height="1400">
     <i>Quasar Nebula:</i>
-    (per [[track:jungle|LoFaM 4 standard]], ive highlighted commentary from people besides the original musicians or cover artists in bold!)
+    (per [[track:jungle-3|LoFaM 4 standard]], ive highlighted commentary from people besides the original musicians or cover artists in bold!)
 Banner Artists:
 - nights
 Banner Dimensions: 1100x203