Merge branch 'staging' into yamldiff

23 files changed, 358 insertions, 122 deletions

diff --git a/album/desynced-vol-1.txt b/album/desynced-vol-1.txt
index d5789574..aa758402 100644
--- a/album/desynced-vol-1.txt
+++ b/album/desynced-vol-1.txt
@@ -5,7 +5,7 @@ Date Added: February 12, 2021
 Color: #adadad
 Groups:
 - Desynced
-- Beyond
+- Fandom
 URLs:
 - https://desynced.bandcamp.com/album/desynced-vol-1
 - https://www.youtube.com/playlist?list=PLAP2Y9dl628mn-qwJlhtZw_Q42oxpA18b
diff --git a/album/desynced-vol-2.txt b/album/desynced-vol-2.txt
index 0d659667..79d54dd3 100644
--- a/album/desynced-vol-2.txt
+++ b/album/desynced-vol-2.txt
@@ -5,7 +5,7 @@ Date Added: February 12, 2021
 Color: #667bd8
 Groups:
 - Desynced
-- Beyond
+- Fandom
 URLs:
 - https://desynced.bandcamp.com/album/desynced-vol-2
 - https://www.youtube.com/playlist?list=PLAP2Y9dl628nyJMzP2s-hwYbnpmqTYVpg
diff --git a/album/election-season.txt b/album/election-season.txt
index 1eda5ce2..5f932a94 100644
--- a/album/election-season.txt
+++ b/album/election-season.txt
@@ -5,7 +5,7 @@ Date Added: February 12, 2021
 Color: #d34b11
 Groups:
 - Desynced
-- Beyond
+- Fandom
 URLs:
 - https://desynced.bandcamp.com/album/election-season
 - https://www.youtube.com/playlist?list=PLAP2Y9dl628ntIo7zpcNDAr5R-7q6Z5_H
diff --git a/album/entertaining-sound.txt b/album/entertaining-sound.txt
index bb9a406e..341f5fcf 100644
--- a/album/entertaining-sound.txt
+++ b/album/entertaining-sound.txt
@@ -286,7 +286,9 @@ Commentary:
 -------------------------------------------------------------------------------
 Track: Malblanka Rozo Verda Stelo
 Duration: 0:35
-References: Black Rose / Green Sun
+References:
+- Black Rose / Green Sun
+- La Espero
 URLs:
 - https://conlangcritic.bandcamp.com/track/malblanka-rozo-verda-stelo
 - https://www.youtube.com/watch?v=L98DwKAd3qE
diff --git a/album/lofam2.txt b/album/lofam2.txt
index b4c80cb1..6e829eff 100644
--- a/album/lofam2.txt
+++ b/album/lofam2.txt
@@ -1451,7 +1451,6 @@ Track Art: Spectrumfizz
 Duration: 3:13
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/planetarium
-- https://youtu.be/0J76sysYCOE
 Commentary:
     <i>Rachel Rose Mitchell:</i>
     Planetarium was the first piece of Homestuck fan music I ever made. I'd only just caught up with the archives when I was set a composition assignment for university. Having never used Logic to compose before, I had fun playing with a bunch of the different inbuilt instruments. When I found the koto, I knew exactly what I wanted to do. I tried to make it sound somewhat ethereal and otherworldly to represent the Incipisphere in all its beautiful weirdness. To try to do that, I threw a whole lot of reverb and delay at pretty much every track. I really did not know what I was doing, but it was fun.
diff --git a/album/lofam4.txt b/album/lofam4.txt
index 1adff5b0..71c8cd21 100644
--- a/album/lofam4.txt
+++ b/album/lofam4.txt
@@ -860,7 +860,7 @@ Art Tags:
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/schr-dingers-harbinger
 - https://youtu.be/n39rrqi8XPM
-Credits:
+Commentary:
     <i>Noisemaker:</i>
     Initially from call and new 2: locomotif under the name Excess Express, I wanted Schrödinger's Harbinger to be Jasprose-themed to compensate for the lack of tracks in that category, as well as to make some additions to the original trakc.
     <i><b>WHATISLOSTINTHEMINES:</b></i>
diff --git a/album/lofam5.txt b/album/lofam5.txt
index 29ce6ccc..2c860eb6 100644
--- a/album/lofam5.txt
+++ b/album/lofam5.txt
@@ -1477,7 +1477,7 @@ Commentary:
 -------------------------------------------------------------------------------
 Track: Crystallized Flowers DX
 Artist: salex_r3kt
-Track Art: Awkward
+Track Art: Monckat
 Duration: 4:25
 References:
 - Crystalanthemums
diff --git a/album/perfectly-generic-object.txt b/album/perfectly-generic-object.txt
index 6c0fe451..965f9ba9 100644
--- a/album/perfectly-generic-object.txt
+++ b/album/perfectly-generic-object.txt
@@ -7,7 +7,7 @@ Has Track Art: no
 Color: #59f669
 Groups:
 - Cristata
-- Beyond
+- Fandom
 URLs:
 - https://smoothiefruitee.bandcamp.com/track/perfectly-generic-object
 Commentary:
diff --git a/album/psycholonials-ep-1.txt b/album/psycholonials-ep-1.txt
index 77900fa5..361fd6a9 100644
--- a/album/psycholonials-ep-1.txt
+++ b/album/psycholonials-ep-1.txt
@@ -11,6 +11,7 @@ Color: #f51806
 Listed on Homepage: no
 Groups:
 - Psycholonials
+- Beyond
 URLs:
 - https://psycholonials.bandcamp.com/album/psycholonials-ep-1
 -------------------------------------------------------------------------------
diff --git a/album/psycholonials-ep-2.txt b/album/psycholonials-ep-2.txt
index e083bbcf..eb818050 100644
--- a/album/psycholonials-ep-2.txt
+++ b/album/psycholonials-ep-2.txt
@@ -11,6 +11,7 @@ Color: #f51806
 Listed on Homepage: no
 Groups:
 - Psycholonials
