« 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/7th-gate-project.yaml14
-rw-r--r--album/9.yaml76
-rw-r--r--album/a-shade-of-blue.yaml8
-rw-r--r--album/a-viral-medium-vol-1.yaml2
-rw-r--r--album/act-7.yaml4
-rw-r--r--album/act-8-volume-1.yaml2
-rw-r--r--album/alternia.yaml16
-rw-r--r--album/alterniabound.yaml34
-rw-r--r--album/ancestral.yaml15
-rw-r--r--album/archive.yaml2
-rw-r--r--album/aspect-clock.yaml10
-rw-r--r--album/basement-tale.yaml6
-rw-r--r--album/beforus.yaml18
-rw-r--r--album/beyond-canon.yaml2
-rw-r--r--album/bowmania.yaml28
-rw-r--r--album/call-and-new-2-locomotif.yaml70
-rw-r--r--album/call-and-new.yaml54
-rw-r--r--album/canwave-2.yaml24
-rw-r--r--album/canwave.yaml24
-rw-r--r--album/canwc-for-the-holidays.yaml12
-rw-r--r--album/canwc-sound-test-1.yaml128
-rw-r--r--album/carne-vale-fusion-collab.yaml4
-rw-r--r--album/cherubim.yaml18
-rw-r--r--album/coloUrs-and-mayhem-universe-a.yaml2
-rw-r--r--album/coloUrs-and-mayhem-universe-b.yaml48
-rw-r--r--album/cool-and-new-greatest-hits.yaml6
-rw-r--r--album/cool-and-new-homestuck-2.yaml72
-rw-r--r--album/cool-and-new-homestuck-3.yaml76
-rw-r--r--album/cool-and-new-homestuck.yaml94
-rw-r--r--album/cool-and-new-volume-2.yaml18
-rw-r--r--album/cool-and-new-volume-7.yaml78
-rw-r--r--album/cool-and-new-volume-ii.yaml50
-rw-r--r--album/cool-and-new-volume-sx.yaml94
-rw-r--r--album/cool-and-new-volume-v.yaml138
-rw-r--r--album/cool-and-new-voulem1.yaml88
-rw-r--r--album/cosmic-caretakers.yaml40
-rw-r--r--album/cyber-city-sound-pak.yaml4
-rw-r--r--album/dialed-to-11.yaml4
-rw-r--r--album/diverging-delicacies.yaml20
-rw-r--r--album/dont-read-a-webcomic-called-homestuck.yaml19
-rw-r--r--album/early-access.yaml24
-rw-r--r--album/entertaining-sound.yaml10
-rw-r--r--album/exile.yaml14
-rw-r--r--album/friendsymphony.yaml6
-rw-r--r--album/genesis-frog.yaml2
-rw-r--r--album/glitchstuck-volume-1.yaml2
-rw-r--r--album/gotta-hatch-em-all.yaml14
-rw-r--r--album/gristmas-carols.yaml4
-rw-r--r--album/guidestuck-volume-one.yaml4
-rw-r--r--album/heinoustuck-vol-1.yaml12
-rw-r--r--album/hiveswap-act-1-ost.yaml2
-rw-r--r--album/homestuck-for-orchestra-ep.yaml2
-rw-r--r--album/homestuck-for-the-holidays.yaml10
-rw-r--r--album/homestuck-swagazaki.yaml8
-rw-r--r--album/homestuck-vol-1-4.yaml82
-rw-r--r--album/homestuck-vol-1.yaml16
-rw-r--r--album/homestuck-vol-10.yaml72
-rw-r--r--album/homestuck-vol-2.yaml14
-rw-r--r--album/homestuck-vol-3.yaml16
-rw-r--r--album/homestuck-vol-4.yaml6
-rw-r--r--album/homestuck-vol-5.yaml104
-rw-r--r--album/homestuck-vol-6.yaml28
-rw-r--r--album/homestuck-vol-7.yaml20
-rw-r--r--album/homestuck-vol-8.yaml24
-rw-r--r--album/homestuck-vol-9.yaml46
-rw-r--r--album/intermishin.yaml4
-rw-r--r--album/jailbreak-vol-1.yaml22
-rw-r--r--album/jpeg.yaml48
-rw-r--r--album/lofam.yaml65
-rw-r--r--album/lofam2.yaml134
-rw-r--r--album/lofam3.yaml34
-rw-r--r--album/lofam4.yaml184
-rw-r--r--album/lofam5.yaml82
-rw-r--r--album/lofam5a2.yaml102
-rw-r--r--album/median.yaml4
-rw-r--r--album/medium.yaml2
-rw-r--r--album/midnight-crew-drawing-dead.yaml4
-rw-r--r--album/mobius-trip-and-hadron-kaleido.yaml4
-rw-r--r--album/moons-of-theseus.yaml12
-rw-r--r--album/more-homestuck-fandom.yaml58
-rw-r--r--album/oceanfables-ray-of-light.yaml4
-rw-r--r--album/of-troles-and-chiptumes.yaml8
-rw-r--r--album/one-year-older.yaml8
-rw-r--r--album/p-s.yaml36
-rw-r--r--album/perfectly-generic-album.yaml4
-rw-r--r--album/play-the-rain.yaml18
-rw-r--r--album/portalstuck-vol-1.yaml5
-rw-r--r--album/prospit-and-derse.yaml6
-rw-r--r--album/references-beyond-homestuck.yaml2
-rw-r--r--album/reprise.yaml4
-rw-r--r--album/retcon-2018.yaml6
-rw-r--r--album/s-collide.yaml7
-rw-r--r--album/s-hecka-jef.yaml2
-rw-r--r--album/s-press-play.yaml3
-rw-r--r--album/sburb-ost.yaml28
-rw-r--r--album/sburb.yaml4
-rw-r--r--album/sburban-neighborhood.yaml16
-rw-r--r--album/skaian-synthesis.yaml16
-rw-r--r--album/skaias-the-limit.yaml6
-rw-r--r--album/song-of-skaia.yaml4
-rw-r--r--album/songs-unsung.yaml2
-rw-r--r--album/spelunky-classic.yaml2
-rw-r--r--album/strife-2.yaml6
-rw-r--r--album/strife.yaml4
-rw-r--r--album/symphony-impossible-to-play.yaml12
-rw-r--r--album/team-paradox.yaml2
-rw-r--r--album/the-baby-is-you.yaml4
-rw-r--r--album/the-ballad-of-megan-pouring.yaml4
-rw-r--r--album/the-felt.yaml2
-rw-r--r--album/the-genesis-project-vol-1.yaml8
-rw-r--r--album/the-wanderers.yaml4
-rw-r--r--album/theres-no-place-like-home.yaml52
-rw-r--r--album/unreleased-tracks.yaml27
-rw-r--r--album/v8lume.yaml60
-rw-r--r--album/vaporwave-2016.yaml8
-rw-r--r--album/vast-error-vol-1-3.yaml2
-rw-r--r--album/vinculum-vitae.yaml16
-rw-r--r--flashes.yaml100
-rw-r--r--groups.yaml4
-rw-r--r--news.yaml2
-rw-r--r--static-page/changelog.yaml2
121 files changed, 1629 insertions, 1604 deletions
diff --git a/album/7th-gate-project.yaml b/album/7th-gate-project.yaml
index 27e66a15..04947fd5 100644
--- a/album/7th-gate-project.yaml
+++ b/album/7th-gate-project.yaml
@@ -34,7 +34,7 @@ Art Tags:
 - Gate
 Referenced Tracks:
 - Warhammer of Zillyhoo
-- track:doctor
+- Doctor
 Commentary: |-
     <i>Catboss:</i>
 
@@ -63,8 +63,8 @@ Art Tags:
 - Gate
 Referenced Tracks:
 - Tribal Ebonpyre
-- track:beatdown-strider-style
-- track:atomyk-ebonpyre
+- Beatdown (Strider Style)
+- Atomyk Ebonpyre
 Commentary: |-
     <i>Catboss:</i>
 
@@ -91,7 +91,7 @@ Cover Artists:
 Art Tags:
 - Gate
 Referenced Tracks:
-- track:endless-climb
+- Endless Climb
 - Black Rose / Green Sun
 Commentary: |-
     <i>Catboss:</i>
@@ -123,7 +123,7 @@ Art Tags:
 - Gate
 Referenced Tracks:
 - track:frost-vol6
-- track:dissension-original
+- Dissension (Original)
 - Sunsetter
 Commentary: |-
     <i>Catboss:</i>
@@ -135,8 +135,8 @@ Commentary: |-
     them's the breaks
     ANYWAY.
     [[track:frost-vol6|Frost]] is one of my favourite Homestuck songs. Go listen to it because it is fantastic. I could probably leave it on loop all day and not get tired of it. It's also Jade's land theme so there's pretty much no way I wasn't going to put it in here.
-    The original idea for this song was always to use [[track:frost-vol6|Frost]] as a "backdrop" and then link it to other songs, but to be perfectly frank I wasn't expecting to use [[track:dissension-original|Dissension]]. I was intending to transition straight to [[Sunsetter]], but then I played a bunch of stuff and was like "hey this sounds like a Homestuck song" and it turned out to be [[track:dissension-original|Dissension]] so I used it. My subconscious is a thief sometimes. Turned out for the better, really, it's one of those happy little coincidences that happen sometimes. =3
-    Also: [[track:dissension-original|Dissension]] doesn't get remixed enough. Needs more luv~~
+    The original idea for this song was always to use [[track:frost-vol6|Frost]] as a "backdrop" and then link it to other songs, but to be perfectly frank I wasn't expecting to use [[Dissension (Original)|Dissension]]. I was intending to transition straight to [[Sunsetter]], but then I played a bunch of stuff and was like "hey this sounds like a Homestuck song" and it turned out to be [[Dissension (Original)|Dissension]] so I used it. My subconscious is a thief sometimes. Turned out for the better, really, it's one of those happy little coincidences that happen sometimes. =3
+    Also: [[Dissension (Original)|Dissension]] doesn't get remixed enough. Needs more luv~~
     Let's see, where was I.
     [[Sunsetter]] might seem like an odd choice really, but since its cousin [[track:sunslammer]] (by [[artist:seth-peelle|Beatfox]]) was [[flash:3001|featured in the comic itself]] it's become more or less linked to Jade, despite the fact that [[Sunsetter]] was originally supposed to be a Dave strife theme if I remember? And that is why I chose it! Which makes [[track:frost-vol6|Frost]] + 2 strife themes, which I think actually makes for a decent seventh-gate theme.
     Stylistically I went for something between [[track:through-the-seventh-gate-land-of-wind-and-shade|LOWAS]] and [[track:through-the-seventh-gate-land-of-heat-and-clockwork|LOHAC]]. It's not as dynamic as the former in terms of... dynamics (-_-") and tempo, but I went for stylistic shifts instead; the sudden orchestral [[Sunsetter]] was completely intentional though, as was the slower, more ambient ending. As a result this actually ended up more complex than [[track:through-the-seventh-gate-land-of-wind-and-shade|LOWAS]] did. It was quite fun to compose.
diff --git a/album/9.yaml b/album/9.yaml
index ed632096..052555a4 100644
--- a/album/9.yaml
+++ b/album/9.yaml
@@ -106,11 +106,11 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/spacetime-starstriker
 - https://youtu.be/i8iyq3ubvfM
 Referenced Tracks:
-- track:doctor
+- Doctor
 - Gaia Queen
 - track:in-the-beginning-canwc
 - Muse of Nanchos
-- track:aggrieve
+- Aggrieve
 - track:midnight-suffer
 - RollerCoaster Tycoon Theme
 - Unintentional Anime (Piano Version)
@@ -146,7 +146,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/harlecoaster-not-voul-1-mix
 - https://youtu.be/8a0nPBVw-ks
 Referenced Tracks:
-- track:harlequin
+- Harlequin
 - RollerCoaster Tycoon Theme
 Commentary: |-
     <i>Commander Cello:</i> (Composer)
@@ -172,13 +172,13 @@ Referenced Tracks:
 - Saturnz Barz
 - track:old-secret
 - Ghost Mound
-- track:explore
+- Explore
 - track:carne-vale
 Sampled Tracks:
 - Saturnz Barz
 - track:old-secret
 - Ghost Mound
-- track:explore
+- Explore
 - track:carne-vale
 - Bowman's Credit Score
 - Your Bed
@@ -304,7 +304,7 @@ URLs:
 - https://youtu.be/C3kOzGRO_Uk
 Referenced Tracks:
 - Liquid Negrocity
-- track:the-ballad-of-jack-noir
+- The Ballad of Jack Noir
 Commentary: |-
     <i>cosmicTerrorist:</i> (Composer)
     I made this as a random idea a few months ago when i was bored and i decided to finish it.
@@ -325,14 +325,14 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/echo-chamber
 - https://youtu.be/4k71rZKpPuw
 Referenced Tracks:
-- track:doctor
+- Doctor
 - Ugly Story
 - Cascade (Beta)
 - Where Have You Been
 - track:x-vapor-rom
 - track:blank-jimmee
 Sampled Tracks:
-- track:doctor
+- Doctor
 - Ugly Story
 - Cascade (Beta)
 - Where Have You Been
@@ -518,7 +518,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/starsetter
 - https://youtu.be/DSpCAx81Haw
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 Commentary: |-
     <i>cosmicTerrorist:</i> (Composer)
     I tried to make a song with the instrumentation of Sunsetter. I then referenced the violin part of The Blind Prophet and used Sburban Jungle leitmotif.
@@ -540,12 +540,12 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/uprising-turnways
 - https://youtu.be/KEjL-4ahMsQ
 Referenced Tracks:
-- track:upward-movement-dave-owns
+- Upward Movement (Dave Owns)
 - The Will to Fight (Original Mix) [Denizen Strife]
 - RollerCoaster Tycoon Theme
 - track:moshi-moshi
 - Unite Synchronization
-- track:atomyk-ebonpyre
+- Atomyk Ebonpyre
 - Rex Duodecim Angelus
 - Rex Mille Geromius
 - Even in Death
@@ -630,9 +630,9 @@ Referenced Tracks:
 - track:cascante
 - Even in Death
 - Pumpkin Party in Sea Hitler's Water Apocalypse
-- track:showtime-original-mix
+- Showtime (Original Mix)
 - Tick
-- track:doctor
+- Doctor
 - track:MeGaLoVania
 - Broom Temperature
 - Title (Mega Man 3)
@@ -666,13 +666,13 @@ URLs:
 Referenced Tracks:
 - Tick
 - English
-- track:chorale-for-jaspers
+- Chorale for Jaspers
 - Dance of Thorns
 - licord nacrasty
 - Walk-Stab-Walk (R&E)
 - Muse of Nanchos
 - Liquid Negrocity
-- track:aggrieve
+- Aggrieve
 Commentary: |-
     <i>WHATISLOSTINTHEMINES:</i> (Composer)
     Wow! Another medley! This song was written for a hypothetical battle between Lord English and Rose, Jack, and Hecka Jef. It took me... about a month to fully put together. Overall, I'm fairly happy where this ended up, and I hope you'll enjoy it.
@@ -761,8 +761,8 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/showoteim
 - https://youtu.be/5OqjnKyQpME
 Referenced Tracks:
-- track:showtime-original-mix
-- track:sburban-jungle
+- Showtime (Original Mix)
+- Sburban Jungle
 Commentary: |-
     <i>Shwan:</i> (Composer)
     as i said earlier inversion is fun, this one, reversion is fun
@@ -811,7 +811,7 @@ Referenced Tracks:
 - track:MeGaLoVania
 - Liquid Negrocity
 - Spider's Claw
-- track:the-ballad-of-jack-noir
+- The Ballad of Jack Noir
 Commentary: |-
     <i>FrostyMac:</i> (Composer)
     Hey, my first song for Canmt! I made the percussion and bass for this song ages ago, and I had pretty much scrapped them, but I was messing around with a song combining MeGaLoVania and Liquid Negrocity a wee bit back and I thought, "Hey, that thing that I scrapped would be perfect for this!" Even so, I didn't actually do much with it until I decided to do something for 9. At that point, I composed this in about 3 hours, did a bit of mixing, and that's how it ended up the way it is now.
@@ -885,8 +885,8 @@ URLs:
 Referenced Tracks:
 - Lose Yourself
 - track:transcend
-- track:sburban-jungle
-- track:upward-movement-dave-owns
+- Sburban Jungle
+- Upward Movement (Dave Owns)
 - track:unintentional-touhou
 - track:moshi-moshi
 - Dirgeish
@@ -897,7 +897,7 @@ Referenced Tracks:
 - Apexhalation
 - licord nacrasty
 - track:midnight-suffer
-- track:aggrieve
+- Aggrieve
 - Eternity Served Cold
 - track:conflict
 Sampled Tracks:
@@ -1108,7 +1108,7 @@ URLs:
 - https://youtu.be/-35N2HANrPE
 Referenced Tracks:
 - Redial
-- track:sburban-jungle
+- Sburban Jungle
 - Cool And New Countdown
 - I absolutely loathe this Drummer.
 - Flare
@@ -1144,7 +1144,7 @@ URLs:
 - https://youtu.be/bwIp0EY5hvo
 Referenced Tracks:
 - Gaia Queen
-- track:gardener
+- Gardener
 - Descend
 - track:penumbra-phantasm
 Commentary: |-
@@ -1174,7 +1174,7 @@ Referenced Tracks:
 - Pumpkin Cravings
 - track:MeGaLoVania
 - track:sunslammer
-- track:under-the-hat
+- Under The Hat
 Commentary: |-
     <i>Pipko Fanfare:</i> (Composer)
     This song started off with me noticing how the chord progressions for flare and old secret are based on the same descending tetrachord bass motif (similar to the one used in megalovania) but with different executions and upper voices. So I tried to blend them together just for some arrangement practice since that was a thing I was doing at the time and it ended up turning into this whole big thing. The idea for it to represent the crazy journey that Hussie has been taking us through over the years - starting off deceptively simple and just growing into this complex intertwined mess of weird time shit and paradoxes and black holes and self-referencial madness - came surprisingly late into the process but helped me make the final call on some arrangement details that I think help it "tell a better story" if that makes sense. (And yes, I know Under The Hat and Pumpkin Cravings aren't REALLY PS tracks but come on you and I both know they FEEL like Problem Sleuth.)
@@ -1358,7 +1358,7 @@ Referenced Tracks:
 - Courser
 - Ruins (With Strings)
 - track:penumbra-phantasm
-- track:mutiny
+- Mutiny
 - track:sunslammer
 - Unintentional Anime (Piano Version)
 - Atomic Bonsai
@@ -1561,7 +1561,7 @@ Referenced Tracks:
 - Meet the Flintstones
 - Shake That
 - We Are Number One
-- track:upward-movement-dave-owns
+- Upward Movement (Dave Owns)
 - GameBro (Original 1990 Mix)
 - GameGrl (Original 1993 Mix)
 - The Nutshack Intro
@@ -1593,7 +1593,7 @@ Sampled Tracks:
 - Meet the Flintstones
 - Shake That
 - We Are Number One
-- track:upward-movement-dave-owns
+- Upward Movement (Dave Owns)
 - GameBro (Original 1990 Mix)
 - GameGrl (Original 1993 Mix)
 - Never Gonna Give You Up
@@ -1792,7 +1792,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/the-elation-of-elevation
 - https://youtu.be/WLTYhgkwWHA
 Referenced Tracks:
-- track:aggrieve
+- Aggrieve
 - track:frost-vol6
 Commentary: |-
     <i>NyashAlex:</i> (Composer)
@@ -1842,7 +1842,7 @@ URLs:
 Referenced Tracks:
 - Science Blaster
 - Flare
-- track:sburban-jungle
+- Sburban Jungle
 Commentary: |-
     <i>Cerulean:</i> (Composer)
     Song started out as an old 80s heavy bass dance track but then i realised it sounded much better with the light synth arps of Serum and Poizone. Then my friend, rumu11, created the art but that was rejected :jaedangry:. Overall, I think this is the most creative (get it?) song ive made so far. I might even rework this idea for a later song because it was so fun to work on. Anyway, hope you have a good day everyone <3
@@ -2008,7 +2008,7 @@ URLs:
 - https://youtu.be/Ky20KK2kdWI
 Referenced Tracks:
 - Breath of the Wild Theme
-- track:mother
+- Mother
 Commentary: |-
     <i>Nicholas Nakano:</i> (Composer)
     it's not snowman for the last fucking time AAAAAAAAAAaaaaaaaa
@@ -2097,7 +2097,7 @@ URLs:
 Referenced Tracks:
 - -3x piano solo
 - Derse Dreamers
-- track:mutiny
+- Mutiny
 - How Do I Live
 Sampled Tracks:
 - Beat 02
@@ -2141,7 +2141,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/downwards
 - https://youtu.be/FhtrQuWxfk0
 Referenced Tracks:
-- track:upward-movement-dave-owns
+- Upward Movement (Dave Owns)
 - End of the world
 - Flare
 - track:MeGaLoVania
@@ -2174,7 +2174,7 @@ Referenced Tracks:
 - I absolutely loathe this Drummer.
 - Rex Mille Geromius
 - Rex Duodecim Angelus
-- track:aggrieve
+- Aggrieve
 - Step's Theme
 - Vaccine
 - Oh Boo Hoo
@@ -2186,7 +2186,7 @@ Referenced Tracks:
 - track:ringleader
 - Touchdown
 Sampled Tracks:
-- track:upward-movement-dave-owns
+- Upward Movement (Dave Owns)
 - AAAAAAAAAAAAAAAAAAAAA
 - Oh Boo Hoo
 Lyrics: |-
@@ -2266,11 +2266,11 @@ Duration: '05:09'
 URLs:
 - https://youtu.be/SOD_MoqZWkc
 Referenced Tracks:
-- track:aggrieve
-- track:endless-climb
+- Aggrieve
+- Endless Climb
 - Dance of Thorns
 - At The Price of Oblivion
-- track:sburban-jungle
+- Sburban Jungle
 ---
 Track: The Souns of Justis (Full)
 Artists:
@@ -2303,4 +2303,4 @@ URLs:
 - https://youtu.be/TT7Ta0cEgUo
 Referenced Tracks:
 - Fly Me To The Moon
-- Elevatorstuck
\ No newline at end of file
+- Elevatorstuck
diff --git a/album/a-shade-of-blue.yaml b/album/a-shade-of-blue.yaml
index 6a88d0df..c5a03b2f 100644
--- a/album/a-shade-of-blue.yaml
+++ b/album/a-shade-of-blue.yaml
@@ -67,7 +67,7 @@ URLs:
 Art Tags:
 - Dave's bro
 Referenced Tracks:
-- track:beatdown-strider-style
+- Beatdown (Strider Style)
 ---
 Track: Final Frontier
 Cover Artists:
@@ -118,7 +118,7 @@ Art Tags:
 - Doc Scratch
 Referenced Tracks:
 - onestop
-- track:upward-movement-dave-owns
+- Upward Movement (Dave Owns)
 ---
 Track: Deep Space
 Duration: '1:40'
@@ -160,7 +160,7 @@ Art Tags:
 - Underlings
 - LoHaC
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 - Time on My Side
 ---
 Track: Cascadium
@@ -186,6 +186,6 @@ Art Tags:
 - Lord English
 - Dream Bubbles
 Referenced Tracks:
-- track:beatdown-strider-style
+- Beatdown (Strider Style)
 - track:carne-vale
 - track:penumbra-phantasm
diff --git a/album/a-viral-medium-vol-1.yaml b/album/a-viral-medium-vol-1.yaml
index 268b47bd..3db723e1 100644
--- a/album/a-viral-medium-vol-1.yaml
+++ b/album/a-viral-medium-vol-1.yaml
@@ -38,7 +38,7 @@ URLs:
 - https://aviralmedium.bandcamp.com/track/geocaching
 - https://soundcloud.com/aviralmedium/2-geocaching?in=aviralmedium/sets/volume1
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 ---
 Track: Archaic Rodeo
 Duration: '1:17'
diff --git a/album/act-7.yaml b/album/act-7.yaml
index 3299ebe7..4f94f160 100644
--- a/album/act-7.yaml
+++ b/album/act-7.yaml
@@ -32,8 +32,8 @@ URLs:
 - https://www.youtube.com/watch?v=FPsMeamXcE8
 Referenced Tracks:
 - I - Overture
-- track:doctor
-- track:sburban-jungle
+- Doctor
+- Sburban Jungle
 - Black Hole / Green Sun
 MIDI Project Files:
 - Title: MIDI by Unknown
diff --git a/album/act-8-volume-1.yaml b/album/act-8-volume-1.yaml
index 934ef768..9e0ce3d4 100644
--- a/album/act-8-volume-1.yaml
+++ b/album/act-8-volume-1.yaml
@@ -173,7 +173,7 @@ Art Tags:
 - LoCaH
 - Skaia
 Referenced Tracks:
-- track:doctor
+- Doctor
 Commentary: |-
     <i>dbnet18:</i>
     It's basically a SOTWW/Doctor remix.
diff --git a/album/alternia.yaml b/album/alternia.yaml
index 2184ca7b..6610341b 100644
--- a/album/alternia.yaml
+++ b/album/alternia.yaml
@@ -27,13 +27,13 @@ Commentary: |-
     First, thank you so much for buying this!!! I haven't been composing music for very long but I greatly enjoy doing it, so I composed these tracks as a fun way to make some money for college. I also created this album primarily to challenge my own creative limits; I'm usually known for creating hard-rocking, fast-pumping tunes with very obvious video game overtones. With this album I tried to show that I can manufacture a soundscape beyond that... that sometimes I'm capable of variety! (probably not what you'd normally expect from me! SORRY BROS)
     Unfortunately I wasn't able to finish the track for the fourteenth troll, Larry, whose track is comprised entirely of the sounds of horses neighing. It was a new genre Andrew and I invented together, and with it I would have consummated my quest to create every type of music known (and unknown) to man. The fact that I didn't finish that track is my only real regret. It keeps me in tears. But overall, aside from that one little fluke, I'm happy with the amount of stuff I was able to pull off, and the amount of improvement I made because I decided to defy the notions of my original style.
     So how did this all start, anyway?
-    The scene: Late May 2010. I was talking to Andrew Hussie (as we are soul twins) when I asked him if I could do a solo album called "Alternia." Alternia's idea was thusly: The trolls have an entire game that none of us would probably ever see in any detail. Taking free reign over this unscripted world, I would go ahead and make a soundtrack to their game session as a parallel to that of the kids, mocking the tracks found in the early Homestuck albums - [[track:harlequin|Harlequin]] would be recalled by a track called [[track:crustacean]], [[track:showtime-original-mix|Showtime]] by [[Showdown]], [[track:aggrieve]] by Aggrave, [[track:sburban-jungle]] would be [[Skaian Summoning]], and the list went on. When fully-formed this album would form an alternate "troll version" of the original Homestuck albums, revealing the similarity in the alternate worlds through song - hence the name "Alternia."
+    The scene: Late May 2010. I was talking to Andrew Hussie (as we are soul twins) when I asked him if I could do a solo album called "Alternia." Alternia's idea was thusly: The trolls have an entire game that none of us would probably ever see in any detail. Taking free reign over this unscripted world, I would go ahead and make a soundtrack to their game session as a parallel to that of the kids, mocking the tracks found in the early Homestuck albums - [[Harlequin]] would be recalled by a track called [[Crustacean]], [[Showtime (Original Mix)|Showtime]] by [[Showdown]], [[Aggrieve]] by Aggrave, [[Sburban Jungle]] would be [[Skaian Summoning]], and the list went on. When fully-formed this album would form an alternate "troll version" of the original Homestuck albums, revealing the similarity in the alternate worlds through song - hence the name "Alternia."
     Obviously Andrew was fine with this idea. (Unless in fact you are reading this in the alternate universe where the album was canceled and replaced with the other one we were planning. The one filled with horse neighs.) In fact, he only had one thing to say against my original concept.
     I said: "We're not gonna see their game session."
     He said: "Whoops don't be so sure!"
     And then on 6/12, the troll game session arc started. WHOOPS AGAIN.
     Luckily, I was there the exact moment the arc started, and I rushed to the forums to enter "Alternia" in the suggestion box. Hilariously enough, my name was chosen to be the planet's name (Alternia I mean. Although I'm sure Planet Radman McDoucheface was a close second in Andrew's mind). If I hadn't been able to post in the suggestion box when he was choosing the planet's name, and it was named something else, I probably just would have renamed the album "Hivebent." (Or "Radman McDoucheface's BIG HITS.")
-    By that point I had only completed 4 tracks - [[Showdown]], [[track:crustacean|Crustacean]], [[Skaian Summoning]], and [[track:theme|"Theme,"]] the latter of which I had to scrap because it was too nice-sounding for the trolls, to phrase it terribly. As Hivebent kept updating I realized that I really couldn't do whatever I wanted with the album because we were actually seeing the trolls' world. I decided that I would just scrap the parallelism and make a track for whatever struck my fancy. And boy was my fancy struck. My fancy resonated rapidly and colly, generating sweet, sweet overtones to each of Andrew's inspiring updates until I had accidentally created a track for every single troll and then some. (Maybe if Larry had debuted in the comic I would have finished that track. Blame Andrew.)
+    By that point I had only completed 4 tracks - [[Showdown]], [[Crustacean]], [[Skaian Summoning]], and [[Theme|"Theme,"]] the latter of which I had to scrap because it was too nice-sounding for the trolls, to phrase it terribly. As Hivebent kept updating I realized that I really couldn't do whatever I wanted with the album because we were actually seeing the trolls' world. I decided that I would just scrap the parallelism and make a track for whatever struck my fancy. And boy was my fancy struck. My fancy resonated rapidly and colly, generating sweet, sweet overtones to each of Andrew's inspiring updates until I had accidentally created a track for every single troll and then some. (Maybe if Larry had debuted in the comic I would have finished that track. Blame Andrew.)
     Now that I think about it, I guess that by making music for points in Hivebent without any established tracks as themes for the trolls, I imitated the first couple of albums in their sort of brave, musical pioneer sort of feeling more than I might have if I had chosen to parallel them completely and more literally, track by track.
     So that's that story.
     Also I'd like to clarify that this album is supposed to be 12 tracks long, but I can't stop myself from making music when the opportunity arises. So now the album is 12 tracks long, plus a bunch of accidental bonus songs.
@@ -91,7 +91,7 @@ MIDI Project Files:
 Commentary: |-
     <i>Toby Fox:</i>
     (CG Sprite Theme)
-    [[track:harlequin|Harlequin]] (partial) was the first track of Homestuck. Therefore it only makes sense to have something similar be the first track of Alternia. It's not the craziest or intensest thing, so I hope people aren't put off by its inclusion at the very beginning. I feel like it fits the start of the album well though - the variety in noise channels and the oddness of the melody and chords give it a bit of a laid-back "alien" feeling that I feel encapsulates Hivebent. In short, it's the scenesetter track ([[Sunsetter|Sunsetter???]] NOPE).
+    [[Harlequin]] (partial) was the first track of Homestuck. Therefore it only makes sense to have something similar be the first track of Alternia. It's not the craziest or intensest thing, so I hope people aren't put off by its inclusion at the very beginning. I feel like it fits the start of the album well though - the variety in noise channels and the oddness of the melody and chords give it a bit of a laid-back "alien" feeling that I feel encapsulates Hivebent. In short, it's the scenesetter track ([[Sunsetter|Sunsetter???]] NOPE).
     In any case, hopefully Mark J. Hadley won't sue me for CREATIVE LICENSE.
     Oh yeah, Cindy (Betelgeuse) says this track reminds her of an undersea carnival, and that the ending is when all of the underwater elephants are climbing up on top of each other, about to topple down. And that's why it's the best part.
     I think that's the best way to describe this song.
@@ -123,7 +123,7 @@ MIDI Project Files:
 Commentary: |-
     <i>Toby Fox:</i>
     (CG Battle Theme)
-    [[track:showtime-original-mix|John's battle theme]] is simple with a heroic theme. It's catchy and brilliantly written.
+    [[Showtime (Original Mix)|John's battle theme]] is simple with a heroic theme. It's catchy and brilliantly written.
     Karkat's battle theme is almost needlessly complicated with sometimes obnoxious rhythms.
     There's some contrast here. In fact, when I was paralleling the original albums, Alex Rosetti (Albatross Soup) told me that it didn't work as a parallel because it was a little bit too... all-over-the-place. But in the end I feel like this works for Karkat. After all, he's a ride, indifferent guy, and wouldn't settle for any song that he couldn't firmly rage to.
     Interestingly, the melody was created by just stringing notes together until they made an interesting rhythmic and melodic arrangement. Then I added harmony and a disturbing amount of manual vibrato. When I was making it I worried that the melody would sound too forced or forgettable (especially given the way I created it), but in the end it turned out alright.
@@ -212,7 +212,7 @@ MIDI Project Files:
 Commentary: |-
     <i>Toby Fox:</i>
     (CG's Medium)
-    A dark sort of [[track:atomyk-ebonpyre|Atomyk Ebonpyre]]-y theme for Karkat's medium. The main melody is oddly catchy.
+    A dark sort of [[Atomyk Ebonpyre]]-y theme for Karkat's medium. The main melody is oddly catchy.
     I had a lot of trouble making this piece because the synthesizer I use to emulate the instruments that sound like they come from a Sega Genesis can only have a couple instances of itself open at once before Fruity Loops basically buckles at the knees and runs out of processing power. I ultimately had to render each part individually and stitch them together in Audacity.
     My inspiration for this track (and I think superior to it even as a theme for Karkat's medium, at least for the first few notes) is "Burn in the Dark" from Brandish 3. Fantastic track from an awesome-terrible video game with a wicked soundtrack.
     BURRRRRRRRRRRRRRN BABY BURRRRRRRRRRRRRRN.
@@ -315,11 +315,11 @@ Art Tags:
 - Alternia
 - 'cw: animal death'
 Referenced Tracks:
-- track:crustacean
+- Crustacean
 Commentary: |-
     <i>Toby Fox:</i>
     (Lusus Death Theme)
-    Not much to say on this one. If you couldn't tell, it's kind of a remix of [[track:crustacean]].
+    Not much to say on this one. If you couldn't tell, it's kind of a remix of [[Crustacean]].
     AND IT'S KINDA SAD.
     ALL THE LUSII ARE DYING.
     THE SUN WON'T COME OUT TO PLAY.
@@ -425,7 +425,7 @@ Cover Artists:
 Cover Art Date: July 18, 2010
 Cover Art File Extension: jpg
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 Sheet Music Files:
 - Title: Sheet music by Gamehunter
   Files:
diff --git a/album/alterniabound.yaml b/album/alterniabound.yaml
index bb052715..7dea2f4f 100644
--- a/album/alterniabound.yaml
+++ b/album/alterniabound.yaml
@@ -101,7 +101,7 @@ Art Tags:
 - Karkat
 - Meteor
 Referenced Tracks:
-- track:crustacean
+- Crustacean
 Sheet Music Files:
 - Title: Sheet music by Tsuwami
   Files:
@@ -127,7 +127,7 @@ MIDI Project Files:
 Commentary: |-
     <i>Toby Fox:</i>
     (Karkat Walkabout)
-    [[album:alternia|Alternia]] began when I created [[track:crustacean|Crustacean]].
+    [[album:alternia|Alternia]] began when I created [[Crustacean]].
     AlterniaBound began when Andrew asked me for a looping version of that track - Crustacean - to use in a flash. Initially this song was simply so, but after I learned more about the scope and depth of the AlterniaBound project... I decided that more of a change was in order for the track. (It was at that point that I also decided it would be cool to have some hidden tracks... leading to the early premiere of many tracks that would eventually be on [[album:homestuck-vol-6]].
     A little while ago, I finished the "final version" of this track. It's not incredibly melodic or wrenchingly dire like my usual fare, but it still remains one of my own personal favorites:
     - It's pompous, alien, and goofy - in short, pretty accurate of Karkat and Alternia as a whole
@@ -154,7 +154,7 @@ Art Tags:
 - 'cw: cops'
 - 'cw: hanging'
 Referenced Tracks:
-- track:under-the-hat
+- Under The Hat
 Sheet Music Files:
 - Title: Sheet music by Erik Scheele (original composer)
   Files:
@@ -193,7 +193,7 @@ Art Tags:
 Referenced Tracks:
 - The Lemonsnout Turnabout
 - Phoenix Wright - Objection! 2001
-- track:sburban-jungle
+- Sburban Jungle
 Sheet Music Files:
 - Title: Sheet music by EuniverseCat
   Files:
@@ -240,7 +240,7 @@ Art Tags:
 - Scalemates
 Referenced Tracks:
 - The Lemonsnout Turnabout
-- track:theme
+- Theme
 Sheet Music Files:
 - Title: Piano score by Resound
   Files:
@@ -308,7 +308,7 @@ Art Tags:
 - LoMaT
 Referenced Tracks:
 - Spider's Claw
-- track:theme
+- Theme
 Sheet Music Files:
 - Title: Sheet music by Tsuwami
   Files:
@@ -344,7 +344,7 @@ Referenced Tracks:
 - Spider's Claw
 - track:MeGaLoVania
 - Eridan's Theme
-- track:crustacean
+- Crustacean
 Commentary: |-
     <i>Tensei:</i>
     (Adventure on the High Seas)
@@ -374,14 +374,14 @@ Art Tags:
 - Karkat
 - Vriska
 Referenced Tracks:
-- track:showtime-imp-strife-mix
+- Showtime (Imp Strife Mix)
 - Pumpkin Cravings
-- track:harlequin
+- Harlequin
 - Sunsetter
 - dESPERADO ROCKET CHAIRS,
 - track:MeGaLoVania
-- track:vagabounce
-- track:beatdown-strider-style
+- Vagabounce
+- Beatdown (Strider Style)
 Commentary: |-
     <i>David Ko:</i>
     (Tavros' Battle Theme)
@@ -735,7 +735,7 @@ Art Tags:
 - Skaia
 - 'cw: blood'
 Referenced Tracks:
-- track:crustacean
+- Crustacean
 - The Lemonsnout Turnabout
 - dESPERADO ROCKET CHAIRS,
 - Virgin Orb
@@ -766,7 +766,7 @@ Commentary: |-
     This was designed as music for the EPIC yet only hinted at battle between the Black King and the Trolls at the end of their game. Rather than making it a fast-paced action-centric doom-fest, it ended upmore like some kind of apocalyptic dance number: The Trolls, despite going against fairly tough odds, all banded together under Karkat's leadership into a well oiled, tactical nuclear force that managed to overcome the Black King and beat the game.
     It is, along with the unique 'Black King's theme, more or less a combination of various Troll themes arranged in order of attack. It's probably easier to just explain what's going on where:
     0:00 - We start with the black king's introduction, Aradiabots from doomed timelines teleporting in and assembling, the reckoning beginning, the Vast Glub being suppressed.
-    1:34 - At this point, the fearless leader steps into action as the first to attack ([[track:crustacean|Crustacean]]). I like to think this move shreds any sense of doubt they had in Karkat as leader at this point. Karkat's theme's quite fun to work with, so I enjoyed this bit.
+    1:34 - At this point, the fearless leader steps into action as the first to attack ([[Crustacean]]). I like to think this move shreds any sense of doubt they had in Karkat as leader at this point. Karkat's theme's quite fun to work with, so I enjoyed this bit.
     2:03 - Terezi made sense as a logical follow to Karkat ([[The Lemonsnout Turnabout]]). It starts off quite simple yet more organised than Karkat's section, representing Terezi's initial appearance as a fairly harmless, blind Troll girl, before building up to her surprise attack. I'd already mucked about with Terezi's theme in my other track, but this one I think is a bit more faithful to the original.
     2:34 - The King responds.
     2:56 - Tavros in his Jet Car ([[dESPERADO ROCKET CHAIRS,]]). There's a hint of tragedy to Tavros' character that I think comes through here - His melody kinda builds up but just as he's about to act it kinda fades back down. Ah well... The world's smallest violin is playing the intro trumpet section to Tavros' original theme here.
@@ -820,7 +820,7 @@ Art Tags:
 - Matriorb
 - Alternia
 Referenced Tracks:
-- track:theme
+- Theme
 Sheet Music Files:
 - Title: Sheet music by EuniverseCat
   Files:
@@ -1032,7 +1032,7 @@ Cover Artists:
 Cover Art Date: March 14, 2011
 Cover Art File Extension: jpg
 Referenced Tracks:
-- track:theme
+- Theme
 Commentary: |-
     <i>Toby Fox:</i>
     These aren't "true" pieces... just jingles based off of "Theme". But I hope that for all their insignificance, they really instill the idea of a game inside of you.
@@ -1050,7 +1050,7 @@ Cover Artists:
 Art Tags:
 - Karkat
 Referenced Tracks:
-- track:theme
+- Theme
 Commentary: |-
     <i>Toby Fox:</i>
     When you win a battle on Alternia, this song plays. No one knows who's singing.
@@ -1070,7 +1070,7 @@ Cover Artists:
 Art Tags:
 - Karkat
 Referenced Tracks:
-- track:theme
+- Theme
 Commentary: |-
     <i>Toby Fox:</i>
     And with that.... good night.
diff --git a/album/ancestral.yaml b/album/ancestral.yaml
index 643aed90..0b8d1dc3 100644
--- a/album/ancestral.yaml
+++ b/album/ancestral.yaml
@@ -163,7 +163,7 @@ Art Tags:
 - The Signless
 - Alternia
 Referenced Tracks:
-- track:skies-of-skaia
+- Skies of Skaia
 Commentary: |-
     <i>Nate Tronerud:</i>
     Cursed with visions of a better Alternia, one of love and peace, the Signless walks ever forward. Visions of such a world may bring to Him great pain, but also great hope: it is a ÷orld worth striving for, one He could possibly see in His own lifetime, and so He continues walking. He spreads the message of such a world knowing it will fall on mostly deaf ears, even met with hostility. But for the chance to bring love and happiness to even a single troll, it fills Him; His suffering is worth it, even if it means making the ultimate sacrifice in the name of peace...
@@ -203,7 +203,7 @@ Art Tags:
 - The Dolorosa
 - The Signless
 Referenced Tracks:
-- track:crustacean
+- Crustacean
 Commentary: |-
     <i>SerialSymphony:</i>
     Theotokos is about how the Dolorosa saw the Signless growing up, his sermons and execution, and ends with a look forward to his descendant. Making this song was like making a premix brownie cake; I love brownie cakes. But you can't just make a brownie cake, you gotta eat it too.
@@ -389,7 +389,7 @@ Art Tags:
 - Alternia
 - 'cw: hanging'
 Referenced Tracks:
-- track:theme
+- Theme
 - Darling Dolorosa
 - Iron Infidel
 - track:olive-scribe
@@ -810,10 +810,10 @@ Art Tags:
 - Dualscar
 Referenced Tracks:
 - Wind-up Storm
-- track:doctor
+- Doctor
 Commentary: |-
     <i>Llyona Fang:</i>
-    A deep and lively dancing tune in 6/8 and 5/4 time, containing excerpts of [[Wind-up Storm]] by Llyona Fang (me) and [[track:doctor|Doctor]] by Buzinkai.
+    A deep and lively dancing tune in 6/8 and 5/4 time, containing excerpts of [[Wind-up Storm]] by Llyona Fang (me) and [[Doctor]] by Buzinkai.
     <i>Donomon:</i>
     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.
 ---
@@ -1091,6 +1091,7 @@ Commentary: |-
 ---
 Track: Mutiny
 Directory: mutiny-ancestral
+Always Reference By Directory: true
 Artists:
 - Zan Beaver
 Duration: '5:30'
@@ -1203,7 +1204,7 @@ Art Tags:
 Referenced Tracks:
 - track:fuchsia-ruler
 - Gold Pilot
-- track:heir-of-grief
+- Heir of Grief
 Commentary: |-
     <i>Circlejourney:</i>
     The Doom of the Planets is about Her Imperious Condescension's relationship with the Helmsman throughout her interplanetary conquest. Grandiose orchestral snippets are interspersed with intimate, sometimes dissonant contrapuntal segments featuring motifs from [[Gold Pilot]] and [[track:fuchsia-ruler]]. Eventually the various disparate moods of the piece unite at the climax of the piece, signifying the ship's final leap through the cosmos, which ends in theHelmsman's death, the music fading way as his life does.
@@ -1239,7 +1240,7 @@ Cover Artists:
 Art Tags:
 - The Handmaid
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 Commentary: |-
     <i>SerialSymphony:</i>
     Handmaiden's F(l)ight is really two songs, or maybe a song inside a song? What I'm saying is that there's a very deep meaning behind whatever it is I did and you should be impressed. Also, I entirely made this track so people would stop complaining about there being no Sburban Jungle remixes.
diff --git a/album/archive.yaml b/album/archive.yaml
index d7b43870..f4a31b6c 100644
--- a/album/archive.yaml
+++ b/album/archive.yaml
@@ -511,7 +511,7 @@ URLs:
 - https://bowman.bandcamp.com/track/jungle-boogie
 - https://www.youtube.com/watch?v=Df9m1mux-BU
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 Commentary: |-
     <i>Michael Guy Bowman:</i>
     Outtake from [[album:homestuck-vol-10]], 2016
diff --git a/album/aspect-clock.yaml b/album/aspect-clock.yaml
index a4b73fa4..2418486a 100644
--- a/album/aspect-clock.yaml
+++ b/album/aspect-clock.yaml
@@ -44,7 +44,7 @@ URLs:
 - https://actomega.bandcamp.com/track/the-clock-ticks-on
 - https://soundcloud.com/user-201967720/the-clock-ticks-on?in=user-201967720/sets/aspectclock
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 ---
 Track: Savior in a Blue Suit
 Duration: '02:12'
@@ -52,7 +52,7 @@ URLs:
 - https://actomega.bandcamp.com/track/savior-in-a-blue-suit
 - https://soundcloud.com/user-201967720/savior-in-a-blue-suit?in=user-201967720/sets/aspectclock
 Referenced Tracks:
-- track:doctor
+- Doctor
 - track:penumbra-phantasm
 ---
 Track: Caretakers
@@ -70,7 +70,7 @@ URLs:
 - https://soundcloud.com/user-201967720/seer-from-the-depths?in=user-201967720/sets/aspectclock
 Referenced Tracks:
 - Black Rose / Green Sun
-- track:sburban-jungle
+- Sburban Jungle
 - Crystalanthemums
 ---
 Track: Universe Breaker
@@ -141,7 +141,7 @@ URLs:
 - https://actomega.bandcamp.com/track/umbral-union
 - https://soundcloud.com/user-201967720/umbral-union?in=user-201967720/sets/aspectclock
 Referenced Tracks:
-- track:umbral-ultimatum
+- Umbral Ultimatum
 Sampled Tracks:
 - Typheus
 ---
@@ -160,7 +160,7 @@ URLs:
 - https://actomega.bandcamp.com/track/moment-of-valiance
 - https://soundcloud.com/user-201967720/moment-of-valiance?in=user-201967720/sets/aspectclock
 Referenced Tracks:
-- track:endless-climb
+- Endless Climb
 - A Taste for Adventure
 ---
 Track: Penumbra Phantasm
diff --git a/album/basement-tale.yaml b/album/basement-tale.yaml
index 1fba11e2..1a3477aa 100644
--- a/album/basement-tale.yaml
+++ b/album/basement-tale.yaml
@@ -69,7 +69,7 @@ URLs:
 Referenced Tracks:
 - cool and new Jungle (Beta Mix)
 - Homestuck Anthem
-- track:sburban-jungle
+- Sburban Jungle
 - Another Jungle
 - Fighting Spirit
 ---
@@ -185,13 +185,13 @@ Referenced Tracks:
 - track:archagent-everlasting
 - Venom Pools for Eons
 - Misery Loves Company
-- track:chorale-for-jaspers
+- Chorale for Jaspers
 - Tick
 - Tock
 - Three in the Morning
 - licord nacrasty
 - Rex Duodecim Angelus
-- track:aggrieve
+- Aggrieve
 - track:in-the-beginning-canwc
 Commentary: |-
     <i>Makin:</i>
diff --git a/album/beforus.yaml b/album/beforus.yaml
index 4e6e08d0..898b35b8 100644
--- a/album/beforus.yaml
+++ b/album/beforus.yaml
@@ -130,7 +130,7 @@ Referenced Tracks:
 - The Lost Child
 - iRRRRRRRRECONCILA8LE
 - track:penumbra-phantasm
-- track:doctor
+- Doctor
 Commentary: |-
     <i>Rhyselinn:</i>
     Hi! I'm Rhyselinn, the composer for Rufioh Nitram's track "Breathtak1ng."
@@ -770,10 +770,10 @@ Cover Artists:
 Art Tags:
 - Meenah
 Referenced Tracks:
-- track:chorale-for-jaspers
+- 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!
+    This song is a result of me playing around with the theme from [[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!
     <i>Sigourney Martin:</i>
     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.
 ---
@@ -790,7 +790,7 @@ Cover Artists:
 Art Tags:
 - 'cw: eye horror'
 Referenced Tracks:
-- track:explore
+- Explore
 - track:ruins
 Commentary: |-
     <i>RowBird:</i>
@@ -1109,7 +1109,7 @@ Art Tags:
 - Damara
 Referenced Tracks:
 - Hate You
-- track:theme
+- 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.
@@ -1254,7 +1254,7 @@ Art Tags:
 - Dark Carnival
 Referenced Tracks:
 - Homestuck Anthem
-- track:harlequin
+- 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.
@@ -1511,7 +1511,7 @@ Art Tags:
 - Beforus
 Referenced Tracks:
 - Featherlight
-- track:theme
+- 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.
@@ -1640,7 +1640,7 @@ Cover Artists:
 Art Tags:
 - Meulin
 Referenced Tracks:
-- track:sburban-jungle
+- 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
@@ -1711,7 +1711,7 @@ Art Tags:
 - Porrim
 Referenced Tracks:
 - Homestuck Anthem
-- track:skies-of-skaia
+- 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,
diff --git a/album/beyond-canon.yaml b/album/beyond-canon.yaml
index 4e21acd3..a78551e5 100644
--- a/album/beyond-canon.yaml
+++ b/album/beyond-canon.yaml
@@ -81,7 +81,7 @@ Cover Artists:
 Art Tags:
 - Dirk
 Referenced Tracks:
-- track:showtime-original-mix
+- Showtime (Original Mix)
 Commentary: |-
     <i>David Ellis:</i>
     (<a href="https://twitter.com/Ducksual/status/1249782135688437761">Twitter</a>)
diff --git a/album/bowmania.yaml b/album/bowmania.yaml
index a9206941..c7acc027 100644
--- a/album/bowmania.yaml
+++ b/album/bowmania.yaml
@@ -47,8 +47,8 @@ Cover Artists:
 Duration: '02:18'
 Referenced Tracks:
 - Michael Bowman Remix
-- track:savior-of-a-lot-of-money
-- track:heir-of-grief
+- Savior of a Lot of Money
+- Heir of Grief
 Sampled Tracks:
 - Your Bed
 - Bumper to Bumper
@@ -267,10 +267,10 @@ Cover Artists:
 - Hadron
 Duration: '02:08'
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 - Michael Bowman Remix
 - Fly
-- track:chorale-for-jaspers
+- Chorale for Jaspers
 - Chain Of Prospit
 Sampled Tracks:
 - unknown TURN IT UP & other vague background samples
@@ -302,7 +302,7 @@ Cover Art File Extension: jpg
 Duration: '04:57'
 Referenced Tracks:
 - track:suicide-hotline
-- track:sburban-jungle
+- Sburban Jungle
 - track:MeGaLoVania
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/bowmaniasmr-roleplay-intentional-part-one
@@ -358,7 +358,7 @@ Cover Artists:
 Cover Art File Extension: jpg
 Duration: '05:32'
 Referenced Tracks:
-- track:chorale-for-jaspers
+- Chorale for Jaspers
 - Texas History Theme
 - Haltmann Works Co. Theme Song
 URLs:
@@ -517,7 +517,7 @@ Referenced Tracks:
 - Dawn of Man
 - Fly
 - Three Small Words
-- track:sburban-jungle
+- Sburban Jungle
 - I'm Seeing Everything
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/im-not-saying-anything
@@ -583,7 +583,7 @@ Duration: '04:33'
 Referenced Tracks:
 - '"Libera me" from hell'
 - Michael Bowman Remix
-- track:sburban-jungle
+- Sburban Jungle
 - 'Harrison: An American Musical'
 - Underneath It All
 Sampled Tracks:
@@ -1188,11 +1188,11 @@ Duration: '02:06'
 Referenced Tracks:
 - Waters of Nazareth
 - Michael Bowman Remix
-- track:sburban-jungle
+- Sburban Jungle
 Sampled Tracks:
 - Waters of Nazareth
 - Michael Bowman Remix
-- track:sburban-jungle
+- Sburban Jungle
 - Bowman's Credit Score
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/credit-of-nazareth
@@ -1301,10 +1301,10 @@ Art Tags:
 - Mobius Trip
 Duration: '03:01'
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 - Michael Bowman Remix
 Sampled Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 - Michael Bowman Remix
 - Texas History
 URLs:
@@ -1748,7 +1748,7 @@ Duration: '02:34'
 Referenced Tracks:
 - Savior of the Waking World
 - Michael Bowman Remix
-- track:sburban-jungle
+- Sburban Jungle
 - Dawn of Man
 Sampled Tracks:
 - Michael Bowman Remix
@@ -1905,4 +1905,4 @@ Lyrics: |-
 
     (Homestuck was designed by the devil to trigger the armageddon and it seems like me writing slash reading this is yet another step towards for the doomsday machine.)
 
-    (Fucking die in a pitfall if you find this stupid bullshit "entertaining".)
\ No newline at end of file
+    (Fucking die in a pitfall if you find this stupid bullshit "entertaining".)
diff --git a/album/call-and-new-2-locomotif.yaml b/album/call-and-new-2-locomotif.yaml
index d3086309..452955ce 100644
--- a/album/call-and-new-2-locomotif.yaml
+++ b/album/call-and-new-2-locomotif.yaml
@@ -101,7 +101,7 @@ Referenced Tracks:
 - A new Track
 - track:moshi-moshi
 - Courser
-- track:sburban-countdown
+- Sburban Countdown
 - track:penumbra-phantasm
 ---
 Track: A New Chronicala
@@ -131,9 +131,9 @@ URLs:
 Referenced Tracks:
 - A new Journey
 - Fruity Pebbles Jingle
-- track:upward-movement-dave-owns
+- Upward Movement (Dave Owns)
 - Oppa Toby Style
-- track:mutiny
+- Mutiny
 ---
 Track: Hijacking Jungle
 Artists:
@@ -146,9 +146,9 @@ URLs:
 - https://youtu.be/e0RDJOz5XH0
 Referenced Tracks:
 - Backtracking
-- track:umbral-ultimatum
+- Umbral Ultimatum
 - track:MeGaLoVania
-- track:sburban-jungle
+- Sburban Jungle
 ---
 Track: Chronological Noise
 Artists:
@@ -161,7 +161,7 @@ URLs:
 - https://youtu.be/k-9i3IPRzL0
 Referenced Tracks:
 - A New Chronicala
-- track:sburban-jungle
+- Sburban Jungle
 ---
 Track: Organ Donation
 Artists:
@@ -271,7 +271,7 @@ URLs:
 - https://youtu.be/2JDo1jGKZIs
 Referenced Tracks:
 - Chronic Jungle
-- track:showtime-original-mix
+- Showtime (Original Mix)
 ---
 Track: Heartwich (With Strings)
 Artists:
@@ -285,11 +285,11 @@ URLs:
 Referenced Tracks:
 - Have a Heart
 - Ruins (With Strings)
-- track:upward-movement-dave-owns
+- Upward Movement (Dave Owns)
 Sampled Tracks:
 - Have a Heart
 - Ruins (With Strings)
-- track:upward-movement-dave-owns
+- Upward Movement (Dave Owns)
 - some episode of spongebob
 - loud nigra
 - U Guessed It
@@ -333,7 +333,7 @@ URLs:
 Referenced Tracks:
 - Cascade (Beta)
 - Pokémon Theme (Gotta Catch 'Em All)
-- track:sburban-jungle
+- Sburban Jungle
 - Fruity Pebbles Redux
 - Have a Heart
 ---
@@ -348,8 +348,8 @@ URLs:
 - https://youtu.be/CdyqtJXjJa0
 Referenced Tracks:
 - Infection
-- track:showtime-original-mix
-- track:showtime-piano-refrain
+- Showtime (Original Mix)
+- Showtime (Piano Refrain)
 - 'NV: Strife'
 - Vriska Dance
 ---
@@ -365,22 +365,22 @@ URLs:
 Referenced Tracks:
 - Infection
 - Lotus
-- track:showtime-piano-refrain
-- track:sburban-countdown
+- Showtime (Piano Refrain)
+- Sburban Countdown
 - RollerCoaster Tycoon Theme
-- track:upward-movement-dave-owns
-- track:endless-climb
+- Upward Movement (Dave Owns)
+- Endless Climb
 - Descend
 - Courser
 - Crystalanthemums
 - Virgin Orb
-- track:aggrieve
+- Aggrieve
 - track:moshi-moshi
 - Ascend
 - 'femorafreack: invesetigat'
 - Liquid Negrocity
 - CONTACT
-- track:skies-of-skaia
+- Skies of Skaia
 Sampled Tracks:
 - Heartwich (With Strings)
 ---
@@ -395,7 +395,7 @@ URLs:
 - https://youtu.be/ryq22RBJ1_o
 Referenced Tracks:
 - track:battle-champion-pokemon-gold-and-silver-versions
-- track:chorale-for-jaspers
+- Chorale for Jaspers
 Sampled Tracks:
 - Heartwich
 Lyrics: |-
@@ -648,10 +648,10 @@ URLs:
 Referenced Tracks:
 - I legitimately hate blighttown
 - Pumpkin Party in Sea Hitler's Water Apocalypse
-- track:ohgodwhat
+- Ohgodwhat
 - Dance of Thorns
 - Waterfall
-- track:chorale-for-jaspers
+- Chorale for Jaspers
 ---
 Track: Converge
 Artists:
@@ -668,7 +668,7 @@ Referenced Tracks:
 - Plaguespreader
 - track:hurt-my-finger
 - track:old-secret
-- track:sburban-jungle
+- Sburban Jungle
 - Descend
 Sampled Tracks:
 - Secretary of Industrial Rap and Grunge Rock Kurt "MCRIDE" Cobain
@@ -700,7 +700,7 @@ URLs:
 - https://youtu.be/NO0gyo89Wps
 Referenced Tracks:
 - 'Dead Secretary: Zero Health'
-- track:chorale-for-jaspers
+- Chorale for Jaspers
 - All Star
 ---
 Track: I slightly dislike chiptown
@@ -715,7 +715,7 @@ URLs:
 Referenced Tracks:
 - I really hate Cooltown
 - Meet the Flintstones
-- track:sburban-jungle
+- Sburban Jungle
 Lyrics: |-
     (This is just like chiptune music.)
 
@@ -750,7 +750,7 @@ URLs:
 - https://youtu.be/dvJi1tBAfNI
 Referenced Tracks:
 - 'Dead Secretary: Zero Health'
-- track:chorale-for-jaspers
+- Chorale for Jaspers
 ---
 Track: Ich bin not dead.
 Artists:
@@ -763,7 +763,7 @@ URLs:
 - https://youtu.be/nkRZgNoE6RU
 Referenced Tracks:
 - 'Dead Secretary: Zero Health'
-- track:chorale-for-jaspers
+- Chorale for Jaspers
 - All Star
 ---
 Track: I absolutely loathe this Drummer.
@@ -778,8 +778,8 @@ URLs:
 Referenced Tracks:
 - I slightly dislike chiptown
 - How to Converge at Flavortown
-- track:sburban-jungle
-- track:dissension-original
+- Sburban Jungle
+- Dissension (Original)
 Lyrics: |-
     Kick, snare, kikick snare, kikikick snare kick kick snare (x38)
 ---
@@ -1068,16 +1068,16 @@ Referenced Tracks:
 - Backtracking
 - track:moshi-moshi
 - Courser
-- track:sburban-jungle
+- Sburban Jungle
 - A New Chronicala
 - Fruity Pebbles Jingle
 - Pokémon Theme (Gotta Catch 'Em All)
 - Regent Erratic
 - Chronic Jungle
 - Spider Dance
-- track:showtime-piano-refrain
-- track:welcome-to-flavortown-battle-against-a-bodacious-foe
-- track:upward-movement-dave-owns
+- Showtime (Piano Refrain)
+- Welcome to Flavortown (Battle Against a Bodacious Foe)
+- Upward Movement (Dave Owns)
 - Ruins (With Strings)
 - Infection
 - Vaccine
@@ -1112,7 +1112,7 @@ URLs:
 - https://soundcloud.com/difarem/train-meldey-next-to-last-station
 Referenced Tracks:
 - Infection
-- track:showtime-original-mix
+- Showtime (Original Mix)
 - Vaccine
 - Plague
 - Plagueback
@@ -1127,7 +1127,7 @@ Referenced Tracks:
 - track:hurt-my-finger
 - Flare
 - Rhythm Code
-- track:upward-movement-dave-owns
+- Upward Movement (Dave Owns)
 ---
 Track: Train Requiem
 Artists:
@@ -1258,4 +1258,4 @@ Directory: cool-mp3
 Artists:
 - Difarem
 Has Cover Art: false
-Duration: '00:15'
\ No newline at end of file
+Duration: '00:15'
diff --git a/album/call-and-new.yaml b/album/call-and-new.yaml
index e4769dfb..4d83ace2 100644
--- a/album/call-and-new.yaml
+++ b/album/call-and-new.yaml
@@ -205,21 +205,21 @@ URLs:
 - https://youtu.be/ZjTJKVN7lzo
 Referenced Tracks:
 - Contact Established (Unused Vocal Mix)
-- track:beatdown-strider-style
-- track:showtime-original-mix
+- Beatdown (Strider Style)
+- Showtime (Original Mix)
 - track:MeGaLoVania
-- track:doctor
-- track:sburban-jungle
+- Doctor
+- Sburban Jungle
 - Lotus
 - Cascade (Beta)
-- track:upward-movement-dave-owns
-- track:skies-of-skaia
-- track:explore
-- track:endless-climb
+- Upward Movement (Dave Owns)
+- Skies of Skaia
+- Explore
+- Endless Climb
 - track:penumbra-phantasm
 - Rex Duodecim Angelus
 - Liquid Negrocity
-- track:aggrieve
+- Aggrieve
 - Virgin Orb
 ---
 Track: Stay in Touch
@@ -324,7 +324,7 @@ URLs:
 Referenced Tracks:
 - track:moshi-moshpit
 - Put A Donk On It
-- track:beatdown-strider-style
+- Beatdown (Strider Style)
 - Freefall
 Sampled Tracks:
 - Put A Donk On It
@@ -341,7 +341,7 @@ URLs:
 Referenced Tracks:
 - Moshi Means Business
 - Put A Donk On It
-- track:beatdown-strider-style
+- Beatdown (Strider Style)
 Sampled Tracks:
 - Put A Donk On It
 Lyrics: |-
@@ -389,9 +389,9 @@ URLs:
 - https://youtu.be/KHoDvvXCfe4
 Referenced Tracks:
 - Good Grievous Bodily Harm
-- track:sburban-jungle
+- Sburban Jungle
 - RollerCoaster Tycoon Theme
-- track:chorale-for-jaspers
+- Chorale for Jaspers
 ---
 Track: Delicious and Nutritious Countdown
 Artists:
@@ -442,8 +442,8 @@ URLs:
 Referenced Tracks:
 - Let's Get Ready to Meme!
 - Get Ready For This
-- track:beatdown-strider-style
-- track:doctor
+- Beatdown (Strider Style)
+- Doctor
 Sampled Tracks:
 - Get Ready For This
 Lyrics: |-
@@ -459,7 +459,7 @@ URLs:
 Referenced Tracks:
 - Let's Get Ready to μίμημα!
 - Seinfeld Theme
-- track:explore
+- Explore
 Sampled Tracks:
 - Seinfeld Theme
 - Bowman's Credit Score
@@ -475,7 +475,7 @@ URLs:
 - https://youtu.be/0IsnAV1_6zE
 Referenced Tracks:
 - Please Be Ready To Kill Me And Eat My Fucking Remains
-- track:explore
+- Explore
 Sampled Tracks:
 - Please Be Ready To Kill Me And Eat My Fucking Remains
 - Bowman's Credit Score
@@ -590,8 +590,8 @@ Referenced Tracks:
 - track:archagent-everlasting
 - Meet the Flintstones
 - White Nuxxle Driver
-- track:doctor
-- track:explore
+- Doctor
+- Explore
 - track:MeGaLoVania
 - Another Medium
 - Snow halation
@@ -631,10 +631,10 @@ URLs:
 Referenced Tracks:
 - Blood Moon
 - Three in the Morning
-- track:explore
-- track:sburban-jungle
+- Explore
+- Sburban Jungle
 - Crystamanthequins
-- track:upward-movement-dave-owns
+- Upward Movement (Dave Owns)
 - RollerCoaster Tycoon Theme
 - Touchdown
 Sampled Tracks:
@@ -654,11 +654,11 @@ Referenced Tracks:
 - CONTACT
 - X Gon' Give It to Ya
 - The Nutshack Intro
-- track:showtime-original-mix
-- track:sburban-jungle
+- Showtime (Original Mix)
+- Sburban Jungle
 - Stay in Touch
 - The Stains of Time
-- track:beatdown-strider-style
+- Beatdown (Strider Style)
 - Do You Remem8er Me
 - Bad Radio
 - First Contact
@@ -667,10 +667,10 @@ Referenced Tracks:
 - Good Grievous Bodily Harm
 - RollerCoaster Tycoon Theme
 - Snow halation
-- track:doctor
+- Doctor
 - Telephone ascension
 - Seinfeld Theme
-- track:black
+- Black
 - track:moonsetter
 - Meet the Flintstones
 - All Star
diff --git a/album/canwave-2.yaml b/album/canwave-2.yaml
index 1f207201..cd5c61a4 100644
--- a/album/canwave-2.yaml
+++ b/album/canwave-2.yaml
@@ -194,9 +194,9 @@ Referenced Tracks:
 - Reverie
 - track:frost-vol6
 - Coursing
-- track:black
+- Black
 - Cobalt Thief
-- track:doctor
+- Doctor
 - Candles and Clockwork (Alpha Version)
 - FantasyP
 - Liquid Negrocity
@@ -207,9 +207,9 @@ Sampled Tracks:
 - Reverie
 - track:frost-vol6
 - Coursing
-- track:black
+- Black
 - Cobalt Thief
-- track:doctor
+- Doctor
 - Candles and Clockwork (Alpha Version)
 - FantasyP
 - Liquid Negrocity
@@ -250,9 +250,9 @@ Art Tags:
 Cover Art File Extension: jpg
 Duration: '03:57'
 Referenced Tracks:
-- track:the-ballad-of-jack-noir
+- The Ballad of Jack Noir
 Sampled Tracks:
-- track:the-ballad-of-jack-noir
+- The Ballad of Jack Noir
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/--12
 - https://youtu.be/QQKNFo_Gwsc
@@ -283,7 +283,7 @@ Art Tags:
 - Skaia
 Duration: '02:24'
 Referenced Tracks:
-- track:skies-of-skaia
+- Skies of Skaia
 Sampled Tracks:
 - Dial-up tones
 - MacOS SFX
@@ -346,7 +346,7 @@ Art Tags:
 Duration: '01:05'
 Referenced Tracks:
 - track:MeGaLoVania
-- track:beatdown-strider-style
+- Beatdown (Strider Style)
 Sampled Tracks:
 - Bowman's Credit Score
 - Moon Age
@@ -638,9 +638,9 @@ Art Tags:
 - Rose
 Duration: '15:33'
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 Sampled Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/a-lamentful-walk-through-the-sburban-plain
 - https://youtu.be/SvBNclrDNWI
@@ -1040,7 +1040,7 @@ Sampled Tracks:
 - Game Boy Advance SFX
 - MacOS SFX
 - Ugly Story
-- track:sburban-jungle
+- Sburban Jungle
 - Windows XP SFX
 - Bop It!
 - Flare (Cascade)
@@ -1271,4 +1271,4 @@ Duration: '01:56'
 URLs:
 - https://youtu.be/WqMGZ6H0cwc
 Referenced Tracks:
-- track:explore
\ No newline at end of file
+- Explore
diff --git a/album/canwave.yaml b/album/canwave.yaml
index fdca569a..eca22d70 100644
--- a/album/canwave.yaml
+++ b/album/canwave.yaml
@@ -144,10 +144,10 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/beatdown-poppa
 - https://youtu.be/aOdHWezMB0s
 Referenced Tracks:
-- track:beatdown-strider-style
+- Beatdown (Strider Style)
 - Big Poppa
 Sampled Tracks:
-- track:beatdown-strider-style
+- Beatdown (Strider Style)
 - Big Poppa
 Lyrics: |-
     To all the ladies in the place with style and grace
@@ -297,9 +297,9 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/b-e-t-d-o-vv-n
 - https://youtu.be/FttOl03MFMk
 Referenced Tracks:
-- track:beatdown-strider-style
+- Beatdown (Strider Style)
 Sampled Tracks:
-- track:beatdown-strider-style
+- Beatdown (Strider Style)
 ---
 Track: doctorwave
 Directory: doctorwave-canwave
@@ -318,9 +318,9 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/doctorwave-2
 - https://youtu.be/YWNNCUFvmMo
 Referenced Tracks:
-- track:doctor
+- Doctor
 Sampled Tracks:
-- track:doctor
+- Doctor
 ---
 Track: Descend more calmly.
 Artists:
@@ -351,9 +351,9 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/b-l-c-k
 - https://youtu.be/wfZdg4VPu44
 Referenced Tracks:
-- track:black
+- Black
 Sampled Tracks:
-- track:black
+- Black
 ---
 Track: C R Y S T A L S
 Directory: crystals-canwave
@@ -560,9 +560,9 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/--7
 - https://youtu.be/ZqS6xnn6pcc
 Referenced Tracks:
-- track:doctor
+- Doctor
 Sampled Tracks:
-- track:doctor
+- Doctor
 ---
 Track: Bowmasquiddlewave V2
 Artists:
@@ -649,9 +649,9 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/--9
 - https://youtu.be/M4cc4EOIG_4
 Referenced Tracks:
-- track:endless-climb
+- Endless Climb
 Sampled Tracks:
-- track:endless-climb
+- Endless Climb
 ---
 Track: Vaporflare
 Artists:
diff --git a/album/canwc-for-the-holidays.yaml b/album/canwc-for-the-holidays.yaml
index f1f19761..33fba5c8 100644
--- a/album/canwc-for-the-holidays.yaml
+++ b/album/canwc-for-the-holidays.yaml
@@ -101,7 +101,7 @@ URLs:
 - https://youtu.be/NHCj8iSC3z4
 Referenced Tracks:
 - Carol of the Bells
-- track:sburban-jungle
+- Sburban Jungle
 - RollerCoaster Tycoon Theme
 - The One Horse Open Sleigh
 - Meet the Flintstones
@@ -322,7 +322,7 @@ URLs:
 - https://youtu.be/KOKcX5TGuj4
 Referenced Tracks:
 - Canon in D
-- track:upward-movement-dave-owns
+- Upward Movement (Dave Owns)
 ---
 Track: The Night Before Gristmas
 Artists:
@@ -376,10 +376,10 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/jhon-killed-santa
 - https://youtu.be/v-ISmEY_xPY
 Referenced Tracks:
-- track:showtime-original-mix
+- Showtime (Original Mix)
 - The One Horse Open Sleigh
 - track:sburban-reversal
-- track:beatdown-strider-style
+- Beatdown (Strider Style)
 Lyrics: |-
     jhon: oh boy, it is christmas
     jhon: i, jhon egbret, am so excited
@@ -457,7 +457,7 @@ URLs:
 - https://youtu.be/SM8vPr-MyZ4
 Referenced Tracks:
 - track:MeGaLoVania
-- track:upward-movement-dave-owns
+- Upward Movement (Dave Owns)
 ---
 Track: How Do I Live Without Christmas
 Artists:
@@ -583,4 +583,4 @@ Lyrics: |-
     Merry merry merry merry merry merry merry merry
     Merry Chris Merry Chris
     Merry merry merry merry merry merry merry merry
-    Merry Chris Merry Chris
\ No newline at end of file
+    Merry Chris Merry Chris
diff --git a/album/canwc-sound-test-1.yaml b/album/canwc-sound-test-1.yaml
index 75674180..ea94e00c 100644
--- a/album/canwc-sound-test-1.yaml
+++ b/album/canwc-sound-test-1.yaml
@@ -83,8 +83,8 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/updoggtor
 - https://youtu.be/tZdnAMGfHMs
 Referenced Tracks:
-- track:upward-movement-dave-owns
-- track:doctor
+- Upward Movement (Dave Owns)
+- Doctor
 ---
 Track: Wwaporvvave
 Artists:
@@ -371,7 +371,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/doctor-chan-unfucked
 - https://youtu.be/fFvBvQXWdj4
 Referenced Tracks:
-- track:doctor
+- Doctor
 ---
 Track: Hoenn Cascade
 Artists:
@@ -391,7 +391,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/hoenn-doctor
 - https://youtu.be/52ZQPZaZLRA
 Referenced Tracks:
-- track:doctor
+- Doctor
 ---
 Track: Hoenn Vale
 Artists:
@@ -444,9 +444,9 @@ URLs:
 Referenced Tracks:
 - track:MeGaLoVania
 - Cascade (Beta)
-- track:doctor
-- track:sburban-jungle
-- track:showtime-original-mix
+- Doctor
+- Sburban Jungle
+- Showtime (Original Mix)
 ---
 Track: Revival
 Artists:
@@ -561,10 +561,10 @@ URLs:
 - https://youtu.be/smHFiMwN-_Y
 Referenced Tracks:
 - Roundabout
-- track:sburban-jungle
+- Sburban Jungle
 Sampled Tracks:
 - Roundabout
-- track:sburban-jungle
+- Sburban Jungle
 ---
 Track: the day of all teh blood!
 Artists:
@@ -624,7 +624,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/grubian-residential-district
 - https://youtu.be/nHWIFdwy4-Q
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 ---
 Track: its a project that i worked on and then didnt care about anymore
 Artists:
@@ -642,7 +642,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/its-megaman-except-the-song-is-homestuck-too
 - https://youtu.be/MSqSCrIjiOM
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 - Meet the Flintstones
 ---
 Track: its music mmbaby
@@ -653,10 +653,10 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/its-music-mmbaby
 - https://youtu.be/odZPQmXn4Fs
 Referenced Tracks:
-- track:showtime-piano-refrain
-- track:doctor
-- track:umbral-ultimatum
-- track:endless-climb
+- Showtime (Piano Refrain)
+- Doctor
+- Umbral Ultimatum
+- Endless Climb
 ---
 Track: Like Jimmy, Like Flash
 Artists:
@@ -667,7 +667,7 @@ URLs:
 - https://youtu.be/ADHMGmA1NXY
 Referenced Tracks:
 - track:MeGaLoVania
-- track:endless-climb
+- Endless Climb
 ---
 Track: Soulward Movement (Davepeta owns)
 Artists:
@@ -677,12 +677,12 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/soulward-movement-davepeta-owns
 - https://youtu.be/SMmGVSvSk5w
 Referenced Tracks:
-- track:upward-movement-dave-owns
+- Upward Movement (Dave Owns)
 - Walls Covered in Blood
 - Olive Rogue
-- track:endless-climb
+- Endless Climb
 Sampled Tracks:
-- track:upward-movement-dave-owns
+- Upward Movement (Dave Owns)
 ---
 Track: Megalovania (Marimbakind)
 Artists:
@@ -703,7 +703,7 @@ URLs:
 - https://youtu.be/S3Iikh-xDPw
 Referenced Tracks:
 - Negastrife
-- track:upward-movement-dave-owns
+- Upward Movement (Dave Owns)
 ---
 Track: Rap Test (the doggo rap)
 Artists:
@@ -730,7 +730,7 @@ URLs:
 - https://youtu.be/3upUY-_Phc8
 Referenced Tracks:
 - Homestuck Anthem
-- track:sburban-jungle
+- Sburban Jungle
 - Another Jungle
 - Fighting Spirit
 ---
@@ -742,8 +742,8 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/a-synth-thing-wip-name
 - https://youtu.be/vuoHS8KDUOg
 Referenced Tracks:
-- track:beatdown-strider-style
-- track:sburban-jungle
+- Beatdown (Strider Style)
+- Sburban Jungle
 ---
 Track: Endless Fall
 Artists:
@@ -753,7 +753,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/endless-fall
 - https://youtu.be/dWXPez_rCKU
 Referenced Tracks:
-- track:endless-climb
+- Endless Climb
 ---
 Track: Over the hat
 Artists:
@@ -763,7 +763,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/over-the-hat
 - https://youtu.be/O3gsaGaDf3I
 Referenced Tracks:
-- track:under-the-hat
+- Under The Hat
 ---
 Track: Showup
 Artists:
@@ -827,10 +827,10 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/crazy-elevator
 - https://youtu.be/wC-OWFvVV4c
 Referenced Tracks:
-- track:upward-movement-dave-owns
+- Upward Movement (Dave Owns)
 - CRAZYBUS Title Screen
 Sampled Tracks:
-- track:upward-movement-dave-owns
+- Upward Movement (Dave Owns)
 - CRAZYBUS Title Screen
 ---
 Track: derse gon give it to ya (brief)
@@ -979,9 +979,9 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/hamburban-jangle
 - https://youtu.be/pOiowBvYwVQ
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 Sampled Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 ---
 Track: Layers Uppon Layers Uphon Lahyers Upoon Lawyers Unpow Laryards Awnop Lanyeos Punwo Lyanerons
 Artists:
@@ -1036,9 +1036,9 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/xplore
 - https://youtu.be/p56ZsL0wqt8
 Referenced Tracks:
-- track:explore
+- Explore
 Sampled Tracks:
-- track:explore
+- Explore
 ---
 Track: Harlecoaster (Lame and Old)
 Artists:
@@ -1299,10 +1299,10 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/err-of-greif-original-mix
 - https://youtu.be/yXpe5AvCS9o
 Referenced Tracks:
-- track:heir-of-grief
+- Heir of Grief
 - Knife's Edge
 - track:MeGaLoVania
-- track:umbral-ultimatum
+- Umbral Ultimatum
 Sampled Tracks:
 - Knife's Edge
 ---
@@ -1415,24 +1415,24 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/3x-piano-solo
 - https://youtu.be/yDFC2cs2VwA
 Referenced Tracks:
-- track:showtime-piano-refrain
-- track:harlequin
-- track:aggrieve
-- track:skies-of-skaia
-- track:atomyk-ebonpyre
+- Showtime (Piano Refrain)
+- Harlequin
+- Aggrieve
+- Skies of Skaia
+- Atomyk Ebonpyre
 - Liquid Negrocity
-- track:sburban-jungle
-- track:chorale-for-jaspers
-- track:dissension-original
-- track:doctor
-- track:explore
-- track:endless-climb
-- track:upward-movement-dave-owns
+- Sburban Jungle
+- Chorale for Jaspers
+- Dissension (Original)
+- Doctor
+- Explore
+- Endless Climb
+- Upward Movement (Dave Owns)
 - Crystalanthemums
-- track:revelawesome
-- track:beatdown-strider-style
+- Revelawesome
+- Beatdown (Strider Style)
 - track:the-beginning-of-something-really-excellent
-- track:carefree-victory
+- Carefree Victory
 ---
 Track: A major in doctor
 Artists:
@@ -1442,7 +1442,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/a-major-in-doctor
 - https://youtu.be/IZk6OKX-2Ro
 Referenced Tracks:
-- track:doctor
+- Doctor
 ---
 Track: mooncrotales
 Artists:
@@ -1472,8 +1472,8 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/show-sburb-setter
 - https://youtu.be/z7nhmzHVUD8
 Referenced Tracks:
-- track:sburban-jungle
-- track:showtime-original-mix
+- Sburban Jungle
+- Showtime (Original Mix)
 - track:moonsetter
 ---
 Track: A E S T H E T O B Y S T Y L E
@@ -1547,7 +1547,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/k-k-doctor
 - https://youtu.be/bhhvCDNWZu0
 Referenced Tracks:
-- track:doctor
+- Doctor
 ---
 Track: Pepper Nadsat
 Artists:
@@ -1572,10 +1572,10 @@ URLs:
 - https://youtu.be/DaGScLNZUcg
 Referenced Tracks:
 - The Baby is You
-- track:doctor
+- Doctor
 Sampled Tracks:
 - The Baby is You
-- track:doctor
+- Doctor
 ---
 Track: A Day When The Sun Is Shining
 Artists:
@@ -1611,7 +1611,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/doctor-help-im-choking-mix
 - https://youtu.be/DbzISAMWBFI
 Referenced Tracks:
-- track:doctor
+- Doctor
 ---
 Track: Fantastic Exposition
 Artists:
@@ -1653,8 +1653,8 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/reveloshowtime-waking-up-the-radiation
 - https://youtu.be/v8sXEsdiVsQ
 Referenced Tracks:
-- track:revelawesome
-- track:showtime-original-mix
+- Revelawesome
+- Showtime (Original Mix)
 ---
 Track: sung for dady jhon
 Artists:
@@ -1664,10 +1664,10 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/sung-for-dady-jhon
 - https://youtu.be/ZAtqSPoMiho
 Referenced Tracks:
-- track:showtime-remix
+- Showtime Remix
 - RollerCoaster Tycoon Theme
 Sampled Tracks:
-- track:showtime-remix
+- Showtime Remix
 - RollerCoaster Tycoon Theme
 ---
 Track: Coasterlovania
@@ -2054,9 +2054,9 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/climbing-endlessly-alpha-version
 - https://youtu.be/I90FkzQhdwQ
 Referenced Tracks:
-- track:endless-climb
+- Endless Climb
 Sampled Tracks:
-- track:endless-climb
+- Endless Climb
 ---
 Track: Droogtime (CD Version)
 Artists:
@@ -2076,12 +2076,12 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/stopless-climb
 - https://youtu.be/OIORzyRPFc8
 Referenced Tracks:
-- track:endless-climb
+- Endless Climb
 - GameBro (Original 1990 Mix)
 - All Star
 - My Heart Will Go On
 Sampled Tracks:
-- track:endless-climb
+- Endless Climb
 - GameBro (Original 1990 Mix)
 - All Star
 - My Heart Will Go On
@@ -2145,7 +2145,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/suburger
 - https://youtu.be/gWKwwT02W4c
 Referenced Tracks:
-- track:skies-of-skaia
+- Skies of Skaia
 ---
 Track: '[S] Jerry: Hammer'
 Artists:
diff --git a/album/carne-vale-fusion-collab.yaml b/album/carne-vale-fusion-collab.yaml
index 43df8d38..8e1f5258 100644
--- a/album/carne-vale-fusion-collab.yaml
+++ b/album/carne-vale-fusion-collab.yaml
@@ -55,7 +55,7 @@ Referenced Tracks:
 - Bodies
 - The Nutshack Intro
 - Rollin' (Air Raid Vehicle)
-- track:upward-movement-dave-owns
+- Upward Movement (Dave Owns)
 - Back 2 Back
 - track:axel-f-crazy-frog
 - Michael Bowman Remix
@@ -90,7 +90,7 @@ Sampled Tracks:
 - DK Rap
 - The Nutshack Intro
 - Rollin'
-- track:upward-movement-dave-owns
+- Upward Movement (Dave Owns)
 - Back 2 Back
 - track:axel-f-crazy-frog
 - Michael Bowman Remix
diff --git a/album/cherubim.yaml b/album/cherubim.yaml
index cd64bf91..ff3d8baa 100644
--- a/album/cherubim.yaml
+++ b/album/cherubim.yaml
@@ -214,7 +214,7 @@ Art Tags:
 - Lil Cal
 Referenced Tracks:
 - Constant Confinement
-- track:doctor
+- Doctor
 Commentary: |-
     <i>Michael Guy Bowman:</i>
     I floated the idea for a UU + uu album last year in about June as a concept record divided in half with equal and analogous parts Calliope and Caliborn. While we really wanted to jump in and get to making more Homestuck music following Volume 9, we decided to wait and discover more of the two characters until December when Radiation re-organized the effort. He proposed the Jekyll / Hyde alternating pace of the album culminating in "Eternity Served Cold" and had the group split into pairs, each musician working with a partner on a track with the same themes and motifs.
@@ -272,14 +272,14 @@ Art Tags:
 - Caliborn
 - 'cw: blood'
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 - English
-- track:revelawesome
+- Revelawesome
 - Black Rose / Green Sun
-- track:endless-climb
+- Endless Climb
 - track:ruins
 - track:penumbra-phantasm
-- track:doctor
+- Doctor
 Sheet Music Files:
 - Title: Piano score by EuniverseCat
   Files:
@@ -315,15 +315,15 @@ Commentary: |-
     <b>The track in more detail</b>
     I tried to be a bit more cinematic in my orchestral arrangement here.  It's far from perfect, but it's better than previous attempts.  Gotta keep pushin' yourself I guess.
     Stuff you should be able to hear:
-    - [[track:sburban-countdown|Sburban Countdown]] (At the start and occasionally in other places)
+    - [[Sburban Countdown]] (At the start and occasionally in other places)
     - [[English]] (Should be obvious)
-    - [[track:revelawesome|Revelawesome]] (ARound 2:40)
+    - [[Revelawesome]] (ARound 2:40)
     - [[Black Hole / Green Sun]] (Twisted a bit, but after the Revelawesome section. The music box makes it noticeable, and 'English' is playing on top of it)
-    - [[track:endless-climb|Endless Climb]] (Subtly added at 3:37)
+    - [[Endless Climb]] (Subtly added at 3:37)
     - [[track:ruins|Ruins]] at 4:03
     - [[track:penumbra-phantasm]] and hints of the finale of the SotDD section in [[Cascade]] at the end.
     Stuff you didn't hear because the track ends before it gets going:
-    - [[track:doctor|Doctor]]
+    - [[Doctor]]
     - Quite a bit of guitar
     So why make another Medley fest? Quite a lot of the HS themes blend really nicely together, and we can associate a lot of events and memories with past flashes (Revelawesome was used as a kind of gag, but here's it more sinister).  I do like a good Medley, and judging from the reaction of Descend, RDA and the latest Solo Album, you guys do too!
     The track was made in FL Studio. It mostly uses SoundsOnline EWQL VST libraries, namely:
diff --git a/album/coloUrs-and-mayhem-universe-a.yaml b/album/coloUrs-and-mayhem-universe-a.yaml
index 9ed82ea5..586b2c2a 100644
--- a/album/coloUrs-and-mayhem-universe-a.yaml
+++ b/album/coloUrs-and-mayhem-universe-a.yaml
@@ -357,7 +357,7 @@ Art Tags:
 - Dualscar
 - Alternia
 Referenced Tracks:
-- track:showtime-piano-refrain
+- Showtime (Piano Refrain)
 Commentary: |-
     <i>Willow Ascenzo:</i>
     Let's talk about Violet Mariner.
diff --git a/album/coloUrs-and-mayhem-universe-b.yaml b/album/coloUrs-and-mayhem-universe-b.yaml
index 0682df3d..ce572f76 100644
--- a/album/coloUrs-and-mayhem-universe-b.yaml
+++ b/album/coloUrs-and-mayhem-universe-b.yaml
@@ -71,7 +71,7 @@ Art Tags:
 - John
 - LoWaS
 Referenced Tracks:
-- track:doctor
+- Doctor
 - Moonsong
 - Eternal Recurrence
 - A Bell is Tolling
@@ -104,7 +104,7 @@ Cover Art File Extension: png
 Art Tags:
 - Rose
 Referenced Tracks:
-- track:chorale-for-jaspers
+- Chorale for Jaspers
 - Black Rose / Green Sun
 Commentary: |-
     <i>David DeCou:</i>
@@ -130,7 +130,7 @@ Art Tags:
 - Dave
 - LoHaC
 Referenced Tracks:
-- track:atomyk-ebonpyre
+- Atomyk Ebonpyre
 Commentary: |-
     <i>Nathan H.:</i>
     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.
@@ -218,8 +218,8 @@ Art Tags:
 - Cats
 - 'cw: alcohol'
 Referenced Tracks:
-- track:chorale-for-jaspers
-- track:aggrieve
+- Chorale for Jaspers
+- Aggrieve
 - track:carefree-action
 Commentary: |-
     <i>Ryan Ames:</i>
@@ -381,7 +381,7 @@ Art Tags:
 - 'cw: blood'
 - 'cw: corpse (abstract)'
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 ---
 Track: Pale Rapture
 Artists:
@@ -411,8 +411,8 @@ Cover Art File Extension: png
 Art Tags:
 - John
 Referenced Tracks:
-- track:doctor
-- track:showtime-original-mix
+- Doctor
+- Showtime (Original Mix)
 Sheet Music Files:
 - Title: Sheet music by Kurama101
   Files:
@@ -582,7 +582,7 @@ Art Tags:
 - The Condesce
 - Imperial Drones
 Referenced Tracks:
-- track:chorale-for-jaspers
+- Chorale for Jaspers
 ---
 Track: Coolkid
 Artists:
@@ -611,9 +611,9 @@ Art Tags:
 - Dave
 - LoHaC
 Referenced Tracks:
-- track:beatdown-strider-style
-- track:atomyk-ebonpyre
-- track:upward-movement-dave-owns
+- Beatdown (Strider Style)
+- Atomyk Ebonpyre
+- Upward Movement (Dave Owns)
 Sheet Music Files:
 - Title: MIDI by pixelseph (original composer)
   Files:
@@ -729,7 +729,7 @@ Art Tags:
 - Horrorterrors
 - Green Sun
 Referenced Tracks:
-- track:endless-climb
+- Endless Climb
 ---
 Track: Pipeorgankind
 Artists:
@@ -745,28 +745,28 @@ Art Tags:
 - John
 - LoWaS
 Referenced Tracks:
-- track:showtime-original-mix
+- Showtime (Original Mix)
 - Warhammer of Zillyhoo
-- track:explore
+- Explore
 - Liquid Negrocity
-- track:doctor
+- Doctor
 - Lifdoff
-- track:harlequin
+- 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!
     I thought it might be fun to show you all the nods and themes I used in the track! (though unless otherwise stated its Showtime, throughout)
-    - 0:00 [[track:showtime-original-mix|Showtime (Original Mix)]]
+    - 0:00 [[Showtime (Original Mix)]]
     - 0:35 [[Warhammer of Zillyhoo]]
-    - 1:05 [[track:explore|Explore]]
-    - 1:24 [[track:black|Black]]
-    - 1:47 [[track:doctor|Doctor]]
+    - 1:05 [[Explore]]
+    - 1:24 [[Black]]
+    - 1:47 [[Doctor]]
     - 2:04 [[Lifdoff]]
-    - 2:17 [[track:harlequin|Harlequin]] / [[Toccata and Fugue in D minor]]
+    - 2:17 [[Harlequin]] / [[Toccata and Fugue in D minor]]
     - 2:29 Toccata line turns into [[Warhammer of Zillyhoo]]
-    - 3:27 [[track:doctor|Doctor]] line again
-    - 3:32 [[track:harlequin|Harlequin]]
+    - 3:27 [[Doctor]] line again
+    - 3:32 [[Harlequin]]
     - 3:43 Zillyhoo/Toccata line
     - 3:56 I wrote in a Breath, (or whats called a Grand Pause!) since John was the Heir of Breath!
     Thanks for all the overwhelming encouragement and support! I wouldn't be here without you guys!
diff --git a/album/cool-and-new-greatest-hits.yaml b/album/cool-and-new-greatest-hits.yaml
index ef134e2a..8c79f50f 100644
--- a/album/cool-and-new-greatest-hits.yaml
+++ b/album/cool-and-new-greatest-hits.yaml
@@ -745,9 +745,9 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/final-confrontation
 Referenced Tracks:
 - track:game-over
-- track:sburban-jungle
+- Sburban Jungle
 - track:MeGaLoVania
-- track:explore
+- Explore
 - Cascade (Beta)
 Commentary: |-
     <i>Makin:</i>
@@ -782,4 +782,4 @@ Art Tags:
 Duration: '06:41'
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/a-very-o-christmas-2
-- https://www.youtube.com/watch?v=BQOcTSnVTEk
\ No newline at end of file
+- https://www.youtube.com/watch?v=BQOcTSnVTEk
diff --git a/album/cool-and-new-homestuck-2.yaml b/album/cool-and-new-homestuck-2.yaml
index a3fb0aca..e6c276db 100644
--- a/album/cool-and-new-homestuck-2.yaml
+++ b/album/cool-and-new-homestuck-2.yaml
@@ -200,9 +200,9 @@ URLs:
 - https://youtu.be/ItXQiBCrVa0
 Referenced Tracks:
 - Even in Death
-- track:aggrieve
+- Aggrieve
 - Terezi's Theme
-- track:crustacean
+- Crustacean
 Commentary: |- 
     <i>Cerulean:</i> (Composer)
     Made this song cus i love even in death, tried to get as far away from even in dance as i could while keeping somethings. Thats why i used the same synth for the lead, Massive.
@@ -303,7 +303,7 @@ URLs:
 - https://youtu.be/slkR4cd51s4
 Referenced Tracks:
 - track:liquid-negrocity
-- track:black
+- Black
 Commentary: |- 
    <i>sylvarn:</i> (Composer)
    I have no idea, but shit instruments and dial-up noises are 100% what this needed. not.
@@ -395,11 +395,11 @@ Referenced Tracks:
 - track:metamorphic-choices
 - Stay in Touch
 - track:moshi-moshi
-- track:explore
-- track:sburban-jungle
+- Explore
+- Sburban Jungle
 - Even in Death
 - Hate You
-- track:upward-movement-dave-owns
+- Upward Movement (Dave Owns)
 - track:MeGaLoVania
 Commentary: |- 
     <i>ostrichlittledungeon:</i> (Composer)
@@ -425,7 +425,7 @@ URLs:
 Referenced Tracks:
 - track:jungle-3
 - Unite Synchronization
-- track:showtime-original-mix
+- Showtime (Original Mix)
 - Sburban Resolution
 - track:moshi-moshi
 Commentary: |- 
@@ -454,7 +454,7 @@ Referenced Tracks:
 - track:boss-battle-pokemon-typing-adventure
 - Unite Synchronization
 - English
-- track:endless-climb
+- Endless Climb
 - All We're Gonna Get
 - Negastrife
 Commentary: |- 
@@ -492,7 +492,7 @@ URLs:
 - https://youtu.be/nJm8KWJxh_k
 Referenced Tracks:
 - RollerCoaster Tycoon Theme
-- track:upward-movement-dave-owns
+- Upward Movement (Dave Owns)
 - track:liquid-negrocity
 - Even in Death (T'Morra's Belly Mix)
 Commentary: |- 
@@ -515,7 +515,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/doctor-phd-begin-d2a5
 - https://youtu.be/lmnBU39OJCs
 Referenced Tracks:
-- track:doctor
+- Doctor
 ---
 Track: jake englii2h you are LIITERALLY lowwer than rat piiss iin my eyes, ii wwould use all my half-baked hope powwers to put a donut shaped hole iin your stomach but iits too much effort so iim just goiing to contiinuously giivve you the biird (kazoo version)
 Directory: jake-english-you-are-literally-lower-than-rat-piss
@@ -581,7 +581,7 @@ URLs:
 Referenced Tracks:
 - Tentacles
 - Horschestra
-- track:sburban-jungle
+- Sburban Jungle
 - English
 Lyrics: |-
     (Holy ******. I am so ludicrously ****** strong. Whoops, pardon my language. That there was some ****** straight up dog. And I'm chagrined as ******.)
@@ -633,7 +633,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/gnarly-piono-solbo
 - https://youtu.be/_JOKlz2anmM
 Referenced Tracks:
-- track:doctor
+- Doctor
 - RollerCoaster Tycoon Theme
 - A Taste for Adventure
 Commentary: |- 
@@ -701,7 +701,7 @@ URLs:
 - https://youtu.be/Zy1YpYIwRuE
 Referenced Tracks:
 - track:carne-vale
-- track:chorale-for-jaspers
+- Chorale for Jaspers
 - We Are Number One
 - The Messenger 2012
 Commentary: |- 
@@ -729,8 +729,8 @@ URLs:
 - https://youtu.be/R9hE62ctUHM
 Referenced Tracks:
 - RollerCoaster Tycoon Theme
-- track:showtime-piano-refrain
-- track:harlequin
+- Showtime (Piano Refrain)
+- Harlequin
 Commentary: |- 
     <i>ostrichlittledungeon:</i> (Composer)
     Ugh, [[track:pipeorgankind|Pipeorgankind]]. The tempo is nowhere near steady. I basically had to play bits and then line them up with each other, which I guess kind of fits how the original sounds?
@@ -755,11 +755,11 @@ Referenced Tracks:
 - English
 - Lifdoff
 - Unite Synchronization
-- track:revelawesome
+- Revelawesome
 - track:jungle-3
 - track:rainbow-connection
 - Negastrife
-- track:explore
+- Explore
 - track:im-a-member-of-the-midnight-crew
 Commentary: |- 
     <i>Starlight Calliope:</i> (Composer)
@@ -859,17 +859,17 @@ URLs:
 - https://www.youtube.com/watch?v=4aipoj_eVHw
 Referenced Tracks:
 - Creata
-- track:skies-of-skaia
-- track:harlequin
+- Skies of Skaia
+- Harlequin
 - Showdown
 - Liquid Negrocity
 - track:fuchsia-ruler
-- track:explore
-- track:showtime-original-mix
-- track:revelawesome
+- Explore
+- Showtime (Original Mix)
+- Revelawesome
 - Negastrife
 - Walk-Stab-Walk (R&E)
-- track:upward-movement-dave-owns
+- Upward Movement (Dave Owns)
 Commentary: |- 
     <i>cookiefonster:</i> (Composer)
     At first I wanted to remix Creata for CANH to fix the problem that the beta kids' motifs didn't sync with the flash and because I'm the only one smart enough to realize that. But then I didn't want to because I thought it would be hard. Then I wanted to do it again, but I heard someone else already did it. I never found the old song so I went ahead and did it anyway. It turns out the old cool and new Creata was some kind of meme dump that wasn't meant to sync with the flash. 
@@ -934,7 +934,7 @@ Referenced Tracks:
 - The Nutshack Intro
 - Disney Bootlegs - JonTron
 - Oppa Toby Style
-- track:explore
+- Explore
 - Blue (Da Ba Dee) (DJ Ponte Ice Pop Mix)
 - Lord Spanish
 - Galo Sengen
@@ -954,21 +954,21 @@ Referenced Tracks:
 - A Cruel Angel's Thesis
 - Interior Crocodile Alligator
 - Virgin Orb
-- track:aggrieve
+- Aggrieve
 - Bassline Junkie
 - Gravity Falls Main Title Theme
-- track:showtime-original-mix
+- Showtime (Original Mix)
 - Snow halation
 - X Gon' Give It to Ya
 - Jane Dargason
 - Wonderwall
 - A Baby Legend - The Baby is 2
-- track:upward-movement-dave-owns
+- Upward Movement (Dave Owns)
 - Terezi's Theme
 - Derse Dreamers
 - track:moonsetter
 - Unite Synchronization
-- track:beatdown-strider-style
+- Beatdown (Strider Style)
 - Vigilante ~ Cornered
 - The Lemonsnout Turnabout
 - Tick
@@ -979,12 +979,12 @@ Referenced Tracks:
 - RollerCoaster Tycoon Theme
 - The Next Episode (Radio Edit)
 - track:ruins-undertale
-- track:harlequin
+- Harlequin
 - Problem Sleuth Theme
 - The Blind Prophet
-- track:endless-climb
+- Endless Climb
 - track:unintentional-touhou
-- track:sburban-jungle
+- Sburban Jungle
 - Flying Car
 - AAAAAAAAAAAAAAAAAAAAA
 - We Are Number One
@@ -1121,12 +1121,12 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/eternity-served-medium-well-avec-cr-me-de-champignons-a-k-a-eternity-served-spicy
 - https://www.youtube.com/watch?v=gWXCAlyax9w
 Referenced Tracks:
-- track:showtime-original-mix
+- Showtime (Original Mix)
 - Hate You
 - Derse Dreamers
-- track:doctor
+- Doctor
 - Rex Duodecim Angelus
-- track:harlequin
+- Harlequin
 Commentary: |- 
     <i>Noisemaker:</i> (Composer)
     The one thing I tried to do with this track was to not use melodies from songs that had been used to death (I'm looking at you, Sburban Jungle). I then swiftly proceeded to use Showtime, Harlequin, and Doctor in the first section of the song. Still, I'm happy with how this turned out, and I'm glad I was able to use some obscure lietmotifs (namely Derse Dreamers and Hate You). One of the only problems that I had making this song was that I didn't use the original song's tempo, which led to a ton of spots that weren't synced with the animation. I was able to fix this by adding tempo changes, but I think it still sounds kind of chaotic at some parts. But other than that, I tried to make this one of the best songs I've done for CaNH, and I hope you can at least sorta agree with me.
@@ -1151,7 +1151,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/tycoon-of-grief
 - https://www.youtube.com/watch?v=k121EJf2TMk
 Referenced Tracks:
-- track:heir-of-grief
+- Heir of Grief
 - RollerCoaster Tycoon Theme
 - Snow halation
 - KARATE
@@ -1296,4 +1296,4 @@ Lyrics: |-
     Bowman Bowman Bowman Bobobo— (Michael Bowman)
     Bowman Bowman Bowman Bobobo— (Michael Bowman)
     Bowman Bowman Bowman Bobobo— (Michael Bowman)
-    (I'm—)
\ No newline at end of file
+    (I'm—)
diff --git a/album/cool-and-new-homestuck-3.yaml b/album/cool-and-new-homestuck-3.yaml
index cadfc1e0..f697da85 100644
--- a/album/cool-and-new-homestuck-3.yaml
+++ b/album/cool-and-new-homestuck-3.yaml
@@ -53,7 +53,7 @@ Art Tags:
 Duration: '02:21'
 Referenced Tracks:
 - track:gasters-theme
-- track:showtime-piano-refrain
+- Showtime (Piano Refrain)
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/spoopy-piano-o-o
 - https://youtu.be/KGuxvBcXstI
@@ -129,7 +129,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/jhon-play-us-a-ditty
 - https://youtu.be/sTeHHoYG6Ic
 Referenced Tracks:
-- track:showtime-imp-strife-mix
+- Showtime (Imp Strife Mix)
 Commentary: |-
     <i>meems:</i> (Composer)
     As I was looking through the possible flashes to work on, nothing struck me with more joy than [[flash:397|JOHN THIS IS NO TIME FOR SLUMBER]]. Right when I heard that first group of violins come in in the original song, it was at that point, I knew. I had to do my work. It was a sunny September day. There was a humid summer air, yet, it felt as if the end of the unbearable heat was in sight. I opened up my DAW of choice, and knew what had to be done. As the song came together, there was only one thing that I could think of that would make this song great. Little did I know that this choice would have immediate repercussions on this song. As I placed the GM Trumpet onto the pattern, my heart sank. However, this sinking wasn't because of sadness, it was because of great joy. I had created a masterpiece. This masterpiece, however, had to be handled masterfully. There was only one thing that I could do: A sprite replacement. The following is a screenshot of the commentary spreadsheet, where a heated 'discussion' took place on this track. I have decided preserve its original format in the spirits of both preservations and compactness.As I opened up Flash, and replaced all of the sprites with our favorite protagonist, the work only got better from there. I replaced the audio, and moved the cursor over to the "Preview" button. Did I want to click it? Did I want to find out what would happen if I pressed that button. Yes. Yes I did. I clicked play. My jaw dropped. It was as if I was in a pit of crocodiles, dauntlessly staring death into the eyes, and proceeding to say "fuck you", as this magnificent savior rescues me. Tears were streaming down my face. Emotions were being tampered with. It was a work of gods. I exported my masterpiece, and from then on, the world was never the same.
@@ -177,7 +177,7 @@ URLs:
 - https://youtu.be/us-2Akq22Rk
 Referenced Tracks:
 - track:skaian-dreams-remix
-- track:skies-of-skaia
+- Skies of Skaia
 - track:formation
 Commentary: |-
     <i>Wheals:</i> (Composer)
@@ -204,7 +204,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/vagaboing
 - https://youtu.be/MFyvrkKEKnQ
 Referenced Tracks:
-- track:vagabounce
+- Vagabounce
 Commentary: |-
     <i>CogentInvalid:</i> (Composer)
     This was essentially an exercise in finding the stupidest instruments possible. A quartet for jawharp, kazoo, tuba, and Steve from Blue's Clues.
@@ -253,7 +253,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/harleband-2-the-return-of-harleband
 - https://youtu.be/f4_7xs4_gYM
 Referenced Tracks:
-- track:harleboss
+- Harleboss
 - HarleBand
 - track:MeGaLoVania
 - Cascade (Beta)
@@ -279,7 +279,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/pnoy-crhlae
 - https://youtu.be/gr5C6OK5hFc
 Referenced Tracks:
-- track:pony-chorale
+- Pony Chorale
 Commentary: |-
     <i>Isoleucine:</i> (Composer)
     This song was originally called something like "pony chorale(future instuments mix)" and It was cool and stuff but then my drive died and I had to remake it and so this time I was like, how much weirder can I make this? Bam! Dedicated Theremin VST, lofi kick, some fun dist on a dissonance,etc. So yeah I mean it's cool. Who knew you could use Fruity Kick for something? I also kind of think it came out spoopy.
@@ -300,12 +300,12 @@ URLs:
 - https://youtu.be/AQZ5VZ60dKo
 Referenced Tracks:
 - Unbreakable Unity
-- track:mutiny
+- Mutiny
 - Mutiny (crapapella)
-- track:carefree-victory
+- Carefree Victory
 Sampled Tracks:
 - Unbreakable Unity
-- track:mutiny
+- Mutiny
 - Feel (Alive)
 - Mutiny (crapapella)
 Lyrics: |-
@@ -329,16 +329,16 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/actually-the-plot-snaps-in-place
 - https://youtu.be/AskDfgmilII
 Referenced Tracks:
-- track:ballad-of-awakening
-- track:sburban-jungle
+- Ballad of Awakening
+- Sburban Jungle
 - Squiddles!
 - track:the-beginning-of-something-really-excellent
-- track:explore
-- track:beatdown-strider-style
+- Explore
+- Beatdown (Strider Style)
 - RollerCoaster Tycoon Theme
-- track:dissension-original
+- Dissension (Original)
 - An Unbreakable Union
-- track:umbral-ultimatum
+- Umbral Ultimatum
 - Hallowed Halls
 Commentary: |-
     <i>SplitSuns:</i> (Composer)
@@ -443,7 +443,7 @@ Referenced Tracks:
 - Anbroids V2.0
 - track:sunslammer
 - Freefall
-- track:mutiny
+- Mutiny
 - track:muse-of-nanchos
 Commentary: |-
     <i>cookiefonster:</i> (Composer)
@@ -502,7 +502,7 @@ Sampled Tracks:
 - Tock
 Commentary: |-
     <i>cookiefonster:</i> (Composer)
-    For this one I adapted my countdown arrangement of Jungle #3 to sync with this flash, and I think I put it to pretty good use. Just as Act 1 ends with a [[track:sburban-countdown|countdown version of Sburban Jungle]], cool and new Act 6 Act 1 ends with a countdown version of Jungle #3. Better yet it replaces literally just windy sound effects.
+    For this one I adapted my countdown arrangement of Jungle #3 to sync with this flash, and I think I put it to pretty good use. Just as Act 1 ends with a [[Sburban Countdown|countdown version of Sburban Jungle]], cool and new Act 6 Act 1 ends with a countdown version of Jungle #3. Better yet it replaces literally just windy sound effects.
 
     <i>Shadok:</i> (Artist)
     The bad thing is the explosion you nutshack
@@ -517,9 +517,9 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/despite-all-my-rage-i-am-still-just-a-nic-in-a-cage
 - https://youtu.be/6NJK1yCI2yY
 Referenced Tracks:
-- track:hardlyquin
+- Hardlyquin
 Sampled Tracks:
-- track:hardlyquin
+- Hardlyquin
 - Matchstick Men
 - The Wicker Man
 - Vampire's Kiss
@@ -568,7 +568,7 @@ Referenced Tracks:
 - track:hardchorale
 - At The Price of Oblivion
 - Completely Delusional
-- track:pony-chorale
+- Pony Chorale
 - Three in the Medley
 Sampled Tracks:
 - Chorale for Caliborn
@@ -577,7 +577,7 @@ Sampled Tracks:
 - track:hardchorale
 - At The Price of Oblivion
 - Completely Delusional
-- track:pony-chorale
+- Pony Chorale
 - Three in the Medley
 Commentary: |-
     <i>cookiefonster:</i> (Composer)
@@ -602,7 +602,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/tiny-chorale
 - https://youtu.be/kgo59pVR2vY
 Referenced Tracks:
-- track:pony-chorale
+- Pony Chorale
 Commentary: |-
     <i>TirantBacon:</i> (Composer)
     I didn't really have a proper idea for this song at all. To be honest, this song was more of an attempt at an overly dramatic orchestral version of Pony Chorale, which was quite funny to note as this is a rather large song for a smol pony.
@@ -651,9 +651,9 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/the-version-we-had-of-this-was-unusable-and-we-had-like-one-day-to-replace-it-so-yazshu-whipped-out-his-kazoo-and-here-we-are
 - https://youtu.be/3dPWehVdlAA
 Referenced Tracks:
-- track:i-dont-want-to-miss-a-thing
+- I Don't Want to Miss a Thing
 Sampled Tracks:
-- track:i-dont-want-to-miss-a-thing
+- I Don't Want to Miss a Thing
 Commentary: |-
     <i>yazshu:</i> (Composer)
     I dont know who made the title of this track but it basically explained everything i was going to say here
@@ -676,14 +676,14 @@ Referenced Tracks:
 - We Are Number One
 - Trickster Mode (Engage)
 - The Nutshack Intro
-- track:doctor
+- Doctor
 - Killers
 Sampled Tracks:
 - We Are Number One
 - Trickster Mode (Engage)
 - 'Metal Gear Rising: Revengeance'
 - The Nutshack Intro
-- track:doctor
+- Doctor
 - Killers
 Lyrics: |-
     Hey! (Memes. The DNA of the soul.)
@@ -932,18 +932,18 @@ URLs:
 Referenced Tracks:
 - English
 - Eternity Served Cold
-- track:explore
+- Explore
 - Another Jungle
 - Celestial Fantasia
 - Switchback
 - track:moshi-moshi
-- track:sburban-jungle
+- Sburban Jungle
 - track:MeGaLoVania
 - Michael Bowman Remix
 - track:axel-f
 - The Lyrist
 - Flare
-- track:sburban-jungle
+- Sburban Jungle
 - We Are Number One
 - Snow halation
 - Meet the Flintstones
@@ -965,10 +965,10 @@ Referenced Tracks:
 - The Nutshack Intro
 - All We're Gonna Get
 - track:ruins-undertale
-- track:black
+- Black
 - Ruins (With Strings)
 - Time on My Side
-- track:showtime-original-mix
+- Showtime (Original Mix)
 - track:unintentional-touhou
 - track:formation
 - Windchime Foley
@@ -1079,9 +1079,9 @@ Art Tags:
 - Aradia
 - Skaia
 Referenced Tracks:
-- track:doctor
+- Doctor
 - Cascade (Beta)
-- track:sburban-jungle
+- Sburban Jungle
 - Tick
 - Lord Spanish
 - Fruity Pebbles Jingle
@@ -1091,7 +1091,7 @@ Referenced Tracks:
 - track:penumbra-phantasm
 - Even in Death
 - Space Jam
-- track:chorale-for-jaspers
+- Chorale for Jaspers
 - At The Price of Oblivion
 - Contra
 - Ascend
@@ -1099,7 +1099,7 @@ Referenced Tracks:
 - Moshi Moshi?
 - track:unintentional-touhou
 - CONTACT
-- track:upward-movement-dave-owns
+- Upward Movement (Dave Owns)
 - track:formation
 - track:jungle-3
 - Muse of Nanchos
@@ -1139,11 +1139,11 @@ Referenced Tracks:
 - Death by Glamour
 - RollerCoaster Tycoon Theme
 - Sunsetter
-- track:showtime-piano-refrain
-- track:endless-climb
+- Showtime (Piano Refrain)
+- Endless Climb
 Commentary: |-
     <i>Noisemaker:</i> (Composer)
     I initially made this as a submission for credits about a month before the deadline, and proceeded to not finish it until 45 minutes before the deadline, hence the uncompleted song (seriously its like 3 minutes shorter than [[flash:8130|[S] Credits]] is), but hey everything worked out in the end :^)
 
     <i>Interrobang:</i> (Booklet Maker)
-    Glad to be done with these tbh (for now at least)
\ No newline at end of file
+    Glad to be done with these tbh (for now at least)
diff --git a/album/cool-and-new-homestuck.yaml b/album/cool-and-new-homestuck.yaml
index fa6a7a27..93574573 100644
--- a/album/cool-and-new-homestuck.yaml
+++ b/album/cool-and-new-homestuck.yaml
@@ -52,7 +52,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/showtime-begin-canh-act-1
 - https://www.youtube.com/watch?v=gQwViq6qdAg
 Referenced Tracks:
-- track:showtime-original-mix
+- Showtime (Original Mix)
 ---
 Track: Backyard Dumb
 Artists:
@@ -106,10 +106,10 @@ Art Tags:
 - Dave
 - Jade
 Referenced Tracks:
-- track:showtime-original-mix
+- Showtime (Original Mix)
 Commentary: |-
     <i>Bambosh:</i>
-    I'm not sure what 413 did to make this song, but it sounds like he chucked the [[track:showtime-original-mix|original Showtime chiptune]] into a midi converter and changed some of the midi instruments around. I kind of unironically love this song though. Despite how chaotic it is, it's inexplicably satisfying to listen to.
+    I'm not sure what 413 did to make this song, but it sounds like he chucked the [[Showtime (Original Mix)|original Showtime chiptune]] into a midi converter and changed some of the midi instruments around. I kind of unironically love this song though. Despite how chaotic it is, it's inexplicably satisfying to listen to.
 
     Oh and by the way this one was an absolute pain to sync to the video. You'd think it would be easy, just chuck it over the thing and call it a day but no. There's only like 30 seconds of content in [[flash:90|the flash]], and no way to easily isolate the sound effects from the original song. As of writing this, I still don't have a solution. But hey there's still a week to release I'm sure it'll be fine hahahahahahahaha oh god help
 
@@ -130,7 +130,7 @@ Art Tags:
 - John
 Referenced Tracks:
 - track:cascante
-- track:sburban-countdown
+- Sburban Countdown
 Sampled Tracks:
 - track:cascante
 Commentary: |-
@@ -151,7 +151,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/explore-begin-canh-act-2
 - https://www.youtube.com/watch?v=ONzT-xVJMYE
 Referenced Tracks:
-- track:explore
+- Explore
 ---
 Track: Aggrieve!
 Directory: aggrieve-canmt
@@ -168,7 +168,7 @@ Art Tags:
 - Rose
 Referenced Tracks:
 - track:conflict
-- track:aggrieve
+- Aggrieve
 Commentary: |-
     <i>Wheals:</i>
     Aggrieve! by wheals is licensed under a cc-by-nc-sa Creative Commons License.
@@ -202,8 +202,8 @@ Art Tags:
 - Dave
 - Earth
 Referenced Tracks:
-- track:upward-movement-dave-owns
-- track:beatdown-strider-style
+- Upward Movement (Dave Owns)
+- Beatdown (Strider Style)
 Commentary: |-
     <i>Minkt:</i>
     I really enjoyed the original Upward Movement, and felt that the new one would have to be even better to do the original justice. I have been infatuated with music that is more synthesised ever since I gave the Hotline Miami soundtrack a listen, so there is some inspiration there. The first version of this redvx had base midi drums and a guitar synthesizer and seemed off, so I looked up how to make synths like those in Hotline Miami and similar synthwave creations. After throwing on a new drum kit and synth, the song surprised me by actually sounding good. I'd like to thank Makin and others for giving the original a listen and telling me how to fix it, and the rest of the music and art team for putting out this COOL and NEW masterpiece. <a href="../../media/misc/JaedAngery.png">:JaedAngery:</a>
@@ -248,12 +248,12 @@ URLs:
 Art Tags:
 - WV
 Referenced Tracks:
-- track:explore
+- Explore
 - Litrichean Rioghail
 - Dance of Thorns
-- track:chorale-for-jaspers
-- track:under-the-hat
-- track:upward-movement-dave-owns
+- Chorale for Jaspers
+- Under The Hat
+- Upward Movement (Dave Owns)
 Sampled Tracks:
 - Mayor Maynot
 Lyrics: |-
@@ -284,7 +284,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/jungle-begin-canh-act-3
 - https://www.youtube.com/watch?v=NbCIUpM0Kn0
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 ---
 Track: Heedful Fads
 Artists:
@@ -324,7 +324,7 @@ Art Tags:
 - Dave's bro
 - Earth
 Referenced Tracks:
-- track:beatdown-strider-style
+- Beatdown (Strider Style)
 Commentary: |-
     <i>Noisemaker:</i>
     This one isn't all THAT special, I guess. It's pretty much just a Beatdown cover.
@@ -347,7 +347,7 @@ Art Tags:
 - Jhon
 - John
 Referenced Tracks:
-- track:harleboss
+- Harleboss
 - Spider-Man
 Commentary: |-
     <i>Bambosh:</i>
@@ -401,7 +401,7 @@ Art Tags:
 - Roxy
 - Caliborn
 Referenced Tracks:
-- track:chorale-for-jaspers
+- Chorale for Jaspers
 Commentary: |-
     <i>Bambosh:</i>
     IT'S THE 413BOSH DOUBLE BILL
@@ -443,7 +443,7 @@ Art Tags:
 - John
 Referenced Tracks:
 - Reveille
-- track:revelawesome
+- Revelawesome
 Commentary: |-
     <i>Discfortune:</i>
     [[artist:bambosh|Bambosh]] said "BE CREATIVE" and this is the result. Also, I wanted to throw in something a little lighthearted to contrast all of the other TOP QUALITY songs in this album.
@@ -463,9 +463,9 @@ URLs:
 Art Tags:
 - John
 Referenced Tracks:
-- track:hardlyquin
+- Hardlyquin
 Sampled Tracks:
-- track:hardlyquin
+- Hardlyquin
 - Jojo's Bizarre Adventure
 - 'Metal Gear Rising: Revengeance'
 - The Office S05E09
@@ -592,7 +592,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/sfxan-jungle
 - https://www.youtube.com/watch?v=-pGcxicduNI
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 Commentary: |-
     <i>sylvarn:</i>
     Don't give this man soundfonts and free time.
@@ -649,7 +649,7 @@ Art Tags:
 - Rose
 - LoLaR
 Referenced Tracks:
-- track:endless-climb
+- Endless Climb
 ---
 Track: Atomyk Scy-Fy
 Artists:
@@ -665,7 +665,7 @@ Art Tags:
 - Dabe
 - Dave
 Referenced Tracks:
-- track:atomyk-ebonpyre
+- Atomyk Ebonpyre
 Commentary: |-
     <i>BitesizeBird:</i>
     Atomyk Ebonpyre...
@@ -686,7 +686,7 @@ URLs:
 Art Tags:
 - Jack Noir
 Referenced Tracks:
-- track:black
+- Black
 - track:the-ballad-of-jack-noir-original
 - track:archagent-everlasting
 - Unity of Thorns
@@ -701,7 +701,7 @@ Commentary: |-
 
     Musically, it's Black but with more COOL AND NEW MELODIES. Which consists of Archagent Everlasting, Unity of Thorns, and a bit of an original thing I composed in five minutes.
 
-    The ending is not synced because WHAT THE FUCK I DONT EVEN KNOW. I didn't know how to solve it so I just made the ending a bit longer and there. Also it has "vaporwave go down" as [[artist:cookiefonster|cookie]] describes it replacing vaporwave [[track:sburban-jungle|Sburban Jungle]]. Thought it was a fun idea.
+    The ending is not synced because WHAT THE FUCK I DONT EVEN KNOW. I didn't know how to solve it so I just made the ending a bit longer and there. Also it has "vaporwave go down" as [[artist:cookiefonster|cookie]] describes it replacing vaporwave [[Sburban Jungle]]. Thought it was a fun idea.
 
     <i>Bambosh:</i>
     I AM DESCENDING INTO MY OWN PERSONAL HELL
@@ -721,7 +721,7 @@ Art Tags:
 - Battlefield
 Referenced Tracks:
 - Three Gates
-- track:harlequin
+- Harlequin
 - track:liquid-negrocity
 Commentary: |-
     <i>Noisemaker:</i>
@@ -818,16 +818,16 @@ Art Tags:
 Referenced Tracks:
 - go down (Fanon Cut)
 - Flare
-- track:upward-movement-dave-owns
+- Upward Movement (Dave Owns)
 - track:megalovania-halloween
-- track:beatdown-strider-style
+- Beatdown (Strider Style)
 - Unity of Thorns
 - Even in Death
-- track:under-the-hat
-- track:explore
+- Under The Hat
+- Explore
 - licord nacrasty
 - Skaian Summoning
-- track:revelawesome
+- Revelawesome
 - Venom Pools for Eons
 - RollerCoaster Tycoon Theme
 - track:archagent-everlasting
@@ -835,13 +835,13 @@ Referenced Tracks:
 - Homestuck Anthem
 - Gardener
 - Sunsetter
-- track:atomyk-ebonpyre
+- Atomyk Ebonpyre
 - Liquid Negrocity
 - Tock
 - JoJo ~Sono Chi no Sadame~
-- track:showtime-original-mix
-- track:sburban-jungle
-- track:skies-of-skaia
+- Showtime (Original Mix)
+- Sburban Jungle
+- Skies of Skaia
 - Meet the Flintstones
 Commentary: |-
     <i>Interrobang:</i>
@@ -1037,17 +1037,17 @@ URLs:
 Art Tags:
 - Jade
 Referenced Tracks:
-- track:umbral-ultimatum
-- track:sburban-jungle
+- Umbral Ultimatum
+- Sburban Jungle
 - track:MeGaLoVania
 - track:sunslammer
 - Courser
 - Atomic Bonsai
-- track:beatdown-strider-style
+- Beatdown (Strider Style)
 - track:liquid-negrocity
 - track:im-a-member-of-the-midnight-crew
 - Rex Duodecim Angelus
-- track:crustacean
+- Crustacean
 - Walk-Stab-Walk (R&E)
 - RollerCoaster Tycoon Theme
 - Snow halation
@@ -1191,9 +1191,9 @@ URLs:
 Art Tags:
 - Terezi
 Referenced Tracks:
-- track:upward-movement-dave-owns
-- track:atomyk-ebonpyre
-- track:beatdown-strider-style
+- Upward Movement (Dave Owns)
+- Atomyk Ebonpyre
+- Beatdown (Strider Style)
 - Terezi Owns
 Commentary: |-
     <i>cookiefonster:</i>
@@ -1313,14 +1313,14 @@ Art Tags:
 - 'cw: blood (abstract)'
 Referenced Tracks:
 - Flare (Cascade)
-- track:aggrieve
+- Aggrieve
 - RollerCoaster Tycoon Theme
-- track:upward-movement-dave-owns
+- Upward Movement (Dave Owns)
 - track:MeGaLoVania
 - track:liquid-negrocity
 - track:ruins-undertale
-- track:showtime-original-mix
-- track:sburban-jungle
+- Showtime (Original Mix)
+- Sburban Jungle
 Commentary: |-
     <i>Shwan:</i>
     I love flare!!!!!!!
@@ -1391,8 +1391,8 @@ Art Tags:
 - 'cw: blood'
 Referenced Tracks:
 - Black Hole / Green Sun
-- track:endless-climb
-- track:chorale-for-jaspers
+- Endless Climb
+- Chorale for Jaspers
 - Dance of Thorns
 - Derse Dreamers
 - track:penumbra-phantasm
diff --git a/album/cool-and-new-volume-2.yaml b/album/cool-and-new-volume-2.yaml
index ed7b99a6..4ba33bf0 100644
--- a/album/cool-and-new-volume-2.yaml
+++ b/album/cool-and-new-volume-2.yaml
@@ -97,7 +97,7 @@ Art Tags:
 - Becquerel
 - Beq
 Referenced Tracks:
-- track:verdancy-bassline
+- Verdancy (Bassline)
 ---
 Track: Moonroller
 Artists:
@@ -160,8 +160,8 @@ URLs:
 - https://www.youtube.com/watch?v=9GfKgs0xViM
 Referenced Tracks:
 - track:guardian-v2
-- track:explore
-- track:mutiny
+- Explore
+- Mutiny
 - Non Compos Mentis
 Sampled Tracks:
 - track:pastor-bill-bolin
@@ -550,8 +550,8 @@ Art Tags:
 - Dabe
 Referenced Tracks:
 - Descend
-- track:atomyk-ebonpyre
-- track:beatdown-strider-style
+- Atomyk Ebonpyre
+- Beatdown (Strider Style)
 - Clockwork Melody
 ---
 Track: Err on Greif (acoostic Covre)
@@ -569,7 +569,7 @@ URLs:
 Art Tags:
 - John
 Referenced Tracks:
-- track:heir-of-grief
+- Heir of Grief
 - Let the Squiddles Sleep (End Theme)
 Sampled Tracks:
 - Let the Squiddles Sleep (End Theme)
@@ -829,7 +829,7 @@ URLs:
 - https://www.youtube.com/watch?v=qEgHWYxLRhA
 Referenced Tracks:
 - Megalo Strike Back
-- track:sburban-jungle
+- Sburban Jungle
 - Once Upon a Time
 - Sunsetter
 - track:megalovania-halloween
@@ -1019,7 +1019,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/germyquin
 - https://www.youtube.com/watch?v=aeMplyD-KfY
 Referenced Tracks:
-- track:harlequin
+- Harlequin
 - SWEET BRO AND HELLA JEFF SHOW
 Sampled Tracks:
 - SWEET BRO AND HELLA JEFF SHOW
@@ -1152,7 +1152,7 @@ Referenced Tracks:
 - track:miracles
 - Purple Bard
 - track:miracles-icp
-- track:harlequin
+- Harlequin
 - Brodyquest
 - licord nacrasty
 - Futurama Main Theme
diff --git a/album/cool-and-new-volume-7.yaml b/album/cool-and-new-volume-7.yaml
index c31f33e7..80f25514 100644
--- a/album/cool-and-new-volume-7.yaml
+++ b/album/cool-and-new-volume-7.yaml
@@ -104,7 +104,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/showup-2
 - https://youtu.be/ug12QOWihgE
 Referenced Tracks:
-- track:showtime-original-mix
+- Showtime (Original Mix)
 - Heartache
 - track:penumbra-phantasm
 ---
@@ -144,13 +144,13 @@ URLs:
 - https://youtu.be/kZYGlL-Ptw0
 Referenced Tracks:
 - Liquid Negrocity
-- track:black
-- track:the-ballad-of-jack-noir
+- Black
+- The Ballad of Jack Noir
 - A Baby Legend - The Baby is 2
 - Break Shot
-- track:endless-climb
+- Endless Climb
 - Clockwork Contrivance
-- track:aggrieve
+- Aggrieve
 - Derse Dreamers
 - Unity of Thorns
 - Dance of Thorns
@@ -189,7 +189,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/youth-stone
 - https://youtu.be/XEbGuWCGmMM
 Referenced Tracks:
-- track:aggrieve
+- Aggrieve
 - Meet the Flintstones
 ---
 Track: Skaian Cloud
@@ -210,8 +210,8 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/skaian-cloud
 - https://youtu.be/pl3mttK1MG0
 Referenced Tracks:
-- track:skies-of-skaia
-- track:sburban-jungle
+- Skies of Skaia
+- Sburban Jungle
 ---
 Track: arfchant evenlasing
 Artists:
@@ -250,10 +250,10 @@ URLs:
 - https://youtu.be/M7MWm403wdU
 Referenced Tracks:
 - track:x-vapor-rom
-- track:showtime-imp-strife-mix
+- Showtime (Imp Strife Mix)
 Sampled Tracks:
 - track:x-vapor-rom
-- track:showtime-imp-strife-mix
+- Showtime (Imp Strife Mix)
 ---
 Track: T3R3X1 STR1K3S B4CK
 Artists:
@@ -363,7 +363,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/jhon-et-la-d-g-n-ration-de-la-p-re
 - https://youtu.be/Itz7ki8rWhs
 Referenced Tracks:
-- track:harlequin
+- Harlequin
 ---
 Track: Tycoonan Jungle
 Artists:
@@ -384,7 +384,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/tycoonan-jungle
 - https://youtu.be/p45kS3iFgBI
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 - RollerCoaster Tycoon Theme
 - Jungle Boogie
 ---
@@ -479,9 +479,9 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/stubborn-throes
 - https://youtu.be/CSjXbWPMvU8
 Referenced Tracks:
-- track:chorale-for-jaspers
+- Chorale for Jaspers
 - Amen, Brother
-- track:aggrieve
+- Aggrieve
 - Battle Against an Unfathomable Enemy
 - At The Price of Oblivion
 ---
@@ -514,7 +514,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/this-saturnine-existence
 - https://youtu.be/pbN5exFda14
 Referenced Tracks:
-- track:the-ballad-of-jack-noir
+- The Ballad of Jack Noir
 Lyrics: |-
     Venom pools for eons...
 ---
@@ -580,7 +580,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/sburban-jungle-dance-remix
 - https://youtu.be/wCv-nqUATok
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 ---
 Track: C O N S U M E
 Directory: consume
@@ -612,10 +612,10 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/transcend
 - https://youtu.be/bjhlz95Dp_8
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 - RollerCoaster Tycoon Theme
-- track:upward-movement-dave-owns
-- track:beatdown-strider-style
+- Upward Movement (Dave Owns)
+- Beatdown (Strider Style)
 - Crystalanthemums
 ---
 Section: 2 Skid
@@ -650,10 +650,10 @@ Referenced Tracks:
 - Flare
 - Eternity Served Cold
 - track:carne-vale
-- track:showtime-original-mix
-- track:beatdown-strider-style
+- Showtime (Original Mix)
+- Beatdown (Strider Style)
 - Crystamanthequins
-- track:black
+- Black
 - track:MeGaLoVania
 ---
 Track: I Love Hussie
@@ -702,7 +702,7 @@ URLs:
 - https://youtu.be/-fkslACJzlo
 Referenced Tracks:
 - Moshi Moshi?
-- track:upward-movement-dave-owns
+- Upward Movement (Dave Owns)
 - track:MeGaLoVania
 - The Will to Fight (Original Mix) [Denizen Strife]
 ---
@@ -746,7 +746,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/upwave
 - https://youtu.be/DMzUyGPS9JQ
 Referenced Tracks:
-- track:upward-movement-dave-owns
+- Upward Movement (Dave Owns)
 ---
 Track: A Cryptic Doctor
 Artists:
@@ -763,9 +763,9 @@ URLs:
 - https://youtu.be/7phsrskisfA
 Referenced Tracks:
 - Moshi Moshi?
-- track:doctor
+- Doctor
 - Lotus
-- track:umbral-ultimatum
+- Umbral Ultimatum
 - Stay in Touch
 ---
 Track: Moonreposter
@@ -814,7 +814,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/deus-revexelatious
 - https://youtu.be/O98YpvyRDDU
 Referenced Tracks:
-- track:revelawesome
+- Revelawesome
 ---
 Track: Fighter Kanaya (Album Cut)
 Artists:
@@ -847,7 +847,7 @@ URLs:
 - https://youtu.be/KRbYazkuND8
 Referenced Tracks:
 - track:versus
-- track:beatdown-strider-style
+- Beatdown (Strider Style)
 ---
 Track: Atomyk Beatdown
 Artists:
@@ -863,9 +863,9 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/atomyk-beatdown
 - https://youtu.be/iNGbzHck11E
 Referenced Tracks:
-- track:atomyk-ebonpyre
-- track:beatdown-strider-style
-- track:upward-movement-dave-owns
+- Atomyk Ebonpyre
+- Beatdown (Strider Style)
+- Upward Movement (Dave Owns)
 - Unite Synchronization
 ---
 Track: Moshi's Claw (Bonus)
@@ -903,11 +903,11 @@ URLs:
 - https://youtu.be/3IGay47Z5u4
 Referenced Tracks:
 - English
-- track:upward-movement-dave-owns
-- track:explore
+- Upward Movement (Dave Owns)
+- Explore
 - Eastern Ghostly Dream ~ Ancient Temple
 - Cascade (Beta)
-- track:sburban-jungle
+- Sburban Jungle
 ---
 Track: FOCUS
 Directory: focus-canwc-vol-7
@@ -923,12 +923,12 @@ Referenced Tracks:
 - track:focus
 - Flare
 - Meet the Flintstones
-- track:explore
-- track:doctor
+- Explore
+- Doctor
 - Sweet Bro Theme Song
 - track:penumbra-phantasm
 - track:MeGaLoVania
-- track:aggrieve
+- Aggrieve
 - The Nutshack Intro
 - Snow halation
 ---
@@ -957,8 +957,8 @@ URLs:
 Referenced Tracks:
 - An Ending
 - RollerCoaster Tycoon Theme
-- track:endless-climb
-- track:showtime-piano-refrain
+- Endless Climb
+- Showtime (Piano Refrain)
 ---
 Section: Bonus tracks
 ---
diff --git a/album/cool-and-new-volume-ii.yaml b/album/cool-and-new-volume-ii.yaml
index 5de93599..d6a328dc 100644
--- a/album/cool-and-new-volume-ii.yaml
+++ b/album/cool-and-new-volume-ii.yaml
@@ -87,8 +87,8 @@ Art Tags:
 - Hella Jeff
 - Hecka Jef
 Referenced Tracks:
-- track:chorale-for-jaspers
-- track:black
+- Chorale for Jaspers
+- Black
 - Dance of Thorns
 ---
 Track: Fruity Pebbles Redux
@@ -104,8 +104,8 @@ URLs:
 - https://www.youtube.com/watch?v=5JhqaVIgUiM
 Referenced Tracks:
 - Fruity Pebbles Jingle
-- track:upward-movement-dave-owns
-- track:sburban-jungle
+- Upward Movement (Dave Owns)
+- Sburban Jungle
 - Walk-Stab-Walk (R&E)
 - track:archagent-everlasting
 Lyrics: |-
@@ -271,7 +271,7 @@ Art Tags:
 - Dabe
 - Earth
 Referenced Tracks:
-- track:beatdown-strider-style
+- Beatdown (Strider Style)
 ---
 Track: Jack's Last 「Stand」
 Artists:
@@ -491,8 +491,8 @@ Art Tags:
 - 'cw: blood (abstract)'
 - 'cw: corpse'
 Referenced Tracks:
-- track:showtime-original-mix
-- track:doctor
+- Showtime (Original Mix)
+- Doctor
 Lyrics: |-
     (Are you next?)
 ---
@@ -508,7 +508,7 @@ URLs:
 Art Tags:
 - WV
 Referenced Tracks:
-- track:vagabounce
+- Vagabounce
 ---
 Track: you godda be kideney (endoctorine mix)
 Artists:
@@ -524,12 +524,12 @@ Referenced Tracks:
 - An Apple Disaster!!
 - Crystalanthemums
 - English
-- track:doctor
+- Doctor
 - Red Like Roses Part II
 - Homestuck Anthem
-- track:crustacean
-- track:showtime-original-mix
-- track:sburban-jungle
+- Crustacean
+- Showtime (Original Mix)
+- Sburban Jungle
 ---
 Track: Even In Space
 Artists:
@@ -621,7 +621,7 @@ Art Tags:
 - LoHaC
 Referenced Tracks:
 - Another Medium
-- track:doctor
+- Doctor
 ---
 Track: please kill me.
 Artists:
@@ -718,7 +718,7 @@ Art Tags:
 - Genesis Frog
 Referenced Tracks:
 - Rex English
-- track:umbral-ultimatum
+- Umbral Ultimatum
 - Ham And Steak
 Commentary:
     <i>Rom M:</i>
@@ -1082,18 +1082,18 @@ Art Tags:
 - Jade
 - Becquerel
 Referenced Tracks:
-- track:dissension-original
+- Dissension (Original)
 - An Unbreakable Union
 - Courser
-- track:mutiny
+- Mutiny
 - The Beginning of Something Really Excellent
-- track:umbral-ultimatum
+- Umbral Ultimatum
 - track:of-gods-and-witches
 - track:frost-vol6
 - track:sunslammer
 - Atomic Bonsai
 - track:guardian
-- track:carefree-victory
+- Carefree Victory
 ---
 Track: MeGaLoPaint
 Artists:
@@ -1160,8 +1160,8 @@ Referenced Tracks:
 - track:penumbra-phantasm
 - track:MeGaLoVania
 - Crystalanthemums
-- track:sburban-jungle
-- track:beatdown-strider-style
+- Sburban Jungle
+- Beatdown (Strider Style)
 ---
 Track: Eternity Served Eternally
 Artists:
@@ -1304,7 +1304,7 @@ Referenced Tracks:
 - Dord Waltz
 - RollerCoaster Tycoon Theme
 - Pumpkin Party in Sea Hitler's Water Apocalypse
-- track:doctor
+- Doctor
 Lyrics: |-
     (ROSE: Oh fuck she's dead.)
 ---
@@ -1321,7 +1321,7 @@ URLs:
 Art Tags:
 - Dave
 Referenced Tracks:
-- track:atomyk-ebonpyre
+- Atomyk Ebonpyre
 ---
 Track: Dragon Clock
 Artists:
@@ -1381,10 +1381,10 @@ URLs:
 Referenced Tracks:
 - Homestuck Anthem
 - English
-- track:sburban-jungle
+- Sburban Jungle
 - Flare
 - 'BL1ND JUST1C3 : 1NV3ST1G4T1ON !!'
-- track:showtime-original-mix
+- Showtime (Original Mix)
 ---
 Track: 'Theory Proposal: NESS is actually INVERTED?!'
 Artists:
@@ -1461,7 +1461,7 @@ Referenced Tracks:
 - track:MeGaLoVania
 - Oppa Toby Style
 - Goodbye To A World
-- track:sburban-jungle
+- Sburban Jungle
 - Homestuck Anthem
 - Stellarum Salve
 ---
diff --git a/album/cool-and-new-volume-sx.yaml b/album/cool-and-new-volume-sx.yaml
index 0f72687e..a852b6a6 100644
--- a/album/cool-and-new-volume-sx.yaml
+++ b/album/cool-and-new-volume-sx.yaml
@@ -286,7 +286,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/sbowban-glamour
 - https://youtu.be/Wj0JHwHZI44
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 - Death by Glamour
 - Beta Version
 - GameBro (Original 1990 Mix)
@@ -307,10 +307,10 @@ URLs:
 - https://youtu.be/mMjRrrDnGVc
 Referenced Tracks:
 - Courage
-- track:upward-movement-dave-owns
+- Upward Movement (Dave Owns)
 Sampled Tracks:
 - Courage
-- track:upward-movement-dave-owns
+- Upward Movement (Dave Owns)
 ---
 Track: Moonslammer
 Artists:
@@ -425,10 +425,10 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/cool-and-new-community-garden
 - https://youtu.be/cGxHW30b_qo
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 - The Beginning of Something Really Excellent
-- track:upward-movement-dave-owns
-- track:explore
+- Upward Movement (Dave Owns)
+- Explore
 - track:penumbra-phantasm
 - Savior of the Dreaming Dead
 - Cascade (Beta)
@@ -446,7 +446,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/rainbow-jungle
 - https://youtu.be/B8oalWhp_1o
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 - Rainbow Road (Super Mario Kart)
 ---
 Track: Sweet Cravings and Pumpkin Jeff
@@ -592,7 +592,7 @@ URLs:
 - https://youtu.be/wnowfp9ziZ4
 Referenced Tracks:
 - cool and new community garden
-- track:upward-movement-dave-owns
+- Upward Movement (Dave Owns)
 - English
 - Flare
 ---
@@ -607,10 +607,10 @@ URLs:
 - https://youtu.be/rZKSlT7L68I
 Referenced Tracks:
 - Takyon (Death Yon)
-- track:atomyk-ebonpyre
+- Atomyk Ebonpyre
 Sampled Tracks:
 - Takyon (Death Yon)
-- track:atomyk-ebonpyre
+- Atomyk Ebonpyre
 ---
 Track: Confliction
 Artists:
@@ -738,8 +738,8 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/black-showtime-revelovania
 - https://youtu.be/n5n2Q1Dvxzc
 Referenced Tracks:
-- track:revelawesome
-- track:showtime-original-mix
+- Revelawesome
+- Showtime (Original Mix)
 - track:liquid-negrocity
 - track:MeGaLoVania
 ---
@@ -798,7 +798,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/roze-da-detepktib
 - https://youtu.be/fn8ookJTjL8
 Referenced Tracks:
-- track:aggrieve
+- Aggrieve
 ---
 Track: Bolero Served Cold
 Artists:
@@ -879,7 +879,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/the-maymay-sonb
 - https://youtu.be/Qn-kWh1VzC0
 Referenced Tracks:
-- track:explore
+- Explore
 ---
 Track: Sburban Ascension
 Artists:
@@ -893,11 +893,11 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/sburban-ascension
 - https://youtu.be/IOAKRSq-MiQ
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 - Another Jungle
 - Homestuck Anthem
-- track:showtime-original-mix
-- track:skies-of-skaia
+- Showtime (Original Mix)
+- Skies of Skaia
 ---
 Track: Bleep (dodecaphonic remix)
 Artists:
@@ -1049,8 +1049,8 @@ URLs:
 - https://youtu.be/TJJYubqL_ts
 Referenced Tracks:
 - Crystamanthequins
-- track:doctor
-- track:showtime-original-mix
+- Doctor
+- Showtime (Original Mix)
 - RollerCoaster Tycoon Theme
 ---
 Track: Afraid of the Spaghettio
@@ -1067,10 +1067,10 @@ URLs:
 - https://youtu.be/yvU5gLY3GGw
 Referenced Tracks:
 - Afraid of the Darko
-- track:aggrieve
+- Aggrieve
 Sampled Tracks:
 - Afraid of the Darko
-- track:aggrieve
+- Aggrieve
 - Bumper to Bumper
 Lyrics: |- 
     Hello, welcome back to Bumper to Bumper, Bumper to Bumper
@@ -1102,7 +1102,7 @@ URLs:
 - https://youtu.be/G2TeAEaRuY4
 Referenced Tracks:
 - Clockwork Sorrow
-- track:upward-movement-dave-owns
+- Upward Movement (Dave Owns)
 ---
 Track: Descend (Revised Edition)
 Artists:
@@ -1180,10 +1180,10 @@ URLs:
 - https://youtu.be/CvtLNkxeYKY
 Referenced Tracks:
 - 'BL1ND JUST1C3 : 1NV3ST1G4T1ON !!'
-- track:sburban-jungle
+- Sburban Jungle
 - Crystamanthequins
 - track:MeGaLoVania
-- track:upward-movement-dave-owns
+- Upward Movement (Dave Owns)
 ---
 Track: Extraterrestrial Flare
 Artists:
@@ -1376,7 +1376,7 @@ URLs:
 - https://youtu.be/d85qXi2Y-lg
 Referenced Tracks:
 - The Simpsons Theme
-- track:black
+- Black
 - track:im-a-member-of-the-midnight-crew
 ---
 Track: The Death of Dirk Strider
@@ -1478,9 +1478,9 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/climbing-endlessly
 - https://youtu.be/wsnACFc_GMk
 Referenced Tracks:
-- track:endless-climb
+- Endless Climb
 Sampled Tracks:
-- track:endless-climb
+- Endless Climb
 ---
 Track: Even in face
 Artists:
@@ -1536,7 +1536,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/trumpets-2-boogyloo
 - https://youtu.be/Xru5Ng8Q8r8
 Referenced Tracks:
-- track:showtime-piano-refrain
+- Showtime (Piano Refrain)
 ---
 Track: Crystalmegamix
 Artists:
@@ -1756,7 +1756,7 @@ URLs:
 Referenced Tracks:
 - Overture (Canon Edit)
 - English
-- track:showtime-piano-refrain
+- Showtime (Piano Refrain)
 Sampled Tracks:
 - Overture (Canon Edit)
 - English
@@ -1906,16 +1906,16 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/flagrievance-for-jasprawesome-with-terexi
 - https://youtu.be/HniQFsdXXpI
 Referenced Tracks:
-- track:chorale-for-jaspers
+- Chorale for Jaspers
 - Flare
 - Aggrievance
-- track:revelawesome
+- Revelawesome
 - track:terexi
 Sampled Tracks:
-- track:chorale-for-jaspers
+- Chorale for Jaspers
 - Flare
 - Aggrievance
-- track:revelawesome
+- Revelawesome
 - track:terexi
 ---
 Track: Bro - Gameabout
@@ -1980,11 +1980,11 @@ URLs:
 - https://youtu.be/chlepbcz4QQ
 Referenced Tracks:
 - October
-- track:showtime-piano-refrain
-- track:gardener
-- track:aggrieve
+- Showtime (Piano Refrain)
+- Gardener
+- Aggrieve
 - Cascade (Beta)
-- track:beatdown-strider-style
+- Beatdown (Strider Style)
 ---
 Track: Eternal Torment of the Casino Dweller
 Artists:
@@ -2105,8 +2105,8 @@ Referenced Tracks:
 - Tock
 - track:archagent-everlasting
 - licord nacrasty
-- track:black
-- track:sburban-jungle
+- Black
+- Sburban Jungle
 - CONTACT
 - Descend
 - track:dr-pepper
@@ -2247,13 +2247,13 @@ URLs:
 - https://youtu.be/9Oq-TUCGyHk
 Referenced Tracks:
 - RollerCoaster Tycoon Theme
-- track:crustacean
+- Crustacean
 - track:sunslammer
 - track:frost-vol6
 - Negastrife
-- track:beatdown-strider-style
+- Beatdown (Strider Style)
 - psych0ruins
-- track:endless-climb
+- Endless Climb
 - Horschestra
 - Another Jungle
 - Time on My Side
@@ -2264,12 +2264,12 @@ Referenced Tracks:
 - Heir Conditioning
 - track:moonsetter
 - Anbroids
-- track:chorale-for-jaspers
-- track:harlequin
+- Chorale for Jaspers
+- Harlequin
 - Despot
 - Pumpkin Party in Sea Hitler's Water Apocalypse
 - Rex Duodecim Angelus
-- track:theme
+- Theme
 - Courser
 - Snow halation
 ---
@@ -2288,11 +2288,11 @@ URLs:
 Referenced Tracks:
 - Sweet Bro Theme Song
 - English
-- track:showtime-original-mix
+- Showtime (Original Mix)
 - Malediction
 - Fighting Spirit
 - It Don't Mean a Thing (If It Ain't Got That Swing)
-- track:explore
+- Explore
 - track:daescend
 - Virgin Orb
 - Holy Ruins
diff --git a/album/cool-and-new-volume-v.yaml b/album/cool-and-new-volume-v.yaml
index 3f06515b..9bea3c43 100644
--- a/album/cool-and-new-volume-v.yaml
+++ b/album/cool-and-new-volume-v.yaml
@@ -21,9 +21,9 @@ Additional Files:
   - Volume V Commentary.pdf
 Commentary: |-
     <i>Cool and New Music Team:</i>
-    Remix album of "[[track:doctor|Doctor]]" by [[artist:buzinkai|George Buzinkai]]
+    Remix album of "[[Doctor]]" by [[artist:buzinkai|George Buzinkai]]
 
-    George Buzinkai wrote unique, memorable pieces such as [[track:endless-climb|Endless Climb]] and the aforementioned Doctor for Homestuck. She's an inspiration to all fan musicians such as us, and without his melodies spreading throughout the Homestuck discography - with 30 tracks containing the Doctor melody as a whole - Homestuck wouldn't be the same without her.
+    George Buzinkai wrote unique, memorable pieces such as [[Endless Climb]] and the aforementioned Doctor for Homestuck. She's an inspiration to all fan musicians such as us, and without his melodies spreading throughout the Homestuck discography - with 30 tracks containing the Doctor melody as a whole - Homestuck wouldn't be the same without her.
 
     Lately, Buzinkai's life situation hasn't been very good, to put it in blunt terms. To say the least, she is not in a situation where she can produce more music for our ears to behold to. And without our help, she might be stuck that way.
 
@@ -51,7 +51,7 @@ Art Tags:
 - John
 - LoWaS
 Referenced Tracks:
-- track:doctor
+- Doctor
 Commentary: |-
     <i>Jakkyr:</i>
     my thought process went "ok i'll make jhon and the art for doctor is of johns planet and that as glowing mushrooms, i'll draw a glowing mushroom, oops i had it in 32 bit and now i have to make it down to 16 bit so i can actually save it, holy fuck i broke it"
@@ -69,7 +69,7 @@ Art Tags:
 - Jhon
 - John
 Referenced Tracks:
-- track:doctor
+- Doctor
 Lyrics: |-
     ([Unintelligible] Wait, something's going on with his EKG. What's wrong with him? I don't know, but this doesn't look good. We're losing him! He's dead.)
 Commentary: |-
@@ -117,7 +117,7 @@ Art Tags:
 - John
 - Earth
 Referenced Tracks:
-- track:doctor
+- Doctor
 Commentary: |-
     <i>Xenozane:</i>
     I couldn't get GIMP working and I was on my laptop so I threw this together in like 5 seconds lol
@@ -135,9 +135,9 @@ URLs:
 Art Tags:
 - LoWaS
 Referenced Tracks:
-- track:doctor
+- Doctor
 Sampled Tracks:
-- track:doctor
+- Doctor
 ---
 Track: The Doctor
 Artists:
@@ -172,7 +172,7 @@ Art Tags:
 - John
 - Consorts
 Referenced Tracks:
-- track:doctor
+- Doctor
 - Meet the Flintstones
 Commentary: |-
     <i>Wheals:</i>
@@ -191,7 +191,7 @@ Art Tags:
 - Jhon
 - John
 Referenced Tracks:
-- track:doctor
+- Doctor
 Lyrics: |-
     Doctor doctor doctor (Doc-tor)
     Doctor doctor doctor (Doctor doctor doc—)
@@ -256,10 +256,10 @@ Art Tags:
 - Femorafreack
 - LoWaS
 Referenced Tracks:
-- track:doctor
+- Doctor
 - Snow halation
 Sampled Tracks:
-- track:doctor
+- Doctor
 - Snow halation
 Lyrics: |-
     Todokete (<i>Ring out</i>)
@@ -304,7 +304,7 @@ Art Tags:
 - Dave
 - Jade
 Referenced Tracks:
-- track:doctor
+- Doctor
 - Cross-Examination - Allegro 2001
 Commentary: |-
     <i>MrCheeze:</i>
@@ -339,7 +339,7 @@ Art Tags:
 Referenced Tracks:
 - Savior of the Waking World
 - RollerCoaster Tycoon Theme
-- track:doctor
+- Doctor
 Sampled Tracks:
 - rct sound effects maybe?
 Commentary: |-
@@ -363,7 +363,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/id-like-to-see-your-diploma
 - https://www.youtube.com/watch?v=OXAktyjf9Is
 Referenced Tracks:
-- track:doctor
+- Doctor
 Commentary: |-
     <i>Noisemaker:</i>
     When I usually make my tracks, I almost always either use the MIDI file for the song I want to remix, or I just come up with a new melody altogether. There's a couple of cases, however, where I deviate from the regular formula and do something completely different. In this case, it was V a p o r w a v e (well, not quite). Honestly, this might one of my favorite ways to make music right now: I import the original song into FL Studio, pitch it up or down, and add some crazy effects to it. What you hear at the beginning of the track is a combination of Fruity Squeeze and Gross Beat on the original track, which are automated to decrease and eventually turn off after the first few measures. While I only have 1 track on this album, I had a lot of fun being a part of this project. Thanks to every single one of you who happened to take the time out of their day to download this!
@@ -389,7 +389,7 @@ URLs:
 Art Tags:
 - John
 Referenced Tracks:
-- track:doctor
+- Doctor
 Sampled Tracks:
 - Giygas Disintegrates
 Commentary: |-
@@ -454,7 +454,7 @@ Art Tags:
 - John
 Referenced Tracks:
 - Doctor Frog
-- track:doctor
+- Doctor
 Commentary: |-
     <i>VulkanShawl:</i>
     The idea was make only a Hospital-game themed Doctor Remix. But actually i remembered Theme Hospital. Later looking from game's OST i just found a song called "Doctor" in his OST. So i decided to do a Double doctor mashup. A funny thing is this game reminds me of a hospital tycoon game. *insert i don't like [[artist:silvagunner|siivagunner]] joke here*
@@ -491,7 +491,7 @@ URLs:
 - https://www.youtube.com/watch?v=Hv-FY7ii5XA
 Referenced Tracks:
 - Chrono Cross ~Scars of Time~
-- track:doctor
+- Doctor
 ---
 Track: Medicus
 Artists:
@@ -505,7 +505,7 @@ URLs:
 Art Tags:
 - LoWaS
 Referenced Tracks:
-- track:doctor
+- Doctor
 Commentary: |-
     <i>Minkt:</i>
     I thought soundfont guitars would sound good in FL 12, but I was very wrong. Anyways, I got the idea for this track when I screwed around with my friend's  acoustic guitar and thought it sounded decent. The bass works really well with the main melody surprisingly, making for a"meh"/10 piece. Also, :jaedAngery: is the best emote and there is nothing you can say to disagree with me.
@@ -530,7 +530,7 @@ Art Tags:
 - LoWaS
 Referenced Tracks:
 - I Am the Doctor
-- track:doctor
+- Doctor
 Sampled Tracks:
 - lsdjghklsdgj
 ---
@@ -545,7 +545,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/dentist
 - https://www.youtube.com/watch?v=f7n47WgtlhA
 Referenced Tracks:
-- track:doctor
+- Doctor
 Sampled Tracks:
 - Seinfeld Theme
 - 'whats the deal with...?'
@@ -572,10 +572,10 @@ Art Tags:
 - Dave
 - Lord English
 Referenced Tracks:
-- track:doctor
+- Doctor
 - Back to the Future
 - English
-- track:sburban-jungle
+- Sburban Jungle
 - Hoverboard
 - The Power of Love
 - track:penumbra-phantasm
@@ -644,9 +644,9 @@ Art Tags:
 - Battlefield
 - Skaia
 Referenced Tracks:
-- track:doctor
+- Doctor
 - Fruity Pebbles Jingle
-- track:upward-movement-dave-owns
+- Upward Movement (Dave Owns)
 Lyrics: |-
     Oh Diet Dr Pepper is the flavor that I savor
     It's sweet and spicy, totally unique
@@ -695,7 +695,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/doctor-robotnik
 - https://www.youtube.com/watch?v=u0yTrL65Xak
 Referenced Tracks:
-- track:doctor
+- Doctor
 Sampled Tracks:
 - Sonic Adventure 2
 - Sonic 25th Anniversary Livestream https://www.youtube.com/watch?v=mzV6RVR2D8g
@@ -744,9 +744,9 @@ Art Tags:
 - John
 - LoWaS
 Referenced Tracks:
-- track:doctor
-- track:showtime-original-mix
-- track:sburban-jungle
+- Doctor
+- Showtime (Original Mix)
+- Sburban Jungle
 Commentary: |-
     <i>Cecily Renns:</i>
     Everyone had their own crazy idea of how to remix Doctor into something truly fucking shit, but I didn't. So I just... did what I always do. Orchestral Bullshit™. Nothing special.
@@ -764,7 +764,7 @@ Art Tags:
 - LoWaS
 - Skaia
 Referenced Tracks:
-- track:doctor
+- Doctor
 - track:penumbra-phantasm
 - The Island – Pt.II (Dusk)
 Commentary: |-
@@ -784,7 +784,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/doctor-is-he-going-to-make-it
 - https://www.youtube.com/watch?v=23AtOsXTlW4
 Referenced Tracks:
-- track:doctor
+- Doctor
 Lyrics: |-
     [Unintelligible clips of people talking overlaid on each other]
 Commentary: |-
@@ -811,9 +811,9 @@ Art Tags:
 - Dabe
 - Dave
 Referenced Tracks:
-- track:doctor
+- Doctor
 Sampled Tracks:
-- track:doctor
+- Doctor
 ---
 Track: Doctor Mario
 Artists:
@@ -827,7 +827,7 @@ URLs:
 Art Tags:
 - LoWaS
 Referenced Tracks:
-- track:doctor
+- Doctor
 Sampled Tracks:
 - super mario world soundfont i dont think this counts tbh
 Commentary: |-
@@ -855,7 +855,7 @@ Art Tags:
 - John
 - Rose
 Referenced Tracks:
-- track:doctor
+- Doctor
 - Moonsong
 ---
 Track: Cross-Planetary Exploration ~ Allegro 2016
@@ -877,7 +877,7 @@ Art Tags:
 - Dave
 - Earth
 Referenced Tracks:
-- track:doctor
+- Doctor
 - Cross-Examination - Allegro 2001
 Sampled Tracks:
 - Cross-Examination - Allegro 2001
@@ -902,7 +902,7 @@ URLs:
 Art Tags:
 - LoWaS
 Referenced Tracks:
-- track:doctor
+- Doctor
 Sampled Tracks:
 - undertale dog noises
 Commentary: |-
@@ -944,11 +944,11 @@ URLs:
 Art Tags:
 - Dave
 Referenced Tracks:
-- track:doctor
-- track:upward-movement-dave-owns
+- Doctor
+- Upward Movement (Dave Owns)
 Sampled Tracks:
-- track:doctor
-- track:upward-movement-dave-owns
+- Doctor
+- Upward Movement (Dave Owns)
 ---
 Track: Moondoctor
 Directory: moondoctor-moonsetter
@@ -965,7 +965,7 @@ Art Tags:
 - Rose
 - Lord English
 Referenced Tracks:
-- track:doctor
+- Doctor
 - track:moonsetter
 - track:penumbra-phantasm
 Commentary: |-
@@ -1005,7 +1005,7 @@ URLs:
 Art Tags:
 - LoWaS
 Referenced Tracks:
-- track:doctor
+- Doctor
 - CORE
 ---
 Track: Nightcore no Doctor
@@ -1020,7 +1020,7 @@ URLs:
 Art Tags:
 - John
 Referenced Tracks:
-- track:doctor
+- Doctor
 Commentary: |-
     <i>VulkanShawl:</i>
     Just a song sped up. The track art is just john looking like a kawaii japanese anime. It's actually a shitty trickster-like John if you see it like me. *insert a [[track:the-nutshack-intro|nutshack]] joke here*
@@ -1040,11 +1040,11 @@ Art Tags:
 - John
 Referenced Tracks:
 - Do You Remem8er Me
-- track:doctor
-- track:endless-climb
+- Doctor
+- Endless Climb
 - Even in Death
 - Oppa Toby Style
-- track:showtime-original-mix
+- Showtime (Original Mix)
 Commentary: |-
     <i>Cecily Renns:</i>
     On one bright summer morning in mid-to-late july, our JohnJRenns was whistling a tune. That tune is a mysterious number that is repeated aplenty that happens to be [[track:bowmans-credit-score|seven hundred and twenty]] I mean [[track:do-you-remem8er-me|Do You Remem8ber Me]] by [[artist:malcolm-brown|Malcolm Brown]].
@@ -1066,7 +1066,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/doctor-egbert-m-d
 - https://www.youtube.com/watch?v=2OAgrmDAqUI
 Referenced Tracks:
-- track:doctor
+- Doctor
 - Teardrop
 Commentary: |-
     <i>VulkanShawl:</i>
@@ -1087,13 +1087,13 @@ Art Tags:
 - LoWaS
 - Prospit
 Referenced Tracks:
-- track:doctor
+- Doctor
 - Medical Emergency
 - Savior of the Waking World
 - Plague Doctor
 - Descend
 Sampled Tracks:
-- track:doctor
+- Doctor
 - Medical Emergency
 - Savior of the Waking World
 - Plague Doctor
@@ -1217,11 +1217,11 @@ Art Tags:
 - Derse
 Referenced Tracks:
 - The Baby is You
-- track:doctor
+- Doctor
 - Savior of the Waking World
 Sampled Tracks:
 - The Baby is You
-- track:doctor
+- Doctor
 - Savior of the Waking World
 Lyrics: |-
     Babies, babies, babies
@@ -1268,11 +1268,11 @@ Art Tags:
 - John
 - LoWaS
 Referenced Tracks:
-- track:doctor
+- Doctor
 - 『SPLASH FREE』50% OFF Cover
 - Eridan's United States of Wwhatevver
 Sampled Tracks:
-- track:doctor
+- Doctor
 - 50% OFF Episode 2 - Late For Anime School - https://www.youtube.com/watch?v=xqPGXJed-PY
 - 『SPLASH FREE』50% OFF Cover
 - 50% OFF Episode 8 - So Hot But So Crazy - https://www.youtube.com/watch?v=zCQ2vXI3KzA
@@ -1342,7 +1342,7 @@ URLs:
 - https://www.youtube.com/watch?v=4cF1SfqJfzs
 Referenced Tracks:
 - Tribal Ebonpyre
-- track:doctor
+- Doctor
 Sampled Tracks:
 - Tribal Ebonpyre
 Commentary: |-
@@ -1361,7 +1361,7 @@ URLs:
 Art Tags:
 - John
 Referenced Tracks:
-- track:doctor
+- Doctor
 Sampled Tracks:
 - Windows XP i guess????
 Commentary: |-
@@ -1389,10 +1389,10 @@ Art Tags:
 - 'cw: blood'
 Referenced Tracks:
 - Liquid Negrocity
-- track:doctor
+- Doctor
 Sampled Tracks:
 - Liquid Negrocity
-- track:doctor
+- Doctor
 Commentary: |-
     <i>XenoZane:</i>
     Don't let Spades Slick "operate" on you
@@ -1415,7 +1415,7 @@ Art Tags:
 - Dadd
 - John's dad
 Referenced Tracks:
-- track:doctor
+- Doctor
 - Warhammer of Zillyhoo
 Commentary: |-
     <i>NyashAlex:</i>
@@ -1433,8 +1433,8 @@ URLs:
 Art Tags:
 - John
 Referenced Tracks:
-- track:doctor
-- track:endless-climb
+- Doctor
+- Endless Climb
 - Good Morning U.S.A.
 Commentary: |-
     <i>cookiefonster:</i>
@@ -1450,7 +1450,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/dr-de-bruin
 - https://www.youtube.com/watch?v=tfm2dbnOuyk
 Referenced Tracks:
-- track:doctor
+- Doctor
 ---
 Track: Doctorlovania
 Artists:
@@ -1465,7 +1465,7 @@ Art Tags:
 - John
 - 'cw: blood'
 Referenced Tracks:
-- track:doctor
+- Doctor
 Commentary: |-
     <i>VulkanShawl:</i>
     Actually the theme was a dumb Doctor Remix soundfont swap. But I'm going to talk about the track art instead. It was my first "serious" art. I thinked "What would be a nice [[flash:3297|[S] Wake]] reference that is not Vriska or Jack?" Welp. Feferi cut in two. I just changed Feferi for John. Changing head and skin colour and the dress colour. (Yeah. John with a Dress.) Actually i like it so much. *insert [[track:gangnam-style|gangnam style]] or triple q joke here*
@@ -1483,7 +1483,7 @@ Art Tags:
 - John
 Referenced Tracks:
 - track:ruins-undertale
-- track:doctor
+- Doctor
 - Hero's End
 - track:ruins
 - Lotus
@@ -1505,7 +1505,7 @@ URLs:
 Art Tags:
 - LoWaS
 Referenced Tracks:
-- track:doctor
+- Doctor
 Commentary: |-
     <i>Interrobang:</i>
     I made this the day that songs for Volume 5 were due, when we thought we were one or two songs short from 52 tracks, 52 being a prime CANWC music team M E M E N U M B E R. So, I threw this together in Musescore by abusing [[artist:mrcheeze|MrCheeze's]] Doctor MIDI, and then took it to Audacity to do the panning. The plugin used for that was 'Random Panning', which can be found on the Audacity Wiki under 'Nyquist Plugins'. I highly recommend it.
@@ -1533,10 +1533,10 @@ Art Tags:
 - Prospit
 - Derse
 Referenced Tracks:
-- track:doctor
+- Doctor
 - rose pragnant
 Sampled Tracks:
-- track:doctor
+- Doctor
 - rose pragnant
 Lyrics: |-
     (Oh my God, I hate Garageband so much.) (i came as fast as i could)
@@ -1562,10 +1562,10 @@ URLs:
 Art Tags:
 - LoWaS
 Referenced Tracks:
-- track:endless-climb
+- Endless Climb
 - track:penumbra-phantasm
-- track:doctor
-- track:showtime-original-mix
+- Doctor
+- Showtime (Original Mix)
 - Windchime Foley
 Sampled Tracks:
 - Windchime Foley
diff --git a/album/cool-and-new-voulem1.yaml b/album/cool-and-new-voulem1.yaml
index 3edf300a..bf6d7db2 100644
--- a/album/cool-and-new-voulem1.yaml
+++ b/album/cool-and-new-voulem1.yaml
@@ -66,9 +66,9 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/cascante
 - https://www.youtube.com/watch?v=UGU4RdvhkrM
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 - Cascade
-- track:showtime-piano-refrain
+- Showtime (Piano Refrain)
 - Shave and a Haircut
 ---
 Track: Harlecoaster
@@ -84,7 +84,7 @@ Art Tags:
 - Jhon
 - John
 Referenced Tracks:
-- track:harlequin
+- Harlequin
 - RollerCoaster Tycoon Theme
 ---
 Track: FLARERERERERERERE
@@ -123,7 +123,7 @@ Art Tags:
 - LoWaS
 - 'cw: blood (abstract)'
 Referenced Tracks:
-- track:showtime-piano-refrain
+- Showtime (Piano Refrain)
 - track:its-showtime
 - Für Elise
 ---
@@ -139,9 +139,9 @@ URLs:
 Art Tags:
 - Ruined Earth
 Referenced Tracks:
-- track:explore
+- Explore
 - Space Jam
-- track:showtime-original-mix
+- Showtime (Original Mix)
 Sampled Tracks:
 - Space Jam
 ---
@@ -434,7 +434,7 @@ Referenced Tracks:
 - track:penumbra-phantasm
 - English
 - Flare
-- track:explore
+- Explore
 - Unite Synchronization
 - Stronger Than You
 Lyrics: |-
@@ -493,13 +493,13 @@ URLs:
 Referenced Tracks:
 - Three in the Morning
 - track:three-in-the-morning-rj
-- track:explore
-- track:aggrieve
-- track:atomyk-ebonpyre
-- track:chorale-for-jaspers
+- Explore
+- Aggrieve
+- Atomyk Ebonpyre
+- Chorale for Jaspers
 - Liquid Negrocity
 - track:MeGaLoVania
-- track:upward-movement-dave-owns
+- Upward Movement (Dave Owns)
 Art Tags:
 - Jade
 ---
@@ -555,9 +555,9 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/can-you-give-me-a-hand
 - https://www.youtube.com/watch?v=8AZ556Deeb8
 Referenced Tracks:
-- track:showtime-piano-refrain
+- Showtime (Piano Refrain)
 - RollerCoaster Tycoon Theme
-- track:showtime-original-mix
+- Showtime (Original Mix)
 Art Tags:
 - Jhon
 - Jack Noir
@@ -573,7 +573,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/usurp
 - https://www.youtube.com/watch?v=0koQxAoc2Ik
 Referenced Tracks:
-- track:explore
+- Explore
 - The Beginning of Something Really Excellent
 Art Tags:
 - Jaed
@@ -593,7 +593,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/a-color-this-shirt-also-comes-in
 - https://www.youtube.com/watch?v=8k-L_dQBVro
 Referenced Tracks:
-- track:black
+- Black
 Art Tags:
 - Jack Noir
 ---
@@ -607,7 +607,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/fun-cat-song-3-3
 - https://www.youtube.com/watch?v=hqjyjXP-gPg
 Referenced Tracks:
-- track:chorale-for-jaspers
+- Chorale for Jaspers
 Directory: fun-cat-song
 Art Tags:
 - Jaspers
@@ -624,7 +624,7 @@ URLs:
 - https://www.youtube.com/watch?v=xKgGAsAqQxs
 Referenced Tracks:
 - Black Rose / Green Sun
-- track:chorale-for-jaspers
+- Chorale for Jaspers
 Art Tags:
 - Rose
 - Jaspers
@@ -651,7 +651,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/upp-word-s-movmeant-fanon-edit
 - https://www.youtube.com/watch?v=NxxwFqTec88
 Referenced Tracks:
-- track:upward-movement-dave-owns
+- Upward Movement (Dave Owns)
 - Descend
 - Snow halation
 - Gangnam Style
@@ -662,7 +662,7 @@ Referenced Tracks:
 - HEY MAN VOLUME 10 MAN HEY CHECK IT OUT
 - RollerCoaster Tycoon Theme
 Sampled Tracks:
-- track:upward-movement-dave-owns
+- Upward Movement (Dave Owns)
 - Descend
 - Snow halation
 - Gangnam Style
@@ -874,7 +874,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/suburbon-contdon
 - https://www.youtube.com/watch?v=G2e80WRHl4Y
 Referenced Tracks:
-- track:sburban-countdown
+- Sburban Countdown
 ---
 Track: upways moving [jhon own dabe]
 Duration: '2:04'
@@ -887,7 +887,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/upways-moving-jhon-own-dabe
 - https://www.youtube.com/watch?v=eJw-qkYIwXk
 Referenced Tracks:
-- track:upward-movement-dave-owns
+- Upward Movement (Dave Owns)
 Art Tags:
 - Jhon
 - Dabe
@@ -907,8 +907,8 @@ URLs:
 - https://www.youtube.com/watch?v=fGvEDsNa6mg
 Referenced Tracks:
 - track:megalovania-halloween
-- track:heir-of-grief
-- track:sburban-countdown
+- Heir of Grief
+- Sburban Countdown
 - Homestuck Anthem
 Art Tags:
 - Jhon
@@ -1143,7 +1143,7 @@ URLs:
 - https://www.youtube.com/watch?v=N3pfnwTJUfM
 Referenced Tracks:
 - RollerCoaster Tycoon Theme
-- track:showtime-piano-refrain
+- Showtime (Piano Refrain)
 Art Tags:
 - Jhon
 - John
@@ -1161,9 +1161,9 @@ URLs:
 - https://www.youtube.com/watch?v=iJLt3FtFBKk
 Referenced Tracks:
 - GameBro (Original 1990 Mix)
-- track:skies-of-skaia
-- track:beatdown-strider-style
-- track:doctor
+- Skies of Skaia
+- Beatdown (Strider Style)
+- Doctor
 Art Tags:
 - Jhon
 - Dabe
@@ -1182,7 +1182,7 @@ URLs:
 - https://www.youtube.com/watch?v=GuCEVLHyvBw
 Referenced Tracks:
 - Rex Duodecim Angelus
-- track:beatdown-strider-style
+- Beatdown (Strider Style)
 - track:MeGaLoVania
 - Descend
 - RollerCoaster Tycoon Theme
@@ -1206,7 +1206,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/doctoral-degree
 - https://www.youtube.com/watch?v=MHPj3MOR-iI
 Referenced Tracks:
-- track:doctor
+- Doctor
 Art Tags:
 - Jhon
 - John
@@ -1252,11 +1252,11 @@ URLs:
 - https://www.youtube.com/watch?v=TXMl0Q8tncs
 Referenced Tracks:
 - Gardener
-- track:dissension-original
+- Dissension (Original)
 Lyrics: |-
     (I give up. I've been trying to make this track for... a week now, and... that's all I got. Practically nothing.
     
-    Do you people realize how little music Jade has to begin with? She really only has [[Gardener]] and [[track:dissension-original|Dissension]], the two songs you just heard. To take those, remix them into a workable song, add my own stuff, and then deliberately make it sound shitty to fit in with the rest of the Cool and New Web Comic... That, I, that's not really an excuse, other musicians have done far more with far less... the rest of this album is proof enough of that.
+    Do you people realize how little music Jade has to begin with? She really only has [[Gardener]] and [[Dissension (Original)|Dissension]], the two songs you just heard. To take those, remix them into a workable song, add my own stuff, and then deliberately make it sound shitty to fit in with the rest of the Cool and New Web Comic... That, I, that's not really an excuse, other musicians have done far more with far less... the rest of this album is proof enough of that.
     
     I guess what it comes down to, is that... I'm not just not as good of a musician, or, really, artist of any way. I don't have talent. I think Hussie said something like "it actually takes a large amount of skill to get Sweet Bro and Hella Jeff to the perfect amount of shittiness"... and I don't have the drive or talent or skill to do that, or really anything.
     
@@ -1306,7 +1306,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/blapck
 - https://www.youtube.com/watch?v=AnC1c9qewrc
 Referenced Tracks:
-- track:black
+- Black
 - Sweet Bro Theme Song
 Sampled Tracks:
 - The Corner
@@ -1393,22 +1393,22 @@ URLs:
 Referenced Tracks:
 - track:vigilante-cornered
 - Liquid Negrocity
-- track:aggrieve
+- Aggrieve
 - track:penumbra-phantasm
 - track:MeGaLoVania
-- track:sburban-countdown
-- track:doctor
+- Sburban Countdown
+- Doctor
 - Dawn of Man
-- track:explore
+- Explore
 - Bowman's Credit Score
 - Terezi's Theme
-- track:atomyk-ebonpyre
+- Atomyk Ebonpyre
 - The Blind Prophet
 - Hate You
 - The La2t Frontiier
-- track:showtime-original-mix
-- track:upward-movement-dave-owns
-- track:skies-of-skaia
+- Showtime (Original Mix)
+- Upward Movement (Dave Owns)
+- Skies of Skaia
 - Meet the Flintstones
 - Homestuck Anthem
 - Showdown
@@ -1473,9 +1473,9 @@ URLs:
 Referenced Tracks:
 - Flare
 - RollerCoaster Tycoon Theme
-- track:endless-climb
-- track:sburban-jungle
-- track:beatdown-strider-style
+- Endless Climb
+- Sburban Jungle
+- Beatdown (Strider Style)
 - Liquid Negrocity
 - track:MeGaLoVania
 ---
diff --git a/album/cosmic-caretakers.yaml b/album/cosmic-caretakers.yaml
index 48ac87ca..05642c42 100644
--- a/album/cosmic-caretakers.yaml
+++ b/album/cosmic-caretakers.yaml
@@ -99,10 +99,10 @@ Art Tags:
 - Underlings
 - LoWaS
 Referenced Tracks:
-- track:under-the-hat
+- Under The Hat
 Commentary: |-
     <i>Pascal van den Bos:</i>
-    For this track i went for the style of music i think Dad listens to, [[track:under-the-hat]] but even jazzier haha. The chiptune breakdown in the middle is also kind of a reference to [[track:showtime-original-mix]] which is the Strife! theme you hear when John encountered Dad. It worked pretty well, i think this is what you'd hear when you walk in to the kitchen when Dad is baking something.
+    For this track i went for the style of music i think Dad listens to, [[Under The Hat]] but even jazzier haha. The chiptune breakdown in the middle is also kind of a reference to [[Showtime (Original Mix)]] which is the Strife! theme you hear when John encountered Dad. It worked pretty well, i think this is what you'd hear when you walk in to the kitchen when Dad is baking something.
     <i>trip:</i>
     I want this dad to be my dad.
 ---
@@ -120,7 +120,7 @@ Art Tags:
 - Earth
 Referenced Tracks:
 - Homestuck Anthem
-- track:nannaquin
+- Nannaquin
 Commentary: |-
     <i>keyboard cait:</i>
     At first I considered making this track electroswing, but that's a bit out of my range. I think this works well as a compromise!
@@ -164,11 +164,11 @@ Art Tags:
 - Dave's bro
 - Earth
 Referenced Tracks:
-- track:beatdown-strider-style
-- track:umbral-ultimatum
+- Beatdown (Strider Style)
+- Umbral Ultimatum
 Commentary: |-
     <i>Chaosvariant:</i>
-    Hi I go by Chaosvariant. I worked on this track for Dave's Bro, my original intention was to remix [[track:beatdown-strider-style]] to have a little more flair and fit better into the cool yet dangerous aura Dave's Bro put off then to have that transition into the fight with Jack Noir. My computer halfway through this process bricked so sadly we're kinda stuck with a WIP but I hope you'll like it for the concept alone.
+    Hi I go by Chaosvariant. I worked on this track for Dave's Bro, my original intention was to remix [[Beatdown (Strider Style)]] to have a little more flair and fit better into the cool yet dangerous aura Dave's Bro put off then to have that transition into the fight with Jack Noir. My computer halfway through this process bricked so sadly we're kinda stuck with a WIP but I hope you'll like it for the concept alone.
     <i>SplitSuns:</i>
     SplitSuns here. In addition to writing my own song for this project, which you'll find 24 tracks from now, I mastered the album in general. In theory, this means making sure each song is around the same volume so you don't have to keep adjusting your headphones. However, sometimes I did some extra work just to polish things up. Like with this song, for instance: I took what Chaosvariant had finished, added some EQ to make the mix clearer, and added a small sound effect at the end to smooth things out.
     <i>ackro:</i>
@@ -190,7 +190,7 @@ Art Tags:
 - 'cw: animal death'
 Referenced Tracks:
 - A Taste for Adventure
-- track:dissension-remix
+- Dissension (Remix)
 - track:old-secret
 Commentary: |-
     <b><i>SplitSuns:</i></b>
@@ -252,7 +252,7 @@ Art Tags:
 - Jane
 - Earth
 Referenced Tracks:
-- track:showtime-original-mix
+- Showtime (Original Mix)
 Commentary: |-
     <i>Grace Medley:</i>
     Sorry, sorry to interrupt the booklet, folks, but I've got a cracking idea: see the next time you find yourself in a pub toilet, and you've got a pen on you, write on the door, "Johnny Crocker, R.I.P." Or let's say you're not old enough to get into pubs yet, let's say, you're still in school? Write it on a desk. Scratch it in with a compass. "Johnny Crocker, R.I.P." Or let's say you're online. Let's say you're on Bebo, Facebook, Myspace, Twitter, a forum, whatever it is, just get the message out there. "Johnny Crocker, R.I.P." Miss you, big man. Gone, but not forgotten.
@@ -274,8 +274,8 @@ Art Tags:
 - Earth
 Referenced Tracks:
 - The Thirteenth Hour
-- track:endless-climb
-- track:aggrieve
+- Endless Climb
+- Aggrieve
 - DAVE STRIDER'S COOL MIXTAPE
 Commentary: |-
     <i>Circlejourney:</i>
@@ -301,7 +301,7 @@ Art Tags:
 - Earth
 - SBaHJ
 Referenced Tracks:
-- track:beatdown-strider-style
+- Beatdown (Strider Style)
 - This Is America
 - Giorgio by Moroder
 - Bodies
@@ -312,7 +312,7 @@ Referenced Tracks:
 - What is a Juggalo?
 - Waters of Nazareth
 - SWEET BRO AND HELLA JEFF SHOW
-- track:upward-movement-dave-owns
+- Upward Movement (Dave Owns)
 Lyrics: |-
     (backwards dialogue)
     Waow
@@ -350,17 +350,17 @@ Art Tags:
 - Lord English
 Referenced Tracks:
 - Rhapsody in Green
-- track:verdancy-bassline
+- Verdancy (Bassline)
 - Skaianet
 - Gardener
-- track:mutiny
+- Mutiny
 - Roundabout
 - Afraid of the Darko
 - Piss
 Commentary: |-
     <i>Interrobang:</i>
     This piece has been in the works for a LONG time. I started it in March of 2017, and though most of the compositional work was complete by July of that year, I didn't finish polishing everything up until late April 2018, after many months of procrastination and tweaking. The idea of the track is simple, it's Jake's Grandmother, Jade English, writing a song for her signature eclectic bass sometime in the 80's, which you probably already knew from the title. Anyway, I wanted to make a song that you could supposedly 'play' on the eclectic bass, which meant I had to figure out what exactly the components of such an instrument were (see [[media:misc/eclectic-bass-diagram.png|the accompanying diagram]]). I chose the iconic Yamaha DX7 (used in tons of 80's pop) to be the keyboards of the instrument as it could make the sounds I wanted, it was from around the right time, and I had an emulation (Digital Suburban's "Dexed") on hand. Other instruments used in the song were Karfoyer Audio's "Pastabass" and "Swagbass" for the bass guitars themselves, as well as Full Bucket Music's "Ragnarök" (used to flesh out some bass frequencies at the song's peak), and some built-in GarageBand instruments (drums) and effects.
-    Compositionally, I started out with the ostinato that closes [[track:rhapsody-in-green]] (Clark Powell) from the Felt album, but played in reverse, adding in an FM pad (the aforementioned DX7) and [[track:skaianet]] by Mark Hadley on the other bass guitar. The introduction section transitions into variations on [[track:verdancy-bassline]] by Kalibration, and closes the track's first half with a medley of various Jade-related songs. The second half is an original thing (though the beginning is a variation on [[track:afraid-of-the-darko]] by RJ! Lake) that I had build in complexity and intensity before dropping off to end the piece. Reference-wise, I tried to keep things centered roughly on Jade, as well as some other skaianet/felt sort of stuff that I thought fit the Alpha world and Jade's place in it, but I did end up throwing in a couple memetic references, see if you can find them both!
+    Compositionally, I started out with the ostinato that closes [[track:rhapsody-in-green]] (Clark Powell) from the Felt album, but played in reverse, adding in an FM pad (the aforementioned DX7) and [[track:skaianet]] by Mark Hadley on the other bass guitar. The introduction section transitions into variations on [[Verdancy (Bassline)]] by Kalibration, and closes the track's first half with a medley of various Jade-related songs. The second half is an original thing (though the beginning is a variation on [[track:afraid-of-the-darko]] by RJ! Lake) that I had build in complexity and intensity before dropping off to end the piece. Reference-wise, I tried to keep things centered roughly on Jade, as well as some other skaianet/felt sort of stuff that I thought fit the Alpha world and Jade's place in it, but I did end up throwing in a couple memetic references, see if you can find them both!
     <i>Jas:</i>
     Grandma Harley often wrote her grandson about the tyranny of Lord English, obviously not able to hide everything from the enemy.
 ---
@@ -676,7 +676,7 @@ Art Tags:
 - Alternia
 Referenced Tracks:
 - Eridan's Theme
-- track:chorale-for-jaspers
+- Chorale for Jaspers
 - Science Seahorse
 Commentary: |-
     <i>FrostyMac:</i>
@@ -745,10 +745,10 @@ Art Tags:
 Referenced Tracks:
 - English
 - Afraid of the Darko
-- track:aggrieve
-- track:beatdown-strider-style
-- track:dissension-original
-- track:showtime-original-mix
+- Aggrieve
+- Beatdown (Strider Style)
+- Dissension (Original)
+- Showtime (Original Mix)
 Commentary: |-
     <i>SplitSuns:</i>
     When I was first given the opportunity to work on Cosmic Caretakers and saw that there was an open slot for a track centered around Doc Scratch, I jumped at the opportunity to produce it! Scratch has always been one of my favorite characters in Homestuck. When I read through the comic for the first time I loved how he orchestrated the destruction of two entire universes but managed to give an air of dignity and style to such a nefarious event. His demeanor was never overtly evil: it was unsettling at times, sure, but he always acted the part of an excellent host through and through. I tried to represent this atmosphere in my own song. Its jazzy feel ripped from "Drawing Dead" or "The Felt" definitely brings to mind a comfortable stay in Scratch's parlor, but if you listen closely you can notice sinister undertones lurking beneath the surface through the decaying bells and whistling winds. Of course, I had to throw in some reverse piano in the mix as well. It wouldn't be a Felt-centric song without one. Towards the end of the track the piano backmasks some iconic Beta Kid motifs, showing how Scratch is acutely aware of every piece to his puzzle (even when we're not). What kind of an excellent host would he be if he didn't keep tabs on his "guests", after all?
diff --git a/album/cyber-city-sound-pak.yaml b/album/cyber-city-sound-pak.yaml
index e26ebc2f..03568c5a 100644
--- a/album/cyber-city-sound-pak.yaml
+++ b/album/cyber-city-sound-pak.yaml
@@ -176,10 +176,10 @@ URLs:
 - https://cristata.bandcamp.com/track/scarlet-forest-lotus-mix
 Referenced Tracks:
 - Scarlet Forest
-- track:upward-movement-dave-owns
+- Upward Movement (Dave Owns)
 - Lotus
 Sampled Tracks:
-- track:upward-movement-dave-owns
+- Upward Movement (Dave Owns)
 Commentary: |-
     <i>Cristata:</i>
     <big><b>[redacted]</b></big>
diff --git a/album/dialed-to-11.yaml b/album/dialed-to-11.yaml
index 465fe98b..112220ae 100644
--- a/album/dialed-to-11.yaml
+++ b/album/dialed-to-11.yaml
@@ -169,7 +169,7 @@ Referenced Tracks:
 - Dream Sequence
 - Rude Awakening
 - Fell Into The Nexus
-- track:sburban-jungle
+- Sburban Jungle
 Commentary: |-
     <i>LudicrousFalcon:</i>
     I technically included all the previous tracks from the album in this song, but some of the references are either very short, hard to catch, or include motifs from bridge sections or background melodies. I don't blame you for having a hard time, especially since there's parts where 2 or more motifs are layered over each other at the same time. Overall, the album references tracks in the order they appear in the album.
@@ -185,7 +185,7 @@ Commentary: |-
     Ok for this next section, I guess I told a little white lie when I said all songs are referenced in order, because upon relisten, I've noticed that the [[track:battle-of-the-bridges|Battle of the bridges]] melody kicks in before the [[track:dialed-to-11|Dialed to 11]] melody. Either way, we got Bridges, but then at 2:54, we get both a different melody from Bridges (this melody of Bridges can be heard at the 1:40 mark), AND a melody from Dialed to 11 (which can be heard at 3:53 in the namesake song). Guitars kick in at 3:30, followed by ANOTHER melody from Battle of the bridges (begins at 4:08 in Bridges). Tracks 11 and 12 are now referenced as we transition to a quieter section that references tracks 13 and 14.
 
     At 3:53 in CF Anthem, we have a violin melody that references a part of [[track:rude-awakening|Rude Awakening]] that begins at 3:12 in Rude Awakening. Alongside that is a quieter reference to "[[track:dream-sequence|Dream Sequence]]". The 2 play alongside eachother before Rude Awakening fades out, leaving us with just Dream Sequence. --- At 4:39 in CF Anthem, we get the 2 of the last 3 references for this song: the base melody for "[[track:fell-into-the-nexus|Fell Into The Nexus]]" (plays throughout entirety of Nexus), along with a return of the bell melody that you hear at the very beginning of CF Anthem, though I dunno if that actually counts as a reference lol.
-    We then get one last section with the guitars, then a quieter piano section that references [[track:sburban-jungle|Sburban Jungle]] from the Homestuck OST before the song ends.
+    We then get one last section with the guitars, then a quieter piano section that references [[Sburban Jungle]] from the Homestuck OST before the song ends.
 ---
 Track: THE Song Of All Time
 Cover Artists:
diff --git a/album/diverging-delicacies.yaml b/album/diverging-delicacies.yaml
index 6cd74737..7f886b42 100644
--- a/album/diverging-delicacies.yaml
+++ b/album/diverging-delicacies.yaml
@@ -102,7 +102,7 @@ Cover Artists:
 Art Tags:
 - Jade
 Referenced Tracks:
-- track:umbral-ultimatum
+- Umbral Ultimatum
 ---
 Track: Constituent Hearts
 Artists:
@@ -175,7 +175,7 @@ Referenced Tracks:
 - Eternity Served Cold
 - Austin, Atlantis
 - Purple Bard
-- track:beatdown-strider-style
+- Beatdown (Strider Style)
 - Horschestra
 - Homosuck Swan Song
 - track:penumbra-phantasm
@@ -236,7 +236,7 @@ Art Tags:
 - Green Sun
 - 'cw: blood'
 Referenced Tracks:
-- track:showtime-piano-refrain
+- Showtime (Piano Refrain)
 - Flare
 ---
 Track: I Am Ascending (And It Is Terrible)
@@ -255,10 +255,10 @@ Referenced Tracks:
 - Black Rose / Green Sun
 - Lilith in Starlight
 - At The Price of Oblivion
-- track:aggrieve
+- Aggrieve
 - Flare
-- track:endless-climb
-- track:chorale-for-jaspers
+- Endless Climb
+- Chorale for Jaspers
 ---
 Track: Come
 Artists:
@@ -297,7 +297,7 @@ Art Tags:
 Cover Art File Extension: jpg
 Referenced Tracks:
 - Orange Hat
-- track:upward-movement-dave-owns
+- Upward Movement (Dave Owns)
 Commentary: |-
     <i>Mikkynga:</i>
     Also bonus art because i read the wrong part of the epilogues at first but i liked it anyway and i couldn't just let it die:
@@ -373,8 +373,8 @@ Art Tags:
 - Earth
 - 'cw: blood'
 Referenced Tracks:
-- track:heir-of-grief
-- track:theme
+- Heir of Grief
+- Theme
 - Purple Bard
 ---
 Track: RUMBLE IN DA PUMPKIN PATCH
@@ -454,7 +454,7 @@ Referenced Tracks:
 - The Lemonsnout Turnabout
 - track:penumbra-phantasm
 - track:MeGaLoVania
-- track:upward-movement-dave-owns
+- Upward Movement (Dave Owns)
 - Black Rose / Green Sun
 - Courser
 - Lotus
diff --git a/album/dont-read-a-webcomic-called-homestuck.yaml b/album/dont-read-a-webcomic-called-homestuck.yaml
index 924abe36..08b9c725 100644
--- a/album/dont-read-a-webcomic-called-homestuck.yaml
+++ b/album/dont-read-a-webcomic-called-homestuck.yaml
@@ -20,22 +20,23 @@ URLs:
 - https://open.spotify.com/track/01XsDx2P2AEi4pQYOv9Bwk
 - https://www.youtube.com/watch?v=yZYMavg7_M4
 Referenced Tracks:
-- track:showtime-piano-refrain
-- track:sburban-jungle
-- track:doctor
-- track:beatdown-strider-style
+- Showtime (Piano Refrain)
+- Sburban Jungle
+- Doctor
+- Beatdown (Strider Style)
 - Gardener
-- track:ohgodwhat
+- Ohgodwhat
 ---
 Track: Heir of Grief
 Directory: heir-of-grief-dont-read-a-webcomic-called-homestuck
+Always Reference By Directory: true
 Duration: '5:44'
 URLs:
 - https://open.spotify.com/track/2fWC2ms6QjUnbD4M7Bqfiq
 - https://www.youtube.com/watch?v=vQhpezzg9zs
 Referenced Tracks:
-- track:heir-of-grief
-- track:harlequin
+- Heir of Grief
+- Harlequin
 ---
 Track: Moonskater
 Duration: '3:57'
@@ -47,6 +48,7 @@ Referenced Tracks:
 ---
 Track: CARNE VALE
 Directory: carne-vale-dont-read-a-webcomic-called-homestuck
+Always Reference By Directory: true
 Duration: '4:25'
 URLs:
 - https://open.spotify.com/track/0gCVMvwUwztzUKmm5ZcbdK
@@ -75,9 +77,10 @@ Referenced Tracks:
 ---
 Track: Umbral Ultimatum
 Directory: umbral-ultimatum-dont-read-a-webcomic-called-homestuck
+Always Reference By Directory: true
 Duration: '4:22'
 URLs:
 - https://open.spotify.com/track/52V2Zd960PTVoK1WLpdqUl
 - https://www.youtube.com/watch?v=g_E82QP4rHI
 Referenced Tracks:
-- track:umbral-ultimatum
+- Umbral Ultimatum
diff --git a/album/early-access.yaml b/album/early-access.yaml
index d333ec79..e7d7f200 100644
--- a/album/early-access.yaml
+++ b/album/early-access.yaml
@@ -37,7 +37,7 @@ Duration: '2:40'
 URLs:
 - https://actomega.bandcamp.com/track/year-one
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 - Courser
 - track:penumbra-phantasm
 - track:im-a-member-of-the-midnight-crew
@@ -56,12 +56,12 @@ Duration: '2:08'
 URLs:
 - https://actomega.bandcamp.com/track/cog
 Referenced Tracks:
-- track:atomyk-ebonpyre
-- track:upward-movement-dave-owns
+- Atomyk Ebonpyre
+- Upward Movement (Dave Owns)
 - Cascade (Beta)
-- track:beatdown-strider-style
+- Beatdown (Strider Style)
 Sampled Tracks:
-- track:upward-movement-dave-owns
+- Upward Movement (Dave Owns)
 Commentary: |-
     <i>Husr:</i>
     Concerning Time.
@@ -75,7 +75,7 @@ URLs:
 - https://actomega.bandcamp.com/track/blastoff
 Referenced Tracks:
 - Trickster Mode (Blast Off)
-- track:sburban-jungle
+- Sburban Jungle
 - track:liquid-negrocity
 - track:penumbra-phantasm
 - Cascade (Beta)
@@ -91,7 +91,7 @@ Duration: '2:32'
 URLs:
 - https://actomega.bandcamp.com/track/extermination
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 - Extermination Alpha
 - track:carne-vale
 - Cascade (Beta)
@@ -117,7 +117,7 @@ Duration: '2:50'
 URLs:
 - https://actomega.bandcamp.com/track/sburban-resolution
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 ---
 Track: Torrent (Bonus)
 Directory: torrent-early-access
@@ -129,14 +129,14 @@ URLs:
 Referenced Tracks:
 - Cascade (Beta)
 - Dance of Thorns
-- track:upward-movement-dave-owns
+- Upward Movement (Dave Owns)
 - Even in Death
 - Love You (Feferi's Theme)
 - Unite Synchronization
 - Black Hole / Green Sun
-- track:doctor
+- Doctor
 Sampled Tracks:
-- track:upward-movement-dave-owns
+- Upward Movement (Dave Owns)
 ---
 Track: Savoir Allegro (Bonus)
 Directory: savoir-allegro
@@ -146,7 +146,7 @@ Duration: '1:37'
 URLs:
 - https://actomega.bandcamp.com/track/savoir-allegro-bonus
 Referenced Tracks:
-- track:doctor
+- Doctor
 - track:penumbra-phantasm
 ---
 Track: Extermination Alpha
diff --git a/album/entertaining-sound.yaml b/album/entertaining-sound.yaml
index eb795cb4..aee3e051 100644
--- a/album/entertaining-sound.yaml
+++ b/album/entertaining-sound.yaml
@@ -178,19 +178,19 @@ Referenced Tracks:
 - track:MeGaLoVania
 - Oppa Toby Style
 - Sunsetter
-- track:carefree-victory
-- track:crustacean
+- Carefree Victory
+- Crustacean
 - Liquid Negrocity
 - Once Upon a Time
 - Your Best Friend
 - Oh! One True Love
-- track:atomyk-ebonpyre
+- Atomyk Ebonpyre
 - Undyne
 - track:ruins-undertale
 - Dogsong
 - Nyeh Heh Heh!
 - track:penumbra-phantasm
-- track:doctor
+- Doctor
 - It's Raining Somewhere Else
 - English
 - Bergentrückung
@@ -228,7 +228,7 @@ Referenced Tracks:
 - Marisa Stole the Precious Thing
 - Never Gonna Give You Up
 - Caramelldansen
-- track:showtime-piano-refrain
+- Showtime (Piano Refrain)
 - Nyanyanyanyanyanyanya!【Momo Momone】
 - Friday
 - Gangnam Style
diff --git a/album/exile.yaml b/album/exile.yaml
index a99015fe..96652b0a 100644
--- a/album/exile.yaml
+++ b/album/exile.yaml
@@ -11,6 +11,7 @@ URLs:
 ---
 Track: Calamity
 Directory: calamity-exile
+Always Reference By Directory: true
 Duration: 0:29
 URLs:
 - https://archive.org/details/exile-pinkushion/01%20Calamity.mp3
@@ -18,19 +19,21 @@ URLs:
 Track: Contention
 Directory: contention-exile
 Originally Released As: track:contention-vol4
+Always Reference By Directory: true
 Duration: '2:28'
 URLs:
 - https://archive.org/details/exile-pinkushion/02%20Contention.mp3
 ---
 Track: Mutiny
 Directory: mutiny-exile
-Originally Released As: track:mutiny
+Originally Released As: Mutiny
 Duration: '2:59'
 URLs:
 - https://archive.org/details/exile-pinkushion/03%20Mutiny.mp3
 ---
 Track: Nightlife
 Originally Released As: track:nightlife-extended
+Always Reference By Directory: true
 Duration: '2:34'
 URLs:
 - https://archive.org/details/exile-pinkushion/04%20Nightlife.mp3
@@ -38,6 +41,7 @@ URLs:
 Track: Guardian
 Directory: guardian-exile
 Originally Released As: track:guardian
+Always Reference By Directory: true
 Duration: '2:04'
 URLs:
 - https://archive.org/details/exile-pinkushion/05%20Guardian.mp3
@@ -71,28 +75,28 @@ URLs:
 Track: Strider Showdown (loop)
 Duration: '0:57'
 Referenced Tracks:
-- track:beatdown-strider-style
+- Beatdown (Strider Style)
 URLs:
 - https://archive.org/details/exile-pinkushion/11%20Strider%20Showdown%20%28loop%29.mp3
 ---
 Track: Beatdown ~Dance Praxis~
 Duration: '1:04'
 Referenced Tracks:
-- track:beatdown-strider-style
+- Beatdown (Strider Style)
 URLs:
 - https://archive.org/details/exile-pinkushion/12%20Beatdown%20~Dance%20Praxis~.mp3
 ---
 Track: Beatdown (pumpkin)
 Duration: '0:53'
 Referenced Tracks:
-- track:beatdown-strider-style
+- Beatdown (Strider Style)
 URLs:
 - https://archive.org/details/exile-pinkushion/13%20Beatdown%20%28pumpkin%29.mp3
 ---
 Track: Beatdown FTFOHCSSRMX
 Duration: '1:07'
 Referenced Tracks:
-- track:beatdown-strider-style
+- Beatdown (Strider Style)
 URLs:
 - https://archive.org/details/exile-pinkushion/14%20Beatdown%20FTFOHCSSRMX.mp3
 ---
diff --git a/album/friendsymphony.yaml b/album/friendsymphony.yaml
index 29a1d724..f99f604c 100644
--- a/album/friendsymphony.yaml
+++ b/album/friendsymphony.yaml
@@ -50,7 +50,7 @@ Duration: 0:56
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/discone
 Referenced Tracks:
-- track:theme
+- Theme
 ---
 Track: Spare Friendship, Ma'am?
 Artists:
@@ -276,8 +276,8 @@ Cover Artists:
 - Chesswanderlust-sama
 Referenced Tracks:
 - Courser
-- track:sburban-jungle
-- track:umbral-ultimatum
+- Sburban Jungle
+- Umbral Ultimatum
 ---
 Track: no *kills you*
 Artists:
diff --git a/album/genesis-frog.yaml b/album/genesis-frog.yaml
index 448ef395..355f849b 100644
--- a/album/genesis-frog.yaml
+++ b/album/genesis-frog.yaml
@@ -190,7 +190,7 @@ Art Tags:
 - Consorts
 - LoHaC
 Referenced Tracks:
-- track:atomyk-ebonpyre
+- Atomyk Ebonpyre
 Commentary: |-
     <i>Alex Rosetti:</i>
     Where do I even start? This is one of my favorite tracks that I've made, and by that I mean to say I'm really amused I was able to come up with this in the first place. It originally wasn't part of this album at all—it was supposed to be a short jingle for the LOHAC Stock Exchange! But it was too much fun to let go of and soon it morphed into a full-fledged character theme for everyone's beloved, excitable consorts. The general idea behind the music was this: Jit may have made a silly arrangement of Atomyk Ebonpyre, but what could I do to put it in an even more ridiculous context? And so it was that it became the manic violin and xylophone old-timey television music-inspired (this was my only frame of reference for what I thought stock exchange music should sound like) tune that it is now. And wouldn't you know it, this type of music turned out to fit the personality of the Crocodiles like a crocodile-fitted glove.
diff --git a/album/glitchstuck-volume-1.yaml b/album/glitchstuck-volume-1.yaml
index 05d32648..eda1b9ea 100644
--- a/album/glitchstuck-volume-1.yaml
+++ b/album/glitchstuck-volume-1.yaml
@@ -86,4 +86,4 @@ URLs:
 Cover Artists:
 - Glitchstuck
 Referenced Tracks:
-- track:sburban-countdown
+- Sburban Countdown
diff --git a/album/gotta-hatch-em-all.yaml b/album/gotta-hatch-em-all.yaml
index f4572cb4..d2deef20 100644
--- a/album/gotta-hatch-em-all.yaml
+++ b/album/gotta-hatch-em-all.yaml
@@ -37,7 +37,7 @@ Artists:
 URLs:
 - https://sahcon.bandcamp.com/track/welcome-to-the-world-of-fiduspawn
 Referenced Tracks:
-- track:theme
+- Theme
 ---
 Track: Hivetown
 Duration: '2:58'
@@ -47,7 +47,7 @@ URLs:
 - https://sahcon.bandcamp.com/track/hivetown
 Referenced Tracks:
 - track:penumbra-phantasm
-- track:theme
+- Theme
 ---
 Track: Mysterious Lab
 Duration: '2:25'
@@ -84,7 +84,7 @@ URLs:
 Referenced Tracks:
 - FIDUSPAWN, GO!
 - track:battle-trainer-battle-pokemon-red-and-blue-versions
-- track:showtime-original-mix
+- Showtime (Original Mix)
 - track:battle-wild-pokemon-johto-version-pokemon-gold-and-silver-versions
 ---
 Track: VS. Fiduspawner
@@ -107,7 +107,7 @@ URLs:
 - https://sahcon.bandcamp.com/track/seavillization
 Referenced Tracks:
 - FIDUSPAWN, GO!
-- track:theme
+- Theme
 - track:penumbra-phantasm
 ---
 Track: Above the Melting Clockwork
@@ -117,7 +117,7 @@ Artists:
 URLs:
 - https://sahcon.bandcamp.com/track/above-the-melting-clockwork
 Referenced Tracks:
-- track:atomyk-ebonpyre
+- Atomyk Ebonpyre
 ---
 Track: VS. Pit Leader
 Duration: '2:23'
@@ -126,7 +126,7 @@ Artists:
 URLs:
 - https://sahcon.bandcamp.com/track/vs-pit-leader
 Referenced Tracks:
-- track:beatdown-strider-style
+- Beatdown (Strider Style)
 ---
 Track: Unsuspicious Gambling Institution
 Duration: '2:50'
@@ -162,7 +162,7 @@ URLs:
 - https://sahcon.bandcamp.com/track/fiducenter
 Referenced Tracks:
 - Route -1
-- track:theme
+- Theme
 ---
 Track: Peaceful Night
 Duration: '3:13'
diff --git a/album/gristmas-carols.yaml b/album/gristmas-carols.yaml
index 9807c1c0..adae387f 100644
--- a/album/gristmas-carols.yaml
+++ b/album/gristmas-carols.yaml
@@ -105,7 +105,7 @@ URLs:
 - https://unofficialmspafans.bandcamp.com/track/creation-myth
 - https://youtu.be/GIWe1ZlioTk
 Referenced Tracks:
-- track:skies-of-skaia
+- Skies of Skaia
 - Frostbite
 - a baby is born
 Commentary: |-
@@ -134,7 +134,7 @@ URLs:
 - https://youtu.be/6XWxat4vn2A
 Referenced Tracks:
 - Frosty the Snowman
-- track:beatdown-strider-style
+- Beatdown (Strider Style)
 Commentary: |-
     <i>FrostyMac:</i>
     I made this whole thing in Spanish class. Suck it productivity!
diff --git a/album/guidestuck-volume-one.yaml b/album/guidestuck-volume-one.yaml
index dcaa2a57..1d482b70 100644
--- a/album/guidestuck-volume-one.yaml
+++ b/album/guidestuck-volume-one.yaml
@@ -157,7 +157,7 @@ URLs:
 Cover Artists:
 - dominodamsel
 Referenced Tracks:
-- track:harlequin
+- Harlequin
 Commentary: |-
     <i>Doctor Onion:</i>
     'Quinnstrife'
@@ -263,4 +263,4 @@ URLs:
 - https://guidestuckofficial.bandcamp.com/track/old-friends-auxiliaryprotocol
 - https://www.youtube.com/watch?v=l7c8bhg_zfY
 Cover Artists:
-- Rangaruka
\ No newline at end of file
+- Rangaruka
diff --git a/album/heinoustuck-vol-1.yaml b/album/heinoustuck-vol-1.yaml
index 2d416e3c..208e4e47 100644
--- a/album/heinoustuck-vol-1.yaml
+++ b/album/heinoustuck-vol-1.yaml
@@ -36,6 +36,7 @@ Commentary:
 ---
 Track: Theme
 Directory: theme-heinoustuck
+Always Reference By Directory: true
 Artists:
 - HexVertigo
 Duration: '01:05'
@@ -76,7 +77,7 @@ Art Tags:
 - 'cw: blood'
 - 'cw: eye horror'
 Referenced Tracks:
-- track:doctor
+- Doctor
 ---
 Track: A Forced Smile
 Artists:
@@ -106,7 +107,7 @@ Art Tags:
 - 'cw: body horror'
 - 'cw: blood'
 Referenced Tracks:
-- track:chorale-for-jaspers
+- Chorale for Jaspers
 ---
 Track: Hellion Angel
 Artists:
@@ -150,8 +151,8 @@ Art Tags:
 - 'cw: body horror'
 - 'cw: blood'
 Referenced Tracks:
-- track:umbral-ultimatum
-- track:dissension-original
+- Umbral Ultimatum
+- Dissension (Original)
 ---
 Track: Trypophobic Canine
 Artists:
@@ -181,6 +182,7 @@ Art Tags:
 ---
 Track: Nightmare
 Directory: nightmare-heinoustuck
+Always Reference By Directory: true
 Artists:
 - karelianArmy
 Duration: '01:09'
@@ -207,7 +209,7 @@ Art Tags:
 - 'cw: body horror'
 - 'cw: blood'
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 ---
 Track: Ignition
 Artists:
diff --git a/album/hiveswap-act-1-ost.yaml b/album/hiveswap-act-1-ost.yaml
index 3e17d037..6a7f38fb 100644
--- a/album/hiveswap-act-1-ost.yaml
+++ b/album/hiveswap-act-1-ost.yaml
@@ -277,7 +277,7 @@ URLs:
 - https://homestuck.bandcamp.com/track/some-kind-of-alien-2
 - https://youtu.be/PDZfnEW86Qc
 Referenced Tracks:
-- track:crustacean
+- Crustacean
 MIDI Project Files:
 - Title: MIDI by Unknown
   Files:
diff --git a/album/homestuck-for-orchestra-ep.yaml b/album/homestuck-for-orchestra-ep.yaml
index 85260049..e98c9e17 100644
--- a/album/homestuck-for-orchestra-ep.yaml
+++ b/album/homestuck-for-orchestra-ep.yaml
@@ -28,7 +28,7 @@ URLs:
 Cover Artists:
 - Walt Ribeiro
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 ---
 Track: Homestuck 'MeGaLoVania' For Orchestra
 Duration: '04:59'
diff --git a/album/homestuck-for-the-holidays.yaml b/album/homestuck-for-the-holidays.yaml
index 21a20a2f..14ade59e 100644
--- a/album/homestuck-for-the-holidays.yaml
+++ b/album/homestuck-for-the-holidays.yaml
@@ -51,7 +51,7 @@ URLs:
 - https://homestuckgaiden.bandcamp.com/track/a-skaian-christmas
 - https://youtu.be/VPB_PlYW89M
 Referenced Tracks:
-- track:skies-of-skaia
+- Skies of Skaia
 ---
 Track: Anthem of Rime
 Artists:
@@ -223,7 +223,7 @@ URLs:
 Referenced Tracks:
 - Santa Claus Is Comin' to Town
 - God Rest You Merry, Gentlemen
-- track:sburban-jungle
+- Sburban Jungle
 ---
 Track: Carolmanthetime
 Artists:
@@ -237,8 +237,8 @@ URLs:
 Referenced Tracks:
 - Carol of the Bells
 - God Rest You Merry, Gentlemen
-- track:doctor
-- track:showtime-piano-refrain
+- Doctor
+- Showtime (Piano Refrain)
 ---
 Track: Candlelight
 Artists:
@@ -380,7 +380,7 @@ Duration: 0:40
 URLs:
 - https://youtu.be/wN6DYiH6aws
 Referenced Tracks:
-- track:ohgodwhat
+- Ohgodwhat
 Lyrics: |-
     SQUIDDLES: God oh man, oh God oh man... oh God Christmas!
     Oh God, Christmas!
diff --git a/album/homestuck-swagazaki.yaml b/album/homestuck-swagazaki.yaml
index a9b46c28..71e4b4ed 100644
--- a/album/homestuck-swagazaki.yaml
+++ b/album/homestuck-swagazaki.yaml
@@ -35,7 +35,7 @@ Duration: '04:40'
 URLs: 
 - https://swagazaki.bandcamp.com/track/cap-glasses
 Referenced Tracks:
-- track:beatdown-strider-style
+- Beatdown (Strider Style)
 - Unite Synchronization
 - track:moonsetter
 ---
@@ -44,15 +44,15 @@ Duration: '04:37'
 URLs: 
 - https://swagazaki.bandcamp.com/track/explore-midnight
 Referenced Tracks:
-- track:explore
+- Explore
 ---
 Track: The Noble Orange Bird
 Duration: '03:32'
 URLs: 
 - https://swagazaki.bandcamp.com/track/the-noble-orange-bird
 Referenced Tracks:
-- track:upward-movement-dave-owns
-- track:endless-climb
+- Upward Movement (Dave Owns)
+- Endless Climb
 ---
 Track: I'm an Englishlord in a Doc
 Duration: '03:06'
diff --git a/album/homestuck-vol-1-4.yaml b/album/homestuck-vol-1-4.yaml
index 36d464b9..43ca9df8 100644
--- a/album/homestuck-vol-1-4.yaml
+++ b/album/homestuck-vol-1-4.yaml
@@ -30,7 +30,7 @@ Section: From Homestuck Vol. 1
 ---
 Track: Showtime (Piano Refrain)
 Directory: showtime-piano-refrain-vol-1-4
-Originally Released As: track:showtime-piano-refrain
+Originally Released As: Showtime (Piano Refrain)
 Art Tags:
 - John
 Duration: '2:20'
@@ -40,7 +40,7 @@ URLs:
 ---
 Track: Harlequin
 Directory: harlequin-vol-1-4
-Originally Released As: track:harlequin
+Originally Released As: Harlequin
 Duration: '1:43'
 URLs:
 - https://homestuck.bandcamp.com/track/harlequin-3
@@ -48,7 +48,7 @@ URLs:
 ---
 Track: Showtime (Original Mix)
 Directory: showtime-original-mix-vol-1-4
-Originally Released As: track:showtime-original-mix
+Originally Released As: Showtime (Original Mix)
 Art Tags:
 - John's dad
 Duration: '2:09'
@@ -58,7 +58,7 @@ URLs:
 ---
 Track: Aggrieve (Violin Refrain)
 Directory: aggrieve-violin-refrain-vol-1-4
-Originally Released As: track:aggrieve-violin-refrain
+Originally Released As: Aggrieve (Violin Refrain)
 Art Tags:
 - Rose
 Duration: '1:34'
@@ -68,7 +68,7 @@ URLs:
 ---
 Track: Sburban Countdown
 Directory: sburban-countdown-vol-1-4
-Originally Released As: track:sburban-countdown
+Originally Released As: Sburban Countdown
 Art Tags:
 - Earth
 Cover Art File Extension: jpg
@@ -79,7 +79,7 @@ URLs:
 ---
 Track: Aggrieve
 Directory: aggrieve-vol-1-4
-Originally Released As: track:aggrieve
+Originally Released As: Aggrieve
 Art Tags:
 - Rose
 - Maplehoof
@@ -90,7 +90,7 @@ URLs:
 ---
 Track: Showtime (Imp Strife Mix)
 Directory: showtime-imp-strife-mix-vol-1-4
-Originally Released As: track:showtime-imp-strife-mix
+Originally Released As: Showtime (Imp Strife Mix)
 Art Tags:
 - Underlings
 - Rabbit
@@ -101,7 +101,7 @@ URLs:
 ---
 Track: Nannaquin
 Directory: nannaquin-vol-1-4
-Originally Released As: track:nannaquin
+Originally Released As: Nannaquin
 Art Tags:
 - John's nanna
 Cover Art File Extension: jpg
@@ -112,7 +112,7 @@ URLs:
 ---
 Track: Skies of Skaia
 Directory: skies-of-skaia-vol-1-4
-Originally Released As: track:skies-of-skaia
+Originally Released As: Skies of Skaia
 Art Tags:
 - Skaia
 Cover Art File Extension: jpg
@@ -126,7 +126,7 @@ Section: From Homestuck Vol. 2
 ---
 Track: Harlequin (Rock Version)
 Directory: harlequin-rock-version-vol-1-4
-Originally Released As: track:harlequin-rock-version
+Originally Released As: Harlequin (Rock Version)
 Art Tags:
 - Underlings
 Cover Art File Extension: jpg
@@ -145,12 +145,12 @@ URLs:
 - https://homestuck.bandcamp.com/track/john-sleeps-skaian-magicant-2
 - https://youtu.be/ZAKLIH_anJI
 Referenced Tracks:
-- track:showtime-original-mix
-- track:skies-of-skaia
+- Showtime (Original Mix)
+- Skies of Skaia
 ---
 Track: Upward Movement (Dave Owns)
 Directory: upward-movement-dave-owns-vol-1-4
-Originally Released As: track:upward-movement-dave-owns
+Originally Released As: Upward Movement (Dave Owns)
 Art Tags:
 - Dave
 - Lil Cal
@@ -162,7 +162,7 @@ URLs:
 ---
 Track: Vagabounce
 Directory: vagabounce-vol-1-4
-Originally Released As: track:vagabounce
+Originally Released As: Vagabounce
 Art Tags:
 - WV
 Cover Art File Extension: jpg
@@ -173,7 +173,7 @@ URLs:
 ---
 Track: Explore
 Directory: explore-vol-1-4
-Originally Released As: track:explore
+Originally Released As: Explore
 Art Tags:
 - Ruined Earth
 Cover Art File Extension: jpg
@@ -205,7 +205,7 @@ Commentary: |-
 ---
 Track: Showtime Remix
 Directory: showtime-remix-vol-1-4
-Originally Released As: track:showtime-remix
+Originally Released As: Showtime Remix
 Duration: '2:02'
 URLs:
 - https://homestuck.bandcamp.com/track/showtime-remix-3
@@ -213,7 +213,7 @@ URLs:
 ---
 Track: Aggrieve Remix
 Directory: aggrieve-remix-vol-1-4
-Originally Released As: track:aggrieve-remix
+Originally Released As: Aggrieve Remix
 Duration: '2:11'
 URLs:
 - https://homestuck.bandcamp.com/track/aggrieve-remix-3
@@ -221,7 +221,7 @@ URLs:
 ---
 Track: Verdancy (Bassline)
 Directory: verdancy-bassline-vol-1-4
-Originally Released As: track:verdancy-bassline
+Originally Released As: Verdancy (Bassline)
 Duration: 0:52
 URLs:
 - https://homestuck.bandcamp.com/track/verdancy-bassline-3
@@ -235,16 +235,16 @@ URLs:
 - https://homestuck.bandcamp.com/track/potential-verdancy-2
 - https://youtu.be/2W9Dd4RAiHo
 Referenced Tracks:
-- track:verdancy-bassline
+- Verdancy (Bassline)
 Sampled Tracks:
-- track:verdancy-bassline
+- Verdancy (Bassline)
 ---
 Color: '#ef001d'
 Section: From Homestuck Vol. 3
 ---
 Track: Beatdown (Strider Style)
 Directory: beatdown-strider-style-vol-1-4
-Originally Released As: track:beatdown-strider-style
+Originally Released As: Beatdown (Strider Style)
 Art Tags:
 - Dave
 - Lil Cal
@@ -257,7 +257,7 @@ URLs:
 ---
 Track: Harleboss
 Directory: harleboss-vol-1-4
-Originally Released As: track:harleboss
+Originally Released As: Harleboss
 Art Tags:
 - John
 Cover Art File Extension: jpg
@@ -268,7 +268,7 @@ URLs:
 ---
 Track: Beatdown Round 2
 Directory: beatdown-round-2-vol-1-4
-Originally Released As: track:beatdown-round-2
+Originally Released As: Beatdown Round 2
 Art Tags:
 - Dave
 - Dave's bro
@@ -280,7 +280,7 @@ URLs:
 ---
 Track: Dissension (Original)
 Directory: dissension-original-vol-1-4
-Originally Released As: track:dissension-original
+Originally Released As: Dissension (Original)
 Art Tags:
 - Jade
 - Jade's grandpa
@@ -292,7 +292,7 @@ URLs:
 ---
 Track: Dissension (Remix)
 Directory: dissension-remix-vol-1-4
-Originally Released As: track:dissension-remix
+Originally Released As: Dissension (Remix)
 Art Tags:
 - Jade
 - Jade's grandpa
@@ -304,7 +304,7 @@ URLs:
 ---
 Track: Ohgodwhat
 Directory: ohgodwhat-vol-1-4
-Originally Released As: track:ohgodwhat
+Originally Released As: Ohgodwhat
 Art Tags:
 - Jade
 Duration: '1:06'
@@ -314,7 +314,7 @@ URLs:
 ---
 Track: Ohgodwhat Remix
 Directory: ohgodwhat-remix-vol-1-4
-Originally Released As: track:ohgodwhat-remix
+Originally Released As: Ohgodwhat Remix
 Art Tags:
 - Jade
 Duration: '1:05'
@@ -324,7 +324,7 @@ URLs:
 ---
 Track: Rediscover Fusion
 Directory: rediscover-fusion-vol-1-4
-Originally Released As: track:rediscover-fusion
+Originally Released As: Rediscover Fusion
 Duration: '1:36'
 URLs:
 - https://homestuck.bandcamp.com/track/rediscover-fusion-3
@@ -332,7 +332,7 @@ URLs:
 ---
 Track: Explore Remix
 Directory: explore-remix-vol-1-4
-Originally Released As: track:explore-remix
+Originally Released As: Explore Remix
 Duration: '2:00'
 URLs:
 - https://homestuck.bandcamp.com/track/explore-remix-3
@@ -340,7 +340,7 @@ URLs:
 ---
 Track: Chorale for Jaspers
 Directory: chorale-for-jaspers-vol-1-4
-Originally Released As: track:chorale-for-jaspers
+Originally Released As: Chorale for Jaspers
 Art Tags:
 - Rose
 - Rose's mom
@@ -352,7 +352,7 @@ URLs:
 ---
 Track: Pony Chorale
 Directory: pony-chorale-vol-1-4
-Originally Released As: track:pony-chorale
+Originally Released As: Pony Chorale
 Art Tags:
 - John
 Cover Art File Extension: jpg
@@ -366,7 +366,7 @@ Section: From Homestuck Vol. 4
 ---
 Track: Revelawesome
 Directory: revelawesome-vol-1-4
-Originally Released As: track:revelawesome
+Originally Released As: Revelawesome
 Art Tags:
 - John
 Cover Art File Extension: jpg
@@ -377,7 +377,7 @@ URLs:
 ---
 Track: Hardlyquin
 Directory: hardlyquin-vol-1-4
-Originally Released As: track:hardlyquin
+Originally Released As: Hardlyquin
 Art Tags:
 - John
 Cover Art File Extension: jpg
@@ -388,7 +388,7 @@ URLs:
 ---
 Track: Carefree Victory
 Directory: carefree-victory-vol-1-4
-Originally Released As: track:carefree-victory
+Originally Released As: Carefree Victory
 Art Tags:
 - Jade
 - Becquerel
@@ -402,7 +402,7 @@ URLs:
 ---
 Track: Ballad of Awakening
 Directory: ballad-of-awakening-vol-1-4
-Originally Released As: track:ballad-of-awakening
+Originally Released As: Ballad of Awakening
 Art Tags:
 - Skaia
 - Earth
@@ -415,7 +415,7 @@ URLs:
 ---
 Track: Sburban Jungle
 Directory: sburban-jungle-vol-1-4
-Originally Released As: track:sburban-jungle
+Originally Released As: Sburban Jungle
 Cover Artists:
 - Alice Hu
 Art Tags:
@@ -440,7 +440,7 @@ URLs:
 ---
 Track: Doctor
 Directory: doctor-vol-1-4
-Originally Released As: track:doctor
+Originally Released As: Doctor
 Art Tags:
 - LoWaS
 Cover Art File Extension: jpg
@@ -451,7 +451,7 @@ URLs:
 ---
 Track: Endless Climb
 Directory: endless-climb-vol-1-4
-Originally Released As: track:endless-climb
+Originally Released As: Endless Climb
 Art Tags:
 - Rose
 - LoLaR
@@ -463,7 +463,7 @@ URLs:
 ---
 Track: Atomyk Ebonpyre
 Directory: atomyk-ebonpyre-vol-1-4
-Originally Released As: track:atomyk-ebonpyre
+Originally Released As: Atomyk Ebonpyre
 Art Tags:
 - Dave
 - LoHaC
@@ -475,7 +475,7 @@ URLs:
 ---
 Track: Black
 Directory: black-vol-1-4
-Originally Released As: track:black
+Originally Released As: Black
 Art Tags:
 - Jack Noir
 - 'cw: blood'
@@ -517,7 +517,7 @@ URLs:
 Commentary: |-
     <i>Buzinkai:</i>
     <a href='https://www.youtube.com/watch?v=EsG71P_zEIE'>'Doctor' Explained</a>
-    <i>Partial transcript:</i><br>Hello internet, my name is George Buzinkai. I am one of the musicians, well, I was one of the musicians for Ms Paint Adventures. I wrote such songs as [[track:endless-climb|Endless Climb]], [[track:showtime-imp-strife-mix|Imp Strife Mix? Strife Imp Mix]] I think and of course the wildly remixed Doctor, which I have open in the original software I wrote it in. 
+    <i>Partial transcript:</i><br>Hello internet, my name is George Buzinkai. I am one of the musicians, well, I was one of the musicians for Ms Paint Adventures. I wrote such songs as [[Endless Climb]], [[Showtime (Imp Strife Mix)|Imp Strife Mix? Strife Imp Mix]] I think and of course the wildly remixed Doctor, which I have open in the original software I wrote it in.
     I'm about to show you a few things you didn't know about the song Doctor, and I'm going to show you a few things people get wrong when remixing it. I don't find a problem with it because half the time I don't even notice it but sometimes there are some things. I think some people have listened to the song by ear and have attempted to write a remix using that and I get requests a lot to post a MIDI of this. Due to the fact I wrote it in PxTone that's really hard to do. There is also another reason, the song was built in such a way that it's really hard to give certain things from the song and I'll explain that as we go. 
     First things first all of the instruments except for the main three main three notes of the main chords which you know were written with instruments from the original [[artist:cave-story|Cave Story]]. If you listen to the drum track that's the original Cave Story drum soundtracks. All the other instruments are also from Cave Story. When I was originally writing the song I always wrote top down so believe it or not the first thing I wrote was the bassline. Then as I was going I added the drums, and from there I decided I should add an extra bassline. Once I added the extra bassline I decided it would be a good time to write an actual, you know, melody line. I was originally planning on using strings but I accidentally put in square waves and I fell in love with it right after I did it and I'm like "I can't switch this to strings now so I'm just gonna leave it as it is." 
     Now the rectangle waves [Note: Referring to the main melody of the song.] I'm focusing on right now are written in a really weird way, not one that I would normally use for writing on a piano or something like that. I wrote the top note first and I wrote the other notes just to harmonize with it. From there I wrote the second note. I obviously didn't write the third one yet, I just wanted to make sure it sounded right. From there I wrote the third note which was kind of a crapshoot but you know, why not. Now, the weird part was once I got to the part where it starts the arpeggiation I already had the instruments here but the problem was I had them on different stereo channels. Like this one was on the left speaker this one was on the right speaker and this one's in the center. 
diff --git a/album/homestuck-vol-1.yaml b/album/homestuck-vol-1.yaml
index 6ab9d929..5e02c6c9 100644
--- a/album/homestuck-vol-1.yaml
+++ b/album/homestuck-vol-1.yaml
@@ -36,7 +36,7 @@ URLs:
 - https://homestuck.bandcamp.com/track/showtime-piano-refrain-3
 - https://youtu.be/U5ggzIxfGDs
 Referenced Tracks:
-- track:showtime-original-mix
+- Showtime (Original Mix)
 Sheet Music Files:
 - Title: Sheet music by afterthought
   Files:
@@ -110,9 +110,9 @@ URLs:
 - https://youtu.be/DKmXadfEnog
 Cover Art File Extension: jpg
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 Sampled Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 Sheet Music Files:
 - Title: Sheet music by Gamehunter
   Files:
@@ -137,7 +137,7 @@ URLs:
 - https://homestuck.bandcamp.com/track/aggrieve-violin-refrain-3
 - https://youtu.be/h46wSFVeWAs
 Referenced Tracks:
-- track:aggrieve
+- Aggrieve
 Sheet Music Files:
 - Title: Sheet music by Danny Wolf
   Files:
@@ -157,7 +157,7 @@ URLs:
 - https://homestuck.bandcamp.com/track/sburban-countdown-3
 - https://youtu.be/C3cvihYafCs
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 MIDI Project Files:
 - Title: MIDI by IronInvoker47
   Files:
@@ -206,7 +206,7 @@ URLs:
 - https://homestuck.bandcamp.com/track/showtime-imp-strife-mix-3
 - https://youtu.be/WQyRS_czmgc
 Referenced Tracks:
-- track:showtime-original-mix
+- Showtime (Original Mix)
 Sheet Music Files:
 - Title: Piano score by Resound
   Files:
@@ -226,7 +226,7 @@ URLs:
 - https://homestuck.bandcamp.com/track/nannaquin-3
 - https://youtu.be/Pf5YpbDgCSU
 Referenced Tracks:
-- track:harlequin
+- Harlequin
 MIDI Project Files:
 - Title: MIDI by IronInvoker47
   Files:
@@ -269,4 +269,4 @@ Duration: 0:46
 URLs:
 - https://youtu.be/K0gpSYelM_k
 Referenced Tracks:
-- track:aggrieve-violin-refrain
+- Aggrieve (Violin Refrain)
diff --git a/album/homestuck-vol-10.yaml b/album/homestuck-vol-10.yaml
index a6e2c726..0ba2a247 100644
--- a/album/homestuck-vol-10.yaml
+++ b/album/homestuck-vol-10.yaml
@@ -77,20 +77,20 @@ Art Tags:
 - Dream Bubbles
 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
+- Showtime (Original Mix)
+- Doctor
+- Harlequin
+- Aggrieve
+- Chorale for Jaspers
+- Endless Climb
+- Beatdown (Strider Style)
+- Atomyk Ebonpyre
+- Upward Movement (Dave Owns)
 - track:frost-vol6
 - The Beginning of Something Really Excellent
-- track:dissension-original
+- Dissension (Original)
 - track:carefree-action
-- track:revelawesome
+- 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
@@ -101,7 +101,7 @@ Lyrics: |-
     <i>Thought blows in the wind, spirit in the wind</i>)
 Commentary: |-
     <i>Seth Peelle:</i>
-    When I first auditioned for the Homestuck music team back in 2009, one of my two audition pieces was [[Pumpkin Cravings]], which ended upon the "Homestuck Vol. 5" album of the following year (and was subsequently orchestrated by the illustrious Alex Rosetti into [[THIS Pumpkin]] on THIS Album). The other piece was a short electronic-sounding demo entitled "Skaia Voyages" that I based on the [[track:sburban-jungle|Sburban Jungle]] and [[track:skies-of-skaia|Skies of Skaia]] themes, inspired by the purposefully vague notion of the Kids' "ascension" recently introduced in the comic at that time. The demo never ended up going anywhere in that form, but its musical ideas stuck in my head, growing and evolving in my mindscape over the years into something much grander than what I had originally envisioned. It grew additional references to [[track:revelawesome|Revelawesome]] and the Kids' themes, grew a full orchestra, grew a massive choir and epic sci-fi noises of indeterminate nature...
+    When I first auditioned for the Homestuck music team back in 2009, one of my two audition pieces was [[Pumpkin Cravings]], which ended upon the "Homestuck Vol. 5" album of the following year (and was subsequently orchestrated by the illustrious Alex Rosetti into [[THIS Pumpkin]] on THIS Album). The other piece was a short electronic-sounding demo entitled "Skaia Voyages" that I based on the [[Sburban Jungle]] and [[Skies of Skaia]] themes, inspired by the purposefully vague notion of the Kids' "ascension" recently introduced in the comic at that time. The demo never ended up going anywhere in that form, but its musical ideas stuck in my head, growing and evolving in my mindscape over the years into something much grander than what I had originally envisioned. It grew additional references to [[Revelawesome]] and the Kids' themes, grew a full orchestra, grew a massive choir and epic sci-fi noises of indeterminate nature...
     And then - eventually - it became REAL.
     It ASCENDED.
     (yes it was totally that easy.<br>no you can't stop me from pretending this.)
@@ -172,7 +172,7 @@ Art Tags:
 - SBaHJ
 - Earth
 Referenced Tracks:
-- track:beatdown-strider-style
+- Beatdown (Strider Style)
 Commentary: |-
     <i>Clark Powell:</i>
     This was the best remix I ever worked on. There was another ermix of this song that didn't make it onto the album, but you can use your imagination for that.
@@ -214,10 +214,10 @@ Art Tags:
 - Jack Noir
 - Dream Bubbles
 Referenced Tracks:
-- track:showtime-piano-refrain
-- track:aggrieve-violin-refrain
+- Showtime (Piano Refrain)
+- Aggrieve (Violin Refrain)
 - Liquid Negrocity
-- track:showtime-original-mix
+- Showtime (Original Mix)
 - Checkmate
 - Gaia Queen
 Lyrics: |-
@@ -257,7 +257,7 @@ Art Tags:
 - 'cw: blood'
 Referenced Tracks:
 - Terezi's Theme
-- track:harlequin
+- Harlequin
 Sheet Music Files:
 - Title: Sheet music by EuniverseCat
   Files:
@@ -284,10 +284,10 @@ Cover Artists:
 Art Tags:
 - Rose
 Referenced Tracks:
-- track:aggrieve
+- Aggrieve
 Commentary: |-
     <i>Mark J. Hadley:</i>
-    While [[track:harlequin|Harlequin]] was the first piece of mine to appear in Homestuck, the first piece I actually wrote for it was [[track:aggrieve|Aggrieve]], and so I felt it was only fitting to make another mix of it for the final album. Plus it gave me an excuse to try writing it in a metal style! I'm not sure it could still be considered Rose's "official theme" anymore (not after the mountain of excellent music the team's written for her over the years), but I still like to think of it that way.
+    While [[Harlequin]] was the first piece of mine to appear in Homestuck, the first piece I actually wrote for it was [[Aggrieve]], and so I felt it was only fitting to make another mix of it for the final album. Plus it gave me an excuse to try writing it in a metal style! I'm not sure it could still be considered Rose's "official theme" anymore (not after the mountain of excellent music the team's written for her over the years), but I still like to think of it that way.
     <i>Rachel Lundin:</i>
     Just, put, like, "It was cool to work on this," I don't know!
 ---
@@ -308,7 +308,7 @@ Art Tags:
 Referenced Tracks:
 - track:moonsetter
 - Showdown
-- track:upward-movement-dave-owns
+- Upward Movement (Dave Owns)
 Commentary: |-
     <i>Kalibration:</i>
     Well, it's really my last song for Homestuck, huh...
@@ -332,7 +332,7 @@ Art Tags:
 - Battlefield
 Referenced Tracks:
 - Skaian Ride
-- track:sburban-jungle
+- Sburban Jungle
 Commentary: |-
     <i>Thomas Ferkol:</i>
     Pretty sure this one first came about back in 2012.
@@ -498,7 +498,7 @@ Art Tags:
 - Dave's bro
 - Earth
 Referenced Tracks:
-- track:beatdown-strider-style
+- Beatdown (Strider Style)
 Commentary: |-
     <i>Curt Blakeslee:</i>
     A simplified chiptune rendering of Beatdown. Dave's original strife track was purposefully overproduced, loud, and busy, so Beatdown DX is actually less 'deluxe' than the original.
@@ -531,7 +531,7 @@ Art Tags:
 Referenced Tracks:
 - track:ruins
 - Flare
-- track:explore
+- Explore
 Commentary: |-
     <i>Marcy Nabors:</i>
     Way back in good ol' 2012 I was in a little one-off band with Erik Scheele, Clark Powell, Astro Kid, and the ever-charismatic Michael Guy Bowman.
@@ -652,12 +652,12 @@ Art Tags:
 - Aradia
 Referenced Tracks:
 - Chamber Complex
-- track:doctor
+- Doctor
 - Cascade (Beta)
 - Time on My Side
 - Hydrogen
-- track:beatdown-strider-style
-- track:upward-movement-dave-owns
+- Beatdown (Strider Style)
+- Upward Movement (Dave Owns)
 - track:penumbra-phantasm
 - Black Rose / Green Sun
 - Arisen Anew
@@ -668,11 +668,11 @@ Referenced Tracks:
 - Sunsetter
 - Neos City (Night)
 - track:MeGaLoVania
-- track:crustacean
+- Crustacean
 - Meet the Flintstones
 - Spider's Claw
 - Homestuck Anthem
-- track:showtime-original-mix
+- Showtime (Original Mix)
 - track:carefree-action
 Sampled Tracks:
 - Chamber Complex
@@ -776,17 +776,17 @@ Art Tags:
 - Jane
 Referenced Tracks:
 - Warhammer of Zillyhoo
-- track:calamity
+- Calamity
 - Walk-Stab-Walk (R&E)
-- track:doctor
+- Doctor
 - Dirgeish
 - Crystalanthemums
-- track:skies-of-skaia
+- Skies of Skaia
 - track:frost-vol6
-- track:beatdown-strider-style
+- Beatdown (Strider Style)
 - track:penumbra-phantasm
 - Courser
-- track:sburban-jungle
+- Sburban Jungle
 Lyrics: |-
     Warhammer<br>Of Zillyhoo
     Warhammer<br>Of<br>Zillyhoo
@@ -857,10 +857,10 @@ Art Tags:
 - John
 - Earth
 Referenced Tracks:
-- track:sburban-jungle
-- track:showtime-piano-refrain
+- Sburban Jungle
+- Showtime (Piano Refrain)
 - Homestuck
-- track:skies-of-skaia
+- Skies of Skaia
 Commentary: |-
     <i>Seth Pelle:</i>
     Oh, hey. Is it the last track already? Man, where did the time go?
diff --git a/album/homestuck-vol-2.yaml b/album/homestuck-vol-2.yaml
index d937df61..6b9c6ead 100644
--- a/album/homestuck-vol-2.yaml
+++ b/album/homestuck-vol-2.yaml
@@ -28,7 +28,7 @@ URLs:
 - https://homestuck.bandcamp.com/track/harlequin-rock-version-3
 - https://youtu.be/g5TDTcMEL_c
 Referenced Tracks:
-- track:harlequin
+- Harlequin
 Commentary: |-
     <i>Michael Guy Bowman:</i>
     The rock version of "Harlequin" sure made a scene, blasting through people's speakers as the background music for the Green Slime Ghost pogo game. Joseph nails the tough bits along with some sweet harmonics on the chorus.
@@ -43,8 +43,8 @@ URLs:
 - https://www.youtube.com/watch?v=Sc8wLKdRshY
 - https://archive.org/download/exile-pinkushion/16%20Skaian%20Lullaby.mp3
 Referenced Tracks:
-- track:showtime-original-mix
-- track:skies-of-skaia
+- Showtime (Original Mix)
+- Skies of Skaia
 ---
 Track: Upward Movement (Dave Owns)
 Artists:
@@ -156,7 +156,7 @@ URLs:
 - https://homestuck.bandcamp.com/track/showtime-remix-3
 - https://youtu.be/VliU0X6XVpA
 Sampled Tracks:
-- track:showtime-piano-refrain
+- Showtime (Piano Refrain)
 ---
 Track: Aggrieve Remix
 Artists:
@@ -167,9 +167,9 @@ URLs:
 - https://homestuck.bandcamp.com/track/aggrieve-remix-3
 - https://youtu.be/DpB5llhN2L0
 Referenced Tracks:
-- track:aggrieve-violin-refrain
+- Aggrieve (Violin Refrain)
 Sampled Tracks:
-- track:aggrieve-violin-refrain
+- Aggrieve (Violin Refrain)
 ---
 Track: Verdancy (Bassline)
 Artists:
@@ -187,4 +187,4 @@ Duration: '1:30'
 URLs:
 - https://www.youtube.com/watch?v=DauXhvk7p6o
 Referenced Tracks:
-- track:verdancy-bassline
+- Verdancy (Bassline)
diff --git a/album/homestuck-vol-3.yaml b/album/homestuck-vol-3.yaml
index f900fb44..8be2d234 100644
--- a/album/homestuck-vol-3.yaml
+++ b/album/homestuck-vol-3.yaml
@@ -50,7 +50,7 @@ URLs:
 - https://homestuck.bandcamp.com/track/harleboss-3
 - https://youtu.be/51vrPLt_LG8
 Referenced Tracks:
-- track:harlequin
+- Harlequin
 Commentary: |-
     <i>Malcolm Brown:</i>
     Harlequin was awesome, and was quite a popular source for remixing the theme (it still is) so this was my early attempt.
@@ -68,7 +68,7 @@ URLs:
 - https://homestuck.bandcamp.com/track/beatdown-round-2-3
 - https://youtu.be/CuQpu45cmtw
 Referenced Tracks:
-- track:beatdown-strider-style
+- Beatdown (Strider Style)
 Sheet Music Files:
 - Title: Sheet music by Gamehunter
   Files:
@@ -100,7 +100,7 @@ URLs:
 - https://homestuck.bandcamp.com/track/dissension-remix-3
 - https://youtu.be/mkPXt83h73w
 Referenced Tracks:
-- track:dissension-original
+- Dissension (Original)
 ---
 Track: Ohgodwhat
 Artists:
@@ -130,7 +130,7 @@ URLs:
 - https://homestuck.bandcamp.com/track/ohgodwhat-remix-3
 - https://youtu.be/ZuaMHCPnqOc
 Referenced Tracks:
-- track:ohgodwhat
+- Ohgodwhat
 MIDI Project Files:
 - Title: MIDI by Unknown
   Files:
@@ -155,7 +155,7 @@ URLs:
 - https://www.youtube.com/watch?v=fBOrrAq_Qv0
 - https://archive.org/download/exile-pinkushion/17%20RS5%20%28Trancestep%20Mix%29.mp3
 Referenced Tracks:
-- track:rediscover-fusion
+- Rediscover Fusion
 ---
 Track: Explore Remix
 Artists:
@@ -165,9 +165,9 @@ URLs:
 - https://homestuck.bandcamp.com/track/explore-remix-3
 - https://youtu.be/06qu70cLPaE
 Referenced Tracks:
-- track:explore
+- Explore
 Sampled Tracks:
-- track:explore
+- Explore
 ---
 Track: Chorale for Jaspers
 Artists:
@@ -201,7 +201,7 @@ URLs:
 - https://homestuck.bandcamp.com/track/pony-chorale-3
 - https://youtu.be/MHsZHFb5FqU
 Referenced Tracks:
-- track:chorale-for-jaspers
+- Chorale for Jaspers
 MIDI Project Files:
 - Title: MIDI by Unknown
   Files:
diff --git a/album/homestuck-vol-4.yaml b/album/homestuck-vol-4.yaml
index 5591f239..3cdab186 100644
--- a/album/homestuck-vol-4.yaml
+++ b/album/homestuck-vol-4.yaml
@@ -60,7 +60,7 @@ URLs:
 - https://homestuck.bandcamp.com/track/hardlyquin-3
 - https://youtu.be/CN04ruWv30g
 Referenced Tracks:
-- track:harlequin
+- Harlequin
 Commentary: |-
     <i>Mark J. 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.
@@ -235,7 +235,7 @@ URLs:
 - https://homestuck.bandcamp.com/track/doctor-3
 - https://youtu.be/ve7TB0FggaY
 Referenced Tracks:
-- track:doctor-original-loop
+- Doctor (Original Loop)
 Sheet Music Files:
 - Title: Sheet music by FlamingTROUT
   Files:
@@ -302,7 +302,7 @@ Commentary: |-
 
     I've never personally spoke to him. Except through E-mail. Other than that, I've never really been too involved with the project. He's enigmatic, but I imagine if we got together, we could do some cool stuff.
 
-    My favorite homestuck song is obviously [[track:showtime-original-mix]], which inspired me to write a remix and get involved.
+    My favorite homestuck song is obviously [[Showtime (Original Mix)]], which inspired me to write a remix and get involved.
 
     I listen to Tchaikovsky and Nobuo Uematsu, I attempt to push emotion through the music to the listener. When I find things which I feel the composer was trying to push into me, I get overwhelmed.
 
diff --git a/album/homestuck-vol-5.yaml b/album/homestuck-vol-5.yaml
index c04befdf..565114b6 100644
--- a/album/homestuck-vol-5.yaml
+++ b/album/homestuck-vol-5.yaml
@@ -47,9 +47,9 @@ Commentary: |-
     <i>Michael Guy Bowman:</i>
     This Volume is a little bit of an oddity in that it's hyper-long and is consisted overwhelmingly of tracks that have not appeared in the comic whatsoever, so you might not be quite so initially motivated to purchase it as you would for one of the soundtracks proper, however, I assure you, there is some really great material on there. The album hits the tip of the creative iceberg that has been the MSPA music project (which I guess is now formally What Pumpkin records) and shows only a fraction of the endless piles upon piles of "other" music that exists on the not-so-secret music forums.
 
-    [[artist:andrew-hussie|Andrew]] has been definitely at a crossroads with the music - the response to his open casting call for the music project over a year ago almost immediately exploded with music, initially with the pretense that we were going to be creating short loops (as in the strife themes such as [[track:showtime-original-mix|Showtime]]). However, when the comic started to operate more cinematically and less like an adventure game, more and more the concentration became on how our music could be used to create the numerous extensive flash-animated cutscenes, some of which fans have awaited and anticipated for days on end.
+    [[artist:andrew-hussie|Andrew]] has been definitely at a crossroads with the music - the response to his open casting call for the music project over a year ago almost immediately exploded with music, initially with the pretense that we were going to be creating short loops (as in the strife themes such as [[Showtime (Original Mix)|Showtime]]). However, when the comic started to operate more cinematically and less like an adventure game, more and more the concentration became on how our music could be used to create the numerous extensive flash-animated cutscenes, some of which fans have awaited and anticipated for days on end.
 
-    This pretty much imploded with the [[flash:1149|end of Act 3]], when Andrew informed us all that he was going to cut back on the animations after spending a week working on the accompanying animation for [[track:sburban-jungle|Sburban Jungle]] day and night on end. Since then, the focus has drifted to various new sectors which I guess will just have to be a surprise to all of you. Either way, consider the new album an outlet for you to sample music inspired by and written for Homestuck and as a chance to support this new community that Andrew has shepherded.
+    This pretty much imploded with the [[flash:1149|end of Act 3]], when Andrew informed us all that he was going to cut back on the animations after spending a week working on the accompanying animation for [[Sburban Jungle]] day and night on end. Since then, the focus has drifted to various new sectors which I guess will just have to be a surprise to all of you. Either way, consider the new album an outlet for you to sample music inspired by and written for Homestuck and as a chance to support this new community that Andrew has shepherded.
 
     <i>Quasar Nebula:</i>
     Track art on these tracks has been uploaded from the <a href="https://sollay-b.tumblr.com/post/188094230423/hello-a-couple-of-years-ago-allyssinian">Homestuck Vol. 5 Anthology</a>! The official release of Vol. 5 didn't come with track art; this collaborative project organized artists to submit their own original art for the album. The art was originally shared in a huge colection on tumblr on 4/13/17 and has now been collected here for viewing convenience and discoverability!
@@ -119,7 +119,7 @@ Art Tags:
 - John
 - Gate
 Referenced Tracks:
-- track:doctor
+- Doctor
 - track:penumbra-phantasm
 Sheet Music Files:
 - Title: Sheet music by Gamehunter
@@ -158,7 +158,7 @@ Art Tags:
 - Dave
 - Lil Cal
 Referenced Tracks:
-- track:endless-climb
+- Endless Climb
 Sheet Music Files:
 - Title: Sheet music by EuniverseCat
   Files:
@@ -187,9 +187,9 @@ Art Tags:
 - Jadesprite
 - Battlefield
 Referenced Tracks:
-- track:showtime-original-mix
-- track:showtime-piano-refrain
-- track:harlequin
+- Showtime (Original Mix)
+- Showtime (Piano Refrain)
+- Harlequin
 Commentary: |-
     <i>Alex Rosetti:</i>
     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.
@@ -221,7 +221,7 @@ Art Tags:
 - Underlings
 - LoLaR
 Referenced Tracks:
-- track:aggrieve
+- Aggrieve
 Commentary: |-
     <i>Mark J. Hadley:</i>
     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.
@@ -241,7 +241,7 @@ Art Tags:
 - Jaspers
 - Earth
 Referenced Tracks:
-- track:chorale-for-jaspers
+- Chorale for Jaspers
 Commentary: |-
     <i>Michael Guy Bowman:</i>
     Radiation, or Toby as I've never actually had the chance to refer to him, sent me his midi arrangement of Happy Cat Song, a sort of lighthearted version of Chorale for Jaspers, so I loaded VSTs for each part and balanced it, along with adding a "meow" sample in for good measure. The effect of it reminds [[artist:tavia-morra|Tavia]] of arriving in a village in "final fantasy or chrono cross or something and it's initially all peaceful and then by the end of the game it's totally raped and pillaged." So the calm before the storm then? MEOW
@@ -263,7 +263,7 @@ Art Tags:
 - Cats
 - 'cw: body horror'
 Referenced Tracks:
-- track:chorale-for-jaspers
+- Chorale for Jaspers
 - Squiddles!
 Commentary: |-
     <i>Alex Rosetti:</i>
@@ -308,8 +308,8 @@ Art Tags:
 - Skaia
 - Earth
 Referenced Tracks:
-- track:aggrieve
-- track:showtime-original-mix
+- Aggrieve
+- Showtime (Original Mix)
 ---
 Track: White
 Artists:
@@ -348,7 +348,7 @@ Art Tags:
 - Horrorterrors
 Referenced Tracks:
 - Liquid Negrocity
-- track:the-ballad-of-jack-noir
+- The Ballad of Jack Noir
 - Non Compos Mentis
 - track:im-a-member-of-the-midnight-crew
 Sampled Tracks:
@@ -389,7 +389,7 @@ Art Tags:
 - Gate
 - Derse
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 ---
 Track: Crystalanthemums
 Artists:
@@ -428,7 +428,7 @@ Art Tags:
 - Derse
 - Veil
 Referenced Tracks:
-- track:skies-of-skaia
+- Skies of Skaia
 Sheet Music Files:
 - Title: Piano score by almostsix
   Files:
@@ -583,7 +583,7 @@ Art Tags:
 - Lotus
 Referenced Tracks:
 - Lotus
-- track:doctor
+- Doctor
 ---
 Track: Chorale for War
 Artists:
@@ -600,7 +600,7 @@ Art Tags:
 - LoFaF
 - 'cw: blood'
 Referenced Tracks:
-- track:chorale-for-jaspers
+- Chorale for Jaspers
 MIDI Project Files:
 - Title: MIDI by Unknown
   Files:
@@ -669,7 +669,7 @@ Art Tags:
 - John
 - LoWaS
 Referenced Tracks:
-- track:doctor
+- Doctor
 - track:penumbra-phantasm
 ---
 Track: Bed of Rose's / Dreams of Derse
@@ -685,7 +685,7 @@ Art Tags:
 - Rose
 - Horrorterrors
 Referenced Tracks:
-- track:aggrieve
+- Aggrieve
 Commentary: |-
     <i>Mark J. Hadley:</i>
     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.
@@ -754,9 +754,9 @@ Art Tags:
 - Dave
 - LoHaC
 Referenced Tracks:
-- track:atomyk-ebonpyre
+- Atomyk Ebonpyre
 - Drop It Like It's Hot
-- track:beatdown-strider-style
+- Beatdown (Strider Style)
 Sampled Tracks:
 - Drop It Like It's Hot
 MIDI Project Files:
@@ -783,7 +783,7 @@ Cover Art File Extension: jpg
 Art Tags:
 - Dave
 Referenced Tracks:
-- track:harlequin
+- Harlequin
 ---
 Track: Sunsetter
 Artists:
@@ -842,7 +842,7 @@ Art Tags:
 - Frog Temple
 Referenced Tracks:
 - track:ruins
-- track:sburban-jungle
+- Sburban Jungle
 Sheet Music Files:
 - Title: Piano score by Erik Scheele (original composer)
   Files:
@@ -978,7 +978,7 @@ Art Tags:
 - Rose
 - LoLaR
 Referenced Tracks:
-- track:endless-climb
+- Endless Climb
 ---
 Track: Land of the Salamanders
 Artists:
@@ -994,12 +994,12 @@ Art Tags:
 - Consorts
 - LoWaS
 Referenced Tracks:
-- track:doctor
-- track:sburban-jungle
-- track:showtime-original-mix
-- track:dissension-remix
-- track:aggrieve
-- track:vagabounce
+- Doctor
+- Sburban Jungle
+- Showtime (Original Mix)
+- Dissension (Remix)
+- Aggrieve
+- Vagabounce
 ---
 Track: Medical Emergency
 Artists:
@@ -1055,7 +1055,7 @@ Art Tags:
 - John
 Referenced Tracks:
 - track:penumbra-phantasm
-- track:doctor
+- Doctor
 ---
 Track: Vertical Motion
 Artists:
@@ -1071,7 +1071,7 @@ Art Tags:
 - Gate
 - LoLaR
 Referenced Tracks:
-- track:endless-climb
+- Endless Climb
 ---
 Track: The Beginning of Something Really Excellent
 Artists:
@@ -1115,7 +1115,7 @@ Art Tags:
 - Carapacians
 - Battlefield
 Referenced Tracks:
-- track:skies-of-skaia
+- Skies of Skaia
 Commentary: |-
     <i>Andrew Huo:</i>
     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.
@@ -1196,7 +1196,7 @@ Art Tags:
 - Jade
 - Earth
 Referenced Tracks:
-- track:showtime-piano-refrain
+- Showtime (Piano Refrain)
 MIDI Project Files:
 - Title: MIDI by Dohmb
   Files:
@@ -1360,7 +1360,7 @@ Art Tags:
 - Prospit
 - Derse
 Referenced Tracks:
-- track:doctor
+- Doctor
 Cover Art File Extension: jpg
 Commentary: |-
     <i>Steve Everson:</i>
@@ -1380,8 +1380,8 @@ Art Tags:
 - Gate
 - LoLaR
 Referenced Tracks:
-- track:aggrieve
-- track:endless-climb
+- Aggrieve
+- Endless Climb
 ---
 Track: Doctor Remix
 Artists:
@@ -1399,7 +1399,7 @@ Art Tags:
 - 'cw: blood'
 - 'cw: corpse'
 Referenced Tracks:
-- track:doctor
+- Doctor
 ---
 Track: Biophosphoradelecrystalluminescence
 Artists:
@@ -1454,29 +1454,29 @@ Art Tags:
 - Jack Noir
 - Skaia
 Referenced Tracks:
-- track:upward-movement-dave-owns
-- track:sburban-jungle
-- track:beatdown-strider-style
-- track:mutiny
-- track:skies-of-skaia
-- track:showtime-original-mix
-- track:aggrieve
+- Upward Movement (Dave Owns)
+- Sburban Jungle
+- Beatdown (Strider Style)
+- Mutiny
+- Skies of Skaia
+- Showtime (Original Mix)
+- Aggrieve
 - track:jackknive
 - track:liquid-negrocity
 - track:guardian
-- track:harlequin
-- track:explore
-- track:chorale-for-jaspers
+- Harlequin
+- Explore
+- Chorale for Jaspers
 - track:underworld
 - track:three-in-the-morning
 - track:non-compos-mentis
 - track:pumpkin-cravings
-- track:vagabounce
+- Vagabounce
 - track:skaian-skuffle
-- track:doctor
+- Doctor
 - track:penumbra-phantasm
-- track:endless-climb
-- track:atomyk-ebonpyre
+- Endless Climb
+- Atomyk Ebonpyre
 - track:lotus
 - track:problem-sleuth-theme
 - track:dirgeish
diff --git a/album/homestuck-vol-6.yaml b/album/homestuck-vol-6.yaml
index fcfd5e43..b334102a 100644
--- a/album/homestuck-vol-6.yaml
+++ b/album/homestuck-vol-6.yaml
@@ -91,7 +91,7 @@ URLs:
 - https://homestuck.bandcamp.com/track/courser-2
 - https://youtu.be/EmdRALDqt7k
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 - Lotus
 ---
 Track: Umbral Ultimatum
@@ -240,8 +240,8 @@ URLs:
 - https://homestuck.bandcamp.com/track/tribal-ebonpyre-2
 - https://youtu.be/xStVhvhg1i4
 Referenced Tracks:
-- track:atomyk-ebonpyre
-- track:sburban-jungle
+- Atomyk Ebonpyre
+- Sburban Jungle
 Commentary: |-
     <i>Erik Scheele:</i>
     <img src="media/misc/tribal-ebonpyre.jpg" width="350">
@@ -259,10 +259,10 @@ URLs:
 - https://youtu.be/383DEqnj71w
 Referenced Tracks:
 - track:i-dont-want-to-miss-a-thing-aerosmith
-- track:sburban-jungle
-- track:showtime-original-mix
+- Sburban Jungle
+- Showtime (Original Mix)
 - Squiddles!
-- track:explore
+- Explore
 - How Do I Live
 Lyrics: |-
     I could stay awake just to hear you breathing
@@ -444,7 +444,7 @@ URLs:
 - https://homestuck.bandcamp.com/track/wacky-antics-2
 - https://youtu.be/X7x3cKse9YI
 Referenced Tracks:
-- track:vagabounce
+- Vagabounce
 ---
 Track: Horschestra
 Artists:
@@ -468,7 +468,7 @@ URLs:
 - https://homestuck.bandcamp.com/track/heir-transparent-2
 - https://youtu.be/bcUrTlpTKPU
 Referenced Tracks:
-- track:doctor
+- Doctor
 ---
 Track: Boy Skylark (Brief)
 Artists:
@@ -492,7 +492,7 @@ URLs:
 - https://homestuck.bandcamp.com/track/squidissension-2
 - https://youtu.be/zJ7y3sWT7l0
 Referenced Tracks:
-- track:dissension-original
+- Dissension (Original)
 - Squiddles!
 Commentary: |-
     <i>Mark J. Hadley:</i>
@@ -616,7 +616,7 @@ URLs:
 - https://homestuck.bandcamp.com/track/phrenic-phever-2
 - https://youtu.be/8rlgjJgyhyw
 Referenced Tracks:
-- track:doctor
+- Doctor
 ---
 Track: 3 In The Morning (Pianokind)
 Artists:
@@ -629,9 +629,9 @@ URLs:
 - https://youtu.be/OesxlnyaBGE
 Referenced Tracks:
 - Three in the Morning
-- track:doctor
-- track:showtime-piano-refrain
-- track:aggrieve
+- Doctor
+- Showtime (Piano Refrain)
+- Aggrieve
 Sheet Music Files:
 - Title: Sheet music by Galactides
   Files:
@@ -652,7 +652,7 @@ URLs:
 - https://homestuck.bandcamp.com/track/a-tender-moment-2
 - https://youtu.be/hyP0FFPcL0c
 Referenced Tracks:
-- track:atomyk-ebonpyre
+- Atomyk Ebonpyre
 MIDI Project Files:
 - Title: MIDI by IronInvoker47 (piano)
   Files:
diff --git a/album/homestuck-vol-7.yaml b/album/homestuck-vol-7.yaml
index b09a501e..8e144bf3 100644
--- a/album/homestuck-vol-7.yaml
+++ b/album/homestuck-vol-7.yaml
@@ -83,10 +83,10 @@ Art Tags:
 - Rose
 - 'cw: blood'
 Referenced Tracks:
-- track:chorale-for-jaspers
+- Chorale for Jaspers
 - Rex Duodecim Angelus
 - Black Rose / Green Sun
-- track:aggrieve
+- Aggrieve
 Sheet Music Files:
 - Title: Piano score by arachnidCalibrator
   Files:
@@ -121,7 +121,7 @@ Art Tags:
 - Rose
 - LoLaR
 Referenced Tracks:
-- track:upward-movement-dave-owns
+- Upward Movement (Dave Owns)
 Sheet Music Files:
 - Title: Piano score by Purple1222119
   Files:
@@ -150,7 +150,7 @@ Art Tags:
 - Terezi
 - Pyralspite
 Referenced Tracks:
-- track:upward-movement-dave-owns
+- Upward Movement (Dave Owns)
 - Crystalanthemums
 MIDI Project Files:
 - Title: MIDI by Unknown (piano)
@@ -202,7 +202,7 @@ Art Tags:
 - Gamzee
 - 'cw: blood'
 Referenced Tracks:
-- track:harlequin
+- Harlequin
 MIDI Project Files:
 - Title: MIDI by Unknown (piano)
   Files:
@@ -249,7 +249,7 @@ Art Tags:
 - John
 - Skaia
 Referenced Tracks:
-- track:showtime-original-mix
+- Showtime (Original Mix)
 Commentary: |-
     <i>Malcolm Brown:</i>
     Name's fairly obviously a reference to SB&HJ And also the bit where John's car takes off, as the song is a reference to.
@@ -365,7 +365,7 @@ Art Tags:
 - LoPaH
 Referenced Tracks:
 - Walk-Stab-Walk (R&E)
-- track:beatdown-strider-style
+- Beatdown (Strider Style)
 ---
 Track: Earthsea Borealis
 Artists:
@@ -380,7 +380,7 @@ Art Tags:
 - Rose
 - Horrorterrors
 Referenced Tracks:
-- track:endless-climb
+- Endless Climb
 ---
 Track: Warhammer of Zillyhoo
 Artists:
@@ -417,7 +417,7 @@ Cover Artists:
 Art Tags:
 - Dave
 Referenced Tracks:
-- track:doctor
+- Doctor
 - track:penumbra-phantasm
 Commentary: |-
     <i>Malcolm Brown:</i>
@@ -455,7 +455,7 @@ Art Tags:
 - Dave
 - Earth
 Referenced Tracks:
-- track:sburban-countdown
+- Sburban Countdown
 Commentary: |-
     <i>Mark J. Hadley:</i>
     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.
diff --git a/album/homestuck-vol-8.yaml b/album/homestuck-vol-8.yaml
index ff73be69..efab8971 100644
--- a/album/homestuck-vol-8.yaml
+++ b/album/homestuck-vol-8.yaml
@@ -84,7 +84,7 @@ Art Tags:
 - Dream Bubbles
 Referenced Tracks:
 - Lifdoff
-- track:showtime-original-mix
+- Showtime (Original Mix)
 - Death of the Lusii
 - track:ruins
 Sheet Music Files:
@@ -296,7 +296,7 @@ Art Tags:
 Cover Art File Extension: jpg
 Referenced Tracks:
 - Hawkeye
-- track:atomyk-ebonpyre
+- Atomyk Ebonpyre
 Sheet Music Files:
 - Title: Sheet music by Purple1222119
   Files:
@@ -389,7 +389,7 @@ Art Tags:
 - Jade
 - 'cw: blood'
 Referenced Tracks:
-- track:showtime-original-mix
+- Showtime (Original Mix)
 Sheet Music Files:
 - Title: Sheet music by adamus
   Files:
@@ -458,8 +458,8 @@ Art Tags:
 Referenced Tracks:
 - Shooting Star
 - Homestuck Anthem
-- track:sburban-jungle
-- track:upward-movement-dave-owns
+- Sburban Jungle
+- Upward Movement (Dave Owns)
 Commentary: |-
     <i>Hilary Troiano:</i>
     Someone sent me a PM asking for some commentary about my two MSPA songs, so [[media:misc/hilary-troiano-commentary.mp3|here it is]]. (<a href="https://jaydeis.tumblr.com/post/19609363685/someone-sent-me-a-pm-asking-for-some-commentary">source</a>)
@@ -469,9 +469,9 @@ Commentary: |-
 
     Um, my other song, Homefree. This one's got less to it, like [laughter] my first goal of this song was actually for me to learn how-how to use a program called Fruity Loops Studio, um... 'cuz, up until this point all of my music had been done with a program called Melody Assistant, and in some ways I really love Melody Assistant like, I have this whole sound database to it that makes it really have an incredibly authentic sound to the instruments but, on the other side of the spectrum it has very little synth options, which, whi-which is really the direction that the MS Paint Adventures music team has moved in, um. So I was like alright alright, let's learn how to synth a bit. Um, and so, in some ways um, Homefree draws a lot from a song I wrote AGES and ages ago, it was a song called [[track:shooting-star|Shooting Star]] which, I mean i-it was kind of basically supposed to sound like an anime opening and it did but i-it... it was missing something. Like, it was very mor— it was more of in a minor key and it was slower, and so I was like, alright. Well first things first I'm gonna try and get this up to, what was it the tempo of [incomprehensible] I don't know how you say that. It's an opening of an anime that you may or may not have heard that just is really high energy and I was like 'Okay, so, if I wanna have a high energy song I probably should try and make it sound about this fast' [laughter].
 
-    So, the opening of Homefree is basically the opening of Shooting Star and, then, then I started like, I was like you know, after you get past the opening it's not really good until you get to the ending and so I was like 'What else can I put in here?' and so I started putting down the [[track:homestuck-anthem|Homestuck theme]] just because it was easy and jumped to mind, and so, when that, when that really seemed to work I was like 'You know what? Let's throw in more bits of different Homestuck songs in there' like, after the um Homestuck theme, what really... what I think most people don't really notice is that the next part actually sounds like, like the like [[track:sburban-jungle|Suburban Jungle]] like, it's-it's moved down about one note but it's like, Suburban Jungle is like [singing] and then, and then in Homefree it's [singing] y'know it's basically the same melody.
+    So, the opening of Homefree is basically the opening of Shooting Star and, then, then I started like, I was like you know, after you get past the opening it's not really good until you get to the ending and so I was like 'What else can I put in here?' and so I started putting down the [[track:homestuck-anthem|Homestuck theme]] just because it was easy and jumped to mind, and so, when that, when that really seemed to work I was like 'You know what? Let's throw in more bits of different Homestuck songs in there' like, after the um Homestuck theme, what really... what I think most people don't really notice is that the next part actually sounds like, like the like [[Sburban Jungle|Suburban Jungle]] like, it's-it's moved down about one note but it's like, Suburban Jungle is like [singing] and then, and then in Homefree it's [singing] y'know it's basically the same melody.
 
-    Um, and then, then it moves into another part which is... kind of hard to hear but there's a little bit of [[track:upward-movement-dave-owns|Dave Rocks- Rocks at this Game]]? Is that what it's called? <i>(Note: Referring to the original title of Upward Movement, 'Dave Fucking Owns at this Game')</i> Wow I don't even know the songs of the MS Paint Adventures music team, I'm the worst member! [laughter] But anyway, anyway, but you can hear like the [singing] underneath the violin melody and then after that it goes into what was the ending to Shooting Star which is this, um... it-it's um, I think it's one of the strongest parts of the song because it's a... It's basically like, it's supposed to sound like kind of like just like breaking free you know like, like it rises and then at the very end it just, goes off into it's own place um...
+    Um, and then, then it moves into another part which is... kind of hard to hear but there's a little bit of [[Upward Movement (Dave Owns)|Dave Rocks- Rocks at this Game]]? Is that what it's called? <i>(Note: Referring to the original title of Upward Movement, 'Dave Fucking Owns at this Game')</i> Wow I don't even know the songs of the MS Paint Adventures music team, I'm the worst member! [laughter] But anyway, anyway, but you can hear like the [singing] underneath the violin melody and then after that it goes into what was the ending to Shooting Star which is this, um... it-it's um, I think it's one of the strongest parts of the song because it's a... It's basically like, it's supposed to sound like kind of like just like breaking free you know like, like it rises and then at the very end it just, goes off into it's own place um...
 
     One of the other interesting things about Homefree- waitwaitwait, I need to address something about Homefree [laughter] okay so, I know the MS Paint Adventures music team, we get a lot of people say 'Ohh this sounds like this this sounds like [[artist:touhou-project|Touhou]] this sounds like' I don't know um [laughter] I didn't mean to make this sound like a Pokemon song, I realized after it was already out there that, yeah, that ther-there's a part to it that really does sound like a [[artist:pokemon|Pokemon]] battle theme [laughter] oh god! That wasn't intentional, that really wasn't intentional but um [laughter] I guess that's what happens when you're part of the Pokemon fandom for so long like I mean I w— I was actually a really really obssessed fan for a while like-like I don't know if any of you, if you've been to Bulbagarden, if you've ever used the Bulbapedia or listened to the Bulbacast, yeah I used to be part of all that I used to be like the top editor of Bulbapedia and I used to like just rant about how Brock was the greatest character ever on the Bulbacast [laughter] I don't really do that anymore now and so that's part of the reasons why it's so embarassing that [laughter] my music sounds like Pokemon music [laughter] oh god! Okay okay anyway, um... yeah anyway, so.
 
@@ -546,7 +546,7 @@ Art Tags:
 - Battlefield
 Referenced Tracks:
 - Skaian Skuffle
-- track:skies-of-skaia
+- Skies of Skaia
 ---
 Track: Kingside Castle
 Artists:
@@ -715,7 +715,7 @@ Art Tags:
 - AH
 - Doc Scratch
 Referenced Tracks:
-- track:explore
+- Explore
 Commentary: |-
     <i>Malcolm Brown:</i>
     Hah!  If 'Sneaking music' was a genre, here's another one to the mix.
@@ -760,7 +760,7 @@ Art Tags:
 - Derse
 - Horrorterrors
 Referenced Tracks:
-- track:atomyk-ebonpyre
+- Atomyk Ebonpyre
 Commentary: |-
     <i>Thomas Ferkol:</i>
     Drift Into the Sun started off as me trying to emulate <a href="https://www.youtube.com/watch?v=3pv2LgRzvKg">the opening choir track</a> of a black metal EP.  Soon some big drums and some spacey guitars found their way into the mix (in my attempts to make something on the line of ambient black or doom metal).  Finally, I added Dave's "blast off" to help Rose with a metal-ified version of Atomyk Ebonpyre (which people keep requesting a full version of... maybe).
@@ -810,7 +810,7 @@ Art Tags:
 - Vriska
 Referenced Tracks:
 - Dirgeish
-- track:sburban-jungle
+- Sburban Jungle
 Commentary: |-
     <i>Michael Guy Bowman:</i>
     "Revered Return" began as a track called "Dirgeish", a .pxtone composition that Nick had completed some time ago but never managed to squeeze into an album. Because as a chip tune it had been long overlooked, I decided to take a whack at producing it in a different style for inclusion on Volume 8. I had been looking for a piece that would work as a rock tune, and "Dirgeish" really struck me because of the heavy involvement of drums, its steady pace, and dynamic structure.
@@ -982,7 +982,7 @@ URLs:
 - https://youtu.be/B6e2XacZSIs
 Referenced Tracks:
 - Black Rose / Green Sun
-- track:sburban-jungle
+- Sburban Jungle
 Sheet Music Files:
 - Title: Guitar solo by lugiaa
   Files:
diff --git a/album/homestuck-vol-9.yaml b/album/homestuck-vol-9.yaml
index 638dd83f..e5cf63cc 100644
--- a/album/homestuck-vol-9.yaml
+++ b/album/homestuck-vol-9.yaml
@@ -193,7 +193,7 @@ Cover Art File Extension: jpg
 Art Tags:
 - The Condesce
 Referenced Tracks:
-- track:aggrieve-violin-refrain
+- Aggrieve (Violin Refrain)
 Commentary: |-
     <i>Tavia Morra:</i>
     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.
@@ -285,8 +285,8 @@ Art Tags:
 - Dirk
 - Earth
 Referenced Tracks:
-- track:sburban-jungle
-- track:showtime-original-mix
+- Sburban Jungle
+- Showtime (Original Mix)
 Sheet Music Files:
 - Title: Sheet music by Purple1222119 (flash version)
   Files:
@@ -409,11 +409,11 @@ Art Tags:
 - Earth
 Cover Art File Extension: jpg
 Referenced Tracks:
-- track:beatdown-strider-style
-- track:atomyk-ebonpyre
+- Beatdown (Strider Style)
+- Atomyk Ebonpyre
 - Magnificat
-- track:explore
-- track:endless-climb
+- Explore
+- Endless Climb
 - Flare
 Lyrics: |-
     Magnificat anima mea Dominum (<i>My soul doth magnify the Lord</i>)
@@ -483,7 +483,7 @@ Referenced Tracks:
 Commentary: |-
     <i>Toby Fox:</i>
     art by P-RO at <a href="https://nomorepros.tumblr.com">nomorepros.tumblr.com</a>. P-RO always does a maximally amazing job so why I asked her to draw the art is a non-question.
-    Stress is actually a pretty faithful arrangement of an original track by Buzinkai. Buzinkai has been responsible for several HS-important melodies like [[track:doctor]], [[track:endless-climb]], and [[track:explore]] and [her] work, for me, has always established a certain "essence" of what Homestuck is. My goal for this piece was actually to create a classic strife theme for Dirk with the core feeling of earlier pieces like [[track:showtime-original-mix|Showtime]] or [[track:doctor]], so basing the piece off of something with that "essence" was important.*
+    Stress is actually a pretty faithful arrangement of an original track by Buzinkai. Buzinkai has been responsible for several HS-important melodies like [[Doctor]], [[Endless Climb]], and [[Explore]] and [her] work, for me, has always established a certain "essence" of what Homestuck is. My goal for this piece was actually to create a classic strife theme for Dirk with the core feeling of earlier pieces like [[Showtime (Original Mix)|Showtime]] or [[Doctor]], so basing the piece off of something with that "essence" was important.*
     I can't say why Buzinkai wrote this piece the way she did, so I'll instead highlight the differences between the original and my arrangement.
     - <p>Updated the instrumentation. Buzinkai's usage of PXTONE is indeed charming and nostalgic-sounding, but I wanted to push things bit further. One major difference is the arrangement of the strings - Buzinkai's PXTONE strings have an sharp attack to them, while mine come on a bit softer but are thicker. My strings then sound more "lush" but less "urgent."</p>
     - <p>I added a section between the original A section and B section with lower intensity. This was because the song got a bit too repetitive and static simply repeating like Buzinkai's. Oddly, the repeats didn't bother me in her track. I think this is partially because MY loop point, unlike Buzinkai's, lowers the intensity a LOT more by removing a bunch of instruments where hers simply flows into a repeat. I need to think about that more.</p>
@@ -512,7 +512,7 @@ Art Tags:
 - Maplehoof
 Commentary: |-
     <i>Michael Guy Bowman:</i>
-    I get the feeling that down the line there will be an explanation for why exactly there's a tiny Maplehoof on Dirk Strider's desk and it will be one of the biggest plot revelations in all of Homestuck. For me it was a cue that there needed to be a Sburb Alpha universe parallel for the song [[track:maplehoofs-adventure]], which in itself was a spiritual sequel to [[track:pony-chorale]]. It's sort of a reality check to realize that I have written not one, not two, but three songs for cartoon ponies now - I guess that's part of this disease we call the Internet.
+    I get the feeling that down the line there will be an explanation for why exactly there's a tiny Maplehoof on Dirk Strider's desk and it will be one of the biggest plot revelations in all of Homestuck. For me it was a cue that there needed to be a Sburb Alpha universe parallel for the song [[track:maplehoofs-adventure]], which in itself was a spiritual sequel to [[Pony Chorale]]. It's sort of a reality check to realize that I have written not one, not two, but three songs for cartoon ponies now - I guess that's part of this disease we call the Internet.
     As with the previous installments, I used a sample of Tavia Morra saying "neigh" to punctuate phrases, this time sped up to about double speed to have that chipmunk-esque effect. Everything about this song is a bit faster-paced and squeakier to reflect the stature of the tiny horse. The orchestration was largely inspired by my last trip to Disneyland - the whistles are arranged to sound a bit like the teapots from Alice in Wonderland, and the horn synths were selected because of their resemblance to a merry-go-round organ.
     Along with recent tracks like [[track:another-jungle]] and [[track:elephant-gun]], this song represents one of my attempts to stick less closely to a predictable song form. The key signature moves up a whole step around 32 seconds in and never comes back down, and the main repeated refrain that ties the song together is the little cadence that shows up at the end of each section. I stuck to my guns as a high school music theory student on this one, mostly drawing from Mozart and Sousa - it's an overstimulating mess of counterpoint, and my main goal was to see if it would annoy composition major Erik Scheele (it worked).
     Out of all the tracks for Volume 9 I worked on, this one was a real breeze. I was on such a roll that I considered making it ten minutes long just to piss off everyone, but I knew that I'd most likely be asked to cut it down if I'd gone to that kind of excess, and I had other tracks to work on.
@@ -534,7 +534,7 @@ Art Tags:
 - Earth
 - 'cw: blood'
 Referenced Tracks:
-- track:showtime-original-mix
+- Showtime (Original Mix)
 - Lifdoff
 - Unite Synchronization
 Commentary: |-
@@ -569,7 +569,7 @@ Art Tags:
 - Earth
 Referenced Tracks:
 - English
-- track:explore
+- Explore
 Commentary: |-
     <i>Mark J. Hadley:</i>
     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.
@@ -1166,11 +1166,11 @@ Art Tags:
 Referenced Tracks:
 - Liquid Negrocity
 - Crystalanthemums
-- track:upward-movement-dave-owns
-- track:sburban-jungle
-- track:beatdown-strider-style
-- track:mutiny
-- track:explore
+- Upward Movement (Dave Owns)
+- Sburban Jungle
+- Beatdown (Strider Style)
+- Mutiny
+- Explore
 - track:penumbra-phantasm
 - Descend
 Sheet Music Files:
@@ -1211,10 +1211,10 @@ Art Tags:
 - PM
 - 'cw: body horror (abstract)'
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 - track:penumbra-phantasm
 - Courser
-- track:doctor
+- Doctor
 - Black Rose / Green Sun
 ---
 Track: A Taste for Adventure
@@ -1230,9 +1230,9 @@ Art Tags:
 - Jake
 - Earth
 Referenced Tracks:
-- track:dissension-original
+- Dissension (Original)
 - track:carefree-action
-- track:showtime-original-mix
+- Showtime (Original Mix)
 Sheet Music Files:
 - Title: Piano score by Do The Musicy Thing
   Files:
@@ -1303,10 +1303,10 @@ Cover Artists:
 - Homestuck
 Cover Art File Extension: jpg
 Referenced Tracks:
-- track:crustacean
-- track:hardlyquin
+- Crustacean
+- Hardlyquin
 Sampled Tracks:
-- track:hardlyquin
+- Hardlyquin
 - Snake Eyes
 - Leaving Las Vegas
 Lyrics: |-
diff --git a/album/intermishin.yaml b/album/intermishin.yaml
index bb2959d8..0a1403f8 100644
--- a/album/intermishin.yaml
+++ b/album/intermishin.yaml
@@ -404,7 +404,7 @@ Art Tags:
 Duration: '03:35'
 Referenced Tracks:
 - Liquid Negrocity
-- track:the-ballad-of-jack-noir
+- The Ballad of Jack Noir
 - We Are Number One
 - The Endless Black (aka Clockwork Negrocity)
 URLs:
@@ -983,4 +983,4 @@ Commentary: |-
     Started off as a sad, lamenting song. Some of the melody sound like English so I thought "PUT IT IN D-MINOR!" I also wanted to try emulating the idea of "He is already here" so I hid the motif of the last four notes throughout the song.
 
     <i>BitesizeBird:</i> (Artist)
-    wowww thats a spook
\ No newline at end of file
+    wowww thats a spook
diff --git a/album/jailbreak-vol-1.yaml b/album/jailbreak-vol-1.yaml
index bbd18175..b75e189b 100644
--- a/album/jailbreak-vol-1.yaml
+++ b/album/jailbreak-vol-1.yaml
@@ -128,7 +128,7 @@ URLs:
 Cover Artists:
 - Robert J! Lake
 Referenced Tracks:
-- track:showtime-original-mix
+- Showtime (Original Mix)
 - The Beginning of Something Really Excellent
 ---
 Track: Rising Water (Oh, Shit!)
@@ -349,7 +349,7 @@ Duration: 0:48
 URLs:
 - https://youtu.be/lDq9alucoMA
 Referenced Tracks:
-- track:doctor
+- Doctor
 - Squiddles!
 ---
 Track: Distanced
@@ -515,8 +515,8 @@ Lyrics: |-
     GFD: Yes, it does. (What are) you on?
     Jit: Yeah, it does.
     Nick: Fine, you win. GFD: And hasn't Parsec made stuff in Famitracker before?
-    Nick: [[track:harlequin|Harlequin]]?
-    GFD: Yeah, er, wait... Jit: [[track:aggrieve|Aggrieve]]?
+    Nick: [[Harlequin]]?
+    GFD: Yeah, er, wait... Jit: [[Aggrieve]]?
     GFD: Was it him that made the [[track:problem-sleuth-theme|title screen for Problem Sleuth]]?
     Nick: Yes. GFD: Because that was in... that was in Famitracker.
     Jit: It would make sense.
@@ -584,10 +584,10 @@ Lyrics: |-
     Nick: Forget everything else, this song's the best.
     Jit: Hi... yeah... it's like— RJ!: This is one of my favorites.
     GFD: Jit, how did— Jit: It's like, god, this thing is so freaking old. This is before Dave had a fight theme, and I was like, "I'll try making one".
-    RJ!: I actually wish this was the fight theme over [[track:beatdown-strider-style|Beatdown]].
+    RJ!: I actually wish this was the fight theme over [[Beatdown (Strider Style)|Beatdown]].
     Nick: Mmm.
-    GFD: Jit— Jit: I don't know, [[track:beatdown-strider-style|Beatdown]] was cool though.
-    GFD: How do you feel about—  Jit: It's just like... RJ!: [[track:beatdown-strider-style|Beatdown]], I like... I like [[track:beatdown-strider-style|Beatdown]] but... I like this more.
+    GFD: Jit— Jit: I don't know, [[Beatdown (Strider Style)|Beatdown]] was cool though.
+    GFD: How do you feel about—  Jit: It's just like... RJ!: [[Beatdown (Strider Style)|Beatdown]], I like... I like [[Beatdown (Strider Style)|Beatdown]] but... I like this more.
     GFD: Jit, how do you feel about yourself when you listen to this?
     Jit: Um... Nick: Probably the same way you feel about how you listen to your stuff.
     GFD: I feel amazing.
@@ -622,11 +622,11 @@ Lyrics: |-
     RJ!: Am I really an inspiration for this, because I was listening to it and I didn't notice.
     GFD: Uh— Nick: Wait, what was the inspiration? GFD: —Andrew H. took like two really, really frickin' old tracks that I made a long time ago.
     RJ!: He said it was Jade inspired and I guess, would that mean that there's some, um... Wait... I'm listening right now... I can't notice any uh, if there's some [[track:the-beginning-of-something-really-excellent|Beginning of Something Really Excellent]] in here.
-    GFD: Isn't it [[track:gardener|Gardener]] that's in here?
+    GFD: Isn't it [[Gardener]] that's in here?
     RJ!: That's what [[track:the-beginning-of-something-really-excellent|Beginning of So]]—, yeah, yeah. GFD: Wait. I don't know my Homestuck songs very well.
-    RJ!: [[track:the-beginning-of-something-really-excellent|Beginning of Something Really Excellent]] is the original, um, it's the same melody as in [[track:gardener|Gardener]]. [[track:gardener|Gardener]] is just the thing that Steve Everson took and he took mine, and put it to a fake bass sample.
+    RJ!: [[track:the-beginning-of-something-really-excellent|Beginning of Something Really Excellent]] is the original, um, it's the same melody as in [[Gardener]]. [[Gardener]] is just the thing that Steve Everson took and he took mine, and put it to a fake bass sample.
     GFD: Oh.
-    RJ!: Yeah... But it's the same melody, the original is [[track:the-beginning-of-something-really-excellent|Beginning of Something Really Excellent]], but it's easier to call it [[track:gardener|Gardener]] so just do that. He gave it the name.
+    RJ!: Yeah... But it's the same melody, the original is [[track:the-beginning-of-something-really-excellent|Beginning of Something Really Excellent]], but it's easier to call it [[Gardener]] so just do that. He gave it the name.
     GFD: It was, oh, we skipped over that part already. The minor part back there was inspired by "eerie.mp3" if anybody remembers that from me.
     RJ!: I don't.
     GFD: No, nobody does.
@@ -680,7 +680,7 @@ Lyrics: |-
     GFD: Well, that's not happening anymore.
     Jit: Whatever... No, screw him.
     RJ!: He says publicly, for the public record.
-    [laughter] Jit: Yeah. Screw [[track:black|Black]] too.
+    [laughter] Jit: Yeah. Screw [[Black]] too.
     [laughter] Nick: Yeah, how 'bout that— GFD: Yeh. Nick: —Radiation, or should I say... mmMMMmGAYdiation.
     Jit: Does he even have any tracks on this album?
     RJ!: No, he does not have any tra—
diff --git a/album/jpeg.yaml b/album/jpeg.yaml
index 797c43b2..a7fdf307 100644
--- a/album/jpeg.yaml
+++ b/album/jpeg.yaml
@@ -98,8 +98,8 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/dave-story
 - https://youtu.be/m_ivW3La4m0
 Referenced Tracks:
-- track:upward-movement-dave-owns
-- track:beatdown-strider-style
+- Upward Movement (Dave Owns)
+- Beatdown (Strider Style)
 - Beatup
 - Cascade (Beta)
 Commentary: |-
@@ -152,7 +152,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/the-cult-of-mods
 - https://youtu.be/NcweiWuAObI
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 - A History of Babies
 - track:moshi-moshi
 Commentary: |-
@@ -179,7 +179,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/no-fursuit-no-shoes-no-service
 - https://youtu.be/MYug3tkSGD8
 Referenced Tracks:
-- track:umbral-ultimatum
+- Umbral Ultimatum
 - Where making this hapen
 - Dogsong
 Commentary: |-
@@ -189,7 +189,7 @@ Commentary: |-
     <i>Pipko Fanfare:</i> (Composer)
     Before I picked this track art to do a song for, I knew I wanted to try to pull off something similar to what CANWC itself does - the seamless mixing of remarkably low quality with suprisingly high quality, based on familiar homestucky goodness but with some unexpected twists - more like Vol 1 than our more recent (at the time) work. I also wanted to play with some more of Jade's tracks, and with the prositan guards under her control this was one of the track arts that would let me do so. (The other option at the time was Yiff Confirmed, which I may have chosen instead except it was the same artist as [[track:thank-you-for-playing|Thank You For Playing]] and I wanted to spread the love around more. Besides, this art is \*awesome*.)
     Unlike nearly everything I've done here, this track had a surprising amount of planning before I set down the first note. For the sake of history, here's my original plan for the structure of the piece, cut and paste from discord
-    [[track:umbral-ultimatum|uu]] but the piano intro is [[track:where-making-this-hapen|h*cka (probs sbhj theme)]] then 0:25 low-quality uu with barks and meows then 0:45 kick into higher quality to build up to 0:55 hq except with a mario paint bark lead then at 1:20 at the melody switch go to a skaia theme or something instead for the prospitans but keep the style of uu, 1:56 refrain of hj intro, 2:15 8-bit dogsong holy shit this song is longer than i remembered
+    [[Umbral Ultimatum|uu]] but the piano intro is [[track:where-making-this-hapen|h*cka (probs sbhj theme)]] then 0:25 low-quality uu with barks and meows then 0:45 kick into higher quality to build up to 0:55 hq except with a mario paint bark lead then at 1:20 at the melody switch go to a skaia theme or something instead for the prospitans but keep the style of uu, 1:56 refrain of hj intro, 2:15 8-bit dogsong holy shit this song is longer than i remembered
     (Okay, so that's only a lot of planning compared to my usual zero. And you can see I changed my mind on a few things later.)
     Cookiefonster made the frytumes while I was still working on the beginning sections, and let's be real it's way better than I could have done!
     I tried a few different techniques to represent The Corruption, some revisited from [[album:cool-and-new-voulem1|Vol 1]] tracks, some new. For example, in the section from 0:30 to 0:50 alone I utilized pitch bending the master channel, intentionally knocking different instrument tracks slightly out of alignment or tempo, and of course good old fashioned craptastic soundfonts. A little after the two minute mark, you'll hear some mouth sounds from me, even some coughing if you listen close enough! Overall, I feel like I was much more successful at the "low quality" portions than the "high quality" ones here, but that's part of the learning process.
@@ -211,12 +211,12 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/s-rose-jef-strife
 - https://youtu.be/oZAUgXyfNW4
 Referenced Tracks:
-- track:chorale-for-jaspers
+- Chorale for Jaspers
 - Where making this hapen
-- track:aggrieve
+- Aggrieve
 - Dance of Thorns
 - Tick
-- track:ohgodwhat
+- Ohgodwhat
 - revengn
 - Tock
 - Muse of Nanchos
@@ -241,7 +241,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/hs-and-new
 - https://youtu.be/Eyr7wIojPYI
 Referenced Tracks:
-- track:doctor
+- Doctor
 - RollerCoaster Tycoon Theme
 Commentary: |-
     <i>Shadok:</i> (Artist)
@@ -298,7 +298,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/rozes-theme-chiptune-warrior
 - https://www.youtube.com/watch?v=vWVnTl4ovos
 Referenced Tracks:
-- track:aggrieve
+- Aggrieve
 - Smack
 - RollerCoaster Tycoon Theme
 Sampled Tracks:
@@ -548,8 +548,8 @@ URLs:
 - https://youtu.be/K6jLWdY6pLE
 Referenced Tracks:
 - RollerCoaster Tycoon Theme
-- track:showtime-original-mix
-- track:doctor
+- Showtime (Original Mix)
+- Doctor
 Commentary: |-
     <i>william_:</i> (Artist)
     i wanted to use After Effects to make a track art sometime, and decided to do something really psychedelic and effects-crazy (since i've often used that style when using AE to make youtube poops.)
@@ -576,10 +576,10 @@ URLs:
 - https://youtu.be/m5K4omKTuDA
 Referenced Tracks:
 - Flare
-- track:sburban-jungle
-- track:doctor
+- Sburban Jungle
+- Doctor
 - Taureg
-- track:beatdown-strider-style
+- Beatdown (Strider Style)
 - track:penumbra-phantasm
 - Clockstopper
 Commentary: |-
@@ -834,12 +834,12 @@ URLs:
 - https://youtu.be/rYlApQIcSy4
 Referenced Tracks:
 - Bargaining with the Beast
-- track:upward-movement-dave-owns
+- Upward Movement (Dave Owns)
 - Davesprite
-- track:beatdown-strider-style
+- Beatdown (Strider Style)
 Sampled Tracks:
 - Bargaining with the Beast
-- track:beatdown-strider-style
+- Beatdown (Strider Style)
 Commentary: |-
     <i>Scarodactyl:</i> (Artist)
     This was basically a drawing of things I wanted to see more of in Homestuck: cool locations like LoHaC, giant denizen monsters, and davesprite getting into swordfights.  And, of course, big beefy arms.
@@ -883,8 +883,8 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/collision-course-davepetas-movement
 - https://youtu.be/QNoZoRqy_nY
 Referenced Tracks:
-- track:upward-movement-dave-owns
-- track:beatdown-strider-style
+- Upward Movement (Dave Owns)
+- Beatdown (Strider Style)
 - Sunsetter
 - CORE
 - English
@@ -983,7 +983,7 @@ URLs:
 Referenced Tracks:
 - track:penumbra-phantasm
 - track:moshi-moshi
-- track:doctor
+- Doctor
 - Muse of Nanchos
 - Where making this hapen
 Sampled Tracks:
@@ -1011,7 +1011,7 @@ Referenced Tracks:
 - Homicide
 - Emerald Terror
 - track:moshi-moshi
-- track:doctor
+- Doctor
 Commentary: |-
     <i>Griever:</i> (Artist)
     I think I drew (well, made) this before DR3. DR3 fucking sucks.
@@ -1064,7 +1064,7 @@ URLs:
 Referenced Tracks:
 - Black Rose / Green Sun
 - Black Hole / Green Sun
-- track:endless-climb
+- Endless Climb
 - Song for Rose Lalonde
 - Exploring the Depths of Sburb
 Commentary: |-
@@ -1175,4 +1175,4 @@ Commentary: |-
     Hey guys im alive -- I doodled (mostly tracing in Sai, a bit of photoshop) this during one of those times we thought Siiva ended. One of those dozens of times. You think the channel could have a more satisfying ending than Homestuck?.....Yeah probably.
 
     <i>Pipko Fanfare:</i> (Composer)
-    I don't think this one requires any explanation. But it \*does* make a great excuse to thank you all for playing with us and joining along in this crazy ride. Thank you all for your support, and I'll see you next album!
\ No newline at end of file
+    I don't think this one requires any explanation. But it \*does* make a great excuse to thank you all for playing with us and joining along in this crazy ride. Thank you all for your support, and I'll see you next album!
diff --git a/album/lofam.yaml b/album/lofam.yaml
index 660a139e..4a2a9068 100644
--- a/album/lofam.yaml
+++ b/album/lofam.yaml
@@ -83,10 +83,10 @@ Art Tags:
 - Jade
 - Earth
 Referenced Tracks:
-- track:skies-of-skaia
+- Skies of Skaia
 - Homestuck Title Screen
 - Homestuck
-- track:theme
+- Theme
 Commentary: |-
     <i>Catboss:</i>
     So I might as well start off with a brief self-introduction. Hello everynyan! I'm konec0. Sometimes I do fanmusic. Sometimes that fanmusic ends up being non-Nepetaquest related (rare!) and finds its way on to the Fanmusic thread.
@@ -107,7 +107,7 @@ Cover Artists:
 Art Tags:
 - Felt Manor
 Referenced Tracks:
-- track:showtime-piano-refrain
+- Showtime (Piano Refrain)
 - Showdown
 Commentary: |-
     <i>SparksD2145:</i>
@@ -128,7 +128,7 @@ Cover Artists:
 Art Tags:
 - John
 Referenced Tracks:
-- track:doctor
+- Doctor
 Commentary: |-
     <i>Solatrus:</i>
     I started reading Homestuck in mid January of 2010, but never really found myself absolutely hooked. So, I really took my time getting through it, especially Acts 1 and 2.
@@ -236,7 +236,7 @@ Art Tags:
 - Doc Scratch
 - LoWaS
 Referenced Tracks:
-- track:beatdown-strider-style
+- Beatdown (Strider Style)
 - Liquid Negrocity
 Commentary: |-
     <i>Chase:</i>
@@ -343,7 +343,7 @@ Art Tags:
 - Jack Noir
 Referenced Tracks:
 - The Broken Clock
-- track:crustacean
+- Crustacean
 - Sunsetter
 Commentary: |-
     <i>Mal McGannon:</i>
@@ -448,7 +448,7 @@ Cover Artists:
 Art Tags:
 - John
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 Commentary: |-
     <i>Ralen Gainsborough:</i>
     A while back, the MSPA forums had the "Forapocalypse", and everyone had their avatars enter the medium one way or another to 'survive' the forums going down.
@@ -488,7 +488,7 @@ Cover Artists:
 Art Tags:
 - Dave
 Referenced Tracks:
-- track:atomyk-ebonpyre
+- Atomyk Ebonpyre
 Commentary: |-
     <i>James Roach:</i>
     I liked the idea of Ebonpyre being used as a strife theme for Dave, so I wanted to go a little further with it. I imagined Dave using a lot of time-skipping while he fights (as represented by the record scratches).
@@ -552,7 +552,7 @@ URLs:
 Cover Artists:
 - Miff
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 Commentary: |-
     <i>Alex Rosetti:</i>
     All I remember was someone requesting Sburban Jungle in the style of elevator music so out pops this thing.
@@ -619,10 +619,10 @@ Art Tags:
 - Vriska
 Referenced Tracks:
 - track:MeGaLoVania
-- track:sburban-jungle
-- track:explore
+- Sburban Jungle
+- Explore
 - Crystalanthemums
-- track:beatdown-strider-style
+- Beatdown (Strider Style)
 - Spider's Claw
 - The La2t Frontiier
 - Terezi's Theme
@@ -634,9 +634,9 @@ Referenced Tracks:
 - Eridan's Theme
 - The Beginning of Something Really Excellent
 - track:miracles
-- track:theme
-- track:aggrieve
-- track:showtime-original-mix
+- Theme
+- Aggrieve
+- Showtime (Original Mix)
 - Showdown
 Commentary: |-
     <i>Catboss:</i>
@@ -720,6 +720,7 @@ Commentary: |-
 ---
 Track: Under the Hat
 Directory: under-the-hat-lofam
+Always Reference By Directory: true
 Artists:
 - Erik Scheele
 Duration: '1:57'
@@ -748,12 +749,12 @@ Cover Artists:
 Art Tags:
 - LoWaS
 Referenced Tracks:
-- track:sburban-jungle
-- track:doctor
-- track:showtime-original-mix
-- track:aggrieve
+- Sburban Jungle
+- Doctor
+- Showtime (Original Mix)
+- Aggrieve
 - track:penumbra-phantasm
-- track:beatdown-strider-style
+- Beatdown (Strider Style)
 Commentary: |-
     <i>Brad Griffin:</i>
     Sburban Jungle and Doctor are pretty much the tastiest songs ever, so I wanted to see what would happen if I mashed em into a gooey paste. As I was putting the ingredients back, some chunks of Showtime and Aggrieve fell into the pot. I tried to tone down the flavor by adding a little more Doctor, but then a bit of Black and Beatdown got pulled in with it. At this point it all boiled over onto my laptop and uploaded itself to the internet. Total culinary disaster!
@@ -772,7 +773,7 @@ Art Tags:
 - John
 Referenced Tracks:
 - Descend
-- track:explore
+- Explore
 Commentary: |-
     <i>EnnuiKing:</i>
     A few months ago I was on a classical guitar kick. I decided to make adaptations of Homestuck tunes for classical guitar, and they both translated surprisingly well for the most part. This particular rendition of Explore is based off the version from Descend, which is in C Minor as opposed to the A Minor of the original. Explore forever has an association with ectobiology because the scene where it plays in Descend is of Egbert sending babies onto meteors.
@@ -853,7 +854,7 @@ Art Tags:
 - 'cw: alcohol'
 Commentary: |-
     <i>Max Wright:</i>
-    This is a piece that found inspiration in pretty much everything. The main influences in this case were Bach (instrument choice), the Professor Layton Theme (throughout, mainly the introduction and melody that the violin takes), [[track:explore|Explore]], and The Felt album in general. The inspiration from Professor Layton, drawing from video game themes, also affected my choice to make this loop(able).
+    This is a piece that found inspiration in pretty much everything. The main influences in this case were Bach (instrument choice), the Professor Layton Theme (throughout, mainly the introduction and melody that the violin takes), [[Explore]], and The Felt album in general. The inspiration from Professor Layton, drawing from video game themes, also affected my choice to make this loop(able).
     House of Lalonde was always intended from the start to be the theme for some sort of home. Orginally, it was going to be for Doc Scratch's study... but the only reason that never happened was because I couldn't find the right organ sound (the kind you hear in [[Scratch]]). So, scrapping that idea, I continued to set about sculpting a theme for a sophisticated abode, and eventually reached the conclusion that it would work rather well for Rose's. I may extend it some day...
     <i>"Somewhere a zealous god threads these strings between the clouds and the earth, preparing for a symphony it fears impossible to play."<br>-- Charles Barkley</i>
 ---
@@ -872,7 +873,7 @@ Referenced Tracks:
 - psych0ruins
 Commentary: |-
     <i>James Dever:</i>
-    L'état de l'ambivalence is the bastardized child of two different songs. I wrote the beginning of a song at the beginning of Hivebent called Lusus' Lament. It was supposed to be like a [[track:chorale-for-jaspers|Chorale for Jaspers]] but for the trolls' custodians. This was before I even knew Alternia was in the works. After hearing psych0ruins I loved those beginning arpeggios and crying effect. So when Rad mentioned the idea of having troll planet themes, I jumped at the chance of making one for Aradia. I used the beginning to Lusus' Lament and then combined it with those beginning arpeggios and the first phrases of psych0ruins.
+    L'état de l'ambivalence is the bastardized child of two different songs. I wrote the beginning of a song at the beginning of Hivebent called Lusus' Lament. It was supposed to be like a [[Chorale for Jaspers]] but for the trolls' custodians. This was before I even knew Alternia was in the works. After hearing psych0ruins I loved those beginning arpeggios and crying effect. So when Rad mentioned the idea of having troll planet themes, I jumped at the chance of making one for Aradia. I used the beginning to Lusus' Lament and then combined it with those beginning arpeggios and the first phrases of psych0ruins.
     Aradia's planet is the Land of Quartz and Melody, so I ran with the music box motif and added glockenspiel for a crystal-esque noise. The beginning section is kind of like what Sburban Jungle is to Rose. Music to add to her trying to enter the medium. There is a pause as she succeeds and enters and the mood of the music shifts completely. The second half builds more of the Quartz feel.
     The title is because Nick thought we should have a foreign name.
     <i>umibouzu:</i>
@@ -891,7 +892,7 @@ Art Tags:
 - Dave
 - Dave's bro
 Referenced Tracks:
-- track:beatdown-strider-style
+- Beatdown (Strider Style)
 Commentary: |-
     <i>Ian White:</i>
     Growin' Up Strider fills a pretty obvious niche I guess, a cutesy song to montage Bro raising/training/abusing Dave, parallel to John and dad and [[Homestuck Anthem]]. The whole time I was making it I had DJ School from Rhythm Heaven stuck in my head, which is another cutesy song about another pair of cool dudes who are also learning to scratch records. So I guess I stole that. They probably weren't brothers though on account of how one was blue and the other was a robot I think. Lemmings had an influence too, which is to say that's where I stole those high-pitched bleeps from. I didn't even think to use Beatdown for the melody until I had prety much built the rest of the song around it. I had an old midi (by Tenebrais I think) and started goofing around trying to play it out in a major key and it fit pretty well sooooo that's that story.
@@ -916,7 +917,7 @@ Art Tags:
 Referenced Tracks:
 - Nyanyanyanyanyanyanya!【Momo Momone】
 - Tribal Ebonpyre
-- track:sburban-jungle
+- Sburban Jungle
 Lyrics: |-
     Nak nak nak nak nak nak nak nak nak nak
     Nak nak nak nak nak nak nak nak nak nak nak nak nak nak nak
@@ -1160,7 +1161,7 @@ Art Tags:
 - Consorts
 - LoWaS
 Referenced Tracks:
-- track:doctor
+- Doctor
 Commentary: |-
     <i>The Lovable Tramp:</i>
     This is what happens when someone is obsessed with Homestuck and afro-cuban grooves at the same time.
@@ -1293,9 +1294,9 @@ Art Tags:
 - Jade
 - Earth
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 - Squiddles!
-- track:beatdown-strider-style
+- Beatdown (Strider Style)
 Commentary: |-
     <i>Willow Ascenzo:</i>
     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.
@@ -1356,7 +1357,7 @@ Art Tags:
 - Karkat
 - Terezi
 Referenced Tracks:
-- track:showtime-piano-refrain
+- Showtime (Piano Refrain)
 Commentary: |-
     <i>Fuzz:</i>
     My approach to music is very dramatic. When I create music I tend to visualise very specific scenes which take place when it plays. Farewell was originally intended to accompany the scene where John discovered Mom and Dad were dead. At this point in the story it could have gone any way, so I started playing around and doing improvisations based around the Showtime theme, being a theme central to John. After messing around some more for a while I realised that a more bittersweet touch worked better though, and that instead of being used for lamenting, in my minds eye the piece seemed to fit something more akin to a goodbye, such as a scene displaying the kids and trolls parting ways.
@@ -1378,9 +1379,9 @@ Art Tags:
 - Dave
 - Jade
 Referenced Tracks:
-- track:doctor
-- track:endless-climb
-- track:atomyk-ebonpyre
+- Doctor
+- Endless Climb
+- Atomyk Ebonpyre
 - track:frost-vol6
 - Squiddles!
 Commentary: |-
diff --git a/album/lofam2.yaml b/album/lofam2.yaml
index fde6208f..1183136c 100644
--- a/album/lofam2.yaml
+++ b/album/lofam2.yaml
@@ -76,7 +76,7 @@ Art Tags:
 - Alternia
 Referenced Tracks:
 - English
-- track:sburban-jungle
+- Sburban Jungle
 - The Paradox Paradigm
 - --Emperical
 Commentary: |-
@@ -100,7 +100,7 @@ Art Tags:
 - Underlings
 - 'cw: alcohol'
 Referenced Tracks:
-- track:aggrieve
+- Aggrieve
 Commentary: |-
     <i>Charles Neudorf:</i>
     Jackpot was originally "written" by me for the Homestuck music contest. I say written in quotation marks because at the time all I had was a cool bassline and a title, I was in a complete musical slump on what to do with the piece, and so I turned to my friend Shadolith for help. Shadolith not only helped to come up with better ideas for the song, but actually finished most if it on her own. I'm really glad she did though, otherwise the song would have never been finished, and it wouldn't be playing in your ears right now!
@@ -119,7 +119,7 @@ Cover Artists:
 Art Tags:
 - LoWaS
 Referenced Tracks:
-- track:doctor
+- Doctor
 - track:penumbra-phantasm
 Commentary: |-
     <i>Joe Ouellet:</i>
@@ -141,7 +141,7 @@ Art Tags:
 - John
 - Battlefield
 Referenced Tracks:
-- track:skies-of-skaia
+- Skies of Skaia
 Commentary: |-
     <i>David Ellis:</i>
     I don't really have much to say about this. I'd been messing about on guitar and found that most of the first theme from Skies of Skaia was playable with harmonics in standard tuning, and only the top note wasn't possible. By returning to EADF#BE and putting a capo on at the 5th fret it was possible then to play the whole thing.
@@ -187,8 +187,8 @@ Art Tags:
 - Green Sun
 Referenced Tracks:
 - Liquid Negrocity
-- track:atomyk-ebonpyre
-- track:showtime-piano-refrain
+- Atomyk Ebonpyre
+- Showtime (Piano Refrain)
 Commentary: |-
     <i>Thomas Ibarra:</i>
     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.
@@ -281,7 +281,7 @@ Referenced Tracks:
 - track:ruins
 - track:growing-up
 - Gilded Sands
-- track:nightmare
+- Nightmare
 Commentary: |-
     <i>Eston Schweickart:</i>
     I wrote Unforgiving Terrain shortly after [[album:the-wanderers]] album came out. It was just an excuse to have fun with sound design and listen to Carapacian Dominion over and over. It's called Unforgiving Terrain because titles are hard. The project file is called <i>Frozen Ruins</i> but I guess I didn't use that name because I ended up not including [[track:frost-vol6]] like I had planned.
@@ -410,8 +410,8 @@ Art Tags:
 - Maplehoof
 - Earth
 Referenced Tracks:
-- track:pony-chorale
-- track:upward-movement-dave-owns
+- Pony Chorale
+- Upward Movement (Dave Owns)
 Lyrics: |-
     Come gather round me, children<br>I'll sing you the tale<br>The Ballad of Maplehoof<br>Though she was but a foal<br>Her story touched us all<br>Sing the Ballad of Maplehoof
     Maplehoof, Maplehoof<br>Ride, Maplehoof, Ride
@@ -470,10 +470,10 @@ Art Tags:
 - Lord English
 - 'cw: body horror'
 Referenced Tracks:
-- track:atomyk-ebonpyre
+- Atomyk Ebonpyre
 - English
 - Liquid Negrocity
-- track:the-ballad-of-jack-noir
+- The Ballad of Jack Noir
 - Walk-Stab-Walk (R&E)
 - Let's All Rock the Heist
 Commentary: |-
@@ -609,10 +609,10 @@ Cover Art File Extension: jpg
 Art Tags:
 - John
 Referenced Tracks:
-- track:showtime-piano-refrain
-- track:showtime-original-mix
-- track:sburban-jungle
-- track:i-dont-want-to-miss-a-thing
+- Showtime (Piano Refrain)
+- Showtime (Original Mix)
+- Sburban Jungle
+- I Don't Want to Miss a Thing
 Commentary: |-
     <i>Plumegeist:</i>
     I composed SHowtime End Strife remix roughly five months after the time I got into Homestuck. Around this time I was still really just a budding musician, and I wanted to make something heavy out of the Showtime theme by Malcolm Brown. The idea was imagining what kind of soundtrack would be backing the kids as they face Lord English in a climactic battle. I was proud of it at the time but in retrospect it never really aged that well. Despite this it remained one of my most popular works.
@@ -653,13 +653,13 @@ Art Tags:
 - Dave
 - Jade
 Referenced Tracks:
-- track:doctor
-- track:showtime-original-mix
-- track:beatdown-strider-style
+- Doctor
+- Showtime (Original Mix)
+- Beatdown (Strider Style)
 - Pumpkin Cravings
-- track:chorale-for-jaspers
+- Chorale for Jaspers
 - 'BL1ND JUST1C3 : 1NV3ST1G4T1ON !!'
-- track:atomyk-ebonpyre
+- Atomyk Ebonpyre
 - Horschestra
 - track:MeGaLoVania
 - Spider's Claw
@@ -685,9 +685,9 @@ Art Tags:
 - Jack Noir
 - 'cw: blood'
 Referenced Tracks:
-- track:harlequin
+- Harlequin
 - Liquid Negrocity
-- track:sburban-jungle
+- Sburban Jungle
 - track:carefree-action
 Commentary: |-
     <i>Thomas Ibarra:</i>
@@ -710,7 +710,7 @@ Art Tags:
 Referenced Tracks:
 - Rhapsody in Green
 - English
-- track:sburban-jungle
+- Sburban Jungle
 Commentary: |-
     <i>Brenden Cameron:</i>
     Ever since 'The Felt' came out, I've been in love with that piano ditty at the start of Variations and in the reversed Rhapsody in Green.
@@ -740,7 +740,7 @@ Art Tags:
 Referenced Tracks:
 - Courser
 - Earthsea Borealis
-- track:upward-movement-dave-owns
+- Upward Movement (Dave Owns)
 - track:ruins
 - Dawn of Man
 - the rose rap
@@ -860,7 +860,7 @@ Art Tags:
 - Prospit
 Referenced Tracks:
 - Homestuck Anthem
-- track:sburban-jungle
+- Sburban Jungle
 Commentary: |-
     <i>Jamie Paige Stanley:</i>
     Hello again!! Disk one is coming to a close. I hope you've enjoyed the fan land and of music so far!! This is a lullaby based mostly off of Homestuck Anthem by Clark "Plazmataz" Powell and Sburban Jungle by Michael Guy Bowman. It's really slow and sweet and has my favorite chord thingy ever which is the F to F minor thing going on there. It's all in all a song that you hopefully fall asleep listening to because that's what it's supposed to do!! And you might need a nap after listening to disk one. In fact, for the full Land of Fans and Musics Experience The Second™, take a nap in between the two disks. Yes. Anyways, I hope you enjoy our musical stylings and that you don't buy this album because that's illegal.
@@ -883,7 +883,7 @@ Art Tags:
 - LoFaM
 Referenced Tracks:
 - White King
-- track:sburban-jungle
+- Sburban Jungle
 Commentary: |-
     <i>Lambda Bledsoe:</i>
     Hi. I'm Lambda Bledsoe, or Xzaz. I started the project to put LoFaM2 together.
@@ -958,32 +958,32 @@ Referenced Tracks:
 - Time on My Side
 - Even in Death
 - Gaia Queen
-- track:endless-climb
+- Endless Climb
 - Olive Rogue
 - track:ruins
 - Lotus
 - 'BL1ND JUST1C3 : 1NV3ST1G4T1ON !!'
-- track:chorale-for-jaspers
+- 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
+- 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
+- Ohgodwhat
 - Courser
 - Dance of Thorns
 - Unite Synchronization
-- track:upward-movement-dave-owns
+- Upward Movement (Dave Owns)
 - Fly
-- track:vagabounce
+- Vagabounce
 - Cascade (Beta)
 - Flare
 - Savior of the Dreaming Dead
@@ -1007,18 +1007,18 @@ Commentary: |-
     - 0:17 - [[Time on My Side]]
     - 0:34 - [[Even in Death]]
     - 0:46 - [[Gaia Queen]]
-    - 0:57 - [[track:endless-climb|Endless Climb]]
+    - 0:57 - [[Endless Climb]]
     - 1:11 - [[Olive Rogue]]
     - 1:26 - [[Ruins (With Strings)]]
     - 1:38 - [[Lotus]]
     - 1:49 - [[BL1ND JUST1C3 : 1NV3ST1G4T1ON !!]]
-    - 2:07 - [[track:chorale-for-jaspers|Chorale for Jaspers]]
+    - 2:07 - [[Chorale for Jaspers]]
     - 2:24 - [[Another Jungle]]
     - 2:30 - [[Let's All Rock the Heist]]
     - 2:47 - [[Derse Dreamers]]
     - 2:57 - [[Carbon Nadsat / Cuestick Genius]]
     - 3:10 - [[Three in the Morning]]
-    - 3:22 - [[track:black|Black]]
+    - 3:22 - [[Black]]
     - 3:33 - [[Trollcops]]
     - 3:57 - [[track:frost-vol6]]
     - 4:08 - [[Rex Duodecim Angelus]]
@@ -1026,12 +1026,12 @@ Commentary: |-
     - 4:43 - [[Infinity Mechanism]]
     - 5:06 - [[Ocean Stars Falling]]
     - 5:11 - [[Love You (Feferi's Theme)]]
-    - 5:41 - [[track:ohgodwhat|Ohgodwhat]]
+    - 5:41 - [[Ohgodwhat]]
     - 5:47 - [[Courser]] &amp; [[Dance of Thorns]]
     - 6:15 - [[Unite Synchronization]]
-    - 6:27 - [[track:upward-movement-dave-owns|Upward Movement (Dave Owns)]]
+    - 6:27 - [[Upward Movement (Dave Owns)]]
     - 7:02 - [[Fly]]
-    - 7:13 - [[track:vagabounce|Vagabounce]]
+    - 7:13 - [[Vagabounce]]
     - 7:36 - [[Walk-Stab-Walk (R&E)]] &amp; [[Time on My Side]]
     - 8:57 - [[Cascade (Beta)]]
     - 9:20 - [[Flare]]
@@ -1067,9 +1067,9 @@ Cover Artists:
 Art Tags:
 - John
 Referenced Tracks:
-- track:showtime-original-mix
-- track:doctor
-- track:sburban-jungle
+- Showtime (Original Mix)
+- Doctor
+- Sburban Jungle
 Commentary: |-
     <i>Brenden Cameron:</i>
     Originally titled 'A Heroic Death', this song was my second entry into the Homestuck Fanmusic contest, as well as the second song I've ever released in general.
@@ -1114,7 +1114,7 @@ Art Tags:
 - Rose
 - Horrorterrors
 Referenced Tracks:
-- track:doctor
+- Doctor
 - Doctor Who Theme
 Commentary: |-
     <i>Veritas Unae:</i>
@@ -1151,17 +1151,17 @@ Art Tags:
 - Squarewave
 - Earth
 Referenced Tracks:
-- track:upward-movement-dave-owns
-- track:endless-climb
-- track:showtime-original-mix
+- Upward Movement (Dave Owns)
+- Endless Climb
+- Showtime (Original Mix)
 - Eridan's Theme
-- track:doctor
+- Doctor
 - Sunsetter
 - track:MeGaLoVania
 - Pumpkin Cravings
-- track:beatdown-strider-style
-- track:chorale-for-jaspers
-- track:harlequin
+- Beatdown (Strider Style)
+- Chorale for Jaspers
+- Harlequin
 - Liquid Negrocity
 - Crystalanthemums
 - Ocean Stars
@@ -1202,8 +1202,8 @@ Art Tags:
 - Jade
 - Green Sun
 Referenced Tracks:
-- track:chorale-for-jaspers
-- track:sburban-jungle
+- Chorale for Jaspers
+- Sburban Jungle
 - track:carefree-action
 Commentary: |-
     <i>Willow Ascenzo:</i>
@@ -1244,13 +1244,13 @@ Art Tags:
 - Jade
 - Skaia
 Referenced Tracks:
-- track:sburban-jungle
-- track:showtime-original-mix
-- track:endless-climb
-- track:doctor
-- track:upward-movement-dave-owns
+- Sburban Jungle
+- Showtime (Original Mix)
+- Endless Climb
+- Doctor
+- Upward Movement (Dave Owns)
 - Homestuck Anthem
-- track:dissension-original
+- Dissension (Original)
 Commentary: |-
     <i>Samm Neiland:</i>
     So this was done mostly as a self response to another fan track I did which was a minute or so long music box rendition of Showtime. While pretty, it hardly showcased my abilities as a musician or a producer. So in about the span of the week, I arranged, composed, and produced a traditional string quartet, heavily inspired by cellist and multitrack recording artist, Zoë Keating. All the recording was done with only my viola and my signature production style.
@@ -1326,7 +1326,7 @@ Art Tags:
 - 'cw: blood'
 - 'cw: body horror'
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 Commentary: |-
     <i>David Dycus:</i>
     Red Miles was the first Homestuck song I ever completed, early in 2011. I had just installed a new copy of FL Studio after losing my old copy in a hard drive crash two years earlier. I imemediately threw together about five Homestuck songs in a desperate attempt to get on the music team. Shortly thereafter, I discovered about a thousand other fan musicians like myself (and also LOFAM I), and quietly accepted that I would never, ever be on an official Homestuck album.
@@ -1468,7 +1468,7 @@ Art Tags:
 - Prospit
 - Skaia
 Referenced Tracks:
-- track:ballad-of-awakening
+- Ballad of Awakening
 Commentary: |-
     <i>Fitzwibble:</i>
     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!
@@ -1504,7 +1504,7 @@ Art Tags:
 - John's dad
 - Earth
 Referenced Tracks:
-- track:showtime-original-mix
+- Showtime (Original Mix)
 Commentary: |-
     <i>Svix:</i>
     I created the first verison of my Showtime remix back in September 2009 shortly after I started getting into Homestuck, it seemed to go down well and a few months later I was invited to be part of the official music team.
@@ -1597,10 +1597,10 @@ Art Tags:
 - LoHaC
 - LoFaF
 Referenced Tracks:
-- track:doctor
-- track:dissension-original
-- track:aggrieve
-- track:atomyk-ebonpyre
+- Doctor
+- Dissension (Original)
+- Aggrieve
+- Atomyk Ebonpyre
 Commentary: |-
     <i>Willow Ascenzo:</i>
     When I started "Ave Dei Novi" (a song made just for Land of Fans and Music 2), I fully intended that it would be the biggest, strongest, most well-composed, best Homestuck fan composition I've worked on to date, a sort of capstone of Homestuck fan music. The first Land of Fans and Music had two of my early songs on it, and I felt it was appropriate that I do my best and show how far I'd come in a year for the second album. "Ave Dei Novi" takes its cue, partially, from the bombastic and incredible Gundam Unicorn soundtrack by Sawano Hiroyuki, especially in the orchestra and percussion grooves, which I worked very hard on. I think I'm most proud of the bongo groove breakdown in the middle and the "Atomyk Ebonpyre" section near the end. Those two parts ended up especially fantastic.
@@ -1647,7 +1647,7 @@ Referenced Tracks:
 - track:penumbra-phantasm
 Commentary: |-
     <i>David Dycus:</i>
-    Prophecy was made in February of 2011, a couple of months after I re-installed FL Studio. [[track: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.
+    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.
 ---
 Track: The Dance of Oblivion
 Artists:
@@ -1664,9 +1664,9 @@ Referenced Tracks:
 - At The Price of Oblivion
 - Rex Duodecim Angelus
 - Dance of Thorns
-- track:sburban-jungle
+- Sburban Jungle
 - An Unbreakable Union
-- track:mutiny
+- Mutiny
 Commentary: |-
     <i>Domble:</i>
     The original version of this track had huge problems. I kept the writing mostly the same, only adding little flourishes here and there and improving the overall sound of the piece dramatically. It just sounds nicer now, and that guitar solo part at the end helps add a real finish to the piece while referencing both titular trakcs in a different, significant way.
diff --git a/album/lofam3.yaml b/album/lofam3.yaml
index d52aaee3..4af2425f 100644
--- a/album/lofam3.yaml
+++ b/album/lofam3.yaml
@@ -146,7 +146,7 @@ Cover Artists:
 Art Tags:
 - Dave
 Referenced Tracks:
-- track:upward-movement-dave-owns
+- Upward Movement (Dave Owns)
 Commentary: |-
     <i><b>Brad Griffin:</b></i>
     Ok so no art OR musician commentary for this page.
@@ -212,7 +212,7 @@ Referenced Tracks:
 - track:cumuloseerus
 - Embittered Shore
 - track:final-stand
-- track:dissension-original
+- Dissension (Original)
 - wwretched wwaltz
 - The Paradox Paradigm
 - track:fuchsia-ruler
@@ -251,7 +251,7 @@ Art Tags:
 - Kanaya
 Referenced Tracks:
 - Dance of Thorns
-- track:endless-climb
+- Endless Climb
 Commentary: |-
     <i>Willow Ascenzo:</i>
     Dance of Viridian and Violet is an oldtrack of mine--about two years old! I was surprised anyone remembered it enough to nominate it for Land of Fans and Music 3, but I suppose I should never underestimate people's willingness to dig years back through a fanartist's works. Anyway, like I said, it is very old and absolutely no mastering was used on it whatsoever (I'm scared to actually look at its waveform) since back then I didn't know what mastering was. The song ended up sounding quite beautiful, and I sitll think so today, despite my relative lack of skill.
@@ -298,7 +298,7 @@ Art Tags:
 - Dave
 - LoHaC
 Referenced Tracks:
-- track:atomyk-ebonpyre
+- Atomyk Ebonpyre
 Commentary: |-
     <i>Yan Rodriguez:</i>
     This song came out of strange feelings.
@@ -417,7 +417,7 @@ Cover Artists:
 Art Tags:
 - Karkat
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 Commentary: |-
     <i>Veritas Unae:</i>
     I did htis piece a while back, quite some time ago now. It was a hypothetical theme fro Sgrub in the same vein as Sburban Jungle was. I considered reworking the piece, but everywhere I turned the piece wasn't really getting better, so here it is in all its original Sibelius 6 glory! Imagine this playing as all of the trolls enter the medium for the very first time. Go imagination, go!
@@ -599,7 +599,7 @@ Art Tags:
 - Sawtooth
 Referenced Tracks:
 - Trepidation
-- track:upward-movement-dave-owns
+- Upward Movement (Dave Owns)
 - Negative Aperture
 - Miasmajesty
 Commentary: |-
@@ -794,7 +794,7 @@ Commentary: |-
     <div style="text-align: right"><i>end of disk 1</i></div>
     <i>Niklink:</i>
     A little bit of fandom history: [[flash:338|Dave's Phat Beat Machine]], the actual real thing instead of the static image they replaced it with after Flash died, has four secret buttons with extra music you find after selecting the four corner buttons on the machine. Somewhat unusually, the flash does indeed pull music directly from external sites which have stopped working over the years. By looking into the flash itself you can see the intended music for each button. From left to right:
-    - <a href="http://www.mspaintadventures.com/storyfiles/hs2/00253/mspa_harlequin.mp3">http://www.mspaintadventures.com/storyfiles/hs2/00253/mspa_harlequin.mp3</a><br> [[track:harlequin]]. This one still works, as it links back to MSPA. Reused from the Act 2 walkaround, actually.
+    - <a href="http://www.mspaintadventures.com/storyfiles/hs2/00253/mspa_harlequin.mp3">http://www.mspaintadventures.com/storyfiles/hs2/00253/mspa_harlequin.mp3</a><br> [[Harlequin]]. This one still works, as it links back to MSPA. Reused from the Act 2 walkaround, actually.
     - <a href="http://www.turner.com/planet/mp3/cp_close.mp3">http://www.turner.com/planet/mp3/cp_close.mp3</a> The [[track:captain-planet-and-the-planeteers-end-title|Captain Planet closing credits]]. Visiting this link now redirects you to a redesigned Warner page instead.
     - <a href="http://fozzy42.com/SoundClips/Themes/Movies/Ghostbusters.mp3">http://fozzy42.com/SoundClips/Themes/Movies/Ghostbusters.mp3</a> [[track:ghostbusters|Ghostbusters theme song]] from some random-ass page that no longer exists.
     - <a href="http://pasko.webs.com/foreign/Aerosmith_-_I_Dont_Wanna_Miss_A_Thing.mp3">http://pasko.webs.com/foreign/Aerosmith_-_I_Dont_Wanna_Miss_A_Thing.mp3</a> Same deal as above, but for [[track:i-dont-want-to-miss-a-thing-aerosmith|I Don't Wanna Miss A Thing]] (as an Armageddon reference)... This links actually works! But.. it's playing a different song??
@@ -850,12 +850,12 @@ Art Tags:
 Referenced Tracks:
 - Eden
 - psych0ruins
-- track:doctor
+- Doctor
 - Savior of the Dreaming Dead
-- track:sburban-jungle
+- Sburban Jungle
 - track:growing-up
 - Flare
-- track:showtime-piano-refrain
+- Showtime (Piano Refrain)
 - Heir Conditioning
 - Dawn of Man
 - Cascade (Beta)
@@ -893,11 +893,11 @@ Referenced Tracks:
 - track:moonsetter
 - English
 - Gold Pilot
-- track:nightmare
+- Nightmare
 - Killed by BR8K Spider!!!!!!!!
 - Unite Synchronization
 - Homestuck Anthem
-- track:theme
+- Theme
 - Mother (Piano)
 ---
 Track: Electric Fireflies
@@ -923,8 +923,8 @@ Art Tags:
 - Serenity
 Referenced Tracks:
 - Firefly Cloud
-- track:doctor
-- track:showtime-original-mix
+- Doctor
+- Showtime (Original Mix)
 Commentary: |-
     <i>Thomas Ibarra:</i>
     Many of my recompositions tend to be experiments with lemotiffs, and Electric Fireflies is no exception. While largely focused around the light flicks of piano melody within Firefly Cloud and the song itself by Erik "Jit" Scheele, I found my experiment to take a coures of its own. I tried to follow Jit's carefully integrated elements of Doctor to discover that his method employed a much more flowing and intertwined realization of instrumental melody; this was something I felt tha I did not achieve. I felt refreshing to observe what can only be described as mastery of melody, theme and atmosphere. It was a pleasure to make this piece.
@@ -1104,7 +1104,7 @@ Referenced Tracks:
 - Liquid Negrocity
 - track:MeGaLoVania
 - psych0ruins
-- track:sburban-jungle
+- Sburban Jungle
 - track:penumbra-phantasm
 - track:final-stand
 Commentary: |-
@@ -1476,7 +1476,7 @@ Art Tags:
 - Serenity
 - Ruined Earth
 Referenced Tracks:
-- track:explore
+- Explore
 Commentary: |-
     <i>keyboard cait:</i>
     What even is keygen music? I have no idea, but if it exists, I hope this sounds like it.
@@ -1501,7 +1501,7 @@ Art Tags:
 - Jack Noir
 - LoFaF
 Referenced Tracks:
-- track:ohgodwhat
+- Ohgodwhat
 Commentary: |-
     <i>Kevin Grant:</i>
     So, this was one of my first chiptunes. People seem to like it. However, when I listen to it now, two years later, I realize how little I knew about Famitracker, and music composition in genearl. I like to think I've learned a great deal since Ohgodboss. Still, I guess it's catchy enough as it is. Enjoy!
diff --git a/album/lofam4.yaml b/album/lofam4.yaml
index 9014e185..edddda09 100644
--- a/album/lofam4.yaml
+++ b/album/lofam4.yaml
@@ -100,7 +100,7 @@ Art Tags:
 - Davepeta
 Referenced Tracks:
 - Serenade
-- track:beatdown-strider-style
+- Beatdown (Strider Style)
 Commentary: |-
     <i>Kouta:</i>
     After writing [[Denizen]], my only thought was that I really wanted to keep writing dubstep, but good dubstep. That was when I deicided to reach out to my good friend poly, who I'm a big fan of. Her dubstep is as great as her production skill, so at the time it was the perfect arrangement. It was hard working together long-distance, but we somehow made it work through all-nighter Skype calls and a lot of caffeine. The way our styles differ and yet somehow met in the middle helped make Merge exactly what I hoped it'd be.
@@ -170,8 +170,8 @@ Art Tags:
 - Roxy
 - Skaia
 Referenced Tracks:
-- track:sburban-jungle
-- track:endless-climb
+- Sburban Jungle
+- Endless Climb
 Commentary: |-
     <i>Shandy:</i>
     This song was written to celebrate the reunion of Rose and Roxy in the 4/29/15 Homestuck update! It was so weet and triumphant, so I tried to reflect that in the music. The main melody is structured kinf of like a call-and-response between the two of them.
@@ -567,7 +567,7 @@ Art Tags:
 Referenced Tracks:
 - Black Rose / Green Sun
 - Greensleeves
-- track:endless-climb
+- Endless Climb
 Commentary: |-
     <i>Shandy:</i>
     Some ships may come and go, but Rosemary is forever.
@@ -796,7 +796,7 @@ Art Tags:
 - LoFaF
 Referenced Tracks:
 - Crystamanthequins
-- track:sburban-jungle
+- Sburban Jungle
 - Flare
 Commentary: |-
     <i>Jamie Paige Stanley:</i>
@@ -846,7 +846,7 @@ Art Tags:
 - 'cw: asphyxiation'
 - 'cw: blood'
 Referenced Tracks:
-- track:upward-movement-dave-owns
+- Upward Movement (Dave Owns)
 Commentary: |-
     <i>Kevin Grant:</i>
     This song was made, unsurprisingly, during one of the many Hiatuses that Homestuck had over the years. I wanted to capture the feeling of hopeful waiting combined with the sadness that came with the lack of content.
@@ -872,17 +872,17 @@ Art Tags:
 Referenced Tracks:
 - Homosuck Swan Song
 - Homosuck Anthem
-- track:upward-movement-dave-owns
-- track:beatdown-strider-style
-- track:showtime-original-mix
-- track:sburban-jungle
-- track:theme
-- track:crustacean
+- Upward Movement (Dave Owns)
+- Beatdown (Strider Style)
+- Showtime (Original Mix)
+- Sburban Jungle
+- Theme
+- Crustacean
 - Walls Covered in Blood
 - The Lemonsnout Turnabout
 - Spider's Claw
 - English
-- track:showtime-piano-refrain
+- Showtime (Piano Refrain)
 - Eternity Served Cold
 - track:carne-vale
 - Warhammer of Zillyhoo
@@ -892,16 +892,16 @@ Referenced Tracks:
 - The Paradox Paradigm
 - Purple Bard
 - Swing of the Clock
-- track:doctor
-- track:endless-climb
-- track:atomyk-ebonpyre
+- Doctor
+- Endless Climb
+- Atomyk Ebonpyre
 - track:frost-vol6
 - Homestuck
-- track:dissension-original
+- Dissension (Original)
 - Horschestra
 - Jane's Dragon
 - Cascade (Beta)
-- track:aggrieve
+- Aggrieve
 - Oh Hi There, Lil Cal
 Commentary: |-
     <i>keyboard cait:</i>
@@ -938,17 +938,17 @@ Commentary: |-
     <b>References</b>
     - [[Homosuck Swan Song]] - 0:35-1:04, 3:30-3:59, 4:27-4:42, 5:04-5:12
     - [[Homosuck Anthem]] - 0:50-1:22, 1:31-1:38, 2:07-2:30, 3:09-3:13
-    - [[track:upward-movement-dave-owns|Upward Movement (Dave Owns)]] - 1:39-1:46, 1:55-2:02, 2:33-2:36
-    - [[track:beatdown-strider-style|Beatdown (Strider Style)]] - 1:47-1:54, 5:12-5:19, 5:34-5:49, 5:52-5:56
-    - [[track:showtime-original-mix|Showtime (Original Mix)]] - 1:59-2:06
-    - [[track:sburban-jungle|Sburban Jungle]] - 2:01-2:06
-    - [[track:theme]] - 2:07-2:30
-    - [[track:crustacean|Crustacean]] - 2:15-2:19, 2:31-2:36
+    - [[Upward Movement (Dave Owns)]] - 1:39-1:46, 1:55-2:02, 2:33-2:36
+    - [[Beatdown (Strider Style)]] - 1:47-1:54, 5:12-5:19, 5:34-5:49, 5:52-5:56
+    - [[Showtime (Original Mix)]] - 1:59-2:06
+    - [[Sburban Jungle]] - 2:01-2:06
+    - [[Theme]] - 2:07-2:30
+    - [[Crustacean]] - 2:15-2:19, 2:31-2:36
     - [[Walls Covered in Blood]] - 2:36-2:38
     - [[The Lemonsnout Turnabout]] - 2:38-2:40
     - [[Spider's Claw]] - 2:40-2:42
     - [[English]] - 2:42-2:43, 4:57-5:07, 6:13-6:18
-    - [[track:showtime-piano-refrain|Showtime (Piano Refrain)]] - 2:44-2:55
+    - [[Showtime (Piano Refrain)]] - 2:44-2:55
     - [[Eternity Served Cold]] - 2:48-2:55, 4:27-4:42, 5:49-5:56
     - [[track:carne-vale]] - 2:55-3:05
     - [[Warhammer of Zillyhoo]] - 3:55-3:59
@@ -958,16 +958,16 @@ Commentary: |-
     - [[The Paradox Paradigm]] - 4:31-4:34, 4:46-4:49 - 5:01-5:04
     - [[Purple Bard]] - 4:35-4:38, 5:49-5:56
     - [[Swing of the Clock]] - 4:38-4:42, 4:53-4:56, 5:08-5:12
-    - [[track:doctor|Doctor]] - 4:42-4:46
-    - [[track:endless-climb|Endless Climb]] - 4:46-4:49
-    - [[track:atomyk-ebonpyre|Atomyk Ebonpyre]] - 4:50-4:53
+    - [[Doctor]] - 4:42-4:46
+    - [[Endless Climb]] - 4:46-4:49
+    - [[Atomyk Ebonpyre]] - 4:50-4:53
     - [[track:frost-vol6]] - 4:53-4:57
     - [[Homestuck]] - 4:57-5:12
-    - [[track:dissension-original|Dissension (Original)]] - 5:19-5:26
+    - [[Dissension (Original)]] - 5:19-5:26
     - [[Horschestra]] - 5:27-5:34, 5:49-5:56
     - [[Jane's Dragon]] - 5:30-5:34
     - [[Cascade (Beta)]] - 5:56-5:58
-    - [[track:aggrieve|Aggrieve]] - 5:58-6:07
+    - [[Aggrieve]] - 5:58-6:07
     - [[Oh Hi There, Lil Cal]] - 6:09-6:12
 ---
 Track: Three in the Morning (Ngame's Bowmix) [Explicit]
@@ -1081,7 +1081,7 @@ Lyrics: |-
     (That was the plan, to give you a— seven hundred and twenty— and you got one. Bada-bing, bada-boom, baby!)
 Commentary: |-
     <i>Ngame:</i>
-    For those not in the know, Michael Guy Bowman is one of the most iconic people associated with Homestuck. You may remember him as the composer of [[track:sburban-jungle|Sburban Jungle]], one of the comic's most iconic songs, the angelic voice that captivated your ears in [[How Do I Live (Bunny Back in the Box Version)]], or maybe even as the "face of the fandom" for his famous Homestuck videos and convention appearances.
+    For those not in the know, Michael Guy Bowman is one of the most iconic people associated with Homestuck. You may remember him as the composer of [[Sburban Jungle]], one of the comic's most iconic songs, the angelic voice that captivated your ears in [[How Do I Live (Bunny Back in the Box Version)]], or maybe even as the "face of the fandom" for his famous Homestuck videos and convention appearances.
     What isn't as well-known is that he's also an incredibly hilarious individual with dozens of sketch comedy videos - often featuring his equally sidesplitting friend, Scott Stutzsman - and I wanted to bring these two worlds together. With the release of Volume 10 in June, and the resulting focus on the Homestuck music team, Bowman appreciation had a resurgence in the fandom (especially one particular video, <a href="https://www.youtube.com/watch?v=6cqZlNGBcwA">Bowman's Credit Score</a>). I got caught up in the fervor as well, and made my first foray into music remixing to put together the first iteration of this tribute to Michael Bowman. The remix includes notable quotes or samples from every video that Michael Bowman and Scott Stutzman collaborated on, as well as many of their individual comedy videos.
     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.
 ---
@@ -1101,8 +1101,8 @@ Art Tags:
 - Roxy
 - Cats
 Referenced Tracks:
-- track:aggrieve
-- track:chorale-for-jaspers
+- Aggrieve
+- Chorale for Jaspers
 Commentary: |-
     <i>Noisemaker:</i>
     Initially from call and new 2: locomotif under the name Excess Express, I wanted Schrödinger's Harbinger to be Jasprose-themed to compensate for the lack of tracks in that category, as well as to make some additions to the original trakc.
@@ -1223,7 +1223,7 @@ Art Tags:
 Referenced Tracks:
 - track:old-secret
 - Spider Dance
-- track:atomyk-ebonpyre
+- Atomyk Ebonpyre
 - Derse Dreamers
 Commentary: |-
     <i>Elanor Pam:</i>
@@ -1266,7 +1266,7 @@ Art Tags:
 - Green Sun
 Referenced Tracks:
 - Amen, Brother
-- track:upward-movement-dave-owns
+- Upward Movement (Dave Owns)
 - Nepeta's Theme
 Commentary: |-
     <i><b>Kal-la-kal-la:</b></i>
@@ -1356,11 +1356,11 @@ Art Tags:
 Referenced Tracks:
 - Liquid Negrocity
 - Amen, Brother
-- track:upward-movement-dave-owns
+- Upward Movement (Dave Owns)
 - Double Midnight
 - track:im-a-member-of-the-midnight-crew
-- track:showtime-original-mix
-- track:beatdown-strider-style
+- Showtime (Original Mix)
+- Beatdown (Strider Style)
 - Freefall
 - Terezi's Theme
 - Unite Synchronization
@@ -1429,11 +1429,11 @@ Art Tags:
 - CD
 - HB
 Referenced Tracks:
-- track:showtime-piano-refrain
-- track:verdancy-bassline
-- track:chorale-for-jaspers
+- Showtime (Piano Refrain)
+- Verdancy (Bassline)
+- Chorale for Jaspers
 - Tall, Dark and Loathsome
-- track:ballad-of-awakening
+- Ballad of Awakening
 - Versus
 - Skaian Summoning
 - Tangled Waltz
@@ -1482,11 +1482,11 @@ Commentary: |-
     I think it makes a statement, and that statement is, "I've been playing too much Persona 5", or perhaps "I hate drawing musical isntruments"
     <hr>
     <b>References:</b>
-    - Homestuck Vol. 1 - [[track:showtime-piano-refrain|Showtime (Piano Refrain)]] - 00:00-00:37
-    - Homestuck Vol. 2 - [[track:verdancy-bassline|Verdancy (Bassline)]] - 00:53-01:01
-    - Homestuck Vol. 3 - [[track:chorale-for-jaspers|Chorale for Jaspers]] - 01:01-01:17
+    - Homestuck Vol. 1 - [[Showtime (Piano Refrain)]] - 00:00-00:37
+    - Homestuck Vol. 2 - [[Verdancy (Bassline)]] - 00:53-01:01
+    - Homestuck Vol. 3 - [[Chorale for Jaspers]] - 01:01-01:17
     - Midnight Crew: Drawing Dead - [[Tall, Dark and Loathsome]] - 01:17-01:49
-    - Homestuck Vol. 4 - [[track:ballad-of-awakening|Ballad of Awakening]] - 01:25-01:49
+    - Homestuck Vol. 4 - [[Ballad of Awakening]] - 01:25-01:49
     - Homestuck Vol. 5 - [[Versus]] - 01:41-02:05
     - Alternia - [[Skaian Summoning]] - 02:06-02:55
     - Squiddles! - [[Tangled Waltz]] - 02:23-02:55
@@ -1541,8 +1541,8 @@ Art Tags:
 - Dave
 - LoHaC
 Referenced Tracks:
-- track:endless-climb
-- track:atomyk-ebonpyre
+- Endless Climb
+- Atomyk Ebonpyre
 Commentary: |-
     <i>Marcy Nabors:</i>
     This song represents a lot of firsts for me. My first piece of Homestuck fan music, my first time composing for an ensemble of orchestral instruments, and the uh... second song I ever wrote in a digital audio workstation. I read Homestuck in a feverish marathon in the Fall of 2010 while taking a class about playing in a rock band and recording music (my high school was very cool). Around that time, I'd also been sequencing MIDI files in Anvil Studio (a program which was also the genesis of Bowman's MIDI experience), and had only recently discovered that Logic also had MIDI sequencing capabilities. After falling madly in love with the Homestuck soundtrack, I had an epiphany to the tune of "holy shit, I know how to make stuff like that!" and Atomyk Clockwyrk was thus the result. I've come a long way since then, but it's a testament to the quality of Logic Pro's stock library that I managed to make it sound this good with minimal knowledge of production. A little volume automation, slap a limiter on top (not even Logic's wonderful Adaptive Limiter? Come ON, 16-year old Marcy...), and blam, what you're hearing today is a time capsule of what I put together in December of 2010.
@@ -1582,7 +1582,7 @@ Art Tags:
 - Jane
 - Prospit
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 Commentary: |-
     <i>keyboard cait:</i>
     This is by far my oldest song on the album, having been created only a couple of months after LOFAM 2's release. The image of the Alpha Kids talking out their problems on cold stone slabs, in the middle of a hollow moon's core, really stuck with me. I set out to make a theme that would convey the melancholy, expansive atmosphere of that scene. The long pauses give off a sense of unsureness, while the echoing background noises bring us back to the chaos currently happening on the planet surface.
@@ -1609,7 +1609,7 @@ Art Tags:
 Referenced Tracks:
 - Even in Death
 - Another Jungle
-- track:beatdown-strider-style
+- Beatdown (Strider Style)
 - Unite Synchronization
 - Pumpkin Party in Sea Hitler's Water Apocalypse
 - Sunsetter
@@ -1704,9 +1704,9 @@ Art Tags:
 - Dave
 - LoWaS
 Referenced Tracks:
-- track:beatdown-strider-style
-- track:doctor
-- track:sburban-jungle
+- Beatdown (Strider Style)
+- Doctor
+- Sburban Jungle
 Commentary: |-
     <i>Cerulean:</i>
     I wanted to combine several things I learned while at college but the only way I knew how was to mash together 3 of my most favourite songs together, Doctor Beatdown and Jungle.
@@ -1880,8 +1880,8 @@ Art Tags:
 - SBaHJ
 - LoTaK
 Referenced Tracks:
-- track:sburban-jungle
-- track:atomyk-ebonpyre
+- Sburban Jungle
+- Atomyk Ebonpyre
 Commentary: |-
     <i>Shandy:</i>
     A track to celebrate the Striders finally talking and hashing out their differences! Because it's a Stirders song, I couldn't help adding a little breakdown. Sharp-eared listeners may also note that in the call-and-response main melody, the first synth is in 4/4 time and the second synth is in triplets—just as Dave and Dirk aren't quite in perfect lockstep. I left the ending open ended and hopeful, because I feel like the final chapter on their relationship has yet to be written.
@@ -1901,12 +1901,12 @@ Art Tags:
 - Green Sun
 Referenced Tracks:
 - The Beginning of Something Really Excellent
-- track:sburban-jungle
-- track:skies-of-skaia
+- Sburban Jungle
+- Skies of Skaia
 - Dawn of Man
-- track:doctor
-- track:endless-climb
-- track:atomyk-ebonpyre
+- Doctor
+- Endless Climb
+- Atomyk Ebonpyre
 - track:frost-vol6
 - Cascade (Beta)
 - Infinity Mechanism
@@ -1925,12 +1925,12 @@ Commentary: |-
     <hr>
     <b>References:</b>
     - [[The Beginning of Something Really Excellent]] - 0:00-0:42, 4:00-4:20, 4:32-4:42
-    - [[track:sburban-jungle|Sburban Jungle]] - 0:43-1:34, 4:21-4:54
-    - [[track:skies-of-skaia|Skies of Skaia]] - 1:19-1:38
+    - [[Sburban Jungle]] - 0:43-1:34, 4:21-4:54
+    - [[Skies of Skaia]] - 1:19-1:38
     - [[Dawn of Man]] - 1:38-2:47
-    - [[track:doctor|Doctor]] - 2:06-2:09
-    - [[track:endless-climb|Endless Climb]] - 2:09-2:12
-    - [[track:atomyk-ebonpyre|Atomyk Ebonpyre]] - 2:13-2:16
+    - [[Doctor]] - 2:06-2:09
+    - [[Endless Climb]] - 2:09-2:12
+    - [[Atomyk Ebonpyre]] - 2:13-2:16
     - [[track:frost-vol6|Frost]] - 2:16-2:23
     - [[Cascade (Beta)]] - 2:23-2:27
     - [[Infinity Mechanism]] - 2:27-2:29
@@ -1962,7 +1962,7 @@ Art Tags:
 - 'cw: blood'
 Referenced Tracks:
 - Black Rose / Green Sun
-- track:showtime-original-mix
+- Showtime (Original Mix)
 - English
 - Homestuck Anthem
 Commentary: |-
@@ -2109,7 +2109,7 @@ Referenced Tracks:
 - track:formation
 - Skaia Voyages
 - Cascade (Beta)
-- track:sburban-jungle
+- Sburban Jungle
 - Another Jungle
 - Celestial Fantasia
 - Homestuck Anthem
@@ -2131,7 +2131,7 @@ Cover Artists:
 Art Tags:
 - Dave
 Referenced Tracks:
-- track:beatdown-strider-style
+- Beatdown (Strider Style)
 Commentary: |-
     <i>Whimsy:</i>
     I'd been trying to make a Strider theme for quite some time, when this idea struck me: What if instead of writing a Strider theme, I wrote THREE STRIDER THEMES? And then shoehorn in a variant of Beatdown because why not.
@@ -2197,7 +2197,7 @@ Referenced Tracks:
 - track:of-gods-and-witches
 - Science Blaster
 - track:formation
-- track:sburban-jungle
+- Sburban Jungle
 Commentary: |-
     <i>ostrichlittledungeon:</i>
     This is the song on LOFAM 4 that I'm most proud of, and was the most fun to make. Yes, it's Gold Pilot. Yes there are like seven other songs on LOFAM 4 that use Gold Pilot. But I do think I did a lot with it, and this piece showcases a bunch of different things. It starts with pretty standard Gold Pilot, and then slowly grows into the subversion that is the Gunshow 2 Theme, followed by a drop. Then there's a section inspired by Of Gods and Witches, then whatever the fuck happens at 1:42. Bring back the Gold Pilot with a new beat, and then end with Formation. Dumb weird fadeout that I definitely could've improved somehow but I was lazy. I wrote -Omega- Timeline with the Game Over timeline in mind—the dark feel and the choirs peppered throughout reflect the devastation to the A2 session, the Of Gods and Witches section is somewhat of a tribute to... dead kids? And the next section is a tribute to... uh, the happiness that's gone? I don't know, come up with some meaning there yourself. Most of this piece was me going for a specific feel rather than a specific meaning. Also, the dashes in the name are more for my own amusement than anything. -ω-
@@ -2356,8 +2356,8 @@ Referenced Tracks:
 - Bilious
 - Earthsea Borealis
 - English
-- track:umbral-ultimatum
-- track:endless-climb
+- Umbral Ultimatum
+- Endless Climb
 - Even in Death
 Commentary: |-
     <i>Interrobang:</i>
@@ -2442,8 +2442,8 @@ Art Tags:
 - The Felt
 Referenced Tracks:
 - Purple Bard
-- track:sburban-jungle
-- track:explore
+- Sburban Jungle
+- Explore
 - English
 - Eternity Served Cold
 Commentary: |-
@@ -2507,9 +2507,9 @@ Art Tags:
 - Roxy
 - Dream Bubbles
 Referenced Tracks:
-- track:sburban-jungle
-- track:doctor
-- track:endless-climb
+- Sburban Jungle
+- Doctor
+- Endless Climb
 - Even in Death
 Commentary: |-
     <i>Joe Ouellet:</i>
@@ -2562,7 +2562,7 @@ Art Tags:
 - Skaia
 Referenced Tracks:
 - Black Rose / Green Sun
-- track:chorale-for-jaspers
+- Chorale for Jaspers
 - Courser
 - Black Hole / Green Sun
 Commentary: |-
@@ -2729,11 +2729,11 @@ Referenced Tracks:
 - Menu (Full)
 - Sleeping Terror
 - Homestuck Anthem
-- track:upward-movement-dave-owns
+- Upward Movement (Dave Owns)
 - Calamari Inkantation
 - Feel (Alive)
 - Hopes and Dreams
-- track:theme
+- Theme
 - September Pumpkin
 - Theme of Eastern Story
 - Magical Hopalong Cassidy Station
@@ -2761,11 +2761,11 @@ Commentary: |-
     - [[Menu (Full)]] - 2:16-2:35
     - [[Sleeping Terror]] - 2:22-2:35
     - [[Homestuck Anthem]] - 2:29-2:35
-    - [[track:upward-movement-dave-owns|Upward Movement (Dave Owns)]] - 2:35-2:38
+    - [[Upward Movement (Dave Owns)]] - 2:35-2:38
     - [[Calamari Inkantation]] - 2:39-2:48
     - [[Feel (Alive)]] - 2:49-2:51
     - [[Hopes and Dreams]] - 2:52-2:55, 2:59-3:02
-    - [[track:theme]] - 2:55-2:58
+    - [[Theme]] - 2:55-2:58
     - [[September Pumpkin]] - 3:02-3:05
     - [[Theme of Eastern Story]] - 3:05-3:27
     - [[Magical Hopalong Cassidy Station]] - 3:18-3:29
@@ -2801,7 +2801,7 @@ Art Tags:
 - CD
 - HB
 Referenced Tracks:
-- track:black
+- Black
 Commentary: |-
     <i>Sean Gorter:</i>
     The base idea for this song's groove came about in late 2011 when I noticed the repeated piano riff was just an E-flat blues scale Radiation messed with, and I started laying it over a Latin-style chord rhythm and liked what I heard. I thought to myself, "this must be what it sonds like when the Midnight Crew just jams", and before I knew it I had a remix idea in my head. Something I've always loved about the original mix I did, poorly executed as it was, was how it took an idea we know to be so dark within the Homestuck universe and turned it into a light, relaxing, foot-tapping piece, something the Crew might have done in happier times.
@@ -2850,9 +2850,9 @@ Commentary: |-
     <img src="media/misc/nights-revisit-rewind.png" width="435">
     <hr>
     <b>References:</b>
-    - [[track:doctor|Doctor]] - 0:07-0:29, 1:30-2:18, 2:26-2:48
+    - [[Doctor]] - 0:07-0:29, 1:30-2:18, 2:26-2:48
     - [[Cascade (Beta)]] - 0:15-0:44
-    - [[track:sburban-jungle|Sburban Jungle]] - 0:16-0:42, 3:06-3:17, 3:42-3:50
+    - [[Sburban Jungle]] - 0:16-0:42, 3:06-3:17, 3:42-3:50
     - [[Tick]] - 0:45-0:59
     - [[Fruity Pebbles Jingle]] - 0:45-1:14
     - [[Potato Knishes]] - 1:00-1:14
@@ -2861,14 +2861,14 @@ Commentary: |-
     - [[track:penumbra-phantasm]] - 1:34-2:03
     - [[Even in Death]] - 2:03-2:18
     - [[Space Jam]] - 2:03-2:18
-    - [[track:chorale-for-jaspers|Chorale for Jaspers]] - 2:03-2:10
+    - [[Chorale for Jaspers]] - 2:03-2:10
     - [[At The Price of Oblivion]] - 2:11-2:14
     - [[Contra]] - 2:18-2:48
     - [[track:MeGaLoVania|MeGaLoVania]] - 2:50-3:05
     - [[Moshi Moshi?]] - 2:50-3:05
     - [[track:unintentional-touhou]] - 3:05-3:20
     - [[CONTACT]] - 3:20-3:50
-    - [[track:upward-movement-dave-owns|Upward Movement (Dave Owns)]] - 3:35-3:50
+    - [[Upward Movement (Dave Owns)]] - 3:35-3:50
     - [[track:formation]] - 3:50-4:20
     - [[track:jungle-3]] - 4:13-4:20, 4:28-4:35
     - [[Muse of Nanchos]] - 4:20-4:35
@@ -2944,15 +2944,15 @@ Art Tags:
 - LoHaC
 - LoFaF
 Referenced Tracks:
-- track:skies-of-skaia
-- track:aggrieve
-- track:showtime-original-mix
+- Skies of Skaia
+- Aggrieve
+- Showtime (Original Mix)
 - Gardener
-- track:upward-movement-dave-owns
-- track:beatdown-strider-style
+- Upward Movement (Dave Owns)
+- Beatdown (Strider Style)
 - Even in Death
 - Homestuck Anthem
-- track:sburban-jungle
+- Sburban Jungle
 Lyrics: >-
     (I will rise, I will go so far and)<br>(I will rise, I will go so far and)<br>(I
     will rise, I will go so far and)<br>(I will rise, I will go so far and)<br>Even
diff --git a/album/lofam5.yaml b/album/lofam5.yaml
index cadbbf3d..575526b4 100644
--- a/album/lofam5.yaml
+++ b/album/lofam5.yaml
@@ -57,10 +57,10 @@ Art Tags:
 - Rose
 - Skaia
 Referenced Tracks:
-- track:skies-of-skaia
+- Skies of Skaia
 Commentary: |-
     <i>Warxtron:</i>
-    A Skaia song originally made for Haeldral's Felt Mansion 2. One of the two final Homestuck songs I made. I wanted it to sound pretty but epic like Skaia itself but without using the same [[track:skies-of-skaia|Skies of Skaia]] leitmotif as always.
+    A Skaia song originally made for Haeldral's Felt Mansion 2. One of the two final Homestuck songs I made. I wanted it to sound pretty but epic like Skaia itself but without using the same [[Skies of Skaia]] leitmotif as always.
     <i>Circlejourney:</i>
     Skaia has such pretty colours, I wanted to capture that.
 ---
@@ -94,10 +94,10 @@ Cover Artists:
 Art Tags:
 - Dave's bro
 Referenced Tracks:
-- track:beatdown-strider-style
+- Beatdown (Strider Style)
 - Cascade (Beta)
 - vs bros
-- track:sburban-jungle
+- Sburban Jungle
 Sampled Tracks:
 - Tony Hawk's Pro Skater 2
 - uh oh
@@ -210,8 +210,8 @@ Art Tags:
 - Cats
 Referenced Tracks:
 - track:penumbra-phantasm
-- track:doctor
-- track:heir-of-grief
+- Doctor
+- Heir of Grief
 - Moshi Moshi?
 Commentary: |-
     <i>FrostyMac:</i>
@@ -297,7 +297,7 @@ Art Tags:
 - John
 - LoWaS
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 Commentary: |-
     <i>FrostyMac:</i>
     This song was made up on the spot note-by-note, but I think it turned out well.
@@ -387,10 +387,10 @@ Art Tags:
 - Doc Scratch
 - Kanaya
 Referenced Tracks:
-- track:aggrieve
+- Aggrieve
 Commentary: |-
     <i>cookiefonster:</i>
-    Another song from the [[group:canmt|Cool and New Music Team]], this time for their final album: cool and new volume 3. I pretty much barfed [[track:aggrieve]] onto Famitracker, changed some chords here and there, and that's that. I think it came out pretty good.
+    Another song from the [[group:canmt|Cool and New Music Team]], this time for their final album: cool and new volume 3. I pretty much barfed [[Aggrieve]] onto Famitracker, changed some chords here and there, and that's that. I think it came out pretty good.
     <i>Gryotharian:</i>
     Upon Makin's suggestion, someone needed to make the art for this Rose pondering her orb. And that someone was me. I like to think she does this regularly. Has a special room in her house just for Orb Pondering. And Kanaya just has to deal with it.
 ---
@@ -407,13 +407,13 @@ Art Tags:
 - Dave
 - Derse
 Referenced Tracks:
-- track:atomyk-ebonpyre
+- Atomyk Ebonpyre
 - It Looks Back
 Commentary: |-
     <i>Scorpyus:</i>
-    I did my best to capture the dreamy feeling of the moons with the slightly sinister undertones. Originally started out as [[Prospit Dreamers|"Prospit Dreamer"]] funnily enough, but then I added the [[track:atomyk-ebonpyre]] motif and I decided it might fit better as just a track for both the moons.
+    I did my best to capture the dreamy feeling of the moons with the slightly sinister undertones. Originally started out as [[Prospit Dreamers|"Prospit Dreamer"]] funnily enough, but then I added the [[Atomyk Ebonpyre]] motif and I decided it might fit better as just a track for both the moons.
     <i>Gryotharian:</i>
-    I originally had very different art in mind for this track, but every time I heard it, it made me think of someone falling through the center of Derse. The use of the [[track:atomyk-ebonpyre]] motif decided that that person would be Dave, and while it didn't really end up being the center of the planet, I feel like I captured the vibe well enough.
+    I originally had very different art in mind for this track, but every time I heard it, it made me think of someone falling through the center of Derse. The use of the [[Atomyk Ebonpyre]] motif decided that that person would be Dave, and while it didn't really end up being the center of the planet, I feel like I captured the vibe well enough.
 ---
 Track: F∞ クライミング『CLIMBING』
 Artists:
@@ -428,10 +428,10 @@ Art Tags:
 - LoLaR
 Referenced Tracks:
 - track:climbing-to-infinity
-- track:endless-climb
+- Endless Climb
 Commentary: |-
     <i>Makin:</i>
-    This track originates from CANWAVE 3, a vaporwave album for the [[group:canmt|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.
+    This track originates from CANWAVE 3, a vaporwave album for the [[group:canmt|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 [[Endless Climb]] by [[artist:buzinkai]]. Rest in peace.
 ---
 Track: Pipe Dream
 Artists:
@@ -503,7 +503,7 @@ Art Tags:
 - Jack Noir
 - 'cw: blood'
 Referenced Tracks:
-- track:black
+- Black
 Commentary: |-
     <i>Makin:</i>
     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.
@@ -540,12 +540,12 @@ Art Tags:
 - Derse
 Referenced Tracks:
 - Switchback
-- track:upward-movement-dave-owns
+- Upward Movement (Dave Owns)
 - Core of Darkness
 - Ace of Trump
 - track:frost-vol6
 - At The Price of Oblivion
-- track:endless-climb
+- Endless Climb
 Commentary: |-
     <i>Monckat:</i>
     A track vaguely themed around Dave, Rose, Derse, and the lovely eldritch horrors next door. For the most part it emerged from wanting to remix some lesser-utilized themes such as [[Switchback]], [[Ace of Trump]], and [[At The Price of Oblivion]]
@@ -564,8 +564,8 @@ Art Tags:
 - WV
 - Ruined Earth
 Referenced Tracks:
-- track:upward-movement-dave-owns
-- track:endless-climb
+- Upward Movement (Dave Owns)
+- Endless Climb
 Commentary: |-
     <i>Shwan:</i>
     I made this during a recent re-reading of Homestuck and the upward drumbeat was really catchy and a bop and I wanted to make something with it. (Hey, maybe WV finds Dave's turntables and Rose's violin)
@@ -664,10 +664,10 @@ Cover Artists:
 Art Tags:
 - Karkat
 Referenced Tracks:
-- track:crustacean
+- Crustacean
 Commentary: |-
     <i>Makin:</i>
-    Damn did you know this track references "[[track:crustacean]]" by [[group:toby-fox|Toby "Radiation" Fox]]???
+    Damn did you know this track references "[[Crustacean]]" by [[group:toby-fox|Toby "Radiation" Fox]]???
 ---
 Track: ALIVE
 Artists:
@@ -811,7 +811,7 @@ Art Tags:
 - Skaia
 Referenced Tracks:
 - Rex Duodecim Angelus
-- track:black
+- Black
 Commentary: |-
     <i>Makin:</i>
     Artisticpolo is a legendary remixer, hailing from the very beginnings of the Homestuck fanmusic scene. Tracking him down proved to be one of the best decisions we could have made. Stay tuned for [[track:time-running-by|another track]] of his in this album!
@@ -894,7 +894,7 @@ Art Tags:
 Referenced Tracks:
 - The Thirteenth Hour
 - Double Midnight
-- track:beatdown-strider-style
+- Beatdown (Strider Style)
 - Sunsetter
 - English
 - track:penumbra-phantasm
@@ -903,7 +903,7 @@ Sampled Tracks:
 Lyrics: Home with the milk in the mo-o-o-o-o-o-
 Commentary: |-
     <i>Monckat:</i>
-    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.
+    The mixture of Jack Noir and Lord English/cherub themes, alongside the [[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.
 ---
 Track: Viridescent Flare
 Artists:
@@ -1012,14 +1012,14 @@ Art Tags:
 - LoTaK
 Referenced Tracks:
 - Austin, Atlantis
-- track:endless-climb
+- Endless Climb
 - Unite Synchronization
 - track:eclipse-svert
 - No More Elders
 - Sweet Dreams, Timaeus
 Commentary: |-
     <i>Gryotharian:</i>
-    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.
+    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 [[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.
 ---
 Track: Strain
 Artists:
@@ -1165,7 +1165,7 @@ Art Tags:
 Referenced Tracks:
 - English
 - Eternity Served Cold
-- track:sburban-jungle
+- Sburban Jungle
 - An Unbreakable Union
 - track:carne-vale
 - track:MeGaLoVania
@@ -1228,7 +1228,7 @@ Referenced Tracks:
 - track:heir-of-grief-sax-cover-youtube
 Commentary: |-
     <i>Monckat:</i>
-    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 [[track:heir-of-grief|Heir of Grief]], right? Yeah me too, thought it was a perfect fit.
+    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.
 ---
 Track: Collapse Reprise
 Artists:
@@ -1270,7 +1270,7 @@ Art Tags:
 - Dream Bubbles
 Referenced Tracks:
 - English
-- track:upward-movement-dave-owns
+- Upward Movement (Dave Owns)
 - Ruins (With Strings)
 - Do You Remem8er Me
 Commentary: |-
@@ -1354,9 +1354,9 @@ Art Tags:
 - LoFaF
 - Consorts
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 Sampled Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 Commentary: |-
     <i>$C4RL3TT:</i>
     In order to really progress much further I think they'd have to start a new sburb session in Homestuck^2. So I thought I'd try to make a theme for that.
@@ -1397,7 +1397,7 @@ Cover Artists:
 Art Tags:
 - Derse
 Referenced Tracks:
-- track:black
+- Black
 Commentary: |-
     <i>Monckat:</i>
     Some minimalist 3D art, vaguely inspired by the sort of 90s cgi stuff you see on youtube compilations of jungle/d&b music.
@@ -1522,10 +1522,10 @@ Cover Artists:
 Art Tags:
 - John
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 Commentary: |-
     <i>WHATISLOSTINTHEMINES:</i>
-    This track was made for Homestuck's 10 year anniversary back in 2019, in the span of about an hour. [[track:sburban-jungle]] always felt to me like the "core" of Homestuck's extremely varied soundtrack, so I always wanted to do a take on it in some form. This didn't end up very similar to the original song, and I wasn't intending it to sound so melancholy, but neither is a bad thing.
+    This track was made for Homestuck's 10 year anniversary back in 2019, in the span of about an hour. [[Sburban Jungle]] always felt to me like the "core" of Homestuck's extremely varied soundtrack, so I always wanted to do a take on it in some form. This didn't end up very similar to the original song, and I wasn't intending it to sound so melancholy, but neither is a bad thing.
     <span style="color:#288857">matthiuss1988:</span> these music will make you shit hard!!!
 ---
 Track: All Alone (Redux)
@@ -1560,8 +1560,8 @@ Cover Artists:
 Art Tags:
 - Dave
 Referenced Tracks:
-- track:upward-movement-dave-owns
-- track:beatdown-strider-style
+- Upward Movement (Dave Owns)
+- Beatdown (Strider Style)
 - Sunsetter
 Commentary: |-
     <i>Makin:</i>
@@ -1649,7 +1649,7 @@ Lyrics: |-
     [S]ynchronize, it's all our hearts still sounding
     [S]ynchronize, infinite hope abounding
 
-    [[track:showtime-original-mix|Showtime!]]
+    [[Showtime (Original Mix)|Showtime!]]
 
     [S]ynchronize, with every breath resounding
     [S]ynchronize, we'll see the light astounding
@@ -1664,7 +1664,7 @@ Lyrics: |-
     Come with me and we'll [[Ascend]]
     Solving puzzles universal
     In our [[Sburban Reversal]]
-    All these [[track:ruins]] we [[track:explore]]
+    All these [[track:ruins]] we [[Explore]]
     Could it be there's something more?
     Pester me, I'm not alone
     I'm just stuck inside my home
@@ -1690,7 +1690,7 @@ Art Tags:
 Referenced Tracks:
 - track:moonsetter
 - Despot
-- track:upward-movement-dave-owns
+- Upward Movement (Dave Owns)
 Commentary: |-
     <i>Monckat:</i>
     Features a sort of on-a-whim redesign of the Theseus to be closer to the sorts of spaceship designs I usually draw. Admittedly though, most of the spaceship designs I draw aren't smashing through gigantic versions of Dirk's shades so I maybe don't have a leg to stand on there.
@@ -1752,7 +1752,7 @@ Referenced Tracks:
 - Crystalanthemums
 - Crystalanthology
 - Crystamanthequins
-- track:sburban-jungle
+- Sburban Jungle
 - Crystalmethequins
 Commentary: |-
     <i>Monckat:</i>
@@ -1845,7 +1845,7 @@ Art Tags:
 - LoFaM
 Referenced Tracks:
 - Homestuck Anthem
-- track:theme
+- Theme
 Commentary: |-
     <i>Gryotharian:</i>
     Decided if this was going to be the last LOFAM album, it needed a good closing track. Not a full huge song (that honor definitely goes to and belongs to [[track:ophiuchus-full-suite-lofam5|Ophiuchus]]), just like a short little thing, the last few notes for the fandom, to wrap everything up. I think I went for a more hopeful tone, that maybe this won't be the end for homestuck's era on the internet. Maybe in another 4 years there'll be another album. Personally, I doubt it, I think the song I made is more hopeful than I am. But who knows.
diff --git a/album/lofam5a2.yaml b/album/lofam5a2.yaml
index 2c080114..22d94795 100644
--- a/album/lofam5a2.yaml
+++ b/album/lofam5a2.yaml
@@ -209,7 +209,7 @@ Art Tags:
 - LoWaS
 Referenced Tracks:
 - track:firefly
-- track:doctor
+- Doctor
 Commentary: |-
     <i>Rainy:</i>
     The impetus for this remix was to give an underrated homestuck that I love track it’s due. “Firefly” is easily one of [[artist:buzinkai|Buzinkai’s]] best solo compositions; it conveying this beautiful feeling of ethereal whimsy and majesty. For this remix I tried to maintain feeling while adding cinematic elements to give it a bigger sense of scope. I took a lot of inspiration from the [[group:deconrecon|Vast Error]] song “A Story about Being Free” especially when incorporating acoustic guitar.
@@ -249,7 +249,7 @@ Art Tags:
 - Vriska
 Referenced Tracks:
 - Savior of the Waking World
-- track:doctor
+- Doctor
 Commentary: |-
     <i>Fender_Jess:</i>
     So Vriskafic8ion is a track Ash wrote inspired by the fanfiction "<a href="https://archiveofourown.org/series/1475819">godfeels</a>", wherein John becomes June with an assist from her own personal brain ghost Vriska. Basically, June is all of John's power and free spirit, combined with Vriska's determination, neverending drive and penchant for (over-re)action. She's a chaotic whirlwind of violence and action and willpower and volatility, all with Vriska there, in spirit, hand on her shoulder. Godfeels is one of my all-time favorite fanworks, and seeing this track appear on LOFAM was an absolute delight, so I wanted to give it a visual punch to go along with the energy of the music. The piece itself is just a few vignettes of important moments plus a Cool Action Shot of June to tie it all together. As simple as the concept is, I'm really happy with how it came out; this is definitely the most ambitious thing I've ever drawn, hahah 
@@ -398,7 +398,7 @@ Cover Artists:
 Art Tags:
 - WV
 Referenced Tracks:
-- track:vagabounce
+- Vagabounce
 Commentary: |-
     <i>David Ko:</i>
     It's always fun to come back to an old favorite. Adapting "Vagabounce" to the FamiTracker soundscape was a fun personal challenge.
@@ -418,8 +418,8 @@ Cover Artists:
 Art Tags:
 - Gate
 Referenced Tracks:
-- track:sburban-countdown
-- track:sburban-jungle
+- Sburban Countdown
+- Sburban Jungle
 Sampled Tracks:
 - Lil' Allen's Keygen sample pack
 Commentary: |-
@@ -552,7 +552,7 @@ URLs:
 Cover Artists:
 - electricwestern
 Referenced Tracks:
-- track:showtime-original-mix
+- Showtime (Original Mix)
 - Concerning Hobbits
 - track:the-council-of-elrond
 Commentary: |-
@@ -694,8 +694,8 @@ Art Tags:
 - Tavros
 - John
 Referenced Tracks:
-- track:sburban-jungle
-- track:umbral-ultimatum
+- Sburban Jungle
+- Umbral Ultimatum
 - The Lemonsnout Turnabout
 - Liquid Negrocity
 - Descend
@@ -876,7 +876,7 @@ Referenced Tracks:
 - track:home
 - Another Jungle
 - Lies With The Sea (Beta)
-- track:sburban-jungle
+- Sburban Jungle
 - Dinosaur Pill
 - Embittered Shore
 Sampled Tracks:
@@ -1168,7 +1168,7 @@ Cover Artists:
 Art Tags:
 - Karkat
 Referenced Tracks:
-- track:crustacean
+- Crustacean
 - risen
 Commentary: |-
     <i>Gryotharian:</i>
@@ -1496,9 +1496,9 @@ Art Tags:
 - Jane
 - Skaia
 Referenced Tracks:
-- track:sburban-jungle
-- track:showtime-piano-refrain
-- track:crustacean
+- Sburban Jungle
+- Showtime (Piano Refrain)
+- Crustacean
 - i guess
 Commentary: |-
     <i>casualclassical:</i>
@@ -1526,7 +1526,7 @@ Art Tags:
 - Prospit
 - Sonic
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 Commentary: |-
     <i>Pax Probliscum:</i>
     I had stumbled across a bunch of electronic noise samples and immediately thought of robots playing Sburb, so I made this entry theme based on it!
@@ -1546,7 +1546,7 @@ Cover Artists:
 Art Tags:
 - John
 Referenced Tracks:
-- track:showtime-piano-refrain
+- Showtime (Piano Refrain)
 Commentary: |-
     <i>Not Eno:</i>
     I got this idea after going through another Synth classical kick! I was specifically listening to the orignal switched on bach and the tomita versions of Clair De lune and [[track:pictures-at-an-exhibition-promenade|Promanade]]. The whole of this cover minus the mellotron choirs and One track of Solina string ensemble was recorded with a Mini moog live (no VST for the majority of those tracks) with me touching various knobs for expression. I think it meets a happy medium between wendy carlos' dry and exact sound design and Tomitas Reverby complex panning sounds.
@@ -1605,7 +1605,7 @@ Art Tags:
 Referenced Tracks:
 - Skaianet
 - Checkmate
-- track:vagabounce
+- Vagabounce
 - Can Town
 - Years in the Future
 Commentary: |-
@@ -1921,17 +1921,17 @@ Art Tags:
 - LoLaR
 - LoWaS
 Referenced Tracks:
-- track:skies-of-skaia
-- track:explore
-- track:dissension-original
-- track:dissension-remix
-- track:showtime-original-mix
-- track:aggrieve
-- track:beatdown-strider-style
-- track:doctor
+- Skies of Skaia
+- Explore
+- Dissension (Original)
+- Dissension (Remix)
+- Showtime (Original Mix)
+- Aggrieve
+- Beatdown (Strider Style)
+- Doctor
 - track:penumbra-phantasm
 - Homestuck Title Screen
-- track:sburban-jungle
+- Sburban Jungle
 Commentary: |-
     <i>Cosmoptera:</i>
     Full disclosure here: I did not intend for this song to be 9 minutes and 46 of god's own seconds long. But once I developed all my ideas to where I was satisfied with them I was already at 6 minutes, so really there was nothing else I could do at that point. To accomplish this I used the technique of thinking really hard about what theme would sound soooo cool to come after whatever phrase I was working on, and then acting on the first instinctive answer I came up with. It seemed to work pretty well in this case so the technique gets my recommendation.
@@ -1964,10 +1964,10 @@ Art Tags:
 - Karkat
 - Meteor
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 - Homestuck
 Sampled Tracks:
-- track:upward-movement-dave-owns
+- Upward Movement (Dave Owns)
 Lyrics: |-
     They'll spend three years waiting on that meteor
     We'll take three years to cross this yellow yard
@@ -2059,7 +2059,7 @@ Cover Artists:
 Art Tags:
 - Jack Noir
 Referenced Tracks:
-- track:the-ballad-of-jack-noir
+- The Ballad of Jack Noir
 Commentary: |-
     <i>Jebb:</i>
     I got the idea for this track after watching S2E3 of Helluva Boss and thinking that making a track with a mafia aesthetic would be a cool idea. Also, around that time I heard Two Planets Approach the Roche Limit and was amazed at how many different parts and elements it had working perfectly in unison, and making a chaotic jazz-ish track was a great opportunity to try and replicate something like that.
@@ -2086,7 +2086,7 @@ Art Tags:
 - Hadron Kaleido
 Referenced Tracks:
 - Beta Version
-- track:sburban-jungle
+- Sburban Jungle
 - Michael Bowman Remix
 Sampled Tracks:
 - Michael Bowman Remix
@@ -2193,7 +2193,7 @@ Referenced Tracks:
 - Liquid Negrocity
 - track:megalovania-undertale
 - track:sunslammer
-- track:explore
+- Explore
 Sampled Tracks:
 - didnt find the undertale sound effect from the commentary unless its the soundfont
 Commentary: |-
@@ -2218,7 +2218,7 @@ Art Tags:
 - Rose
 - Meteor
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 Lyrics: |-
     All these familiar faces
     Even in a world that is new
@@ -2617,7 +2617,7 @@ URLs:
 Cover Artists:
 - Kett
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 - Dawn of Man
 - Cascade (Beta)
 Commentary: |-
@@ -2662,7 +2662,7 @@ Art Tags:
 - Prospit
 Referenced Tracks:
 - Three in the Morning
-- track:the-ballad-of-jack-noir
+- The Ballad of Jack Noir
 - Double Midnight
 - Litrichean Rioghail
 - track:how-do-i-live
@@ -2686,8 +2686,8 @@ Referenced Tracks:
 - track:collision-course-davepetas-movement
 - '#BrooklynBloodPop!'
 - Terezi Owns
-- track:upward-movement-dave-owns
-- track:beatdown-strider-style
+- Upward Movement (Dave Owns)
+- Beatdown (Strider Style)
 Commentary: |-
     <i>Wr3ck0rdz:</i>
     "Otherwise that’s it I think, I don’t have much to say about the track." (LOL)
@@ -2715,8 +2715,8 @@ Art Tags:
 - LoFaF
 - Battlefield
 Referenced Tracks:
-- track:sburban-jungle
-- track:showtime-piano-refrain
+- Sburban Jungle
+- Showtime (Piano Refrain)
 Commentary: |-
     <i>LudicrousFalcon:</i>
     I like to think that this song captures the overall vibe of a Sburb session, and the journey of its players reaching toward the goal of creating a new universe while ascending to the god tiers. Not super dark or gritty, but not a easy breeze in the park either. The Adventurous Ascent through Sburb mirrors the ascent through life itself, and the many challenges it brings. This track was originally going to be on an upcoming album for my fanadventure (and it'll probably still be on there despite also being on LOFAM); when I saw submissions open for LOFAM 5.2, I decided to submit some tracks, and Adventurous Ascent was the one that got approved. This is my first track to appear on a LOFAM album, and I'm very happy to see that it made it on!
@@ -2786,8 +2786,8 @@ Art Tags:
 - Alternia
 Referenced Tracks:
 - Aya and Serenata
-- track:sburban-jungle
-- track:beatdown-strider-style
+- Sburban Jungle
+- Beatdown (Strider Style)
 - Serenade
 - Thanks for Playing
 - Three's a Crowd
@@ -2814,18 +2814,18 @@ Art Tags:
 - LoHaC
 Referenced Tracks:
 - Versus
-- track:beatdown-strider-style
-- track:atomyk-ebonpyre
+- Beatdown (Strider Style)
+- Atomyk Ebonpyre
 - Candles and Clockwork
 - Unite Synchronization
-- track:upward-movement-dave-owns
+- Upward Movement (Dave Owns)
 - track:liquid-negrocity
-- track:umbral-ultimatum
-- track:doctor
-- track:endless-climb
+- Umbral Ultimatum
+- Doctor
+- Endless Climb
 - Flare
 - Cascade (Beta)
-- track:sburban-jungle
+- Sburban Jungle
 - Savior of the Dreaming Dead
 Commentary: |-
     <i>yuuDii:</i>
@@ -2948,9 +2948,9 @@ Art Tags:
 - Dave
 Referenced Tracks:
 - Clockstopper
-- track:beatdown-strider-style
-- track:atomyk-ebonpyre
-- track:upward-movement-dave-owns
+- Beatdown (Strider Style)
+- Atomyk Ebonpyre
+- Upward Movement (Dave Owns)
 Commentary: |-
     <i>pixelseph:</i> (& paradiddlesjosh)
     “Clockstopper” from [[album:coloUrs-and-mayhem-universe-b|coloUrs & mayhem Universe B]], but it's from 2023 and Dave needed to destroy every single clock in Sburb. No one asked for more Castlevania/Megaman/Otacore vibes on this track, but we brought it anyway. Enjoy your New Game+.
@@ -3007,7 +3007,7 @@ Art Tags:
 Referenced Tracks:
 - track:penumbra-phantasm
 - Pseudumbra Phauxtasm
-- track:doctor
+- Doctor
 Sampled Tracks:
 - Typheus
 Commentary: |-
@@ -3321,4 +3321,4 @@ Lyrics: |-
     (The craters are all rounded off. There's quite a few of them, some of them are newer. Many of them look like - especially the round ones - look like hit by meteorites or projectiles of some sort.)
 Commentary: |-
     <i>Makin:</i>
-    I’d just like to interject for a moment. What you’re refering to as Stuck, is in fact, Home / Stuck, or as I’ve recently taken to calling it, Home plus Stuck. Stuck is not a song upon itself, but rather another movement of a fully produced track made useful by the Home corelyrics, themes and vital leitmotifs comprising a full submission as defined by [[group:unofficial-mspa-fans|UMSPAF]].
\ No newline at end of file
+    I’d just like to interject for a moment. What you’re refering to as Stuck, is in fact, Home / Stuck, or as I’ve recently taken to calling it, Home plus Stuck. Stuck is not a song upon itself, but rather another movement of a fully produced track made useful by the Home corelyrics, themes and vital leitmotifs comprising a full submission as defined by [[group:unofficial-mspa-fans|UMSPAF]].
diff --git a/album/median.yaml b/album/median.yaml
index c9395b49..54f41310 100644
--- a/album/median.yaml
+++ b/album/median.yaml
@@ -54,7 +54,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/ruses-2
 - https://youtu.be/uyDEpdMEgDw
 Referenced Tracks:
-- track:harlequin
+- Harlequin
 ---
 Track: Darknes
 Cover Artists:
@@ -72,4 +72,4 @@ Cover Artists:
 Duration: '04:48'
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/froges
-- https://youtu.be/zWKo0Czb8W4
\ No newline at end of file
+- https://youtu.be/zWKo0Czb8W4
diff --git a/album/medium.yaml b/album/medium.yaml
index e8b458d8..c9ff47ca 100644
--- a/album/medium.yaml
+++ b/album/medium.yaml
@@ -53,7 +53,7 @@ URLs:
 - https://homestuck.bandcamp.com/track/rain-2
 - https://youtu.be/WWSphawicMY
 Referenced Tracks:
-- track:skies-of-skaia
+- Skies of Skaia
 ---
 Track: Frogs
 Duration: '5:06'
diff --git a/album/midnight-crew-drawing-dead.yaml b/album/midnight-crew-drawing-dead.yaml
index 2fed6501..cae67b1d 100644
--- a/album/midnight-crew-drawing-dead.yaml
+++ b/album/midnight-crew-drawing-dead.yaml
@@ -86,7 +86,7 @@ URLs:
 - https://homestuck.bandcamp.com/track/blue-noir-2
 - https://youtu.be/YvMyo3opDOY
 Referenced Tracks:
-- track:vagabounce
+- Vagabounce
 ---
 Track: Dead Shuffle
 Artists:
@@ -335,7 +335,7 @@ URLs:
 - https://homestuck.bandcamp.com/track/jokers-wild-2
 - https://youtu.be/MDaWJUfxFCM
 Referenced Tracks:
-- track:harlequin
+- Harlequin
 Commentary: |-
     <i>Mark J. 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.
diff --git a/album/mobius-trip-and-hadron-kaleido.yaml b/album/mobius-trip-and-hadron-kaleido.yaml
index 8a157af8..8a4a0c4a 100644
--- a/album/mobius-trip-and-hadron-kaleido.yaml
+++ b/album/mobius-trip-and-hadron-kaleido.yaml
@@ -71,7 +71,7 @@ URLs:
 - https://youtu.be/Fyib6VCDA2s
 - https://open.spotify.com/track/6WjbErpN3Q2VvydajTKSCp
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 Sheet Music Files:
 - Title: Chords by Kal-la-kal-la
   Files:
@@ -211,4 +211,4 @@ URLs:
 Art Tags:
 - Mobius Trip
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
diff --git a/album/moons-of-theseus.yaml b/album/moons-of-theseus.yaml
index 72f8eb5d..394e5ba2 100644
--- a/album/moons-of-theseus.yaml
+++ b/album/moons-of-theseus.yaml
@@ -54,7 +54,7 @@ Art Tags:
 Referenced Tracks:
 - Forever
 - Dawn of Man
-- track:sburban-jungle
+- Sburban Jungle
 - The Return
 - Violet and Gold
 Sampled Tracks:
@@ -137,7 +137,7 @@ Art Tags:
 - Skaia
 - 'cw: blood'
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 - Lies With The Sea
 - Polyominoes
 - Airwaves
@@ -226,7 +226,7 @@ Art Tags:
 - Prospit
 Referenced Tracks:
 - Ithaca
-- track:sburban-jungle
+- Sburban Jungle
 Lyrics: |-
     I spent the best years of my life waiting<br>For this moment<br>A time to call my own, a place to call my homeland
     It's come here far too soon<br>I sit around my room<br>Hatching my plans and schemes I mostly leave forgotten
@@ -254,7 +254,7 @@ Cover Artists:
 - Kodar
 Referenced Tracks:
 - The New Window
-- track:sburban-jungle
+- Sburban Jungle
 - The Deeper You Go
 - Got It?
 Commentary: |-
@@ -277,7 +277,7 @@ Art Tags:
 - Derse
 Referenced Tracks:
 - The Deeper You Go
-- track:sburban-jungle
+- Sburban Jungle
 - Beta Version
 - Chain Of Prospit
 - Fly
@@ -393,7 +393,7 @@ Referenced Tracks:
 - Derse Dreamers
 - Chain Of Prospit
 - Dawn of Man
-- track:sburban-jungle
+- Sburban Jungle
 - Forever
 - Beta Version
 - Fly
diff --git a/album/more-homestuck-fandom.yaml b/album/more-homestuck-fandom.yaml
index e551c4bb..d6a8dd59 100644
--- a/album/more-homestuck-fandom.yaml
+++ b/album/more-homestuck-fandom.yaml
@@ -165,8 +165,8 @@ Duration: '2:12'
 URLs:
 - https://www.youtube.com/watch?v=qaMjpWYqvME
 Referenced Tracks:
-- track:beatdown-strider-style
-- track:sburban-jungle
+- Beatdown (Strider Style)
+- Sburban Jungle
 ---
 Track: Daywalker ~Rise~
 Directory: daywalker-rise-contest
@@ -279,7 +279,7 @@ URLs:
 Referenced Tracks:
 - Rex Duodecim Angelus
 - Cascade (Beta)
-- track:dissension-original
+- Dissension (Original)
 ---
 Track: Flow
 Artists:
@@ -308,8 +308,8 @@ Referenced Tracks:
 - You're So Rad
 - Unite Synchronization
 - Homestuck Anthem
-- track:showtime-original-mix
-- track:doctor
+- Showtime (Original Mix)
+- Doctor
 ---
 Track: haunt
 Artists:
@@ -413,7 +413,7 @@ Duration: '4:48'
 URLs:
 - https://youtu.be/Y3eQgdzvBfQ
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 Lyrics: |-
     Lonely submarine in murky shades of blue and green
     A silent knock on Davy Jones' door
@@ -468,6 +468,7 @@ URLs:
 ---
 Track: Mother
 Directory: mother-malcolm-brown
+Always Reference By Directory: true
 Artists:
 - Malcolm Brown
 Duration: '2:09'
@@ -475,8 +476,8 @@ URLs:
 - https://youtu.be/4AILbcNRy-k?t=2086
 Referenced Tracks:
 - Black Rose / Green Sun
-- track:aggrieve
-- track:harlequin
+- Aggrieve
+- Harlequin
 ---
 Track: Mutiny (crapapella)
 Artists:
@@ -485,7 +486,7 @@ Duration: '0:43'
 URLs:
 - https://www.youtube.com/watch?v=N3BJsvKM6DY
 Referenced Tracks:
-- track:mutiny
+- Mutiny
 Lyrics: |-
     I LOVE YOU DOGGY
 ---
@@ -512,7 +513,7 @@ Duration: 0:59
 URLs:
 - https://youtu.be/HNdCAUpmXws
 Referenced Tracks:
-- track:doctor
+- Doctor
 MIDI Project Files:
 - Title: MIDI by IronInvoker47
   Files:
@@ -605,9 +606,9 @@ Duration: '1:12'
 URLs:
 - https://hsmusic.wiki/media/misc/archive/Skaia%20Voyages.mp3
 Referenced Tracks:
-- track:sburban-jungle
-- track:showtime-piano-refrain
-- track:skies-of-skaia
+- Sburban Jungle
+- Showtime (Piano Refrain)
+- Skies of Skaia
 ---
 Track: Skaian Shuffle
 Artists:
@@ -657,6 +658,7 @@ Lyrics: |-
 ---
 Track: The Ballad of Jack Noir
 Directory: the-ballad-of-jack-noir-original
+Always Reference By Directory: true
 Artists:
 - Toby Fox
 Duration: '2:47'
@@ -768,7 +770,7 @@ Duration: '2:12'
 URLs:
 - https://www.youtube.com/watch?v=9y5c-6-11eU
 Referenced Tracks:
-- track:crustacean
+- Crustacean
 ---
 Section: Other fanmusic
 ---
@@ -1046,12 +1048,12 @@ Duration: '3:57'
 URLs:
 - https://www.youtube.com/watch?v=4bQvjdx8cbo
 Referenced Tracks:
-- track:heir-of-grief
+- Heir of Grief
 Commentary: |-
     <i>subversiveasset:</i>
     (<a href="https://www.youtube.com/watch?v=4bQvjdx8cbo">Music video!</a>)
 
-    As we near the end of Homestuck, please listen to this cover of [[artist:tensei|Joren "Tensei" de Bruin's]] "[[track:heir-of-grief|Heir of Grief]]" on saxophone.
+    As we near the end of Homestuck, please listen to this cover of [[artist:tensei|Joren "Tensei" de Bruin's]] "[[Heir of Grief]]" on saxophone.
 
     Since its beginning on April 13, 2009, Homestuck has accumulated over 8000 pages and 800,000 words and numerous characters. With End of Act 6's flash [S] Collide, the final act has begun. It's hard to believe that on April 13, 2016, the entire journey will be over. 
 
@@ -1074,7 +1076,7 @@ Duration: '8:28'
 URLs:
 - https://www.youtube.com/watch?v=N_kGx5RikYA
 Referenced Tracks:
-- track:skies-of-skaia
+- Skies of Skaia
 ---
 Track: I Am An Island
 Artists:
@@ -1303,7 +1305,7 @@ Artists:
 Referenced Tracks:
 - Flare
 - Homestuck Anthem
-- track:explore
+- Explore
 ---
 Track: Malediction
 Artists:
@@ -1546,7 +1548,7 @@ Duration: '2:45'
 URLs:
 - https://www.youtube.com/watch?v=x6NrArPldZo
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 ---
 Section: From the Cool and New Music Team
 ---
@@ -1572,7 +1574,7 @@ Duration: 0:30
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/doctors-ringtone-no-sfx
 Referenced Tracks:
-- track:doctor
+- Doctor
 ---
 Track: Durst
 Artists:
@@ -1595,9 +1597,9 @@ URLs:
 Referenced Tracks:
 - RollerCoaster Tycoon Theme
 - track:penumbra-phantasm
-- track:doctor
+- Doctor
 - First Contact
-- track:harlequin
+- Harlequin
 ---
 Track: Higher
 Artists:
@@ -1606,8 +1608,8 @@ Duration: '1:54'
 URLs:
 - https://www.youtube.com/watch?v=6hrtEsTfnuU?&t=185
 Referenced Tracks:
-- track:skies-of-skaia
-- track:endless-climb
+- Skies of Skaia
+- Endless Climb
 - Land of Quartz and Melody
 ---
 Track: its time
@@ -1624,9 +1626,9 @@ Duration: '2:47'
 URLs:
 - https://www.youtube.com/watch?v=vRRpWt87LS8?&t=340
 Referenced Tracks:
-- track:harlequin
+- Harlequin
 - RollerCoaster Tycoon Theme
-- track:showtime-piano-refrain
+- Showtime (Piano Refrain)
 ---
 Track: saoidfisd
 Artists:
@@ -1926,7 +1928,7 @@ Duration: '4:35'
 URLs:
 - https://www.youtube.com/watch?v=mLwwOH0qy9o
 Referenced Tracks:
-- track:doctor
+- Doctor
 ---
 Section: From Ophiuchus (Full Suite)
 ---
@@ -1989,4 +1991,4 @@ URLs:
 - https://soundcloud.com/user-98942170/ophiuchus-final-part-spirals-including-illusions-of-freedom
 Commentary: |-
     <i>Warxtron:</i>
-    And so finally, Ophiuchus is finished. I've been working on it since march, and now this 28 minute long prog rock homestuck epic is done. I had a lot of fun writing all this parts, although it's been quite hard sometimes. You can expect more prog rock songs like these in the future. Thank you all for listening.
\ No newline at end of file
+    And so finally, Ophiuchus is finished. I've been working on it since march, and now this 28 minute long prog rock homestuck epic is done. I had a lot of fun writing all this parts, although it's been quite hard sometimes. You can expect more prog rock songs like these in the future. Thank you all for listening.
diff --git a/album/oceanfables-ray-of-light.yaml b/album/oceanfables-ray-of-light.yaml
index 2af32968..82ee39be 100644
--- a/album/oceanfables-ray-of-light.yaml
+++ b/album/oceanfables-ray-of-light.yaml
@@ -46,10 +46,10 @@ Duration: '02:15'
 URLs:
 - https://nightslights.bandcamp.com/track/snow-increasing
 Referenced Tracks:
-- track:upward-movement-dave-owns
+- Upward Movement (Dave Owns)
 - Field of Hopes and Dreams
 Sampled Tracks:
-- track:upward-movement-dave-owns
+- Upward Movement (Dave Owns)
 ---
 Track: Chiptune
 Duration: '01:07'
diff --git a/album/of-troles-and-chiptumes.yaml b/album/of-troles-and-chiptumes.yaml
index a1158ddf..223d914d 100644
--- a/album/of-troles-and-chiptumes.yaml
+++ b/album/of-troles-and-chiptumes.yaml
@@ -151,7 +151,7 @@ Art Tags:
 Referenced Tracks:
 - Long Night Ahead 
 - 'BL1ND JUST1C3 : 1NV3ST1G4T1ON !!'
-- track:under-the-hat
+- Under The Hat
 - Teal Seer
 ---
 Track: Madame Controversielle
@@ -230,7 +230,7 @@ Referenced Tracks:
 - Eridan's Theme
 - Violet Prince
 - Nautical Nightmare
-- track:sburban-jungle
+- Sburban Jungle
 - Keepers
 ---
 Track: The Heiress Without a Role
@@ -289,12 +289,12 @@ Referenced Tracks:
 - 'My Little Pony: Friendship is Magic Theme'
 - Karkat's Theme
 - track:archagent-everlasting
-- track:atomyk-ebonpyre
+- Atomyk Ebonpyre
 - Terezi's Theme
 - justice must be a serve
 - RollerCoaster Tycoon Theme
 - Dance of Thorns
-- track:harlequin
+- Harlequin
 - track:miracles-icp
 - Where making this hapen
 - Courser
diff --git a/album/one-year-older.yaml b/album/one-year-older.yaml
index f8990baf..011ba686 100644
--- a/album/one-year-older.yaml
+++ b/album/one-year-older.yaml
@@ -107,7 +107,7 @@ Art Tags:
 - John
 - LoWaS
 Referenced Tracks:
-- track:doctor
+- Doctor
 Commentary: |-
     <i>Eric Scheele:</i>
     So after a quick burst of events and some luck, John finds himself in LOWAS, the Land of Wind and Shade. Everything's dark, except for the stars above, but as we found out, they were really fireflies trapped in the clouds. This was one of the concepts I latched onto rather hard with this piece, the mass of sparkling and blinking above John as he traipsed about. I've been lucky enough to live in a more rural area for most of my life, and being able to watch the stars was always great, so I could only ever imagine what LOWAS's clouds looked like.
@@ -324,7 +324,7 @@ Art Tags:
 - Green Sun
 - 'cw: blood'
 Referenced Tracks:
-- track:showtime-original-mix
+- Showtime (Original Mix)
 - Cascade (Beta)
 - Rex Duodecim Angelus
 Commentary: |-
@@ -354,7 +354,7 @@ Art Tags:
 - LoHaC
 Referenced Tracks:
 - Mother (Piano)
-- track:skies-of-skaia
+- Skies of Skaia
 Sheet Music Files:
 - Title: Piano score by Erik Scheele (original composer)
   Files:
@@ -448,7 +448,7 @@ MIDI Project Files:
   - 'Mother (Piano) - i300.mid'
 Commentary: |-
     <i>Erik Scheele:</i>
-    This is the original recording that [[track:mother]] came from, made years back when I thought the only way to avoid clipping while recording was to play the softest I possibly could. I stressed out for ages to get it sounding just right, too, and after two years or however long it's been, it's still not perfect but it's pretty close.
+    This is the original recording that [[Mother]] came from, made years back when I thought the only way to avoid clipping while recording was to play the softest I possibly could. I stressed out for ages to get it sounding just right, too, and after two years or however long it's been, it's still not perfect but it's pretty close.
     If you've been reading this along with the tracks, then this means you've reached the end. You can either put the entire album on repeat and let it loop back to the beginning, or you can stop it here if you'd like. But in any case this means you're done reading this pdf for now, so I'll say goodbye now.
     And of course, thanks for listening to this album, and supporting both me and the comic in whatever way you have.
 ---
diff --git a/album/p-s.yaml b/album/p-s.yaml
index 1a8485ce..a1d34c12 100644
--- a/album/p-s.yaml
+++ b/album/p-s.yaml
@@ -96,7 +96,7 @@ Duration: '3:08'
 URLs:
 - https://casualsunday.bandcamp.com/track/bro-hop
 Referenced Tracks:
-- track:aggrieve-violin-refrain
+- Aggrieve (Violin Refrain)
 ---
 Track: Wily Espionage
 Artists:
@@ -112,11 +112,11 @@ Duration: '4:44'
 URLs:
 - https://casualsunday.bandcamp.com/track/apexhalation
 Referenced Tracks:
-- track:ballad-of-awakening
+- Ballad of Awakening
 - Lifdoff
 - Ham And Steak
-- track:doctor
-- track:showtime-original-mix
+- Doctor
+- Showtime (Original Mix)
 Commentary: |-
     <i>Malcolm Brown:</i>
     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)
@@ -136,7 +136,7 @@ Duration: '3:16'
 URLs:
 - https://casualsunday.bandcamp.com/track/sburban-metro
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 - Rosanna
 ---
 Track: Skaianet 2.0
@@ -188,7 +188,7 @@ Duration: '2:25'
 URLs:
 - https://casualsunday.bandcamp.com/track/we-shall-not-cease-from-exploration
 Referenced Tracks:
-- track:explore
+- Explore
 ---
 Track: The New Crew
 Artists:
@@ -204,7 +204,7 @@ Duration: '3:33'
 URLs:
 - https://casualsunday.bandcamp.com/track/heir-of-grief-8-bit
 Referenced Tracks:
-- track:heir-of-grief
+- Heir of Grief
 ---
 Track: '[S]ynchronise'
 Artists:
@@ -215,7 +215,7 @@ URLs:
 Referenced Tracks:
 - Unite Synchronization
 - Lifdoff
-- track:doctor
+- Doctor
 Lyrics: |-
     I'm still wondering,<br>Where to go now,<br>We have seen the highest peak but there was nothing there, no truth, and how<br>I'm wandering,<br>Through all these places,<br>Lands of Little Cubes & Tea, of Wind and Shade, these null spaces.
     I've stared at the stars, how they shine verdant dreams,<br>I've looked through the void, seen it crack at the seams,<br>I fought every challenge, these Devils and Gods,<br>They won't know what hit them!
@@ -266,7 +266,7 @@ Referenced Tracks:
 - English
 - Black Hole / Green Sun
 - track:glide
-- track:sburban-jungle
+- Sburban Jungle
 - track:ruins
 - track:penumbra-phantasm
 ---
@@ -277,25 +277,25 @@ Duration: '4:36'
 URLs:
 - https://casualsunday.bandcamp.com/track/a-farewell-to-arms
 Referenced Tracks:
-- track:skies-of-skaia
+- Skies of Skaia
 - Homestuck Anthem
-- track:theme
+- Theme
 - Crystalanthemums
 - The Beginning of Something Really Excellent
 - Eden
 - Courser
 - Infinity Mechanism
-- track:sburban-jungle
+- Sburban Jungle
 - Another Jungle
 - track:frost-vol6
 - Heir Conditioning
-- track:endless-climb
-- track:dissension-original
-- track:beatdown-strider-style
-- track:ohgodwhat
+- Endless Climb
+- Dissension (Original)
+- Beatdown (Strider Style)
+- Ohgodwhat
 - Sarabande
-- track:ballad-of-awakening
-- track:upward-movement-dave-owns
+- Ballad of Awakening
+- Upward Movement (Dave Owns)
 ---
 Track: Moving On
 Artists:
diff --git a/album/perfectly-generic-album.yaml b/album/perfectly-generic-album.yaml
index 625a2a4d..ce6124b2 100644
--- a/album/perfectly-generic-album.yaml
+++ b/album/perfectly-generic-album.yaml
@@ -54,7 +54,7 @@ URLs:
 - https://cristata.bandcamp.com/track/healing-june
 - https://www.youtube.com/watch?v=xZtfOpp-0jo
 Referenced Tracks:
-- track:doctor
+- Doctor
 ---
 Track: Moondancer
 Duration: '6:01'
@@ -161,7 +161,7 @@ URLs:
 - https://cristata.bandcamp.com/track/welcome-to-your-new-suburban-reality
 - https://www.youtube.com/watch?v=_3NstB6oouo
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 Commentary: |-
     <i>Cristata:</i>
     Acts 1-3 were really good, actually.
diff --git a/album/play-the-rain.yaml b/album/play-the-rain.yaml
index 5f86de5a..4025177a 100644
--- a/album/play-the-rain.yaml
+++ b/album/play-the-rain.yaml
@@ -23,7 +23,7 @@ URLs:
 - https://larkmordancy.bandcamp.com/track/sburban-genesis
 Referenced Tracks:
 - Dawn of Man
-- track:sburban-jungle
+- Sburban Jungle
 - Exodus
 ---
 Track: '720413'
@@ -33,7 +33,7 @@ Duration: '03:18'
 URLs:
 - https://larkmordancy.bandcamp.com/track/720413
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 - '69423'
 ---
 Track: Wanderer's Vigil
@@ -43,7 +43,7 @@ Duration: '02:57'
 URLs:
 - https://larkmordancy.bandcamp.com/track/wanderers-vigil-2
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 - Skaian Skirmish
 Commentary:
     <i>Lark Mordancy:</i>
@@ -85,7 +85,7 @@ Duration: '04:03'
 URLs:
 - https://larkmordancy.bandcamp.com/track/batrachian-biogeny
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 ---
 Track: Too L8
 Artists:
@@ -94,10 +94,10 @@ Duration: '02:52'
 URLs:
 - https://larkmordancy.bandcamp.com/track/too-l8
 Referenced Tracks:
-- track:doctor
+- Doctor
 - Spider's Claw
 - track:MeGaLoVania
-- track:sburban-jungle
+- Sburban Jungle
 - Homestuck Anthem
 - 'BL1ND JUST1C3 : 1NV3ST1G4T1ON !!'
 ---
@@ -108,7 +108,7 @@ Duration: '02:53'
 URLs:
 - https://larkmordancy.bandcamp.com/track/stalemate-2
 Referenced Tracks:
-- track:sburban-jungle
-- track:black
-- track:explore
+- Sburban Jungle
+- Black
+- Explore
 - Flare
diff --git a/album/portalstuck-vol-1.yaml b/album/portalstuck-vol-1.yaml
index 7bc47478..52193557 100644
--- a/album/portalstuck-vol-1.yaml
+++ b/album/portalstuck-vol-1.yaml
@@ -19,6 +19,7 @@ Commentary: |-
 ---
 Track: Awakening
 Directory: awakening-portalstuck
+Always Reference By Directory: true
 Duration: 0:27
 URLs:
 - https://portalstuck.bandcamp.com/track/awakening
@@ -40,7 +41,7 @@ URLs:
 - https://www.youtube.com/watch?v=Ry-PUhs4kxk
 Referenced Tracks:
 - Reconstructing More Science
-- track:sburban-jungle
+- Sburban Jungle
 ---
 Track: Smell The Ashes
 Duration: '1:11'
@@ -74,7 +75,7 @@ URLs:
 - https://portalstuck.bandcamp.com/track/facades-begone
 - https://www.youtube.com/watch?v=yccS1M3-bts
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 - Even in Death
 ---
 Track: Invincible
diff --git a/album/prospit-and-derse.yaml b/album/prospit-and-derse.yaml
index b88fcc1f..b503c3fe 100644
--- a/album/prospit-and-derse.yaml
+++ b/album/prospit-and-derse.yaml
@@ -114,7 +114,7 @@ Art Tags:
 Referenced Tracks:
 - track:penumbra-phantasm
 - track:frost-vol6
-- track:doctor
+- Doctor
 Commentary: |-
     <i>Solatrus:</i>
     <i>(original commentary)</i>
@@ -227,8 +227,8 @@ Art Tags:
 - Dave
 - Derse
 Referenced Tracks:
-- track:atomyk-ebonpyre
-- track:endless-climb
+- Atomyk Ebonpyre
+- Endless Climb
 Sheet Music Files:
 - Title: Sheet music by adamus
   Files:
diff --git a/album/references-beyond-homestuck.yaml b/album/references-beyond-homestuck.yaml
index 164a4e3f..31315283 100644
--- a/album/references-beyond-homestuck.yaml
+++ b/album/references-beyond-homestuck.yaml
@@ -1179,6 +1179,7 @@ Track: Awakening
 # Reference:
 #   https://nigoro.bandcamp.com/album/la-mulana-original-sound-track-complete
 Directory: awakening-la-mulana
+Always Reference By Directory: true
 Artists:
 - La-Mulana
 - Houryu Samejima
@@ -5277,6 +5278,7 @@ URLs:
 ---
 Track: I Don't Want to Miss a Thing
 Directory: i-dont-want-to-miss-a-thing-aerosmith
+Always Reference By Directory: true
 Artists:
 - Armageddon
 - Diane Warren
diff --git a/album/reprise.yaml b/album/reprise.yaml
index 5e19d552..d0ff55c5 100644
--- a/album/reprise.yaml
+++ b/album/reprise.yaml
@@ -57,7 +57,7 @@ URLs:
 - https://luminantaegis.bandcamp.com/track/reprise-for-the-fallen
 Referenced Tracks:
 - Homestuck Anthem
-- track:chorale-for-jaspers
+- Chorale for Jaspers
 ---
 Track: A New World
 Directory: a-new-world-reprise
@@ -65,4 +65,4 @@ Duration: '1:49'
 URLs:
 - https://luminantaegis.bandcamp.com/track/bonus-a-new-world
 Referenced Tracks:
-- track:a-new-world
\ No newline at end of file
+- track:a-new-world
diff --git a/album/retcon-2018.yaml b/album/retcon-2018.yaml
index 4ad1513e..15e305ee 100644
--- a/album/retcon-2018.yaml
+++ b/album/retcon-2018.yaml
@@ -34,7 +34,7 @@ Duration: '03:38'
 URLs:
 - https://8-bitshit.bandcamp.com/track/time
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 ---
 Track: '-'
 Directory: descend-retcon
@@ -49,14 +49,14 @@ Duration: '03:37'
 URLs:
 - https://8-bitshit.bandcamp.com/track/space
 Referenced Tracks:
-- track:umbral-ultimatum
+- Umbral Ultimatum
 ---
 Track: Interlude I
 Duration: '01:12'
 URLs:
 - https://8-bitshit.bandcamp.com/track/interlude-i
 Referenced Tracks:
-- track:explore
+- Explore
 ---
 Track: Regicide
 Duration: '06:45'
diff --git a/album/s-collide.yaml b/album/s-collide.yaml
index 95508917..055eea33 100644
--- a/album/s-collide.yaml
+++ b/album/s-collide.yaml
@@ -66,9 +66,9 @@ URLs:
 Referenced Tracks:
 - Ham And Steak
 - Cascade (Beta)
-- track:doctor
+- Doctor
 - Crystalanthemums
-- track:crustacean
+- Crustacean
 - Liquid Negrocity
 MIDI Project Files:
 - Title: MIDI by TirantBacon
@@ -107,6 +107,7 @@ Referenced Tracks:
 ---
 Track: Heir of Grief
 Directory: heir-of-grief-collide
+Always Reference By Directory: true
 Artists:
 - Tensei
 Contributors:
@@ -122,7 +123,7 @@ URLs:
 - https://homestuck.bandcamp.com/track/heir-of-grief-2
 - https://youtu.be/Es5mh7pBeec
 Referenced Tracks:
-- track:heir-of-grief
+- Heir of Grief
 - Typheus
 Sheet Music Files:
 - Title: Guitar tabs by EuniverseCat
diff --git a/album/s-hecka-jef.yaml b/album/s-hecka-jef.yaml
index b898c15e..c9583389 100644
--- a/album/s-hecka-jef.yaml
+++ b/album/s-hecka-jef.yaml
@@ -159,7 +159,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/guilty-of-being-jhon
 - https://youtu.be/cCbaZpxHgMU
 Referenced Tracks:
-- track:atomyk-ebonpyre
+- Atomyk Ebonpyre
 Commentary: |- 
     <i>413:</i> (Composer)
     <img src="media/misc/but-nobody-came.png" width="258">
diff --git a/album/s-press-play.yaml b/album/s-press-play.yaml
index b344445d..b104b7e5 100644
--- a/album/s-press-play.yaml
+++ b/album/s-press-play.yaml
@@ -170,8 +170,9 @@ URLs:
 Referenced Tracks:
 - Title (The Legend of Zelda)
 ---
-Track:  Planet Healer
+Track: Planet Healer
 Directory: planet-healer-press-play
+Always Reference By Directory: true
 Artists:
 - awsomfaic
 Cover Artists:
diff --git a/album/sburb-ost.yaml b/album/sburb-ost.yaml
index 80c75e52..c74f7ba0 100644
--- a/album/sburb-ost.yaml
+++ b/album/sburb-ost.yaml
@@ -93,10 +93,10 @@ Cover Artists:
 Art Tags:
 - Skaia
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 Commentary: |-
     <i>Michael Guy Bowman:</i>
-    So this being arguably the third time I've written the same song from a functional perspective, "Waiting for Adventure" is definitely a hell of an exercise for me. The melody is halfway between "[[track:sburban-jungle]]" and "[[track:another-jungle]]" and was probably the least involved element. Everything else was an attempt to find a heavier sound than I had attempted with either of my tracks from the Homestuck soundtrack, and I guess this time around I made it happen. While the other two score a lot more merits for memorability, composition, and length, this one was definitely the most fun to produce - unlike its two predecessors it's more of an ass-shaker than a head-banger, so I like that.
+    So this being arguably the third time I've written the same song from a functional perspective, "Waiting for Adventure" is definitely a hell of an exercise for me. The melody is halfway between "[[Sburban Jungle]]" and "[[track:another-jungle]]" and was probably the least involved element. Everything else was an attempt to find a heavier sound than I had attempted with either of my tracks from the Homestuck soundtrack, and I guess this time around I made it happen. While the other two score a lot more merits for memorability, composition, and length, this one was definitely the most fun to produce - unlike its two predecessors it's more of an ass-shaker than a head-banger, so I like that.
 
     <i>Tavia Morra:</i>
     Between the time I finished [[track:fly]] to when I was asked to make art for the Sburb OST, I had just picked up a book comprised entirely of panels and pictures of art deco design by Eugene Grasset. I was quite taken with the style and decided to add hints of it in the compositions of my Sburb OST art.
@@ -115,10 +115,10 @@ Cover Artists:
 Art Tags:
 - Skaia
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 Commentary: |-
     <i>sidewalkbanana:</i>
-    When I went into doing this piece, I wasn't really thinking about anything and I literally spent the first day doing nothing. Then I tried to remember the first song I properly heard and enjoyed which was '[[track:explore]]'.
+    When I went into doing this piece, I wasn't really thinking about anything and I literally spent the first day doing nothing. Then I tried to remember the first song I properly heard and enjoyed which was '[[Explore]]'.
     
     I tried to give it a highly arpeggiated sound and a low classical feel while still using synths. Once I fell into the flow of things, it was easy enough to get some basic melodies down. I split it up into two sections to explore the themes of both Prospit and Derse. In the end, I am happy with it due to this being my first attempt at composing, and I have definitely learnt from the experience.
 
@@ -191,7 +191,7 @@ Cover Artists:
 - Dawn Davis
 Commentary: |-
     <i>Veritas Unae:</i>
-    Metamorphic Choices was lovingly glitched by [[artist:marcy-nabors|Shadolith]]. This song is meant to be a sort of a 'you just prototyped this, way to go' song - a great big flash (everything got changed his molecules were all rearranged...) happens as your item makes contact with the kernelsprite and then the song plays. This piece was heavily inspired by [[track:harlequin]] and [[track:nannaquin]]. Who doesn't love glitchy sprites?
+    Metamorphic Choices was lovingly glitched by [[artist:marcy-nabors|Shadolith]]. This song is meant to be a sort of a 'you just prototyped this, way to go' song - a great big flash (everything got changed his molecules were all rearranged...) happens as your item makes contact with the kernelsprite and then the song plays. This piece was heavily inspired by [[Harlequin]] and [[Nannaquin]]. Who doesn't love glitchy sprites?
 
     <i>Dawn Davis:</i>
     I actually had a hard time coming up with what to do here so I relied on [[artist:veritas-unae|Scott]] and Marcy a lot for the concept. We used it as an excuse sort of to really get into a lot of the specific world and sprite stuff! In the end Marcy made a Squiddle Speaker Sprite which I LOVE because of how fucking terrifying it looks with that cyclops speaker eye. Veri has his self-writing story sprite, which is much more classy. And then we got Marcy and Veri's worlds in there, too. Up top you see the Land of Beats and Stirring Sonar, and below you have the Land of Music and Technology. It seems that I forgot how much fun I have with scenery and land designs until I joined the Sburb group.
@@ -209,8 +209,8 @@ Cover Artists:
 Art Tags:
 - Earth
 Referenced Tracks:
-- track:sburban-jungle
-- track:umbral-ultimatum
+- Sburban Jungle
+- Umbral Ultimatum
 Commentary: |-
     <i>Max Wright:</i>
     The end of the world is a pretty big deal. Maybe not in the grand scheme of everything in SBURB, but this is still the apocalypse we're talking about! It's loud, it's powerful, and it stops for no one, so you'd better be ready for it. This piece revolves around the anticipation of a timer constantly ticking towards turmoil, as well as the frantic nature of the whole puzzling process that must be completed while proximate meteors rain down in a destructive deluge. It is a chaotic cataclysm that builds up and up as the remaining minutes drain away - the countdown timer continues its steady death march until the very last second, when the hour is met and the final bell is struck.
@@ -525,7 +525,7 @@ Commentary: |-
 
     U MAD?
 
-    Seriously, though. In Homestuck, Jack's theme "[[track:black]]" is pretty darn crazy with all the pitch bending and running notes, but to be honest? I don't think it fits with Jack as a character. Don't get me wrong - it's perfectly justified within the context of Homestuck because Jack goes batshit insane after getting the bunny. But if you look at him within the context of a regular session, he's, well - a washed-up Archagent stuck in a dead-end job who hates his superior. And that's not very exciting. So I made something that sounds more like a funeral march. It's your funeral, because after the song's over, he <i>shoas u his stabbz</i>.
+    Seriously, though. In Homestuck, Jack's theme "[[Black]]" is pretty darn crazy with all the pitch bending and running notes, but to be honest? I don't think it fits with Jack as a character. Don't get me wrong - it's perfectly justified within the context of Homestuck because Jack goes batshit insane after getting the bunny. But if you look at him within the context of a regular session, he's, well - a washed-up Archagent stuck in a dead-end job who hates his superior. And that's not very exciting. So I made something that sounds more like a funeral march. It's your funeral, because after the song's over, he <i>shoas u his stabbz</i>.
     
     <i>melodiousDiscord:</i>
     Some explanation is required for this piece. Kon made the sprite that made Jack hate him at least 10 times more. A Party Cat sprite. Sadly for Jack, these are not corpse parties, these are the good old fashioned cake, confetti, and music parties. So imagine you are Jack. You went to bed feeling disgruntled as always but that's nothing new. You are then suddenly wakened by DD, HB, and CD playing a rousing and lively song outside your door. How do you feel?
@@ -852,9 +852,9 @@ Art Tags:
 - Prospit
 Commentary: |-
     <i>Solatrus:</i>
-    Skaiaward has had a pretty strange development. I was the original artist attached to it, but had to drop out of the SburbOST project to focus on everything else that was going on. Eventually, [[artist:melodiousdiscord|Cadrien (mD)]] attempted something for it, but struggled due to his lack of compositional experience. Nonetheless, the pentatonic idea he went with (similarly to the canon [[track:skies-of-skaia]]) was the base that Marcy and I ultimately used in our reinterpretation... after I managed to get myself involved with the project again.
+    Skaiaward has had a pretty strange development. I was the original artist attached to it, but had to drop out of the SburbOST project to focus on everything else that was going on. Eventually, [[artist:melodiousdiscord|Cadrien (mD)]] attempted something for it, but struggled due to his lack of compositional experience. Nonetheless, the pentatonic idea he went with (similarly to the canon [[Skies of Skaia]]) was the base that Marcy and I ultimately used in our reinterpretation... after I managed to get myself involved with the project again.
 
-    Our opinion is that this piece is a more accurate representation of Skaia compared to [[track:skies-of-skaia]]. The focus is on the bittersweet concept that Skaia is both a creator and destroyer of life.
+    Our opinion is that this piece is a more accurate representation of Skaia compared to [[Skies of Skaia]]. The focus is on the bittersweet concept that Skaia is both a creator and destroyer of life.
 
     <i>Toe:</i>
     You gotta admit, Skaia is beautiful.<br>
@@ -871,7 +871,7 @@ URLs:
 Cover Artists:
 - Kate Holden
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 Commentary: |-
     <i>Brad Griffin:</i>
     "[[flash:3087]]" is one of my favorite HS pages. A lot of that was watched while composing this. I added the fading rain at the start as a transition from the [[track:barren-session|Game Over]] track before that got moved. The crescendo and accelerando throughout is meant to embody the returning of vitality and infusion of power. It's in 5/4 time because 4/4 is boring.
@@ -935,7 +935,7 @@ Art Tags:
 - Denizens
 Referenced Tracks:
 - The Will to Fight (Original Mix) [Denizen Strife]
-- track:showtime-piano-refrain
+- Showtime (Piano Refrain)
 - Waking the Beast [Denizen Encounter]
 Commentary: |-
     <i>Kevin Grant:</i>
@@ -1254,8 +1254,8 @@ Cover Artists:
 Art Tags:
 - Denizens
 Referenced Tracks:
-- track:showtime-original-mix
-- track:showtime-piano-refrain
+- Showtime (Original Mix)
+- Showtime (Piano Refrain)
 Commentary: |-
     <i>Kevin Grant:</i>
     This song started out as a chiptune, but due to computer failures, I lost all of my work. I decided to remake it in non-chiptune form. It's supposed to sound menacing while at the same time spurring you into action. A real fight-or-die situation would have music like this. Overall, I just tried to have fun with this piece, drawing inspiration from songs like [[Chaotic Strength]] and [[Tomahawk Head]]. While I don't think the song is as good as it could be, other obligations (and further computer failures) caused me leave it a bit unpolished.
diff --git a/album/sburb.yaml b/album/sburb.yaml
index ce9abfbd..98b56424 100644
--- a/album/sburb.yaml
+++ b/album/sburb.yaml
@@ -122,7 +122,7 @@ URLs:
 - https://jamesdever.bandcamp.com/track/exodus
 - https://youtu.be/UnbRhrKFofY
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 Sheet Music Files:
 - Title: Piano score by James Dever (original composer)
   Files:
@@ -130,7 +130,7 @@ Sheet Music Files:
 Commentary: |-
     <i>James Dever:</i>
     <i>(original commentary)</i>
-    The Book of Exodus comes after the Book of Genesis. It narrates the mass journey out of Israel by Moses. In Sburb, the players must go through a set of tasks to escape impending doom. This song reflects the process of entering the medium. This is why I encorporated [[track:sburban-jungle|Sburban Jungle]] into the beginning and end. The first time Sburb is booted up you hear a bit of Sburban Jungle, just like at the beginning of the song you hear the bottom chords. Later, when John enters the medium (as well as Rose) you hear the song in more complete forms like the end of the piece. When playing, the trickiest part is definitely the triplet ostinato that continues throughout the entire song. The best method to pulling this off is by playing the note on the beat (which will always be either E flat or G) with the left hand and the rest of the notes on the right hand. You will notice that when there are lower notes, there are rests in the ostinato so that you can quickly jump down the piano.
+    The Book of Exodus comes after the Book of Genesis. It narrates the mass journey out of Israel by Moses. In Sburb, the players must go through a set of tasks to escape impending doom. This song reflects the process of entering the medium. This is why I encorporated [[Sburban Jungle]] into the beginning and end. The first time Sburb is booted up you hear a bit of Sburban Jungle, just like at the beginning of the song you hear the bottom chords. Later, when John enters the medium (as well as Rose) you hear the song in more complete forms like the end of the piece. When playing, the trickiest part is definitely the triplet ostinato that continues throughout the entire song. The best method to pulling this off is by playing the note on the beat (which will always be either E flat or G) with the left hand and the rest of the notes on the right hand. You will notice that when there are lower notes, there are rests in the ostinato so that you can quickly jump down the piano.
     <i>(commentary redux)</i>
     Continuing the Homestuck homages, this piece prominently features the bassline from [[artist:michael-guy-bowman|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.
diff --git a/album/sburban-neighborhood.yaml b/album/sburban-neighborhood.yaml
index 9d41bb56..0dbd281a 100644
--- a/album/sburban-neighborhood.yaml
+++ b/album/sburban-neighborhood.yaml
@@ -56,11 +56,11 @@ URLs:
 - https://sahcon.bandcamp.com/track/everyone-here-fine-and-happy-lets-eat-some-cake-and-play-a-song

 - https://www.youtube.com/watch?v=vPFpFjJ0-7g

 Referenced Tracks:

-- track:harlequin

+- Harlequin

 Commentary: |-

     <i>sunsprite:</i>

     The game finally ended. Come over, let's eat some cake and play that song your dad liked.<br>

-    The base motif is obviously [[track:harlequin|Harlequin]], but it's jazzy.<br>

+    The base motif is obviously [[Harlequin]], but it's jazzy.<br>

     One of the main inspirations is [[Moonsweater]] by [[artist:david-ellis]], it's great.<br>

     Playing everything live on real instruments just feels different to me, and I really like that feeling.<br>

     It was very fun to iterate on the parts and do all different solos.<br>

@@ -197,7 +197,7 @@ URLs:
 - https://sahcon.bandcamp.com/track/no-homo

 - https://soundcloud.com/metafract/no-homo

 Referenced Tracks:

-- track:upward-movement-dave-owns

+- Upward Movement (Dave Owns)

 Lyrics: |-

     (Yes, it's understandable because you are really attractive. I am attracted to you.)

     (Thank you.)

@@ -217,7 +217,7 @@ URLs:
 - https://sahcon.bandcamp.com/track/nostalgia-paradox

 - https://soundcloud.com/levc-egm/nostalgia-paradox-sburban-neighborhood

 Referenced Tracks:

-- track:showtime-piano-refrain

+- Showtime (Piano Refrain)

 Commentary: |-

     <i>Levc:</i>

     It started as a sequel to [[October]] (By [[artist:erik-scheele|Erik "Jit" Scheele]]) but i gave up and basically came up with something more weird and original to celebrate this great virtual convention where im too shy to talk!

@@ -410,13 +410,13 @@ Referenced Tracks:
 - Vast Error

 - Overlook

 - Liquid Negrocity

-- track:sburban-jungle

-- track:beatdown-strider-style

+- Sburban Jungle

+- Beatdown (Strider Style)

 - Flare

 - Even in Death

 - Terezi's Theme

 - track:MeGaLoVania

-- track:doctor

+- Doctor

 - track:penumbra-phantasm

 - track:terexi

 Commentary: |-

@@ -497,7 +497,7 @@ URLs:
 - https://sahcon.bandcamp.com/track/bonus-black-nova-green-moon

 Referenced Tracks:

 - Flare

-- track:sburban-jungle

+- Sburban Jungle

 - Derse Dreamers

 ---

 Track: One Last Strife

diff --git a/album/skaian-synthesis.yaml b/album/skaian-synthesis.yaml
index deb8cfff..a4d7be42 100644
--- a/album/skaian-synthesis.yaml
+++ b/album/skaian-synthesis.yaml
@@ -30,28 +30,31 @@ URLs:
 - https://www.youtube.com/watch?v=79UsislvaLY
 Referenced Tracks:
 - Homestuck Anthem
-- track:sburban-jungle
+- Sburban Jungle
 ---
 Track: Heir of Grief
 Directory: heir-of-grief-skaian-synthesis
+Always Reference By Directory: true
 Duration: '3:09'
 URLs:
 - https://funkmclovin.bandcamp.com/track/heir-of-grief
 - https://www.youtube.com/watch?v=vaR5rOAsBfE
 Referenced Tracks:
-- track:heir-of-grief
+- Heir of Grief
 ---
 Track: Sburban Jungle
 Directory: sburban-jungle-skaian-synthesis
+Always Reference By Directory: true
 Duration: '3:08'
 URLs:
 - https://funkmclovin.bandcamp.com/track/sburban-jungle
 - https://www.youtube.com/watch?v=QHIBD78LeQw
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 ---
 Track: Moonsetter
 Directory: moonsetter-skaian-synthesis
+Always Reference By Directory: true
 Duration: '2:48'
 URLs:
 - https://funkmclovin.bandcamp.com/track/moonsetter-2
@@ -61,12 +64,13 @@ Referenced Tracks:
 ---
 Track: Beatdown
 Directory: beatdown-skaian-synthesis
+Always Reference By Directory: true
 Duration: '2:05'
 URLs:
 - https://funkmclovin.bandcamp.com/track/beatdown
 - https://www.youtube.com/watch?v=9Cr_Rh2pvxk
 Referenced Tracks:
-- track:beatdown-strider-style
+- Beatdown (Strider Style)
 ---
 Track: Eurolovania
 Duration: '1:42'
@@ -78,6 +82,7 @@ Referenced Tracks:
 ---
 Track: Black
 Directory: black-skaian-synthesis
+Always Reference By Directory: true
 Duration: '2:40'
 URLs:
 - https://funkmclovin.bandcamp.com/track/black
@@ -87,9 +92,10 @@ Referenced Tracks:
 ---
 Track: Sunslammer
 Directory: sunslammer-skaian-synthesis
+Always Reference By Directory: true
 Duration: '2:04'
 URLs:
 - https://funkmclovin.bandcamp.com/track/sunslammer
 - https://www.youtube.com/watch?v=AQhvNfm5W_c
 Referenced Tracks:
-- track:sunslammer
\ No newline at end of file
+- track:sunslammer
diff --git a/album/skaias-the-limit.yaml b/album/skaias-the-limit.yaml
index a1b255a7..2db0391b 100644
--- a/album/skaias-the-limit.yaml
+++ b/album/skaias-the-limit.yaml
@@ -20,7 +20,7 @@ Artists:
 URLs:
 - https://sahcon.bandcamp.com/track/beatdown
 Referenced Tracks:
-- track:beatdown-strider-style
+- Beatdown (Strider Style)
 Commentary: |-
     <i>BLVKAROT:</i>
     I warned you about the beat bro, I told you dawg.
@@ -95,9 +95,9 @@ Artists:
 URLs:
 - https://sahcon.bandcamp.com/track/re-tcon
 Referenced Tracks:
-- track:doctor
+- Doctor
 - track:penumbra-phantasm
-- track:sburban-jungle
+- Sburban Jungle
 Sampled Tracks:
 - Shin Megami Tensei V https://youtu.be/x3rye8S3SZw?t=406
 Lyrics: |-
diff --git a/album/song-of-skaia.yaml b/album/song-of-skaia.yaml
index dc159c39..304ea310 100644
--- a/album/song-of-skaia.yaml
+++ b/album/song-of-skaia.yaml
@@ -32,7 +32,7 @@ URLs:
 - https://parsecproductions.bandcamp.com/track/skaian-birth
 - https://youtu.be/pEtclU-Tdck
 Referenced Tracks:
-- track:skies-of-skaia
+- Skies of Skaia
 ---
 Track: Song of Skaia
 Contributors:
@@ -42,7 +42,7 @@ URLs:
 - https://parsecproductions.bandcamp.com/track/song-of-skaia
 - https://youtu.be/731LkYOajeA
 Referenced Tracks:
-- track:skies-of-skaia
+- Skies of Skaia
 Lyrics: |-
     In vento cogitatio, spirat in vento<br>E vacuo lux elucet, lux e vacuo<br>E somno somnia cre'ta, somnia e somno<br>In clara umbra creatum versat
     (<i>Thought blows in the wind, in the wind<br>Light shines from the void, light from the void<br>Dreams awaken out of sleep, dreams out of sleep<br>Creation twirls in a bright shadow</i>)
diff --git a/album/songs-unsung.yaml b/album/songs-unsung.yaml
index afd06a93..0426d3bc 100644
--- a/album/songs-unsung.yaml
+++ b/album/songs-unsung.yaml
@@ -38,7 +38,7 @@ URLs:
 - https://tenseimusic.bandcamp.com/track/of-gods-and-witches
 - https://www.youtube.com/watch?v=FpBfNFGA8qY
 Referenced Tracks:
-- track:doctor
+- Doctor
 ---
 Track: Peaches and Curry
 Duration: '2:01'
diff --git a/album/spelunky-classic.yaml b/album/spelunky-classic.yaml
index 2ddfdb9e..5e4ed5f5 100644
--- a/album/spelunky-classic.yaml
+++ b/album/spelunky-classic.yaml
@@ -13,7 +13,7 @@ Groups:
 Commentary: |-
     <i>Quasar Nebula:</i>
     The original version of Spelunky, developed by Derek Yu and now dubbed <a href="https://spelunkyworld.com/original.html"><i>Spelunky Classic</i></a>, released on December 21st, 2008 on TIGSource. Although it was later remastered, that Game Maker version remains freeware.
-    Spelunky Classic's retro-style, fondly-remembered soundtrack was composed by [[artist:buzinkai]] and [[artist:jon-perry]], the former of whom only a year or so later composed renowned tracks of the Homestuck discography [[track:doctor]], [[track:explore]], [[track:endless-climb]] and more; Jon Perry has been designing hands-on and video games alike for many years, including other collaborations with Derek Yu.
+    Spelunky Classic's retro-style, fondly-remembered soundtrack was composed by [[artist:buzinkai]] and [[artist:jon-perry]], the former of whom only a year or so later composed renowned tracks of the Homestuck discography [[Doctor]], [[Explore]], [[Endless Climb]] and more; Jon Perry has been designing hands-on and video games alike for many years, including other collaborations with Derek Yu.
 ---
 Track: Title
 Directory: title-spelunky
diff --git a/album/strife-2.yaml b/album/strife-2.yaml
index 9c006322..86cc2bbc 100644
--- a/album/strife-2.yaml
+++ b/album/strife-2.yaml
@@ -100,7 +100,7 @@ Art Tags:
 - 'cw: blood'
 Referenced Tracks:
 - The King in Red (Beta)
-- track:crustacean
+- Crustacean
 ---
 Track: Heel Girl
 Duration: '4:00'
@@ -110,7 +110,7 @@ URLs:
 - https://open.spotify.com/track/488wpDgIrrPAYQOgThRzo4
 Referenced Tracks:
 - Heel Girl (Beta)
-- track:umbral-ultimatum
+- Umbral Ultimatum
 ---
 Track: Unite Division
 Duration: '3:40'
@@ -138,7 +138,7 @@ Duration: '1:39'
 URLs:
 - https://www.youtube.com/watch?v=o-okW7YECmI
 Referenced Tracks:
-- track:crustacean
+- Crustacean
 ---
 Track: Unite Division (Beta)
 Duration: '1:43'
diff --git a/album/strife.yaml b/album/strife.yaml
index 150b2362..80ad367c 100644
--- a/album/strife.yaml
+++ b/album/strife.yaml
@@ -49,7 +49,7 @@ URLs:
 - https://open.spotify.com/track/5fqROOwxqBNQCRepcjggRN
 Referenced Tracks:
 - Tomboyish Girl in Love
-- track:doctor
+- Doctor
 - track:penumbra-phantasm
 Sheet Music Files:
 - Title: Tabs by Tensei (original composer)
@@ -98,7 +98,7 @@ URLs:
 - https://youtu.be/_zfOKIREJX8
 - https://open.spotify.com/track/7lgxvFZWOPgBJ0wh2TEvTQ
 Referenced Tracks:
-- track:beatdown-strider-style
+- Beatdown (Strider Style)
 - Liquid Negrocity
 - Master of Puppets
 Sheet Music Files:
diff --git a/album/symphony-impossible-to-play.yaml b/album/symphony-impossible-to-play.yaml
index 49f6f66f..5a64b18c 100644
--- a/album/symphony-impossible-to-play.yaml
+++ b/album/symphony-impossible-to-play.yaml
@@ -47,15 +47,15 @@ URLs:
 - https://homestuck.bandcamp.com/track/i-overture-2
 - https://youtu.be/Fi311fNF09w
 Referenced Tracks:
-- track:endless-climb
+- Endless Climb
 - Crystalanthemums
-- track:atomyk-ebonpyre
-- track:sburban-jungle
-- track:doctor
+- Atomyk Ebonpyre
+- Sburban Jungle
+- Doctor
 - Three in the Morning
 - Flare
-- track:explore
-- track:upward-movement-dave-owns
+- Explore
+- Upward Movement (Dave Owns)
 - Even in Death
 ---
 Track: II - Sarabande
diff --git a/album/team-paradox.yaml b/album/team-paradox.yaml
index d44cc90a..39467025 100644
--- a/album/team-paradox.yaml
+++ b/album/team-paradox.yaml
@@ -194,7 +194,7 @@ URLs:
 Cover Artists:
 - Team Paradox
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 ---
 Track: Retkoned Whiplash
 Artists:
diff --git a/album/the-baby-is-you.yaml b/album/the-baby-is-you.yaml
index 25775951..ad96b154 100644
--- a/album/the-baby-is-you.yaml
+++ b/album/the-baby-is-you.yaml
@@ -40,7 +40,7 @@ Duration: 0:43
 URLs:
 - https://youtu.be/KSHPZp33vv4
 Referenced Tracks:
-- track:showtime-original-mix
+- Showtime (Original Mix)
 Lyrics: |-
     (JOHN: Hi I'm John Egbert, and I tell you about my rock opera that's totally like— OH MY GOD DAVE WHAT THE FUCK ARE YOU DOING ON THE GROUND WRITHING IN PAIN.
     DAVE: Nothing- nothing John, just ignore me I'm not <big>PREGNANT</big>!
@@ -298,7 +298,7 @@ Lyrics: |-
 
     I'm the king of everything under the sun
     I'm just like Parappa except I like hot dog buns
-    I'm gonna [[track:beatdown-strider-style|Beatdown]] your butt, I'll [[track:contention-vol4]] your face
+    I'm gonna [[Beatdown (Strider Style)|Beatdown]] your butt, I'll [[track:contention-vol4]] your face
     I'll eat all the babies in the human race
 
     (JOHN: Why would Bro say something like that?
diff --git a/album/the-ballad-of-megan-pouring.yaml b/album/the-ballad-of-megan-pouring.yaml
index aa7e3dfe..eead7058 100644
--- a/album/the-ballad-of-megan-pouring.yaml
+++ b/album/the-ballad-of-megan-pouring.yaml
@@ -127,7 +127,7 @@ Duration: '06:23'
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/the-ballad-of-megan-pouring-instrumental
 Referenced Tracks:
-- track:doctor
+- Doctor
 - track:penumbra-phantasm
 - Bad Apple!!
 - Snow halation
@@ -135,4 +135,4 @@ Referenced Tracks:
 - Feel Good Inc.
 - Homestuck Anthem
 - Bridal Chorus
-- Wanderlust
\ No newline at end of file
+- Wanderlust
diff --git a/album/the-felt.yaml b/album/the-felt.yaml
index 38cb6e5b..0614d400 100644
--- a/album/the-felt.yaml
+++ b/album/the-felt.yaml
@@ -182,7 +182,7 @@ URLs:
 - https://homestuck.bandcamp.com/track/apocryphal-antithesis-2
 - https://youtu.be/PTd8rhHHyEs
 Referenced Tracks:
-- track:endless-climb
+- Endless Climb
 ---
 Track: Trails
 Artists:
diff --git a/album/the-genesis-project-vol-1.yaml b/album/the-genesis-project-vol-1.yaml
index 4e2c2f96..562778c9 100644
--- a/album/the-genesis-project-vol-1.yaml
+++ b/album/the-genesis-project-vol-1.yaml
@@ -27,7 +27,7 @@ Duration: 0:32
 URLs:
 - https://genesis-project.bandcamp.com/track/configure-the-universe
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 ---
 Track: Genesiac Jungle
 Artists:
@@ -59,7 +59,7 @@ Duration: '2:08'
 URLs:
 - https://genesis-project.bandcamp.com/track/showtime-panini-mix
 Referenced Tracks:
-- track:showtime-original-mix
+- Showtime (Original Mix)
 ---
 Track: Skaian Selection
 Artists:
@@ -68,8 +68,8 @@ Duration: '2:34'
 URLs:
 - https://genesis-project.bandcamp.com/track/skaian-selection
 Referenced Tracks:
-- track:skies-of-skaia
-- track:sburban-jungle
+- Skies of Skaia
+- Sburban Jungle
 ---
 Track: Symphotronic
 Artists:
diff --git a/album/the-wanderers.yaml b/album/the-wanderers.yaml
index 00e412b0..4f1264d4 100644
--- a/album/the-wanderers.yaml
+++ b/album/the-wanderers.yaml
@@ -244,7 +244,7 @@ Cover Artists:
 Art Tags:
 - PM
 Referenced Tracks:
-- track:explore
+- Explore
 Commentary: |-
     <i>Malcolm Brown:</i>
     Aaah this one. This caused me a bit of unexpected grief, but we'll get to that.
@@ -339,7 +339,7 @@ Art Tags:
 - WV
 - Ruined Earth
 Referenced Tracks:
-- track:vagabounce
+- Vagabounce
 ---
 Track: Tomahawk Head
 Artists:
diff --git a/album/theres-no-place-like-home.yaml b/album/theres-no-place-like-home.yaml
index cfcac9ee..0b13032d 100644
--- a/album/theres-no-place-like-home.yaml
+++ b/album/theres-no-place-like-home.yaml
@@ -27,12 +27,12 @@ Duration: '4:04'
 URLs:
 - https://teeveemusic.bandcamp.com/track/confined
 Referenced Tracks:
-- track:sburban-countdown
-- track:sburban-jungle
+- Sburban Countdown
+- Sburban Jungle
 - Another Jungle
-- track:showtime-original-mix
+- Showtime (Original Mix)
 - Versus
-- track:beatdown-strider-style
+- Beatdown (Strider Style)
 ---
 Track: 🎼 Fraymotif !
 Duration: '13:11'
@@ -55,18 +55,18 @@ Referenced Tracks:
 - Terezi Owns
 - Scourge Sisters
 - Valhalla
-- track:showtime-piano-refrain
+- Showtime (Piano Refrain)
 - Gold Pilot
-- track:revelawesome
+- Revelawesome
 - Warhammer of Zillyhoo
 - Infinity Mechanism
 - Unite Synchronization
 - Showdown
-- track:dissension-original
-- track:crustacean
+- Dissension (Original)
+- Crustacean
 - Horschestra
 - Cascade (Beta)
-- track:explore
+- Explore
 - Skaian Skirmish
 - A Little Fight Mewsic
 - Superego
@@ -81,7 +81,7 @@ Referenced Tracks:
 - Eridan's Theme
 - Moonshatter
 - Pumpkin Tide
-- track:under-the-hat
+- Under The Hat
 - track:im-a-member-of-the-midnight-crew
 ---
 Track: Beat Mesa Boogie
@@ -89,9 +89,9 @@ Duration: '16:16'
 URLs:
 - https://teeveemusic.bandcamp.com/track/beat-mesa-boogie
 Referenced Tracks:
-- track:harlequin
+- Harlequin
 - The Lordling
-- track:vagabounce
+- Vagabounce
 - Your Best Nightmare
 - English
 - Squiddles!
@@ -103,7 +103,7 @@ Referenced Tracks:
 - track:carne-vale
 - Oppa Toby Style
 - Courser
-- track:umbral-ultimatum
+- Umbral Ultimatum
 - Tomahawk Head
 - Crystalanthemums
 - Do You Remem8er Me
@@ -124,8 +124,8 @@ Referenced Tracks:
 - Killed by BR8K Spider!!!!!!!!
 - Spider's Claw
 - Liquid Negrocity
-- track:the-ballad-of-jack-noir
-- track:atomyk-ebonpyre
+- The Ballad of Jack Noir
+- Atomyk Ebonpyre
 - Solar Sect of Mystic Wisdom ~ Nuclear Fusion
 - The Golden Towers
 - Catapult Capuchin
@@ -151,7 +151,7 @@ Referenced Tracks:
 - track:of-gods-and-witches
 - Cyan Beast
 - Olive Rogue
-- track:ohgodwhat
+- Ohgodwhat
 - Dawn of Man
 - track:i-dont-want-to-miss-a-thing-aerosmith
 - How Do I Live (Bunny Back in the Box Version)
@@ -169,9 +169,9 @@ Referenced Tracks:
 - Flare
 - track:frost-vol6
 - track:ruins
-- track:chorale-for-jaspers
-- track:endless-climb
-- track:upward-movement-dave-owns
+- Chorale for Jaspers
+- Endless Climb
+- Upward Movement (Dave Owns)
 - The Thirteenth Hour
 - Battle Against an Unfathomable Enemy
 - Stress
@@ -185,26 +185,26 @@ Referenced Tracks:
 - Darling Kanaya
 - Lotus
 - Tomboyish Girl in Love
-- track:aggrieve
+- Aggrieve
 ---
 Track: God Tier
 Duration: '6:09'
 URLs:
 - https://teeveemusic.bandcamp.com/track/god-tier
 Referenced Tracks:
-- track:sburban-jungle
-- track:verdancy-bassline
+- Sburban Jungle
+- Verdancy (Bassline)
 - Homestuck Anthem
 - Pondsquatter
 - Virgin Orb
-- track:ballad-of-awakening
-- track:skies-of-skaia
+- Ballad of Awakening
+- Skies of Skaia
 - Savior of the Dreaming Dead
 - track:penumbra-phantasm
 - Thanks for Playing
 - Cascade (Beta)
-- track:heir-of-grief
-- track:doctor
+- Heir of Grief
+- Doctor
 - Descend
 ---
 Track: MeGaLoVania (cover)
diff --git a/album/unreleased-tracks.yaml b/album/unreleased-tracks.yaml
index 0f4364e1..b1db0166 100644
--- a/album/unreleased-tracks.yaml
+++ b/album/unreleased-tracks.yaml
@@ -391,7 +391,7 @@ Duration: '1:59'
 URLs:
 - https://www.youtube.com/watch?v=oVRCbmh-TI4
 Referenced Tracks:
-- track:crustacean
+- Crustacean
 ---
 Track: G4M38L0RG
 Artists:
@@ -477,7 +477,7 @@ Duration: 0:10
 URLs:
 - https://www.youtube.com/watch?v=0Hd6q5xn8mg
 Referenced Tracks:
-- track:showtime-original-mix
+- Showtime (Original Mix)
 Commentary: |-
     <i>Niklink:</i>
     Unofficial name. Labeled simply as 'Trickster Mode' on the MSPA sound credits, albeit in conjunction with [[track:trickster-mode-blast-off|the other Trickster Mode track]].
@@ -489,7 +489,7 @@ Duration: 0:16
 URLs:
 - https://www.youtube.com/watch?v=sCFuOmInTxQ
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 Commentary: |-
     <i>Niklink:</i>
     Unofficial name. Labeled simply as 'Trickster Mode' on the MSPA sound credits, albeit in conjunction with [[track:trickster-mode-engage|the other Trickster Mode track]].
@@ -697,8 +697,8 @@ URLs:
 Cover Artists:
 - Homestuck
 Referenced Tracks:
-- track:showtime-piano-refrain
-- track:harlequin
+- Showtime (Piano Refrain)
+- Harlequin
 Commentary: |-
     <i>James Roach:</i>
     SO! PesterQuest is out. We've been sitting on this one for a while. This first route has been done for a while. It was supposed to come out back on 6/12 but our new publisher had us sit on it for reasons that are beyond even me. Anyway, big ups to Malcolm and Mark for letting me use their themes.
@@ -717,7 +717,7 @@ URLs:
 Cover Artists:
 - Homestuck
 Referenced Tracks:
-- track:endless-climb
+- 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.
@@ -738,7 +738,7 @@ URLs:
 Cover Artists:
 - Homestuck
 Referenced Tracks:
-- track:upward-movement-dave-owns
+- Upward Movement (Dave Owns)
 ---
 Track: ill probably just name this one something normal oh no wait oh jeez aw beans
 Artists:
@@ -773,8 +773,8 @@ Cover Artists:
 - Homestuck
 Referenced Tracks:
 - 2chords
-- track:upward-movement-dave-owns
-- track:sburban-jungle
+- Upward Movement (Dave Owns)
+- 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
@@ -793,7 +793,7 @@ Cover Artists:
 - Homestuck
 Referenced Tracks:
 - track:carefree-action
-- track:carefree-victory
+- Carefree Victory
 Sampled Tracks:
 - Speak-N-Say
 Lyrics: |-
@@ -840,6 +840,7 @@ Commentary: |-
 ---
 Track: CRUSTacean
 Directory: crustacean-pq
+Always Reference By Directory: true
 Artists:
 - James Roach
 Art Tags:
@@ -851,7 +852,7 @@ URLs:
 Cover Artists:
 - Homestuck
 Referenced Tracks:
-- track:crustacean
+- 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.
@@ -1046,10 +1047,10 @@ Cover Artists:
 Referenced Tracks:
 - Rex Duodecim Angelus
 - track:moonsetter
-- track:sburban-jungle
+- Sburban Jungle
 - track:penumbra-phantasm
 - Unite Synchronization
-- track:upward-movement-dave-owns
+- Upward Movement (Dave Owns)
 - Homestuck Anthem
 - WORST END
 Commentary: |-
diff --git a/album/v8lume.yaml b/album/v8lume.yaml
index 60ba728d..c0fcc36d 100644
--- a/album/v8lume.yaml
+++ b/album/v8lume.yaml
@@ -269,7 +269,7 @@ Duration: '03:59'
 Referenced Tracks:
 - Where making this hapen
 - you kiled swet bro prepair to di
-- track:doctor
+- Doctor
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/u-kiled-swet-bro-prepare-to-die
 - https://youtu.be/zh0vrpdst58
@@ -404,8 +404,8 @@ Art Tags:
 Duration: '04:19'
 Referenced Tracks:
 - Michael Bowman Remix
-- track:sburban-jungle
-- track:chorale-for-jaspers
+- Sburban Jungle
+- Chorale for Jaspers
 - Underneath It All
 - Dawn of Man
 - Roll With The Punches
@@ -550,7 +550,7 @@ Art Tags:
 Duration: '02:13'
 Referenced Tracks:
 - track:penumbra-phantasm
-- track:doctor
+- Doctor
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/dialup
 - https://youtu.be/cV8uHxvn_ZA
@@ -613,7 +613,7 @@ Art Tags:
 Duration: '01:38'
 Referenced Tracks:
 - RollerCoaster Tycoon Theme
-- track:aggrieve
+- Aggrieve
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/rose-a-coaster
 - https://youtu.be/6KxVN5-FCAQ
@@ -663,7 +663,7 @@ Art Tags:
 Duration: '02:52'
 Referenced Tracks:
 - Vriska's Theme
-- track:umbral-ultimatum
+- Umbral Ultimatum
 - track:moshi-moshi
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/fairydust-vraskys-theme
@@ -876,10 +876,10 @@ Art Tags:
 - Derse
 Duration: '02:41'
 Referenced Tracks:
-- track:black
-- track:aggrieve
-- track:showtime-original-mix
-- track:beatdown-strider-style
+- Black
+- Aggrieve
+- Showtime (Original Mix)
+- Beatdown (Strider Style)
 - track:archagent-everlasting
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/bendalass
@@ -953,7 +953,7 @@ URLs:
 - https://youtu.be/erWTvoVuyWw
 Referenced Tracks:
 - track:midnight-suffer
-- track:showtime-original-mix
+- Showtime (Original Mix)
 - licord nacrasty
 - Oppa Toby Style
 - Kid Radd Theme
@@ -981,7 +981,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/sburban-blaster-full-version
 - https://youtu.be/I1O6WH8VzWs
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 - Science Blaster
 Commentary: |-
     <i>tempest2k:</i> (Composer)
@@ -1196,7 +1196,7 @@ Art Tags:
 - Dave
 Duration: '00:55'
 Referenced Tracks:
-- track:atomyk-ebonpyre
+- Atomyk Ebonpyre
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/guilty-of-being-alternia
 - https://youtu.be/KI4Xj2xCbOI
@@ -1475,8 +1475,8 @@ Cover Artists:
 - greenTetrahedron
 Duration: '01:19'
 Referenced Tracks:
-- track:doctor
-- track:beatdown-strider-style
+- Doctor
+- Beatdown (Strider Style)
 - track:sunslammer
 Sampled Tracks:
 - I Can't Believe You've Done This
@@ -1551,7 +1551,7 @@ Referenced Tracks:
 - You're So Rad
 - Fresh Jimmy's Fresh Beatz
 - Good Grievous Bodily Harm
-- track:doctor
+- Doctor
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/fresh-jimmys-fresh-orchestraz
 - https://youtu.be/5lzQGRA_JkI
@@ -1578,7 +1578,7 @@ Art Tags:
 Duration: '02:12'
 Referenced Tracks:
 - Purple Tyrant
-- track:crustacean
+- Crustacean
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/le-canrival
 - https://youtu.be/TyOBgdutWq8
@@ -1605,7 +1605,7 @@ Referenced Tracks:
 - track:moshi-moshi
 - RollerCoaster Tycoon Theme
 - track:MeGaLoVania
-- track:chorale-for-jaspers
+- Chorale for Jaspers
 - Ratboy Genius Theme Song
 - Is this a chord progression?
 - Contra
@@ -1686,7 +1686,7 @@ URLs:
 - https://youtu.be/fWG4kXtGAYA
 Commentary: |-
     <i>Wights End:</i> (Composer)
-    I first started work on this song after listening to the really bass heavy section in the original at 1:20 and thinking "Hey, Waters of Nazareth would be cool here" I don't care for the intro section that uses the motif from my song Misery Loves Company. It doesn't have the grandure that I wanted to achieve, but I didn't really know how to improve it. In retrospect I would probably have referenced a different song. I tried to reference Cool and New Webcomic music motifs as much as possible, but I also included a few others for shits and giggles or because a certain part of the song reminded me of it. I also tried to use iconic soundfonts and VSTs such as DVS Sax (Used in [[track:black|Black]]), Zunpets ([[artist:touhou-project|Touhou]] Trumpets), Earthbound Overdriven Guitar (Used in MeGaLoVania) And two string soundfonts from Hopes and Dreams and [[track:upward-movement-dave-owns|Upward Movement]]. My favorite part is the mashup of Michael Bowman Remix and a U.N. Owen Was Her acapella; and my least favorite part is the transition right after that. I really like Ska music so a lot of the parts of my song are inspired by it. All and all, I'm happy with the song, though there are some things I would have done differently in retrospect.
+    I first started work on this song after listening to the really bass heavy section in the original at 1:20 and thinking "Hey, Waters of Nazareth would be cool here" I don't care for the intro section that uses the motif from my song Misery Loves Company. It doesn't have the grandure that I wanted to achieve, but I didn't really know how to improve it. In retrospect I would probably have referenced a different song. I tried to reference Cool and New Webcomic music motifs as much as possible, but I also included a few others for shits and giggles or because a certain part of the song reminded me of it. I also tried to use iconic soundfonts and VSTs such as DVS Sax (Used in [[Black]]), Zunpets ([[artist:touhou-project|Touhou]] Trumpets), Earthbound Overdriven Guitar (Used in MeGaLoVania) And two string soundfonts from Hopes and Dreams and [[Upward Movement (Dave Owns)|Upward Movement]]. My favorite part is the mashup of Michael Bowman Remix and a U.N. Owen Was Her acapella; and my least favorite part is the transition right after that. I really like Ska music so a lot of the parts of my song are inspired by it. All and all, I'm happy with the song, though there are some things I would have done differently in retrospect.
 
     <i>Wights End:</i> (Artist)
     i ship it
@@ -1710,26 +1710,26 @@ Art Tags:
 - John
 Duration: '06:18'
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 - RollerCoaster Tycoon Theme
 - Homestuck Anthem
 - track:archagent-everlasting
-- track:revelawesome
+- Revelawesome
 - We Are Number One
 - track:old-secret
 - Infinity Mechanism
-- track:atomyk-ebonpyre
-- track:showtime-original-mix
-- track:theme
-- track:dissension-original
-- track:aggrieve
+- Atomyk Ebonpyre
+- Showtime (Original Mix)
+- Theme
+- Dissension (Original)
+- Aggrieve
 - The Thirteenth Hour
 - Hello Zepp
 - Unite Synchronization
-- track:harlequin
+- Harlequin
 - Virgin Orb
 - Another Jungle
-- track:crustacean
+- Crustacean
 - The Lemonsnout Turnabout
 - track:in-the-beginning-canwc
 - track:unintentional-touhou
@@ -1783,7 +1783,7 @@ Art Tags:
 - Vriska
 Duration: '01:01'
 Referenced Tracks:
-- track:showtime-piano-refrain
+- Showtime (Piano Refrain)
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/this-song-was-made-30-minutes-before-the-deadline-so-fuck-you
 - https://youtu.be/OOYR34B9uS4
@@ -1856,4 +1856,4 @@ Has Cover Art: false
 URLs:
 - https://www.youtube.com/watch?v=aMji1UeffQs
 Referenced Tracks:
-- track:sburban-jungle
\ No newline at end of file
+- Sburban Jungle
diff --git a/album/vaporwave-2016.yaml b/album/vaporwave-2016.yaml
index d95b4095..6e0409bf 100644
--- a/album/vaporwave-2016.yaml
+++ b/album/vaporwave-2016.yaml
@@ -70,7 +70,7 @@ URLs:
 - https://unofficialmspafans.bandcamp.com/track/--6
 - https://youtu.be/HcSNncKT0jw
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 ---
 Track: CRYSTAL母の国歌
 Directory: vaporwave-2016-track6
@@ -110,7 +110,7 @@ URLs:
 - https://unofficialmspafans.bandcamp.com/track/h-w-im-420
 - https://youtu.be/w7wyVTTCFag
 Referenced Tracks:
-- track:showtime-original-mix
+- Showtime (Original Mix)
 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
@@ -132,7 +132,7 @@ URLs:
 - https://unofficialmspafans.bandcamp.com/track/--11
 - https://youtu.be/SmF51-oEPvo
 Referenced Tracks:
-- track:upward-movement-dave-owns
+- Upward Movement (Dave Owns)
 ---
 Track: weed dreams..
 Directory: vaporwave-2016-track12
@@ -141,7 +141,7 @@ URLs:
 - https://unofficialmspafans.bandcamp.com/track/weed-dreams
 - https://youtu.be/gUAowj3xo0o
 Referenced Tracks:
-- track:aggrieve-violin-refrain
+- Aggrieve (Violin Refrain)
 ---
 Track: 酔ったMIDNIGHTの乗組員
 Directory: vaporwave-2016-track13
diff --git a/album/vast-error-vol-1-3.yaml b/album/vast-error-vol-1-3.yaml
index 8cef7025..65a04e91 100644
--- a/album/vast-error-vol-1-3.yaml
+++ b/album/vast-error-vol-1-3.yaml
@@ -75,7 +75,7 @@ Duration: '01:42'
 URLs:
 - https://vasterror.bandcamp.com/track/a-new-world-2
 Referenced Tracks:
-- track:explore
+- Explore
 ---
 Track: Razzmatazz
 Artists:
diff --git a/album/vinculum-vitae.yaml b/album/vinculum-vitae.yaml
index c68f0815..5b911ad1 100644
--- a/album/vinculum-vitae.yaml
+++ b/album/vinculum-vitae.yaml
@@ -34,7 +34,7 @@ URLs:
 - https://lordcakespy.bandcamp.com/track/sburban-sprawl
 - https://soundcloud.com/lordcakespy/sburban-sprawl?in=lordcakespy/sets/vinculum-vitae
 Referenced Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 ---
 Track: Slick Tricks
 Contributors:
@@ -84,10 +84,10 @@ URLs:
 - https://lordcakespy.bandcamp.com/track/unstable-loops
 - https://soundcloud.com/lordcakespy/unstable-loops?in=lordcakespy/sets/vinculum-vitae
 Referenced Tracks:
-- track:beatdown-strider-style
+- Beatdown (Strider Style)
 - track:carne-vale
 - English
-- track:atomyk-ebonpyre
+- Atomyk Ebonpyre
 - track:ruins
 - Cascade
 ---
@@ -97,7 +97,7 @@ URLs:
 - https://lordcakespy.bandcamp.com/track/windterlude
 - https://soundcloud.com/lordcakespy/windterlude?in=lordcakespy/sets/vinculum-vitae
 Referenced Tracks:
-- track:doctor
+- Doctor
 ---
 Track: Ruined Singularity
 Duration: '3:14'
@@ -116,8 +116,8 @@ URLs:
 Referenced Tracks:
 - Lotus
 - Courser
-- track:sburban-jungle
-- track:upward-movement-dave-owns
+- Sburban Jungle
+- Upward Movement (Dave Owns)
 ---
 Track: All In Your Mind
 Duration: '3:51'
@@ -138,7 +138,7 @@ URLs:
 Referenced Tracks:
 - track:carbon-nadsat-cuestick-genius
 - Liquid Negrocity
-- track:the-ballad-of-jack-noir
+- The Ballad of Jack Noir
 ---
 Track: Unification
 Duration: '4:06'
@@ -154,7 +154,7 @@ URLs:
 - https://lordcakespy.bandcamp.com/track/thief-of-space
 - https://soundcloud.com/lordcakespy/thief-of-space?in=lordcakespy/sets/vinculum-vitae
 Referenced Tracks:
-- track:skies-of-skaia
+- Skies of Skaia
 - track:penumbra-phantasm
 - Homestuck Anthem
 ---
diff --git a/flashes.yaml b/flashes.yaml
index 1a514407..9ae94a3c 100644
--- a/flashes.yaml
+++ b/flashes.yaml
@@ -14,7 +14,7 @@ Date: April 21, 2009
 URLs:
 - https://www.bgreco.net/hsflash/001977.html
 Featured Tracks:
-- track:showtime-piano-refrain
+- Showtime (Piano Refrain)
 Flash: '[S] John: Play haunting piano refrain.'
 Page: '77'
 ---
@@ -28,7 +28,7 @@ Page: '82'
 ---
 Date: April 27, 2009
 Featured Tracks:
-- track:harlequin
+- Harlequin
 Flash: '[S] John: Enter.'
 Page: '88'
 ---
@@ -37,7 +37,7 @@ URLs:
 - https://youtu.be/Ytrd_2x-8Rs
 - https://www.bgreco.net/hsflash/001990.html
 Featured Tracks:
-- track:showtime-original-mix
+- Showtime (Original Mix)
 Flash: '[S] STRIFE!'
 Page: '90'
 ---
@@ -52,7 +52,7 @@ Page: '137'
 ---
 Date: May 21, 2009
 Featured Tracks:
-- track:harlequin
+- Harlequin
 Flash: '[S] ==>'
 Page: '186'
 ---
@@ -60,7 +60,7 @@ Date: May 29, 2009
 URLs:
 - https://www.bgreco.net/hsflash/002122.html
 Featured Tracks:
-- track:aggrieve-violin-refrain
+- Aggrieve (Violin Refrain)
 Flash: '[S] Rose: Play a haunting refrain on the violin.'
 Page: '222'
 ---
@@ -69,7 +69,7 @@ URLs:
 - https://youtu.be/ec0sDrBI0V8
 - https://www.bgreco.net/hsflash/002146.html
 Featured Tracks:
-- track:sburban-countdown
+- Sburban Countdown
 Flash: '[S] John: Take bite of apple.'
 Page: '246'
 ---
@@ -81,8 +81,8 @@ Date: June 14, 2009
 URLs:
 - https://www.bgreco.net/hsflash/002153.html
 Featured Tracks:
-- track:showtime-piano-refrain
-- track:harlequin
+- Showtime (Piano Refrain)
+- Harlequin
 Flash: '[S] YOU THERE. BOY.'
 Page: '253'
 ---
@@ -106,7 +106,7 @@ Featured Tracks:
 - track:phat14
 - track:phat15
 - track:phat16
-- track:harlequin
+- Harlequin
 - Captain Planet and the Planeteers End Title
 - Ghostbusters
 - track:i-dont-want-to-miss-a-thing-aerosmith
@@ -117,7 +117,7 @@ Date: July 19, 2009
 URLs:
 - https://www.bgreco.net/hsflash/002288.html
 Featured Tracks:
-- track:aggrieve
+- Aggrieve
 Flash: '[S] Rose: Youth roll right out the front door.'
 Page: '388'
 ---
@@ -125,7 +125,7 @@ Date: July 22, 2009
 URLs:
 - https://www.bgreco.net/hsflash/002293.html
 Featured Tracks:
-- track:showtime-imp-strife-mix
+- Showtime (Imp Strife Mix)
 Flash: '[S] ==>==>==>!!!!!!!!!'
 Page: '393'
 ---
@@ -133,7 +133,7 @@ Date: July 23, 2009
 URLs:
 - https://www.bgreco.net/hsflash/002297.html
 Featured Tracks:
-- track:showtime-imp-strife-mix
+- Showtime (Imp Strife Mix)
 Flash: '[S] GET UP JOHN, THIS IS NO TIME FOR SLUMBER.'
 Page: '397'
 ---
@@ -141,13 +141,13 @@ Date: July 25, 2009
 URLs:
 - https://www.bgreco.net/hsflash/002300.html
 Featured Tracks:
-- track:showtime-imp-strife-mix
+- Showtime (Imp Strife Mix)
 Flash: '[S] JOHN, SALVAGE YOUR WEAPON AND FIGHT ON!'
 Page: '400'
 ---
 Date: July 30, 2009
 Featured Tracks:
-- track:nannaquin
+- Nannaquin
 Flash: '[S] WHAT THIS IS SO OUTRAGEOUS'
 Page: '418'
 ---
@@ -155,7 +155,7 @@ Date: August 1, 2009
 URLs:
 - https://www.bgreco.net/hsflash/002322.html
 Featured Tracks:
-- track:skies-of-skaia
+- Skies of Skaia
 Flash: '[S] GO ON. ==>'
 Page: '422'
 ---
@@ -163,19 +163,19 @@ Date: August 15, 2009
 URLs:
 - https://www.bgreco.net/hsflash/002376.html
 Featured Tracks:
-- track:harlequin-rock-version
+- Harlequin (Rock Version)
 Flash: '[S] ==>'
 Page: '476'
 ---
 Date: September 15, 2009
 Featured Tracks:
-- track:john-sleeps-skaian-magicant
+- John Sleeps / Skaian Magicant
 Flash: '[S] John: Sleep.'
 Page: '644'
 ---
 Date: September 17, 2009
 Featured Tracks:
-- track:john-sleeps-skaian-magicant
+- John Sleeps / Skaian Magicant
 Flash: '[S] John: Wake up.'
 Page: '651'
 ---
@@ -184,7 +184,7 @@ URLs:
 - https://youtu.be/hLzo0aaSvlg
 - https://www.bgreco.net/hsflash/002565.html
 Featured Tracks:
-- track:upward-movement-dave-owns
+- Upward Movement (Dave Owns)
 Flash: '[S] Dave: Ascend to the highest point of the building.'
 Page: '665'
 ---
@@ -193,7 +193,7 @@ URLs:
 - https://youtu.be/bQ2Lw3dcilg
 - https://www.bgreco.net/hsflash/002621.html
 Featured Tracks:
-- track:vagabounce
+- Vagabounce
 Flash: '[S] WV: Lead your men to victory!'
 Page: '721'
 ---
@@ -211,7 +211,7 @@ URLs:
 - https://youtu.be/a-WxdPfVddo
 - https://www.bgreco.net/hsflash/002657.html
 Featured Tracks:
-- track:explore
+- Explore
 Flash: '[S] WV: Ascend.'
 Page: '757'
 ---
@@ -233,15 +233,15 @@ Page: '822'
 ---
 Date: October 31, 2009
 Featured Tracks:
-- track:showtime-remix
-- track:aggrieve-remix
-- track:verdancy-bassline
+- Showtime Remix
+- Aggrieve Remix
+- Verdancy (Bassline)
 - Potential Verdancy
-- track:ohgodwhat
-- track:ohgodwhat-remix
-- track:rediscover-fusion
+- Ohgodwhat
+- Ohgodwhat Remix
+- Rediscover Fusion
 - Crystalanthemums
-- track:explore-remix
+- Explore Remix
 Flash: '[S] Jade: Open FreshJamz!'
 Page: '830'
 ---
@@ -258,7 +258,7 @@ Date: November 6, 2009
 URLs:
 - https://www.bgreco.net/hsflash/002736.html
 Featured Tracks:
-- track:beatdown-strider-style
+- Beatdown (Strider Style)
 Flash: '[S] Dave: STRIFE.'
 Page: '836'
 ---
@@ -266,7 +266,7 @@ Date: November 8, 2009
 URLs:
 - https://www.bgreco.net/hsflash/002743.html
 Featured Tracks:
-- track:harleboss
+- Harleboss
 Flash: '[S] Jade: Descend.'
 Page: '843'
 ---
@@ -274,7 +274,7 @@ Date: November 18, 2009
 URLs:
 - https://www.bgreco.net/hsflash/002771.html
 Featured Tracks:
-- track:beatdown-round-2
+- Beatdown Round 2
 Flash: '[S] Dave: Abscond.'
 Page: '871'
 ---
@@ -282,7 +282,7 @@ Date: November 20, 2009
 URLs:
 - https://www.bgreco.net/hsflash/002779.html
 Featured Tracks:
-- track:harleboss
+- Harleboss
 Flash: '[S] Rose: Ascend.'
 Page: '879'
 ---
@@ -290,7 +290,7 @@ Date: November 27, 2009
 URLs:
 - https://www.bgreco.net/hsflash/002818.html
 Featured Tracks:
-- track:dissension-original
+- Dissension (Original)
 Flash: '[S] Strife!!!'
 Page: '918'
 ---
@@ -298,7 +298,7 @@ Date: December 1, 2009
 URLs:
 - https://www.bgreco.net/hsflash/002838.html
 Featured Tracks:
-- track:chorale-for-jaspers
+- Chorale for Jaspers
 Flash: '[S] Rose: Fast forward to now.'
 Page: '938'
 ---
@@ -306,7 +306,7 @@ Date: December 1, 2009
 URLs:
 - https://youtu.be/USB1pj6hAjU
 Featured Tracks:
-- track:pony-chorale
+- Pony Chorale
 Flash: '[S] Ride.'
 Page: pony
 ---
@@ -315,13 +315,13 @@ URLs:
 - https://youtu.be/DNydoi_vFng
 - https://www.bgreco.net/hsflash/002848.html
 Featured Tracks:
-- track:revelawesome
+- Revelawesome
 Flash: '[S] John: Examine your dad''s room.'
 Page: '948'
 ---
 Date: December 6, 2009
 Featured Tracks:
-- track:hardlyquin
+- Hardlyquin
 Flash: '[S] John: Mental breakdown.'
 Page: '979'
 ---
@@ -330,7 +330,7 @@ URLs:
 - https://www.bgreco.net/hsflash/002880.html
 Featured Tracks:
 - An Unbreakable Union
-- track:carefree-victory
+- Carefree Victory
 Flash: '[S] Jade: Retrieve package.'
 Page: '980'
 ---
@@ -354,7 +354,7 @@ URLs:
 - https://youtu.be/WYF1aiE0fOc
 - https://www.bgreco.net/hsflash/002973.html
 Featured Tracks:
-- track:ballad-of-awakening
+- Ballad of Awakening
 Flash: '[S] Jade: Pester John.'
 Page: '1073'
 ---
@@ -363,7 +363,7 @@ URLs:
 - https://youtu.be/g2CBnn3d1cY
 - https://www.bgreco.net/hsflash/003049.html
 Featured Tracks:
-- track:sburban-jungle
+- Sburban Jungle
 Flash: '[S] Enter.'
 Page: '1149'
 ---
@@ -387,7 +387,7 @@ Date: February 10, 2010
 URLs:
 - https://www.bgreco.net/hsflash/003258.html
 Featured Tracks:
-- track:doctor
+- Doctor
 Flash: '[S] ACT 4 ==>'
 Page: '1358'
 ---
@@ -396,7 +396,7 @@ URLs:
 - https://youtu.be/iRHWm9R59mo
 - https://www.bgreco.net/hsflash/003307.html
 Featured Tracks:
-- track:endless-climb
+- Endless Climb
 Flash: '[S] ==>'
 Page: '1407'
 ---
@@ -405,7 +405,7 @@ URLs:
 - https://youtu.be/kgddCGdUq9c
 - https://www.bgreco.net/hsflash/003541.html
 Featured Tracks:
-- track:atomyk-ebonpyre
+- Atomyk Ebonpyre
 Flash: '[S] Dave: Accelerate.'
 Page: '1641'
 ---
@@ -422,7 +422,7 @@ URLs:
 - https://youtu.be/DaYBhbe0dns
 - https://www.bgreco.net/hsflash/003568.html
 Featured Tracks:
-- track:black
+- Black
 - Descend
 Flash: '[S] Jack: Ascend.'
 Page: '1668'
@@ -615,7 +615,7 @@ URLs:
 - https://youtu.be/BeeVidHB8-I
 - https://www.bgreco.net/hsflash/004827.html
 Featured Tracks:
-- track:umbral-ultimatum
+- Umbral Ultimatum
 Flash: '[S] Jade: Enter.'
 Page: '2927'
 ---
@@ -649,7 +649,7 @@ Date: December 15, 2010
 URLs:
 - https://www.bgreco.net/hsflash/004979.html
 Featured Tracks:
-- track:planet-healer
+- Planet Healer
 - Typheus
 Flash: '[S] John: Enter village.'
 Page: '3079'
@@ -953,7 +953,7 @@ Page: '4572'
 ---
 Date: February 26, 2012
 Featured Tracks:
-- track:chorale-for-jaspers
+- Chorale for Jaspers
 Flash: '[S] Frigglish: Fast forward to Jaspersprite.'
 Page: '4617'
 ---
@@ -961,7 +961,7 @@ Date: February 26, 2012
 URLs:
 - https://youtu.be/vHSyoThUyOQ
 Featured Tracks:
-- track:pony-chorale
+- Pony Chorale
 Flash: '[S] Ride.'
 Page: pony2
 ---
@@ -1015,7 +1015,7 @@ Page: '4827'
 ---
 Date: May 17, 2012
 Featured Tracks:
-- track:black
+- Black
 Flash: '[S] DD: Ascend.'
 Page: '4942'
 ---
@@ -1029,7 +1029,7 @@ Page: '4944'
 ---
 Date: June 12, 2012
 Featured Tracks:
-- track:i-dont-want-to-miss-a-thing
+- I Don't Want to Miss a Thing
 Flash: '[S] Terry: Fast forward to Liv.'
 Page: '5027'
 ---
diff --git a/groups.yaml b/groups.yaml
index 90001e1f..e1877ca2 100644
--- a/groups.yaml
+++ b/groups.yaml
@@ -134,7 +134,7 @@ Group: Michael Guy Bowman
 URLs:
 - https://bowman.bandcamp.com/
 Description: |-
-    Renowned for [[track:sburban-jungle]], his official solo album [[album:mobius-trip-and-hadron-kaleido]] and many other hit Homestuck releases, Bowman has gone on to create his own expansive personal discography since.
+    Renowned for [[Sburban Jungle]], his official solo album [[album:mobius-trip-and-hadron-kaleido]] and many other hit Homestuck releases, Bowman has gone on to create his own expansive personal discography since.
 ---
 Group: Nasqueron
 URLs:
@@ -146,7 +146,7 @@ Group: Parsec Productions
 URLs:
 - https://parsecproductions.bandcamp.com/
 Description: |-
-    Best known to Homestuck fans for creating some of its [[track:skies-of-skaia|foundational]] [[track:aggrieve|themes]], and to the internet at large for Slender: The Eight Pages and [[album:slender-the-arrival-soundtrack|its sequel]], Mark J. Hadley is a multitalented composer and independent developer.
+    Best known to Homestuck fans for creating some of its [[Skies of Skaia|foundational]] [[Aggrieve|themes]], and to the internet at large for Slender: The Eight Pages and [[album:slender-the-arrival-soundtrack|its sequel]], Mark J. Hadley is a multitalented composer and independent developer.
 ---
 Group: tempest2k
 URLs:
diff --git a/news.yaml b/news.yaml
index 1a7dd1ef..0505a2db 100644
--- a/news.yaml
+++ b/news.yaml
@@ -187,7 +187,7 @@ Content: |-
 
     Ooo, exciting! We'll introduce the new albums first, then check out other additions and features across the site.
 
-    The big name communal addition this time around comes from [[group:canmt]], [[album:cool-and-new-volume-v]]! They heard you like [[track:doctor|Doctor]], so they put more [[track:doctor-remix|Doctor]] in your [[track:plague-doctor|Doctor]]. Now you can [[track:savior-of-the-waking-world|Doctor]] while you [[track:descend|Doctor]] and honestly, that's really quite [[track:doctar|Doctar]].
+    The big name communal addition this time around comes from [[group:canmt]], [[album:cool-and-new-volume-v]]! They heard you like [[Doctor]], so they put more [[track:doctor-remix|Doctor]] in your [[track:plague-doctor|Doctor]]. Now you can [[track:savior-of-the-waking-world|Doctor]] while you [[track:descend|Doctor]] and honestly, that's really quite [[track:doctar|Doctar]].
 
     Okay, it sounds like a playful tribute album, and in ways it is; yet it's also a sincere love letter to the spirit and memories Buzinkai gave through their music to Homestuck's entire community. Give it a listen if it's new to you! (Thanks to koba and Niklink for bringing this to the wiki.)
 
diff --git a/static-page/changelog.yaml b/static-page/changelog.yaml
index 8958effb..9a3e399c 100644
--- a/static-page/changelog.yaml
+++ b/static-page/changelog.yaml
@@ -1014,7 +1014,7 @@ Content: |-
         - [[track:let-me-dance-let-me-glisten]] now featured in [[track:the-light-forms-us]]
         - [[track:giorgio-by-moroder]] now featured in [[track:the-dave-strider-experience]]
         - [[track:what-is-a-juggalo]] now featured in [[track:the-dave-strider-experience]]
-        - [[track:verdancy-bassline]] now featured in [[track:study-for-eclectic-bass-1984-1]]
+        - [[Verdancy (Bassline)]] now featured in [[track:study-for-eclectic-bass-1984-1]]
         - [[track:virgin-orb]] now featured in [[track:recordare-virgo-mater]]
         - [[track:dissension-original]] now featured in [[track:the-puppet-master]]
         - [[track:nova-solis]] now featured in [[track:singularity]]