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

33 files changed, 196 insertions, 34 deletions

diff --git a/album/alternia.yaml b/album/alternia.yaml
index 7a11414e..0a8a84e7 100644
--- a/album/alternia.yaml
+++ b/album/alternia.yaml
@@ -5,7 +5,6 @@ Date: July 18, 2010
 Date Added: November 15, 2019
 URLs:
 - https://homestuck.bandcamp.com/album/alterniabound-with-alternia
-- https://www.youtube.com/watch?v=FwQNcM_QhYI
 - https://www.youtube.com/playlist?list=PLYhdhHfN2xDpqsbieSVEmK_OYNgAYgZEZ
 Cover Artists:
 - Cindy Dominguez
diff --git a/album/alterniabound.yaml b/album/alterniabound.yaml
index 00d0e577..29f9b69e 100644
--- a/album/alterniabound.yaml
+++ b/album/alterniabound.yaml
@@ -377,7 +377,7 @@ Referenced Tracks:
 - track:showtime-imp-strife-mix
 - Pumpkin Cravings
 - track:harlequin
-- Sunslammer
+- Sunsetter
 - dESPERADO ROCKET CHAIRS,
 - track:MeGaLoVania
 - track:vagabounce
diff --git a/album/are-you-lost.yaml b/album/are-you-lost.yaml
index a03c9743..47f02997 100644
--- a/album/are-you-lost.yaml
+++ b/album/are-you-lost.yaml
@@ -50,7 +50,7 @@ URLs:
 - https://cristata.bandcamp.com/track/are-you-lost
 - https://www.youtube.com/watch?v=dvYzJ86-WpQ
 Referenced Tracks:
-- Fallen Down
+- Lost Girl
 ---
 Track: FALLEN
 Duration: '4:51'
diff --git a/album/contritum.yaml b/album/contritum.yaml
index 46f8fe72..30fc3fc5 100644
--- a/album/contritum.yaml
+++ b/album/contritum.yaml
@@ -5,6 +5,7 @@ Date: July 17, 2018
 Date Added: January 12, 2021
 URLs:
 - https://nightslights.bandcamp.com/track/contritum
+Cover Art File Extension: png
 Cover Artists:
 - nights
 Color: '#f30d00'
diff --git a/album/cool-and-new-volume-2.yaml b/album/cool-and-new-volume-2.yaml
index 3feedc57..fb3dd0e7 100644
--- a/album/cool-and-new-volume-2.yaml
+++ b/album/cool-and-new-volume-2.yaml
@@ -850,6 +850,9 @@ Art Tags:
 Referenced Tracks:
 - Game Hypothesis
 - Messiah
+Sampled Tracks:
+- "Game Theory: UNDERTALE - Sans's SECRET Identity! - https://www.youtube.com/watch?v=KYdDUXyFocY"
+- Loud Nigra
 Lyrics: |-
     Well MatPat
     Well MatFat
@@ -866,8 +869,6 @@ Lyrics: |-
     (Which brings us back to Undertale. Three faces with "don't forget" written on it? It's Ness trying to remember his three friends. In short, Undertale is a continuation of Toby's version of EarthBound, with Ness never being able to get home, adopting the name Sans, and accompanied by Papyrus; a former Starman, an alien force able to speak English and still equipped with his armor and signature posture, but without any knowledge of earthly things, like the sun. The pieces all just seem to fit. Now all we need is an appearance from Pokey/Porky and we've got ourselves a true sequel! But hey, that's just a theory...
 
     A GAME THEORY! THANKS FOR WATCHING!)
-Sampled Tracks:
-- Loud Nigra
 ---
 Track: MoonBetter
 Artists:
diff --git a/album/cool-and-new-voulem1.yaml b/album/cool-and-new-voulem1.yaml
index b66f654b..7d65e86f 100644
--- a/album/cool-and-new-voulem1.yaml
+++ b/album/cool-and-new-voulem1.yaml
@@ -555,8 +555,8 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/can-you-give-me-a-hand
 - https://www.youtube.com/watch?v=8AZ556Deeb8
 Referenced Tracks:
-- RollerCoaster Tycoon Theme
 - track:showtime-piano-refrain
+- RollerCoaster Tycoon Theme
 - track:showtime-original-mix
 Art Tags:
 - Jhon
@@ -1410,7 +1410,7 @@ Referenced Tracks:
 - track:upward-movement-dave-owns
 - track:skies-of-skaia
 - Meet the Flintstones
-- Homestuck
+- Homestuck Anthem
 - Showdown
 - Feel (Alive)
 - track:carne-vale
@@ -1489,9 +1489,8 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/cool-and-new-web-comic
 - https://www.youtube.com/watch?v=hzWSa9d4GDQ
 Referenced Tracks:
-- RollerCoaster Tycoon Theme
 - Homestuck
-- Homestuck Anthem
+- RollerCoaster Tycoon Theme
 - Cascade (Beta)
 - Freefall
 Art Tags:
diff --git a/album/cyber-city-sound-pak.yaml b/album/cyber-city-sound-pak.yaml
index f3f65958..0cf9c828 100644
--- a/album/cyber-city-sound-pak.yaml
+++ b/album/cyber-city-sound-pak.yaml
@@ -78,8 +78,9 @@ Lyrics: |-
     (The National Weather Service in Denver, Colorado has issued a Snow Squall Warning for South— and North— and North—)
 Commentary: |-
     <i>Cristata:</i>
-    <b>Your computer might be at risk</b>
-    Grandma is making spaghetti tonight
+    <p style="font-family:'Tahoma', 'MS Sans Serif', sans-serif">❌ <b>Your computer might be at risk</b>
+    <p style="font-family:'Tahoma', 'MS Sans Serif', sans-serif">Grandma is making<br>
+    spaghetti tonight
 ---
 Track: SMART RACE (Cristata Vs Hywell Mix)
 Duration: '5:14'
@@ -101,11 +102,11 @@ Referenced Tracks:
 - Attack of the Killer Queen
 Commentary: |-
     <i>Cristata:</i>
-    WINNER!
+    <p style="font-family:'MS Sans Serif', 'Tahoma', sans-serif"><b>WINNER!</b>
 
