Merge branch 'staging' into preview

13 files changed, 446 insertions, 260 deletions

diff --git a/album/alterniabound.yaml b/album/alterniabound.yaml
index 4bd97ef7..cd00a1cc 100644
--- a/album/alterniabound.yaml
+++ b/album/alterniabound.yaml
@@ -155,7 +155,7 @@ Art Tags:
 - Vriska
 Referenced Tracks:
 - The Lemonsnout Turnabout
-- Objection! 2001
+- Phoenix Wright - Objection! 2001
 - track:sburban-jungle
 Commentary: |-
     <i>Malcolm Brown:</i>
diff --git a/album/bee-forus-seatbelt-safebee.yaml b/album/bee-forus-seatbelt-safebee.yaml
index c4a9cac4..8ee31022 100644
--- a/album/bee-forus-seatbelt-safebee.yaml
+++ b/album/bee-forus-seatbelt-safebee.yaml
@@ -37,6 +37,21 @@ Additional Files:
 - Title: Bandcamp Banner
   Files:
   - banner.png
+Commentary: |-
+    <i>Circlejourney:</i>
+    [[artist:blackhole|Blackhole (Not-Terezi-Pyrope)]] and the Beforus Q&A Team proudly present;
+    <b><p style="font-family:'Comic Sans', 'Comic Sans MS', cursive">seatbelt safebee</b></i>
+    A collaborative meme album, with 12 all-new tracks and original dialogue written by [[artist:blackhole|Blackhole]] and [[artist:magnoliajades|Magnoliajades]].
+    Commentary booklet assembled by [[artist:circlejourney|Circlejourney]].<br>
+    Track commentaries pulled from our Skype chat log. The Seatbelt Safebee album and related media are brought to you by memes.<br>
+    Homestuck, Undertale, Dark Souls and The Bee Movie are the property of their respective creators.<br>
+    Special thanks to [[artist:amelia-g|Amelia G. (amelia-inkheart)]] and [[artist:gilwing|Gilwing]] for letting us use their art, and [[artist:veritas-unae|VeritasUnae]] for hosting the tracks.
+
+    <b>About this album</b>
+    The Cronus Seatbelt Safety meme was born during the livestream of the [[album:beforus|Beforus album]], during the track [[track:land-of-cruisin-and-bruisin|Land of Cruisin and Bruisin]] by [[artist:nate-tronerud|Nate Tronerud]]. Tumblr user princeskytoe remarked upon Cronus’ lack of a visible seatbelt in the track art, which resulted in various users joking about his disregard for road safety and the fact that he was “cruising for a bruising”.
+    Bee memes made an appearance during the Beforus Album stream when album director and stream manager [[artist:blackhole|Blackhole (Not-Terezi-Pyrope)]] imposed various bee images over the booklet pages being shown in the stream, causing users to flood the stream chat with exclamations about bees.
+    Soon after the Q&A session, the artists from the Q&A Skype group got talking, composing, and drawing. Six days later, we had an album on our hands.
+    Ladies, gentlemen, and non-binary folks: Bee-forus: Seatbelt Safebee.
 ---
 Track: Bees.mp3
 Duration: '2:02'
@@ -51,21 +66,21 @@ URLs:
 Art Tags:
 - Bees
 Lyrics: |-