+- Beyond
 URLs:
 - https://psycholonials.bandcamp.com/album/psycholonials-ep-2
 -------------------------------------------------------------------------------
diff --git a/album/psycholonials-ep-3.txt b/album/psycholonials-ep-3.txt
index 17c75971..6a94a13a 100644
--- a/album/psycholonials-ep-3.txt
+++ b/album/psycholonials-ep-3.txt
@@ -11,6 +11,7 @@ Color: #f51806
 Listed on Homepage: no
 Groups:
 - Psycholonials
+- Beyond
 URLs:
 - https://psycholonials.bandcamp.com/album/psycholonials-ep-3
 -------------------------------------------------------------------------------
diff --git a/album/psycholonials-ep-4.txt b/album/psycholonials-ep-4.txt
index 2e574906..7e0dba70 100644
--- a/album/psycholonials-ep-4.txt
+++ b/album/psycholonials-ep-4.txt
@@ -11,6 +11,7 @@ Color: #f51806
 Listed on Homepage: no
 Groups:
 - Psycholonials
+- Beyond
 URLs:
 - https://psycholonials.bandcamp.com/album/psycholonials-ep-4
 -------------------------------------------------------------------------------
diff --git a/album/psycholonials-ep-5.txt b/album/psycholonials-ep-5.txt
index c234ae7b..4017dc97 100644
--- a/album/psycholonials-ep-5.txt
+++ b/album/psycholonials-ep-5.txt
@@ -11,6 +11,7 @@ Color: #f51806
 Listed on Homepage: no
 Groups:
 - Psycholonials
+- Beyond
 URLs:
 - https://psycholonials.bandcamp.com/album/psycholonials-ep-5
 -------------------------------------------------------------------------------
diff --git a/album/psycholonials-ep-6.txt b/album/psycholonials-ep-6.txt
index 61ae1103..3d9ba44d 100644
--- a/album/psycholonials-ep-6.txt
+++ b/album/psycholonials-ep-6.txt
@@ -11,6 +11,7 @@ Color: #f51806
 Listed on Homepage: no
 Groups:
 - Psycholonials
+- Beyond
 URLs:
 - https://psycholonials.bandcamp.com/album/psycholonials-ep-6
 -------------------------------------------------------------------------------
diff --git a/album/psycholonials-ep-7.txt b/album/psycholonials-ep-7.txt
index 80aa6c02..206f77a6 100644
--- a/album/psycholonials-ep-7.txt
+++ b/album/psycholonials-ep-7.txt
@@ -11,6 +11,7 @@ Color: #f51806
 Listed on Homepage: no
 Groups:
 - Psycholonials
+- Beyond
 URLs:
 - https://psycholonials.bandcamp.com/album/psycholonials-ep-7
 -------------------------------------------------------------------------------
diff --git a/album/psycholonials-ep-8.txt b/album/psycholonials-ep-8.txt
index 23b1be82..089a8dfa 100644
--- a/album/psycholonials-ep-8.txt
+++ b/album/psycholonials-ep-8.txt
@@ -11,6 +11,7 @@ Color: #f51806
 Listed on Homepage: no
 Groups:
 - Psycholonials
+- Beyond
 URLs:
 - https://psycholonials.bandcamp.com/album/psycholonials-ep-8
 -------------------------------------------------------------------------------
diff --git a/album/psycholonials-ep-9.txt b/album/psycholonials-ep-9.txt
index 4c390301..a448bb4d 100644
--- a/album/psycholonials-ep-9.txt
+++ b/album/psycholonials-ep-9.txt
@@ -11,6 +11,7 @@ Color: #f51806
 Listed on Homepage: no
 Groups:
 - Psycholonials
+- Beyond
 URLs:
 - https://psycholonials.bandcamp.com/album/psycholonials-ep-9
 -------------------------------------------------------------------------------
diff --git a/album/sburb-ost.txt b/album/sburb-ost.txt
index 893435a1..46d2cd71 100644
--- a/album/sburb-ost.txt
+++ b/album/sburb-ost.txt
@@ -1,4 +1,4 @@
-Album: Sburb OST
+Album: SBURB OST
 Directory: sburb-ost
 Cover Art: melodiousDiscord
 Banner Art: melodiousDiscord
diff --git a/album/sburb.txt b/album/sburb.txt
index 7bf1dea0..b7a07949 100644
--- a/album/sburb.txt
+++ b/album/sburb.txt
@@ -1,5 +1,5 @@
 Album: Sburb
-Artist: James Dever, Erik Scheele
+Artists: James Dever, Erik Scheele
 Cover Art: Vivian Ng
 Has Track Art: no
 Date: July 13, 2011
diff --git a/album/the-baby-is-you.txt b/album/the-baby-is-you.txt
index cd17d219..1b17aaa8 100644
--- a/album/the-baby-is-you.txt
+++ b/album/the-baby-is-you.txt
@@ -1,6 +1,6 @@
 Album: The Baby is You
 Artist: Toby Fox
-Cover Art: astroliner
+Cover Art: Astroliner
 Has Track Art: no
 Date: September 27, 2010
 Date Added: January 12, 2021
@@ -8,12 +8,16 @@ Groups:
 - Toby Fox
 - Fandom
 Color: #545fff
+Art Tags:
+- John
+- Karkat
+- Dave
 URLs:
 - https://www.youtube.com/watch?v=gfiwU2f-ts4
 - https://www.youtube.com/playlist?list=PLnVpmehyaOFZ8yr7acSFrBeUvkA0XlDN6
 - https://recordcrash.com/tbiy/thebabyisyou.htm
 Commentary:
-    <i>sanctfarum:</i>
+    <i>Sanctferum:</i>
     (<i>From the Homestuck Sound Test 4/13/2017 Edition release notes:</i>)
     Simultaneously the worst fucking thing Toby Fox has ever made and his magnum opus that even Undertale cannot surpass, even mentioning this legendary trash opera on the now-defunct MSPA forums was grounds for a ban. Warning: Contains male pregnancy (mpreg), heavy implications of underage sex, implications of incest, time travel, a clip of Karkat saying "MMMMMMMMMMM" that was used in the Act 6 Act 6 Act 1 opening flash, vore, the answer to the Ultimate Riddle, and other absolutely awful shit that has no business being in the Sound Test, or indeed, anywhere. Listen at your own risk, if you dare...
 -------------------------------------------------------------------------------
@@ -22,13 +26,9 @@ Duration: 1:01
 URLs:
 - https://youtu.be/5Z5XKg37ZGc
 Lyrics:
-    EVERY DAY<br>a million babies are born<br>in the united states alone
-    many of these babies<br>climb out of<br>vaginas
-    others<br>the storks bring them
-    some are born out of slime in paradox space<br>thanks to a special video game<br>your mommy used to play
-    but regardless of how these babies may be born<br>they all come into the world with a special force<br>called
-    LOVE
-    this is that story
+    (Every day, a million babies are born in the United States alone. Many of these babies climb out of... vaginas. Others, the storks bring them. Some are born out of slime in paradox space, thanks to a special video game your momma used to play. But regardless of how these babies may be born, they all come into the world with a special force called... love.
+
+    This... is that story.)
 -------------------------------------------------------------------------------
 Track: Throguh Song
 Duration: 0:43
@@ -37,8 +37,20 @@ References:
 URLs:
 - https://youtu.be/KSHPZp33vv4
 Lyrics:
-    (police sirens)
-    john: hi im john egbert and OH MY GOD DAVE WHAT ARE YOU DOING ON THE FLOOR WRITHIN IN PAIN<br>dave: nothin, john... just ignore me... im not... pregnant<br>john: OH MY GOD DAVE... WHATS HAPPENED TO YOU<br>DAVE: im... im lyin.... i am pregnant<br>john: WHAT!!! HOW IS THAT POSSIBLE!!! WHOSE THE FATHER<br>dave: the father... i cant tell you john<br>john: but... then... WHOSE THE BABY<br>dave: the baby john... is you<br>dave: your the baby<br>dave: all the babies<br>dave: all of them<br>JOHN: NO DAVE NOOOOOOOOOOOOOOOOO<br>JOHN: WE HAVE TO GET YOU TO A HOSPITAL<br>JOHN: ARE YOU SERIOUS THOUGH, WHAT ARE YOU SAYING<br>dave: john i guess the only way you can understand is song
+    (JOHN: Hi I'm John Egbert, and I tell you about my rock opera that's totally like— OH MY GOD DAVE WHAT THE FUCK ARE YOU DOING ON THE GROUND WRITHING IN PAIN.
+    DAVE: Nothing- nothing John, just ignore me I'm not <big>PREGNANT</big>!
+    JOHN: Oh my God Dave what happened to youuuu?
+    DAVE: I'm- I'm lying I am pregnant.
+    JOHN: How- how- how is that possible? Who's the father?
+    DAVE: The father, I can't tell you John.
+    JOHN: But, but then... who's the baby??
+    DAVE: The baby, John... is YOU!
+    JOHN: Noooo Dave, nooooooooo!
+    DAVE: You're the baby, all of the babies, all of them!
+    JOHN: We have to get you to a hospit-pital, what are you- what are you saying? What are you saying, Dave?
+    DAVE: John I guess the only way you can understand... is through song.)
+
+    (oooOOOooo, police sirens, police sirens, oooOOOooo, oooOOOooo...)
 -------------------------------------------------------------------------------
 Track: The Baby is You
 Duration: 1:36
@@ -46,24 +58,49 @@ References: Throguh Song
 URLs:
 - https://youtu.be/BtCsf7tFBIQ
 Lyrics:
-    BUM BUM BUM
-    i was sittin around, in the middle of the night<br>all bored with nothing to do
-    i called up my friend, he put some stuff in my end<br>taught him a hundred different ways to screw
-    i conksunked his boots, touched his imigrants<br>the chips had just started to fall
-    now after that night, i was given a fright<br>a babytummy shaped like a ball
-    DAVE: DAMN JOHN!!!
-    im havin a baby and the baby is you<br>id birth my best friend its true
-    im havin a baby and the baby is you<br>koalababies up the avenue
-    im a havin a baby and the baby is you<br>my ovaries are out the wazoo
-    im having a a baby and the baby is you<br>ur gonna come out my hoohoo
-    john: BUT HOW IS THAT POSSIBLE<br>dave: i dont know... such is the magic of skaia<br>he entered all of my seven gates<br>he touched john<br>he prototyped my medium<br>and now my kernelsprite is rich with data<br>and... now.... your the baby
-    john: NOOOOOOOOOOOOOOOOO
-    duet:
-    YOUR HAVIN A BABY AND THE BABY IS YOU/ME<br>BIRTH MY BEST FRIEND ITS TRUE
-    HAVIN A BABY AND THE BABY IS YOU<br>KOALABABIES UP THE AVENUE
-    HAVIN A ABABY AND THE BABY IS YOU<br>OVARIES ARE OUT THE WAZOO
-    HAVIN A BABY AND THE BABY WEARS SHOES<br>BABIES FLYIN OUT THE HOO HOO
-    WAHOOOOOOOOOOOOOOOOOO
+    I was sittin' around, in the middle of the night
+    All bored with nothin' to do
+    I called up a friend, he put some stuff in my end
+    I taught him a hundred different ways to screw (Oh Dave!)
+    I conksunked his boots, touched his imigrants
+    The chips had just started to fall
+    Now after that night, I was given a fright
+    A babytummy shaped like a ball    
+    <big>Damn John!</big>
+
+    I'm havin' a baby and the baby is you!
+    I'd birth my best friend it's true! (Oh no!)
+    I'm havin' a baby and the baby is you!
+    Koalababies up the avenue!
+    I'm havin' a baby and the baby is you!
+    My ovaries are out the wazoo! (Oh no!)
+    I'm havin' a baby and the baby is you!
+    You're gonna come out my hoohoo
+
+    (JOHN: But how is that possible?
+    DAVE: I don't know, such is the magic of Skaia! He entered all of my... seven gates.
+    JOHN: Ohh, ohhh...
+    DAVE: He touched me John.
+    JOHN: Meow
+    DAVE: He prototyped my Medium.
+    JOHN: Ohh...
+    DAVE: And now my kernelsprite is... rich with data... and now.... YOU'RE THE BABYYYYY!
+    JOHN: NOOOOOOOOOOOOOOOOO
+    DAVE: OPEN WIIIIDE
+    JOHN: OOOOOO—
+    Wha- what the fuck [???] [laughter])
+
+    You're havin' a baby and the baby is you! (You're havin' a baby and the baby is me!)
+    I'd birth my best friend it's true!
+    I'm havin' a baby and the baby is you! (You're havin' a baby and the baby is me!)
+    Koalababies up the avenue!
+    I'm havin' a baby and the baby is you! (Havin' a baby and the baby is me!)
+    My ovaries are out the wazoo!
+    I'm havin' a baby and the baby wears shoes!
+    Babies, babies, babies, babies, babies, babies, babies, babies, babies, babies, babies, babies [Babeatboxing]
+    Wahoo!
+
+    (oooOOOooo, police sirens, police sirens, oooOOOooo, oooOOOooo...)
 -------------------------------------------------------------------------------
 Track: bootes
 Duration: 1:47
@@ -71,115 +108,262 @@ References: Canon in D
 URLs:
 - https://youtu.be/aoDIAbQnV88
 Lyrics:
-    DAVE: OH MY GOD... john... THE BABY... IS A BABY.... IS A BABY<br>John: dave you're losing your water break, we cant go to the hospital now<br>DAVE: YOUR RIGHT THERES NO TIME<br>DAVE: WE MUST GO TO MOUNT PROSPIT<br>DAVE: where i myself was born<br>JOHN: you were born in a lab dave and im your lab daddy<br>DAVE: ok shut up, dad, because your my baby now and youre the one that's going to have mantitties in your face<br>john: what?<br>dave: <i>MANTITTIES IN YOUR FACe, MANTITTIES IN YOUR FACE</i><br>john: aww, gross! dave put your fucking shirt on<br>dave: MANTITTIES<br>john: i'm not even born yet that's not fair<br>dave: oh my god... someone needs to deliver this baby right now<br>karkat: I CAN DO THAT<br>john: karkat what the fuck are you doing<br>karkat: delivering babies... i did it once i can do it again.......<br>john: leave it up to me karkat<br>karkat: no... no i cant... your the baby.....<br>karkat: i must do this... i must be the... the midwife<br>karkat: john... theres some things you cant know<br>john: like what<br>dave: please just reach inside me<br>KARKAT: <i>LETS SING A FUCKING SONG</i>
-    ONCE UPON A TIME ON TOP OF A MOUNTAIN<br>A BABY WAS SITTING IN A WATER FOUNTAIN
-    HIS NAME WAS DAVE AND HE WAS SUPREME<br>HIS BOOTIES WERE COVERED IN PEACHES AND CREAM
-    AND THAT STORY TODAY IS TOTALLY IRRELEVANT<br>I'M A TROLL AND JOHN I WANT TO FUCK YOU OUT OF HATE
-    <big>MMMMM<big>MMMMMMMM</big>MMMM</big>
-    dave: please stop this singing shit, i need to have this baby... now...... <big><big>MMMMMMMMMMMMMMMM</big></big>
+    (Dave: Oh my God, John... the baby... is a baby... is a baby...
+    JOHN: Dave you're losing your water break, we can't go to a hospital now!
+    DAVE: You're right there's no time! We must go to Mount Prospit... where I myself was born.
+    JOHN: You were born in a lab, Dave, and I'm your lab daddy.
+    DAVE: Just shut up, Dad! 'Cuz, you're my baby now, and you're the one that's gonna have mantitties in your face!
+    JOHN: What?
+    DAVE: Mantitties in your face!
+    JOHN: No! No, gross!
+    DAVE: Mantitties in your faaaace!
+    JOHN: Dave, put your fucking shirt on!
+    DAVE: Mantitties.
+    JOHN: I'm not even born yet, that's not fair!
+    DAVE: Oh my God... someone needs to deliver this baby... right now.
+    KARKAT: I can do that.
+    JOHN: Karkat what the fuck are you doing?
+    KARKAT: Delivering babies... I did it once, I can do it again.
+    JOHN: Leave it up to me Karkat.
+    KARKAT: No, no I can't, you're... a baby. I must do this, I must be the... midwife. John, there are some things you can't know.
+    JOHN: Like what?
+    DAVE: Please just reach inside me—
+    KARKAT: LET'S SING A FUCKING SONG)
+
+    Once upon a time on top of a mountain (I'm Karkat, by the way)
+    A baby was sitting in a water fountain (Karkat, Karkat)
+    His name was Dave and he was supreme
+    His booties were covered in peaches and cream
+    And that story today is, totally, irrelevant
+    I'm a troll John
+    I wanna fuck you out of hate
+    I wanna fuck you out of hate 'cause I'm Karkat
+
+    (MMMMM<big>MMMMMMMM</big>MMMM
+    DAVE: Oh, my God, please stop this singing shit, I have to have this baby now! Ohh!
+    <big>MMMMMMMMMMMMMMMM</big>... MMMMM...)
 -------------------------------------------------------------------------------
 Track: rose pragnant
 Duration: 1:11
+Contributors:
+- Astroliner (Rose)
 References: Showdown
 URLs:
 - https://youtu.be/l6BDUDe4eQo
 Lyrics:
-    JOHN: dave you need to hang in there<br>DAVE: AEAAAEEAAA<br>karkat: i dont get it... the baby just wont come out<br>dave: IM NOT READY... there are some things I have to clean up first
-    <big><i>(car)</i></big>
-    rose: i came as fast as i could
-    dave: rose i'm glad you're here.... i need to talk you about................. this........ big baby in my mommytummy
-    rose: undubitatably. i will embiggen my words less so you can understand me. i am the queen of books.
-    dave: lets not talk. lets.... sing....... like old times
-    rose: no, strider. the truth is.... im pregnant. i cant sing.
-    john: <big>ROSE!!!!!!!!!</big>
-    dave: it's... its only fair....
-    rose: besides singing is passe for those of a caliber like ours. let us engage in that ancient art far superior.....
-    <big><big><big><i>rap</i></big></big></big>
+    (ROSE: Oh my God, I hate Garageband so much.
+    JOHN: Dave you need to hang in there!
+    DAVE: AAEEAAEEAAAAAA
+    KARKAT: I don't get it, the baby just won't come out.
+    ROSE: What the fuck? What is this fucking metronome shit?
+    DAVE: I'm not ready. There's some things I have to clean up first.
+    It's a car.
+    Holy crap, it's a car.
+    ROSE: i came as fast as i could
+    DAVE: Rose I'm glad you're here. I need to talk to you about... this big baby in my mommytummy.
+    ROSE: I'm serious. I'm a serious... actor. Voice actor- VA. Indubitably, I will embiggen my words less so you can understand what the fuck I'm- fuck-
+    DAVE: Let's not talk. Let's... sing, like old times.
+    Rose is pregnant and she can't sing, okay? It's a problem.
+    DAVE: ROOOOOSE!!
+    JOHN: Rose!
+    DAVE: It's only fair...
+    ROSE: Right. Besides singing is passé for those of a caliber like ours. Let us engage in that ancient art far superior... <big><i>rap</i></big>
+
+    ROSE: It happened.
+    Make it happen Lalonde.
+    Suck that bitches' dick!
+    ROSE: I'm go- that's NOT what I'm doing! That's the opposite of what I'm doing. Alright... —fast as- BAH IT'S NOT RECORDING!
+    ROSE: i came as fast as i could
+    ROSE: Indubitably. I can- [angry noises])
 -------------------------------------------------------------------------------
 Track: the rose rap
 Duration: 2:45
-References: rose pragnant
+References:
+- Lose Yourself
+- track:miracles-icp
+Samples:
+- rose pragnant
+- bootes
+Contributors:
+- Von Fawn (Rose)
+- Astroliner (Rose, but from rose pragnant)
 URLs:
 - https://youtu.be/o3rJTGHgYTk
 Lyrics:
-    roserap:
-    strider let me break it down like this for you
-    there once was a violet femme fatale<br>whose violent violin sung sweet without
-    the tables of a boy who turned tricks and treats<br>like icy halloween breeze/ so fresh were his beats
-    but alone they were weak<br>no revolution<br>together - overtime<br>there was an evolution
-    they met on the net and there was a fusion<br>like danimals yogurt breakfast frusion
-    hearts<br>and minds<br>and souls<br>and hearts<br>they loved each other you bag of farts
-    they promised to be each others baby mommy daddy babies<br>but now theyre both caught in their lies<br>their fingers in another persons pies<br>guilty of another person's scabies
-    CHORUS (SUNG):
-    strider<br>heart to heart<br>dont treat me like a fool
-    you may have played me<br>but my heart waylayed me<br>i wanna be your baby mommy too
-    daverap:
-    rose i know how you're feeling, i know your emotions<br>i want you to know i mirror your devotion<br>you dont see this kind of depravity on the serengetti<br>whoops there goes gravity, moms spaghetti
-    i screwed up, i fucked up, i got screwed and fucked<br>im the baby of bad choices and my little legs are tucked<br>i wanted to be true, make you a faithful hubby<br>but you know i cant do, it's just too much trubby
-    we're related rose, thats the problem, not the other<br>we cant be baby mommy daddies because your my sis and im you're brother<br>i have the feelings your feeling, we share the same idea<br>and i know i screwed up and probably caught gonohrrea
-    but the truth of it all yo is that.... rose it would have never worked<br>and i hope you forgive me<br>because... actually... im having this baby now<br>i want to say im sorry and that i want to be.......... with you<br>and that what i did was wrong<br>and you can be its mommy and we can get married<br>and not worried about [*] babes
-    do you agree
-    roserap: yes dave.......... oh yes..................... take me away...........
-    <i>CHORUS</i>
-    <i>CHORUS X 2 with harmonies</i>
-    ROSE: DAVE I LIED.... IM NOT PREGNANT..... IM JUST FAT................<br>dave: oh rose.............. i dont care........... being pregnant might be against the rules of the mpsa forum, but this isn't...........
+    (Alright Strider, let's do this thing. Strider, let me break it down like this for ya.)
+
+    There once was a violet femme fatale
+    Whose violent violin sung sweet without
+    The tables of a boy who turned tricks and treats
+    Like icy Halloween breeze, so fresh were his beats
+    But alone they were weak, no revolution
+    Together, overtime, there was an evolution
+    They met on the net and there was a fusion
+    Like Danimals Yogurt Breakfast Frusion
+
+    Hearts, and minds
+    And souls, and hearts
+    They loved, each other
+    You bag, of farts
+
+    They promised to be each other's baby mommy babies
+    But now they're caught in their lies
+    Their fingers in another person's pies
+    Guilty of another person's scabies
+
+    Strider, heart to heart
+    Don't treat me like a fool
+    You may have played me
+    But my heart waylaid me
+    I wanna be your baby mommy too
+
+    Rose I know how you're feeling, I know your emotions
+    I want you to know I mirror your devotion
+    You don't see this kind of depravity on the Serengeti
+    Whoop there goes gravity! Mom's spaghetti
+
+    I screwed up, I fucked up, I got screwed and fucked (Oh my God, I hate Garageband so much.)
+    I'm the baby of bad choices and my little legs are tucked
+    I wanted to be true, make you a faithful hubby
+    But you know I can't do, it's too much trubby
+
+    We're related Rose, that's the problem not the other
+    We can't be baby mommy daddies 'cause you're my sis and I'm your brother (Miracles, fuckin' miracles bro!)
+    These feelings that you're feeling, we share the same idea
+    I know I screwed up and probably caught gonorrhea
+
+    (DAVE: But the truth Rose, is that... we can't have a baby because it would be retarded, and besides, incest is disgusting, and, um, anyone that condones pedophilia or incest is—
+    Water, fire, air and dirt!
+    DAVE: ...um, bad and they should see a psychiatrist, and also, will you marry me?
+    ROSE: Yes Dave!
+    DAVE: So we can have the baby together.
+    ROSE: Take me away!)
+
+    Strider, heart to heart
+    I wanna treat you like a fool
+    You may have played me
+    But my heart waylaid me
+    I wanna be your baby mommy
+    I wanna be your baby mommy
+    Baby mommy, baby mommy too! (Oh my God, I hate Garageband so much.)
+    (i came as fast as i could)
+
+    (ROSE: Dave, I lied!
+    DAVE: Rose I- I mean I think we can work through this, you know- even though—
+    ROSE: No I lied I'm not pregnant!
+    ROSE: <big>I'M JUST FAT</big>
+    DAVE: Oh Rose, I don't care... being pregnant might be against the rules of the MSPA Forum...
+    KARKAT: I'm going to throw up.
+    DAVE: ...but... shipping us together is not!
+    JOHN: Gross! Everyone cover your eyes!
     (worst makeout sounds ever)
-    karkat: im going to throw up<br>john: gross!!! everyone cover your eyes!!! the two naked incestuous pregnant teenagers are..... KISSING!!!!!!
-    <big><i>mmmmmmmmmmmmmmmmmmmmmmm</i></big>
+    JOHN: The two naked incestuous pregnant teenagers are... KISSING!! GROSS!!
+
+    MMMMM<big>MMMMMMMM</big>MMMM
+    ROSE: That's hot.)
 -------------------------------------------------------------------------------
 Track: uh oh
 Duration: 0:07
 URLs:
 - https://youtu.be/QJWPUe5cdKc
 Lyrics:
-    LOOKS LIKE EVERYTHINGS GOING TO BE OK
-    bro: dave im going to eat ur baby
+    (DAVE: Looks like everything's gonna work out fine after a- oh, holy shit is that—
+    BRO: Dave I'm gonna eat your baby.)
 -------------------------------------------------------------------------------
 Track: vs bros
 Duration: 1:27
-References: Can You Feel the Love Tonight, Versus
+References: Versus
+Samples: Can You Feel the Love Tonight
 URLs:
 - https://youtu.be/ustNt1bH9JQ
 Lyrics:
-    dave: bro i dont want to fight you. i just want to have my baby in peace.
-    bro: hah! too bad, ash ketchum! im gary motherfucking oak and i'm hungry for babies so get goddamn shoveling!
-    bro: i'm the king of everything under the sun<br>im just like parappa except i like hot dog buns
-    im gonna beatdown your butt<br>ill contention your face
-    ill eat all the babies in the human race
-    john: why would bro say something like that
-    dave: i dunno. he's never tried to eat my babies before!
-    bro: shut up your face dad, im totally me<br>eatin apple jacks is the way to be
-    haha! how does it feel to be shut down by my superior rapping techniques
-    i will show you the power of the forbidden rhyme - the words that rhyme with THEMSELVES
-    john: this is entirely unimpressive
-    bro: you have yet to see my true power
-    huaaaaaaaaaaaaaahhhhhhhhhhhhh
-    dave: actually this is [*]<br>im going to bed
-    bro: YOU CANT GO TO BED
-    actually im out of batteries so i'm going to die
+    Caaaan you feeeel—
+
+    (DAVE: Bro I dont wanna fight you, I just want to have my baby in peace.
+    BRO: Hah! Too bad, Ash Ketchum! I'm Gary motherfucking Oak, I'm hungry for babies so get goddamn shoveling!)
+
+    I'm the king of everything under the sun
+    I'm just like Parappa except I like hot dog buns
+    I'm gonna [[track:beatdown-strider-style|Beatdown]] your butt, I'll [[track:contention-vol4]] your face
+    I'll eat all the babies in the human race
+
+    (JOHN: Why would Bro say something like that?
+    DAVE: I don't know, he's never tried to eat my babies before!)
+
+    Shut up your face dad, I'm totally me
+    Eatin' apple jacks is the way to be!
+    
+    (BRO: How does it feel to be shut down by my superior rapping techniques? I will show you the power of the forbidden rhyme... words that rhyme with THEMSELVES!)
+
+    Hat, hat
+    Cat, cat
+    Bat, bat
+    Bat, bat (He's gonna run out of words sometime!)
+    Oops, I said something wrong 'cuz I'm stupid
+    Uh, uh, uh, uh
+    I don't, I didn't even write anything for this part
+    So, yeah...
+
+    (Actually, a fight sequence was entirely unnecessary. So, it was deleted aaaand what happens is that in the end: it turns out Bro's a robot. I mean... it was just complex given the fact that this is a normally simple story about, um uh, you know like a... thirteen-year-old boy giving birth to his brea- best friend, I- It- It didn't fit the archetypes. So, I'm going to uh... move on to the next song and you can, just... chillax a little bit.)
 -------------------------------------------------------------------------------
 Track: a baby is born
 Duration: 1:30
-References: rose pragnant
+Samples: rose pragnant
+Contributors:
+- Artemis251 (Kid, Luigi, Sweet Bro, Hella Jeff, background vocals)
+- Astroliner (Rose)
 URLs:
 - https://youtu.be/jCfE_6pTN8A
 Lyrics:
-    KC GREEN: HEY KIDS,,, THIS IS KC GREEN AND IT'S TIME FOR THE GUNSHOW SINGALONG SHOW I HOPE YOU ALL GOT YOUR FACES READY TO SING A LITTLE TUNE HERE
-    LETS GO
-    all: I'm having a baby and the baby is you<br>I'm having a baby and the baby is true<br>Greetings Andrew Hussie this is Radiation<br>How high do you have to be
-    pretty goddamn high
-    havin a baby and the baby is you (is you)<br>the baby is true (is trueeee)
-    OHHHHHHHH IM HAVIN A BABY<br>AND ITS GONNA BE AWESOME WHEN I HAVE A BABY
-    dave: omg its happening<br>IM HAVIN THIS BABY<br>IM HAVIN A BABY<br>ALL OVER YOUR FACE<br>AHFSAHFJHAGJKHAGKJHS<br>fjsahfkashgkjhagjks
-    luigi: actually this is pretty gross
-    arty: PUSH PUSH PUSH
-    mia: i came
-    dave: it's beautiful its beautiful<br>your beautiful<br>john youre a beautiful baby
-    john: I LOVE BEING YOUR BABY/ IM THE BABY. IM THE BABY, ITS ME
-    AND WE ALL LIVED HAPPILY EVER AFTER
-    &nbsp;
-    &nbsp;
-    &nbsp;
-    &nbsp;
-    &nbsp;
-    mia: i came as fast as i could
+    (KC GREEN: Hey kids! This is KC Green!
+    KID: Yay!
+    KC GREEN: And it's time for the Gunshow singalong show!
+    KID: The singalong, yay!
+    KC GREEN: I hope you all got your faces ready!
+    KID: My face is ready!
+    KC GREEN: To sing a little tune here!
+    KID: Let's sing!
+    KC GREEN: Let's go!)
+
+    I'm havin' a baby and the baby is you!
+    I'm havin' a baby and the baby is true!
+    Greetings Andrew Hussie this is Radiation
+    How high do you have to be?
+    Pretty goddamn high
+
+    Havin' a baby and the baby is you (Havin' a baby) (Is you)
+    Havin' a baby and the baby is true (Is trueeee)
+
+    Ohhhh, I'm having a baby (Havin' a baby, dogs!)
+    And it's gonna be awesome when I have a baby (???)
+
+    (DAVE: Oh my God! It's happening!
+    KID: Oh my, push!
+    DAVE: I'm having a baby! I'm having this baby right now!
+    JOHN: Having a baby!
+    KC GREEN: Oh it's so beautiful!
+    DAVE: All over your face!
+    KID: Push, push, push!
+    DAVE: Greuh, baby, baby—
+    JOHN: It's me! I'm the baby!
+    LUIGI: That's actually kinda really gross!
+    DAVE: Blblblblblblblbl...
+    KID: ???
+    JOHN: It's me! Wah!
+    DAVE: Oh, John!
+    ROSE: i came
+    DAVE: It's beautiful!
+    JOHN: [baby noises]
+    DAVE: It's beautiful John, you're a beautiful baaaaby!
+    JOHN: Thanks Dave!
+    DAVE: You're a beautiful baby!
+    JOHN: I love being your baby!
+    DAVE: <big>AND WE ALL LIVED HAPPILY EVER AFTER</big>
+
+    ROSE: i came
+    ROSE: i came as fast as i could
+
+    Brought to you by the rules of the MSPA Forums.
+
+    SWEET BRO AND HELLA JEFF: Who would even write this conksuck song anyway?
+    SWEET BRO AND HELLA JEFF: Imigrants??)
\ No newline at end of file
diff --git a/album/unreleased-tracks.txt b/album/unreleased-tracks.txt
index f6c45e35..58a81407 100644
--- a/album/unreleased-tracks.txt
+++ b/album/unreleased-tracks.txt
@@ -302,6 +302,9 @@ Track: Homosuck Anthem
 Artist: Toby Fox
 Duration: 1:51
 References: Homestuck Anthem
+Samples:
+- bootes
+- Wilhelm Scream
 URLs: https://www.youtube.com/watch?v=sVXPWSvSKGM
 -------------------------------------------------------------------------------
 Track: Typheus (Glitched)
@@ -1948,6 +1951,10 @@ Track: La Cucaracha
 Artist: Lost in History
 URLs: https://www.youtube.com/watch?v=cQLCJsIof8s
 -------------------------------------------------------------------------------
+Track: La Espero
+Artist: L. L. Zamenhof, Félicien Menu de Ménil
+URLs: https://www.youtube.com/watch?v=d97KYGY0_NY
+-------------------------------------------------------------------------------
 Track: Lawnmower
 Directory: lawnmower-lemon-demon
 Artist: Lemon Demon
@@ -1978,6 +1985,11 @@ Artist: Katamari Damacy
 Duration: 5:44
 URLs: https://www.youtube.com/watch?v=7_QydNXI_ok
 -------------------------------------------------------------------------------
+Track: Lose Yourself
+Artist: Eminem
+Duration: 5:20
+URLs: https://www.youtube.com/watch?v=xFYQQPAOz7Y
+-------------------------------------------------------------------------------
 Track: LRAD
 Artist: Knife Party
 Duration: 5:15
@@ -2716,6 +2728,10 @@ Duration: 1:39
 References: Sweet Victory
 URLs: https://www.youtube.com/watch?v=1BZs005Hbgs
 -------------------------------------------------------------------------------
+Track: Wilhelm Scream
+Artist: Lost in History
+URLs: https://www.youtube.com/watch?v=xn6hhrX34Pw
+-------------------------------------------------------------------------------
 Track: WOAH!
 Artist: Chris Patstone
 Duration: 0:07
diff --git a/artists.txt b/artists.txt
index 63cf57dd..4d5c72c0 100644
--- a/artists.txt
+++ b/artists.txt
@@ -306,6 +306,10 @@ URLs:
 -------------------------------------------------------------------------------
 Artist: arosoup
 -------------------------------------------------------------------------------
+Artist: Artemis251
+URLs:
+- http://artemis251.fobby.net/
+-------------------------------------------------------------------------------
 Artist: Arthur Fields
 -------------------------------------------------------------------------------
 Artist: articulatelyComposed
@@ -365,7 +369,9 @@ URLs:
 - https://twitter.com/ASTROBLUR
 - https://astroblur.carrd.co/
 -------------------------------------------------------------------------------
-Artist: astroliner
+Artist: Astroliner
+URLs:
+- https://astroliner.tumblr.com/
 -------------------------------------------------------------------------------
 Artist: atissi
 URLs:
@@ -1109,7 +1115,7 @@ Artist: Drowning Pool
 -------------------------------------------------------------------------------
 Artist: DSNAKE
 URLs:
- -https://www.instagram.com/disorderly.snake/
+- https://www.instagram.com/disorderly.snake/
 -------------------------------------------------------------------------------
 Artist: Dragonnova
 Alias: Melissa Peebles
@@ -1204,6 +1210,8 @@ Artist: Emily Jane
 Artist: Emily Tuohy
 Alias: Dizzy
 -------------------------------------------------------------------------------
+Artist: Eminem
+-------------------------------------------------------------------------------
 Artist: Emma Glaze
 URLs:
 - https://bedsafely.tumblr.com/
@@ -1276,6 +1284,8 @@ URLs:
 Artist: Feastings
 URLs: https://feastings.tumblr.com/
 -------------------------------------------------------------------------------
+Artist: Félicien Menu de Ménil
+-------------------------------------------------------------------------------
 Artist: felicitousArtisan
 -------------------------------------------------------------------------------
 Artist: Fellow Traveller
@@ -2054,6 +2064,8 @@ URLs:
 -------------------------------------------------------------------------------
 Artist: Kyle G. Jamolin
 -------------------------------------------------------------------------------
+Artist: L. L. Zamenhof
+-------------------------------------------------------------------------------
 Artist: L4Vo5
 URLs:
 - https://www.youtube.com/c/l4vo5
@@ -4105,6 +4117,8 @@ URLs:
 Artist: Vivus
 Alias: Vivian Ng
 -------------------------------------------------------------------------------
+Artist: Von Fawn
+-------------------------------------------------------------------------------
 Artist: vorpos
 URLs:
 - https://vorpos.tumblr.com/
diff --git a/static-pages.txt b/static-pages.txt
index 5bde04d6..501d25c7 100644
--- a/static-pages.txt
+++ b/static-pages.txt
@@ -90,10 +90,14 @@ Content:
             - added [[track:thin-red-line]] and [[artist:blazblue]] for references
     - added [[track:audio-commentary-featuring-robert-j-lake-nick-smalley-luke-gfd-benjamins-and-erik-jit-scheele]] to [[album:jailbreak-vol-1]]
         - fully transcribed, all 43 minutes of it (thanks Nameless Rumia for the initial transcription!)
+    - added updated lyrics, references contributors, and art tags to [[album:the-baby-is-you]] throughout the album
+        - added [[track:lose-yourself]] and [[artist:eminem]] for references
     - added [[track:haunt]] to [[album:unreleased-tracks]]
     <h3>data changes</h3>
     - added information for separate 'sampling' reference field to many tracks (mainly in [[group:official]], [[group:homestuck-gaiden]], and [[album:lofam5]]), not visible for now until support is implemented
         - some reference information will have appeared to disappear until then as it has been moved to samples
+    - moved [[group:desynced]] and [[album:perfectly-generic-object]] from [[group:beyond]] to [[group:fandom]]
+    - added the individual [[group:psycholonials]] episode albums to [[group:beyond]]
     - fixed incorrect title for [[track:skaian-dreams-remix]]
     - fixed [[track:contention]] not attributing [[group:toby-fox]]
     - fixed [[track:caramelldansen]] not attributing [[artist:caramell]] (thanks, Leo!)
@@ -108,8 +112,16 @@ Content:
     - fixed [[track:aggrieve-remix]] referencing [[track:aggrieve]] instead of [[track:aggrieve-violin-refrain]]
     - fixed [[track:white-host-green-room]] referencing [[track:the-king-in-red]] instead of [[track:the-king-in-red-beta]] (thanks, Cello!)
     - fixed [[Toby Fox Has Written Hundreds of Unique Original Songs]] referencing [[track:ruins]] (by Erik Scheele) instead of [[track:ruins-undertale]] (by Toby Fox)
+    - fixed a number of syntax errors in data files, thanks to improved parsing and data review by Gio (thank you!):
+        - fixed artist commentary not showing up for [[track:frogsong]] and [[track:schrodingers-harbinger]]
+        - fixed Instagram link not showing up for artist [[artist:DSNAKE]]
+        - fixed YouTube and tumblr links not showing up for artist [[artist:first-turn-fold]]
+        - fixed tumblr link not showing up for artist [[artist:thiefofstars]]
+    - fixed [[La Espero]] not being listed in reference list for [[Malblanka Rozo Verda Stelo]] (thanks, Sgeo!)
+        - added [[La Espero]] and artists [[artist:l-l-zamenhof]] and [[artist:flicien-menu-de-mnil]]
+    - fixed incorrect capitalization for [[album:sburb-ost]]
     - added Bandcamp link to [[album:perfectly-generic-object]] (thanks, Leo!)
-    - replaced dead Youtube link to [[track:corridors-of-time]] (thanks, Sgeo!)
+    - replaced dead Youtube link to [[track:corridors-of-time]] and removed dead Youtube link from [[track:planetarium]] (thanks, Sgeo!)
     - directory changed for some [[album:jailbreak-vol-1]] content
     - art tags for [[album:strife]] and [[album:act-7]]'s covers
     - added art tags for some Hiveswap characters (unused except for [[tag:jude]])