-    <b>YOU'VE WON!</b>
+    <p style="font-family:'MS Sans Serif', 'Tahoma', sans-serif"><big><b>YOU'VE WON!</b></big>
 
-    CLAIM YOUR FREE GAMECLAM 3 NOW !!!!!
+    <p style="font-family:'MS Sans Serif', 'Tahoma', sans-serif"><b>CLAIM YOUR FREE GAMECLAM 3 NOW !!!!!</b>
 ---
 Track: BIG SHOT (1997 Remix)
 Duration: '7:32'
@@ -181,7 +182,7 @@ Sampled Tracks:
 - track:upward-movement-dave-owns
 Commentary: |-
     <i>Cristata:</i>
-    <big>[redacted]</big>
+    <big><b>[redacted]</b></big>
 ---
 Track: FIELD OF HOPES AND DREAMS (Flare Mix)
 Duration: '10:25'
diff --git a/album/deltarune-ch2-ost.yaml b/album/deltarune-ch2-ost.yaml
index 59c6c4e5..41314def 100644
--- a/album/deltarune-ch2-ost.yaml
+++ b/album/deltarune-ch2-ost.yaml
@@ -232,6 +232,23 @@ URLs:
 - https://open.spotify.com/track/4RZCenPPiY28As8ZzeMYyv?si=2889b9c7b8054ad3
 Referenced Tracks:
 - Spamton
+Lyrics: |-
+    NOW'S YOUR CHANCE TO BE A [[track:big-shot|BIG SHOT]]!
+    BE A BIG BE A BIG BE A BIG SHOT!
+    NOW'S YOUR CHANCE TO BE A BIG SHOT
+    BE A BIG BE A BIG
+    NOW'S YOUR CHANCE TO BE A BIG SHOT
+    BE A BIG BE A BIG
+
+    NOW'S YOUR CHANCE, NOW'S YOUR CHANCE
+    NOW'S YOUR CHANCE, NOW'S YOUR CHANCE
+    NOW'S YOUR CHANCE, NOW'S YOUR CHANCE
+    BE A BIG BE A BIG
+
+    NOW'S YOUR CHANCE, NOW'S YOUR CHANCE
+    NOW'S YOUR CHANCE, NOW'S YOUR CHANCE
+    NOW'S YOUR CHANCE, NOW'S YOUR CHANCE
+    BE A BIG BE A BIG
 ---
 Track: Elegant Entrance
 Duration: '1:18'
@@ -383,6 +400,7 @@ Referenced Tracks:
 - NOW'S YOUR CHANCE TO BE A
 - THE WORLD REVOLVING
 - Power of "NEO"
+- Dummy!
 Lyrics: >-
     <i>Ambiguous: See <a href="http://web.archive.org/web/20210926164336/https://inq-dreams.tumblr.com/post/663123854616625152/inq-dreams-hoooly-shit-guys-i-think-i-managed-to">inq-dreams.tumblr.com</a>
     for isolated vocals and fan commentary!</i>
diff --git a/album/diverging-delicacies.yaml b/album/diverging-delicacies.yaml
index 492c1454..c1055c68 100644
--- a/album/diverging-delicacies.yaml
+++ b/album/diverging-delicacies.yaml
@@ -204,7 +204,7 @@ Referenced Tracks:
 - track:penumbra-phantasm
 - Retconjuration
 - track:conflict
-- Homestuck
+- Homestuck Anthem
 ---
 Track: Betrayed
 Artists:
diff --git a/album/homestuck-vol-1-4.yaml b/album/homestuck-vol-1-4.yaml
index 28e2484d..28ff75a7 100644
--- a/album/homestuck-vol-1-4.yaml
+++ b/album/homestuck-vol-1-4.yaml
@@ -258,8 +258,6 @@ Duration: '2:02'
 URLs:
 - https://homestuck.bandcamp.com/track/showtime-remix-3
 - https://youtu.be/ENWA9aNEkXk
-Referenced Tracks:
-- track:showtime-piano-refrain
 Sampled Tracks:
 - track:showtime-piano-refrain
 ---
diff --git a/album/homestuck-vol-10.yaml b/album/homestuck-vol-10.yaml
index 69b8c160..dedcb599 100644
--- a/album/homestuck-vol-10.yaml
+++ b/album/homestuck-vol-10.yaml
@@ -216,9 +216,9 @@ Art Tags:
 - Dream Bubbles
 Referenced Tracks:
 - track:showtime-piano-refrain
-- track:showtime-original-mix
 - track:aggrieve-violin-refrain
 - Liquid Negrocity
+- track:showtime-original-mix
 - Checkmate
 - Gaia Queen
 Lyrics: |-
diff --git a/album/homestuck-vol-2.yaml b/album/homestuck-vol-2.yaml
index a00f1340..d937df61 100644
--- a/album/homestuck-vol-2.yaml
+++ b/album/homestuck-vol-2.yaml
@@ -155,8 +155,6 @@ Duration: '2:02'
 URLs:
 - https://homestuck.bandcamp.com/track/showtime-remix-3
 - https://youtu.be/VliU0X6XVpA
-Referenced Tracks:
-- track:showtime-piano-refrain
 Sampled Tracks:
 - track:showtime-piano-refrain
 ---
diff --git a/album/homestuck-vol-6.yaml b/album/homestuck-vol-6.yaml
index 9a071f39..9757fdd9 100644
--- a/album/homestuck-vol-6.yaml
+++ b/album/homestuck-vol-6.yaml
@@ -417,7 +417,7 @@ URLs:
 - https://homestuck.bandcamp.com/track/elevatorstuck-2
 - https://youtu.be/9namZe_rorQ
 Referenced Tracks:
-- Homestuck Anthem
+- Homestuck
 Sheet Music Files:
 - Title: Flute line by Optimatum
   Files:
diff --git a/album/homestuck-vol-7.yaml b/album/homestuck-vol-7.yaml
index 50ee49c5..b09a501e 100644
--- a/album/homestuck-vol-7.yaml
+++ b/album/homestuck-vol-7.yaml
@@ -52,6 +52,8 @@ Art Tags:
 - Rose
 - Horrorterrors
 - Green Sun
+Referenced Tracks:
+- Macabre
 Sheet Music Files:
 - Title: Sheet music by Quaddy
   Files:
@@ -149,6 +151,7 @@ Art Tags:
 - Pyralspite
 Referenced Tracks:
 - track:upward-movement-dave-owns
+- Crystalanthemums
 MIDI Project Files:
 - Title: MIDI by Unknown (piano)
   Files:
diff --git a/album/homestuck-vol-8.yaml b/album/homestuck-vol-8.yaml
index 904f0554..24f678a9 100644
--- a/album/homestuck-vol-8.yaml
+++ b/album/homestuck-vol-8.yaml
@@ -463,6 +463,21 @@ Referenced Tracks:
 Commentary: |-
     <i>Hilary Troiano:</i>
     Someone sent me a PM asking for some commentary about my two MSPA songs, so [[media:misc/hilary-troiano-commentary.mp3|here it is]]. (<a href="https://jaydeis.tumblr.com/post/19609363685/someone-sent-me-a-pm-asking-for-some-commentary">source</a>)
+
+    <b>Transcript:</b><br>
+    <i>(Before talking about this song, Hilary talks about her other song, [[track:ace-of-trump]], with those sections transcribed on that song's page.)</i>
+
+    Um, my other song, Homefree. This one's got less to it, like [laughter] my first goal of this song was actually for me to learn how-how to use a program called Fruity Loops Studio, um... 'cuz, up until this point all of my music had been done with a program called Melody Assistant, and in some ways I really love Melody Assistant like, I have this whole sound database to it that makes it really have an incredibly authentic sound to the instruments but, on the other side of the spectrum it has very little synth options, which, whi-which is really the direction that the MS Paint Adventures music team has moved in, um. So I was like alright alright, let's learn how to synth a bit. Um, and so, in some ways um, Homefree draws a lot from a song I wrote AGES and ages ago, it was a song called [[track:shooting-star|Shooting Star]] which, I mean i-it was kind of basically supposed to sound like an anime opening and it did but i-it... it was missing something. Like, it was very mor— it was more of in a minor key and it was slower, and so I was like, alright. Well first things first I'm gonna try and get this up to, what was it the tempo of [incomprehensible] I don't know how you say that. It's an opening of an anime that you may or may not have heard that just is really high energy and I was like 'Okay, so, if I wanna have a high energy song I probably should try and make it sound about this fast' [laughter].
+
+    So, the opening of Homefree is basically the opening of Shooting Star and, then, then I started like, I was like you know, after you get past the opening it's not really good until you get to the ending and so I was like 'What else can I put in here?' and so I started putting down the [[track:homestuck-anthem|Homestuck theme]] just because it was easy and jumped to mind, and so, when that, when that really seemed to work I was like 'You know what? Let's throw in more bits of different Homestuck songs in there' like, after the um Homestuck theme, what really... what I think most people don't really notice is that the next part actually sounds like, like the like [[track:sburban-jungle|Suburban Jungle]] like, it's-it's moved down about one note but it's like, Suburban Jungle is like [singing] and then, and then in Homefree it's [singing] y'know it's basically the same melody.
+
+    Um, and then, then it moves into another part which is... kind of hard to hear but there's a little bit of [[track:upward-movement-dave-owns|Dave Rocks- Rocks at this Game]]? Is that what it's called? <i>(Note: Referring to the original title of Upward Movement, 'Dave Fucking Owns at this Game')</i> Wow I don't even know the songs of the MS Paint Adventures music team, I'm the worst member! [laughter] But anyway, anyway, but you can hear like the [singing] underneath the violin melody and then after that it goes into what was the ending to Shooting Star which is this, um... it-it's um, I think it's one of the strongest parts of the song because it's a... It's basically like, it's supposed to sound like kind of like just like breaking free you know like, like it rises and then at the very end it just, goes off into it's own place um...
+
+    One of the other interesting things about Homefree- waitwaitwait, I need to address something about Homefree [laughter] okay so, I know the MS Paint Adventures music team, we get a lot of people say 'Ohh this sounds like this this sounds like [[artist:touhou-project|Touhou]] this sounds like' I don't know um [laughter] I didn't mean to make this sound like a Pokemon song, I realized after it was already out there that, yeah, that ther-there's a part to it that really does sound like a [[artist:pokemon|]]Pokemon battle theme [laughter] oh god! That wasn't intentional, that really wasn't intentional but um [laughter] I guess that's what happens when you're part of the Pokemon fandom for so long like I mean I w— I was actually a really really obssessed fan for a while like-like I don't know if any of you, if you've been to Bulbagarden, if you've ever used the Bulbapedia or listened to the Bulbacast, yeah I used to be part of all that I used to be like the top editor of Bulbapedia and I used to like just rant about how Brock was the greatest character ever on the Bulbacast [laughter] I don't really do that anymore now and so that's part of the reasons why it's so embarassing that [laughter] my music sounds like Pokemon music [laughter] oh god! Okay okay anyway, um... yeah anyway, so.
+
+    One-one thing that I-that I did wanna make it sound like though and I don't really remember what inspired this but, in the last section I was like 'You know what? Um, since this is- since time is such a big theme in Homestuck, I think I'm gonna try and make it sound like the [[track:westminster-quarters|Westminster bells]] playing here' and-and so you hear those [singing] which actually isn't how the Westminster bells go but y'know what, screw it! That's how I remember them because, I don't actually hear the Westminster bells that often. [laughter] No, that's a lie, I used to hear them all the time in college and I still don't remember exactly how the notes go, um. [laughter]. So, anyway, anyway. Um... but... wait no, I remember now! I remember what led to it! Because I noticed that exactly at 4 minutes and 13 seconds into the song like it-like I was like 'It would sound really good if there was just a bell chiming here and it's-and it's like [singing]' and then I was like, I was like 'You know what? Let's-let's make it sound like this is where the clock strikes twelve and it's like, so earlier there's the Westminster bells which starts, which plays right before... right when the clock strikes mid-midnight or noon or any sort of twelve, and then at 4 minutes and 13 seconds in it starts chiming, um, like that's when the... final countdown ends, whatever you wanna call it, like when the, when the timer runs out and hits zero. Um, and for a bit I actually considered since the-th-it actually only chimes four times, I was thinking of having just eight more chimes of it while nothing else was playing. I... didn't actually go with that though because I thought that would just sound weird and artsy to most people like you know, why didn't the song already end, why can't I go on listening to the next song... but I don't know, anyway. [laughter]
+
+    Long story short, um... actually I don't know what is the long story short. Well i-it's basically, um, it's not quite the Homestuck theme. I-i-it's, I do-I don't think it's gonna be used, I don't think Hussie's ever gonna use any of my stuff but, you know I'm, I'm really happy whenever I get anybody saying that they like my work, like, that's really one of the best things about writing music I'm not even gonna lie. I mean, I love doing all kinds of art, I love, I love writing, I love drawing, I'm not really that great at anything except programming [laughter] but, um, one of the things I love most about music um, is, when you're a musician, there's... uhh how do I even explain this... um it's like... a lot of people really love it, but there's so few people who really know-know how to get into it like, they think that you know, you have to be a really blessed singer or, or um... like you need to have just been born playing the saxophone or something and, you need like uh, an agent recognize you- I don't think any of that's really necessary to really, just start writing music and start enjoying it like, I-I-I think people would— it's kind of like any art, it takes, it takes some practice and theb all of a sudden you'll start surprising yourself like 'Wow, did I really make that? Is it really possible for someone to make something that sounds like this? Is it possible for me to make something that sounds like this? I don't need help, I can do this on my own?' Um, or maybe that's just how it was for me I mean... I, I... sometimes I still think it's kind of amazing that I can make anything never mind something that, gets-that's part of such a really amazingly talented team such as the MSPA music team... [laughter]
 ---
 Track: Galaxy Hearts
 Artists:
diff --git a/album/homestuck-vol-9.yaml b/album/homestuck-vol-9.yaml
index 57d1cadc..52cc0fcd 100644
--- a/album/homestuck-vol-9.yaml
+++ b/album/homestuck-vol-9.yaml
@@ -121,6 +121,11 @@ Commentary: |-
     So with that, everything's shut down, and the song ends.
     Granted, I probably didn't manage to get this little 'story' across with everybody, but this was the general thought process when I was making the thing.  Hopefully if you listen to it now you'll get some of the ideas I was going for. If not? Well... enjoy it however you like :p Or even come up with your own interpretation that's better than mine :p
     Johnathan Griffiths was the track art man of the hour - There's even a mega drive controller there! And how are those shades staying on? All round awesome :)
+
+    <i>Jonathan Griffiths:</i>
+    My track art for Anbroids V2.0 by Malcolm Brown off Homestuck Volume 9!
+
+    The track reminded me a lot of Toejam & Earl, so I wanted to have some kind of ridiculous 90s background, and you can’t get more 90s than complementary colors, triangles, and color halftones. ;) Then I gave Squarewave a Genesis controller necklace for good measure. THE SHUTTER SHADES WERE A SPECIAL BONUS FOR ALL OF YOU <3
 ---
 Track: Trepidation
 Artists:
diff --git a/album/lofam.yaml b/album/lofam.yaml
index e1abcf1b..887f1e8a 100644
--- a/album/lofam.yaml
+++ b/album/lofam.yaml
@@ -403,6 +403,8 @@ Cover Artists:
 - Brad Griffin
 Art Tags:
 - Gamzee
+Sampled Tracks:
+- Mandark's laugh
 Commentary: |-
     <i>Eligecos:</i>
     This song was originally called Ghost Aqua. I created this song for a hypothetical strife theme for Gamzee. Though the song didn't start off that way.
@@ -1243,7 +1245,7 @@ Lyrics: |-
     And Christmas is good for you
 Commentary: |-
     <i>Erik Scheele:</i>
-    This was recorded ages ago, back when I didn't know what I was doing recording-wise, but I never want to change anything about it.
+    <p style="font-family:'Comic Sans', 'Comic Sans MS', cursive">This was recorded ages ago, back when I didn't know what I was doing recording-wise, but I never want to change anything about it.
 ---
 Track: Growing Up
 Artists:
diff --git a/album/lofam2.yaml b/album/lofam2.yaml
index bd516648..58ba123a 100644
--- a/album/lofam2.yaml
+++ b/album/lofam2.yaml
@@ -609,8 +609,8 @@ Cover Art File Extension: jpg
 Art Tags:
 - John
 Referenced Tracks:
-- track:showtime-original-mix
 - track:showtime-piano-refrain
+- track:showtime-original-mix
 - track:sburban-jungle
 - track:i-dont-want-to-miss-a-thing
 Commentary: |-
diff --git a/album/lofam3.yaml b/album/lofam3.yaml
index 5824b3a3..02e8a07d 100644
--- a/album/lofam3.yaml
+++ b/album/lofam3.yaml
@@ -1084,11 +1084,12 @@ Referenced Tracks:
 - Flare
 Commentary: |-
     <i>Team Dogfight:</i>
-    NEOCLASICAL GUITAR-
-    <i>S O L B O</i>
-    BWEEEEEEEEEEEEEEEEEEEEEe eeeeeeeeeeeeeeeeeEEEEEEEEE EEEEEEEEEEEEEeeeeeeeeeeeee eeeeeeeeeeEEEEEEEEEEEEEEE EEEEEeeeeeeeeeflareee<big>eeeee eeeeeEEEEEEEEEEEEEEe eeeeeeeeeeeeeeeeeeeeEE EEeEEEEEeeeeEEEEEeee</big>
+    <big><p style="font-family:'Comic Sans', 'Comic Sans MS', cursive">NEOCLASICAL GUITAR-</p></big>
+    <big><p style="font-family:'Comic Sans', 'Comic Sans MS', cursive">S O L B O</p></big>
+    <big><p style="font-family:'Comic Sans', 'Comic Sans MS', cursive">BWEEEEEEEEEEEEEEEEEEEEEe eeeeeeeeeeeeeeeeeEEEEEEEEE EEEEEEEEEEEEEeeeeeeeeeeeee eeeeeeeeeeEEEEEEEEEEEEEEE EEEEEeeeeeeeeeflareee<b>eeeee eeeeeEEEEEEEEEEEEEEe eeeeeeeeeeeeeeeeeeeeEE EEeEEEEEeeeeEEEEEeee</b></p></big>
     <i>Veritas Unae:</i>
-    "i don't usually make art<br>........................but when i do, it's for a sbahj track."
+    <p style="font-family:'Comic Sans', 'Comic Sans MS', cursive">"i don't usually make art<br>
+    ........................but when i do, it's for a sbahj track."
 ---
 Track: The Demon and the Alien
 Artists:
diff --git a/album/lofam5.yaml b/album/lofam5.yaml
index 5ba8d8b3..a234893b 100644
--- a/album/lofam5.yaml
+++ b/album/lofam5.yaml
@@ -1124,6 +1124,7 @@ Art Tags:
 Referenced Tracks:
 - The Lyrist
 - The Thirteenth Hour
+- The Thirteenth Troll
 Commentary: |-
     <i>Monckat:</i>
     [[The Lyrist]] is one of my favorite Homestuck tracks, with its main melody being in my humble opinion the most hauntingly beautiful refrain on the whole soundtrack. Which is why it's always driven me slightly mad that said melody only appears in the first 45 seconds and never returns. And while the rest of the track is wonderful in its own right, it's never stuck in my brain quite as much.
diff --git a/album/midnight-crew-drawing-dead.yaml b/album/midnight-crew-drawing-dead.yaml
index b7bc5b0e..b6fcf910 100644
--- a/album/midnight-crew-drawing-dead.yaml
+++ b/album/midnight-crew-drawing-dead.yaml
@@ -263,6 +263,30 @@ URLs:
 Commentary: |-
     <i>Hilary Troiano:</i>
     Someone sent me a PM asking for some commentary about my two MSPA songs, so [[media:misc/hilary-troiano-commentary.mp3|here it is]]. (<a href="https://jaydeis.tumblr.com/post/19609363685/someone-sent-me-a-pm-asking-for-some-commentary">source</a>)
+
+    <b>Transcript:</b>
+
+    So, someone on the MS Paint Adventures Forums asked me if I would be willing to give some commentary on my songs which have appeared on the Homestuck albums. Well, two of them. For those who don't know me, my name is Hilary Troiano, and I'm the artist behind Ace of Trump on the Midnight Crew album and [[track:homefree|Homefree]] on [[album:homestuck-vol-8|Volume 8]]. I'm entirely self taught, I never really took a music theory class or anything, in fact in high school I was trying to learn how to perform music, you know playing trumpet in orchestra... but I wasn't really all that good at it. I spent more of my days in middle school and high school kinda playing around with the music synthesizing program on my computer and I guess somewhere along the way I figured things out.
+
+    In college I started getting into MS Paint Adventures, I was there for the ending of Problem Sleuth, and when Homestuck rolled around I really liked the inclusion of music, and... went onto the forums and found that they had a thread where people were just posting up songs that they wrote as sort of a fan contribution. I... didn't really have any Homestuck-related ideas yet but I followed the thread anyways and I was really interested in the program they were using, a program called Famitracker which allows you to kind of replicate the sort of chiptunes that you would hear on the NES.
+
+    Um, I'm very much influenced by video games in my music, I especially love chiptunes, like the kinds you would find in the NES era or, even on the Genesis or the SNES. Um, before anyone asks, yes I'm a fan of [[artist:nobuo-uematsu|Nobuo Uematsu]], but I think my favorite video game composer would have to be Noriyuki Iwadare. If you don't know him, he's the composer who did music for the Lunar series, the Grandia series, third game in the [[artist:ace-attorney|Ace Attorney]] series, he's one of the artists working on a new game coming out, um, Icarus something or other- oh my boyfriend's gonna hate me for not remembering that [laughter]. Um, I specially recommend the Lunar series, I think Radiation will back me up on this, but anyway anyway. So, I-I-I— one of my other main influences is anime music, like, I think a good example would be Suzumu Hirasawa if you don't know him, he did music for a lot of Satoshi Kon's work, like Paranoia Agent or the movie Paprika. Um, a-and yeah I also listen to American music I just don't take after it as much I think.
+
+    Um anyway anyway so. When I started playing around with this Famitracker on the Homestuck forums I posted a few songs and I guess I got the music team's attention. Um, and then when I got to the forums I didn't really know what-what to do like I posted a lot of my old work and it was like 'Wow, this is really old and bad!' and they were already moving away from chiptunes so, I didn't really know what to do until I noticed that, I think it was Hussie who was posting a thread about how he wanted to do like a Midnight Crew album like he wanted to have all these fake bands for Homestuck that would just add to the story so, well, I mean I love jazz music, my sister in particular she, helped me— exposed me to a lot of jazz, like she was part of our high school jazz band and was, at one point the best baritone saxophone jazz player in the... state I think? I don't know, it's a small state. [laughter] I'm from Rhode Island for the people who don't get that! Um, [laughter]. Anwyay, so, the deadline was kinda rapidly approaching but I did wanna get at least one song on there just to show people that you know, I'm part of this team and I'm pretty good when it comes to jazz music, like, I-I-i-it's a genre I love and that I— that I'm really familiar with.
+
+    Um, so, let's see, Ace of Trump. I guess the first thing that I thought of when I came up with this was that I wanted something that really did sound like the band was playing it like, I mean a lot of people for that— for that album they just did any sort of jazz thing but... I went back to [[flash:833|the flash where we see the Midnight Crew first playing their jazz instruments]] and, tried to identify what everyone was playing and use that as the basis for the song, like we see Spades Slick on the piano of course, Hearts Boxcars playing the bass, Diamonds Droog on the saxophone and Clubs Deuce on the oboe. I thought this one was a pretty interesting choice because oboes aren't really that common in jazz but, you know, I like it! I-I was actually kinda disappointed in— when I saw that the album art had it changed to what appeared to be a clarinet but, I-I think oboes are better so, you know whatever. Anyway, the whole basis for the song actually is the card game Hearts, um, and that's why in the intro, besides the sort of jazzy drums and the trumpet, the only thing you can hear is the bass which would be Hearts Boxcars's instrument. This is present throughout the song to kind of establish this as his game.
+
+    Um, anyways so the whole intro I.. kinda wish I had either made it shorter or a little faster cuz, yeah I wanted it to drag but it really dragged! I think that was probably the worst thing about the song, um [laughter]. But anyway, it set the scene, kinda, kind of a gritty dive I wanna say. And, probably some guys with nothing better to do starting to sit down for a card game. Um, wheeeen, when that whole introduction section finally ends we- things suddenly pick up pace which when I assume that the cards are being dealt and everything's being set up. Um, Hearts Boxcars is actually, even though it's his game he's not, he himself isn't supposed to be a player in this. The ones that I see playing would be Spades Slick, Clubs Deuce, Diamonds Droog and at the time, a femme fatale that wasn't really named because I m-I mean this was before Snowman's introduction and I was like you know, 'There's all this noir and it hasn't even included a femme fatale!' Well screw it, there's gonna be one in this song because I said so! Um, and that's-that's the trumpet actually that's... um... I mean, I-I guess that was probably a biased choice because I myself play the trumpet but I also did it because you know there's a pun! It's the trump! [laughter] Hearts trump all in the game of Hearts.
+
+    Anyway anyway anyway, um, so, so we have after the cards all get dealt we have the first solo which is Clubs Deuce, which I thought was really appropriate for the fact that if you've ever played the game of Hearts, the first card that lead like the very first trick is always the two of clubs, so of course the game starts with him. He's-he's... um... okay sorry I just had a brain fart! [laughter] Um, so halfway through that we have the trumpet breaking in which is where the hearts actually break the suit because if you ever played the game of Hearts again, um, you can't play hearts until they're broken, like you have to not have any of the trump suit that led the trick and only have hearts available to play. Um, so halfway through the trumpet comes in and starts messing things up, then play passes to Diamonds Droog on his saxophone solo, um things get— start getting more and more intense just going through the different hands. Um, then it moves to Spades Slick, which is where things start getting kind of interesting, and where this femme fatale theme starts to really come into play. Like, there's a thing in the game of Hearts where the queen of spades is actually the most dangerous card like, in-in fact the ace of spades is the one card you really, REALLY don't want because usually, if you, if you... play it and there's, the person after you has the queen of spades, that this queen will come out and you will get her and as it turns out she's worth 13 points and it's a game where you want as few points as possible, so it's basically like you just got all the hearts in one hand and you just lost the game, no that wasn't a 4chan pun, don't you DARE leave lousy comments about that on my, on wherever I end up posting this.
+
+    Um, anyway so, so it's during the Spades run, this whole really complicated piano solo um [laughter] I should address this, I think I remember at some point someone was like 'Wow that piano solo was amazing, you must be an amazing player!' ...I don't play the piano at all it's all synthesized I just tried to make it sound like a real piano was playing [laughter] I don't even know if it's possible to play, if someone can play it, ummm... I'll be impressed! Send me a video of you doing it, I wanna see! But no I don't think it's actually possible and if it is it's certainly not possible by me. Um, anyway but there's this whole messy piano solo that-that leads the way as we hear all of-all of the instruments in the background but, a-as the piano section goes on it slowly very slowly but surely gets completely dominated by the trumpet, um, and, it ends on kind of a sadder note because of that because um... one-one thing about Hearts is that um, if someone— well for the most part what you really want to do is you wanna make sure everybody else gets the hearts and the queen of spades and that you get none of them but, there's something else that you can do where if you get all hearts it's called shooting the moon and everyone else is stuck with all... with getting, um... 26 points instead of you, I think that's how it goes, it's been a while since I've played actually but, um, so slowly this femme fatale just keeps accumulating heart cards and at the end of the game it just ends with her kicking their asses because you know, that's how femme fatales roll they just beat men at the game of Hearts heuheuheuh [laughter] sorry.
+
+    Yeah, Ace of Trump is just basically one long pun. But, I mean that's-tha-that's kind of how I write my music, I don't... I spend more time trying to think of how to tell it as a story than just be like 'Okay let's add the drums, let's add the melody' like, every song that I write has to have some sort of like... it has to be able to stand on its own, I- and I think I really accomplished that well with Ace of Trump, I think it has one of the most distinctive stories to it than to any than any other song that I've written... um, which- I mean I'd be glad to share my music with you guys but I don't think most of it's very good, uhh there's a reason only two of my songs have appeared on albums. A-and, part of it also is just that uh, I've had a lot of problems with my life lately I've been, graduating college, trying to find work, um... and I-I mean I'd love to get back more into writing music but... I think more and more I'm moving towards my real passion which is you know, programming, developing, developing software and, more than that I'd love to get into video game design and development just, starting to make these games that I'm so obsessed with. Aaanyway [laughter] kind of got off on a tangent there.
+
+    <i>(Commentary continues talking about her other track, [[track:homefree]], before returning to this song. You can read the relevant transcription of that segment on that page.)</i>
+
+    And, I don't know, I-I-I think I'd like to do more in the future, like, for example I-I really wanted to actually do a remix at least of [[track:ace-of-trump|Ace of Trump]] like I believe for one thing that any song can be turned into a swing song, and on the other hand any swing jazz song can be turned into a, non-swing jazz song and, if you took-take the swing out of it, Ace of Trump could actually-can actually sound r-pretty sinister and intense so, I-I kinda wanna do like a battle remix of it you know, call it 'Ace of Swords' or something [laughter] that's a Terra reference for those who don't get it um [laughter] but I don't know, we'll-we'll see. If-if I don't contribute any music to the MS Paint Adventures music team, don't think that that's the last you're ever gonna hear of me 'cuz, I... I don't know, I've got some ideas of my own, I think you'll see me around somewhere.
 ---
 Track: Moonshine
 Artists:
diff --git a/album/more-homestuck-fandom.yaml b/album/more-homestuck-fandom.yaml
index 570a3a11..8ca0984b 100644
--- a/album/more-homestuck-fandom.yaml
+++ b/album/more-homestuck-fandom.yaml
@@ -502,6 +502,20 @@ Commentary: |-
 
     Also I didn't know noir wasn't two syllables so this song is kind of ruined for me hahaha
 ---