-  (It's been a long, hard day. You're walking down to the shops to buy yourself a glass a nice cool glass of lemonade.)
-  (Ahh...)
-  (And you seem to have lost your way. Where the shop should be, there is a beehive, and where there should be a shopkeeper, there is a bee. You approach the bee. He looks up with a menacing pincer snick. You're lost, you explain. You wonder if the bee could direct you to the lemonade. Sweet, sweet lemonade.)
-  (Ahh...)
-  (The bee looks at you. His mandibles widen. He begins to emit a swarm of yet smaller bees. They surround you, coating your clothes and hair, and infesting your various orifices with their warm, fuzzy mass. Don't worry, says one of the bees, whispering softly into your ear.)
-  (Don't worry.)
-  (There is nothing to fear. We are merely bees and bees are your friends.)
-  (Don't bee afraid.)
-  (You don't understand. All you wanted was some lemonade, its sweet icy coolness.)
-  (Ahh...)
-  (But now, that life is gone, and the whole world is bees. They are coating the room now.)
-  (Don't fight it.)
-  (They cover everything, filling it, filling you, with bee. Join us, they say, their voices a chorus of mournful buzzing. The soft cadence of the noise seems to hang poised in the air, forcefully penetrating your ears, your skull, your mind.)
-  (Join us.)
-  (Join us, say the bees, and you realise, you're one with the bees. This skin, this shell, is nothing but a minor barrier between you and the bees. You are bees. Glorious crescendo of buzzing rises under your skin! You are a swarm, rapturous melding of mind and form of bees dissolving to the sound in the air, a choir become one with its music, a phoenix of bees risen to take on a greater yet higher form! You let yourself go. You become one with the bees. You are a bee.)
+    (It's been a long, hard day. You're walking down to the shops to buy yourself a glass a nice cool glass of lemonade.)
+    (Ahh...)
+    (And you seem to have lost your way. Where the shop should be, there is a beehive, and where there should be a shopkeeper, there is a bee. You approach the bee. He looks up with a menacing pincer snick. You're lost, you explain. You wonder if the bee could direct you to the lemonade. Sweet, sweet lemonade.)
+    (Ahh...)
+    (The bee looks at you. His mandibles widen. He begins to emit a swarm of yet smaller bees. They surround you, coating your clothes and hair, and infesting your various orifices with their warm, fuzzy mass. Don't worry, says one of the bees, whispering softly into your ear.)
+    (Don't worry.)
+    (There is nothing to fear. We are merely bees and bees are your friends.)
+    (Don't bee afraid.)
+    (You don't understand. All you wanted was some lemonade, its sweet icy coolness.)
+    (Ahh...)
+    (But now, that life is gone, and the whole world is bees. They are coating the room now.)
+    (Don't fight it.)
+    (They cover everything, filling it, filling you, with bee. Join us, they say, their voices a chorus of mournful buzzing. The soft cadence of the noise seems to hang poised in the air, forcefully penetrating your ears, your skull, your mind.)
+    (Join us.)
+    (Join us, say the bees, and you realise, you're one with the bees. This skin, this shell, is nothing but a minor barrier between you and the bees. You are bees. Glorious crescendo of buzzing rises under your skin! You are a swarm, rapturous melding of mind and form of bees dissolving to the sound in the air, a choir become one with its music, a phoenix of bees risen to take on a greater yet higher form! You let yourself go. You become one with the bees. You are a bee.)
 ---
 Track: Seatbelt Safety
 Duration: '0:51'
@@ -83,9 +98,22 @@ Sampled Tracks:
 Art Tags:
 - Cronus
 Lyrics: |-
-  (Ladies and gentlemen, and everyone in between and otherwise, I'm here to tell you a story, about a certain man who did not know how to properly wear a seatbelt. That young man's name was Cronus Ampora, and one day he was driving his car, otherwise cruising and bruising, without wearing a seatbelt as mandated by Title 49 of the United States Code, Chapter 301, Motor Vehicle Safety Standard. In just a short time, through a series of trials and tribulations that would affect him on this day, he would discover the secrets of seatbelt safety, and have a convertive and serious motor vehicle accident because he was unfastened within the vehicle. This is the story of that journey of self-discovery that would affect him for the rest of his life. All of you, I hope you enjoy.)
+    (Ladies and gentlemen, and everyone in between and otherwise, I'm here to tell you a story, about a certain man who did not know how to properly wear a seatbelt. That young man's name was Cronus Ampora, and one day he was driving his car, otherwise cruising and bruising, without wearing a seatbelt as mandated by Title 49 of the United States Code, Chapter 301, Motor Vehicle Safety Standard. In just a short time, through a series of trials and tribulations that would affect him on this day, he would discover the secrets of seatbelt safety, and have a convertive and serious motor vehicle accident because he was unfastened within the vehicle. This is the story of that journey of self-discovery that would affect him for the rest of his life. All of you, I hope you enjoy.)
+
+    (Oh no, not the bees, not the bees! AAAAAAH!)
+Commentary: |-
+    <i>SerialSymphony:</i>
+    how do we make a cronus seatbelt song<br>
+    I'm thinking traffic background noise
+  
+    <i>Ducky Senpai:</i>
+    seatbelt clicking noises
+
+    <i>Stara:</i>
+    just sample traffic and the gross sounds seatbelts make when you rub them against themselves
 
-  (Oh no, not the bees, not the bees! AAAAAAH!)
+    <i>Ducky Senpai:</i>
+    cli-click
 ---
 Track: Damara's Bees (Fatalism Beemix)
 Duration: '3:24'
@@ -109,33 +137,47 @@ Art Tags:
 - Damara
 - Bees
 Lyrics: |-
-  (Now, remember what we went over before, Cronus. I don't have to repeat myself. If the safety belt is not on...)
-  (But Damara, I want to drive my rad greaser car vwithout having to vworry about the intricacies of safety!)
-  (Are you listening to me? If the safety belt isn't fastened tight around your smoking hot waist, you're going to die!)
-  (B-but I don't vwant to!)
-  (I'm not joking. Wear the belt, or you'll die.)
-  (Bu-bu-but bu-bu-but!)
-  (You'll die, Cronus. I'm saying right now, because the bees... they're going to get you, and you'll die.)
-
-  No not the bee! Oh bee, not the bee!
-  Oh not the bee, not the bee, not the bee!
-  No not the bee! Aaaa, not my eyes!
-  Aaaa not the aaa not my eyes! AAAAAAH!
-  No not the bee! Oh bee, not the bee!
-  Oh not the bee, not the bee, not the bee!
-  Oh not the bee! Aaaa, not my eyes!
-  Aaaa not the aaa not my eyes! AAAAAAH!
-
-  No not the bee! Oh bee, not the bee!
-  Oh not the bee, not the bee, not the bee!
-  No not the bee! Aaaa, not my eyes!
-  Aaaa not the aaa not my eyes! AAAAAAH!
-  No not the bee! Oh bee, not the bee!
-  Oh not the bee, not the bee, not the bee!
-  Oh not the bee! Aaaa, not my eyes!
-  Aaaa not the aaa not my eyes! AAAAAAH!
-
-  (Vwow, good thing no one actually has any bees around here.)
+    (Now, remember what we went over before, Cronus. I don't have to repeat myself. If the safety belt is not on...)
+    (But Damara, I want to drive my rad greaser car vwithout having to vworry about the intricacies of safety!)
+    (Are you listening to me? If the safety belt isn't fastened tight around your smoking hot waist, you're going to die!)
+    (B-but I don't vwant to!)
+    (I'm not joking. Wear the belt, or you'll die.)
+    (Bu-bu-but bu-bu-but!)
+    (You'll die, Cronus. I'm saying right now, because the bees... they're going to get you, and you'll die.)
+
+    No not the bee! Oh bee, not the bee!
+    Oh not the bee, not the bee, not the bee!
+    No not the bee! Aaaa, not my eyes!
+    Aaaa not the aaa not my eyes! AAAAAAH!
+    No not the bee! Oh bee, not the bee!
+    Oh not the bee, not the bee, not the bee!
+    Oh not the bee! Aaaa, not my eyes!
+    Aaaa not the aaa not my eyes! AAAAAAH!
+
+    No not the bee! Oh bee, not the bee!
+    Oh not the bee, not the bee, not the bee!
+    No not the bee! Aaaa, not my eyes!
+    Aaaa not the aaa not my eyes! AAAAAAH!
+    No not the bee! Oh bee, not the bee!
+    Oh not the bee, not the bee, not the bee!
+    Oh not the bee! Aaaa, not my eyes!
+    Aaaa not the aaa not my eyes! AAAAAAH!
+
+    (Vwow, good thing no one actually has any bees around here.)
+Commentary: |-
+    <i>NEON SYSTEM 95:</i>
+    "bees? fuckin idiot shoulda worn his seatbelt"
+
+    <i>SerialSymphony:</i>
+    'he wears the seatbelt or he gets the bees'
+
+    <i>Sigourney Martin:</i>
+    "wear your seatbelt kids or the SEATBELT BEE'S will come out and attack you."
+
+    <i>NEON SYSTEM 95:</i>
+    "what'll it be sir, seatbelt or bees?"<br>
+    [confused] "bees?"<br>
+    "HE HAS CHOSEN THE BEES"
 ---
 Track: Safety Crusher
 Duration: '1:24'
@@ -149,12 +191,15 @@ URLs:
 Referenced Tracks:
 - Metal Crusher
 Lyrics: |-
-  (Boy, I sure do love being a piece of shit all day who doesn't wear his seatbelt!)
-  (Hello.)
-  (Vwhat the fuck?)
-  (I am the Safety Robot. I am here to teach you about seatbelts.)
-  (Oh god!)
-  (Buckle up, fish nerd.)
+    (Boy, I sure do love being a piece of shit all day who doesn't wear his seatbelt!)
+    (Hello.)
+    (Vwhat the fuck?)
+    (I am the Safety Robot. I am here to teach you about seatbelts.)
+    (Oh god!)
+    (Buckle up, fish nerd.)
+Commentary: |-
+    <i>Lovissa Lassen:</i>
+    headcanon: safety bot is just a badly disguised mettaton
 ---
 Track: In Love (With Safety)
 Duration: '1:37'
@@ -174,35 +219,38 @@ Art Tags:
 - Cronus
 - SBaHJ
 Lyrics: |-
-  (Damara, help, save me from this creature! He's got me trapped in the car! Damara? Damara! Yes, get in the car, g-get in the car!)
-  (Now that we're in the car, we can... wait, w-who's, who are, oh, oh...)
-  (Oh, vwhat are you doing?)
-  (Oh, oh, Safety Bot, your...)
-  (Damara?)
-  (Your legs, they're so...)
-  (Damara, vwhat...)
-  (Oh my god...)
-  (Sort of being attacked here!)
-  (Maybe later, you and I, we can go back to my respiteblock, and...)
-  (Oh, for god's sake!)
-
-  Hey there, hello mister Safety Bot
-  Is that a belt that you have strapped on?
-  You're teaching Cronus how to buckle up
-  But afterward I'll unfasten you
-
-  Unlike other robots, you're concerned
-  For our safety, and that's attractive
-  Though what's safety without some danger
-  If you'd like, then I'll unfasten you
-
-  You make my motor run, keep it on
-  I could be the belt to your buckle
-  You make my horn go [BEEP BEEP], do it again,
-  I could be the belt to your buckle
-
-  (Watashi wa anzen botto no dikku wo suushitai desu.)
-  (Wait, hey, hang on, what are you doing with those bees?)
+    (Damara, help, save me from this creature! He's got me trapped in the car! Damara? Damara! Yes, get in the car, g-get in the car!)
+    (Now that we're in the car, we can... wait, w-who's, who are, oh, oh...)
+    (Oh, vwhat are you doing?)
+    (Oh, oh, Safety Bot, your...)
+    (Damara?)
+    (Your legs, they're so...)
+    (Damara, vwhat...)
+    (Oh my god...)
+    (Sort of being attacked here!)
+    (Maybe later, you and I, we can go back to my respiteblock, and...)
+    (Oh, for god's sake!)
+
+    Hey there, hello mister Safety Bot
+    Is that a belt that you have strapped on?
+    You're teaching Cronus how to buckle up
+    But afterward I'll unfasten you
+
+    Unlike other robots, you're concerned
+    For our safety, and that's attractive
+    Though what's safety without some danger
+    If you'd like, then I'll unfasten you
+
+    You make my motor run, keep it on
+    I could be the belt to your buckle
+    You make my horn go [BEEP BEEP], do it again,
+    I could be the belt to your buckle
+
+    (Watashi wa anzen botto no dikku wo suushitai desu.)
+    (Wait, hey, hang on, what are you doing with those bees?)
+Commentary: |-
+    <i>Blackhole:</i>
+    Jade you should make a track on your piano where you sing a raunchy ballad to the safety bot :p
 ---
 Track: FEAR OF BEES
 Duration: '2:02'
@@ -225,14 +273,18 @@ Art Tags:
 - Cronus
 - Bees
 Lyrics: |-
-  (Safety Bot does not care about troll romance. Safety Bot only cares about safety. Because you refuse safety, Safety Bot will now release the bees. Releasing bees now.)
-  (What the fuck are you doing with those bees? Oh, fuck me Cronus, floor it! The bees are coming, The bees are coming!)
-  (Oh god, the bees!)
-  (Damn it Cronus, I told you to wear protection! Get us out of here)
+    (Safety Bot does not care about troll romance. Safety Bot only cares about safety. Because you refuse safety, Safety Bot will now release the bees. Releasing bees now.)
+    (What the fuck are you doing with those bees? Oh, fuck me Cronus, floor it! The bees are coming, The bees are coming!)
+    (Oh god, the bees!)
+    (Damn it Cronus, I told you to wear protection! Get us out of here)
 
-  (Oh no, not the bees, not the bees! AAAAAAH! They're in my eyes! My eyes! Aaaah! Aaaah!)
+    (Oh no, not the bees, not the bees! AAAAAAH! They're in my eyes! My eyes! Aaaah! Aaaah!)
 
-  (AAAAAAH! They're in my eyes! My eyes! Aaaah! Aaaah!)
+    (AAAAAAH! They're in my eyes! My eyes! Aaaah! Aaaah!)
+Commentary: |-
+    <i>NEON SYSTEM 95:</i>
+    i could put bees into the intro to the song i made<br>
+    it'd work really well
 ---
 Track: Beltstep
 Duration: '2:07'
@@ -253,45 +305,48 @@ Referenced Tracks:
 Art Tags:
 - Bees
 Lyrics: |-
-  (Warning. Safety Bot has detected that bee levels are in excess. Excess bees are unsafe. Engaging bees in combat.)
-  (Vwait, he's going to fight the bees? Yes!)
-  (Yeeeah, go Safety Bot, go!)
-  (I mean, it would have been good if he just hadn't released them in the first place, but—)
-  (Engaging combat mode.)
-
-  (Boy, I sure do love being a piece of shit all day who doesn't wear his seatbelt.)
-  (Hello.)
-  (Vwhat the fuck?)
-  I am the Safety Robot
-  The Safety Robot
-  The Safety Robot
-  The Safety Robot
-  The Safe the Safe the Safe the Safe the Safety— buckle up, fish nerd
-
-  Buckle up, buckle up, buckle up
-  Buckle up, buckle up, buckle up
-  Buckle up, buckle up, buckle up
-  Buckle up, buckle up, buckle up
-
-  Buckle up, buckle up, buckle up, nerd
-  Buckle up, buckle up, buckle up, nerd
-  Buckle up, buckle up, buckle up, nerd
-  Buckle up, buckle up, buckle up
-
-  (Boy, I sure do love being a piece of shit... who doesn't wear his seatbelt.)
-  (Hello)
-  (Vwhat the fuck?)
-  (Buckle up... fish nerd)
-
-  Buckle up, buckle up, buckle up
-  Buckle up, buckle up, buckle up
-  Buckle up, buckle up, buckle up, nerd
-  Buckle up, buckle up, buckle up, nerd
-  Buckle up, buckle up, buckle up, nerd
-  Buckle up, buckle up, buckle up, nerd
-  Buckle up, buckle up, buckle up (Vwhat the fuck?)
-
-  (Safety Bot has lost against the bees. The bees have won. Des—)
+    (Warning. Safety Bot has detected that bee levels are in excess. Excess bees are unsafe. Engaging bees in combat.)
+    (Vwait, he's going to fight the bees? Yes!)
+    (Yeeeah, go Safety Bot, go!)
+    (I mean, it would have been good if he just hadn't released them in the first place, but—)
+    (Engaging combat mode.)
+
+    (Boy, I sure do love being a piece of shit all day who doesn't wear his seatbelt.)
+    (Hello.)
+    (Vwhat the fuck?)
+    I am the Safety Robot
+    The Safety Robot
+    The Safety Robot
+    The Safety Robot
+    The Safe the Safe the Safe the Safe the Safety— buckle up, fish nerd
+
+    Buckle up, buckle up, buckle up
+    Buckle up, buckle up, buckle up
+    Buckle up, buckle up, buckle up
+    Buckle up, buckle up, buckle up
+
+    Buckle up, buckle up, buckle up, nerd
+    Buckle up, buckle up, buckle up, nerd
+    Buckle up, buckle up, buckle up, nerd
+    Buckle up, buckle up, buckle up
+
+    (Boy, I sure do love being a piece of shit... who doesn't wear his seatbelt.)
+    (Hello)
+    (Vwhat the fuck?)
+    (Buckle up... fish nerd)
+
+    Buckle up, buckle up, buckle up
+    Buckle up, buckle up, buckle up
+    Buckle up, buckle up, buckle up, nerd
+    Buckle up, buckle up, buckle up, nerd
+    Buckle up, buckle up, buckle up, nerd
+    Buckle up, buckle up, buckle up, nerd
+    Buckle up, buckle up, buckle up (Vwhat the fuck?)
+
+    (Safety Bot has lost against the bees. The bees have won. Des—)
+Commentary: |-
+    <i>Ducky Senpai:</i>
+    <b>who wants really shitty beltstep???</b>
 ---
 Track: Beetermination (Thinking Bee)
 Duration: '1:32'
@@ -309,30 +364,35 @@ URLs:
 Sampled Tracks:
 - The Bee Movie
 Lyrics: |-
-  (Damn it, Safety Bot! Why are you so bad at fighting bees? And why are you so good in bed? Mmm-mmm!)
-  (Yeah, how could bees defeat a robot anyway?)
-  (Because bees have the power of determination.)
-  (Oh god, vwho the fuck are you?)
-  (I am the voice of the bees, and I'm here to tell you more about the bees.)
-
-  According to all known laws of aviation
-  There is no way a bee should be able to fly
-  Its wings are too small
-  To get its fat little body off the ground
-  The bee, of course, flies anyway
-  Because bees don't care what humans think is impossible
-  (Impossible. Impossible. Impossible. Impossible. Impossible. Impossible.)
-
-  (Bee! Bee! Bee! Bee! Bee!)
-  (Bee! Bee! Bee! Bee! Bee!)
-  (Bee! Bee! Bee! Bee! Bee!)
-  (Bee! Bee! Bee! Bee! Bee!)
-  (Bee! Bee! Bee! Bee! Bee!)
-  (Bee! Bee! Bee! Bee! Bee!)
-  (Bee! Bee! Bee! Bee! Bee!)
-  (Bee! Bee! Bee! Bee! Bee!)
-
-  (Bedbug...)
+    (Damn it, Safety Bot! Why are you so bad at fighting bees? And why are you so good in bed? Mmm-mmm!)
+    (Yeah, how could bees defeat a robot anyway?)
+    (Because bees have the power of determination.)
+    (Oh god, vwho the fuck are you?)
+    (I am the voice of the bees, and I'm here to tell you more about the bees.)
+
+    According to all known laws of aviation
+    There is no way a bee should be able to fly
+    Its wings are too small
+    To get its fat little body off the ground
+    The bee, of course, flies anyway
+    Because bees don't care what humans think is impossible
+    (Impossible. Impossible. Impossible. Impossible. Impossible. Impossible.)
+
+    (Bee! Bee! Bee! Bee! Bee!)
+    (Bee! Bee! Bee! Bee! Bee!)
+    (Bee! Bee! Bee! Bee! Bee!)
+    (Bee! Bee! Bee! Bee! Bee!)
+    (Bee! Bee! Bee! Bee! Bee!)
+    (Bee! Bee! Bee! Bee! Bee!)
+    (Bee! Bee! Bee! Bee! Bee!)
+    (Bee! Bee! Bee! Bee! Bee!)
+
+    (Bedbug...)
+Commentary: |-
+    <i>SerialSymphony:</i>
+    I am<br>
+    watching the bee movie<br>
+    for meme purposes
 ---
 Track: Bee Safe
 Duration: '1:49'
@@ -354,18 +414,29 @@ Art Tags:
 - Cronus
 - Beforus
 Lyrics: |-
-  (Vwait, I think I'm having an epiphany!)
-  (What.)
-  (The bees, I can communicate with them. They're teaching me about, about... about seatbelt safety!)
-
-  Up where they buzz, up where they swarm
-  Up where they buckle up their seatbelts
-  Just wait and see
-  Someday I'll be
-  One with the bees
-
-  (Yeah. The bees. Bzzzzzzz—)
-  (Buckle up...)
+    (Vwait, I think I'm having an epiphany!)
+    (What.)
+    (The bees, I can communicate with them. They're teaching me about, about... about seatbelt safety!)
+
+    Up where they buzz, up where they swarm
+    Up where they buckle up their seatbelts
+    Just wait and see
+    Someday I'll be
+    One with the bees
+
+    (Yeah. The bees. Bzzzzzzz—)
+    (Buckle up...)
+Commentary: |-
+    <i>NEON SYSTEM 95:</i>
+    Cronus Seatbelt Safety is good too<br>
+    NO<br>
+    BEE SAFE
+
+    <i>Circlejourney:</i>
+    holy fuck
+
+    <i>NEON SYSTEM 95:</i>
+    "Bee Safe, Cronus!"
 ---
 Track: Savior of the Driving Dead
 Duration: '1:34'
@@ -385,13 +456,31 @@ Art Tags:
 - Cronus
 - Bees
 Lyrics: |-
-  (He is here now. The savior of driving safety. The bees have shown him the way of the seatbelt. He is now... the Savior of the Driving Dead.)
+    (He is here now. The savior of driving safety. The bees have shown him the way of the seatbelt. He is now... the Savior of the Driving Dead.)
+
+    (Fuck you, Safety Bot! But also... <i>fuck you</i>, Safety Bot...)
+
+    (Oh no, not the bees, not the bees! AAAAAAH! They're in my eyes! My eyes! Aaaah! Aaaah!)
+
+    (Damara is love, Damara is life. Deal with it.)
+Commentary: |-
+    <i>Lovisa Lassen:</i>
+    a beacon of hope
 
-  (Fuck you, Safety Bot! But also... <i>fuck you</i>, Safety Bot...)
+    <i>Circlejourney:</i>
+    unbelievable
 
-  (Oh no, not the bees, not the bees! AAAAAAH! They're in my eyes! My eyes! Aaaah! Aaaah!)
+    <i>Lovisa Lassen:</i>
+    hope that one day we can be safe
 
-  (Damara is love, Damara is life. Deal with it.)
+    <i>SerialSymphony:</i>
+    holy shit
+
+    <i>Circlejourney:</i>
+    the saviour
+
+    <i>Lovisa Lassen:</i>
+    saviour of the driving dead
 ---
 Track: I Want You (To Wear a Seatbelt)
 Artists:
@@ -403,6 +492,8 @@ Contributors:
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/i-want-you-to-wear-a-seatbelt
 - https://www.youtube.com/watch?v=EWr7djL04Og
+Referenced Tracks:
+- Savior of the Driving Dead
 Sampled Tracks:
 - The Wicker Man
 Duration: '1:05'
@@ -410,26 +501,42 @@ Art Tags:
 - Cronus
 - Mituna
 Lyrics: |-
-  (So, Cronus. Now that you're a master of seatbelt safety, do you have anything to tell the masses?)
-  (Yes. I have to tell them, that I vwant you to vwear a seatbelt!)
-
-  Oh no, not the bees!
-  Bees!
-  Bees!
-  Bees!
-  Bees!
-  Bees!
-  Bees!
-  Bees!
-  Oh no, not the bees!
-  Bees!
-  Bees!
-  Bees!
-  Bees!
-  Bees!
-  Bees!
-  Bees!
-  Oh no, not the bees!
+    (So, Cronus. Now that you're a master of seatbelt safety, do you have anything to tell the masses?)
+    (Yes. I have to tell them, that I vwant you to vwear a seatbelt!)
+
+    Oh no, not the bees!
+    Bees!
+    Bees!
+    Bees!
+    Bees!
+    Bees!
+    Bees!
+    Bees!
+    Oh no, not the bees!
+    Bees!
+    Bees!
+    Bees!
+    Bees!
+    Bees!
+    Bees!
+    Bees!
+    Oh no, not the bees!
+Commentary: |-
+    <i>SerialSymphony:</i>
+    imma make it like<br>
+    all pompous and orchestry<br>
+    to mimic the 'I Want You' joke
+
+    <i>Sigourney Martin:</i>
+    this is some serious memings
+
+    <i>magnoliajades:</i>
+    it could use a patriotic touch
+
+    <i>SerialSymphony:</i>
+    since this is cronus pro-seatbelt<br>
+    I'm incorporating savior of the driving dead<br>
+    as he's learned his lesson
 ---
 Track: Safe Drive at Midnight (Fuchsia Moonrise Beep Mix)
 Duration: '1:08'
@@ -449,23 +556,26 @@ Art Tags:
 - Cronus
 - Beforus
 Lyrics: |-
-  (Hey Damara, vwant to go for a drive?)
-
-  Buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck
-
-  Buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck
-  Buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck
-  Buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck
-  Buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck
-
-  Buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck
-  (The other day.)
-  Buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck
-  (I read a comic called Homestuck.)
-  Buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck
-  (And, uh, it was so... dumb)
-  Buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck
-  (They didn't even have legs, like Safety Bot... what's the point?)
+    (Hey Damara, vwant to go for a drive?)
+
+    Buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck
+
+    Buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck
+    Buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck
+    Buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck
+    Buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck
+
+    Buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck
+    (The other day.)
+    Buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck
+    (I read a comic called Homestuck.)
+    Buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck
+    (And, uh, it was so... dumb)
+    Buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck buck
+    (They didn't even have legs, like Safety Bot... what's the point?)
+Commentary: |-
+    <i>Circlejourney:</i>
+    it's my album track ([[track:fuchsia-moonrise|fuchsia moonrise]]) with a car horn, bees buzzing and a "buckle up" voice sample in place of some instruments
 ---
 Track: Sleep Tite, Veri
 Duration: '2:00'
@@ -482,8 +592,42 @@ Art Tags:
 - Cronus
 - Bees
 Lyrics:
-  (And with that, we end our charming tale about road driving safety with seatbelts. Sleep tite, kids, and buckle up.)
+    (And with that, we end our charming tale about road driving safety with seatbelts. Sleep tite, kids, and buckle up.)
 
 
-  (Buckle up...)
-  
+    (Buckle up...)
+Commentary: |-
+    <i>Circlejourney:</i>
+    congrats veri<br>
+    have a good rest
+
+    <i>Ducky Senpai:</i>
+    yes do the sleep
+
+    <i>Veritas Unae:</i>
+    slumbers like a dragon
+
+    <i>SerialSymphony:</i>
+    Sleep tight
+
+    <i>Nate Tronerud:</i>
+    goodnight sweet prince
+
+    <i>Ducky Senpai:</i>
+    the noblest and sleepiest of reptilians
+
+    <i>SerialSymphony:</i>
+    Imma make a lullaby for veri
+
+    <i>magnoliajades:</i>
+    goodnight veriii
+
+    <i>Ducky Senpai:</i>
+    this whole seatbelt album is actually the shittiest lullaby made specifically for veri<br>
+    rock opera lullaby<br>
+    sleep tight and dream of bees<br>
+    and nic cage<br>
+    also safety
+
+    <i>Circlejourney:</i>
+    remember to buckle your seatbelt
diff --git a/album/cool-and-new-volume-2.yaml b/album/cool-and-new-volume-2.yaml
index 3f7b2b21..112ddcf2 100644
--- a/album/cool-and-new-volume-2.yaml
+++ b/album/cool-and-new-volume-2.yaml
@@ -29,6 +29,15 @@ Commentary: |-
     i'ts album fro cool and new web comic................................................agian!?!
     its the 2th one
 
+    <i>Cryptanark:</i>
+    sometimes you need to sacrifice meme numbers for bigger and better things
+
+    <i>Aris Martinian:</i>
+    Some of the stuff on this album is seriously some of the best music I've listened to, And I'm not talking about the shitpost tracks.
+
+    <i>miraculousAvantgarde:</i>
+    It was pretty hard sitting around doing nothing as the Art Manager. I had some coke (not the drink) and a can of pringles, but that still didn't satisfy my curiosity. Also, I'm currently eating a bowl of Fruity Pebbles. It's not great, but it's not terrible. I'd rate it somewhere [[track:bowmans-credit-score|between 4/50 and 8/50]]. Speaking of which, this message has been brought to you by Kellog's Fruity Pebbles. When you eat Kellog's Fruity Pebbles every morning, you'll feel like you want to [[track:fruity-pebbles-jingle|start a bloody war and build a pebble nation]]!
+
     <i>Niklink:</i>
     I'm just pointing out that this whole 50+ track album came out two and a half weeks after [[album:cool-and-new-voulem1|our previous 50+ track album]].
 
@@ -37,6 +46,9 @@ Commentary: |-
 
     <i>Ngame:</i>
     (<a href="https://www.youtube.com/watch?v=4GyZeqU-eu0">Community listening stream w/ chat</a>)
+
+    <i>Cryptanark:</i>
+    who am i kidding meme numbers are great
 ---
 Track: Autonomonasty Senserational Meridisick Repose
 Artists:
diff --git a/album/cool-and-new-volume-ii.yaml b/album/cool-and-new-volume-ii.yaml
index 97c85e54..c6d5ba89 100644
--- a/album/cool-and-new-volume-ii.yaml
+++ b/album/cool-and-new-volume-ii.yaml
@@ -58,6 +58,9 @@ Commentary: |-
     i'ts album fro cool and new web comic
     its the IIth one
 
+    <i>Aris Martinian:</i>
+    Having spent hours and hours mastering these two albums, I've been able to listen to every single track and appreciate all 102 of them. Not that I particularly appreciated every single one. In any case, I'd like to thank each and every music team member who contributed to this release as well as every art team member who provided the brilliantly done artwork found throughout both albums. Special thanks to [[artist:o|o]], once again, for writing the comic that has inspired us all. I'm glad to be part of an effort to keep a dying webcomic alive through a tradition of music, artwork, and most importantly of all, friendship and community. Thank you for downloading this album. We wouldn't have been able to do this without you and everyone else who hit that button on either bandcamp or mega.nz.
+
     <i>Niklink:</i>
     I'm just pointing out that this whole 50 track album came out two and a half hours after [[album:cool-and-new-volume-2|our previous 50+ track album]].
 
diff --git a/album/friendsymphony.yaml b/album/friendsymphony.yaml
index 78f948e5..f7aab006 100644
--- a/album/friendsymphony.yaml
+++ b/album/friendsymphony.yaml
@@ -19,6 +19,7 @@ Banner File Extension: png
 Wallpaper Artists:
 - Chesswanderlust-sama
 Wallpaper Style: 'opacity: 0.8;'
+Wallpaper File Extension: png
 Additional Files:
 - Title: Bandcamp Banner and Background
   Files:
diff --git a/album/homestuck-vol-1-4.yaml b/album/homestuck-vol-1-4.yaml
index c2983b7b..4c64c90b 100644
--- a/album/homestuck-vol-1-4.yaml
+++ b/album/homestuck-vol-1-4.yaml
@@ -16,6 +16,12 @@ Wallpaper Style: 'opacity: 0.85;'
 Wallpaper Artists:
 - Homestuck
 - Niklink (edits for wiki)
+Additional Files:
+- Title: SBURB Wallpaper (from Vol. 4)
+  Files:
+  - sburbwp_1280x1024.jpg
+  - sburbwp_1440x900.jpg
+  - sburbwp_1920x1080.jpg
 ---
 Color: '#38f43d'
 Group: From <i>Homestuck Vol. 1</i>
diff --git a/album/homestuck-vol-9.yaml b/album/homestuck-vol-9.yaml
index 452440cf..13d0be21 100644
--- a/album/homestuck-vol-9.yaml
+++ b/album/homestuck-vol-9.yaml
@@ -691,7 +691,7 @@ Artists:
 - Michael Guy Bowman
 Contributors:
 - Erik Scheele (piano)
-- Marcy Nabors (thermin & accordian)
+- Marcy Nabors (theremin & accordion)
 Duration: '3:50'
 URLs:
 - https://homestuck.bandcamp.com/track/im-a-member-of-the-midnight-crew-post-punk-version-2
diff --git a/album/nice-wizards-electronic-extravaganza.yaml b/album/nice-wizards-electronic-extravaganza.yaml
index 16dcf34f..41baf2e4 100644
--- a/album/nice-wizards-electronic-extravaganza.yaml
+++ b/album/nice-wizards-electronic-extravaganza.yaml
@@ -11,6 +11,7 @@ Cover Artists:
 Color: '#6d74cf'
 Groups:
 - Fandom
+- Beyond
 Commentary: |-
     <i>Nice Wizard:</i>
     This is a collection of my electronic works, all in one easy album! Don't feel obliged to pay anything, I'd rather you guys hear it than pay me a penny!
diff --git a/album/oceanfalls-vol-3.yaml b/album/oceanfalls-vol-3.yaml
index 78b2b1b6..90ac873b 100644
--- a/album/oceanfalls-vol-3.yaml
+++ b/album/oceanfalls-vol-3.yaml
@@ -290,3 +290,5 @@ Cover Artists:
 - Hadron
 Art Tags:
 - Kaji (Oceanfalls)
+Referenced Tracks:
+- Sea Patrol (Ocean Quarrel)
diff --git a/album/of-troles-and-chiptumes.yaml b/album/of-troles-and-chiptumes.yaml
index 1ea1d8bc..fa841ee8 100644
--- a/album/of-troles-and-chiptumes.yaml
+++ b/album/of-troles-and-chiptumes.yaml
@@ -85,7 +85,7 @@ Referenced Tracks:
 ---
 Track: The Not-Fuckass Not-Waltz
 Cover Artists:
-- drXfactorz
+- daXfactorz
 Duration: '02:41'
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/the-not-fuckass-not-waltz
diff --git a/album/references-beyond-homestuck.yaml b/album/references-beyond-homestuck.yaml
index bac39b25..f0179a41 100644
--- a/album/references-beyond-homestuck.yaml
+++ b/album/references-beyond-homestuck.yaml
@@ -173,6 +173,15 @@ Lyrics: |-
     (Well thank you Scott. Thank goodness for comedians. You know? It lightens our day.)
     (It-that-it wasn't supposed to be funny.)
 ---
+Track: Gaster's Theme
+# No official release, duration is from the in-game audio loop.
+Artists:
+- 'Toby Fox'
+Directory: gasters-theme-undertale
+Duration: 0:17
+URLs:
+- https://www.youtube.com/watch?v=CFn8xs157Gw
+---
 Track: Gay Love Song for Four Cellos
 Artists:
 - Clark Powell
@@ -253,6 +262,14 @@ URLs:
 - https://sleepytimejesse.bandcamp.com/track/megalo-strike-back
 - https://www.youtube.com/watch?v=ZpJudi7_iiw
 ---
+Track: Megalovania
+Directory: megalovania-halloween
+# No official release (RIP)
+Artists:
+- Toby Fox
+URLs:
+- https://www.youtube.com/watch?v=iIowwZThIXM
+---
 Track: Michael Bowman Remix
 Artists:
 - Michael Guy Bowman
@@ -417,6 +434,14 @@ Lyrics: |-
 
     (So what, in conclusion, subscribe to my YouTube, subscribe to my Twitter, my Tumblr, everything you can find! I'm Toby "Radiation" Fox, and I'm, the greatest living artist, known to maaan! ...Yo, the fuck? Homestuck update yo, get out! Yo get out! ...Aw, Equius, you get me in a place I can't touch.)
 ---
+Track: Room of Dog
+# No official release, duration is from the in-game audio loop.
+Artists:
+- 'Toby Fox'
+Duration: '0:35'
+URLs:
+- https://www.youtube.com/watch?v=grGnVeKCcvc
+---
 Track: Seinfeld X
 Artists:
 - Toby Fox
@@ -1018,15 +1043,6 @@ Artists:
 URLs:
 - https://www.youtube.com/watch?v=hPT77G3LGwA
 ---
-Track: Gaster's Theme
-# No official release, duration is from the in-game audio loop.
-Artists:
-- 'Toby Fox'
-Directory: gasters-theme-undertale
-Duration: 0:17
-URLs:
-- https://www.youtube.com/watch?v=CFn8xs157Gw
----
 Track: Giygas Disintegrates
 # (See Eight Melodies, no official soundtrack release)
 Artists:
@@ -1487,13 +1503,20 @@ Lyrics: |-
     Your lonely rolling star
     Saa mae wo muite yukou (<i>So face forward and keep going!</i>)
 ---
-Track: Megalovania
-Directory: megalovania-halloween
-# No official release (RIP)
+Track: Maya Fey - Turnabout Sisters 2001
+# JP: 綾里真宵　～逆転姉妹のテーマ 2001
+# Official release:
+#   逆転裁判＋逆転裁判２　オリジナル・サウンドトラック
+# Reference:
+#   https://vgmdb.net/album/2600
 Artists:
-- Toby Fox
+- Ace Attorney
+- Masakazu Sugimori
+Contributors:
+- Naoto Tanaka (arrangement)
+Duration: '2:41'
 URLs:
-- https://www.youtube.com/watch?v=iIowwZThIXM
+- https://www.youtube.com/watch?v=upOhRRYVGkA
 ---
 Track: Moon Over the Castle
 # Original release:
@@ -1534,21 +1557,6 @@ Artists:
 URLs:
 - https://www.youtube.com/watch?v=PTQBFoM_cVw
 ---
-Track: Objection! 2001
-# JP: 成歩堂龍一　～異議あり！ 2001
-# Official release:
-#   逆転裁判＋逆転裁判２　オリジナル・サウンドトラック
-# Reference:
-#   https://vgmdb.net/album/2600
-Artists:
-- Ace Attorney
-- Masakazu Sugimori
-Contributors:
-- Naoto Tanaka (arrangement)
-Duration: '1:22'
-URLs:
-- https://www.youtube.com/watch?v=_I34nshlOPk
----
 Track: Old Friends
 # Official release on Bandcamp
 Artists:
@@ -1577,6 +1585,21 @@ Artists:
 URLs:
 - https://www.youtube.com/watch?v=XKfXsTkA71I
 ---
+Track: Phoenix Wright - Objection! 2001
+# JP: 成歩堂龍一　～異議あり！ 2001
+# Official release:
+#   逆転裁判＋逆転裁判２　オリジナル・サウンドトラック
+# Reference:
+#   https://vgmdb.net/album/2600
+Artists:
+- Ace Attorney
+- Masakazu Sugimori
+Contributors:
+- Naoto Tanaka (arrangement)
+Duration: '1:22'
+URLs:
+- https://www.youtube.com/watch?v=_I34nshlOPk
+---
 Track: Pushing Onwards
 # Official release on Bandcamp (OK, also the guy's own site)
 # Reference:
@@ -1669,14 +1692,6 @@ Duration: '5:04'
 URLs:
 - https://www.youtube.com/watch?v=SmIdewKUmW4
 ---
-Track: Room of Dog
-# No official release, duration is from the in-game audio loop.
-Artists:
-- 'Toby Fox'
-Duration: '0:35'
-URLs:
-- https://www.youtube.com/watch?v=grGnVeKCcvc
----
 Track: Running Hell
 # The original Cave Story's soundtrack hasn't been officially released.
 Artists:
@@ -2161,21 +2176,6 @@ Duration: '3:29'
 URLs:
 - https://youtu.be/KYhA2RisjP0?t=43
 ---
-Track: Turnabout Sisters Theme 2001
-# JP: 綾里真宵　～逆転姉妹のテーマ 2001
-# Official release:
-#   逆転裁判＋逆転裁判２　オリジナル・サウンドトラック
-# Reference:
-#   https://vgmdb.net/album/2600
-Artists:
-- Ace Attorney
-- Masakazu Sugimori
-Contributors:
-- Naoto Tanaka (arrangement)
-Duration: '2:41'
-URLs:
-- https://www.youtube.com/watch?v=upOhRRYVGkA
----
 Track: Ultimate Koopa
 # JP: クッパ3号
 # Official release:
diff --git a/album/shortcuts.yaml b/album/shortcuts.yaml
index e17ee025..f78fc450 100644
--- a/album/shortcuts.yaml
+++ b/album/shortcuts.yaml
@@ -33,6 +33,8 @@ Additional Files:
   - banner.png
   - bg.png
 ---
+Group: Main album
+---
 Track: A Scape
 Artists:
 - Marcy Nabors
@@ -150,3 +152,18 @@ URLs:
 Commentary: |-
     <i>Nat Wesley:</i>
     hues/tone is a track about houston get it
+---
+Group: Bonus tracks
+---
+Track: Audio Commentary Featuring David Ellis, Robert J! Lake, Yishan Mai, Marcy Nabors and Corbin Pangilinan
+Artists:
+- David Ellis
+- Robert J! Lake
+- Catboss
+- Marcy Nabors
+- Corbin Pangilinan
+Duration: '40:03'
+Has URLs: false
+Commentary: |-
+    <i>Niklink:</i>
+    The 'lyrics' to this track are deliberately ommitted. As commentary, providing a transcription would be essentially the same as providing the audio itself, which is purchase-only bonus material.
\ No newline at end of file
diff --git a/album/undertale-soundtrack.yaml b/album/undertale-soundtrack.yaml
index 40b06498..1eeb1612 100644
--- a/album/undertale-soundtrack.yaml
+++ b/album/undertale-soundtrack.yaml
@@ -838,7 +838,7 @@ URLs:
 - https://youtu.be/9nXCOhSYu38
 Referenced Tracks:
 - Dating Start!
-- Turnabout Sisters Theme 2001
+- Maya Fey - Turnabout Sisters 2001
 ---
 Track: Bereavement
 Artists: