« get me outta code hell

hsmusic-data - Data files for https://hsmusic.wiki - track, album, artist & flash info, etc
summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--album/act-7.yaml2
-rw-r--r--album/alternia.yaml24
-rw-r--r--album/alterniabound.yaml180
-rw-r--r--album/ancestral.yaml190
-rw-r--r--album/archive.yaml24
-rw-r--r--album/are-you-lost.yaml32
-rw-r--r--album/bashful-hearts-out.yaml4
-rw-r--r--album/beforus.yaml162
-rw-r--r--album/beyond-canon.yaml18
-rw-r--r--album/cherubim.yaml54
-rw-r--r--album/class-act-b-side.yaml40
-rw-r--r--album/class-act.yaml4
-rw-r--r--album/coloUrs-and-mayhem-universe-a.yaml30
-rw-r--r--album/coloUrs-and-mayhem-universe-b.yaml104
-rw-r--r--album/cosmic-caretakers.yaml190
-rw-r--r--album/deltarune-ch1-ost.yaml140
-rw-r--r--album/desynced-vol-1.yaml80
-rw-r--r--album/desynced-vol-2.yaml136
-rw-r--r--album/diverging-delicacies.yaml190
-rw-r--r--album/election-season.yaml64
-rw-r--r--album/entertaining-sound.yaml118
-rw-r--r--album/exceptis-excipiendis.yaml4
-rw-r--r--album/friendsymphony.yaml103
-rw-r--r--album/genesis-frog.yaml112
-rw-r--r--album/gristmas-carols.yaml58
-rw-r--r--album/hiveswap-act-1-ost.yaml120
-rw-r--r--album/hiveswap-act-2-ost.yaml98
-rw-r--r--album/hiveswap-friendsim.yaml32
-rw-r--r--album/homestuck-for-the-holidays.yaml74
-rw-r--r--album/homestuck-vol-1-4.yaml229
-rw-r--r--album/homestuck-vol-1.yaml32
-rw-r--r--album/homestuck-vol-10.yaml190
-rw-r--r--album/homestuck-vol-2.yaml32
-rw-r--r--album/homestuck-vol-3.yaml32
-rw-r--r--album/homestuck-vol-4.yaml32
-rw-r--r--album/homestuck-vol-5.yaml218
-rw-r--r--album/homestuck-vol-6.yaml132
-rw-r--r--album/homestuck-vol-7.yaml72
-rw-r--r--album/homestuck-vol-8.yaml122
-rw-r--r--album/homestuck-vol-9.yaml144
-rw-r--r--album/i-am-writing-myself-a-dream-in-a-letter.yaml24
-rw-r--r--album/inhospitable-delisted.yaml35
-rw-r--r--album/jailbreak-vol-1.yaml50
-rw-r--r--album/labyrinths-heart.yaml14
-rw-r--r--album/lofam.yaml214
-rw-r--r--album/lofam2.yaml420
-rw-r--r--album/lofam3.yaml282
-rw-r--r--album/lofam4.yaml922
-rw-r--r--album/lofam5.yaml645
-rw-r--r--album/medium.yaml14
-rw-r--r--album/midnight-crew-drawing-dead.yaml23
-rw-r--r--album/mobius-trip-and-hadron-kaleido.yaml12
-rw-r--r--album/moons-of-theseus.yaml120
-rw-r--r--album/nuclears-explosion-1.yaml23
-rw-r--r--album/oceanfalls-vol-1.yaml4
-rw-r--r--album/oceanfalls-vol-2.yaml12
-rw-r--r--album/oceanfalls-vol-3.yaml16
-rw-r--r--album/one-year-older.yaml50
-rw-r--r--album/p-s.yaml100
-rw-r--r--album/perfectly-generic-album.yaml8
-rw-r--r--album/perfectly-generic-object.yaml4
-rw-r--r--album/prospit-and-derse.yaml18
-rw-r--r--album/psycholonials-ep-1.yaml10
-rw-r--r--album/psycholonials-ep-2.yaml19
-rw-r--r--album/psycholonials-ep-3.yaml13
-rw-r--r--album/psycholonials-ep-4.yaml13
-rw-r--r--album/psycholonials-ep-5.yaml10
-rw-r--r--album/psycholonials-ep-6.yaml10
-rw-r--r--album/psycholonials-ep-7.yaml11
-rw-r--r--album/psycholonials-ep-8.yaml10
-rw-r--r--album/psycholonials-ep-9.yaml18
-rw-r--r--album/psycholonials.yaml127
-rw-r--r--album/rust-apocalypse.yaml33
-rw-r--r--album/s-collide.yaml24
-rw-r--r--album/sburb-ost.yaml106
-rw-r--r--album/sburb.yaml20
-rw-r--r--album/shortcuts.yaml4
-rw-r--r--album/someday.yaml4
-rw-r--r--album/song-of-skaia.yaml8
-rw-r--r--album/squiddles.yaml35
-rw-r--r--album/strife-2.yaml50
-rw-r--r--album/strife.yaml38
-rw-r--r--album/symphony-impossible-to-play.yaml22
-rw-r--r--album/the-baby-is-you.yaml30
-rw-r--r--album/the-felt.yaml34
-rw-r--r--album/the-funk-mclovin-homestuck-experience.yaml24
-rw-r--r--album/the-genesis-project-vol-1.yaml18
-rw-r--r--album/the-grubbles.yaml4
-rw-r--r--album/the-wanderers.yaml44
-rw-r--r--album/theres-no-place-like-home.yaml42
-rw-r--r--album/tomb-of-the-ancestors.yaml20
-rw-r--r--album/triassic-slump.yaml8
-rw-r--r--album/undertale-soundtrack.yaml344
-rw-r--r--album/unreleased-tracks.yaml411
-rw-r--r--album/vaporwave-2016.yaml62
-rw-r--r--album/weird-puzzle-tunes.yaml50
-rw-r--r--album/xenoplanetarium.yaml60
-rw-r--r--artists.yaml6
-rw-r--r--flashes.yaml748
-rw-r--r--homepage.yaml2
-rw-r--r--news.yaml16
-rw-r--r--static-pages.yaml2
-rw-r--r--wiki-info.yaml2
103 files changed, 4629 insertions, 4515 deletions
diff --git a/album/act-7.yaml b/album/act-7.yaml
index ab7d510c..d1191cc6 100644
--- a/album/act-7.yaml
+++ b/album/act-7.yaml
@@ -23,7 +23,7 @@ Duration: '9:00'
 URLs:
 - https://homestuck.bandcamp.com/track/overture-canon-edit-2
 - https://www.youtube.com/watch?v=FPsMeamXcE8
-References:
+Referenced Tracks:
 - I - Overture
 - track:doctor
 - track:sburban-jungle
diff --git a/album/alternia.yaml b/album/alternia.yaml
index 37cf5f1c..66625a95 100644
--- a/album/alternia.yaml
+++ b/album/alternia.yaml
@@ -2,7 +2,6 @@ Album: Alternia
 Artist: Toby Fox
 Date: July 18, 2010
 Date Added: November 15, 2019
-Track Art Date: October 25, 2017
 Color: '#cc44ff'
 Groups:
 - Toby Fox
@@ -52,6 +51,7 @@ Cover Artists:
 Wallpaper Artists:
 - Cindy Dominguez
 - Andrew Hussie
+Default Track Cover Art Date: October 25, 2017
 ---
 Group: Main album
 ---
@@ -198,8 +198,6 @@ Cover Artists:
 ---
 Track: Walls Covered in Blood
 Duration: '2:00'
-Samples:
-- Mario Paint
 Art Tags:
 - Nepeta
 - Nepeta's lusus
@@ -218,6 +216,8 @@ Commentary: |-
     <img src="media/misc/walls-covered-in-blood.jpg" width="350" height="350">
 Cover Artists:
 - lime-time
+Sampled Tracks:
+- Mario Paint
 ---
 Track: dESPERADO ROCKET CHAIRS,
 Duration: '1:37'
@@ -245,8 +245,6 @@ Cover Artists:
 ---
 Track: Death of the Lusii
 Duration: '2:00'
-References:
-- track:crustacean
 Art Tags:
 - Gamzee
 - Gamzee's lusus
@@ -268,6 +266,8 @@ Commentary: |-
     <img src="media/misc/death-of-the-lusii.jpg" width="350" height="350">
 Cover Artists:
 - Aeritus
+Referenced Tracks:
+- track:crustacean
 ---
 Track: Virgin Orb
 Duration: '2:23'
@@ -293,9 +293,6 @@ Cover Artists:
 - allyssinian
 ---
 Track: The La2t Frontiier
-References:
-- Sunsetter
-- Guile's Theme
 Duration: '1:50'
 Art Tags:
 - Sollux
@@ -321,6 +318,9 @@ Commentary: |-
     <img src="media/misc/the-la2t-frontiier.jpg" width="350" height="350">
 Cover Artists:
 - Kirvia
+Referenced Tracks:
+- Sunsetter
+- Guile's Theme
 ---
 Track: Skaian Summoning
 Duration: '2:22'
@@ -343,8 +343,6 @@ Group: Bonus tracks
 Track: The Thirteenth Hour
 Cover Art Date: July 18, 2010
 Duration: '2:10'
-References:
-- track:sburban-jungle
 URLs:
 - https://homestuck.bandcamp.com/track/the-thirteenth-hour-2
 - https://youtu.be/SixKHx18sqk
@@ -364,6 +362,8 @@ Commentary: |-
     (the track art anthology for Alternia didn't include a fanart for this track.)
 Cover Artists:
 - Homestuck
+Referenced Tracks:
+- track:sburban-jungle
 ---
 Track: Spider's Claw
 Duration: 0:37
@@ -452,8 +452,6 @@ Cover Artists:
 ---
 Track: Walls Covered in Blood DX
 Duration: '2:01'
-References:
-- Walls Covered in Blood
 Art Tags:
 - Nepeta
 - Nepeta's lusus
@@ -467,3 +465,5 @@ Commentary: |-
     <img src="media/misc/walls-covered-in-blood-dx.jpg" width="350" height="350">
 Cover Artists:
 - atissi
+Referenced Tracks:
+- Walls Covered in Blood
diff --git a/album/alterniabound.yaml b/album/alterniabound.yaml
index a59b998c..d8057758 100644
--- a/album/alterniabound.yaml
+++ b/album/alterniabound.yaml
@@ -1,11 +1,7 @@
 Album: AlterniaBound
-Banner Art:
-- Hanni Brosh
-- Niklink (edits for wiki)
 Banner Dimensions: 1100x166
 Date: March 14, 2011
 Date Added: November 15, 2019
-Track Art Date: October 25, 2017
 Color: '#00a4a4'
 Groups:
 - Official
@@ -34,17 +30,16 @@ Cover Artists:
 Wallpaper Artists:
 - Hanni Brosh
 - Niklink (edits for wiki)
+Banner Artists:
+- Hanni Brosh
+- Niklink (edits for wiki)
+Default Track Cover Art Date: October 25, 2017
 ---
 Group: Main album
 ---
 Track: Arisen Anew
 Artist: Tensei
 Duration: '2:55'
-References:
-- psych0ruins
-- My Little Pony Theme
-Samples:
-- Dr. Who
 Art Tags:
 - Aradia
 URLs:
@@ -70,12 +65,15 @@ Lyrics: |-
     Toki no hime wa inu wo tometa<br>Toki no hime wa inu wo tometa<br>Toki no hime wa inu wo tometa<br>Toki no hime wa inu wo tometa<br>Toki no hime wa inu wo tometa<br>Toki no hime wa inu wo tometa<br>Toki no hime wa inu wo tometa<br>Toki no hime wa inu wo tometa
 Cover Artists:
 - vorpos
+Referenced Tracks:
+- psych0ruins
+- My Little Pony Theme
+Sampled Tracks:
+- Dr. Who
 ---
 Track: Karkat's Theme
 Artist: Toby Fox
 Duration: '1:58'
-References:
-- track:crustacean
 Art Tags:
 - Karkat
 URLs:
@@ -96,12 +94,12 @@ Commentary: |-
     <img src="media/misc/karkats-theme.jpg" width="350" height="350">
 Cover Artists:
 - gaylalondes
+Referenced Tracks:
+- track:crustacean
 ---
 Track: Trollcops
 Artist: Erik Scheele
 Duration: '2:45'
-References:
-- track:under-the-hat
 Art Tags:
 - Sollux
 - Terezi
@@ -124,14 +122,12 @@ Commentary: |-
     <img src="media/misc/trollcops.jpg" width="350" height="350">
 Cover Artists:
 - Melissa Peebles
+Referenced Tracks:
+- track:under-the-hat
 ---
 Track: 'BL1ND JUST1C3 : 1NV3ST1G4T1ON !!'
 Artist: Malcolm Brown
 Duration: '2:48'
-References:
-- The Lemonsnout Turnabout
-- Objection! 2001
-- track:sburban-jungle
 Art Tags:
 - Terezi
 - Vriska
@@ -153,13 +149,14 @@ Commentary: |-
     <img src="media/misc/bl1nd-just1c3-1nv3st1g4t1on.jpg" width="350" height="350">
 Cover Artists:
 - fenkko
+Referenced Tracks:
+- The Lemonsnout Turnabout
+- Objection! 2001
+- track:sburban-jungle
 ---
 Track: Terezi's Theme
 Artist: Toby Fox
 Duration: '2:16'
-References:
-- The Lemonsnout Turnabout
-- Theme
 Art Tags:
 - Terezi
 URLs:
@@ -176,12 +173,13 @@ Commentary: |-
     <img src="media/misc/terezis-theme.jpg" width="350" height="350">
 Cover Artists:
 - Kirvia
+Referenced Tracks:
+- The Lemonsnout Turnabout
+- Theme
 ---
 Track: Dreamers and The Dead
 Artist: Thomas Ferkol
 Duration: '4:04'
-References:
-- Cuddlefish
 Art Tags:
 - Aradia
 URLs:
@@ -199,13 +197,12 @@ Commentary: |-
     <img src="media/misc/dreamers-and-the-dead.jpg" width="350" height="350">
 Cover Artists:
 - sicklydoodles
+Referenced Tracks:
+- Cuddlefish
 ---
 Track: Vriska's Theme
 Artist: Toby Fox
 Duration: '1:43'
-References:
-- Spider's Claw
-- Theme
 Art Tags:
 - Vriska
 URLs:
@@ -224,15 +221,13 @@ Commentary: |-
     <img src="media/misc/vriskas-theme.jpg" width="350" height="350">
 Cover Artists:
 - Chumi
+Referenced Tracks:
+- Spider's Claw
+- Theme
 ---
 Track: She's a Sp8der
 Artist: Tensei
 Duration: '3:05'
-References:
-- Spider's Claw
-- track:MeGaLoVania
-- Eridan's Theme
-- track:crustacean
 Art Tags:
 - Mindfang
 URLs:
@@ -250,6 +245,11 @@ Commentary: |-
     <img src="media/misc/shes-a-sp8der.jpg" width="350" height="350">
 Cover Artists:
 - gaylalondes
+Referenced Tracks:
+- Spider's Claw
+- track:MeGaLoVania
+- Eridan's Theme
+- track:crustacean
 ---
 Track: FIDUSPAWN, GO!
 Artist: David Ko
@@ -265,15 +265,6 @@ Art Tags:
 URLs:
 - https://homestuck.bandcamp.com/track/fiduspawn-go-2
 - https://youtu.be/fCBr-v4JswY
-References:
-- track:showtime-imp-strife-mix
-- Pumpkin Cravings
-- track:harlequin
-- Sunslammer
-- dESPERADO ROCKET CHAIRS,
-- track:MeGaLoVania
-- track:vagabounce
-- track:beatdown-strider-style
 Commentary: |-
     <i>David Ko:</i>
     (Tavros' Battle Theme)
@@ -288,6 +279,15 @@ Commentary: |-
     <img src="media/misc/fiduspawn-go.jpg" width="350" height="350">
 Cover Artists:
 - Phil Gibson
+Referenced Tracks:
+- track:showtime-imp-strife-mix
+- Pumpkin Cravings
+- track:harlequin
+- Sunslammer
+- dESPERADO ROCKET CHAIRS,
+- track:MeGaLoVania
+- track:vagabounce
+- track:beatdown-strider-style
 ---
 Track: Darling Kanaya
 Artist: Toby Fox
@@ -297,8 +297,6 @@ Art Tags:
 URLs:
 - https://homestuck.bandcamp.com/track/darling-kanaya-2
 - https://youtu.be/54YThzEi4bk
-References:
-- Virgin Orb
 Commentary: |-
     <i>Toby Fox:</i>
     (Kanaya Walkabout)
@@ -310,6 +308,8 @@ Commentary: |-
     <img src="media/misc/darling-kanaya.jpg" width="350" height="350">
 Cover Artists:
 - vorpos
+Referenced Tracks:
+- Virgin Orb
 ---
 Track: Requiem of Sunshine and Rainbows
 Artist: Paige Turner
@@ -340,8 +340,6 @@ Artist: Toby Fox
 Contributors:
 - The_Eighth_Bit (soundfont)
 Duration: '2:41'
-References:
-- Catchyegrabber (Skipper Plumbthroat's Song)
 Art Tags:
 - Eridan
 URLs:
@@ -368,6 +366,8 @@ Commentary: |-
     <img src="media/misc/eridans-theme.jpg" width="350" height="350">
 Cover Artists:
 - chocolatula
+Referenced Tracks:
+- Catchyegrabber (Skipper Plumbthroat's Song)
 ---
 Track: Nautical Nightmare
 Artist: Toby Fox
@@ -395,8 +395,6 @@ Cover Artists:
 Track: Nepeta's Theme
 Artist: Toby Fox
 Duration: '1:32'
-References:
-- Walls Covered in Blood
 Art Tags:
 - Nepeta
 - Aradia
@@ -420,13 +418,12 @@ Commentary: |-
     <img src="media/misc/nepetas-theme.jpg" width="350" height="350">
 Cover Artists:
 - pbnj-art
+Referenced Tracks:
+- Walls Covered in Blood
 ---
 Track: Horschestra STRONG Version
 Artist: Alex Rosetti
 Duration: '3:23'
-References:
-- Horschestra
-- Walls Covered in Blood
 Directory: horschestra-STRONG-version
 Art Tags:
 - Equius
@@ -450,15 +447,13 @@ Commentary: |-
     <img src="media/misc/horschestra-STRONG-version.jpg" width="350" height="350">
 Cover Artists:
 - chocolatula
+Referenced Tracks:
+- Horschestra
+- Walls Covered in Blood
 ---
 Track: Blackest Heart (With Honks)
 Artist: Toby Fox
 Duration: '2:30'
-References:
-- Blackest Heart
-- La Cucaracha
-- First Call
-- Toreador Song
 Art Tags:
 - Equius
 - Gamzee
@@ -485,6 +480,11 @@ Commentary: |-
     <img src="media/misc/blackest-heart-with-honks.jpg" width="350" height="350">
 Cover Artists:
 - officialspec
+Referenced Tracks:
+- Blackest Heart
+- La Cucaracha
+- First Call
+- Toreador Song
 ---
 Track: Midnight Calliope
 Artist: Mark Hadley
@@ -511,10 +511,6 @@ Cover Artists:
 Track: Chaotic Strength
 Artist: Thomas Ferkol
 Duration: '2:34'
-References:
-- Chaotic Frenzy
-- The Number of the Beast
-- The Riddle Wants To Be
 Art Tags:
 - Equius
 - Underlings
@@ -538,6 +534,10 @@ Lyrics: |-
     Go, go, go, go, go, go, go, go!
 Cover Artists:
 - Rebecca Peason
+Referenced Tracks:
+- Chaotic Frenzy
+- The Number of the Beast
+- The Riddle Wants To Be
 ---
 Track: Trollian Standoff
 Artist: Tensei
@@ -577,17 +577,6 @@ Art Tags:
 URLs:
 - https://homestuck.bandcamp.com/track/rex-duodecim-angelus-2
 - https://youtu.be/hn6Yl371mIc
-References:
-- track:crustacean
-- The Lemonsnout Turnabout
-- dESPERADO ROCKET CHAIRS,
-- Virgin Orb
-- Horschestra
-- Walls Covered in Blood
-- Keepers
-- The La2t Frontiier
-- psych0ruins
-- Spider's Claw
 Commentary: |-
     <i>Malcolm Brown:</i>
     (Final Battle Against the Black King)
@@ -615,12 +604,21 @@ Commentary: |-
     <img src="media/misc/rex-duodecim-angelus.jpg" width="350" height="350">
 Cover Artists:
 - floralmarsupial
+Referenced Tracks:
+- track:crustacean
+- The Lemonsnout Turnabout
+- dESPERADO ROCKET CHAIRS,
+- Virgin Orb
+- Horschestra
+- Walls Covered in Blood
+- Keepers
+- The La2t Frontiier
+- psych0ruins
+- Spider's Claw
 ---
 Track: Killed by BR8K Spider!!!!!!!!
 Artist: Toby Fox
 Duration: '4:20'
-References:
-- Spider's Claw
 Art Tags:
 - Vriska
 URLs:
@@ -635,12 +633,12 @@ Commentary: |-
     <img src="media/misc/killed-by-br8k-spider.jpg" width="350" height="350">
 Cover Artists:
 - hellobeau
+Referenced Tracks:
+- Spider's Claw
 ---
 Track: Alternia
 Artist: Seth Peelle
 Duration: '3:57'
-References:
-- Theme
 URLs:
 - https://homestuck.bandcamp.com/track/alternia-2
 - https://youtu.be/ouwick_Ii2c
@@ -658,6 +656,8 @@ Commentary: |-
     <img src="media/misc/alternia.jpg" width="350" height="350">
 Cover Artists:
 - Xan Drake
+Referenced Tracks:
+- Theme
 ---
 Group: Bonus tracks
 ---
@@ -667,8 +667,6 @@ Cover Art Date: March 14, 2011
 Contributors:
 - Nick Smalley (words)
 Duration: '2:59'
-References:
-- Trollcops
 Art Tags:
 - Aradia
 - 'cw: cops'
@@ -687,6 +685,8 @@ Commentary: |-
     ... AND TOGETHER THEY ARE... TROLL COCKS.
 Cover Artists:
 - Homestuck
+Referenced Tracks:
+- Trollcops
 ---
 Track: Catapult Capuchin
 Artist: Toby Fox
@@ -757,16 +757,6 @@ Artist: Toby Fox
 Duration: '3:00'
 Contributors:
 - hank hill & cyclops (everything)
-References:
-- The La2t Frontiier
-- Yahoos and Triangles
-- track:MeGaLoVania
-- Courser
-- Guile's Theme
-Samples:
-- King of the Hill
-- 'X-Men: Children of the Atom'
-- X-Men vs. Street Fighter
 Art Tags:
 - Sollux
 - 'cw: blood'
@@ -794,13 +784,21 @@ Lyrics: |-
     bobby
 Cover Artists:
 - Melissa Peebles
+Referenced Tracks:
+- The La2t Frontiier
+- Yahoos and Triangles
+- track:MeGaLoVania
+- Courser
+- Guile's Theme
+Sampled Tracks:
+- King of the Hill
+- 'X-Men: Children of the Atom'
+- X-Men vs. Street Fighter
 ---
 Track: AlterniaBound
 Artist: Toby Fox
 Cover Art Date: March 14, 2011
 Duration: 0:20
-References:
-- Theme
 URLs:
 - https://homestuck.bandcamp.com/track/alterniabound-2
 - https://youtu.be/FD5tJvMtzDo
@@ -810,12 +808,12 @@ Commentary: |-
     AlterniaBound is a VERY direct homage to the title screen of EarthBound. If you don't know what EarthBound is... you may be missing out on something.
 Cover Artists:
 - Homestuck
+Referenced Tracks:
+- Theme
 ---
 Track: You Won A Combat
 Artist: Toby Fox
 Duration: 0:08
-References:
-- Theme
 Art Tags:
 - Karkat
 URLs:
@@ -829,12 +827,12 @@ Commentary: |-
     <img src="media/misc/you-won-a-combat.jpg" width="350" height="350">
 Cover Artists:
 - allyssinian
+Referenced Tracks:
+- Theme
 ---
 Track: Rest A While
 Artist: Toby Fox
 Duration: 0:09
-References:
-- Theme
 Art Tags:
 - Karkat
 URLs:
@@ -848,3 +846,5 @@ Commentary: |-
     <img src="media/misc/rest-a-while.jpg" width="350" height="350">
 Cover Artists:
 - scatterpunk
+Referenced Tracks:
+- Theme
diff --git a/album/ancestral.yaml b/album/ancestral.yaml
index 3280e5a5..c47812b9 100644
--- a/album/ancestral.yaml
+++ b/album/ancestral.yaml
@@ -1,10 +1,5 @@
 Album: Ancestral
 Directory: ancestral
-Banner Art:
-- Rangzhe
-- Rebecca Peason
-- Circlejourney (asset organizing)
-- Niklink (edits for wiki)
 Banner Dimensions: 1100x180
 Date: August 27, 2017
 Date Added: June 12, 2020
@@ -42,6 +37,11 @@ Commentary: |-
     To some extent, I consider Ancestral to be a little sister album to [[album:beforus]]. We share many contributors and this project was largely inspired by Beforus. The reason we asked Rangzhe to make our cover was to tie it in. The very last track of Beforus, [[Motions of Infinity]], ending with the ancestors being created, was drawn by her. Isn't it fitting how she begins this story after having ended the last? That, and her art is hella.
 Cover Artists:
 - Rangzhe
+Banner Artists:
+- Rangzhe
+- Rebecca Peason
+- Circlejourney (asset organizing)
+- Niklink (edits for wiki)
 ---
 Group: Disc 1
 ---
@@ -127,8 +127,6 @@ Cover Artists:
 Track: ♋️A Peace Worth Fighting For♋️
 Artist: Nate Tronerud
 Duration: '5:12'
-References:
-- track:skies-of-skaia
 Art Tags:
 - The Signless
 URLs:
@@ -141,6 +139,8 @@ Commentary: |-
     I wanted to experiment a little with this one! And great apologies to Austin Wintory and the whole team who worked on Journey by That Game Company. This song seemed very lonely, very solitary, so I envisioned the Signless wandering through the dunes between city and township of people who won't listen, lit by the light of two moons, but only remembering one.
 Cover Artists:
 - Lilly Higgs
+Referenced Tracks:
+- track:skies-of-skaia
 ---
 Track: ♌On The Hunt For Something Unknown♌
 Artist: The One Music Maniac
@@ -162,8 +162,6 @@ Cover Artists:
 Track: ♍Theotokos♍
 Artist: SerialSymphony
 Duration: '4:34'
-References:
-- track:crustacean
 Art Tags:
 - The Dolorosa
 - The Signless
@@ -178,6 +176,8 @@ Commentary: |-
     I love how this track starts off so sweet, builds up steadily, then falls back again. There's so much happening; it was very difficult to pick a single snapshot// I just hope I was able to do this magnificently dynamic piece a little justice!
 Cover Artists:
 - shu
+Referenced Tracks:
+- track:crustacean
 ---
 Track: ♎H3R HONOR4BL3 V3NG34NC3♎
 Artist: Seren Mist
@@ -200,10 +200,6 @@ Artist: Blackhole
 Contributors:
 - magnoliajades (vocals)
 Duration: '10:00'
-References:
-- Spider8ite!!!!!!!!
-- Cobalt Corsair
-- Winterfall
 Art Tags:
 - Mindfang
 URLs:
@@ -219,6 +215,10 @@ Commentary: |-
     I've been working a lot with Blackhole lately and they've really helped me out a lot with this album, so I wanted to collab right from the start. There's not much to tell; it's Mindfang looking good and probably being nasty. It's fully made with aquarelle and I never want to ever see her hair again.
 Cover Artists:
 - Josefin B.
+Referenced Tracks:
+- Spider8ite!!!!!!!!
+- Cobalt Corsair
+- Winterfall
 ---
 Track: ♐Broken Strings♐
 Artist: psithurist
@@ -321,32 +321,6 @@ Cover Artists:
 Track: Ancestral Anthem
 Artist: Rhyselinn
 Duration: '5:24'
-References:
-- Theme
-- Darling Dolorosa
-- Iron Infidel
-- Olive Scribe
-- Gold Pilot
-- Jade Mother
-- Indigo Heir
-- Cobalt Corsair
-- Violet Prince
-- Purple Bard
-- Bronze Rebel
-- The Lost Child
-- Fuchsia Ruler
-- ♈Reality Theatre♈
-- ♉W1th W1ngs♉
-- ♊Propulsion♊
-- ♋️A Peace Worth Fighting For♋️
-- ♌On The Hunt For Something Unknown♌
-- ♍Theotokos♍
-- ♎H3R HONOR4BL3 V3NG34NC3♎
-- ♏Spider's Eclipse♏
-- ♐Broken Strings♐
-- ♑His Demented Mural♑
-- ♒Tumescent♒
-- ♓Greatest -Empress♓
 Art Tags:
 - The Signless
 - The Handmaid
@@ -382,6 +356,32 @@ Commentary: |-
     I greatly enjoyed working on this piece. I'm so proud of all the work that's gone into this project and it's been an honor to participate.
 Cover Artists:
 - bootsie
+Referenced Tracks:
+- Theme
+- Darling Dolorosa
+- Iron Infidel
+- Olive Scribe
+- Gold Pilot
+- Jade Mother
+- Indigo Heir
+- Cobalt Corsair
+- Violet Prince
+- Purple Bard
+- Bronze Rebel
+- The Lost Child
+- Fuchsia Ruler
+- ♈Reality Theatre♈
+- ♉W1th W1ngs♉
+- ♊Propulsion♊
+- ♋️A Peace Worth Fighting For♋️
+- ♌On The Hunt For Something Unknown♌
+- ♍Theotokos♍
+- ♎H3R HONOR4BL3 V3NG34NC3♎
+- ♏Spider's Eclipse♏
+- ♐Broken Strings♐
+- ♑His Demented Mural♑
+- ♒Tumescent♒
+- ♓Greatest -Empress♓
 ---
 Track: BATTERWITC)( ASC-ENDANT
 Directory: batterwitch-ascendant
@@ -420,8 +420,6 @@ Cover Artists:
 Track: Orphaner's Ocean
 Artist: Acyl
 Duration: '4:14'
-References:
-- Eridan's Theme
 Art Tags:
 - Dualscar
 URLs:
@@ -434,6 +432,8 @@ Commentary: |-
     This piece was really intersting to try out. I was experimenting with a way of painting over everything rather than just staying within the comfort zone of line art. I think for the most part it worked out. Considering the song literally had wave sounds in it, I'd figure to put Dualscar near an ocean as well. The song parallels Eridan's theme too, so I thought I'd set a callback to when he took down a whale of his own. Dualscar's a messy shot thoug, which is why he's probably cleaning the spill off his gun.
 Cover Artists:
 - Cro
+Referenced Tracks:
+- Eridan's Theme
 ---
 Track: cerulean seas, misery machine
 Artist: smear
@@ -502,8 +502,6 @@ Cover Artists:
 Track: PRII2M BREAK
 Artist: David Burkee
 Duration: '2:10'
-References:
-- Battle! (Colress)
 Art Tags:
 - The Psiioniic
 URLs:
@@ -516,6 +514,8 @@ Commentary: |-
     Upon escaping, the Psii must have struggled with respecting his leader's pacifism when given the chance to strike back for once in his life. I wanted to show the split second when adrenaline is at the helm and the Signless' words are the only thing keeping him from blasting you moonside.
 Cover Artists:
 - Andi DiSpirito
+Referenced Tracks:
+- Battle! (Colress)
 ---
 Track: The Disciple's New Beginning
 Artist: Neveah Drexler
@@ -537,12 +537,6 @@ Cover Artists:
 Track: C9me T9gether
 Artist: TempiTunes
 Duration: '3:51'
-References:
-- Jade Mother
-- Iron Infidel
-- Walls Covered in Blood
-- Serenade
-- Gold Pilot
 Art Tags:
 - The Signless
 - The Disciple
@@ -559,6 +553,12 @@ Commentary: |-
     There's so much to this "family's" story and so much from the song that I really love. The trick comes to showing a alrge story in a single image. Luckily, the very tone of the song seemed to lead to the idea of stained glass windows. So I tried to create one to display the moments of this family coming together.
 Cover Artists:
 - Erin B.
+Referenced Tracks:
+- Jade Mother
+- Iron Infidel
+- Walls Covered in Blood
+- Serenade
+- Gold Pilot
 ---
 Track: Sufferer's Suite
 Artist: Toris Crow
@@ -581,11 +581,6 @@ Cover Artists:
 Track: Black Heart, Green Dress
 Artist: psithurist
 Duration: '4:44'
-References:
-- Amen, Brother
-- Limelight
-- Temporal Shenanigans
-- English
 Art Tags:
 - The Handmaid
 URLs:
@@ -608,6 +603,11 @@ Commentary: |-
 Cover Artists:
 - Josefin B. (lines)
 - Andi DiSpirito (coloring)
+Referenced Tracks:
+- Amen, Brother
+- Limelight
+- Temporal Shenanigans
+- English
 ---
 Track: Expatri8's March
 Artist: Nymelord
@@ -657,8 +657,6 @@ Track: E%ile
 Directory: exile
 Artist: ndividedbyzero
 Duration: '1:46'
-References:
-- track:ruins
 Art Tags:
 - The Expatriate
 URLs:
@@ -672,6 +670,8 @@ Commentary: |-
     This made me think of Darkleer's life in general so here he is, standing proud and doing his job, and then his slouched form bemoaning his existence after being banished.
 Cover Artists:
 - Xagave
+Referenced Tracks:
+- track:ruins
 ---
 Track: Legacy
 Artist: aeolianChemist
@@ -703,8 +703,6 @@ Cover Artists:
 Track: Terminal Aeon
 Artist: WC
 Duration: '2:02'
-References:
-- Gold Pilot
 Art Tags:
 - The Psiioniic
 - 'cw: body horror'
@@ -718,13 +716,12 @@ Commentary: |-
     I based the composition of the picture on the adjacent notes on the opposite ears with the two most prominent figures in the Psiioniic's life. I also used what the musician said about him losing his emotions over time to decide on the colours, bright and lively and warm for the main figure then darker an dcolder in the background.
 Cover Artists:
 - gelasticat
+Referenced Tracks:
+- Gold Pilot
 ---
 Track: Vwigor8us
 Artist: Llyona Fang
 Duration: '3:42'
-References:
-- Wind-up Storm
-- track:doctor
 Art Tags:
 - Mindfang
 - Dualscar
@@ -738,6 +735,9 @@ Commentary: |-
     Here's my finished art, I went pretty literal, and tried to capture more of a 'falling in love/good times' feel that the upbeat music inspired. There's some hints of their conflict, Mindfang's hair is engulfing and overwhelming, Duelscar's possessive embrace is being held at a distance.
 Cover Artists:
 - Donomon
+Referenced Tracks:
+- Wind-up Storm
+- track:doctor
 ---
 Track: Lady of Sorrows
 Artist: Dallas Ross Hicks
@@ -787,10 +787,6 @@ Cover Artists:
 Track: Court of Miracles
 Artist: irl-porrim-maryam
 Duration: '2:23'
-References:
-- In the Hall of the Mountain King
-- Purple Tyrant
-- The Court of Miracles
 Art Tags:
 - The Grand Highblood
 URLs:
@@ -803,12 +799,14 @@ Commentary: |-
     Grand Highblood is a tricky fellow, isn't he? Right when you think he's shown his hand, his true intentions are still lurking in the shadows...
 Cover Artists:
 - bootsie
+Referenced Tracks:
+- In the Hall of the Mountain King
+- Purple Tyrant
+- The Court of Miracles
 ---
 Track: Violet Means to a Violent End
 Artist: Acyl
 Duration: '4:09'
-References:
-- Purple Tyrant
 Art Tags:
 - Dualscar
 - The Grand Highblood
@@ -824,6 +822,8 @@ Commentary: |-
     Dualscar's exact end is left am ystery, only hinted at by Mindfang's memoirs. I have a feeling no one saw his death coming until the last moment, the Orphaner least of all. The track's frenetic build gave me a sense of the kind desperation he was feeling at that point, and how his short sighted mistake cost him everything.
 Cover Artists:
 - Liz Fish
+Referenced Tracks:
+- Purple Tyrant
 ---
 Track: Paint The Walls
 Artist: The One Music Maniac
@@ -879,8 +879,6 @@ Cover Artists:
 Track: JUST1C3 R41NS FROM 4BOV3
 Artist: SerialSymphony, Circlejourney
 Duration: '4:13'
-References:
-- The Confront8ion
 Art Tags:
 - Redglare
 - Pyralspite
@@ -896,12 +894,12 @@ Commentary: |-
     It was difficult making the art as epic as the music while keeping it simple. Still, I did my best to make them both look mighty in a way. Could've focused more on Pyralspite.
 Cover Artists:
 - Lou Chastain
+Referenced Tracks:
+- The Confront8ion
 ---
 Track: The Demise of Neophyte Redglare at the Hands of the Unruly Mob
 Artist: SerialSymphony
 Duration: '2:30'
-References:
-- Terezi's Theme
 Art Tags:
 - Redglare
 - 'cw: hanging'
@@ -916,6 +914,8 @@ Commentary: |-
     The art was inspired by religious art due to the dramatic crescendo and haunting tones depicting the abrupt death of Neophyte Redglare. The music combined with the Neophyte's hanging reminded me of some sort of ascension which I wanted to show with the halo and her outstretched hands.
 Cover Artists:
 - Daisy S.
+Referenced Tracks:
+- Terezi's Theme
 ---
 Track: The Mechanism
 Artist: not-the-kind-you-save
@@ -1086,10 +1086,6 @@ Cover Artists:
 Track: The Doom of the Planets
 Artist: Circlejourney
 Duration: '3:31'
-References:
-- Fuchsia Ruler
-- Gold Pilot
-- Heir of Grief
 Art Tags:
 - The Psiioniic
 - The Condesce
@@ -1104,6 +1100,10 @@ Commentary: |-
     oh gosh i really like this song, especially the more orchestral parts. i tried to depict the condesce walking away from the helmsman as he bleeds out to death on the ship and looking all sinister and dark, as the doom of planets should be, and yet making it colorful to match the very prominent fuchsia ruler tune. i have no idea how to describe music so pardon me if i got anything wrong!
 Cover Artists:
 - Tunapuns
+Referenced Tracks:
+- Fuchsia Ruler
+- Gold Pilot
+- Heir of Grief
 ---
 Track: Rusted Wench
 Artist: miraculouslollipop
@@ -1124,8 +1124,6 @@ Track: Handmaiden's F(l)ight
 Directory: handmaidens-flight
 Artist: SerialSymphony
 Duration: '6:01'
-References:
-- track:sburban-jungle
 Art Tags:
 - The Handmaid
 URLs:
@@ -1138,14 +1136,12 @@ Commentary: |-
     the scene of Handmaid running from Dr. Scratch in Lord English's sight.
 Cover Artists:
 - Silverwater
+Referenced Tracks:
+- track:sburban-jungle
 ---
 Track: Of Rust and Royalty
 Artist: Grace Medley
 Duration: '3:20'
-References:
-- Rust Apocalypse
-- Fuchsia Ruler
-- Eternity Served Cold
 Art Tags:
 - The Handmaid
 - The Condesce
@@ -1159,6 +1155,10 @@ Commentary: |-
     The battle between the Condesce and the Handmaid is still one of the most mysterious parts of the story, and I feel its impact and consequences have yet to be fully explored. There's no question that it was an insidious trap for the Condesce, but what is the true nature of the curse spoken by Doc Scratch...?
 Cover Artists:
 - Elanor Pam
+Referenced Tracks:
+- Rust Apocalypse
+- Fuchsia Ruler
+- Eternity Served Cold
 ---
 Track: The Handmaid's Lament
 Artist: Sara Stebbins
@@ -1302,9 +1302,6 @@ Cover Artists:
 Track: Tomorrow There'll Be More Of Us
 Artist: Navochao
 Duration: '2:06'
-References:
-- track:tomorrow-therell-be-more-of-us-hamilton
-- Burn
 Art Tags:
 - The Signless
 - The Disciple
@@ -1318,12 +1315,13 @@ Commentary: |-
     I sort of wonder sometimes if collecting strays ran in the family. Dolorosa had no idea what she'd start, picking up the little red grub.
 Cover Artists:
 - Liz Fish
+Referenced Tracks:
+- track:tomorrow-therell-be-more-of-us-hamilton
+- Burn
 ---
 Track: Signless Protection Squad
 Artist: Navochao
 Duration: '2:27'
-References:
-- Icirrus City
 Art Tags:
 - The Psiioniic
 - The Disciple
@@ -1338,6 +1336,8 @@ Commentary: |-
     Every time I imagine the Psiioniic and the Disciple interacting, I imagine him using his sparks like a cat laser to distract her. I didn't want to be so silly, but I hope I captured the same energy as the song!
 Cover Artists:
 - bootsie
+Referenced Tracks:
+- Icirrus City
 ---
 Track: Purple And Purple
 Artist: WC
@@ -1403,10 +1403,6 @@ Cover Artists:
 Track: Leftovers
 Artist: psithurist
 Duration: '4:08'
-References:
-- Walls Covered in Blood
-- Olive Scribe
-- Flare
 Art Tags:
 - The Disciple
 URLs:
@@ -1423,6 +1419,10 @@ Commentary: |-
     At first i had alot of ideas about what i wanted to draw for image but i finally settled with a view of the disciple writing on the screen while inside a cave, giving a nod towards Nepeta and for example her shipping wall.
 Cover Artists:
 - senpai-satan
+Referenced Tracks:
+- Walls Covered in Blood
+- Olive Scribe
+- Flare
 ---
 Track: Cardinal Fyre
 Artist: Zan Beaver
@@ -1462,9 +1462,6 @@ Cover Artists:
 Track: Swan Song
 Artist: Navochao
 Duration: '2:38'
-References:
-- The Cave You Fear
-- track:swan-song-set-it-off
 Art Tags:
 - The Grand Highblood
 URLs:
@@ -1478,12 +1475,13 @@ Commentary: |-
     I wanted something dramatic because that just seemed right for a swan song but somewhat subdued at the same time since that's how the track came across. I went with a stained glass aesthetic because they've always encompassed that kind of feeling for me.
 Cover Artists:
 - gelasticat
+Referenced Tracks:
+- The Cave You Fear
+- track:swan-song-set-it-off
 ---
 Track: The Doom of the Planets (Reprise)
 Artist: Circlejourney
 Duration: '3:32'
-References:
-- The Doom of the Planets
 Art Tags:
 - The Condesce
 URLs:
@@ -1495,3 +1493,5 @@ Commentary: |-
     The Condesce looks on at a new star system as her ship approaches, mirroring the contemplative mood of the track.
 Cover Artists:
 - Circlejourney
+Referenced Tracks:
+- The Doom of the Planets
diff --git a/album/archive.yaml b/album/archive.yaml
index 5b5c571a..f0a559de 100644
--- a/album/archive.yaml
+++ b/album/archive.yaml
@@ -501,16 +501,14 @@ Duration: '4:00'
 URLs:
 - https://bowman.bandcamp.com/track/jungle-boogie
 - https://www.youtube.com/watch?v=Df9m1mux-BU
-References:
-- track:sburban-jungle
 Commentary: |-
     <i>Michael Guy Bowman:</i>
     Outtake from [[album:homestuck-vol-10]], 2016
+Referenced Tracks:
+- track:sburban-jungle
 ---
 Track: Awake (2013 Version)
 Duration: '3:28'
-References:
-- Awake (2012 Version)
 URLs:
 - https://bowman.bandcamp.com/track/awake-2013-version
 - https://www.youtube.com/watch?v=FmKaslOTrXs
@@ -545,13 +543,13 @@ Lyrics: |-
     And time restarts and life resumes
     I rise to meet the coming day
     But someone's laughing far away
+Referenced Tracks:
+- Awake (2012 Version)
 ---
 Group: Bonus tracks
 ---
 Track: Aba Daba Honeymoon
 Directory: aba-daba-honeymoon-archive
-References:
-- track:aba-daba-honeymoon
 Duration: '1:27'
 Has URLs: false
 Lyrics: |-
@@ -592,6 +590,8 @@ Lyrics: |-
     Then the big baboon one night in June
     He married them and very soon
     They went upon their aba daba honeymoon
+Referenced Tracks:
+- track:aba-daba-honeymoon
 ---
 Track: Valentine To Sarah From Julian
 Duration: '2:12'
@@ -669,10 +669,10 @@ Lyrics: |-
     (Yes!)
 ---
 Track: Emery's Theme (Fast Version)
-References:
-- Emery's Theme
 Duration: 0:57
 Has URLs: false
+Referenced Tracks:
+- Emery's Theme
 ---
 Track: Conro Corp Anthem
 Duration: 0:36
@@ -734,8 +734,6 @@ Lyrics: |-
 ---
 Track: Old Buggy Now (Solatrus remix)
 Artist: Solatrus
-References:
-- Old Buggy Now
 Duration: '4:04'
 Has URLs: false
 Lyrics: |-
@@ -778,11 +776,11 @@ Lyrics: |-
     In this old buggy old buggy now
     In this old buggy old buggy now
     In this old buggy old buggy now
+Referenced Tracks:
+- Old Buggy Now
 ---
 Track: Ithaca (hrmnzr remix)
 Artist: Jamie Paige Stanley
-References:
-- Ithaca
 Duration: '4:14'
 Has URLs: false
 Lyrics: |-
@@ -836,3 +834,5 @@ Lyrics: |-
     Although I sing along
     That moment now has gone
     My heart still a restless sea where Ithaca is calling
+Referenced Tracks:
+- Ithaca
diff --git a/album/are-you-lost.yaml b/album/are-you-lost.yaml
index 4b682e9e..028736a5 100644
--- a/album/are-you-lost.yaml
+++ b/album/are-you-lost.yaml
@@ -3,8 +3,6 @@ Directory: are-you-lost
 Artist: hywell
 Date: November 22, 2020
 Date Added: April 12, 2021
-Banner Art:
-- Astroblur
 Banner Dimensions: 975x180
 Has Track Art: false
 Color: '#45cef2'
@@ -27,44 +25,46 @@ Cover Artists:
 - Astroblur
 Wallpaper Artists:
 - Astroblur
+Banner Artists:
+- Astroblur
 ---
 Track: SIGNAL START
 Duration: '3:25'
-References:
-- ASGORE
 URLs:
 - https://smoothiefruitee.bandcamp.com/track/signal-start
+Referenced Tracks:
+- ASGORE
 ---
 Track: ARE YOU LOST?
 Duration: '4:40'
-References:
-- Fallen Down
 URLs:
 - https://smoothiefruitee.bandcamp.com/track/are-you-lost
+Referenced Tracks:
+- Fallen Down
 ---
 Track: FALLEN
 Duration: '4:51'
-References:
-- Fallen Down
 URLs:
 - https://smoothiefruitee.bandcamp.com/track/fallen
+Referenced Tracks:
+- Fallen Down
 ---
 Track: LOREM IPSUM DOCET
 Duration: '4:13'
-References:
-- Moonsetter
 URLs:
 - https://smoothiefruitee.bandcamp.com/track/lorem-ipsum-docet
+Referenced Tracks:
+- Moonsetter
 ---
 Track: TRUE AUTUMN
 Artists:
 - hywell
 - Cristata
 Duration: '5:21'
-References:
-- Quiet Autumn
 URLs:
 - https://smoothiefruitee.bandcamp.com/track/true-autumn-ft-cristata
+Referenced Tracks:
+- Quiet Autumn
 ---
 Track: MEDIUM
 Directory: medium-are-you-lost
@@ -72,14 +72,14 @@ Artists:
 - hywell
 - Cristata
 Duration: '6:22'
-References:
-- CORE
 URLs:
 - https://smoothiefruitee.bandcamp.com/track/medium-ft-cristata
+Referenced Tracks:
+- CORE
 ---
 Track: JUDGEMENT
 Duration: '3:31'
-References:
-- track:megalovania-undertale
 URLs:
 - https://smoothiefruitee.bandcamp.com/track/judgement
+Referenced Tracks:
+- track:megalovania-undertale
diff --git a/album/bashful-hearts-out.yaml b/album/bashful-hearts-out.yaml
index 25a7ad5f..e1f6f960 100644
--- a/album/bashful-hearts-out.yaml
+++ b/album/bashful-hearts-out.yaml
@@ -1,7 +1,5 @@
 Album: Bashful Hearts Out
 Artist: WHATISLOSTINTHEMINES
-Banner Art:
-- WHATISLOSTINTHEMINES
 Banner Dimensions: 975x105
 Has Track Art: false
 Date: September 30, 2020
@@ -16,6 +14,8 @@ Cover Artists:
 - WHATISLOSTINTHEMINES
 Wallpaper Artists:
 - WHATISLOSTINTHEMINES
+Banner Artists:
+- WHATISLOSTINTHEMINES
 ---
 Track: Spontaneous Combustion
 Duration: '3:33'
diff --git a/album/beforus.yaml b/album/beforus.yaml
index 59b09db0..adaeb8ac 100644
--- a/album/beforus.yaml
+++ b/album/beforus.yaml
@@ -1,7 +1,5 @@
 Album: Beforus
 Directory: beforus
-Banner Art:
-- Gilwing
 Banner Dimensions: 1100x203
 Date: April 12, 2016
 Date Added: May 25, 2020
@@ -38,6 +36,8 @@ Commentary: |-
     I'm so grateful for the privilege of illustrating the album cover! I don't think I've ever put so many characters in one illustration before, so it was an experience trying to fit them all in together. It's based off of where the trolls lived before starting their game, with Meenah having run away to the pink moon while everyone else is on Beforus, as well as my track art for [[Cosmic Malfunction]] by Ducky Senpai, which also has to do with people chilling on space orbs. It was really hard to find a balance with all these guys, while at the same time knowing it has to represent the entire album and all of the people working on it. It was a unique challenge but I had a blast, I hope I did it justice!
 Cover Artists:
 - Gilwing
+Banner Artists:
+- Gilwing
 ---
 Group: Disc 1
 ---
@@ -103,14 +103,6 @@ Art Tags:
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/breathtak1ng
 - https://youtu.be/3uDVyljVSC4
-References:
-- Do The Windy Thing
-- dESPERADO ROCKET CHAIRS,
-- Bronze Rebel
-- The Lost Child
-- iRRRRRRRRECONCILA8LE
-- Penumbra Phantasm
-- track:doctor
 Commentary: |-
     <i>Rhyselinn:</i>
     Hi! I'm Rhyselinn, the composer for Rufioh Nitram's track "Breathtak1ng."
@@ -120,6 +112,14 @@ Commentary: |-
     The idea for this art was to have Rufioh flying away from the ones who have made his life hard. The papers flying about are meant to be seen as him finally pursuing what he loves. Ideally I would have loved to have him fly into the sun, but as I imagined him as being alive rather than dead, this was not ideal.
 Cover Artists:
 - doodlebonez
+Referenced Tracks:
+- Do The Windy Thing
+- dESPERADO ROCKET CHAIRS,
+- Bronze Rebel
+- The Lost Child
+- iRRRRRRRRECONCILA8LE
+- Penumbra Phantasm
+- track:doctor
 ---
 Track: ♊ - The Mituna Method
 Artist: psithurist
@@ -162,8 +162,6 @@ Art Tags:
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/mog-3
 - https://youtu.be/4GqkApgXiQU
-References:
-- Nine Lives One Love
 Commentary: |-
     <i>Dallas Ross Hicks:</i>
     MOG^3<br>1. Meulin, Obsessive Girl<br>2. Makara's Oddball Gaiety<br>3. Matesprits Osculate Gleefully<br>(EpiMOG: Milord's Onerous Gift)
@@ -172,6 +170,8 @@ Commentary: |-
     I've always found Meulin slightly unsettling, so I was pleased to be assigned art duty on a track that explores all facets of the character, rather than just "she's cute and likes cats!". Meulin happily ships and memes her way through a surprisingly tragic life; she's fine that Kurloz deafened her, she's oblivious that he's mind-controlling her. I wanted to reflect that with a smiling mouth and eyes full of stars and the beauty of it all, but a sense of emptiness and loss as the Vast Honk obliterates her hearing and she's left with a meaningless future. Sorry, that's pretty nihilistic, but so is Meulin!
 Cover Artists:
 - felicitousArtisan
+Referenced Tracks:
+- Nine Lives One Love
 ---
 Track: ♍ - Let Me Dance, Let Me Glisten
 Artist: Flutterwhat
@@ -305,10 +305,6 @@ Art Tags:
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/killer-beach
 - https://youtu.be/c_F4NGUgG3o
-References:
-- Rex Duodecim Angelus
-- English
-- track:MeGaLoVania
 Commentary: |-
     <i>VeritasUnae:</i>
     I wanted to deal with mixed elements of Meenah's character. It has similarities to [[Hate You]], which I considered a primary inspiration, though I also drew inspiration from the Splatoon soundtrack for the opening section.
@@ -318,6 +314,10 @@ Commentary: |-
     I wanted to reflect on what the musician wanted to portray Meenah on the track, but also my ideas of Meenah's similarity in personality with her Alternian counter-part, the Condesce. I put a little more of my own idea that Meenah not realizing how much she is like the Condesce even when hearing and at awe about her accomplishments and her magnificent ruling style from Aranea. I also put lime green as the background color not only to match up the complimentary color but to also symbolize LE's employment of the Condesce. She is a lot more like her Alternian self than she realizes... 38)
 Cover Artists:
 - Rangzhe
+Referenced Tracks:
+- Rex Duodecim Angelus
+- English
+- track:MeGaLoVania
 ---
 Group: Disc 2
 ---
@@ -451,9 +451,6 @@ Art Tags:
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/the-weeaboos-battle-cry
 - https://youtu.be/DSYt9MOT75I
-References:
-- The Brave and the Bronze
-- dESPERADO ROCKET CHAIRS,
 Commentary: |-
     <i>Toris Crow:</i>
     This piece was written for Rufioh Nitram and specifically, his clan, the Lost Weeaboos. The instrumentation was based off "The Brave and the Bronze" by Yan "Nucleose" Rodriguez, with the percussion beat coming from Tavros's song "dESPERADO ROCKET CHAIRS," by Toby "Radiation" Fox. Its musical connection to Rufioh is mostly open for interpretation. This song's alternate name in my own album is "La Tauromaquia," meaning "bullfighting" in Spanish.
@@ -461,6 +458,9 @@ Commentary: |-
     When I was figuring out what th draw for the song, I did pay attention to the song's name and also alternate name. Hearing "weeaboo" made me want to put kitty ears on Rufioh, but I scrapped that idea and instea dfocussed on the bullfighting aspect of the song first and foremost. Since Rufioh is kind of a silly character, I thught that it'd be great to gie him one of those little pony riding sticks with a bull for the head. After I finished drawing the main part of the drawing, I was still trying to figure out how to incorporate "weeaboo"-ness into it. Well, weeaboo makes me think of kitties and anime, so my mind went to Nyan Cat. Perfect, I thought, I'll add some Goold Ol' Nyan Cat rainbows, haha. And then, of course, glitter becaus anime. It came out really colorful and I'm happy with it.
 Cover Artists:
 - rockytoad
+Referenced Tracks:
+- The Brave and the Bronze
+- dESPERADO ROCKET CHAIRS,
 ---
 Track: Life With Peace
 Artist: Mathias Ramalho
@@ -696,8 +696,6 @@ Art Tags:
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/formant-sprite-chorus-mix
 - https://youtu.be/bA0Y8wakRXQ
-References:
-- track:chorale-for-jaspers
 Commentary: |-
     <i>Blackhole:</i>
     This song is a result of me playing around with the theme from [[track:chorale-for-jaspers|Chorale for Jaspers]] and stumbling upon a particular preset for one of my synthesizers, "Formant", for which I later named the song. The music sounded so great with that particular synth that I decided to build an entire song around it, and completed Formant in its entirety pretty much later that day. Whilst I originally billed it as a Jasprose theme when she made her debut, for Beforus I've repurposed it as a more general sprite theme that would work for the Beforan session sprites. This album version is extended with a longer intro, and features cleaner audio without the static!
@@ -705,6 +703,8 @@ Commentary: |-
     Hey! I'm Siggy and I'm honored to make art for the Beforus album. Listening to this song made me think of the colour pink and Meenah being the best pink troll on the block, I decided to make the picture all pink.
 Cover Artists:
 - Sigourney Martin
+Referenced Tracks:
+- track:chorale-for-jaspers
 ---
 Track: The Explored Ruins
 Artist: RowBird, one-imperfect-rose
@@ -714,9 +714,6 @@ Art Tags:
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/the-explored-ruins
 - https://youtu.be/QD89pyXd-m4
-References:
-- track:explore
-- track:ruins
 Commentary: |-
     <i>RowBird:</i>
     This song was composed with the intent of having a "Homestuck" feel to it, while being my own creation at the same time. The floating left-hand chord pattern that is heard throughout the song is inspired by [[Flare]], and [[Three in the Morning]]. The piano portion was composed before I even knew of the fan album, so it was mostly in the additional elements (the strings, woodwinds, percussion, etc.) that the character was shaped.
@@ -726,6 +723,9 @@ Commentary: |-
     Since both Damara and Horuss played such important roles in Rufioh's life, I really wanted to include them in what ended up being not so metaphorical objects: the roses, representing passion but also strangling, hurting love; and the arrows, symbolizing a new union and a new direction. Yet, in the end, everything fades away with one last Breath. How suitable.
 Cover Artists:
 - Neiratina
+Referenced Tracks:
+- track:explore
+- track:ruins
 ---
 Track: Shipping Implicatpuns
 Artist: rest✩taurus
@@ -892,12 +892,6 @@ Art Tags:
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/cheater-pan
 - https://youtu.be/rqxWDyxIT-8
-References:
-- Rust Maid
-- psych0ruins
-- Indigo Heir
-- Bronze Rebel
-- dESPERADO ROCKET CHAIRS,
 Commentary: |-
     <i>David Burkee:</i>
     I thought of how I would direct the track on my way to the shop actually. I ws listening to coloUrs and mayhem and I was just like "these would work well together." The beginning of the track is how the "accident" (read: damara's insatiable fury) happened, going on to Horuss and Rufioh building a relationship as he worked on the latter's body, which devolved into Rufioh's eternal, depressing grind through a mundane life, dating a guy he lost admiration for after the initial spark faded.
@@ -905,6 +899,12 @@ Commentary: |-
     The idea for this drawing was that I just really wanted to draw Damara and Rufioh meeting up after his head's been placed ona robot horse. Nothing much really! I've always had a soft spot for Megidos so adding her in was absolutely necessary.
 Cover Artists:
 - Robin
+Referenced Tracks:
+- Rust Maid
+- psych0ruins
+- Indigo Heir
+- Bronze Rebel
+- dESPERADO ROCKET CHAIRS,
 ---
 Track: DAMiterNEIGHtions
 Artist: rest✩taurus
@@ -958,12 +958,6 @@ Art Tags:
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/timeout
 - https://youtu.be/OEJ4XmwS1n0
-References:
-- track:MeGaLoVania
-- Fuchsia Ruler
-- Penumbra Phantasm
-- Flare
-- Killed by BR8K Spider!!!!!!!!
 Commentary: |-
     <i>psithurist:</i>
     For my piece, I wanted to write for an obscure part of the story that we only really hear about through exposition in Openbound: the duel between Damara and Meenah. Damara ends up killing Meenah (the section around 2:08), who is saved by Aranea (the final round), carrying her to her Quest Cocoon so she can Get the Tiger (the ending section). Damara and Aranea don't really have canonised themes, so I composed my own motif for Damara, and referenced Fuchsia Ruler for Meenah, and Killed by BR8K Spider!!!!!!!! for Aranea (technically a Vriska theme, but they're both spider girls, gimme a 8r8k ;;;;) ). I actually started writing this track without a theme in mind, only really knowing it was going to be a battle theme, so the working title was "beforan beatdown". The whole track uses original synth sounds made with Magical8BitPlug and NES VST, except the drums, which are sampled from Secret of Mana, and the piano.
@@ -971,6 +965,12 @@ Commentary: |-
     I always found Damara's sudden madness very interesting. By all accounts, she used to be a sweet girl until finally snapping and fighting Meenah. Aranea's involvement, however, has always been interesting to me. She, of course, brought Meenah to a quest bed, but I always wanted to explore the ambiguity of her involvement. Whether it was just to drag Meenah away or a decision to nudge along a friend suffering in silence to take action, who can really say. A bloody battle, a bully beaten, and a girl freed from her silence. I wanted this piece to show Aranea's ambiguous involvement and the terror that Damara had become.
 Cover Artists:
 - Rebecca Peason
+Referenced Tracks:
+- track:MeGaLoVania
+- Fuchsia Ruler
+- Penumbra Phantasm
+- Flare
+- Killed by BR8K Spider!!!!!!!!
 ---
 Track: Game Lost
 Artist: Sean William Calhoun
@@ -1013,9 +1013,6 @@ Art Tags:
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/press-a-to-reset
 - https://youtu.be/D_lrUCCtLA8
-References:
-- Hate You
-- Theme
 Commentary: |-
     <i>Private I.:</i>
     Let's face it. Even though most of the Beforan session was allegedly sloppy teen romance, the end of it was awesome. They literally went out with a bang. So I thought, what if the whole session was made into an 8-bit NES game? This tune is the on cellosupposed theme of the final stage of BEFORUS: The Game. Or something. Sorry, I suck at names.
@@ -1025,6 +1022,9 @@ Commentary: |-
     I tried to make this image like some kind of classy high-res 8-bit shoutout to match with the song. The color scheme was inspired by wathcing a two year old draw all over the wall with neon glitter crayons.
 Cover Artists:
 - oxfordroulette
+Referenced Tracks:
+- Hate You
+- Theme
 ---
 Track: The Scratch Before The Calm
 Artist: Laurent Désautels-Séguin
@@ -1093,8 +1093,6 @@ Art Tags:
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/the-sylph-is-in
 - https://youtu.be/96c21g3U15I
-References:
-- Cobalt Corsair
 Commentary: |-
     <i>Sara Stebbins:</i>
     My track was inspired by Aranea's exposition booth in Openbound. I tried to go for a swing piano piece kind of in the vein of Charlie Brown, though I didn't adhere to that completely. I alsou sed themes from "Cobalt Corsair" on Colours and Mayhem Universe A. Basically, it was written to be something one could tap dance to.
@@ -1102,6 +1100,8 @@ Commentary: |-
     Because the song took themes from swing dancing and Aranea's expasition booth, I thought it would be fun for Aranea to cut loose in her own private library.
 Cover Artists:
 - Quietserval
+Referenced Tracks:
+- Cobalt Corsair
 ---
 Track: Vwiolet Vwelvwet
 Artist: Dallas Ross Hicks
@@ -1144,9 +1144,6 @@ Art Tags:
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/whispering-chucklevoodoo
 - https://youtu.be/2UjsD1IIDv0
-References:
-- Homestuck Anthem
-- track:harlequin
 Commentary: |-
     <i>Llyona Fang:</i>
     A Meulin and Kurloz fansong. From its light-hearted and delicate beginning, it transitions into the mysterious sounds of an abandoned carnival. Out of the darkness, there rises an oblivious bliss, framed perfectly with the hint of a silent skeletal smile.
@@ -1154,6 +1151,9 @@ Commentary: |-
     A cheerful interaction between friends—or is it? My goal for this image is to show the insidious nature of Meulin and Kurloz's seemingly innocent relationship. Among the static lies a corrupted carnival abandoned years before, or perhaps never used? Unaware of the dark tendrils surrounding her, Meulin falls under the spell of her former matesprit's chucklevoodoo. Behind the stitches a menacing smile appears; in the distance, a silent prayer is lifted.
 Cover Artists:
 - Ann-Marie Blackington
+Referenced Tracks:
+- Homestuck Anthem
+- track:harlequin
 ---
 Track: 7UR8UL3N7 coll4bor4t1on
 Artist: laptopStrummer
@@ -1250,10 +1250,6 @@ Art Tags:
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/curly-fury
 - https://youtu.be/tuLKm2sEohQ
-References:
-- Blackest Heart
-- Purple Tyrant
-- Purple Bard
 Commentary: |-
     <i>laptopStrummer:</i>
     For Kurloz, I wanted a song that begins and ends with silence. I borrowed the melodic theme from Blackest Heart (and Purple Bard and Purple Tyrant aswell, those are all Makara-themed songs) and played wtih it. I couldn't resist to put some of my (dare I say signature ?) stellar samples for the ambient outra. So some of the sounds actually come from space ! Thank you for listening. Cheers !
@@ -1261,6 +1257,10 @@ Commentary: |-
     when i listened to the song, and saw its title, the only thing that came to me was the "vast honk" or how kurloz sewed his mouth, i wanted this drawing to more or less show how kurloz was then (after he sewed it) and at the vast honk. i hope you like the drawing!
 Cover Artists:
 - Sam Garcia
+Referenced Tracks:
+- Blackest Heart
+- Purple Tyrant
+- Purple Bard
 ---
 Track: The Light Forms Us
 Artist: Blackhole
@@ -1271,8 +1271,6 @@ Art Tags:
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/the-light-forms-us
 - https://youtu.be/cMYKgpKfI7Q
-References:
-- track:let-me-dance-let-me-glisten
 Commentary: |-
     <i>Blackhole:</i>
     This song was born out of a desire to remix the theme from Flutterwhat's fantastic "Let Me Dance, Let me glisten", one of the earliest tracks we received for the album. That song is about Porrim, and incorporates ideas of her radiance as a rainbow drinker, and so I had those images in my mind when I was putting this song together. However, for my own spin on the LMDLMG leitmotif, I wanted to give the track a broader meaning, so I decided to turn this into a song about the Green Sun, and how its light shines through the furthest ring and presides over the Beforan session (and many others). I used a similar set of sounds to those which I incorporated into [[Formant (Sprite Chorus Mix)]], the eponymous Formant synth common in both tracks always having given me the feeling of radiant light.
@@ -1280,6 +1278,8 @@ Commentary: |-
     The track is nominally about the Green Sun, but the inclusion of the main leitmotif in Porrim's principal track links the Sun to Porrim specifically. I found that an interesting relationship and decided to explore it in the track art. This track gives me a strong ethereal cosmic vibe; to match that, I drew Porrim basking in the glrious light of the Green Sun, which fills half the sky even though it lies beyond the universe, indicating its power and importance. Deep magenta seemed like the perfect colour to pair with the sun's green.
 Cover Artists:
 - Circlejourney
+Referenced Tracks:
+- track:let-me-dance-let-me-glisten
 ---
 Track: Fortune Fins
 Artist: rest✩taurus
@@ -1306,8 +1306,6 @@ Art Tags:
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/thief-of-the-ring
 - https://youtu.be/XgP5iCtN_HQ
-References:
-- Carne Vale
 Commentary: |-
     <i>The One Music Maniac:</i>
     "Thief of the Ring" is a pre-GAME OVER themed composition that covers Aranea's selfish motives &amp; how it caused the imapct of GAME OVER, including: possessing Gamzee to steal the ring from John, almost forcing a kiss on Jake, forcing Jake to use his Hope power, killing Jade, getting angry because John promised the ring would be for Calliope, forcing Roxy to sleep, having to fight Brain Ghost Dirk as he rips her soul out of her body, and causing Jane's vengeance for the death of her ectobiological granddaughter.
@@ -1315,6 +1313,8 @@ Commentary: |-
     The music, with its beat, and of course its theme that ties into GAME OVER, I naturally went towards bold colors and contrast- which is actually a staple of my art! I focused on the motif of the ring itself, and Aranea's life/death, giving her one dead eye and one living eye, split by the shadows. The ring itself is incorporated into her seven pupils, and the circular overlays.
 Cover Artists:
 - Gillian Pascasio
+Referenced Tracks:
+- Carne Vale
 ---
 Track: In the Light
 Artist: slitherbot
@@ -1385,9 +1385,6 @@ Art Tags:
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/beforus
 - https://youtu.be/W80-xaGbZUw
-References:
-- Featherlight
-- Theme
 Commentary: |-
     <i>Toris Crow:</i>
     Early last year, I wrote a song called "Featherlight." This is an extended and improved version of it made exclusively for the Beforus Album project and will not appear in any of my own albums. It serves as a mirror for the song [[Alternia]] in the album "AlterniaBound." This song is dedicated to Not-Terezi-Pyrope (Blackhole) for making this project possible.
@@ -1397,6 +1394,9 @@ Commentary: |-
     Aranea once referred to the Green Moon as a "large(r) green interloper" that had never belonged to her world. Thus Beforus is represented by the Pink Moon standing alone in the sky; the Beforan players contemplate it from a tree branch of one of the Pyrope's forest. Is this a night before the end? A dreambubble illusion? As the track art for the last song on disk 2, the ambiguity seemed fitting. One way or another, it's now nothing more than a bittersweet recollection of simpler times.
 Cover Artists:
 - Elanor Pam
+Referenced Tracks:
+- Featherlight
+- Theme
 ---
 Group: Disc 3
 ---
@@ -1455,8 +1455,6 @@ Art Tags:
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/burgundy-revenge
 - https://youtu.be/J3tLIpRbjNI
-References:
-- English
 Commentary: |-
     <i>Mathias Ramalho:</i>
     A Damara Megido song, focused on her hate against her archrival and an excellent host. It took me 6 hours and is based off Meenah's and Doc Scratch's songs.
@@ -1464,6 +1462,8 @@ Commentary: |-
     Conceding to the original track artist's commentary, this piece was made to represent a strife between Meenah and Damara. Burgundy Revenge to me was a very creepy and atmospheric track so I decided to set it in a black and smoky enviornment.
 Cover Artists:
 - smear
+Referenced Tracks:
+- English
 ---
 Track: '#problematicfave'
 Artist: theh0nestman
@@ -1507,8 +1507,6 @@ Art Tags:
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/puppeteer
 - https://youtu.be/TUj3E7oOxO4
-References:
-- track:sburban-jungle
 Lyrics: |-
     Hello my darling dear<br>I’ve always been right here<br>Waiting for you, waiting for you<br>What’s that, my darling dear?<br>Suddenly I can’t hear you<br>Cat got your tongue?
     Puppeteer, puppeteer<br>There’s no need to fear<br>Puppeteer, puppeteer<br>You're my love, the one I hold so dear
@@ -1529,6 +1527,8 @@ Commentary: |-
     Give up your mind and jump into the void.
 Cover Artists:
 - Vanessa Auqué
+Referenced Tracks:
+- track:sburban-jungle
 ---
 Track: Cardinal Movement
 Artist: rest✩taurus
@@ -1555,8 +1555,6 @@ Art Tags:
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/anacronus
 - https://youtu.be/RhgUdG-yskI
-References:
-- Flare
 Commentary: |-
     <i>Laurent Désautels-Séguin:</i>
     Anacronus is a song about "what if Cronus was an 80's cop". So the song is inspired by artists like Waveshaper and Infinity Shred. At first, there was supposed to have drums in the song, but I found the sound to be more wide, threating and John Carpenter-esque. In the middle part, I quoted Flare by Plazmataz because why not. I made all the sounds with NI Massive. // When I heard about the project, I wanted to do a cool Cronus track... except that he's not really cool. So I made him an 80's cop. I tried to do something like John Carpenter: epic, dangerous and a lot of arpeggios.
@@ -1564,6 +1562,8 @@ Commentary: |-
     I read that it was supposed to be 80's cop Cronus and played around for a little bit with that. The theme sounds dark and emotional, which rpompted me to, humorously, think about that meme where a person is on a stool with a microphone and has faded versions of their face around. Obviously I didn't do that here, but the more I thought about it seriously, the mroe I thought it'd fit.
 Cover Artists:
 - rockytoad
+Referenced Tracks:
+- Flare
 ---
 Track: Madam Firefly
 Artist: violasarecool
@@ -1573,9 +1573,6 @@ Art Tags:
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/madam-firefly
 - https://youtu.be/VLX6-E5bXy4
-References:
-- Homestuck Anthem
-- track:skies-of-skaia
 Lyrics: |-
     Madam Firefly,<br>Blinking in the sky,<br>Swim through the stars to find your place,<br>You're wandering through endless space.
     Tricky little bug,<br>Tend to your mother grub,<br>Don't worry 'bout the pink and blue,<br>'cause green is all you ever knew,
@@ -1590,12 +1587,13 @@ Commentary: |-
     I enjoyed making this piece since Porrim and I share the same zodiac sign and I already think she's gorgeous. I focused on the mood of the song (and how the sound of the vocals made me feel) more so than the lyrics, and tried to capture those moods in this picture. Listening to the track was comforting and felt... warm. I was glad the composer intended to take a lighter aesthetic approach, because that was something I could eaisly match.
 Cover Artists:
 - magnoliajades
+Referenced Tracks:
+- Homestuck Anthem
+- track:skies-of-skaia
 ---
 Track: 7UN3 R3M1X
 Artist: Princezz
 Duration: '3:09'
-References:
-- 7UN3
 Art Tags:
 - Mituna
 URLs:
@@ -1608,12 +1606,12 @@ Commentary: |-
     It was mostly inspired by the track's mroe distorted sound effects and its playful melody. It's definitely a catchy tune and I found myself humming around while drawing this so I hope I did the composer some justice! I'm glad I got assigned a Mituna song because I've never actually drawn him and it was a lot of fun hahaa//
 Cover Artists:
 - shu
+Referenced Tracks:
+- 7UN3
 ---
 Track: East Beforan Funk
 Artist: Blackhole, The D
 Duration: '4:46'
-References:
-- Uptown Funk
 Art Tags:
 - Rufioh
 - Damara
@@ -1644,6 +1642,8 @@ Commentary: |-
     I figured that a parody of a real song deserved parody album artwork to match, so of course I ended up Funkifying Rifoh and Damara and mimicking the actual Uptown Funk album artwork. Considering the state that we saw Damara and Rufioh in Openbound, it was kinda nice to be able to draw them from a time when they were having lighthearted fun together!
 Cover Artists:
 - memento vivere
+Referenced Tracks:
+- Uptown Funk
 ---
 Track: Rex Duodecim Daemonia X (ReDuX)
 Artist: Veritas Unae
@@ -1662,7 +1662,19 @@ Art Tags:
 - Kurloz
 - Cronus
 - Meenah
-References:
+URLs:
+- https://unofficialmspafans.bandcamp.com/track/rex-duodecim-daemonia-x-redux
+- https://youtu.be/Cve3V9NnEPE
+Commentary: |-
+    <i>Veritas Unae:</i>
+    This piece... I don't think I've ever had a chance to write anything like it. It was insanely challenging, least of all trying to find some way to fit in all of the principal tracks. I've tried my best to include something that sort of sounds close to each of the tracks while telling a story, but I apologise if it's not exactly what or as much as you expect.
+    The King Awakens. Kankri's Rally. Horuss and Rufioh's Attempt. Meulin and Kurloz's Carnival. Damara, Centre Stage. Retaliation and Aranea's Failure. Porrim's Glow. Cronus's Final Stand. Mituna and Latula's Efforts. Aranea's Return. Meenah's Finale.
+    I could spend a while talking about this so I'll just note a few things: Kurloz mimics RDA like Gamzee did. Aranea attempts to make a big show against the king around 4.33, but fails (Porrim steps up to help after this). The Thirteenth Hour appears at the end of the Mituna/Latula section as well. It's something "ve always wanted to reference in a track and seemed appropriate for thsi song that was literally finished in the last hours of the project. I hope you've enjoyed this album as much as I enjoyed spending several long nights toiling over this piece.
+    <i>HermesNitram:</i>
+    The fight with the Black King is surely one of the most exciting parts of the game, and I tried to show the spirit of the fight that each Beforus troll would have. The order of trolls on the picture follows the track, and each one has been assigned the most possible fitting weapon that would help them fight the Black King. In order of appearance: Kankri (Social Justice speech), Horuss (untamed strength of bare fists), Rufioh (spear and shield), Kurlzo (chucklevoodoos and needle with thread), Meulin (written fanfiction), Damara (wands), Porrim (glow and the Gigli chainsaw), Cronus (Ahab's Crosshairs), Mituna & Latula (Troll Playstation), Aranea (dice and Mindfang's sword), and Meenah (2x3dent). The visualization of Black King is left to the imagination of the audience.
+Cover Artists:
+- HermesNitram
+Referenced Tracks:
 - Rex Duodecim Angelus
 - ♋ - Civil Discussi9n
 - ♐ - Creeping Blue
@@ -1677,18 +1689,6 @@ References:
 - ♊ - The Mituna Method
 - The Thirteenth Hour
 - ♓ - Killer Beach
-URLs:
-- https://unofficialmspafans.bandcamp.com/track/rex-duodecim-daemonia-x-redux
-- https://youtu.be/Cve3V9NnEPE
-Commentary: |-
-    <i>Veritas Unae:</i>
-    This piece... I don't think I've ever had a chance to write anything like it. It was insanely challenging, least of all trying to find some way to fit in all of the principal tracks. I've tried my best to include something that sort of sounds close to each of the tracks while telling a story, but I apologise if it's not exactly what or as much as you expect.
-    The King Awakens. Kankri's Rally. Horuss and Rufioh's Attempt. Meulin and Kurloz's Carnival. Damara, Centre Stage. Retaliation and Aranea's Failure. Porrim's Glow. Cronus's Final Stand. Mituna and Latula's Efforts. Aranea's Return. Meenah's Finale.
-    I could spend a while talking about this so I'll just note a few things: Kurloz mimics RDA like Gamzee did. Aranea attempts to make a big show against the king around 4.33, but fails (Porrim steps up to help after this). The Thirteenth Hour appears at the end of the Mituna/Latula section as well. It's something "ve always wanted to reference in a track and seemed appropriate for thsi song that was literally finished in the last hours of the project. I hope you've enjoyed this album as much as I enjoyed spending several long nights toiling over this piece.
-    <i>HermesNitram:</i>
-    The fight with the Black King is surely one of the most exciting parts of the game, and I tried to show the spirit of the fight that each Beforus troll would have. The order of trolls on the picture follows the track, and each one has been assigned the most possible fitting weapon that would help them fight the Black King. In order of appearance: Kankri (Social Justice speech), Horuss (untamed strength of bare fists), Rufioh (spear and shield), Kurlzo (chucklevoodoos and needle with thread), Meulin (written fanfiction), Damara (wands), Porrim (glow and the Gigli chainsaw), Cronus (Ahab's Crosshairs), Mituna & Latula (Troll Playstation), Aranea (dice and Mindfang's sword), and Meenah (2x3dent). The visualization of Black King is left to the imagination of the audience.
-Cover Artists:
-- HermesNitram
 ---
 Track: Motions of Infinity
 Artist: Toris Crow
diff --git a/album/beyond-canon.yaml b/album/beyond-canon.yaml
index 5b632604..4179cc01 100644
--- a/album/beyond-canon.yaml
+++ b/album/beyond-canon.yaml
@@ -1,7 +1,6 @@
 Album: Beyond Canon
 Date: April 13, 2020
 Date Added: April 13, 2020
-Track Art Date: June 1, 2020
 Color: '#f2a400'
 Groups:
 - Official
@@ -30,6 +29,7 @@ Commentary: |-
     <img src="media/misc/beyond-canon-bonus3.jpg" width="1400" height="1400">
 Cover Artists:
 - Xamag
+Default Track Cover Art Date: June 1, 2020
 ---
 Track: exclusion zone
 Artist: horizon
@@ -69,8 +69,6 @@ Art Tags:
 URLs:
 - https://homestuck.bandcamp.com/track/now-im-a-villain
 - https://youtu.be/-CbjEPNFCqQ
-References:
-- track:showtime-original-mix
 Commentary: |-
     <i>David Ellis:</i>
     (<a href="https://twitter.com/Ducksual/status/1249782135688437761">Twitter</a>)
@@ -79,6 +77,8 @@ Commentary: |-
     <img src="media/misc/now-im-a-villain-wip.jpg" width="981" height="939">
 Cover Artists:
 - Jas
+Referenced Tracks:
+- track:showtime-original-mix
 ---
 Track: Cosmic Carousel
 Artist: polysaw
@@ -104,8 +104,6 @@ Cover Artists:
 Track: Surprise, We're Back
 Artist: Sean Gorter
 Duration: '5:21'
-References:
-- End of Act
 Art Tags:
 - John
 - Rose
@@ -140,6 +138,8 @@ Commentary: |-
     <img src="media/misc/surprise-were-back-wip3.jpg" width="605" height="606">
 Cover Artists:
 - D'paq
+Referenced Tracks:
+- End of Act
 ---
 Track: SPLIT REALITY
 Artist: Xauric
@@ -147,8 +147,6 @@ Duration: '5:06'
 URLs:
 - https://homestuck.bandcamp.com/track/split-reality
 - https://youtu.be/XzZ7PNmcHiU
-References:
-- Alphamatic Replacement
 Commentary: |-
     <i>Xauric:</i>
     (<a href="https://twitter.com/Xauric/status/1249774701691301894">Twitter</a>)
@@ -166,6 +164,8 @@ Commentary: |-
     <img src="media/misc/split-reality-wip.jpg" width="664" height="664">
 Cover Artists:
 - Gastlu
+Referenced Tracks:
+- Alphamatic Replacement
 ---
 Track: Assembly
 Artist: Erik Scheele
@@ -432,8 +432,6 @@ Cover Artists:
 Track: Four Kids (and a Game They Played Together)
 Artist: Robert J! Lake
 Duration: '4:13'
-References:
-- Four Kids and a Game They Play Together
 Art Tags:
 - John
 - Rose
@@ -489,6 +487,8 @@ Commentary: |-
     <img src="media/misc/four-kids-and-a-game-they-played-together-wip3.jpg" width="441" height="441">
 Cover Artists:
 - star-nomad
+Referenced Tracks:
+- Four Kids and a Game They Play Together
 ---
 Track: crystal hung in firmament's descent
 Artist: Emelia K.
diff --git a/album/cherubim.yaml b/album/cherubim.yaml
index aea7542e..de0afeca 100644
--- a/album/cherubim.yaml
+++ b/album/cherubim.yaml
@@ -1,6 +1,4 @@
 Album: Cherubim
-Banner Art:
-- Shelby Cragg
 Banner Dimensions: 1100x203
 Date: March 14, 2013
 Date Added: November 15, 2019
@@ -21,6 +19,8 @@ Commentary: |-
 Cover Artists:
 - Kait Linney (lines)
 - Shelby Cragg (coloring & logo)
+Banner Artists:
+- Shelby Cragg
 ---
 Track: Reverie
 Artist: Alex Rosetti
@@ -40,8 +40,6 @@ Cover Artists:
 Track: Power Fantasy
 Artist: Clark Powell
 Duration: '4:22'
-References:
-- Reverie
 Art Tags:
 - Caliborn
 URLs:
@@ -49,6 +47,8 @@ URLs:
 - https://youtu.be/5adGTghTECM
 Cover Artists:
 - Indolentjellyfish
+Referenced Tracks:
+- Reverie
 ---
 Track: Stellarum Salve
 Artist: Robert J! Lake
@@ -68,10 +68,6 @@ Cover Artists:
 Track: Carne Vale
 Artist: Malcolm Brown
 Duration: '4:23'
-References:
-- Stellarum Salve
-- English
-- Eternity Served Cold
 Art Tags:
 - Caliborn
 - Jane
@@ -107,12 +103,14 @@ Commentary: |-
     And that’s Carne Vale.  An angry little shout from a little green, malevolent angel-baby. Grr. Argh.
 Cover Artists:
 - Leslie Hung
+Referenced Tracks:
+- Stellarum Salve
+- English
+- Eternity Served Cold
 ---
 Track: Green Lolly
 Artist: James Dever, Robert J! Lake
 Duration: '4:11'
-References:
-- The Uranian
 Art Tags:
 - Calliope
 URLs:
@@ -123,12 +121,12 @@ Contributors:
 - Robert J! Lake (arrangement, production)
 Cover Artists:
 - Brianne
+Referenced Tracks:
+- The Uranian
 ---
 Track: Red Sucker
 Artist: James Dever, Robert J! Lake
 Duration: '3:44'
-References:
-- The Undying
 Art Tags:
 - Caliborn
 URLs:
@@ -139,6 +137,8 @@ Contributors:
 - Robert J! Lake (arrangement, production)
 Cover Artists:
 - Dana Smart
+Referenced Tracks:
+- The Undying
 ---
 Track: Constant Confinement
 Artist: Erik Scheele
@@ -154,9 +154,6 @@ Cover Artists:
 Track: Constant Conquest
 Artist: Michael Guy Bowman
 Duration: '4:46'
-References:
-- Constant Confinement
-- track:doctor
 Art Tags:
 - Caliborn
 URLs:
@@ -170,6 +167,9 @@ Commentary: |-
     What really sealed in the atmosphere of this track was the huge slather of pads that adorned the track, most of which were created using analog equipment. I fed the signal from an old Radio Shack keyboard with basic midi patches through a pawn shop guitar pedal to create the many layers of sound that fill the background. Some of the most excellent sounds on the track (especially that snarling synth at 2:57) were created by hammering the mod knobs and wah-wah pedal while playing atonal pitches. The result is distorted synth excellence.
 Cover Artists:
 - Elly Beck
+Referenced Tracks:
+- Constant Confinement
+- track:doctor
 ---
 Track: The Lyrist
 Artist: Thomas Ferkol
@@ -185,9 +185,6 @@ Cover Artists:
 Track: The Lordling
 Artist: Toby Fox
 Duration: '2:51'
-References:
-- The Lyrist
-- Flowey's Laugh
 Art Tags:
 - Caliborn
 URLs:
@@ -195,6 +192,9 @@ URLs:
 - https://youtu.be/nLrChSME0T8
 Cover Artists:
 - rumminov
+Referenced Tracks:
+- The Lyrist
+- Flowey's Laugh
 ---
 Track: Eternity Served Cold
 Artist: Malcolm Brown
@@ -205,15 +205,6 @@ Art Tags:
 URLs:
 - https://homestuck.bandcamp.com/track/eternity-served-cold-2
 - https://youtu.be/wg9jows9Yfo
-References:
-- track:sburban-jungle
-- English
-- track:revelawesome
-- Black Rose / Green Sun
-- track:endless-climb
-- track:ruins
-- Penumbra Phantasm
-- track:doctor
 Commentary: |-
     <i>Malcolm Brown:</i>
     First off, a thanks to the folk who enjoyed EsC.
@@ -271,3 +262,12 @@ Commentary: |-
     honk HONK.
 Cover Artists:
 - rennerei
+Referenced Tracks:
+- track:sburban-jungle
+- English
+- track:revelawesome
+- Black Rose / Green Sun
+- track:endless-climb
+- track:ruins
+- Penumbra Phantasm
+- track:doctor
diff --git a/album/class-act-b-side.yaml b/album/class-act-b-side.yaml
index 0b96bc66..6280d865 100644
--- a/album/class-act-b-side.yaml
+++ b/album/class-act-b-side.yaml
@@ -2,8 +2,6 @@ Album: CLASS ACT (B Side)
 Artist: Funk McLovin
 Date: August 31, 2020 12:00:00
 Date Added: April 12, 2021
-Banner Art:
-- Funk McLovin
 Banner Dimensions: 975x180
 Has Track Art: false
 Color: '#facab6'
@@ -14,74 +12,76 @@ URLs:
 - https://funkmclovin.bandcamp.com/album/class-act-b-side
 Cover Artists:
 - Funk McLovin
+Banner Artists:
+- Funk McLovin
 ---
 Track: Accept My Shaft
 Duration: '3:45'
-References:
-- track:accept-my-shaft-nsp
 URLs:
 - https://funkmclovin.bandcamp.com/track/accept-my-shaft
 - https://www.youtube.com/watch?v=IDt2HHrjqC0
+Referenced Tracks:
+- track:accept-my-shaft-nsp
 ---
 Track: Get It On
 Duration: '2:33'
-References:
-- track:get-it-on-chase
 URLs:
 - https://funkmclovin.bandcamp.com/track/get-it-on
 - https://www.youtube.com/watch?v=TALiw8ahfzA
+Referenced Tracks:
+- track:get-it-on-chase
 ---
 Track: LAWNMOWER
 Duration: '2:06'
-References:
-- track:lawnmower-lemon-demon
 URLs:
 - https://funkmclovin.bandcamp.com/track/lawnmower
 - https://www.youtube.com/watch?v=eOxJH4XCHjE
+Referenced Tracks:
+- track:lawnmower-lemon-demon
 ---
 Track: Lonely Rolling Star (English)
 Duration: '5:38'
-References:
-- Lonely Rolling Star
 URLs:
 - https://funkmclovin.bandcamp.com/track/lonely-rolling-star-english
 - https://www.youtube.com/watch?v=Vt4VSTqOUdg
+Referenced Tracks:
+- Lonely Rolling Star
 ---
 Track: Hey Baby
 Duration: '2:01'
-References:
-- track:hey-baby-bruce-channel
 URLs:
 - https://funkmclovin.bandcamp.com/track/hey-baby
 - https://www.youtube.com/watch?v=r7RbFsG2TOg
+Referenced Tracks:
+- track:hey-baby-bruce-channel
 ---
 Track: Fever
 Duration: '3:13'
-References:
-- track:fever-cooley-blackwell
 URLs:
 - https://funkmclovin.bandcamp.com/track/fever
 - https://www.youtube.com/watch?v=gBaWWnmNtNU
+Referenced Tracks:
+- track:fever-cooley-blackwell
 ---
 Track: Man of Constant Sorrow
 Duration: '2:56'
-References:
-- track:man-of-constant-sorrow-o-brother
 URLs:
 - https://funkmclovin.bandcamp.com/track/man-of-constant-sorrow
 - https://www.youtube.com/watch?v=mKyqO5LIw6w
+Referenced Tracks:
+- track:man-of-constant-sorrow-o-brother
 ---
 Track: Teenagers
 Duration: '2:04'
-References:
-- track:teenagers-mcr
 URLs:
 - https://funkmclovin.bandcamp.com/track/teenagers
 - https://www.youtube.com/watch?v=s9a-ddeXY80
+Referenced Tracks:
+- track:teenagers-mcr
 ---
 Track: Rainbow Connection
 Duration: '2:51'
-References:
-- track:rainbow-connection-muppets
 URLs:
 - https://funkmclovin.bandcamp.com/track/rainbow-connection
+Referenced Tracks:
+- track:rainbow-connection-muppets
diff --git a/album/class-act.yaml b/album/class-act.yaml
index fb30f8b9..beb07c17 100644
--- a/album/class-act.yaml
+++ b/album/class-act.yaml
@@ -2,8 +2,6 @@ Album: CLASS ACT
 Artist: Funk McLovin
 Date: August 31, 2020 12:00:01
 Date Added: April 12, 2021
-Banner Art:
-- Funk McLovin
 Banner Dimensions: 975x180
 Has Track Art: false
 Color: '#ff1e47'
@@ -14,6 +12,8 @@ URLs:
 - https://funkmclovin.bandcamp.com/album/class-act
 Cover Artists:
 - Funk McLovin
+Banner Artists:
+- Funk McLovin
 ---
 Track: New Year Boogie
 Duration: '2:16'
diff --git a/album/coloUrs-and-mayhem-universe-a.yaml b/album/coloUrs-and-mayhem-universe-a.yaml
index c89b126d..9372178b 100644
--- a/album/coloUrs-and-mayhem-universe-a.yaml
+++ b/album/coloUrs-and-mayhem-universe-a.yaml
@@ -1,8 +1,5 @@
 Album: 'coloUrs and mayhem: Universe A'
 Directory: coloUrs-and-mayhem-universe-a
-Banner Art:
-- Shelby Cragg
-- Niklink (edits for wiki)
 Banner Dimensions: 1100x180
 Date: April 2, 2012
 Date Added: November 15, 2019
@@ -30,19 +27,22 @@ Cover Artists:
 Wallpaper Artists:
 - Shelby Cragg
 - Niklink (edits for wiki)
+Banner Artists:
+- Shelby Cragg
+- Niklink (edits for wiki)
 ---
 Group: Side 1
 ---
 Track: ~~SIDE 1~~
 Artist: Toby Fox
 Duration: 0:09
-References:
-- Liquid Negrocity
 Directory: side-1-universe-a
 URLs:
 - https://homestuck.bandcamp.com/track/universe-a-side-1
 - https://youtu.be/l9hqTE7FCu8
 Has Cover Art: false
+Referenced Tracks:
+- Liquid Negrocity
 ---
 Track: Rust Servant
 Artist: Willow Ascenzo
@@ -169,8 +169,6 @@ Cover Artists:
 ---
 Track: Cobalt Corsair
 Artist: Max Wright
-References:
-- Hallowed Halls
 Duration: '4:14'
 Art Tags:
 - Mindfang
@@ -192,6 +190,8 @@ Commentary: |-
     BRASS | STRINGS | WOODWIND | PERCUSSION AND MISCELLANEOUS <i>(dead dropbox links)</i>
 Cover Artists:
 - Grue
+Referenced Tracks:
+- Hallowed Halls
 ---
 Track: Indigo Archer
 Artist: Rachel Rose Mitchell
@@ -217,8 +217,6 @@ Cover Artists:
 Track: Violet Mariner
 Artist: Willow Ascenzo
 Duration: '2:45'
-References:
-- track:showtime-piano-refrain
 Art Tags:
 - Dualscar
 URLs:
@@ -231,11 +229,12 @@ Commentary: |-
     Violet Mariner was the first song I started working on for the Homestuck music contest that eventually became the coloUrs and mayhem dual album. It’s a song about Dualscar—but it wasn’t always a song about Dualscar. No, it started out as a song about John. This explains the harp/piano section, which plays with the opening melody to Showtime, vaguely darting near it without ever actually producing the exact notes from Malcolm Brown’s original song. I intended it to be more of a hint of John’s original strife theme than a direct reference. In hindsight, keeping the references to existing Homestuck leitmotifs subtle was a smart idea. If I’d been more overt in my references and just made it a straight-up Doctor remix or an explicit arrangement of Showtime, it would have been really hard to reallocate it to a different character. And I’m happy that Violet Mariner is a Dualscar song. Dualscar needs more songs. And also it gave Radiation an excuse to almost name it “Violet Seaman”. And besides, it means I still technically haven’t used the original title, Heirstrike, yet.
 Cover Artists:
 - rumminov
+Referenced Tracks:
+- track:showtime-piano-refrain
 ---
 Track: Fuchsia Ruler
 Artist: Kezinox
 Duration: '4:07'
-Refrences: Liquid Negrocity, twoward2 the heaven2
 Art Tags:
 - The Condesce
 URLs:
@@ -249,19 +248,22 @@ Commentary: |-
     This is my song entry for the Homestuck Music Contest--essentially a dark electro house song for the Condesce. On a technical level this song more or less represents the culmination of all the practice and knowledge I've gained from working with music up until now.
 Cover Artists:
 - Mel
+Referenced Tracks:
+- Liquid Negrocity
+- twoward2 the heaven2
 ---
 Group: Side 2
 ---
 Track: ~~SIDE 2~~
 Artist: Toby Fox
 Duration: 0:10
-References:
-- track:side-1-universe-a
 Directory: side-2-universe-a
 URLs:
 - https://homestuck.bandcamp.com/track/universe-a-side-2
 - https://youtu.be/4yYe9Y0zJwE
 Has Cover Art: false
+Referenced Tracks:
+- track:side-1-universe-a
 ---
 Track: Rust Maid
 Artist: Plumegeist
@@ -445,13 +447,13 @@ Group: Additional Mayhem
 Track: ~~ADDITIONAL MAYHEM~~
 Artist: Toby Fox
 Duration: 0:17
-References:
-- Double Midnight
 Directory: additional-mayhem-universe-a
 URLs:
 - https://homestuck.bandcamp.com/track/universe-a-additional-mayhem
 - https://youtu.be/_cVhbp4Z2sI
 Has Cover Art: false
+Referenced Tracks:
+- Double Midnight
 ---
 Track: Your Universe
 Artist: Marcus Carline
diff --git a/album/coloUrs-and-mayhem-universe-b.yaml b/album/coloUrs-and-mayhem-universe-b.yaml
index c40c0f8c..8b42d3ae 100644
--- a/album/coloUrs-and-mayhem-universe-b.yaml
+++ b/album/coloUrs-and-mayhem-universe-b.yaml
@@ -1,7 +1,4 @@
 Album: 'coloUrs and mayhem: Universe B'
-Banner Art:
-- Shelby Cragg
-- Niklink (edits for wiki)
 Banner Dimensions: 1100x180
 Directory: coloUrs-and-mayhem-universe-b
 Date: April 13, 2012
@@ -26,31 +23,28 @@ Cover Artists:
 Wallpaper Artists:
 - Shelby Cragg
 - Niklink (edits for wiki)
+Banner Artists:
+- Shelby Cragg
+- Niklink (edits for wiki)
 ---
 Group: Side 1
 ---
 Track: ~~SIDE 1~~
 Artist: Toby Fox
-References:
-- English
 Duration: 0:08
 Directory: side-1-universe-b
 URLs:
 - https://homestuck.bandcamp.com/track/universe-b-side-1
 - https://youtu.be/ScD8J0igQwU
 Has Cover Art: false
+Referenced Tracks:
+- English
 ---
 Track: Green Ghost
 Artist: Monobrow
 Duration: '5:58'
 Art Tags:
 - John
-References:
-- track:doctor
-- Moonsong
-- Eternal Recurrence
-- A Bell is Tolling
-- Terra's Theme
 URLs:
 - https://homestuck.bandcamp.com/track/green-ghost-2
 - https://youtu.be/nx2CqNp16IA
@@ -62,13 +56,16 @@ Commentary: |-
     Anyway, I remastered this version of the song, and added a few other elements, and instrument balance, per a couple suggestions by Radiation Fox... So you can think of this as more of a Cosmic Surgen v. 0.1...
 Cover Artists:
 - Koba
+Referenced Tracks:
+- track:doctor
+- Moonsong
+- Eternal Recurrence
+- A Bell is Tolling
+- Terra's Theme
 ---
 Track: Orchid Horror
 Artist: David DeCou
 Duration: '4:07'
-References:
-- track:chorale-for-jaspers
-- Black Rose / Green Sun
 Art Tags:
 - Rose
 URLs:
@@ -84,12 +81,13 @@ Commentary: |-
     Black Rose/Green Sun is a great song. I did use the same sort of chord progression that's in there. It shows up in a lot of Homestuck songs though I think.
 Cover Artists:
 - Sukka
+Referenced Tracks:
+- track:chorale-for-jaspers
+- Black Rose / Green Sun
 ---
 Track: Red Disc
 Artist: Nathan H.
 Duration: '2:52'
-References:
-- track:atomyk-ebonpyre
 Art Tags:
 - Dave
 URLs:
@@ -100,14 +98,14 @@ Commentary: |-
     This was the first entry I made for the contest, and likely the one that took me the longest to complete; probably because I was running into walls during transitions while trying to keep whole song congruent. Nonetheless, I think it turned out great. I had a battle between Hephaestus and Dave in mind as I wrote the piece, and took inspiration for it from the first few boss fights in the game Dark Souls.
 Cover Artists:
 - Aurum
+Referenced Tracks:
+- track:atomyk-ebonpyre
 ---
 Track: Blue Atom
 Artist: David Ellis
 Contributors:
 - Malik Refaat (alto saxophone)
 Duration: '4:46'
-References:
-- The Beginning of Something Really Excellent
 Art Tags:
 - Jade
 - Frogs
@@ -120,19 +118,21 @@ Commentary: |-
     Technical note: Sometimes when I think I’ve finished writing something I’ll find that it’s a bit too long and something needs to change, this was one of those times. The sound you hear at 3:53 is the sound of me finding a way to avoid playing an extra intro/verse and tightening up the song a bit. Using almost the same build up heard earlier in the piece and changing the resolution at the end has the added advantage of (hopefully) making you think it’s heading back towards the intro riff until the key shifts in the last bar and the song jumps straight to the final chorus.
 Cover Artists:
 - Petra K.
+Referenced Tracks:
+- The Beginning of Something Really Excellent
 ---
 Group: Side 2
 ---
 Track: ~~SIDE 2~~
 Artist: Toby Fox
 Duration: 0:13
-References:
-- track:side-1-universe-b
 Directory: side-2-universe-b
 URLs:
 - https://homestuck.bandcamp.com/track/universe-b-side-2
 - https://youtu.be/fhaFzwEZ-VI
 Has Cover Art: false
+Referenced Tracks:
+- track:side-1-universe-b
 ---
 Track: Cyan Beast
 Artist: David Ellis
@@ -155,10 +155,6 @@ Cover Artists:
 Track: Pink Cat
 Artist: Ryan Ames
 Duration: '3:52'
-References:
-- track:chorale-for-jaspers
-- track:aggrieve
-- Carefree Action
 Art Tags:
 - Roxy
 - Cats
@@ -182,6 +178,10 @@ Commentary: |-
     Wow I did not expect to type this much. Anyway this song was a blast to make and even if it’s not accepted, I still learned a whole lot! I hope you all enjoy listening to it as much as I enjoyed making it!
 Cover Artists:
 - MissNK
+Referenced Tracks:
+- track:chorale-for-jaspers
+- track:aggrieve
+- Carefree Action
 ---
 Track: Orange Hat
 Artist: Plumegeist
@@ -217,13 +217,13 @@ Group: Additional Mayhem
 Track: ~~ADDITIONAL MAYHEM~~
 Artist: Toby Fox
 Duration: 0:18
-References:
-- Jadesprite
 Directory: additional-mayhem-universe-b
 URLs:
 - https://homestuck.bandcamp.com/track/universe-b-additional-mayhem
 - https://youtu.be/GetfDAZKshg
 Has Cover Art: false
+Referenced Tracks:
+- Jadesprite
 ---
 Track: Squiddle Song
 Artist: Maya Kern
@@ -261,8 +261,6 @@ Cover Artists:
 Track: Pendulum
 Artist: Shandy
 Duration: '3:16'
-References:
-- track:sburban-jungle
 Art Tags:
 - Dave
 - 'cw: blood'
@@ -272,6 +270,8 @@ URLs:
 - https://youtu.be/Mv0zF9BRfOI
 Cover Artists:
 - Rii Abrego
+Referenced Tracks:
+- track:sburban-jungle
 ---
 Track: Pale Rapture
 Artist: The Black Curtain
@@ -287,9 +287,6 @@ Cover Artists:
 Track: Do The Windy Thing
 Artist: Brian Schaefer
 Duration: '2:45'
-References:
-- track:doctor
-- track:showtime-original-mix
 Art Tags:
 - John
 URLs:
@@ -297,12 +294,13 @@ URLs:
 - https://youtu.be/T-CliOV5-sg
 Cover Artists:
 - Emily Blundell
+Referenced Tracks:
+- track:doctor
+- track:showtime-original-mix
 ---
 Track: Pilot Light
 Artist: Thomas Ibarra
 Duration: '2:51'
-References:
-- Flare
 Art Tags:
 - Jade
 URLs:
@@ -310,6 +308,8 @@ URLs:
 - https://youtu.be/05nEUculjxM
 Cover Artists:
 - KIIPPU
+Referenced Tracks:
+- Flare
 ---
 Track: Ohgodcat
 Artist: Eligecos
@@ -366,8 +366,6 @@ Cover Artists:
 Track: Bec Noir
 Artist: Will Kommor
 Duration: '3:17'
-References:
-- Amen, Brother
 Art Tags:
 - Jack Noir
 URLs:
@@ -375,6 +373,8 @@ URLs:
 - https://youtu.be/5V-RpYzKfx8
 Cover Artists:
 - Rem
+Referenced Tracks:
+- Amen, Brother
 ---
 Track: The Vast Glub
 Artist: Kris Flacke
@@ -403,8 +403,6 @@ Cover Artists:
 Track: March of the Batterwitch
 Artist: Marcy Nabors
 Duration: '3:35'
-References:
-- track:chorale-for-jaspers
 Art Tags:
 - The Condesce
 URLs:
@@ -412,6 +410,8 @@ URLs:
 - https://youtu.be/1YyY6v87qsA
 Cover Artists:
 - Dawn Davis
+Referenced Tracks:
+- track:chorale-for-jaspers
 ---
 Track: Coolkid
 Artist: Haunter
@@ -427,10 +427,6 @@ Cover Artists:
 Track: Clockstopper
 Artist: viaSatellite, infiniteKnife
 Duration: '5:42'
-References:
-- track:beatdown-strider-style
-- track:atomyk-ebonpyre
-- track:upward-movement-dave-owns
 Art Tags:
 - Dave
 URLs:
@@ -438,6 +434,10 @@ URLs:
 - https://youtu.be/CO5IN60Nt9E
 Cover Artists:
 - Kurimja
+Referenced Tracks:
+- track:beatdown-strider-style
+- track:atomyk-ebonpyre
+- track:upward-movement-dave-owns
 ---
 Track: Dapper Dueling
 Artist: Max Wright
@@ -522,8 +522,6 @@ Cover Artists:
 Track: Rustless Fall
 Artist: Gabe Stilez
 Duration: '3:32'
-References:
-- track:endless-climb
 Art Tags:
 - Rose
 - Horrorterrors
@@ -532,6 +530,8 @@ URLs:
 - https://youtu.be/YDzxho9uztI
 Cover Artists:
 - Kadi Fedoruk
+Referenced Tracks:
+- track:endless-climb
 ---
 Track: Pipeorgankind
 Artist: James Roach
@@ -541,15 +541,6 @@ Art Tags:
 URLs:
 - https://homestuck.bandcamp.com/track/pipeorgankind-2
 - https://youtu.be/hTpm_sDz62M
-References:
-- track:showtime-original-mix
-- Warhammer of Zillyhoo
-- track:explore
-- Liquid Negrocity
-- track:doctor
-- Lifdoff
-- track:harlequin
-- Toccata and Fugue in D minor
 Commentary: |-
     <i>James Roach:</i>
     As a lot of you know, my track Pipeorgankind was featured in last night's Flash! I used melodies and themes from several talented musicians to create this track, and orchestrated/arranged them for fun! I never thought it would become anything!
@@ -569,3 +560,12 @@ Commentary: |-
     Thanks for all the overwhelming encouragement and support! I wouldn’t be here without you guys!
 Cover Artists:
 - VickyBit
+Referenced Tracks:
+- track:showtime-original-mix
+- Warhammer of Zillyhoo
+- track:explore
+- Liquid Negrocity
+- track:doctor
+- Lifdoff
+- track:harlequin
+- Toccata and Fugue in D minor
diff --git a/album/cosmic-caretakers.yaml b/album/cosmic-caretakers.yaml
index 568ec5bc..2bd3b13a 100644
--- a/album/cosmic-caretakers.yaml
+++ b/album/cosmic-caretakers.yaml
@@ -1,6 +1,4 @@
 Album: Cosmic Caretakers
-Banner Art:
-- melodiousDiscord
 Banner Dimensions: 1100x180
 Date: February 17, 2019
 Date Added: January 12, 2021
@@ -50,6 +48,8 @@ Cover Artists:
 - Elanor Pam
 Wallpaper Artists:
 - Elanor Pam
+Banner Artists:
+- melodiousDiscord
 ---
 Group: Disc 1
 ---
@@ -71,8 +71,6 @@ Cover Artists:
 Track: Egbert's Kitchen
 Artist: Pascal van den Bos
 Duration: '3:01'
-References:
-- track:under-the-hat
 Art Tags:
 - John's dad
 - Underlings
@@ -86,13 +84,12 @@ Commentary: |-
     I want this dad to be my dad.
 Cover Artists:
 - trip
+Referenced Tracks:
+- track:under-the-hat
 ---
 Track: Nanna's New Groove
 Artist: ndividedbyzero
 Duration: '3:48'
-References:
-- Homestuck Anthem
-- track:nannaquin
 Art Tags:
 - John's nanna
 URLs:
@@ -107,6 +104,9 @@ Commentary: |-
     in this household we stan Jane Crocker/Nanna Egbert.
 Cover Artists:
 - TheChaoMaster
+Referenced Tracks:
+- Homestuck Anthem
+- track:nannaquin
 ---
 Track: Martini Cardamom
 Artist: Sean Gorter, PoisonedElite
@@ -133,9 +133,6 @@ Artist: Chaosvariant
 Duration: '2:38'
 Art Tags:
 - Dave's bro
-References:
-- track:beatdown-strider-style
-- Umbral Ultimatum
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/meteor-schmeteor-ill-cut-that-thing-right-in-half
 - https://youtu.be/aYC3XRHFOkQ
@@ -148,14 +145,13 @@ Commentary: |-
     i really like how i did this one. not too much going on but i feel its good for how simple it is. drawing the meteor took a bit of work, and looking at some reference shots from descend, but it really came together, and of course the sense of scale given with bro and the meteor is very well executed id say. pretty much flawless except for the fire which i couldve done better.
 Cover Artists:
 - ackro
+Referenced Tracks:
+- track:beatdown-strider-style
+- Umbral Ultimatum
 ---
 Track: Hunting the Most Dangerous Game
 Artist: Kanishka
 Duration: '3:30'
-References:
-- A Taste for Adventure
-- track:dissension-remix
-- track:old-secret
 Art Tags:
 - Jade's grandpa
 - Becquerel
@@ -170,6 +166,10 @@ Commentary: |-
     i accidentally listened to bec's song instead of grandpa's song (wow well done me), so i HAD to include dogs. but i wanted the image to live up to this song's title. you can see my thought process here. besides which you can see the <i>true danger</i> that grandpa must have put himself in expressed here with his lack of pants. anyway i wanted the animals to all look vaguely real, so i spent a lot of time looking up pictures of them while drawing. i was heavily inspired by hiveswap and the photo frames of grandpa in his past, and wanted to draw a silly looking hunting scenario that could fill the gaps of in your head. there's even a version with joey's comments scribbled on, though it was a bit too busy and standoutish. hope you enjoy [Kanishka]'s song.
 Cover Artists:
 - Tipsy
+Referenced Tracks:
+- A Taste for Adventure
+- track:dissension-remix
+- track:old-secret
 ---
 Track: Fetch That Steak
 Artist: Kusoro
@@ -191,8 +191,6 @@ Cover Artists:
 Track: Monatomic Strife
 Artist: Pascal van den Bos
 Duration: '2:15'
-References:
-- Versus
 Art Tags:
 - John's dad
 - The Felt
@@ -206,6 +204,8 @@ Commentary: |-
     This one too.
 Cover Artists:
 - trip
+Referenced Tracks:
+- Versus
 ---
 Track: Secondhand Memories
 Artist: Grace Medley
@@ -228,11 +228,6 @@ Cover Artists:
 Track: The Light's Rebellion
 Artist: Circlejourney
 Duration: '3:48'
-References:
-- The Thirteenth Hour
-- track:endless-climb
-- track:aggrieve
-- DAVE STRIDER'S COOL MIXTAPE
 Art Tags:
 - Roxy's mom
 URLs:
@@ -249,23 +244,15 @@ Commentary: |-
     Not complacent, but sure as hell learned enough to punt you down a waterfall with stabby needles.
 Cover Artists:
 - gelasticat
+Referenced Tracks:
+- The Thirteenth Hour
+- track:endless-climb
+- track:aggrieve
+- DAVE STRIDER'S COOL MIXTAPE
 ---
 Track: The Dave Strider Experience
 Artist: ndividedbyzero
 Duration: '3:54'
-References:
-- track:beatdown-strider-style
-- This Is America
-- Giorgio by Moroder
-- Bodies
-- Take Me Away
-- Running Hell
-- track:suicide-hotline-icp
-- The Witch
-- What is a Juggalo?
-- Waters of Nazareth
-- SWEET BRO AND HELLA JEFF SHOW
-- track:upward-movement-dave-owns
 Art Tags:
 - Dirk's bro
 URLs:
@@ -293,20 +280,24 @@ Lyrics: |-
     IT'S THE SWEET BRO AND HELLA JEFF SHOW! WHOAAAAAAAAa
 Cover Artists:
 - dazed-squid
+Referenced Tracks:
+- track:beatdown-strider-style
+- This Is America
+- Giorgio by Moroder
+- Bodies
+- Take Me Away
+- Running Hell
+- track:suicide-hotline-icp
+- The Witch
+- What is a Juggalo?
+- Waters of Nazareth
+- SWEET BRO AND HELLA JEFF SHOW
+- track:upward-movement-dave-owns
 ---
 Track: Jade English - Study for Eclectic Bass, 1984.1
 Directory: study-for-eclectic-bass-1984-1
 Artist: Interrobang
 Duration: '5:09'
-References:
-- Rhapsody in Green
-- track:verdancy-bassline
-- Skaianet
-- Gardener
-- track:mutiny
-- Roundabout
-- Afraid of the Darko
-- Piss
 Art Tags:
 - Jake's grandma
 URLs:
@@ -320,6 +311,15 @@ Commentary: |-
     Grandma Harley often wrote her grandson about the tyranny of Lord English, obviously not able to hide everything from the enemy.
 Cover Artists:
 - Jas
+Referenced Tracks:
+- Rhapsody in Green
+- track:verdancy-bassline
+- Skaianet
+- Gardener
+- track:mutiny
+- Roundabout
+- Afraid of the Darko
+- Piss
 ---
 Track: Felidae Superior
 Artist: WHATISLOSTINTHEMINES
@@ -340,8 +340,6 @@ Cover Artists:
 Track: Sweet Talker
 Artist: Ucklin
 Duration: '3:24'
-References:
-- Hate You
 Art Tags:
 - The Condesce
 URLs:
@@ -355,6 +353,8 @@ Commentary: |-
     This very nice track gave me vibes of a casual setting with the condesce, so I thought to draw her doing a mundane but fun task - baking! I've always liked fanart of HIC as betty crocker, doing crockery things like baking cake and raising post-scratch john/jade.
 Cover Artists:
 - nights
+Referenced Tracks:
+- Hate You
 ---
 Group: Disc 2
 ---
@@ -383,8 +383,6 @@ Cover Artists:
 Track: Voice of the Dead
 Artist: Mathias Ramalho, cookiefonster
 Duration: '2:20'
-References:
-- Aradia's Theme (Pre-Death)
 Art Tags:
 - Aradia's lusus
 - Aradia
@@ -403,12 +401,12 @@ Commentary: |-
     I love the track and wanted to try and capture the more haunting side to it.
 Cover Artists:
 - freckledOctopus
+Referenced Tracks:
+- Aradia's Theme (Pre-Death)
 ---
 Track: Flittaurine
 Artist: Shirokishi
 Duration: '2:07'
-References:
-- Rust Servant
 Art Tags:
 - Tavros' lusus
 URLs:
@@ -422,12 +420,12 @@ Commentary: |-
     Dear, sweet, precious Tinkerbull. Rest in peace my little guy.
 Cover Artists:
 - Chumi
+Referenced Tracks:
+- Rust Servant
 ---
 Track: Polypolyphemus
 Artist: Ducky Senpai
 Duration: '3:18'
-References:
-- Die For Me
 Art Tags:
 - Sollux's lusus
 URLs:
@@ -440,12 +438,12 @@ Commentary: |-
     Polypolyphemus is an intense track, so it's fitting for its art to capture the same intensity. Sollux's Biclops is captured right before its imminent demise as the troll's Mind Honey-induced flip out rips through the ceiling of his hive and surrounds the lusus in a multi-colored beam of energy. The meteors illuminating the night sky further illustrate the carnage present in the scene in a fashion that pops up time and time again in Homestuck proper. If only one of those meteors could break the chain around the Biclops' leg and set it free! Wait, the resulting impact would probably just kill the Biclops anyway. Never mind, that was a stupid idea.
 Cover Artists:
 - shu
+Referenced Tracks:
+- Die For Me
 ---
 Track: Rangoon
 Artist: WHATISLOSTINTHEMINES
 Duration: '2:03'
-References:
-- Showdown
 Art Tags:
 - Karkat's lusus
 - Karkat
@@ -459,12 +457,12 @@ Commentary: |-
     this one is pretty much just a carbon copy of a homestuck panel i found. i mean i didnt trace anything, but its all placed pretty much the same with minor differences. dont give me too much praise for this one.
 Cover Artists:
 - ackro
+Referenced Tracks:
+- Showdown
 ---
 Track: Apex Conquistador
 Artist: TempiTunes, WHATISLOSTINTHEMINES
 Duration: '1:38'
-References:
-- Nepeta's Theme
 Art Tags:
 - Nepeta's lusus
 URLs:
@@ -479,12 +477,12 @@ Commentary: |-
     Coincidentally, it's about to die because of said two-mouthed cat monster eating it. You just can't have it all, unfortunately.
 Cover Artists:
 - Sammie
+Referenced Tracks:
+- Nepeta's Theme
 ---
 Track: Recordare, Virgo Mater
 Artist: queer maggot
 Duration: '3:34'
-References:
-- Virgin Orb
 Art Tags:
 - Kanaya's lusus
 URLs:
@@ -500,12 +498,12 @@ Commentary: |-
     The Mothergrub has always been a fascinating creature to me in Homestuck, both as a part of reproduction and as a lusus. Especially since becoming a lusus means that you give up a life in the brooding caverns for a shortened existence to care for onechild. And with the Virgin Mother Grub drawing so many parallels to the iconic Holy Virgin Mary, I decided to draw my own parallels. I wanted this peice to be symbolic in nature towards the ideas and standards of the Mothergrub. It also may be a little sacrilegious in regards to the Catholic images of the Virgin Mary, but we'll just ignore that little fact. The Virgin Mothergrub floats with the brooding caverns behind her, and her new charge sleeping peacefully nearby, alongside other eggs nearly ready to hatch into trolls that will play a game and sacrifice to create something new. <s>(we're also going to ignore the fact that i may have had an out-of-body experience while working on this piece)</s>
 Cover Artists:
 - artisticallyCrafty
+Referenced Tracks:
+- Virgin Orb
 ---
 Track: Amniotic Daydream
 Artist: Circlejourney
 Duration: '4:16'
-References:
-- JUST1C3 R41NS FROM 4BOV3
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/amniotic-daydream
 - https://youtu.be/Bne6tHjEIko
@@ -519,12 +517,12 @@ Commentary: |-
     this piece is probably the most complex one i did for the album, and i think it payed off in spades. i used a lot of elements from the scene in which terezi's dragon hatches and is immediately killed by a falling meteor, which might be one of the best looking parts in homestuck, although its hard to choose since the first half of homestuck is littered with striking imagery. oh my god just look at it. so good. so fucking good guys. its really good.
 Cover Artists:
 - ackro
+Referenced Tracks:
+- JUST1C3 R41NS FROM 4BOV3
 ---
 Track: Arachnida Antecessor
 Artist: arcaneGemini
 Duration: '2:11'
-References:
-- track:MeGaLoVania
 Art Tags:
 - Vriska's lusus
 - Vriska
@@ -544,13 +542,13 @@ Commentary: |-
     I understand why hussie didn't draw spider-mom with hair on her. that took way too much time to have to do it more than once.
 Cover Artists:
 - Caitlin Beamer
+Referenced Tracks:
+- track:MeGaLoVania
 ---
 Track: STRONG Butler. Best Dad.
 Directory: STRONG-butler-best-dad
 Artist: arcaneGemini
 Duration: '3:16'
-References:
-- Horschestra STRONG Version
 Art Tags:
 - Equius's lusus
 - Equius
@@ -571,12 +569,12 @@ Commentary: |-
     For every album cover I've drawn so far, I try to make them look a little different and experiment with different styles. In this case I tried to draw a HORSE (crazy i know) and used this very painting-like flat style, and decided to put Equius's signature up, effectively making it his own painting! This went through lots of colour hue alterations and was originally a very light pink desert in a sunny sky before we settled on this darker background to make Aurthour stand out more. I like to think that Equius is simultaneously admiring his surroundings and panicking about their imminent death by sunburn.
 Cover Artists:
 - Tipsy
+Referenced Tracks:
+- Horschestra STRONG Version
 ---
 Track: Absent Reflection
 Artist: PoisonedElite
 Duration: '2:10'
-References:
-- track:dilemma
 Art Tags:
 - Gamzee
 URLs:
@@ -590,14 +588,12 @@ Commentary: |-
     Sometimes you wait a long time to see the people you love.
 Cover Artists:
 - Jas
+Referenced Tracks:
+- track:dilemma
 ---
 Track: Hippocampaternal
 Artist: FrostyMac
 Duration: '2:35'
-References:
-- Eridan's Theme
-- track:chorale-for-jaspers
-- Science Seahorse
 Art Tags:
 - Eridan's lusus
 URLs:
@@ -610,16 +606,14 @@ Commentary: |-
     Your baby crashed in on a blaze of fire, go get him seahorse daddy
 Cover Artists:
 - Jas
+Referenced Tracks:
+- Eridan's Theme
+- track:chorale-for-jaspers
+- Science Seahorse
 ---
 Track: Whispering Leviathan
 Artist: Kanishka
 Duration: '4:24'
-References:
-- Fear of the Heavens
-- Silencio
-- The Vast Glub
-- Penumbra Phantasm
-- Keepers
 Art Tags:
 - Feferi's lusus
 - Horrorterrors
@@ -634,6 +628,12 @@ Commentary: |-
     Finding the right balance between silhouette and rendering proved one of the primary challenges of completing this piece. Too much light meant the image lost its spooky, foreboding tone; too little made it look flat. In the end I came out with something that roughly strikes that balance, though I still feel that it loses some of the spookiness of the sketch. Thanks @ the good people at the Homestuck Artist discord for the tips!
 Cover Artists:
 - Circlejourney
+Referenced Tracks:
+- Fear of the Heavens
+- Silencio
+- The Vast Glub
+- Penumbra Phantasm
+- Keepers
 ---
 Track: Al-Aalam
 Artist: Kal-la-kal-la
@@ -656,13 +656,6 @@ Cover Artists:
 Track: The Puppet Master
 Artist: SplitSuns
 Duration: '4:10'
-References:
-- English
-- Afraid of the Darko
-- track:aggrieve
-- track:beatdown-strider-style
-- track:dissension-original
-- track:showtime-original-mix
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/the-puppet-master
 - https://youtu.be/hGnSgIGK6HM
@@ -674,6 +667,13 @@ Commentary: |-
 Cover Artists:
 - Ephemerald
 - yazshu
+Referenced Tracks:
+- English
+- Afraid of the Darko
+- track:aggrieve
+- track:beatdown-strider-style
+- track:dissension-original
+- track:showtime-original-mix
 ---
 Group: Disc 3
 ---
@@ -698,9 +698,6 @@ Cover Artists:
 Track: HONK FRIEND.
 Artist: Mathias Ramalho
 Duration: '4:14'
-References:
-- Reverie
-- Power Fantasy
 Art Tags:
 - Gamzee
 - Caliborn
@@ -715,15 +712,13 @@ Commentary: |-
     It's hard being a single mom when you are a teenage boy. At least Caliborn is sitting still for once.
 Cover Artists:
 - Jas
+Referenced Tracks:
+- Reverie
+- Power Fantasy
 ---
 Track: Singularity
 Artist: ndividedbyzero
 Duration: '4:55'
-References:
-- track:ruins
-- track:disc2-cosmic-caretakers
-- Nova Solis
-- Isle Unto Thyself
 Art Tags:
 - Cherubs
 URLs:
@@ -738,17 +733,17 @@ Commentary: |-
 Lyrics: Then all the planets fell to dust
 Cover Artists:
 - Aeritus
+Referenced Tracks:
+- track:ruins
+- track:disc2-cosmic-caretakers
+- Nova Solis
+- Isle Unto Thyself
 ---
 Group: Bonus tracks
 ---
 Track: It's Ogre
 Artist: Circlejourney
 Duration: '3:03'
-References:
-- All Star
-- Eridan's Theme
-- I'm A Believer
-- Violet Prince
 Art Tags:
 - Eridan
 - Shrek
@@ -762,3 +757,8 @@ Commentary: |-
     I hate myself for making this and yet
 Cover Artists:
 - Jas
+Referenced Tracks:
+- All Star
+- Eridan's Theme
+- I'm A Believer
+- Violet Prince
diff --git a/album/deltarune-ch1-ost.yaml b/album/deltarune-ch1-ost.yaml
index cba74e05..5cf7bcf6 100644
--- a/album/deltarune-ch1-ost.yaml
+++ b/album/deltarune-ch1-ost.yaml
@@ -30,21 +30,21 @@ URLs:
 Track: Beginning
 Directory: beginning-deltarune
 Duration: 0:57
-References:
-- Don't Forget
-- Once Upon a Time
 URLs:
 - https://tobyfox.bandcamp.com/track/beginning
 - https://youtu.be/OHhgmjijRWg
+Referenced Tracks:
+- Don't Forget
+- Once Upon a Time
 ---
 Track: School
 Duration: '1:20'
-References:
-- Don't Forget
-- Snowdin Town
 URLs:
 - https://tobyfox.bandcamp.com/track/school
 - https://youtu.be/MVTmvDQwX2k
+Referenced Tracks:
+- Don't Forget
+- Snowdin Town
 ---
 Track: Susie
 Duration: 0:27
@@ -54,11 +54,11 @@ URLs:
 ---
 Track: The Door
 Duration: 0:41
-References:
-- Nightmare Knight
 URLs:
 - https://tobyfox.bandcamp.com/track/the-door
 - https://youtu.be/VuM5pBqV4fM
+Referenced Tracks:
+- Nightmare Knight
 ---
 Track: Cliffs
 Duration: 0:35
@@ -68,11 +68,11 @@ URLs:
 ---
 Track: The Chase
 Duration: 0:33
-References:
-- The Door
 URLs:
 - https://tobyfox.bandcamp.com/track/the-chase
 - https://youtu.be/m9vD-_xYUwI
+Referenced Tracks:
+- The Door
 ---
 Track: The Legend
 Duration: '1:51'
@@ -89,35 +89,35 @@ URLs:
 ---
 Track: Rude Buster
 Duration: '1:15'
-References:
-- Determination
 URLs:
 - https://tobyfox.bandcamp.com/track/rude-buster
 - https://youtu.be/xYVhUjee-oM
+Referenced Tracks:
+- Determination
 ---
 Track: Empty Town
 Duration: '1:23'
-References:
-- The Legend
 URLs:
 - https://tobyfox.bandcamp.com/track/empty-town
 - https://youtu.be/MjpukFi_CW0
+Referenced Tracks:
+- The Legend
 ---
 Track: Weird Birds
 Duration: 0:16
-References:
-- One Fateful Night
 URLs:
 - https://tobyfox.bandcamp.com/track/weird-birds
 - https://youtu.be/HlcNLYnhb0w
+Referenced Tracks:
+- One Fateful Night
 ---
 Track: Field of Hopes and Dreams
 Duration: '2:41'
-References:
-- Don't Forget
 URLs:
 - https://tobyfox.bandcamp.com/track/field-of-hopes-and-dreams
 - https://youtu.be/PhhGEA_317w
+Referenced Tracks:
+- Don't Forget
 ---
 Track: Fanfare
 Directory: fanfare-deltarune
@@ -128,20 +128,20 @@ URLs:
 ---
 Track: Lantern
 Duration: '1:08'
-References:
-- The Legend
-- Determination
 URLs:
 - https://tobyfox.bandcamp.com/track/lantern
 - https://youtu.be/r9Wc9a2uD3c
+Referenced Tracks:
+- The Legend
+- Determination
 ---
 Track: I'm Very Bad
 Duration: 0:13
-References:
-- track:lancer-deltarune
 URLs:
 - https://tobyfox.bandcamp.com/track/im-very-bad
 - https://youtu.be/YetdpAvNPEc
+Referenced Tracks:
+- track:lancer-deltarune
 ---
 Track: Checker Dance
 Duration: '1:18'
@@ -151,71 +151,71 @@ URLs:
 ---
 Track: Quiet Autumn
 Duration: 0:49
-References:
-- Quiet Water
-- Scarlet Forest
 URLs:
 - https://tobyfox.bandcamp.com/track/quiet-autumn
 - https://youtu.be/Lyswkjw3U9Q
+Referenced Tracks:
+- Quiet Water
+- Scarlet Forest
 ---
 Track: Scarlet Forest
 Duration: '2:08'
-References:
-- Don't Forget
 URLs:
 - https://tobyfox.bandcamp.com/track/scarlet-forest
 - https://youtu.be/xxSpXQDOcAo
+Referenced Tracks:
+- Don't Forget
 ---
 Track: Thrash Machine
 Duration: 0:54
-References:
-- track:lancer-deltarune
 URLs:
 - https://tobyfox.bandcamp.com/track/thrash-machine
 - https://youtu.be/ONlbHu7aDNI
+Referenced Tracks:
+- track:lancer-deltarune
 ---
 Track: Vs. Lancer
 Duration: 0:42
-References:
-- track:lancer-deltarune
-- The Chase
 URLs:
 - https://tobyfox.bandcamp.com/track/vs-lancer
 - https://youtu.be/gQZxGRucsMQ
+Referenced Tracks:
+- track:lancer-deltarune
+- The Chase
 ---
 Track: Basement
 Duration: 0:27
-References:
-- Card Castle
 URLs:
 - https://tobyfox.bandcamp.com/track/basement
 - https://youtu.be/9y8UXb7KfgU
+Referenced Tracks:
+- Card Castle
 ---
 Track: Imminent Death
 Duration: 0:20
-References:
-- Your Best Nightmare
 URLs:
 - https://tobyfox.bandcamp.com/track/imminent-death
 - https://youtu.be/nedqvk48HWo
+Referenced Tracks:
+- Your Best Nightmare
 ---
 Track: Vs. Susie
 Duration: '1:21'
-References:
-- Your Best Nightmare
-- Susie
 URLs:
 - https://tobyfox.bandcamp.com/track/vs-susie
 - https://youtu.be/SBHgJzYNR6s
+Referenced Tracks:
+- Your Best Nightmare
+- Susie
 ---
 Track: Card Castle
 Duration: '1:01'
-References:
-- track:lancer-deltarune
-- Once Upon a Time
 URLs:
 - https://tobyfox.bandcamp.com/track/card-castle
 - https://youtu.be/Euc8VllYbOU
+Referenced Tracks:
+- track:lancer-deltarune
+- Once Upon a Time
 ---
 Track: Rouxls Kaard
 Duration: 0:19
@@ -243,82 +243,82 @@ URLs:
 ---
 Track: Chaos King
 Duration: '1:46'
-References:
-- Card Castle
-- track:lancer-deltarune
-- The Legend
 URLs:
 - https://tobyfox.bandcamp.com/track/chaos-king
 - https://youtu.be/fFsTQCSYY4Q
+Referenced Tracks:
+- Card Castle
+- track:lancer-deltarune
+- The Legend
 ---
 Track: Darkness Falls
 Duration: '1:06'
-References:
-- ANOTHER HIM
 URLs:
 - https://tobyfox.bandcamp.com/track/darkness-falls
 - https://youtu.be/FSn4p1Xx7NU
+Referenced Tracks:
+- ANOTHER HIM
 ---
 Track: The Circus
 Duration: 0:51
-References:
-- The Legend
 URLs:
 - https://tobyfox.bandcamp.com/track/the-circus
 - https://youtu.be/tpIkEnzGd5U
+Referenced Tracks:
+- The Legend
 ---
 Track: THE WORLD REVOLVING
 Duration: '1:41'
-References:
-- The Door
-- Don't Forget
 URLs:
 - https://tobyfox.bandcamp.com/track/the-world-revolving
 - https://youtu.be/8gkTtNefxws
+Referenced Tracks:
+- The Door
+- Don't Forget
 ---
 Track: Friendship
 Duration: '2:40'
-References:
-- Don't Forget
 URLs:
 - https://tobyfox.bandcamp.com/track/friendship
 - https://youtu.be/l5D6Nfe7AMs
+Referenced Tracks:
+- Don't Forget
 ---
 Track: THE HOLY
 Duration: 0:48
-References:
-- Determination
 URLs:
 - https://tobyfox.bandcamp.com/track/the-holy
 - https://youtu.be/1lHuP00QbMU
+Referenced Tracks:
+- Determination
 ---
 Track: Your Power
 Duration: 0:13
-References:
-- Don't Forget
 URLs:
 - https://tobyfox.bandcamp.com/track/your-power
 - https://youtu.be/hLG_tNvSHek
+Referenced Tracks:
+- Don't Forget
 ---
 Track: A Town Called Hometown
 Duration: '1:53'
-References:
-- The Legend
-- Don't Forget
-- Snowdin Town
 URLs:
 - https://tobyfox.bandcamp.com/track/a-town-called-hometown
 - https://youtu.be/HMLrsPnk7dg
+Referenced Tracks:
+- The Legend
+- Don't Forget
+- Snowdin Town
 ---
 Track: You Can Always Come Home
 Duration: '1:40'
-References:
-- track:home-undertale
-- Once Upon a Time
-- Don't Forget
 URLs:
 - https://tobyfox.bandcamp.com/track/you-can-always-come-home
 - https://youtu.be/LJ2XM3fpVQk
+Referenced Tracks:
+- track:home-undertale
+- Once Upon a Time
+- Don't Forget
 ---
 Track: Don't Forget
 Artist: Laura Shigihara, Toby Fox
@@ -333,8 +333,8 @@ Lyrics: |-
 ---
 Track: Before the Story
 Duration: '1:28'
-References:
-- Once Upon a Time
 URLs:
 - https://tobyfox.bandcamp.com/track/before-the-story
 - https://youtu.be/niSJhhpBqjU
+Referenced Tracks:
+- Once Upon a Time
diff --git a/album/desynced-vol-1.yaml b/album/desynced-vol-1.yaml
index 4e79982b..d2bc7d87 100644
--- a/album/desynced-vol-1.yaml
+++ b/album/desynced-vol-1.yaml
@@ -17,13 +17,13 @@ Track: Sunrise
 Directory: sunrise-desynced
 Artist: Pascal van den Bos
 Duration: '3:05'
-References:
-- Daughter
 URLs:
 - https://desynced.bandcamp.com/track/sunrise
 - https://www.youtube.com/watch?v=-eJntaowesQ
 Cover Artists:
 - Dizzy
+Referenced Tracks:
+- Daughter
 ---
 Track: Cutest Companion
 Artist: Pascal van den Bos
@@ -37,38 +37,38 @@ Cover Artists:
 Track: Winds of Change
 Artist: Andrew "Rainy" Obeng
 Duration: '2:43'
-References:
-- Daughter
-- Cooldown
 URLs:
 - https://desynced.bandcamp.com/track/winds-of-change
 - https://www.youtube.com/watch?v=TJc4gcozzkc
 Cover Artists:
 - Siedlag
+Referenced Tracks:
+- Daughter
+- Cooldown
 ---
 Track: Temporal Guardian
 Artist: Pascal van den Bos
 Duration: '2:32'
-References:
-- Bedelia
-- Daughter
 URLs:
 - https://desynced.bandcamp.com/track/temporal-guardian
 - https://www.youtube.com/watch?v=clrX3zdsX94
 Cover Artists:
 - Jules
+Referenced Tracks:
+- Bedelia
+- Daughter
 ---
 Track: Daughter (Short Ver.)
 Artist: Dizzy
 Duration: 0:57
-References:
-- Daughter
-- Cooldown
 URLs:
 - https://desynced.bandcamp.com/track/daughter-short-ver
 - https://www.youtube.com/watch?v=TRQm12ryKEM
 Cover Artists:
 - wumby
+Referenced Tracks:
+- Daughter
+- Cooldown
 ---
 Track: A Very Forgiving Kind of Guy
 Artist: Levc
@@ -91,16 +91,16 @@ Cover Artists:
 Track: Behind the Door
 Artist: Levc
 Duration: '1:32'
-References:
-- Cooldown
-- Temporal Guardian
-- Daughter
-- Desynced Anthem
 URLs:
 - https://desynced.bandcamp.com/track/behind-the-door
 - https://www.youtube.com/watch?v=kK-VJO4x_B8
 Cover Artists:
 - Dizzy
+Referenced Tracks:
+- Cooldown
+- Temporal Guardian
+- Daughter
+- Desynced Anthem
 ---
 Track: Eclipse
 Artist: Net
@@ -123,28 +123,28 @@ Cover Artists:
 Track: Alpha Admission
 Artist: Pascal van den Bos
 Duration: '3:46'
-References:
-- Temporal Guardian
-- Cooldown
-- Daughter
 URLs:
 - https://desynced.bandcamp.com/track/alpha-admission
 - https://www.youtube.com/watch?v=q3uV9X1Itz4
 Cover Artists:
 - Dizzy
+Referenced Tracks:
+- Temporal Guardian
+- Cooldown
+- Daughter
 ---
 Track: We'll Be Right Back
 Artist: Chris Hafling
 Duration: '2:06'
-References:
-- Vexation
-- Escapade
-- Liquid Negrocity
 URLs:
 - https://desynced.bandcamp.com/track/well-be-right-back-2
 - https://www.youtube.com/watch?v=GshW0kZKF9Y
 Cover Artists:
 - Dizzy
+Referenced Tracks:
+- Vexation
+- Escapade
+- Liquid Negrocity
 ---
 Track: Daughter
 Artist: Pascal van den Bos
@@ -158,13 +158,13 @@ Cover Artists:
 Track: Am I You?
 Artist: salex_r3kt
 Duration: '2:57'
-References:
-- Lunar Dance
 URLs:
 - https://desynced.bandcamp.com/track/am-i-you
 - https://www.youtube.com/watch?v=9Z-lbIeoh3o
 Cover Artists:
 - Protomans
+Referenced Tracks:
+- Lunar Dance
 ---
 Track: Lady
 Artist: Levc
@@ -178,24 +178,24 @@ Cover Artists:
 Track: Mother Dearest
 Artist: Andrew "Rainy" Obeng
 Duration: '4:17'
-References:
-- Daughter
 URLs:
 - https://desynced.bandcamp.com/track/mother-dearest
 - https://www.youtube.com/watch?v=5Z145OjEWRI
 Cover Artists:
 - Protomans
+Referenced Tracks:
+- Daughter
 ---
 Track: Noir
 Artist: Pascal van den Bos
 Duration: '2:13'
-References:
-- Escapade
 URLs:
 - https://desynced.bandcamp.com/track/noir
 - https://www.youtube.com/watch?v=ASvQBj3cXlY
 Cover Artists:
 - Dizzy
+Referenced Tracks:
+- Escapade
 ---
 Track: Lullaby for a Drifter
 Artist: Chris Hafling
@@ -218,26 +218,26 @@ Cover Artists:
 Track: Lunar Dance
 Artist: Pascal van den Bos
 Duration: '4:10'
-References:
-- Desynced Anthem
-- Vexation
-- track:alpha-admission
 URLs:
 - https://desynced.bandcamp.com/track/lunar-dance
 - https://www.youtube.com/watch?v=SJIvrlQuDHA
 Cover Artists:
 - Phos
+Referenced Tracks:
+- Desynced Anthem
+- Vexation
+- track:alpha-admission
 ---
 Track: Escapade
 Artist: Pascal van den Bos
 Duration: '3:22'
-References:
-- Liquid Negrocity
 URLs:
 - https://desynced.bandcamp.com/track/escapade-2
 - https://www.youtube.com/watch?v=UXt6Kx5nGcY
 Cover Artists:
 - Dizzy
+Referenced Tracks:
+- Liquid Negrocity
 ---
 Track: Desynced Anthem
 Artist: Levc
@@ -253,20 +253,20 @@ Group: Bonus tracks
 Track: Daughter (PX Tone)
 Artist: Chris Hafling
 Duration: '2:18'
-References:
-- Daughter
 URLs:
 - https://www.youtube.com/watch?v=PSRW86lVkxI
 Cover Artists:
 - Dizzy
 - Jules
+Referenced Tracks:
+- Daughter
 ---
 Track: Happy Anthem
 Artist: Levc
 Duration: '1:32'
-References:
-- Desynced Anthem
 URLs:
 - https://www.youtube.com/watch?v=0GT1gfoPYMs
 Cover Artists:
 - Levc
+Referenced Tracks:
+- Desynced Anthem
diff --git a/album/desynced-vol-2.yaml b/album/desynced-vol-2.yaml
index 28458f76..38b876eb 100644
--- a/album/desynced-vol-2.yaml
+++ b/album/desynced-vol-2.yaml
@@ -14,7 +14,12 @@ Cover Artists:
 Track: Skanthem
 Artist: Levc
 Duration: '2:48'
-References:
+URLs:
+- https://desynced.bandcamp.com/track/skanthem
+- https://www.youtube.com/watch?v=VJxxa-5Zjm4
+Cover Artists:
+- Dizzy
+Referenced Tracks:
 - Daughter
 - Cooldown
 - Desynced Anthem
@@ -23,22 +28,17 @@ References:
 - A Very Forgiving Kind of Guy
 - Winds of Change
 - Mirror Mirror
-URLs:
-- https://desynced.bandcamp.com/track/skanthem
-- https://www.youtube.com/watch?v=VJxxa-5Zjm4
-Cover Artists:
-- Dizzy
 ---
 Track: Light of the Sun
 Artist: Levc
 Duration: '2:22'
-References:
-- Sunsetter
 URLs:
 - https://desynced.bandcamp.com/track/light-of-the-sun
 - https://www.youtube.com/watch?v=iFA2YHPlICg
 Cover Artists:
 - Dizzy
+Referenced Tracks:
+- Sunsetter
 ---
 Track: Friends to the End
 Artist: Andrew "Rainy" Obeng
@@ -61,13 +61,13 @@ Cover Artists:
 Track: Heartbreaker
 Artist: Andrew "Rainy" Obeng
 Duration: '2:09'
-References:
-- Mirror Mirror
 URLs:
 - https://desynced.bandcamp.com/track/heartbreaker
 - https://www.youtube.com/watch?v=HiNB-v_kyvU
 Cover Artists:
 - wumby
+Referenced Tracks:
+- Mirror Mirror
 ---
 Track: Tsukuyomi
 Artist: Andrew "Rainy" Obeng
@@ -90,29 +90,29 @@ Cover Artists:
 Track: Do You Dream of Electric Sheep?
 Artist: Andrew "Rainy" Obeng
 Duration: '3:09'
-References:
-- track:asimov-3
 URLs:
 - https://desynced.bandcamp.com/track/do-you-dream-of-electric-sheep
 - https://www.youtube.com/watch?v=zkIYYmuRx0s
 Cover Artists:
 - Dizzy
+Referenced Tracks:
+- track:asimov-3
 ---
 Track: Egress
 Artist: Andrew "Rainy" Obeng
 Duration: '2:38'
-References:
+URLs:
+- https://desynced.bandcamp.com/track/egress
+- https://www.youtube.com/watch?v=EmmVlnnO6zk
+Cover Artists:
+- Mikkynga
+Referenced Tracks:
 - Mirror Mirror
 - track:alpha-admission
 - Daughter
 - Mother Dearest
 - Escapade
 - Tsukuyomi
-URLs:
-- https://desynced.bandcamp.com/track/egress
-- https://www.youtube.com/watch?v=EmmVlnnO6zk
-Cover Artists:
-- Mikkynga
 ---
 Track: Chat
 Artist: Levc
@@ -126,37 +126,37 @@ Cover Artists:
 Track: Town of Breath
 Artist: Pascal van den Bos
 Duration: '1:02'
-References:
-- Heart of the Land
 URLs:
 - https://desynced.bandcamp.com/track/town-of-breath
 - https://www.youtube.com/watch?v=2RbQLOr6Pi4
 Cover Artists:
 - Sal
+Referenced Tracks:
+- Heart of the Land
 ---
 Track: Desynsamba
 Artist: Levc
 Duration: '1:47'
-References:
-- Desynced Anthem
-- Light of the Sun
 URLs:
 - https://desynced.bandcamp.com/track/desynsamba
 - https://www.youtube.com/watch?v=ruiZ7CuCtB0
 Cover Artists:
 - Jeremy Boznango
+Referenced Tracks:
+- Desynced Anthem
+- Light of the Sun
 ---
 Track: Her Loving Embrace
 Artist: Andrew "Rainy" Obeng
 Duration: '1:38'
-References:
-- Mother Dearest
-- Daughter
 URLs:
 - https://desynced.bandcamp.com/track/her-loving-embrace
 - https://www.youtube.com/watch?v=NSW2lLe-r6M
 Cover Artists:
 - Mikkynga
+Referenced Tracks:
+- Mother Dearest
+- Daughter
 ---
 Track: Evanhenare1
 Artist: Net
@@ -170,13 +170,13 @@ Cover Artists:
 Track: Temporal Guardian - Electro Swing Remix
 Artist: Spad3s
 Duration: '2:06'
-References:
-- Temporal Guardian
 URLs:
 - https://desynced.bandcamp.com/track/temporal-guardian-electro-swing-remix
 - https://www.youtube.com/watch?v=eZ1Cp6QE_vg
 Cover Artists:
 - Jules
+Referenced Tracks:
+- Temporal Guardian
 ---
 Track: Allegro
 Artist: Andrew "Rainy" Obeng
@@ -210,25 +210,25 @@ Cover Artists:
 Track: Bloodstained Camellias
 Artist: Andrew "Rainy" Obeng
 Duration: '1:40'
-References:
-- Lunar Dance
-- Tsukuyomi
 URLs:
 - https://desynced.bandcamp.com/track/bloodstained-camellias
 - https://www.youtube.com/watch?v=wv4_wSgZyZM
 Cover Artists:
 - Jules
+Referenced Tracks:
+- Lunar Dance
+- Tsukuyomi
 ---
 Track: Inner Demons
 Artist: Andrew "Rainy" Obeng
 Duration: '3:42'
-References:
-- Daughter
 URLs:
 - https://desynced.bandcamp.com/track/inner-demons
 - https://www.youtube.com/watch?v=PnsLHAt_CGM
 Cover Artists:
 - Mikkynga
+Referenced Tracks:
+- Daughter
 ---
 Track: Hell Riders
 Artist: SerialSymphony
@@ -244,109 +244,114 @@ Cover Artists:
 Track: Puppet Master
 Artist: Levc
 Duration: '2:07'
-References:
-- Amalgam
-- A Very Forgiving Kind of Guy
-- Heartbreaker
-- Mirror Mirror
 URLs:
 - https://desynced.bandcamp.com/track/puppet-master
 - https://www.youtube.com/watch?v=aqTzZO7_sD0
 Cover Artists:
 - Dizzy
+Referenced Tracks:
+- Amalgam
+- A Very Forgiving Kind of Guy
+- Heartbreaker
+- Mirror Mirror
 ---
 Track: Rocket Power
 Artist: Pascal van den Bos
 Duration: '2:28'
-References:
-- Cooldown
-- Escapade
-- Light of the Sun
 URLs:
 - https://desynced.bandcamp.com/track/rocket-power
 - https://www.youtube.com/watch?v=qCL3OxwHfy4
 Cover Artists:
 - Dizzy
+Referenced Tracks:
+- Cooldown
+- Escapade
+- Light of the Sun
 ---
 Track: ASIMOV 3つの法律 (Lofi Beats to Engineer alone to)
 Directory: asimov-3
 Artist: Andrew "Rainy" Obeng
 Duration: '2:08'
-References:
-- Desynced Anthem
 URLs:
 - https://desynced.bandcamp.com/track/asimov-3-lofi-beats-to-engineer-alone-to
 - https://www.youtube.com/watch?v=qyj6sQKSChY
 Cover Artists:
 - Dizzy
+Referenced Tracks:
+- Desynced Anthem
 ---
 Track: Pugnae Pythonissam
 Artist: Levc
 Duration: '3:38'
-References:
-- Daughter
-- Cooldown
-- Desynced Anthem
-- Friends to the End
-- Mother Dearest
 URLs:
 - https://desynced.bandcamp.com/track/pugnae-pythonissam
 - https://www.youtube.com/watch?v=wZONu3nHFoQ
 Cover Artists:
 - serpaz
+Referenced Tracks:
+- Daughter
+- Cooldown
+- Desynced Anthem
+- Friends to the End
+- Mother Dearest
 ---
 Track: Void of the Moon
 Artist: Levc
 Duration: '3:00'
-References:
-- Light of the Sun
 URLs:
 - https://desynced.bandcamp.com/track/void-of-the-moon
 - https://www.youtube.com/watch?v=K9PgRllP-gY
 Cover Artists:
 - Dizzy
+Referenced Tracks:
+- Light of the Sun
 ---
 Track: Desynced
 Artist: Andrew "Rainy" Obeng
 Duration: '2:39'
-References:
-- Desynced Anthem
 URLs:
 - https://desynced.bandcamp.com/track/desynced
 - https://www.youtube.com/watch?v=QiuX1hjknmw
 Cover Artists:
 - Dizzy
+Referenced Tracks:
+- Desynced Anthem
 ---
 Track: Celestial Blaze
 Artist: Pascal van den Bos
 Duration: '2:47'
-References:
-- Light of the Sun
-- Desynced Anthem
-- Daughter
 URLs:
 - https://desynced.bandcamp.com/track/celestial-blaze
 - https://www.youtube.com/watch?v=TUr_v-Kspbs
 Cover Artists:
 - Dizzy
+Referenced Tracks:
+- Light of the Sun
+- Desynced Anthem
+- Daughter
 ---
 Track: Vantablack
 Artist: Levc
 Duration: '3:38'
-References:
-- Void of the Moon
-- Desynced Anthem
-- Daughter
 URLs:
 - https://desynced.bandcamp.com/track/vantablack
 - https://www.youtube.com/watch?v=U5SU3rpk-f8
 Cover Artists:
 - Dizzy
+Referenced Tracks:
+- Void of the Moon
+- Desynced Anthem
+- Daughter
 ---
 Track: Arrival
 Artist: Pascal van den Bos
 Duration: '6:56'
-References:
+URLs:
+- https://desynced.bandcamp.com/track/arrival
+- https://www.youtube.com/watch?v=4nButQ164PQ
+Cover Artists:
+- Dizzy
+Referenced Tracks:
 - Daughter (Short Ver.)
 - track:alpha-admission
 - Fate of the Heir
@@ -367,8 +372,3 @@ References:
 - Daughter
 - Desynced Anthem
 - Battle! (Elite Four)
-URLs:
-- https://desynced.bandcamp.com/track/arrival
-- https://www.youtube.com/watch?v=4nButQ164PQ
-Cover Artists:
-- Dizzy
diff --git a/album/diverging-delicacies.yaml b/album/diverging-delicacies.yaml
index 09edd6b7..1cfc318c 100644
--- a/album/diverging-delicacies.yaml
+++ b/album/diverging-delicacies.yaml
@@ -1,6 +1,4 @@
 Album: Diverging Delicacies
-Banner Art:
-- Ephemerald
 Banner Dimensions: 1100x180
 Date: March 1, 2020
 Date Added: March 1, 2020
@@ -16,19 +14,21 @@ URLs:
 - https://www.youtube.com/playlist?list=PL1fTYKSo2grAJ--CZjFkFeFa3Uy6-xV4x
 Cover Artists:
 - Ephemerald
+Banner Artists:
+- Ephemerald
 ---
 Group: Prologue
 ---
 Track: Greetings from Earth C!
 Artist: pizzagremlin
 Duration: 0:55
-References:
-- Homestuck
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/greetings-from-earth-c
 - https://youtu.be/ZkVkyMJ1DMY
 Cover Artists:
 - Jas
+Referenced Tracks:
+- Homestuck
 ---
 Track: Hauntological Nightmares
 Artist: Kanishka
@@ -40,20 +40,18 @@ Art Tags:
 - Nepeta
 - Terezi
 - Eridan
-References:
-- Heir Transparent
-- Spirit of Storms
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/hauntological-nightmares
 - https://youtu.be/nZnE7pIikmI
 Cover Artists:
 - Tipsy
+Referenced Tracks:
+- Heir Transparent
+- Spirit of Storms
 ---
 Track: The Decision | The Division
 Artist: Viko Riféo
 Duration: '2:01'
-References:
-- The Paradox Paradigm
 Art Tags:
 - John
 - 'cw: blood (abstract)'
@@ -62,24 +60,24 @@ URLs:
 - https://youtu.be/da3L1DMzvUw
 Cover Artists:
 - BlueAmethyst
+Referenced Tracks:
+- The Paradox Paradigm
 ---
 Group: Meat Epilogue
 ---
 Track: '[MEAT EPILOGUE | 🥩]'
 Artist: ndividedbyzero
 Duration: 0:08
-References:
-- The Paradox Paradigm
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/meat-epilogue
 - https://youtu.be/j2t6H7oLODE
 Has Cover Art: false
+Referenced Tracks:
+- The Paradox Paradigm
 ---
 Track: Party God
 Artist: Cristata
 Duration: '3:58'
-References:
-- Umbral Ultimatum
 Art Tags:
 - Jade
 URLs:
@@ -87,11 +85,20 @@ URLs:
 - https://youtu.be/Qd-q9su2Sqg
 Cover Artists:
 - Crystalrina
+Referenced Tracks:
+- Umbral Ultimatum
 ---
 Track: Constituent Hearts
 Artist: Ucklin
 Duration: '2:11'
-References:
+Art Tags:
+- Dirk
+URLs:
+- https://unofficialmspafans.bandcamp.com/track/constituent-hearts
+- https://youtu.be/TLrTXAea_Pw
+Cover Artists:
+- BlueAmethyst
+Referenced Tracks:
 - English
 - Horsecatska
 - track:s-dirk-unite-synchronization-with-lyrics
@@ -116,21 +123,10 @@ References:
 - Good Morning, Dirk
 - Heart Beat
 - The Engineer
-Art Tags:
-- Dirk
-URLs:
-- https://unofficialmspafans.bandcamp.com/track/constituent-hearts
-- https://youtu.be/TLrTXAea_Pw
-Cover Artists:
-- BlueAmethyst
 ---
 Track: The Cyan Experience
 Artist: heir-of-puns
 Duration: '3:44'
-References:
-- Homestuck Anthem
-- Cyan Beast
-- First Steps
 Art Tags:
 - Jane
 URLs:
@@ -138,11 +134,23 @@ URLs:
 - https://youtu.be/EKUHV3OmLS0
 Cover Artists:
 - Jas
+Referenced Tracks:
+- Homestuck Anthem
+- Cyan Beast
+- First Steps
 ---
 Track: THE RAREST. AND MOST INTERPRETIVE. DANCE MEATCABRE.
 Artist: ndividedbyzero
 Duration: '3:03'
-References:
+Art Tags:
+- Caliborn
+- Lil Cal
+URLs:
+- https://unofficialmspafans.bandcamp.com/track/the-rarest-and-most-interpretive-dance-meatcabre
+- https://youtu.be/uP5-_gKkDWM
+Cover Artists:
+- Aeritus
+Referenced Tracks:
 - Singularity
 - HOMOSUCK. DIRECTOR'S CUT, OF THE YEAR EDITION.
 - Eternity Served Cold
@@ -155,27 +163,10 @@ References:
 - The Lyrist
 - The Paradox Paradigm
 - Swing of the Clock
-Art Tags:
-- Caliborn
-- Lil Cal
-URLs:
-- https://unofficialmspafans.bandcamp.com/track/the-rarest-and-most-interpretive-dance-meatcabre
-- https://youtu.be/uP5-_gKkDWM
-Cover Artists:
-- Aeritus
 ---
 Track: Irrelevance Event Horizon
 Artist: Kanishka
 Duration: '4:22'
-References:
-- Ecstasy
-- Even in Death
-- Spider8reath
-- Killed by BR8K Spider!!!!!!!!
-- Penumbra Phantasm
-- Retconjuration
-- Conflict!
-- Homestuck
 Art Tags:
 - Vriska
 - 'cw: blood (abstract)'
@@ -184,13 +175,19 @@ URLs:
 - https://youtu.be/he0MFbIDcLM
 Cover Artists:
 - Jas
+Referenced Tracks:
+- Ecstasy
+- Even in Death
+- Spider8reath
+- Killed by BR8K Spider!!!!!!!!
+- Penumbra Phantasm
+- Retconjuration
+- Conflict!
+- Homestuck
 ---
 Track: Betrayed
 Artist: Joe Ouellet
 Duration: '2:09'
-References:
-- Horschestra
-- Sunsetter
 Art Tags:
 - Dirk
 URLs:
@@ -198,13 +195,13 @@ URLs:
 - https://youtu.be/0u51YWNfNJ8
 Cover Artists:
 - swanfire
+Referenced Tracks:
+- Horschestra
+- Sunsetter
 ---
 Track: Gone in a moment
 Artist: Not Eno
 Duration: '7:12'
-References:
-- track:showtime-piano-refrain
-- Flare
 Art Tags:
 - John
 - 'cw: blood'
@@ -213,18 +210,13 @@ URLs:
 - https://youtu.be/3tE1U0MubAU
 Cover Artists:
 - ricemilk
+Referenced Tracks:
+- track:showtime-piano-refrain
+- Flare
 ---
 Track: I Am Ascending (And It Is Terrible)
 Artist: heir-of-puns
 Duration: '7:09'
-References:
-- Black Rose / Green Sun
-- Lilith in Starlight
-- At The Price of Oblivion
-- track:aggrieve
-- Flare
-- track:endless-climb
-- track:chorale-for-jaspers
 Art Tags:
 - Rose
 - Green Sun
@@ -233,15 +225,18 @@ URLs:
 - https://youtu.be/Bs51Pzlg2oM
 Cover Artists:
 - Spades
+Referenced Tracks:
+- Black Rose / Green Sun
+- Lilith in Starlight
+- At The Price of Oblivion
+- track:aggrieve
+- Flare
+- track:endless-climb
+- track:chorale-for-jaspers
 ---
 Track: Come
 Artist: Grace Medley
 Duration: '3:45'
-References:
-- Limelight
-- Voidlight
-- track:canwave3-track6
-- Glide
 Art Tags:
 - Jade
 - Alternate Calliope
@@ -250,14 +245,16 @@ URLs:
 - https://youtu.be/zLC2UzTf6Oc
 Cover Artists:
 - Mikkynga
+Referenced Tracks:
+- Limelight
+- Voidlight
+- track:canwave3-track6
+- Glide
 ---
 Track: Kamina Burana (Ascend to the highest point of the building)
 Artist: Grace Medley
 Duration: '3:56'
 Directory: kamina-burana
-References:
-- Orange Hat
-- track:upward-movement-dave-owns
 Art Tags:
 - Dirk
 - Jade
@@ -270,12 +267,13 @@ Commentary: |-
     <img src="media/misc/kamina-burana-bonus.jpeg" width="1400" height="1400">
 Cover Artists:
 - Mikkynga
+Referenced Tracks:
+- Orange Hat
+- track:upward-movement-dave-owns
 ---
 Track: Giving Up the Ghost
 Artist: Kanishka
 Duration: '4:59'
-References:
-- Lifdoff
 Art Tags:
 - Terezi
 - Jane
@@ -284,6 +282,8 @@ URLs:
 - https://youtu.be/Rp3KuUqhyew
 Cover Artists:
 - ricemilk
+Referenced Tracks:
+- Lifdoff
 ---
 Track: Pursuit in Polykrome
 Artist: heir-of-puns
@@ -303,12 +303,12 @@ Group: Candy Epilogue
 Track: '[CANDY EPILOGUE | 🍭]'
 Artist: ndividedbyzero
 Duration: 0:08
-References:
-- The Paradox Paradigm
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/candy-epilogue
 - https://youtu.be/C6wP1FPHMKQ
 Has Cover Art: false
+Referenced Tracks:
+- The Paradox Paradigm
 ---
 Track: Athazagoraphobia
 Artist: Toris Crow
@@ -324,10 +324,6 @@ Cover Artists:
 Track: Repentance Galore
 Artist: Kanishka
 Duration: '2:11'
-References:
-- Heir of Grief
-- Theme
-- Purple Bard
 Art Tags:
 - Gamzee
 URLs:
@@ -335,6 +331,10 @@ URLs:
 - https://youtu.be/wBbViIX0mtg
 Cover Artists:
 - cherry bomb bunny
+Referenced Tracks:
+- Heir of Grief
+- Theme
+- Purple Bard
 ---
 Track: RUMBLE IN DA PUMPKIN PATCH
 Artist: pizzagremlin
@@ -351,12 +351,6 @@ Cover Artists:
 Track: Remember Me When I Am Gone Away
 Artist: Kal-la-kal-la
 Duration: '4:28'
-References:
-- Remember
-- Homestuck Anthem
-- Do You Remem8er Me
-- Penumbra Phantasm
-- Infinity Mechanism
 Art Tags:
 - Terezi
 URLs:
@@ -368,12 +362,16 @@ Lyrics: |-
     Yet if you should forget me for a while<br>And afterwards remember, do not grieve:<br>For if the darkness and corruption leave<br>A vestige of the thoughts that once I had,<br>Better by far you should forget and smile<br>Than that you should remember and be sad.
 Cover Artists:
 - Cosmic
+Referenced Tracks:
+- Remember
+- Homestuck Anthem
+- Do You Remem8er Me
+- Penumbra Phantasm
+- Infinity Mechanism
 ---
 Track: Dirk's Dreamers
 Artist: heir-of-puns
 Duration: '2:45'
-References:
-- Derse Dreamers
 Art Tags:
 - Dirk
 - 'cw: hanging'
@@ -383,19 +381,12 @@ URLs:
 - https://youtu.be/IS8RH6q_BT0
 Cover Artists:
 - Skyplayer
+Referenced Tracks:
+- Derse Dreamers
 ---
 Track: Ghost Hole
 Artist: heir-of-puns
 Duration: '4:38'
-References:
-- English
-- The Lemonsnout Turnabout
-- Penumbra Phantasm
-- track:MeGaLoVania
-- track:upward-movement-dave-owns
-- Black Rose / Green Sun
-- Courser
-- Lotus
 Art Tags:
 - Terezi
 - John
@@ -410,13 +401,19 @@ URLs:
 - https://youtu.be/85EflC57Ob0
 Cover Artists:
 - Jas
+Referenced Tracks:
+- English
+- The Lemonsnout Turnabout
+- Penumbra Phantasm
+- track:MeGaLoVania
+- track:upward-movement-dave-owns
+- Black Rose / Green Sun
+- Courser
+- Lotus
 ---
 Track: Heritage for the Future
 Artist: Kanishka
 Duration: '6:30'
-References:
-- Throwdown
-- Homefree
 Art Tags:
 - Harry
 - Tavvy
@@ -427,6 +424,9 @@ URLs:
 Cover Artists:
 - swanfire
 - Jas
+Referenced Tracks:
+- Throwdown
+- Homefree
 ---
 Track: That's Kind of Xenophobic
 Artist: pizzagremlin
@@ -456,8 +456,6 @@ Artist: Kal-la-kal-la
 Contributors:
 - OneDragonArmy (Additional vocals)
 Duration: '4:07'
-References:
-- Galactic Cancer
 Art Tags:
 - Karkat
 URLs:
@@ -471,6 +469,8 @@ Lyrics: |-
     We will paint the firmament in flame,<br>Offer up our blood in sacrifice,<br><i>Sic semper tyrannis</i>, a baptism,<br>In the milk of paradise.
 Cover Artists:
 - Mikkynga
+Referenced Tracks:
+- Galactic Cancer
 ---
 Track: Postscript (Sugar Mix)
 Artist: pizzagremlin
diff --git a/album/election-season.yaml b/album/election-season.yaml
index 5ebf6be0..83ba37c3 100644
--- a/album/election-season.yaml
+++ b/album/election-season.yaml
@@ -14,14 +14,14 @@ Cover Artists:
 Track: Under the Sun
 Artist: Levc
 Duration: '3:39'
-References:
-- Light of the Sun
-- Saving Grace
 URLs:
 - https://desynced.bandcamp.com/track/under-the-sun
 - https://www.youtube.com/watch?v=wfn8V83KGQI&list=PLAP2Y9dl628ntIo7zpcNDAr5R-7q6Z5_H&index=1
 Cover Artists:
 - Chesswanderlust-sama
+Referenced Tracks:
+- Light of the Sun
+- Saving Grace
 ---
 Track: Saving Grace
 Artist: Andrew "Rainy" Obeng
@@ -80,9 +80,6 @@ Cover Artists:
 Track: Breath Suspense
 Artist: Levc
 Duration: '2:45'
-References:
-- Inner Demons
-- Light of the Sun
 Art Tags:
 - 'cw: blood (abstract)'
 URLs:
@@ -90,79 +87,82 @@ URLs:
 - https://www.youtube.com/watch?v=nZjtZGTlMY0&list=PLAP2Y9dl628ntIo7zpcNDAr5R-7q6Z5_H&index=8
 Cover Artists:
 - Dizzy
+Referenced Tracks:
+- Inner Demons
+- Light of the Sun
 ---
 Track: Daylight Dreamers
 Artist: salex_r3kt
 Duration: '4:47'
-References:
-- Daughter
-- Mirror Mirror
-- Lunar Dance
-- Embryonic
-- Vexation
 URLs:
 - https://desynced.bandcamp.com/track/daylight-dreamers
 - https://www.youtube.com/watch?v=EBO_xLF04Uc&list=PLAP2Y9dl628ntIo7zpcNDAr5R-7q6Z5_H&index=9
 Cover Artists:
 - Chesswanderlust-sama
+Referenced Tracks:
+- Daughter
+- Mirror Mirror
+- Lunar Dance
+- Embryonic
+- Vexation
 ---
 Track: Embryonic
 Artist: salex_r3kt
 Duration: '2:57'
-References:
-- Light of the Sun
-- Desynced Anthem
 URLs:
 - https://desynced.bandcamp.com/track/embryonic
 - https://www.youtube.com/watch?v=H83_nZedm30&list=PLAP2Y9dl628ntIo7zpcNDAr5R-7q6Z5_H&index=10
 Cover Artists:
 - Dizzy
+Referenced Tracks:
+- Light of the Sun
+- Desynced Anthem
 ---
 Track: 'INTERMISSION: Switch the Station'
 Directory: switch-the-station
 Artist: Levc
 Duration: '1:50'
-References:
-- Light of the Sun
-- Void of the Moon
 URLs:
 - https://desynced.bandcamp.com/track/intermission-switch-the-station
 - https://www.youtube.com/watch?v=y86jo36KYr8&list=PLAP2Y9dl628ntIo7zpcNDAr5R-7q6Z5_H&index=11
 Cover Artists:
 - Jeremy Boznango
+Referenced Tracks:
+- Light of the Sun
+- Void of the Moon
 ---
 Track: Under the Moon
 Artist: Levc
 Duration: '2:27'
-References:
-- Void of the Moon
 URLs:
 - https://desynced.bandcamp.com/track/under-the-moon
 - https://www.youtube.com/watch?v=zsrTLB_LtzM&list=PLAP2Y9dl628ntIo7zpcNDAr5R-7q6Z5_H&index=12
 Cover Artists:
 - Chesswanderlust-sama
+Referenced Tracks:
+- Void of the Moon
 ---
 Track: Snake-Eyes!
 Artist: Spad3s
 Duration: '3:56'
-References:
-- Noir
 URLs:
 - https://desynced.bandcamp.com/track/snake-eyes
 - https://www.youtube.com/watch?v=mwVBOXT8HHU&list=PLAP2Y9dl628ntIo7zpcNDAr5R-7q6Z5_H&index=13
 Cover Artists:
 - Dizzy
+Referenced Tracks:
+- Noir
 ---
 Track: A Dime a Dozen
 Artist: Andrew "Rainy" Obeng
 Duration: '2:33'
-References:
-- I'm a Member of the Midnight Crew
 URLs:
 - https://desynced.bandcamp.com/track/a-dime-a-dozen
 - https://www.youtube.com/watch?v=uVMAJuoffYI&list=PLAP2Y9dl628ntIo7zpcNDAr5R-7q6Z5_H&index=14
 Cover Artists:
 - Dizzy
+Referenced Tracks:
+- I'm a Member of the Midnight Crew
 ---
 Track: Man of Many Passions
 Artist: SpilledCereals
@@ -204,34 +204,34 @@ Cover Artists:
 Track: Ain't Jack but Jack
 Artist: Spad3s
 Duration: 0:40
-References:
-- Noir
 URLs:
 - https://desynced.bandcamp.com/track/aint-jack-but-jack
 - https://www.youtube.com/watch?v=AlJHkIrs4IE&list=PLAP2Y9dl628ntIo7zpcNDAr5R-7q6Z5_H&index=19
 Cover Artists:
 - Levc
+Referenced Tracks:
+- Noir
 ---
 Track: Twilight Dreamers
 Artist: Andrew "Rainy" Obeng
 Duration: '2:54'
-References:
-- Mirror Mirror
-- What was Ya'll Thinking?
-- Do You Dream of Electric Sheep?
 URLs:
 - https://desynced.bandcamp.com/track/twilight-dreamers
 - https://www.youtube.com/watch?v=1qYgeQLK3zg&list=PLAP2Y9dl628ntIo7zpcNDAr5R-7q6Z5_H&index=20
 Cover Artists:
 - Chesswanderlust-sama
+Referenced Tracks:
+- Mirror Mirror
+- What was Ya'll Thinking?
+- Do You Dream of Electric Sheep?
 ---
 Track: Gestalt
 Artist: Andrew "Rainy" Obeng
 Duration: '4:00'
-References:
-- Void of the Moon
 URLs:
 - https://desynced.bandcamp.com/track/gestalt
 - https://www.youtube.com/watch?v=6ekVnZm29kw&list=PLAP2Y9dl628ntIo7zpcNDAr5R-7q6Z5_H&index=21
 Cover Artists:
 - Dizzy
+Referenced Tracks:
+- Void of the Moon
diff --git a/album/entertaining-sound.yaml b/album/entertaining-sound.yaml
index 03bf7c58..688169c6 100644
--- a/album/entertaining-sound.yaml
+++ b/album/entertaining-sound.yaml
@@ -36,23 +36,23 @@ Commentary: |-
 ---
 Track: The Bad Time Is You
 Duration: '1:48'
-References:
-- The Baby is You
-- track:megalovania-undertale
 URLs:
 - https://conlangcritic.bandcamp.com/track/the-bad-time-is-you
 Commentary: |-
     <i>jan Misali:</i>
     toby fox (the undertale guy) wrote a rock opera about mpreg once
+Referenced Tracks:
+- The Baby is You
+- track:megalovania-undertale
 ---
 Track: Super Dry Dance
 Directory: super-dry-dance-entertaining-sound
 Duration: '2:33'
-References:
-- track:super-dry-dance
 URLs:
 - https://conlangcritic.bandcamp.com/track/super-dry-dance-2
-Commrntary: |-
+Referenced Tracks:
+- track:super-dry-dance
+Commentary: |-
     <i>jan Misali:</i>
     this is hands down (a chiptune cover of) the best song from earthbound
 ---
@@ -67,38 +67,44 @@ Commentary: |-
 Track: Griffin Space Jam
 Directory: griffin-space-jam-entertaining-sound
 Duration: '1:05'
-References:
-- track:griffin-space-jam
 URLs:
 - https://conlangcritic.bandcamp.com/track/griffin-space-jam
 Commentary: |-
     <i>jan Misali:</i>
     this is actually the MOST EXCLUSIVE song on the album! I've never posted this griffin mcelroy remix anywhere UNTIL NOW
+Referenced Tracks:
+- track:griffin-space-jam
 ---
 Track: melomane solresol
 Duration: '2:28'
-References:
-- Solresol
 URLs:
 - https://conlangcritic.bandcamp.com/track/melomane-solresol
 Commentary: |-
     <i>jan Misali:</i>
     there's a song called solresol by melomane and it's a v good song (it's ABOUT solresol, not IN solresol)
+Referenced Tracks:
+- Solresol
 ---
 Track: krespo2012
 Duration: '2:15'
-References:
-- File Select (SM64)
 URLs:
 - https://conlangcritic.bandcamp.com/track/krespo2012
 - https://www.youtube.com/watch?v=l1_49gKZiOE
 Commentary: |-
     <i>jan Misali:</i>
     remember when this was a meme
+Referenced Tracks:
+- File Select (SM64)
 ---
 Track: 2016 but all the best memes happen at the same time
 Duration: '2:06'
-References:
+URLs:
+- https://conlangcritic.bandcamp.com/track/2016-but-all-the-best-memes-happen-at-the-same-time
+- https://www.youtube.com/watch?v=6xu8YshzxXw
+Commentary: |-
+    <i>jan Misali:</i>
+    remember 2016? what a garbage year. the memes were pretty good though
+Referenced Tracks:
 - We Are Number One
 - 0.5x A Presses
 - history of japan
@@ -109,66 +115,66 @@ References:
 - Science Blaster
 - 7 GRAND DAD
 - Snow halation - Love Live!
-URLs:
-- https://conlangcritic.bandcamp.com/track/2016-but-all-the-best-memes-happen-at-the-same-time
-- https://www.youtube.com/watch?v=6xu8YshzxXw
-Commentary: |-
-    <i>jan Misali:</i>
-    remember 2016? what a garbage year. the memes were pretty good though
 ---
 Track: New radio shows?
 Duration: '3:57'
-References:
-- Pumpkin Cravings
-- You have got to be about the most superficial commentator on con-langues since the
-    idiotic B. Gilson.
 URLs:
 - https://conlangcritic.bandcamp.com/track/new-radio-shows
 - https://www.youtube.com/watch?v=5zCbq2sFCgY
 Commentary: |-
     <i>jan Misali:</i>
     based on a true story
+Referenced Tracks:
+- Pumpkin Cravings
+- You have got to be about the most superficial commentator on con-langues since the
+    idiotic B. Gilson.
 ---
 Track: body
 Duration: '1:10'
-References:
-- All Star
 URLs:
 - https://conlangcritic.bandcamp.com/track/body
 - https://www.youtube.com/watch?v=1LzAfpj46KY
 Commentary: |-
     <i>jan Misali:</i>
     I'm not quite sure how to describe this one
+Referenced Tracks:
+- All Star
 ---
 Track: Taako's Good Out Here
 Duration: '2:23'
-References:
-- Deja Vu
-- Arms Outstretched
-- Crystal Kingdom
-- Fantasy Costco Jingle
-- All Star
 URLs:
 - https://conlangcritic.bandcamp.com/track/taakos-good-out-here
 Commentary: |-
     <i>jan Misali:</i>
     strap on your fantasy seatbelts
+Referenced Tracks:
+- Deja Vu
+- Arms Outstretched
+- Crystal Kingdom
+- Fantasy Costco Jingle
+- All Star
 ---
 Track: Cascendits
 Duration: '4:11'
-References:
-- Cascade
-- Descend
-- Ascend
 URLs:
 - https://conlangcritic.bandcamp.com/track/cascendits
 Commentary: |-
     <i>jan Misali:</i>
     this song was featured in the patreon announcement video and was never released in full because it didn't sound very good
+Referenced Tracks:
+- Cascade
+- Descend
+- Ascend
 ---
 Track: Toby Fox Has Written Hundreds of Unique Original Songs
 Duration: '6:25'
-References:
+URLs:
+- https://conlangcritic.bandcamp.com/track/toby-fox-has-written-hundreds-of-unique-original-songs
+- https://www.youtube.com/watch?v=HO5V2uogkYc
+Commentary: |-
+    <i>jan Misali:</i>
+    toby "undertale" fox reuses the megalovania chord progression a lot and here's proof
+Referenced Tracks:
 - track:megalovania-undertale
 - track:MeGaLoVania
 - Oppa Toby Style
@@ -202,16 +208,16 @@ References:
 - Science Blaster
 - Goodbye To A World
 - Slider - Super Mario 64
-URLs:
-- https://conlangcritic.bandcamp.com/track/toby-fox-has-written-hundreds-of-unique-original-songs
-- https://www.youtube.com/watch?v=HO5V2uogkYc
-Commentary: |-
-    <i>jan Misali:</i>
-    toby "undertale" fox reuses the megalovania chord progression a lot and here's proof
 ---
 Track: oh, 2017?
 Duration: '3:18'
-References:
+URLs:
+- https://conlangcritic.bandcamp.com/track/oh-2017
+- https://www.youtube.com/watch?v=lhhRrJm65BU
+Commentary: |-
+    <i>jan Misali:</i>
+    the sequel to the awkwardly titled "[[2016 but all the best memes happen at the same time]]"
+Referenced Tracks:
 - all yor base r blong 2 us
 - The Next Episode
 - Everybody Everybody
@@ -248,54 +254,48 @@ References:
 - WOAH!
 - Two Trucks
 - Big Enough
-URLs:
-- https://conlangcritic.bandcamp.com/track/oh-2017
-- https://www.youtube.com/watch?v=lhhRrJm65BU
-Commentary: |-
-    <i>jan Misali:</i>
-    the sequel to the awkwardly titled "[[2016 but all the best memes happen at the same time]]"
 ---
 Track: here comes my favorite song from mario odyssey
 Duration: '1:18'
-References:
-- Viva la Vida
-- Steam Gardens
 URLs:
 - https://conlangcritic.bandcamp.com/track/here-comes-my-favorite-song-from-mario-odyssey
 - https://www.youtube.com/watch?v=BmBw9Kzv8NE
 Commentary: |-
     <i>jan Misali:</i>
     there was a whole controversy about this one that I probably shouldn't get into. anyway sorry about all that, siivagunner
+Referenced Tracks:
+- Viva la Vida
+- Steam Gardens
 ---
 Track: ambidextrous remix
 Duration: '2:36'
-References:
-- Left-Hand Remix
-- Right-Hand Remix
 URLs:
 - https://conlangcritic.bandcamp.com/track/ambidextrous-remix
 Commentary: |-
     <i>jan Misali:</i>
     left hand remix plays in the left ear and right hand remix plays in the right ear
+Referenced Tracks:
+- Left-Hand Remix
+- Right-Hand Remix
 ---
 Track: A Song About a Circle Constant
 Duration: '2:40'
-References:
-- track:a-song-about-a-circle-constant-vi-hart
 URLs:
 - https://conlangcritic.bandcamp.com/track/a-song-about-a-circle-constant
 - https://www.youtube.com/watch?v=YpIY61QW56M
 Commentary: |-
     <i>jan Misali:</i>
     I made this cover song in 2015 and it's the only thing I made in 2015 that I still think has any value
+Referenced Tracks:
+- track:a-song-about-a-circle-constant-vi-hart
 ---
 Track: Malblanka Rozo Verda Stelo
 Duration: 0:35
-References:
-- Black Rose / Green Sun
 URLs:
 - https://conlangcritic.bandcamp.com/track/malblanka-rozo-verda-stelo
 - https://www.youtube.com/watch?v=L98DwKAd3qE
 Commentary: |-
     <i>jan Misali:</i>
     what if the green sun was actually the esperanto green star game theory
+Referenced Tracks:
+- Black Rose / Green Sun
diff --git a/album/exceptis-excipiendis.yaml b/album/exceptis-excipiendis.yaml
index c5522546..4ec49a1a 100644
--- a/album/exceptis-excipiendis.yaml
+++ b/album/exceptis-excipiendis.yaml
@@ -128,13 +128,13 @@ Cover Artists:
 ---
 Track: Prana Ferox
 Duration: '3:52'
-References:
-- track:prana-ferox-the-mountain-goats
 URLs:
 - https://nasqueron.bandcamp.com/track/prana-ferox
 Lyrics: |-
     I went down to the basement<br>To check up on the sour mash<br>I looked down to the nonreactive ceramic tub<br>It was bubbling.<br>I had stirred up the dust on the stairs coming down.<br>I saw the dust devils swarming around.<br>Incoming sun beams cut them apart.<br>And I watched a shadow pass across my heart.<br>You were upstairs in the kitchen with your head against the sink.<br>Trying to cool down.<br>Trying to cool down.
     I know you don't believe me but I could hear you breathing<br>I looked into the tub and there the mixture was seething<br>With new life.<br>New life all around.<br>I had stirred up the dust on the stairs coming down.<br>You were upstairs in the kitchen with your head against the sink.<br>Trying to cool down.<br>Trying to cool down.
+Referenced Tracks:
+- track:prana-ferox-the-mountain-goats
 ---
 Track: Song For King Arthur
 Duration: '6:13'
diff --git a/album/friendsymphony.yaml b/album/friendsymphony.yaml
index 5dec6b1d..6cdb2fa5 100644
--- a/album/friendsymphony.yaml
+++ b/album/friendsymphony.yaml
@@ -1,6 +1,4 @@
 Album: FriendSymphony
-Banner Art:
-- Chesswanderlust-sama
 Banner Dimensions: 1100x180
 Wallpaper Style: 'opacity: 0.8;'
 Date: November 30, 2020
@@ -18,17 +16,19 @@ Cover Artists:
 - Knil
 Wallpaper Artists:
 - Chesswanderlust-sama
+Banner Artists:
+- Chesswanderlust-sama
 ---
 Group: Disc 1
 ---
 Track: '>>DiscOne<<'
 Artist: Tee-vee
 Duration: 0:56
-References:
-- Theme
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/discone
 Has Cover Art: false
+Referenced Tracks:
+- Theme
 ---
 Track: Spare Friendship, Ma'am?
 Artist: pizzagremlin
@@ -114,8 +114,6 @@ Artist: Tee-vee
 Duration: '3:06'
 Art Tags:
 - Chixie
-References:
-- it be like that sometimes
 URLs:
 - >-
     https://unofficialmspafans.bandcamp.com/track/hi-everyone-antony-fntano-here-alternias-busiest-music-nerd-and-its-time-for-a-review-of-the-new-chixie-roixmr-album
@@ -124,6 +122,8 @@ Lyrics: |-
     Second verse, it doesn't get better<br>No hemospectrum cred you'd be groupies, motherfuckers<br>You think you're hot shit, you're just some damn cheaters<br>Pretending and posing for 5 likes on Chittr
 Cover Artists:
 - Chesswanderlust-sama
+Referenced Tracks:
+- it be like that sometimes
 ---
 Track: it's hard, being famous. it's hard and nobody understands
 Directory: its-hard-being-famous
@@ -131,12 +131,12 @@ Artist: astropod
 Duration: '2:15'
 Art Tags:
 - Cirava
-References:
-- Gold Pilot
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/its-hard-being-famous-its-hard-and-nobody-understands
 Cover Artists:
 - ZowerLemon
+Referenced Tracks:
+- Gold Pilot
 ---
 Track: leech
 Artist: Gryotharian
@@ -155,38 +155,38 @@ Duration: '2:18'
 Art Tags:
 - Folykl
 - Kuprum
-References:
-- leech
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/assault-and-battery
 Cover Artists:
 - Nova
+Referenced Tracks:
+- leech
 ---
 Track: Carefree Consternation
 Artist: JulieTunes
 Duration: '2:05'
 Art Tags:
 - Zebede
-References:
-- Carefree Action
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/carefree-consternation
 Cover Artists:
 - Chesswanderlust-sama
+Referenced Tracks:
+- Carefree Action
 ---
 Track: '|||Optic Duelist|||'
 Artist: Andrew "Rainy" Obeng
 Duration: '4:00'
 Art Tags:
 - Azdaja
-References:
-- Distortion Navigator
-- Fate of the Heir
-- The Blind Prophet
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/optic-duelist
 Cover Artists:
 - MarbleMint
+Referenced Tracks:
+- Distortion Navigator
+- Fate of the Heir
+- The Blind Prophet
 ---
 Group: Disc 2
 ---
@@ -200,14 +200,14 @@ Has Cover Art: false
 Track: Marvelous Marauder
 Artist: Andrew "Rainy" Obeng, Tee-vee
 Duration: '3:45'
-References:
-- Courser
-- track:sburban-jungle
-- Umbral Ultimatum
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/marvelous-marauder
 Cover Artists:
 - Chesswanderlust-sama
+Referenced Tracks:
+- Courser
+- track:sburban-jungle
+- Umbral Ultimatum
 ---
 Track: no *kills you*
 Artist: astropod
@@ -224,23 +224,24 @@ Artist: Panfex
 Duration: '2:29'
 Art Tags:
 - Boldir
-References:
-- track:old-secret
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/caught-in-the-facts
 Cover Artists:
 - Awkward
+Referenced Tracks:
+- track:old-secret
 ---
 Track: Paradox Pariah
 Artist: Baleish
 Duration: '2:33'
 Art Tags:
 - Charun
-ReferenceS: Studio Space
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/paradox-pariah
 Cover Artists:
 - shu
+Referenced Tracks:
+- Studio Space
 ---
 Track: Mother To Many
 Artist: JulieTunes
@@ -278,10 +279,6 @@ Artist: Tee-vee
 Duration: '3:46'
 Art Tags:
 - Daraya
-References:
-- (this title was too long)
-- You're Standing On My Neck
-- Darling Dolorosa
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/we-waste-time-jaded
 Lyrics: |-
@@ -295,6 +292,10 @@ Lyrics: |-
     Wasted time & wasted trolls<br>Enjoy your time before the fall<br>Sneak out of your sacred walls<br>Take my tears, make it worth living<br>Hope lost right out of the womb<br>It's up to us not to succumb<br>No point in fighting to your doom<br>Jade blood, black heart, ch-ch-cherrybomb
 Cover Artists:
 - Chesswanderlust-sama
+Referenced Tracks:
+- (this title was too long)
+- You're Standing On My Neck
+- Darling Dolorosa
 ---
 Track: Naive Harmony
 Artist: JulieTunes
@@ -321,12 +322,12 @@ Artist: Gryotharian
 Duration: '3:37'
 Art Tags:
 - Tyzias
-References:
-- Seer of Same-Color Scalemate Combos
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/exhausted-hope
 Cover Artists:
 - Elanor Pam
+Referenced Tracks:
+- Seer of Same-Color Scalemate Combos
 ---
 Track: Bullet Brain
 Artist: JulieTunes
@@ -396,42 +397,42 @@ Cover Artists:
 Track: Pop Pills Get Girls
 Artist: Scorpyus
 Duration: '3:29'
-References:
-- Killed by BR8K Spider!!!!!!!!
-- track:MeGaLoVania
-- Superego
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/pop-pills-get-girls
 Cover Artists:
 - Chesswanderlust-sama
+Referenced Tracks:
+- Killed by BR8K Spider!!!!!!!!
+- track:MeGaLoVania
+- Superego
 ---
 Track: Blatant Plagiarism
 Artist: Scorpyus
 Duration: '2:46'
 Art Tags:
 - Remele
-References:
-- track:piwates
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/blatant-plagiarism
 Cover Artists:
 - Awkward
+Referenced Tracks:
+- track:piwates
 ---
 Track: Dumbass Terminal
 Artist: Tee-vee
 Duration: '6:01'
 Art Tags:
 - Mallek
-References:
+URLs:
+- https://unofficialmspafans.bandcamp.com/track/dumbass-terminal
+Cover Artists:
+- shu
+Referenced Tracks:
 - Knife's Edge
 - Arachnofunkia
 - Time on My Side
 - Killed by BR8K Spider!!!!!!!!
 - Spider8ite!!!!!!!!
-URLs:
-- https://unofficialmspafans.bandcamp.com/track/dumbass-terminal
-Cover Artists:
-- shu
 ---
 Track: growing up
 Directory: growing-up-friendsymphony
@@ -457,13 +458,13 @@ Cover Artists:
 Track: Sesquipedalian Loquaciousness
 Artist: Tee-vee
 Duration: '2:56'
-References:
-- Horschestra
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/sesquipedalian-loquaciousness
 Cover Artists:
 - Chesswanderlust-sama
 - Makin
+Referenced Tracks:
+- Horschestra
 ---
 Track: '*Suplexes piano*'
 Artist: Scorpyus
@@ -499,12 +500,12 @@ Duration: '3:00'
 Art Tags:
 - Barzum
 - Baizli
-References:
-- Chucklevoodoo Waltz
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/phantasmagoria
 Cover Artists:
 - ZowerLemon
+Referenced Tracks:
+- Chucklevoodoo Waltz
 ---
 Track: The Show Must Go On
 Artist: Scorpyus
@@ -520,12 +521,12 @@ Cover Artists:
 Track: You're the Whole Circus
 Artist: Tee-vee
 Duration: '3:36'
-References:
-- CLOWNFUCKER
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/youre-the-whole-circus
 Cover Artists:
 - Chesswanderlust-sama
+Referenced Tracks:
+- CLOWNFUCKER
 ---
 Track: The Puppetmaster
 Artist: Gryotharian
@@ -537,12 +538,12 @@ Art Tags:
 - Mallek
 - Ardata
 - Boldir
-References:
-- WORST END
-- the final clowntdown
-- English
-- Carne Vale
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/the-puppetmaster
 Cover Artists:
 - CyberSoulgem
+Referenced Tracks:
+- WORST END
+- the final clowntdown
+- English
+- Carne Vale
diff --git a/album/genesis-frog.yaml b/album/genesis-frog.yaml
index 714ed1e3..cc028022 100644
--- a/album/genesis-frog.yaml
+++ b/album/genesis-frog.yaml
@@ -1,8 +1,5 @@
 Album: Genesis Frog
 Artist: Alex Rosetti
-Banner Art:
-- Homestuck
-- Niklink (edits for wiki)
 Banner Dimensions: 1100x200
 Wallpaper Style: |-
     opacity: 0.85;
@@ -54,13 +51,14 @@ Cover Artists:
 Wallpaper Artists:
 - Homestuck
 - Quasar Nebula (edits for wiki)
+Banner Artists:
+- Homestuck
+- Niklink (edits for wiki)
 ---
 Group: Main album
 ---
 Track: Prelude
 Duration: '2:03'
-References:
-- Pondsquatter
 Art Tags:
 - Genesis Frog
 URLs:
@@ -71,6 +69,8 @@ Commentary: |-
     This is an album about growth, so I wanted it to start very quiet and exposed. The piece opens with a quartal chord in the harp, and after the atmosphere is established a solo clarinet introduces the main theme of the album.  A portion of the orchestra comes in after that and there’s a small swell before tapering off into a cello solo. The ensemble is pretty scarce in this one due to its subdued nature. There’s not a lot going on in this track overall, but it does its job both as the prelude to Pondsquatter and the album as a whole.
 Cover Artists:
 - Sylladexter
+Referenced Tracks:
+- Pondsquatter
 ---
 Track: Pondsquatter
 Duration: '5:11'
@@ -88,9 +88,6 @@ Cover Artists:
 ---
 Track: Our Glorious Speaker
 Duration: '5:10'
-References:
-- Pondsquatter
-- Sarabande
 Art Tags:
 - Carapacians
 - Genesis Frog
@@ -103,11 +100,12 @@ Commentary: |-
     The music was representing devotion, so I wanted it to have the warmest, most tranquil tone it could. There are two chorale-like sections, the first being the passage the strings play in the beginning, and then later in the brass when the rest of the orchestra drops out for a while. The style of this piece was inspired by Taku Iwasaki’s scores, which often feature very beautiful and lush string textures. I actually don’t think I captured that very well, and in fact strayed from that idea as the piece went on. But the core of the inspiration remains and I think one can tell if they are familiar with his style. Of note is the last third of the piece which is a self-indulgent, overly-romanticized arrangement of Erik Scheele’s Sarabande. It’s such a beautiful piece and I knew from the day I started working on this that I wanted to include it, no matter how schmaltzy I made it sound. Give me a break, it was fun, okay?
 Cover Artists:
 - Rikuru
+Referenced Tracks:
+- Pondsquatter
+- Sarabande
 ---
 Track: Prospitian Folklore
 Duration: '3:38'
-References:
-- Pondsquatter
 Art Tags:
 - Carapacians
 URLs:
@@ -120,14 +118,11 @@ Commentary: |-
     After the main section is over, the piece shifts into a short woodwind chorale, and then into what I can only call a cadenza made up of tense suspended figures in the strings with an out-of-meter pulse underneath. I kind of wrote this last section accidentally, since it somehow started flowing out of the chorale and I just went with it. It seemed to have an air of urgency and importance to me, so I kept it in to represent “Skaia’s reflection through broken glass”, which is such a fascinating image. Broken glass has been a recurring motif in Homestuck and seems to hold important consequences every time it occurs, and the text implies it will be significant in the Genesis Frog’s final destination. So the atmosphere of this final section felt significant and fitting to me.
 Cover Artists:
 - Rikuru
+Referenced Tracks:
+- Pondsquatter
 ---
 Track: Consorts' Intermezzo
 Duration: 0:28
-References:
-- Buy NAK Sell DOOF
-- Pink Shells
-- Entrance of the Salamanders
-- Thip of the Tongue
 Art Tags:
 - Consorts
 - Frogs
@@ -143,11 +138,14 @@ Commentary: |-
     The character of the music during this section is a bit different than the rest of the album due to the inherent silliness of the creatures it is representing. The Consorts are all also, for lack of a better word, dumb. The music reflects that too. This intermezzo transitions from the serious tone of the first section of the album into the absurd rom that is about to follow. The idea of including two intermezzos in this album came from the Actraiser Symphonic Suite, a collection of orchestrations from the SNES game Actraiser that used this classic "in between" sort of music as a way to reiterate a recurring theme. I use these little movements in a slightly different manner, but the spirit is the same. Musically, this is a simple interlude that states all the Consort themes that are to come in a solo viola accompanied by pizzicato strings.
 Cover Artists:
 - Sylladexter
+Referenced Tracks:
+- Buy NAK Sell DOOF
+- Pink Shells
+- Entrance of the Salamanders
+- Thip of the Tongue
 ---
 Track: Buy NAK Sell DOOF
 Duration: '3:50'
-References:
-- track:atomyk-ebonpyre
 Directory: buy-NAK-sell-DOOF
 Contributors:
 - Nyanface
@@ -178,11 +176,11 @@ Commentary: |-
     - Katie Caldwell
 Cover Artists:
 - Sylladexter
+Referenced Tracks:
+- track:atomyk-ebonpyre
 ---
 Track: Pink Shells
 Duration: '3:22'
-References:
-- Pondsquatter
 Art Tags:
 - Consorts
 URLs:
@@ -195,11 +193,11 @@ Commentary: |-
     The middle section is a very loosely based on the Pondsquatter theme, and the high register marimba interjection makes it obvious in case you didn’t pick up on it in the first five notes. This eventually leads back into the main melody of the piece, and a couple sequences later it ends. I wonder how much it shows that I was really short on ideas for this piece. Any time it was playing up the comedy in timing or shifting feel, it felt more like I had no idea what to do and desperately stuck something in so the piece could move on. Maybe I’m being hard on it; I still think it is enjoyable to listen to. But from a compositional standpoint, it is probably the weakest on the album.
 Cover Artists:
 - Rikuru
+Referenced Tracks:
+- Pondsquatter
 ---
 Track: Entrance of the Salamanders
 Duration: '2:56'
-References:
-- Our Glorious Speaker
 Art Tags:
 - Consorts
 URLs:
@@ -212,11 +210,11 @@ Commentary: |-
     I sort of envisioned this composition as a dual piano/organ concerto in terms of how I treated the instruments. Both are featured over the orchestra, and play off it with plenty of silly textures and orchestrations. Stylistically, the oom-pah marching characteristics combined with the instrumentation may call to mind images of a circus, which is in fact how the piece got its name. It’s kind of a veiled reference, but if you know what the title is referring to then it’s easy to figure out why it resembles circus music. And of course in the spirit of things, for one last antic I finished it off with a slide whistle; an instrument I thought represented the salamanders’ bubbles pretty well.
 Cover Artists:
 - Sylladexter
+Referenced Tracks:
+- Our Glorious Speaker
 ---
 Track: Thip of the Tongue
 Duration: '4:09'
-References:
-- Stoke the Forge
 Art Tags:
 - Consorts
 URLs:
@@ -229,11 +227,11 @@ Commentary: |-
     The second part is where things get interesting. It is the only section of the album where I drop the orchestra shtick completely and use an ensemble of recorders, crumhorns, pipes, and an unconventional rhythm section featuring a dulcimer. I thought about what kind of music the Iguanas would make if given the opportunity. I figured they would have a lot of primitive instruments at hand and would produce simple, joyous music. This whole section is unabashedly a tribute to Kumi Tanioka’s work in Final Fantasy: Crystal Chronicles. It’s a sort of re-imagining of this world of ancient instruments that she created, and it was one of my earliest influences. There are also seeds of Yasunori Mitsuda in here; it is such a fun piece that I don’t mind citing very strong influences here if people want to hear similar music to this.
 Cover Artists:
 - Rikuru
+Referenced Tracks:
+- Stoke the Forge
 ---
 Track: Frogs' Intermezzo
 Duration: 0:14
-References:
-- Pondsquatter
 Art Tags:
 - Consorts
 - Frogs
@@ -249,12 +247,11 @@ Commentary: |-
     This intermezzo changes the tone from the lighthearted Consort music to something more full of wonder to suit the story to come. It is a simple swell based on the Pondsquatter theme, and once it settles down, the texture becomes very sparse so as to lead into Breeding Duties.
 Cover Artists:
 - Sylladexter
+Referenced Tracks:
+- Pondsquatter
 ---
 Track: Breeding Duties
 Duration: '5:09'
-References:
-- Pondsquatter
-- Prospitian Folklore
 Art Tags:
 - Jade
 - Frogs
@@ -269,10 +266,11 @@ Commentary: |-
     But still, I did have a lot of scenes brewing in my head with this one, so I think it is totally appropriate to imagine a story going along with it. Anyway, the majestic section cuts off for a few seconds, then a booming section based on the opening stumbles in and leaves as fast as it entered. From that point on the material from Pondsquatter comes in and is given the same feel as the rest of this piece, and if there was any one word I had to describe this last section with it would be, “shenanigans”. Incidentally, I consider this and Great LOFAF Expedition of 2009 to be the heart of the album. There will be more on that later in the commentary.
 Cover Artists:
 - Sylladexter
+Referenced Tracks:
+- Pondsquatter
+- Prospitian Folklore
 ---
 Track: Stoke the Forge
-References:
-- Prospitian Folklore
 Duration: '3:43'
 Art Tags:
 - Frogs
@@ -285,12 +283,11 @@ Commentary: |-
     The piece opens with a brass fanfare based off the Folklore theme interspersed with anvil and bass drum hits. The decision to feature the anvil came from Dave’s denizen, Hephaestus, who is referred to as “Lord of the Forge” with little explanation other than he desired access to Jade’s Forge to repair the Caledfwlch. In fact, the entire piece has the feeling of hammering, since harsh gestures in the brass and strings are common in combination with liberal usage of timpani and bass drum. The entire piece is in Dorian, which is a mode I can rarely resist composing in, and it lends a big sense of adventure to it. Formally there is not a lot going on, other than a melody being repeated several times with different orchestration and transposition. An interesting moment occurs when the entire ensemble drops out and a flute solo comes in playing a lighter, more humorous version of the tune before heading towards the climax. All in all, it is a pretty standard theme with a solid tune despite the fact that nothing extraordinary happens for its duration. But hey, we wouldn’t want overkill would we? I was saving that for the next track.
 Cover Artists:
 - Sylladexter
+Referenced Tracks:
+- Prospitian Folklore
 ---
 Track: Great LOFAF Expedition of 2009
 Duration: '4:55'
-References:
-- Pondsquatter
-- Our Glorious Speaker
 Art Tags:
 - Jade
 - Frogs
@@ -305,6 +302,9 @@ Commentary: |-
      The music makes a shift into 7/8, though no true pulse is really established. As a result, many different lines of counterpoint come in at disjointed intervals, lending to the image of a lot of different frogs hopping around in the depths of the forest. The pace picks up again when the music shifts back to simple meter and the march rhythm is brought back. There is more counterpoint here with the main motive of the piece; it is overlayed with itself in several different rhythmic rhythmic transpositions over the march ostinato. Then, after a brief interlude, the piece shifts back into 7/8 with more of a pulse, and the Pondsquatter theme is repeated in full followed by a coda based on this piece’s motive. This is one of the few pieces on the album that ends on an unambiguous tonic chord, which I thought was very refreshing at this point. Especially in light of this piece, which I promised would be overkill thanks to all the ridiculous directions it manages to go in for its duration of five minutes.
 Cover Artists:
 - Sylladexter
+Referenced Tracks:
+- Pondsquatter
+- Our Glorious Speaker
 ---
 Track: The Temple's Withered Bloom
 Duration: '2:55'
@@ -326,10 +326,6 @@ Cover Artists:
 ---
 Track: Bilious
 Duration: '4:05'
-References:
-- Prospitian Folklore
-- Liquid Negrocity
-- The Temple's Withered Bloom
 Art Tags:
 - Jack Noir
 - Genesis Frog
@@ -344,11 +340,13 @@ Commentary: |-
     At this point I figured, what the hell, I’ll quote Black. It actually fits quite well with the “Jack” device from The Temple’s Withered Bloom that I bring back here, thanks to the fact that they both emphasise on the tritone. My own Jack motive begins to take over from Radiation’s, and eventually the strings are playing it in canon as it gets more and more chaotic, until everything drops out and the lower piano register begins an ostinato based on it. The orchestra builds again into more chaotic textures, the tension drops briefly, and then the theme is recapped as the climax. All in all it is probably the most exciting piece on the album, and for my first foray into more action-like music, I think it does its job well.
 Cover Artists:
 - Rikuru
+Referenced Tracks:
+- Prospitian Folklore
+- Liquid Negrocity
+- The Temple's Withered Bloom
 ---
 Track: Speaker (Skaia's Reflection)
 Duration: '2:57'
-References:
-- Pondsquatter
 Art Tags:
 - Genesis Frog
 URLs:
@@ -361,17 +359,11 @@ Commentary: |-
 Cover Artists:
 - Sylladexter
 - Rikuru
+Referenced Tracks:
+- Pondsquatter
 ---
 Track: The Vast Croak
 Duration: '5:08'
-References:
-- Pondsquatter
-- Prospitian Folklore
-- Buy NAK Sell DOOF
-- Pink Shells
-- Entrance of the Salamanders
-- Thip of the Tongue
-- Frogs' Intermezzo
 Art Tags:
 - Genesis Frog
 - 'cw: body horror (abstract)'
@@ -386,17 +378,19 @@ Commentary: |-
     The A section then returns in a transposed form before the piece ends in a very big fashion. When all appears to be said and done and the very last of the reverberation is dying off, the harp comes in. It is followed by clarinet, piano, celesta, and finally the violins playing harmonics; this is the instrumentation the album opened with. This small ensemble plays a subdued arrangement of Pondsquatter, and the album ends as it began in the vastness of paradox space. If you start the album over again, you will find that it flows seamlessly from the ending to beginning. Somewhere in this revelation lies my ultimate artistic intent with Genesis Frog, which probably involves something about infinity’s endless repetition, or life always finding a way forward, or something along those lines depending on how pretentious you want to think of me as.
 Cover Artists:
 - Rikuru
+Referenced Tracks:
+- Pondsquatter
+- Prospitian Folklore
+- Buy NAK Sell DOOF
+- Pink Shells
+- Entrance of the Salamanders
+- Thip of the Tongue
+- Frogs' Intermezzo
 ---
 Group: Bonus tracks
 ---
 Track: Pondsquatter (Live Chamber Version)
 Duration: '6:02'
-References:
-- Prelude
-- Pondsquatter
-- Frogs' Intermezzo
-- Great LOFAF Expedition of 2009
-- Breeding Duties
 URLs:
 - https://youtu.be/l07w1i-C7hs
 Commentary: |-
@@ -406,15 +400,21 @@ Commentary: |-
     During my Junior year of college, I had the opportunity to have one of my pieces read by the acclaimed Talea Ensemble, a chamber group that was visiting my college and doing a performance there. They graciously offered to read through student works and provide commentary for us. I took advantage of this in an odd way and arranged Pondsquatter for Pierrot Ensemble, an instrumentation that consists of piano, violin, cello, flute, clarinet, and in some cases percussion. This recording was made during a runthrough they did of it, and what you should keep in mind is that this was all sightread. Obviously the performance is not perfect, and I’m slightly afraid of sharing this in case I embarrass the ensemble with it, but I can guarantee that had they prepared it beforehand, it would have been perfect. However, even without prior preparation, the performance is astounding and I thank them dearly.
     In case you are reading this online and are unable to buy the album to obtain this bonus track, you can find it on both my website and my music blog, the URLs of which are provided at the end of this commentary.
 Has Cover Art: false
+Referenced Tracks:
+- Prelude
+- Pondsquatter
+- Frogs' Intermezzo
+- Great LOFAF Expedition of 2009
+- Breeding Duties
 ---
 Track: Frogsong
 Duration: '2:24'
-References:
-- Pondsquatter
-- weird moody horse shit
 URLs:
 - https://youtu.be/xINZv3-S6xU
 Commentary: |-
     <i>Alex Rosetti:</i>
     This was originally going to be in the album, but I excluded it because it didn’t fit enough with the orchestral feel and I didn’t really know where to go with it after the first minute. It’s still a very fun piece though, and I thought it was worth including as a little bonus. I may have employed heavy use of certain frog-related sound effects...it’s a bit of a weakness...
 Has Cover Art: false
+Referenced Tracks:
+- Pondsquatter
+- weird moody horse shit
diff --git a/album/gristmas-carols.yaml b/album/gristmas-carols.yaml
index a3fd1395..f6332a88 100644
--- a/album/gristmas-carols.yaml
+++ b/album/gristmas-carols.yaml
@@ -1,6 +1,4 @@
 Album: Gristmas Carols
-Banner Art:
-- melodiousDiscord
 Banner Dimensions: 1100x180
 Has Track Art: false
 Date: December 25, 2017
@@ -31,15 +29,12 @@ Cover Artists:
 - Ephemerald
 Wallpaper Artists:
 - Ephemerald
+Banner Artists:
+- melodiousDiscord
 ---
 Track: A Very Merry Gristmas Indeed
 Artist: ndividedbyzero
 Duration: '3:49'
-References:
-- Homestuck Anthem
-- Deck the Halls
-- Smiles and Tears
-- Snowdin Town
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/a-very-merry-gristmas-indeed
 - https://youtu.be/d3axpwRy9dQ
@@ -47,18 +42,23 @@ Commentary: |-
     <i>ndividedbyzero:</i>
     When I set out to make my first song for this album I only had two things in mind. The first was to make at least part of it feel like one of those classic 80s Christmas songs that everyone loves, a la Wham!. The second was to make it feel like the in-betweens of the holiday experience: after the unwrapping of presents or whichiver main celebration applies, in the midst of the gathering, before everyone's said their goodbyes and while the spirit of holiday cheer still remains. A theme you could have a cup of hot chocolate to while engaging a seldom-seen relative in lighthearted conversation.
     Whether I succeeded in these things is up to you. But in any case, I had a whole lot of fun making this!
+Referenced Tracks:
+- Homestuck Anthem
+- Deck the Halls
+- Smiles and Tears
+- Snowdin Town
 ---
 Track: Twelfth Perigee's Eve Sarabande
 Artist: Sean Gorter
 Duration: '1:52'
-References:
-- Sarabande
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/twelfth-perigees-eve-sarabande
 - https://youtu.be/Q67iEYetWLM
 Commentary: |-
     <i>Sean Gorter:</i>
     I had actually written out an entire Troll parody of Michael Caine's line in The Dark Knight talking about working for the local government in Burma, but when I tried recording over the music I realized it ruined a perfectly good jazz arrangement. Now all that's left of Troll Michael Caine is this stupid throwaway intro.
+Referenced Tracks:
+- Sarabande
 ---
 Track: You're A Mean One, Mr. Slick
 Artist: WHATISLOSTINTHEMINES
@@ -68,10 +68,6 @@ Contributors:
 - SplitSuns (lyrics)
 - Ephemerald (lyrics)
 Duration: '2:42'
-References:
-- You're A Mean One, Mr. Grinch
-- Liquid Negrocity
-- Walk-Stab-Walk (R&E)
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/youre-a-mean-one-mr-slick
 - https://youtu.be/sBLIayXR_sU
@@ -83,72 +79,76 @@ Lyrics: |-
 Commentary: |-
     <i>WHATISLOSTINTHEMINES:</i>
     This was fairly annoying to put together, as I'm not a particularly strong singer, and I wasn't able to find a good recording environment while I was making this. In any case, I hope you'll enjoy my warbling.
+Referenced Tracks:
+- You're A Mean One, Mr. Grinch
+- Liquid Negrocity
+- Walk-Stab-Walk (R&E)
 ---
 Track: Creation Myth
 Artist: Kanishka
 Duration: '2:36'
-References:
-- track:skies-of-skaia
-- Frostbite
-- a baby is born
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/creation-myth
 - https://youtu.be/GIWe1ZlioTk
 Commentary: |-
     <i>Kanishka:</i>
     Who would even write this conksunk song anyway?
+Referenced Tracks:
+- track:skies-of-skaia
+- Frostbite
+- a baby is born
 ---
 Track: JOHN DO THE SNOWY THING
 Artist: WHATISLOSTINTHEMINES
 Duration: '2:02'
-References:
-- JOHN DO THE WINDY THING
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/john-do-the-snowy-thing
 - https://www.youtube.com/watch?v=WH_LmsPYgr0
 Commentary: |-
     <i>WHATISLOSTINTHEMINES:</i>
     As you could probably guess, this song was inspired by RJ's Lofam 3 track: [[track:john-do-the-windy-thing]]. I'd like to apologize in advance.
+Referenced Tracks:
+- JOHN DO THE WINDY THING
 ---
 Track: Strider the Snowman
 Artist: FrostyMac
 Duration: 0:55
-References:
-- Frosty the Snowman
-- track:beatdown-strider-style
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/strider-the-snowman
 - https://youtu.be/6XWxat4vn2A
 Commentary: |-
     <i>FrostyMac:</i>
     I made this whole thing in Spanish class. Suck it productivity!
+Referenced Tracks:
+- Frosty the Snowman
+- track:beatdown-strider-style
 ---
 Track: YOUR LORD. AND HIS HOLY GREEN SLEEVES.
 Artist: ndividedbyzero
 Duration: '3:14'
-References:
-- Greensleeves
-- Eternity Served Cold
-- HOMOSUCK. DIRECTOR'S CUT, OF THE YEAR EDITION.
-- Carol of the Bells
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/your-lord-and-his-holy-green-sleeves
 - https://youtu.be/qyzSR1iGCL4
 Commentary: |-
     <i>ndividedbyzero:</i>
     Caliborn would probably love Christmas, if it were about him, and if all presents people got were also given to him. On Christmas Eve he would travel on his Cairo Overcoat all across the world, taking people's presents from under their trees and hoarding them all, like some sort of weird nega-Santa. Then he'd probably proceed to do nothing with them, because human artifacts are beneath his stature, except when they aren't. What a guy.
+Referenced Tracks:
+- Greensleeves
+- Eternity Served Cold
+- HOMOSUCK. DIRECTOR'S CUT, OF THE YEAR EDITION.
+- Carol of the Bells
 ---
 Track: Fuchsia Sleighride
 Artist: PoisonedElite
 Duration: '3:57'
-References:
-- Fuchsia Moonrise
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/fuchsia-sleighride
 - https://youtu.be/y4jxrIlulr0
 Commentary: |-
     <i>PoisonedElite:</i>
     Imagine Meenah in a Full Santa outfit riding a sleigh. Most of the instruments I made using FM synthesis and it was hard.
+Referenced Tracks:
+- Fuchsia Moonrise
 ---
 Track: End of Act
 Artist: Sean Gorter
diff --git a/album/hiveswap-act-1-ost.yaml b/album/hiveswap-act-1-ost.yaml
index 9d094a86..4d92fb44 100644
--- a/album/hiveswap-act-1-ost.yaml
+++ b/album/hiveswap-act-1-ost.yaml
@@ -27,24 +27,24 @@ Duration: 0:21
 URLs:
 - https://homestuck.bandcamp.com/track/definitely-safe-forever-2
 - https://youtu.be/NkNtHnzH6cc
-References:
-- Joey Claire, Extraordinaire
 Commentary: |-
     <i>James Roach:</i>
     This is the track that has been rewritten the most. It’s so much better now than it used to be. This latest version is meant to tie in with the title screen music. It’s based around Joey and Jude’s theme, and has a few nods in there to some others if you’re listening.
+Referenced Tracks:
+- Joey Claire, Extraordinaire
 ---
 Track: Snake Escape
 Duration: 0:41
 URLs:
 - https://homestuck.bandcamp.com/track/snake-escape-2
 - https://youtu.be/NFhRUwGzPcs
-References:
-- Singular Peril
-- Joey Claire, Extraordinaire
-- Half-Harley Manor
 Commentary: |-
     <i>James Roach:</i>
     In its current form, I think this is one of the best examples on this soundtrack of what Toby and I’s respective styles sound like mixed together. Toby doesn’t like to use a lot of percussion, so I wrote this based on what was originally a piano piece. It is one of the VERY first things written for the game. WOW. The original version of this sounds a lot more like “SINGULAR PERIL” without any drums and not sampled, so just like, straight 8ths.
+Referenced Tracks:
+- Singular Peril
+- Joey Claire, Extraordinaire
+- Half-Harley Manor
 ---
 Track: Joey Claire, Extraordinaire
 Duration: '2:50'
@@ -62,18 +62,16 @@ Duration: '2:52'
 URLs:
 - https://homestuck.bandcamp.com/track/half-harley-manor-2
 - https://youtu.be/jfdTeNsU4ow
-References:
-- Joey Claire, Extraordinaire
 Commentary: |-
     <i>James Roach:</i>
     This went through a bunch of revisions, too. It used a lot of harpsichord originally, which we then thought we’d use a little more sparingly. When we first came onto the project Andrew told us “it’s like a haunted house” so we really made it like… spooky but months down the line Andrew was like “ok lads reel it in it’s not actually haunted just lonely” so we switched it to piano and toned it down a bit. Toby ended up doing the final version of this one, though I think a piano version I did exists somewhere too.
     <i>Toby Fox:</i>
     This is one of the first tracks I did for the game. I’m pretty proud of how it turned out from a musical standpoint, though I guess it’s kind of serious given how goofy the house looks. Whoops…
+Referenced Tracks:
+- Joey Claire, Extraordinaire
 ---
 Track: Relatively Visible Darkness
 Duration: '2:02'
-References:
-- Half-Harley Manor
 URLs:
 - https://homestuck.bandcamp.com/track/relatively-visible-darkness-2
 - https://youtu.be/7ht1khfdGzo
@@ -84,10 +82,10 @@ Commentary: |-
     It sounds kind of like Yoshi’s Story to me. This turned out to be a really tuba-heavy soundtrack somehow. Maybe that’s a good thing though.
     <i>James Roach:</i>
     We just kept telling each other to add Tuba to things. Like some sort of Will They/Won’t They Tuba standoff.
+Referenced Tracks:
+- Half-Harley Manor
 ---
 Track: Bedroom for an Annoying Dog
-References:
-- Half-Harley Manor
 Duration: '3:32'
 URLs:
 - https://homestuck.bandcamp.com/track/bedroom-for-an-annoying-dog-2
@@ -99,12 +97,11 @@ Commentary: |-
     I literally didn’t understand why it was called this until I read James’s comment on it.
     <i>James Roach:</i>
     Toby what the hell.
+Referenced Tracks:
+- Half-Harley Manor
 ---
 Track: That's How I Beat Snake
 Duration: '2:11'
-References:
-- SERPENT GENESIS
-- Half-Harley Manor
 URLs:
 - https://homestuck.bandcamp.com/track/thats-how-i-beat-snake-2
 - https://youtu.be/xq9PkYNsTLU
@@ -115,36 +112,37 @@ Commentary: |-
     They probably should have also named the song that plays when you play the Snake minigame this. Just two songs with an identical name. That would be have been cool.
     <i>Cohen Edenfield:</i>
     (Hey Cohen here. several people have asked if the title is a reference to the aaron carter song. obviously it is, yes, that. James’ song titles were good but they were usually a very direct reference to what actually happened in the scene they were playing for. So I renamed them, because I didn’t want people poring over the tracklist to decode the entire plot before actually playing the game. because you would have. I know you.)
+Referenced Tracks:
+- SERPENT GENESIS
+- Half-Harley Manor
 ---
 Track: Jude Harley, Bizarrely
 Duration: '1:38'
 URLs:
 - https://homestuck.bandcamp.com/track/jude-harley-bizarrely-2
 - https://youtu.be/nLTcCJH4QQg
-References:
-- Half-Harley Manor
-- Joey Claire, Extraordinaire
 Commentary: |-
     <i>James Roach:</i>
     Hey did you know Jude’s treehouse theme is just a slightly different “Joey Claire, Extraordinaire?” Anyway here is where I first accidentally discovered how fun it is to write a completely unlistenable synth sound that sounds like some hapless dweeb. I have truly realized my ultimate self.
     <i>Toby Fox:</i>
     Besides tubas, I think James’s weird voicey grubble synths that sound like they’re yelling are maybe the most defining instrument of this soundtrack.
+Referenced Tracks:
+- Half-Harley Manor
+- Joey Claire, Extraordinaire
 ---
 Track: Table for Tooth
 Duration: '2:15'
-References:
-- Half-Harley Manor
 URLs:
 - https://homestuck.bandcamp.com/track/table-for-tooth-2
 - https://youtu.be/iSHxqEXZ_YU
 Commentary: |-
     <i>James Roach:</i>
     I wrote this in 2014 and I THINK the original monster you fought here was the proto version big monster with two mouths, from the Living Room STRIFE. I wanted the synth to sound like the monster singing because I didn’t know how the monsters sounded yet and I thought it’d be funny if they were like stupid idiots.
+Referenced Tracks:
+- Half-Harley Manor
 ---
 Track: Final Spice
 Duration: 0:54
-References:
-- track:alternate-recipe
 URLs:
 - https://homestuck.bandcamp.com/track/final-spice-2
 - https://youtu.be/xvY_5XLVtj4
@@ -157,25 +155,25 @@ Commentary: |-
     It is my favorite song on Vol. 1.
     <i>Cohen Edenfield:</i>
     (hi it’s Cohen I intentionally made this strife more convoluted and complex as a result of how much I love this song, sorry)
+Referenced Tracks:
+- track:alternate-recipe
 ---
 Track: Living Legend
 Duration: '1:22'
 URLs:
 - https://homestuck.bandcamp.com/track/living-legend-2
 - https://youtu.be/2h1AwHOqSyM
-References:
-- Half-Harley Manor
-- Joey Claire, Extraordinaire
 Commentary: |-
     <i>James Roach:</i>
     I wanted to write something very Final Fantasy Boss Battle™ and around the time I wrote this an article came out where Nobuo Uematsu says he just wrote phrases a few measures at a time and put them together so that’s what I did. (<a href="https://www.youtube.com/watch?v=mvyE9AJoUCM">youtube.com/watch?v=mvyE9AJoUCM</a>)
     <i>Toby Fox:</i>
     Basically James is saying this is the One Winged Angel of the Hiveswap soundtrack.
+Referenced Tracks:
+- Half-Harley Manor
+- Joey Claire, Extraordinaire
 ---
 Track: Singular Peril
 Duration: '1:22'
-References:
-- Half-Harley Manor
 URLs:
 - https://homestuck.bandcamp.com/track/singular-peril-2
 - https://youtu.be/fQyCThoSwCA
@@ -184,11 +182,11 @@ Commentary: |-
     This was written based off the extremely old original snake chase sketch Toby did. I wanted to put that throwback in for myself. Like an easter egg only I know or care about. I also wanted to try like… sampling stuff since I’m not super good at it yet and wanted to grow as a composer.
     <i>Cohen Edenfield:</i>
     (hey this is named Singular Peril because it plays during the only point in Act 1 when you can die. do you get the joke)
+Referenced Tracks:
+- Half-Harley Manor
 ---
 Track: A More Defensible Position
 Duration: 0:57
-References:
-- Half-Harley Manor
 URLs:
 - https://homestuck.bandcamp.com/track/a-more-defensible-position-2
 - https://youtu.be/DhNOD_CRa5c
@@ -197,11 +195,11 @@ Commentary: |-
     This is a Toby Track 100% he just goes ham with echo. If you ever look at his work files it’s like a thousand tracks and half of them are just echoes. This sounds so good toby is so good. I think this was originally a loop for… <a href="https://soundcloud.com/hiveswap/conversation-loops">in between conversations or something</a>?
     <i>Toby Fox:</i>
     I think it was just written for the attic in general.
+Referenced Tracks:
+- Half-Harley Manor
 ---
 Track: Open The Door
 Duration: '1:01'
-References:
-- track:how-it-could-have-gone
 URLs:
 - https://homestuck.bandcamp.com/track/open-the-door-2
 - https://youtu.be/VEQt6FPj3-g
@@ -210,11 +208,11 @@ Commentary: |-
     This track has a really rich backstory, in the sense that it has had several complete versions each with their own revision process. You can check out one of those versions in the B-side “how it could have gone” available on bandcamp.
     <i>Toby Fox:</i>
     My main contribution to this track is the piano riff 10 seconds in… Hell yeah…
+Referenced Tracks:
+- track:how-it-could-have-gone
 ---
 Track: Keep Your Head Down
 Duration: '1:10'
-References:
-- Rustblood
 URLs:
 - https://homestuck.bandcamp.com/track/keep-your-head-down-2
 - https://youtu.be/47IOSYnYiRc
@@ -227,11 +225,11 @@ Commentary: |-
     Me neither.
     <i>James Roach:</i>
     We are frauds.
+Referenced Tracks:
+- Rustblood
 ---
 Track: Oh Whoa, What's This
 Duration: '1:05'
-References:
-- Some Kind of Alien
 URLs:
 - https://homestuck.bandcamp.com/track/oh-whoa-whats-this-2
 - https://youtu.be/a1fm7sHekVE
@@ -244,11 +242,11 @@ Commentary: |-
     <i>Cohen Edenfield:</i>
     (hi it’s Cohen. When I renamed the album tracks this was one of only 2 or 3 that James really wanted to keep. He didn’t tell me that it was a furry meme. I don’t know about memes. I’m just a little bappy paws otter I don’t know shit)
     <img src="media/misc/owo.png" width="500" height="421">
+Referenced Tracks:
+- Some Kind of Alien
 ---
 Track: Some Kind of Alien
 Duration: '1:30'
-References:
-- track:crustacean
 URLs:
 - https://homestuck.bandcamp.com/track/some-kind-of-alien-2
 - https://youtu.be/PDZfnEW86Qc
@@ -261,6 +259,8 @@ Commentary: |-
     Anyway because a few of my friends really liked that song and it seemed to feel really “Troll” to me, it seemed like a good idea to bring back that feeling for Hiveswap. And get some nostalgia in there as well. And to put more tubas on the soundtrack.
     <i>James Roach:</i>
     My contribution to this track is that I made <i>Toby</i> go in and add in more tuba. There is a disgusting tuba-less version of this song that will never see the light of day.
+Referenced Tracks:
+- track:crustacean
 ---
 Track: Rustblood
 Duration: '1:17'
@@ -277,8 +277,6 @@ Commentary: |-
 ---
 Track: Filthy Nuclear Bunker
 Duration: '4:34'
-References:
-- Rustblood
 URLs:
 - https://homestuck.bandcamp.com/track/filthy-nuclear-bunker-2
 - https://youtu.be/Du1cFu4zl4o
@@ -289,11 +287,11 @@ Commentary: |-
     I actually think this is James’s best arrangement of the song that he wrote when he was 12 that he keeps putting into everything. I’m glad it could be used somewhere the player will be forced to listen to it for a really long time. It’s great.
     <i>James Roach:</i>
     I made it his hive theme just to force people to listen to it again.
+Referenced Tracks:
+- Rustblood
 ---
 Track: SPORTS! Personally, I Love Them.
 Duration: '3:36'
-References:
-- Rustblood
 URLs:
 - https://homestuck.bandcamp.com/track/sports-personally-i-love-them-2
 - https://youtu.be/jNtIznTXLpo
@@ -306,11 +304,11 @@ Commentary: |-
     I would love to see you try little man.
     <i>Cohen Edenfield:</i>
     (I don’t know what anime he’s talking about. I guess the paused Arena Stickball match on the TV is pretty anime-looking. But James also sees anime everywhere, wherever he goes. One time I saw him pick a rotten peach up off the ground, call it a “tsun-momo,” and take a huge bite. He bit right through the pit)
+Referenced Tracks:
+- Rustblood
 ---
 Track: Lofted Gunpile
 Duration: '4:08'
-References:
-- Some Kind of Alien
 URLs:
 - https://homestuck.bandcamp.com/track/lofted-gunpile-2
 - https://youtu.be/zNrEIxvGA8M
@@ -320,6 +318,8 @@ Commentary: |-
     <img src="media/misc/lofted-gunpile.png" width="500" height="289">
     <i>Toby Fox:</i>
     Your advice didn’t work on me because I just like things to be really loud all the time.
+Referenced Tracks:
+- Some Kind of Alien
 ---
 Track: SERPENT GENESIS
 Duration: '1:14'
@@ -341,18 +341,16 @@ Duration: '3:18'
 URLs:
 - https://homestuck.bandcamp.com/track/we-shall-go-together-2
 - https://youtu.be/IzsFUuvWIuI
-References:
-- Joey Claire, Extraordinaire
 Commentary: |-
     <i>James Roach:</i>
     OK I know what you’re thinking, “This gets its own track on the OST, but OLD SECRET isn’t even here??” Hey look I love old secret too but <i>(COHEN: redacted)</i>. I only put it in that cutscene for you, the fans. Also it fit really well. Anyway, this track is inspired a lot by <a href="https://tobyfox.bandcamp.com/track/quiet-water">Quiet Water</a> by Toby Fox maybe you’ve heard of him. It is just a <a href="https://www.youtube.com/watch?v=RwICiHW-Pyk">very slowed down</a> version of Joey’s theme.
     <i>Cohen Edenfield:</i>
     (if you want to know what the title of this song is from google it with quotes)
+Referenced Tracks:
+- Joey Claire, Extraordinaire
 ---
 Track: Wish You Were Here
 Duration: 0:50
-References:
-- Intermission 1
 URLs:
 - https://homestuck.bandcamp.com/track/wish-you-were-here-2
 - https://youtu.be/GZv2KDakIVs
@@ -363,16 +361,14 @@ Commentary: |-
     This song is cool
     <i>Cohen Edenfield:</i>
     (James thought I wouldn’t <s>embed</s> <a href="https://www.youtube.com/watch?v=ZkBMXQ47d7s">link</a> this video! he underestimates me every single day of my life)
+Referenced Tracks:
+- Intermission 1
 ---
 Track: Intermission 1
 Duration: '2:12'
 URLs:
 - https://homestuck.bandcamp.com/track/intermission-1-2
 - https://youtu.be/CbhUNkmqMHA
-References:
-- Rustblood
-- Joey Claire, Extraordinaire
-- Filthy Nuclear Bunker
 Commentary: |-
     <i>James Roach:</i>
     This has a bunch of different themes but is mostly the Heiress’s theme, which is based off a <a href="https://soundcloud.com/hiveswap/original-heiress-piano-concept">really old really simple piano sketch toby sent me</a>. It’s got Nuclear in it too. also Joeys theme and Xefros’s theme. I am explicitly not saying the word “leitmotif” out of a sort of… <a href="https://www.youtube.com/watch?v=p0ySY6xyvf0">indignant disgust</a>.
@@ -380,6 +376,10 @@ Commentary: |-
     There was a longer Heiress sketch too where it got really loud. Anyway I guess we’ll talk about that later when <i>(redacted)</i>
     <i>James Roach:</i>
     I absolutely refuse to wait another second.
+Referenced Tracks:
+- Rustblood
+- Joey Claire, Extraordinaire
+- Filthy Nuclear Bunker
 ---
 Group: B-Sides
 ---
@@ -397,8 +397,6 @@ Commentary: |-
 ---
 Track: How it Could Have Gone
 Duration: '1:14'
-References:
-- Half-Harley Manor
 Directory: how-it-could-have-gone
 URLs:
 - https://homestuck.bandcamp.com/track/b-side-how-it-could-have-gone-2
@@ -408,6 +406,8 @@ Commentary: |-
     I [[track:open-the-door|already]] talked about this one I guess??
     <i>Toby Fox:</i>
     This was basically James’s arrangement of MY arrangement of the cutscene where, spoilers, Joey gets HIVE-SWAPPED!!!!!! The part where the choirs are soft was going to be the part when her and Dammek look at each other.
+Referenced Tracks:
+- Half-Harley Manor
 ---
 Track: Alternate Recipe
 Duration: '1:30'
@@ -429,10 +429,6 @@ Directory: heavy-snaking
 URLs:
 - https://homestuck.bandcamp.com/track/b-side-heavy-snaking-2
 - https://youtu.be/GL3l_Klo8ic
-References:
-- Half-Harley Manor
-- Table for Tooth
-- Joey Claire, Extraordinaire
 Commentary: |-
     <i>James Roach:</i>
     When we first envisioned the basement/snake strife it was gonna be really moody like the basement music. I wrote this as a joke but it worked out really well. But later we decided that scene could use a little BEEFING UP in terms of… intensity and energy? Anyway that’s how a completely finished track ended up as a b-side. Could we re-use it later? Not really it’s literally the mansion theme and table for tooth so it cant go anywhere else!
@@ -444,12 +440,13 @@ Commentary: |-
     like just an unbelievably chill snake.
     <i>Toby Fox:</i>
     Yeah like wearing sunglasses and its attack is to tell you to not do drugs.
+Referenced Tracks:
+- Half-Harley Manor
+- Table for Tooth
+- Joey Claire, Extraordinaire
 ---
 Track: SPOOKTUNE
 Duration: 0:50
-References:
-- track:spooktune-undertale
-- Relatively Visible Darkness
 Directory: spooktune
 URLs:
 - https://homestuck.bandcamp.com/track/b-side-spooktune-2
@@ -465,3 +462,6 @@ Commentary: |-
     Great job team
     <i>Cohen Edenfield:</i>
     OK everybody that’s it. We’ll be back next week with something else, which will also be good. Probably something about the art? Yeah. OK bye.
+Referenced Tracks:
+- track:spooktune-undertale
+- Relatively Visible Darkness
diff --git a/album/hiveswap-act-2-ost.yaml b/album/hiveswap-act-2-ost.yaml
index fa02136c..9e3d1bd9 100644
--- a/album/hiveswap-act-2-ost.yaml
+++ b/album/hiveswap-act-2-ost.yaml
@@ -42,22 +42,22 @@ Group: Main album
 Track: On-Time Departure
 Artist: James Roach
 Duration: '3:04'
-References:
-- Wish You Were Here
-- Some Kind of Alien
-- Joey Claire, Extraordinaire
 URLs:
 - https://homestuck.bandcamp.com/track/on-time-departure
 - https://youtu.be/jxuEFaDyD0s
+Referenced Tracks:
+- Wish You Were Here
+- Some Kind of Alien
+- Joey Claire, Extraordinaire
 ---
 Track: Lunch Break
 Artist: James Roach
 Duration: '1:05'
-References:
-- Joey Claire, Extraordinaire
 URLs:
 - https://homestuck.bandcamp.com/track/lunch-break
 - https://youtu.be/XO4geGxyOK4
+Referenced Tracks:
+- Joey Claire, Extraordinaire
 ---
 Track: Above Sea Level
 Artist: James Roach, Toby Fox
@@ -67,39 +67,42 @@ URLs:
 - https://youtu.be/S42nK1sihuc
 ---
 Track: Studio Space
-AKA: Charun's Cave
 Artist: Toby Fox
 Duration: '1:02'
 URLs:
 - https://homestuck.bandcamp.com/track/studio-space
 - https://youtu.be/Rwi2BvZ30SY
+Also Released As:
+- Charun's Cave
 ---
 Track: Raw Honey
 Artist: James Roach, Toby Fox
 Duration: '2:45'
-References:
-- Homestead
 URLs:
 - https://homestuck.bandcamp.com/track/raw-honey
 - https://youtu.be/xAwi2PS382s
+Referenced Tracks:
+- Homestead
 ---
 Track: Homestead
-AKA: beekeeper who? i dont know her.
 Artist: James Roach
 Duration: '1:42'
 URLs:
 - https://homestuck.bandcamp.com/track/homestead
 - https://youtu.be/xDyuk7rRSVA
+Also Released As:
+- beekeeper who? i dont know her.
 ---
 Track: Shell Game
-AKA: SERVICE CAR
 Artist: James Roach
 Duration: '4:05'
-References:
-- track:ticket-to-ride-rusty
 URLs:
 - https://homestuck.bandcamp.com/track/shell-game
 - https://youtu.be/2NolhxSH9I8
+Referenced Tracks:
+- track:ticket-to-ride-rusty
+Also Released As:
+- SERVICE CAR
 ---
 Track: 'Ticket to Ride: Rusty'
 Artist: James Roach
@@ -111,11 +114,11 @@ URLs:
 Track: 'Ticket to Ride: Quadrant Confusion'
 Artist: Toby Fox
 Duration: '1:45'
-References:
-- track:ticket-to-ride-rusty
 URLs:
 - https://homestuck.bandcamp.com/track/ticket-to-ride-quadrant-confusion
 - https://youtu.be/12X31slGqKw
+Referenced Tracks:
+- track:ticket-to-ride-rusty
 ---
 Track: The Prince of All Mustardbloods
 Artist: James Roach
@@ -127,20 +130,20 @@ URLs:
 Track: 'Ticket to Ride: Trial Variation'
 Artist: Toby Fox
 Duration: '1:50'
-References:
-- track:ticket-to-ride-rusty
 URLs:
 - https://homestuck.bandcamp.com/track/ticket-to-ride-trial-variation
 - https://youtu.be/_4GmT28X5bc
+Referenced Tracks:
+- track:ticket-to-ride-rusty
 ---
 Track: Court Begins
 Artist: Clark Powell
 Duration: '4:02'
-References:
-- Cross Examination
 URLs:
 - https://homestuck.bandcamp.com/track/court-begins
 - https://youtu.be/UH5dFHEJ628
+Referenced Tracks:
+- Cross Examination
 ---
 Track: Objection
 Artist: Clark Powell
@@ -158,59 +161,60 @@ URLs:
 Track: Cornered
 Artist: Clark Powell
 Duration: '3:26'
-References:
-- Cross Examination
 URLs:
 - https://homestuck.bandcamp.com/track/cornered
 - https://youtu.be/ooIEh1O4d64
+Referenced Tracks:
+- Cross Examination
 ---
 Track: 'Ticket to Ride: The Other Half'
 Artist: James Roach, Toby Fox
 Duration: '4:35'
-References:
-- track:ticket-to-ride-rusty
 URLs:
 - https://homestuck.bandcamp.com/track/ticket-to-ride-the-other-half
 - https://youtu.be/64GAMIdWxmY
+Referenced Tracks:
+- track:ticket-to-ride-rusty
 ---
 Track: 'Ticket to Ride: Down with the Clown'
 Artist: James Roach
 Duration: '2:50'
-References:
-- track:ticket-to-ride-rusty
-- Cross Examination
 URLs:
 - https://homestuck.bandcamp.com/track/ticket-to-ride-down-with-the-clown
 - https://youtu.be/cYebmejzENc
+Referenced Tracks:
+- track:ticket-to-ride-rusty
+- Cross Examination
 ---
 Track: Conductor's Cabin
 Artist: James Roach, Toby Fox
 Duration: '3:37'
-References:
-- track:ticket-to-ride-rusty
-- Rustblood
 URLs:
 - https://homestuck.bandcamp.com/track/conductor-s-cabin
 - https://youtu.be/t24E34ShFe0
+Referenced Tracks:
+- track:ticket-to-ride-rusty
+- Rustblood
 ---
 Track: Old Secret
 Directory: old-secret-act2
-AKA: track:old-secret
 Artist: James Roach
 Duration: '4:26'
 URLs:
 - https://homestuck.bandcamp.com/track/old-secret-2
 - https://youtu.be/5BenvLz9Ru4
+Also Released As:
+- track:old-secret
 ---
 Track: Ghost Train
 Duration: '3:04'
 Artist: James Roach
-References:
-- Joey Claire, Extraordinaire
-- track:old-secret-act2
 URLs:
 - https://homestuck.bandcamp.com/track/ghost-train
 - https://youtu.be/AJh5dQB0wvM
+Referenced Tracks:
+- Joey Claire, Extraordinaire
+- track:old-secret-act2
 ---
 Group: B-Sides
 ---
@@ -224,55 +228,55 @@ URLs:
 Track: The Perfect Cast
 Duration: '1:33'
 Artist: James Roach, Toby Fox
-References:
-- Studio Space
 URLs:
 - https://homestuck.bandcamp.com/track/the-perfect-cast
 - https://youtu.be/GMxAjZB1A_g
+Referenced Tracks:
+- Studio Space
 ---
 Track: 'Dark Carnival: Rusty'
 Duration: '4:00'
 Artist: James Roach
-References:
-- track:ticket-to-ride-rusty
 URLs:
 - https://homestuck.bandcamp.com/track/dark-carnival-rusty
 - https://youtu.be/xoSPIJC-zt4
+Referenced Tracks:
+- track:ticket-to-ride-rusty
 ---
 Track: 'Dark Carnival: Quadrant Confusion'
 Duration: '4:06'
 Artist: James Roach
-References:
-- track:ticket-to-ride-quadrant-confusion
 URLs:
 - https://homestuck.bandcamp.com/track/dark-carnival-quadrant-confusion
 - https://youtu.be/Be1iIwXP4EY
+Referenced Tracks:
+- track:ticket-to-ride-quadrant-confusion
 ---
 Track: 'Dark Carnival: Trial Variation'
 Duration: '2:27'
 Artist: James Roach
-References:
-- track:ticket-to-ride-trial-variation
 URLs:
 - https://homestuck.bandcamp.com/track/dark-carnival-trial-variation
 - https://youtu.be/qxRN8p6_lWc
+Referenced Tracks:
+- track:ticket-to-ride-trial-variation
 ---
 Track: 'Dark Carnival: The Other Half'
 Duration: '2:00'
 Artist: James Roach
-References:
-- track:ticket-to-ride-the-other-half
 URLs:
 - https://homestuck.bandcamp.com/track/dark-carnival-the-other-half
 - https://youtu.be/HL-l-a6_vG0
+Referenced Tracks:
+- track:ticket-to-ride-the-other-half
 ---
 Track: DRONE
 Duration: '1:20'
 Artist: James Roach
-References:
-- track:drone-pq
-- Intermission 1
-- Rustblood
 URLs:
 - https://homestuck.bandcamp.com/track/drone
 - https://youtu.be/AGgey4ok3pc
+Referenced Tracks:
+- track:drone-pq
+- Intermission 1
+- Rustblood
diff --git a/album/hiveswap-friendsim.yaml b/album/hiveswap-friendsim.yaml
index ec70cd01..edbbffcd 100644
--- a/album/hiveswap-friendsim.yaml
+++ b/album/hiveswap-friendsim.yaml
@@ -47,8 +47,6 @@ Commentary: |-
 Track: M O I S T
 Duration: '2:29'
 Directory: moist
-References:
-- Get The Horns
 URLs:
 - https://homestuck.bandcamp.com/track/-
 - https://soundcloud.com/jamesroachmusic/a-bunch-of-boxes-that-dont-translate-into-a-url
@@ -58,6 +56,8 @@ Commentary: |-
     (Cirava's theme)
     originally this was called M O I S T but w/e program trace was using didnt interpret them right but it was so much funnier to just leave it as boxes LMAO
     anyway i said somethin ages ago about some of the trolls having themes i didnt get to finish all of them but ciravas is just a re-purposed early WIP of a grubbles song (get the horns) that i made vapor/moisturewave by slowing it down in the right way because thats literally all vaporwave is.
+Referenced Tracks:
+- Get The Horns
 ---
 Track: Call me Gor-Gor
 Duration: '3:05'
@@ -138,8 +138,6 @@ Commentary: |-
 ---
 Track: Old Secret
 Duration: '4:26'
-References:
-- Old Friends
 URLs:
 - https://homestuck.bandcamp.com/track/old-secret
 - https://soundcloud.com/jamesroachmusic/old-secret
@@ -151,6 +149,8 @@ Commentary: |-
     this was going to be in act 3, then i made it the EOA2 cutscene but it still cut off too early to be a full release and i just really liked it so i wanted you guys to hear it now instead of later.
     i used it for boldir because it fit her whole aesthetic, but this song was originally wrote for a scene where joey and xefros are on the run. having been hardened by their journey they hit the streets. it was meant to be a really sort of somber realization.
     I LOVE the mood of the transistor soundtrack and you might notice this drum beat and title are a very obvious nod to the song "Old Friends" (though someone else named it, years ago) I was specifically instructed "make it sound like this song" but since then I have worked to make it sound like more my own thing. you can see the influence of that soundtrack on all my work, though. the slow driving half-time beat. the airy reverb on chordal tones. the dirty bass. originally meant as a placeholder i never got over how the beat drops the backbeat on every other 4. I could dweeb out about this for hours.
+Referenced Tracks:
+- Old Friends
 ---
 Track: IIYWASWIWTBOTSA4AATWUOTDTMIHCIMFH
 Duration: '1:11'
@@ -174,8 +174,6 @@ Commentary: |-
 ---
 Track: SERVICE CAR
 Duration: '4:13'
-References:
-- track:ticket-to-ride-rusty
 URLs:
 - https://homestuck.bandcamp.com/track/service-car
 - https://soundcloud.com/jamesroachmusic/service-car
@@ -189,11 +187,11 @@ Commentary: |-
     There is a whole like section of the game where this melody is used a lot. Its in the old 3D hiveswap trailer, in the Homestuck 2.0 video. Wow. All the cursed ones. It is explicitly not a leitmotif because it is not meant to be "..indicative of a person or place" it is just a theme.
     wait but... if i make it marsti's theme does that not mean it, however inadvertently, is now a person's theme and therefore IS a leitmotif? aw jeez guys i really beefed it this time.
     this ones a bit older but this is, once again, just another example of me goin ham on bass for no good fuckin reason. i just think it sounds cool what do you want from me.
+Referenced Tracks:
+- track:ticket-to-ride-rusty
 ---
 Track: (an ascii image of bowsette)
 Duration: '5:08'
-References:
-- track:dungeon-theme-zelda1
 URLs:
 - https://homestuck.bandcamp.com/track/an-ascii-image-of-bowsette
 - https://soundcloud.com/jamesroachmusic/an-ascii-image-of-bowsette
@@ -207,6 +205,8 @@ Commentary: |-
     i mean i get it. i was just on a podcast this morning talking about how the one thing that binds us all together is that we've all engaged in some clownery. i think i talk about regrettably hooking up with a juggalo as a teen for a solid 10 minutes. its hard being me.
     i just moved and gave my old electric bass away to a friend who was interested in learning. i recorded this before giving it away. goodbye electric bass. dozens of children will miss how i used to just go ham on the bass in a bunch of songs for no reason. oh also im beatboxing for two seconds in this one. i ran it through a filter so it sounds less like "james roach making some sounds."
     all in all, i wanted to make this one sound a little more whimsical so i borrowed the synth i made for my friends dnd character theme... where they're also a clown? its a really good synth. ok marsti is up next.
+Referenced Tracks:
+- track:dungeon-theme-zelda1
 ---
 Track: idk man you name it im tired
 Duration: '2:36'
@@ -243,8 +243,6 @@ Commentary: |-
 Track: CLOWNFUCKER
 Artist: James Roach, Toby Fox
 Duration: '2:52'
-References:
-- take me to clown church
 URLs:
 - https://homestuck.bandcamp.com/track/clownfucker
 - https://soundcloud.com/jamesroachmusic/clownfucker-by-james-roach-and-toby-fox
@@ -256,6 +254,8 @@ Commentary: |-
     i got that weird laugh from toby as an mp3 and i THINK its from a spiderman game. it could just be toby's own impish laughter but probably not. toby has a hearty joy-filled laugh with exactly 0% in the vein of clownery department. i love toby so much.
     so here we are. friendsim friday and i have to act like clownfuckery is just another aspect of my life akin to say a sweet tooth or psoriasis. like "yeah man we all done fugged a clown once am i right fellas" over here grasping at straws, desperation in my voice "r-right??? fellas???"
     his name was daniel and he really loved ICP and i think now he works as a manager at a taco bell. yeah thats right daniel. i'm callin you out you nasty juggalo. my inherited army of teens are comin into your taco bell and taking all your fuego sauce. dont call me. that felt good. i feel better. what were we talkin about?
+Referenced Tracks:
+- take me to clown church
 ---
 Track: (this title was too long)
 Duration: '2:10'
@@ -311,11 +311,11 @@ Duration: '3:01'
 URLs:
 - https://homestuck.bandcamp.com/track/end-of-friendvangelion
 - https://youtu.be/q0eDgNWy0o8
-References:
+Has Cover Art: false
+Referenced Tracks:
 - Homestuck Anthem
 - Joey Claire, Extraordinaire
 - Rustblood
-Has Cover Art: false
 ---
 Track: VALID END
 Duration: '2:01'
@@ -329,10 +329,6 @@ Has Cover Art: false
 ---
 Track: WORST END
 Duration: '2:30'
-References:
-- English
-- Liquid Negrocity
-- GRAVEYARD SHIFT
 URLs:
 - https://homestuck.bandcamp.com/track/worst-end
 - https://youtu.be/tf_EvjG7Ir8
@@ -344,3 +340,7 @@ Commentary: |-
     heres the one for MC/DOC SCRATCH that i think is my favorite from the whole thing. its based off a song from an old (bad) fantroll album i did in like 2011 (and the song was written even earlier than that) that i have since purged from the internet as best i can. thank you for not reposting it. i re-used a lot of assets from it for other stuff. i was in a real weird place when i made it so aside from it being kinda bad i just… don’t wanna see it ever LMAO.
     that album made the homestuck music community real mad at me because they thought i was getting preferential treatment for being popular on-line and friendly with some WP staff on twitter. my unofficial album got approved for sale and at the same time, completely unknown to me someone on the music team’s album didn’t get approved. a handful of them used this incident to talk shit about me for several years. one of them made fun of me for my dad passing away?? yikes. most of us have made our peace (i understand how easy it is to get caught up in dog-piling on a common enemy or w/e) but theres still one or two that are like… still real mad at me for this percieved slight. they’ll say like “you were rude to us” and its like… you guys… literally made fun of me for not having a family i’m not sure what you want from me.
     this one got away from me. anyway. thanks for listening. stop being weird to me on twitter. tip your waitstaff.
+Referenced Tracks:
+- English
+- Liquid Negrocity
+- GRAVEYARD SHIFT
diff --git a/album/homestuck-for-the-holidays.yaml b/album/homestuck-for-the-holidays.yaml
index 5201259e..91947d66 100644
--- a/album/homestuck-for-the-holidays.yaml
+++ b/album/homestuck-for-the-holidays.yaml
@@ -44,40 +44,40 @@ Lyrics: >-
 Track: A Skaian Christmas
 Artist: Mark Hadley
 Duration: '2:22'
-References:
-- track:skies-of-skaia
 URLs:
 - https://homestuckgaiden.bandcamp.com/track/a-skaian-christmas
 - https://youtu.be/VPB_PlYW89M
+Referenced Tracks:
+- track:skies-of-skaia
 ---
 Track: Anthem of Rime
 Artist: Solatrus, Nick Smalley
 Duration: '3:22'
-References:
-- Carol of the Bells
-- track:frost-vol6
 URLs:
 - https://homestuckgaiden.bandcamp.com/track/anthem-of-rime
 - https://youtu.be/AS9bJhBFXyY
+Referenced Tracks:
+- Carol of the Bells
+- track:frost-vol6
 ---
 Track: Pachelbel's Gardener
 Artist: Robert J! Lake
-References:
-- Canon in D
-- The Beginning of Something Really Excellent
 Duration: '3:58'
 URLs:
 - https://homestuckgaiden.bandcamp.com/track/pachelbels-gardener
 - https://youtu.be/O0Pnv0AKM2U
+Referenced Tracks:
+- Canon in D
+- The Beginning of Something Really Excellent
 ---
 Track: Carefree Perigee
 Artist: Toby Fox
 Duration: '1:38'
-References:
-- Carefree Action
 URLs:
 - https://homestuckgaiden.bandcamp.com/track/carefree-perigee
 - https://youtu.be/sEFEEfJ0Rzk
+Referenced Tracks:
+- Carefree Action
 ---
 Track: The More You Know
 Artist: Nick Smalley
@@ -95,8 +95,6 @@ Lyrics: >-
 Track: The Squiddles Save Christmas
 Artist: Alex Rosetti
 Duration: '2:46'
-References:
-- Squiddles!
 URLs:
 - https://homestuckgaiden.bandcamp.com/track/the-squiddles-save-christmas
 - https://youtu.be/YyGhvEWMyd4
@@ -126,13 +124,12 @@ Lyrics: |-
     (GET OUT OF MY LIFE DAD)
 
     (AnD tO aLl A-)
+Referenced Tracks:
+- Squiddles!
 ---
 Track: Billy the Bellsuit Diver Has Something to Say
 Artist: Erik Scheele
 Duration: '3:26'
-References:
-- Tempus adest floridum
-- Squiddles!
 URLs:
 - https://homestuckgaiden.bandcamp.com/track/billy-the-bellsuit-diver-has-something-to-say
 - https://youtu.be/cRxCQv2nutw
@@ -145,12 +142,13 @@ Lyrics: >-
     Merry Christmas. Merry Christmas. Merry Christmas to you. Merry Christmas. Merry
     Christmas. Merry Christmas. Merry Christmas. [unmuffling] Merry Christmas to you
     and a happy New Year.)
+Referenced Tracks:
+- Tempus adest floridum
+- Squiddles!
 ---
 Track: Squiddly Night
 Artist: David Ko
 Duration: '1:01'
-References:
-- Silent Night
 URLs:
 - https://homestuckgaiden.bandcamp.com/track/squiddly-night
 - https://youtu.be/i50tv01mJvI
@@ -164,6 +162,8 @@ Lyrics: |-
     If you just go to sleep
 
     [Indecipherable demonic whispering]
+Referenced Tracks:
+- Silent Night
 ---
 Track: The Santa Claus Interdimensional Travel Sleigh
 Artist: Nick Smalley
@@ -180,43 +180,41 @@ Lyrics: >-
 Track: Land of Light and Cheer
 Artist: Thomas Ferkol
 Duration: '1:53'
-References:
-- The First Noel
-- Clockwork Apocalypse
 URLs:
 - https://homestuckgaiden.bandcamp.com/track/land-of-light-and-cheer
 - https://youtu.be/fwqFAtNqWhA
+Referenced Tracks:
+- The First Noel
+- Clockwork Apocalypse
 ---
 Track: Gog Rest Ye Merry Prospitians
 Artist: Thomas Ferkol
 Duration: '2:15'
-References:
-- Santa Claus Is Comin' to Town
-- God Rest You Merry, Gentlemen
-- track:sburban-jungle
 URLs:
 - https://homestuckgaiden.bandcamp.com/track/gog-rest-ye-merry-prospitians
 - https://youtu.be/H1s0RX4ikfE
+Referenced Tracks:
+- Santa Claus Is Comin' to Town
+- God Rest You Merry, Gentlemen
+- track:sburban-jungle
 ---
 Track: Carolmanthetime
 Artist: Erik Scheele
 Contributors:
 - Robert J! Lake (intro production)
 Duration: '3:44'
-References:
+URLs:
+- https://homestuckgaiden.bandcamp.com/track/carolmanthetime
+- https://youtu.be/pCWVB-AjnXk
+Referenced Tracks:
 - Carol of the Bells
 - God Rest You Merry, Gentlemen
 - track:doctor
 - track:showtime-piano-refrain
-URLs:
-- https://homestuckgaiden.bandcamp.com/track/carolmanthetime
-- https://youtu.be/pCWVB-AjnXk
 ---
 Track: Candlelight
 Artist: Robert J! Lake
 Duration: '3:15'
-References:
-- Candles and Clockwork
 Art Tags:
 - The Felt
 URLs:
@@ -237,6 +235,8 @@ Lyrics: |-
     In the space behind the candlelight
 Cover Artists:
 - Richard Browne
+Referenced Tracks:
+- Candles and Clockwork
 ---
 Track: Oh, No! It's the Midnight Crew!
 Artist: Nick Smalley
@@ -252,11 +252,11 @@ Lyrics: |-
 Track: Let it Snow
 Artist: Mark Hadley
 Duration: '1:31'
-References:
-- Let it Snow! Let it Snow! Let it Snow!
 URLs:
 - https://homestuckgaiden.bandcamp.com/track/let-it-snow
 - https://youtu.be/BaNH2BKfRKk
+Referenced Tracks:
+- Let it Snow! Let it Snow! Let it Snow!
 ---
 Track: Hella Sweet
 Artist: Nick Smalley
@@ -329,8 +329,6 @@ Group: Bonus tracks
 Track: Oh God, Christmas!
 Artist: Lost in History
 Duration: 0:40
-References:
-- track:ohgodwhat
 URLs:
 - https://youtu.be/wN6DYiH6aws
 Lyrics: |-
@@ -349,6 +347,8 @@ Lyrics: |-
     Oh God, Christmas!
     Oh God, Christmaaaaas!! Aaaaaahhh!!
     Oh, God... Christmas
+Referenced Tracks:
+- track:ohgodwhat
 ---
 Track: A Very Special Time
 Artist: Lost in History
@@ -372,8 +372,8 @@ Lyrics: |-
 Track: Candles and Merry Gentlemen
 Artist: Solatrus
 Duration: '1:02'
-References:
-- Candles and Clockwork
-- Candlelight
 URLs:
 - https://youtu.be/TG0NSG8f1RY
+Referenced Tracks:
+- Candles and Clockwork
+- Candlelight
diff --git a/album/homestuck-vol-1-4.yaml b/album/homestuck-vol-1-4.yaml
index c30b2372..a9dc3d33 100644
--- a/album/homestuck-vol-1-4.yaml
+++ b/album/homestuck-vol-1-4.yaml
@@ -17,145 +17,156 @@ Group: From <i>Homestuck Vol. 1</i>
 ---
 Track: Showtime (Piano Refrain)
 Directory: showtime-piano-refrain-vol-1-4
-AKA: track:showtime-piano-refrain
 Artist: Kevin Regamey
 Duration: '2:20'
-References:
-- track:showtime-original-mix
 URLs:
 - https://homestuck.bandcamp.com/track/showtime-piano-refrain-3
 - https://youtu.be/DkVQaxrXM_s
+Referenced Tracks:
+- track:showtime-original-mix
+Also Released As:
+- track:showtime-piano-refrain
 ---
 Track: Harlequin
 Directory: harlequin-vol-1-4
-AKA: track:harlequin
 Artist: Mark Hadley
 Duration: '1:43'
 URLs:
 - https://homestuck.bandcamp.com/track/harlequin-3
 - https://youtu.be/UDJo0gWPTms
+Also Released As:
+- track:harlequin
 ---
 Track: Showtime (Original Mix)
 Directory: showtime-original-mix-vol-1-4
-AKA: track:showtime-original-mix
 Artist: Malcolm Brown
 Duration: '2:09'
 URLs:
 - https://homestuck.bandcamp.com/track/showtime-original-mix-3
 - https://youtu.be/lc4mLtbGVDA
+Also Released As:
+- track:showtime-original-mix
 ---
 Track: Aggrieve (Violin Refrain)
 Directory: aggrieve-violin-refrain-vol-1-4
-AKA: track:aggrieve-violin-refrain
 Artist: Andrew Huo
 Contributors:
 - Gabe Nezovic (mastering)
 Duration: '1:34'
-References:
-- track:aggrieve
 URLs:
 - https://homestuck.bandcamp.com/track/aggrieve-violin-refrain-3
 - https://youtu.be/lzXuvymrzZg
+Referenced Tracks:
+- track:aggrieve
+Also Released As:
+- track:aggrieve-violin-refrain
 ---
 Track: Sburban Countdown
 Directory: sburban-countdown-vol-1-4
-AKA: track:sburban-countdown
 Artist: Mark Hadley
 Duration: 0:38
-References:
-- track:sburban-jungle
 URLs:
 - https://homestuck.bandcamp.com/track/sburban-countdown-3
 - https://youtu.be/1402jlRYFuw
+Referenced Tracks:
+- track:sburban-jungle
+Also Released As:
+- track:sburban-countdown
 ---
 Track: Aggrieve
 Directory: aggrieve-vol-1-4
-AKA: track:aggrieve
 Artist: Mark Hadley
 Duration: '2:32'
 URLs:
 - https://homestuck.bandcamp.com/track/aggrieve-3
 - https://youtu.be/0Up18n-IzVA
+Also Released As:
+- track:aggrieve
 ---
 Track: Showtime (Imp Strife Mix)
 Directory: showtime-imp-strife-mix-vol-1-4
-AKA: track:showtime-imp-strife-mix
 Artist: Buzinkai, Curt Blakeslee (fanfare)
 Duration: '1:57'
-References:
-- track:showtime-original-mix
 URLs:
 - https://homestuck.bandcamp.com/track/showtime-imp-strife-mix-3
 - https://youtu.be/KBQQj_4t1Uo
+Referenced Tracks:
+- track:showtime-original-mix
+Also Released As:
+- track:showtime-imp-strife-mix
 ---
 Track: Nannaquin
 Directory: nannaquin-vol-1-4
-AKA: track:nannaquin
 Artist: Mark Hadley
 Duration: '1:24'
-References:
-- track:harlequin
 URLs:
 - https://homestuck.bandcamp.com/track/nannaquin-3
 - https://youtu.be/0hDCamkN5HM
+Referenced Tracks:
+- track:harlequin
+Also Released As:
+- track:nannaquin
 ---
 Track: Skies of Skaia
 Directory: skies-of-skaia-vol-1-4
-AKA: track:skies-of-skaia
 Artist: Mark Hadley
 Duration: '2:45'
 URLs:
 - https://homestuck.bandcamp.com/track/skies-of-skaia-3
 - https://youtu.be/tjq32cJRqpc
+Also Released As:
+- track:skies-of-skaia
 ---
 Group: From <i>Homestuck Vol. 2</i>
 ---
 Track: Harlequin (Rock Version)
 Directory: harlequin-rock-version-vol-1-4
-AKA: track:harlequin-rock-version
 Artist: Michael Guy Bowman, Joseph Aylsworth
 Contributors:
 - Joseph Aylsworth (guitar)
 Duration: '2:48'
-References:
-- track:harlequin
 URLs:
 - https://homestuck.bandcamp.com/track/harlequin-rock-version-3
 - https://youtu.be/Yi7Wf-BTpMs
+Referenced Tracks:
+- track:harlequin
+Also Released As:
+- track:harlequin-rock-version
 ---
 Track: John Sleeps / Skaian Magicant
 Artist: Toby Fox
 Duration: 0:41
-References:
-- track:showtime-piano-refrain
-- track:skies-of-skaia
 URLs:
 - https://homestuck.bandcamp.com/track/john-sleeps-skaian-magicant-2
 - https://youtu.be/ZAKLIH_anJI
+Referenced Tracks:
+- track:showtime-piano-refrain
+- track:skies-of-skaia
 ---
 Track: Upward Movement (Dave Owns)
 Directory: upward-movement-dave-owns-vol-1-4
-AKA: track:upward-movement-dave-owns
 Artist: Kalibration
 Duration: '4:20'
-References:
-- track:amen-brother
 URLs:
 - https://homestuck.bandcamp.com/track/upward-movement-dave-owns-3
 - https://youtu.be/i47-v-eVymk
+Referenced Tracks:
+- track:amen-brother
+Also Released As:
+- track:upward-movement-dave-owns
 ---
 Track: Vagabounce
 Directory: vagabounce-vol-1-4
-AKA: track:vagabounce
 Artist: David Ko
 Duration: '1:13'
 URLs:
 - https://homestuck.bandcamp.com/track/vagabounce-3
 - https://youtu.be/wanZ6XJKChc
+Also Released As:
+- track:vagabounce
 ---
 Track: Explore
 Directory: explore-vol-1-4
-AKA: track:explore
 Artist: Buzinkai, Michael Guy Bowman
 Contributors:
 - Michael Guy Bowman (arrangement)
@@ -163,11 +174,11 @@ Duration: '2:28'
 URLs:
 - https://homestuck.bandcamp.com/track/explore-3
 - https://youtu.be/DedSi6YXk1w
+Also Released As:
+- track:explore
 ---
 Track: Gardener
 Artist: Steve Everson
-References:
-- track:the-beginning-of-something-really-excellent
 Duration: '1:44'
 URLs:
 - https://homestuck.bandcamp.com/track/gardener-2
@@ -177,277 +188,297 @@ Commentary: |-
     This is part of the Bolin Incident. If you don’t know what happened, up until half-way through Act 4 a guy called Bill Bolin was on the time, one of the original members. He was a great musician, that much can’t be denied; he wrote a lot of tracks that appeared in early act 3; Jade’s bass solo, the remix of it, the last part of the Dave and Bro battle… some others I forget. During that flash with Dave and Rose on Derse the original music was five Bolin tracks, ones he wasn’t all that happy with. He flipped out and did a lot of things that ended up with him dropped from the team, and his music replaced.
     I called replacing Jade’s bass solo (I was enthusiastic about getting something of mine into the comic). We figured there’d probably be an existing piece of music used for the remix on Prospit so there were a couple of different versions remixing different tracks until Something Really Excellent was locked in.
     We were on a strict timetable at the time, so I didn’t get the chance to find a really good bass voice or find a good rhythm. That was much improved for the actual release in Volumes 1-4.
+Referenced Tracks:
+- track:the-beginning-of-something-really-excellent
 ---
 Track: Showtime Remix
 Directory: showtime-remix-vol-1-4
-AKA: track:showtime-remix
 Artist: Gabe Nezovic
 Duration: '2:02'
-References:
-- track:showtime-piano-refrain
-Samples:
-- track:showtime-piano-refrain
 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
+Also Released As:
+- track:showtime-remix
 ---
 Track: Aggrieve Remix
 Directory: aggrieve-remix-vol-1-4
-AKA: track:aggrieve-remix
 Artist: Gabe Nezovic
-References:
-- track:aggrieve-violin-refrain
-Samples:
-- track:aggrieve-violin-refrain
 Duration: '2:11'
 URLs:
 - https://homestuck.bandcamp.com/track/aggrieve-remix-3
 - https://youtu.be/KilKZfggMOU
+Referenced Tracks:
+- track:aggrieve-violin-refrain
+Sampled Tracks:
+- track:aggrieve-violin-refrain
+Also Released As:
+- track:aggrieve-remix
 ---
 Track: Verdancy (Bassline)
 Directory: verdancy-bassline-vol-1-4
-AKA: track:verdancy-bassline
 Artist: Kalibration
 Duration: 0:52
 URLs:
 - https://homestuck.bandcamp.com/track/verdancy-bassline-3
 - https://youtu.be/Hhwop2K7zt0
+Also Released As:
+- track:verdancy-bassline
 ---
 Track: Potential Verdancy
 Artist: Robert J! Lake
 Duration: '3:25'
-References:
-- track:verdancy-bassline
-Samples:
-- track:verdancy-bassline
 URLs:
 - https://homestuck.bandcamp.com/track/potential-verdancy-2
 - https://youtu.be/2W9Dd4RAiHo
+Referenced Tracks:
+- track:verdancy-bassline
+Sampled Tracks:
+- track:verdancy-bassline
 ---
 Group: From <i>Homestuck Vol. 3</i>
 ---
 Track: Beatdown (Strider Style)
 Directory: beatdown-strider-style-vol-1-4
-AKA: track:beatdown-strider-style
 Artist: Curt Blakeslee
 Duration: '2:32'
 URLs:
 - https://homestuck.bandcamp.com/track/beatdown-strider-style-3
 - https://youtu.be/9fXnKNoF81g
+Also Released As:
+- track:beatdown-strider-style
 ---
 Track: Harleboss
 Directory: harleboss-vol-1-4
-AKA: track:harleboss
 Artist: Malcolm Brown
 Duration: '2:47'
-References:
-- track:harlequin
 URLs:
 - https://homestuck.bandcamp.com/track/harleboss-3
 - https://youtu.be/nYaiMTPWh78
+Referenced Tracks:
+- track:harlequin
+Also Released As:
+- track:harleboss
 ---
 Track: Beatdown Round 2
 Directory: beatdown-round-2-vol-1-4
-AKA: track:beatdown-round-2
 Artist: Curt Blakeslee
 Duration: '2:27'
-References:
-- track:beatdown-strider-style
 URLs:
 - https://homestuck.bandcamp.com/track/beatdown-round-2-3
 - https://youtu.be/knNKryd8jEU
+Referenced Tracks:
+- track:beatdown-strider-style
+Also Released As:
+- track:beatdown-round-2
 ---
 Track: Dissension (Original)
 Directory: dissension-original-vol-1-4
-AKA: track:dissension-original
 Artist: David Ko
 Duration: '1:47'
 URLs:
 - https://homestuck.bandcamp.com/track/dissension-original-3
 - https://youtu.be/VwMew8akQx4
+Also Released As:
+- track:dissension-original
 ---
 Track: Dissension (Remix)
 Directory: dissension-remix-vol-1-4
-AKA: track:dissension-remix
 Artist: David Ko
 Duration: '2:03'
-References:
-- track:dissension-original
 URLs:
 - https://homestuck.bandcamp.com/track/dissension-remix-3
 - https://youtu.be/y36JjcfvM0c
+Referenced Tracks:
+- track:dissension-original
+Also Released As:
+- track:dissension-remix
 ---
 Track: Ohgodwhat
 Directory: ohgodwhat-vol-1-4
-AKA: track:ohgodwhat
 Artist: Nick Smalley
 Duration: '1:06'
 URLs:
 - https://homestuck.bandcamp.com/track/ohgodwhat-3
 - https://youtu.be/P-X8EB6KbZ0
+Also Released As:
+- track:ohgodwhat
 ---
 Track: Ohgodwhat Remix
 Directory: ohgodwhat-remix-vol-1-4
-AKA: track:ohgodwhat-remix
 Artist: Michael Guy Bowman
 Duration: '1:05'
-References:
-- track:ohgodwhat
 URLs:
 - https://homestuck.bandcamp.com/track/ohgodwhat-remix-3
 - https://youtu.be/KlVkDe0iVUc
+Referenced Tracks:
+- track:ohgodwhat
+Also Released As:
+- track:ohgodwhat-remix
 ---
 Track: Rediscover Fusion
 Directory: rediscover-fusion-vol-1-4
-AKA: track:rediscover-fusion
 Artist: BurnedKirby
 Duration: '1:36'
 URLs:
 - https://homestuck.bandcamp.com/track/rediscover-fusion-3
 - https://youtu.be/_wv2Q9fTmLk
+Also Released As:
+- track:rediscover-fusion
 ---
 Track: Explore Remix
 Directory: explore-remix-vol-1-4
-AKA: track:explore-remix
 Artist: Gabe Nezovic
 Duration: '2:00'
-References:
-- track:explore
-Samples:
-- track:explore
 URLs:
 - https://homestuck.bandcamp.com/track/explore-remix-3
 - https://youtu.be/Zzf5NwkM8Ys
+Referenced Tracks:
+- track:explore
+Sampled Tracks:
+- track:explore
+Also Released As:
+- track:explore-remix
 ---
 Track: Chorale for Jaspers
 Directory: chorale-for-jaspers-vol-1-4
-AKA: track:chorale-for-jaspers
 Artist: Michael Guy Bowman
 Duration: '1:15'
 URLs:
 - https://homestuck.bandcamp.com/track/chorale-for-jaspers-3
 - https://youtu.be/uvfkPq248Qo
+Also Released As:
+- track:chorale-for-jaspers
 ---
 Track: Pony Chorale
 Directory: pony-chorale-vol-1-4
-AKA: track:pony-chorale
 Artist: Michael Guy Bowman
 Contributors:
 - Tavia Morra (vocals)
 Duration: '1:03'
-References:
-- track:chorale-for-jaspers
 URLs:
 - https://homestuck.bandcamp.com/track/pony-chorale-3
 - https://youtu.be/B88bE5niVFQ
+Referenced Tracks:
+- track:chorale-for-jaspers
+Also Released As:
+- track:pony-chorale
 ---
 Group: From <i>Homestuck Vol. 4</i>
 ---
 Track: Revelawesome
 Directory: revelawesome-vol-1-4
-AKA: track:revelawesome
 Artist: Malcolm Brown
 Duration: 0:43
 URLs:
 - https://homestuck.bandcamp.com/track/revelawesome-3
 - https://youtu.be/JEnmIrIDMNs
+Also Released As:
+- track:revelawesome
 ---
 Track: Hardlyquin
 Directory: hardlyquin-vol-1-4
-AKA: track:hardlyquin
 Artist: Mark Hadley
 Duration: '1:38'
-References:
-- track:harlequin
 URLs:
 - https://homestuck.bandcamp.com/track/hardlyquin-3
 - https://youtu.be/c7fzYfxNQLg
+Referenced Tracks:
+- track:harlequin
+Also Released As:
+- track:hardlyquin
 ---
 Track: Carefree Victory
 Directory: carefree-victory-vol-1-4
-AKA: track:carefree-victory
 Artist: Andrew Huo, Toby Fox
 Duration: '1:36'
-References:
-- track:carefree-action
 URLs:
 - https://homestuck.bandcamp.com/track/carefree-victory-3
 - https://youtu.be/ocYQytoPE8M
+Referenced Tracks:
+- track:carefree-action
+Also Released As:
+- track:carefree-victory
 ---
 Track: Ballad of Awakening
 Directory: ballad-of-awakening-vol-1-4
-AKA: track:ballad-of-awakening
 Artist: Malcolm Brown
 Duration: '3:08'
 URLs:
 - https://homestuck.bandcamp.com/track/ballad-of-awakening-3
 - https://youtu.be/fwqjHs4z0fE
+Also Released As:
+- track:ballad-of-awakening
 ---
 Track: Sburban Jungle
 Directory: sburban-jungle-vol-1-4
-AKA: track:sburban-jungle
 Artist: Michael Guy Bowman
 Duration: '3:39'
 URLs:
 - https://homestuck.bandcamp.com/track/sburban-jungle-3
 - https://youtu.be/RtiiIxM_5Qg
+Also Released As:
+- track:sburban-jungle
 ---
 Track: Three in the Morning (RJ's I Can Barely Sleep In This Casino Remix)
 Directory: three-in-the-morning-rj-vol-1-4
-AKA: track:three-in-the-morning-rj
 Artist: Robert J! Lake
 Duration: '6:29'
-References:
-- track:three-in-the-morning
-Samples:
-- track:three-in-the-morning
 URLs:
 - https://homestuck.bandcamp.com/track/three-in-the-morning-rjs-i-can-barely-sleep-in-this-casino-remix-3
 - https://youtu.be/NutIhwWDqpc
+Referenced Tracks:
+- track:three-in-the-morning
+Sampled Tracks:
+- track:three-in-the-morning
+Also Released As:
+- track:three-in-the-morning-rj
 ---
 Track: Doctor
 Directory: doctor-vol-1-4
-AKA: track:doctor
 Artist: Buzinkai
 Contributors:
 - Clark Powell (production)
 - Michael Vallejo (production)
 Duration: '2:37'
-References:
-- track:doctor-original-loop
 URLs:
 - https://homestuck.bandcamp.com/track/doctor-3
 - https://youtu.be/EQqnA8Brfcg
+Referenced Tracks:
+- track:doctor-original-loop
+Also Released As:
+- track:doctor
 ---
 Track: Endless Climb
 Directory: endless-climb-vol-1-4
-AKA: track:endless-climb
 Artist: Buzinkai
 Duration: '1:24'
 URLs:
 - https://homestuck.bandcamp.com/track/endless-climb-3
 - https://youtu.be/Tm5w-82-ZII
+Also Released As:
+- track:endless-climb
 ---
 Track: Atomyk Ebonpyre
 Directory: atomyk-ebonpyre-vol-1-4
-AKA: track:atomyk-ebonpyre
 Artist: Toby Fox
 Duration: '1:10'
 URLs:
 - https://homestuck.bandcamp.com/track/atomyk-ebonpyre-3
 - https://youtu.be/Z8HnkcZXBsc
+Also Released As:
+- track:atomyk-ebonpyre
 ---
 Track: Black
 Directory: black-vol-1-4
-AKA: track:black
 Artist: Toby Fox
 Duration: '2:24'
 Art Tags:
 - 'cw: blood'
-References:
-- track:liquid-negrocity
-Samples:
-- track:im-a-member-of-the-midnight-crew
 URLs:
 - https://homestuck.bandcamp.com/track/black-3
 - https://youtu.be/dJ7H7MkL1Yk
@@ -470,6 +501,12 @@ Lyrics: |-
     I'm a member of the Midnight Crew!
     I'm a- I'm a- I'm a member of the-
     I'm a member of the Midnight Crew!
+Referenced Tracks:
+- track:liquid-negrocity
+Sampled Tracks:
+- track:im-a-member-of-the-midnight-crew
+Also Released As:
+- track:black
 ---
 Group: Bonus tracks
 ---
diff --git a/album/homestuck-vol-1.yaml b/album/homestuck-vol-1.yaml
index 5da9a475..deab2a31 100644
--- a/album/homestuck-vol-1.yaml
+++ b/album/homestuck-vol-1.yaml
@@ -16,8 +16,6 @@ Group: Main album
 Track: Showtime (Piano Refrain)
 Artist: Kevin Regamey
 Duration: '2:20'
-References:
-- track:showtime-original-mix
 URLs:
 - https://homestuck.bandcamp.com/track/showtime-piano-refrain-3
 - https://youtu.be/U5ggzIxfGDs
@@ -26,6 +24,8 @@ Commentary: |-
     To be honest, I've fallen off the MSPA train pretty hard. This has undoubtedly been the busiest year (or two) of my life, and I am only now returning to reacquaint myself with what the heck is up.
     Malcolm wrote the chiptune version of Showtime first. I heard it, dug it, and created a piano arrangement just for the hell of it. Like Malcolm has said - earlier on, we didn't necessarily know what we were writing for, so we just wrote whatever spoke to us. I had posted a "Work in progress" version to the music boards, and I received some positive feedback. Positive enough for me to elaborate it into a full piece. As luck would have it, Andrew was finishing up the first playable page of Homestuck just as I posted the full version. As such, I was lucky enough to have the honour of first musical appearance in Homestuck, but most of the credit should certainly go to Malcolm - for defining John musically at such an early stage of the game, and for being the sole inspiration behind this track.
     Oh, side note: My midi keyboard was misbehaving when I wrote this, so every note of the piece was clicked into a sequencer. D:
+Referenced Tracks:
+- track:showtime-original-mix
 ---
 Track: Harlequin
 Artist: Mark Hadley
@@ -53,38 +53,38 @@ Commentary: |-
 Track: Sburban Jungle (Brief Mix)
 Artist: Michael Guy Bowman
 Duration: '1:36'
-References:
-- track:sburban-jungle
-Samples:
-- track:sburban-jungle
 URLs:
 - https://youtu.be/DKmXadfEnog
+Referenced Tracks:
+- track:sburban-jungle
+Sampled Tracks:
+- track:sburban-jungle
 ---
 Track: Aggrieve (Violin Refrain)
 Artist: Andrew Huo
 Contributors:
 - Gabe Nezovic (mastering)
 Duration: '1:34'
-References:
-- track:aggrieve
 URLs:
 - https://homestuck.bandcamp.com/track/aggrieve-violin-refrain-3
 - https://youtu.be/h46wSFVeWAs
 Commentary: |-
     <i>Andrew Huo:</i>
     Ahh, the glory days, when we had no idea we were going on a universe-destroying/creating adventure, or even a world-destroying one. This was when the music team's main scoop on the kids was that they were going to have theme instruments that somehow function as their weapons or special abilities as well, although I guess this has only mostly come to fruition with Dave's turntables. Well, I'm primarily a violinist, and Rose's instrument was to be violin/strings, so this was right up my alley. I love just randomly improvising on the violin, exploring different poetic areas, if you will, and coming up with things that sounded beautiful to me. At this time in particular, I was doing that a lot. Hadley's Aggrieve was created first in this case, and I had roughly dictated it, so I knew the notes. I fooled around with it a couple of times, playing with a haunting/sad-but-hopeful tone, and the arrangement that you hear was recorded literally the first time it was played - the first time those notes were played in that rhythm, tone and order was the same time it was recorded. That version, cut, is what you hear in the comic. I reverse-engineered the sheet music from my own recording to do a recording for the album. Unfortunately, I was, and I suppose am still today, new to the recording game, and so there are mistakes I cringe at in both the comic and album versions. Gabe Nezovic's mastering helps to cover most of it, but I still feel kind of guilty about it. Oh well.
+Referenced Tracks:
+- track:aggrieve
 ---
 Track: Sburban Countdown
 Artist: Mark Hadley
 Duration: 0:38
-References:
-- track:sburban-jungle
 URLs:
 - https://homestuck.bandcamp.com/track/sburban-countdown-3
 - https://youtu.be/C3cvihYafCs
 Commentary: |-
     <i>Mark Hadley:</i>
     I really liked Sburban Jungle and felt it was iconic enough to be considered a theme song for Sburb (not just the loading screen as it was originally presented). Since the ending scene for Act 1 was an early pivotal moment in the game, I tried to make something that sounded like Sburban Jungle, but clearly felt like time was ticking away to something big. It's a lot to try and cram into a little over 30 seconds, but I did my best.
+Referenced Tracks:
+- track:sburban-jungle
 ---
 Track: Aggrieve
 Artist: Mark Hadley
@@ -99,26 +99,26 @@ Commentary: |-
 Track: Showtime (Imp Strife Mix)
 Artist: Buzinkai, Curt Blakeslee (fanfare)
 Duration: '1:57'
-References:
-- track:showtime-original-mix
 URLs:
 - https://homestuck.bandcamp.com/track/showtime-imp-strife-mix-3
 - https://youtu.be/WQyRS_czmgc
 Commentary: |-
     <i>Buzinkai:</i>
     I wrote this after listening to the original song for HOURS. I do believe this was what originally got me to send music to Andrew Hussie in a fan-mail and got me writing music for the project. It came down to the thought, "I wonder what that would sound like if I re-wrote it in my software." However, as with most of my obsessions, I got well carried away with it.
+Referenced Tracks:
+- track:showtime-original-mix
 ---
 Track: Nannaquin
 Artist: Mark Hadley
 Duration: '1:24'
-References:
-- track:harlequin
 URLs:
 - https://homestuck.bandcamp.com/track/nannaquin-3
 - https://youtu.be/Pf5YpbDgCSU
 Commentary: |-
     <i>Mark Hadley:</i>
     A "Harlequin" remix obviously. In order to give it an old-timey feel, I used sounds of a saloon piano and a muted trumpet. Once it was done, I ran it through a filter to make it sound... less good (pitch warping and reducing the bass) and added a loop of some vinyl pops and cracks. For the soundtrack version, I added the needle coming down onto the record at the beginning, and then I thought it would be fun to end it by having the record skip before the needle is pulled off the record. Needless to say, this was fun to make.
+Referenced Tracks:
+- track:harlequin
 ---
 Track: Skies of Skaia
 Artist: Mark Hadley
@@ -135,7 +135,7 @@ Group: Bonus tracks
 Track: Aggrieve (Violin Redux)
 Artist: Andrew Huo
 Duration: 0:46
-References:
-- track:aggrieve-violin-refrain
 URLs:
 - https://youtu.be/K0gpSYelM_k
+Referenced Tracks:
+- track:aggrieve-violin-refrain
diff --git a/album/homestuck-vol-10.yaml b/album/homestuck-vol-10.yaml
index 9a2814c5..5824f76f 100644
--- a/album/homestuck-vol-10.yaml
+++ b/album/homestuck-vol-10.yaml
@@ -55,23 +55,6 @@ Art Tags:
 URLs:
 - https://homestuck.bandcamp.com/track/creata-3
 - https://youtu.be/lXmiKt-rBjo
-References:
-- Skaia Voyages
-- track:showtime-original-mix
-- track:doctor
-- track:harlequin
-- track:aggrieve
-- track:chorale-for-jaspers
-- track:endless-climb
-- track:beatdown-strider-style
-- track:atomyk-ebonpyre
-- track:upward-movement-dave-owns
-- track:frost-vol6
-- The Beginning of Something Really Excellent
-- track:dissension-original
-- Carefree Action
-- track:revelawesome
-- track:song-of-skaia
 Lyrics: |-
     In vento cogitatio, spiritus in vento<br>In fusco lumen ignescit, lux e vacuo<br>E somnis nata verita e somno somnia<br>In clara umbra sunt omnia creata<br>Creata sunt omnia
     Lindelë sama calad<br>Oloriello illuvë onant<br>Eä
@@ -91,6 +74,23 @@ Commentary: |-
     (i definitely did cry)
 Cover Artists:
 - PJ Tush
+Referenced Tracks:
+- Skaia Voyages
+- track:showtime-original-mix
+- track:doctor
+- track:harlequin
+- track:aggrieve
+- track:chorale-for-jaspers
+- track:endless-climb
+- track:beatdown-strider-style
+- track:atomyk-ebonpyre
+- track:upward-movement-dave-owns
+- track:frost-vol6
+- The Beginning of Something Really Excellent
+- track:dissension-original
+- Carefree Action
+- track:revelawesome
+- track:song-of-skaia
 ---
 Track: Train
 Artist: Buzinkai
@@ -113,8 +113,6 @@ Cover Artists:
 Track: Of Gods and Witches
 Artist: Tensei
 Duration: '4:13'
-References:
-- track:doctor
 Art Tags:
 - Jade
 - Jadesprite
@@ -129,12 +127,12 @@ Commentary: |-
     So by the limited powers of canonization invested in me, I hereby pronounce this song's alternative title as "Of Sylphs and Sekrets" and that it may be interpreted as a theme for either Jade or Aranea.
 Cover Artists:
 - Archeia
+Referenced Tracks:
+- track:doctor
 ---
 Track: Beatup
 Artist: Clark Powell, Astro Kid
 Duration: '5:11'
-References:
-- track:beatdown-strider-style
 Art Tags:
 - Dave
 - Dirk
@@ -161,6 +159,8 @@ Commentary: |-
     I felt like a lot of saturated cool colors would really match how the song felt to me as well!
 Cover Artists:
 - Shan Murphy
+Referenced Tracks:
+- track:beatdown-strider-style
 ---
 Track: You Killed My Father (Prepare To Die)
 Artist: Team Dogfight
@@ -179,13 +179,6 @@ Contributors:
 - David Dycus (synths, composition)
 - Ian White (trumpet)
 - Kelly Sadwin (violin)
-References:
-- track:showtime-piano-refrain
-- track:showtime-original-mix
-- track:aggrieve-violin-refrain
-- Liquid Negrocity
-- Checkmate
-- Gaia Queen
 Lyrics: |-
     Round one
     Round two
@@ -210,13 +203,17 @@ Commentary: |-
     I have always thought of John as one who keeps his dorky self kept close in all situations, so John facing off Bec with the most energy filled, accusing point served as my inspiration for this piece.
 Cover Artists:
 - Mika B.
+Referenced Tracks:
+- track:showtime-piano-refrain
+- track:showtime-original-mix
+- track:aggrieve-violin-refrain
+- Liquid Negrocity
+- Checkmate
+- Gaia Queen
 ---
 Track: Sound Judgement
 Artist: Malcolm Brown
 Duration: '3:26'
-References:
-- Terezi's Theme
-- track:harlequin
 Art Tags:
 - Terezi
 - 'cw: blood'
@@ -234,12 +231,13 @@ Commentary: |-
     For this piece I wanted to go really comic book-y, so I leaned towards a Daredevil influence for Terezi (for obvious reasons). Initially, I had her in a more dtailed setting in extreme light and shadow, with Gamzee's silhouette looming over her. Totally by accident I ended up deleting the background layers, leaving just the strip of red lava as the orizon-- which looked way cooler than what I had before and gave it the comic-book-cover vibe I was shooting for. Super fun piece to work on!
 Cover Artists:
 - Sera B.
+Referenced Tracks:
+- Terezi's Theme
+- track:harlequin
 ---
 Track: Aggrievocation
 Artist: Mark Hadley
 Duration: '3:41'
-References:
-- track:aggrieve
 Art Tags:
 - Rose
 URLs:
@@ -252,14 +250,12 @@ Commentary: |-
     Just, put, like, "It was cool to work on this," I don't know!
 Cover Artists:
 - Rachel Lundin
+Referenced Tracks:
+- track:aggrieve
 ---
 Track: Stride
 Artist: Kalibration
 Duration: '3:26'
-References:
-- Moonsetter
-- Showdown
-- track:upward-movement-dave-owns
 Art Tags:
 - Dave
 - Dirk
@@ -276,13 +272,14 @@ Commentary: |-
     Fuck the rug.
 Cover Artists:
 - Seth Massey
+Referenced Tracks:
+- Moonsetter
+- Showdown
+- track:upward-movement-dave-owns
 ---
 Track: Skaian Overdrive
 Artist: Thomas Ferkol
 Duration: '2:27'
-References:
-- Skaian Ride
-- track:sburban-jungle
 Art Tags:
 - Underlings
 - BK
@@ -302,12 +299,13 @@ Commentary: |-
     Wish we saw more of them.
 Cover Artists:
 - Seth Massey
+Referenced Tracks:
+- Skaian Ride
+- track:sburban-jungle
 ---
 Track: Freefall
 Artist: Robert J! Lake
 Duration: '4:13'
-References:
-- Cascade (Beta)
 Art Tags:
 - John
 - Rose
@@ -334,6 +332,8 @@ Commentary: |-
     Very glad to be able to have the opportunity to draw something for the album overall!
 Cover Artists:
 - Nico J. Dolloso
+Referenced Tracks:
+- Cascade (Beta)
 ---
 Track: Moonsweater
 Artist: David Ellis
@@ -341,8 +341,6 @@ Contributors:
 - Toby Fox (with apologies to)
 - Malik Refaat (alto & tenor saxophone)
 Duration: '7:57'
-References:
-- Moonsetter
 Art Tags:
 - Midnight Crew
 - The Felt
@@ -359,6 +357,8 @@ Commentary: |-
     Thomas Ferkol came up with the name.
 Cover Artists:
 - David Litt
+Referenced Tracks:
+- Moonsetter
 ---
 Track: Castle
 Artist: Buzinkai
@@ -386,9 +386,6 @@ Cover Artists:
 Track: Skaian Happy Flight
 Artist: Seth Peelle
 Duration: '2:06'
-References:
-- Skaian Ride
-- Skaia Voyages
 Art Tags:
 - John
 - Dave
@@ -410,6 +407,9 @@ Commentary: |-
     There were aspects of the more detailed coloring I liked, but I didn't want John to stick out as awkwardly rendered against the otherwise mostly simplistic background style. I had a lot of fun creating this piece and I hope it does the cute song some justice!
 Cover Artists:
 - Alyssa Lee Dalangin
+Referenced Tracks:
+- Skaian Ride
+- Skaia Voyages
 ---
 Track: Voidlight
 Artist: Thomas Ferkol
@@ -427,8 +427,6 @@ Cover Artists:
 Track: Beatdown DX
 Artist: Curt Blakeslee
 Duration: '4:13'
-References:
-- track:beatdown-strider-style
 Art Tags:
 - Dave
 - Dave's bro
@@ -443,14 +441,12 @@ Commentary: |-
     Catch me on the roof in my mid 30's pwning a 9th grader with a sword.
 Cover Artists:
 - miraculoustang
+Referenced Tracks:
+- track:beatdown-strider-style
 ---
 Track: Solar Voyage
 Artist: Marcy Nabors
 Duration: '5:06'
-References:
-- track:ruins
-- Flare
-- track:explore
 Art Tags:
 - Jack Noir
 - PM
@@ -479,6 +475,10 @@ Commentary: |-
     \_(ツ)_/
 Cover Artists:
 - Seth Massey
+Referenced Tracks:
+- track:ruins
+- Flare
+- track:explore
 ---
 Track: Feel (Alive)
 Artist: Luke Benjamins, Robert J! Lake
@@ -523,8 +523,6 @@ Cover Artists:
 Track: Breeze
 Artist: Erik Scheele
 Duration: '5:16'
-References:
-- Sea of Derse
 Art Tags:
 - John
 URLs:
@@ -538,14 +536,14 @@ Commentary: |-
     A chill tune deserves a classy cover.
 Cover Artists:
 - Richard Gung
+Referenced Tracks:
+- Sea of Derse
 ---
 Track: Starfall
 Artist: Solatrus
 Contributors:
 - Justin Hellier (special thanks)
 Duration: '4:13'
-References:
-- Ascend
 Art Tags:
 - Rose
 URLs:
@@ -566,6 +564,8 @@ Commentary: |-
     I'm pretty happy to have had this opportunity to draw something for this album.
 Cover Artists:
 - Lunise
+Referenced Tracks:
+- Ascend
 ---
 Track: Ascend
 Artist: Tensei
@@ -576,7 +576,19 @@ Art Tags:
 URLs:
 - https://homestuck.bandcamp.com/track/ascend-2
 - https://youtu.be/e9gGXYbtSt8
-References:
+Lyrics: |-
+    Toki no hime wa<br>(<i>The princess of time</i>)
+    (Toki no hime wa inu wo tometa)<br>(Toki no hime wa inu wo tometa)<br>(Toki no hime wa inu wo tometa)<br>(Toki no hime wa inu wo tometa)
+    (Toki no hime wa inu wo tometa)<br>(Toki no hime wa inu wo tometa)<br>(Toki no hime wa inu wo tometa)<br>(Toki no hime wa inu wo tometa)
+    (<i>The princess of time stopped the dog</i>)
+Commentary: |-
+    <i>Tensei:</i>
+    First of all, I'm not an EDM producer.
+    So I made this track called [[The King in Red]]. Here's the song:<br>PSYCH, that's the wrong song!
+    Sweet Fruity Loops - I use that.<br>Supa hot beats - I drop that.<br>John and Aradia - I ship that.
+Cover Artists:
+- Marimo
+Referenced Tracks:
 - track:doctor
 - Cascade (Beta)
 - Time on My Side
@@ -599,27 +611,10 @@ References:
 - Homestuck Anthem
 - track:showtime-original-mix
 - Carefree Action
-Lyrics: |-
-    Toki no hime wa<br>(<i>The princess of time</i>)
-    (Toki no hime wa inu wo tometa)<br>(Toki no hime wa inu wo tometa)<br>(Toki no hime wa inu wo tometa)<br>(Toki no hime wa inu wo tometa)
-    (Toki no hime wa inu wo tometa)<br>(Toki no hime wa inu wo tometa)<br>(Toki no hime wa inu wo tometa)<br>(Toki no hime wa inu wo tometa)
-    (<i>The princess of time stopped the dog</i>)
-Commentary: |-
-    <i>Tensei:</i>
-    First of all, I'm not an EDM producer.
-    So I made this track called [[The King in Red]]. Here's the song:<br>PSYCH, that's the wrong song!
-    Sweet Fruity Loops - I use that.<br>Supa hot beats - I drop that.<br>John and Aradia - I ship that.
-Cover Artists:
-- Marimo
 ---
 Track: Lilith in Starlight
 Artist: Malcolm Brown
 Duration: '3:51'
-References:
-- Black Rose / Green Sun
-- Mother
-- track:aggrieve
-- Darling Kanaya
 Art Tags:
 - Rose
 - Kanaya
@@ -637,6 +632,11 @@ Commentary: |-
     Just the two of them in their own little world, sharing a romantic moment!
 Cover Artists:
 - Sera B.
+Referenced Tracks:
+- Black Rose / Green Sun
+- Mother
+- track:aggrieve
+- Darling Kanaya
 ---
 Track: Thanks for Playing
 Artist: Max Wright
@@ -687,19 +687,6 @@ Contributors:
 - Robin S (choir)
 - Chris Roper (choir)
 - Stephen "Jeebes" Wiley (choir)
-References:
-- Warhammer of Zillyhoo
-- Calamity
-- Walk-Stab-Walk (R&E)
-- track:doctor
-- Dirgeish
-- Crystalanthemums
-- track:skies-of-skaia
-- track:frost-vol6
-- track:beatdown-strider-style
-- Penumbra Phantasm
-- Courser
-- track:sburban-jungle
 Commentary: |-
     <i>Marcy Nabors:</i>
     Four years! And what a wild four years it has been.
@@ -722,12 +709,23 @@ Lyrics: |-
     <i>Renew!<br>Return!</i>)
 Cover Artists:
 - Zilleniose
+Referenced Tracks:
+- Warhammer of Zillyhoo
+- Calamity
+- Walk-Stab-Walk (R&E)
+- track:doctor
+- Dirgeish
+- Crystalanthemums
+- track:skies-of-skaia
+- track:frost-vol6
+- track:beatdown-strider-style
+- Penumbra Phantasm
+- Courser
+- track:sburban-jungle
 ---
 Track: THIS Pumpkin
 Artist: Alex Rosetti
 Duration: '4:02'
-References:
-- Pumpkin Cravings
 URLs:
 - https://homestuck.bandcamp.com/track/this-pumpkin-2
 - https://youtu.be/ekWbliUNqfM
@@ -745,6 +743,8 @@ Commentary: |-
     but I was ultimately irked and redid it with candy corn PS a few days later.
 Cover Artists:
 - Worthikids
+Referenced Tracks:
+- Pumpkin Cravings
 ---
 Track: Conclude
 Artist: Seth Peelle
@@ -754,11 +754,6 @@ Art Tags:
 URLs:
 - https://homestuck.bandcamp.com/track/conclude-2
 - https://youtu.be/5Dq01x-oxWM
-References:
-- track:sburban-jungle
-- track:showtime-piano-refrain
-- Homestuck
-- track:skies-of-skaia
 Commentary: |-
     <i>Seth Pelle:</i>
     Oh, hey. Is it the last track already? Man, where did the time go?
@@ -787,3 +782,8 @@ Commentary: |-
     This piece is my thank-you to Homestuck for that experience.
 Cover Artists:
 - Kiko B.
+Referenced Tracks:
+- track:sburban-jungle
+- track:showtime-piano-refrain
+- Homestuck
+- track:skies-of-skaia
diff --git a/album/homestuck-vol-2.yaml b/album/homestuck-vol-2.yaml
index 2c016514..2159fa23 100644
--- a/album/homestuck-vol-2.yaml
+++ b/album/homestuck-vol-2.yaml
@@ -16,28 +16,28 @@ Artist: Michael Guy Bowman, Joseph Aylsworth
 Contributors:
 - Joseph Aylsworth (guitar)
 Duration: '2:48'
-References:
-- track:harlequin
 URLs:
 - https://homestuck.bandcamp.com/track/harlequin-rock-version-3
 - https://youtu.be/g5TDTcMEL_c
+Referenced Tracks:
+- track:harlequin
 ---
 Track: Skaian Dreams (Remix)
 Artist: Bill Bolin
 Duration: '1:30'
-References:
+Has URLs: false
+Referenced Tracks:
 - track:showtime-original-mix
 - track:skies-of-skaia
-Has URLs: false
 ---
 Track: Upward Movement (Dave Owns)
 Artist: Kalibration
 Duration: '4:20'
-References:
-- track:amen-brother
 URLs:
 - https://homestuck.bandcamp.com/track/upward-movement-dave-owns-3
 - https://youtu.be/j6UiUu_7LVc
+Referenced Tracks:
+- track:amen-brother
 ---
 Track: Vagabounce
 Artist: David Ko
@@ -71,24 +71,24 @@ Has URLs: false
 Track: Showtime Remix
 Artist: Gabe Nezovic
 Duration: '2:02'
-References:
-- track:showtime-piano-refrain
-Samples:
-- track:showtime-piano-refrain
 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
 ---
 Track: Aggrieve Remix
 Artist: Gabe Nezovic
-References:
-- track:aggrieve-violin-refrain
-Samples:
-- track:aggrieve-violin-refrain
 Duration: '2:11'
 URLs:
 - https://homestuck.bandcamp.com/track/aggrieve-remix-3
 - https://youtu.be/DpB5llhN2L0
+Referenced Tracks:
+- track:aggrieve-violin-refrain
+Sampled Tracks:
+- track:aggrieve-violin-refrain
 ---
 Track: Verdancy (Bassline)
 Artist: Kalibration
@@ -100,6 +100,6 @@ URLs:
 Track: Kinetic Verdancy
 Artist: Bill Bolin
 Duration: '1:30'
-References:
-- track:verdancy-bassline
 Has URLs: false
+Referenced Tracks:
+- track:verdancy-bassline
diff --git a/album/homestuck-vol-3.yaml b/album/homestuck-vol-3.yaml
index dc2100b4..df1bb26d 100644
--- a/album/homestuck-vol-3.yaml
+++ b/album/homestuck-vol-3.yaml
@@ -21,8 +21,6 @@ URLs:
 Track: Harleboss
 Artist: Malcolm Brown
 Duration: '2:47'
-References:
-- track:harlequin
 URLs:
 - https://homestuck.bandcamp.com/track/harleboss-3
 - https://youtu.be/51vrPLt_LG8
@@ -31,15 +29,17 @@ Commentary: |-
     Harlequin was awesome, and was quite a popular source for remixing the theme (it still is) so this was my early attempt.
     The soundfont is actually a FF6 SNES font I found somewhere (At lot of people got it from the choir). The SNES soundfont choice was taken from a kind of natural evolution the music was taking from the earlier Vol 1 8-bi to 16-bit style music.
     Not much to say on this one except it was quite a stereotypical 'Epic' boss battle theme - Choirs, church organs, bells, guitar and fast drums.
+Referenced Tracks:
+- track:harlequin
 ---
 Track: Beatdown Round 2
 Artist: Curt Blakeslee
 Duration: '2:27'
-References:
-- track:beatdown-strider-style
 URLs:
 - https://homestuck.bandcamp.com/track/beatdown-round-2-3
 - https://youtu.be/CuQpu45cmtw
+Referenced Tracks:
+- track:beatdown-strider-style
 ---
 Track: Dissension (Original)
 Artist: David Ko
@@ -51,11 +51,11 @@ URLs:
 Track: Dissension (Remix)
 Artist: David Ko
 Duration: '2:03'
-References:
-- track:dissension-original
 URLs:
 - https://homestuck.bandcamp.com/track/dissension-remix-3
 - https://youtu.be/mkPXt83h73w
+Referenced Tracks:
+- track:dissension-original
 ---
 Track: Ohgodwhat
 Artist: Nick Smalley
@@ -75,11 +75,11 @@ Commentary: |-
 Track: Ohgodwhat Remix
 Artist: Michael Guy Bowman
 Duration: '1:05'
-References:
-- track:ohgodwhat
 URLs:
 - https://homestuck.bandcamp.com/track/ohgodwhat-remix-3
 - https://youtu.be/ZuaMHCPnqOc
+Referenced Tracks:
+- track:ohgodwhat
 ---
 Track: Rediscover Fusion
 Artist: BurnedKirby
@@ -91,20 +91,20 @@ URLs:
 Track: Rediscover Fusion Remix
 Artist: Bill Bolin
 Duration: '2:05'
-References:
-- track:rediscover-fusion
 Has URLs: false
+Referenced Tracks:
+- track:rediscover-fusion
 ---
 Track: Explore Remix
 Artist: Gabe Nezovic
 Duration: '2:00'
-References:
-- track:explore
-Samples:
-- track:explore
 URLs:
 - https://homestuck.bandcamp.com/track/explore-remix-3
 - https://youtu.be/06qu70cLPaE
+Referenced Tracks:
+- track:explore
+Sampled Tracks:
+- track:explore
 ---
 Track: Chorale for Jaspers
 Artist: Michael Guy Bowman
@@ -118,8 +118,8 @@ Artist: Michael Guy Bowman
 Contributors:
 - Tavia Morra (vocals)
 Duration: '1:03'
-References:
-- track:chorale-for-jaspers
 URLs:
 - https://homestuck.bandcamp.com/track/pony-chorale-3
 - https://youtu.be/MHsZHFb5FqU
+Referenced Tracks:
+- track:chorale-for-jaspers
diff --git a/album/homestuck-vol-4.yaml b/album/homestuck-vol-4.yaml
index 39a298f2..48b7fca4 100644
--- a/album/homestuck-vol-4.yaml
+++ b/album/homestuck-vol-4.yaml
@@ -26,14 +26,14 @@ Commentary: |-
 Track: Hardlyquin
 Artist: Mark Hadley
 Duration: '1:38'
-References:
-- track:harlequin
 URLs:
 - https://homestuck.bandcamp.com/track/hardlyquin-3
 - https://youtu.be/CN04ruWv30g
 Commentary: |-
     <i>Mark Hadley:</i>
     When Andrew asked us to do something for a shock and surprise for the upcoming reveal of John's Dad's room, this is what I came up with. I slipped some Harlequin in there for good measure. The original version was exactly as it appears in the comic (complete with the record scratch at the end), and I lengthened it for the soundtrack since it was so very, very short. Somehow it came out creepier in that version.
+Referenced Tracks:
+- track:harlequin
 ---
 Track: Mutiny
 Artist: Bill Bolin
@@ -43,8 +43,6 @@ Has URLs: false
 Track: Carefree Victory
 Artist: Andrew Huo, Toby Fox
 Duration: '1:36'
-References:
-- track:carefree-action
 URLs:
 - https://homestuck.bandcamp.com/track/carefree-victory-3
 - https://youtu.be/2z1Rp2UynQE
@@ -52,13 +50,15 @@ Commentary: |-
     <i>Andrew Huo:</i>
     Carefree Victory is really Hadley's baby, and I would feel like I'm plagiarizing to really call it my own. I really just dictated his piece, called Carefree Action, put it into PXTone, added some lines, changed the tempo, and added a coda (which wasn't even used in the comic, I think?).
     One of the lines I added, for the intro, was roughly inspired by Cave Story music. I'm pretty Cave Story-influenced, especially with Homestuck stuff.
+Referenced Tracks:
+- track:carefree-action
 ---
 Track: Guardian V2
 Artist: Bill Bolin
 Duration: '1:20'
-References:
-- track:guardian
 Has URLs: false
+Referenced Tracks:
+- track:guardian
 ---
 Track: Contention
 Directory: contention-vol4
@@ -91,14 +91,14 @@ URLs:
 Track: Three in the Morning (RJ's I Can Barely Sleep In This Casino Remix)
 Artist: Robert J! Lake
 Duration: '6:29'
-References:
-- track:three-in-the-morning
-Samples:
-- track:three-in-the-morning
 Directory: three-in-the-morning-rj
 URLs:
 - https://homestuck.bandcamp.com/track/three-in-the-morning-rjs-i-can-barely-sleep-in-this-casino-remix-3
 - https://youtu.be/GACczxr7464
+Referenced Tracks:
+- track:three-in-the-morning
+Sampled Tracks:
+- track:three-in-the-morning
 ---
 Track: Doctor
 Artist: Buzinkai
@@ -106,8 +106,6 @@ Contributors:
 - Clark Powell (production)
 - Michael Vallejo (production)
 Duration: '2:37'
-References:
-- track:doctor-original-loop
 URLs:
 - https://homestuck.bandcamp.com/track/doctor-3
 - https://youtu.be/ve7TB0FggaY
@@ -117,6 +115,8 @@ Commentary: |-
     <i>Buzinkai:</i>
     Doctor was written before Homestuck, actually. The only thing I can really remember was that Super Smash Bros Brawl came out right before I finished it. The original loop (which is not the one specifically heard in the comic, but was included in the album release) was directly inspired by music from Cave Story, and I was trying to at the time musically embody how I felt at the time, I think. Though it never seems to come out exactly as I plan it, I enjoyed the results. I will say that I cannot truly believe how many people have remixed it.
     The arpeggio part at the end goes between the left, both, and right speakers sequentially. I was too lazy to set the channel settings manually, so I did each note on a different instrument, which is set to each speaker channel. Not many people know that, and I think it actually made it a living hell for remixers who got a hold of the original file.
+Referenced Tracks:
+- track:doctor-original-loop
 ---
 Track: Endless Climb
 Artist: Buzinkai
@@ -140,10 +140,6 @@ Artist: Toby Fox
 Duration: '2:24'
 Art Tags:
 - 'cw: blood'
-References:
-- track:liquid-negrocity
-Samples:
-- track:im-a-member-of-the-midnight-crew
 URLs:
 - https://homestuck.bandcamp.com/track/black-3
 - https://youtu.be/5NACWZBDtN8
@@ -166,3 +162,7 @@ Lyrics: |-
     I'm a member of the Midnight Crew!
     I'm a- I'm a- I'm a member of the-
     I'm a member of the Midnight Crew!
+Referenced Tracks:
+- track:liquid-negrocity
+Sampled Tracks:
+- track:im-a-member-of-the-midnight-crew
diff --git a/album/homestuck-vol-5.yaml b/album/homestuck-vol-5.yaml
index 09a4d75e..6c637f87 100644
--- a/album/homestuck-vol-5.yaml
+++ b/album/homestuck-vol-5.yaml
@@ -1,10 +1,6 @@
 Album: Homestuck Vol. 5
 Date: June 13, 2010
 Date Added: November 15, 2019
-Track Art Date: April 13, 2017
-Banner Art:
-- Lexxy
-- Niklink (edits for wiki)
 Banner Dimensions: 1100x203
 Wallpaper Style: 'opacity: 0.6;'
 Color: '#00aaff'
@@ -29,6 +25,10 @@ Cover Artists:
 Wallpaper Artists:
 - Lexxy
 - Niklink (edits for wiki)
+Banner Artists:
+- Lexxy
+- Niklink (edits for wiki)
+Default Track Cover Art Date: April 13, 2017
 ---
 Track: Homestuck Anthem
 Artist: Clark Powell
@@ -47,9 +47,6 @@ Cover Artists:
 Track: Skaian Skirmish
 Artist: Andrew Huo, Toby Fox
 Duration: '2:09'
-References:
-- Skaian Skuffle
-- Lotus
 Art Tags:
 - WV
 - Carapacians
@@ -58,13 +55,13 @@ URLs:
 - https://youtu.be/_EB_Y3biviY
 Cover Artists:
 - seiii-tan
+Referenced Tracks:
+- Skaian Skuffle
+- Lotus
 ---
 Track: Savior of the Waking World
 Artist: Toby Fox
 Duration: '2:26'
-References:
-- track:doctor
-- Penumbra Phantasm
 Art Tags:
 - John
 URLs:
@@ -72,12 +69,13 @@ URLs:
 - https://youtu.be/juQcAEkvzdQ
 Cover Artists:
 - cityinthesea
+Referenced Tracks:
+- track:doctor
+- Penumbra Phantasm
 ---
 Track: Clockwork Melody
 Artist: Clark Powell
 Duration: 0:35
-References:
-- track:endless-climb
 Art Tags:
 - Dave
 - Lil Cal
@@ -87,14 +85,12 @@ URLs:
 - https://youtu.be/0s4JjBz-pr4
 Cover Artists:
 - fizzmouth
+Referenced Tracks:
+- track:endless-climb
 ---
 Track: Heirfare
 Artist: Alex Rosetti
 Duration: '2:42'
-References:
-- track:showtime-original-mix
-- track:showtime-piano-refrain
-- track:harlequin
 Art Tags:
 - John
 - Rose
@@ -108,6 +104,10 @@ Commentary: |-
     This piece is one of the strongest examples of how much better my old music could have been if I had used better samples. But I had nothing but cheap stuff at the time, so I think this one suffers a lot. Personal regret aside, I composed this as an ode to John, so it features the themes from Showtime and Harlequin. I wanted something big and dramatic, so I went the semi-orchestral route, and completely transformed the context of the two melodies I used to suit the mood of the piece. In particular, Harlequin seems almost unrecognizable unless you're paying attention or have a good ear. I think its attempt to come off as big and noble is a little heavy-handed at times, but it would definitely be a fun one to come back to and update.
 Cover Artists:
 - Sollay
+Referenced Tracks:
+- track:showtime-original-mix
+- track:showtime-piano-refrain
+- track:harlequin
 ---
 Track: Jade's Lullaby
 Artist: David Ko
@@ -124,8 +124,6 @@ Cover Artists:
 Track: Aggrievance
 Artist: Mark Hadley
 Duration: '3:01'
-References:
-- track:aggrieve
 Art Tags:
 - Rose
 URLs:
@@ -136,12 +134,12 @@ Commentary: |-
     Since Aggrieve was the first song I wrote for Homestuck, I also imagined it would be the first thing I would remix. That turned out not to be the case (I remixed Harlequin first), but I went ahead with it anyway. I also figured it might come in handy in case there was ever another strife scene with Rose post-entry, but those became rare after a while, except for special situations.
 Cover Artists:
 - rose-ebottles
+Referenced Tracks:
+- track:aggrieve
 ---
 Track: Happy Cat Song!
 Artist: Michael Guy Bowman, Toby Fox
 Duration: 0:34
-References:
-- track:chorale-for-jaspers
 Art Tags:
 - Rose
 - Jaspers
@@ -150,15 +148,14 @@ URLs:
 - https://youtu.be/oLxeExkmGWs
 Cover Artists:
 - strife-kind
+Referenced Tracks:
+- track:chorale-for-jaspers
 ---
 Track: Hardchorale
 Artist: Alex Rosetti, Toby Fox
 Contributors:
 - Michael Guy Bowman (meows)
 Duration: '2:54'
-References:
-- track:chorale-for-jaspers
-- Squiddles!
 Art Tags:
 - 'cw: body horror'
 URLs:
@@ -169,6 +166,9 @@ Commentary: |-
     I've always considered the creation of this song a "classic story". It came about in a strange, almost fateful way, and I think the final product reflects that. It was the first thing that Radiation and I worked on together, and it was through Hardchorale that our friendship started. He approached me with a MIDI file he had made, intending it to be a sort of "boss battle" arrangement of Chorale for Jaspers in the style of Harleboss. He asked if I would be interested in producing it, since at the time he was just starting out and had no means to do so. I agreed, Chorale being one of my favorite Homestuck tunes. So I produced it in a DAW to make it sound "good", and relative to the MIDI file it sounded great, and we were both really happy with it. Radiation got Bowman to record some heavy metal meows, which he apparently almost got kicked out of his apartment for recording and claims to have video of, though I have yet to see it. Once I found out it was going to be on Vol. 5, I added a section to it (roughly the last third of the piece) and at the very end sneaked the Squiddles theme just because I could. I realize that was more of a narrative than a commentary, but it's the history behind this piece that I find fun to talk about more than the piece itself.
 Cover Artists:
 - floralmarsupial
+Referenced Tracks:
+- track:chorale-for-jaspers
+- Squiddles!
 ---
 Track: An Unbreakable Union
 Artist: Kalibration
@@ -185,9 +185,6 @@ Cover Artists:
 Track: Skaian Ride
 Artist: Seth Peelle, Andrew Huo
 Duration: '3:04'
-References:
-- track:aggrieve
-- track:showtime-original-mix
 Art Tags:
 - Jane
 - Jake
@@ -198,12 +195,13 @@ URLs:
 - https://youtu.be/tD_AfVeEyu4
 Cover Artists:
 - awildcale
+Referenced Tracks:
+- track:aggrieve
+- track:showtime-original-mix
 ---
 Track: White
 Artist: Toby Fox
 Duration: '1:25'
-References:
-- Liquid Negrocity
 Art Tags:
 - PM
 URLs:
@@ -211,16 +209,12 @@ URLs:
 - https://youtu.be/AmsR9n_5xKk
 Cover Artists:
 - RainbowCookiz
+Referenced Tracks:
+- Liquid Negrocity
 ---
 Track: Octoroon Rangoon
 Artist: Toby Fox
 Duration: '2:11'
-References:
-- Liquid Negrocity
-- The Ballad of Jack Noir
-- Non Compos Mentis
-Samples:
-- I'm a Member of the Midnight Crew
 Art Tags:
 - Jack Noir
 - Horrorterrors
@@ -230,6 +224,12 @@ URLs:
 Lyrics: Make her a member of the Midnight Crew!
 Cover Artists:
 - enjistier
+Referenced Tracks:
+- Liquid Negrocity
+- The Ballad of Jack Noir
+- Non Compos Mentis
+Sampled Tracks:
+- I'm a Member of the Midnight Crew
 ---
 Track: Pumpkin Cravings
 Artist: Seth Peelle
@@ -249,8 +249,6 @@ Cover Artists:
 Track: Welcome to the New Extreme
 Artist: Robert J! Lake
 Duration: '3:18'
-References:
-- track:sburban-jungle
 Art Tags:
 - Rose
 - Dave
@@ -260,6 +258,8 @@ URLs:
 - https://youtu.be/kWVQH0Z5u08
 Cover Artists:
 - Xagave
+Referenced Tracks:
+- track:sburban-jungle
 ---
 Track: Crystalanthemums
 Artist: Alex Rosetti
@@ -278,8 +278,6 @@ Cover Artists:
 Track: Skaia (Incipisphere Mix)
 Artist: Solatrus
 Duration: '5:06'
-References:
-- track:skies-of-skaia
 URLs:
 - https://homestuck.bandcamp.com/track/skaia-incipisphere-mix-2
 - https://youtu.be/IaT2a68dyJo
@@ -305,6 +303,8 @@ Commentary: |-
     Of course, the comments I see the most on this song are on the improvised piano part. Before I was on the team I started doing a regular broadcast on the skaia.net internet radio, and I’d improvise over this song pretty often back then. I eventually figured out a few parts that I wanted to keep consistent, and I did a bunch of takes to finally get to what you hear in the final song. Of course, MIDI never seems to record very accurately, and I’m not actually the greatest at piano (!!!), so I had to do some fine-tuning on the note timings to make them actually sound precise. But those really fast runs were definitely real, and, no, don’t ask me to play it again. I won’t be able to. It was a really good day for me.
 Cover Artists:
 - razzberrysheep
+Referenced Tracks:
+- track:skies-of-skaia
 ---
 Track: Sarabande
 Artist: Erik Scheele
@@ -327,8 +327,6 @@ Cover Artists:
 Track: Clockwork Sorrow
 Artist: David Ko
 Duration: '1:04'
-References:
-- Clockwork Melody
 Art Tags:
 - Dave
 URLs:
@@ -336,6 +334,8 @@ URLs:
 - https://youtu.be/fMn4Iehh2A4
 Cover Artists:
 - Prince
+Referenced Tracks:
+- Clockwork Melody
 ---
 Track: Phantasmagoric Waltz
 Artist: Alex Rosetti
@@ -361,8 +361,6 @@ Cover Artists:
 Track: Sunslammer
 Artist: Seth Peelle
 Duration: '3:05'
-References:
-- Sunsetter
 Art Tags:
 - Jade
 - Underlings
@@ -371,13 +369,12 @@ URLs:
 - https://youtu.be/DJ5crJDYtDg
 Cover Artists:
 - Aeritus
+Referenced Tracks:
+- Sunsetter
 ---
 Track: Lotus Land Story
 Artist: Toby Fox
 Duration: '1:52'
-References:
-- Lotus
-- track:doctor
 Art Tags:
 - Jade
 URLs:
@@ -385,12 +382,13 @@ URLs:
 - https://youtu.be/O7qf5KhmM-I
 Cover Artists:
 - fenkko
+Referenced Tracks:
+- Lotus
+- track:doctor
 ---
 Track: Chorale for War
 Artist: Steve Everson
 Duration: '1:37'
-References:
-- track:chorale-for-jaspers
 Art Tags:
 - Dave
 - Jade
@@ -403,6 +401,8 @@ Commentary: |-
     This one predates my time on the music team! It started life as a midi called Battle Chorale (obviously, a pun on "battle royale"). It was pretty popular, if I recall correctly, though there wasn’t a lot of fan music around in those days to compare to. Some time after joining the team, one of the other musicians created their own hard rock Chorale remix by that same name! So I updated my old one under a new name, and Albatross and Rad created their Hardchorale remix too. Battle Chorale never made it to publication but these two survived.
 Cover Artists:
 - appulsprite
+Referenced Tracks:
+- track:chorale-for-jaspers
 ---
 Track: Unsheath'd
 Artist: Alex Rosetti
@@ -437,9 +437,6 @@ Contributors:
 - Toby Fox (various material)
 - Erik Scheele (various material)
 Duration: '1:39'
-References:
-- track:doctor
-- Penumbra Phantasm
 Art Tags:
 - John
 URLs:
@@ -447,12 +444,13 @@ URLs:
 - https://youtu.be/VQjHlYSM_jo
 Cover Artists:
 - Meruz
+Referenced Tracks:
+- track:doctor
+- Penumbra Phantasm
 ---
 Track: Bed of Rose's / Dreams of Derse
 Artist: Mark Hadley
 Duration: '1:43'
-References:
-- track:aggrieve
 Art Tags:
 - Rose
 - Horrorterrors
@@ -464,12 +462,12 @@ Commentary: |-
     John had a "sleep and recover hp/mp" type theme, so I wrote one for Rose as well. Naturally it uses part of the theme from Aggrieve. When it came time to put it on the album, I didn't really want to leave it as short as it was, so I added the Dreams of Derse section to lengthen it, imagining what the cold, far orbit of Derse might be like.
 Cover Artists:
 - Seagrot
+Referenced Tracks:
+- track:aggrieve
 ---
 Track: Skaian Flight
 Artist: Kalibration
 Duration: '1:30'
-References:
-- Skaian Ride
 Art Tags:
 - John
 URLs:
@@ -477,14 +475,14 @@ URLs:
 - https://youtu.be/1pXdGOSIvEs
 Cover Artists:
 - Aryll
+Referenced Tracks:
+- Skaian Ride
 ---
 Track: How Do I Live (Bunny Back in the Box Version)
 Artist: Michael Guy Bowman
 Contributors:
 - Nick Smalley (guitar solo)
 Duration: '3:43'
-References:
-- How Do I Live
 Art Tags:
 - John
 - Rose
@@ -506,15 +504,12 @@ Lyrics: |-
     (Oh, it's- it's done. Oh.)
 Cover Artists:
 - copiko-art
+Referenced Tracks:
+- How Do I Live
 ---
 Track: Dupliblaze COMAGMA
 Artist: Toby Fox
 Duration: '2:24'
-References:
-- track:atomyk-ebonpyre
-- track:beatdown-strider-style
-Samples:
-- Drop It Like It's Hot
 Art Tags:
 - Dave
 URLs:
@@ -527,12 +522,15 @@ Lyrics: |-
     Drop it like it's hot<br>Drop it like it's hot
 Cover Artists:
 - Shoutloaf
+Referenced Tracks:
+- track:atomyk-ebonpyre
+- track:beatdown-strider-style
+Sampled Tracks:
+- Drop It Like It's Hot
 ---
 Track: Moonshatter
 Artist: Toby Fox
 Duration: '1:17'
-References:
-- track:harlequin
 Art Tags:
 - Dave
 URLs:
@@ -540,12 +538,12 @@ URLs:
 - https://youtu.be/pGgEeNu-WpY
 Cover Artists:
 - madragingven
+Referenced Tracks:
+- track:harlequin
 ---
 Track: Sunsetter
 Artist: Toby Fox
 Duration: '1:32'
-References:
-- Hawkeye
 Art Tags:
 - Dave
 - 'cw: body horror (abstract)'
@@ -554,6 +552,8 @@ URLs:
 - https://youtu.be/DooIE-BKSGo
 Cover Artists:
 - Raddical
+Referenced Tracks:
+- Hawkeye
 ---
 Track: Lotus
 Artist: Seth Peelle
@@ -569,9 +569,6 @@ Cover Artists:
 Track: Ruins (With Strings)
 Artist: Erik Scheele, Michael Guy Bowman
 Duration: '3:09'
-References:
-- track:ruins
-- track:sburban-jungle
 Art Tags:
 - Jade
 URLs:
@@ -590,6 +587,9 @@ Commentary: |-
     Really, the track should probably be listed simply as “Ruins” if not for the fact that there is not official piano rendition of the piece. I think it would be really cool to hear such a version of the tune if Jit ever found himself recording material in a studio again (as he did for James’s piano suite Sburb).
 Cover Artists:
 - ghostpressure
+Referenced Tracks:
+- track:ruins
+- track:sburban-jungle
 ---
 Track: Ectobiology
 Artist: David Ko
@@ -640,9 +640,6 @@ Cover Artists:
 ---
 Track: Crystamanthequins
 Artist: Erik Scheele
-References:
-- Crystalanthemums
-- Mannequin
 Duration: '3:10'
 Art Tags:
 - Aradia
@@ -660,12 +657,13 @@ Commentary: |-
     Also, as a sidenote, my like for Beck is rather shown in this piece, as is evidenced by my direct attempt to semi-recreate main beat in Replica to transition between the two sections. #MUSICSECRETSSSSSSSS
 Cover Artists:
 - Jenny
+Referenced Tracks:
+- Crystalanthemums
+- Mannequin
 ---
 Track: Endless Climbing
 Artist: Perry Sullivan
 Duration: '2:12'
-References:
-- track:endless-climb
 Art Tags:
 - Rose
 URLs:
@@ -673,17 +671,12 @@ URLs:
 - https://youtu.be/zBh8V5EonSs
 Cover Artists:
 - allyssinian
+Referenced Tracks:
+- track:endless-climb
 ---
 Track: Land of the Salamanders
 Artist: David Ko
 Duration: '1:44'
-References:
-- track:doctor
-- track:sburban-jungle
-- track:showtime-original-mix
-- track:dissension-remix
-- track:aggrieve
-- track:vagabounce
 Art Tags:
 - John
 - Consorts
@@ -692,12 +685,17 @@ URLs:
 - https://youtu.be/bfKXw-kSnq8
 Cover Artists:
 - Kisbys
+Referenced Tracks:
+- track:doctor
+- track:sburban-jungle
+- track:showtime-original-mix
+- track:dissension-remix
+- track:aggrieve
+- track:vagabounce
 ---
 Track: Medical Emergency
 Artist: Alex Rosetti
 Duration: '2:08'
-References:
-- Savior of the Waking World
 Art Tags:
 - John
 - 'cw: blood'
@@ -709,12 +707,12 @@ Commentary: |-
     Radiation gave me a MIDI of Savior of the Waking World to remix shortly before he figured out how to do it himself. It's based on a prototype of that song and goes in a completely different direction, complete with a cheesy electric guitar synth. I think the opening ended up sounding really cool, but the rest of it just sounds kind of dumb in its execution, not that the material itself isn't good.
 Cover Artists:
 - Nolvini
+Referenced Tracks:
+- Savior of the Waking World
 ---
 Track: Clockwork Contrivance
 Artist: Clark Powell
 Duration: '4:33'
-References:
-- Clockwork Melody
 Art Tags:
 - Dave
 URLs:
@@ -722,13 +720,12 @@ URLs:
 - https://youtu.be/b3VZo6aQyoc
 Cover Artists:
 - Ghostcrebs
+Referenced Tracks:
+- Clockwork Melody
 ---
 Track: Get Up
 Artist: Toby Fox
 Duration: '1:18'
-References:
-- Penumbra Phantasm
-- track:doctor
 Art Tags:
 - John
 URLs:
@@ -736,12 +733,13 @@ URLs:
 - https://youtu.be/RG-gwMm7vcg
 Cover Artists:
 - reinardfox
+Referenced Tracks:
+- Penumbra Phantasm
+- track:doctor
 ---
 Track: Vertical Motion
 Artist: Toby Fox
 Duration: '1:32'
-References:
-- track:endless-climb
 Art Tags:
 - Rose
 URLs:
@@ -749,6 +747,8 @@ URLs:
 - https://youtu.be/RCMpwY8pirw
 Cover Artists:
 - inariijane
+Referenced Tracks:
+- track:endless-climb
 ---
 Track: The Beginning of Something Really Excellent
 Artist: Robert J! Lake
@@ -763,8 +763,6 @@ Cover Artists:
 ---
 Track: Pyrocumulus (Kickstart)
 Artist: Robert J! Lake
-References:
-- Skaian Skuffle
 Duration: '3:02'
 Art Tags:
 - John
@@ -773,12 +771,12 @@ URLs:
 - https://youtu.be/KYc4reXiKfE
 Cover Artists:
 - thespacemaid
+Referenced Tracks:
+- Skaian Skuffle
 ---
 Track: Skaian Skuffle
 Artist: Andrew Huo
 Duration: '2:11'
-References:
-- track:skies-of-skaia
 Art Tags:
 - WV
 - Jack Noir
@@ -791,6 +789,8 @@ Commentary: |-
     Skaian Skuffle was made with the intent of turning Skies of Skaia into a battle theme. The bass progression matches Skies of Skaia's, with more bounce to it, and the melody of Skies of Skaia was quantified/simplified into a repeating motif. It was mostly composed by feel the rest of the way. I actually had writer's block for a while after I reached about 1:02, and it never really got resolved, which is why 1:21 onwards feels kinda awkward and not so great. I kinda wish I could go back and redo it so it sounds better. But what Radiation did with it turning it into Skaian Skirmish worked really well. There was some vague artistic direction from the Big Man that helped with this a little bit. If I remember correctly, it was something along the lines of "okay, maybe you can bring it down a bit in the middle, then ramp it up for the big finish." So I tried to do that using a new bassline, using wandering skips of third and fourth rather than downwise step in an attempt to mirror Skies of Skaia's original melody, as well as scrambling the repeating sixteenth note motif based on the original melody. Like I said, though, I would say it worked out awkwardly rather than well. It does create a certain mood, which, like I said, Radiation capitalized on. Whoops, I just repeated myself, but in more detail the second time. What's that called in literary device terms? Amplification? Yeah, let's go with that.
 Cover Artists:
 - innocoussketches
+Referenced Tracks:
+- track:skies-of-skaia
 ---
 Track: Throwdown
 Artist: Steve Everson
@@ -837,8 +837,6 @@ Cover Artists:
 Track: Light
 Artist: Erik Scheele
 Duration: '4:27'
-References:
-- track:showtime-piano-refrain
 Directory: light-vol5
 Art Tags:
 - John
@@ -855,6 +853,8 @@ Commentary: |-
     413 as a motif, I’ve used it in various ways. Not saying anything, though, not even sure about spoiling its use in Light. If you ever analyze various bits of music, though, you might notice it popping up, or other little fun bits. That’s all I’ve got to say about that.
 Cover Artists:
 - allyssinian
+Referenced Tracks:
+- track:showtime-piano-refrain
 ---
 Track: Softly
 Artist: Robert J! Lake
@@ -913,8 +913,6 @@ Cover Artists:
 Track: Snow Pollen
 Artist: Toby Fox
 Duration: '2:10'
-References:
-- Lotus
 Art Tags:
 - Jade
 URLs:
@@ -922,6 +920,8 @@ URLs:
 - https://youtu.be/xFTuVM3nACY
 Cover Artists:
 - Rozenn-blog
+Referenced Tracks:
+- Lotus
 ---
 Track: Candles and Clockwork
 Artist: James Dever
@@ -949,8 +949,6 @@ Cover Artists:
 Track: Plague Doctor
 Artist: Steve Everson
 Duration: '1:13'
-References:
-- track:doctor
 Art Tags:
 - John
 URLs:
@@ -961,13 +959,12 @@ Commentary: |-
     I’m sure you all know the story behind the Doctor remixes. During the Intermission Andrew wanted a remix of that to use for LOWAS and everyone jumped at the chance. This was my contribution. It’s a pretty straight transcription to different instruments. Nowadays I find that a little disappointing. I started writing a new version not long ago; maybe one day I’ll finish it and post it here.
 Cover Artists:
 - ghostecutioner
+Referenced Tracks:
+- track:doctor
 ---
 Track: Enlightenment
 Artist: Steve Everson
 Duration: '1:15'
-References:
-- track:aggrieve
-- track:endless-climb
 Art Tags:
 - John
 URLs:
@@ -975,12 +972,13 @@ URLs:
 - https://youtu.be/h0UVwLDYneI
 Cover Artists:
 - Sigourney Martin
+Referenced Tracks:
+- track:aggrieve
+- track:endless-climb
 ---
 Track: Doctor Remix
 Artist: Gabe Nezovic
 Duration: 0:58
-References:
-- track:doctor
 Art Tags:
 - John
 - Horrorterrors
@@ -991,6 +989,8 @@ URLs:
 - https://youtu.be/EhVwra6X4B0
 Cover Artists:
 - microwavedsoap
+Referenced Tracks:
+- track:doctor
 ---
 Track: Biophosphoradelecrystalluminescence
 Artist: Robert J! Lake
@@ -1024,7 +1024,9 @@ Art Tags:
 URLs:
 - https://homestuck.bandcamp.com/track/descend-2
 - https://youtu.be/HE1JZZYUZYM
-References:
+Cover Artists:
+- queenoftheantz
+Referenced Tracks:
 - track:upward-movement-dave-owns
 - track:sburban-jungle
 - track:beatdown-strider-style
@@ -1052,14 +1054,10 @@ References:
 - track:problem-sleuth-theme
 - track:dirgeish
 - track:fear-of-the-heavens
-Cover Artists:
-- queenoftheantz
 ---
 Track: Homestuck
 Artist: Mark Hadley
 Duration: '2:27'
-References:
-- Homestuck Anthem
 Art Tags:
 - John
 - Rose
@@ -1074,3 +1072,5 @@ Commentary: |-
     Plazmataz came up with a melody to use as an anthem for Homestuck, which they then used in Homestuck Anthem. While that was a very driving melody, I opted to come up with something that might be more suitable for credits (opening or end) or a title screen. I really like how this came out; it sounds a bit moody, but still optimistic, which is what I was aiming for.
 Cover Artists:
 - Snilm
+Referenced Tracks:
+- Homestuck Anthem
diff --git a/album/homestuck-vol-6.yaml b/album/homestuck-vol-6.yaml
index 9b91f23c..87af6005 100644
--- a/album/homestuck-vol-6.yaml
+++ b/album/homestuck-vol-6.yaml
@@ -1,7 +1,4 @@
 Album: 'Homestuck Vol. 6: Heir Transparent'
-Banner Art:
-- Andrew Hussie
-- Niklink (edits for wiki)
 Banner Dimensions: 1100x216
 Wallpaper Style: 'opacity: 0.4;'
 Directory: homestuck-vol-6
@@ -23,12 +20,13 @@ Default Track Cover Artists:
 - Homestuck
 Wallpaper Artists:
 - Andrew Hussie
+Banner Artists:
+- Andrew Hussie
+- Niklink (edits for wiki)
 ---
 Track: Frost
 Artist: Solatrus
 Duration: '5:05'
-References:
-- Flow
 Directory: frost-vol6
 URLs:
 - https://homestuck.bandcamp.com/track/frost-3
@@ -57,35 +55,35 @@ Commentary: |-
     After the feature, though, I scrambled to improve the song’s quality. I changed around a few things in the first half (most notably making the whole mix a bit quieter), and pushed the melody a bit more forward. The second half, I basically swapped out this very strange sounding piano improvisation I did with the percussion (vibes, glockenspiel) instruments and a saw pad for lead. The replacements work incredibly well for trying to give an icy sound, and I’m pleased with how it turned out.
     I don’t know if I’ll ever go back to doing songs that are this ambient and minimalist, because my composing skills have progressed significantly since then, and I require much more complexity in my work. Also, now that this song is actually over two years old (for me), I’ve noticed how flawed it is.
     But nonetheless, this is probably one of my best songs, and it’s well loved by the Homestuck fandom. That’s good enough for me.
+Referenced Tracks:
+- Flow
 ---
 Track: Courser
 Artist: Seth Peelle, Alex Rosetti
 Duration: '4:37'
-References:
-- track:sburban-jungle
-- Lotus
 URLs:
 - https://homestuck.bandcamp.com/track/courser-2
 - https://youtu.be/EmdRALDqt7k
+Referenced Tracks:
+- track:sburban-jungle
+- Lotus
 ---
 Track: Umbral Ultimatum
 Artist: Toby Fox
 Duration: '3:33'
-References:
+URLs:
+- https://homestuck.bandcamp.com/track/umbral-ultimatum-2
+- https://youtu.be/OEB1uh0T9UA
+Referenced Tracks:
 - Penumbra Phantasm
 - An Unbreakable Union
 - Courser
 - Carefree Action
 - Homestuck Anthem
-URLs:
-- https://homestuck.bandcamp.com/track/umbral-ultimatum-2
-- https://youtu.be/OEB1uh0T9UA
 ---
 Track: GameBro (Original 1990 Mix)
 Artist: Erik Scheele
 Duration: '3:24'
-References:
-- Say "I Gotta Believe!"
 URLs:
 - https://homestuck.bandcamp.com/track/gamebro-original-1990-mix-2
 - https://youtu.be/k_-LPPdHEyA
@@ -108,13 +106,12 @@ Lyrics: |-
     The games will never stop, the games will never stop<br>(Go, go, go, go, go, go, go GameBro)<br>The games will never stop, the games will never stop<br>(Go, go, go, go, go, go, go GameBro)<br>The games will never stop, the games will never stop<br>(Go, go, go, go, go, go, go GameBro)<br>The games will never stop, the games will never stop<br>(Go, go, go, go, go, go, go)
     The games will never stop, the games will never stop<br>(Go, go, go, go, go, go, go GameBro)<br>The games will never stop, the games will never stop<br>(Go, go, go, go, go, go, go)<br>The games will never stop, the games will never stop<br>(Go, go, go, go, go, go, go GameBro)<br>The games will never stop, the games will never stop<br>(Go, go, go, go, go, go, go)
     Alright!
+Referenced Tracks:
+- Say "I Gotta Believe!"
 ---
 Track: Tribal Ebonpyre
 Artist: Erik Scheele
 Duration: '1:48'
-References:
-- track:atomyk-ebonpyre
-- track:sburban-jungle
 URLs:
 - https://homestuck.bandcamp.com/track/tribal-ebonpyre-2
 - https://youtu.be/xStVhvhg1i4
@@ -123,17 +120,13 @@ Commentary: |-
     <img src="media/misc/tribal-ebonpyre.jpg" width="480" height="480">
     naknaknaknaknaknaknaknaknaknak
     Although I didn't think the crocodiles would be so low, but whichever
+Referenced Tracks:
+- track:atomyk-ebonpyre
+- track:sburban-jungle
 ---
 Track: I Don't Want to Miss a Thing
 Artist: Michael Guy Bowman
 Duration: '3:57'
-References:
-- track:i-dont-want-to-miss-a-thing-aerosmith
-- track:sburban-jungle
-- track:showtime-original-mix
-- Squiddles!
-- track:explore
-- How Do I Live
 URLs:
 - https://homestuck.bandcamp.com/track/i-dont-want-to-miss-a-thing-2
 - https://youtu.be/383DEqnj71w
@@ -145,21 +138,28 @@ Lyrics: |-
     I don't wanna miss one smile<br>I don't wanna miss one kiss<br>I just wanna be with you<br>Right here, right now, just like this<br>I just wanna hold you close<br>Feel your heart so close to mine<br>And just stay right here in this moment<br>For the rest of time<br>Yeah, yeah, yeah, yeah!
     I don't wanna close my eyes<br>I don't wanna fall asleep<br>'Cause I'd miss you, babe<br>And I don't wanna miss a thing<br>'Cause even when I dream of you<br>The sweetest dream could never do<br>I'd still miss you, babe<br>And I don't wanna miss a thing
     I don't wanna close my eyes<br>I don't wanna fall asleep<br>'Cause I'd miss you, babe<br>And I don't wanna miss a thing<br>'Cause even when I dream of you<br>The sweetest dream could never do<br>I'd still miss you, babe<br>And I don't wanna miss a thing
+Referenced Tracks:
+- track:i-dont-want-to-miss-a-thing-aerosmith
+- track:sburban-jungle
+- track:showtime-original-mix
+- Squiddles!
+- track:explore
+- How Do I Live
 ---
 Track: MeGaLoVania
 Artist: Toby Fox
 Contributors:
 - Tensei (guitar)
 Duration: '2:47'
-References:
-- track:megalovania-halloween
-- Spider's Claw
-- Sunsetter
-- The La2t Frontiier
 Directory: MeGaLoVania
 URLs:
 - https://homestuck.bandcamp.com/track/megalovania-2
 - https://youtu.be/xbUTyGfolX0
+Referenced Tracks:
+- track:megalovania-halloween
+- Spider's Claw
+- Sunsetter
+- The La2t Frontiier
 ---
 Track: Walk-Stab-Walk (R&E)
 Artist: Erik Scheele
@@ -174,8 +174,6 @@ Commentary: |-
 Track: Gaia Queen
 Artist: Toby Fox
 Duration: '3:06'
-References:
-- Showdown
 URLs:
 - https://homestuck.bandcamp.com/track/gaia-queen-2
 - https://youtu.be/MU0eoyziRrU
@@ -184,24 +182,26 @@ Lyrics: |-
     Mortal
     Say your prayers
     Impossible
+Referenced Tracks:
+- Showdown
 ---
 Track: Elevatorstuck
 Artist: Tensei
 Duration: '2:09'
-References:
-- Homestuck Anthem
 URLs:
 - https://homestuck.bandcamp.com/track/elevatorstuck-2
 - https://youtu.be/9namZe_rorQ
+Referenced Tracks:
+- Homestuck Anthem
 ---
 Track: Wacky Antics
 Artist: David Ko, Toby Fox
 Duration: '2:05'
-References:
-- track:vagabounce
 URLs:
 - https://homestuck.bandcamp.com/track/wacky-antics-2
 - https://youtu.be/X7x3cKse9YI
+Referenced Tracks:
+- track:vagabounce
 ---
 Track: Horschestra
 Artist: Alex Rosetti
@@ -213,11 +213,11 @@ URLs:
 Track: Heir Transparent
 Artist: Robert J! Lake
 Duration: '4:01'
-References:
-- track:doctor
 URLs:
 - https://homestuck.bandcamp.com/track/heir-transparent-2
 - https://youtu.be/bcUrTlpTKPU
+Referenced Tracks:
+- track:doctor
 ---
 Track: Boy Skylark (Brief)
 Artist: Robert J! Lake
@@ -229,21 +229,19 @@ URLs:
 Track: Squidissension
 Artist: Mark Hadley
 Duration: '2:44'
-References:
-- track:dissension-original
-- Squiddles!
 URLs:
 - https://homestuck.bandcamp.com/track/squidissension-2
 - https://youtu.be/zJ7y3sWT7l0
 Commentary: |-
     <i>Mark Hadley:</i>
     Not a lot to say here aside from it being a combination of the Squiddles Theme and Dissension. I always enjoy finding ways to combine two themes together, and this worked better than I had hoped. I did have to move the Squiddles to a minor key for it to work though.
+Referenced Tracks:
+- track:dissension-original
+- Squiddles!
 ---
 Track: Blackest Heart
 Artist: Mark Hadley
 Duration: '2:32'
-References:
-- Liquid Negrocity
 Art Tags:
 - 'cw: blood'
 URLs:
@@ -252,24 +250,12 @@ URLs:
 Commentary: |-
     <i>Mark Hadley:</i>
     It's extremely subtle, but the cello tremolos are playing a very slow version of the theme from the beginning of Liquid Negrocity (and Black). I wrote this just after Jack Noir retreated from John and the rabbit. I didn't know what he'd be doing at the time, nor what his motivation would be, so I imagined him retreating to some castle and brooding as he contemplated his next move. Later on, Blackest Heart would be applied (rather effectively) to Gamzee instead.
+Referenced Tracks:
+- Liquid Negrocity
 ---
 Track: Nic Cage Song
 Artist: Toby Fox
 Duration: '2:45'
-References:
-- Drop It Like It's Hot
-- Ah! vous dirai-je, maman
-- Nic Cage Romance
-Samples:
-- The Wicker Man
-- The Rock
-- Leaving Las Vegas
-- Vampire's Kiss
-- Gone in 60 Seconds
-- Snake Eyes
-- Matchstick Men
-- 'National Treasure: Book of Secrets'
-- 'Bad Lieutenant: Port of Call New Orleans'
 URLs:
 - https://homestuck.bandcamp.com/track/nic-cage-song-2
 - https://youtu.be/dxVXLeX9FXY
@@ -288,42 +274,54 @@ Lyrics: |-
     (Ha-haa!) (I'm a vampire!) PISSED, BLOOD?<br>(Can I get my prescription, PLEASE?)<br>(Ha-haa!) (I-I-I-I'm a vampire!) PISSED, BLOOD?<br>(Can I get my prescription, PLEASE?)<br>(Ha-haa!) (I'm a-I'm a vampire!) PISSED, BLOOD?<br>(Ha-haa!) What do you say we cut the chit-chat, A-hole!<br>(I'm a vampi-I'm a vam-I'm-I'm-I'm a vampire!)
     Bangers and mash. Bubbles and squeak. Smoked eel pie. (Sir?) HAGGIS!
     Oh no, not the bees, not the bees!<br>AAAAAAH!
+Referenced Tracks:
+- Drop It Like It's Hot
+- Ah! vous dirai-je, maman
+- Nic Cage Romance
+Sampled Tracks:
+- The Wicker Man
+- The Rock
+- Leaving Las Vegas
+- Vampire's Kiss
+- Gone in 60 Seconds
+- Snake Eyes
+- Matchstick Men
+- 'National Treasure: Book of Secrets'
+- 'Bad Lieutenant: Port of Call New Orleans'
 ---
 Track: Phrenic Phever
 Artist: Clark Powell
 Duration: '3:18'
-References:
-- track:doctor
 URLs:
 - https://homestuck.bandcamp.com/track/phrenic-phever-2
 - https://youtu.be/8rlgjJgyhyw
+Referenced Tracks:
+- track:doctor
 ---
 Track: 3 In The Morning (Pianokind)
 Artist: Erik Scheele
 Duration: '4:13'
-References:
+URLs:
+- https://homestuck.bandcamp.com/track/3-in-the-morning-pianokind-2
+- https://youtu.be/OesxlnyaBGE
+Referenced Tracks:
 - Three in the Morning
 - track:doctor
 - track:showtime-piano-refrain
 - track:aggrieve
-URLs:
-- https://homestuck.bandcamp.com/track/3-in-the-morning-pianokind-2
-- https://youtu.be/OesxlnyaBGE
 ---
 Track: A Tender Moment
 Artist: Toby Fox
 Duration: '2:17'
-References:
-- track:atomyk-ebonpyre
 URLs:
 - https://homestuck.bandcamp.com/track/a-tender-moment-2
 - https://youtu.be/hyP0FFPcL0c
+Referenced Tracks:
+- track:atomyk-ebonpyre
 ---
 Track: Crystalanthology
 Artist: Solatrus
 Duration: '4:44'
-References:
-- Crystalanthemums
 URLs:
 - https://homestuck.bandcamp.com/track/crystalanthology-2
 - https://youtu.be/3wsZuqG5IY0
@@ -349,3 +347,5 @@ Commentary: |-
     Fun fact, this was the first song I used Gross Beat on. What’s Gross Beat? It’s something a Time Lord of Gallifrey would approve of in music. :D If you listen to the stutter effects heard in the song, mostly in the latter half, that’s where I start using Gross Beat to do some crazy time shifting stuff.
     Man, I really love what I did on this song.
     ...I need to do another Homestuck remix, don’t I?
+Referenced Tracks:
+- Crystalanthemums
diff --git a/album/homestuck-vol-7.yaml b/album/homestuck-vol-7.yaml
index 15acd7ea..460ba0e2 100644
--- a/album/homestuck-vol-7.yaml
+++ b/album/homestuck-vol-7.yaml
@@ -1,7 +1,5 @@
 Album: 'Homestuck Vol. 7: At the Price of Oblivion'
 Directory: homestuck-vol-7
-Banner Art:
-- Homestuck
 Banner Dimensions: 1100x158
 Wallpaper Style: 'opacity: 0.8;'
 Date: May 31, 2011 00:00:05
@@ -20,6 +18,8 @@ Cover Artists:
 - Homestuck
 Wallpaper Artists:
 - Homestuck
+Banner Artists:
+- Homestuck
 ---
 Group: Main album
 ---
@@ -48,11 +48,6 @@ Cover Artists:
 Track: At The Price of Oblivion
 Artist: Malcolm Brown
 Duration: '3:23'
-References:
-- track:chorale-for-jaspers
-- Rex Duodecim Angelus
-- Black Rose / Green Sun
-- track:aggrieve
 Art Tags:
 - Rose
 - 'cw: blood'
@@ -70,12 +65,15 @@ Commentary: |-
     When Andrew told me he was going to use this one for a fight scene I was looking heavily forward to it. Imagine my surprise when just as it's about to kick off... John gets himself stabbed.
 Cover Artists:
 - Shelby Cragg
+Referenced Tracks:
+- track:chorale-for-jaspers
+- Rex Duodecim Angelus
+- Black Rose / Green Sun
+- track:aggrieve
 ---
 Track: Even in Death
 Artist: Clark Powell
 Duration: '2:32'
-References:
-- track:upward-movement-dave-owns
 Art Tags:
 - Rose
 URLs:
@@ -83,12 +81,12 @@ URLs:
 - https://youtu.be/T86uquWB9Mw
 Cover Artists:
 - Yapoos
+Referenced Tracks:
+- track:upward-movement-dave-owns
 ---
 Track: Terezi Owns
 Artist: Toby Fox
 Duration: '1:39'
-References:
-- track:upward-movement-dave-owns
 Art Tags:
 - Terezi
 - Pyralspite
@@ -97,13 +95,12 @@ URLs:
 - https://youtu.be/2pfcakhXhE8
 Cover Artists:
 - Angela Sham
+Referenced Tracks:
+- track:upward-movement-dave-owns
 ---
 Track: Trial and Execution
 Artist: Malcolm Brown
 Duration: '1:29'
-References:
-- The Lemonsnout Turnabout
-- Crystalanthemums
 Art Tags:
 - Terezi
 - Vriska
@@ -125,12 +122,13 @@ Commentary: |-
     The name's fairly obvious - I was trying to work in some kind of "Trial and Error" gag but I guess this works.
 Cover Artists:
 - Shelby Cragg
+Referenced Tracks:
+- The Lemonsnout Turnabout
+- Crystalanthemums
 ---
 Track: The Carnival
 Artist: Erik Scheele
 Duration: '2:15'
-References:
-- track:harlequin
 Art Tags:
 - Gamzee
 - 'cw: blood'
@@ -139,13 +137,12 @@ URLs:
 - https://youtu.be/Q5gjYuJrfbc
 Cover Artists:
 - Carla Bravo
+Referenced Tracks:
+- track:harlequin
 ---
 Track: Spider8reath
 Artist: Tensei
 Duration: '2:44'
-References:
-- Spider's Claw
-- Heir Conditioning
 Art Tags:
 - Vriska
 URLs:
@@ -162,6 +159,9 @@ Commentary: |-
     Really though, the main inspiration for this song simply comes from building on the previous Vriska songs that Radiation did. While the brass was a new, spur-of-the-moment addition, the guitar riffs and melodies were always supposed to be reminiscent of stuff like Spider’s Claw, Killed by Br8k Spider and MeGaLoVaNia. People definitely seem to associate this song with Vriska too now, so mission accomplished I guess?
 Cover Artists:
 - Lazylaz
+Referenced Tracks:
+- Spider's Claw
+- Heir Conditioning
 ---
 Track: Lifdoff
 Artist: Malcolm Brown
@@ -182,8 +182,6 @@ Cover Artists:
 Track: Awakening
 Artist: Erik Scheele
 Duration: '3:57'
-References:
-- track:ruins
 Art Tags:
 - John
 URLs:
@@ -191,6 +189,8 @@ URLs:
 - https://youtu.be/ss0NXbwO_Xs
 Cover Artists:
 - Devin H-S
+Referenced Tracks:
+- track:ruins
 ---
 Track: Havoc To Be Wrought
 Artist: Thomas Ferkol
@@ -253,9 +253,6 @@ Cover Artists:
 Track: WSW-Beatdown
 Artist: Erik Scheele
 Duration: '3:36'
-References:
-- Walk-Stab-Walk (R&E)
-- track:beatdown-strider-style
 Art Tags:
 - Karkat
 - Underlings
@@ -264,12 +261,13 @@ URLs:
 - https://youtu.be/-dusgXh-taQ
 Cover Artists:
 - Devin H-S
+Referenced Tracks:
+- Walk-Stab-Walk (R&E)
+- track:beatdown-strider-style
 ---
 Track: Earthsea Borealis
 Artist: Toby Fox
 Duration: '2:58'
-References:
-- track:endless-climb
 Art Tags:
 - Rose
 - Horrorterrors
@@ -278,6 +276,8 @@ URLs:
 - https://youtu.be/KXgPNyd45A4
 Cover Artists:
 - Molly Gur
+Referenced Tracks:
+- track:endless-climb
 ---
 Track: Warhammer of Zillyhoo
 Artist: Michael Guy Bowman
@@ -297,9 +297,6 @@ Cover Artists:
 Track: Savior of the Dreaming Dead
 Artist: Malcolm Brown
 Duration: '4:10'
-References:
-- track:doctor
-- Penumbra Phantasm
 Art Tags:
 - Dave
 URLs:
@@ -312,6 +309,9 @@ Commentary: |-
     But. After it was used in Cascade, particularly with Rad's additions to the ending and generally going along to the animation of Jade Being Awesome and Universes Being Destroyed it's hard for me not to like it now - Particularly when the end cuts hit and everything's starting to head towards disaster. I don't think it's one of my best, and I would love to go back and try making it better, but I'm happy enough that it was used at one of the biggest moments in the comic, and still stands as a fairly harmless, simple and straightforward bit of music.
 Cover Artists:
 - Left
+Referenced Tracks:
+- track:doctor
+- Penumbra Phantasm
 ---
 Group: Bonus tracks
 ---
@@ -330,8 +330,6 @@ Cover Artists:
 Track: Sburban Reversal
 Artist: Mark Hadley
 Duration: '3:51'
-References:
-- track:sburban-countdown
 Art Tags:
 - Dave
 URLs:
@@ -342,15 +340,12 @@ Commentary: |-
     Not long after I made Sburban Countdown, I made a version that rewinds back to the beginning again and called it 'Sburban Reversal', just in case it might be useful someday. Andrew ended up using part of it in act 2 except for the actual reversing part, but still credited it as 'Sburban Reversal', which had people asking me constantly after that if it's a real song. It wasn't really anything except for the reversing, so I eventually decided to extend it out to a full song. Since it was never actually fully in the comic, I recommended it as a bonus track.
 Cover Artists:
 - Devin H-S
+Referenced Tracks:
+- track:sburban-countdown
 ---
 Track: White Host, Green Room
 Artist: Tensei
 Duration: '3:28'
-Samples:
-- Terezi Owns
-- Cascade (Beta)
-- The King in Red (Beta)
-- Black Rose / Green Sun
 Art Tags:
 - Doc Scratch
 URLs:
@@ -358,3 +353,8 @@ URLs:
 - https://youtu.be/oL3r83dPcMs
 Cover Artists:
 - Al Neun
+Sampled Tracks:
+- Terezi Owns
+- Cascade (Beta)
+- The King in Red (Beta)
+- Black Rose / Green Sun
diff --git a/album/homestuck-vol-8.yaml b/album/homestuck-vol-8.yaml
index 727bf75f..a99006df 100644
--- a/album/homestuck-vol-8.yaml
+++ b/album/homestuck-vol-8.yaml
@@ -1,8 +1,6 @@
 Album: Homestuck Vol. 8
 Date: October 25, 2011
 Date Added: November 15, 2019
-Banner Art:
-- Homestuck
 Banner Dimensions: 1100x203
 Wallpaper Style: |-
     opacity: 0.6;
@@ -19,17 +17,14 @@ Cover Artists:
 - Homestuck
 Wallpaper Artists:
 - Homestuck
+Banner Artists:
+- Homestuck
 ---
 Group: Main album
 ---
 Track: Calamity
 Artist: Michael Guy Bowman
 Duration: '3:38'
-References:
-- Walk-Stab-Walk (R&E)
-- Warhammer of Zillyhoo
-Samples:
-- Apollo 11 Launch Countdown
 Art Tags:
 - Karkat
 - Gamzee
@@ -47,15 +42,15 @@ Commentary: |-
     The countdown sample is from a NASA recording, I believe it’s the launch of Apollo 11.
 Cover Artists:
 - Tavia Morra
+Referenced Tracks:
+- Walk-Stab-Walk (R&E)
+- Warhammer of Zillyhoo
+Sampled Tracks:
+- Apollo 11 Launch Countdown
 ---
 Track: Do You Remem8er Me
 Artist: Malcolm Brown
 Duration: '4:28'
-References:
-- Lifdoff
-- track:showtime-original-mix
-- Death of the Lusii
-- track:ruins
 Art Tags:
 - John
 - Vriska
@@ -87,6 +82,11 @@ Commentary: |-
     I also fully suspect I missed some ‘8’s somewhere........ This stuff’s harder than it looks.  God help me if I try to commentary another gorram Terezi track ::::p
 Cover Artists:
 - Richard Gung
+Referenced Tracks:
+- Lifdoff
+- track:showtime-original-mix
+- Death of the Lusii
+- track:ruins
 ---
 Track: Flare
 Artist: Clark Powell
@@ -162,8 +162,6 @@ Artist: Michael Guy Bowman
 Contributors:
 - Tavia Morra
 Duration: '3:12'
-References:
-- Ocean Stars
 Art Tags:
 - Squiddles
 URLs:
@@ -177,6 +175,8 @@ Commentary: |-
     This is another example of a song that has the “just right” feeling about its length. I could probably have easily repeated the vocals endlessly as though I was attempting to induce transcendental meditation - it would probably have had the same effect as “Hey Jude” or any number of other great songs. Owing though to my sense that this album was going to be a long one (my contributions alone come out to more than 20 minutes of music) I decided to capitalize on having achieved the harmony and just let it end when its thought was fully expressed, not unlike the original composition by Mark.
 Cover Artists:
 - Richard Gung
+Referenced Tracks:
+- Ocean Stars
 ---
 Track: Escape Pod
 Artist: Michael Guy Bowman
@@ -199,9 +199,6 @@ Cover Artists:
 Track: Davesprite
 Artist: Toby Fox
 Duration: '1:41'
-References:
-- Hawkeye
-- track:atomyk-ebonpyre
 Art Tags:
 - Davesprite
 URLs:
@@ -209,6 +206,9 @@ URLs:
 - https://youtu.be/Iy5fKp-aV4o
 Cover Artists:
 - P-RO
+Referenced Tracks:
+- Hawkeye
+- track:atomyk-ebonpyre
 ---
 Track: Airtime
 Artist: Robert J! Lake
@@ -243,9 +243,6 @@ Artist: Solatrus
 Contributors:
 - Thomas Ferkol (electric guitar)
 Duration: '4:35'
-References:
-- Terra
-- track:frost-vol6
 Art Tags:
 - Jade
 - Dave
@@ -261,12 +258,13 @@ Commentary: |-
     And because the fight of Dave and Jade vs. Jack was an interesting event, so that’s how the song came to be.
 Cover Artists:
 - Richard Gung
+Referenced Tracks:
+- Terra
+- track:frost-vol6
 ---
 Track: Unite Synchronization
 Artist: Malcolm Brown
 Duration: '2:54'
-References:
-- track:showtime-original-mix
 Art Tags:
 - Dave
 - John
@@ -308,15 +306,12 @@ Commentary: |-
     I’d like to see Dave match that. :p
 Cover Artists:
 - melodiousDiscord
+Referenced Tracks:
+- track:showtime-original-mix
 ---
 Track: Homefree
 Artist: Hilary Troiano
 Duration: '4:28'
-References:
-- Shooting Star
-- Homestuck Anthem
-- track:sburban-jungle
-- track:upward-movement-dave-owns
 Art Tags:
 - John
 URLs:
@@ -327,6 +322,11 @@ Commentary: |-
     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>)
 Cover Artists:
 - Vivian Ng
+Referenced Tracks:
+- Shooting Star
+- Homestuck Anthem
+- track:sburban-jungle
+- track:upward-movement-dave-owns
 ---
 Track: Galaxy Hearts
 Artist: Mark Hadley
@@ -379,9 +379,6 @@ Cover Artists:
 Track: Pyrocumulus (Sicknasty)
 Artist: Robert J! Lake
 Duration: '2:50'
-References:
-- Skaian Skuffle
-- track:skies-of-skaia
 Art Tags:
 - John
 URLs:
@@ -389,6 +386,9 @@ URLs:
 - https://youtu.be/4BqRC-ZPovM
 Cover Artists:
 - Rutares
+Referenced Tracks:
+- Skaian Skuffle
+- track:skies-of-skaia
 ---
 Track: Kingside Castle
 Artist: Clark Powell
@@ -402,8 +402,6 @@ Cover Artists:
 Track: Temporary
 Artist: Robert J! Lake
 Duration: '3:37'
-References:
-- Temporal Piano
 Art Tags:
 - Dave
 - The Felt
@@ -412,6 +410,8 @@ URLs:
 - https://youtu.be/CYh1OlRWzp4
 Cover Artists:
 - Chaz Canterbury
+Referenced Tracks:
+- Temporal Piano
 ---
 Track: Gust of Heir
 Artist: James Dever, Michael Guy Bowman
@@ -446,13 +446,13 @@ Cover Artists:
 Track: Even in Death (T'Morra's Belly Mix)
 Artist: Clark Powell, Tavia Morra
 Duration: '4:08'
-References:
-- Even in Death
 URLs:
 - https://homestuck.bandcamp.com/track/even-in-death-tmorras-belly-mix-2
 - https://youtu.be/9MdltybiL00
 Cover Artists:
 - Tavia Morra
+Referenced Tracks:
+- Even in Death
 ---
 Track: Bargaining with the Beast
 Artist: Thomas Ferkol
@@ -476,19 +476,17 @@ Artist: Toby Fox
 Contributors:
 - Marcy Nabors (flute)
 Duration: '3:51'
-References:
-- Gaia Queen
 URLs:
 - https://homestuck.bandcamp.com/track/frostbite-2
 - https://youtu.be/Gdb_nZs6plw
 Cover Artists:
 - Nic Carey
+Referenced Tracks:
+- Gaia Queen
 ---
 Track: The Lost Child
 Artist: Toby Fox
 Duration: '2:54'
-References:
-- psych0ruins
 Art Tags:
 - The Handmaid
 URLs:
@@ -496,6 +494,8 @@ URLs:
 - https://youtu.be/-OFQHEy5TDw
 Cover Artists:
 - Sarah Fu
+Referenced Tracks:
+- psych0ruins
 ---
 Track: Questant's Lament
 Artist: Thomas Ferkol
@@ -516,8 +516,6 @@ Cover Artists:
 Track: Hussie Hunt
 Artist: Malcolm Brown
 Duration: '2:46'
-References:
-- track:explore
 Art Tags:
 - AH
 - Doc Scratch
@@ -533,6 +531,8 @@ Commentary: |-
     Had quite a bit of fun doin' this one. Also quite proud of the name  Even if I do have to occasionally explain it to people who don't read the comic...
 Cover Artists:
 - Hanni Brosh
+Referenced Tracks:
+- track:explore
 ---
 Track: Havoc
 Artist: Svix
@@ -556,8 +556,6 @@ Contributors:
 - Clark Powell (some production)
 - Toby Fox (climax drum programming)
 Duration: '3:22'
-References:
-- track:atomyk-ebonpyre
 Art Tags:
 - Rose
 - Dave
@@ -572,6 +570,8 @@ Commentary: |-
     And that was how Virginia was founded!
 Cover Artists:
 - Zilon
+Referenced Tracks:
+- track:atomyk-ebonpyre
 ---
 Track: Infinity Mechanism
 Artist: Thomas Ferkol
@@ -588,9 +588,6 @@ Cover Artists:
 ---
 Track: Revered Return
 Artist: Nick Smalley, Michael Guy Bowman
-References:
-- Dirgeish
-- track:sburban-jungle
 Duration: '2:33'
 Art Tags:
 - Terezi
@@ -607,14 +604,15 @@ Commentary: |-
     Remember that thing about ORGMaker? Yeah, this song, too. Except add me asking Andrew Huo to help finish it and Bowman to ramp it up, and you’ve got Revered Return. :3
 Cover Artists:
 - Noot
+Referenced Tracks:
+- Dirgeish
+- track:sburban-jungle
 ---
 Track: Judgment Day
 Artist: Toby Fox
 Contributors:
 - Kelly Sadwin (violin)
 Duration: '2:00'
-References:
-- track:ruins
 Art Tags:
 - John
 URLs:
@@ -622,38 +620,38 @@ URLs:
 - https://youtu.be/MD2TLTtyfDE
 Cover Artists:
 - Lazylaz
+Referenced Tracks:
+- track:ruins
 ---
 Track: Lotus (Bloom)
 Artist: Seth Peelle
 Duration: '4:05'
-References:
-- Lotus
 URLs:
 - https://homestuck.bandcamp.com/track/lotus-bloom-2
 - https://youtu.be/RrIofwv86HM
 Cover Artists:
 - myluckyseven
+Referenced Tracks:
+- Lotus
 ---
 Track: Cascade
 Artist: Toby Fox, Tensei, Clark Powell, Malcolm Brown
 Contributors:
 - Toby Fox (editing)
 Duration: '13:14'
-References:
-- Cascade (Beta)
-- Flare (Cascade)
-- Savior of the Dreaming Dead (Cascade Cut)
-- Black Hole / Green Sun
 URLs:
 - https://homestuck.bandcamp.com/track/cascade-2
 - https://youtu.be/Ckr6KyZoS58
 Has Cover Art: false
+Referenced Tracks:
+- Cascade (Beta)
+- Flare (Cascade)
+- Savior of the Dreaming Dead (Cascade Cut)
+- Black Hole / Green Sun
 ---
 Track: I'm a Member of the Midnight Crew (Acapella)
 Artist: David Ko
 Duration: '2:50'
-References:
-- I'm a Member of the Midnight Crew
 Art Tags:
 - Midnight Crew
 URLs:
@@ -669,14 +667,14 @@ Lyrics: |-
     Make her a member of the Midnight Crew!
 Cover Artists:
 - Vivian Ng
+Referenced Tracks:
+- I'm a Member of the Midnight Crew
 ---
 Group: Bonus tracks
 ---
 Track: How Do I Live (D8 Night Version)
 Artist: Michael Guy Bowman
 Duration: '3:23'
-References:
-- How Do I Live
 Art Tags:
 - John
 URLs:
@@ -698,6 +696,8 @@ Commentary: |-
     I added a new bridge section in so that Thomas Ferkol could have a chance to play some real guitar in this one, and of course he showed his colors as a metal guitarist, sending me a duet between harmonized voices. David Ko also appears on this track as the gently-spoken backup vocalist.
 Cover Artists:
 - Victoria Grace Elliott
+Referenced Tracks:
+- How Do I Live
 ---
 Track: Cascade (Beta)
 Artist: Tensei
@@ -718,9 +718,6 @@ Contributors:
 - Tensei (electric guitar)
 - Kelly Sadwin (violin)
 Duration: '2:30'
-References:
-- Black Rose / Green Sun
-- track:sburban-jungle
 URLs:
 - https://homestuck.bandcamp.com/track/black-hole-green-sun-2
 - https://youtu.be/B6e2XacZSIs
@@ -728,6 +725,9 @@ Commentary: |-
     <i>Malcolm Brown:</i>
     Not much to say on this really except the title is kind of an ode to Soundgarden.
 Has Cover Art: false
+Referenced Tracks:
+- Black Rose / Green Sun
+- track:sburban-jungle
 ---
 Track: Carefree Action
 Artist: Mark Hadley
diff --git a/album/homestuck-vol-9.yaml b/album/homestuck-vol-9.yaml
index a7a573cf..f6ea5355 100644
--- a/album/homestuck-vol-9.yaml
+++ b/album/homestuck-vol-9.yaml
@@ -1,6 +1,4 @@
 Album: Homestuck Vol. 9
-Banner Art:
-- Lazylaz
 Banner Dimensions: 1100x203
 Date: June 12, 2012
 Date Added: November 15, 2019
@@ -26,15 +24,14 @@ Cover Artists:
 - Lazylaz
 Wallpaper Artists:
 - Homestuck
+Banner Artists:
+- Lazylaz
 ---
 Group: Main album
 ---
 Track: Crystalmethequins
 Artist: Clark Powell, Astro Kid
 Duration: '5:13'
-References:
-- Crystamanthequins
-- Crystalanthemums
 Art Tags:
 - Aradia
 URLs:
@@ -49,13 +46,13 @@ Commentary: |-
     The song was chosen from among its peers to open Volume 9. There it stands proudly to this day.
 Cover Artists:
 - Richard Gung
+Referenced Tracks:
+- Crystamanthequins
+- Crystalanthemums
 ---
 Track: Anbroids V2.0
 Artist: Malcolm Brown
 Duration: '2:19'
-References:
-- Anbroids
-- Davesprite
 Directory: anbroids-v2
 Art Tags:
 - Dirk
@@ -92,6 +89,9 @@ Commentary: |-
     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 :)
 Cover Artists:
 - Jonathan Griffiths
+Referenced Tracks:
+- Anbroids
+- Davesprite
 ---
 Track: Trepidation
 Artist: Svix
@@ -132,8 +132,6 @@ Cover Artists:
 Track: Ugly Betty
 Artist: Robert J! Lake
 Duration: '3:22'
-References:
-- track:aggrieve-violin-refrain
 Art Tags:
 - The Condesce
 URLs:
@@ -144,14 +142,14 @@ Commentary: |-
     RJ gave me the reins on this one. At first I was drawing it in the same style as a later track ([[Before the Beginning and After the End]]) I did art for, but then it quickly turned in to a painting. This palette in particular was fun and challenging to work with. I’m happy with the end result, since it looks like the Batterwitch is cackling as the world burns down around her.
 Cover Artists:
 - Tavia Morra
+Referenced Tracks:
+- track:aggrieve-violin-refrain
 ---
 Track: Hate You
 Artist: Toby Fox
 Contributors:
 - Azami (laughter)
 Duration: '2:53'
-References:
-- Love You (Feferi's Theme)
 Art Tags:
 - Meenah
 URLs:
@@ -159,6 +157,8 @@ URLs:
 - https://youtu.be/2gU_54ibyKM
 Cover Artists:
 - MissNK
+Referenced Tracks:
+- Love You (Feferi's Theme)
 ---
 Track: Pumpkin Party in Sea Hitler's Water Apocalypse
 Artist: Malcolm Brown
@@ -203,9 +203,6 @@ Cover Artists:
 Track: Another Jungle
 Artist: Michael Guy Bowman
 Duration: '4:39'
-References:
-- track:sburban-jungle
-- track:showtime-original-mix
 Art Tags:
 - Roxy
 - Dirk
@@ -221,6 +218,9 @@ Commentary: |-
     The art for this track is by Richard Gung.
 Cover Artists:
 - Richard Gung
+Referenced Tracks:
+- track:sburban-jungle
+- track:showtime-original-mix
 ---
 Track: GameGrl (Original 1993 Mix)
 Artist: Michael Guy Bowman
@@ -228,10 +228,6 @@ Contributors:
 - Erik Scheele (keytar)
 - Tavia Morra (vocals)
 Duration: '3:29'
-References:
-- Bro Hop
-- Airtime
-- Afraid of the Darko
 URLs:
 - https://homestuck.bandcamp.com/track/gamegrl-original-1993-mix-2
 - https://youtu.be/4kdVpq3bnuY
@@ -276,6 +272,10 @@ Lyrics: |-
     But hey, girls, whenever you need to show those creepy boys who's boss, just remember that GameGrl's got your back. Look for me on specially-marked boxes of Betty Crocker brand snacks and have an adult call the toll-free number to subscribe to the exclusive girls-only GameGrl Magazine. Alright, check you later girlfriends!
 Cover Artists:
 - Tavia Morra
+Referenced Tracks:
+- Bro Hop
+- Airtime
+- Afraid of the Darko
 ---
 Track: ASSAULT
 Artist: Toby Fox
@@ -303,13 +303,6 @@ Cover Artists:
 Track: Austin, Atlantis
 Artist: Clark Powell
 Duration: '3:43'
-References:
-- track:beatdown-strider-style
-- track:atomyk-ebonpyre
-- Magnificat
-- track:explore
-- track:endless-climb
-- Flare
 URLs:
 - https://homestuck.bandcamp.com/track/austin-atlantis-2
 - https://youtu.be/wPfUy4j9V7c
@@ -322,6 +315,13 @@ Commentary: |-
     Additional fun fact: the entire song is played off key, detuned into the spaces between quartertones. The piano itself is significantly flat. This surprised me in how far it went toward making the song sound “sunken.”
 Cover Artists:
 - Nic Carey
+Referenced Tracks:
+- track:beatdown-strider-style
+- track:atomyk-ebonpyre
+- Magnificat
+- track:explore
+- track:endless-climb
+- Flare
 ---
 Track: Despot
 Artist: Erik Scheele
@@ -346,8 +346,6 @@ Contributors:
 - Buzinkai (composition)
 - Toby Fox (arrangement)
 Duration: '2:02'
-References:
-- Five-Four Stress
 Art Tags:
 - Dirk
 - 'cw: blood'
@@ -371,6 +369,8 @@ Commentary: |-
     ** Bonus challenge: See if you can count out how I divided the measures in this song! If you can do this, you can easily understand how to compose in time signatures like this. It’s actually VERY simple and derived directly from the other breakdowns I did.
 Cover Artists:
 - P-RO
+Referenced Tracks:
+- Five-Four Stress
 ---
 Track: Minihoof's Adventure
 Artist: Michael Guy Bowman
@@ -397,10 +397,6 @@ Cover Artists:
 Track: Encore
 Artist: Malcolm Brown
 Duration: '3:09'
-References:
-- track:showtime-original-mix
-- Lifdoff
-- Unite Synchronization
 Art Tags:
 - Jake
 URLs:
@@ -425,13 +421,14 @@ Commentary: |-
     And that’s Encore! Hope ya’ll enjoyed that little trip back down memory lane!
 Cover Artists:
 - Bea
+Referenced Tracks:
+- track:showtime-original-mix
+- Lifdoff
+- Unite Synchronization
 ---
 Track: Expedition
 Artist: Mark Hadley
 Duration: '2:29'
-References:
-- English
-- track:explore
 Art Tags:
 - Jake
 URLs:
@@ -442,6 +439,9 @@ Commentary: |-
     As I've mentioned before, I really like finding ways to combine themes. In this case, I combined 'Explore' and 'English' in a style inspired by the sailing theme from 'Legend of Zelda: The Wind Waker'. (It's easy to miss the theme from 'English', since it's a lot more upbeat and in a major key.) I don't use brass a lot when I write, but I think it came out well here.
 Cover Artists:
 - Kiddy
+Referenced Tracks:
+- English
+- track:explore
 ---
 Track: Elephant Gun
 Artist: Michael Guy Bowman
@@ -477,9 +477,6 @@ Cover Artists:
 Track: Jane Dargason
 Artist: Clark Powell, Robert J! Lake
 Duration: '3:43'
-References:
-- Jane's Dragon
-- Life in Technicolor
 Art Tags:
 - Jane
 URLs:
@@ -501,12 +498,13 @@ Commentary: |-
     the track art attached to the audio file on the original tumblr post eventually became the art for [[Princess of Helium]]!
 Cover Artists:
 - Dawn Davis
+Referenced Tracks:
+- Jane's Dragon
+- Life in Technicolor
 ---
 Track: Before the Beginning and After the End
 Artist: Robert J! Lake
 Duration: '4:27'
-References:
-- Before Before the Beginning
 Art Tags:
 - Jane
 - Roxy
@@ -520,6 +518,8 @@ Commentary: |-
     This was one of the last track art pieces I did that I had a lot of fun with. I didn’t really know what I was doing when I went in, but as soon as I had laid out what Alpha Kid went where, the colors instantly stood out in my mind. I really like the way this one came out.
 Cover Artists:
 - Tavia Morra
+Referenced Tracks:
+- Before Before the Beginning
 ---
 Track: Bridge of Stars
 Artist: Thomas Ferkol
@@ -550,8 +550,6 @@ Cover Artists:
 Track: Busting Makes Me Feel Good
 Artist: Michael Guy Bowman
 Duration: '3:25'
-References:
-- Ghostbusters
 Art Tags:
 - John
 - Jade
@@ -580,6 +578,8 @@ Commentary: |-
     The art is by Victoria Grace Elliott.
 Cover Artists:
 - Victoria Grace Elliott
+Referenced Tracks:
+- Ghostbusters
 ---
 Track: Everything is Something to Somebody
 Artist: Robert J! Lake
@@ -622,8 +622,6 @@ Contributors:
 - Erik Scheele (piano)
 - Marcy Nabors (thermin & accordian)
 Duration: '3:50'
-References:
-- I'm a Member of the Midnight Crew
 Art Tags:
 - Midnight Crew
 URLs:
@@ -645,12 +643,12 @@ Commentary: |-
     The track art is by Cari Garafalo.
 Cover Artists:
 - Cari Garafalo
+Referenced Tracks:
+- I'm a Member of the Midnight Crew
 ---
 Track: Three in the Morning (Aftermath)
 Artist: Erik Scheele
 Duration: '3:28'
-References:
-- Three in the Morning
 Art Tags:
 - Roxy
 URLs:
@@ -661,6 +659,8 @@ Commentary: |-
     I don’t remember how long ago it was that Plaz asked me to do an improvisation around their Three In The Morning, but I did it, and here it is!
 Cover Artists:
 - Dawn Davis
+Referenced Tracks:
+- Three in the Morning
 ---
 Track: Lancer
 Artist: Clark Powell
@@ -677,8 +677,6 @@ Cover Artists:
 Track: Three's a Crowd
 Artist: Robert J! Lake, Thomas Ferkol
 Duration: '3:27'
-References:
-- Three in the Morning
 Art Tags:
 - DD
 - Midnight Crew
@@ -687,6 +685,8 @@ URLs:
 - https://youtu.be/hBnCIpVQTls
 Cover Artists:
 - ari
+Referenced Tracks:
+- Three in the Morning
 ---
 Track: Break Shot
 Artist: Kalibration
@@ -780,8 +780,6 @@ Cover Artists:
 Track: Requited
 Artist: Clark Powell
 Duration: '4:32'
-References:
-- Serenade
 Art Tags:
 - The Disciple
 URLs:
@@ -795,6 +793,8 @@ Commentary: |-
     For the artwork on this track I asked my chum Dodostad to draw something up. Her style of whimsical, faded character art seemed the perfect match for the song, and she did a magnificent job.
 Cover Artists:
 - dodostad
+Referenced Tracks:
+- Serenade
 ---
 Track: Princess of Helium
 Artist: Clark Powell
@@ -829,8 +829,6 @@ Artist: James Dever
 Contributors:
 - Alex Rosetti (mixing)
 Duration: '2:28'
-References:
-- Candles and Clockwork
 Art Tags:
 - Dave
 URLs:
@@ -852,12 +850,12 @@ Commentary: |-
     The art was done by the fantastic Worthikids who I only just recently discovered! They actually made it a while ago for the original Volume 5 version. I messaged them about using it for this version. Go check them out!
 Cover Artists:
 - Worthikids
+Referenced Tracks:
+- Candles and Clockwork
 ---
 Track: Coursing
 Artist: Alex Rosetti
 Duration: '4:17'
-References:
-- Courser
 Art Tags:
 - Becquerel
 - God Cat
@@ -869,6 +867,8 @@ Commentary: |-
     I wrote it to be the “alpha” version of Courser, another piece by myself and Beatfox. Where Courser is a theme for Bec, Coursing can be thought of as a theme for GCat, though in my mind it encompasses the idea of any First Guardian. It is not a “remix” or even an arrangement of Courser, but it is based off Courser’s material and of course heavily references it and quotes it. I hope you enjoy! The track art is by the amazing Zilleniose. Thanks Zoey!
 Cover Artists:
 - Zilleniose
+Referenced Tracks:
+- Courser
 ---
 Track: Cairo Overcoat
 Artist: Thomas Ferkol
@@ -895,10 +895,6 @@ Cover Artists:
 Track: Noirscape
 Artist: David Ellis
 Duration: '5:08'
-References:
-- Liquid Negrocity
-- Crystalanthemums
-- Descend
 Art Tags:
 - Jack Noir
 - 'cw: blood'
@@ -920,6 +916,10 @@ Commentary: |-
     <img src="media/misc/noirscape.png" width="776" height="776">
 Cover Artists:
 - kendle bentley b!
+Referenced Tracks:
+- Liquid Negrocity
+- Crystalanthemums
+- Descend
 ---
 Track: Dogfight
 Artist: Team Dogfight
@@ -937,22 +937,18 @@ Contributors:
 - DJ最テー (guitar)
 - viaSatellite (guitar & bass)
 - Ian White (trumpet & bass)
-References:
+Cover Artists:
+- Molly Gur
+Referenced Tracks:
 - track:sburban-jungle
 - Penumbra Phantasm
 - Courser
 - track:doctor
 - Black Rose / Green Sun
-Cover Artists:
-- Molly Gur
 ---
 Track: A Taste for Adventure
 Artist: Seth Peelle
 Duration: '8:24'
-References:
-- track:dissension-original
-- Carefree Action
-- track:showtime-original-mix
 Art Tags:
 - Jake
 URLs:
@@ -960,6 +956,10 @@ URLs:
 - https://youtu.be/S4kIfIUSV6o
 Cover Artists:
 - minty
+Referenced Tracks:
+- track:dissension-original
+- Carefree Action
+- track:showtime-original-mix
 ---
 Track: Stargaze
 Artist: Nick Smalley
@@ -985,8 +985,6 @@ Group: Bonus tracks
 Track: Another Countdown
 Artist: Michael Guy Bowman
 Duration: '1:20'
-References:
-- Another Jungle
 Art Tags:
 - Jane
 URLs:
@@ -999,15 +997,12 @@ Commentary: |-
     The track art is by Emery Ferguson.
 Cover Artists:
 - Emery Ferguson
+Referenced Tracks:
+- Another Jungle
 ---
 Track: Frustracean
 Artist: Toby Fox
 Duration: '2:47'
-References:
-- track:crustacean
-Samples:
-- Snake Eyes
-- Leaving Las Vegas
 URLs:
 - https://www.youtube.com/watch?v=om3VC6ru4yk
 - https://youtu.be/om3VC6ru4yk
@@ -1017,3 +1012,8 @@ Lyrics: |-
     boner
 Cover Artists:
 - Homestuck
+Referenced Tracks:
+- track:crustacean
+Sampled Tracks:
+- Snake Eyes
+- Leaving Las Vegas
diff --git a/album/i-am-writing-myself-a-dream-in-a-letter.yaml b/album/i-am-writing-myself-a-dream-in-a-letter.yaml
index 7be13d58..591d40c9 100644
--- a/album/i-am-writing-myself-a-dream-in-a-letter.yaml
+++ b/album/i-am-writing-myself-a-dream-in-a-letter.yaml
@@ -18,9 +18,6 @@ Default Track Cover Artists:
 ---
 Track: Blood For My Ancestors
 Duration: '6:03'
-References:
-- Summer
-- Howl
 URLs:
 - https://nasqueron.bandcamp.com/track/blood-for-my-ancestors
 Lyrics: |-
@@ -29,22 +26,23 @@ Lyrics: |-
 Commnentary: |-
     <i>Kal-la-kal-la:</i>
     I can't claim to remember which radio stations I took audio from, but I used this websdr - <a href="http://k3fef.com:8901/">http://k3fef.com:8901/</a>
+Referenced Tracks:
+- Summer
+- Howl
 ---
 Track: Dreaming Pool
 Duration: '8:32'
-References:
-- Summer
-- Howl
 URLs:
 - https://nasqueron.bandcamp.com/track/dreaming-pool-2
 Lyrics: |-
     All green things growing under every sky,<br>All hands reaching into grave,<br>Every horse's chest drums out the sound, the<br>Beating beating of hearts, feet and fists,<br>On the ground, on the ground, on your body;<br>On your body, on your skin,<br>And every building falls and flowers grow;<br>And seabirds cry the sounds<br>Of Now and Here and Salt and Fear and Open;<br>And the eyes of the fox are open, and the eyes<br>Of the rabbit are open, and the grass<br>Will never stop, and the sun<br>Rolls down your mountain bones, leaving<br>Scorched grass,<br>And a lamb, eyes closed and stiff and cold,<br>In your arms so heavy;<br>Soft soft its skull and gold and dull,<br>We wait for rain.
     What sphinx of cement and aluminum bashed open their skulls and ate up their brains and imagination?<br>Moloch! Solitude! Filth! Ugliness! Ashcans and unobtainable dollars! Children screaming under the stairways! Boys sobbing in armies! Old men weeping in the parks!<br>Moloch! Moloch! Nightmare of Moloch! Moloch the loveless! Mental Moloch! Moloch the heavy judger of men!<br>Moloch the incomprehensible prison! Moloch the crossbone soulless jailhouse and Congress of sorrows! Moloch whose buildings are judgment! Moloch the vast stone of war! Moloch the stunned governments!<br>Moloch whose mind is pure machinery! Moloch whose blood is running money! Moloch whose fingers are ten armies! Moloch whose breast is a cannibal dynamo! Moloch whose ear is a smoking tomb!<br>Moloch whose eyes are a thousand blind windows! Moloch whose skyscrapers stand in the long streets like endless Jehovahs! Moloch whose factories dream and croak in the fog! Moloch whose smoke-stacks and antennae crown the cities!<br>Moloch whose love is endless oil and stone! Moloch whose soul is electricity and banks! Moloch whose poverty is the specter of genius! Moloch whose fate is a cloud of sexless hydrogen! Moloch whose name is the Mind!<br>Moloch in whom I sit lonely! Moloch in whom I dream Angels! Crazy in Moloch! Cocksucker in Moloch! Lacklove and manless in Moloch!<br>Moloch who entered my soul early! Moloch in whom I am a consciousness without a body! Moloch who frightened me out of my natural ecstasy! Moloch whom I abandon! Wake up in Moloch! Light streaming out of the sky!<br>Moloch! Moloch! Robot apartments! invisible suburbs! skeleton treasuries! blind capitals! demonic industries! spectral nations! invincible madhouses! granite cocks! monstrous bombs!<br>They broke their backs lifting Moloch to Heaven! Pavements, trees, radios, tons! lifting the city to Heaven which exists and is everywhere about us!<br>Visions! omens! hallucinations! miracles! ecstasies! gone down the American river!<br>Dreams! adorations! illuminations! religions! the whole boatload of sensitive bullshit!<br>Breakthroughs! over the river! flips and crucifixions! gone down the flood! Highs! Epiphanies! Despairs! Ten years’ animal screams and suicides! Minds! New loves! Mad generation! down on the rocks of Time!<br>Real holy laughter in the river! They saw it all! the wild eyes! the holy yells! They bade farewell! They jumped off the roof! to solitude! waving! carrying flowers! Down to the river! into the street!
+Referenced Tracks:
+- Summer
+- Howl
 ---
 Track: Jet Black
 Duration: '6:42'
-References:
-- track:jet-black-jawbreaker
 URLs:
 - https://nasqueron.bandcamp.com/track/jet-black
 Lyrics: >-
@@ -59,11 +57,11 @@ Lyrics: >-
     same as the symptom.<br>Simple and pure: break to keep fixing.<br>Patiently nurse,
     patient and nurse.<br>This is the part I wouldn't show you.<br>The part where
     you say, "I don't even know you."<br>This is your cue.<br>Be glad it's through.
+Referenced Tracks:
+- track:jet-black-jawbreaker
 ---
 Track: Coelacanth
 Duration: '7:37'
-References:
-- The City of Dreadful Night
 URLs:
 - https://nasqueron.bandcamp.com/track/coelacanth
 Lyrics: |-
@@ -71,6 +69,8 @@ Lyrics: |-
     As I came through the desert thus it was,<br>As I came through the desert: On the left<br>The sun arose and crowned a broad crag-cleft;<br>There stopped and burned out black, except a rim,<br>A bleeding eyeless socket, red and dim;<br>Whereon the moon fell suddenly south-west,<br>And stood above the right-hand cliffs at rest:<br>Still I strode on austere;<br>No hope could have no fear.
      I dream of you rising up out of the ocean, skeletons of coelacanths caught in your horns, licking kelp from between your teeth, feeding drowned decadence with the gilded petals of the world above. Better it be yours than mine, an empty sinking pit of hunger tunnelling down to the centre of the earth, chewing red flesh and spitting black seeds.
      the rain pulls down curtains around you, flooding subway stations and cascading down the glass sheet faces of skyscrapers. I see the future in refracted light, and it is the rainbow in a puddle of oil. The scattered remnants of the way we used to live adorn our walls, sit abandoned in drawers, in brief moments of recollection, at the edge of conversations, foam flecks on a black table, lights adorning street-sides, between blank walls of concrete reaching up into the sky.
+Referenced Tracks:
+- The City of Dreadful Night
 ---
 Track: An Overture From The Far End Of The Room
 Duration: '10:08'
@@ -79,8 +79,6 @@ URLs:
 ---
 Track: Hijra
 Duration: '7:37'
-References:
-- Up-Hill
 URLs:
 - https://nasqueron.bandcamp.com/track/hijra
 Lyrics: |-
@@ -88,3 +86,5 @@ Lyrics: |-
     But is there for the night a resting-place?<br>May not the darkness hide it from my face?
     Shall I meet other wayfarers at night?<br>Then must I knock, or call when just in sight?
     Shall I find comfort, travel-sore and weak?<br>Will there be beds for me and all who seek?
+Referenced Tracks:
+- Up-Hill
diff --git a/album/inhospitable-delisted.yaml b/album/inhospitable-delisted.yaml
index f5dee57a..515b275e 100644
--- a/album/inhospitable-delisted.yaml
+++ b/album/inhospitable-delisted.yaml
@@ -21,88 +21,88 @@ Default Track Cover Artists:
 - nuclear333
 ---
 Track: INHOSPITABLE (Old Title)
-AKA: Main Theme - INHOSPITABLE
 Duration: 0:59
-Original Date: November 28, 2017
 URLs:
 - https://nuclear333.bandcamp.com/track/inhospitable-old-title
 Has Cover Art: false
+Also Released As:
+- Main Theme - INHOSPITABLE
+Date First Released: November 28, 2017
 ---
 Track: Misconduct
 Duration: '3:06'
-Original Date: November 28, 2017
 URLs:
 - https://nuclear333.bandcamp.com/track/misconduct
+Date First Released: November 28, 2017
 ---
 Track: Faultline Flatfoots
 Duration: '2:08'
-Original Date: November 28, 2017
 URLs:
 - https://nuclear333.bandcamp.com/track/faultline-flatfoots
+Date First Released: November 28, 2017
 ---
 Track: Regrets
 Duration: '2:03'
-Original Date: November 28, 2017
 URLs:
 - https://nuclear333.bandcamp.com/track/regrets
+Date First Released: November 28, 2017
 ---
 Track: Scratch Zero
 Duration: '2:20'
-Original Date: November 28, 2017
 URLs:
 - https://nuclear333.bandcamp.com/track/scratch-zero
+Date First Released: November 28, 2017
 ---
 Track: Crying Robot
 Duration: '2:42'
-Original Date: November 28, 2017
 URLs:
 - https://nuclear333.bandcamp.com/track/crying-robot
 Commentary: |-
     <i>nuclear333:</i>
     This track didn't come with track art.
 Has Cover Art: false
+Date First Released: November 28, 2017
 ---
 Track: Perspective Inbound
 Duration: '1:52'
-Original Date: November 28, 2017
 URLs:
 - https://nuclear333.bandcamp.com/track/perspective-inbound
 Commentary: |-
     <i>nuclear333:</i>
     This track reused the art from [[track:regrets]] in the original too.
+Date First Released: November 28, 2017
 ---
 Track: Deep in the Planet
 Duration: '2:24'
-Original Date: November 28, 2017
 URLs:
 - https://nuclear333.bandcamp.com/track/deep-in-the-planet
+Date First Released: November 28, 2017
 ---
 Track: The Serpent's Trail
 Duration: '1:52'
-Original Date: November 28, 2017
 URLs:
 - https://nuclear333.bandcamp.com/track/the-serpents-trail
 Commentary: |-
     <i>nuclear333:</i>
     One of the instruments here is a dog bark. The entire song was made specifically so I could try that technique.
 Has Cover Art: false
+Date First Released: November 28, 2017
 ---
 Track: Losing Reality
 Duration: '1:54'
-Original Date: November 28, 2017
 URLs:
 - https://nuclear333.bandcamp.com/track/losing-reality
+Date First Released: November 28, 2017
 ---
 Track: Mystic Jam
 Duration: '1:30'
-Original Date: November 28, 2017
 URLs:
 - https://nuclear333.bandcamp.com/track/mystic-jam
 Has Cover Art: false
+Date First Released: November 28, 2017
 ---
 Track: Hammer Head
 Duration: '1:58'
-Original Date: November 28, 2017
 URLs:
 - https://nuclear333.bandcamp.com/track/hammer-head
 Commentary: |-
@@ -110,41 +110,42 @@ Commentary: |-
     Honestly in retrospect this album art really isn't too fitting, but it's pretty cute. It's nice to see how much North's art has improved since then, especially considering I'm not taking that to mean this art is bad.
 Cover Artists:
 - Cozy Skeleton
+Date First Released: November 28, 2017
 ---
 Track: Demon Juice
 Duration: '2:04'
-Original Date: November 28, 2017
 URLs:
 - https://nuclear333.bandcamp.com/track/demon-juice
 Commentary: |-
     <i>nuclear333:</i>
     Cringe is dead. This track art was cool I don't care what you say. Yeah it's like, BAD ART, but conceptually this rules. I should note that 90% of the track art was complete bullshit because I didn't actually have any big ideas back then. The beta track art sucks though. Don't apply that in your metadata. The second I finished making it I knew it wasn't going to be good.
     Anyway this song was originally made for Cool and New Music Team's '9' album, but was rejected because it sucked, and also because I got the lore I was working off of wrong. Cool and New Webcomic is not a good comic.
+Date First Released: November 28, 2017
 ---
 Track: Channel Surfing
 Duration: '2:19'
-Original Date: November 28, 2017
 URLs:
 - https://nuclear333.bandcamp.com/track/channel-surfing
 Commentary: |-
     <i>nuclear333:</i>
     Bad photoshop edit. Eugh, can't believe I thought this was passable as track art back then.
+Date First Released: November 28, 2017
 ---
 Track: Infinite Midnight
 Duration: '3:43'
-Original Date: November 28, 2017
 URLs:
 - https://nuclear333.bandcamp.com/track/infinite-midnight
 Commentary: |-
     <i>nuclear333:</i>
     I completely forgot I reused this art THREE times on this album.
+Date First Released: November 28, 2017
 ---
 Track: Greater Impact
 Duration: '1:46'
-Original Date: November 28, 2017
 URLs:
 - https://nuclear333.bandcamp.com/track/greater-impact
 Commentary: |-
     <i>nuclear333:</i>
     This track art was originally for the song "Techno Babtle", which isn't included here. I basically just drew the part of the comic it was used for from a different perspective, and I am so glad I rebooted it oh my god this sucked. This was not nearly as cool as I thought it was back then. If you want to go find the page this was from, it's on MSPFA, but maybe don't. It was pretty bad.
     If you're wondering why this is an unfitting track for the end of an album, please remember that this album had 26 tracks originally.
+Date First Released: November 28, 2017
diff --git a/album/jailbreak-vol-1.yaml b/album/jailbreak-vol-1.yaml
index 7cb5ff3a..b4b61e9e 100644
--- a/album/jailbreak-vol-1.yaml
+++ b/album/jailbreak-vol-1.yaml
@@ -1,7 +1,4 @@
 Album: Jailbreak Vol. 1
-Banner Art:
-- Robert J! Lake
-- Niklink (edits for wiki)
 Banner Dimensions: 1100x180
 Banner Style: |-
     image-rendering: pixelated;
@@ -17,6 +14,9 @@ URLs:
 - https://www.youtube.com/playlist?list=PLnVpmehyaOFa8lNfIzETogLpPBnC_ZIDw
 Cover Artists:
 - Robert J! Lake
+Banner Artists:
+- Robert J! Lake
+- Niklink (edits for wiki)
 ---
 Group: Main album
 ---
@@ -86,14 +86,14 @@ Cover Artists:
 Track: Confrontation
 Artist: Andrew Huo
 Duration: '2:06'
-References:
-- track:showtime-original-mix
-- The Beginning of Something Really Excellent
 URLs:
 - https://homestuckgaiden.bandcamp.com/track/confrontation
 - https://youtu.be/IUELbxXmltg
 Cover Artists:
 - Robert J! Lake
+Referenced Tracks:
+- track:showtime-original-mix
+- The Beginning of Something Really Excellent
 ---
 Track: Rising Water (Oh, Shit!)
 Artist: Peter Turner
@@ -143,13 +143,13 @@ Cover Artists:
 Track: Console Thunder
 Artist: Robert J! Lake
 Duration: '2:57'
-References:
-- Arcade Thunder
 URLs:
 - https://homestuckgaiden.bandcamp.com/track/console-thunder
 - https://youtu.be/enuWBwEsBlQ
 Cover Artists:
 - melodiousDiscord
+Referenced Tracks:
+- Arcade Thunder
 ---
 Track: Be the Other Guy
 Artist: James Dever, Perry Sullivan
@@ -163,13 +163,13 @@ Cover Artists:
 Track: Softbit
 Artist: Robert J! Lake
 Duration: '3:32'
-References:
-- track:softbit-original-gfd-please-shut-the-fuckass-mix-by-request-demo-version
 URLs:
 - https://homestuckgaiden.bandcamp.com/track/softbit
 - https://youtu.be/gV45Z5-Dkys
 Cover Artists:
 - Robert J! Lake
+Referenced Tracks:
+- track:softbit-original-gfd-please-shut-the-fuckass-mix-by-request-demo-version
 ---
 Track: Drillgorg
 Artist: Luke Benjamins
@@ -196,14 +196,14 @@ Artist: Nick Smalley
 Contributors:
 - Luke Benjamins
 Duration: '2:22'
-Samples:
-- Meet the Spy
 Lyrics: Your mother
 URLs:
 - https://homestuckgaiden.bandcamp.com/track/retrobution
 - https://youtu.be/uCS_Bz-5ocM
 Cover Artists:
 - Robert J! Lake
+Sampled Tracks:
+- Meet the Spy
 ---
 Track: Game Over
 Directory: game-over-jailbreak
@@ -218,13 +218,13 @@ Cover Artists:
 Track: Is This the End?
 Artist: Robert J! Lake
 Duration: '3:27'
-References:
-- Isn't This "Is This the End?" Again?
 URLs:
 - https://homestuckgaiden.bandcamp.com/track/is-this-the-end
 - https://youtu.be/SIGgQhizLxM
 Cover Artists:
 - Robert J! Lake
+Referenced Tracks:
+- Isn't This "Is This the End?" Again?
 ---
 Track: This is the End
 Artist: Robert J! Lake
@@ -247,12 +247,6 @@ Has Cover Art: false
 Track: A Common Occurrance (Every Night, To Be Exact)
 Artist: Robert J! Lake
 Duration: 0:57
-References:
-- Gust of Heir
-Samples:
-- Meet the Spy
-- Drillgorg
-- Your Bed
 URLs:
 - https://youtu.be/tdTjk-HX2rw
 Lyrics: |-
@@ -277,6 +271,12 @@ Lyrics: |-
 
     I am- your mother- in bed
 Has Cover Art: false
+Referenced Tracks:
+- Gust of Heir
+Sampled Tracks:
+- Meet the Spy
+- Drillgorg
+- Your Bed
 ---
 Track: Useful or Otherwise
 Artist: Robert J! Lake
@@ -288,12 +288,12 @@ Has Cover Art: false
 Track: Dr. Squiddle
 Artist: Andrew Huo
 Duration: 0:48
-References:
-- track:doctor
-- Squiddles!
 URLs:
 - https://youtu.be/lDq9alucoMA
 Has Cover Art: false
+Referenced Tracks:
+- track:doctor
+- Squiddles!
 ---
 Track: Distanced
 Artist: Robert J! Lake
@@ -326,11 +326,11 @@ Has Cover Art: false
 Track: Softbit (Original GFD Please Shut the Fuckass Mix By Request Demo Version)
 Artist: Robert J! Lake
 Duration: '3:24'
-References:
-- Softly
 URLs:
 - https://www.youtube.com/watch?v=GedH5uJhRW4
 Has Cover Art: false
+Referenced Tracks:
+- Softly
 ---
 Track: Audio Commentary Featuring Robert J! Lake, Nick Smalley, Luke "GFD" Benjamins,
     and Erik "Jit" Scheele
diff --git a/album/labyrinths-heart.yaml b/album/labyrinths-heart.yaml
index 9004c2b0..8d92d231 100644
--- a/album/labyrinths-heart.yaml
+++ b/album/labyrinths-heart.yaml
@@ -2,8 +2,6 @@ Album: Labyrinth's Heart
 Artist: Clark Powell
 Date: September 2, 2015
 Date Added: October 10, 2020
-Banner Art:
-- dodostad
 Banner Dimensions: 975x180
 Has Track Art: false
 Color: '#9f887a'
@@ -14,6 +12,8 @@ URLs:
 - https://www.youtube.com/playlist?list=PLnVpmehyaOFZhrI8iMi4bMrEyl2ZaWd7R
 Cover Artists:
 - dodostad
+Banner Artists:
+- dodostad
 ---
 Track: Getting Lost
 Duration: '1:22'
@@ -37,15 +37,15 @@ URLs:
 ---
 Track: Misbegotten
 Duration: '4:20'
-References:
-- Pencil Holder (demo version)
-- track:lori-and-erich-baker
 URLs:
 - https://youtu.be/9ai9ETnvXQo
 Lyrics: |-
     <i>Countless bodies remain unidentified, some ending up in unmarked graves and small border town cemeteries.</i>
 
     I went out on a forensic case, and the sheriff had a skull on his office desk. It was the skull of a younger person, and he was using it as a pencil holder. He had pens and pencils in the eye socket of this person. So that's when I decided something had to be done.
+Referenced Tracks:
+- Pencil Holder (demo version)
+- track:lori-and-erich-baker
 ---
 Track: Calypso Deep
 Duration: '1:46'
@@ -84,11 +84,11 @@ URLs:
 ---
 Track: Requiem
 Duration: '4:38'
-References:
-- Serenade
 Directory: requiem-labyrinths-heart
 URLs:
 - https://youtu.be/u4x-_BipEwA
+Referenced Tracks:
+- Serenade
 ---
 Track: I Miss Being Lost
 Duration: '2:48'
diff --git a/album/lofam.yaml b/album/lofam.yaml
index 2927658e..19443aa3 100644
--- a/album/lofam.yaml
+++ b/album/lofam.yaml
@@ -1,8 +1,5 @@
 Album: Land of Fans and Music
 Directory: lofam
-Banner Art:
-- Lunise
-- Niklink (edits for wiki)
 Banner Dimensions: 1100x180
 Date: July 30, 2011
 Date Added: March 16, 2020
@@ -52,6 +49,9 @@ Commentary: |-
     <i>We hope you enjoyed the first-ever Homestuck Fanmusic Album!</i>
 Cover Artists:
 - melodiousDiscord
+Banner Artists:
+- Lunise
+- Niklink (edits for wiki)
 ---
 Track: Beginnings (Press Start to Play)
 Artist: Catboss
@@ -61,11 +61,6 @@ Art Tags:
 - Rose
 - Dave
 - Jade
-References:
-- track:skies-of-skaia
-- Homestuck Title Screen
-- Homestuck
-- Theme
 URLs:
 - https://homestuckgaiden.bandcamp.com/track/beginnings-press-start-to-play
 - https://youtu.be/WLa8iqsW_x8
@@ -78,13 +73,15 @@ Commentary: |-
     Fun fact: I didn't realise for a while that "Homestuck" and "Alternia" were technically remixes themselves, making this a 3x remix-of-remix combob.
 Cover Artists:
 - Red Pen
+Referenced Tracks:
+- track:skies-of-skaia
+- Homestuck Title Screen
+- Homestuck
+- Theme
 ---
 Track: Downtime
 Artist: Thomas Ibarra
 Duration: '2:15'
-References:
-- track:showtime-piano-refrain
-- Showdown
 URLs:
 - https://homestuckgaiden.bandcamp.com/track/downtime
 - https://youtu.be/IKnJNJHty2U
@@ -96,12 +93,13 @@ Commentary: |-
     Thanks, MSPA.
 Cover Artists:
 - JNJ
+Referenced Tracks:
+- track:showtime-piano-refrain
+- Showdown
 ---
 Track: Doctor (Deep Breeze Mix)
 Artist: Solatrus
 Duration: '4:36'
-References:
-- track:doctor
 Art Tags:
 - John
 URLs:
@@ -115,12 +113,12 @@ Commentary: |-
     Credit to AndrewNeo of Skaia.net for the track's name.
 Cover Artists:
 - august
+Referenced Tracks:
+- track:doctor
 ---
 Track: Meltwater
 Artist: Elaine Wang
 Duration: '5:04'
-References:
-- track:frost-vol6
 Art Tags:
 - Jade
 URLs:
@@ -136,12 +134,12 @@ Commentary: |-
     Initially everything is piled on top, in the center. In revision for the album I pan everything back and forth. It may be noted that this song still sounds perfectly fine in mono, though.
 Cover Artists:
 - Dalmationer
+Referenced Tracks:
+- track:frost-vol6
 ---
 Track: Crystalanachrony
 Artist: Willow Ascenzo
 Duration: '3:05'
-References:
-- Crystalanthemums
 Art Tags:
 - Dave
 - Aradia
@@ -155,6 +153,8 @@ Commentary: |-
     This song is also an homage to Michiru Yamane's impressive body of soundtrack work for the various Castlevania games.
 Cover Artists:
 - Aelyrin
+Referenced Tracks:
+- Crystalanthemums
 ---
 Track: The Land of Wind and Shade
 Artist: Kristian Anderson
@@ -180,8 +180,6 @@ Cover Artists:
 Track: Thought and Flow
 Artist: Steve Everson
 Duration: '1:46'
-References:
-- Hydrocity Zone (Act 2)
 URLs:
 - https://homestuckgaiden.bandcamp.com/track/thought-and-flow
 - https://youtu.be/Bj-3pyAbc3U
@@ -193,13 +191,12 @@ Commentary: |-
     As it happens, drawing giant sky neurons is incredibly fun. Ancient runined temples, not so much fun and also incredibly difficult to shade right, but there you go. I am ashamed I did not manage to work in any Sonic the Hedgehog references, though.
 Cover Artists:
 - catastrophicGenesis
+Referenced Tracks:
+- Hydrocity Zone (Act 2)
 ---
 Track: First Guardian, Last Stand
 Artist: Chase
 Duration: '3:33'
-References:
-- track:beatdown-strider-style
-- Liquid Negrocity
 Art Tags:
 - Doc Scratch
 URLs:
@@ -213,6 +210,9 @@ Commentary: |-
     This one was a bit of an oops moment haha! The way it was originally posted, I had thought the song title was "Chasing Fireflies" but as it turns out, that is Chase's full username. I had already made this up though. Doc Scratch standing on John's planet for some reason. With fireflies in the background.
 Cover Artists:
 - melodiousDiscord
+Referenced Tracks:
+- track:beatdown-strider-style
+- Liquid Negrocity
 ---
 Track: Land of Wrath and Angels
 Artist: Ian White
@@ -275,8 +275,6 @@ Cover Artists:
 Track: A Fashionable Escape
 Artist: Yan Rodriguez
 Duration: '3:43'
-Samples:
-- Metal Gear Solid
 Art Tags:
 - Kanaya
 URLs:
@@ -289,16 +287,14 @@ Commentary: |-
     A nice, simple piece. Fashion in Homestuck is associated with Kanaya in my mind so I came up with the idea of Kanaya seeking to escape something, and then halfway through the song the klaxon alarm kicks in. Thus we get this piece of art.
 Cover Artists:
 - melodiousDiscord
+Sampled Tracks:
+- Metal Gear Solid
 ---
 Track: Clockbreaker
 Artist: Mal McGannon
 Duration: '2:40'
 Art Tags:
 - Jack Noir
-References:
-- The Broken Clock
-- track:crustacean
-- Sunsetter
 URLs:
 - https://homestuckgaiden.bandcamp.com/track/clockbreaker
 - https://youtu.be/ZKhzNLEXlAI
@@ -310,6 +306,10 @@ Commentary: |-
     When drawing this I learned that I can't draw clocks well in perspective, so I googled a clock and Photoshopped it in. Take notes, kids: use technology to hide your faults!
 Cover Artists:
 - Brad Griffin
+Referenced Tracks:
+- The Broken Clock
+- track:crustacean
+- Sunsetter
 ---
 Track: Quartz Lullaby
 Artist: Evan Copeland
@@ -369,8 +369,6 @@ Cover Artists:
 Track: Sunshaker
 Artist: D. Crystal
 Duration: '2:29'
-References:
-- Sunsetter
 Art Tags:
 - Doc Scratch
 URLs:
@@ -385,12 +383,12 @@ Commentary: |-
     that's about it
 Cover Artists:
 - D. Crystal
+Referenced Tracks:
+- Sunsetter
 ---
 Track: Sburban Rush
 Artist: Ralen Gainsborough
 Duration: '1:37'
-References:
-- track:sburban-jungle
 Art Tags:
 - John
 URLs:
@@ -405,6 +403,8 @@ Commentary: |-
     I have always liked silhouette pieces. I knew that I wanted to draw John running. I briefly considered doing all four kids but decided against it, Sburban Jungle is John's theme after all, and the color scheme would look better with just him. From there it was a simple matter of posing him and arranging the rest of the piece. I think that this is one of the ones I am most proud of, even if it's very simple.
 Cover Artists:
 - melodiousDiscord
+Referenced Tracks:
+- track:sburban-jungle
 ---
 Track: Prince of Seas
 Artist: Max Wright
@@ -427,8 +427,6 @@ Cover Artists:
 Track: Atomik Meltdown
 Artist: James Roach
 Duration: '3:28'
-References:
-- track:atomyk-ebonpyre
 Art Tags:
 - Dave
 URLs:
@@ -442,13 +440,12 @@ Commentary: |-
     All the warning siren things in it made me feel that a powerplant was about to explode. So obviously Dave needs to be jumping out of a swirling mass of liquid fire at an interesting angle to show this.
 Cover Artists:
 - Pancake-Fairy
+Referenced Tracks:
+- track:atomyk-ebonpyre
 ---
 Track: Jackie Treats
 Artist: Artisticpolo
 Duration: '3:14'
-References:
-- track:frost-vol6
-- Liquid Negrocity
 Art Tags:
 - Dave
 - Jade
@@ -466,6 +463,9 @@ Commentary: |-
     I drew the picture this way because the track was inspired by the Snausages page where Bec feels love towards Jade. In this piece he's putting his trust in Jade as she is holding said treats, meanwhile Dave is sneaking up behind him for an attack.
 Cover Artists:
 - Pancake-Fairy
+Referenced Tracks:
+- track:frost-vol6
+- Liquid Negrocity
 ---
 Track: Skaian Air
 Artist: Trent West
@@ -488,8 +488,6 @@ Cover Artists:
 Track: Sburban Elevator
 Artist: Alex Rosetti
 Duration: 0:30
-References:
-- track:sburban-jungle
 URLs:
 - https://homestuckgaiden.bandcamp.com/track/sburban-elevator
 - https://youtu.be/SqJiI9ouAhU
@@ -498,6 +496,8 @@ Commentary: |-
     All I remember was someone requesting Sburban Jungle in the style of elevator music so out pops this thing.
 Cover Artists:
 - Miff
+Referenced Tracks:
+- track:sburban-jungle
 ---
 Track: Moody Mister Gemini
 Artist: Thomas Ferkol
@@ -547,7 +547,22 @@ Cover Artists:
 Track: MeGaDanceVaNia
 Artist: Catboss
 Duration: '6:04'
-References:
+Art Tags:
+- Vriska
+URLs:
+- https://homestuckgaiden.bandcamp.com/track/megadancevania
+- https://youtu.be/UIcXeunzAaM
+Commentary: |-
+    <i>Catboss:</i>
+    One fine day I got the idea for a MeGaLoVania dance remix, but I sat on it because frankly? I don't actually enjoy dance music. Or techno. Or whatever genre this classifies as.
+    Several days later, I was trying to conjure up music for Nepetaquest. But I was drawing a blank because "MeGaLoVania dance remix come on guy you want it" was stuck in my head. So eventaully I was like "OKAY I'LL DO IT SHUTUP"
+    And then once I got started, it just grew. And grew. And grew. Like cancer. MUSICAL CANCER. Before I knew it I'd stuffed most of the kids' and trolls' motifs in there. There are 20 melodies I used (albeit some only for veeeery short segments). It started off with 16; I expanded it slightly in the process of revising it for the album. See if you can spot them all!
+    Fun fact: when I was composing this, I didn't even realise I'd ripped the chords from Sburban Jungle until much later.
+    <i>JNJ:</i>
+    I made this image before I even knew about the album. The visual reference to Dance Dance Revolution (DDR) fits with a track named MeGaDanceVaNia.
+Cover Artists:
+- JNJ
+Referenced Tracks:
 - track:MeGaLoVania
 - track:sburban-jungle
 - track:explore
@@ -568,21 +583,6 @@ References:
 - track:aggrieve
 - track:showtime-original-mix
 - Showdown
-Art Tags:
-- Vriska
-URLs:
-- https://homestuckgaiden.bandcamp.com/track/megadancevania
-- https://youtu.be/UIcXeunzAaM
-Commentary: |-
-    <i>Catboss:</i>
-    One fine day I got the idea for a MeGaLoVania dance remix, but I sat on it because frankly? I don't actually enjoy dance music. Or techno. Or whatever genre this classifies as.
-    Several days later, I was trying to conjure up music for Nepetaquest. But I was drawing a blank because "MeGaLoVania dance remix come on guy you want it" was stuck in my head. So eventaully I was like "OKAY I'LL DO IT SHUTUP"
-    And then once I got started, it just grew. And grew. And grew. Like cancer. MUSICAL CANCER. Before I knew it I'd stuffed most of the kids' and trolls' motifs in there. There are 20 melodies I used (albeit some only for veeeery short segments). It started off with 16; I expanded it slightly in the process of revising it for the album. See if you can spot them all!
-    Fun fact: when I was composing this, I didn't even realise I'd ripped the chords from Sburban Jungle until much later.
-    <i>JNJ:</i>
-    I made this image before I even knew about the album. The visual reference to Dance Dance Revolution (DDR) fits with a track named MeGaDanceVaNia.
-Cover Artists:
-- JNJ
 ---
 Track: SadoMasoPedoRoboNecroBestiality
 Artist: tynic
@@ -590,8 +590,6 @@ Duration: '1:48'
 Contributors:
 - Beast72 (original midi)
 - Goatmon (additional vocals)
-References:
-- Supercalifragilisticexpialidocious
 Art Tags:
 - Aradia
 - Equius
@@ -653,6 +651,8 @@ Commentary: |-
     I'd always hoped that I'd eventually come out with some Homestuck thing that would be well remembered by the fans. Here I was wasting my time whipping together silly mario paints, when I should have been recording catchy songs about amoral abusive relationships. Live and learn.
 Cover Artists:
 - Red Pen
+Referenced Tracks:
+- Supercalifragilisticexpialidocious
 ---
 Track: Under the Hat
 Artist: Erik Scheele
@@ -674,13 +674,6 @@ Cover Artists:
 Track: Sburban Piano Doctor
 Artist: Brad Griffin
 Duration: '1:52'
-References:
-- track:sburban-jungle
-- track:doctor
-- track:showtime-original-mix
-- track:aggrieve
-- Penumbra Phantasm
-- track:beatdown-strider-style
 URLs:
 - https://homestuckgaiden.bandcamp.com/track/sburban-piano-doctor
 - https://youtu.be/AUkt5bpcJdQ
@@ -690,13 +683,17 @@ Commentary: |-
     I guess it sounded alright though.
 Cover Artists:
 - Brad Griffin
+Referenced Tracks:
+- track:sburban-jungle
+- track:doctor
+- track:showtime-original-mix
+- track:aggrieve
+- Penumbra Phantasm
+- track:beatdown-strider-style
 ---
 Track: The Hymn of Making Babies
 Artist: EnnuiKing
 Duration: '1:12'
-References:
-- Descend
-- track:explore
 Art Tags:
 - John
 URLs:
@@ -710,6 +707,9 @@ Commentary: |-
     When I first saw the title, 'Hymn of Making Babies,' my mind appropriately jumped to our resident Ectobiologist, John. And listening to the track doesn't disappoint, either! The cover that EnnuiKing did is both a mix of sombre, almost Medieval playing, and then downright goofy John-ness at the end, and I wanted to try and get that. At first glance, this picture is a little serious and a little solemn, and then you realize... this is John Egbert that's the subject matter here, and that just makes it incredibly silly because, well, in the end, wouldn't he just go so over-the-top dramatic in this situation? Yeah. Probably.
 Cover Artists:
 - tT Twigwise
+Referenced Tracks:
+- Descend
+- track:explore
 ---
 Track: Emissary of Wind
 Artist: Eston Schweickart
@@ -745,8 +745,6 @@ Cover Artists:
 Track: Midnight Spider
 Artist: Yan Rodriguez
 Duration: '3:17'
-References:
-- Spider's Claw
 Art Tags:
 - Vriska
 URLs:
@@ -759,6 +757,8 @@ Commentary: |-
     I can't really take any credit for the art behind "Midnight Spider," because Nucelose had the concept completely fleshed out by the time i ever laid hands on it. All I did was redo his awesome it in my style.
 Cover Artists:
 - umibouzu
+Referenced Tracks:
+- Spider's Claw
 ---
 Track: House of Lalonde
 Artist: Max Wright
@@ -780,8 +780,6 @@ Cover Artists:
 Track: L'etat de l'ambivalence
 Artist: James Dever
 Duration: '3:04'
-References:
-- psych0ruins
 Art Tags:
 - Aradia
 URLs:
@@ -795,12 +793,12 @@ Commentary: |-
     I picked up "L'état de L'ambivalence" before I knew what it was about. When I found out it was an Aradia land theme, I kind of panicked. Backgrounds and scenery are a huge weakness of mine, and I wasn't soure how to depict LOQAM without essentially copying the existing art, so I decided to focus more on Aradia herself.
 Cover Artists:
 - umibouzu
+Referenced Tracks:
+- psych0ruins
 ---
 Track: Growin' Up Strider
 Artist: Ian White
 Duration: '1:30'
-References:
-- track:beatdown-strider-style
 Art Tags:
 - Dave
 - Dave's bro
@@ -815,6 +813,8 @@ Commentary: |-
     There was pretty much no way I was not going to jump on "Growin' Up Strider." I love Dave (and Bro). It ended up not being very creative, but the thought of baby Dave in his horse leather bib and tiny shades makes me smile.
 Cover Artists:
 - umibouzu
+Referenced Tracks:
+- track:beatdown-strider-style
 ---
 Track: Nakkadile
 Artist: Marcy Nabors
@@ -822,10 +822,6 @@ Contributors:
 - Nyanface (primary naks)
 - Alex Rosetti (secondary naks)
 Duration: '2:48'
-References:
-- Nyanyanyanyanyanyanya!
-- Tribal Ebonpyre
-- track:sburban-jungle
 Art Tags:
 - Consorts
 URLs:
@@ -911,6 +907,10 @@ Lyrics: |-
     Nak! (Nak!)
 Cover Artists:
 - Tawa
+Referenced Tracks:
+- Nyanyanyanyanyanyanya!
+- Tribal Ebonpyre
+- track:sburban-jungle
 ---
 Track: Vigilante
 Artist: Brenna Curran
@@ -1040,8 +1040,6 @@ Artist: EnnuiKing
 Contributors:
 - Angelo Badalamenti (inspiration through work on Twin Peaks)
 Duration: '2:21'
-References:
-- Ectobiology
 Art Tags:
 - Karkat
 - Kanaya
@@ -1058,12 +1056,12 @@ Commentary: |-
     This song sounds like something you might tango to, so I wanted the pose to initially look like they were dancing, but then Kanaya's blood and limp frame sink in. I thought Kan's red skirt and jade blod coinciding with roses made a beautiful limited color scheme. I also didn't want too much detail to tip the moment too far into silly or somber, as it really is both at the same time.
 Cover Artists:
 - kayak
+Referenced Tracks:
+- Ectobiology
 ---
 Track: Salamander Fiesta
 Artist: The Lovable Tramp
 Duration: '3:14'
-References:
-- track:doctor
 Art Tags:
 - Consorts
 URLs:
@@ -1076,12 +1074,12 @@ Commentary: |-
     With Salamander Fiesta, I wanted to try and introduce something of a festive atmosphere into Land of Wind and Shade, which normally has something of a gloomy feel with all its blue and black tones. Also, salamanders in sombreros.
 Cover Artists:
 - Yee-Tvae Corinst
+Referenced Tracks:
+- track:doctor
 ---
 Track: MegaloVaniaC
 Artist: Xenocidebot
 Duration: '1:42'
-References:
-- track:MeGaLoVania
 Art Tags:
 - Vriska
 URLs:
@@ -1095,6 +1093,8 @@ Commentary: |-
     MeGaLoVania + Rock. A potent combination when mixed! A similar yet more complex piece when compared to [[A Fashionable Escape]]. Both had characters that I cut out of the panel and edited to fit my purposes. I really do like how this one turned out though. My original draft had curtains on each side of her. I went back and cut them out though. I thought "okay, it's metal, there should be smoke". The lights were already in place so when I added the smoke effect I was awed by the effect it had. From there I touched things up and added Vriska's background lights. ::::)
 Cover Artists:
 - melodiousDiscord
+Referenced Tracks:
+- track:MeGaLoVania
 ---
 Track: Shame and Doubt
 Artist: Trent West
@@ -1117,8 +1117,6 @@ Cover Artists:
 Track: SWEET BRO AND HELLA JEFF SHOW
 Artist: Erik Scheele
 Duration: '1:07'
-References:
-- Deck the Halls
 Art Tags:
 - SBaHJ
 URLs:
@@ -1155,18 +1153,12 @@ Commentary: |-
     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.
 Cover Artists:
 - Elaine Wang
+Referenced Tracks:
+- Deck the Halls
 ---
 Track: Growing Up
 Artist: Eston Schweickart
 Duration: '5:11'
-References:
-- Lotus
-- Hearts Flush
-- Crystalanthemums
-- Homestuck Anthem
-- How Do I Live
-- track:ruins
-- Liquid Negrocity
 Art Tags:
 - John
 - John's dad
@@ -1182,14 +1174,18 @@ Commentary: |-
     As soon as I listened to this song, I knew I had to draw the artwork for it. To me, it clearly represented the passage from childhood to maturity that each of the kids, especially John, were forced to undergo in their short-lived session. Focusing on our favourite Friend-Leader, I attempted to capture this with an image of him turning his back on the relative safety and comforts of childhood and the watchful eye of his guardian.
 Cover Artists:
 - Cheers
+Referenced Tracks:
+- Lotus
+- Hearts Flush
+- Crystalanthemums
+- Homestuck Anthem
+- How Do I Live
+- track:ruins
+- Liquid Negrocity
 ---
 Track: The Drawing of the Four
 Artist: Willow Ascenzo
 Duration: '5:00'
-References:
-- track:sburban-jungle
-- Squiddles!
-- track:beatdown-strider-style
 Art Tags:
 - John
 - Rose
@@ -1203,6 +1199,10 @@ Commentary: |-
     The title is, of course, a blatant reference to Steven King's Dark Towerseries. The song is a build-up to each of the four kids entering the Medium (they're being "drawn" into the game just as Eddie, Susannah, and Jake were drawn into Mid-World, but that's enough for now about something that isn't Homsetuck), so we start out with a slow rendition of "Sburban Jungle" played on the piano (John's instrument) with subsequent accompaniment by a violin (Rose's instrument). Then, here come the drums (Dave's instrument), and we kick the song into high gear when the flute and bass (both Jade's instruments) come in. There's a long period of pseudo-improv from the bass, flute, and violin before returning to the meat of the song - and a nod to the Squiddles theme (another reference to Rose) before the finale. Curiously, the order of the instruments exactly matches the order of the kids' introduction.
 Cover Artists:
 - Red Pen
+Referenced Tracks:
+- track:sburban-jungle
+- Squiddles!
+- track:beatdown-strider-style
 ---
 Track: Ira quod Angelus
 Artist: Kalibration
@@ -1246,8 +1246,6 @@ Cover Artists:
 Track: Farewell
 Artist: Fuzz
 Duration: '4:04'
-References:
-- track:showtime-piano-refrain
 Art Tags:
 - John
 - Karkat
@@ -1262,16 +1260,12 @@ Commentary: |-
     This piece is based on what I hope will happen (still). After joining forces to defeat Jack, the kids' ultimate reward is unlocked and the trolls either go back to their won world, or accompany the kids. John is the last to leave and you can see the shadows of Terezi and Karkat. John gives a final wave before stepping through the door, Karkat gives a last farewell gesture in response. A bittersweet ending indeed.
 Cover Artists:
 - melodiousDiscord
+Referenced Tracks:
+- track:showtime-piano-refrain
 ---
 Track: ~ Heir - Seer - Knight - Witch ~
 Artist: Joe Griffith
 Duration: '7:59'
-References:
-- track:doctor
-- track:endless-climb
-- track:atomyk-ebonpyre
-- track:frost-vol6
-- Squiddles!
 Art Tags:
 - John
 - Rose
@@ -1289,12 +1283,16 @@ Commentary: |-
     Hope you enjoy!
 Cover Artists:
 - kayak
+Referenced Tracks:
+- track:doctor
+- track:endless-climb
+- track:atomyk-ebonpyre
+- track:frost-vol6
+- Squiddles!
 ---
 Track: Cutscene at the End of the Hallway
 Artist: Robert J! Lake
 Duration: '2:50'
-References:
-- Homestuck Title Screen
 URLs:
 - https://homestuckgaiden.bandcamp.com/track/cutscene-at-the-end-of-the-hallway
 - https://youtu.be/ZSWphWAVpfs
@@ -1307,3 +1305,5 @@ Commentary: |-
     basically the point is that i guess this song is a little like that if you use your imagination
 Cover Artists:
 - Zilleniose
+Referenced Tracks:
+- Homestuck Title Screen
diff --git a/album/lofam2.yaml b/album/lofam2.yaml
index 6fe9e686..3c80178e 100644
--- a/album/lofam2.yaml
+++ b/album/lofam2.yaml
@@ -1,7 +1,5 @@
 Album: Land of Fans and Music 2
 Directory: lofam2
-Banner Art:
-- Lunise
 Banner Dimensions: 1100x203
 Date: December 25, 2012
 Date Added: March 16, 2020
@@ -29,28 +27,25 @@ Commentary: |-
     <b>-INSPIRATION-</b><br>Andrew Hussie &amp; What Pumpkin Studios<br>The Homestuck Music Team
 Cover Artists:
 - Lunise
+Banner Artists:
+- Lunise
 ---
 Group: Disk 1
 ---
 Track: •~DISK 1~•
 Artist: Veritas Unae
 Duration: 0:31
-References:
-- The Paradox Paradigm
 Directory: disk1-lofam2
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/o-disk-1-o
 - https://youtu.be/x_pSKzA1_Eg
 Has Cover Art: false
+Referenced Tracks:
+- The Paradox Paradigm
 ---
 Track: Chronology
 Artist: Jamie Paige Stanley
 Duration: '7:44'
-References:
-- English
-- track:sburban-jungle
-- The Paradox Paradigm
-- --Emperical
 Art Tags:
 - Feferi
 - Doc Scratch
@@ -66,12 +61,15 @@ Commentary: |-
     paige told me the song was about doc scratch, the condesce and lord english, and since the track was titled chronology i tried to show some sort of a progression within the track art while expressing some of the background of each character.
 Cover Artists:
 - Skylar
+Referenced Tracks:
+- English
+- track:sburban-jungle
+- The Paradox Paradigm
+- --Emperical
 ---
 Track: Jackpot
 Artist: Charles Neudorf, Marcy Nabors
 Duration: '3:57'
-References:
-- track:aggrieve
 Art Tags:
 - Roxy
 - Underlings
@@ -86,13 +84,12 @@ Commentary: |-
     Here's my track art for "Jackpot"! It's a Roxy strife theme, and since we have yet to witness such an event in Homestuck, let's make believe. ;3
 Cover Artists:
 - 8bitkitten
+Referenced Tracks:
+- track:aggrieve
 ---
 Track: Satellite Physician
 Artist: Joe Ouellet
 Duration: '3:27'
-References:
-- track:doctor
-- Penumbra Phantasm
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/satellite-physician
 - https://youtu.be/RCPevVDN7xE
@@ -103,12 +100,13 @@ Commentary: |-
     This track and cover art was featured in the Homestuck/Zelda fan adventure, Legend of Homestuck, as John's theme.
 Cover Artists:
 - grayscaleOddysey
+Referenced Tracks:
+- track:doctor
+- Penumbra Phantasm
 ---
 Track: A Study In Skaia
 Artist: David Ellis
 Duration: '3:02'
-References:
-- track:skies-of-skaia
 Art Tags:
 - John
 URLs:
@@ -123,6 +121,8 @@ Commentary: |-
     I can admit that I had no idea where this was going when I painted it. I don't think I've ever drawn clouds before either haha.
 Cover Artists:
 - dodostad
+Referenced Tracks:
+- track:skies-of-skaia
 ---
 Track: Cuddlefish
 Artist: Thomas Ferkol
@@ -148,10 +148,6 @@ Cover Artists:
 Track: Rectify
 Artist: Thomas Ibarra
 Duration: '2:52'
-References:
-- Liquid Negrocity
-- track:atomyk-ebonpyre
-- track:showtime-piano-refrain
 Art Tags:
 - Jack Noir
 URLs:
@@ -162,6 +158,10 @@ Commentary: |-
     My second entry to the music contest, Rectify, was a follow-up to [[Irradiated]] in that it presented the same goal of making something different with the Black/Liquid Negrocity leitmotif. In this composition, based on Cascade, the menacing tone of Black would be turned into a battle theme for the good, as if Jack had performed a heelturn in light of impressive character development. It was a fun, fulfilling project that taught me many new things.
 Cover Artists:
 - Seth Massey
+Referenced Tracks:
+- Liquid Negrocity
+- track:atomyk-ebonpyre
+- track:showtime-piano-refrain
 ---
 Track: Rabbunctious!
 Artist: Brad Griffin
@@ -184,9 +184,6 @@ Cover Artists:
 Track: Skaian Starstorm
 Artist: Astro Kid
 Duration: '4:17'
-References:
-- Skaian Skirmish
-- Skaian Shuffle
 Art Tags:
 - Jade
 URLs:
@@ -200,13 +197,13 @@ Commentary: |-
     <i>AS IF SENSING THE CHANGE IN THE CAPTIVE CREATURE'S DEMEANOR, THE ASCENT SEEMS TO STEADY AND SWIFTEN.</i>
 Cover Artists:
 - Dawn Davis
+Referenced Tracks:
+- Skaian Skirmish
+- Skaian Shuffle
 ---
 Track: Good Dog (Best Friend)
 Artist: Catboss
 Duration: '4:26'
-References:
-- Courser
-- Carefree Action
 Art Tags:
 - Jade
 - Becquerel
@@ -223,17 +220,13 @@ Commentary: |-
     I was inspired by the pesterlog on <a href="https://homestuck.com/story/4858">page <s>6758</s> 4858</a>. Even though I had heard this track long before that update, when I listened to it again to get an idea for what kind of track art I'd like to draw for it, all I could think of was that pesterlog about alpha Jade.
 Cover Artists:
 - Lunise
+Referenced Tracks:
+- Courser
+- Carefree Action
 ---
 Track: Unforgiving Terrain
 Artist: Eston Schweickart
 Duration: '4:11'
-References:
-- Endless Expanse
-- Carapacian Dominion
-- track:ruins
-- track:growing-up
-- Gilded Sands
-- Nightmare
 Art Tags:
 - AR
 - PM
@@ -248,6 +241,13 @@ Commentary: |-
     After the original art file crashed like a piping hot baby on a meteor, I decided to create an Egyptian hieroglyphic-ish piece for this song because you know, DESERTS and WANDERERS and WOW JUST GOSH. But I also wanted to add in some of WV's little cahlk drawings too because it's cute! I mean, come on. Look at them, being happy and carefree and unaware. Yes, I know deep in my heart that this story will have a very happy end. No doubts about it. *insert evil laughter here*
 Cover Artists:
 - Cap
+Referenced Tracks:
+- Endless Expanse
+- Carapacian Dominion
+- track:ruins
+- track:growing-up
+- Gilded Sands
+- Nightmare
 ---
 Track: CR1M1N4L, CR1M1N4L
 Artist: Rachel Rose Mitchell
@@ -282,9 +282,6 @@ Cover Artists:
 Track: Squiddles In Sunglasses
 Artist: Eston Schweickart
 Duration: '1:08'
-References:
-- Friendship is Paramount
-- Squiddle Samba
 Art Tags:
 - Squiddles
 URLs:
@@ -295,12 +292,13 @@ Commentary: |-
     Squiddles in Sunglasses was originally part of a 6-part Homestuck medley that as going to be around 12 minutes long when finished. Halfway through I realized that I didn't like anything I was writing, so I did what any good artist does when faced with self-doubt and gave up. A few months later I listened to the old project files again and liked this part enough to make it its own piece. I think inspiration for this style came from Average White Band's <i>Pick Up the Pieces</i> but I can't remember for sure.
 Cover Artists:
 - RaChoTamer
+Referenced Tracks:
+- Friendship is Paramount
+- Squiddle Samba
 ---
 Track: JackBot
 Artist: Astro Kid
 Duration: '4:23'
-References:
-- Jackpot
 Art Tags:
 - Sawtooth
 - Squarewave
@@ -320,12 +318,12 @@ Commentary: |-
     <i>THE CONVERSATION CONTINUES IN THIS MANNER FOR SEVERAL VAPID MINUTES, BUT IS BROUGHT TO A SWIFT END BY THEIR ARRIVAL AT THE MYSTERIOUS AIRBOURNE VESSEL.</i>
 Cover Artists:
 - Brenden Cameron
+Referenced Tracks:
+- Jackpot
 ---
 Track: Crystalguitarthemums
 Artist: Erik Scheele
 Duration: '2:20'
-References:
-- Crystalanthemums
 Art Tags:
 - Jade
 - Becquerel
@@ -340,13 +338,12 @@ Commentary: |-
     I thought about drawing Vriska and Aradia, but somehow this song reminded me of Jade. I don't remember seeing much art of her and Bec so I thought I'd fix that!
 Cover Artists:
 - dodostad
+Referenced Tracks:
+- Crystalanthemums
 ---
 Track: The Ballad of Maplehoof
 Artist: Ian White, Lauren Collis, Mike Anderson
 Duration: '5:17'
-References:
-- track:pony-chorale
-- track:upward-movement-dave-owns
 Art Tags:
 - John
 - Rose
@@ -380,12 +377,13 @@ Commentary: |-
     I wrote these lyrics around the time that Maplehoof died in-story. I didn't put it to music though until after she had been revived as Minihoof. Kinda saps the poignancy right out of it. The lovely Lauren Collis sings vocals and the ever-punctual Mike Anderson provides the real life guitars. Sound effects provided by Mother Nature!
 Cover Artists:
 - Shoona
+Referenced Tracks:
+- track:pony-chorale
+- track:upward-movement-dave-owns
 ---
 Track: Rainbow Rebirth
 Artist: David Ellis
 Duration: '4:20'
-References:
-- Savior of the Waking World
 Art Tags:
 - Kanaya
 - 'cw: blood (abstract)'
@@ -400,17 +398,12 @@ Commentary: |-
     I saw the name Rainbow Rebirth and immediately wanted to do something cool with Kanaya and her fairly new rainbow drinker status, since I was pretty dang sure that was what the title was referencing. Since it was her care for the matriorb that led up to her transformation, I thought it made the most sense to include it, as well as rainbow colors, obviously, into this picture.
 Cover Artists:
 - Maddie Haines
+Referenced Tracks:
+- Savior of the Waking World
 ---
 Track: Psychedelic Psychodelic
 Artist: Catboss
 Duration: '4:54'
-References:
-- track:atomyk-ebonpyre
-- English
-- Liquid Negrocity
-- The Ballad of Jack Noir
-- Walk-Stab-Walk (R&E)
-- Let's All Rock the Heist
 Art Tags:
 - Jack Noir
 - Lord English
@@ -428,12 +421,17 @@ Commentary: |-
     Draw, Spades.
 Cover Artists:
 - Amethyst Barron
+Referenced Tracks:
+- track:atomyk-ebonpyre
+- English
+- Liquid Negrocity
+- The Ballad of Jack Noir
+- Walk-Stab-Walk (R&E)
+- Let's All Rock the Heist
 ---
 Track: Flare (With Vocals)
 Artist: horizon
 Duration: '3:02'
-References:
-- Flare
 Art Tags:
 - John
 - Rose
@@ -459,6 +457,8 @@ Commentary: |-
     I have been listening to Horizon's renditions of Homestuck music with her lyrics for a while now, and Flare has always been my favorite one she did. I hoped I could make a picture that represents the feeling of closeness beween the four kids in getting through the game that I feel in the words she wrote.
 Cover Artists:
 - PV
+Referenced Tracks:
+- Flare
 ---
 Track: Sports
 Artist: Jamie Paige Stanley
@@ -494,9 +494,6 @@ Cover Artists:
 Track: Electrocumulus
 Artist: Joe Ouellet
 Duration: '3:10'
-References:
-- Pyrocumulus (Kickstart)
-- Skaian Skuffle
 Art Tags:
 - John
 - WV
@@ -510,12 +507,13 @@ Commentary: |-
     The songs this was remixed from are associated with Skaia and the battlefield, but I thought that Electrocumulus was way too high energy and fun for something like that. I decided to go for the next best thing- John speeding through Skaia and plowing through clouds in his Dad's car! As it turns out, exploded clouds are also rpetty fun to cut out with a scalpel.
 Cover Artists:
 - plaidcushion
+Referenced Tracks:
+- Pyrocumulus (Kickstart)
+- Skaian Skuffle
 ---
 Track: Three in the Morning (Kali's 2 in the AM PM Edit)
 Artist: Kalibration
 Duration: '4:00'
-References:
-- track:three-in-the-morning-rj
 Art Tags:
 - Snowman
 - The Felt
@@ -530,15 +528,12 @@ Commentary: |-
     kali has such a way with words
 Cover Artists:
 - Toon Lettuce
+Referenced Tracks:
+- track:three-in-the-morning-rj
 ---
 Track: Showtime (End Strife Remix)
 Artist: Plumegeist
 Duration: '4:57'
-References:
-- track:showtime-original-mix
-- track:showtime-piano-refrain
-- track:sburban-jungle
-- track:i-dont-want-to-miss-a-thing
 Art Tags:
 - John
 URLs:
@@ -552,11 +547,14 @@ Commentary: |-
     Showtime has always been one of the most memorable pieces of music in Homestuck, forever representing a (if not the) quintiessential "strife" theme. With this in mind, I think I had almost too much freedom in choosing the conflict I wanted to depict in this piece. Initially, I was going to make it John vs. Dad from Act 1... but that ended up being a little too underwhelming in comparison to the song it was for. So, in the end, I settled upon focusing the piece on a determined-looking John about to face down the underling horde at the beginning of Cascade. I'm pretty happy with the end result.
 Cover Artists:
 - devonianecho
+Referenced Tracks:
+- track:showtime-original-mix
+- track:showtime-piano-refrain
+- track:sburban-jungle
+- track:i-dont-want-to-miss-a-thing
 ---
 Track: Soulb0t
 Artist: Charles Neudorf
-References:
-- psych0ruins
 Duration: '3:42'
 Art Tags:
 - Aradia
@@ -568,23 +566,12 @@ Commentary: |-
     Soulb0t was conceived after I tried writing the familiar Psych0ruins apreggio to test out a new synth I downloaded. It sounded really cool to me, so I figured "why not just write an electronic remix of Psych0ruins all together." So I did just that. It took a while to get the melody just right, and if it wasn't for the various friends who helped me to decide what sounded good or bad, this song wouldn't have sounded nearly as good.
 Cover Artists:
 - Somnivus
+Referenced Tracks:
+- psych0ruins
 ---
 Track: Fighting Spirit
 Artist: Kevin Grant
 Duration: '4:04'
-References:
-- track:doctor
-- track:showtime-original-mix
-- track:beatdown-strider-style
-- Pumpkin Cravings
-- track:chorale-for-jaspers
-- 'BL1ND JUST1C3 : 1NV3ST1G4T1ON !!'
-- track:atomyk-ebonpyre
-- Horschestra
-- track:MeGaLoVania
-- Spider's Claw
-- Walk-Stab-Walk (R&E)
-- Liquid Negrocity
 Art Tags:
 - John
 - Rose
@@ -600,15 +587,23 @@ Commentary: |-
     Listening to Fighting Spirit the first time kind of got me nostalgic for the old Strife pages, with their chiptune music. You know, waaaay back in the beginning of the comic when the Beta kids were still on planet Earth and were being harassed by trolls. So nearly a year later, I figured that a strife page would make for an excellent cover. Admittedly action poses have always been a weakness of mine, so I probably drew each kid at least twice for this cover until I was satisfied. Still though, I'm happy with how the art came out. Hopefully I did this awesome track justice.
 Cover Artists:
 - AS
+Referenced Tracks:
+- track:doctor
+- track:showtime-original-mix
+- track:beatdown-strider-style
+- Pumpkin Cravings
+- track:chorale-for-jaspers
+- 'BL1ND JUST1C3 : 1NV3ST1G4T1ON !!'
+- track:atomyk-ebonpyre
+- Horschestra
+- track:MeGaLoVania
+- Spider's Claw
+- Walk-Stab-Walk (R&E)
+- Liquid Negrocity
 ---
 Track: Irradiated
 Artist: Thomas Ibarra
 Duration: '2:21'
-References:
-- track:harlequin
-- Liquid Negrocity
-- track:sburban-jungle
-- Carefree Action
 Art Tags:
 - John
 - Jack Noir
@@ -623,14 +618,15 @@ Commentary: |-
     Irradiated is among the first Homestuck fanmusic tracks I ever heard, so I was very pleased to be able to create art to accompany it on LOFAM2. I decided to draw inspiration from AutoDevote's first HS fanimation, which to this day remains one of my favourite Homestuck videos. I'm not particularly apt at composition or shading or several other things, but I'm pretty happy with what I accomplished here.
 Cover Artists:
 - Spectrumfizz
+Referenced Tracks:
+- track:harlequin
+- Liquid Negrocity
+- track:sburban-jungle
+- Carefree Action
 ---
 Track: He Is Already Here
 Artist: Brenden Cameron
 Duration: '4:11'
-References:
-- Rhapsody in Green
-- English
-- track:sburban-jungle
 Art Tags:
 - AH
 - 'cw: blood'
@@ -646,18 +642,14 @@ Commentary: |-
     Thank you all for listening!
 Cover Artists:
 - clumsyroyalty
+Referenced Tracks:
+- Rhapsody in Green
+- English
+- track:sburban-jungle
 ---
 Track: Rise of the Denizens
 Artist: Domble
 Duration: '3:01'
-References:
-- Courser
-- Earthsea Borealis
-- track:upward-movement-dave-owns
-- track:ruins
-- Dawn of Man
-- the rose rap
-- Cascade
 Art Tags:
 - Jade
 - John
@@ -687,14 +679,18 @@ Commentary: |-
     Here is the full commentary to the rise of the denizens track art. c:
 Cover Artists:
 - Lunise
+Referenced Tracks:
+- Courser
+- Earthsea Borealis
+- track:upward-movement-dave-owns
+- track:ruins
+- Dawn of Man
+- the rose rap
+- Cascade
 ---
 Track: Sburban Genesis
 Artist: Lark Mordancy
 Duration: '4:00'
-References:
-- Dawn of Man
-- track:sburban-jungle
-- Exodus
 Art Tags:
 - Genesis Frog
 URLs:
@@ -707,13 +703,14 @@ Commentary: |-
     This really sounded like a night time kind of song to me, which I think went nicely with the baby frog Jade finds on her island as a kid. He's a pretty cute little guy, but his role carries a lot of weight, so I think he fits the song pretty well.
 Cover Artists:
 - plaidcushion
+Referenced Tracks:
+- Dawn of Man
+- track:sburban-jungle
+- Exodus
 ---
 Track: Who Mourns for Jack Noir?
 Artist: Nitrosparxx
 Duration: '7:21'
-References:
-- Liquid Negrocity
-- The Beginning of Something Really Excellent
 Art Tags:
 - Jade
 - Jack Noir
@@ -727,6 +724,9 @@ Commentary: |-
     Given the fact that the song references Jade's theme, I thought that I'd go with something that has to do with the characters' relationship. in the picture, I had originally intended Jade to be a sort-of ghost image, as if she wasn't really there. I wanted to show that Jack was alone, but I later changed that aspect, despite how much I loved the idea. Making her more faded created imbalance in the work, and the details were also washed out.
 Cover Artists:
 - Corrina
+Referenced Tracks:
+- Liquid Negrocity
+- The Beginning of Something Really Excellent
 ---
 Track: The Seer and the Tribesmen
 Artist: Thomas Ferkol
@@ -763,9 +763,6 @@ Cover Artists:
 Track: Prospitian Lullaby
 Artist: Jamie Paige Stanley
 Duration: '4:45'
-References:
-- Homestuck Anthem
-- track:sburban-jungle
 Art Tags:
 - Jane
 - Jake
@@ -779,15 +776,15 @@ Commentary: |-
     [END OF DISK 1]
 Cover Artists:
 - Shoona
+Referenced Tracks:
+- Homestuck Anthem
+- track:sburban-jungle
 ---
 Group: Disk 2
 ---
 Track: •~Disk 2~•
 Artist: Veritas Unae
 Duration: 0:20
-References:
-- White King
-- track:sburban-jungle
 Directory: disk2-lofam2
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/o-disk-2-o
@@ -802,13 +799,13 @@ Commentary: |-

 Cover Artists:
 - melodiousDiscord
+Referenced Tracks:
+- White King
+- track:sburban-jungle
 ---
 Track: Brofessor Layton (Every Puzzle Has A Brolution)
 Artist: Ian White
 Duration: '3:37'
-References:
-- GameBro (Original 1990 Mix)
-- Layton's Theme
 Art Tags:
 - Dave
 - Dave's bro
@@ -824,14 +821,13 @@ Commentary: |-
     Plus I wanted Bro in a nifty tophat and Dave in Lambda's snazzy sweater.
 Cover Artists:
 - doctoroftime
+Referenced Tracks:
+- GameBro (Original 1990 Mix)
+- Layton's Theme
 ---
 Track: ElecTrollCopSwing
 Artist: Astro Kid
 Duration: '4:17'
-References:
-- Revolution 909
-- Trollcops
-- Fuck tha Police
 Art Tags:
 - Dave
 - Karkat
@@ -847,47 +843,14 @@ Commentary: |-
     I was thinking that it would be in a speakeasy during the jazz era, and Terezi is there undercover to knock heads and bring the sweet taste of justice to miscreats and wrong-doers. Or something like that, heh heh.
 Cover Artists:
 - Rachel Weiss
+Referenced Tracks:
+- Revolution 909
+- Trollcops
+- Fuck tha Police
 ---
 Track: Dance-Stab-Dance
 Artist: Catboss
 Duration: '11:12'
-References:
-- MeGaDanceVaNia
-- Walk-Stab-Walk (R&E)
-- Time on My Side
-- Even in Death
-- Gaia Queen
-- track:endless-climb
-- Olive Rogue
-- track:ruins
-- Lotus
-- 'BL1ND JUST1C3 : 1NV3ST1G4T1ON !!'
-- track:chorale-for-jaspers
-- Another Jungle
-- Let's All Rock the Heist
-- Derse Dreamers
-- Carbon Nadsat / Cuestick Genius
-- Three in the Morning
-- Liquid Negrocity
-- track:under-the-hat
-- track:frost-vol6
-- Rex Duodecim Angelus
-- A Taste for Adventure
-- Infinity Mechanism
-- Ocean Stars Falling
-- Love You (Feferi's Theme)
-- track:ohgodwhat
-- Courser
-- Dance of Thorns
-- Unite Synchronization
-- track:upward-movement-dave-owns
-- Fly
-- track:vagabounce
-- Cascade (Beta)
-- Flare
-- Savior of the Dreaming Dead
-- Black Hole / Green Sun
-- At The Price of Oblivion
 Art Tags:
 - Jack Noir
 URLs:
@@ -944,6 +907,43 @@ Commentary: |-
     - 10:53 - [[At The Price of Oblivion]]
 Cover Artists:
 - Dawn Davis
+Referenced Tracks:
+- MeGaDanceVaNia
+- Walk-Stab-Walk (R&E)
+- Time on My Side
+- Even in Death
+- Gaia Queen
+- track:endless-climb
+- Olive Rogue
+- track:ruins
+- Lotus
+- 'BL1ND JUST1C3 : 1NV3ST1G4T1ON !!'
+- track:chorale-for-jaspers
+- Another Jungle
+- Let's All Rock the Heist
+- Derse Dreamers
+- Carbon Nadsat / Cuestick Genius
+- Three in the Morning
+- Liquid Negrocity
+- track:under-the-hat
+- track:frost-vol6
+- Rex Duodecim Angelus
+- A Taste for Adventure
+- Infinity Mechanism
+- Ocean Stars Falling
+- Love You (Feferi's Theme)
+- track:ohgodwhat
+- Courser
+- Dance of Thorns
+- Unite Synchronization
+- track:upward-movement-dave-owns
+- Fly
+- track:vagabounce
+- Cascade (Beta)
+- Flare
+- Savior of the Dreaming Dead
+- Black Hole / Green Sun
+- At The Price of Oblivion
 ---
 Track: Trapped
 Artist: Yan Rodriguez
@@ -962,10 +962,6 @@ Cover Artists:
 Track: Till The Last Breath
 Artist: Brenden Cameron
 Duration: '3:09'
-References:
-- track:showtime-original-mix
-- track:doctor
-- track:sburban-jungle
 Art Tags:
 - John
 URLs:
@@ -981,6 +977,10 @@ Commentary: |-
     This shows little John asking his older self if they saved Dad from the game. I wanted to reflect some inner workings in John's mind, he still thinks about his only family rather than simply drawing him as powerful and never giving up like in most pictures.
 Cover Artists:
 - Racheme
+Referenced Tracks:
+- track:showtime-original-mix
+- track:doctor
+- track:sburban-jungle
 ---
 Track: The Note Desolation Plays
 Artist: Max Wright
@@ -1002,9 +1002,6 @@ Cover Artists:
 Track: I'm The Doctor
 Artist: Veritas Unae
 Duration: '2:06'
-References:
-- track:doctor
-- Doctor Who Theme
 Art Tags:
 - Doc Scratch
 - Rose
@@ -1017,6 +1014,9 @@ Commentary: |-
     I recall this was primiarily composed for two reasons. One: Combining the Doctor Who theme with Doctor needed to happen. Two: The Doctor Who Sburb fan adventure was something I had just discovered and I wanted to compose something for it. There's not much to be said about this one. It's Doctor + Doctor Who Theme. Yeah.
 Cover Artists:
 - Strideer
+Referenced Tracks:
+- track:doctor
+- Doctor Who Theme
 ---
 Track: Wind In My Heir
 Artist: Joe Ouellet
@@ -1035,7 +1035,19 @@ Cover Artists:
 Track: Fighting Spirit ~Second Form~
 Artist: Kevin Grant
 Duration: '4:22'
-References:
+Art Tags:
+- Dirk
+- Sawtooth
+- Squarewave
+URLs:
+- https://unofficialmspafans.bandcamp.com/track/fighting-spirit-second-form
+- https://youtu.be/gX4RAeGIDEM
+Commentary: |-
+    <i>Kevin Grant:</i>
+    With 16 songs included in the mashup, it's a far mroe complicated piece than the original. I tried to include many songs from Volume 8, like the Ocean Stars Falling bit near the end. I think it flows smoother than the original due to both song choice, and the one-year difference in skill level when creating the song. Both are made entirely in Famitracker.
+Cover Artists:
+- sketchcomplex
+Referenced Tracks:
 - track:upward-movement-dave-owns
 - track:endless-climb
 - track:showtime-original-mix
@@ -1052,18 +1064,6 @@ References:
 - Ocean Stars
 - Homestuck Anthem
 - How Do I Live
-Art Tags:
-- Dirk
-- Sawtooth
-- Squarewave
-URLs:
-- https://unofficialmspafans.bandcamp.com/track/fighting-spirit-second-form
-- https://youtu.be/gX4RAeGIDEM
-Commentary: |-
-    <i>Kevin Grant:</i>
-    With 16 songs included in the mashup, it's a far mroe complicated piece than the original. I tried to include many songs from Volume 8, like the Ocean Stars Falling bit near the end. I think it flows smoother than the original due to both song choice, and the one-year difference in skill level when creating the song. Both are made entirely in Famitracker.
-Cover Artists:
-- sketchcomplex
 ---
 Track: Corkscrew Sundown
 Artist: Trent West
@@ -1083,10 +1083,6 @@ Cover Artists:
 Track: Doghead
 Artist: Willow Ascenzo, D. Crystal
 Duration: '3:19'
-References:
-- track:chorale-for-jaspers
-- track:sburban-jungle
-- Carefree Action
 Art Tags:
 - Jade
 URLs:
@@ -1097,6 +1093,10 @@ Commentary: |-
     I got the idea for "Doghead" shortly after "Cascade" and Jade's incredible ascension. I set out to create something epic, fast-paced, and exciting, but once I'd finished the first part, I found it was missing something. So I approached MSPA forumite and fellow Homestuck fan musician D. Crystal to see if he could add some guitar and drum tracks. He was happy to oblige, and the end result turned out much better than the work I could do by myself. I learned two lessons that one day: one, that two heads are better than one and collaboration is incredibly fun, and two, that electric guitars make everything better.
 Cover Artists:
 - albel-is-mine
+Referenced Tracks:
+- track:chorale-for-jaspers
+- track:sburban-jungle
+- Carefree Action
 ---
 Track: Jane's Theme
 Artist: David Dycus
@@ -1118,14 +1118,6 @@ Cover Artists:
 Track: The Four Thrones
 Artist: Samm Neiland
 Duration: '5:15'
-References:
-- track:sburban-jungle
-- track:showtime-original-mix
-- track:endless-climb
-- track:doctor
-- track:upward-movement-dave-owns
-- Homestuck Anthem
-- track:dissension-original
 Art Tags:
 - John
 - Rose
@@ -1142,6 +1134,14 @@ Commentary: |-
     I wanted to represent the beta kids reaching their godtier status while mixing in the royalty theme that Samm's song gave me. Samm said to me himself that he thought of the crowning scene in Narnia and the four thrones, and I thought it was suitable to represent them with crowns, holding the Skaia they influenced and looking content and almost relieved in each other's company. I wanted to create something happy and a little bitter-sweet, which was the feeling I got from Samm's track. And I wanted to show that sort of unity and friendship the kids have, even after all they've been through.
 Cover Artists:
 - Reid Slater
+Referenced Tracks:
+- track:sburban-jungle
+- track:showtime-original-mix
+- track:endless-climb
+- track:doctor
+- track:upward-movement-dave-owns
+- Homestuck Anthem
+- track:dissension-original
 ---
 Track: Jade Aubade
 Artist: Trent West
@@ -1192,8 +1192,6 @@ Cover Artists:
 Track: Red Miles
 Artist: David Dycus
 Duration: '2:25'
-References:
-- track:sburban-jungle
 Directory: red-miles-lofam2
 Art Tags:
 - Jack Noir
@@ -1208,12 +1206,12 @@ Commentary: |-
     A year and a half later, Red Miles definitely sounds like a first attempt. My only objective was to try to make the most over-the-top, attention-grabbing chiptune-metal song I could muster, so I threw in every trope I knew: the pipe organ, the wall of 8-bit synths, the Inferno electric guitar patch, and the Sburban Jungle motif (which I would use many, many more times). It may have been a bit much, but it was a necessary first step.
 Cover Artists:
 - Amethyst Barron
+Referenced Tracks:
+- track:sburban-jungle
 ---
 Track: Elegy for a Thief (Dreamscape Remix)
 Artist: Willow Ascenzo
 Duration: '1:48'
-References:
-- Spider's Claw
 Art Tags:
 - Vriska
 URLs:
@@ -1227,6 +1225,8 @@ Commentary: |-
     Now imagine my surprise when I heard that Ascenzo later remixed the song and made it like 16,777,216 times cooler.
 Cover Artists:
 - Cap
+Referenced Tracks:
+- Spider's Claw
 ---
 Track: We Won't Wander Alone
 Artist: Land of Ships and Music
@@ -1267,9 +1267,6 @@ Cover Artists:
 Track: Ye Flarey Gentlemen
 Artist: Clark Powell
 Duration: '2:46'
-References:
-- Flare
-- God Rest You Merry, Gentlemen
 Art Tags:
 - Aradia
 - Sollux
@@ -1284,6 +1281,9 @@ Commentary: |-
     this entire album was a joke at clark's expense
 Cover Artists:
 - Dawn Davis
+Referenced Tracks:
+- Flare
+- God Rest You Merry, Gentlemen
 ---
 Track: Finale Strife
 Artist: Willow Ascenzo
@@ -1323,8 +1323,6 @@ Cover Artists:
 ---
 Track: Joy And Dreams Eternal
 Artist: Malcolm Brown
-References:
-- track:ballad-of-awakening
 Duration: '2:45'
 Art Tags:
 - Jade
@@ -1336,6 +1334,8 @@ Commentary: |-
     When I first heard this song, I got this sense of... I guess you could call it grand scale? Glorious grandscaliness? No wait that is dumb. I wanted to do something that captured that feeling, and it made me think of the panel where we see Prospit rising over the towers of the moon, and I could just imagine Jade flying around and marvelling at this amazing view. I hope I did the song justice!
 Cover Artists:
 - Fitzwibble
+Referenced Tracks:
+- track:ballad-of-awakening
 ---
 Track: Guns Blazing
 Artist: Catboss
@@ -1356,8 +1356,6 @@ Cover Artists:
 Track: Showtime (Svix Mix)
 Artist: Svix
 Duration: '2:51'
-References:
-- track:showtime-original-mix
 Art Tags:
 - John
 - John's dad
@@ -1372,6 +1370,8 @@ Commentary: |-
     To fit a remix of one of my favorite Homestuck themes, I wanted to make the Strife scene between Dad and John in my own style, while still holding somewhat true to the original. A remix of the art as well as the song.
 Cover Artists:
 - PV
+Referenced Tracks:
+- track:showtime-original-mix
 ---
 Track: Ugly Story
 Artist: PhemieC
@@ -1438,11 +1438,6 @@ Cover Artists:
 Track: Ave Dei Novi
 Artist: Willow Ascenzo
 Duration: '3:48'
-References:
-- track:doctor
-- track:dissension-original
-- track:aggrieve
-- track:atomyk-ebonpyre
 Art Tags:
 - Jade
 URLs:
@@ -1457,6 +1452,11 @@ Commentary: |-
     this song was originally titled "ascension", but there was to be another song on lofam2 with a similar title ("god tier ascension") (except now there isn't) so wmm changed it to"ave dei novi" which translates to "hail the new gods"
 Cover Artists:
 - xkoraxayomex
+Referenced Tracks:
+- track:doctor
+- track:dissension-original
+- track:aggrieve
+- track:atomyk-ebonpyre
 ---
 Track: Nevermore (Can't Sleep, Crows Will Find Me)
 Artist: Thomas Ferkol
@@ -1479,8 +1479,6 @@ Cover Artists:
 Track: Prophecy
 Artist: David Dycus
 Duration: '2:26'
-References:
-- Penumbra Phantasm
 Art Tags:
 - Rose
 - Horrorterrors
@@ -1492,19 +1490,14 @@ Commentary: |-
     Prophecy was made in February of 2011, a couple of months after I re-installed FL Studio. [[Umbral Ultimatum]] remains one of my favorite HS songs, and I wanted to do something in 3/4 time using the opening melody. The song's development is kind of a blur to me now, I was busy with work and was experiencing some anxiety problems, and threw the song together over a two or three-day period, but it obviously took a very dark turn somewhere along the way. Whatever happened, I'm still pretty pleased with how it turned out.
 Cover Artists:
 - Daysi
+Referenced Tracks:
+- Penumbra Phantasm
 ---
 Track: The Dance of Oblivion
 Artist: Domble
 Duration: '3:10'
 Art Tags:
 - Rose
-References:
-- At The Price of Oblivion
-- Rex Duodecim Angelus
-- Dance of Thorns
-- track:sburban-jungle
-- An Unbreakable Union
-- track:mutiny
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/the-dance-of-oblivion
 - https://youtu.be/dw9fX9Z6jK4
@@ -1514,6 +1507,13 @@ Commentary: |-
     Oh and the title makes me think of The Dance of Eternity by Dream Theater which is a really cool song.
 Cover Artists:
 - piskomil
+Referenced Tracks:
+- At The Price of Oblivion
+- Rex Duodecim Angelus
+- Dance of Thorns
+- track:sburban-jungle
+- An Unbreakable Union
+- track:mutiny
 ---
 Track: Alphamatic Replacement
 Artist: Xauric
diff --git a/album/lofam3.yaml b/album/lofam3.yaml
index ad507431..d117aac1 100644
--- a/album/lofam3.yaml
+++ b/album/lofam3.yaml
@@ -1,7 +1,5 @@
 Album: Land of Fans and Music 3
 Directory: lofam3
-Banner Art:
-- Lunise
 Banner Dimensions: 1100x203
 Date: December 15, 2013
 Date Added: March 16, 2020
@@ -32,19 +30,21 @@ Commentary: |-
     <b>-INSPIRATION-</b><br>Andrew Hussie &amp; What Pumpkin Studios<br>The Homestuck Music Team<br>The Homestuck Fan Musicians
 Cover Artists:
 - Quietserval
+Banner Artists:
+- Lunise
 ---
 Group: Disk 1
 ---
 Track: ˚ Disk 1 ˚
 Artist: Veritas Unae
 Duration: 0:24
-References:
-- Violet and Gold
 Directory: disk1-lofam3
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/disk-1-2
 - https://youtu.be/o3cpnDkAhFY
 Has Cover Art: false
+Referenced Tracks:
+- Violet and Gold
 ---
 Track: The Delicate Art of Temporal Manipulation
 Artist: Eston Schweickart
@@ -93,8 +93,6 @@ Art Tags:
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/planet-cracker
 - https://youtu.be/2RXMevfxCPg
-References:
-- Sunsetter
 Commentary: |-
     <i>Colin Stanfill:</i>
     I wrote this song as an art exchange for redux on the forums who wanted more sunsetter remixes.
@@ -102,6 +100,8 @@ Commentary: |-
     When I first saw the track's name on its own I thought of Caliborn's planet quest, but I thought this song was too upbeat for that, so I went with a Derse and Prospit's moons exploding and the Alphas reaching godtier. I really enjoyed drawing Jake and Jane's face. Drawing Derse and Prospit was quite the challenge but I hope I managed something recognizable! I tried to include some pixely elements and most of the godtier update (unfortunately I couldn't find a place for Jake's crotch but hey we all know why he's so shocked).
 Cover Artists:
 - awakesleeping
+Referenced Tracks:
+- Sunsetter
 ---
 Track: I'm Not a Hero
 Artist: Robyo
@@ -111,8 +111,6 @@ Art Tags:
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/im-not-a-hero
 - https://youtu.be/2PBxH568OIE
-References:
-- track:upward-movement-dave-owns
 Commentary: |-
     <i><b>Brad Griffin:</b></i>
     Ok so no art OR musician commentary for this page.
@@ -121,6 +119,8 @@ Commentary: |-
     John is the hero. (See [[track:youre-the-hero-its-you|track 19]].)
 Cover Artists:
 - infinitymechanism
+Referenced Tracks:
+- track:upward-movement-dave-owns
 ---
 Track: confinis
 Artist: horizon
@@ -152,7 +152,18 @@ Art Tags:
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/emissary-of-dance
 - https://youtu.be/G4qa1mTNYrc
-References:
+Commentary: |-
+    <i>Catboss:</i>
+    This is more of a MGDVN 2.5 than a 3, really. After DSD I was all, okay I'm tapped out of official Homestuck songs, what now?
+    Fanmusic. Fanmusic is what.
+    This song is essentially a lov letter to the huge, burgeoning, and pretty much excellent fanmusic community. There is so much creativity and talent there it is pretty ridiculous?? Also, I would probably never have gotten any of my stuff online if it wasn't for the community's support so basically you guys are awesome.
+    now the hard part
+    Quotes songs by... *deep breath*
+    eston"silence"schweickartbradgriffin(avinoch)malcolmbrown paultuttlestarclarkpowellcahrles"crazy-8"neudorfwillascenzo firstturnfoldkeral.joneserik"jit"scheele kristian"dacen"andersonnicksmalleymichaelguybowman... *puff* *wheeze*
+    <small>...brenna"randomencounter"curranyan"nucleose"rodriguezmarcynabors(shadolith) sammneilandmax"imbrog"wrightgecdavidkorobert"kali"blaker paige"hrmnzr"<small>stanleysinisterpsycheian"myusernamesmud"white toby"radiatio<small>n"foxveritasunaeda<small>vid"dirtiest"dycus teamdogfightdavidellis(alunatic'sda</small>ydream)demographerist</small></small></small>
+Cover Artists:
+- Phil Gibson
+Referenced Tracks:
 - Emissary of Wind
 - Rabbunctious!
 - Anbroids V2.0
@@ -188,24 +199,10 @@ References:
 - Dogfight
 - Cyan Beast
 - White King
-Commentary: |-
-    <i>Catboss:</i>
-    This is more of a MGDVN 2.5 than a 3, really. After DSD I was all, okay I'm tapped out of official Homestuck songs, what now?
-    Fanmusic. Fanmusic is what.
-    This song is essentially a lov letter to the huge, burgeoning, and pretty much excellent fanmusic community. There is so much creativity and talent there it is pretty ridiculous?? Also, I would probably never have gotten any of my stuff online if it wasn't for the community's support so basically you guys are awesome.
-    now the hard part
-    Quotes songs by... *deep breath*
-    eston"silence"schweickartbradgriffin(avinoch)malcolmbrown paultuttlestarclarkpowellcahrles"crazy-8"neudorfwillascenzo firstturnfoldkeral.joneserik"jit"scheele kristian"dacen"andersonnicksmalleymichaelguybowman... *puff* *wheeze*
-    <small>...brenna"randomencounter"curranyan"nucleose"rodriguezmarcynabors(shadolith) sammneilandmax"imbrog"wrightgecdavidkorobert"kali"blaker paige"hrmnzr"<small>stanleysinisterpsycheian"myusernamesmud"white toby"radiatio<small>n"foxveritasunaeda<small>vid"dirtiest"dycus teamdogfightdavidellis(alunatic'sda</small>ydream)demographerist</small></small></small>
-Cover Artists:
-- Phil Gibson
 ---
 Track: Dance of Viridian and Violet
 Artist: Willow Ascenzo
 Duration: '3:13'
-References:
-- Dance of Thorns
-- track:endless-climb
 Art Tags:
 - Rose
 - Kanaya
@@ -220,12 +217,13 @@ Commentary: |-
     This was a piece where I had the concept from day one. I knew that the piece ought to be ballet-inspired, given the prompt. Grimdark Rose and Kanpire were aesthetic choices - I wanted their duet to be balanced, with neither one taking the background role, and the duality suited the theme nicely.
 Cover Artists:
 - rosesarecrimson
+Referenced Tracks:
+- Dance of Thorns
+- track:endless-climb
 ---
 Track: Warweary Villein
 Artist: Dakota Medina
 Duration: '1:09'
-References:
-- Mayor Maynot
 Art Tags:
 - WV
 URLs:
@@ -243,12 +241,12 @@ Commentary: |-
     He's on a walk with his citizen-cans. They're having a lot of fun if you couldn't tell.
 Cover Artists:
 - piskomil
+Referenced Tracks:
+- Mayor Maynot
 ---
 Track: Thermporia
 Artist: Yan Rodriguez
 Duration: '2:50'
-References:
-- track:atomyk-ebonpyre
 Art Tags:
 - Dave
 URLs:
@@ -264,13 +262,12 @@ Commentary: |-
     no, but really, SOO GOOOOD
 Cover Artists:
 - insecureIllustrator
+Referenced Tracks:
+- track:atomyk-ebonpyre
 ---
 Track: 720413
 Artist: Lark Mordancy
 Duration: '3:18'
-References:
-- track:sburban-jungle
-- 69423
 Art Tags:
 - John
 - Rose
@@ -290,6 +287,9 @@ Commentary: |-
     This music gave me a ton of inspiration for the track art but I ahd to draw a lot of different things and concepts before I actually came down to what I really wanted. For starters, Sburban Jungle has always been the music that kick started the game for the kids. For a beautiful track like this I felt the need to be a bit more abstract, so as the kids rise up, they bleed this colourful and glitchy glitter and the image itself follows the sequence of the Zodiac Signs (Trolls amde the kids), Green Spirograph (Beta Kids session) and the game reset which amde the Sburb logo red (Alpha kids session).
 Cover Artists:
 - sayachan-art
+Referenced Tracks:
+- track:sburban-jungle
+- 69423
 ---
 Track: March of the Aluminum Soldiers
 Artist: Ian White
@@ -360,8 +360,6 @@ Cover Artists:
 Track: Sgrubian Wilderness
 Artist: Veritas Unae
 Duration: '2:31'
-References:
-- track:sburban-jungle
 Art Tags:
 - Karkat
 URLs:
@@ -374,6 +372,8 @@ Commentary: |-
     Karkat furiously playing the marinba ostinato.
 Cover Artists:
 - Brad Griffin
+Referenced Tracks:
+- track:sburban-jungle
 ---
 Track: Medium
 Artist: Arzenic
@@ -494,8 +494,6 @@ Cover Artists:
 ---
 Track: Courtroom Shuffle
 Artist: Nitrosparxx
-References:
-- Terezi's Theme
 Duration: '3:00'
 Art Tags:
 - Terezi
@@ -515,15 +513,12 @@ Commentary: |-
     This track was actually slated to be on LOFAM 2 originally, but got pushed back for some reason or other. This art's been around since then. Very dramatic.
 Cover Artists:
 - Elanor Pam
+Referenced Tracks:
+- Terezi's Theme
 ---
 Track: Waveform
 Artist: ndividedbyzero
 Duration: '3:07'
-References:
-- Trepidation
-- track:upward-movement-dave-owns
-- Negative Aperture
-- Miasmajesty
 Art Tags:
 - Squarewave
 - Sawtooth
@@ -538,19 +533,15 @@ Commentary: |-
     This picture started out digitally as an attempt to imitate N's original placeholder, but I had to restart it when the pen on my tablet wore down. Because I am more comfortable with physical media, the piece was free to go in more interesting directions. I feel digital art is better suited to applications like music art, so I added distinctly digital colors.
 Cover Artists:
 - Yorick Cobb
+Referenced Tracks:
+- Trepidation
+- track:upward-movement-dave-owns
+- Negative Aperture
+- Miasmajesty
 ---
 Track: Maidswap
 Artist: Ashley Jones
 Duration: '5:06'
-References:
-- Havoc
-- Fuchsia Ruler
-- 0
-- Ugly Betty
-- --Emperical
-- Rust Servant
-- The Lost Child
-- English
 Art Tags:
 - The Handmaid
 - The Condesce
@@ -564,6 +555,15 @@ Commentary: |-
     All of Scarodactyl's art was actually slightly smaller than the resolution I used for this booklet. Hopefully upscaling it didn't ruin the pixels too much.
 Cover Artists:
 - Scarodactyl
+Referenced Tracks:
+- Havoc
+- Fuchsia Ruler
+- 0
+- Ugly Betty
+- --Emperical
+- Rust Servant
+- The Lost Child
+- English
 ---
 Track: Sleepy Eyes of Derse
 Artist: Colin Stanfill
@@ -584,8 +584,6 @@ Cover Artists:
 Track: Sign of the Scorpion
 Artist: Willow Ascenzo
 Duration: '3:05'
-References:
-- Spider's Claw
 Art Tags:
 - Vriska
 URLs:
@@ -598,14 +596,14 @@ Commentary: |-
     I did a track art for one of Ascenzo's songs back in LOFAM2 as well and also the art for [[Rust Apocalypse]]. So, when I saw two songs by them on the available songs for track art, I couldn't really help myself. Their songs are great. I know you like it, I can tell. Hope the track art seems suitable, and that you'll enjoy that as well. I have nothing else to say on the matter. That's it.
 Cover Artists:
 - Ducky Senpai
+Referenced Tracks:
+- Spider's Claw
 ---
 Track: Aqueous Armagourddon
 Artist: Brad Griffin
 Contributors:
 - Malcolm Brown (with regards to)
 Duration: '2:00'
-References:
-- Pumpkin Party in Sea Hitler's Water Apocalypse
 Art Tags:
 - Roxy
 URLs:
@@ -619,6 +617,8 @@ Commentary: |-
     I loved the sound of this song but had a hard time figuring out what to draw for it, but whenever in doubt draw a sad Roxy inside a pumpkin.
 Cover Artists:
 - dodostad
+Referenced Tracks:
+- Pumpkin Party in Sea Hitler's Water Apocalypse
 ---
 Track: Fortune Healer
 Artist: Joe Ouellet
@@ -671,11 +671,6 @@ Duration: '3:34'
 Art Tags:
 - Roxy
 - Dirk
-References:
-- Unite Synchronization
-- Space Jam
-- GameBro (Original 1990 Mix)
-- GameGrl (Original 1993 Mix)
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/theme-of-the-slam-jam
 - https://youtu.be/ESHQd9oIr3Q
@@ -687,6 +682,11 @@ Commentary: |-
     This is simultaneously the best and stupidest thing I have ever created. Thank goodness for the 90's.
 Cover Artists:
 - plaidcushion
+Referenced Tracks:
+- Unite Synchronization
+- Space Jam
+- GameBro (Original 1990 Mix)
+- GameGrl (Original 1993 Mix)
 ---
 Track: JOHN DO THE WINDY THING
 Artist: Robert J! Lake
@@ -713,8 +713,6 @@ Track: ˚ Disk 2 ˚
 Directory: disk2-lofam3
 Artist: Veritas Unae
 Duration: 0:11
-References:
-- Eden
 Art Tags:
 - John
 - Rose
@@ -736,25 +734,12 @@ Commentary: |-
     -Avinoch
 Cover Artists:
 - Elanor Pam
+Referenced Tracks:
+- Eden
 ---
 Track: Garden of Eden (Part 1)
 Artist: Veritas Unae, David Ellis
 Duration: '8:15'
-References:
-- Eden
-- psych0ruins
-- track:doctor
-- Savior of the Dreaming Dead
-- track:sburban-jungle
-- track:growing-up
-- Flare
-- track:showtime-piano-refrain
-- Heir Conditioning
-- Dawn of Man
-- Cascade (Beta)
-- Liquid Negrocity
-- track:ruins
-- Black Rose / Green Sun
 Art Tags:
 - John
 - Jane
@@ -770,11 +755,31 @@ Commentary: |-
     scoot did piano<br>i drew piano
 Cover Artists:
 - azuzatori
+Referenced Tracks:
+- Eden
+- psych0ruins
+- track:doctor
+- Savior of the Dreaming Dead
+- track:sburban-jungle
+- track:growing-up
+- Flare
+- track:showtime-piano-refrain
+- Heir Conditioning
+- Dawn of Man
+- Cascade (Beta)
+- Liquid Negrocity
+- track:ruins
+- Black Rose / Green Sun
 ---
 Track: Garden of Eden (Part 2)
 Artist: Veritas Unae, David Ellis
 Duration: '10:39'
-References:
+URLs:
+- https://unofficialmspafans.bandcamp.com/track/garden-of-eden-part-2
+- https://youtu.be/S9qynPjh44o
+Cover Artists:
+- azuzatori
+Referenced Tracks:
 - Garden of Eden (Part 1)
 - Crystalanthemums
 - October
@@ -793,19 +798,10 @@ References:
 - Homestuck Anthem
 - Theme
 - Mother (Piano)
-URLs:
-- https://unofficialmspafans.bandcamp.com/track/garden-of-eden-part-2
-- https://youtu.be/S9qynPjh44o
-Cover Artists:
-- azuzatori
 ---
 Track: Electric Fireflies
 Artist: Thomas Ibarra
 Duration: '3:39'
-References:
-- Firefly Cloud
-- track:doctor
-- track:showtime-original-mix
 Art Tags:
 - Calliope
 - John
@@ -827,6 +823,10 @@ Commentary: |-
     MY WORKSPACE TABLET IS INCREDIBLY SHITTY I AM SO SORRY CALLIE DESERVED BETTER THAN THIS also I actually forgot about Dirk's sword and only noticed it when I was about to post haha whoops
 Cover Artists:
 - Elanor Pam
+Referenced Tracks:
+- Firefly Cloud
+- track:doctor
+- track:showtime-original-mix
 ---
 Track: The Blast
 Artist: Dakota Medina
@@ -872,8 +872,6 @@ Cover Artists:
 Track: Run-Stab-Run
 Artist: Yan Rodriguez
 Duration: '2:11'
-References:
-- Walk-Stab-Walk (R&E)
 Art Tags:
 - Jack Noir
 - Underlings
@@ -888,13 +886,13 @@ Commentary: |-
     Slick strut!
 Cover Artists:
 - Amethyst Barron
+Referenced Tracks:
+- Walk-Stab-Walk (R&E)
 ---
 Track: Tombs & Krypton
 Directory: tombs-and-krypton
 Artist: Rob Little
 Duration: '2:46'
-References:
-- track:ruins
 Art Tags:
 - Dirk
 URLs:
@@ -907,6 +905,8 @@ Commentary: |-
     I was beyond excited to get to be part of another fan album, especially to be drawing for a song connected to Dirk's planet, since he's one of my absolute favorite characters. Every kid/troll's planet reflects them and also challenges them at the same time. LOTAK is one of the more dangerous planets, with its constant raging lightning storms and the most powerful denizen at its center, fitting for Dirk who is a determined, skilled fighter. The planet is also a contrast, a planet full of tall buildings for someone who grew up in an ocean surrounded by nothing. I really wanted to show LOTAK as an extension, or part of, DIrk himself. The song itself gives a sense of floating, or as the musi artist said themselves, a very spacey feeling, so I tried to capture this as well, with the overview shot of the planet that Dirk appears to be floating over. I hope that others who look at my piece will feel I managed to pictuer the song well in my drawing for it.
 Cover Artists:
 - fueledbyanimation
+Referenced Tracks:
+- track:ruins
 ---
 Track: Contention
 Artist: Marcy Nabors
@@ -928,8 +928,6 @@ Cover Artists:
 Track: Slick Snow
 Artist: Eston Schweickart
 Duration: '1:16'
-References:
-- Three in the Morning
 Art Tags:
 - Snowman
 - Jack Noir
@@ -943,12 +941,12 @@ Commentary: |-
     Ooh, complex rhythm. Jazzy.
 Cover Artists:
 - Elanor Pam
+Referenced Tracks:
+- Three in the Morning
 ---
 Track: Sord.....
 Artist: Team Dogfight
 Duration: '1:25'
-References:
-- Flare
 Art Tags:
 - SBaHJ
 URLs:
@@ -963,17 +961,12 @@ Commentary: |-
     "i don't usually make art<br>........................but when i do, it's for a sbahj track."
 Cover Artists:
 - Veritas Unae
+Referenced Tracks:
+- Flare
 ---
 Track: The Demon and the Alien
 Artist: Veritas Unae, David Ellis
 Duration: '3:49'
-References:
-- Liquid Negrocity
-- track:MeGaLoVania
-- psych0ruins
-- track:sburban-jungle
-- Penumbra Phantasm
-- Final Stand
 Art Tags:
 - Aradia
 - Jack Noir
@@ -989,14 +982,17 @@ Commentary: |-
     Since Aradia came back to life she's been entertaining nuts, and I had this image of her sitting with a calm smile on her face while Jack is trapped and PISSED. I thought it would be fun since Aradia takes everything so in stride, and when she first becomes God Tier she freezes Jack mere seconds before he kills her, with a big smile on her face and no worries. I wanted to go with something like this, Jack being trapped in 'time' and Aradia sitting by sweetly.
 Cover Artists:
 - laroone
+Referenced Tracks:
+- Liquid Negrocity
+- track:MeGaLoVania
+- psych0ruins
+- track:sburban-jungle
+- Penumbra Phantasm
+- Final Stand
 ---
 Track: Party of Three
 Artist: Cullen Lawson, Joe Ouellet
 Duration: '3:22'
-References:
-- Three's a Crowd
-- Carbon Nadsat / Cuestick Genius
-- Liquid Negrocity
 Art Tags:
 - DD
 URLs:
@@ -1011,12 +1007,14 @@ Commentary: |-
     I wanted to go with a simple but striking design that worked on two levels: the large diamond with the grey layers, which looks good as a thumbnail on a small ipod screen or similar, and the silhouetted shadowy type DDs that are more apparent when you view the art at full size. I'm really happy with how well it worked out!
 Cover Artists:
 - plaidcushion
+Referenced Tracks:
+- Three's a Crowd
+- Carbon Nadsat / Cuestick Genius
+- Liquid Negrocity
 ---
 Track: Invertebrate
 Artist: Astro Kid
 Duration: '3:15'
-References:
-- Tentacles
 Art Tags:
 - Squiddles
 URLs:
@@ -1029,6 +1027,8 @@ Commentary: |-
     SQUIDDLES
 Cover Artists:
 - dodostad
+Referenced Tracks:
+- Tentacles
 ---
 Track: timaeusAmplified
 Artist: Shandy
@@ -1047,8 +1047,6 @@ Cover Artists:
 Track: Scabbard
 Artist: Yan Rodriguez
 Duration: '2:06'
-References:
-- Unsheath'd
 Art Tags:
 - The Condesce
 URLs:
@@ -1061,17 +1059,14 @@ Commentary: |-
     Pretty sure this is one of them Pisces trolls. Not sure why it is called Scabbard.
 Cover Artists:
 - batteravesucriere
+Referenced Tracks:
+- Unsheath'd
 ---
 Track: Sketches in Black
 Artist: Kevin Grant
 Duration: '2:13'
 Art Tags:
 - Jack Noir
-References:
-- It Don't Mean a Thing (If It Ain't Got That Swing)
-- Paint It, Black
-- Liquid Negrocity
-- Horschestra
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/sketches-in-black
 - https://youtu.be/V83XZ-cyxuM
@@ -1083,6 +1078,11 @@ Commentary: |-
     Great perspective work on the art.
 Cover Artists:
 - queenoftheantz
+Referenced Tracks:
+- It Don't Mean a Thing (If It Ain't Got That Swing)
+- Paint It, Black
+- Liquid Negrocity
+- Horschestra
 ---
 Track: Together (At Last)
 Artist: Joe Ouellet
@@ -1106,9 +1106,6 @@ Cover Artists:
 Track: INFIDELS!
 Artist: David Ellis
 Duration: '4:14'
-References:
-- Iron Infidel
-- Spider's Claw
 Art Tags:
 - The Signless
 - The Psiioniic
@@ -1124,6 +1121,9 @@ Commentary: |-
     Let's be 100% clear here, I freaking love prog rock, so I was pretty pumped listening to this tune over and over while drawing this one. Every piece of track art I've done for this album has been a little different. This one was the easiest to do and only took an hour because this kind of inked comic book art is my bread and butter. I felt that something bold and comic bookish would fit well since it has that epic kind of scope prog rock gets across. Remember how in the eighties the X-men seemed to spend most of their time in space participating in Space Opera stuff? I wanted to do something like that.
 Cover Artists:
 - Kate Holden
+Referenced Tracks:
+- Iron Infidel
+- Spider's Claw
 ---
 Track: Forest Fire
 Artist: Brad Griffin
@@ -1131,9 +1131,6 @@ Contributors:
 - Solatrus (with regards to)
 - Clark Powell (with regards to)
 Duration: '2:42'
-References:
-- Heart of the Forest
-- Flare
 Art Tags:
 - Rose
 - Green Sun
@@ -1148,12 +1145,13 @@ Commentary: |-
     This song takes me back to when Rose was trying to escape her impending doom and get into the game and then when hearing Flare I find myself thinking about the tumor, its countdown, her death and ascension and it makes me realize how much she has grown. So, what I tried to imply with this cover is how that fire she was trying to evade eventually became the flames of the green sun where she accepted her fate and arose anew.
 Cover Artists:
 - sayachan-art
+Referenced Tracks:
+- Heart of the Forest
+- Flare
 ---
 Track: RetroBution (ohgodwhy Remix)
 Artist: Astro Kid
 Duration: '4:02'
-References:
-- Retrobution
 Art Tags:
 - Dirk
 - Aranea
@@ -1168,6 +1166,8 @@ Commentary: |-
     I had been wanting to make a full set of functional, repearing titles anyway for use in maybe making a simple platforme,r so I decided to make use of them and create a sort of "If mspa was a game in the 16 bit era" thing. The spirtes were also an excellent opportunity to test out the sprite base I've been working on making from scratch.
 Cover Artists:
 - Kate Holden
+Referenced Tracks:
+- Retrobution
 ---
 Track: Insomniac
 Artist: Princey The Kid
@@ -1209,8 +1209,6 @@ Cover Artists:
 Track: Maid in Spades
 Artist: Max Wright
 Duration: '2:01'
-References:
-- Rust Servant
 Art Tags:
 - The Handmaid
 URLs:
@@ -1225,12 +1223,12 @@ Commentary: |-
     The song is very uplifting, but you can't really draw Handmaid without making her glare really hard, can you?
 Cover Artists:
 - dodostad
+Referenced Tracks:
+- Rust Servant
 ---
 Track: Gears and Chandeliers
 Artist: Joe Ouellet
 Duration: '3:42'
-References:
-- Candles and Clockwork
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/gears-and-chandeliers
 - https://youtu.be/JIJIE-wQOq0
@@ -1241,12 +1239,12 @@ Commentary: |-
     Ooh, crystalline. Very shiny!
 Cover Artists:
 - ceruleantrafficlights
+Referenced Tracks:
+- Candles and Clockwork
 ---
 Track: Cold Steel
 Artist: Nick Smalley, Solatrus
 Duration: '4:25'
-References:
-- track:frost-vol6
 Art Tags:
 - Jade
 - Frogs
@@ -1261,13 +1259,12 @@ Commentary: |-
     Doing art for a dance remix of Frost wouldn't have proved tricky if not for a perplexing (but very cool) track title. And so, here we have Jade and some frogs integrated as part of a... metaphoric-circuitboard-type-thing by Echidna. I think if you imagine the song set to a trippy frog-gathering montage on LOFAF with this imagery, you'll get a better idea of what I was aiming for. At any rate, I'm really happy with how it turned out, and I hope I've done the track the justice it absolutely deserves.
 Cover Artists:
 - devonianecho
+Referenced Tracks:
+- track:frost-vol6
 ---
 Track: 'Pirates of Alternia: Dead Troll''s Chest'
 Artist: Willow Ascenzo
 Duration: '4:13'
-References:
-- Cobalt Corsair
-- Violet Mariner
 Art Tags:
 - Mindfang
 URLs:
@@ -1288,6 +1285,9 @@ Commentary: |-
     Oh look, it appears I've done yet another track art for Ascenzo. I'm kind of like Will's artist stalker.
 Cover Artists:
 - Ducky Senpai
+Referenced Tracks:
+- Cobalt Corsair
+- Violet Mariner
 ---
 Track: Sunsoaked Heavenscape
 Artist: Ashley Jones
@@ -1308,8 +1308,6 @@ Cover Artists:
 Track: Explore [Keygen Mix]
 Artist: ndividedbyzero
 Duration: '2:37'
-References:
-- track:explore
 Art Tags:
 - WV
 - PM
@@ -1327,12 +1325,12 @@ Commentary: |-
     My interest in doing Homestuck fanart has waned over the past few months, but I will always have a soft spot for the exiles no matter what. So it is only natural that I do goofy exile art for an Explore arrangement! Even though I was seriously burned out on art in general when I did this, I think it turned out okay. Goofy, happy exiles always turn out okay!
 Cover Artists:
 - Lunise
+Referenced Tracks:
+- track:explore
 ---
 Track: Ohgodboss
 Artist: Kevin Grant
 Duration: '3:20'
-References:
-- track:ohgodwhat
 Art Tags:
 - Dave
 - Jade
@@ -1349,16 +1347,12 @@ Commentary: |-
     I actually did two pieces of potential art for this, both featuring Dave and Jade fighting Bec Noir, since it seemed appropriate for an intense boss tune featuring a theme associated with Jade. There was a duller version of this as well as a more comic bookish one. A panel of friends agreed that this one read better, but it was a little flat, so I started brightening it and tweaking it, but still wanted to convey '8-bit', so I started playing around with a square brush throwing in this Darwina-esque square noise, which I thought looked pretty cool. It has been remarked that Jade firing an assault rifle in the air in front of a volcano is metal as shit. That's probably my favourite commentary on this image.
 Cover Artists:
 - Kate Holden
+Referenced Tracks:
+- track:ohgodwhat
 ---
 Track: Dogfight (Dirtiest's Dubstep Remix)
 Artist: David Dycus
 Duration: '3:59'
-References:
-- Dogfight
-- Bec Noir
-- GameGrl (Original 1993 Mix)
-- I'm a Member of the Midnight Crew
-- Carefree Action
 Art Tags:
 - PM
 - Jack Noir
@@ -1372,12 +1366,16 @@ Commentary: |-
     I HOPE YOU LIKE GAMEGRL
 Cover Artists:
 - Lunise
+Referenced Tracks:
+- Dogfight
+- Bec Noir
+- GameGrl (Original 1993 Mix)
+- I'm a Member of the Midnight Crew
+- Carefree Action
 ---
 Track: Starblaze
 Artist: Astro Kid
 Duration: '5:38'
-References:
-- Stargaze
 Art Tags:
 - Jane
 - Roxy
@@ -1394,3 +1392,5 @@ Commentary: |-
     Thanks for listening!
 Cover Artists:
 - plaidcushion
+Referenced Tracks:
+- Stargaze
diff --git a/album/lofam4.yaml b/album/lofam4.yaml
index 7e0737a9..e750dba9 100644
--- a/album/lofam4.yaml
+++ b/album/lofam4.yaml
@@ -1,7 +1,5 @@
 Album: Land of Fans and Music 4
 Directory: lofam4
-Banner Art:
-- Sozzay
 Banner Dimensions: 1100x203
 Date: September 9, 2017
 Date Added: March 16, 2020
@@ -40,13 +38,13 @@ Cover Artists:
 - Sozzay
 Wallpaper Artists:
 - Sozzay
+Banner Artists:
+- Sozzay
 ---
 Group: Disc 1
 ---
 Track: ~~DISC 1~~
 Artist: Lambda Bledsoe, ndividedbyzero
-References:
-- Homestuck Title Screen
 Duration: 0:32
 Directory: disc1-lofam4
 URLs:
@@ -60,13 +58,12 @@ Commentary: |-
     <i>Sozzay:</i>
     This piece was a very unique experience for me because it involved drawing something I was rather unfamiliar with. Before I started this piece I knew from the beginning I wanted something rather dynamic and fun and I feel the result stayed true to the image I had in mind. This piece was certainly difficult, but after some trial and error things eventually started coming together nicely. I ended up having a lot of fun trying out new brushes and mixing my favourite colors together to get a final result I was very pleased with.
 Has Cover Art: false
+Referenced Tracks:
+- Homestuck Title Screen
 ---
 Track: Merge
 Artist: Kouta, polysaw
 Duration: '3:12'
-References:
-- Serenade
-- track:beatdown-strider-style
 Art Tags:
 - Davepeta
 URLs:
@@ -81,13 +78,13 @@ Commentary: |-
     I drew this immediately following [S] Collide. Kouta later asked to use it as the track cover for Merge on SoundCloud, and I was happy to oblige. I'm honoured that they saw it as a fitting image to accompany their (very impressive) track.
 Cover Artists:
 - Circlejourney
+Referenced Tracks:
+- Serenade
+- track:beatdown-strider-style
 ---
 Track: Jungle
 Artist: cookiefonster
 Duration: '4:05'
-References:
-- Another Jungle
-- Oppa Toby Style
 Art Tags:
 - Jane
 - Roxy
@@ -106,6 +103,9 @@ Commentary: |-
     This art is a lovely rendition of Fitzwibble of that bit in [S] Dirk: Unite where Dirk takes Roxy and Jane along for a ride. Unfortunately, due to her foolish boorishness, Jane does not appreciate the joy of flying through the air as a bird would in spring. It is a shame, that such an enlightening experience must go ignored.
 Cover Artists:
 - Fitzwibble
+Referenced Tracks:
+- Another Jungle
+- Oppa Toby Style
 ---
 Track: Frost and Clockwork
 Artist: Circlejourney
@@ -129,9 +129,6 @@ Cover Artists:
 Track: Reunited
 Artist: Shandy
 Duration: '4:21'
-References:
-- track:sburban-jungle
-- track:endless-climb
 Art Tags:
 - Rose
 - Roxy
@@ -145,6 +142,9 @@ Commentary: |-
     Rose and Roxy's interactions are some of my favorite parts of Homestuck, the best of which is their meeting after Game Over. I've resketched and redrawn this way too much since I wanted to give this very nice track some justice. Originally the idea was much more different, I was going to draw Roxy running towards Rose with Skaia in the background, but I changed it to match the canon scene better. Overall I'm pretty happy with the final product, I hope you guys like it too!
 Cover Artists:
 - nights
+Referenced Tracks:
+- track:sburban-jungle
+- track:endless-climb
 ---
 Track: Prospitian Crescent
 Artist: Mmetafour
@@ -186,10 +186,6 @@ Cover Artists:
 Track: Midnight
 Artist: TirantBacon
 Duration: '2:47'
-References:
-- Midnight Suffer
-- Liquid Negrocity
-- Amen, Brother
 Art Tags:
 - Jack Noir
 URLs:
@@ -203,16 +199,14 @@ Commentary: |-
     I chose Midnight as my track art, mostly just because of my love for Intermission. This song is absolutely fantastic, but since I'm not the most creative person around it took me a while to come up with any concrete designs at first. I was originally going to start off with a 50/50 bust drawing of Slick and Jack, but I soon discovered that might be a little too bland. I ended up listening to the song a dozen more times until I sketched out the base idea for the finalized idea. The main challenge had just been lining everything and getting the perspective to look pretty alright, although I'm not really an expert on perspective or composition. Either way, I'm really happy with how the piece turned out, especailly with the lighting on Slick himself.
 Cover Artists:
 - Calicorn
+Referenced Tracks:
+- Midnight Suffer
+- Liquid Negrocity
+- Amen, Brother
 ---
 Track: Dersite
 Artist: Aris Martinian
 Duration: '1:51'
-References:
-- Flare
-- English
-- Derse Dreamers
-- Cascade (Beta)
-- Courser
 Art Tags:
 - Carapacians
 URLs:
@@ -225,14 +219,16 @@ Commentary: |-
     I wonder what life was like for the carapacians, floating out in space away from everything going on on the battlefield as it got prototyped. Seems kind of lonely.
 Cover Artists:
 - plaidcushion
+Referenced Tracks:
+- Flare
+- English
+- Derse Dreamers
+- Cascade (Beta)
+- Courser
 ---
 Track: Pax Condesca
 Artist: Viko Riféo
 Duration: '2:37'
-References:
-- Calamari Inkantation
-- Crystalanthemums
-- Negastrife
 Art Tags:
 - The Condesce
 URLs:
@@ -247,13 +243,14 @@ Commentary: |-
     The image's composition, in which the Condesce is encircled by the planets she has conquered and ruled, is inspired by the Diamond murals from Steven Universe.
 Cover Artists:
 - Circlejourney
+Referenced Tracks:
+- Calamari Inkantation
+- Crystalanthemums
+- Negastrife
 ---
 Track: Blind Pilot
 Artist: Kurtis Burton
 Duration: '4:11'
-References:
-- Gold Pilot
-- The Blind Prophet
 Art Tags:
 - The Psiioniic
 URLs:
@@ -267,12 +264,13 @@ Commentary: |-
     Additional note: this is the first of four Gold Pilot arranges to appear on the album, and boy does it start off the trend well. I hope you enjoy all their unique spins on the original!
 Cover Artists:
 - Adamantist
+Referenced Tracks:
+- Gold Pilot
+- The Blind Prophet
 ---
 Track: Daywalker ~Rise~
 Artist: Catboss
 Duration: '3:12'
-References:
-- track:daywalker-rise-contest
 Art Tags:
 - Kanaya
 URLs:
@@ -286,12 +284,12 @@ Commentary: |-
     This image has three Kanaya Maryams in it. Having two more Kanaya Maryams than Homestuck itself had is a bold creative decision, one which, in my opinion, works out rather well. I very much like the 'Naya in the foreground's halo, illuminating her face, while the Maryam furthest from the front of the scene is relatively shrouded in darkness. Consequently, her bright yellow eyes shine like a wild animal in the dead of night. Cool as hell all around, this image.
 Cover Artists:
 - Emily Jane
+Referenced Tracks:
+- track:daywalker-rise-contest
 ---
 Track: Savior of the Waking World (Cement City Remix)
 Artist: Cement City
 Duration: '5:40'
-References:
-- Savior of the Waking World
 Art Tags:
 - John
 URLs:
@@ -303,6 +301,8 @@ Commentary: |-
     For this track, Chalaite rendered a portrait of John staring down at his deathplace, after being revived by the inscrutable mechanics of sburb. Despite being killed by Bec Noir, her retains his life, and is now more powerful than ever, having attained god tier.
 Cover Artists:
 - Chalaite
+Referenced Tracks:
+- Savior of the Waking World
 ---
 Track: Skaian Dreamers
 Artist: Difarem
@@ -330,8 +330,6 @@ Cover Artists:
 Track: Emerald Waltz
 Artist: Willow Ascenzo
 Duration: '4:13'
-References:
-- Darling Kanaya
 Art Tags:
 - Kanaya
 URLs:
@@ -344,6 +342,8 @@ Commentary: |-
     A little known power held by the clearly very fictional and not at all real troll folklore creatures known as "Rainbow Drinkers" is to create flashing green silhouettes of themselves whenever they dance. This of course, holds no practical purpose whatsoever, except for the theoretical seduction of aliens who happen to resemble flighty broads.
 Cover Artists:
 - Beta
+Referenced Tracks:
+- Darling Kanaya
 ---
 Track: Intermission
 Artist: Joe Ouellet
@@ -366,9 +366,6 @@ Cover Artists:
 Track: Retconjuration
 Artist: ndividedbyzero
 Duration: '2:33'
-References:
-- Windchime Foley
-- Homestuck Anthem
 Art Tags:
 - John
 - Roxy
@@ -383,6 +380,9 @@ Commentary: |-
     I've always loved the 'John's retocn adventures' section of Homestuck, and I think it has to do with how it leads both the characterts and myself along a brisk rollercoaster of twists and turns, through unknown paths - this sense of adventure is what I tried to convey in this art.
 Cover Artists:
 - William Leonard
+Referenced Tracks:
+- Windchime Foley
+- Homestuck Anthem
 ---
 Track: Formation
 Artist: Hadron
@@ -446,11 +446,6 @@ Cover Artists:
 Track: Limelight
 Artist: psithurist
 Duration: '3:11'
-References:
-- The Lyrist
-- Flare
-- Even in Death
-- English
 Art Tags:
 - Alternate Calliope
 URLs:
@@ -463,12 +458,15 @@ Commentary: |-
     Like the song, this fantastic art was originally used for Act 8 Volume 1. It's a pretty stark contrast to the carefree art for Glide immediately before it; Alternate Calliope has now taken off her hood, with a look that indicates that she means business.
 Cover Artists:
 - Jenny
+Referenced Tracks:
+- The Lyrist
+- Flare
+- Even in Death
+- English
 ---
 Track: Bonehead Destiny (LoFaM Cut)
 Artist: Grace Medley
 Duration: '4:16'
-References:
-- Unite Synchronization
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/bonehead-destiny-lofam-cut
 - https://youtu.be/wmJt4OJoI38
@@ -479,16 +477,12 @@ Commentary: |-
     The futility of a sacrifice, the chaos of a final battle, the wrath of an arbiter, the finding of love after death, the absolute ownage of a sharply written missive. All these and more contributed to making the epic ending of Problem Sleuth what it came to be known as: a confusing clusterfuck of hilarious and completely insane shenanigans.
 Cover Artists:
 - Elanor Pam
+Referenced Tracks:
+- Unite Synchronization
 ---
 Track: Stubborn Throes
 Artist: SplitSuns
 Duration: '3:08'
-References:
-- track:chorale-for-jaspers
-- Amen, Brother
-- track:aggrieve
-- Battle Against an Unfathomable Enemy
-- At The Price of Oblivion
 Art Tags:
 - Rose
 - Horrorterrors
@@ -502,14 +496,16 @@ Commentary: |-
     This track received brand new art for its release on LOFAM4, courtesy of the talented Neiratina! With this song portraying Rose succumbing to the broodfester throes and going Grimdark, this art features Rose beginning to slip away to the eldritch Horrorterrors as well. WIth her wand gripped firmly in hand, Rose looks fiercely determined to destroy anything in her path. Her aura of golden is inexorably being snuffed out by the black tentacles that pour out of the image, even interfering with the designs in Rose's shrit and snaking their way into the background. Marked with jagged lines and dripping ink, this piece perfectly caputres Rose's last moments of innocence as she throws caution to the wind and turns herself Grimdark.
 Cover Artists:
 - Neiratina
+Referenced Tracks:
+- track:chorale-for-jaspers
+- Amen, Brother
+- track:aggrieve
+- Battle Against an Unfathomable Enemy
+- At The Price of Oblivion
 ---
 Track: My Lady Greensleeves
 Artist: Shandy
 Duration: '2:21'
-References:
-- Black Rose / Green Sun
-- Greensleeves
-- track:endless-climb
 Art Tags:
 - Rose
 - Kanaya
@@ -524,12 +520,14 @@ Commentary: |-
     This is a solemn artwork that captures a snapshot of Rose and Kanaya in a tender embrace. The piece manages to render the two lovers at their closest, while also highlighting the extremes of both of their characters. Rose's skin is tainted black to indicate her status as Grimdark, while Kanaya is glowing white as rainbow drinkers often do. Although the addition of the titular "greensleeves" to Kanaya's outfit is subtle, it helps tie the artwork even further to its song and turns it into an excellent companion.
 Cover Artists:
 - Shandy
+Referenced Tracks:
+- Black Rose / Green Sun
+- Greensleeves
+- track:endless-climb
 ---
 Track: Highland Thunder
 Artist: Thomas Ferkol
 Duration: '3:20'
-References:
-- Danger! High Voltage
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/highland-thunder
 - https://youtu.be/2sXRcKDYKZM
@@ -540,6 +538,8 @@ Commentary: |-
     At one point I described this as something along the lines of "electric Scottish war music", and that still stands. The melody in this song is absolutely iconic, if you ask me, and it gets INCREDIBLY ampled. Maybe enough to see what lies under that voltaic fault. (Spoiler: It's just a lot of xenon.) Also, the lyrics to this song are "DANGER HIGH VOLTAGE". That is all.
 Cover Artists:
 - Elanor Pam
+Referenced Tracks:
+- Danger! High Voltage
 ---
 Track: Ghosts
 Artist: David Dycus
@@ -560,10 +560,6 @@ Cover Artists:
 Track: Pilotwave
 Artist: Interrobang
 Duration: '2:37'
-References:
-- Gold Pilot
-- Courser
-- Courage
 Art Tags:
 - Jade
 - Becquerel
@@ -578,6 +574,10 @@ Commentary: |-
     This took a really long time.
 Cover Artists:
 - Robin
+Referenced Tracks:
+- Gold Pilot
+- Courser
+- Courage
 ---
 Track: Aura of Colour
 Artist: olegoleg123
@@ -602,8 +602,6 @@ Cover Artists:
 Track: Beyond the Death of the King
 Artist: Seth Massey
 Duration: '3:41'
-References:
-- Orchid Horror
 Art Tags:
 - Calmasis
 URLs:
@@ -618,14 +616,12 @@ Commentary: |-
     I must confess to loving this art style, with mostly aliased lines and two-tone shading, especially in its similarity to some of Andrew Hussie's own art in Homestuck. It's none too common to see fanart of Calmasis, so it's nice to see them rendered in a more dynamic pose than the only canon one, while still clearly recognizable as that same antihero.
 Cover Artists:
 - sailorleo
+Referenced Tracks:
+- Orchid Horror
 ---
 Track: En Masse
 Artist: The Great Anansi
 Duration: '3:38'
-References:
-- Scratch
-- English
-- Rex Duodecim Angelus
 Art Tags:
 - Doc Scratch
 URLs:
@@ -638,6 +634,10 @@ Commentary: |-
     This art primarily focuses on Doc Scratch, his profile taking up most of the canvas. There's a nice contrast between the organic and textured forms of his suit and the precisely geometric shapes such as his cueball head, the triangle cutting through his chest, and the halo of squares over him. The use of recurring motifs such as pool balls, arrows, and brooms help to connect the piece further to Scratch's roots, with the peacock texturing suggesting the foreboding Felt Manor. An interesting artwork for an enigmatic character.
 Cover Artists:
 - rawlithmora
+Referenced Tracks:
+- Scratch
+- English
+- Rex Duodecim Angelus
 ---
 Track: '[GRIEF]'
 Artist: Nicholas Nakano
@@ -676,9 +676,6 @@ Cover Artists:
 Track: Buffskull
 Artist: Noisemaker
 Duration: '2:33'
-References:
-- Spider8reath
-- Spider's Claw
 Art Tags:
 - Vriska
 - Lord English
@@ -692,12 +689,13 @@ Commentary: |-
     Buffskull was originally a part of the CANMT song "7 GRAND END," with the music syncing up to the final Act 7 flash in Homestuck. This part of the song played when Vriska and her army prepared to face off against Lord English, and the art reflects this tense moment. Vriska stands in the middle of the chaos, with the house juju towering behind her. All of this is reflected in the eye of Lord English himself, his normally radiating visage forced into the position of eight-balls. The detail on English's eye is both very sharp and a little unsettling. So although this art mirrors previous scenes in the comic, it adds its own interseting twists to the presentation to make it an exciting and engaging image.
 Cover Artists:
 - Benedict Ide
+Referenced Tracks:
+- Spider8reath
+- Spider's Claw
 ---
 Track: I'm a Member of the Midnight Crew (theh0nestman Version)
 Artist: theh0nestman
 Duration: '4:22'
-References:
-- I'm a Member of the Midnight Crew
 Art Tags:
 - CD
 URLs:
@@ -710,14 +708,12 @@ Commentary: |-
     I was asking around for iconic rock album covers to base the art on since it was rather classic rock take on the midnight crew. Someone said Nirvana's Nevermind and I laughed and laughed and went with it
 Cover Artists:
 - dodostad
+Referenced Tracks:
+- I'm a Member of the Midnight Crew
 ---
 Track: Crystalendofgames
 Artist: Jamie Paige Stanley
 Duration: '6:55'
-References:
-- Crystamanthequins
-- track:sburban-jungle
-- Flare
 Art Tags:
 - WV
 - PM
@@ -734,14 +730,16 @@ Commentary: |-
     This is one part of a larger image formed by the covers of this, [[Ultimate Alchemy]], and [[Black Hole / White Door]].
 Cover Artists:
 - Circlejourney
+Referenced Tracks:
+- Crystamanthequins
+- track:sburban-jungle
+- Flare
 ---
 Group: Disc 2
 ---
 Track: ~~DISC 2~~
 Artist: Lambda Bledsoe, ndividedbyzero
 Duration: 0:16
-References:
-- Jackpot
 Directory: disc2-lofam4
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/disc-2-2
@@ -754,12 +752,12 @@ Commentary: |-
     In my opinion, this track art perfectly fits the "calm before the storm" vibe of a middle before an end, like Disc 2 is before the endgame-themed Disc 3. I'll also note it looks incredibly fitting for the cover of a vinyl record, and with those bright colors and jazzy writing I'd check that hypothetical cover out the moment I saw it.
 Cover Artists:
 - Buck
+Referenced Tracks:
+- Jackpot
 ---
 Track: Hiatus
 Artist: Kevin Grant
 Duration: '2:45'
-References:
-- track:upward-movement-dave-owns
 Art Tags:
 - Gamzee
 - Terezi
@@ -774,44 +772,12 @@ Commentary: |-
     The song was made during the gigapause, if the timestamp on soundcloud was right. So, I drew part of the scene where the gigapause left off aka Terezi getting the shit kicked out of her.
 Cover Artists:
 - Trufflemeep
+Referenced Tracks:
+- track:upward-movement-dave-owns
 ---
 Track: HOMOSUCK. DIRECTOR'S CUT, OF THE YEAR EDITION.
 Artist: ndividedbyzero
 Duration: '6:40'
-References:
-- Homosuck Swan Song
-- Homosuck Anthem
-- track:upward-movement-dave-owns
-- track:beatdown-strider-style
-- track:showtime-original-mix
-- track:sburban-jungle
-- Theme
-- track:crustacean
-- Walls Covered in Blood
-- The Lemonsnout Turnabout
-- Spider's Claw
-- English
-- track:showtime-piano-refrain
-- Eternity Served Cold
-- Carne Vale
-- Warhammer of Zillyhoo
-- track:null-toby-fox
-- Hello Zepp
-- Rabbunctious!
-- The Paradox Paradigm
-- Purple Bard
-- Swing of the Clock
-- track:doctor
-- track:endless-climb
-- track:atomyk-ebonpyre
-- track:frost-vol6
-- Homestuck
-- track:dissension-original
-- Horschestra
-- Jane's Dragon
-- Cascade (Beta)
-- track:aggrieve
-- Oh Hi There, Lil Cal
 Art Tags:
 - John
 - Rose
@@ -889,16 +855,45 @@ Commentary: |-
     - [[Oh Hi There, Lil Cal]] - 6:09-6:12
 Cover Artists:
 - Nick Tucker
+Referenced Tracks:
+- Homosuck Swan Song
+- Homosuck Anthem
+- track:upward-movement-dave-owns
+- track:beatdown-strider-style
+- track:showtime-original-mix
+- track:sburban-jungle
+- Theme
+- track:crustacean
+- Walls Covered in Blood
+- The Lemonsnout Turnabout
+- Spider's Claw
+- English
+- track:showtime-piano-refrain
+- Eternity Served Cold
+- Carne Vale
+- Warhammer of Zillyhoo
+- track:null-toby-fox
+- Hello Zepp
+- Rabbunctious!
+- The Paradox Paradigm
+- Purple Bard
+- Swing of the Clock
+- track:doctor
+- track:endless-climb
+- track:atomyk-ebonpyre
+- track:frost-vol6
+- Homestuck
+- track:dissension-original
+- Horschestra
+- Jane's Dragon
+- Cascade (Beta)
+- track:aggrieve
+- Oh Hi There, Lil Cal
 ---
 Track: Three in the Morning (Ngame's Bowmix) [Explicit]
 Directory: three-in-the-morning-ngames-bowmix
 Artist: Ngame
 Duration: '5:39'
-References:
-- Three in the Morning
-- RollerCoaster Tycoon Theme
-- Fruity Pebbles Jingle
-- Bowman Remix
 Art Tags:
 - Snowman
 URLs:
@@ -911,14 +906,16 @@ Commentary: |-
     If you liked Bowman's Homestuck stuff, love comedy videos, or were just too damn intrigued by this song to stay out of the loop, I recommend giving <a href="https://youtube.com/playlist?list=PLoOnh0MiKsmJb0CsYOTzkihMcNSl6-ruw">the Stutzbows</a> (as I like to call their videos) a watch. Whether it's Scott singing you the jingle for his favorite breakfast cereal, Bowman informing you about his credit score (spoiler alert: it's 720), or both of them having some good, old-fashioned backyard fun, I'm certain there's something to enjoy for everyone.
 Cover Artists:
 - Ngame
+Referenced Tracks:
+- Three in the Morning
+- RollerCoaster Tycoon Theme
+- Fruity Pebbles Jingle
+- Bowman Remix
 ---
 Track: Schrödinger's Harbinger
 Directory: schrodingers-harbinger
 Artist: Noisemaker
 Duration: '2:21'
-References:
-- track:aggrieve
-- track:chorale-for-jaspers
 Art Tags:
 - Rose
 - Jasprose
@@ -933,6 +930,9 @@ Credits: |-
     I can't believe that Roxy thinks that Rose smothering herself in response to the heinous evils of Jasprose is so "wonderful". What a terrible mother/daughter figure.
 Cover Artists:
 - Benedict Ide
+Referenced Tracks:
+- track:aggrieve
+- track:chorale-for-jaspers
 ---
 Track: Listless Squiddly Bliss
 Artist: Marcy Nabors
@@ -953,12 +953,6 @@ Cover Artists:
 Track: All the Luck
 Artist: Kusoro
 Duration: '2:32'
-References:
-- Spider's Claw
-- track:MeGaLoVania
-- Terezi's Theme
-- Spider8ite!!!!!!!!
-- Lotus
 Art Tags:
 - Vriska
 URLs:
@@ -971,6 +965,12 @@ Commentary: |-
     Xoro was working on a little 8-song Vriska album concept for the CANMT, to be released on 8/8/2016. Though the idea never came to be, he made a couple songs for it, which then languished on the main tab of our organization sheet. Reading through the list of semi-abandoned songs there, I convinced him to put it on our Volume 8, so it ended up with some 8-related action. At some point, either the LOFAM judges listened to the album and felt it was a standout track, or Xoro submitted it on his own. The latter is possible since right around then was when Lambda put out an open call on /r/homestuck for song submissions. Either way, Xoro felt the song could bei mproved, so the song as presented here is an even more polished version of the v8lume one. Relistening, many of the changes jump out. Right away you can tell some of the instruments have changed. (Enemy Approaching, the Undertale song, is still an obvious compositional inspiration, even though the instrumentation being less electronic makes this version less similar in that sense.) Some of the mixing is better and more punchy, a skill that Xoro excels at. Terezi's theme opens the bridge, after which the song contains new composition. Returning to the original motifs of the song after the bridge, it continues to put a new spin on them. I never cease to be impressed by the musical improvements of my friends in the Homestuck fanmusic community. And I'm glad that in a managerial role, I can facilitate others' improvement. Let's all give Xoro a thumbsup for the great work here.
 Cover Artists:
 - Phil Gibson
+Referenced Tracks:
+- Spider's Claw
+- track:MeGaLoVania
+- Terezi's Theme
+- Spider8ite!!!!!!!!
+- Lotus
 ---
 Track: Wisest Wizord
 Artist: rilez, Natrox
@@ -1030,11 +1030,6 @@ Cover Artists:
 Track: Daydreamer
 Artist: electric lantern
 Duration: '1:48'
-References:
-- track:old-secret
-- Spider Dance
-- track:atomyk-ebonpyre
-- Derse Dreamers
 Art Tags:
 - Joey
 URLs:
@@ -1048,12 +1043,15 @@ Commentary: |-
     I'm personally glad Elanor took the Hiveswap route for this song's track art, because I feel it fits the song so well even beyond Old Secret. The song invokes a calm theme for Joey, and speculation on all of the possible misadventuers she'll have that we'll soon get to see. As of this writing, Hiveswap's definitive release date of September 14th was revealed three days ago, and I hold hope it won't be delayed any longer. In the meantime, Daydream is a theme that embodies thoughts of that wait and that hope, and of course, thoughts of the game itself.
 Cover Artists:
 - Elanor Pam
+Referenced Tracks:
+- track:old-secret
+- Spider Dance
+- track:atomyk-ebonpyre
+- Derse Dreamers
 ---
 Track: Grimbark
 Artist: Willow Ascenzo
 Duration: '3:37'
-References:
-- Penumbra Phantasm
 Art Tags:
 - Jade
 - 'cw: body horror'
@@ -1067,14 +1065,12 @@ Commentary: |-
     Okay, okay. Before you start listening to this song, just picture in your head the absolute BEST grimdark Jade theme. Then hit play. If you're not confused as to how Ascenzo managed to read your mind, you did something wrong.
 Cover Artists:
 - Amethyst Barron
+Referenced Tracks:
+- Penumbra Phantasm
 ---
 Track: Upward Meowvement (Davepetasprite^2 Owns)
 Artist: LydianChord
 Duration: '2:01'
-Referenes:
-- Amen, Brother
-- track:upward-movement-dave-owns
-- Nepeta's Theme
 Art Tags:
 - Davepeta
 URLs:
@@ -1086,12 +1082,14 @@ Commentary: |-
     Davepetasprite^2, Paradox Space's certified #1 cat-bird, shows us their stabs from a vantage point just beyond the Green Sun. The green and orange hues in this piece are particularly lovely.
 Cover Artists:
 - CybeR
+Referenced Tracks:
+- Amen, Brother
+- track:upward-movement-dave-owns
+- Nepeta's Theme
 ---
 Track: Requited (Dirtiest Remix)
 Artist: David Dycus
 Duration: '5:08'
-References:
-- Requited
 Art Tags:
 - Nepeta
 - Meulin
@@ -1108,12 +1106,12 @@ Commentary: |-
     The picture is all guache on aquarelle paper.
 Cover Artists:
 - Josefin B.
+Referenced Tracks:
+- Requited
 ---
 Track: Expanses of Interstellar Space
 Artist: Elaine Wang
 Duration: '4:14'
-References:
-- Gold Pilot
 Art Tags:
 - PM
 - Jack Noir
@@ -1127,6 +1125,8 @@ Commentary: |-
     A calmer, somewhat less dramatic remix of Gold Pilot. I'd imagine it gets pretty lonely exploring the EXPANSES OF INTERSTELLAR SPACE.
 Cover Artists:
 - yazshu
+Referenced Tracks:
+- Gold Pilot
 ---
 Track: Horizontal Headshot
 Artist: Aris Martinian
@@ -1138,7 +1138,17 @@ Art Tags:
 - Jake
 - 'cw: decapitation (abstract)'
 - 'cw: blood'
-References:
+URLs:
+- https://unofficialmspafans.bandcamp.com/track/horizontal-headshot
+- https://youtu.be/XfBz4kvoU7Q
+Commentary: |-
+    <i>Aris Martinian:</i>
+    Written for the Cool and New Music Team's Cool and New Homestuck 2, this is an attempt to remix Unite Synchronization in a way that fits better thematically with [S] Dirk: Synchronize and [S] Dirk: Unite. Some of the things I worked in were Orange Hat when Dirk wakes up, for example, Metamorphic Choices when the kernelsprite appears, Hate You for Meenah's cameo... Dirk's scateboard-riding I represented with Moshi Moshi?, a theme that's admittedly been a bit of a stickymotif for me (I've used it in way too many compositions). I like Moshi for an umber of reasons, not the least of which is the fact that it goes so well with so many things. What can I say? I like mashing themes together.
+    <i><b>WHATISLOSTINTHEMINES:</b></i>
+    An illustration of the events of both [S] Dirk: Synchronize and [S] Dirk: Unite. As can clearly be seen, the Red Miles tore up the spacetime continuum, resulting in all the events happening concurrently. This is exactly what happened both here and in the flashes, and definitely isn't just a clever tactic by dazed-squid to create a pretty neat track art that depicts a lot of the best parts of said flashes.
+Cover Artists:
+- dazed-squid
+Referenced Tracks:
 - Unite Synchronization
 - Orange Hat
 - track:metamorphic-choices
@@ -1153,21 +1163,21 @@ References:
 - Jungle
 - Sburban Resolution
 - track:showtime-original-mix
-URLs:
-- https://unofficialmspafans.bandcamp.com/track/horizontal-headshot
-- https://youtu.be/XfBz4kvoU7Q
-Commentary: |-
-    <i>Aris Martinian:</i>
-    Written for the Cool and New Music Team's Cool and New Homestuck 2, this is an attempt to remix Unite Synchronization in a way that fits better thematically with [S] Dirk: Synchronize and [S] Dirk: Unite. Some of the things I worked in were Orange Hat when Dirk wakes up, for example, Metamorphic Choices when the kernelsprite appears, Hate You for Meenah's cameo... Dirk's scateboard-riding I represented with Moshi Moshi?, a theme that's admittedly been a bit of a stickymotif for me (I've used it in way too many compositions). I like Moshi for an umber of reasons, not the least of which is the fact that it goes so well with so many things. What can I say? I like mashing themes together.
-    <i><b>WHATISLOSTINTHEMINES:</b></i>
-    An illustration of the events of both [S] Dirk: Synchronize and [S] Dirk: Unite. As can clearly be seen, the Red Miles tore up the spacetime continuum, resulting in all the events happening concurrently. This is exactly what happened both here and in the flashes, and definitely isn't just a clever tactic by dazed-squid to create a pretty neat track art that depicts a lot of the best parts of said flashes.
-Cover Artists:
-- dazed-squid
 ---
 Track: One and a Half Midnight
 Artist: Kusoro
 Duration: '2:22'
-References:
+Art Tags:
+- Jack Noir
+URLs:
+- https://unofficialmspafans.bandcamp.com/track/one-and-a-half-midnight
+- https://youtu.be/Cv6Ca070MPk
+Commentary: |-
+    <i>Selan Pike:</i>
+    LET THEM FIGHT
+Cover Artists:
+- Selan Pike
+Referenced Tracks:
 - Liquid Negrocity
 - Amen, Brother
 - track:upward-movement-dave-owns
@@ -1183,23 +1193,10 @@ References:
 - Moshi Moshi?
 - English
 - track:additional-mayhem-universe-a
-Art Tags:
-- Jack Noir
-URLs:
-- https://unofficialmspafans.bandcamp.com/track/one-and-a-half-midnight
-- https://youtu.be/Cv6Ca070MPk
-Commentary: |-
-    <i>Selan Pike:</i>
-    LET THEM FIGHT
-Cover Artists:
-- Selan Pike
 ---
 Track: Fractal Flowers Nui
 Artist: Kal-la-kal-la
 Duration: '4:43'
-References:
-- Fractal Flowers
-- Creeping in My Soul
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/fractal-flowers-nui
 - https://youtu.be/RN5LBP9kqm0
@@ -1213,16 +1210,15 @@ Commentary: |-
     Look, I should never be allowed to draw Bionicles.
 Cover Artists:
 - Selan Pike
+Referenced Tracks:
+- Fractal Flowers
+- Creeping in My Soul
 ---
 Track: Ringleader
 Artist: Cryptanark
 Contributors:
 - TirantBacon (mastering)
 Duration: '3:07'
-References:
-- English
-- Liquid Negrocity
-- Let's All Rock the Heist
 Art Tags:
 - The Felt
 URLs:
@@ -1235,56 +1231,16 @@ Commentary: |-
     Crypt's songs are always a delight to listen to, I'm so happy I got the chance to do art for one of them. (Plus it's a Crowbar track! Objectively the best Felt member. This is fact not opinion.)
 Cover Artists:
 - nights
+Referenced Tracks:
+- English
+- Liquid Negrocity
+- Let's All Rock the Heist
 ---
 Track: Dance of the Dead
 Artist: Veritas Unae
 Contributors:
 - Nick Smalley (additional vocals)
 Duration: '13:04'
-References:
-- track:showtime-piano-refrain
-- track:verdancy-bassline
-- track:chorale-for-jaspers
-- Tall, Dark and Loathsome
-- track:ballad-of-awakening
-- Versus
-- Skaian Summoning
-- Tangled Waltz
-- Omelette Sandwich
-- A Tender Moment
-- Atomic Bonsai
-- A Fairy Battle
-- Heat
-- Beta Version
-- Let's All Rock the Heist
-- Revelations II
-- Aimless Morning Gold
-- Core of Darkness
-- Escape Pod
-- Skaian Birth
-- Temporal Shenanigans
-- Pendulum
-- Skaianet
-- II - Sarabande
-- Underfoot
-- Pondsquatter
-- Red Sucker
-- Oppa Toby Style
-- Train
-- Penumbra Phantasm
-- Jack and Black Queen
-- Phantom Echoes
-- Spider8ite!!!!!!!!
-- track:gods-of-the-new-world
-- Jade Aubade
-- Bathearst's Theme
-- For Beforus
-- Four Kids and a Game They Play Together
-- Monochromatic Shenanigans
-- Rouge on the Rox
-- JUST1C3 R41NS FROM 4BOV3
-- Daydreamer
-- Sburban Metro
 Art Tags:
 - Midnight Crew
 URLs:
@@ -1347,13 +1303,54 @@ Commentary: |-
     - P[S] - [[Sburban Metro]] - 12:21-13:04
 Cover Artists:
 - Selan Pike
+Referenced Tracks:
+- track:showtime-piano-refrain
+- track:verdancy-bassline
+- track:chorale-for-jaspers
+- Tall, Dark and Loathsome
+- track:ballad-of-awakening
+- Versus
+- Skaian Summoning
+- Tangled Waltz
+- Omelette Sandwich
+- A Tender Moment
+- Atomic Bonsai
+- A Fairy Battle
+- Heat
+- Beta Version
+- Let's All Rock the Heist
+- Revelations II
+- Aimless Morning Gold
+- Core of Darkness
+- Escape Pod
+- Skaian Birth
+- Temporal Shenanigans
+- Pendulum
+- Skaianet
+- II - Sarabande
+- Underfoot
+- Pondsquatter
+- Red Sucker
+- Oppa Toby Style
+- Train
+- Penumbra Phantasm
+- Jack and Black Queen
+- Phantom Echoes
+- Spider8ite!!!!!!!!
+- track:gods-of-the-new-world
+- Jade Aubade
+- Bathearst's Theme
+- For Beforus
+- Four Kids and a Game They Play Together
+- Monochromatic Shenanigans
+- Rouge on the Rox
+- JUST1C3 R41NS FROM 4BOV3
+- Daydreamer
+- Sburban Metro
 ---
 Track: Atomyk Clockwyrk
 Artist: Marcy Nabors
 Duration: '1:56'
-References:
-- track:endless-climb
-- track:atomyk-ebonpyre
 Art Tags:
 - Dave
 URLs:
@@ -1367,6 +1364,9 @@ Commentary: |-
     Fun fact actually, this piece had a couple other variants before this version, which had Dave wearing different colored suits. One was white, and the other was red. However, after dazed-squid was suggested to try a green one instead, it managed to catch the eye quite very well indeed. As such, the green version stuck.
 Cover Artists:
 - dazed-squid
+Referenced Tracks:
+- track:endless-climb
+- track:atomyk-ebonpyre
 ---
 Track: Cleopatra's Cocktail Party
 Artist: Thomas Ferkol
@@ -1388,8 +1388,6 @@ Cover Artists:
 Track: Quest Crypt
 Artist: ndividedbyzero
 Duration: '1:19'
-References:
-- track:sburban-jungle
 Art Tags:
 - Jane
 URLs:
@@ -1403,20 +1401,12 @@ Commentary: |-
     The A6A5A1x2combo is -apart from being a mouthful- a very introspective breath after a wild, high-octane sequence. My early draft for this piece featured all four alpha kids on their respective devices, but it felt too engaged, too connected. I think this song is more reflective of solitude (the solitude that comes despite being in simultaneous chat conversations with two other people), and I hoped to convey that.
 Cover Artists:
 - sweetjegus
+Referenced Tracks:
+- track:sburban-jungle
 ---
 Track: Noble Ascendance
 Artist: WHATISLOSTINTHEMINES
 Duration: '6:31'
-References:
-- Even in Death
-- Another Jungle
-- track:beatdown-strider-style
-- Unite Synchronization
-- Pumpkin Party in Sea Hitler's Water Apocalypse
-- Sunsetter
-- Oppa Toby Style
-- Hate You
-- track:ruins
 Art Tags:
 - Jane
 - Roxy
@@ -1434,12 +1424,20 @@ Commentary: |-
     After her fantastic work on the Volume 5 Anthology, a project to supply Homestuck Volume 5 with unique art for each track, Aeritus supplied this wonderful image. Here, the alpha kids lie in rest, waiting for the future of attaining god tier. It... can't be comfortable to lie in rest on stone slabs. That must be hell on your back.
 Cover Artists:
 - Aeritus
+Referenced Tracks:
+- Even in Death
+- Another Jungle
+- track:beatdown-strider-style
+- Unite Synchronization
+- Pumpkin Party in Sea Hitler's Water Apocalypse
+- Sunsetter
+- Oppa Toby Style
+- Hate You
+- track:ruins
 ---
 Track: Sunslammer (Cement City Remix)
 Artist: Cement City
 Duration: '3:12'
-References:
-- Sunslammer
 Art Tags:
 - Jade
 URLs:
@@ -1462,12 +1460,12 @@ Commentary: |-
     (SFX: Toki yo Tomare.)
 Cover Artists:
 - Cro
+Referenced Tracks:
+- Sunslammer
 ---
 Track: Climbing to Infinity
 Artist: SplitSuns
 Duration: '4:28'
-References:
-- track:endless-climb
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/climbing-to-infinity
 - https://youtu.be/RZmbjMySkJY
@@ -1477,12 +1475,12 @@ Commentary: |-
     The track art is a parody of the cover of the vaporwave album "Shader Complete" by Sacred Tapestry.
 Cover Artists:
 - SplitSuns
+Referenced Tracks:
+- track:endless-climb
 ---
 Track: Beatup (Shutdown)
 Artist: Astro Kid
 Duration: '2:36'
-References:
-- Beatup
 Art Tags:
 - Dave
 - Dave's bro
@@ -1495,14 +1493,12 @@ Commentary: |-
     This art reminds me of what could have been. Oh, Bro. You could have had it all. A sweet hipster ninja buddy just like you who had your back at all times, who enjoyed being with you and never fought against the blade. You could have trained him with such bullshit free discipline mixed with such terror free compassion that his genuine confidence would never let him lose again. Not even to you, the teacher, brother and father. Then you two could stand back to back while this badass music of fraternal teamwork played in the distance, complete with a backdrop of blazing sun and raging meteors. But then you just had to throw the kid off a building and make his daily life hell. Thanks for nothing, man.
 Cover Artists:
 - Beta
+Referenced Tracks:
+- Beatup
 ---
 Track: Airtime Assault
 Artist: Cerulean
 Duration: '2:52'
-References:
-- track:beatdown-strider-style
-- track:doctor
-- track:sburban-jungle
 Art Tags:
 - John
 - Dave
@@ -1518,14 +1514,14 @@ Commentary: |-
     (ps, viko told me to say johndave is canon i guess)
 Cover Artists:
 - nuclear333
+Referenced Tracks:
+- track:beatdown-strider-style
+- track:doctor
+- track:sburban-jungle
 ---
 Track: Robert Jailbreak
 Artist: Mathias Ramalho
 Duration: '2:12'
-References:
-- Pumpkin Cravings
-- Assail
-- Jackknive
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/robert-jailbreak
 - https://youtu.be/BaiE1IJwV_E
@@ -1540,15 +1536,14 @@ Commentary: |-
     W ho Did This
 Cover Artists:
 - Jaspy
+Referenced Tracks:
+- Pumpkin Cravings
+- Assail
+- Jackknive
 ---
 Track: hors
 Artist: Hadron
 Duration: '3:17'
-References:
-- Horschestra STRONG Version
-- track:sburban-jungle
-- English
-- Let the Squiddles Sleep (End Theme)
 Art Tags:
 - John
 - Dave
@@ -1564,15 +1559,15 @@ Commentary: |-
     Jojo and Homestuck sure do have a lot of things in common, don't they? Themes of predestination, weird time shit, luck being used as a weapon, a guy without the use of his legs, horses everywhere in a certain part...it's all kind of weird and interesting. So that's why I did an EPIC JOJOKE for this trackart. If you don't understand what's going on here, read some more Jojo, I guess. Or don't. Look, Hors is a great, funny track, and this is the dank artistry it deserves as accompaniment. You're welcome.
 Cover Artists:
 - Griever
+Referenced Tracks:
+- Horschestra STRONG Version
+- track:sburban-jungle
+- English
+- Let the Squiddles Sleep (End Theme)
 ---
 Track: The Gemoni Mustard Blood
 Artist: cookiefonster
 Duration: '2:04'
-References:
-- track:the-mituna-method
-- The La2t Frontiier
-- The Blind Prophet
-- Gold Mage
 Art Tags:
 - Sollux
 URLs:
@@ -1587,13 +1582,15 @@ Commentary: |-
     Sollux is about to get down. Gotta give out some FRESH BEATS. Gotta JAM YOUR EYEBALLS AND EARHOLES WITH SOME SWEET ASS TUNES. CHECK IT OUT YO.
 Cover Artists:
 - Melissa Peebles
+Referenced Tracks:
+- track:the-mituna-method
+- The La2t Frontiier
+- The Blind Prophet
+- Gold Mage
 ---
 Track: Reconciled
 Artist: Shandy
 Duration: '4:07'
-References:
-- track:sburban-jungle
-- track:atomyk-ebonpyre
 Art Tags:
 - Dave
 - Dirk
@@ -1611,27 +1608,13 @@ Commentary: |-
     Dave and Dirk's reuinion on the spires of LOTAK was serious and poignant, but not without its sillier moments. This art is a mashup and showcase of the most ironic bullshit the Striders had to offer throughout the story. Smuppets galore, their plush rumps and jutting probosices laid alongside such gems as a Game Bro magazine, an artifacted Statue of Liberty, the lovable Squarewave and Sawtooth, and SBaHJ icons including the Big Man himself. And who could forget Guy Fieri's surprise appearance, his scream frozen in place as he prepares to assume the title of the next Antichrist? But that's a story for another time.
 Cover Artists:
 - Beta
+Referenced Tracks:
+- track:sburban-jungle
+- track:atomyk-ebonpyre
 ---
 Track: The End of Something Really Excellent
 Artist: Rhyselinn
 Duration: '5:02'
-References:
-- The Beginning of Something Really Excellent
-- track:sburban-jungle
-- track:skies-of-skaia
-- Dawn of Man
-- track:doctor
-- track:endless-climb
-- track:atomyk-ebonpyre
-- track:frost-vol6
-- Cascade (Beta)
-- Infinity Mechanism
-- Another Jungle
-- Even in Death
-- Lotus
-- Do You Remem8er Me
-- Skaian Skirmish
-- Homestuck Anthem
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/the-end-of-something-really-excellent
 - https://youtu.be/0XRCD67voTo
@@ -1661,17 +1644,29 @@ Commentary: |-
     - [[Homestuck Anthem]] - 4:42-4:54
 Cover Artists:
 - Rebecca Peason
+Referenced Tracks:
+- The Beginning of Something Really Excellent
+- track:sburban-jungle
+- track:skies-of-skaia
+- Dawn of Man
+- track:doctor
+- track:endless-climb
+- track:atomyk-ebonpyre
+- track:frost-vol6
+- Cascade (Beta)
+- Infinity Mechanism
+- Another Jungle
+- Even in Death
+- Lotus
+- Do You Remem8er Me
+- Skaian Skirmish
+- Homestuck Anthem
 ---
 Track: The Sin and the Salvation
 Artist: psithurist
 Contributors:
 - Lucas Haggett (bass guitar)
 Duration: '8:53'
-References:
-- Black Rose / Green Sun
-- track:showtime-original-mix
-- English
-- Homestuck Anthem
 Art Tags:
 - Gamzee
 - Caliborn
@@ -1689,19 +1684,15 @@ Commentary: |-
     I'm really glad I had the chance to draw track art for a cherub song since Caliborn is probably one of my favorite characters in Homestuck. I tried to fill this up with as many pieces of imagery of the cherub's journeys to god tier, all framed within a beautiful clock ready to be smashed with a crowbar. Side Note: Caliborn's gun was superbly hard to draw and now I can see why Hussie used a jpg image for it as often as he could.
 Cover Artists:
 - SmashCooper
+Referenced Tracks:
+- Black Rose / Green Sun
+- track:showtime-original-mix
+- English
+- Homestuck Anthem
 ---
 Track: Resend
 Artist: Noisemaker
 Duration: '4:48'
-References:
-- Cascade (Beta)
-- Crystalanthemums
-- Showdown
-- Death by Glamour
-- RollerCoaster Tycoon Theme
-- Sunsetter
-- track:showtime-piano-refrain
-- track:endless-climb
 Art Tags:
 - Caliborn
 - Gamzee
@@ -1716,14 +1707,21 @@ Commentary: |-
     originally this song was going to be replaced by ocean man, per my request. it wasn't. fuck you bambosh
 Cover Artists:
 - yazshu
+Referenced Tracks:
+- Cascade (Beta)
+- Crystalanthemums
+- Showdown
+- Death by Glamour
+- RollerCoaster Tycoon Theme
+- Sunsetter
+- track:showtime-piano-refrain
+- track:endless-climb
 ---
 Group: Disc 3
 ---
 Track: ~~DISC 3~~
 Artist: Lambda Bledsoe, ndividedbyzero
 Duration: 0:26
-References:
-- Starblaze
 Directory: disc3-lofam4
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/disc-3-2
@@ -1735,16 +1733,14 @@ Commentary: |-
     We ended up going with Starblaze because it <i>does</i> have original portions and I'm fairly sure was one of those "universal yes" songs among the judges. My second choice would've been [[Fortune Healer]], probably.
 Cover Artists:
 - Matrosha
+Referenced Tracks:
+- Starblaze
 ---
 Track: Pseudumbra Phauxtasm
 Artist: Marcy Nabors, Jamie Paige Stanley
 Contributors:
 - Matt Martin (guitar)
 Duration: '6:30'
-References:
-- Penumbra Phantasm
-- Breath of the Wild Theme
-- Sunsetter
 Art Tags:
 - John
 - Alternate Calliope
@@ -1763,12 +1759,14 @@ Commentary: |-
     While this image wasn't originally made for Pseudumbria Phauxtasm, I think it is a fitting illustration to accompany it: this track is an expansive and beautifully-made arrangement of the elusive Penumbra Phantasm, a track that has been kept under wraps for almost as long as the end of Homestuck itself.
 Cover Artists:
 - Circlejourney
+Referenced Tracks:
+- Penumbra Phantasm
+- Breath of the Wild Theme
+- Sunsetter
 ---
 Track: Crystalmethequins (Broken Bad)
 Artist: Astro Kid
 Duration: '6:33'
-References:
-- Crystalmethequins
 Art Tags:
 - Vriska
 - Aradia
@@ -1784,21 +1782,12 @@ Commentary: |-
     (Note: Don't do drugs, kids. Note 2: Don't even THINK of doing meth, trust on this one, please. Note 3: This isn't actually all-new, it's been around since 2013, but BOY is it still a doozy. Note 4: This is a remix of a remix of a remix. Are you a bad enough dude (or any casual moniker of your choice) to continue the chain? Note 5: I've run out of ntoes, so I guess... enjoy the song?!?!?)
 Cover Artists:
 - tti
+Referenced Tracks:
+- Crystalmethequins
 ---
 Track: Thyme on My Fries
 Artist: SplitSuns
 Duration: '3:24'
-References:
-- Axel F
-- Time on My Side
-- E.T.
-- Smackdown
-- Moonsetter
-- Waters of Nazareth
-- I'm a Member of the Midnight Crew
-- Vela-Nova
-- Unite Synchronization
-- track:MeGaLoVania
 Art Tags:
 - Dirk
 - Jake
@@ -1818,18 +1807,21 @@ Commentary: |-
     Oh, and thanks to Nights for finding the image of the sun for the line in the middle.
 Cover Artists:
 - Ephemerald
+Referenced Tracks:
+- Axel F
+- Time on My Side
+- E.T.
+- Smackdown
+- Moonsetter
+- Waters of Nazareth
+- I'm a Member of the Midnight Crew
+- Vela-Nova
+- Unite Synchronization
+- track:MeGaLoVania
 ---
 Track: Raise of the Conductor's Baton
 Artist: Hadron
 Duration: '3:02'
-References:
-- Formation
-- Skaia Voyages
-- Cascade (Beta)
-- track:sburban-jungle
-- Another Jungle
-- Celestial Fantasia
-- Homestuck Anthem
 Art Tags:
 - Alternate Calliope
 URLs:
@@ -1842,12 +1834,18 @@ Commentary: |-
     This track was amde way back in November for the [S] Finale animation, a culmination of Cool and New Web Comic lore Hadron had been working on for a long time. The track features a bunch of obscure little refefernces like Skaian Voyages and Celestial Fantasia, both amazing Beatfox songs you should probably look up, and Formation, the Hadron song you've already listened to. Beatfox is a music god, and Hadron knew just how to combine all the good leitmotifs in order to make the song feel as grand and epic as humanly possible. I actually named this track, as I feel cool Homestuck quotes like "Raise of the Conductor's Baton" ought to be used when they fit the content (and indeed, Rose raises her wand... conductorly... in the animation mentioned above. Seriously, <a href="https://www.youtube.com/watch?v=Vgw1yxGLStI">go watch</a> [S] Finale when you're done with this album).
 Cover Artists:
 - Hadron
+Referenced Tracks:
+- Formation
+- Skaia Voyages
+- Cascade (Beta)
+- track:sburban-jungle
+- Another Jungle
+- Celestial Fantasia
+- Homestuck Anthem
 ---
 Track: Radness from Concentrate
 Artist: Whimsy
 Duration: '3:19'
-References:
-- track:beatdown-strider-style
 Art Tags:
 - Dave
 URLs:
@@ -1861,6 +1859,8 @@ Commentary: |-
     Radness is a rad song so it needed a rad track art and what is mroe rad than alpha dave saoring through space on unreal air? but there's also a bit of playfulness to the song which is why I added those shitty statues of liberty. Imagine dave with pockets full of shitty statues of liberty just tossing them down on the planet as he flies by.
 Cover Artists:
 - piskomil
+Referenced Tracks:
+- track:beatdown-strider-style
 ---
 Track: Conflict!
 Artist: Emelia K.
@@ -1879,9 +1879,6 @@ Cover Artists:
 Track: Solar Momentum
 Artist: Nicholas Nakano
 Duration: '2:51'
-References:
-- Pushing Onwards
-- Sunsetter
 Art Tags:
 - PM
 - Jack Noir
@@ -1895,18 +1892,13 @@ Commentary: |-
     The pairing of aggressive electric guitar and elegant violin immediately made me think of the similarly aggressive-but-elegant PM, and the snazzy chip tune flair inspired the pixelated art style.
 Cover Artists:
 - Mags
+Referenced Tracks:
+- Pushing Onwards
+- Sunsetter
 ---
 Track: -Omega- Timeline
 Artist: Aris Martinian
 Duration: '3:07'
-References:
-- Gold Pilot
-- English
-- track:intro-canwave2
-- Of Gods and Witches
-- Science Blaster
-- Formation
-- track:sburban-jungle
 Art Tags:
 - Terezi
 URLs:
@@ -1919,15 +1911,18 @@ Commentary: |-
     Omega Timeline is a song about the Game Over timeline, which Terezi heavily assists in healing with a plan she formed herself. Naturally, then, it works for the art to show Terezi in the middle of her final journey in this timeline, inches away from finding her true potential. It fits the adventurous and determined nature of the song pretty well! The fact that the letter Omega is associated with Libra helps too, of course.
 Cover Artists:
 - cobaltmoth
+Referenced Tracks:
+- Gold Pilot
+- English
+- track:intro-canwave2
+- Of Gods and Witches
+- Science Blaster
+- Formation
+- track:sburban-jungle
 ---
 Track: Emerald Cinders
 Artist: Grace Medley
 Duration: '5:12'
-References:
-- Rhapsody in Green
-- Afraid of the Darko
-- Carne Vale
-- English
 Art Tags:
 - Snowman
 URLs:
@@ -1940,6 +1935,11 @@ Commentary: |-
     snowman a la mal from inception. credit to power for the concept!
 Cover Artists:
 - sonotcanon
+Referenced Tracks:
+- Rhapsody in Green
+- Afraid of the Darko
+- Carne Vale
+- English
 ---
 Track: Sugar Cubes
 Artist: Kusoro
@@ -1974,10 +1974,6 @@ Cover Artists:
 Track: Prospitian Monody
 Artist: Viko Riféo
 Duration: '2:04'
-References:
-- Cascade (Beta)
-- Rhapsody in Green
-- Rex Duodecim Angelus
 Art Tags:
 - Carapacians
 - 'cw: blood'
@@ -1995,16 +1991,14 @@ Commentary: |-
     Also johndave is a bad ship suck it viko
 Cover Artists:
 - Jas
+Referenced Tracks:
+- Cascade (Beta)
+- Rhapsody in Green
+- Rex Duodecim Angelus
 ---
 Track: Shatter
 Artist: Kanishka
 Duration: '1:58'
-References:
-- Double Midnight
-- Amen, Brother
-- Penumbra Phantasm
-- A Baby Legend - The Baby is 2
-- Dirgeish
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/shatter
 - https://youtu.be/dxjSHHDLekQ
@@ -2017,6 +2011,12 @@ Commentary: |-
     "Boom boom boom boom<br>I want you in my room<br>Let's spend the night together<br>From now until forever<br>Boom boom boom boom<br>I wanna double boom<br>Let's spend the night together<br>Together in my room" - Vengaboys
 Cover Artists:
 - Andiavang
+Referenced Tracks:
+- Double Midnight
+- Amen, Brother
+- Penumbra Phantasm
+- A Baby Legend - The Baby is 2
+- Dirgeish
 ---
 Track: Denizen
 Artist: Kouta
@@ -2040,13 +2040,6 @@ Artist: Interrobang
 Contributors:
 - Seijen (mastering)
 Duration: '2:20'
-References:
-- Bilious
-- Earthsea Borealis
-- English
-- Umbral Ultimatum
-- track:endless-climb
-- Even in Death
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/ultimate-alchemy
 - https://youtu.be/0mYCTAeiHGw
@@ -2059,6 +2052,13 @@ Commentary: |-
     This is one part of a larger iamge formed of the covers of this, [[Crystalendofgames]], and [[Black Hole / White Door]].
 Cover Artists:
 - Circlejourney
+Referenced Tracks:
+- Bilious
+- Earthsea Borealis
+- English
+- Umbral Ultimatum
+- track:endless-climb
+- Even in Death
 ---
 Track: The Sock Ruse
 Artist: Alex Votl
@@ -2087,12 +2087,6 @@ Cover Artists:
 Track: Juju Breaker
 Artist: ndividedbyzero
 Duration: '4:10'
-References:
-- Purple Bard
-- track:sburban-jungle
-- track:explore
-- English
-- Eternity Served Cold
 Art Tags:
 - The Felt
 URLs:
@@ -2107,6 +2101,12 @@ Commentary: |-
     Oh right, on another note, Crowbar's pretty sweet, I guess. Enjoy.
 Cover Artists:
 - Griever
+Referenced Tracks:
+- Purple Bard
+- track:sburban-jungle
+- track:explore
+- English
+- Eternity Served Cold
 ---
 Track: Tragic Heights
 Artist: Thomas Ferkol
@@ -2147,11 +2147,6 @@ Cover Artists:
 Track: Everlasting
 Artist: Joe Ouellet
 Duration: '4:40'
-References:
-- track:sburban-jungle
-- track:doctor
-- track:endless-climb
-- Even in Death
 Art Tags:
 - Roxy
 URLs:
@@ -2164,13 +2159,15 @@ Commentary: |-
     When I hear the song, it's a no brainer that it was about Roxy in the dreambubbles, being a remix of 'Even in Death' and all. What was tricky was figuring out what exactly to show in the track art: what angle, what aspect of the dreambubbles, and so on. I didn't want to make the art too busy, so I went for a simpler piece that showcased one of the grander moments of the 'Roxy: Sleepwalk' flash—where the music swells as Roxy falls into that dream bubble. Pinks and purples were used cause they pop on the black, and they're nice mysterious colors.
 Cover Artists:
 - PatManDX
+Referenced Tracks:
+- track:sburban-jungle
+- track:doctor
+- track:endless-climb
+- Even in Death
 ---
 Track: Crystalline Repose
 Artist: Willow Ascenzo
 Duration: '5:42'
-References:
-- Corridors of Time
-- Crystalanthemums
 Art Tags:
 - Aradia
 URLs:
@@ -2183,15 +2180,13 @@ Commentary: |-
     Chrono Trigger is a great game. Corridors of Time is a great song. Crystalanthemums is also a great song. Any questions?
 Cover Artists:
 - dodostad
+Referenced Tracks:
+- Corridors of Time
+- Crystalanthemums
 ---
 Track: Black Hole / White Door
 Artist: ehlsea
 Duration: '3:14'
-References:
-- Black Rose / Green Sun
-- track:chorale-for-jaspers
-- Courser
-- Black Hole / Green Sun
 Art Tags:
 - John
 - Rose
@@ -2217,19 +2212,15 @@ Commentary: |-
     The final boss is beaten. The game is won. The lights fade and the world begins to disappear. A gaping maw drags all into it, even the very fabric of reality. In the distance, a door opens.
 Cover Artists:
 - Circlejourney
+Referenced Tracks:
+- Black Rose / Green Sun
+- track:chorale-for-jaspers
+- Courser
+- Black Hole / Green Sun
 ---
 Track: Strife Mayhem
 Artist: Musical Panini
 Duration: '5:39'
-References:
-- Flare
-- Eternity Served Cold
-- Carne Vale
-- track:showtime-original-mix
-- track:beatdown-strider-style
-- Crystamanthequins
-- track:black
-- track:MeGaLoVania
 Art Tags:
 - John
 - Rose
@@ -2278,13 +2269,19 @@ Commentary: |-
     I have wanted to do something like this for a long time. Final Fantasy 6 is a big inspiration for me, particularly the in-battle sprites and backgrounds. Homestuck, with its numerous great designs, seemed like it would be really fun to render in this style. When I saw Strife Mayhem on the song list I knew what I had to do--a large-scale battle with lots of characters to match an amazing battle song with lots of leitmotifs. I pulled a few elements from my previous track arts which were sort of stabs in the same direction, particularly the background from Medium and the handmaid from Maidswap. The GUI is also a bit of a reference to the previous track art for this song on Cool and New Volume 7.
 Cover Artists:
 - Scarodactyl
+Referenced Tracks:
+- Flare
+- Eternity Served Cold
+- Carne Vale
+- track:showtime-original-mix
+- track:beatdown-strider-style
+- Crystamanthequins
+- track:black
+- track:MeGaLoVania
 ---
 Track: Moonsetter (Strider Remix)
 Artist: Cement City
 Duration: '2:26'
-References:
-- Moonsetter
-- Mad About the Boy
 Art Tags:
 - Dave
 - Dirk
@@ -2300,6 +2297,9 @@ Commentary: |-
     Honestly, the head of an ogre doesn't sound like the most comfortable chair to me, but evidently, the Striders disagree. I guess they're too... cool...
 Cover Artists:
 - Kate Griffith
+Referenced Tracks:
+- Moonsetter
+- Mad About the Boy
 ---
 Track: Exsanguinated
 Artist: Seijen
@@ -2321,9 +2321,6 @@ Cover Artists:
 Track: Premortem
 Artist: Noisemaker
 Duration: '2:12'
-References:
-- Purple Tyrant
-- track:crustacean
 Art Tags:
 - Gamzee
 - Kurloz
@@ -2338,32 +2335,13 @@ Commentary: |-
 Cover Artists:
 - 0ysTezy
 - EllenZarael
+Referenced Tracks:
+- Purple Tyrant
+- track:crustacean
 ---
 Track: Fruitjam
 Artist: ndividedbyzero
 Duration: '3:34'
-References:
-- Your Best Friend
-- Softly
-- Fall of Fall ~ Autumnal Waterfall
-- Safe Return
-- The Beginning of Something Really Excellent
-- An Apple Disaster!!
-- Ryuunosuke Akutagawa's "Kappa" ~ Candid Friend
-- Bad Apple!!
-- Native Faith
-- The Primal Scene of Japan the Girl Saw
-- Menu (Full)
-- Sleeping Terror
-- Homestuck Anthem
-- track:upward-movement-dave-owns
-- Calamari Inkantation
-- Feel (Alive)
-- Hopes and Dreams
-- Theme
-- September Pumpkin
-- Theme of Eastern Story
-- Magical Hopalong Cassidy Station
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/fruitjam
 - https://youtu.be/kKKh0izriyc
@@ -2401,6 +2379,28 @@ Commentary: |-
     - [[Magical Hopalong Cassidy Station]] - 3:18-3:29
 Cover Artists:
 - sweetjegus
+Referenced Tracks:
+- Your Best Friend
+- Softly
+- Fall of Fall ~ Autumnal Waterfall
+- Safe Return
+- The Beginning of Something Really Excellent
+- An Apple Disaster!!
+- Ryuunosuke Akutagawa's "Kappa" ~ Candid Friend
+- Bad Apple!!
+- Native Faith
+- The Primal Scene of Japan the Girl Saw
+- Menu (Full)
+- Sleeping Terror
+- Homestuck Anthem
+- track:upward-movement-dave-owns
+- Calamari Inkantation
+- Feel (Alive)
+- Hopes and Dreams
+- Theme
+- September Pumpkin
+- Theme of Eastern Story
+- Magical Hopalong Cassidy Station
 ---
 Track: Lightfall
 Artist: nights
@@ -2420,8 +2420,6 @@ Cover Artists:
 Track: Blanc
 Artist: Sean Gorter
 Duration: '5:00'
-References:
-- track:black
 Art Tags:
 - Midnight Crew
 URLs:
@@ -2434,18 +2432,12 @@ Commentary: |-
     It's been long enough since I made this image that I don't have much that I can remember to say about this, beyond feeling like I really nailed Boxcars' face.
 Cover Artists:
 - Daniel McDonald
+Referenced Tracks:
+- track:black
 ---
 Track: Collision Course (Davepeta's Movement)
 Artist: SplitSuns
 Duration: '4:05'
-References:
-- track:upward-movement-dave-owns
-- track:beatdown-strider-style
-- Sunsetter
-- CORE
-- English
-- Olive Rogue
-- Hardchorale
 Art Tags:
 - Davepeta
 - Lil Cal
@@ -2460,39 +2452,19 @@ Commentary: |-
     <img src="media/misc/collision-course-bonus.png" width="1400" height="1400">
 Cover Artists:
 - Shadok
+Referenced Tracks:
+- track:upward-movement-dave-owns
+- track:beatdown-strider-style
+- Sunsetter
+- CORE
+- English
+- Olive Rogue
+- Hardchorale
 ---
 Track: Revisit/Rewind
 Directory: revisit-rewind
 Artist: Aris Martinian
 Duration: '6:13'
-References:
-- track:doctor
-- Cascade (Beta)
-- track:sburban-jungle
-- Tick
-- Lord Spanish
-- Fruity Pebbles Jingle
-- Potato Knishes
-- The Ultimate Showdown of Ultimate Destiny
-- Rex Mille Geromius
-- Penumbra Phantasm
-- Even in Death
-- Space Jam
-- track:chorale-for-jaspers
-- At The Price of Oblivion
-- Contra
-- Ascend
-- track:MeGaLoVania
-- Moshi Moshi?
-- Unintentional Touhou
-- CONTACT
-- track:upward-movement-dave-owns
-- Formation
-- Jungle
-- Muse of Nanchos
-- Meet the Flintstones
-- track:intro-canwave2
-- RollerCoaster Tycoon Theme
 Art Tags:
 - John
 - Aradia
@@ -2535,15 +2507,40 @@ Commentary: |-
     - [[RollerCoaster Tycoon Theme]] - 5:33-6:12
 Cover Artists:
 - nights
+Referenced Tracks:
+- track:doctor
+- Cascade (Beta)
+- track:sburban-jungle
+- Tick
+- Lord Spanish
+- Fruity Pebbles Jingle
+- Potato Knishes
+- The Ultimate Showdown of Ultimate Destiny
+- Rex Mille Geromius
+- Penumbra Phantasm
+- Even in Death
+- Space Jam
+- track:chorale-for-jaspers
+- At The Price of Oblivion
+- Contra
+- Ascend
+- track:MeGaLoVania
+- Moshi Moshi?
+- Unintentional Touhou
+- CONTACT
+- track:upward-movement-dave-owns
+- Formation
+- Jungle
+- Muse of Nanchos
+- Meet the Flintstones
+- track:intro-canwave2
+- RollerCoaster Tycoon Theme
 ---
 Track: Homestuck Sonata
 Artist: David Ellis
 Contributors:
 - James Ellis (production)
 Duration: '7:46'
-References:
-- Homestuck
-- Penumbra Phantasm
 Art Tags:
 - John
 URLs:
@@ -2556,12 +2553,13 @@ Commentary: |-
     This idea came to me after scrapping a few rought drafts. Originally I planned for an artwork starring an original hero, but decided to change it to something involving John because his associated instrument is a piano. It was a difficult piece to draw, but I am very happy with the finished result and feel I created something really dynamic.
 Cover Artists:
 - Sozzay
+Referenced Tracks:
+- Homestuck
+- Penumbra Phantasm
 ---
 Track: Wicker Kingdom
 Artist: Kurtis Burton
 Duration: '3:58'
-References:
-- White King
 Art Tags:
 - WQ
 - WK
@@ -2576,22 +2574,14 @@ Commentary: |-
     A rhythmic, galloping reel brings to mind our lost monarchs.
 Cover Artists:
 - PatManDX
+Referenced Tracks:
+- White King
 ---
 Track: Skaian Rebirth
 Artist: Kris Flacke
 Contributors:
 - Tamara Fritz (vocals)
 Duration: '8:31'
-References:
-- track:skies-of-skaia
-- track:aggrieve
-- track:showtime-original-mix
-- Gardener
-- track:upward-movement-dave-owns
-- track:beatdown-strider-style
-- Even in Death
-- Homestuck Anthem
-- track:sburban-jungle
 Art Tags:
 - John
 - Rose
@@ -2613,3 +2603,13 @@ Commentary: |-
     P.S. If you don't know what spectograms are... now would be a useful time to learn.
 Cover Artists:
 - Sam Garcia
+Referenced Tracks:
+- track:skies-of-skaia
+- track:aggrieve
+- track:showtime-original-mix
+- Gardener
+- track:upward-movement-dave-owns
+- track:beatdown-strider-style
+- Even in Death
+- Homestuck Anthem
+- track:sburban-jungle
diff --git a/album/lofam5.yaml b/album/lofam5.yaml
index 9c305ad2..dce39bbd 100644
--- a/album/lofam5.yaml
+++ b/album/lofam5.yaml
@@ -2,9 +2,6 @@ Album: Land of Fans and Music 5
 Directory: lofam5
 Wallpaper File Extension: png
 Wallpaper Style: 'opacity: 0.9;'
-Banner Art:
-- Monckat
-- Niklink (edits for wiki)
 Banner File Extension: png
 Banner Dimensions: 1100x180
 Date: December 19, 2021
@@ -29,12 +26,13 @@ Cover Artists:
 - Monckat
 Wallpaper Artists:
 - Monckat
+Banner Artists:
+- Monckat
+- Niklink (edits for wiki)
 ---
 Track: Skaian Spirograph
 Artist: WarxTron
 Duration: '2:56'
-References:
-- track:skies-of-skaia
 Art Tags:
 - John
 - Rose
@@ -47,23 +45,12 @@ Commentary: |-
     Skaia has such pretty colours, I wanted to capture that.
 Cover Artists:
 - Circlejourney
+Referenced Tracks:
+- track:skies-of-skaia
 ---
 Track: Spacetime Starstriker
 Artist: Cryptanark
 Duration: '2:19'
-References:
-- track:doctor
-- Gaia Queen
-- track:in-the-beginning-canwc
-- Muse of Nanchos
-- track:aggrieve
-- Midnight Suffer
-- RollerCoaster Tycoon Theme
-Samples:
-- Bowman's Credit Score
-- RollerCoaster Tycoon 2
-- track:next-arrow
-- GameBro (Original 1990 Mix)
 Art Tags:
 - Rose
 URLs:
@@ -84,24 +71,23 @@ Commentary: |-
     Many of the motifs and quotes in this track are lifted from CANMT tracks. What a fun group! Those folks helped me get into music-making in the first place, and I most certainly would not be here without them. I encourage you to check out some of the more experimental albums we released. They’re more interesting to me than the Greatest Hits compilations, anyhow.
 Cover Artists:
 - avocado
+Referenced Tracks:
+- track:doctor
+- Gaia Queen
+- track:in-the-beginning-canwc
+- Muse of Nanchos
+- track:aggrieve
+- Midnight Suffer
+- RollerCoaster Tycoon Theme
+Sampled Tracks:
+- Bowman's Credit Score
+- RollerCoaster Tycoon 2
+- track:next-arrow
+- GameBro (Original 1990 Mix)
 ---
 Track: Post​-​Ironic Radical Child Abuse Anthem
 Artist: Gryotharian
 Duration: '1:57'
-References:
-- track:beatdown-strider-style
-- Cascade (Beta)
-- vs bros
-- track:sburban-jungle
-Samples:
-- Tony Hawk's Pro Skater 2
-- uh oh
-- TEETH AND BLOOD
-- hurt2.wav
-- Sega Jingle
-- Tekkno Pigeon
-- All Minions Go To Hell Main Title Theme
-- Sonic the Hedgehog 2
 Art Tags:
 - Dave's bro
 URLs:
@@ -121,18 +107,24 @@ Commentary: |-
     I hope the art reflects that energy too. I’ve been told I have a particular talent for ironically bad masterpieces.
 Cover Artists:
 - Gryotharian
+Referenced Tracks:
+- track:beatdown-strider-style
+- Cascade (Beta)
+- vs bros
+- track:sburban-jungle
+Sampled Tracks:
+- Tony Hawk's Pro Skater 2
+- uh oh
+- TEETH AND BLOOD
+- hurt2.wav
+- Sega Jingle
+- Tekkno Pigeon
+- All Minions Go To Hell Main Title Theme
+- Sonic the Hedgehog 2
 ---
 Track: InterNep
 Artist: Tee-vee
 Duration: '5:17'
-References:
-- Olive Rogue
-- Walls Covered in Blood
-Samples:
-- Fox Hunt (1996)
-- OUR $3,400,000 MANSION! (House Tour)
-- Louis Cole Drum Beat Tutorials
-- Chats, Kwiskas
 Art Tags:
 - Nepeta
 - Equius
@@ -151,13 +143,19 @@ Commentary: |-
     <img src="media/misc/internep-top-nep.png" width="117" height="134"> I'm sorry for my sins
 Cover Artists:
 - Gryotharian
+Referenced Tracks:
+- Olive Rogue
+- Walls Covered in Blood
+Sampled Tracks:
+- Fox Hunt (1996)
+- OUR $3,400,000 MANSION! (House Tour)
+- Louis Cole Drum Beat Tutorials
+- Chats, Kwiskas
 ---
 Track: 'Princess Berryboo and Her Orchestra Present "Friendship is Paramount" ft.
     Squishy Tentacle On Piano '
 Artist: Aradiawithgeese
 Duration: '3:44'
-References:
-- Friendship is Paramount
 Art Tags:
 - MSPA Reader
 - Squiddles
@@ -169,6 +167,8 @@ Commentary: |-
     This one I actually wrote a while ago. At this point I was just challenging myself to make as many homestuck covers in as many different styles as I could and I think this one is particularly special. Squiddles were already one of my favorite little lore spirals from homestuck so to be able to put a little bit more AU weirdness is something Im honored to be able to do.
 Cover Artists:
 - Gryotharian
+Referenced Tracks:
+- Friendship is Paramount
 ---
 Track: On an Island Far Away
 Artist: Circlejourney
@@ -192,11 +192,6 @@ Cover Artists:
 Track: 24/7 lo fi anime beats to achieve your destiny to
 Artist: FrostyMac
 Duration: '3:02'
-References:
-- Penumbra Phantasm
-- track:doctor
-- Heir of Grief
-- Moshi Moshi?
 Art Tags:
 - John
 URLs:
@@ -208,16 +203,16 @@ Commentary: |-
     Yeah I don’t think I had another option I had to draw this.
 Cover Artists:
 - Gryotharian
+Referenced Tracks:
+- Penumbra Phantasm
+- track:doctor
+- Heir of Grief
+- Moshi Moshi?
 ---
 Track: Alpha Admission
 Directory: alpha-admission-lofam5
-AKA: track:alpha-admission
 Artist: Pascal van den Bos
 Duration: '3:47'
-References:
-- Temporal Guardian
-- Cooldown
-- Daughter
 Art Tags:
 - Dirk
 - 'cw: blood (abstract)'
@@ -229,14 +224,16 @@ Commentary: |-
     In a cross-multiversal display of brotherhood among shades-wearing anime swordsmen, Dirk and Kate’s dad (from [[group:desynced]]) chop up some goons. As a certified MSPFA addict I couldn’t pass up a  chance to give an excellent fanventure a shoutout in the art for this track (which originated in its OST).
 Cover Artists:
 - Monckat
+Referenced Tracks:
+- Temporal Guardian
+- Cooldown
+- Daughter
+Also Released As:
+- track:alpha-admission
 ---
 Track: Cut the Chain
 Artist: Sylvarn
 Duration: '4:07'
-References:
-- Prospit Dreamers
-- Cascade (Beta)
-- Midnight
 Art Tags:
 - Jack Noir
 URLs:
@@ -248,12 +245,14 @@ Commentary: |-
     Jack Noir decides Prospit didn’t need its moon anyway. I tried my best to convey Noir’s speed, as well as the scale and chonk of those massive golden chains. And yes the chains really are that long in canon please don’t go check
 Cover Artists:
 - Monckat
+Referenced Tracks:
+- Prospit Dreamers
+- Cascade (Beta)
+- Midnight
 ---
 Track: Firefly Storm
 Artist: Astro Kid
 Duration: '6:46'
-References:
-- Firefly Cloud
 Art Tags:
 - John
 URLs:
@@ -263,12 +262,12 @@ Commentary: |-
     As always, Astro Kid manages to turn any track into a rave-worthy bop, no matter how melancholic the original is. This used to be a lost track, and I might have never heard it if Rafe Saltman hadn’t reuploaded it on Youtube, so he deserves our thanks. This art piece was actually inspired by the track a few months after it was made, so I contacted the artist to finally make it official, half a decade later.
 Cover Artists:
 - nagunkgunk
+Referenced Tracks:
+- Firefly Cloud
 ---
 Track: Urban Jungle
 Artist: FrostyMac
 Duration: '3:01'
-References:
-- track:sburban-jungle
 Art Tags:
 - John
 - Rose
@@ -281,18 +280,12 @@ Commentary: |-
     This song was made up on the spot note-by-note, but I think it turned out well.
 Cover Artists:
 - V-6
+Referenced Tracks:
+- track:sburban-jungle
 ---
 Track: Spritely Gardener
 Artist: Andrew "Rainy" Obeng
 Duration: '3:19'
-References:
-- Jadesprite
-- The Beginning of Something Really Excellent
-- Courser
-- Carefree Action
-- Snowfall
-- Blue Atom
-- Softly
 Art Tags:
 - Jade
 URLs:
@@ -302,15 +295,18 @@ Commentary: |-
     This song is is a redo of my very first piece of homestuck fanmusic I ever did. I wanted a remix of a lesser known homestuck song so I decided to do a remix of Toby Fox's [[Jadesprite]].
 Cover Artists:
 - Chesswanderlust-sama
+Referenced Tracks:
+- Jadesprite
+- The Beginning of Something Really Excellent
+- Courser
+- Carefree Action
+- Snowfall
+- Blue Atom
+- Softly
 ---
 Track: Special Delivery
 Artist: Kanishka
 Duration: '3:20'
-References:
-- White
-- Double Midnight
-- Flight of the White Wolf
-- Unsheath'd
 Art Tags:
 - PM
 URLs:
@@ -320,19 +316,15 @@ Commentary: "<i>Kanishka:</i>\nLiberty. Reason. Justice. Civility. Edification.
     \ to draw PM with the sentry worm. "
 Cover Artists:
 - Circlejourney
+Referenced Tracks:
+- White
+- Double Midnight
+- Flight of the White Wolf
+- Unsheath'd
 ---
 Track: Sunriser
 Artist: Kusoro
 Duration: '3:16'
-References:
-- Sunsetter
-- Skaian Summoning
-- Penumbra Phantasm
-- track:MeGaLoVania
-- Ascend
-- Conflict!
-Samples:
-- ???
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/sunriser
 Commentary: |-
@@ -340,12 +332,19 @@ Commentary: |-
     The crimson glow of the rising sun falls across the Strider apartment complex, and it looks like Dave’s pulled an all-nighter working on his jams. His neighbors must love him. I made this art pretty quickly but I’m proud of it all the same, managed to capture some vibes.
 Cover Artists:
 - Monckat
+Referenced Tracks:
+- Sunsetter
+- Skaian Summoning
+- Penumbra Phantasm
+- track:MeGaLoVania
+- Ascend
+- Conflict!
+Sampled Tracks:
+- ???
 ---
 Track: Aggrieve (Knightcore Mix)
 Artist: cookiefonster
 Duration: '1:53'
-References:
-- track:aggrieve
 Art Tags:
 - Rose
 - Doc Scratch
@@ -361,13 +360,12 @@ Commentary: "<i>cookiefonster:</i>\nAnother song from the Cool and New Music Tea
     \ room in her house just for Orb Pondering. And Kanaya just has to deal with it. "
 Cover Artists:
 - Gryotharian
+Referenced Tracks:
+- track:aggrieve
 ---
 Track: Dreamers
 Artist: Scorpyus
 Duration: '5:29'
-References:
-- track:atomyk-ebonpyre
-- It Looks Back
 Art Tags:
 - Dave
 URLs:
@@ -383,13 +381,13 @@ Commentary: "<i>Scorpyus:</i>\nI did my best to capture the dreamy feeling of th
     \ I feel like I captured the vibe well enough. "
 Cover Artists:
 - Gryotharian
+Referenced Tracks:
+- track:atomyk-ebonpyre
+- It Looks Back
 ---
 Track: F∞ クライミング『CLIMBING』
 Artist: SplitSuns
 Duration: '2:50'
-References:
-- Climbing to Infinity
-- track:endless-climb
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/f-climbing
 Commentary: |-
@@ -397,13 +395,13 @@ Commentary: |-
     This track originates from CANWAVE 3, a vaporwave album for the Cool and New Music Team. Yes, we cursed the world with three of them, but it was all worth it if only for this SplitSuns track. For the less leitmotif-aware, this is a take on [[track:endless-climb]] by [[artist:buzinkai]]. Rest in peace.
 Cover Artists:
 - SplitSuns
+Referenced Tracks:
+- Climbing to Infinity
+- track:endless-climb
 ---
 Track: Pipe Dream
 Artist: Kanishka
 Duration: '4:51'
-References:
-- Litrichean Rioghail
-- Firefly Cloud
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/pipe-dream
 Commentary: |-
@@ -411,20 +409,13 @@ Commentary: |-
     You know that old Windows screensaver? No no, not the flying toasters. No, not the maze one! I mean that one that your teachers always used so you just stared at it all period instead of getting work done. Yes, with the pipes! This is that but LOWAS, and also taking 20 minutes to render a frame instead of whatever fps the old screensaver ran at. The cost of beauty. It's an honor to make art for a LOFAM album, I've been listening to the older ones since I was a teenager. You could say that with this art I fulfilled a Pipe Dream.
 Cover Artists:
 - Skyplayer
+Referenced Tracks:
+- Litrichean Rioghail
+- Firefly Cloud
 ---
 Track: Stab - Stab - Stab
 Artist: Interrobang
 Duration: '3:56'
-References:
-- Walk-Stab-Walk (R&E)
-- Rain
-- Flare
-- LRAD
-- PLUR Police
-- Boss Mode
-- Destroy Them With Lazers
-- Bad Apple!!
-- My Sharona
 Art Tags:
 - Jack Noir
 - Lord English
@@ -435,14 +426,20 @@ Commentary: |-
     I made this track for the Cool and New Music Team Felt/Midnight Crew album circa 2018 or so, and it was nominated for “the next LOFAM” long before any actual prep for this album had really started. I actually requested it be taken off of LOFAM5 because I felt it didn’t meet my standards anymore, but due to a miscommunication it stayed on. I found this out about 15 minutes before the release stream, which is happening as I type this - Album is sounding great, y’all! Anyway, hope it sounds better to you than it does to me.
 Cover Artists:
 - Gryotharian
+Referenced Tracks:
+- Walk-Stab-Walk (R&E)
+- Rain
+- Flare
+- LRAD
+- PLUR Police
+- Boss Mode
+- Destroy Them With Lazers
+- Bad Apple!!
+- My Sharona
 ---
 Track: A Dream Of Broken Clocks
 Artist: Gryotharian
 Duration: '6:31'
-References:
-- English
-- WORST END
-- The Puppetmaster
 Art Tags:
 - Doc Scratch
 URLs:
@@ -453,12 +450,14 @@ Commentary: |-
     This was some of the first non-pixel digital art I ever did, and for that, I think it turned out pretty well. However, I had a real knack for doing things the hardest possible way, and oh my god, I never want to draw another clock again. I did all of this, with a keyboard and trackpad, on a free trial for a photoshop knockoff. That wallpaper? I didn’t figure out how to use the copy-paste tool properly, and had to manually put in every detail on it. This was a nightmare to complete, (albeit a nightmare of my own making), so you all had better appreciate it.
 Cover Artists:
 - Gryotharian
+Referenced Tracks:
+- English
+- WORST END
+- The Puppetmaster
 ---
 Track: Black (Electro Swing Remix)
 Artist: Spad3s
 Duration: '2:55'
-References:
-- track:black
 Art Tags:
 - Jack Noir
 - 'cw: blood'
@@ -469,6 +468,8 @@ Commentary: |-
     The art for this track is actually <a href="https://www.youtube.com/watch?v=okTNlwSViX8">a video</a>, so I had to combine a few frames into one, but you can probably get the gist. Damn it Bandcamp, add APNG support already.
 Cover Artists:
 - J-Airshiper
+Referenced Tracks:
+- track:black
 ---
 Track: Dance of Entropy
 Artist: Gryotharian
@@ -487,14 +488,6 @@ Cover Artists:
 Track: Furthest Ringside
 Artist: Monckat
 Duration: '2:38'
-References:
-- Switchback
-- track:upward-movement-dave-owns
-- Core of Darkness
-- Ace of Trump
-- track:frost-vol6
-- At The Price of Oblivion
-- track:endless-climb
 Art Tags:
 - Rose
 - Dave
@@ -510,13 +503,18 @@ Commentary: "<i>Monckat:</i>\nA track vaguely themed around Dave, Rose, Derse, a
     \ in my fanventure The Tapestry more than canon Homestuck ones) "
 Cover Artists:
 - Monckat
+Referenced Tracks:
+- Switchback
+- track:upward-movement-dave-owns
+- Core of Darkness
+- Ace of Trump
+- track:frost-vol6
+- At The Price of Oblivion
+- track:endless-climb
 ---
 Track: Wayward
 Artist: Shwan
 Duration: '3:06'
-References:
-- track:upward-movement-dave-owns
-- track:endless-climb
 Art Tags:
 - WV
 URLs:
@@ -530,6 +528,9 @@ Commentary: "<i>Shwan:</i>\nI made this during a recent re-reading of Homestuck
     \ so probably not) "
 Cover Artists:
 - Monckat
+Referenced Tracks:
+- track:upward-movement-dave-owns
+- track:endless-climb
 ---
 Track: Upon Whom Sacrifice Calls
 Artist: Sylvarn
@@ -548,8 +549,6 @@ Cover Artists:
 Track: Sun and Setter
 Artist: Pascal van den Bos
 Duration: '1:29'
-References:
-- Sunsetter
 Art Tags:
 - Dave
 - Davesprite
@@ -560,12 +559,12 @@ Commentary: |-
     What a rad track! I'm not sure what the original [[Sunsetter]] is about, so I took a cue from the track art fan anthology piece for [[Sunsetter]], and also the backup art choice for this track.
 Cover Artists:
 - Circlejourney
+Referenced Tracks:
+- Sunsetter
 ---
 Track: Hippocampus Sea
 Artist: Levc
 Duration: '3:20'
-References:
-- Science Seahorse
 Art Tags:
 - Eridan's lusus
 URLs:
@@ -579,16 +578,12 @@ Commentary: "<i>Levc:</i>\nInspired by the short cover of [[Science Seahorse|sci
     \ side…\nAlso this tracks makes me want to eat ice cream for some reason. "
 Cover Artists:
 - Circlejourney
+Referenced Tracks:
+- Science Seahorse
 ---
 Track: She's a D8ddy L8ng L8gs
 Artist: Mathias Ramalho
 Duration: '5:31'
-References:
-- She's a Sp8der
-- Pumpkin Cravings
-- track:MeGaLoVania
-- Spider8ite!!!!!!!!
-- Die.
 Art Tags:
 - Vriska
 - Midnight Crew
@@ -599,12 +594,16 @@ Commentary: |-
     I believe this time it’s best to let the art speak for itself.
 Cover Artists:
 - Scarodactyl
+Referenced Tracks:
+- She's a Sp8der
+- Pumpkin Cravings
+- track:MeGaLoVania
+- Spider8ite!!!!!!!!
+- Die.
 ---
 Track: King Crab
 Artist: $C4RL3TT
 Duration: '2:12'
-References:
-- track:crustacean
 Art Tags:
 - Karkat
 URLs:
@@ -614,17 +613,12 @@ Commentary: |-
     Damn did you know this track references “[[track:crustacean]]” by [[group:toby-fox|Toby “Radiation” Fox]]???
 Cover Artists:
 - Gryotharian
+Referenced Tracks:
+- track:crustacean
 ---
 Track: ALIVE
 Artist: heir-of-puns
 Duration: '3:31'
-References:
-- Temporal Shenanigans
-- track:old-secret
-- Rust Apocalypse
-- track:MeGaLoVania
-Samples:
-- Temporal Shenanigans
 Art Tags:
 - Aradia
 URLs:
@@ -641,18 +635,17 @@ Commentary: "<i>heir-of-puns:</i>\n[[Temporal Shenanigans]] was the first homest
     \ and after coming back to life, and the change in her disposition. "
 Cover Artists:
 - Circlejourney
+Referenced Tracks:
+- Temporal Shenanigans
+- track:old-secret
+- Rust Apocalypse
+- track:MeGaLoVania
+Sampled Tracks:
+- Temporal Shenanigans
 ---
 Track: Blood Rite
 Artist: Scorpyus
 Duration: '6:13'
-References:
-- English
-- Alternia
-- 'BL1ND JUST1C3 : 1NV3ST1G4T1ON !!'
-- Terezi's Theme
-- '>>DiscThree<<'
-Samples:
-- '>>DiscThree<<'
 Art Tags:
 - The Condesce
 - The Handmaid
@@ -671,12 +664,18 @@ Commentary: "<i>Scorpyus:</i>\nStarted when I decided the [[track:discthree|Disc
     \ of alternia as it is. With a little nod to doc scratch through the handmaid. "
 Cover Artists:
 - swanfire
+Referenced Tracks:
+- English
+- Alternia
+- 'BL1ND JUST1C3 : 1NV3ST1G4T1ON !!'
+- Terezi's Theme
+- '>>DiscThree<<'
+Sampled Tracks:
+- '>>DiscThree<<'
 ---
 Track: Madame Controversielle 2
 Artist: cookiefonster
 Duration: '2:43'
-References:
-- Madame Controversielle
 Art Tags:
 - Vriska
 - Karkat
@@ -691,17 +690,12 @@ Commentary: |-
     I’m not sure about how this one turned out. All the chiptune and vriska definitely made me think of like, a retro game player select screen, so I went back to my old pixel art style, and tried to fill it with the most vriska that vriska could vriska. But it had been a while since I was working with plain pixel art again, and that probably shows.
 Cover Artists:
 - Gryotharian
+Referenced Tracks:
+- Madame Controversielle
 ---
 Track: Anamnesis
 Artist: Kanishka
 Duration: '3:58'
-References:
-- Vriska's Theme
-- Underfoot
-- Dreamers and The Dead
-- Cascade (Beta)
-- Cobalt Thief
-- Superego
 Art Tags:
 - Vriska
 - Jack Noir
@@ -710,14 +704,17 @@ URLs:
 - https://unofficialmspafans.bandcamp.com/track/anamnesis
 Cover Artists:
 - ricemilk
+Referenced Tracks:
+- Vriska's Theme
+- Underfoot
+- Dreamers and The Dead
+- Cascade (Beta)
+- Cobalt Thief
+- Superego
 ---
 Track: Pumpkin Party in Sea Hitler's Water Apocalypse (Cement City Remix)
 Artist: Cement City
 Duration: '4:22'
-References:
-- Pumpkin Party in Sea Hitler's Water Apocalypse
-Samples:
-- meow
 Art Tags:
 - The Condesce
 URLs:
@@ -732,13 +729,14 @@ Commentary: |-
     When I first heard the original version of the song, I didn’t immediately think dubstep would be a good fit, but I think [[artist:cement-city]] has proved us all wrong.
 Cover Artists:
 - dodostad
+Referenced Tracks:
+- Pumpkin Party in Sea Hitler's Water Apocalypse
+Sampled Tracks:
+- meow
 ---
 Track: Rex Duodecim Angelus (Remix)
 Artist: Artisticpolo
 Duration: '3:20'
-References:
-- Rex Duodecim Angelus
-- track:black
 Art Tags:
 - BK
 URLs:
@@ -750,13 +748,14 @@ Commentary: |-
     It’s hard to make a design like the unprototyped black king seem threatening.
 Cover Artists:
 - Gryotharian
+Referenced Tracks:
+- Rex Duodecim Angelus
+- track:black
 ---
 Track: Pondsquatter (Demaster/Demix)
 Directory: pondsquatter-demaster-demix
 Artist: Mathias Ramalho
 Duration: '3:52'
-References:
-- Pondsquatter
 Art Tags:
 - Genesis Frog
 URLs:
@@ -766,6 +765,8 @@ Commentary: |-
     This is actually the full version of an asset used for the fanventure “Karkat Goes to a Convention”, which I wholeheartedly recommend. This amazing art by Radical Dude 42, an expert in the original MSPA style, suggests the fanventure’s title might be selling it short…
 Cover Artists:
 - Radical Dude 42
+Referenced Tracks:
+- Pondsquatter
 ---
 Track: At the Threshold
 Artist: heir-of-puns
@@ -789,8 +790,6 @@ Cover Artists:
 Track: Scratching Consequences
 Artist: TirantBacon
 Duration: '1:44'
-References:
-- A Very "O" Christmas
 Art Tags:
 - Doc Scratch
 - John
@@ -802,19 +801,12 @@ Commentary: |-
     Some sort of interpretation of Doc Scratch’s manipulations, causing the heroes to create the green sun.
 Cover Artists:
 - Gryotharian
+Referenced Tracks:
+- A Very "O" Christmas
 ---
 Track: One Hour Later
 Artist: Kusoro
 Duration: '6:54'
-References:
-- The Thirteenth Hour
-- Double Midnight
-- track:beatdown-strider-style
-- Sunsetter
-- English
-- Penumbra Phantasm
-Samples:
-- I'm a Member of the Midnight Crew (Acapella)
 Art Tags:
 - Jack Noir
 - Dave
@@ -829,12 +821,19 @@ Commentary: |-
     The mixture of Jack Noir and Lord English/cherub themes, alongside the [[track:beatdown-strider-style|Beatdown]] reference, brought my mind straight to this scene from [S] Collide. The camera follows Jack English/Union Jack’s head upwards as it begins to blackholesplode, tilting at the mother of all dutch angles in the process.
 Cover Artists:
 - Monckat
+Referenced Tracks:
+- The Thirteenth Hour
+- Double Midnight
+- track:beatdown-strider-style
+- Sunsetter
+- English
+- Penumbra Phantasm
+Sampled Tracks:
+- I'm a Member of the Midnight Crew (Acapella)
 ---
 Track: Viridescent Flare
 Artist: Shwan
 Duration: '2:13'
-References:
-- Flare
 Art Tags:
 - Green Sun
 URLs:
@@ -844,6 +843,8 @@ Commentary: |-
     From the artist who made the hit single flarezzzzzzz (from Cool And New Homestuck), bringing you…, another [[Flare|flare]] song.
 Cover Artists:
 - Gryotharian
+Referenced Tracks:
+- Flare
 ---
 Track: The Dreamer and the Dream
 Artist: Kal-la-kal-la
@@ -861,10 +862,6 @@ Cover Artists:
 Track: Sailing (In The Sea Of Stars)
 Artist: Circlejourney
 Duration: '4:22'
-References:
-- The Doom of the Planets
-- Fuchsia Moonrise
-- The Thirteenth Hour
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/sailing-in-the-sea-of-stars-2
 Commentary: "<i>Circlejourney:</i>\nA theme for the post-Epilogue crew(s) sailing\
@@ -874,14 +871,16 @@ Commentary: "<i>Circlejourney:</i>\nA theme for the post-Epilogue crew(s) sailin
     \ with less constraints and it turned out neat :>"
 Cover Artists:
 - Awkward
+Referenced Tracks:
+- The Doom of the Planets
+- Fuchsia Moonrise
+- The Thirteenth Hour
 ---
 Track: She's Out There (In The Sea Of Stars)
 Artist: Circlejourney
 Contributors:
 - Ucklin (additional vocals)
 Duration: '3:22'
-References:
-- Sailing (In The Sea Of Stars)
 Art Tags:
 - Kanaya
 - Rose
@@ -907,17 +906,12 @@ Commentary: |-
     "She’s Out There, Somewhere In The Sea Of Stars." Kanaya remembers Rose. Many thanks to Ucklin for the additional vocals!
 Cover Artists:
 - ricemilk
+Referenced Tracks:
+- Sailing (In The Sea Of Stars)
 ---
 Track: Revelations of Self Importance
 Artist: Gryotharian
 Duration: '3:41'
-References:
-- Austin, Atlantis
-- track:endless-climb
-- Unite Synchronization
-- track:eclipse-svert
-- No More Elders
-- Sweet Dreams, Timaeus
 Art Tags:
 - Dirk
 - Dave
@@ -928,15 +922,19 @@ Commentary: |-
     I made this song shortly after reading Detective Pony, when Dirk Strider was fresh on my mind and skyrocketing to the top of my all-time favorite characters. I wanted to do something specifically for the offscreen period between the end of homestuck and the epilogues, his journey to becoming what he is now, his acceptance of becoming the villain, etc. Mainly, just really love Dirk. Also, it’s an excuse to give some love to some of his more underrated songs. (Basically anything that isn’t [[track:beatdown-strider-style|Beatdown]].) I had never even heard [[Austin, Atlantis|Austin Atlantis]] before I started on this song, and man was I missing out, so it quickly became the basis for the whole thing. In retrospect I wish I could’ve put [[Orange Hat]] in there somewhere, mainly just cause that’s also an awesome underrated song, but by the time I remembered, this was mostly done and it wouldn’t have really fit anywhere. This might be the song I’m happiest with on this album.
 Cover Artists:
 - tamajikis
+Referenced Tracks:
+- Austin, Atlantis
+- track:endless-climb
+- Unite Synchronization
+- track:eclipse-svert
+- No More Elders
+- Sweet Dreams, Timaeus
 ---
 Track: Strain
 Artist:
 - TirantBacon
 - WarxTron
 Duration: '2:27'
-References:
-- Five-Four Stress
-- Apexhalation
 Art Tags:
 - Dirk
 URLs:
@@ -948,13 +946,13 @@ Commentary: |-
     Dirk finds himself in a mildly spooky, straining situation deep in the depths of the Land of Tombs and Krypton.
 Cover Artists:
 - Monckat
+Referenced Tracks:
+- Five-Four Stress
+- Apexhalation
 ---
 Track: Death Minute in Duodecimal ~ Regicide Demonica
 Artist: Tee-vee
 Duration: '5:27'
-References:
-- Rex Duodecim Angelus
-- Scratch
 Art Tags:
 - BK
 URLs:
@@ -979,13 +977,13 @@ Commentary: "<i>Tee-vee:</i>\nI was listening to Demetori as I usually do and on
     \ in terms of color range and my most complex in terms of detail. "
 Cover Artists:
 - Monckat
+Referenced Tracks:
+- Rex Duodecim Angelus
+- Scratch
 ---
 Track: Black Hole's Dozen
 Artist: Monckat
 Duration: '3:25'
-References:
-- The Lyrist
-- The Thirteenth Hour
 Art Tags:
 - Alternate Calliope
 - Green Sun
@@ -999,17 +997,13 @@ Commentary: |-
     The teal and purple orbs are intended to be the orb things Alt Calliope uses to create the black hole in Act 7. My little headcanon for those orbs is that they're genesis frog frogspawn, basically embryonic universes. The idea being that since it took two universes to create the Green Sun, perhaps it takes three to destroy it.
 Cover Artists:
 - Monckat
+Referenced Tracks:
+- The Lyrist
+- The Thirteenth Hour
 ---
 Track: PAST FUNK IS WORSE THAN FUTURE FUNK
 Artist: Koba
 Duration: '2:19'
-References:
-- saoidfisd
-Samples:
-- saoidfisd
-- HEY MAN VOLUME 10 MAN HEY CHECK IT OUT
-- feeling right
-- Love Taste
 Art Tags:
 - Karkat
 URLs:
@@ -1037,11 +1031,32 @@ Commentary: |-
     what’s a homestuck
 Cover Artists:
 - cloudie
+Referenced Tracks:
+- saoidfisd
+Sampled Tracks:
+- saoidfisd
+- HEY MAN VOLUME 10 MAN HEY CHECK IT OUT
+- feeling right
+- Love Taste
 ---
 Track: Infinite Zest
 Artist: Noisemaker
 Duration: '6:00'
-References:
+Art Tags:
+- Jade
+- WV
+URLs:
+- https://unofficialmspafans.bandcamp.com/track/infinite-zest
+Lyrics: '[Mayor Maynot samples set to Megalovania]'
+Commentary: "<i>Makin:</i>\nOriginally known as “you have got to be SHITTONG me (temp\
+    \ title)”. No further commentary. \n<i>Monckat:</i>\nI really wasn’t sure what\
+    \ to draw for this one at first, and I’m not sure it’s even possible to capture\
+    \ everything going on here in a single image. But hey, I think any piece of art\
+    \ that contains a watermark of Sans WV superimposed over a pumpkin-guzzling black\
+    \ hole can’t be too bad."
+Cover Artists:
+- Monckat
+Referenced Tracks:
 - RollerCoaster Tycoon Theme
 - Greenhouse
 - Moonsetter
@@ -1056,34 +1071,13 @@ References:
 - track:MeGaLoVania
 - Broom Temperature
 - Title (Mega Man 3)
-Samples:
+Sampled Tracks:
 - Let The Squiddles Sleep (End Theme)
 - Mayor Maynot
-Art Tags:
-- Jade
-- WV
-URLs:
-- https://unofficialmspafans.bandcamp.com/track/infinite-zest
-Lyrics: '[Mayor Maynot samples set to Megalovania]'
-Commentary: "<i>Makin:</i>\nOriginally known as “you have got to be SHITTONG me (temp\
-    \ title)”. No further commentary. \n<i>Monckat:</i>\nI really wasn’t sure what\
-    \ to draw for this one at first, and I’m not sure it’s even possible to capture\
-    \ everything going on here in a single image. But hey, I think any piece of art\
-    \ that contains a watermark of Sans WV superimposed over a pumpkin-guzzling black\
-    \ hole can’t be too bad."
-Cover Artists:
-- Monckat
 ---
 Track: TEETH AND BLOOD
 Artist: Gryotharian
 Duration: '4:29'
-References:
-- English
-- Eternity Served Cold
-- track:sburban-jungle
-- An Unbreakable Union
-- Carne Vale
-- track:MeGaLoVania
 Art Tags:
 - Caliborn
 URLs:
@@ -1096,20 +1090,17 @@ Commentary: |-
     There was a lot going on in the production of this, and none of it had to do with the final track. A long, long time ago, before any of my other submissions, I was going to do a Caliborn track, with the intent of being presented as a track that Caliborn himself produced. But at that time, there weren’t many other submissions for this album yet, and a disturbingly high percentage of them were cherub related, so I dropped it. A year later, I was working on a remix of the afterword theme from Pesterquest, but it wasn’t really clicking right. The heavy bass synths and bitcrushed drums weren’t working for the style of the track. Around the same time, I finally got my hands on the incredibly elusive midi of [[Carne Vale]], which has been my favorite homestuck song since the first time I heard it, and has yet to be dethroned. So I had the crazy notion, that the instruments I was using for my Pesterquest remix would work fantastically if I decided to go back to a Caliborn track, now that I could properly reference [[Carne Vale]]. (I had been trying to figure out that bassline by ear for, oh lord, something like 3 years.) And, I ended up with what might be one of my favorite compositions of mine to date. Had it stuck in my head for months. Cleaned up the mixing over the next little while, and the rest is history. I had two names for it for a while, Teeth and Blood, and Space Crusader. Originally I was going to go with both, have one of those little ~ things in between, but I decided that Space Crusader, while it fit the vibe of the song, didn’t really fit the vibe of Caliborn, so I dropped it.
 Cover Artists:
 - Gryotharian
+Referenced Tracks:
+- English
+- Eternity Served Cold
+- track:sburban-jungle
+- An Unbreakable Union
+- Carne Vale
+- track:MeGaLoVania
 ---
 Track: Predomination
 Artist: Kal-la-kal-la
 Duration: '4:13'
-References:
-- Voidlight
-- Walk-Stab-Walk (R&E)
-- The Lyrist
-- Reverie
-- Carne Vale
-- Archagent Everlasting
-Samples:
-- Let The Squiddles Sleep (End Theme)
-- Mayor Maynot
 Art Tags:
 - Lord English
 - Calliope
@@ -1120,6 +1111,16 @@ Commentary: "<i>Monckat:</i>\nCalliope alone, haunted by visions of her other ha
     \ future. "
 Cover Artists:
 - Monckat
+Referenced Tracks:
+- Voidlight
+- Walk-Stab-Walk (R&E)
+- The Lyrist
+- Reverie
+- Carne Vale
+- Archagent Everlasting
+Sampled Tracks:
+- Let The Squiddles Sleep (End Theme)
+- Mayor Maynot
 ---
 Track: The Power of RETCON
 Artist: Levc
@@ -1140,8 +1141,6 @@ Cover Artists:
 Track: Heir of Grief (Sax Cover)
 Artist: subversiveasset
 Duration: '4:00'
-References:
-- Heir of Grief
 Art Tags:
 - Jack Noir
 URLs:
@@ -1151,11 +1150,23 @@ Commentary: |-
     You guys all remember that iconic moment in [S] Collide where PM finally steals the sax that Jack’s been using to play Black all this time and uses it to perform a haunting sax rendition of [[Heir of Grief]], right? Yeah me too, thought it was a perfect fit.
 Cover Artists:
 - Monckat
+Referenced Tracks:
+- Heir of Grief
 ---
 Track: Collapse Reprise
 Artist: Pascal van den Bos
 Duration: '5:44'
-References:
+URLs:
+- https://unofficialmspafans.bandcamp.com/track/collapse-reprise
+Commentary: "<i>Pascal van den Bos:</i>\nI originally wrote this song in 2019 for\
+    \ Stable Time Loops and Paradoxes 3 but i ended up scrapping it and completely\
+    \ redoing it, i'm not exactly sure why i did that but either way i felt really\
+    \ bad about that because IMO i ended up ruining the song LOL. So anyway this is\
+    \ the 3rd and proper final version of Collapse AKA \"The Descend of the PMT\"\
+    \ because it references so many songs. "
+Cover Artists:
+- Gryotharian
+Referenced Tracks:
 - Distortion Navigator
 - Temporal Virtuoso
 - track:d-break-the-bow
@@ -1168,25 +1179,10 @@ References:
 - More Real than Kraft Mayo
 - All Alone
 - Jittery Optimist
-URLs:
-- https://unofficialmspafans.bandcamp.com/track/collapse-reprise
-Commentary: "<i>Pascal van den Bos:</i>\nI originally wrote this song in 2019 for\
-    \ Stable Time Loops and Paradoxes 3 but i ended up scrapping it and completely\
-    \ redoing it, i'm not exactly sure why i did that but either way i felt really\
-    \ bad about that because IMO i ended up ruining the song LOL. So anyway this is\
-    \ the 3rd and proper final version of Collapse AKA \"The Descend of the PMT\"\
-    \ because it references so many songs. "
-Cover Artists:
-- Gryotharian
 ---
 Track: Shattered Spacetime
 Artist: Gryotharian
 Duration: '5:01'
-References:
-- English
-- track:upward-movement-dave-owns
-- Ruins (With Strings)
-- Do You Remem8er Me
 Art Tags:
 - Lord English
 URLs:
@@ -1209,12 +1205,15 @@ Commentary: "<i>Gryotharian:</i>\nThis was another one that I made surprisingly
     \ in a glass room.\" "
 Cover Artists:
 - Cratmang
+Referenced Tracks:
+- English
+- track:upward-movement-dave-owns
+- Ruins (With Strings)
+- Do You Remem8er Me
 ---
 Track: Consonant Conquest
 Artist: Interrobang
 Duration: '4:22'
-References:
-- Constant Conquest
 Art Tags:
 - Caliborn
 URLs:
@@ -1226,6 +1225,8 @@ Commentary: |-
     I like to think Caliborn worked really hard on this one, maybe it’s hanging over a mantelpiece in Lord English’s manor somewhere. He’s added some tasteful JPEG artifacts and plastic wrap filters to his style, I’m so proud of him!
 Cover Artists:
 - Monckat
+Referenced Tracks:
+- Constant Conquest
 ---
 Track: Reunion
 Artist: Aradiawithgeese
@@ -1245,11 +1246,6 @@ Cover Artists:
 Track: Crystalschalasthemequins
 Artist: Momora
 Duration: '5:06'
-References:
-- Crystalmethequins
-- Schala's Theme
-Samples:
-- Schala's Theme
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/crystalschalasthemequins
 Commentary: |-
@@ -1257,14 +1253,15 @@ Commentary: |-
     There’s a Homestuck continuation fanventure named “Act 8”, and this amazing track scored part of it! You can <a href="https://www.youtube.com/watch?v=_hQSOfOIkJw">check it out here</a>.
 Cover Artists:
 - swanfire
+Referenced Tracks:
+- Crystalmethequins
+- Schala's Theme
+Sampled Tracks:
+- Schala's Theme
 ---
 Track: Sburban City
 Artist: $C4RL3TT
 Duration: 0:54
-References:
-- track:sburban-jungle
-Samples:
-- track:sburban-jungle
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/sburban-city
 Commentary: |-
@@ -1275,12 +1272,14 @@ Commentary: |-
     Man, drawing this has made me sad there’s no Spore 2 again. Dammit.
 Cover Artists:
 - Monckat
+Referenced Tracks:
+- track:sburban-jungle
+Sampled Tracks:
+- track:sburban-jungle
 ---
 Track: Gold Mage [Playtime is Over Mix]
 Artist: repeatedScales
 Duration: '4:07'
-References:
-- Gold Mage
 Art Tags:
 - Sollux
 URLs:
@@ -1293,13 +1292,13 @@ Commentary: |-
     This amazing redux version of the [[album:coloUrs-and-mayhem-universe-a|Colours and Mayhem: Universe A]] track was hidden away in the musician’s <a href="https://103records.bandcamp.com/">bandcamp</a>, known to few. It’s time it saw the light of the mainstream and knocked your socks off.
 Cover Artists:
 - Gryotharian
+Referenced Tracks:
+- Gold Mage
 ---
 Track: Black ($C4RL3TT Remix)
 Directory: black-sc4rl3tt-remix
 Artist: $C4RL3TT
 Duration: '2:36'
-References:
-- track:black
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/black-c4rl3tt-remix
 Commentary: |-
@@ -1307,12 +1306,12 @@ Commentary: |-
     Some minimalist 3D art, vaguely inspired by the sort of 90s cgi stuff you see on youtube compilations of jungle/d&b music.
 Cover Artists:
 - Monckat
+Referenced Tracks:
+- track:black
 ---
 Track: Harley-Claire Retro Time!
 Artist: FlareDragon
 Duration: '2:59'
-References:
-- Half-Harley Manor
 Art Tags:
 - Joey
 - Jude
@@ -1320,13 +1319,12 @@ URLs:
 - https://unofficialmspafans.bandcamp.com/track/harley-claire-retro-time
 Cover Artists:
 - crabaqqle
+Referenced Tracks:
+- Half-Harley Manor
 ---
 Track: Snake Case Closin' '18
 Artist: Tee-vee
 Duration: '3:35'
-References:
-- That's How I Beat Snake
-- SERPENT GENESIS
 Art Tags:
 - Joey
 - Xefros
@@ -1340,12 +1338,13 @@ Commentary: |-
     Fun Fact: I had the cursed idea of making this image as a 3D scene in Blender. But only got partway through modelling Xefros when I realized that I didn't have enough time or patience for it.
 Cover Artists:
 - Cratmang
+Referenced Tracks:
+- That's How I Beat Snake
+- SERPENT GENESIS
 ---
 Track: Minor Manor
 Artist: L4Vo5
 Duration: '1:48'
-References:
-- Half-Harley Manor
 Art Tags:
 - Joey
 URLs:
@@ -1355,6 +1354,8 @@ Commentary: "<i>Gryotharian:</i>\nWanted to go for a sort of Luigi’s mansion t
     \ paint edutainment game, and ended up with this. "
 Cover Artists:
 - Gryotharian
+Referenced Tracks:
+- Half-Harley Manor
 ---
 Track: 'Joey: Play Haunting Melody'
 Artist: Erik Scheele
@@ -1373,33 +1374,31 @@ Cover Artists:
 Track: Keep Your Head Down, Rustblood!
 Artist: subversiveasset
 Duration: '3:41'
-References:
-- Keep Your Head Down
-- Rustblood
 Art Tags:
 - Xefros
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/keep-your-head-down-rustblood
 Cover Artists:
 - Gryotharian
+Referenced Tracks:
+- Keep Your Head Down
+- Rustblood
 ---
 Track: Final Spice (Remix)
 Artist: Kusoro
 Duration: '2:07'
-References:
-- Final Spice
 Art Tags:
 - Joey
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/final-spice-remix
 Cover Artists:
 - Mmueoul
+Referenced Tracks:
+- Final Spice
 ---
 Track: Sburban Fall
 Artist: WHATISLOSTINTHEMINES
 Duration: '2:38'
-References:
-- track:sburban-jungle
 Art Tags:
 - John
 URLs:
@@ -1410,12 +1409,12 @@ Commentary: |-
     <span style="color:#288857">matthiuss1988:</span> these music will make you shit hard!!!
 Cover Artists:
 - Gryotharian
+Referenced Tracks:
+- track:sburban-jungle
 ---
 Track: All Alone (Redux)
 Artist: Andrew "Rainy" Obeng
 Duration: '2:32'
-References:
-- All Alone
 Art Tags:
 - Damara
 URLs:
@@ -1428,14 +1427,12 @@ Commentary: "<i>Andrew \"Rainy\" Obeng:</i>\nRedux of All Alone from PMT's \"Bef
     \ and thus i shined the spotlight on her in the focus of the art. "
 Cover Artists:
 - swanfire
+Referenced Tracks:
+- All Alone
 ---
 Track: Time Running By
 Artist: Artisticpolo
 Duration: '2:39'
-References:
-- track:upward-movement-dave-owns
-- track:beatdown-strider-style
-- Sunsetter
 Art Tags:
 - Dave
 URLs:
@@ -1448,17 +1445,15 @@ Commentary: "<i>Makin:</i>\nI remember looping this track over and over back in
     \ Just standing there. Give him a break, it’s hard to run on a clock. "
 Cover Artists:
 - Gryotharian
+Referenced Tracks:
+- track:upward-movement-dave-owns
+- track:beatdown-strider-style
+- Sunsetter
 ---
 Track: Event Horizon/Barium Starlight
 Directory: event-horizon-barium-starlight
 Artist: Grace Medley
 Duration: '3:48'
-References:
-- Black Rose / Green Sun
-- Black Hole / Green Sun
-- track:endless-climb
-- Song for Rose Lalonde
-- Exploring the Depths of Sburb
 Art Tags:
 - Rose
 URLs:
@@ -1468,6 +1463,12 @@ Commentary: |-
     This track art actually depicts Rose in her Lord of Space outfit from Cool and New Web Comic, since this track originates there. I cropped it a bit to not blow people’s minds too much. Wait, what is that drop OH MY GOD
 Cover Artists:
 - Sozzay
+Referenced Tracks:
+- Black Rose / Green Sun
+- Black Hole / Green Sun
+- track:endless-climb
+- Song for Rose Lalonde
+- Exploring the Depths of Sburb
 ---
 Track: '[S] ==>'
 Directory: s-next-arrow
@@ -1477,9 +1478,6 @@ Artist:
 Contributors:
 - Circlejourney (harmonies)
 Duration: '5:21'
-References:
-- '[S]ynchronize'
-- Cascade (Beta)
 Art Tags:
 - John
 - Rose
@@ -1521,14 +1519,13 @@ Lyrics: "[[[S]ynchronize]]\n\nI’m still wondering\nWhere to go now\nWe have se
     \ more?\nPester me, I’m not alone\nI’m just stuck inside my home"
 Cover Artists:
 - Circlejourney
+Referenced Tracks:
+- '[S]ynchronize'
+- Cascade (Beta)
 ---
 Track: Abstract
 Artist: Kusoro
 Duration: '2:02'
-References:
-- Moonsetter
-- Despot
-- track:upward-movement-dave-owns
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/abstract
 Commentary: "<i>Monckat:</i>\nFeatures a sort of on-a-whim redesign of the Theseus,\
@@ -1537,6 +1534,10 @@ Commentary: "<i>Monckat:</i>\nFeatures a sort of on-a-whim redesign of the These
     \ of Dirk’s shades so I maybe don’t have a leg to stand on there. "
 Cover Artists:
 - Monckat
+Referenced Tracks:
+- Moonsetter
+- Despot
+- track:upward-movement-dave-owns
 ---
 Track: Saccharine Slumber, Strider
 Artist: Shwan
@@ -1567,9 +1568,6 @@ Cover Artists:
 Track: Somnambulist
 Artist: heir-of-puns
 Duration: '3:35'
-References:
-- Even in Death
-- Pumpkin Party in Sea Hitler's Water Apocalypse
 Art Tags:
 - Roxy
 URLs:
@@ -1583,16 +1581,13 @@ Commentary: "<i>heir-of-puns:</i>\nThis is like the third entirely redone versio
     \ if it was less complex.  "
 Cover Artists:
 - Awkward
+Referenced Tracks:
+- Even in Death
+- Pumpkin Party in Sea Hitler's Water Apocalypse
 ---
 Track: Crystallized Flowers DX
 Artist: salex_r3kt
 Duration: '4:25'
-References:
-- Crystalanthemums
-- Crystalanthology
-- Crystamanthequins
-- track:sburban-jungle
-- Crystalmethequins
 Art Tags:
 - Jade
 URLs:
@@ -1603,17 +1598,16 @@ Commentary: |-
     Please do not eat the bright red crystal flowers, no matter how tasty they look. They are deadly poison. Thousands have died already this year.
 Cover Artists:
 - Awkward
+Referenced Tracks:
+- Crystalanthemums
+- Crystalanthology
+- Crystamanthequins
+- track:sburban-jungle
+- Crystalmethequins
 ---
 Track: I Am Bigger Than This Story
 Artist: FrostyMac
 Duration: '4:15'
-References:
-- Flare
-- END OF FRIENDVANGELION
-- Homestuck Anthem
-- track:old-secret
-- Embittered Shore
-- Penumbra Phantasm
 Art Tags:
 - MSPA Reader
 - Green Sun
@@ -1623,6 +1617,13 @@ Commentary: "<i>FrostyMac:</i>\nI loved the ending to Pesterquest and wanted to
     \ a track on it. "
 Cover Artists:
 - crabaqqle
+Referenced Tracks:
+- Flare
+- END OF FRIENDVANGELION
+- Homestuck Anthem
+- track:old-secret
+- Embittered Shore
+- Penumbra Phantasm
 ---
 Track: A Story That Consumes Itself
 Artist: Circlejourney
diff --git a/album/medium.yaml b/album/medium.yaml
index f098ef35..f01e4df8 100644
--- a/album/medium.yaml
+++ b/album/medium.yaml
@@ -37,11 +37,11 @@ URLs:
 ---
 Track: Rain
 Duration: '6:34'
-References:
-- track:skies-of-skaia
 URLs:
 - https://homestuck.bandcamp.com/track/rain-2
 - https://youtu.be/WWSphawicMY
+Referenced Tracks:
+- track:skies-of-skaia
 ---
 Track: Frogs
 Duration: '5:06'
@@ -58,12 +58,12 @@ URLs:
 ---
 Track: Clockwork
 Duration: '5:13'
-References:
-- Westminister Quarters
-- Carol of the Bells
 URLs:
 - https://homestuck.bandcamp.com/track/clockwork-2
 - https://youtu.be/AeUNnQ0ZkvA
+Referenced Tracks:
+- Westminister Quarters
+- Carol of the Bells
 ---
 Track: Heat
 Duration: '5:12'
@@ -73,8 +73,8 @@ URLs:
 ---
 Track: Wind
 Duration: '8:03'
-References:
-- Polovtsian Dances
 URLs:
 - https://homestuck.bandcamp.com/track/wind-2
 - https://youtu.be/mwFWnxZVIFk
+Referenced Tracks:
+- Polovtsian Dances
diff --git a/album/midnight-crew-drawing-dead.yaml b/album/midnight-crew-drawing-dead.yaml
index 2ecd48b8..4ad3398e 100644
--- a/album/midnight-crew-drawing-dead.yaml
+++ b/album/midnight-crew-drawing-dead.yaml
@@ -24,12 +24,12 @@ URLs:
 ---
 Track: Blue Noir
 Artist: David Ko
-References:
-- track:vagabounce
 Duration: 0:55
 URLs:
 - https://homestuck.bandcamp.com/track/blue-noir-2
 - https://youtu.be/YvMyo3opDOY
+Referenced Tracks:
+- track:vagabounce
 ---
 Track: Dead Shuffle
 Artist: Mark Hadley
@@ -103,8 +103,6 @@ URLs:
 Track: Hauntjam
 Artist: Andrew Huo, Michael Guy Bowman
 Duration: '2:16'
-References:
-- track:haunt
 Art Tags:
 - 'cw: blood'
 URLs:
@@ -113,6 +111,8 @@ URLs:
 Commentary: |-
     <i>Andrew Huo:</i>
     Hauntjam and Hauntjelly are interesting things. They were actually made based on a short fruity loop that The Big Man Andrew did, called haunt.wav or haunt.mp3 or something like that. A jam on his theme, logically, would therefore be called "hauntjam," with the opportunity for naming puns including "hauntjelly." His theme appears mostly unchanged as the bassline for the first part of the pieces. At this point in terms of instrumentation, we were still mostly striving for faithfulness to the canon Midnight Crew "band," as can be seen in <a href="http://www.mspaintadventures.com/extras/ps000018.html">the Extras page</a> wherein the MC fill 'em with midnight (bottom), so Hauntjam employs trombone, string bass, piano, clarinet, and sax (I forget which because I've lost the file and am not a band person, but I think it was alto). From there on, it was fairly straightforward to write a haunting refrain and then solos for each instrument. I will admit I got a little writerblock'd for the second part, which was sort of a brief modulation to the dominant, so it sounds a little strange. But it still has its own little charm, with the almost annoying trill put in for a spooky ghost-like effect. In Hauntjam, Bowman did some good stuff with bringing out moving parts in the first refrain. In Hauntjelly, Xerxes emphasizes the spookiness by changing instruments for more electric organ.
+Referenced Tracks:
+- track:haunt
 ---
 Track: Carbon Nadsat / Cuestick Genius
 Artist: Robert J! Lake
@@ -154,14 +154,14 @@ URLs:
 Track: Joker's Wild
 Artist: Mark Hadley
 Duration: '2:16'
-References:
-- track:harlequin
 URLs:
 - https://homestuck.bandcamp.com/track/jokers-wild-2
 - https://youtu.be/MDaWJUfxFCM
 Commentary: |-
     <i>Mark Hadley:</i>
     When we were writing music for Drawing Dead, I just HAD to make a jazz remix of Harlequin. The song pretty much wrote itself after that. I think if I was going to change anything about it though, I'd have tried to get a live saxophone; the synth sounds a bit off. But then, any of the songs off of Drawing Dead would probably sound amazing by a live band.
+Referenced Tracks:
+- track:harlequin
 ---
 Track: Livin' It Up
 Artist: Gabe Nezovic
@@ -173,19 +173,20 @@ URLs:
 Track: Hauntjelly
 Artist: Andrew Huo, Ian Taylor
 Duration: '2:02'
-References:
-- track:hauntjam
-Samples:
-- track:hauntjam
 Art Tags:
 - 'cw: blood (abstract)'
 URLs:
 - https://homestuck.bandcamp.com/track/hauntjelly-2
 - https://youtu.be/MccD13jZSTU
+Referenced Tracks:
+- track:hauntjam
+Sampled Tracks:
+- track:hauntjam
 ---
 Track: Nightlife (Extended)
 Directory: nightlife-extended-mc-dd
-AKA: track:nightlife-extended
 Artist: Bill Bolin
 Duration: '2:34'
 Has URLs: false
+Also Released As:
+- track:nightlife-extended
diff --git a/album/mobius-trip-and-hadron-kaleido.yaml b/album/mobius-trip-and-hadron-kaleido.yaml
index bf0cb870..1374afc9 100644
--- a/album/mobius-trip-and-hadron-kaleido.yaml
+++ b/album/mobius-trip-and-hadron-kaleido.yaml
@@ -52,8 +52,6 @@ URLs:
 ---
 Track: Dawn of Man
 Duration: '5:44'
-References:
-- track:sburban-jungle
 URLs:
 - https://bowman.bandcamp.com/track/dawn-of-man
 - https://youtu.be/Fyib6VCDA2s
@@ -65,6 +63,8 @@ Lyrics: |-
     If anyone's out there to see what we have done<br>Can somebody tell me what we are to become<br>Our tiny lives<br>They fly right by<br>This goodly frame, it does not care<br>If we live or die
     It was the month of June<br>In Tiananmen Square<br>The tanks were on TV<br>But I was not yet there<br>The guns they wall went pop<br>We heard the screams and shouts<br>I was brought into this world<br>As they were taken out
     If anyone's out there to see what I have done<br>Can somebody tell me what we are to become<br>Our tiny lives<br>They fly right by<br>Who were they, and next to them<br>Who the hell am I?
+Referenced Tracks:
+- track:sburban-jungle
 ---
 Track: Beta Version
 Duration: '4:35'
@@ -107,8 +107,6 @@ Lyrics: |-
 ---
 Track: Lies With The Sea
 Duration: '4:46'
-References:
-- track:sburban-jungle
 Art Tags:
 - Hadron Kaleido
 URLs:
@@ -136,6 +134,8 @@ Commentary: |-
      One thing it has in common with the quicker, more lightly-produced version of the track I put out in May was a fairly strong inspiration from modern electronic acts. I drew farily heavily from the sensibilities of Gorillaz in chosing synthesizer sounds on tracks like “Rhinestone Eyes” and “El Ma&ntilde;ana” and also pretty closely studied the mix on Daft Punk’s “Something About Us”, a down tempo track I greatly admire.
      The thing that most strongly made me feel comfortable using this track on Mobius Trip and Hadron Kaleido was its inspiration from dreams and the sense that it generally echoed the thought of being swept away in a wave as mentioned in “Dawn of Man” earlier on the album. Originally I even recorded an alternate lyric to the melody of “Sburban Jungle” to open the second verse which I ditched that went as follows:
      “Down, down far below, somewhere safe/ Lost in the wave once again.”
+Referenced Tracks:
+- track:sburban-jungle
 ---
 Track: Chain Of Prospit
 Duration: '4:37'
@@ -173,10 +173,10 @@ Lyrics: |-
 ---
 Track: The Deeper You Go
 Duration: '3:36'
-References:
-- track:sburban-jungle
 Art Tags:
 - Mobius Trip
 URLs:
 - https://bowman.bandcamp.com/track/the-deeper-you-go
 - https://youtu.be/IMpM4xKg9vU
+Referenced Tracks:
+- track:sburban-jungle
diff --git a/album/moons-of-theseus.yaml b/album/moons-of-theseus.yaml
index b15a8704..4b12f814 100644
--- a/album/moons-of-theseus.yaml
+++ b/album/moons-of-theseus.yaml
@@ -1,6 +1,4 @@
 Album: Moons of Theseus
-Banner Art:
-- Nick Tucker
 Banner Dimensions: 1100x203
 Wallpaper Style: |-
     opacity: 0.35;
@@ -17,6 +15,8 @@ Cover Artists:
 - Nick Tucker
 Wallpaper Artists:
 - Nick Tucker
+Banner Artists:
+- Nick Tucker
 ---
 Track: Home
 Artist: Grace Medley, SplitSuns
@@ -24,12 +24,6 @@ Contributors:
 - Ucklin (vocals)
 - WHATISLOSTINTHEMINES (vocals, additional guitar)
 Duration: '10:25'
-References:
-- Forever
-- Dawn of Man
-- track:sburban-jungle
-- The Return
-- Violet and Gold
 Art Tags:
 - Hadron Kaleido
 URLs:
@@ -54,6 +48,12 @@ Commentary: |-
     The varied parts of Home take you by the hand and guide you on a journey throughout time and space. It is my belief that by listening, you're taking the same journey Grace, myself, and all the other creatives involved in this album took in the process of making the project a reality. It's been a long and winding road, but I wouldn't have had it any other way. Thank you.
 Cover Artists:
 - ricemilk
+Referenced Tracks:
+- Forever
+- Dawn of Man
+- track:sburban-jungle
+- The Return
+- Violet and Gold
 ---
 Track: Traveling
 Artist: ndividedbyzero
@@ -61,17 +61,6 @@ Contributors:
 - OneDragonArmy (vocals)
 - Ucklin (vocals)
 - WHATISLOSTINTHEMINES (vocals)
-References:
-- track:sburban-jungle
-- Lies With The Sea
-- Polyominoes
-- Airwaves
-- Dawn of Man
-- Old Buggy Now
-- Light Of Apollo
-- Wrong Or Right
-- Purgatory
-- Chain Of Prospit
 Duration: '4:22'
 Art Tags:
 - Mobius Trip
@@ -92,14 +81,21 @@ Commentary: |-
     Naturally when everyone else is going for wild, creative concepts, I fall back on making it Homestuck... when I heard Cait's song it made me think of the Battlefield, and when I read the lyrics, I thought, what better thing to depict than the moment Mobius Trip and Hadron Kaleido look into the clouds for the first time and witness the secrets of the universe?
 Cover Artists:
 - Tipsy
+Referenced Tracks:
+- track:sburban-jungle
+- Lies With The Sea
+- Polyominoes
+- Airwaves
+- Dawn of Man
+- Old Buggy Now
+- Light Of Apollo
+- Wrong Or Right
+- Purgatory
+- Chain Of Prospit
 ---
 Track: Unchained
 Artist: Kanishka
 Duration: '3:24'
-References:
-- Chain Of Prospit
-- The Deeper You Go
-- Amen, Brother
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/unchained
 Commentary: |-
@@ -109,6 +105,10 @@ Commentary: |-
     Chain of Prospit has always been one of my all-time favorite Homestuck songs. Even just the title of Unchained immediately gave me visions of the Prospit Moon's broken connection to Prospit, but unlike [S] Descend, where the event is catastrophic, I wanted to depict the moon coming loose as a moment of freedom.
 Cover Artists:
 - Skyplayer
+Referenced Tracks:
+- Chain Of Prospit
+- The Deeper You Go
+- Amen, Brother
 ---
 Track: Dinosaur Pill
 Artist: Ucklin
@@ -146,9 +146,6 @@ Artist: WHATISLOSTINTHEMINES
 Duration: '4:13'
 Art Tags:
 - Mobius Trip
-References:
-- Ithaca
-- track:sburban-jungle
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/ithaca-is-calling
 Lyrics: |-
@@ -169,15 +166,13 @@ Commentary: |-
     Fun fact, the title track off of Michael Guy Bowman's album Ithaca was initially planned to be part of Mobius Trip and Hadron Kaleido. This cover is an attempt to capture what the original song might have been had it stayed on the original track listing. This is by far the most complex song I've worked on yet, I think there's like... 30 different instances of synths or instruments? At the very least? And plenty of them only end up playing for a couple seconds in the end. Regardless of all that, I had a lot of fun putting this together, and I hope I managed to capture that MTAHK vibe we all hold so close to our hearts.
 Cover Artists:
 - ricemilk
+Referenced Tracks:
+- Ithaca
+- track:sburban-jungle
 ---
 Track: The Fifth Window
 Artist: Jaspy
 Duration: '3:17'
-References:
-- The New Window
-- track:sburban-jungle
-- The Deeper You Go
-- Got It?
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/the-fifth-window
 Commentary: |-
@@ -186,6 +181,11 @@ Commentary: |-
     please nintendo give me animal crossing switch at e3 PLEASE
 Cover Artists:
 - Kodar
+Referenced Tracks:
+- The New Window
+- track:sburban-jungle
+- The Deeper You Go
+- Got It?
 ---
 Track: The Return
 Artist: SplitSuns
@@ -193,7 +193,16 @@ Duration: '6:12'
 Art Tags:
 - Mobius Trip
 - Hadron Kaleido
-References:
+URLs:
+- https://unofficialmspafans.bandcamp.com/track/the-return
+Commentary: |-
+    <i>SplitSuns:</i>
+    This song has quite the history to it! I made it back in July of 2018 for the Cool and New Music Team's "Volume 11" project, a plan to make a fan-made meme-filled image of a fake Volume 11 from the Homestuck Music Team's Bandcamp page a reality. All the songs, including a 12-hour "extended" version of Penumbra Phantasm, a rock opera made out of Michael Guy Bowman memes, and a sequel to the Baby is You, were painstakingly produced based on the ideas (and jokes) the track names suggested. Each song's length was the same as it was in the original image, and photoshopped reviews were even added on the album's page using dummy accounts!
+    For my song (originally called "The Return of Mobius Trip and Hadron Kaleido") the team was planning on playing it straight and producing a medley of songs from MTaHK. I went with their idea and made a mega-mix of every song on the album, with the caveat being it had to be 6:12 long exactly! I first planned out the structure of the song on a single piano track to make sure it fit the time limit, then went back in and fleshed out all the instrumentation. I wanted it to be reminiscent of Bowman's work, with his classic guitar flourishes, but put my own spin on it all the same. The whole project kind of crystallized over the course of a single week I spent stuck to my computer 24/7, continually tweaking it to make sure the track flowed despite its disparate parts. If you're interested to find out more about its production process check out <a href="https://www.youtube.com/watch?v=eqpcqEpMndA">this video</a>.
+    All in all, it's a fast-paced schizophrenic redux of the highlights of MTaHK (which is to say, the whole album) that even now I'm still proud of. I'm happy to have the opportunity to put it on this amazing album!
+Cover Artists:
+- nights
+Referenced Tracks:
 - The Deeper You Go
 - track:sburban-jungle
 - Beta Version
@@ -204,23 +213,12 @@ References:
 - Lies With The Sea
 - Dawn of Man
 - Forever
-URLs:
-- https://unofficialmspafans.bandcamp.com/track/the-return
-Commentary: |-
-    <i>SplitSuns:</i>
-    This song has quite the history to it! I made it back in July of 2018 for the Cool and New Music Team's "Volume 11" project, a plan to make a fan-made meme-filled image of a fake Volume 11 from the Homestuck Music Team's Bandcamp page a reality. All the songs, including a 12-hour "extended" version of Penumbra Phantasm, a rock opera made out of Michael Guy Bowman memes, and a sequel to the Baby is You, were painstakingly produced based on the ideas (and jokes) the track names suggested. Each song's length was the same as it was in the original image, and photoshopped reviews were even added on the album's page using dummy accounts!
-    For my song (originally called "The Return of Mobius Trip and Hadron Kaleido") the team was planning on playing it straight and producing a medley of songs from MTaHK. I went with their idea and made a mega-mix of every song on the album, with the caveat being it had to be 6:12 long exactly! I first planned out the structure of the song on a single piano track to make sure it fit the time limit, then went back in and fleshed out all the instrumentation. I wanted it to be reminiscent of Bowman's work, with his classic guitar flourishes, but put my own spin on it all the same. The whole project kind of crystallized over the course of a single week I spent stuck to my computer 24/7, continually tweaking it to make sure the track flowed despite its disparate parts. If you're interested to find out more about its production process check out <a href="https://www.youtube.com/watch?v=eqpcqEpMndA">this video</a>.
-    All in all, it's a fast-paced schizophrenic redux of the highlights of MTaHK (which is to say, the whole album) that even now I'm still proud of. I'm happy to have the opportunity to put it on this amazing album!
-Cover Artists:
-- nights
 ---
 Track: Pumpkin Tide (Gourdian Sea Version)
 Artist: Ucklin
 Duration: '2:39'
 Art Tags:
 - Mobius Trip
-References:
-- Pumpkin Tide
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/pumpkin-tide-gourdian-sea-version
 Lyrics: |-
@@ -238,6 +236,8 @@ Commentary: |-
     A remake of my old piece from 2013. I gave it a proper background that compliments the song. Peaceful but a bit broken up and in the process of healing.
 Cover Artists:
 - piskomil
+Referenced Tracks:
+- Pumpkin Tide
 ---
 Track: Self-Avoiding Walks
 Artist: Kanishka
@@ -245,8 +245,6 @@ Duration: '4:41'
 Art Tags:
 - Mobius Trip
 - Hadron Kaleido
-References:
-- The Deeper You Go
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/self-avoiding-walks
 Commentary: |-
@@ -256,6 +254,8 @@ Commentary: |-
     With self reflection in mind this is presented on a spiral bound sketchbook, a place for wandering thoughts and discardable ideas, the entire book easily closed and abandoned. I did a bit of multimedia on this one by photographing magazine clppings and editing the beans out of them.
 Cover Artists:
 - Jas
+Referenced Tracks:
+- The Deeper You Go
 ---
 Track: Negligent Murmur
 Artist: Ucklin
@@ -263,8 +263,6 @@ Duration: '6:29'
 Art Tags:
 - Mobius Trip
 - Hadron Kaleido
-References:
-- Careless Whisper
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/negligent-murmur
 Commentary: |-
@@ -276,6 +274,8 @@ Commentary: |-
     With the instruction: "Something like Hadron singing passionately into a microphone while Mobius plays a weird looking saxophone, or whatever." I have set to work on this overcomplicated masterpiece, adding more and more clutter until I have reached the ultimate concert effect.
 Cover Artists:
 - piskomil
+Referenced Tracks:
+- Careless Whisper
 ---
 Track: Violet and Gold
 Artist: Veritas Unae
@@ -288,19 +288,6 @@ Contributors:
 - LizaWithAZed (lyrics)
 - Max Wright (additional help)
 Duration: '7:20'
-References:
-- Pumpkin Tide
-- No Release
-- The Deeper You Go
-- Lies With The Sea
-- Derse Dreamers
-- Chain Of Prospit
-- Dawn of Man
-- track:sburban-jungle
-- Forever
-- Beta Version
-- Fly
-- How Do I Live (Bunny Back in the Box Version)
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/violet-and-gold
 Lyrics: |-
@@ -336,3 +323,16 @@ Commentary: |-
 Cover Artists:
 - Jas
 - Skyplayer
+Referenced Tracks:
+- Pumpkin Tide
+- No Release
+- The Deeper You Go
+- Lies With The Sea
+- Derse Dreamers
+- Chain Of Prospit
+- Dawn of Man
+- track:sburban-jungle
+- Forever
+- Beta Version
+- Fly
+- How Do I Live (Bunny Back in the Box Version)
diff --git a/album/nuclears-explosion-1.yaml b/album/nuclears-explosion-1.yaml
index ba309ae2..7a60c882 100644
--- a/album/nuclears-explosion-1.yaml
+++ b/album/nuclears-explosion-1.yaml
@@ -37,10 +37,11 @@ URLs:
 ---
 Track: Phantasmic Foe
 Directory: phantasmic-foe-nuclears-explosion
-AKA: track:phantasmic-foe
 Duration: '1:18'
 URLs:
 - https://nuclear333.bandcamp.com/track/phantasmic-foe
+Also Released As:
+- track:phantasmic-foe
 ---
 Track: Green Mansion [Original]
 Duration: 0:25
@@ -52,12 +53,12 @@ Cover Artists:
 Track: Green Mansion [Difarem Arrangement]
 Artist: Difarem
 Duration: '2:15'
-References:
-- Green Mansion [Original]
 URLs:
 - https://nuclear333.bandcamp.com/track/green-mansion-difarem-arrangement
 Cover Artists:
 - bobthetacocat
+Referenced Tracks:
+- Green Mansion [Original]
 ---
 Track: Where's This?
 Duration: '1:58'
@@ -71,10 +72,11 @@ URLs:
 ---
 Track: Defuse a Bomb
 Directory: defuse-a-bomb-nuclears-explosion
-AKA: track:defuse-a-bomb
 Duration: '1:22'
 URLs:
 - https://nuclear333.bandcamp.com/track/defuse-a-bomb
+Also Released As:
+- track:defuse-a-bomb
 ---
 Track: Stacked Cans
 Duration: '1:09'
@@ -98,10 +100,10 @@ URLs:
 ---
 Track: Stacked Cans (No DVS Sax Version)
 Duration: '1:09'
-References:
-- Stacked Cans
 URLs:
 - https://nuclear333.bandcamp.com/track/stacked-cans-no-dvs-sax-version
+Referenced Tracks:
+- Stacked Cans
 ---
 Track: Main Theme - INHOSPITABLE
 Duration: 0:59
@@ -144,15 +146,15 @@ URLs:
 - https://nuclear333.bandcamp.com/track/a-noble-anthem-one-instrument
 ---
 Track: Red Trail plus Green Mansion
-References:
-- Red Trail
-- Green Mansion [Original]
 Duration: 0:26
 URLs:
 - https://nuclear333.bandcamp.com/track/red-trail-plus-green-mansion
 Commentary: |-
     <i>nuclear333:</i>
     An old version of Red Trail layered over an older version of Green Mansion.
+Referenced Tracks:
+- Red Trail
+- Green Mansion [Original]
 ---
 Track: Troubled Seas
 Duration: 0:29
@@ -189,7 +191,8 @@ Commentary: |-
 ---
 Track: The Point of Going Home
 Directory: the-point-of-going-home-nuclears-explosion
-AKA: track:the-point-of-going-home
 Duration: '1:23'
 URLs:
 - https://nuclear333.bandcamp.com/track/the-point-of-going-home
+Also Released As:
+- track:the-point-of-going-home
diff --git a/album/oceanfalls-vol-1.yaml b/album/oceanfalls-vol-1.yaml
index c36dabf0..3f19ce35 100644
--- a/album/oceanfalls-vol-1.yaml
+++ b/album/oceanfalls-vol-1.yaml
@@ -1,7 +1,5 @@
 Album: Oceanfalls Vol. 1
 Artist: nights
-Banner Art:
-- nights
 Banner Dimensions: 975x180
 Banner Style: |-
     image-rendering: pixelated;
@@ -18,6 +16,8 @@ Cover Artists:
 - nights
 Default Track Cover Artists:
 - nights
+Banner Artists:
+- nights
 ---
 Group: Main album
 ---
diff --git a/album/oceanfalls-vol-2.yaml b/album/oceanfalls-vol-2.yaml
index de7dd269..6bfca607 100644
--- a/album/oceanfalls-vol-2.yaml
+++ b/album/oceanfalls-vol-2.yaml
@@ -23,11 +23,11 @@ Cover Artists:
 Track: A Wild Monster Appeared!
 Artist: OpsCat
 Duration: '1:17'
-References:
-- Wild Battle
 URLs:
 - https://nightslights.bandcamp.com/track/a-wild-monster-appeared
 Has Cover Art: false
+Referenced Tracks:
+- Wild Battle
 ---
 Track: Moongaze
 Artist: TirantBacon
@@ -144,22 +144,22 @@ Artist: FrostyMac
 Duration: '2:42'
 Art Tags:
 - 'cw: blood'
-References:
-- Spider's Claw
 URLs:
 - https://nightslights.bandcamp.com/track/destiny-unfolds
 Cover Artists:
 - Sozzay
+Referenced Tracks:
+- Spider's Claw
 ---
 Track: Sovereign Domain
 Artist: OpsCat
 Duration: '2:11'
-References:
-- track:megalovania-undertale
 URLs:
 - https://nightslights.bandcamp.com/track/sovereign-domain
 Cover Artists:
 - ackro
+Referenced Tracks:
+- track:megalovania-undertale
 ---
 Track: Remember You
 Artist: Ost
diff --git a/album/oceanfalls-vol-3.yaml b/album/oceanfalls-vol-3.yaml
index 8f889d31..1450311d 100644
--- a/album/oceanfalls-vol-3.yaml
+++ b/album/oceanfalls-vol-3.yaml
@@ -95,13 +95,13 @@ Cover Artists:
 Track: Galactic Princess Selene Opening 1
 Artist: Ray Maiky
 Duration: '2:10'
-References:
-- Amen, Brother
-- Your Best Nightmare
 URLs:
 - https://nightslights.bandcamp.com/track/galactic-princess-selene-opening-1
 Cover Artists:
 - nights
+Referenced Tracks:
+- Amen, Brother
+- Your Best Nightmare
 ---
 Track: Far Away
 Artist: FrostyMac
@@ -137,13 +137,13 @@ Cover Artists:
 ---
 Track: XXXSelene
 Artist: Ray Maiky
-References:
-- Rude Buster
 Duration: '1:25'
 URLs:
 - https://nightslights.bandcamp.com/track/xxxselene
 Cover Artists:
 - nights
+Referenced Tracks:
+- Rude Buster
 ---
 Track: Angry Cat OwO (Oceanfalls Version)
 Artist: Ray Maiky
@@ -193,13 +193,13 @@ Cover Artists:
 Track: Galactic Princess Selene Battle Theme
 Artist: Ray Maiky
 Duration: '1:30'
-References:
-- Rude Buster
-- Galactic Princess Selene Opening 1
 URLs:
 - https://nightslights.bandcamp.com/track/galactic-princess-selene-battle-theme
 Cover Artists:
 - nights
+Referenced Tracks:
+- Rude Buster
+- Galactic Princess Selene Opening 1
 ---
 Track: Kaji's Theme
 Artist: Ray Maiky
diff --git a/album/one-year-older.yaml b/album/one-year-older.yaml
index 9ad2e8a7..9602fd69 100644
--- a/album/one-year-older.yaml
+++ b/album/one-year-older.yaml
@@ -1,8 +1,5 @@
 Album: One Year Older
 Artist: Erik Scheele
-Banner Art:
-- Homestuck
-- Niklink (edits for wiki)
 Banner Dimensions: 1100x200
 Wallpaper Style: |-
     opacity: 0.7;
@@ -37,13 +34,14 @@ Cover Artists:
 Wallpaper Artists:
 - Homestuck
 - Quasar Nebula (edits for wiki)
+Banner Artists:
+- Homestuck
+- Niklink (edits for wiki)
 ---
 Group: Main album
 ---
 Track: Sunrise
 Duration: '3:20'
-References:
-- track:light-vol5
 URLs:
 - https://erikscheele.bandcamp.com/track/sunrise
 - https://youtu.be/AmW_GOMIimo
@@ -53,6 +51,8 @@ Commentary: |-
     I imagine, if this piece were performed live, it would do best with all the instrumentalists scattered to some degree. And I usually hate that gimmick, but it could work well in this context.
 Cover Artists:
 - Tavia Morra
+Referenced Tracks:
+- track:light-vol5
 ---
 Track: October
 Duration: '5:12'
@@ -73,8 +73,6 @@ Cover Artists:
 ---
 Track: Firefly Cloud
 Duration: '4:04'
-References:
-- track:doctor
 Art Tags:
 - John
 URLs:
@@ -87,11 +85,11 @@ Commentary: |-
     And of course, there's one or two Doctor quotes in there just because.
 Cover Artists:
 - Nic Carey
+Referenced Tracks:
+- track:doctor
 ---
 Track: FantasyP
 Duration: '3:52'
-References:
-- Penumbra Phantasm
 Art Tags:
 - John
 URLs:
@@ -104,6 +102,8 @@ Commentary: |-
     On a completely random note this piece always makes me want to go out running, and I have done so to this piece a few times. If I could do flips and parkour and stuff I'd totally be doing that too cause it works really well. Maybe gunfights too. Alright let's move on to the next piece.
 Cover Artists:
 - Kaymurph
+Referenced Tracks:
+- Penumbra Phantasm
 ---
 Track: Underfoot
 Duration: '3:05'
@@ -195,10 +195,6 @@ Cover Artists:
 ---
 Track: Skaian Shrapnel
 Duration: '4:13'
-References:
-- track:ruins
-- Walk-Stab-Walk (R&E)
-- Crystalanthemums
 Art Tags:
 - Jack Noir
 - 'cw: body horror (abstract)'
@@ -212,6 +208,10 @@ Commentary: |-
     Overall, in my opinion at least, the piece turned out a little strange, a little awkward, and not really nice, but really that works just fine for me. Everything was really going for the characters at the time, after all. People were getting hunted down, friends were turning on each other, nobody in the fandom really knew who was going to be next. Was this person? Or this person? Were you next? It all led to a heavy air of unease that sort of manifested itself in the odd piano riff and distorted drums that were used, and all the heavy glitching that led us up to...
 Cover Artists:
 - Amethyst Barron
+Referenced Tracks:
+- track:ruins
+- Walk-Stab-Walk (R&E)
+- Crystalanthemums
 ---
 Track: The Scratch
 Duration: '7:34'
@@ -245,10 +245,6 @@ Cover Artists:
 ---
 Track: Negastrife
 Duration: '6:29'
-References:
-- track:showtime-original-mix
-- Cascade (Beta)
-- Rex Duodecim Angelus
 Art Tags:
 - Jack Noir
 - Lord English
@@ -263,14 +259,15 @@ Commentary: |-
     And at the end, there's a little victory music to pass through and segue into the last piece...
 Cover Artists:
 - Amethyst Barron
+Referenced Tracks:
+- track:showtime-original-mix
+- Cascade (Beta)
+- Rex Duodecim Angelus
 ---
 Track: Mother
 Contributors:
 - Robert J! Lake (additional beats)
 Duration: '5:03'
-References:
-- Mother (Piano)
-- track:skies-of-skaia
 Art Tags:
 - John
 - Rose
@@ -286,14 +283,15 @@ Commentary: |-
     With the new universe and many new characters being explored, this piece might not work for "the end of Homestuck" anymore, but if anything, I see it as a sort of moving forward. John's journey on that one day, when he turned 13, matured both him and his friends. Like many others, he took the hero's journey, and grew as a result of it, and so this piece could very well fit him leaving his universe and going on to the next, bringing his experiences and knowledge with him, just as well as it could fit him moving past Sburb to whatever adventures lie ahead.
 Cover Artists:
 - Louise L.
+Referenced Tracks:
+- Mother (Piano)
+- track:skies-of-skaia
 ---
 Group: Bonus tracks
 ---
 Track: Another Chance
 Artist: Eston Schweickart
 Duration: '5:01'
-References:
-- Walk-Stab-Walk (R&E)
 Art Tags:
 - John
 URLs:
@@ -313,14 +311,14 @@ Commentary: |-
     Eston is the coolest of bros and makes sick music. But in a good way, not like sick with the flu or whatever. If you want to check out more of his stuff, and you should, you can visit his blog at <a href="https://siasinsilence.tumblr.com/">siasinsilence.tumblr.com</a>.
 Cover Artists:
 - dapperpixel
+Referenced Tracks:
+- Walk-Stab-Walk (R&E)
 ---
 Track: Under The Hat
 Duration: '3:27'
 URLs:
 - https://erikscheele.bandcamp.com/track/under-the-hat-bonus
 - https://youtu.be/tBfUV056rjo
-References:
-- track:under-the-hat-lofam
 Commentary: |-
     <i>Erik Scheele:</i>
     Also known as [[Trollcops]], this is a rather old idea that I once had for a Dad strife theme. I mean, all the kids had fight music, why not him? Anyway, between a chiptune variant I started and Trollcops, it's had a bit of a journey, but when it turned out alright on piano too, I didn't see any reason not to record a few takes.
@@ -328,6 +326,8 @@ Commentary: |-
     Of course, not being able to play something magnificently and to the best form of the genre didn't really stop me from playing around with this piece. So I did.
     I also think it would fit in during the first Intermission, with all the under-the-hat chicanery and stabbings that went on.
 Has Cover Art: false
+Referenced Tracks:
+- track:under-the-hat-lofam
 ---
 Track: Mother (Piano)
 Duration: '3:07'
@@ -346,8 +346,8 @@ Group: 2019 release
 Track: it's good to see you again
 Duration: '1:45'
 Has URLs: false
-Original Date: October 29, 2019
 Commentary: |-
     <i>Quasar Nebula:</i>
     (This is an unlisted bonus track, part of the free album download on Erik Scheele's <a href="https://erikscheele.bandcamp.com/album/one-year-older">independent re-release of <i>One Year Older</i></a> shortly after most solo albums were removed from the official Homestuck bandcamp.)
 Has Cover Art: false
+Date First Released: October 29, 2019
diff --git a/album/p-s.yaml b/album/p-s.yaml
index 48cd20e2..75e6d288 100644
--- a/album/p-s.yaml
+++ b/album/p-s.yaml
@@ -1,7 +1,5 @@
 Album: P[S]
 Directory: p-s
-Banner Art:
-- Robert J! Lake
 Banner Dimensions: 1100x180
 Wallpaper Style: 'opacity: 0.8;'
 Date: June 13, 2018
@@ -28,6 +26,8 @@ Cover Artists:
 - climeade
 Wallpaper Artists:
 - Robert J! Lake
+Banner Artists:
+- Robert J! Lake
 ---
 Group: Main album
 ---
@@ -43,8 +43,6 @@ Contributors:
 - Clouds Haberberg (vocals)
 - Adam Beveridge (trumpet)
 Duration: '7:31'
-References:
-- Cyan Beast
 URLs:
 - https://casualsunday.bandcamp.com/track/back-to-life
 Lyrics: |-
@@ -59,31 +57,33 @@ Lyrics: |-
     Buried under the ground<br>Is there no hope<br>Waiting here to be freed?<br>Like this world we’ll be dead<br>Will we rise up<br>If I planted the seeds...
     When I fall back to sleep and I’m dreaming<br>I’ll look up to the clouds<br>If it’s out there to see, to believe in<br>There’s no reason to doubt
     Step out into the world<br>We're not homestuck<br>Take the chance to be free<br>‘Cause this land can’t be dead<br>We will rise up<br>So I planted the seeds<br>And I’ll bring it back to life.
+Referenced Tracks:
+- Cyan Beast
 ---
 Track: A World Awake
 Artist: David Ellis
 Duration: '7:17'
-References:
-- Cyan Beast
 URLs:
 - https://casualsunday.bandcamp.com/track/a-world-awake
+Referenced Tracks:
+- Cyan Beast
 ---
 Track: Blue Blood Group
 Artist: Mark Hadley
 Duration: '3:06'
-References:
-- Spider's Claw
-- Horschestra
 URLs:
 - https://casualsunday.bandcamp.com/track/blue-blood-group
+Referenced Tracks:
+- Spider's Claw
+- Horschestra
 ---
 Track: Bro Hop
 Artist: Michael Guy Bowman
 Duration: '3:08'
-References:
-- track:aggrieve-violin-refrain
 URLs:
 - https://casualsunday.bandcamp.com/track/bro-hop
+Referenced Tracks:
+- track:aggrieve-violin-refrain
 ---
 Track: Wily Espionage
 Artist: Thomas Ferkol
@@ -94,12 +94,6 @@ URLs:
 Track: Apexhalation
 Artist: Malcolm Brown
 Duration: '4:44'
-References:
-- Historia Crux
-- track:ballad-of-awakening
-- Lifdoff
-- track:doctor
-- track:showtime-original-mix
 URLs:
 - https://casualsunday.bandcamp.com/track/apexhalation
 Commentary: |-
@@ -107,6 +101,12 @@ Commentary: |-
     Couldn't end my run on Homestuck without doing one last John/Showtime track! It's an orchestral smorgasbord of Ballad of Awakening, Lifdoff, Showtime and probably something else I've forgotten. Also makes use of Shepard Tones in the middle to give the impression of a constantly rising melody, (or just to sound annoying)
     Didn't quite make the Volume 10 cut, but presented here for your enjoyment! :D
     Alternative name: "Shave and a Heircut"
+Referenced Tracks:
+- Historia Crux
+- track:ballad-of-awakening
+- Lifdoff
+- track:doctor
+- track:showtime-original-mix
 ---
 Track: Sburban Metro
 Artist: Veritas Unae
@@ -117,19 +117,19 @@ Contributors:
 - Timothy Reed (trumpet)
 - stellamorphine (alto, tenor, and baritone saxophone)
 - Joe Morley (trombone)
-References:
-- track:sburban-jungle
-- Rosanna
 URLs:
 - https://casualsunday.bandcamp.com/track/sburban-metro
+Referenced Tracks:
+- track:sburban-jungle
+- Rosanna
 ---
 Track: Skaianet 2.0
 Artist: Mark Hadley
 Duration: '2:40'
-References:
-- Skaianet
 URLs:
 - https://casualsunday.bandcamp.com/track/skaianet-20
+Referenced Tracks:
+- Skaianet
 ---
 Track: Whiteout
 Artist: David Dycus
@@ -140,19 +140,19 @@ URLs:
 Track: Requiem for Something Really Excellent
 Artist: Robert J! Lake
 Duration: '3:14'
-References:
-- Requiem for Something Really Excellent (Demo)
-- The Beginning of Something Really Excellent
 URLs:
 - https://casualsunday.bandcamp.com/track/requiem-for-something-really-excellent
+Referenced Tracks:
+- Requiem for Something Really Excellent (Demo)
+- The Beginning of Something Really Excellent
 ---
 Track: Atoms in the Snow
 Artist: David Ellis
 Duration: '1:07'
-References:
-- Blue Atom
 URLs:
 - https://casualsunday.bandcamp.com/track/atoms-in-the-snow
+Referenced Tracks:
+- Blue Atom
 ---
 Track: Web Weaver
 Artist: Seth Massey
@@ -163,10 +163,10 @@ URLs:
 Track: We Shall Not Cease From Exploration
 Artist: Michael Guy Bowman
 Duration: '2:25'
-References:
-- track:explore
 URLs:
 - https://casualsunday.bandcamp.com/track/we-shall-not-cease-from-exploration
+Referenced Tracks:
+- track:explore
 ---
 Track: The New Crew
 Artist: Thomas Ferkol
@@ -177,18 +177,14 @@ URLs:
 Track: Heir of Grief 8-bit
 Artist: Tensei
 Duration: '3:33'
-References:
-- Heir of Grief
 URLs:
 - https://casualsunday.bandcamp.com/track/heir-of-grief-8-bit
+Referenced Tracks:
+- Heir of Grief
 ---
 Track: '[S]ynchronize'
 Artist: Malcolm Brown
 Duration: '5:19'
-References:
-- Unite Synchronization
-- Lifdoff
-- track:doctor
 URLs:
 - https://casualsunday.bandcamp.com/track/s-ynchronise
 Lyrics: |-
@@ -204,6 +200,10 @@ Lyrics: |-
     ([S]ynchronize) With every BREATH resounding,<br>([S]ynchronize) We’ll see the LIGHT astounding,<br>([S]ynchronize) TIME keeps our heartbeat pounding,<br>([S]ynchronize) Now witness SPACE surrounding!
     ([S]ynchronize) With every BREATH resounding,<br>([S]ynchronize) We’ll see the LIGHT astounding,<br>([S]ynchronize) TIME keeps our heartbeat pounding,<br>([S]ynchronize) Now witness SPACE surrounding!
     This will be the end!<br>Come with me and we’ll Ascend!<br>Solving puzzles Universal,<br>In our Sburban Reversal!<br>All these Ruins we Explore,<br>Could it be there’s something more?<br>Pester me, I’m not alone,<br>I’m just Stuck inside my Home!
+Referenced Tracks:
+- Unite Synchronization
+- Lifdoff
+- track:doctor
 ---
 Track: Bane
 Artist: Mark Hadley
@@ -220,15 +220,17 @@ URLs:
 Track: Bronze Brawling
 Artist: Max Wright
 Duration: '2:44'
-References:
-- Dapper Dueling
 URLs:
 - https://casualsunday.bandcamp.com/track/bronze-brawling
+Referenced Tracks:
+- Dapper Dueling
 ---
 Track: Infinity's Lament
 Artist: Veritas Unae
 Duration: '6:39'
-References:
+URLs:
+- https://casualsunday.bandcamp.com/track/infinitys-lament
+Referenced Tracks:
 - Thunderhead
 - English
 - Black Hole / Green Sun
@@ -236,13 +238,13 @@ References:
 - track:sburban-jungle
 - track:ruins
 - Penumbra Phantasm
-URLs:
-- https://casualsunday.bandcamp.com/track/infinitys-lament
 ---
 Track: A Farewell to Arms
 Artist: Catboss
 Duration: '4:36'
-References:
+URLs:
+- https://casualsunday.bandcamp.com/track/a-farewell-to-arms
+Referenced Tracks:
 - track:skies-of-skaia
 - Homestuck Anthem
 - Theme
@@ -262,8 +264,6 @@ References:
 - Sarabande
 - track:ballad-of-awakening
 - track:upward-movement-dave-owns
-URLs:
-- https://casualsunday.bandcamp.com/track/a-farewell-to-arms
 ---
 Track: Moving On
 Artist: Robert J! Lake
@@ -276,10 +276,10 @@ Group: Bonus tracks
 Track: '[S]ynchronize (Instrumental)'
 Artist: Malcolm Brown
 Duration: '5:22'
-References:
-- '[S]ynchronize'
 URLs:
 - https://casualsunday.bandcamp.com/track/bonus-s-ynchronise-instrumental
+Referenced Tracks:
+- '[S]ynchronize'
 ---
 Track: Myststuck Suite (Full Version)
 Artist: David Ellis
@@ -287,17 +287,17 @@ Contributors:
 - Clouds Haberberg (vocals)
 - Adam Beveridge (trumpet)
 Duration: '16:13'
-References:
+URLs:
+- https://casualsunday.bandcamp.com/track/bonus-myststuck-suite-full-version
+Referenced Tracks:
 - First Steps
 - Back to Life
 - A World Awake
-URLs:
-- https://casualsunday.bandcamp.com/track/bonus-myststuck-suite-full-version
 ---
 Track: Requiem for Something Really Excellent (Demo)
 Artist: Robert J! Lake
 Duration: '1:45'
-References:
-- The Beginning of Something Really Excellent
 URLs:
 - https://casualsunday.bandcamp.com/track/bonus-requiem-for-something-really-excellent-demo
+Referenced Tracks:
+- The Beginning of Something Really Excellent
diff --git a/album/perfectly-generic-album.yaml b/album/perfectly-generic-album.yaml
index 42016001..c7d1bdf3 100644
--- a/album/perfectly-generic-album.yaml
+++ b/album/perfectly-generic-album.yaml
@@ -35,18 +35,18 @@ Commentary: |-
 ---
 Track: Healing June
 Duration: '3:08'
-References:
-- track:doctor
 Has URLs: false
+Referenced Tracks:
+- track:doctor
 ---
 Track: Moondancer
 Duration: '6:01'
-References:
-- Moonsetter
 Has URLs: false
 Commentary: |-
     <i>Cristata:</i>
     Moonsetter still makes me cry every time I listen to it.
+Referenced Tracks:
+- Moonsetter
 ---
 Track: Perfectly Generic
 Duration: '2:36'
diff --git a/album/perfectly-generic-object.yaml b/album/perfectly-generic-object.yaml
index d8bcb6a4..089bc11c 100644
--- a/album/perfectly-generic-object.yaml
+++ b/album/perfectly-generic-object.yaml
@@ -16,8 +16,8 @@ Cover Artists:
 - Cristata
 ---
 Track: Perfectly Generic Object
-References:
-- Perfectly Generic
 Duration: '2:56'
 URLs:
 - https://smoothiefruitee.bandcamp.com/track/perfectly-generic-object
+Referenced Tracks:
+- Perfectly Generic
diff --git a/album/prospit-and-derse.yaml b/album/prospit-and-derse.yaml
index 8a75dd26..43566337 100644
--- a/album/prospit-and-derse.yaml
+++ b/album/prospit-and-derse.yaml
@@ -58,8 +58,6 @@ Cover Artists:
 ---
 Track: The Golden Towers
 Duration: '3:22'
-References:
-- The Obsidian Towers
 Art Tags:
 - John
 - Jade
@@ -78,16 +76,14 @@ Commentary: |-
     As an additional note, it’s been pointed out to me by <a href="http://kicking-christ-in-a-dirty-diaper.tumblr.com/">this fan</a> that this song sounds like it has Mark Hadley’s Problem Sleuth theme in it, at least in part. It’s a coincidence in the exact same reason that Frost gets the same comment: slow melodies, probably the same key. Really nothing else to it. I’ve listened to Hadley’s PS theme probably twice ever. Oops. Said fan also wondered if I jokingly thought that gentlemen of Team Sleuth are Prospit’s agents much like our chums in the Midnight Crew are Derse’s. I didn’t, but that’s an awesome comparison and now I’m all for it.
 Cover Artists:
 - Pride
+Referenced Tracks:
+- The Obsidian Towers
 ---
 Track: Prospit Dreamers
 Duration: '3:19'
 Art Tags:
 - John
 - Jade
-References:
-- Penumbra Phantasm
-- track:frost-vol6
-- track:doctor
 URLs:
 - https://music.solatrus.com/track/prospit-dreamers
 - https://youtu.be/S70lGd8zpRM
@@ -115,6 +111,10 @@ Commentary: |-
     Butts indeed.
 Cover Artists:
 - Zilleniose
+Referenced Tracks:
+- Penumbra Phantasm
+- track:frost-vol6
+- track:doctor
 ---
 Track: Center of Brilliance
 Duration: '3:37'
@@ -182,9 +182,6 @@ Duration: '3:35'
 Art Tags:
 - Rose
 - Dave
-References:
-- track:atomyk-ebonpyre
-- track:endless-climb
 URLs:
 - https://music.solatrus.com/track/derse-dreamers
 - https://youtu.be/HpmCCuSHmng
@@ -209,6 +206,9 @@ Commentary: |-
     More importantly, however, I’m thrilled this song is enjoyed by so many people, and I’ve been blown away how people have have been using this song in their own derivative works. It’s just really heartwarming as an artist to see my work out there having a life of its own.
 Cover Artists:
 - Mixt
+Referenced Tracks:
+- track:atomyk-ebonpyre
+- track:endless-climb
 ---
 Track: Core of Darkness
 Duration: '3:14'
diff --git a/album/psycholonials-ep-1.yaml b/album/psycholonials-ep-1.yaml
index 28d3eeb0..f1076bb0 100644
--- a/album/psycholonials-ep-1.yaml
+++ b/album/psycholonials-ep-1.yaml
@@ -1,7 +1,5 @@
 Album: Psycholonials EP 1
 Artist: Clark Powell
-Banner Art:
-- Andrew Hussie
 Banner Dimensions: 1100x180
 Has Track Art: false
 Date: February 3, 2021
@@ -17,18 +15,22 @@ Cover Artists:
 Wallpaper Artists:
 - Andrew Hussie
 - Niklink (edits for wiki)
+Banner Artists:
+- Andrew Hussie
 ---
 Track: Summer That Never Was
-AKA: Star I Never Caught
 Duration: '3:50'
 URLs:
 - https://psycholonials.bandcamp.com/track/summer-that-never-was
+Also Released As:
+- Star I Never Caught
 ---
 Track: Morning Ritual
-AKA: Puzzle I Never Solved
 Duration: '2:47'
 URLs:
 - https://psycholonials.bandcamp.com/track/morning-ritual
+Also Released As:
+- Puzzle I Never Solved
 ---
 Track: What's Wasting Me
 Duration: '2:35'
diff --git a/album/psycholonials-ep-2.yaml b/album/psycholonials-ep-2.yaml
index 2efff9f6..5d76b726 100644
--- a/album/psycholonials-ep-2.yaml
+++ b/album/psycholonials-ep-2.yaml
@@ -1,7 +1,5 @@
 Album: Psycholonials EP 2
 Artist: Clark Powell
-Banner Art:
-- Andrew Hussie
 Banner Dimensions: 1100x180
 Has Track Art: false
 Date: February 17, 2021
@@ -17,33 +15,40 @@ Cover Artists:
 Wallpaper Artists:
 - Andrew Hussie
 - Niklink (edits for wiki)
+Banner Artists:
+- Andrew Hussie
 ---
 Track: The Cold Hand
-AKA: Sigh I Never Breathed
 Duration: '2:21'
 URLs:
 - https://psycholonials.bandcamp.com/track/the-cold-hand
+Also Released As:
+- Sigh I Never Breathed
 ---
 Track: Together
-AKA: Day That Never Came
 Duration: '2:04'
 URLs:
 - https://psycholonials.bandcamp.com/track/together
+Also Released As:
+- Day That Never Came
 ---
 Track: The Influencer
-AKA: Woman I Never Met
 Duration: '2:26'
 URLs:
 - https://psycholonials.bandcamp.com/track/the-influencer
+Also Released As:
+- Woman I Never Met
 ---
 Track: Just Dreams
-AKA: People I Never Knew
 Duration: '3:10'
 URLs:
 - https://psycholonials.bandcamp.com/track/just-dreams
+Also Released As:
+- People I Never Knew
 ---
 Track: I Have Some Ideas
-AKA: All but Alone
 Duration: '4:10'
 URLs:
 - https://psycholonials.bandcamp.com/track/i-have-some-ideas
+Also Released As:
+- All but Alone
diff --git a/album/psycholonials-ep-3.yaml b/album/psycholonials-ep-3.yaml
index 9c3aa255..d6cbbd4b 100644
--- a/album/psycholonials-ep-3.yaml
+++ b/album/psycholonials-ep-3.yaml
@@ -1,7 +1,5 @@
 Album: Psycholonials EP 3
 Artist: Clark Powell
-Banner Art:
-- Andrew Hussie
 Banner Dimensions: 1100x180
 Has Track Art: false
 Date: February 24, 2021
@@ -17,21 +15,26 @@ Cover Artists:
 Wallpaper Artists:
 - Andrew Hussie
 - Niklink (edits for wiki)
+Banner Artists:
+- Andrew Hussie
 ---
 Track: Time Is Helpless
-AKA: track:requiem-labyrinths-heart
 Duration: '4:36'
 URLs:
 - https://psycholonials.bandcamp.com/track/time-is-helpless
+Also Released As:
+- track:requiem-labyrinths-heart
 ---
 Track: Through The Play
-AKA: Pleas
 Duration: '3:13'
 URLs:
 - https://psycholonials.bandcamp.com/track/through-the-play
+Also Released As:
+- Pleas
 ---
 Track: Just Almost
-AKA: Song I Never Played
 Duration: '1:37'
 URLs:
 - https://psycholonials.bandcamp.com/track/just-almost
+Also Released As:
+- Song I Never Played
diff --git a/album/psycholonials-ep-4.yaml b/album/psycholonials-ep-4.yaml
index c2ffbca1..9fd03f3e 100644
--- a/album/psycholonials-ep-4.yaml
+++ b/album/psycholonials-ep-4.yaml
@@ -1,7 +1,5 @@
 Album: Psycholonials EP 4
 Artist: Clark Powell
-Banner Art:
-- Andrew Hussie
 Banner Dimensions: 1100x180
 Has Track Art: false
 Date: March 3, 2021
@@ -17,18 +15,22 @@ Cover Artists:
 Wallpaper Artists:
 - Andrew Hussie
 - Niklink (edits for wiki)
+Banner Artists:
+- Andrew Hussie
 ---
 Track: Outlaw
-AKA: Pencil Holder (demo version)
 Duration: '3:57'
 URLs:
 - https://psycholonials.bandcamp.com/track/outlaw
+Also Released As:
+- Pencil Holder (demo version)
 ---
 Track: A Screaming Inside
-AKA: Dante
 Duration: '2:14'
 URLs:
 - https://psycholonials.bandcamp.com/track/a-screaming-inside
+Also Released As:
+- Dante
 ---
 Track: Breakthroughs
 Duration: '2:14'
@@ -36,10 +38,11 @@ URLs:
 - https://psycholonials.bandcamp.com/track/breakthroughs
 ---
 Track: Nervous Energy
-AKA: A Romance of Protons and Neutrons
 Duration: '4:28'
 URLs:
 - https://psycholonials.bandcamp.com/track/nervous-energy
+Also Released As:
+- A Romance of Protons and Neutrons
 ---
 Track: Now And Forever
 Duration: '3:59'
diff --git a/album/psycholonials-ep-5.yaml b/album/psycholonials-ep-5.yaml
index 437cc1d6..6b254705 100644
--- a/album/psycholonials-ep-5.yaml
+++ b/album/psycholonials-ep-5.yaml
@@ -1,7 +1,5 @@
 Album: Psycholonials EP 5
 Artist: Clark Powell
-Banner Art:
-- Andrew Hussie
 Banner Dimensions: 1100x180
 Has Track Art: false
 Date: March 10, 2021
@@ -17,6 +15,8 @@ Cover Artists:
 Wallpaper Artists:
 - Andrew Hussie
 - Niklink (edits for wiki)
+Banner Artists:
+- Andrew Hussie
 ---
 Track: In The Works
 Duration: '4:22'
@@ -24,13 +24,15 @@ URLs:
 - https://psycholonials.bandcamp.com/track/in-the-works
 ---
 Track: Ephemeral Muse
-AKA: Harrigan
 Duration: '4:46'
 URLs:
 - https://psycholonials.bandcamp.com/track/ephemeral-muse
+Also Released As:
+- Harrigan
 ---
 Track: Blood On Their Hands
-AKA: Dusk for the Age of Miracles
 Duration: '2:46'
 URLs:
 - https://psycholonials.bandcamp.com/track/blood-on-their-hands
+Also Released As:
+- Dusk for the Age of Miracles
diff --git a/album/psycholonials-ep-6.yaml b/album/psycholonials-ep-6.yaml
index ba84509c..f34d5ea2 100644
--- a/album/psycholonials-ep-6.yaml
+++ b/album/psycholonials-ep-6.yaml
@@ -1,7 +1,5 @@
 Album: Psycholonials EP 6
 Artist: Clark Powell
-Banner Art:
-- Andrew Hussie
 Banner Dimensions: 1100x180
 Has Track Art: false
 Date: March 24, 2021
@@ -17,18 +15,22 @@ Cover Artists:
 Wallpaper Artists:
 - Andrew Hussie
 - Niklink (edits for wiki)
+Banner Artists:
+- Andrew Hussie
 ---
 Track: The Administrator
-AKA: Cruel Ulysses
 Duration: '2:21'
 URLs:
 - https://psycholonials.bandcamp.com/track/the-administrator
+Also Released As:
+- Cruel Ulysses
 ---
 Track: Means Of Conquest
-AKA: Country I Never Saw
 Duration: '3:55'
 URLs:
 - https://psycholonials.bandcamp.com/track/means-of-conquest
+Also Released As:
+- Country I Never Saw
 ---
 Track: Twelve Clown Salute
 Duration: '2:19'
diff --git a/album/psycholonials-ep-7.yaml b/album/psycholonials-ep-7.yaml
index 448c433c..b86cc361 100644
--- a/album/psycholonials-ep-7.yaml
+++ b/album/psycholonials-ep-7.yaml
@@ -1,7 +1,5 @@
 Album: Psycholonials EP 7
 Artist: Clark Powell
-Banner Art:
-- Andrew Hussie
 Banner Dimensions: 1100x180
 Has Track Art: false
 Date: March 31, 2021
@@ -17,19 +15,22 @@ Cover Artists:
 Wallpaper Artists:
 - Andrew Hussie
 - Niklink (edits for wiki)
+Banner Artists:
+- Andrew Hussie
 ---
 Track: The March
 Duration: '2:46'
-References:
-- Voice I Never Heard
 URLs:
 - https://psycholonials.bandcamp.com/track/the-march
+Referenced Tracks:
+- Voice I Never Heard
 ---
 Track: Such A Shame
-AKA: Miranda
 Duration: '3:25'
 URLs:
 - https://psycholonials.bandcamp.com/track/such-a-shame
+Also Released As:
+- Miranda
 ---
 Track: Break This
 Duration: '1:21'
diff --git a/album/psycholonials-ep-8.yaml b/album/psycholonials-ep-8.yaml
index 09a7080e..19116c23 100644
--- a/album/psycholonials-ep-8.yaml
+++ b/album/psycholonials-ep-8.yaml
@@ -1,7 +1,5 @@
 Album: Psycholonials EP 8
 Artist: Clark Powell
-Banner Art:
-- Andrew Hussie
 Banner Dimensions: 1100x180
 Has Track Art: false
 Date: April 13, 2021
@@ -17,18 +15,22 @@ Cover Artists:
 Wallpaper Artists:
 - Andrew Hussie
 - Niklink (edits for wiki)
+Banner Artists:
+- Andrew Hussie
 ---
 Track: In The Loop
-AKA: the Chillest Beat
 Duration: '2:38'
 URLs:
 - https://psycholonials.bandcamp.com/track/in-the-loop
+Also Released As:
+- the Chillest Beat
 ---
 Track: 'Flare: Insurrection Remix'
-AKA: Flare (Green Sun Remix)
 Duration: '4:08'
 URLs:
 - https://psycholonials.bandcamp.com/track/flare-insurrection-remix
+Also Released As:
+- Flare (Green Sun Remix)
 ---
 Track: 'Summer That Never Was: Firebrand Remix'
 Duration: '3:55'
diff --git a/album/psycholonials-ep-9.yaml b/album/psycholonials-ep-9.yaml
index 8afbc76a..e5538180 100644
--- a/album/psycholonials-ep-9.yaml
+++ b/album/psycholonials-ep-9.yaml
@@ -1,7 +1,5 @@
 Album: Psycholonials EP 9
 Artist: Clark Powell
-Banner Art:
-- Andrew Hussie
 Banner Dimensions: 1100x180
 Has Track Art: false
 Date: April 20, 2021 12:00:00
@@ -17,6 +15,8 @@ Cover Artists:
 Wallpaper Artists:
 - Andrew Hussie
 - Niklink (edits for wiki)
+Banner Artists:
+- Andrew Hussie
 ---
 Track: Fix This
 Duration: '1:54'
@@ -25,10 +25,10 @@ URLs:
 ---
 Track: Edge Of Dawn
 Duration: '4:33'
-References:
-- Shoreline
 URLs:
 - https://psycholonials.bandcamp.com/track/edge-of-dawn
+Referenced Tracks:
+- Shoreline
 ---
 Track: Threshold
 Duration: '1:47'
@@ -36,10 +36,11 @@ URLs:
 - https://psycholonials.bandcamp.com/track/threshold
 ---
 Track: We Were Right About Everything
-AKA: Lunatic
 Duration: '5:51'
 URLs:
 - https://psycholonials.bandcamp.com/track/we-were-right-about-everything
+Also Released As:
+- Lunatic
 ---
 Track: Feeling I Can't Shake
 Duration: '2:26'
@@ -52,10 +53,11 @@ URLs:
 - https://psycholonials.bandcamp.com/track/zhen
 ---
 Track: The Successor
-AKA: Forgotten
 Duration: '4:22'
 URLs:
 - https://psycholonials.bandcamp.com/track/the-successor
+Also Released As:
+- Forgotten
 ---
 Track: Love Song
 Duration: '3:54'
@@ -63,8 +65,8 @@ URLs:
 - https://psycholonials.bandcamp.com/track/love-song
 ---
 Track: 'Ephemeral Muse: Final Remix'
-References:
-- track:ephemeral-muse
 Duration: '4:08'
 URLs:
 - https://psycholonials.bandcamp.com/track/ephemeral-muse-final-remix
+Referenced Tracks:
+- track:ephemeral-muse
diff --git a/album/psycholonials.yaml b/album/psycholonials.yaml
index c6467f8c..89a51279 100644
--- a/album/psycholonials.yaml
+++ b/album/psycholonials.yaml
@@ -1,7 +1,5 @@
 Album: Psycholonials
 Artist: Clark Powell
-Banner Art:
-- Andrew Hussie
 Banner Dimensions: 1100x180
 Has Track Art: false
 Date: April 20, 2021 12:00:01
@@ -18,295 +16,334 @@ Cover Artists:
 Wallpaper Artists:
 - Andrew Hussie
 - Niklink (edits for wiki)
+Banner Artists:
+- Andrew Hussie
 ---
 Group: From <i>EP 1</i>
 ---
 Track: Summer That Never Was
 Directory: summer-that-never-was-ost
-AKA: Star I Never Caught
 Duration: '3:50'
 URLs:
 - https://psycholonials.bandcamp.com/track/summer-that-never-was-2
+Also Released As:
+- Star I Never Caught
 ---
 Track: Morning Ritual
 Directory: morning-ritual-ost
-AKA: Puzzle I Never Solved
 Duration: '2:47'
 URLs:
 - https://psycholonials.bandcamp.com/track/morning-ritual-2
+Also Released As:
+- Puzzle I Never Solved
 ---
 Track: What's Wasting Me
 Directory: whats-wasting-me-ost
-AKA: track:whats-wasting-me
 Duration: '2:35'
 URLs:
 - https://psycholonials.bandcamp.com/track/whats-wasting-me-2
+Also Released As:
+- track:whats-wasting-me
 ---
 Group: From <i>EP 2</i>
 ---
 Track: The Cold Hand
 Directory: the-cold-hand-ost
-AKA: Sigh I Never Breathed
 Duration: '2:21'
 URLs:
 - https://psycholonials.bandcamp.com/track/the-cold-hand-2
+Also Released As:
+- Sigh I Never Breathed
 ---
 Track: Together
 Directory: together-ost
-AKA: Day That Never Came
 Duration: '2:04'
 URLs:
 - https://psycholonials.bandcamp.com/track/together-2
+Also Released As:
+- Day That Never Came
 ---
 Track: The Influencer
 Directory: the-influencer-ost
-AKA: Woman I Never Met
 Duration: '2:26'
 URLs:
 - https://psycholonials.bandcamp.com/track/the-influencer-2
+Also Released As:
+- Woman I Never Met
 ---
 Track: Just Dreams
 Directory: just-dreams-ost
-AKA: People I Never Knew
 Duration: '3:10'
 URLs:
 - https://psycholonials.bandcamp.com/track/just-dreams-2
+Also Released As:
+- People I Never Knew
 ---
 Track: I Have Some Ideas
 Directory: i-have-some-ideas-ost
-AKA: All but Alone
 Duration: '4:10'
 URLs:
 - https://psycholonials.bandcamp.com/track/i-have-some-ideas-2
+Also Released As:
+- All but Alone
 ---
 Group: From <i>EP 3</i>
 ---
 Track: Time Is Helpless
 Directory: time-is-helpless-ost
-AKA: track:requiem-labyrinths-heart
 Duration: '4:36'
 URLs:
 - https://psycholonials.bandcamp.com/track/time-is-helpless-2
+Also Released As:
+- track:requiem-labyrinths-heart
 ---
 Track: Through The Play
 Directory: through-the-play-ost
-AKA: Pleas
 Duration: '3:13'
 URLs:
 - https://psycholonials.bandcamp.com/track/through-the-play-2
+Also Released As:
+- Pleas
 ---
 Track: Just Almost
 Directory: just-almost-ost
-AKA: Song I Never Played
 Duration: '1:37'
 URLs:
 - https://psycholonials.bandcamp.com/track/just-almost-2
+Also Released As:
+- Song I Never Played
 ---
 Group: From <i>EP 4</i>
 ---
 Track: Outlaw
 Directory: outlaw-ost
-AKA: Pencil Holder (demo version)
 Duration: '3:57'
 URLs:
 - https://psycholonials.bandcamp.com/track/outlaw-2
+Also Released As:
+- Pencil Holder (demo version)
 ---
 Track: A Screaming Inside
 Directory: a-screaming-inside-ost
-AKA: Dante
 Duration: '2:14'
 URLs:
 - https://psycholonials.bandcamp.com/track/a-screaming-inside-2
+Also Released As:
+- Dante
 ---
 Track: Breakthroughs
 Directory: breakthroughs-ost
-AKA: track:breakthroughs
 Duration: '2:14'
 URLs:
 - https://psycholonials.bandcamp.com/track/breakthroughs-2
+Also Released As:
+- track:breakthroughs
 ---
 Track: Nervous Energy
 Directory: nervous-energy-ost
-AKA: A Romance of Protons and Neutrons
 Duration: '4:28'
 URLs:
 - https://psycholonials.bandcamp.com/track/nervous-energy-2
+Also Released As:
+- A Romance of Protons and Neutrons
 ---
 Track: Now And Forever
 Directory: now-and-forever-ost
-AKA: track:now-and-forever
 Duration: '3:59'
 URLs:
 - https://psycholonials.bandcamp.com/track/now-and-forever-2
+Also Released As:
+- track:now-and-forever
 ---
 Group: From <i>EP 5</i>
 ---
 Track: In The Works
 Directory: in-the-works-ost
-AKA: track:in-the-works
 Duration: '4:22'
 URLs:
 - https://psycholonials.bandcamp.com/track/in-the-works-2
+Also Released As:
+- track:in-the-works
 ---
 Track: Ephemeral Muse
 Directory: ephemeral-muse-ost
-AKA: Harrigan
 Duration: '4:46'
 URLs:
 - https://psycholonials.bandcamp.com/track/ephemeral-muse-2
+Also Released As:
+- Harrigan
 ---
 Track: Blood On Their Hands
 Directory: blood-on-their-hands-ost
-AKA: Dusk for the Age of Miracles
 Duration: '2:46'
 URLs:
 - https://psycholonials.bandcamp.com/track/blood-on-their-hands-2
+Also Released As:
+- Dusk for the Age of Miracles
 ---
 Group: From <i>EP 6</i>
 ---
 Track: The Administrator
 Directory: the-administrator-ost
-AKA: Cruel Ulysses
 Duration: '2:21'
 URLs:
 - https://psycholonials.bandcamp.com/track/the-administrator-2
+Also Released As:
+- Cruel Ulysses
 ---
 Track: Means Of Conquest
 Directory: means-of-conquest-ost
-AKA: Country I Never Saw
 Duration: '3:55'
 URLs:
 - https://psycholonials.bandcamp.com/track/means-of-conquest-2
+Also Released As:
+- Country I Never Saw
 ---
 Track: Twelve Clown Salute
 Directory: twelve-clown-salute-ost
-AKA: track:twelve-clown-salute
 Duration: '2:19'
 URLs:
 - https://psycholonials.bandcamp.com/track/twelve-clown-salute-2
+Also Released As:
+- track:twelve-clown-salute
 ---
 Group: From <i>EP 7</i>
 ---
 Track: The March
 Directory: the-march-ost
-AKA: track:the-march
 Duration: '2:46'
-References:
-- Voice I Never Heard
 URLs:
 - https://psycholonials.bandcamp.com/track/the-march-2
+Referenced Tracks:
+- Voice I Never Heard
+Also Released As:
+- track:the-march
 ---
 Track: Such A Shame
 Directory: such-a-shame-ost
-AKA: Miranda
 Duration: '3:25'
 URLs:
 - https://psycholonials.bandcamp.com/track/such-a-shame-2
+Also Released As:
+- Miranda
 ---
 Track: Break This
 Directory: break-this-ost
-AKA: track:break-this
 Duration: '1:21'
 URLs:
 - https://psycholonials.bandcamp.com/track/break-this-2
+Also Released As:
+- track:break-this
 ---
 Group: From <i>EP 8</i>
 ---
 Track: In The Loop
 Directory: in-the-loop-ost
-AKA: the Chillest Beat
 Duration: '2:38'
 URLs:
 - https://psycholonials.bandcamp.com/track/in-the-loop-2
+Also Released As:
+- the Chillest Beat
 ---
 Track: 'Flare: Insurrection Remix'
 Directory: flare-insurrection-remix-ost
-AKA: Flare (Green Sun Remix)
 Duration: '4:08'
 URLs:
 - https://psycholonials.bandcamp.com/track/flare-insurrection-remix-2
+Also Released As:
+- Flare (Green Sun Remix)
 ---
 Track: 'Summer That Never Was: Firebrand Remix'
 Directory: summer-that-never-was-firebrand-remix-ost
-AKA: track:summer-that-never-was-firebrand-remix
 Duration: '3:55'
 URLs:
 - https://psycholonials.bandcamp.com/track/summer-that-never-was-firebrand-remix-2
+Also Released As:
+- track:summer-that-never-was-firebrand-remix
 ---
 Group: From <i>EP 9</i>
 ---
 Track: Fix This
 Directory: fix-this-ost
-AKA: track:fix-this
 Duration: '1:54'
 URLs:
 - https://psycholonials.bandcamp.com/track/fix-this-2
+Also Released As:
+- track:fix-this
 ---
 Track: Edge Of Dawn
 Directory: edge-of-dawn-ost
-AKA: track:edge-of-dawn
 Duration: '4:33'
-References:
-- Shoreline
 URLs:
 - https://psycholonials.bandcamp.com/track/edge-of-dawn-2
+Referenced Tracks:
+- Shoreline
+Also Released As:
+- track:edge-of-dawn
 ---
 Track: Threshold
 Directory: threshold-ost
-AKA: track:threshold
 Duration: '1:47'
 URLs:
 - https://psycholonials.bandcamp.com/track/threshold-2
+Also Released As:
+- track:threshold
 ---
 Track: We Were Right About Everything
 Directory: we-were-right-about-everything-ost
-AKA: Lunatic
 Duration: '5:51'
 URLs:
 - https://psycholonials.bandcamp.com/track/we-were-right-about-everything-2
+Also Released As:
+- Lunatic
 ---
 Track: Feeling I Can't Shake
 Directory: feeling-i-cant-shake-ost
-AKA: track:feeling-i-cant-shake
 Duration: '2:26'
 URLs:
 - https://psycholonials.bandcamp.com/track/feeling-i-cant-shake-2
+Also Released As:
+- track:feeling-i-cant-shake
 ---
 Track: Zhen
 Directory: zhen-ost
-AKA: track:zhen
 Duration: '2:42'
 URLs:
 - https://psycholonials.bandcamp.com/track/zhen-2
+Also Released As:
+- track:zhen
 ---
 Track: The Successor
 Directory: the-successor-ost
-AKA: Forgotten
 Duration: '4:22'
 URLs:
 - https://psycholonials.bandcamp.com/track/the-successor-2
+Also Released As:
+- Forgotten
 ---
 Track: Love Song
 Directory: love-song-ost
-AKA: track:love-song
 Duration: '3:54'
 URLs:
 - https://psycholonials.bandcamp.com/track/love-song-2
+Also Released As:
+- track:love-song
 ---
 Track: 'Ephemeral Muse: Final Remix'
 Directory: ephemeral-muse-final-remix-ost
-References:
-- track:ephemeral-muse
 Duration: '4:08'
 URLs:
 - https://psycholonials.bandcamp.com/track/ephemeral-muse-final-remix-2
+Referenced Tracks:
+- track:ephemeral-muse
 ---
 Group: Bonus tracks
 ---
 Track: 'Together: Vocal Remix'
-AKA: Someday
 Artists:
 - Clark Powell
 - Astro Kid
 Duration: '2:56'
 Has URLs: false
+Also Released As:
+- Someday
diff --git a/album/rust-apocalypse.yaml b/album/rust-apocalypse.yaml
index c19d9eba..eef82427 100644
--- a/album/rust-apocalypse.yaml
+++ b/album/rust-apocalypse.yaml
@@ -26,59 +26,62 @@ URLs:
 ---
 Track: Rust Witch
 Duration: '3:47'
-References:
-- Rust Servant
 Directory: rust-witch-ascenzo
 URLs:
 - https://wellmanicuredmusic.bandcamp.com/track/rust-witch
+Referenced Tracks:
+- Rust Servant
 ---
 Track: Teal Justice
 Duration: '2:51'
-References:
-- Teal Hunter
 URLs:
 - https://wellmanicuredmusic.bandcamp.com/track/teal-justice
+Referenced Tracks:
+- Teal Hunter
 ---
 Track: Violet Armada
 Duration: '4:01'
-References:
-- Violet Mariner
 URLs:
 - https://wellmanicuredmusic.bandcamp.com/track/violet-armada
+Referenced Tracks:
+- Violet Mariner
 ---
 Track: Rust Apocalypse
 Duration: '7:46'
-References:
-- Rust Servant
 URLs:
 - https://wellmanicuredmusic.bandcamp.com/track/rust-apocalypse
 - https://youtu.be/l6FOxvXbym4
+Referenced Tracks:
+- Rust Servant
 ---
 Track: White Angel
 Duration: '2:57'
-References:
-- Teal Hunter
 URLs:
 - https://wellmanicuredmusic.bandcamp.com/track/white-angel
+Referenced Tracks:
+- Teal Hunter
 ---
 Group: Bonus tracks
 ---
 Track: Rust Servant (original)
 Duration: '4:48'
-AKA: Rust Servant
 URLs:
 - https://wellmanicuredmusic.bandcamp.com/track/rust-servant-original
+Also Released As:
+- Rust Servant
 ---
 Track: Teal Hunter (original)
 Duration: '2:31'
-AKA: Teal Hunter
 URLs:
 - https://wellmanicuredmusic.bandcamp.com/track/teal-hunter-original
+Also Released As:
+- Teal Hunter
 ---
 Track: Violet Mariner (original)
 Duration: '2:45'
-References:
-- track:showtime-piano-refrain
-AKA: Violet Mariner
 URLs:
 - https://wellmanicuredmusic.bandcamp.com/track/violet-mariner-original
+Referenced Tracks:
+- track:showtime-piano-refrain
+Also Released As:
+- Violet Mariner
diff --git a/album/s-collide.yaml b/album/s-collide.yaml
index bf56b2a6..fedf44c8 100644
--- a/album/s-collide.yaml
+++ b/album/s-collide.yaml
@@ -18,11 +18,11 @@ Wallpaper Artists:
 Track: Creata (Canon Edit)
 Artist: Seth Peelle
 Duration: '1:56'
-References:
-- Creata
 URLs:
 - https://homestuck.bandcamp.com/track/creata-canon-edit-2
 - https://youtu.be/43XGeVEiihM
+Referenced Tracks:
+- Creata
 ---
 Track: Oppa Toby Style
 Artist: Toby Fox
@@ -32,7 +32,12 @@ Duration: '5:39'
 URLs:
 - https://homestuck.bandcamp.com/track/oppa-toby-style-2
 - https://youtu.be/bjAK8D5ytiU
-References:
+Commentary: |-
+    <i>James Roach:</i>
+    i love cheers in songs (i edited the cheers into tobys song for [s] collide, and have written them into a few things) so the sword/shield gym theme really does it for me
+    I JUST VERY SELFISHLY ADDED <a href="https://youtu.be/bjAK8D5ytiU?t=82">THESE CHEERS</a> TO AN ALREADY GOOD SONG LMAO
+    toby had written a really cool song but i wanted to give andrew some hits that were less on the downbeat for the animation so while i was editing the tracks down for length and extending bits here and there i ended up adding them in because i wanted the section to feel hype
+Referenced Tracks:
 - Ham And Steak
 - Rex Duodecim Angelus
 - English
@@ -41,28 +46,21 @@ References:
 - Crystalanthemums
 - track:crustacean
 - Liquid Negrocity
-Commentary: |-
-    <i>James Roach:</i>
-    i love cheers in songs (i edited the cheers into tobys song for [s] collide, and have written them into a few things) so the sword/shield gym theme really does it for me
-    I JUST VERY SELFISHLY ADDED <a href="https://youtu.be/bjAK8D5ytiU?t=82">THESE CHEERS</a> TO AN ALREADY GOOD SONG LMAO
-    toby had written a really cool song but i wanted to give andrew some hits that were less on the downbeat for the animation so while i was editing the tracks down for length and extending bits here and there i ended up adding them in because i wanted the section to feel hype
 ---
 Track: Eternity, Served Cold (Canon Edit)
 Artist: Malcolm Brown
 Duration: '3:34'
-References:
-- Eternity Served Cold
 URLs:
 - https://homestuck.bandcamp.com/track/eternity-served-cold-canon-edit-2
 - https://youtu.be/Ow8PeoCrfcg
+Referenced Tracks:
+- Eternity Served Cold
 ---
 Track: Heir of Grief
 Artist: Tensei
 Contributors:
 - James Roach (editing)
 Duration: '6:12'
-References:
-- Heir Conditioning
 URLs:
 - https://homestuck.bandcamp.com/track/heir-of-grief-2
 - https://youtu.be/Es5mh7pBeec
@@ -70,3 +68,5 @@ Commentary: |-
     <i>James Roach:</i>
     the rest of the edits i did for collide were like... timing things. theres a part at the end where we needed one more bar of hits during heir of grief because one extra thing happens (the part where the condesce gets stabbed is the previous 4 bars copied and edited in)
     you might notice this if you're music savvy to the point where you're like wait why is there a 12 bar phrase in an otherwise 16 bar pattern. its because that part wasnt long enough for the animation and andrew suggested asking to re-record it and i was like thatll take too long
+Referenced Tracks:
+- Heir Conditioning
diff --git a/album/sburb-ost.yaml b/album/sburb-ost.yaml
index 323a8e2a..d0d310e6 100644
--- a/album/sburb-ost.yaml
+++ b/album/sburb-ost.yaml
@@ -1,7 +1,5 @@
 Album: Sburb OST
 Directory: sburb-ost
-Banner Art:
-- melodiousDiscord
 Banner Dimensions: 1100x203
 Date: November 24, 2012
 Date Added: May 25, 2020
@@ -14,6 +12,8 @@ URLs:
 - https://www.youtube.com/playlist?list=PL2E1aOkERtLXq9YuH-q42kkqvsYGl7fvD
 Cover Artists:
 - melodiousDiscord
+Banner Artists:
+- melodiousDiscord
 ---
 Group: Disk 1
 ---
@@ -30,26 +30,26 @@ Track: Waiting For Adventure [Loading Screen]
 Directory: waiting-for-adventure
 Artist: Michael Guy Bowman
 Duration: '1:28'
-References:
-- track:sburban-jungle
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/waiting-for-adventure-loading-screen
 - https://youtu.be/76qyHMO_To4
 Cover Artists:
 - Tavia Morra
+Referenced Tracks:
+- track:sburban-jungle
 ---
 Track: SBURBan Prelude [Main Menu]
 Directory: sburban-prelude
 Artist: sidewalkbanana
 Duration: '6:35'
-References:
-- track:sburban-jungle
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/sburban-prelude-main-menu
 - https://youtu.be/pfN56WauQMc
 Cover Artists:
 - RunDoubleRun
 - Emily
+Referenced Tracks:
+- track:sburban-jungle
 ---
 Track: Meta Choices [Options]
 Directory: meta-choices
@@ -66,13 +66,13 @@ Track: Ignorance Is Bliss [Tutorial]
 Directory: ignorance-is-bliss
 Artist: Marcy Nabors
 Duration: '1:40'
-References:
-- Homestuck Anthem
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/ignorance-is-bliss-tutorial
 - https://youtu.be/yvwYCNet-rg
 Cover Artists:
 - Esabelle Ryngin
+Referenced Tracks:
+- Homestuck Anthem
 ---
 Track: Metamorphic Choices [Kernel Prototyping]
 Directory: metamorphic-choices
@@ -88,38 +88,38 @@ Track: Dawn of the End [Countdown]
 Directory: dawn-of-the-end
 Artist: Max Wright
 Duration: '3:51'
-References:
-- track:sburban-jungle
-- Umbral Ultimatum
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/dawn-of-the-end-countdown
 - https://youtu.be/1Go4d26_Fc4
 Cover Artists:
 - invalidgriffin
+Referenced Tracks:
+- track:sburban-jungle
+- Umbral Ultimatum
 ---
 Track: A Spirited Conversation [Sprite Interaction]
 Directory: a-spirited-conversation
 Artist: Veritas Unae, Charles Neudorf
 Duration: '2:08'
-References:
-- Metamorphic Choices [Kernel Prototyping]
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/a-spirited-conversation-sprite-interaction
 - https://youtu.be/wGWHW8Z0I20
 Cover Artists:
 - Adoxographist
+Referenced Tracks:
+- Metamorphic Choices [Kernel Prototyping]
 ---
 Track: Layers Upon Layers [Build]
 Directory: layers-upon-layers
 Artist: Marcy Nabors, Jamie Paige Stanley
 Duration: '11:47'
-References:
-- Waiting For Adventure [Loading Screen]
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/layers-upon-layers-build
 - https://youtu.be/aZk3ZyMZbto
 Cover Artists:
 - Alistair Diszrali
+Referenced Tracks:
+- Waiting For Adventure [Loading Screen]
 ---
 Track: Mysterious Messengers [Exiles]
 Directory: mysterious-messengers
@@ -215,8 +215,6 @@ Cover Artists:
 Track: On Golden Dreams [Prospit]
 Directory: on-golden-dreams
 Artist: Veritas Unae
-References:
-- track:lulling-lutescent
 Duration: '5:44'
 Art Tags:
 - Carapacians
@@ -225,6 +223,8 @@ URLs:
 - https://youtu.be/xWH3oGbPT0I
 Cover Artists:
 - invalidgriffin
+Referenced Tracks:
+- track:lulling-lutescent
 ---
 Track: Amongst Smiling Faces [Prospitian Dignitaries]
 Directory: amongst-smiling-faces
@@ -243,8 +243,6 @@ Cover Artists:
 Track: Grudge in A Minor [Jack Noir]
 Directory: grudge-in-a-minor
 Artist: Catboss
-References:
-- Liquid Negrocity
 Duration: '3:27'
 Art Tags:
 - Jack Noir
@@ -254,18 +252,20 @@ URLs:
 - https://youtu.be/QSRDbMqEKNU
 Cover Artists:
 - melodiousDiscord
+Referenced Tracks:
+- Liquid Negrocity
 ---
 Track: Lavender Lullaby [Derse Sleep]
 Directory: lavender-lullaby
 Artist: Veritas Unae
-References:
-- Planet in Shadow [Derse]
 Duration: 0:15
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/lavender-lullaby-derse-sleep
 - https://youtu.be/IVzdrWlyi2k
 Cover Artists:
 - Phosphorescence
+Referenced Tracks:
+- Planet in Shadow [Derse]
 ---
 Track: Planet in Shadow [Derse]
 Directory: planet-in-shadow
@@ -326,14 +326,14 @@ Cover Artists:
 Track: Inner Depths [Labs]
 Directory: inner-depths
 Artist: Brad Griffin
-References:
-- Outer Reaches [Veil]
 Duration: '2:24'
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/inner-depths-labs
 - https://youtu.be/P9sCVSugHJk
 Cover Artists:
 - Tarranon
+Referenced Tracks:
+- Outer Reaches [Veil]
 ---
 Track: Autogenesis [Ectobiology]
 Directory: autogenesis
@@ -348,8 +348,6 @@ Cover Artists:
 Track: Broken Dreams [Prospit's Fall]
 Directory: broken-dreams
 Artist: Veritas Unae, Charles Neudorf
-References:
-- On Golden Dreams [Prospit]
 Duration: '1:45'
 Art Tags:
 - WK
@@ -360,6 +358,8 @@ URLs:
 - https://youtu.be/IXQOYNTjDL0
 Cover Artists:
 - Brad Griffin
+Referenced Tracks:
+- On Golden Dreams [Prospit]
 ---
 Track: Paradoxical Meteor Shower [Reckoning]
 Directory: paradoxical-meteor-shower
@@ -389,26 +389,26 @@ Track: ~~~~DISK 2~~~~
 Directory: disk2-sburb-ost
 Artist: Veritas Unae
 Duration: 0:09
-References:
-- Emerald Icarus [Green Sun]
-- CumuloSeerus [Oracle Clouds]
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/disk-2
 - https://youtu.be/LRgpQv4M61g
 Cover Artists:
 - melodiousDiscord
+Referenced Tracks:
+- Emerald Icarus [Green Sun]
+- CumuloSeerus [Oracle Clouds]
 ---
 Track: CumuloSeerus [Oracle Clouds]
 Directory: cumuloseerus
 Artist: Brad Griffin
 Duration: '2:24'
-References:
-- SBURBan Prelude [Main Menu]
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/cumuloseerus-oracle-clouds
 - https://youtu.be/4-h0cq--6dU
 Cover Artists:
 - Tavia Morra
+Referenced Tracks:
+- SBURBan Prelude [Main Menu]
 ---
 Track: Checkerboard Checkmate [Battlefield]
 Directory: checkerboard-checkmate
@@ -438,20 +438,18 @@ Track: Resurrection [God Tier]
 Directory: resurrection
 Artist: Brad Griffin
 Duration: '2:22'
-References:
-- track:sburban-jungle
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/resurrection-god-tier
 - https://youtu.be/nikAW_QAZ6U
 Cover Artists:
 - Kate Holden
+Referenced Tracks:
+- track:sburban-jungle
 ---
 Track: Land of _____ and Frogs [Frog Gathering]
 Directory: land-of-_____-and-frogs
 Artist: Veritas Unae
 Duration: '1:45'
-References:
-- Frog's Theme
 Art Tags:
 - Frogs
 URLs:
@@ -459,6 +457,8 @@ URLs:
 - https://youtu.be/eWdABIdlYgc
 Cover Artists:
 - Brad Griffin
+Referenced Tracks:
+- Frog's Theme
 ---
 Track: Rana's Abode [Frog Temple]
 Directory: ranas-abode
@@ -476,10 +476,6 @@ Track: The Will to Fight Further [Denizen Strife]
 Directory: the-will-to-fight-further
 Artist: Kevin Grant, Catboss
 Duration: '5:08'
-References:
-- The Will to Fight (Original Mix) [Denizen Strife]
-- track:showtime-piano-refrain
-- Waking the Beast [Denizen Encounter]
 Art Tags:
 - Denizens
 URLs:
@@ -487,6 +483,10 @@ URLs:
 - https://youtu.be/OZXn9yrrvAg
 Cover Artists:
 - Dawn Davis
+Referenced Tracks:
+- The Will to Fight (Original Mix) [Denizen Strife]
+- track:showtime-piano-refrain
+- Waking the Beast [Denizen Encounter]
 ---
 Track: Barren Session [Game Over]
 Directory: barren-session
@@ -536,8 +536,6 @@ Track: Endgame Execution [Black King Battle]
 Directory: endgame-execution
 Artist: Catboss
 Duration: '8:50'
-References:
-- Rex Duodecim Angelus
 Art Tags:
 - BK
 URLs:
@@ -545,6 +543,8 @@ URLs:
 - https://youtu.be/3ubrfmrP_QY
 Cover Artists:
 - shymuffin
+Referenced Tracks:
+- Rex Duodecim Angelus
 ---
 Track: Where ribbIt All Began [Genesis Frog]
 Directory: where-ribbit-all-began
@@ -586,19 +586,24 @@ Track: ~~~~BONUS~~~~
 Directory: bonus-sburb-ost
 Artist: Veritas Unae
 Duration: 0:17
-References:
-- Gods of the New World [Universe Creation]
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/bonus
 - https://youtu.be/r-mC0yxln38
 Cover Artists:
 - Veritas Unae
+Referenced Tracks:
+- Gods of the New World [Universe Creation]
 ---
 Track: The Untold Story [Skaia Exposition]
 Directory: the-untold-story
 Artist: Brad Griffin
 Duration: '3:39'
-References:
+URLs:
+- https://unofficialmspafans.bandcamp.com/track/the-untold-story-skaia-exposition
+- https://youtu.be/IoYq-Alfnr4
+Cover Artists:
+- Brad Griffin
+Referenced Tracks:
 - CumuloSeerus [Oracle Clouds]
 - Check the Chequered Castle [Battlefield Castle]
 - On Golden Dreams [Prospit]
@@ -606,11 +611,6 @@ References:
 - Overly Ostentatious Ogre [Miniboss]
 - Resurrection [God Tier]
 - Gods of the New World [Universe Creation]
-URLs:
-- https://unofficialmspafans.bandcamp.com/track/the-untold-story-skaia-exposition
-- https://youtu.be/IoYq-Alfnr4
-Cover Artists:
-- Brad Griffin
 ---
 Track: Melody && Form && Composition [Alchemiter]
 Directory: melody-form-composition
@@ -626,14 +626,14 @@ Track: Take Flight [Battleship]
 Directory: take-flight
 Artist: Veritas Unae
 Duration: '2:46'
-References:
-- Checkerboard Checkmate [Battlefield]
-- Check the Chequered Castle [Battlefield Castle]
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/take-flight-battleship
 - https://youtu.be/VfjGp71BKt0
 Cover Artists:
 - Pseudonym
+Referenced Tracks:
+- Checkerboard Checkmate [Battlefield]
+- Check the Chequered Castle [Battlefield Castle]
 ---
 Track: Born to Die [Doomed Timeline]
 Directory: born-to-die
@@ -649,8 +649,6 @@ Track: The Will to Fight (Original Mix) [Denizen Strife]
 Directory: the-will-to-fight-original-mix
 Artist: Kevin Grant
 Duration: '4:41'
-References:
-- track:showtime-original-mix
 Art Tags:
 - Denizens
 URLs:
@@ -658,6 +656,8 @@ URLs:
 - https://youtu.be/Vv3q8rSn7Ow
 Cover Artists:
 - Dawn Davis
+Referenced Tracks:
+- track:showtime-original-mix
 ---
 Track: Prime [Pause]
 Directory: prime
diff --git a/album/sburb.yaml b/album/sburb.yaml
index f65a5057..a35551c1 100644
--- a/album/sburb.yaml
+++ b/album/sburb.yaml
@@ -42,8 +42,6 @@ Cover Artists:
 ---
 Track: The Prelude
 Duration: '1:43'
-References:
-- Homestuck Anthem
 URLs:
 - https://jamesdever.bandcamp.com/track/prelude
 - https://youtu.be/7k8zCRNxa7k
@@ -55,6 +53,8 @@ Commentary: |-
     The introduction to the suite lays the fundamentals and ideas present throughout the rest of the movements. A juxtaposition between major and minor are in every chord creating a backbone of polytonality that I wanted to explore as I formulated the album.
     The main Homestuck anthem is weaved through the chords as this album was originally written for and published through MS Paint Adventures and What Pumpkin. The original theme was composed by Clark Powell.
     The album in its entirety is performed by Erik Scheele.
+Referenced Tracks:
+- Homestuck Anthem
 ---
 Track: Genesis
 Duration: '2:26'
@@ -83,8 +83,6 @@ Commentary: |-
 ---
 Track: Exodus
 Duration: '2:08'
-References:
-- track:sburban-jungle
 URLs:
 - https://jamesdever.bandcamp.com/track/exodus
 - https://youtu.be/UnbRhrKFofY
@@ -95,6 +93,8 @@ Commentary: |-
     <i>(commentary redux)</i>
     Continuing the Homestuck homages, this piece prominently features the bassline from Michael Guy Bowman's Sburban Jungle.
     When I was writing this movement I really wanted to explore how much I could utilize the different registers of the piano while keeping a constant ostinato running through the middle register.
+Referenced Tracks:
+- track:sburban-jungle
 ---
 Track: Requiem
 Duration: '2:56'
@@ -126,8 +126,6 @@ Commentary: |-
 ---
 Track: Chronicles
 Duration: '1:42'
-References:
-- Candles and Clockwork
 URLs:
 - https://jamesdever.bandcamp.com/track/chronicles
 - https://youtu.be/TOtz3MTSeKg
@@ -138,6 +136,8 @@ Commentary: |-
     <i>(commentary redux)</i>
     Chronicles is an adaption of an earlier Homestuck track I wrote, Candles and Clockwork. It was one of the first compositions I ever finished and, true to form, is a big hemiola. I wanted an ostinato in a different time signature than the melody which is what I focus on during the first section as I introduce the melody.
     The second part of the song introduces the final major motive of the suite, a sextuplet accompaniment outlining the tonic and dominant. A staple of the western art canon, it was a good foundation for me to work on some melodies that weren't purely rhythmic noodling.
+Referenced Tracks:
+- Candles and Clockwork
 ---
 Track: Rapture
 Duration: '1:52'
@@ -153,8 +153,6 @@ Commentary: |-
 ---
 Track: Creation
 Duration: '4:02'
-References:
-- Homestuck Anthem
 URLs:
 - https://jamesdever.bandcamp.com/track/creation
 - https://youtu.be/XorynbzZQpI
@@ -167,11 +165,11 @@ Commentary: |-
     You can definitely see that I was influenced into writing music from the works of Philip Glass and that is in full force here, but even in retrospect I feel like I put a great personal spin on it.
     As the sun sets, there's a final recall of the Homestuck Anthem. This movement was originally the last movement before I added the Revelations movements but it fit too well and I could not bring myself to remove it.
     I wrote this the weeks following the passing of my grandmother. It will always be for her and for everything she did for me.
+Referenced Tracks:
+- Homestuck Anthem
 ---
 Track: Revelations I
 Duration: '1:07'
-References:
-- Homestuck Anthem
 URLs:
 - https://jamesdever.bandcamp.com/track/revelations-i
 - https://youtu.be/YoIYaFyll5Q
@@ -183,6 +181,8 @@ Commentary: |-
     <i>(commentary redux)</i>
     Revelations is a three part finale that is completely centered on the sextuplet dominant/tonic motive introduced earlier in the album. Each movement was more exploration of how I can use the same general accompaniment but completely change the melody.
     <i>(commentary from movements II and III is from original booklet)</i>
+Referenced Tracks:
+- Homestuck Anthem
 ---
 Track: Revelations II
 Duration: '2:41'
diff --git a/album/shortcuts.yaml b/album/shortcuts.yaml
index 237c3a15..0e096e24 100644
--- a/album/shortcuts.yaml
+++ b/album/shortcuts.yaml
@@ -1,7 +1,5 @@
 Album: Shortcuts
 Wallpaper Style: 'opacity: 0.7;'
-Banner Art:
-- Robert J! Lake
 Banner Dimensions: 1100x180
 Date: November 2, 2013
 Date Added: July 24, 2020
@@ -23,6 +21,8 @@ Cover Artists:
 - Robert J! Lake
 Wallpaper Artists:
 - Robert J! Lake
+Banner Artists:
+- Robert J! Lake
 ---
 Track: A Scape
 Artist: Marcy Nabors
diff --git a/album/someday.yaml b/album/someday.yaml
index 0569be48..360ace23 100644
--- a/album/someday.yaml
+++ b/album/someday.yaml
@@ -25,6 +25,6 @@ URLs:
 Track: Someday (Astro Kid Remix)
 Artist: Astro Kid
 Duration: '4:41'
-References:
-- Someday
 Has URLs: false
+Referenced Tracks:
+- Someday
diff --git a/album/song-of-skaia.yaml b/album/song-of-skaia.yaml
index 39bae4e5..897bae63 100644
--- a/album/song-of-skaia.yaml
+++ b/album/song-of-skaia.yaml
@@ -21,16 +21,14 @@ URLs:
 ---
 Track: Skaian Birth
 Duration: '2:28'
-References:
-- track:skies-of-skaia
 URLs:
 - https://parsecproductions.bandcamp.com/track/skaian-birth
 - https://youtu.be/pEtclU-Tdck
+Referenced Tracks:
+- track:skies-of-skaia
 ---
 Track: Song of Skaia
 Duration: '6:27'
-References:
-- track:skies-of-skaia
 Contributors:
 - Tarien Ainuvë (lyrics/vocals)
 URLs:
@@ -47,3 +45,5 @@ Lyrics: |-
     (<i>Music joins light<br>All is born from a dream<br>Let it be</i>)
     In vento cogitatio, spirat in vento (Pel Amar)<br>E vacuo lux elucet, lux e vacuo (Vinya-onant)<br>E somno somnia cre'ta, somnia e somno (Feä raniel)<br>In clara umbra creatum versat (Vilyadessë sira)
     In vento spiritus flat, spiritus in vento (Lindelë)<br>In fusco lumen ignescit, lumen in fusco (Sama calad)<br>E somnis verita nata est verita nata (Oloriello)<br>E nihil omnia cre'ta sunt omnia creata (Illuvë onant, eä)
+Referenced Tracks:
+- track:skies-of-skaia
diff --git a/album/squiddles.yaml b/album/squiddles.yaml
index c26354fd..d0464da0 100644
--- a/album/squiddles.yaml
+++ b/album/squiddles.yaml
@@ -1,8 +1,6 @@
 Album: Squiddles!
 Date: August 26, 2010
 Date Added: November 15, 2019
-Banner Art:
-- Cindy Dominguez
 Banner Dimensions: 1100x205
 Wallpaper Style: 'opacity: 0.6;'
 Has Track Art: false
@@ -17,6 +15,8 @@ Cover Artists:
 - Cindy Dominguez
 Wallpaper Artists:
 - Cindy Dominguez
+Banner Artists:
+- Cindy Dominguez
 ---
 Group: Main album
 ---
@@ -48,11 +48,11 @@ URLs:
 ---
 Track: Squiddle Parade
 Artist: Ian Taylor
-References:
-- Homestuck Anthem
 Duration: 0:50
 URLs:
 - https://youtu.be/gqd8XTRwzoI
+Referenced Tracks:
+- Homestuck Anthem
 ---
 Track: Squiddle March
 Artist: Erik Scheele
@@ -69,10 +69,10 @@ URLs:
 Track: Sun-Speckled Squiddly Afternoon
 Artist: Alex Rosetti
 Duration: '1:41'
-References:
-- Squiddles!
 URLs:
 - https://youtu.be/faRVzG1TZus
+Referenced Tracks:
+- Squiddles!
 ---
 Track: Squiddles Campfire
 Artist: Erik Scheele
@@ -83,10 +83,10 @@ URLs:
 Track: Friendship is Paramount
 Artist: Seth Peelle
 Duration: '3:43'
-References:
-- Squiddles!
 URLs:
 - https://youtu.be/X0DmGl7AJIU
+Referenced Tracks:
+- Squiddles!
 ---
 Track: Lazybones
 Artist: Steve Everson
@@ -204,8 +204,6 @@ Artist: Alex Rosetti
 Contributors:
 - Toby Fox (Skipper Plumbthroat)
 Duration: '2:51'
-References:
-- Catchyegrabber (Skipper Plumbthroat's Song)
 URLs:
 - https://youtu.be/4PfZu1AWTWI
 Lyrics: |-
@@ -215,27 +213,29 @@ Lyrics: |-
     (Darn those Squiddles, where are my pants?)<br>(I am embarrassed that you Squiddles have had to see my naked body.)
     (I’ll get you yet, you Squiddles!)<br>(Well, EXCUSE me, Squiddles!)<br>(Squiddles! Curse you, Squiddles!)<br>(You have yet to see the power of the Catchyegrabber!)
     (I wish I had a job! I wish I wasn’t such a- [unintelligible] this! [unintelligible] Skipper Plumbthroat!)
+Referenced Tracks:
+- Catchyegrabber (Skipper Plumbthroat's Song)
 ---
 Track: Squiddles the Movie Trailer - The Day the Unicorns Couldn't Play
 Artist: Toby Fox
 Duration: '1:51'
-References:
-- Squiddles!
 URLs:
 - https://youtu.be/9lWRGynBNVs
 Lyrics: |-
     (But... but where are the unicorns today, Mommy? Where are the unicorns?)
     (Someday, when I’m older, I’ll— I’ll find Santa Claus. He’ll bring the unicorns back, won’t he Mommy? Mommy? Where are you, Mommy? Are you with the unicorns?)
     (NOOOOOOOOOOOOOOOO!)
+Referenced Tracks:
+- Squiddles!
 ---
 Track: Carefree Princess Berryboo
 Artist: Alex Rosetti
 Duration: '2:16'
-References:
-- Carefree Action
 URLs:
 - https://youtu.be/_Z8qT1GBhds
 Lyrics: (Well EXCUSE me, Princess Berryboo!)
+Referenced Tracks:
+- Carefree Action
 ---
 Track: Mister Bowman Tells You About the Squiddles
 Artist: Michael Guy Bowman
@@ -272,9 +272,6 @@ Commentary: |-
 Track: Let the Squiddles Sleep (End Theme)
 Artist: Robert J! Lake
 Duration: '5:06'
-References:
-- Squiddles!
-Samples: Squiddles!
 URLs:
 - https://youtu.be/mpn7lahHvEc
 Lyrics: |-
@@ -286,6 +283,10 @@ Lyrics: |-
     Squeedle dee dee<br>Squeedle dee dum<br>Everyone sing a Squiddly song<br>Let's all be friends<br>And work as a team<br>Squiddles for you<br>Squiddles for me!
     Tangle Buddies<br>Let's become<br>Tangle Buddies<br>That's right<br>Tangle Buddies<br>You heard me<br>Tangle Buddies<Br>Tangle Buddies<br>Let's become<br>Tangle Buddies<br>That's right<br>Tangle Buddies<br>You heard me<br>Tangle Bu-
     My tangle[???] Tangle Buddies<br>Tangle Buddies<br>Let's become Tangle Buddies
+Referenced Tracks:
+- Squiddles!
+Sampled Tracks:
+- Squiddles!
 ---
 Group: Bonus tracks
 ---
diff --git a/album/strife-2.yaml b/album/strife-2.yaml
index 6c9be232..0c010004 100644
--- a/album/strife-2.yaml
+++ b/album/strife-2.yaml
@@ -37,20 +37,20 @@ Cover Artists:
 ---
 Track: Rouge on the Rox
 Duration: '2:48'
-References:
-- JoJo ~Sono Chi no Sadame~
 URLs:
 - https://tenseimusic.bandcamp.com/track/rouge-on-the-rox
 - https://youtu.be/3hepsdc1xPc
+Referenced Tracks:
+- JoJo ~Sono Chi no Sadame~
 ---
 Track: Perfect Cascade of the Heart
 Duration: '2:55'
-References:
-- Cascade (Beta)
-- Time on My Side
 URLs:
 - https://tenseimusic.bandcamp.com/track/perfect-cascade-of-the-heart
 - https://youtu.be/8_iVaqCiRFE
+Referenced Tracks:
+- Cascade (Beta)
+- Time on My Side
 ---
 Track: Hope Strikes Eternal
 Duration: '3:14'
@@ -68,19 +68,16 @@ URLs:
 ---
 Track: Arachnofunkia
 Duration: '3:21'
-References:
-- Arachnofunkia (Beta)
 URLs:
 - https://tenseimusic.bandcamp.com/track/arachnofunkia
 - https://youtu.be/vIu5V4tuFuA
 Cover Artists:
 - nights
+Referenced Tracks:
+- Arachnofunkia (Beta)
 ---
 Track: The King in Red
 Duration: '3:49'
-References:
-- The King in Red (Beta)
-- track:crustacean
 Art Tags:
 - 'cw: blood'
 URLs:
@@ -88,49 +85,52 @@ URLs:
 - https://youtu.be/2_uFQGP7s9k
 Cover Artists:
 - nights
+Referenced Tracks:
+- The King in Red (Beta)
+- track:crustacean
 ---
 Track: Heel Girl
 Duration: '4:00'
-References:
-- Heel Girl (Beta)
-- Umbral Ultimatum
 URLs:
 - https://tenseimusic.bandcamp.com/track/heel-girl
 - https://youtu.be/RrU12KztX0Q
+Referenced Tracks:
+- Heel Girl (Beta)
+- Umbral Ultimatum
 ---
 Track: Unite Division
 Duration: '3:40'
-References:
-- Unite Division (Beta)
-- Liquid Negrocity
 URLs:
 - https://tenseimusic.bandcamp.com/track/unite-division
 - https://youtu.be/SLy2p6mVZ9A
+Referenced Tracks:
+- Unite Division (Beta)
+- Liquid Negrocity
 ---
 Track: Spirit of Storms (Reprise)
 Duration: '1:23'
-References:
-- Spirit of Storms
 URLs:
 - https://tenseimusic.bandcamp.com/track/spirit-of-storms-reprise
 - https://youtu.be/psmbW5obOrQ
+Referenced Tracks:
+- Spirit of Storms
 ---
 Group: Bonus tracks
 ---
 Track: The King in Red (Beta)
 Duration: '1:39'
-References:
-- track:crustacean
 URLs:
 - https://www.youtube.com/watch?v=o-okW7YECmI
+Referenced Tracks:
+- track:crustacean
 ---
 Track: Unite Division (Beta)
 Duration: '1:43'
-References:
-- Thin RED Line
-- Liquid Negrocity
 URLs:
 - https://www.youtube.com/watch?v=o-okW7YECmI
+Referenced Tracks:
+- Thin RED Line
+- Liquid Negrocity
 ---
 Track: Arachnofunkia (Beta)
 Duration: 0:52
@@ -149,10 +149,10 @@ URLs:
 ---
 Track: Dance of Thorns (Karaoke)
 Duration: '4:01'
-References:
-- Dance of Thorns
 URLs:
 - https://www.youtube.com/watch?v=3z9BE1F58_o
+Referenced Tracks:
+- Dance of Thorns
 ---
 Track: Bound in Blood (Beta)
 Duration: '1:33'
diff --git a/album/strife.yaml b/album/strife.yaml
index 00cdf8d2..57b62ec3 100644
--- a/album/strife.yaml
+++ b/album/strife.yaml
@@ -28,31 +28,27 @@ URLs:
 ---
 Track: Heir Conditioning
 Duration: '3:53'
-References:
-- Tomboyish Girl in Love
-- track:doctor
-- Penumbra Phantasm
 URLs:
 - https://tenseimusic.bandcamp.com/track/heir-conditioning
 - https://youtu.be/vwUc_apgdo0
+Referenced Tracks:
+- Tomboyish Girl in Love
+- track:doctor
+- Penumbra Phantasm
 ---
 Track: Dance of Thorns
 Duration: '4:01'
-References:
+URLs:
+- https://tenseimusic.bandcamp.com/track/dance-of-thorns
+- https://youtu.be/3dKRKDn9ZJk
+Referenced Tracks:
 - Moon Over the Castle
 - Bloody Tears
 - track:beginning
 - Recruitment Theme
-URLs:
-- https://tenseimusic.bandcamp.com/track/dance-of-thorns
-- https://youtu.be/3dKRKDn9ZJk
 ---
 Track: Time on My Side
 Duration: '3:28'
-References:
-- track:beatdown-strider-style
-- Liquid Negrocity
-- Master of Puppets
 URLs:
 - https://tenseimusic.bandcamp.com/track/time-on-my-side
 - https://youtu.be/_zfOKIREJX8
@@ -72,25 +68,29 @@ Commentary: |-
     The original inspiration for this song probably comes from the least likely source imaginable. It’s not The Prodigy or Goldeneye 64 music, but actually the original score to the movie Space Jam. You probably don’t even know or remember it, but a lot of the songs have a very distinct looped hiphop beat, guitars, and orchestral stabs all over the place, much like a large portion of this song.
     Seriously, listen to <a href="https://www.youtube.com/watch?v=UBenCP-51Qw">this</a> from about 0:50 onward and you should hear the resemblance.
     That aside, obviously stuff from The Prodigy’s Fat of the Land album bears some resemblance as well, especially with the cheesy bassline. I know that a few Prodigy songs have been used in the otherwise kinda shitty Charlie’s Angels movies whenever shit was about to go down, and that’s really the kind of vibe I was going for as well.
+Referenced Tracks:
+- track:beatdown-strider-style
+- Liquid Negrocity
+- Master of Puppets
 ---
 Track: Atomic Bonsai
 Duration: '4:20'
-References:
-- The Raising Fighting Spirit
-- Reverse Situation
-- The Decisive Battle
 URLs:
 - https://tenseimusic.bandcamp.com/track/atomic-bonsai
 - https://youtu.be/ncLsScNc4ZY
+Referenced Tracks:
+- The Raising Fighting Spirit
+- Reverse Situation
+- The Decisive Battle
 ---
 Track: Knife's Edge
 Duration: '4:05'
-References:
-- To Make the End of Battle
-- Cascade (Beta)
 URLs:
 - https://tenseimusic.bandcamp.com/track/knifes-edge
 - https://youtu.be/eYdneOkIvvc
+Referenced Tracks:
+- To Make the End of Battle
+- Cascade (Beta)
 ---
 Group: Bonus tracks
 ---
diff --git a/album/symphony-impossible-to-play.yaml b/album/symphony-impossible-to-play.yaml
index b3d545eb..b416d317 100644
--- a/album/symphony-impossible-to-play.yaml
+++ b/album/symphony-impossible-to-play.yaml
@@ -1,8 +1,5 @@
 Album: Symphony Impossible to Play
 Artist: Clark Powell
-Banner Art:
-- Homestuck
-- Niklink (edits for wiki)
 Banner Dimensions: 1100x200
 Wallpaper Style: |-
     opacity: 0.6;
@@ -25,6 +22,9 @@ Cover Artists:
 Wallpaper Artists:
 - Homestuck
 - Quasar Nebula (edits for wiki)
+Banner Artists:
+- Homestuck
+- Niklink (edits for wiki)
 ---
 Track: I - Overture
 Duration: '7:00'
@@ -32,7 +32,7 @@ Directory: overture
 URLs:
 - https://homestuck.bandcamp.com/track/i-overture-2
 - https://youtu.be/Fi311fNF09w
-References:
+Referenced Tracks:
 - track:endless-climb
 - Crystalanthemums
 - track:atomyk-ebonpyre
@@ -46,28 +46,28 @@ References:
 ---
 Track: II - Sarabande
 Duration: '2:36'
-References:
-- track:sarabande-vol5
 Directory: sarabande-symphony
 URLs:
 - https://homestuck.bandcamp.com/track/ii-sarabande-2
 - https://youtu.be/iADicSzT0VE
+Referenced Tracks:
+- track:sarabande-vol5
 ---
 Track: III - Serenade
 Duration: '5:44'
-References:
-- Serenade
-- track:ruins
 Directory: serenade-symphony
 URLs:
 - https://homestuck.bandcamp.com/track/iii-serenade-2
 - https://youtu.be/wjvxf4QiHfU
+Referenced Tracks:
+- Serenade
+- track:ruins
 ---
 Track: IV - Anthem
 Duration: '3:48'
-References:
-- Homestuck Anthem
 Directory: anthem
 URLs:
 - https://homestuck.bandcamp.com/track/iv-anthem-2
 - https://youtu.be/FaT8T3030mA
+Referenced Tracks:
+- Homestuck Anthem
diff --git a/album/the-baby-is-you.yaml b/album/the-baby-is-you.yaml
index 24efb53b..ea0640fa 100644
--- a/album/the-baby-is-you.yaml
+++ b/album/the-baby-is-you.yaml
@@ -33,18 +33,16 @@ Lyrics: |-
 ---
 Track: Throguh Song
 Duration: 0:43
-References:
-- track:showtime-original-mix
 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
+Referenced Tracks:
+- track:showtime-original-mix
 ---
 Track: The Baby is You
 Duration: '1:36'
-References:
-- Throguh Song
 URLs:
 - https://youtu.be/BtCsf7tFBIQ
 Lyrics: |-
@@ -66,11 +64,11 @@ Lyrics: |-
     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
+Referenced Tracks:
+- Throguh Song
 ---
 Track: bootes
 Duration: '1:47'
-References:
-- Canon in D
 URLs:
 - https://youtu.be/aoDIAbQnV88
 Lyrics: |-
@@ -80,11 +78,11 @@ Lyrics: |-
     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>
+Referenced Tracks:
+- Canon in D
 ---
 Track: rose pragnant
 Duration: '1:11'
-References:
-- Showdown
 URLs:
 - https://youtu.be/l6BDUDe4eQo
 Lyrics: |-
@@ -99,11 +97,11 @@ Lyrics: |-
     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>
+Referenced Tracks:
+- Showdown
 ---
 Track: the rose rap
 Duration: '2:45'
-References:
-- rose pragnant
 URLs:
 - https://youtu.be/o3rJTGHgYTk
 Lyrics: |-
@@ -131,6 +129,8 @@ Lyrics: |-
     (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>
+Referenced Tracks:
+- rose pragnant
 ---
 Track: uh oh
 Duration: 0:07
@@ -142,9 +142,6 @@ Lyrics: |-
 ---
 Track: vs bros
 Duration: '1:27'
-References:
-- Can You Feel the Love Tonight
-- Versus
 URLs:
 - https://youtu.be/ustNt1bH9JQ
 Lyrics: |-
@@ -164,11 +161,12 @@ Lyrics: |-
     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
+Referenced Tracks:
+- Can You Feel the Love Tonight
+- Versus
 ---
 Track: a baby is born
 Duration: '1:30'
-References:
-- rose pragnant
 URLs:
 - https://youtu.be/jCfE_6pTN8A
 Lyrics: |-
@@ -191,3 +189,5 @@ Lyrics: |-
     &nbsp;
     &nbsp;
     mia: i came as fast as i could
+Referenced Tracks:
+- rose pragnant
diff --git a/album/the-felt.yaml b/album/the-felt.yaml
index d3218368..d32d2479 100644
--- a/album/the-felt.yaml
+++ b/album/the-felt.yaml
@@ -21,17 +21,15 @@ Wallpaper Artists:
 Track: Jade Dragon
 Artist: Robert J! Lake
 Duration: '3:27'
-References:
-- Viva la Vida
 URLs:
 - https://homestuck.bandcamp.com/track/jade-dragon-2
 - https://youtu.be/et0432j4c5s
+Referenced Tracks:
+- Viva la Vida
 ---
 Track: Swing of the Clock
 Artist: Solatrus
 Duration: '5:58'
-References:
-- Three in the Morning
 URLs:
 - https://homestuck.bandcamp.com/track/swing-of-the-clock-2
 - https://youtu.be/kEGailT_BHs
@@ -61,6 +59,8 @@ Commentary: |-
     <b>Now For Some Trivia!</b>
     Swing of the Clock was the second to last of a very long stretch of original songs I did in the key of F minor. It’s my favorite key to write music in, but I’ve barely touched it since Chartreuse Rewind. (Which is next week..! Er.. I guess this week, since I was late on this. Oops.) Why? Well, too much of a good thing is a bad thing.
     Secondly, Lexxy really dug this song and it made me flip the fuck out when I found out she liked it, because she’s an amazing person!
+Referenced Tracks:
+- Three in the Morning
 ---
 Track: Rhapsody in Green
 Artist: Clark Powell
@@ -79,8 +79,6 @@ URLs:
 Track: Clockwork Reversal
 Artist: Thomas Ferkol
 Duration: '1:41'
-References:
-- Clockwork Apocalypse
 Art Tags:
 - 'cw: blood'
 URLs:
@@ -90,6 +88,8 @@ Commentary: |-
     <i>Thomas Ferkol:</i>
     Clockwork Reversal was my second contribution to the Felt.  I love the melody of Endless Climb.  I loved the music box-esque remixes on Volume 5 even more.  Before I got on the team, I had written Clockwork Apocalypse, an orchestrated version of Clockwork Melody.  After realizing Audacity could reverse music, I started experimenting.
     Since the Endless Climb melody was so memorable and it had served as good sort of interlude tracks on Volume 5, I decided to try to make something in a similar vein.  Oddly enough, I think the reversed version of the Clockwork Reversal sounds even better than both Clockwork Reversal and Clockwork Apocalypse.
+Referenced Tracks:
+- Clockwork Apocalypse
 ---
 Track: Chartreuse Rewind
 Artist: Solatrus
@@ -124,11 +124,11 @@ URLs:
 Track: Apocryphal Antithesis
 Artist: Clark Powell
 Duration: '2:51'
-References:
-- track:endless-climb
 URLs:
 - https://homestuck.bandcamp.com/track/apocryphal-antithesis-2
 - https://youtu.be/PTd8rhHHyEs
+Referenced Tracks:
+- track:endless-climb
 ---
 Track: Trails
 Artist: Mark Hadley
@@ -152,12 +152,12 @@ URLs:
 Track: Scratch
 Artist: David Ko
 Duration: '3:10'
-References:
-- Toccata and Fugue in D minor
-- Ultimate Koopa
 URLs:
 - https://homestuck.bandcamp.com/track/scratch-2
 - https://youtu.be/3OVpWgisy0o
+Referenced Tracks:
+- Toccata and Fugue in D minor
+- Ultimate Koopa
 ---
 Track: Omelette Sandwich
 Artist: Mark Hadley
@@ -181,8 +181,6 @@ URLs:
 Track: Time Paradox
 Artist: Thomas Ferkol
 Duration: '3:06'
-References:
-- Westminister Quarters
 Art Tags:
 - 'cw: blood'
 - 'cw: corpse'
@@ -194,6 +192,8 @@ Commentary: |-
     This was the first piece I submitted for an album once I got on the team.  Basically what happened was: I am visiting somewhere in Chicago with only my phone’s connection to the internet, check the MSPA forums and find a message notification waiting for me.  Radiation congratulates me on getting on the team.  After some moments of sputtering disbelief, I read on.  He says if I want to get started on something, the Squiddles was being finished up and the Felt was on the table.  So, for the next couple hours I was invigorated, consumed wholly during the car ride and time in the hotel before I finally fell asleep with working on a track for the Felt.  Time Paradox was made.
     Originally, I made it imagining the recruitment of the Felt, picturing Doc Scratch warping across time and space, assembling the green goons from who knows where, and then witnessing the construction of the Felt manor.
     It’s a fun track, more energetic than a lot of things I had worked on and definitely influenced by Radiation’s style.  The last two sections are still some of my favorite phrases that I’ve written.
+Referenced Tracks:
+- Westminister Quarters
 ---
 Track: Eldritch
 Artist: Alex Rosetti
@@ -214,11 +214,11 @@ URLs:
 Track: Variations
 Artist: Robert J! Lake
 Duration: '6:03'
-References:
+URLs:
+- https://homestuck.bandcamp.com/track/variations-2
+- https://youtu.be/M966V66lLuE
+Referenced Tracks:
 - Rhapsody in Green
 - Jade Dragon
 - Swing of the Clock
 - Afraid of the Darko
-URLs:
-- https://homestuck.bandcamp.com/track/variations-2
-- https://youtu.be/M966V66lLuE
diff --git a/album/the-funk-mclovin-homestuck-experience.yaml b/album/the-funk-mclovin-homestuck-experience.yaml
index d3e549ac..c39f936f 100644
--- a/album/the-funk-mclovin-homestuck-experience.yaml
+++ b/album/the-funk-mclovin-homestuck-experience.yaml
@@ -31,7 +31,6 @@ Lyrics: |-
 ---
 Track: The Strider Rap-Off
 Duration: '3:16'
-Original Date: April 9, 2020
 URLs:
 - https://funkmclovin.bandcamp.com/track/the-strider-rap-off
 - https://www.youtube.com/watch?v=SkDY73uNxtE
@@ -140,19 +139,17 @@ Lyrics: |-
     DIRK: Fucking sick.
 
     (<i>Credits to <a href="https://www.youtube.com/channel/UCPFTOXaTJ665xSDVxoV6wgQ">Vinyl</a> for <a href="https://www.youtube.com/watch?v=SkDY73uNxtE&lc=Ugxw9X0PulMJTLiITwV4AaABAg">transcription</a>.</i>)
+Date First Released: April 9, 2020
 ---
 Track: Jade Defender
 Duration: '2:21'
-Original Date: February 21, 2020
 URLs:
 - https://funkmclovin.bandcamp.com/track/jade-defender
 - https://www.youtube.com/watch?v=y0jzBu7IZWU
+Date First Released: February 21, 2020
 ---
 Track: GameGoth
 Duration: '1:42'
-Original Date: January 28, 2020
-References:
-- GameBro (Original 1990 Mix)
 URLs:
 - https://funkmclovin.bandcamp.com/track/gamegoth
 - https://www.youtube.com/watch?v=QLHdyAM4ujs
@@ -191,10 +188,12 @@ Lyrics: |-
     I'd say "better luck next time" but that won't be the case
     Another victim claimed to the darkest gaming ace
     Hahahaha!
+Referenced Tracks:
+- GameBro (Original 1990 Mix)
+Date First Released: January 28, 2020
 ---
 Track: Less Pale, More Pail
 Duration: '2:03'
-Original Date: February 10, 2020
 URLs:
 - https://funkmclovin.bandcamp.com/track/less-pale-more-pail
 - https://www.youtube.com/watch?v=LYQj9F5fLMI
@@ -225,31 +224,31 @@ Lyrics: |-
     (Oh, baby. Please don't make me beg.
     'Cause I will beg. I don't wanna beg but I will.
     I definitely will beg. If you make me.)
+Date First Released: February 10, 2020
 ---
 Track: 'Steel Bastille: Heart of Light, Crown of Thorns'
 Duration: '2:58'
-Original Date: February 26, 2020
 URLs:
 - https://funkmclovin.bandcamp.com/track/steel-bastille-heart-of-light-crown-of-thorns
 - https://www.youtube.com/watch?v=8DDPym9XkRk
+Date First Released: February 26, 2020
 ---
 Track: Vrissy's Theme
 Duration: '2:29'
-Original Date: January 2, 2020
 URLs:
 - https://funkmclovin.bandcamp.com/track/vrissys-theme
 - https://www.youtube.com/watch?v=w86Mq0kLnwQ
+Date First Released: January 2, 2020
 ---
 Track: Vogue Rogue
 Duration: '2:09'
-Original Date: January 6, 2020
 URLs:
 - https://funkmclovin.bandcamp.com/track/vogue-rogue
 - https://www.youtube.com/watch?v=ttk-q7BonIE
+Date First Released: January 6, 2020
 ---
 Track: Ult!Dirk Can't Rap
 Duration: 0:59
-Original Date: April 3, 2020
 URLs:
 - https://funkmclovin.bandcamp.com/track/ult-dirk-cant-rap
 - https://www.youtube.com/watch?v=btUK0HAPXeQ
@@ -288,11 +287,12 @@ Lyrics: |-
     I wonder how Jane's doing? God I miss Jake
 
     (--Rose get the fuck out of here!)
+Date First Released: April 3, 2020
 ---
 Track: Vriska's Theme (Off The Shits Edition)
 Duration: '3:50'
-References:
-- Vriska's Theme
 URLs:
 - https://funkmclovin.bandcamp.com/track/vriskas-theme-off-the-shits-edition
 - https://www.youtube.com/watch?v=o34votcZmMA
+Referenced Tracks:
+- Vriska's Theme
diff --git a/album/the-genesis-project-vol-1.yaml b/album/the-genesis-project-vol-1.yaml
index a1e0cb9c..da54d030 100644
--- a/album/the-genesis-project-vol-1.yaml
+++ b/album/the-genesis-project-vol-1.yaml
@@ -23,18 +23,18 @@ URLs:
 Track: Configure the Universe
 Artist: Musical Panini
 Duration: 0:32
-References:
-- track:sburban-jungle
 URLs:
 - https://genesis-project.bandcamp.com/track/configure-the-universe
+Referenced Tracks:
+- track:sburban-jungle
 ---
 Track: Genesiac Jungle
 Artist: Commander Cello
 Duration: '1:24'
-References:
-- track:ruins
 URLs:
 - https://genesis-project.bandcamp.com/track/genesiac-jungle
+Referenced Tracks:
+- track:ruins
 ---
 Track: Aggravate
 Artist: Musical Panini
@@ -51,19 +51,19 @@ URLs:
 Track: Showtime (Panini Mix)
 Artist: Musical Panini
 Duration: '2:08'
-References:
-- track:showtime-original-mix
 URLs:
 - https://genesis-project.bandcamp.com/track/showtime-panini-mix
+Referenced Tracks:
+- track:showtime-original-mix
 ---
 Track: Skaian Selection
 Artist: Musical Panini
 Duration: '2:34'
-References:
-- track:skies-of-skaia
-- track:sburban-jungle
 URLs:
 - https://genesis-project.bandcamp.com/track/skaian-selection
+Referenced Tracks:
+- track:skies-of-skaia
+- track:sburban-jungle
 ---
 Track: Symphotronic
 Artist: pragmaticNihilist
diff --git a/album/the-grubbles.yaml b/album/the-grubbles.yaml
index 954e5164..f179762a 100644
--- a/album/the-grubbles.yaml
+++ b/album/the-grubbles.yaml
@@ -53,8 +53,8 @@ URLs:
 ---
 Track: Get The Horns
 Duration: '2:15'
-References:
-- Filthy Nuclear Bunker
 URLs:
 - https://homestuck.bandcamp.com/track/get-the-horns
 - https://youtu.be/ZZbFo1W1TjQ
+Referenced Tracks:
+- Filthy Nuclear Bunker
diff --git a/album/the-wanderers.yaml b/album/the-wanderers.yaml
index 3034ab70..61be3e13 100644
--- a/album/the-wanderers.yaml
+++ b/album/the-wanderers.yaml
@@ -1,6 +1,4 @@
 Album: The Wanderers
-Banner Art:
-- Lauren Ross
 Banner Dimensions: 1463x270
 Wallpaper Style: |-
     background-size: auto;
@@ -31,6 +29,8 @@ Cover Artists:
 - Lauren Ross
 Wallpaper Artists:
 - Lauren Ross
+Banner Artists:
+- Lauren Ross
 ---
 Group: Main album
 ---
@@ -74,8 +74,6 @@ Cover Artists:
 Track: Gilded Sands
 Artist: Nick Smalley, Solatrus
 Duration: '4:00'
-References:
-- Stone Tower Temple
 Art Tags:
 - WV
 - Serenity
@@ -93,6 +91,8 @@ Commentary: |-
     Seriously.
 Cover Artists:
 - Nyanface
+Referenced Tracks:
+- Stone Tower Temple
 ---
 Track: Years in the Future
 Artist: Robert J! Lake
@@ -112,10 +112,6 @@ Cover Artists:
 Track: Mayor Maynot
 Artist: Toby Fox
 Duration: '3:20'
-References:
-- Mailtime
-Samples:
-- Judge Dredd
 Art Tags:
 - WV
 URLs:
@@ -139,6 +135,10 @@ Lyrics: |-
     YER. MAY, YER, MAY YER. (TAIL. MAIL, MAIL, MAY TAIL.)<br>MAY, YER, MAY YERRRRR~! (MAIL, MAIL, MAY MAILLLL~.)
 Cover Artists:
 - Shad Andrews
+Referenced Tracks:
+- Mailtime
+Sampled Tracks:
+- Judge Dredd
 ---
 Track: We Walk
 Artist: Steve Everson
@@ -161,8 +161,6 @@ Cover Artists:
 Track: Requiem for an Exile
 Artist: Solatrus
 Duration: '2:01'
-References:
-- track:requiem
 Art Tags:
 - WV
 - PM
@@ -176,12 +174,12 @@ Commentary: |-
     I’d be a bit flat sounding!
 Cover Artists:
 - Zilleniose
+Referenced Tracks:
+- track:requiem
 ---
 Track: Raggy Looking Dance
 Artist: Alex Rosetti
 Duration: '3:28'
-References:
-- Squiddles!
 Art Tags:
 - WV
 - PM
@@ -190,6 +188,8 @@ URLs:
 - https://albatrosssoup.bandcamp.com/track/raggy-looking-dance
 Cover Artists:
 - Zilleniose
+Referenced Tracks:
+- Squiddles!
 ---
 Track: Riches to Ruins Movements I & II
 Artist: Toby Fox
@@ -204,8 +204,6 @@ Cover Artists:
 Track: Litrichean Rioghail
 Artist: Malcolm Brown
 Duration: '5:00'
-References:
-- track:explore
 Art Tags:
 - PM
 URLs:
@@ -223,12 +221,12 @@ Commentary: |-
     That's really all I have to say on the matter.
 Cover Artists:
 - Hanni Brosh
+Referenced Tracks:
+- track:explore
 ---
 Track: Ruins Rising
 Artist: Michael Guy Bowman
 Duration: '5:00'
-References:
-- track:ruins
 Art Tags:
 - WV
 - Jack Noir
@@ -236,6 +234,8 @@ URLs:
 - https://youtu.be/pDYCL68d3wI
 Cover Artists:
 - Raizor
+Referenced Tracks:
+- track:ruins
 ---
 Track: What a Daring Dream
 Artist: Alex Rosetti
@@ -264,10 +264,6 @@ Cover Artists:
 Track: Nightmare
 Artist: Malcolm Brown
 Duration: '4:13'
-References:
-- Liquid Negrocity
-- Rex Duodecim Angelus
-- Carapacian Dominion
 Art Tags:
 - WV
 - Carapacians
@@ -285,20 +281,24 @@ Commentary: |-
     Also hey, 4:13. Love it when that happens.
 Cover Artists:
 - Left
+Referenced Tracks:
+- Liquid Negrocity
+- Rex Duodecim Angelus
+- Carapacian Dominion
 ---
 Group: Bonus tracks
 ---
 Track: Vagabounce Remix
 Artist: David Ko
 Duration: '1:55'
-References:
-- track:vagabounce
 Art Tags:
 - WV
 URLs:
 - https://youtu.be/P_pCaNbhExo
 Cover Artists:
 - Noot
+Referenced Tracks:
+- track:vagabounce
 ---
 Track: Tomahawk Head
 Artist: Toby Fox, Tensei
diff --git a/album/theres-no-place-like-home.yaml b/album/theres-no-place-like-home.yaml
index 6e6811db..55198707 100644
--- a/album/theres-no-place-like-home.yaml
+++ b/album/theres-no-place-like-home.yaml
@@ -24,19 +24,21 @@ Cover Artists:
 ---
 Track: Confined
 Duration: '4:04'
-References:
+URLs:
+- https://teeveemusic.bandcamp.com/track/confined
+Referenced Tracks:
 - track:sburban-countdown
 - track:sburban-jungle
 - Another Jungle
 - track:showtime-original-mix
 - Versus
 - track:beatdown-strider-style
-URLs:
-- https://teeveemusic.bandcamp.com/track/confined
 ---
 Track: 🎼 Fraymotif !
 Duration: '13:11'
-References:
+URLs:
+- https://teeveemusic.bandcamp.com/track/fraymotif
+Referenced Tracks:
 - track:overture
 - Play The Wind
 - Terezi's Theme
@@ -81,12 +83,12 @@ References:
 - Pumpkin Tide
 - track:under-the-hat
 - I'm a Member of the Midnight Crew
-URLs:
-- https://teeveemusic.bandcamp.com/track/fraymotif
 ---
 Track: Beat Mesa Boogie
 Duration: '16:16'
-References:
+URLs:
+- https://teeveemusic.bandcamp.com/track/beat-mesa-boogie
+Referenced Tracks:
 - track:harlequin
 - The Lordling
 - track:vagabounce
@@ -131,12 +133,12 @@ References:
 - Nautical Nightmare
 - The Blind Prophet
 - Sunsetter
-URLs:
-- https://teeveemusic.bandcamp.com/track/beat-mesa-boogie
 ---
 Track: Rainbow Rumpus Partytown
 Duration: '7:12'
-References:
+URLs:
+- https://teeveemusic.bandcamp.com/track/rainbow-rumpus-partytown
+Referenced Tracks:
 - Genesis
 - Prospitian Folklore
 - A Taste for Adventure
@@ -158,12 +160,12 @@ References:
 - Science Seahorse
 - Love You (Feferi's Theme)
 - Darling Dolorosa
-URLs:
-- https://teeveemusic.bandcamp.com/track/rainbow-rumpus-partytown
 ---
 Track: '''Til Death, We Grieve'
 Duration: '6:48'
-References:
+URLs:
+- https://teeveemusic.bandcamp.com/track/til-death-we-grieve
+Referenced Tracks:
 - Flare
 - track:frost-vol6
 - track:ruins
@@ -184,12 +186,12 @@ References:
 - Lotus
 - Tomboyish Girl in Love
 - track:aggrieve
-URLs:
-- https://teeveemusic.bandcamp.com/track/til-death-we-grieve
 ---
 Track: God Tier
 Duration: '6:09'
-References:
+URLs:
+- https://teeveemusic.bandcamp.com/track/god-tier
+Referenced Tracks:
 - track:sburban-jungle
 - track:verdancy-bassline
 - Homestuck Anthem
@@ -204,16 +206,14 @@ References:
 - Heir of Grief
 - track:doctor
 - Descend
-URLs:
-- https://teeveemusic.bandcamp.com/track/god-tier
 ---
 Track: MeGaLoVania (cover)
 Directory: megalovania-tee-vee
 Duration: '2:51'
-References:
+URLs:
+- https://teeveemusic.bandcamp.com/track/cover
+Referenced Tracks:
 - track:MeGaLoVania
 - track:megalovania-undertale
 - Dance of Thorns
 - Cascade (Beta)
-URLs:
-- https://teeveemusic.bandcamp.com/track/cover
diff --git a/album/tomb-of-the-ancestors.yaml b/album/tomb-of-the-ancestors.yaml
index 877a64ad..390f7779 100644
--- a/album/tomb-of-the-ancestors.yaml
+++ b/album/tomb-of-the-ancestors.yaml
@@ -1,7 +1,5 @@
 Album: Tomb of the Ancestors
 Artist: Kalibration
-Banner Art:
-- GaMZ
 Banner Dimensions: 1100x203
 Wallpaper Style: |-
     background-repeat: repeat;
@@ -23,13 +21,13 @@ Cover Artists:
 - GaMZ
 Wallpaper Artists:
 - GaMZ
+Banner Artists:
+- GaMZ
 ---
 Group: Main album
 ---
 Track: ETERNAL SUFFERING
 Duration: '2:51'
-Samples:
-- Mischief Makers
 Art Tags:
 - The Signless
 - 'cw: blood'
@@ -39,6 +37,8 @@ URLs:
 Lyrics: (THROUGH FIRE, JUSTICE IS SERVED!)
 Cover Artists:
 - Brianne
+Sampled Tracks:
+- Mischief Makers
 ---
 Track: twoward2 the heaven2
 Duration: '2:22'
@@ -90,8 +90,6 @@ Cover Artists:
 ---
 Track: aN UNHOLY RITUAL,
 Duration: '2:45'
-References:
-- Spider8ite!!!!!!!!
 Art Tags:
 - The Summoner
 - Pyralspite
@@ -100,6 +98,8 @@ URLs:
 - https://youtu.be/BPflUVnQfs0
 Cover Artists:
 - Sylladexter
+Referenced Tracks:
+- Spider8ite!!!!!!!!
 ---
 Track: Immaculate Peacekeeper
 Duration: '3:03'
@@ -259,16 +259,14 @@ Has Cover Art: false
 ---
 Track: Valhalla (Scratched Disc Edit)
 Duration: '3:31'
-References:
-- Valhalla
 URLs:
 - https://youtu.be/9XzsA3Tkock
 Has Cover Art: false
+Referenced Tracks:
+- Valhalla
 ---
 Track: Spider8ite (Thief of Lounge Mix)
 Duration: '3:31'
-References:
-- Spider8ite!!!!!!!!
 URLs:
 - https://youtu.be/K7GUBOtJmwo
 Lyrics: |-
@@ -320,3 +318,5 @@ Lyrics: |-
     (With my spider bite)
     (In my world there...)
 Has Cover Art: false
+Referenced Tracks:
+- Spider8ite!!!!!!!!
diff --git a/album/triassic-slump.yaml b/album/triassic-slump.yaml
index a4436d2a..f90f28ff 100644
--- a/album/triassic-slump.yaml
+++ b/album/triassic-slump.yaml
@@ -112,8 +112,6 @@ Lyrics: |-
 ---
 Track: Keep It Going
 Duration: '5:40'
-References:
-- Super Mario Bros. (The Movie)
 URLs:
 - https://what.bandcamp.com/track/keep-it-going
 Lyrics: |-
@@ -144,6 +142,8 @@ Lyrics: |-
     gotta keep it going [repeated]
     gotta keep it, keep the boogie
     going, going
+Referenced Tracks:
+- Super Mario Bros. (The Movie)
 ---
 Track: Rabbit and Squirrel
 Duration: '3:59'
@@ -307,8 +307,6 @@ Track: Daily Routine
 Duration: '4:47'
 URLs:
 - https://what.bandcamp.com/track/daily-routine
-References:
-- Jurassic Park
 Lyrics: |-
     so you think you're all alone
     on this journey towards forever and a half
@@ -336,6 +334,8 @@ Lyrics: |-
     OOOOOOH, FOREVER AND EVER
     OOOOOOH, FOREVER AND EVER
     ...
+Referenced Tracks:
+- Jurassic Park
 ---
 Track: I'm Not Real
 Duration: '3:21'
diff --git a/album/undertale-soundtrack.yaml b/album/undertale-soundtrack.yaml
index 68787671..f0ce8dd1 100644
--- a/album/undertale-soundtrack.yaml
+++ b/album/undertale-soundtrack.yaml
@@ -29,11 +29,11 @@ URLs:
 ---
 Track: Start Menu
 Duration: 0:32
-References:
-- Once Upon a Time
 URLs:
 - https://tobyfox.bandcamp.com/track/start-menu
 - https://youtu.be/kRT9vY2f7tg
+Referenced Tracks:
+- Once Upon a Time
 ---
 Track: Your Best Friend
 Duration: 0:23
@@ -62,11 +62,11 @@ URLs:
 ---
 Track: Anticipation
 Duration: 0:22
-References:
-- Enemy Approaching
 URLs:
 - https://tobyfox.bandcamp.com/track/anticipation-2
 - https://youtu.be/t62zFJATVPM
+Referenced Tracks:
+- Enemy Approaching
 ---
 Track: Unnecessary Tension
 Duration: 0:17
@@ -95,28 +95,28 @@ URLs:
 Track: Home
 Directory: home-undertale
 Duration: '2:03'
-References:
-- Once Upon a Time
 URLs:
 - https://tobyfox.bandcamp.com/track/home-2
 - https://youtu.be/5_E_y1AWAfc
+Referenced Tracks:
+- Once Upon a Time
 ---
 Track: Home (Music Box)
 Duration: '2:03'
-References:
-- track:home-undertale
-- Once Upon a Time
 URLs:
 - https://tobyfox.bandcamp.com/track/home-music-box-2
 - https://youtu.be/ANEsXjSiYxI
+Referenced Tracks:
+- track:home-undertale
+- Once Upon a Time
 ---
 Track: Heartache
 Duration: '1:48'
-References:
-- Enemy Approaching
 URLs:
 - https://tobyfox.bandcamp.com/track/heartache-2
 - https://youtu.be/xflkF-sqNaM
+Referenced Tracks:
+- Enemy Approaching
 ---
 Track: sans.
 Duration: 0:50
@@ -138,19 +138,19 @@ URLs:
 ---
 Track: Uwa!! So Holiday♫
 Duration: 0:30
-References:
-- Uwa!! So Temperate♫
 URLs:
 - https://tobyfox.bandcamp.com/track/uwa-so-holiday
 - https://youtu.be/XnG7HG8bmkU
+Referenced Tracks:
+- Uwa!! So Temperate♫
 ---
 Track: Dogbass
 Duration: 0:06
-References:
-- Ghost Fight
 URLs:
 - https://tobyfox.bandcamp.com/track/dogbass
 - https://youtu.be/a1OLiuNLpEs
+Referenced Tracks:
+- Ghost Fight
 ---
 Track: Mysterious Place
 Duration: 0:44
@@ -160,68 +160,68 @@ URLs:
 ---
 Track: Dogsong
 Duration: 0:37
-References:
-- Enemy Approaching
 URLs:
 - https://tobyfox.bandcamp.com/track/dogsong
 - https://youtu.be/woPff-Tpkns
+Referenced Tracks:
+- Enemy Approaching
 ---
 Track: Snowdin Town
 Duration: '1:16'
-References:
-- Snowy
 URLs:
 - https://tobyfox.bandcamp.com/track/snowdin-town
 - https://youtu.be/z6LmMCuGjfA
+Referenced Tracks:
+- Snowy
 ---
 Track: Shop
 Duration: 0:50
-References:
-- Snowdin Town
 URLs:
 - https://tobyfox.bandcamp.com/track/shop
 - https://youtu.be/jCQ_5Gj6jlg
+Referenced Tracks:
+- Snowdin Town
 ---
 Track: Bonetrousle
 Duration: 0:57
-References:
-- Nyeh Heh Heh!
 URLs:
 - https://tobyfox.bandcamp.com/track/bonetrousle
 - https://youtu.be/zdeZwAk6ULE
+Referenced Tracks:
+- Nyeh Heh Heh!
 ---
 Track: Dating Start!
 Duration: '1:56'
-References:
-- Snowdin Town
 URLs:
 - https://tobyfox.bandcamp.com/track/dating-start
 - https://youtu.be/dtYwq4aBr0E
+Referenced Tracks:
+- Snowdin Town
 ---
 Track: Dating Tense!
 Duration: 0:26
-References:
-- Undyne
 URLs:
 - https://tobyfox.bandcamp.com/track/dating-tense
 - https://youtu.be/ShK_Tj-Ee3Y
+Referenced Tracks:
+- Undyne
 ---
 Track: Dating Fight!
 Duration: 0:35
-References:
-- Dating Start!
-- Snowdin Town
 URLs:
 - https://tobyfox.bandcamp.com/track/dating-fight
 - https://youtu.be/JQ8bpWkoC7A
+Referenced Tracks:
+- Dating Start!
+- Snowdin Town
 ---
 Track: Premonition
 Duration: '1:01'
-References:
-- Your Best Nightmare
 URLs:
 - https://tobyfox.bandcamp.com/track/premonition
 - https://youtu.be/sQDiDDb1_9k
+Referenced Tracks:
+- Your Best Nightmare
 ---
 Track: Danger Mystery
 Duration: 0:18
@@ -237,61 +237,61 @@ URLs:
 ---
 Track: Waterfall
 Duration: '2:06'
-References:
-- track:ruins-undertale
-- Another Medium
-- Ooo
 URLs:
 - https://tobyfox.bandcamp.com/track/waterfall
 - https://youtu.be/v712NiVK5uY
+Referenced Tracks:
+- track:ruins-undertale
+- Another Medium
+- Ooo
 ---
 Track: Run!
 Duration: 0:26
-References:
-- Undyne
 URLs:
 - https://tobyfox.bandcamp.com/track/run
 - https://youtu.be/PPapt88_3aU
+Referenced Tracks:
+- Undyne
 ---
 Track: Quiet Water
 Duration: 0:32
-References:
-- track:ruins-undertale
 URLs:
 - https://tobyfox.bandcamp.com/track/quiet-water
 - https://youtu.be/AsvhQ-soLdg
+Referenced Tracks:
+- track:ruins-undertale
 ---
 Track: Memory
 Duration: '1:15'
-References:
-- His Theme
 URLs:
 - https://tobyfox.bandcamp.com/track/memory
 - https://youtu.be/eijdNQMYikY
+Referenced Tracks:
+- His Theme
 ---
 Track: Bird That Carries You Over A Disproportionately Small Gap
 Duration: 0:25
-References:
-- Alphys
 URLs:
 - https://tobyfox.bandcamp.com/track/bird-that-carries-you-over-a-disproportionately-small-gap
 - https://youtu.be/Z51lfE2k7jU
+Referenced Tracks:
+- Alphys
 ---
 Track: Dummy!
 Duration: '2:25'
-References:
-- Ghost Fight
 URLs:
 - https://tobyfox.bandcamp.com/track/dummy
 - https://youtu.be/N3epEVMNJdY
+Referenced Tracks:
+- Ghost Fight
 ---
 Track: Pathetic House
 Duration: 0:38
-References:
-- Ghost Fight
 URLs:
 - https://tobyfox.bandcamp.com/track/pathetic-house
 - https://youtu.be/nu_ruGyTNEs
+Referenced Tracks:
+- Ghost Fight
 ---
 Track: Spooktune
 Directory: spooktune-undertale
@@ -302,19 +302,19 @@ URLs:
 ---
 Track: Spookwave
 Duration: 0:25
-References:
-- track:spooktune-undertale
 URLs:
 - https://tobyfox.bandcamp.com/track/spookwave
 - https://youtu.be/o251comtNfk
+Referenced Tracks:
+- track:spooktune-undertale
 ---
 Track: Ghouliday
 Duration: 0:12
-References:
-- The One Horse Open Sleigh
 URLs:
 - https://tobyfox.bandcamp.com/track/ghouliday
 - https://youtu.be/lWP9s44i-YA
+Referenced Tracks:
+- The One Horse Open Sleigh
 ---
 Track: Chill
 Duration: 0:56
@@ -330,37 +330,37 @@ URLs:
 ---
 Track: Temmie Village
 Duration: 0:57
-References:
-- Enemy Approaching
 URLs:
 - https://tobyfox.bandcamp.com/track/temmie-village
 - https://youtu.be/rNlyF43Te6U
+Referenced Tracks:
+- Enemy Approaching
 ---
 Track: Tem Shop
 Duration: 0:45
-References:
-- Enemy Approaching
 URLs:
 - https://tobyfox.bandcamp.com/track/tem-shop
 - https://youtu.be/y_qHuDjE3CQ
+Referenced Tracks:
+- Enemy Approaching
 ---
 Track: NGAHHH!!
 Duration: '1:22'
-References:
-- Undyne
-- track:ruins-undertale
 URLs:
 - https://tobyfox.bandcamp.com/track/ngahhh
 - https://youtu.be/PLDyWLbuptQ
+Referenced Tracks:
+- Undyne
+- track:ruins-undertale
 ---
 Track: Spear of Justice
 Duration: '1:55'
-References:
-- Undyne
-- track:ruins-undertale
 URLs:
 - https://tobyfox.bandcamp.com/track/spear-of-justice
 - https://youtu.be/qrBB3_rFPjg
+Referenced Tracks:
+- Undyne
+- track:ruins-undertale
 ---
 Track: Ooo
 Duration: 0:14
@@ -376,93 +376,93 @@ URLs:
 ---
 Track: It's Showtime!
 Duration: 0:46
-References:
-- Hotel
 URLs:
 - https://tobyfox.bandcamp.com/track/its-showtime
 - https://youtu.be/9uwEAugeH8w
+Referenced Tracks:
+- Hotel
 ---
 Track: Metal Crusher
 Duration: '1:03'
-References:
-- Noisemaster Theme
 URLs:
 - https://tobyfox.bandcamp.com/track/metal-crusher
 - https://youtu.be/P0PpyUsvT9w
+Referenced Tracks:
+- Noisemaster Theme
 ---
 Track: Another Medium
 Duration: '2:22'
-References:
-- Patient
 URLs:
 - https://tobyfox.bandcamp.com/track/another-medium
 - https://youtu.be/xLsuam9o9BA
+Referenced Tracks:
+- Patient
 ---
 Track: Uwa!! So HEATS!!♫
 Duration: 0:33
-References:
-- Uwa!! So Temperate♫
 URLs:
 - https://tobyfox.bandcamp.com/track/uwa-so-heats
 - https://youtu.be/wyShNqRkQ1I
+Referenced Tracks:
+- Uwa!! So Temperate♫
 ---
 Track: Stronger Monsters
 Duration: '1:03'
-References:
-- Enemy Approaching
 URLs:
 - https://tobyfox.bandcamp.com/track/stronger-monsters
 - https://youtu.be/HnmHqWU0z5M
+Referenced Tracks:
+- Enemy Approaching
 ---
 Track: Hotel
 Duration: '1:27'
-References:
-- Once Upon a Time
 URLs:
 - https://tobyfox.bandcamp.com/track/hotel
 - https://youtu.be/8wSYwqbp4S4
+Referenced Tracks:
+- Once Upon a Time
 ---
 Track: Can You Really Call This A Hotel, I Didn't Receive A Mint On My Pillow Or Anything
 Duration: '1:01'
-References:
-- Hotel
-- Once Upon a Time
 URLs:
 - https://tobyfox.bandcamp.com/track/can-you-really-call-this-a-hotel-i-didnt-receive-a-mint-on-my-pillow-or-anything
 - https://youtu.be/wRUdj1WgwIE
+Referenced Tracks:
+- Hotel
+- Once Upon a Time
 ---
 Track: Confession
 Duration: 0:42
-References:
-- Snowdin Town
 URLs:
 - https://tobyfox.bandcamp.com/track/confession
 - https://youtu.be/qzQyP99Q0pE
+Referenced Tracks:
+- Snowdin Town
 ---
 Track: Live Report
 Duration: 0:17
-References:
-- It's Showtime!
 URLs:
 - https://tobyfox.bandcamp.com/track/live-report
 - https://youtu.be/4oi_XcH2sAw
+Referenced Tracks:
+- It's Showtime!
 ---
 Track: Death Report
 Duration: 0:47
-References:
-- Live Report
-- It's Showtime!
 URLs:
 - https://tobyfox.bandcamp.com/track/death-report
 - https://youtu.be/Z3ZULqzMutw
+Referenced Tracks:
+- Live Report
+- It's Showtime!
 ---
 Track: Spider Dance
 Duration: '1:46'
-References:
-- Ghost Fight
 URLs:
 - https://tobyfox.bandcamp.com/track/spider-dance
 - https://youtu.be/YZ3XjVVNagU
+Referenced Tracks:
+- Ghost Fight
 ---
 Track: Wrong Enemy !?
 Duration: 0:58
@@ -478,43 +478,43 @@ URLs:
 ---
 Track: Oh! Dungeon
 Duration: 0:32
-References:
-- Oh! One True Love
 URLs:
 - https://tobyfox.bandcamp.com/track/oh-dungeon
 - https://youtu.be/5aRE_J4UvYM
+Referenced Tracks:
+- Oh! One True Love
 ---
 Track: It's Raining Somewhere Else
 Duration: '2:50'
-References:
-- sans.
 URLs:
 - https://tobyfox.bandcamp.com/track/its-raining-somewhere-else
 - https://youtu.be/zNd4apsr3WE
+Referenced Tracks:
+- sans.
 ---
 Track: CORE Approach
 Duration: 0:12
-References:
-- Hotel
 URLs:
 - https://tobyfox.bandcamp.com/track/core-approach
 - https://youtu.be/qNi_6kXc2cc
+Referenced Tracks:
+- Hotel
 ---
 Track: CORE
 Duration: '2:46'
-References:
-- Another Medium
 URLs:
 - https://tobyfox.bandcamp.com/track/core
 - https://youtu.be/tDuEWw648jo
+Referenced Tracks:
+- Another Medium
 ---
 Track: Last Episode!
 Duration: 0:07
-References:
-- Metal Crusher
 URLs:
 - https://tobyfox.bandcamp.com/track/last-episode
 - https://youtu.be/pzhYcYwg4vE
+Referenced Tracks:
+- Metal Crusher
 ---
 Track: Oh My...
 Duration: 0:14
@@ -524,22 +524,22 @@ URLs:
 ---
 Track: Death by Glamour
 Duration: '2:14'
-References:
+URLs:
+- https://tobyfox.bandcamp.com/track/death-by-glamour
+- https://youtu.be/2TgO-tN5wAM
+Referenced Tracks:
 - CORE
 - Another Medium
 - Metal Crusher
 - It's Showtime!
-URLs:
-- https://tobyfox.bandcamp.com/track/death-by-glamour
-- https://youtu.be/2TgO-tN5wAM
 ---
 Track: For the Fans
 Duration: '1:47'
-References:
-- Oh! One True Love
 URLs:
 - https://tobyfox.bandcamp.com/track/for-the-fans
 - https://youtu.be/6nOHNgotIPM
+Referenced Tracks:
+- Oh! One True Love
 ---
 Track: Long Elevator
 Duration: 0:20
@@ -549,31 +549,31 @@ URLs:
 ---
 Track: Undertale
 Duration: '6:21'
-References:
-- His Theme
-- Once Upon a Time
 URLs:
 - https://tobyfox.bandcamp.com/track/undertale
 - https://youtu.be/EBhFHJMVfiI
+Referenced Tracks:
+- His Theme
+- Once Upon a Time
 ---
 Track: Song That Might Play When You Fight Sans
 Duration: '1:02'
-References:
-- sans.
-- Nyeh Heh Heh!
 URLs:
 - https://tobyfox.bandcamp.com/track/song-that-might-play-when-you-fight-sans
 - https://youtu.be/41YOknSl0zw
+Referenced Tracks:
+- sans.
+- Nyeh Heh Heh!
 ---
 Track: The Choice
 Duration: '2:12'
-References:
-- Undertale
-- Once Upon a Time
-- His Theme
 URLs:
 - https://tobyfox.bandcamp.com/track/the-choice
 - https://youtu.be/C4Wv5M9JPao
+Referenced Tracks:
+- Undertale
+- Once Upon a Time
+- His Theme
 ---
 Track: Small Shock
 Duration: 0:14
@@ -595,111 +595,111 @@ URLs:
 ---
 Track: ASGORE
 Duration: '2:36'
-References:
+URLs:
+- https://tobyfox.bandcamp.com/track/asgore
+- https://youtu.be/hMa4hZQbrms
+Referenced Tracks:
 - Bergentrückung
 - Heartache
 - Determination
 - Undyne
-URLs:
-- https://tobyfox.bandcamp.com/track/asgore
-- https://youtu.be/hMa4hZQbrms
 ---
 Group: Hidden on Bandcamp
 ---
 Track: You Idiot
 Duration: 0:34
-References:
-- Your Best Nightmare
 URLs:
 - https://youtu.be/eOqq5kNBVoM
+Referenced Tracks:
+- Your Best Nightmare
 ---
 Track: Your Best Nightmare
 Duration: '4:00'
-References:
+URLs:
+- https://youtu.be/eUcThHVbrXY
+Referenced Tracks:
 - Flowey's Laugh
 - Your Best Friend
 - Amen, Brother
 - Terezi's Theme
-URLs:
-- https://youtu.be/eUcThHVbrXY
 ---
 Track: Finale
 Duration: '1:52'
-References:
+URLs:
+- https://youtu.be/yWjavxcGfqM
+Referenced Tracks:
 - Your Best Friend
 - Amen, Brother
 - His Theme
-URLs:
-- https://youtu.be/yWjavxcGfqM
 ---
 Track: An Ending
 Duration: '3:28'
-References:
-- track:ruins-undertale
 URLs:
 - https://youtu.be/l3sJ79C1Zyo
+Referenced Tracks:
+- track:ruins-undertale
 ---
 Track: She's Playing Piano
 Duration: 0:18
-References:
-- Alphys
 URLs:
 - https://youtu.be/zEAN2dna9To
+Referenced Tracks:
+- Alphys
 ---
 Track: Here We Are
 Duration: '2:06'
-References:
-- Alphys
 URLs:
 - https://youtu.be/y49b8aiQVBg
+Referenced Tracks:
+- Alphys
 ---
 Track: Amalgam
 Duration: '1:20'
-References:
-- Barrier
 URLs:
 - https://youtu.be/71u0i6J-Qes
+Referenced Tracks:
+- Barrier
 ---
 Track: Fallen Down (Reprise)
 Duration: '2:30'
-References:
-- Fallen Down
-- Once Upon a Time
 URLs:
 - https://youtu.be/cGBMTAGzWPs
+Referenced Tracks:
+- Fallen Down
+- Once Upon a Time
 ---
 Track: Don't Give Up
 Duration: '2:02'
-References:
-- track:ruins-undertale
 URLs:
 - https://youtu.be/B4qdpiad_Q0
+Referenced Tracks:
+- track:ruins-undertale
 ---
 Track: Hopes and Dreams
 Duration: '3:01'
-References:
+URLs:
+- https://youtu.be/tz82xbLvK_k
+Referenced Tracks:
 - Once Upon a Time
 - Undertale
 - Your Best Friend
 - Snowdin Town
-URLs:
-- https://youtu.be/tz82xbLvK_k
 ---
 Track: Burn in Despair!
 Duration: 0:21
-References:
-- Your Best Nightmare
 URLs:
 - https://youtu.be/pumVu-WWhKM
+Referenced Tracks:
+- Your Best Nightmare
 ---
 Track: SAVE the World
 Duration: '1:53'
-References:
+URLs:
+- https://youtu.be/mZRP7nQkfrM
+Referenced Tracks:
 - Hopes and Dreams
 - Once Upon a Time
 - Your Best Friend
-URLs:
-- https://youtu.be/mZRP7nQkfrM
 ---
 Track: His Theme
 Duration: '2:05'
@@ -708,39 +708,41 @@ URLs:
 ---
 Track: Final Power
 Duration: 0:19
-References:
-- Hopes and Dreams
-- Once Upon a Time
 URLs:
 - https://youtu.be/6nQbkE1DS0o
+Referenced Tracks:
+- Hopes and Dreams
+- Once Upon a Time
 ---
 Track: Reunited
 Directory: reunited-undertale
 Duration: '4:44'
-References:
-- Once Upon a Time
-- Snowdin Town
 URLs:
 - https://youtu.be/WgRfPc1lfJk
+Referenced Tracks:
+- Once Upon a Time
+- Snowdin Town
 ---
 Track: Menu (Full)
 Duration: 0:32
-References:
-- Start Menu
-- Once Upon a Time
 URLs:
 - https://youtu.be/brP9Q08kEfk
+Referenced Tracks:
+- Start Menu
+- Once Upon a Time
 ---
 Track: Respite
 Duration: '1:54'
-References:
-- track:ruins-undertale
 URLs:
 - https://youtu.be/E-fyLcHg4iM
+Referenced Tracks:
+- track:ruins-undertale
 ---
 Track: Bring It In, Guys!
 Duration: '4:12'
-References:
+URLs:
+- https://youtu.be/x_P5smsopK0
+Referenced Tracks:
 - Enemy Approaching
 - Nyeh Heh Heh!
 - sans.
@@ -752,50 +754,48 @@ References:
 - Bergentrückung
 - Fallen Down
 - Once Upon a Time
-URLs:
-- https://youtu.be/x_P5smsopK0
 ---
 Track: Last Goodbye
 Duration: '2:15'
-References:
+URLs:
+- https://youtu.be/5P8V4mP5RLg
+Referenced Tracks:
 - SAVE the World
 - Once Upon a Time
 - Your Best Friend
-URLs:
-- https://youtu.be/5P8V4mP5RLg
 ---
 Track: But the Earth Refused to Die
 Duration: 0:34
-References:
-- track:ruins-undertale
 URLs:
 - https://youtu.be/ML6OV8fG74w
+Referenced Tracks:
+- track:ruins-undertale
 ---
 Track: Battle Against a True Hero
 Duration: '2:36'
-References:
-- track:ruins-undertale
 URLs:
 - https://youtu.be/aWBtpBwzzdM
+Referenced Tracks:
+- track:ruins-undertale
 ---
 Track: Power of "NEO"
 Duration: 0:30
-References:
-- Battle Against a True Hero
 URLs:
 - https://youtu.be/mwrUem9vM_A
+Referenced Tracks:
+- Battle Against a True Hero
 ---
 Track: MEGALOVANIA
 Directory: megalovania-undertale
 Duration: '2:36'
-References:
-- track:megalovania-halloween
 URLs:
 - https://youtu.be/c5daGZ96QGU
+Referenced Tracks:
+- track:megalovania-halloween
 ---
 Track: Good Night
 Duration: 0:31
-References:
-- Once Upon a Time
 URLs:
 - https://youtu.be/BGpJrPY563A
+Referenced Tracks:
+- Once Upon a Time
diff --git a/album/unreleased-tracks.yaml b/album/unreleased-tracks.yaml
index 960cb42c..33728450 100644
--- a/album/unreleased-tracks.yaml
+++ b/album/unreleased-tracks.yaml
@@ -184,19 +184,19 @@ URLs:
 Track: Hero's Growth
 Artist: Solatrus
 Duration: '1:54'
-References:
-- You Gained a Level!
-- Eight Melodies
 URLs:
 - https://www.youtube.com/watch?v=fy6SMhEBSBk
+Referenced Tracks:
+- You Gained a Level!
+- Eight Melodies
 ---
 Track: Nic Cage Romance
 Artist: Toby Fox
 Duration: '1:19'
-References:
-- How Do I Live
 URLs:
 - https://www.youtube.com/watch?v=fvDpDxXXZog
+Referenced Tracks:
+- How Do I Live
 ---
 Track: Miracles
 Directory: miracles-icp
@@ -208,20 +208,20 @@ URLs:
 Track: Secret ROM
 Artist: Toby Fox
 Duration: '3:22'
-References:
+URLs:
+- https://www.youtube.com/watch?v=ercVSU3rjrc
+Referenced Tracks:
 - The Little Sprite
 - Onett Theme
 - Terra's Theme
 - Wind Scene
 - Chrono Trigger
-URLs:
-- https://www.youtube.com/watch?v=ercVSU3rjrc
 ---
 Track: Typheus
 Artist: Homestuck
-References:
-- Fear of the Heavens
 Has URLs: false
+Referenced Tracks:
+- Fear of the Heavens
 ---
 Track: I'm a Member of the Midnight Crew
 Artist: Eddie Morton
@@ -232,10 +232,10 @@ URLs:
 Track: XROM
 Artist: Toby Fox
 Duration: '3:16'
-References:
-- Secret ROM
 URLs:
 - https://www.youtube.com/watch?v=wY2nX_b9Gm4
+Referenced Tracks:
+- Secret ROM
 ---
 Track: Goat Foley
 Artist: Toby Fox
@@ -250,61 +250,61 @@ URLs:
 Track: weird moody horse shit
 Artist: Alex Rosetti
 Duration: '1:02'
-References:
-- not a creature was stirring
 URLs:
 - https://www.youtube.com/watch?v=hC2Vdh7WmDc
+Referenced Tracks:
+- not a creature was stirring
 ---
 Track: Darling Dolorosa
 Artist: Toby Fox
 Duration: '2:06'
-References:
-- Darling Kanaya
 URLs:
 - https://www.youtube.com/watch?v=JrXZJkY8eq0
+Referenced Tracks:
+- Darling Kanaya
 ---
 Track: GameGlr
 Artist: Toby Fox
 Duration: '1:31'
-References:
-- GameGrl (Original 1993 Mix)
-- Teal Seer
 URLs:
 - https://www.youtube.com/watch?v=rbpRX42T7Ho
+Referenced Tracks:
+- GameGrl (Original 1993 Mix)
+- Teal Seer
 ---
 Track: Crab Waltz
 Artist: Toby Fox
 Duration: '1:59'
-References:
-- track:crustacean
 URLs:
 - https://www.youtube.com/watch?v=oVRCbmh-TI4
+Referenced Tracks:
+- track:crustacean
 ---
 Track: G4M38L0RG
 Artist: Toby Fox
 Duration: '1:45'
-References:
+URLs:
+- https://www.youtube.com/watch?v=31TcKfXCBVc
+Referenced Tracks:
 - GameBro (Original 1990 Mix)
 - The La2t Frontiier
 - The Blind Prophet
-URLs:
-- https://www.youtube.com/watch?v=31TcKfXCBVc
 ---
 Track: 108 Stars of Density
 Artist: Toby Fox
 Duration: '1:36'
-References:
-- Hate You
 URLs:
 - https://www.youtube.com/watch?v=pyMlQ92eyWs
+Referenced Tracks:
+- Hate You
 ---
 Track: The Brave and the Bronze
 Artist: Yan Rodriguez
 Duration: '1:25'
-References:
-- Bronze Rebel
 URLs:
 - https://www.youtube.com/watch?v=0WNzXUt9suA
+Referenced Tracks:
+- Bronze Rebel
 ---
 Track: Trickster Mode (Engage)
 Artist: Toby Fox
@@ -321,43 +321,43 @@ URLs:
 Track: Kazoostuck
 Artist: Toby Fox
 Duration: 0:38
-References:
-- Homestuck
 URLs:
 - https://www.youtube.com/watch?v=mjKX8H3mSJo
+Referenced Tracks:
+- Homestuck
 ---
 Track: A Very Trickster Mode Christmas
 Artist: Toby Fox
 Duration: 0:08
-References:
-- The One Horse Open Sleigh
 URLs:
 - https://www.youtube.com/watch?v=MaywzJqgyh4
+Referenced Tracks:
+- The One Horse Open Sleigh
 ---
 Track: A Very Trickster Mode Christmas (WHEEEEEEEEEEE!)
 Artist: Toby Fox
 Duration: 0:10
-References:
-- A Very Trickster Mode Christmas
 URLs:
 - https://www.youtube.com/watch?v=91yZRnk3BRA
+Referenced Tracks:
+- A Very Trickster Mode Christmas
 ---
 Track: Warhammer of Zillyhoo (With Mario Paint)
 Artist: Toby Fox
 Duration: 0:49
-References:
-- Warhammer of Zillyhoo
 URLs:
 - https://www.youtube.com/watch?v=hCO-grMys2k
+Referenced Tracks:
+- Warhammer of Zillyhoo
 ---
 Track: A Very Trickster Mode Christmas (With Fancy Santas)
 Artist: Toby Fox
 Duration: 0:08
-References:
-- A Very Trickster Mode Christmas (WHEEEEEEEEEEE!)
-- Flowey's Laugh
 URLs:
 - https://www.youtube.com/watch?v=DydDjMNlBsQ
+Referenced Tracks:
+- A Very Trickster Mode Christmas (WHEEEEEEEEEEE!)
+- Flowey's Laugh
 ---
 Track: Yaldabaoth
 Artist: Homestuck
@@ -366,24 +366,24 @@ Has URLs: false
 Track: Homosuck Anthem
 Artist: Toby Fox
 Duration: '1:51'
-References:
-- Homestuck Anthem
 URLs:
 - https://www.youtube.com/watch?v=sVXPWSvSKGM
+Referenced Tracks:
+- Homestuck Anthem
 ---
 Track: Typheus (Glitched)
 Artist: Homestuck
-References:
-- Typheus
 Has URLs: false
+Referenced Tracks:
+- Typheus
 ---
 Track: Elevatorstuck, with Meows
 Artist: Toby Fox
 Duration: 0:52
-References:
-- Elevatorstuck
 URLs:
 - https://www.youtube.com/watch?v=3Yy_wTW-OJs
+Referenced Tracks:
+- Elevatorstuck
 ---
 Track: not a creature was stirring
 Artist: Alex Rosetti
@@ -394,10 +394,10 @@ URLs:
 Track: Homosuck Swan Song
 Artist: Toby Fox
 Duration: '1:07'
-References:
-- Homestuck Anthem
 URLs:
 - https://www.youtube.com/watch?v=XzEJp5QJ8vE
+Referenced Tracks:
+- Homestuck Anthem
 ---
 Track: Hello Zepp
 Artist: Saw
@@ -412,10 +412,10 @@ Has URLs: false
 Track: Horsecatska
 Artist: James Roach
 Duration: 0:53
-References:
-- Horschestra
 URLs:
 - https://www.youtube.com/watch?v=EjCbsleXpuk
+Referenced Tracks:
+- Horschestra
 ---
 Group: Tracks featured in Hiveswap Friendsim
 Color: '#78df56'
@@ -423,10 +423,10 @@ Color: '#78df56'
 Track: Single Female Lawyer
 Artist: Alex Rosetti
 Duration: '1:16'
-References:
-- Seer of Same-Color Scalemate Combos
 URLs:
 - https://www.youtube.com/watch?v=4Q2dS1Z2p9g
+Referenced Tracks:
+- Seer of Same-Color Scalemate Combos
 ---
 Track: DaJam
 Artist: Alex Rosetti
@@ -461,8 +461,6 @@ Color: '#71daff'
 Track: Friendvangelion Rebuild
 Artist: James Roach
 Duration: '2:55'
-References:
-- Homestuck
 URLs:
 - https://soundcloud.com/jamesroachmusic/the-note-desolation-plays
 - https://www.youtube.com/watch?v=hnBMOTxQfJ4
@@ -471,6 +469,8 @@ Commentary: |-
     how mysterious
 Cover Artists:
 - Homestuck
+Referenced Tracks:
+- Homestuck
 ---
 Track: sometimes i call andrew hussie 'andy' and so far he hasn't corrected me
 Artist: James Roach
@@ -478,15 +478,15 @@ Duration: '4:34'
 URLs:
 - https://soundcloud.com/jamesroachmusic/pesterquest-sometimes-i-call-andrew-hussie-andy-and-so-far-he-hasnt-corrected-me
 - https://www.youtube.com/watch?v=xSrT-SDN-uA
-References:
-- track:showtime-piano-refrain
-- Homestuck
 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.
     I don't know if I'll have as much time or energy to do the tracks for pesterquest like i did for friendsim since i got a new job. I will try my best.
 Cover Artists:
 - Homestuck
+Referenced Tracks:
+- track:showtime-piano-refrain
+- Homestuck
 ---
 Track: please support The Trevor Project
 Artist: James Roach
@@ -494,8 +494,6 @@ Duration: '3:19'
 URLs:
 - https://soundcloud.com/jamesroachmusic/pesterquest-please-support-the-trevor-project
 - https://www.youtube.com/watch?v=urbot0kfsz8
-References:
-- track:endless-climb
 Commentary: |-
     <i>James Roach:</i>
     I wasn't certain how to approach this one. I knew if I was going to use the theme from endless climb it wouldn't feel right accepting any money for it. These things don't exactly pay well to begin with tbh, so i thought I would use the platform i've been given to try and do something... even a little positive.
@@ -505,16 +503,18 @@ Commentary: |-
     if you want to know more about the trevor project, or just suicide prevention in general visit <a href="https://www.thetrevorproject.org/">thetrevorproject.org</a>
 Cover Artists:
 - Homestuck
+Referenced Tracks:
+- track:endless-climb
 ---
 Track: 2chords
 Artist: James Roach
 Duration: '1:13'
-References:
-- track:upward-movement-dave-owns
 URLs:
 - https://www.youtube.com/watch?v=Q3JQPZ2T03k
 Cover Artists:
 - Homestuck
+Referenced Tracks:
+- track:upward-movement-dave-owns
 ---
 Track: ill probably just name this one something normal oh no wait oh jeez aw beans
 Artist: James Roach
@@ -523,14 +523,14 @@ URLs:
 - >-
     https://soundcloud.com/jamesroachmusic/pesterquest-ill-probably-just-name-this-one-something-normal-oh-no-wait-oh-jeez-aw-beans
 - https://www.youtube.com/watch?v=DREQ4rJUXXQ
-References:
-- Davesprite
 Commentary: |-
     <i>James Roach:</i>
     well cats outta the bag i did the dave route. when andrew approached me about writing it i had very little writing experience outside of my personal projects. im glad andrew had faith in me and i hope you guys like it. itll come out at 11 AM EDT.
     for this one and the next routes music im gonna try and keep with the tradition of uploading it the morning of.
 Cover Artists:
 - Homestuck
+Referenced Tracks:
+- Davesprite
 ---
 Track: 24/7 lo fi anime beats to question your sexuality to
 Artist: James Roach
@@ -538,16 +538,16 @@ Duration: '2:51'
 URLs:
 - https://soundcloud.com/jamesroachmusic/pesterquest-247-lo-fi-anime-beats-to-question-your-sexuality-to
 - https://www.youtube.com/watch?v=0I2ufAhRbf0
-References:
-- 2chords
-- track:upward-movement-dave-owns
-- track:sburban-jungle
 Commentary: |-
     <i>James Roach:</i>
     i just wanted to do more than one song so i did two and a half. hope you like it. thanks for all the support! also im in this image can u find me LMAO
     <img src="media/misc/lo-fi-cover.jpg" alt="Pesterquest art of the inside of an Olive Garden, packed with Homestuck team members." width="500" height="500">
 Cover Artists:
 - Homestuck
+Referenced Tracks:
+- 2chords
+- track:upward-movement-dave-owns
+- track:sburban-jungle
 ---
 Track: CAREFREE VICTORY (REMIX)
 Artist: James Roach
@@ -557,9 +557,6 @@ Duration: '6:02'
 URLs:
 - https://soundcloud.com/jamesroachmusic/pesterquest-james-roach-ft-speak-n-say-carefree-victory-remix
 - https://www.youtube.com/watch?v=c8aZFD8ic9A&
-References:
-- Carefree Action
-- track:carefree-victory
 Commentary: |-
     <i>James Roach:</i>
     jades theme! wow we've really come a long way huh fellas?
@@ -603,6 +600,9 @@ Lyrics: |-
     Bark
 Cover Artists:
 - Homestuck
+Referenced Tracks:
+- Carefree Action
+- track:carefree-victory
 ---
 Track: CRUSTacean
 Directory: crustacean-pq
@@ -611,13 +611,13 @@ Duration: '5:28'
 URLs:
 - https://soundcloud.com/jamesroachmusic/pesterquest-crustacean
 - https://www.youtube.com/watch?v=9hdPSPGCK3Q
-References:
-- track:crustacean
 Commentary: |-
     <i>James Roach:</i>
     there are a handful of people out there who really thought we were just gonna put karkalicious in there.
 Cover Artists:
 - Homestuck
+Referenced Tracks:
+- track:crustacean
 ---
 Track: the drone rhythmic motif which can be found in act 1 and act 2
 Directory: drone-pq
@@ -632,31 +632,28 @@ Duration: '4:19'
 URLs:
 - https://soundcloud.com/jamesroachmusic/pesterquest-terezis-theme-ch3ck-th3-m3t4d4t4
 - https://www.youtube.com/watch?v=DuGQM9YsyXo
-References:
-- The Lemonsnout Turnabout
 Commentary: |-
     <i>James Roach:</i>
     dont actually do that you clowns
 Cover Artists:
 - Homestuck
+Referenced Tracks:
+- The Lemonsnout Turnabout
 ---
 Track: it's a cover of 'made of time'
 Artist: James Roach
 Duration: '1:44'
-References:
-- Made of Time
 Has URLs: false
 Cover Artists:
 - Homestuck
+Referenced Tracks:
+- Made of Time
 ---
 Track: yeah, it is
 Artist: James Roach
 Contributors:
 - Tamara Fritz (vocals)
 Duration: '5:41'
-References:
-- it's a cover of 'made of time'
-- track:MeGaLoVania
 URLs:
 - https://soundcloud.com/jamesroachmusic/pesterquest-aradias-theme-yeah-it-is
 - https://www.youtube.com/watch?v=MDqXkGBFPg0
@@ -665,6 +662,9 @@ Commentary: |-
     big ups to Tamara "TOTALSPIFFAGE" Fritz for really knocking it outta the park with these vocals.
 Cover Artists:
 - Homestuck
+Referenced Tracks:
+- it's a cover of 'made of time'
+- track:MeGaLoVania
 ---
 Track: IT'S NOTHING
 Artist: James Roach
@@ -716,12 +716,12 @@ Cover Artists:
 Track: Riches to Ruins Movement II
 Artist: Toby Fox
 Duration: '1:10'
-References:
-- Riches to Ruins Movements I & II
 URLs:
 - https://www.youtube.com/watch?v=mNu1KAi0Prk
 Cover Artists:
 - Homestuck
+Referenced Tracks:
+- Riches to Ruins Movements I & II
 ---
 Track: 'this is like... what was it... > [S] MSPAR: Remember'
 Artist: James Roach
@@ -729,19 +729,24 @@ Duration: '1:06'
 Directory: mspar-remember
 URLs:
 - https://www.youtube.com/watch?v=osip3rTivjM
-References:
+Cover Artists:
+- Homestuck
+Referenced Tracks:
 - Unite Synchronization
 - Penumbra Phantasm
 - Rex Duodecim Angelus
-Cover Artists:
-- Homestuck
 ---
 Track: normal song name
 Artist: James Roach
 Duration: '1:56'
 URLs:
 - https://soundcloud.com/jamesroachmusic/afterw-rd-theme-normal-song-name#t=0:00
-References:
+Commentary: |-
+    <i>James Roach:</i>
+    its over
+Cover Artists:
+- Homestuck
+Referenced Tracks:
 - Rex Duodecim Angelus
 - Moonsetter
 - Homestuck
@@ -750,11 +755,6 @@ References:
 - track:MeGaLoVania
 - Homestuck Anthem
 - WORST END
-Commentary: |-
-    <i>James Roach:</i>
-    its over
-Cover Artists:
-- Homestuck
 ---
 Group: Tracks featured in Namco High
 Color: '#f0650a'
@@ -805,26 +805,24 @@ URLs:
 Track: Upbeat (Half)
 Artist: Ryan Francis
 Duration: '2:33'
-References:
-- Upbeat
 URLs:
 - https://www.youtube.com/watch?v=H_PyGnlM2w4
+Referenced Tracks:
+- Upbeat
 ---
 Track: Boss Theme
 Artist: Ryan Francis
 Duration: '2:08'
-References:
-- Namco Theme
 URLs:
 - https://www.youtube.com/watch?v=Q8ace06keaQ
+Referenced Tracks:
+- Namco Theme
 ---
 Track: Credits
 Artist: Ryan Francis
 Contributors:
 - Mary Thomas (vocals)
 Duration: '2:43'
-References:
-- Namco Theme
 URLs:
 - https://www.youtube.com/watch?v=QuWdIDEwjRk
 Lyrics: |-
@@ -834,6 +832,8 @@ Lyrics: |-
     (Hey!<br>How's it going?<br>Good! How 'bout you?<br>Geometry's really hard, I think I need help<br>Oh, well, I'm really good at it, so... if you need help just hit me up!<br>Awesome! Yeah, I'll do that)
     Be true to yourself<br>Namco High
     Be true to yourself<br>Namco High
+Referenced Tracks:
+- Namco Theme
 ---
 Group: Other Homestuck tracks
 Color: '#ff7bf7'
@@ -842,8 +842,6 @@ Track: 暗闇の中の光
 Directory: canwave3-track6
 Artist: SplitSuns
 Duration: '7:45'
-References:
-- Voidlight
 URLs:
 - https://soundcloud.com/splitsuns/light-in-the-darkness
 Commentary: |-
@@ -851,13 +849,13 @@ Commentary: |-
     ...When the hell did I get 100 followers?? I give my thanks to all of you for listening to my shitty music, haha.
     This is one of my tracks for the CaNMT's almost-vaporware all-vaporwave album, CANWAVE 3. In its current iteration it's a take on 2814's sample-free approach to the vapor aesthetic through ambient and techno albums such as 新しい日の誕生 and Rain Temple. It's one of my most complex songs yet and it took a lot of work to make, but the end result is something very awe-inspiring, even to me.
     (Originally this song was a straight-up cover of Voidlight that was much more laid-back and repetitive, but I scrapped it in favor of this version. Maybe I'll upload that old version somewhere along the line.)
+Referenced Tracks:
+- Voidlight
 ---
 Track: A Baby Legend - The Baby is 2
 Directory: a-baby-legend
 Artist: Toby Fox
 Duration: '1:37'
-References:
-- A History of Babies
 URLs:
 - https://youtu.be/j_AHimPxR40
 Lyrics: |-
@@ -868,6 +866,8 @@ Lyrics: |-
     this is the story of one man's search for love and truth<br>in a universe forgotten by time
     the story of those fearful creatures<br>those that we call
     <big><big><i>BABIES</i></big></big>
+Referenced Tracks:
+- A History of Babies
 ---
 Track: A Very "O" Christmas
 Artist:
@@ -896,25 +896,25 @@ URLs:
 Track: Archagent Everlasting
 Artist: JohnJRenns
 Duration: '2:07'
-References:
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/archagent-everlasting
+- https://www.youtube.com/watch?v=Hh7t7vQbu1I
+Referenced Tracks:
 - Liquid Negrocity
 - Cascade (Beta)
 - Walk-Stab-Walk (R&E)
 - I'm a Member of the Midnight Crew
-URLs:
-- https://coolandnewwebcomic.bandcamp.com/track/archagent-everlasting
-- https://www.youtube.com/watch?v=Hh7t7vQbu1I
 ---
 Track: Arisen Anew (Remaster)
 Artist: Tensei
 Duration: '2:58'
-References:
-- Arisen Anew
 URLs:
 - https://youtu.be/wouDFje3RY8
 Commentary: |-
     <i>Tensei:</i>
     The original release version of this song had been mastered at a fairly low volume level in order to match the other songs on the Alterniabound album. I felt that a bouncy electronica song like this warranted a lot more volume and dynamic range compression though, so this version is the song as I had originally intended it. The difference might not be all that noticeable unless you're comparing the versions side by side.
+Referenced Tracks:
+- Arisen Anew
 ---
 Track: Before Before the Beginning
 Artist: Robert J! Lake
@@ -929,10 +929,10 @@ URLs:
 Track: Boy Skylark
 Artist: Robert J! Lake
 Duration: '7:14'
-References:
-- Boy Skylark (Brief)
 URLs:
 - https://spellmynamewithabang.bandcamp.com/track/boy-skylark
+Referenced Tracks:
+- Boy Skylark (Brief)
 ---
 Track: Brobot Scrimmage
 Artist: Pascal van den Bos
@@ -944,37 +944,37 @@ URLs:
 Track: Calming Quartz (Beta)
 Artist: PoisonedElite
 Duration: '2:13'
-References:
-- Land of Quartz and Melody
 URLs:
 - https://soundcloud.com/poisonedelite/calming-quartz-beta/s-2FvRp
 Commentary: |-
     <i>PoisonedElite:</i>
     The first Version of Calming Quartz, my song for the album Xenoplanetarium, a Homestuck Fan Album. I wasn't happy with this version so I redid the entire song. This song references Land of Quartz and Melody by Thomas Ferkol.
+Referenced Tracks:
+- Land of Quartz and Melody
 ---
 Track: Cascade (Director's Cut)
 Artist: Tensei
 Duration: '4:20'
-References:
-- Cascade (Beta)
-- track:sburban-jungle
-- track:beatdown-strider-style
 URLs:
 - https://youtu.be/Ejw-E2HBtlY
 Commentary: |-
     <i>Tensei:</i>
     A slightly updated/different version of my section of Cascade. The most notable differences are the altered melodies at the start and numerous production improvements such as rerecorded guitars, improved string sections, etc.
+Referenced Tracks:
+- Cascade (Beta)
+- track:sburban-jungle
+- track:beatdown-strider-style
 ---
 Track: Cascante
 Artist: Noisemaker
 Duration: '3:05'
-References:
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/cascante
+Referenced Tracks:
 - track:sburban-jungle
 - Cascade (Beta)
 - track:showtime-piano-refrain
 - Shave and a Haircut
-URLs:
-- https://coolandnewwebcomic.bandcamp.com/track/cascante
 ---
 Track: Chalk Emerald
 Artist: Kusoro
@@ -998,19 +998,19 @@ URLs:
 Track: Chucklevoodoo Waltz
 Artist: Elodie Cunningham
 Duration: '2:40'
-References:
-- Purple Tyrant
 URLs:
 - https://soundcloud.com/chemicalwordsmith/chucklevoodoo-waltz
 - https://www.youtube.com/watch?v=J_3j1erEwFE
+Referenced Tracks:
+- Purple Tyrant
 ---
 Track: Clockwork Apocalypse
 Artist: Thomas Ferkol
 Duration: '1:39'
-References:
-- track:endless-climb
 URLs:
 - https://www.youtube.com/watch?v=e1d8iai1Wlk
+Referenced Tracks:
+- track:endless-climb
 ---
 Track: CONTACT
 Artist: Difarem
@@ -1101,11 +1101,11 @@ URLs:
 Track: Double Midnight
 Artist: Toby Fox
 Duration: 0:25
-References:
-- Liquid Negrocity
-- I'm a Member of the Midnight Crew
 URLs:
 - https://www.youtube.com/watch?v=un7k0l8p12U
+Referenced Tracks:
+- Liquid Negrocity
+- I'm a Member of the Midnight Crew
 ---
 Track: Dwelling Among the Dream Bubbles
 Artist: Pascal van den Bos
@@ -1142,9 +1142,6 @@ URLs:
 Track: Flare (Cascade)
 Artist: Clark Powell
 Duration: '3:26'
-References:
-- Flare
-- Cascade (Beta)
 URLs:
 - https://plazmataz.tumblr.com/post/19774190658/download-flare-cascade-i-have-recut-and
 - https://www.youtube.com/watch?v=hT0ijIKJkbE
@@ -1154,6 +1151,9 @@ Commentary: |-
     I have attempted a number of times to put together a mix of Flare that utilized the distinctive crescendo that is recognizable from Cascade, but it never seems to work well without the cinematic context. The buildup sort of leads to nothing, and then the track either ends awkwardly or fades out, and I have something personal against fade-outs. Maybe I’ll talk about that someday. But not now.
     I gave it another go, this time trying a decrescendo to bring the song back down from all the energy it riles up, then ending it on kind of a creepy note. I had more success here than I ever have in past attempts to cut the song together in this way.
     Flare was a pretty big hit in its own right, so there’s always the pressure coming from the responsibility to handle this properly. I hope you enjoy it!
+Referenced Tracks:
+- Flare
+- Cascade (Beta)
 ---
 Track: Flare (Green Sun Remix)
 Artist: Clark Powell
@@ -1165,7 +1165,7 @@ Track: Flight of the White Wolf
 Artist: Malcolm Brown
 Duration: '4:45'
 Has URLs: false
-References:
+Referenced Tracks:
 - Rex Duodecim Angelus
 - Cascade (Beta)
 - track:dissension-original
@@ -1198,14 +1198,14 @@ URLs:
 Track: Ham And Steak
 Artist: Malcolm Brown
 Duration: '8:24'
-References:
+URLs:
+- https://www.youtube.com/watch?v=OqT3gaihbPE
+- https://soundcloud.com/dragonxvi/ham-and-steak-unused-homestuck-music
+Referenced Tracks:
 - Rex English
 - Unite Synchronization
 - Homestuck Anthem
 - track:showtime-original-mix
-URLs:
-- https://www.youtube.com/watch?v=OqT3gaihbPE
-- https://soundcloud.com/dragonxvi/ham-and-steak-unused-homestuck-music
 ---
 Track: haunt
 Artist: Andrew Hussie
@@ -1222,20 +1222,20 @@ URLs:
 Track: Heart Beat
 Artist: Pascal van den Bos
 Duration: '2:49'
-References:
-- Moonsetter
-- Dark Necessities
 URLs:
 - https://pascalpotatovandenbos.bandcamp.com/track/heart-beat
 - https://www.youtube.com/watch?v=Wj_gN138rd4
+Referenced Tracks:
+- Moonsetter
+- Dark Necessities
 ---
 Track: Homestuck Title Screen
 Artist: MK_97
 Duration: '8:28'
-References:
-- track:skies-of-skaia
 URLs:
 - https://www.youtube.com/watch?v=N_kGx5RikYA
+Referenced Tracks:
+- track:skies-of-skaia
 ---
 Track: I Am An Island
 Artist: PhemieC
@@ -1247,11 +1247,11 @@ Track: Intro
 Directory: intro-canwave2
 Artist: Aris Martinian
 Duration: '3:07'
-References:
-- The Star-Spangled Banner
-- track:explore
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/intro
+Referenced Tracks:
+- The Star-Spangled Banner
+- track:explore
 ---
 Track: In the Beginning
 Directory: in-the-beginning-canwc
@@ -1301,31 +1301,32 @@ URLs:
 Track: Lord Spanish
 Artist: Cryptanark
 Duration: '1:12'
-References:
-- English
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/lord-spanish
+Referenced Tracks:
+- English
 ---
 Track: Madame Controversielle
 Artist: cookiefonster
 Duration: '2:50'
-References:
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/madame-controversielle
+Referenced Tracks:
 - Killed by BR8K Spider!!!!!!!!
 - Vriska's Theme
 - track:MeGaLoVania
 - Crystalanthemums
 - Cobalt Corsair
-URLs:
-- https://coolandnewwebcomic.bandcamp.com/track/madame-controversielle
 ---
 Track: Mayorlovania
 Artist: Noisemaker
 Duration: '2:40'
-References:
-- track:MeGaLoVania
-Samples: Mayor Maynot
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/mayorlovania
+Referenced Tracks:
+- track:MeGaLoVania
+Sampled Tracks:
+- Mayor Maynot
 ---
 Track: Mannequin
 Artist: Perry Sullivan
@@ -1373,19 +1374,19 @@ Has URLs: false
 Track: 'null'
 Artist: Toby Fox
 Duration: 0:08
-References:
-- Penumbra Phantasm
 Directory: null-toby-fox
 URLs:
 - https://www.youtube.com/watch?v=sIgtSvgERB4
+Referenced Tracks:
+- Penumbra Phantasm
 ---
 Track: Patient
 Artist: Toby Fox
 Duration: 0:59
-References:
-- track:doctor
 URLs:
 - https://youtu.be/HNdCAUpmXws
+Referenced Tracks:
+- track:doctor
 ---
 Track: Penumbra Phantasm
 Artist: Toby Fox
@@ -1396,14 +1397,14 @@ URLs:
 Track: Rags of Rust
 Artist: Willow Ascenzo
 Duration: '3:14'
-References:
-- Rust Servant
 URLs:
 - https://soundcloud.com/wellmanicuredman/rust-piano
 Commentary: |-
     <i>Willow Ascenzo:</i>
     I'm a little late for 6/12, I know, but I just finished some piano arrangements ([[Rags of Rust]], [[Teal Wings and Scales]], [[Violet Sea Breeze]]) of my tracks from [[album:coloUrs-and-mayhem-universe-a]]. I composed the originals back in January 2012--two and a half years ago! My, how time flies when you're having fun.
     I have to thank my piano professor from last semester for these. No, I can't play these pieces live, not yet at least--but taking a piano course really improved my level of comfort and familiarity with composing for pianos. I just might make sheet music available, though!
+Referenced Tracks:
+- Rust Servant
 ---
 Track: Rematch
 Artist: Pascal van den Bos
@@ -1415,16 +1416,18 @@ URLs:
 Track: Rex English
 Artist: Toby Fox
 Duration: 0:50
-References:
-- Rex Duodecim Angelus
-- English
 URLs:
 - https://www.youtube.com/watch?v=xTQo2rPvEzM
+Referenced Tracks:
+- Rex Duodecim Angelus
+- English
 ---
 Track: Rex Mille Geromius
 Artist: cookiefonster
 Duration: '5:46'
-References:
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/rex-mille-geromius
+Referenced Tracks:
 - Rex Duodecim Angelus
 - My Little Pony Theme
 - Karkat's Theme
@@ -1440,8 +1443,6 @@ References:
 - Courser
 - Chalk Emerald
 - track:miracles
-URLs:
-- https://coolandnewwebcomic.bandcamp.com/track/rex-mille-geromius
 ---
 Track: Ruins
 Artist: Erik Scheele
@@ -1458,11 +1459,11 @@ URLs:
 Track: Savior of the Dreaming Dead (Cascade Cut)
 Artist: Malcolm Brown
 Duration: '4:31'
-References:
-- Savior of the Dreaming Dead
-- Cascade (Beta)
 URLs:
 - https://www.youtube.com/watch?v=h9dF20s8SYo
+Referenced Tracks:
+- Savior of the Dreaming Dead
+- Cascade (Beta)
 ---
 Track: Sburban Resolution
 Artist: Aris Martinian
@@ -1479,10 +1480,10 @@ URLs:
 Track: Seer of Same-Color Scalemate Combos
 Artist: Alex Rosetti
 Duration: '1:16'
-References:
-- The Lemonsnout Turnabout
 URLs:
 - https://soundcloud.com/albatrosssoup/seer-of-same-color-scalemate-combos
+Referenced Tracks:
+- The Lemonsnout Turnabout
 ---
 Track: Shooting Star
 Artist: Hilary Troiano
@@ -1501,20 +1502,20 @@ URLs:
 Track: Skaia Voyages
 Artist: Seth Peelle
 Duration: '1:12'
-References:
+URLs:
+- /media/misc/archive/Skaia%20Voyages.mp3
+Referenced Tracks:
 - track:sburban-jungle
 - track:showtime-piano-refrain
 - track:skies-of-skaia
-URLs:
-- /media/misc/archive/Skaia%20Voyages.mp3
 ---
 Track: Skaian Shuffle
 Artist: Clark Powell
 Duration: '4:16'
-References:
-- Skaian Skuffle
 URLs:
 - /media/misc/archive/Skaian%20Shuffle.mp3
+Referenced Tracks:
+- Skaian Skuffle
 ---
 Track: Slamdown
 Artist: Noisemaker
@@ -1537,18 +1538,18 @@ URLs:
 Track: Stay in Touch
 Artist: Wheals
 Duration: '2:11'
-References:
-- Do You Remem8er Me
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/stay-in-touch
 - https://www.youtube.com/watch?v=ZjFavm2I9o8
+Referenced Tracks:
+- Do You Remem8er Me
 ---
 Track: Strider Showdown
 Artist: Bill Bolin
 Duration: 0:57
-References:
-- track:beatdown-strider-style
 Has URLs: false
+Referenced Tracks:
+- track:beatdown-strider-style
 ---
 Track: Smackdown
 Artist: Noisemaker
@@ -1573,23 +1574,23 @@ URLs:
 Track: Teal Wings and Scales
 Artist: Willow Ascenzo
 Duration: '2:50'
-References:
-- Teal Hunter
 URLs:
 - https://soundcloud.com/wellmanicuredman/teal-wings-and-scales
 Commentary: |-
     <i>Willow Ascenzo:</i>
     I'm a little late for 6/12, I know, but I just finished some piano arrangements ([[Rags of Rust]], [[Teal Wings and Scales]], [[Violet Sea Breeze]]) of my tracks from [[album:coloUrs-and-mayhem-universe-a]]. I composed the originals back in January 2012--two and a half years ago! My, how time flies when you're having fun.
     I have to thank my piano professor from last semester for these. No, I can't play these pieces live, not yet at least--but taking a piano course really improved my level of comfort and familiarity with composing for pianos. I just might make sheet music available, though!
+Referenced Tracks:
+- Teal Hunter
 ---
 Track: Temporal Virtuoso
 Artist: Pascal van den Bos
 Duration: '2:29'
-References:
-- Cascade (Beta)
-- Time on My Side
 URLs:
 - https://pascalpotatovandenbos.bandcamp.com/track/temporal-virtuoso
+Referenced Tracks:
+- Cascade (Beta)
+- Time on My Side
 ---
 Track: The Engineer
 Artist: Aradia Jones
@@ -1612,10 +1613,10 @@ URLs:
 Track: The Uranian
 Artist: James Dever
 Duration: 0:47
-References:
-- The Undying
 URLs:
 - https://youtu.be/gbiS4WkCOVo?t=27042
+Referenced Tracks:
+- The Undying
 ---
 Track: Tick
 Artist: Cryptanark
@@ -1626,11 +1627,11 @@ URLs:
 Track: Unintentional Touhou
 Artist: Cryptanark
 Duration: '3:04'
-References:
-- Liquid Negrocity
-- Oppa Toby Style
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/unintentional-touhou
+Referenced Tracks:
+- Liquid Negrocity
+- Oppa Toby Style
 ---
 Track: Vexation
 Artist: Chris Hafling
@@ -1641,22 +1642,22 @@ URLs:
 Track: Violet Sea Breeze
 Artist: Willow Ascenzo
 Duration: '3:01'
-References:
-- Violet Mariner
 URLs:
 - https://soundcloud.com/wellmanicuredman/violet-sea-breeze
 Commentary: |-
     <i>Willow Ascenzo:</i>
     I'm a little late for 6/12, I know, but I just finished some piano arrangements ([[Rags of Rust]], [[Teal Wings and Scales]], [[Violet Sea Breeze]]) of my tracks from [[album:coloUrs-and-mayhem-universe-a]]. I composed the originals back in January 2012--two and a half years ago! My, how time flies when you're having fun.
     I have to thank my piano professor from last semester for these. No, I can't play these pieces live, not yet at least--but taking a piano course really improved my level of comfort and familiarity with composing for pianos. I just might make sheet music available, though!
+Referenced Tracks:
+- Violet Mariner
 ---
 Track: Void Session
 Artist: Ducky Senpai
 Duration: '2:39'
-References:
-- track:sburban-jungle
 URLs:
 - https://www.youtube.com/watch?v=kdfgB3Gc_pw
+Referenced Tracks:
+- track:sburban-jungle
 ---
 Track: Where making this hapen
 Artist: David Ko
@@ -1683,10 +1684,10 @@ Track: リサフランク420 / 現代のコンピュー
 Directory: lisa-frank-420-modern-computing
 Artist: Macintosh Plus
 Duration: '7:21'
-References:
-- It's Your Move
 URLs:
 - https://www.youtube.com/watch?v=aQkPcPqTq4M
+Referenced Tracks:
+- It's Your Move
 ---
 Track: A Bell is Tolling
 Artist: Secret of Mana
@@ -1739,8 +1740,6 @@ URLs:
 Track: An Apple Disaster!!
 Artist: Toby Fox
 Duration: 0:58
-References:
-- Magical Hopalong Cassidy Station
 URLs:
 - https://youtu.be/wa2K_8Ff41M?t=149
 - https://fwugradiation.tumblr.com/post/13528293577/improvised-touhou-music-with-annoying-commentary
@@ -1750,6 +1749,8 @@ Lyrics: |-
     <i>You should taste my wonderful apples</i><br><i>No, sorry, I'm watching my weight recently</i><br><i>No!! You have to try the apples or I won't let you through!</i><br><i>Oh, well, I'll give you a diabetes bow tie</i><br><i>[UNTRANSLATABLE JAPANESE IDIOM]</i>
     Then you have a weird chord change<br>Because it's a newer Touhou song
     Then they make a joke about apple pie
+Referenced Tracks:
+- Magical Hopalong Cassidy Station
 ---
 Track: Arms Outstretched
 Artist: Griffin McElroy
@@ -1872,9 +1873,9 @@ URLs:
 ---
 Track: Careless Whisper
 Artist: George Michael
-Duratoin: '5:01'
 URLs:
 - https://www.youtube.com/watch?v=izGwDsrQ1eQ
+Duration: '5:01'
 ---
 Track: Carol of the Bells
 Artist: Mykola Leontovych
@@ -2144,15 +2145,15 @@ URLs:
 Track: Good Night - Undertale
 Artist: SilvaGunner
 Duration: '5:29'
-References:
+URLs:
+- https://www.youtube.com/watch?v=KyNVRrHkwe0
+- https://gilvasunner.bandcamp.com/track/goodbye-to-the-underground
+Referenced Tracks:
 - Good Night
 - Goodbye To A World
 - Hopes and Dreams
 - Once Upon a Time
 - Meet the Flintstones
-URLs:
-- https://www.youtube.com/watch?v=KyNVRrHkwe0
-- https://gilvasunner.bandcamp.com/track/goodbye-to-the-underground
 ---
 Track: He Not Like the Banana
 Artist: Cat No Banana
@@ -2500,10 +2501,10 @@ URLs:
 Track: Pencil Holder (demo version)
 Artist: Clark Powell
 Duration: '4:22'
-References:
-- track:lori-and-erich-baker
 URLs:
 - https://soundcloud.com/plazmataz/pencil-holder-demo-version
+Referenced Tracks:
+- track:lori-and-erich-baker
 ---
 Track: Piss
 Artist: Neil Cicierega
@@ -2698,12 +2699,12 @@ URLs:
 Track: Slider - Super Mario 64
 Artist: SilvaGunner
 Duration: '1:18'
-References:
-- Slider
-- Meet the Flintstones
 URLs:
 - https://www.youtube.com/watch?v=DrCLBuf0Yec
 - https://gilvasunner.bandcamp.com/track/grand-dads-secret-slide
+Referenced Tracks:
+- Slider
+- Meet the Flintstones
 ---
 Track: Smiles and Tears
 Artist: EarthBound
@@ -2720,11 +2721,11 @@ URLs:
 Track: Snow halation - Love Live!
 Artist: SilvaGunner
 Duration: '4:19'
-References:
-- Snow halation
 URLs:
 - https://www.youtube.com/watch?v=g1p5eNOsl7I
 - https://gilvasunner.bandcamp.com/track/stone-halation
+Referenced Tracks:
+- Snow halation
 ---
 Track: Solresol
 Artist: Melomane
@@ -3183,10 +3184,10 @@ URLs:
 Track: what year is it
 Artist: Jon Bois
 Duration: '1:39'
-References:
-- Sweet Victory
 URLs:
 - https://www.youtube.com/watch?v=1BZs005Hbgs
+Referenced Tracks:
+- Sweet Victory
 ---
 Track: WOAH!
 Artist: Chris Patstone
diff --git a/album/vaporwave-2016.yaml b/album/vaporwave-2016.yaml
index 0e179fe2..fe469086 100644
--- a/album/vaporwave-2016.yaml
+++ b/album/vaporwave-2016.yaml
@@ -22,11 +22,6 @@ Cover Artists:
 Track: -私はあなたを騙しました-( ͡° ͜ʖ ͡°)
 Directory: vaporwave-2016-track1
 Duration: '6:43'
-References:
-- Pseudumbra Phauxtasm
-- track:lisa-frank-420-modern-computing
-- Sunslammer
-- Wonderwall
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/--2
 - https://youtu.be/F24thk49xfk
@@ -34,66 +29,69 @@ Lyrics: |-
     yo, what's up<br>comin' at you live from the virtual plaza<br>it's homestuck twenty sixteen vaporwave ruh-ruh-ruh-remiiiiiiiiiix<br>yeah<br>take it away<br>toby "fox" bowman
     disclaimer: the song that you just heard is most certainly not the real penumbra phantasm, and had little to no involvement from toby fox. the rest of this playlist is homestuck vaporwave. anyway, here's wonderwall.
     [wonderwall]
+Referenced Tracks:
+- Pseudumbra Phauxtasm
+- track:lisa-frank-420-modern-computing
+- Sunslammer
+- Wonderwall
 ---
 Track: GAMINGブラザー96
 Directory: vaporwave-2016-track2
 Duration: '4:17'
-References:
-- GameBro (Original 1990 Mix)
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/--3
 - https://youtu.be/mllhnBUuA08
+Referenced Tracks:
+- GameBro (Original 1990 Mix)
 ---
 Track: 夜間のMOON汗
 Directory: vaporwave-2016-track3
 Duration: '3:26'
-References:
-- Moonsetter
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/--4
 - https://youtu.be/Mkz6-4ftbdU
+Referenced Tracks:
+- Moonsetter
 ---
 Track: 家で立ち往生「UGLY-BEBBY」
 Directory: vaporwave-2016-track4
 Duration: '2:57'
-References:
-- Ugly Betty
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/--5
 - https://youtu.be/8TpqOPN0aRk
+Referenced Tracks:
+- Ugly Betty
 ---
 Track: SジBャUンRグBル
 Directory: vaporwave-2016-track5
 Duration: '4:39'
-References:
-- track:sburban-jungle
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/--6
 - https://youtu.be/HcSNncKT0jw
+Referenced Tracks:
+- track:sburban-jungle
 ---
 Track: CRYSTAL母の国歌
 Directory: vaporwave-2016-track6
 Duration: '1:48'
-References:
-- Crystalanthemums
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/--7
 - https://youtu.be/2zcnqtKMGyc
+Referenced Tracks:
+- Crystalanthemums
 ---
 Track: RJ眠れない3AM
 Directory: vaporwave-2016-track7
 Duration: '6:42'
-References:
-- track:three-in-the-morning-rj
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/--8
 - https://youtu.be/tah9_8cx0-4
+Referenced Tracks:
+- track:three-in-the-morning-rj
 ---
 Track: イカの子供のPARADISE
 Directory: vaporwave-2016-track8
 Duration: '4:42'
-References:
-- Squiddles in Paradise
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/--9
 - https://youtu.be/CsXVWLdI6UU
@@ -101,12 +99,12 @@ Lyrics: >-
     yo what's up<br>it's me again<br>fuckin' squiddles in paradise<br>we're on some
     motherfuckin'<br>kokomo beach beach boys shit<br>right now<br>oh shit<br>squiddles<br>fuck<br>homestuck<br>vaporwave<br>twenty
     sixteen<br>remix<br>remix remix<br>fuck
+Referenced Tracks:
+- Squiddles in Paradise
 ---
 Track: $H☯W✝IM€-420-( ▽ ` )ノ
 Directory: vaporwave-2016-track9
 Duration: '2:43'
-References:
-- track:showtime-original-mix
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/h-w-im-420
 - https://youtu.be/w7wyVTTCFag
@@ -114,52 +112,54 @@ Lyrics: >-
     yo what's up<br>it's me again<br>chiptune vaporave?<br>that's a new thing<br>i'm
     pretty sure<br>i dunno<br>somebody probably already remixed undertale<br>to be
     vaporwave<br>i dunno<br>homestuck vaporwave twenty sixteen ruh-ruh-remix
+Referenced Tracks:
+- track:showtime-original-mix
 ---
 Track: 魚娘ドキドキ
 Directory: vaporwave-2016-track10
 Duration: '2:22'
-References:
-- Love You (Feferi's Theme)
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/--10
 - https://youtu.be/FwMC3Ubi1gE
+Referenced Tracks:
+- Love You (Feferi's Theme)
 ---
 Track: がんばってDAVIDさん
 Directory: vaporwave-2016-track11
 Duration: '2:00'
-References:
-- track:upward-movement-dave-owns
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/--11
 - https://youtu.be/SmF51-oEPvo
+Referenced Tracks:
+- track:upward-movement-dave-owns
 ---
 Track: weed dreams..
 Directory: vaporwave-2016-track12
 Duration: '2:38'
-References:
-- track:aggrieve-violin-refrain
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/weed-dreams
 - https://youtu.be/gUAowj3xo0o
+Referenced Tracks:
+- track:aggrieve-violin-refrain
 ---
 Track: 酔ったMIDNIGHTの乗組員
 Directory: vaporwave-2016-track13
 Duration: '5:29'
-References:
-- I'm a Member of the Midnight Crew (Post-Punk Version)
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/--12
 - https://youtu.be/II7xYMkx0lM
 Lyrics: '(see: [[track:im-a-member-of-the-midnight-crew-post-punk-version]])'
+Referenced Tracks:
+- I'm a Member of the Midnight Crew (Post-Punk Version)
 ---
 Track: 4ちゃん • プロスピット
 Directory: vaporwave-2016-track14
 Duration: '3:46'
-References:
-- Chain Of Prospit
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/--13
 - https://youtu.be/IwBwhoqNd0M
 Lyrics: |-
     yo what's up<br>how you doin'<br>havin' fun yet?<br>here's a little track<br>from my boy<br>mikey b<br>homestuck<br>vaporwave<br>twenty sixteen<br>ruh-ruh-ruh-remix<br>woo
     (see: [[track:chain-of-prospit]])
+Referenced Tracks:
+- Chain Of Prospit
diff --git a/album/weird-puzzle-tunes.yaml b/album/weird-puzzle-tunes.yaml
index ef7fa8a4..d295c41d 100644
--- a/album/weird-puzzle-tunes.yaml
+++ b/album/weird-puzzle-tunes.yaml
@@ -1,9 +1,6 @@
 Album: Weird Puzzle Tunes
 Date: March 10, 2017
 Date Added: January 12, 2021
-Banner Art:
-- Selan Pike
-- ndividedbyzero (asset organizing)
 Banner Dimensions: 1100x203
 Color: '#9e80c0'
 Groups:
@@ -15,18 +12,21 @@ URLs:
 Cover Artists:
 - Selan Pike
 - XenoZane (concept)
+Banner Artists:
+- Selan Pike
+- ndividedbyzero (asset organizing)
 ---
 Group: Main album
 ---
 Track: Compensation, Adequate
 Artist: Aris Martinian
 Duration: '2:12'
-References:
-- Problem Sleuth Theme
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/compensation-adequate
 - https://youtu.be/s_uy3n2cMRk
 Has Cover Art: false
+Referenced Tracks:
+- Problem Sleuth Theme
 ---
 Track: We Have A Problem, Sleuth
 Artist: nuclear333
@@ -58,13 +58,13 @@ Cover Artists:
 Track: Defuse A Bomb
 Artist: nuclear333
 Duration: '1:22'
-References:
-- In the Hall of the Mountain King
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/defuse-a-bomb
 - https://youtu.be/7X9FgQnBWXo
 Cover Artists:
 - nuclear333
+Referenced Tracks:
+- In the Hall of the Mountain King
 ---
 Track: Fractal Flowers
 Artist: Kal-la-kal-la
@@ -96,15 +96,15 @@ Cover Artists:
 Track: You Died, Idiot
 Artist: Grace Medley
 Duration: '1:49'
-References:
-- Negastrife
-- Problem Sleuth Theme
-- DEVILHEAD RISING
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/you-died-idiot
 - https://youtu.be/hz4f-RM3YPY
 Cover Artists:
 - yazshu
+Referenced Tracks:
+- Negastrife
+- Problem Sleuth Theme
+- DEVILHEAD RISING
 ---
 Track: Monochromatic Shenanigans
 Artist: Kusoro
@@ -127,13 +127,13 @@ Cover Artists:
 Track: While the Iron's Hot
 Artist: OpsCat
 Duration: '1:38'
-References:
-- Moshi Moshi?
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/while-the-irons-hot
 - https://youtu.be/-zq98Dcf2H0
 Cover Artists:
 - OpsCat
+Referenced Tracks:
+- Moshi Moshi?
 ---
 Track: Aggress
 Artist: WHATISLOSTINTHEMINES
@@ -169,59 +169,59 @@ Cover Artists:
 Track: Bonehead Destiny
 Artist: Grace Medley
 Duration: '3:44'
-References:
-- Unite Synchronization
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/bonehead-destiny
 - https://youtu.be/6e9V8I9cuKY
 Cover Artists:
 - OpsCat
+Referenced Tracks:
+- Unite Synchronization
 ---
 Track: Semisepulchritude
 Artist: ndividedbyzero
 Duration: '3:16'
-References:
-- Aggress
-- Battle Against An Imaginary Foe
-- Problem Sleuth Theme
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/semisepulchritude
 - https://youtu.be/GDK0Ogot-nA
 Cover Artists:
 - Selan Pike
+Referenced Tracks:
+- Aggress
+- Battle Against An Imaginary Foe
+- Problem Sleuth Theme
 ---
 Track: Replicollision
 Artist: Noisemaker
 Duration: '2:25'
-References:
-- Problem Sleuth Theme
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/replicollision
 - https://youtu.be/E0afAoosOLo
 Cover Artists:
 - Homestuck
+Referenced Tracks:
+- Problem Sleuth Theme
 ---
 Group: Bonus tracks
 ---
 Track: Midnight Stew
 Artist: ndividedbyzero
 Duration: '3:50'
-References:
-- Liquid Negrocity
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/bonus-midnight-stew
 - https://youtu.be/QhjKUxa6IhY
 Cover Artists:
 - Selan Pike
+Referenced Tracks:
+- Liquid Negrocity
 ---
 Track: The Point of Going Home
 Artist: nuclear333
 Duration: '1:23'
-References:
-- Go Back
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/bonus-the-point-of-going-home
 - https://youtu.be/J9oHcnqUvw8
 Cover Artists:
 - Selan Pike
 - avocado (concept)
+Referenced Tracks:
+- Go Back
diff --git a/album/xenoplanetarium.yaml b/album/xenoplanetarium.yaml
index 69fe83d1..9b33b7de 100644
--- a/album/xenoplanetarium.yaml
+++ b/album/xenoplanetarium.yaml
@@ -2,8 +2,6 @@ Album: Xenoplanetarium
 Date: December 8, 2017
 Date Added: January 12, 2021
 Color: '#d790ca'
-Banner Art:
-- nights
 Banner Dimensions: 1100x203
 Groups:
 - Unofficial MSPA Fans
@@ -40,6 +38,8 @@ Commentary: |-
     (per [[track:jungle-3|LoFaM 4 standard]], ive highlighted commentary from people besides the original musicians or cover artists in bold!)
 Cover Artists:
 - nights
+Banner Artists:
+- nights
 ---
 Track: Calming Quartz
 Artist: PoisonedElite
@@ -47,8 +47,6 @@ Art Tags:
 - Aradia
 - 'cw: body horror'
 Duration: '2:05'
-References:
-- Calming Quartz (Beta)
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/calming-quartz
 - https://youtu.be/i_rH12hll8A
@@ -65,6 +63,8 @@ Commentary: |-
     LOQAM has a very eerie atmosphere to it that is captured to amazing effect in this artwork. The jagged textures of quartz crystals provide a nice backdrop when paired with the howling, almost glowing sky. There's a ton of detail put into every area of this piece, and that's especially noticable in the Aradiabot occupying the left of the composition. Her damaged and decaying appearance helps to add to the unsettling nature of the piece. Aradia herself is also visible in the art as well. Isn't it a little weird that these two different versions of Aradia are in the same piece...? Then again, if there was ever to be a troll that showed up in two places at the same time, it's her.
 Cover Artists:
 - Elanor Pam
+Referenced Tracks:
+- Calming Quartz (Beta)
 ---
 Track: Sandy Skyline
 Artist: Aris Martinian
@@ -84,8 +84,6 @@ Cover Artists:
 Track: Deep Fried
 Artist: Kanishka
 Duration: '4:00'
-References:
-- The La2t Frontiier
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/deep-fried
 - https://youtu.be/VL-k3TDTxSA
@@ -102,14 +100,14 @@ Commentary: |-
     <s>(look mom! i'm using my medical knowledge for something dear to my heart!)</s>
 Cover Artists:
 - artisticallyCrafty
+Referenced Tracks:
+- The La2t Frontiier
 ---
 Track: Red Pulse
 Artist: ehlsea
 Art Tags:
 - 'cw: blood (abstract)'
 Duration: '3:25'
-References:
-- Karkat's Theme
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/red-pulse
 - https://youtu.be/uZrnoad2yUQ
@@ -120,14 +118,12 @@ Commentary: |-
     LOPAH is home to an oppressive and bloody landscape, quite literally so. I mean, the oceans are legitimately made of blood. If that isn't metal I don't know what is. Anyway, this artwork conveys the hostility of stepping foot in such an environment masterfully, with the moody skies, foreboding architecture, and blood-rivers that cut into the terrain and seem to take up the entire canvas. There's great care taken into even the most minor aspects of the lighting so that the piece as a whole feels truly complete. The end result: a pretty cool-looking place, all things considered. Just try not to lose your footing; no one should have to experience being submerged in blood.
 Cover Artists:
 - Elanor Pam
+Referenced Tracks:
+- Karkat's Theme
 ---
 Track: Oolongcat
 Artist: Ucklin
 Duration: '2:43'
-References:
-- Nepeta's Theme
-- Horschestra
-- Rex Duodecim Angelus
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/oolongcat
 - https://youtu.be/bQBkjUo9q10
@@ -140,13 +136,14 @@ Commentary: |-
     huzzah the nine kettle pots we<br>on sugar we rest on you see<br>friends of the cat<br>nothing wrong with that<br>now shut up and have some damn tea
 Cover Artists:
 - TheChaoMaster
+Referenced Tracks:
+- Nepeta's Theme
+- Horschestra
+- Rex Duodecim Angelus
 ---
 Track: Light Like Raindrops
 Artist: Grace Medley
 Duration: '3:15'
-References:
-- Frog Forager
-- track:theotokos
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/light-like-raindrops
 - https://youtu.be/7at_By7l078
@@ -159,13 +156,13 @@ Commentary: |-
     *This is only accurate assuming Power doesn't completely rework it considering it's an unintentional Magicant arrangement.
 Cover Artists:
 - Circlejourney
+Referenced Tracks:
+- Frog Forager
+- track:theotokos
 ---
 Track: Delta Divination
 Artist: ndividedbyzero
 Duration: '3:27'
-References:
-- Retconjuration
-- Terezi's Theme
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/delta-divination
 - https://youtu.be/GcXi5JoU_94
@@ -179,15 +176,15 @@ Commentary: |-
     I love Terezi, as much as I never draw her... and I also love drawing landscapes! Two dragonmoms with one meteor!
 Cover Artists:
 - Chumi
+Referenced Tracks:
+- Retconjuration
+- Terezi's Theme
 ---
 Track: Acquiesce
 Artist: psithurist
 Art Tags:
 - Denizens
 Duration: '4:25'
-References:
-- Killed by BR8K Spider!!!!!!!!
-- Spider's Claw
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/acquiesce
 - https://youtu.be/TS5ibctqo5U
@@ -203,12 +200,13 @@ Commentary: |-
     In the waves of LOMAT Cetus lurks awaiting the child of light.
 Cover Artists:
 - Jas
+Referenced Tracks:
+- Killed by BR8K Spider!!!!!!!!
+- Spider's Claw
 ---
 Track: Depths and Water
 Artist: Blackhole
 Duration: '7:15'
-References:
-- Indigo Heir
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/depths-and-water
 - https://youtu.be/Y6N6qPUberY
@@ -219,12 +217,12 @@ Commentary: |-
     I had lots of fun working on this piece, and the input from others really helped me learn new ways to do things and helped the piece come together to what it is now. I feel that the hardest part was making all the pieces of the art meld together into one cohesive and nice to look at image. I hope everyone listening enjoys the song and the art, and I hope they like the album as a whole as it was put together with help from all sorts of talented musicians and artists whom I respect greatly.
 Cover Artists:
 - Cosmic
+Referenced Tracks:
+- Indigo Heir
 ---
 Track: Carnival of Nescience
 Artist: WHATISLOSTINTHEMINES
 Duration: '2:05'
-References:
-- track:miracles-icp
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/carnival-of-nescience
 - https://youtu.be/Bjwg6RjvTzI
@@ -240,14 +238,14 @@ Commentary: |-
     This piece was a bit of a challenge for me, since landscapes aren't really my strong suit. This was also my first contribution to unofficialmspafans. To me, the song had a kind of dreamy, hazy feel to it, and I tried to reflect that the best I could in the artwork. LOTAM is an interesting land, and I had a lot of fun drawing this. I hope that you guys will all enjoy this song as much as I did!
 Cover Artists:
 - genericDragon
+Referenced Tracks:
+- track:miracles-icp
 ---
 Track: Round Perdition's Flames
 Artist: Kal-la-kal-la
 Art Tags:
 - Angels
 Duration: '3:44'
-References:
-- Eridan's Theme
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/round-perditions-flames
 - https://youtu.be/331ZPNLIdZo
@@ -259,15 +257,14 @@ Commentary: |-
     LOWAA is my favourite land, so I was very excited to get to draw this piece. My collabs have almost always been written ones, never involving music, so this was an interesting way for me to try that out - especially when Kal-la-kal-la surprised me with exactly the type of music I love!
 Cover Artists:
 - Caitlin Beamer
+Referenced Tracks:
+- Eridan's Theme
 ---
 Track: The Hyaline
 Artist: Circlejourney
 Art Tags:
 - Feferi
 Duration: '4:13'
-References:
-- Fuchsia Moonrise
-- Love You (Feferi's Theme)
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/the-hyaline
 - https://youtu.be/dDbC9VpsMtc
@@ -281,3 +278,6 @@ Commentary: |-
     I wanted to show off the feel and personality that Feferi and her planet share, to go with the light music. In particular I wanted to reference 'Sing Sweet Nightingale' from Disney's Cinderlla, to reflect the watery, bubbly, dreamy feel of Feferi's planet.
 Cover Artists:
 - allyssinian
+Referenced Tracks:
+- Fuchsia Moonrise
+- Love You (Feferi's Theme)
diff --git a/artists.yaml b/artists.yaml
index 8580c7a4..fd2988ef 100644
--- a/artists.yaml
+++ b/artists.yaml
@@ -464,7 +464,7 @@ URLs:
 Artist: Beta
 ---
 Artist: Bill Bolin
-Note: |-
+Context Notes: |-
     Entries for tracks by Bill Bolin have been retained for the sake of preserving the intended structure and form of albums they appear on; however, it should be noted that Bolin left the music team after throwing a huge tantrum regarding "professionalism" and having tracks he hadn't formally released featured in the comic. While they still appear as their original releases in the albums on this artist page, they were promptly replaced with tracks by other music team members, and eventually [[album:homestuck-vol-1-4]] was released, including several replacement tracks. The entire fiasco around Bolin has long been infamous within the music fandom.
     It also came to public light later that Bolin had acted transphobic towards another music team member.
 ---
@@ -2673,7 +2673,7 @@ Artist: Nico J. Dolloso
 Artist: Nicole Sequeira
 ---
 Artist: Nick Smalley
-Note: >-
+Context Notes: >-
     Tracks by Nick Smalley have been retained for the sake of preserving the intended
     structure and form of albums they appear on; however, it should be noted that
     this artist is a known and admitted pedophile. As of this writing, he is no longer
@@ -3400,7 +3400,7 @@ Artist: Secret of Mana
 Artist: seiii-tan
 ---
 Artist: Seijen
-Note: >-
+Context Notes: >-
     Tracks by Seijen have been retained for the sake of preserving the intended structure
     and form of albums they appear on, however, it should be noted that this artist
     has made several statements defending neo-Nazi comic Stonetoss.
diff --git a/flashes.yaml b/flashes.yaml
index c4816ff8..083dd9f6 100644
--- a/flashes.yaml
+++ b/flashes.yaml
@@ -1,95 +1,97 @@
-ACT: Act 1 - The Note Desolation Plays
 Color: '#7799ff'
 Anchor: a1
 Jump: Side 1 (Acts 1-5)
 Jump Color: '#4ac925'
+Act: Act 1 - The Note Desolation Plays
 ---
 Flash: 'John: Examine games on CD rack.'
 Page: 31
 Date: April 16, 2009
-Tracks:
+Featured Tracks:
 - Problem Sleuth Theme
 ---
 Flash: '[S] John: Play haunting piano refrain.'
 Page: 77
 Date: April 21, 2009
-Tracks:
-- track:showtime-piano-refrain
 URLs:
 - https://www.bgreco.net/hsflash/001977.html
+Featured Tracks:
+- track:showtime-piano-refrain
 ---
 Flash: '[S] ==>'
 Page: 82
 Date: April 24, 2009
-Tracks:
-- Windchime Foley
 URLs:
 - https://youtu.be/rrG3_mqjW04
+Featured Tracks:
+- Windchime Foley
 ---
 Flash: '[S] John: Enter.'
 Page: 88
 Date: April 27, 2009
-Tracks:
+Featured Tracks:
 - track:harlequin
 ---
 Flash: '[S] STRIFE!'
 Page: 90
 Date: April 28, 2009
-Tracks:
-- track:showtime-original-mix
 URLs:
 - https://youtu.be/Ytrd_2x-8Rs
 - https://www.bgreco.net/hsflash/001990.html
+Featured Tracks:
+- track:showtime-original-mix
 ---
 Flash: '[S] ==>'
 Page: 137
 Date: May 9, 2009
-Tracks:
-- Sburban Jungle (Brief Mix)
 URLs:
 - https://youtu.be/IBqARyNMonk
 - https://www.bgreco.net/hsflash/002037.html
+Featured Tracks:
+- Sburban Jungle (Brief Mix)
 ---
 Flash: '[S] ==>'
 Page: 186
 Date: May 21, 2009
-Tracks:
+Featured Tracks:
 - track:harlequin
 ---
 Flash: '[S] Rose: Play a haunting refrain on the violin.'
 Page: 222
 Date: May 29, 2009
-Tracks:
-- track:aggrieve-violin-refrain
 URLs:
 - https://www.bgreco.net/hsflash/002122.html
+Featured Tracks:
+- track:aggrieve-violin-refrain
 ---
 Flash: '[S] John: Take bite of apple.'
 Page: 246
 Date: June 7, 2009
-Tracks:
-- track:sburban-countdown
 URLs:
 - https://youtu.be/ec0sDrBI0V8
 - https://www.bgreco.net/hsflash/002146.html
+Featured Tracks:
+- track:sburban-countdown
 ---
-ACT: Act 2 - Raise of the Conductor's Baton
 Color: '#ff5555'
 Anchor: a2
+Act: Act 2 - Raise of the Conductor's Baton
 ---
 Flash: '[S] YOU THERE. BOY.'
 Page: 253
 Date: June 14, 2009
-Tracks:
-- track:showtime-piano-refrain
-- track:harlequin
 URLs:
 - https://www.bgreco.net/hsflash/002153.html
+Featured Tracks:
+- track:showtime-piano-refrain
+- track:harlequin
 ---
 Flash: '[S] ==>'
 Page: 338
 Date: July 4, 2009
-Tracks:
+URLs:
+- https://www.bgreco.net/hsflash/002238.html
+Featured Tracks:
 - track:phat1
 - track:phat2
 - track:phat3
@@ -111,131 +113,129 @@ Tracks:
 - Ghostbusters
 - JOHN DO THE WINDY THING
 - track:i-dont-want-to-miss-a-thing-aerosmith
-URLs:
-- https://www.bgreco.net/hsflash/002238.html
 ---
 Flash: '[S] Rose: Youth roll right out the front door.'
 Page: 388
 Date: July 19, 2009
-Tracks:
-- track:aggrieve
 URLs:
 - https://www.bgreco.net/hsflash/002288.html
+Featured Tracks:
+- track:aggrieve
 ---
 Flash: '[S] ==>==>==>!!!!!!!!!'
 Page: 393
 Date: July 22, 2009
-Tracks:
-- track:showtime-imp-strife-mix
 URLs:
 - https://www.bgreco.net/hsflash/002293.html
+Featured Tracks:
+- track:showtime-imp-strife-mix
 ---
 Flash: '[S] GET UP JOHN, THIS IS NO TIME FOR SLUMBER.'
 Page: 397
 Date: July 23, 2009
-Tracks:
-- track:showtime-imp-strife-mix
 URLs:
 - https://www.bgreco.net/hsflash/002297.html
+Featured Tracks:
+- track:showtime-imp-strife-mix
 ---
 Flash: '[S] JOHN, SALVAGE YOUR WEAPON AND FIGHT ON!'
 Page: 400
 Date: July 25, 2009
-Tracks:
-- track:showtime-imp-strife-mix
 URLs:
 - https://www.bgreco.net/hsflash/002300.html
+Featured Tracks:
+- track:showtime-imp-strife-mix
 ---
 Flash: '[S] WHAT THIS IS SO OUTRAGEOUS'
 Page: 418
 Date: July 30, 2009
-Tracks:
+Featured Tracks:
 - track:nannaquin
 ---
 Flash: '[S] GO ON. ==>'
 Page: 422
 Date: August 1, 2009
-Tracks:
-- track:skies-of-skaia
 URLs:
 - https://www.bgreco.net/hsflash/002322.html
+Featured Tracks:
+- track:skies-of-skaia
 ---
 Flash: '[S] ==>'
 Page: 476
 Date: August 15, 2009
-Tracks:
-- track:harlequin-rock-version
 URLs:
 - https://www.bgreco.net/hsflash/002376.html
+Featured Tracks:
+- track:harlequin-rock-version
 ---
 Flash: '[S] John: Sleep.'
 Page: 644
 Date: September 15, 2009
-Tracks:
+Featured Tracks:
 - track:john-sleeps-skaian-magicant
 ---
 Flash: '[S] John: Wake up.'
 Page: 651
 Date: September 17, 2009
-Tracks:
+Featured Tracks:
 - track:john-sleeps-skaian-magicant
 ---
 Flash: '[S] Dave: Ascend to the highest point of the building.'
 Page: 665
 Date: September 21, 2009
-Tracks:
-- track:upward-movement-dave-owns
 URLs:
 - https://youtu.be/hLzo0aaSvlg
 - https://www.bgreco.net/hsflash/002565.html
+Featured Tracks:
+- track:upward-movement-dave-owns
 ---
 Flash: '[S] WV: Lead your men to victory!'
 Page: 721
 Date: October 2, 2009
-Tracks:
-- track:vagabounce
 URLs:
 - https://youtu.be/bQ2Lw3dcilg
 - https://www.bgreco.net/hsflash/002621.html
+Featured Tracks:
+- track:vagabounce
 ---
 Flash: '[S] WV: Hasten to the exit post-haste!'
 Page: 755
 Date: October 9, 2009
-Tracks:
-- Sburban Reversal
 URLs:
 - https://youtu.be/_xjI4ZmvnGc
 - https://www.bgreco.net/hsflash/002655.html
+Featured Tracks:
+- Sburban Reversal
 ---
 Flash: '[S] WV: Ascend.'
 Page: 757
 Date: October 11, 2009
-Tracks:
-- track:explore
 URLs:
 - https://youtu.be/a-WxdPfVddo
 - https://www.bgreco.net/hsflash/002657.html
+Featured Tracks:
+- track:explore
 ---
-ACT: Act 3 - Insane Corkscrew Haymakers
 Color: '#55ff77'
 Anchor: a3
+Act: Act 3 - Insane Corkscrew Haymakers
 ---
 Flash: '[S] Jade: Play a silly flute refrain.'
 Page: 769
 Date: October 15, 2009
-Tracks:
+Featured Tracks:
 - Flute Performance
 ---
 Flash: '[S] Jade: Play a hauntingly relaxing bassline.'
 Page: 822
 Date: October 27, 2009
-Tracks:
+Featured Tracks:
 - Gardener
 ---
 Flash: '[S] Jade: Open FreshJamz!'
 Page: 830
 Date: October 31, 2009
-Tracks:
+Featured Tracks:
 - track:showtime-remix
 - track:aggrieve-remix
 - track:verdancy-bassline
@@ -249,189 +249,189 @@ Tracks:
 Flash: '[S] MIDNIGHT CREW: ACT 1031'
 Page: 833
 Date: November 2, 2009
-Tracks:
-- Dead Shuffle
 URLs:
 - https://youtu.be/wAGh8RJk-TU
 - https://www.bgreco.net/hsflash/002733.html
+Featured Tracks:
+- Dead Shuffle
 ---
 Flash: '[S] Dave: STRIFE.'
 Page: 836
 Date: November 6, 2009
-Tracks:
-- track:beatdown-strider-style
 URLs:
 - https://www.bgreco.net/hsflash/002736.html
+Featured Tracks:
+- track:beatdown-strider-style
 ---
 Flash: '[S] Jade: Descend.'
 Page: 843
 Date: November 8, 2009
-Tracks:
-- track:harleboss
 URLs:
 - https://www.bgreco.net/hsflash/002743.html
+Featured Tracks:
+- track:harleboss
 ---
 Flash: '[S] Dave: Abscond.'
 Page: 871
 Date: November 18, 2009
-Tracks:
-- track:beatdown-round-2
 URLs:
 - https://www.bgreco.net/hsflash/002771.html
+Featured Tracks:
+- track:beatdown-round-2
 ---
 Flash: '[S] Rose: Ascend.'
 Page: 879
 Date: November 20, 2009
-Tracks:
-- track:harleboss
 URLs:
 - https://www.bgreco.net/hsflash/002779.html
+Featured Tracks:
+- track:harleboss
 ---
 Flash: '[S] Strife!!!'
 Page: 918
 Date: November 27, 2009
-Tracks:
-- track:dissension-original
 URLs:
 - https://www.bgreco.net/hsflash/002818.html
+Featured Tracks:
+- track:dissension-original
 ---
 Flash: '[S] Rose: Fast forward to now.'
 Page: 938
 Date: December 1, 2009
-Tracks:
-- track:chorale-for-jaspers
 URLs:
 - https://www.bgreco.net/hsflash/002838.html
+Featured Tracks:
+- track:chorale-for-jaspers
 ---
 Flash: '[S] Ride.'
 Page: pony
 Date: December 1, 2009
-Tracks:
-- track:pony-chorale
 URLs:
 - https://youtu.be/USB1pj6hAjU
+Featured Tracks:
+- track:pony-chorale
 ---
 Flash: '[S] John: Examine your dad''s room.'
 Page: 948
 Date: December 3, 2009
-Tracks:
-- track:revelawesome
 URLs:
 - https://youtu.be/DNydoi_vFng
 - https://www.bgreco.net/hsflash/002848.html
+Featured Tracks:
+- track:revelawesome
 ---
 Flash: '[S] John: Mental breakdown.'
 Page: 979
 Date: December 6, 2009
-Tracks:
+Featured Tracks:
 - track:hardlyquin
 ---
 Flash: '[S] Jade: Retrieve package.'
 Page: 980
 Date: December 8, 2009
-Tracks:
-- An Unbreakable Union
-- track:carefree-victory
 URLs:
 - https://www.bgreco.net/hsflash/002880.html
+Featured Tracks:
+- An Unbreakable Union
+- track:carefree-victory
 ---
 Flash: '[S] Jade: Dream up extra arms and play advanced bass solo.'
 Page: 1026
 Date: December 18, 2009
-Tracks:
-- The Beginning of Something Really Excellent
 URLs:
 - https://youtu.be/71UlrQFkZJc
 - https://www.bgreco.net/hsflash/002926.html
+Featured Tracks:
+- The Beginning of Something Really Excellent
 ---
 Flash: '[S] Dave: Strife!'
 Page: 1070
 Date: December 24, 2009
-Tracks:
+Featured Tracks:
 - Versus
 ---
 Flash: '[S] Jade: Pester John.'
 Page: 1073
 Date: December 29, 2009
-Tracks:
-- track:ballad-of-awakening
 URLs:
 - https://youtu.be/WYF1aiE0fOc
 - https://www.bgreco.net/hsflash/002973.html
+Featured Tracks:
+- track:ballad-of-awakening
 ---
 Flash: '[S] Enter.'
 Page: 1149
 Date: January 14, 2010
-Tracks:
-- track:sburban-jungle
 URLs:
 - https://youtu.be/g2CBnn3d1cY
 - https://www.bgreco.net/hsflash/003049.html
+Featured Tracks:
+- track:sburban-jungle
 ---
-ACT: Intermission - Don't Bleed on the Suits.
 Color: '#22cc22'
 Anchor: i1
+Act: Intermission - Don't Bleed on the Suits.
 ---
 Flash: '[S][I] ==>'
 Page: 1267
 Date: January 29, 2010
-Tracks:
-- Three in the Morning
 URLs:
 - https://www.bgreco.net/hsflash/003167.html
+Featured Tracks:
+- Three in the Morning
 ---
-ACT: Act 4 - Flight of the Paradox Clones
 Color: '#b536da'
 Anchor: a4
+Act: Act 4 - Flight of the Paradox Clones
 ---
 Flash: '[S] ACT 4 ==>'
 Page: 1358
 Date: February 10, 2010
-Tracks:
-- track:doctor
 URLs:
 - https://www.bgreco.net/hsflash/003258.html
+Featured Tracks:
+- track:doctor
 ---
 Flash: '[S] ==>'
 Page: 1407
 Date: February 17, 2010
-Tracks:
-- track:endless-climb
 URLs:
 - https://youtu.be/iRHWm9R59mo
 - https://www.bgreco.net/hsflash/003307.html
+Featured Tracks:
+- track:endless-climb
 ---
 Flash: '[S] Dave: Accelerate.'
 Page: 1641
 Date: April 2, 2010
-Tracks:
-- track:atomyk-ebonpyre
 URLs:
 - https://youtu.be/kgddCGdUq9c
 - https://www.bgreco.net/hsflash/003541.html
+Featured Tracks:
+- track:atomyk-ebonpyre
 ---
 Flash: '[S] ==>'
 Page: 1656
 Date: April 3, 2010
-Tracks:
-- Bed of Rose's / Dreams of Derse
 URLs:
 - https://www.bgreco.net/hsflash/003556.html
+Featured Tracks:
+- Bed of Rose's / Dreams of Derse
 ---
 Flash: '[S] Jack: Ascend.'
 Page: 1668
 Date: April 13, 2010
-Tracks:
-- track:black
-- Descend
 URLs:
 - https://youtu.be/DaYBhbe0dns
 - https://www.bgreco.net/hsflash/003568.html
+Featured Tracks:
+- track:black
+- Descend
 ---
 Flash: '[S] Rose and Dave: Shut up and jam.'
 Page: 1720
 Date: April 22, 2010
-Tracks:
+Featured Tracks:
 - Unsheath'd
 - Welcome to the New Extreme
 - Octoroon Rangoon
@@ -441,28 +441,26 @@ Tracks:
 Flash: '[S] WV?: Rise up.'
 Page: 1801
 Date: May 5, 2010
-Tracks:
-- Skaian Skirmish
 URLs:
 - https://youtu.be/ehSFreQEq2A
 - https://www.bgreco.net/hsflash/003701.html
 Contributors:
 - Michael Firman (art)
 - Nic Carey (art)
+Featured Tracks:
+- Skaian Skirmish
 ---
 Flash: '[S] John: Reunite with your loving wife and daughter.'
 Page: 1931
 Date: May 26, 2010
-Tracks:
-- How Do I Live (Bunny Back in the Box Version)
 URLs:
 - https://youtu.be/7YqiHDf-agA
+Featured Tracks:
+- How Do I Live (Bunny Back in the Box Version)
 ---
 Flash: '[S] Descend.'
 Page: 1940
 Date: May 31, 2010
-Tracks:
-- Descend
 URLs:
 - https://youtu.be/paQXkYModNs
 - https://www.bgreco.net/hsflash/003840.html
@@ -477,24 +475,24 @@ Contributors:
 - Richard Gung (art)
 - Hanni Brosh (art)
 - Vivian Ng (art)
+Featured Tracks:
+- Descend
 ---
-ACT: 'Act 5 Act 1 - <span style="color: #008282">MOB1US DOUBL3 R34CH4ROUND</span>'
 Color: '#0000ff'
 Anchor: a5a1
+Act: 'Act 5 Act 1 - <span style="color: #008282">MOB1US DOUBL3 R34CH4ROUND</span>'
 ---
 Flash: '[S???] ======>'
 Page: 2070
 Date: June 22, 2010
-Tracks:
-- Showdown
 URLs:
 - https://www.homestuck.com/story/2070
+Featured Tracks:
+- Showdown
 ---
 Flash: '[S] Make her pay.'
 Page: 2578
 Date: September 8, 2010
-Tracks:
-- Crystamanthequins
 URLs:
 - https://youtu.be/raMHZCdgnnU
 - https://www.bgreco.net/hsflash/004478.html
@@ -515,39 +513,52 @@ Contributors:
 - Molly Gur (art)
 - Lauren Ross (art)
 - Vivian Ng (art)
+Featured Tracks:
+- Crystamanthequins
 ---
-ACT: 'Act 5 Act 2 - <span style="color: #2ed73a">He is already here.</span>'
 Color: '#ff0000'
 Anchor: a5a2
+Act: 'Act 5 Act 2 - <span style="color: #2ed73a">He is already here.</span>'
 ---
 Flash: '[S] ACT 5 ACT 2 ==>'
 Page: 2626
 Date: September 19, 2010
-Tracks:
-- Homestuck
 URLs:
 - https://youtu.be/zZIyQuHn0Ag
 - https://www.bgreco.net/hsflash/004526.html
+Featured Tracks:
+- Homestuck
 ---
 Flash: 'Vriska: What''s his deal????????'
 Page: 2672
 Date: September 26, 2010
-Tracks:
+Featured Tracks:
 - How Do I Live
 ---
 Flash: '[S] Vriska: Watch street tough maverick with nothing to lose'
 Page: 2787
 Date: October 19, 2010
-Tracks:
-- How Do I Live (Bunny Back in the Box Version)
 URLs:
 - https://youtu.be/MfRv4W0homw
 - https://www.bgreco.net/hsflash/004687.html
+Featured Tracks:
+- How Do I Live (Bunny Back in the Box Version)
 ---
 Flash: '[S] Past Karkat: Wake up.'
 Page: 2792
 Date: October 25, 2010
-Tracks:
+URLs:
+- https://www.bgreco.net/hsflash/004692.html
+Contributors:
+- Brett Muller (art)
+- Eyes5 (art)
+- Jessica Allison (art)
+- M. Thomas Harding (art)
+- Paige Turner (art)
+- Richard Gung (art)
+- Hanni Brosh (art)
+- Vivian Ng (art)
+Featured Tracks:
 - Karkat's Theme
 - Vriska's Theme
 - Terezi's Theme
@@ -563,29 +574,16 @@ Tracks:
 - Phrenic Phever
 - Walk-Stab-Walk (R&E)
 - Horschestra
-URLs:
-- https://www.bgreco.net/hsflash/004692.html
-Contributors:
-- Brett Muller (art)
-- Eyes5 (art)
-- Jessica Allison (art)
-- M. Thomas Harding (art)
-- Paige Turner (art)
-- Richard Gung (art)
-- Hanni Brosh (art)
-- Vivian Ng (art)
 ---
 Flash: 'Dave: Answer Gamzee.'
 Page: 2818
 Date: October 31, 2010
-Tracks:
+Featured Tracks:
 - track:miracles-icp
 ---
 Flash: '[S] Jade: Wake up.'
 Page: 2848
 Date: November 10, 2010
-Tracks:
-- Let the Squiddles Sleep (End Theme)
 URLs:
 - https://youtu.be/NUHzVVCnEVk
 Contributors:
@@ -599,12 +597,12 @@ Contributors:
 - Molly Gur (art)
 - Tavia Morra (art)
 - Vivian Ng (art)
+Featured Tracks:
+- Let the Squiddles Sleep (End Theme)
 ---
 Flash: '[S] Jade: Enter.'
 Page: 2927
 Date: November 28, 2010
-Tracks:
-- Umbral Ultimatum
 URLs:
 - https://youtu.be/BeeVidHB8-I
 - https://www.bgreco.net/hsflash/004827.html
@@ -618,30 +616,29 @@ Contributors:
 - Hanni Brosh (art)
 - Lauren Ross (art)
 - Vivian Ng (art)
+Featured Tracks:
+- Umbral Ultimatum
 ---
 Flash: '[S] ==>'
 Page: 2988
 Date: December 4, 2010
-Tracks:
-- track:frost-vol6
 URLs:
 - https://youtu.be/roCH-7IQjj0
 - https://www.bgreco.net/hsflash/004888.html
+Featured Tracks:
+- track:frost-vol6
 ---
 Flash: '[S] Jade: STRIFE!!!!!!!!!!!!'
 Page: 3001
 Date: December 6, 2010
-Tracks:
-- Sunslammer
 URLs:
 - https://www.bgreco.net/hsflash/004901.html
+Featured Tracks:
+- Sunslammer
 ---
 Flash: '[S] John: Enter village.'
 Page: 3079
 Date: December 15, 2010
-Tracks:
-- Planet Healer
-- Typheus
 URLs:
 - https://www.bgreco.net/hsflash/004979.html
 Contributors:
@@ -653,36 +650,33 @@ Contributors:
 - Hanni Brosh (art)
 - Lauren Ross (art)
 - Vivian Ng (art)
+Featured Tracks:
+- Planet Healer
+- Typheus
 ---
 Flash: '[S] JOHN. RISE UP.'
 Page: 3087
 Date: December 16, 2010
-Tracks:
-- Savior of the Waking World
 URLs:
 - https://youtu.be/jYCa-ByMNsA
 - https://www.bgreco.net/hsflash/004987.html
 Contributors:
 - Lexxy (art)
+Featured Tracks:
+- Savior of the Waking World
 ---
 Flash: '[S] Wake.'
 Page: 3297
 Date: January 15, 2011
-Tracks:
-- track:MeGaLoVania
 URLs:
 - https://youtu.be/cIqYNGZokFY
 - https://www.bgreco.net/hsflash/005197.html
+Featured Tracks:
+- track:MeGaLoVania
 ---
 Flash: '[S] Kanaya: Return to the core.'
 Page: 3321
 Date: January 22, 2011
-Tracks:
-- Darling Kanaya
-- Karkat's Theme
-- Eridan's Theme
-- Nautical Nightmare
-- Heir Conditioning
 URLs:
 - https://www.bgreco.net/hsflash/005221.html
 Contributors:
@@ -696,16 +690,16 @@ Contributors:
 - Hanni Brosh (art)
 - Lauren Ross (art)
 - Vivian Ng (art)
+Featured Tracks:
+- Darling Kanaya
+- Karkat's Theme
+- Eridan's Theme
+- Nautical Nightmare
+- Heir Conditioning
 ---
 Flash: '[S] Equius: Seek the highb100d.'
 Page: 3438
 Date: February 6, 2011
-Tracks:
-- Horschestra STRONG Version
-- Nepeta's Theme
-- Blackest Heart (With Honks)
-- Midnight Calliope
-- track:miracles-icp
 URLs:
 - https://www.bgreco.net/hsflash/005338.html
 Contributors:
@@ -719,12 +713,16 @@ Contributors:
 - Hanni Brosh (art)
 - Lauren Ross (art)
 - Vivian Ng (art)
+Featured Tracks:
+- Horschestra STRONG Version
+- Nepeta's Theme
+- Blackest Heart (With Honks)
+- Midnight Calliope
+- track:miracles-icp
 ---
 Flash: '[S] 3x SHOWDOWN COMBO.'
 Page: 3520
 Date: February 16, 2011
-Tracks:
-- Trollian Standoff
 URLs:
 - https://youtu.be/VEA60fK1bk8
 - https://www.bgreco.net/hsflash/005420.html
@@ -734,21 +732,21 @@ Contributors:
 - Nic Carey (art)
 - Molly Gur (art)
 - Vivian Ng (art)
+Featured Tracks:
+- Trollian Standoff
 ---
 Flash: '[S] All: Behold glory of Zillyhoo.'
 Page: 3679
 Date: March 23, 2011
-Tracks:
-- Warhammer of Zillyhoo
 URLs:
 - https://youtu.be/LB2wi2EYSbw
 - https://www.bgreco.net/hsflash/005579.html
+Featured Tracks:
+- Warhammer of Zillyhoo
 ---
 Flash: '[S] Seer: Descend.'
 Page: 3695
 Date: March 30, 2011
-Tracks:
-- Black Rose / Green Sun
 URLs:
 - https://www.bgreco.net/hsflash/005595.html
 Contributors:
@@ -759,43 +757,43 @@ Contributors:
 - Hanni Brosh (art)
 - Lauren Ross (art)
 - Vivian Ng (art)
+Featured Tracks:
+- Black Rose / Green Sun
 ---
 Flash: '[S] ==>'
 Page: 3696
 Date: April 2, 2011
-Tracks:
-- At The Price of Oblivion
 URLs:
 - https://www.bgreco.net/hsflash/005596.html
 Contributors:
 - Lexxy (art)
+Featured Tracks:
+- At The Price of Oblivion
 ---
 Flash: '[S] Terezi: Read note.'
 Page: 3718
 Date: April 17, 2011
-Tracks:
-- Secret ROM
 URLs:
 - https://www.bgreco.net/hsflash/005618.html
+Featured Tracks:
+- Secret ROM
 ---
 Flash: '[S] Terezi: Play records.'
 Page: 3725
 Date: April 19, 2011
-Tracks:
+URLs:
+- https://www.bgreco.net/hsflash/005625.html
+Featured Tracks:
 - Trollcops
 - Havoc To Be Wrought
 - Rumble at the Rink
 - Unlabeled
 - XROM
 - I'm a Member of the Midnight Crew
-URLs:
-- https://www.bgreco.net/hsflash/005625.html
 ---
 Flash: '[S] Seer: Ascend.'
 Page: 3744
 Date: April 30, 2011
-Tracks:
-- Terezi Owns
 URLs:
 - https://youtu.be/n-hCXQPW_do
 - https://www.bgreco.net/hsflash/005644.html
@@ -809,38 +807,38 @@ Contributors:
 - Molly Gur (art)
 - Lauren Ross (art)
 - Vivian Ng (art)
+Featured Tracks:
+- Terezi Owns
 ---
 Flash: '[S] Flip.'
 Page: 3760
 Date: May 15, 2011
-Tracks:
-- 'BL1ND JUST1C3 : 1NV3ST1G4T1ON !!'
 URLs:
 - https://youtu.be/8RC_02KeBrE
+Featured Tracks:
+- 'BL1ND JUST1C3 : 1NV3ST1G4T1ON !!'
 ---
 Flash: '[S][o] ==>'
 Page: 3952
 Date: August 15, 2011
-Tracks:
+Featured Tracks:
 - Typheus
 ---
 Flash: '[S] Attempt rare and highly dangerous 5x SHOWDOWN COMBO.'
 Page: 4085
 Date: August 22, 2011
-Tracks:
-- The Carnival
 URLs:
 - https://youtu.be/V-ePGeiKr_k
 - https://www.bgreco.net/hsflash/005985.html
 Contributors:
 - Vivian Ng (art)
 - Lazylaz (art)
+Featured Tracks:
+- The Carnival
 ---
 Flash: '[S] Cascade.'
 Page: 4109
 Date: October 25, 2011
-Tracks:
-- Cascade
 URLs:
 - https://youtu.be/FDt-SLyEcjI
 - https://www.bgreco.net/hsflash/006009.html
@@ -861,218 +859,214 @@ Contributors:
 - Tavia Morra (art)
 - Vivian Ng (art)
 - Xamag (art)
+Featured Tracks:
+- Cascade
 ---
-ACT: Intermission 2 - The Man in the Cairo Overcoat.
 Color: '#22cc22'
 Anchor: a2
+Act: Intermission 2 - The Man in the Cairo Overcoat.
 ---
 Flash: '[S] Begin intermission 2.'
 Page: 4111
 Date: October 31, 2011
-Tracks:
-- English
 URLs:
 - https://youtu.be/Bc0DAfQuFNQ
 - https://www.bgreco.net/hsflash/006011.html
+Featured Tracks:
+- English
 ---
-ACT: Act 6 Act 1 - Through Broken Glass
 Color: '#7799ff'
 Anchor: a6a1
 Jump: Side 2 (Acts 6-7)
 Jump Color: '#1076a2'
+Act: Act 6 Act 1 - Through Broken Glass
 ---
 Flash: '[S] ACT 6'
 Page: 4113
 Date: November 11, 2011
-Tracks:
-- Homestuck Anthem
 URLs:
 - https://youtu.be/htBxlE2hKok
 - https://www.bgreco.net/hsflash/006013.html
+Featured Tracks:
+- Homestuck Anthem
 ---
 Flash: '[S] ==>'
 Page: 4275
 Date: December 7, 2011
-Tracks:
+Featured Tracks:
 - Goat Foley
 ---
 Flash: '[S] Jane: Get mail.'
 Page: 4282
 Date: December 9, 2011
-Tracks:
+Featured Tracks:
 - Windchime Foley
 ---
-ACT: Act 6 Intermission 1 - corpse party
 Color: '#a10000'
 Anchor: a6i1
+Act: Act 6 Intermission 1 - corpse party
 ---
 Flash: '[S][A6I1] Karkat: Mental breakdown.'
 Page: 4373
 Date: December 23, 2011
-Tracks:
-- Frustracean
 URLs:
 - https://www.bgreco.net/hsflash/006273.html
+Featured Tracks:
+- Frustracean
 ---
 Flash: '[S] END OF ACT 6 INTERMISSION 1'
 Page: 4390
 Date: December 29, 2011
-Tracks:
-- Infinity Mechanism
 URLs:
 - https://youtu.be/kwuo1yH5DHg
 - https://www.bgreco.net/hsflash/006290.html
+Featured Tracks:
+- Infinity Mechanism
 ---
-ACT: Act 6 Act 2 - Your shit is wrecked.
 Color: '#f2a400'
 Anchor: a6a2
+Act: Act 6 Act 2 - Your shit is wrecked.
 ---
 Flash: '[S] Roxy: Sleepwalk.'
 Page: 4486
 Date: January 21, 2011
-Tracks:
-- Even in Death
 URLs:
 - https://youtu.be/1ZYAcoEQ0dA
 - https://www.bgreco.net/hsflash/006386.html
+Featured Tracks:
+- Even in Death
 ---
 Flash: '[S] RAP-OFF!!!!!!!!!!'
 Page: 4541
 Date: February 4, 2012
-Tracks:
+Featured Tracks:
 - Anbroids
 ---
 Flash: '[S] Prince of Heart: Rise up.'
 Page: 4572
 Date: February 16, 2012
-Tracks:
-- Time on My Side
 URLs:
 - https://youtu.be/PVO0FXYAfKw
 - https://www.bgreco.net/hsflash/006472.html
+Featured Tracks:
+- Time on My Side
 ---
 Flash: '[S] Frigglish: Fast forward to Jaspersprite.'
 Page: 4617
 Date: February 26, 2012
-Tracks:
+Featured Tracks:
 - track:chorale-for-jaspers
 ---
 Flash: '[S] Ride.'
 Page: pony2
 Date: February 26, 2012
-Tracks:
-- track:pony-chorale
 URLs:
 - https://youtu.be/vHSyoThUyOQ
+Featured Tracks:
+- track:pony-chorale
 ---
 Flash: '[S] Jane: Enter.'
 Page: 4665
 Date: March 8, 2012
-Tracks:
-- Another Jungle
-- A Taste for Adventure
 URLs:
 - https://youtu.be/cbg-wxqtgUo
 - https://www.bgreco.net/hsflash/006565.html
+Featured Tracks:
+- Another Jungle
+- A Taste for Adventure
 ---
-ACT: Act 6 Intermission 2 - penis ouija
 Color: '#e00707'
 Anchor: a6a2
+Act: Act 6 Intermission 2 - penis ouija
 ---
 Flash: '[S][A6I2] ???'
 Page: 4815
 Date: April 3, 2012
-Tracks:
+Featured Tracks:
 - weird moody horse shit
 ---
-ACT: Act 6 Act 3 - Nobles
 Color: '#8899cc'
 Anchor: a6a3
+Act: Act 6 Act 3 - Nobles
 ---
 Flash: '[S] ACT 6 ACT 3'
 Page: 4820
 Date: April 14, 2012
-Tracks:
-- Rain
 URLs:
 - https://www.bgreco.net/hsflash/006720.html
+Featured Tracks:
+- Rain
 ---
 Flash: '[S] Jane: Proceed.'
 Page: 4825
 Date: April 16, 2012
-Tracks:
-- Ruins (With Strings)
 URLs:
 - https://www.bgreco.net/hsflash/006725.html
+Featured Tracks:
+- Ruins (With Strings)
 ---
 Flash: '[S] Jane: Cautiously approach.'
 Page: 4827
 Date: April 17, 2012
-Tracks:
-- Elevatorstuck
 URLs:
 - https://www.bgreco.net/hsflash/006727.html
+Featured Tracks:
+- Elevatorstuck
 ---
 Flash: '[S] DD: Ascend.'
 Page: 4942
 Date: May 17, 2012
-Tracks:
+Featured Tracks:
 - track:black
 ---
 Flash: '[S] DD: Ascend more casually.'
 Page: 4944
 Date: May 17, 2012
-Tracks:
-- I'm a Member of the Midnight Crew (Acapella)
 URLs:
 - https://youtu.be/owe03uIkhFo
+Featured Tracks:
+- I'm a Member of the Midnight Crew (Acapella)
 ---
 Flash: '[S] Terry: Fast forward to Liv.'
 Page: 5027
 Date: June 12, 2012
-Tracks:
+Featured Tracks:
 - track:i-dont-want-to-miss-a-thing
 ---
 Flash: '[S] Dirk: Synchronize.'
 Page: 5238
 Date: July 9, 2012
-Tracks:
-- Unite Synchronization
 URLs:
 - https://youtu.be/GZ0PkXNtUhU
 - https://www.bgreco.net/hsflash/007138.html
+Featured Tracks:
+- Unite Synchronization
 ---
 Flash: '[S] Dirk: Unite.'
 Page: 5252
 Date: July 9, 2012
-Tracks:
-- Unite Synchronization
 URLs:
 - https://youtu.be/U9uFkc3N4JQ
 - https://www.bgreco.net/hsflash/007152.html
+Featured Tracks:
+- Unite Synchronization
 ---
 Flash: '[S] Caliborn: Enter.'
 Page: 5261
 Date: July 28, 2012
-Tracks:
-- Eternity Served Cold
 URLs:
 - https://youtu.be/L4QUXZTKgfo
 - https://www.bgreco.net/hsflash/007161.html
+Featured Tracks:
+- Eternity Served Cold
 ---
-ACT: Act 6 Intermission 3 - Ballet of the Dancestors
 Color: '#b536da'
 Anchor: a6i3
+Act: Act 6 Intermission 3 - Ballet of the Dancestors
 ---
 Flash: '[S] ACT 6 INTERMISSION 3'
 Page: 5263
 Date: August 31, 2012
-Tracks:
-- Fuchsia Ruler
-- Darling Dolorosa
-- GameGlr
-- Iron Infidel
-- Elevatorstuck
 URLs:
 - https://www.bgreco.net/hsflash/007163.html
 Contributors:
@@ -1086,11 +1080,21 @@ Contributors:
 - Vivian Ng (art)
 - Xamag (art)
 - Tanney Liu (art)
+Featured Tracks:
+- Fuchsia Ruler
+- Darling Dolorosa
+- GameGlr
+- Iron Infidel
+- Elevatorstuck
 ---
 Flash: '[S][A6I3] ==>'
 Page: 5308
 Date: September 24, 2012
-Tracks:
+URLs:
+- https://www.bgreco.net/hsflash/007208.html
+Contributors:
+- <i>See [[flash:5263]].</i>
+Featured Tracks:
 - Hate You
 - G4M38L0RG
 - Olive Rogue
@@ -1098,45 +1102,45 @@ Tracks:
 - Purple Bard
 - Teal Seer
 - Crab Waltz
-URLs:
-- https://www.bgreco.net/hsflash/007208.html
-Contributors:
-- <i>See [[flash:5263]].</i>
 ---
 Flash: '[S][A6I3] ==>'
 Page: 5373
 Date: October 9, 2012
-Tracks:
+Featured Tracks:
 - weird moody horse shit
 ---
 Flash: '[S][A6I3] ==>'
 Page: 5374
 Date: October 9, 2012
-Tracks:
+Featured Tracks:
 - weird moody horse shit
 ---
 Flash: '[S][A6I3] ==>'
 Page: 5375
 Date: October 9, 2012
-Tracks:
+Featured Tracks:
 - weird moody horse shit
 ---
 Flash: '[S][A6I3] ==>'
 Page: 5376
 Date: October 11, 2012
-Tracks:
+Featured Tracks:
 - weird moody horse shit
 ---
 Flash: '[S][A6I3] ==>'
 Page: 5377
 Date: October 11, 2012
-Tracks:
+Featured Tracks:
 - weird moody horse shit
 ---
 Flash: '[S][A6I3] ==>'
 Page: 5398
 Date: October 22, 2012
-Tracks:
+URLs:
+- https://www.bgreco.net/hsflash/007298.html
+Contributors:
+- <i>See [[flash:5263]].</i>
+Featured Tracks:
 - 108 Stars of Density
 - The Brave and the Bronze
 - Jade Sylph
@@ -1145,265 +1149,259 @@ Tracks:
 - Orchid Horror
 - Davesprite
 - iRRRRRRRRECONCILA8LE
-URLs:
-- https://www.bgreco.net/hsflash/007298.html
-Contributors:
-- <i>See [[flash:5263]].</i>
 ---
 Flash: '[S][A6I3] ==>'
 Page: 5426
 Date: October 27, 2012
-Jiff: Yeah
+Cover Art File Extension: Yeah
 ---
 Flash: '[S][A6I3] MINISTRIFE!!!'
 Page: 5427
 Date: November 3, 2012
-Tracks:
-- Killed by BR8K Spider!!!!!!!!
 URLs:
 - https://www.bgreco.net/hsflash/007327.html
 Contributors:
 - 'Feastings (art: character sprites)'
 - 'Scarodactyl (art: background sprites)'
 - 'Shelby Cragg (art: last panel)'
+Featured Tracks:
+- Killed by BR8K Spider!!!!!!!!
 ---
-ACT: Act 6 Act 4 - Void
 Color: '#cccccc'
 Anchor: a6a4
+Act: Act 6 Act 4 - Void
 ---
 Flash: '[S] ACT 6 ACT 4'
 Page: 5438
 Date: November 12, 2012
-Tracks:
-- Even in Death (T'Morra's Belly Mix)
 URLs:
 - https://youtu.be/mF3mNn7FPwU
 - https://www.bgreco.net/hsflash/007338.html
+Featured Tracks:
+- Even in Death (T'Morra's Belly Mix)
 ---
 Flash: '[S] ==>'
 Page: 5440
 Date: November 14, 2012
-Tracks:
+Featured Tracks:
 - English
 ---
-ACT: Act 6 Intermission 4 - Dead
 Color: '#777777'
 Anchor: a6i4
+Act: Act 6 Intermission 4 - Dead
 ---
 Flash: '[S][A6I4] ==>'
 Page: 5471
 Date: November 18, 2012
-Tracks:
+Featured Tracks:
 - Elevatorstuck
 ---
 Flash: '[S][A6I4] ==>'
 Page: 5472
 Date: November 19, 2012
-Tracks:
+Featured Tracks:
 - Elevatorstuck
 ---
 Flash: '[S][A6I4] ==>'
 Page: 5473
 Date: November 19, 2012
-Tracks:
+Featured Tracks:
 - Elevatorstuck
 ---
 Flash: '[S][A6I4] ==>'
 Page: 5474
 Date: November 19, 2012
-Tracks:
+Featured Tracks:
 - Elevatorstuck
 ---
 Flash: '[S][A6I4] ==>'
 Page: 5485
 Date: November 21, 2012
-Tracks:
+Featured Tracks:
 - Elevatorstuck
 ---
 Flash: '[S!][A6I4] ==>'
 Page: 5494
 Date: November 25, 2012
-Tracks:
+Featured Tracks:
 - Elevatorstuck
 ---
 Flash: '[!!!][A6I4] ==>'
 Page: 5495
 Date: November 25, 2012
-Tracks:
+Featured Tracks:
 - Elevatorstuck
 ---
-ACT: Act 6 Act 5 - Of Gods and Tricksters
 Color: '#ffee00'
 Anchor: a6a5
+Act: Act 6 Act 5 - Of Gods and Tricksters
 ---
 Flash: '[S] ACT 6 ACT 5'
 Page: 5512
 Date: November 28, 2012
-Tracks:
-- A Taste for Adventure
 URLs:
 - https://youtu.be/ShIvL8SLC7c
 - https://www.bgreco.net/hsflash/007412.html
+Featured Tracks:
+- A Taste for Adventure
 ---
 Flash: '[S] Ride.'
 Page: 5655
 Date: December 26, 2012
-Tracks:
-- Horschestra STRONG Version
 URLs:
 - https://youtu.be/z48Ssmhu3vg
 - https://www.bgreco.net/hsflash/007555.html
+Featured Tracks:
+- Horschestra STRONG Version
 ---
 Flash: '[S] Jane: Engage.'
 Page: 5711
 Date: January 9, 2013
-Tracks:
-- Trickster Mode (Engage)
 URLs:
 - https://youtu.be/5O0OZQ3BuTQ
 - https://www.bgreco.net/hsflash/008131.html
+Featured Tracks:
+- Trickster Mode (Engage)
 ---
 Flash: '[S] Jane: Blast off.'
 Page: 5712
 Date: January 10, 2013
-Tracks:
-- Trickster Mode (Blast Off)
 URLs:
 - https://youtu.be/tPo5q6985uE
+Featured Tracks:
+- Trickster Mode (Blast Off)
 ---
 Flash: '[S] ACT 6 ACT 5 ACT 2'
 Page: 5714
 Date: January 11, 2013
-Tracks:
+Featured Tracks:
 - Kazoostuck
 ---
 Flash: '[S] ==>'
 Page: 5726
 Date: January 13, 2013
-Tracks:
+Featured Tracks:
 - Trickster Mode (Engage)
 ---
 Flash: '[S] ==>'
 Page: 5740
 Date: January 17, 2013
-Tracks:
+Featured Tracks:
 - Trickster Mode (Engage)
 ---
 Flash: '[S] ==>'
 Page: 5759
 Date: January 23, 2013
-Tracks:
+Featured Tracks:
 - Trickster Mode (Engage)
 ---
 Flash: '[S] Tricksters: Alchemize.'
 Page: 5763
 Date: January 24, 2013
-Tracks:
+Featured Tracks:
 - A Very Trickster Mode Christmas
 ---
 Flash: '[S] ==>'
 Page: 5764
 Date: January 25, 2013
-Tracks:
+Featured Tracks:
 - Warhammer of Zillyhoo (With Mario Paint)
 ---
 Flash: '[S] WHEEEEEEEEEEE!'
 Page: 5776
 Date: January 26, 2013
-Tracks:
+Featured Tracks:
 - A Very Trickster Mode Christmas (WHEEEEEEEEEEE!)
 ---
 Flash: '[S] HA HA HA! HE HE HE! HO HO HO!'
 Page: 5777
 Date: January 26, 2013
-Tracks:
+Featured Tracks:
 - A Very Trickster Mode Christmas (With Fancy Santas)
 ---
-ACT: 'Act 6 Intermission 5 - <span style="color: #929292">I''M PUTTING YOU ON SPEAKER
-    CRAB.</span>'
 Color: '#77ff88'
 Anchor: a6i5
+Act: 'Act 6 Intermission 5 - <span style="color: #929292">I''M PUTTING YOU ON SPEAKER
+    CRAB.</span>'
 ---
 Flash: '[S][A6I5] BEGIN INTERFISHIN'
 Page: 5981
 Date: March 10, 2013
-Tracks:
-- Elevatorstuck
 URLs:
 - https://youtu.be/fT0SLVNdvF8
+Featured Tracks:
+- Elevatorstuck
 ---
 Flash: '[S][A6I5] ==>'
 Page: 5997
 Date: March 14, 2013
-Tracks:
+Featured Tracks:
 - Yaldabaoth
 ---
 Flash: '[S][A6I5] END OF ACT 6 INTERMISSION 5 INTERMISSION 4'
 Page: 6066
 Date: April 1, 2013
-Tracks:
+Featured Tracks:
 - Blackest Heart (With Honks)
 ---
 Flash: '[S][A6I5] ==>'
 Page: 6231
 Date: April 13, 2013
-Tracks:
-- A Taste for Adventure
 URLs:
 - https://youtu.be/oReLrD9WrA8
+Featured Tracks:
+- A Taste for Adventure
 ---
-ACT: Act 6 Act 6 Act 1 - HOMOSUCK
 Color: '#2ed73a'
 Anchor: a6a6a1
+Act: Act 6 Act 6 Act 1 - HOMOSUCK
 ---
 Flash: '[S] ACT 6 ACT 6'
 Page: 6243
 Date: June 12, 2013
-Tracks:
-- Homosuck Anthem
 URLs:
 - https://youtu.be/PTYc67Cp6oE
+Featured Tracks:
+- Homosuck Anthem
 ---
-ACT: Act 6 Act 6 Intermission 1 - Stardust
 Color: '#dddddd'
 Anchor: a6a6i1
+Act: Act 6 Act 6 Intermission 1 - Stardust
 ---
 Flash: '[S] ACT 6 ACT 6 INTERMISSION 1'
 Page: 6278
 Date: June 14, 2013
-Tracks:
-- Gold Pilot
 URLs:
 - https://youtu.be/j-wdUF0ofts
 - https://www.bgreco.net/hsflash/008178.html
+Featured Tracks:
+- Gold Pilot
 ---
 Flash: '[S][A6A6I1] ====>'
 Page: 6400
 Date: August 7, 2013
-Tracks:
-- Elevatorstuck
 URLs:
 - https://www.bgreco.net/hsflash/008300.html
+Featured Tracks:
+- Elevatorstuck
 ---
-ACT: Act 6 Act 6 Intermission 2 - theres problems
 Color: '#e00707'
 Anchor: a6a6i2
+Act: Act 6 Act 6 Intermission 2 - theres problems
 ---
 Flash: '[S][A6A6I2] ====>'
 Page: 6552
 Date: September 3, 2013
-Tracks:
+Featured Tracks:
 - Fuchsia Ruler
 ---
-ACT: Act 6 Act 6 Intermission 3 - GAME OVER
 Color: '#dddddd'
 Anchor: a6a6i3
+Act: Act 6 Act 6 Intermission 3 - GAME OVER
 ---
 Flash: '[S] GAME OVER.'
 Page: 6901
 Date: October 25, 2014
-Tracks:
-- Carne Vale
 URLs:
 - https://youtu.be/5IDKxUEiuyc
 - https://www.bgreco.net/hsflash/GAMEOVER.html
@@ -1414,66 +1412,66 @@ Contributors:
 - Rennie Kingsley (art)
 - Zack Morrison (art)
 - J.N. Wiedle (art)
+Featured Tracks:
+- Carne Vale
 ---
-ACT: 'Act 6 Act 6 Intermission 4 - <span style="color: #008282">F1X TH1S</span>'
 Color: '#4466ff'
 Anchor: a6a6i4
+Act: 'Act 6 Act 6 Intermission 4 - <span style="color: #008282">F1X TH1S</span>'
 ---
 Flash: '[S][A6A6I4] ====>'
 Page: 7086
 Date: November 24, 2014
-Tracks:
+Featured Tracks:
 - Typheus (Glitched)
 ---
 Flash: '[S][A6A6I4] ====>'
 Page: 7098
 Date: November 28, 2014
-Tracks:
-- Pipeorgankind
 URLs:
 - https://youtu.be/Xdn70gnBw2w
 - https://www.bgreco.net/hsflash/008998.html
+Featured Tracks:
+- Pipeorgankind
 ---
 Flash: '[S][A6A6I4] ====>'
 Page: 7101
 Date: December 1, 2014
-Tracks:
+Featured Tracks:
 - Elevatorstuck, with Meows
 ---
 Flash: '[S][A6A6I4] ====>'
 Page: 7405
 Date: January 19, 2015
-Tracks:
+Featured Tracks:
 - not a creature was stirring
 ---
-ACT: Act 6 Act 6 Act 5 - MASTERPIECE
 Color: '#55ff00'
 Anchor: a6a6a5
+Act: Act 6 Act 6 Act 5 - MASTERPIECE
 ---
 Flash: '[S] ACT 6 ACT 6 ACT 5'
 Page: 7409
 Date: April 13, 2015
-Tracks:
+Featured Tracks:
 - Homosuck Swan Song
 ---
 Flash: '[S] MSPA Reader: Mental breakdown.'
 Page: 7448
 Date: April 22, 2015
-Tracks:
-- Hello Zepp
 URLs:
 - https://youtu.be/v3PIyyIr2pQ
 - https://www.bgreco.net/hsflash/009348.html
+Featured Tracks:
+- Hello Zepp
 ---
-ACT: 'Act 6 Act 6 Intermission 5 - <span style="color: #1076a2">She''s 8ack</span>'
 Color: '#00ffff'
 Anchor: a6a6i5
+Act: 'Act 6 Act 6 Intermission 5 - <span style="color: #1076a2">She''s 8ack</span>'
 ---
 Flash: '[S] ACT 6 ACT 6 INTERMISSION 5'
 Page: 7449
 Date: April 26, 2015
-Tracks:
-- Moonsetter
 URLs:
 - https://youtu.be/BzxRi-HWDLc
 - https://www.bgreco.net/hsflash/009349.html
@@ -1483,30 +1481,30 @@ Contributors:
 - Ikimaru (art)
 - Rennie Kingsley (art)
 - J.N. Wiedle (art)
+Featured Tracks:
+- Moonsetter
 ---
 Flash: '[S][A6A6I5] ====>'
 Page: 7635
 Date: June 3, 2015
-Tracks:
-- Echidna
 Contributors:
 - Rah-Bop (art)
+Featured Tracks:
+- Echidna
 ---
 Flash: '[S][A6A6I5] ====>'
 Page: 7928
 Date: July 23, 2015
-Tracks:
-- Horsecatska
 URLs:
 - https://youtu.be/9G-2714Ht9Q
 Contributors:
 - ipgd (art)
+Featured Tracks:
+- Horsecatska
 ---
 Flash: '[S] Terezi: Remem8er.'
 Page: 7959
 Date: July 27, 2015
-Tracks:
-- Do You Remem8er Me
 URLs:
 - https://youtu.be/3pLgxneqLgk
 Contributors:
@@ -1515,19 +1513,16 @@ Contributors:
 - Angela Sham (art)
 - Shelby Cragg (art)
 - Rah-Bop (art)
+Featured Tracks:
+- Do You Remem8er Me
 ---
-ACT: 'Act 6 Act 6 Act 6 - <span style="color: #ff0000">Collide.</span>'
 Color: '#ee1100'
 Anchor: a6a6a6
+Act: 'Act 6 Act 6 Act 6 - <span style="color: #ff0000">Collide.</span>'
 ---
 Flash: '[S] Collide.'
 Page: 8087
 Date: April 6, 2016
-Tracks:
-- Creata (Canon Edit)
-- Oppa Toby Style
-- Eternity, Served Cold (Canon Edit)
-- Heir of Grief
 URLs:
 - https://youtu.be/Y5wYN6rB_Rg
 Contributors:
@@ -1550,43 +1545,48 @@ Contributors:
 - ToastyGlow (art)
 - Vivian Ng (art)
 - Xamag (art)
+Featured Tracks:
+- Creata (Canon Edit)
+- Oppa Toby Style
+- Eternity, Served Cold (Canon Edit)
+- Heir of Grief
 ---
-ACT: 'Act 7 - <span style="color: #c7ff43">The Rapture</span><br><i>&amp; Post Canon</i>'
 Color: '#dddddd'
 Anchor: a7
+Act: 'Act 7 - <span style="color: #c7ff43">The Rapture</span><br><i>&amp; Post Canon</i>'
 ---
 Flash: '[S] ACT 7'
 Page: 8127
 Date: April 13, 2016
-Tracks:
-- Overture (Canon Edit)
 URLs:
 - https://youtu.be/FevMNMwvdPw
 Contributors:
 - Angela Sham
 - Ani Roschier
 - Jeffrey Lai
+Featured Tracks:
+- Overture (Canon Edit)
 ---
 Flash: '[S] ==>'
 Page: 8129
 Date: October 25, 2016
-Tracks:
+Featured Tracks:
 - Windchime Foley
 ---
 Flash: '[S] ==>'
 Page: 8130
 Date: October 25, 2016
-Tracks:
-- Ascend
 Contributors:
 - Adrienne Garcia
 URLs:
 - https://youtu.be/rMZU89jY2j8
+Featured Tracks:
+- Ascend
 ---
-ACT: Hiveswap
 Color: '#33cc77'
 Anchor: hiveswap
 Jump: Hiveswap
+Act: Hiveswap
 ---
 Flash: Hiveswap Act 1
 Directory: hiveswap-act1
@@ -1649,7 +1649,7 @@ Contributors:
 - ToastyGlow (animation)
 - Toby Fox (music)
 - Tom Hunt (engineering)
-Tracks:
+Featured Tracks:
 - Definitely Safe Forever
 - Snake Escape
 - Joey Claire, Extraordinaire
@@ -1736,7 +1736,7 @@ Contributors:
 - What Pumpkin Games (marketing)
 - Xamag (environment art)
 - Yamigoye (animation, animation cleanup)
-Tracks:
+Featured Tracks:
 - On-Time Departure
 - Lunch Break
 - DRONE
@@ -1770,10 +1770,10 @@ Tracks:
 - Ghost Train
 - Fight of the Bumblebee
 ---
-ACT: Hiveswap Friendsim
 Color: '#d3ff8f'
 Anchor: friendsim
 Jump: Hiveswap Friendsim
+Act: Hiveswap Friendsim
 ---
 Flash: Of Bloodthurst and Bratwurst
 Contributors:
@@ -1783,7 +1783,7 @@ Contributors:
 - David Turnbull (programming)
 Directory: fs-vol1
 Date: April 13, 2018
-Tracks:
+Featured Tracks:
 - Breeding Duties
 - Moonshine
 ---
@@ -1796,7 +1796,7 @@ Contributors:
 - David Turnbull (programming)
 Directory: fs-vol2
 Date: April 27, 2018
-Tracks:
+Featured Tracks:
 - ARTCHOP (APPARENTLY)
 - track:moist
 ---
@@ -1808,7 +1808,7 @@ Contributors:
 - David Turnbull (programming)
 Directory: fs-vol3
 Date: May 11, 2018
-Tracks:
+Featured Tracks:
 - Dapper Dueling
 - Phantasmagoric Waltz
 ---
@@ -1820,7 +1820,7 @@ Contributors:
 - David Turnbull (programming)
 Directory: fs-vol4
 Date: May 25, 2018
-Tracks:
+Featured Tracks:
 - Call me Gor-Gor
 - Thip of the Tongue
 ---
@@ -1832,7 +1832,7 @@ Contributors:
 - David Turnbull (programming)
 Directory: fs-vol5
 Date: June 8, 2018
-Tracks:
+Featured Tracks:
 - Coursing
 - Hollow Suit
 ---
@@ -1844,7 +1844,7 @@ Contributors:
 - Mint Chipleaf (programming)
 Directory: fs-vol6
 Date: June 22, 2018
-Tracks:
+Featured Tracks:
 - Superego
 - track:tfw-another-james-roach-track
 ---
@@ -1856,7 +1856,7 @@ Contributors:
 - David Turnbull (programming)
 Directory: fs-vol7
 Date: July 6, 2018
-Tracks:
+Featured Tracks:
 - track:piwates
 - Olive Scribe
 ---
@@ -1868,7 +1868,7 @@ Contributors:
 - Mint Chipleaf (programming)
 Directory: fs-vol8
 Date: July 20, 2018
-Tracks:
+Featured Tracks:
 - Single Female Lawyer
 - it be like that sometimes
 ---
@@ -1880,7 +1880,7 @@ Contributors:
 - Mint Chipleaf (programming)
 Directory: fs-vol9
 Date: August 3, 2018
-Tracks:
+Featured Tracks:
 - DaJam
 - take me to clown church
 ---
@@ -1894,7 +1894,7 @@ Contributors:
 - 'Angela Sham (art: backgrounds)'
 Directory: fs-vol10
 Date: August 17, 2018
-Tracks:
+Featured Tracks:
 - beekeeper who? i dont know her.
 - ASSAULT
 ---
@@ -1907,7 +1907,7 @@ Contributors:
 - Mint Chipleaf (programming)
 Directory: fs-vol11
 Date: August 31, 2018
-Tracks:
+Featured Tracks:
 - fortnite funny moments epic fails episode 413
 - Frostbite
 ---
@@ -1920,7 +1920,7 @@ Contributors:
 - Mint Chipleaf (programming)
 Directory: fs-vol12
 Date: September 14, 2018
-Tracks:
+Featured Tracks:
 - Snow Pollen
 - Carefree Princess Berryboo
 ---
@@ -1933,7 +1933,7 @@ Contributors:
 - Mint Chipleaf (programming)
 Directory: fs-vol13
 Date: September 28, 2018
-Tracks:
+Featured Tracks:
 - track:old-secret
 - IIYWASWIWTBOTSA4AATWUOTDTMIHCIMFH
 ---
@@ -1946,7 +1946,7 @@ Contributors:
 - Mint Chipleaf (programming)
 Directory: fs-vol14
 Date: October 10, 2018
-Tracks:
+Featured Tracks:
 - SERVICE CAR
 - (an ascii image of bowsette)
 ---
@@ -1959,7 +1959,7 @@ Contributors:
 - Mint Chipleaf (programming)
 Directory: fs-vol15
 Date: October 26, 2018
-Tracks:
+Featured Tracks:
 - Charun's Cave
 - idk man you name it im tired
 ---
@@ -1972,7 +1972,7 @@ Contributors:
 - Mint Chipleaf (programming)
 Directory: fs-vol16
 Date: November 9, 2018
-Tracks:
+Featured Tracks:
 - GRAVEYARD SHIFT
 - CLOWNFUCKER
 ---
@@ -1986,7 +1986,7 @@ Contributors:
 - Mint Chipleaf (programming)
 Directory: fs-vol17
 Date: November 30, 2018
-Tracks:
+Featured Tracks:
 - (this title was too long)
 - turns out its like the shoe
 - END OF FRIENDVANGELION
@@ -2001,7 +2001,7 @@ Contributors:
 - Mint Chipleaf (programming)
 Directory: fs-vol18
 Date: December 14, 2018
-Tracks:
+Featured Tracks:
 - yall know i just do the music right
 - VALID END
 - the final clowntdown
@@ -2015,13 +2015,13 @@ Contributors:
 - Mint Chipleaf (programming)
 Directory: fs-epilogue
 Date: December 14, 2018
-Tracks:
+Featured Tracks:
 - WORST END
 ---
-ACT: Pesterquest
 Color: '#71daff'
 Anchor: pesterquest
 Jump: Pesterquest
+Act: Pesterquest
 ---
 Flash: Magic Is Fucking Real
 Contributors:
@@ -2032,7 +2032,7 @@ Contributors:
 - Mint Chipleaf (programming)
 Directory: pq-vol1
 Date: September 4, 2019
-Tracks:
+Featured Tracks:
 - WORST END
 - sometimes i call andrew hussie 'andy' and so far he hasn't corrected me
 ---
@@ -2044,7 +2044,7 @@ Contributors:
 - David Turnbull (programming)
 Directory: pq-vol2
 Date: September 4, 2019
-Tracks:
+Featured Tracks:
 - please support The Trevor Project
 ---
 Flash: A King's Feast of Ass
@@ -2055,7 +2055,7 @@ Contributors:
 - Mint Chipleaf (programming)
 Directory: pq-vol3
 Date: September 18, 2019
-Tracks:
+Featured Tracks:
 - 2chords
 - ill probably just name this one something normal oh no wait oh jeez aw beans
 - 24/7 lo fi anime beats to question your sexuality to
@@ -2067,7 +2067,7 @@ Contributors:
 - 'Courtney Brendle (art: backgrounds, endings)'
 Directory: pq-vol4
 Date: October 2, 2019
-Tracks:
+Featured Tracks:
 - CAREFREE VICTORY (REMIX)
 ---
 Flash: Skip to The Trolls
@@ -2079,7 +2079,7 @@ Contributors:
 - Mint Chipleaf (programming)
 Directory: pq-vol5
 Date: October 16, 2019
-Tracks:
+Featured Tracks:
 - 2chords
 - track:crustacean-pq
 - track:drone-pq
@@ -2094,7 +2094,7 @@ Contributors:
 - David Turnbull (programming)
 Directory: pq-vol6
 Date: October 30, 2019
-Tracks:
+Featured Tracks:
 - track:miracles
 - Superego
 ---
@@ -2107,7 +2107,7 @@ Contributors:
 - Mint Chipleaf (programming)
 Directory: pq-vol7
 Date: November 13, 2019
-Tracks:
+Featured Tracks:
 - 2chords
 - CH3CK TH3 M3T4D4T4
 - Indigo Heir
@@ -2120,7 +2120,7 @@ Contributors:
 - 'Courtney Brendle (art: backgrounds, endings)'
 Directory: pq-vol8
 Date: December 5, 2019
-Tracks:
+Featured Tracks:
 - Bronze Rebel
 - it's a cover of 'made of time'
 - yeah, it is
@@ -2137,7 +2137,7 @@ Contributors:
 - Mint Chipleaf (programming)
 Directory: pq-vol9
 Date: December 20, 2019
-Tracks:
+Featured Tracks:
 - 2chords
 - track:requiem-labyrinths-heart
 - KWCOM DOT WAV
@@ -2151,7 +2151,7 @@ Contributors:
 - Zichao Zang (programming)
 Directory: pq-vol10
 Date: January 15, 2020
-Tracks:
+Featured Tracks:
 - 2chords
 - Busker's Theme mk II
 - The La2t Frontiier
@@ -2165,7 +2165,7 @@ Contributors:
 - Adelaide Killigan (prorgamming)
 Directory: pq-vol11
 Date: February 5, 2020
-Tracks:
+Featured Tracks:
 - 2chords
 - i guess
 ---
@@ -2177,7 +2177,7 @@ Contributors:
 - Andrew D. (programming)
 Directory: pq-vol12
 Date: February 19, 2020
-Tracks:
+Featured Tracks:
 - 2chords
 - Riches to Ruins Movement II
 ---
@@ -2189,7 +2189,7 @@ Contributors:
 - Andrew D. (programming)
 Directory: pq-vol13
 Date: March 4, 2020
-Tracks:
+Featured Tracks:
 - 2chords
 - Would you believe this was for something else
 - Even in Death (T'Morra's Belly Mix)
@@ -2203,7 +2203,7 @@ Contributors:
 - Adelaide Killigan (programming)
 Directory: pq-vol14
 Date: April 1, 2020
-Tracks:
+Featured Tracks:
 - 2chords
 - Stress
 - Beatup
@@ -2212,10 +2212,10 @@ Tracks:
 - normal song name
 - Embittered Shore
 ---
-ACT: Psycholonials
 Color: '#f51806'
 Anchor: psycholonials
 Jump: Psycholonials
+Act: Psycholonials
 ---
 Flash: Psycholonials
 Directory: psycholonials
@@ -2234,7 +2234,7 @@ Contributors:
 Flash: Summer That Never Was
 Directory: psych-ch1
 Date: February 3, 2021
-Tracks:
+Featured Tracks:
 - track:love-song
 - track:summer-that-never-was
 - track:morning-ritual
@@ -2245,7 +2245,7 @@ Tracks:
 Flash: Pranxis
 Directory: psych-ch2
 Date: February 17, 2021
-Tracks:
+Featured Tracks:
 - track:edge-of-dawn
 - track:love-song
 - track:the-cold-hand
@@ -2259,7 +2259,7 @@ Tracks:
 Flash: Wildcard
 Directory: psych-ch3
 Date: February 24, 2021
-Tracks:
+Featured Tracks:
 - track:love-song
 - track:morning-ritual
 - track:time-is-helpless
@@ -2271,7 +2271,7 @@ Tracks:
 Flash: A Symbol Of Strength
 Directory: psych-ch4
 Date: March 3, 2021
-Tracks:
+Featured Tracks:
 - track:edge-of-dawn
 - track:love-song
 - track:outlaw
@@ -2286,7 +2286,7 @@ Tracks:
 Flash: Stuck Pig
 Directory: psych-ch5
 Date: March 10, 2021
-Tracks:
+Featured Tracks:
 - track:love-song
 - track:through-the-play
 - track:whats-wasting-me
@@ -2300,7 +2300,7 @@ Tracks:
 Flash: The Practice of Delegation
 Directory: psych-ch6
 Date: March 24, 2021
-Tracks:
+Featured Tracks:
 - track:love-song
 - track:outlaw
 - track:the-influencer
@@ -2315,7 +2315,7 @@ Tracks:
 Flash: It Never Even Stood A Chance
 Directory: psych-ch7
 Date: March 31, 2021
-Tracks:
+Featured Tracks:
 - track:love-song
 - track:the-march
 - track:the-administrator
@@ -2331,7 +2331,7 @@ Tracks:
 Flash: Grinch Heart
 Directory: psych-ch8
 Date: April 13, 2021
-Tracks:
+Featured Tracks:
 - track:edge-of-dawn
 - track:love-song
 - track:nervous-energy
@@ -2352,7 +2352,7 @@ Tracks:
 Flash: A Sword And A Crown
 Directory: psych-ch9
 Date: April 20, 2021
-Tracks:
+Featured Tracks:
 - track:ephemeral-muse-final-remix
 - track:fix-this
 - track:edge-of-dawn
@@ -2367,10 +2367,10 @@ Tracks:
 - track:the-march
 - track:together-vocal-remix
 ---
-ACT: Miscellaneous
 Color: '#0088ff'
 Anchor: miscellaneous
 Jump: Miscellaneous
+Act: Miscellaneous
 ---
 Flash: Namco High
 Directory: namco-high
@@ -2402,7 +2402,7 @@ Contributors:
 - 'OMOCAT (art: Hiromi)'
 - 'Tyson Hesse (art: Akiho Matsuo)'
 - 'Der-shing Helmer (art: Tomari)'
-Tracks:
+Featured Tracks:
 - Namco Theme
 - track:school-namco-high
 - Around Town
diff --git a/homepage.yaml b/homepage.yaml
index 45e0826b..fed3f018 100644
--- a/homepage.yaml
+++ b/homepage.yaml
@@ -1,5 +1,5 @@
 Homepage: Homepage
-Sidebar: |-
+Sidebar Content: |-
     <h1>Get involved!</h1>
     - [[static:feedback|Send feedback]]
     - [[static:discord|Join the Discord server]]
diff --git a/news.yaml b/news.yaml
index ad7ca025..f95565d2 100644
--- a/news.yaml
+++ b/news.yaml
@@ -1,7 +1,7 @@
 Name: Wiki Finalization
 Date: July 7, 2021
 Directory: wiki-finalization
-Body: |-
+Content: |-
     Thank you to everyone who's supported the wiki, offered feedback, sent kind messages, and visited the wiki.
     (This is a repost of a post we published earlier this month on Patreon, with a couple added notes.)
     <hr class="split">
@@ -27,7 +27,7 @@ Body: |-
 Name: June Attuned
 Date: June 12, 2021
 Directory: june-attuned
-Body: |-
+Content: |-
     Hello! As is regular now, we've an update short yet sweet to share today. Following personal direction in a hobby project, most wiki work has been put into internal restructuring, though in revisiting each page, we've written a few UI refinements too. Details, as ever, past the split!
     <hr class="split">
     <i>As ever, thank you to everyone who sent feedback and kind messages during development! We're also very grateful for all [[static:donate|supporters of the wiki]], including: enchantingHunter, <span style="color: #f1c40f">Gradis</span>, and Nights!</i>
@@ -51,7 +51,7 @@ Body: |-
 Name: the my ex-wife is a real bitch update
 Date: May 12, 2021
 Directory: the-my-ex-wife-is-a-real-bitch-update
-Body: |-
+Content: |-
     <i>Wait, what?</i>
     Aranoyas! Wow, we sure have no idea how <em>that</em> got in the release title field! This update brings a redesign to the album sidebars, and lots of data fixes and additions across the site. Much thanks to everyone in the Discord community for throwing in suggestions and additions all throughout this update - details, as ever, past the split!
     <hr class="split">
@@ -93,7 +93,7 @@ Body: |-
 Name: Solo Albums Aplenty
 Date: April 12, 2021
 Directory: solo-albums-aplenty
-Body: |-
+Content: |-
     <i>Independent works from four artists, plus a variety of stylistic tweaks and additions!</i>
     Heya! We've got another smaller update to share this time, though with plenty of wonderful music brought to the wiki from a set of four solo artists. Find details and listening recommendations past the split!
     <hr class="split">
@@ -123,7 +123,7 @@ Body: |-
 Name: Translation & Renovation
 Date: March 12, 2021
 Directory: translation-renovation
-Body: |-
+Content: |-
     <i>Looking for volunteer translators to help bring the wiki to different languages!</i>
     Hello again! We have a smaller update to share this month - mostly polish and internal restructuring. It's all in the aims of making the site more accessible; we're now <b>looking for translators</b> to help bring the site around the world! Details, as usual, past the split.
     <hr class="split">
@@ -153,7 +153,7 @@ Body: |-
 Name: Retrace, Retexture
 Date: February 12, 2021
 Directory: retrace-retexture
-Body: |-
+Content: |-
     <i>Album wallpapers, internal changes, and more!</i>
     Hi again! We hope the month's been as kind as possible to you all. As planned, we have a new monthly update! The wiki's undergoing some significant internal improvements, but we have a host of new features, and, of course, wonderful albums and artists to share, as well. Thanks go out to our very first patrons - details of all past the split!
     <hr class="split">
@@ -202,7 +202,7 @@ Body: |-
 Name: Traversing Fandom
 Date: January 12, 2021
 Directory: traversing-fandom
-Body: |-
+Content: |-
     <i>First update of 2021 - now releasing monthly! (Also, Discord!)</i>
     Hey again, and welcome (as best one can be welcomed) to 2021! As announced in the last update's news entry, the new leading direction of the wiki is sharing and celebrating music created by fan musicians at large. In addition to <i>fifteen</i> new albums, this update builds on last update's foundations - details past the split - and we've started a Discord for visitors of the wiki as well!
     <hr class="split">
@@ -245,7 +245,7 @@ Body: |-
 Name: Launch of HSMusic.wiki!
 Date: December 12, 2020
 Directory: hsmusicwiki
-Body: |-
+Content: |-
     <i>Welcome to all visitors, new and returning!</i>
     We're proud to announce the launch of <a href="https://hsmusic.wiki/">https://HSMusic.wiki</a>, the new home of the Homestuck Music Wiki! If you've visited the wiki before, you've probably already noticed plenty of changes. I'll cover a few of the changes in this news entry, and talk about the future direction of the wiki too - there's been a shift over the last few updates I'd love to shed some light on. :)
     <hr class="split">
diff --git a/static-pages.yaml b/static-pages.yaml
index ee557313..491154e9 100644
--- a/static-pages.yaml
+++ b/static-pages.yaml
@@ -1064,13 +1064,13 @@ Content: |-
 ---
 Name: Donate
 Directory: donate
-Listed: false
 Content: |-
     Donations for the wiki are now closed. Thank you to everyone who donated over the course of wiki development, including:
     - Nights
     - enchantingHunter
     - leo homestuck
     - Gradis
+Show in Navigation Bar: false
 ---
 Name: HSMusic Community Discord Server
 Short Name: Discord
diff --git a/wiki-info.yaml b/wiki-info.yaml
index c4f92274..1ec900a2 100644
--- a/wiki-info.yaml
+++ b/wiki-info.yaml
@@ -11,7 +11,7 @@ Enable Listings: true
 Enable News: true
 Enable Art Tag UI: true
 Enable Group UI: true
-Footer: >-
+Footer Content: >-
     [[static:about|HSMusic is an unofficial fan project.]] Its creation and development
     was made possible through the [[static:donate|support]] and [[static:feedback|feedback]]
     of our wonderful and generous community. Thank you!