+Track: The Thirteenth Troll
+Artists:
+- Toby Fox
+Duration: '1:19'
+URLs:
+- https://www.youtube.com/watch?v=gbiS4WkCOVo&t=5182s
+Referenced Tracks:
+- The Thirteenth Hour
+Commentary: |-
+    <i>Toby Fox:</i>
+    did something cute with UU’s theme from [[album:alternia|Alternia]]
+
+    u_u;;;
+---
 Track: The Undying
 Artists:
 - James Dever
@@ -775,7 +789,7 @@ Artists:
 - Cerulean
 Duration: '2:01'
 URLs:
-- https://hsmusic.wiki/media/misc/archive/Gaem%20Theor.mp3
+- https://hsmusic.wiki/media/misc/archive/Gaem_Theor.mp3
 Referenced Tracks:
 - Science Blaster
 - track:megalovania-undertale
diff --git a/album/oceanfables-ray-of-light.yaml b/album/oceanfables-ray-of-light.yaml
index 116a35bc..0fdc1ad2 100644
--- a/album/oceanfables-ray-of-light.yaml
+++ b/album/oceanfables-ray-of-light.yaml
@@ -9,6 +9,13 @@ URLs:
 Cover Artists:
 - nights
 Cover Art File Extension: png
+Wallpaper File Extension: png
+Wallpaper Artists:
+- nights
+- Niklink (edits for wiki)
+Wallpaper Style: |-
+    opacity: 0.75;
+    background-position: top left;
 Color: '#ffff7f'
 Groups:
 - Oceanfalls
diff --git a/album/oceanfalls-vol-1.yaml b/album/oceanfalls-vol-1.yaml
index 8d891904..349c937f 100644
--- a/album/oceanfalls-vol-1.yaml
+++ b/album/oceanfalls-vol-1.yaml
@@ -15,11 +15,15 @@ Groups:
 - Beyond
 Banner Artists:
 - nights
-Banner Dimensions: 975x180
+- Niklink (edits for wiki)
+Banner Dimensions: 1100x180
 Banner File Extension: png
 Banner Style: |-
     image-rendering: pixelated;
     image-rendering: crisp-edges;
+Cover Art File Extension: png
+Track Art File Extension: png
+Wallpaper File Extension: png
 Wallpaper Artists:
 - nights
 Wallpaper Style: |-
diff --git a/album/oceanfalls-vol-2.yaml b/album/oceanfalls-vol-2.yaml
index a5c622c7..6d40a005 100644
--- a/album/oceanfalls-vol-2.yaml
+++ b/album/oceanfalls-vol-2.yaml
@@ -12,6 +12,13 @@ Groups:
 Art Tags:
 - Nino (Oceanfalls)
 - Five (Oceanfalls)
+Cover Art File Extension: png
+Track Art File Extension: png
+Wallpaper File Extension: png
+Wallpaper Artists:
+- nights
+- Niklink (edits for wiki)
+Wallpaper Style: 'opacity: 0.9;'
 ---
 Section: Main album
 ---
diff --git a/album/oceanfalls-vol-3.yaml b/album/oceanfalls-vol-3.yaml
index e10cc3bd..101d1d96 100644
--- a/album/oceanfalls-vol-3.yaml
+++ b/album/oceanfalls-vol-3.yaml
@@ -14,6 +14,15 @@ Art Tags:
 - Aria (Oceanfalls)
 - Five (Oceanfalls)
 - Meimona (Oceanfalls)
+Cover Art File Extension: png
+Track Art File Extension: png
+Wallpaper File Extension: png
+Wallpaper Artists:
+- nights
+- Niklink (edits for wiki)
+Wallpaper Style: |-
+    opacity: 0.85;
+    background-position: top left;
 ---
 Section: Main album
 ---
diff --git a/album/oceanfalls-vol-4.yaml b/album/oceanfalls-vol-4.yaml
index 87fcd217..fd66efa4 100644
--- a/album/oceanfalls-vol-4.yaml
+++ b/album/oceanfalls-vol-4.yaml
@@ -17,6 +17,11 @@ Art Tags:
 - Reed (Oceanfalls)
 Cover Art File Extension: png
 Track Art File Extension: png
+Wallpaper File Extension: png
+Wallpaper Artists:
+- nights
+- Niklink (edits for wiki)
+Wallpaper Style: 'opacity: 0.75;'
 ---
 Track: Up From the Depths
 Artists:
diff --git a/album/oceanfalls-vol-five.yaml b/album/oceanfalls-vol-five.yaml
index 463b3b30..048495eb 100644
--- a/album/oceanfalls-vol-five.yaml
+++ b/album/oceanfalls-vol-five.yaml
@@ -16,6 +16,14 @@ Art Tags:
 - Lune (Oceanfalls)
 Cover Art File Extension: png
 Track Art File Extension: png
+Wallpaper File Extension: png
+Wallpaper Artists:
+- nights
+- Niklink (edits for wiki)
+Wallpaper Style: |-
+    opacity: 0.65;
+    background-repeat: repeat;
+    background-size: auto;
 Commentary: |-
     <i>nights:</i>
     A specially made album for Oceanfalls' anniversary, and a celebration of Five's birthday date in the story!
diff --git a/album/perfectly-generic-album.yaml b/album/perfectly-generic-album.yaml
index 3183cd79..532b5b6e 100644
--- a/album/perfectly-generic-album.yaml
+++ b/album/perfectly-generic-album.yaml
@@ -39,6 +39,11 @@ Duration: '1:31'
 URLs:
 - https://cristata.bandcamp.com/track/new-and-improved
 - https://www.youtube.com/watch?v=PNFVwcHAqmI
+Referenced Tracks:
+- track:penumbra-phantasm
+Sampled Tracks:
+- ness double jump sfx from like melee
+- koopa shell stomp sfx... also from melee?
 Commentary: |-
     <i>Cristata:</i>
     New And Improved Webcomic.
@@ -115,6 +120,9 @@ URLs:
 - https://www.youtube.com/watch?v=JK5G79GcSAg
 Referenced Tracks:
 - track:gasters-theme
+- track:megalovania-undertale
+Sampled Tracks:
+- dialup internet noise
 Commentary: |-
     <i>Cristata:</i>
     Listen, if you didn't think I would shoehorn Gaster into this album somehow, you were incredibly, horribly wrong.
@@ -126,7 +134,10 @@ URLs:
 - https://www.youtube.com/watch?v=if21XVJnGlE
 Referenced Tracks:
 - ANOTHER HIM
+- Amen, Brother
 - Liquid Negrocity
+Sampled Tracks:
+- undertale sfx nonsense
 Commentary: |-
     <i>Cristata:</i>
     Another Noir patch notes
@@ -150,6 +161,8 @@ Duration: '5:21'
 URLs:
 - https://cristata.bandcamp.com/track/welcome-to-your-new-suburban-reality
 - https://www.youtube.com/watch?v=_3NstB6oouo
+Referenced Tracks:
+- track:sburban-jungle
 Commentary: |-
     <i>Cristata:</i>
     Acts 1-3 were really good, actually.
@@ -159,6 +172,9 @@ Duration: '5:22'
 URLs:
 - https://cristata.bandcamp.com/track/eternally-you
 - https://www.youtube.com/watch?v=mqPxB2ustEU
+Referenced Tracks:
+- Flare
+- track:homestuck-anthem
 Commentary: |-
     <i>Cristata:</i>
     See ya next time!
diff --git a/album/references-beyond-homestuck.yaml b/album/references-beyond-homestuck.yaml
index 8ebc041a..a48e2394 100644
--- a/album/references-beyond-homestuck.yaml
+++ b/album/references-beyond-homestuck.yaml
@@ -66,6 +66,8 @@ Artists:
 Duration: '2:22'
 URLs:
 - https://www.youtube.com/watch?v=WyPD3YMhwnQ
+Referenced Tracks:
+- WELCOME TO THE CITY
 ---
 Track: Dusk for the Age of Miracles
 Artists:
@@ -344,6 +346,20 @@ Duration: '0:41'
 URLs:
 - https://www.youtube.com/watch?v=_IQGtkt7Grk
 ---
+Track: Macabre
+Artists:
+- Malcolm Brown
+Duration: '4:15'
+URLs:
+- https://www.youtube.com/watch?v=0xXq4eEDL9g&t=1357s
+MIDI Project Files:
+- Title: MIDI by Malcolm Brown (original composer)
+  Files:
+  - 'Macabre.mid'
+Commentary: |-
+    <i>Niklink:</i>
+    Part of the soundtrack for Malcolm Brown's 2002 Sonic fangame, Sonic ThirdScape 2, which formed a trilogy with previous games Omni Khaos and Sonic ThirdScape. Track name is taken from its filename when extracted from the game.
+---
 Track: Magical Hopalong Cassidy Station
 Artists:
 - Toby Fox
diff --git a/album/sburb-ost.yaml b/album/sburb-ost.yaml
index 32d519aa..4da617d6 100644
--- a/album/sburb-ost.yaml
+++ b/album/sburb-ost.yaml
@@ -1254,6 +1254,7 @@ Art Tags:
 - Denizens
 Referenced Tracks:
 - track:showtime-original-mix
+- track:showtime-piano-refrain
 Commentary: |-
     <i>Kevin Grant:</i>
     This song started out as a chiptune, but due to computer failures, I lost all of my work. I decided to remake it in non-chiptune form. It's supposed to sound menacing while at the same time spurring you into action. A real fight-or-die situation would have music like this. Overall, I just tried to have fun with this piece, drawing inspiration from songs like [[Chaotic Strength]] and [[Tomahawk Head]]. While I don't think the song is as good as it could be, other obligations (and further computer failures) caused me leave it a bit unpolished.
diff --git a/album/sburban-neighborhood.yaml b/album/sburban-neighborhood.yaml
index e7c95403..165d69b7 100644
--- a/album/sburban-neighborhood.yaml
+++ b/album/sburban-neighborhood.yaml
@@ -356,7 +356,7 @@ URLs:
 - https://sahcon.bandcamp.com/track/lofistuck

 Referenced Tracks:

 - Elevatorstuck

-- Homestuck

+- Homestuck Anthem

 Commentary: |-

     <i>sunsprite:</i>

     Cro originally suggested doing Lofi [[Elevatorstuck]], so there's that. Absolutely loved the idea and started doing that right when I first read it in the chat.

diff --git a/album/unreleased-tracks.yaml b/album/unreleased-tracks.yaml
index 000ea544..1d57fad0 100644
--- a/album/unreleased-tracks.yaml
+++ b/album/unreleased-tracks.yaml
@@ -451,6 +451,15 @@ URLs:
 - https://www.youtube.com/watch?v=pyMlQ92eyWs
 Referenced Tracks:
 - Hate You
+Commentary: |-
+    <i>Toby Fox:</i>
+    108 Stars of Density, my new track from the latest [[flash:5398|update]].
+
+    This song was actually a scrapped attempt at another Meenah song for Volume 9, created out of frustration towards composing [[track:hate-you]]. The song is based off of the ending portion of Hate You, starting at 2:11, which in turn was based off of the intro from [[track:love-you-feferis-theme|Love You]]. I took it out of hibernation and finished it for the update.
+
+    The weird name is a reference to Suikoden, a PlayStation RPG where you walk around talking to characters trying to recruit them into your army. Each character you can recruit corresponds to one of the 108 Stars of Destiny.
+
+    As Meenah, you walk around trying to recruit constellation-corresponding characters into your army………….
 ---
 Track: The Brave and the Bronze
 Artists:
@@ -692,7 +701,7 @@ Cover Artists:
 - Homestuck
 Referenced Tracks:
 - track:showtime-piano-refrain
-- Homestuck
+- track:harlequin
 Commentary: |-
     <i>James Roach:</i>
     SO! PesterQuest is out. We've been sitting on this one for a while. This first route has been done for a while. It was supposed to come out back on 6/12 but our new publisher had us sit on it for reasons that are beyond even me. Anyway, big ups to Malcolm and Mark for letting me use their themes.
@@ -1040,10 +1049,10 @@ Cover Artists:
 Referenced Tracks:
 - Rex Duodecim Angelus
 - Moonsetter
-- Homestuck
+- track:sburban-jungle
 - track:penumbra-phantasm
 - Unite Synchronization
-- track:MeGaLoVania
+- track:upward-movement-dave-owns
 - Homestuck Anthem
 - WORST END
 Commentary: |-