clean up remaining ambiguous names

52 files changed, 136 insertions, 118 deletions

diff --git a/album/9.yaml b/album/9.yaml
index aff9d779..66fb7427 100644
--- a/album/9.yaml
+++ b/album/9.yaml
@@ -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.
@@ -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.
@@ -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
@@ -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
diff --git a/album/alternia.yaml b/album/alternia.yaml
index 17043ea1..28952fd7 100644
--- a/album/alternia.yaml
+++ b/album/alternia.yaml
@@ -33,7 +33,7 @@ Commentary: |-
     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]], [[track:crustacean|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.
diff --git a/album/alterniabound.yaml b/album/alterniabound.yaml
index e57f977a..52c49b54 100644
--- a/album/alterniabound.yaml
+++ b/album/alterniabound.yaml
@@ -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:
@@ -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:
@@ -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 49aa9fc4..fd686cf3 100644
--- a/album/ancestral.yaml
+++ b/album/ancestral.yaml
@@ -389,7 +389,7 @@ Art Tags:
 - Alternia
 - 'cw: hanging'
 Referenced Tracks:
-- track:theme
+- Theme
 - Darling Dolorosa
 - Iron Infidel
 - track:olive-scribe
@@ -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.
diff --git a/album/aspect-clock.yaml b/album/aspect-clock.yaml
index f8d66710..2418486a 100644
--- a/album/aspect-clock.yaml
+++ b/album/aspect-clock.yaml
@@ -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
 ---
diff --git a/album/beforus.yaml b/album/beforus.yaml
index 0c122a21..898b35b8 100644
--- a/album/beforus.yaml
+++ b/album/beforus.yaml
@@ -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.
@@ -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.
diff --git a/album/bowmania.yaml b/album/bowmania.yaml
index cfb301f8..d9e8a0af 100644
--- a/album/bowmania.yaml
+++ b/album/bowmania.yaml
@@ -48,7 +48,7 @@ Duration: '02:18'
 Referenced Tracks:
 - Michael Bowman Remix
 - Savior of a Lot of Money
-- track:heir-of-grief
+- Heir of Grief
 Sampled Tracks:
 - Your Bed
 - Bumper to Bumper
diff --git a/album/call-and-new-2-locomotif.yaml b/album/call-and-new-2-locomotif.yaml
index 98077ba2..8cc56675 100644
--- a/album/call-and-new-2-locomotif.yaml
+++ b/album/call-and-new-2-locomotif.yaml
@@ -133,7 +133,7 @@ Referenced Tracks:
 - Fruity Pebbles Jingle
 - Upward Movement (Dave Owns)
 - Oppa Toby Style
-- track:mutiny
+- Mutiny
 ---
 Track: Hijacking Jungle
 Artists:
@@ -146,7 +146,7 @@ URLs:
 - https://youtu.be/e0RDJOz5XH0
 Referenced Tracks:
 - Backtracking
-- track:umbral-ultimatum
+- Umbral Ultimatum
 - track:MeGaLoVania
 - Sburban Jungle
 ---
diff --git a/album/canwave-2.yaml b/album/canwave-2.yaml
index 75b4762f..cd5c61a4 100644
--- a/album/canwave-2.yaml
+++ b/album/canwave-2.yaml
@@ -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
diff --git a/album/canwc-sound-test-1.yaml b/album/canwc-sound-test-1.yaml
index c192066f..ea94e00c 100644
--- a/album/canwc-sound-test-1.yaml
+++ b/album/canwc-sound-test-1.yaml
@@ -655,7 +655,7 @@ URLs:
 Referenced Tracks:
 - Showtime (Piano Refrain)
 - Doctor
-- track:umbral-ultimatum
+- Umbral Ultimatum
 - Endless Climb
 ---
 Track: Like Jimmy, Like Flash
@@ -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:
@@ -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
 ---
diff --git a/album/cool-and-new-homestuck-2.yaml b/album/cool-and-new-homestuck-2.yaml
index e5c08230..fafa7fdd 100644
--- a/album/cool-and-new-homestuck-2.yaml
+++ b/album/cool-and-new-homestuck-2.yaml
@@ -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
diff --git a/album/cool-and-new-homestuck-3.yaml b/album/cool-and-new-homestuck-3.yaml
index 1a73e186..f697da85 100644
--- a/album/cool-and-new-homestuck-3.yaml
+++ b/album/cool-and-new-homestuck-3.yaml
@@ -300,12 +300,12 @@ URLs:
 - https://youtu.be/AQZ5VZ60dKo
 Referenced Tracks:
 - Unbreakable Unity
-- track:mutiny
+- Mutiny
 - Mutiny (crapapella)
 - Carefree Victory
 Sampled Tracks:
 - Unbreakable Unity
-- track:mutiny
+- Mutiny
 - Feel (Alive)
 - Mutiny (crapapella)
 Lyrics: |-
@@ -338,7 +338,7 @@ Referenced Tracks:
 - RollerCoaster Tycoon Theme
 - 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)
@@ -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
diff --git a/album/cool-and-new-homestuck.yaml b/album/cool-and-new-homestuck.yaml
index 94a69b3b..8a1e0341 100644
--- a/album/cool-and-new-homestuck.yaml
+++ b/album/cool-and-new-homestuck.yaml
@@ -252,7 +252,7 @@ Referenced Tracks:
 - Litrichean Rioghail
 - Dance of Thorns
 - Chorale for Jaspers
-- track:under-the-hat
+- Under The Hat
 - Upward Movement (Dave Owns)
 Sampled Tracks:
 - Mayor Maynot
@@ -823,7 +823,7 @@ Referenced Tracks:
 - Beatdown (Strider Style)
 - Unity of Thorns
 - Even in Death
-- track:under-the-hat
+- Under The Hat
 - Explore
 - licord nacrasty
 - Skaian Summoning
@@ -1037,7 +1037,7 @@ URLs:
 Art Tags:
 - Jade
 Referenced Tracks:
-- track:umbral-ultimatum
+- Umbral Ultimatum
 - Sburban Jungle
 - track:MeGaLoVania
 - track:sunslammer
diff --git a/album/cool-and-new-volume-2.yaml b/album/cool-and-new-volume-2.yaml
index ac0a006b..4ba33bf0 100644
--- a/album/cool-and-new-volume-2.yaml
+++ b/album/cool-and-new-volume-2.yaml
@@ -161,7 +161,7 @@ URLs:
 Referenced Tracks:
 - track:guardian-v2
 - Explore
-- track:mutiny
+- Mutiny
 - Non Compos Mentis
 Sampled Tracks:
 - track:pastor-bill-bolin
@@ -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)
diff --git a/album/cool-and-new-volume-7.yaml b/album/cool-and-new-volume-7.yaml
index cc0d0925..80f25514 100644
--- a/album/cool-and-new-volume-7.yaml
+++ b/album/cool-and-new-volume-7.yaml
@@ -145,7 +145,7 @@ URLs:
 Referenced Tracks:
 - Liquid Negrocity
 - Black
-- track:the-ballad-of-jack-noir
+- The Ballad of Jack Noir
 - A Baby Legend - The Baby is 2
 - Break Shot
 - Endless Climb
@@ -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...
 ---
@@ -765,7 +765,7 @@ Referenced Tracks:
 - Moshi Moshi?
 - Doctor
 - Lotus
-- track:umbral-ultimatum
+- Umbral Ultimatum
 - Stay in Touch
 ---
 Track: Moonreposter
diff --git a/album/cool-and-new-volume-ii.yaml b/album/cool-and-new-volume-ii.yaml
index a050d1ad..501e9c57 100644
--- a/album/cool-and-new-volume-ii.yaml
+++ b/album/cool-and-new-volume-ii.yaml
@@ -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>
@@ -1085,9 +1085,9 @@ Referenced Tracks:
 - 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
diff --git a/album/cool-and-new-volume-sx.yaml b/album/cool-and-new-volume-sx.yaml
index 6f3db95f..db4ab4e3 100644
--- a/album/cool-and-new-volume-sx.yaml
+++ b/album/cool-and-new-volume-sx.yaml
@@ -2269,7 +2269,7 @@ Referenced Tracks:
 - Despot
 - Pumpkin Party in Sea Hitler's Water Apocalypse
 - Rex Duodecim Angelus
-- track:theme
+- Theme
 - Courser
 - Snow halation
 ---
diff --git a/album/cool-and-new-voulem1.yaml b/album/cool-and-new-voulem1.yaml
index ccc026f5..fd0b83b6 100644
--- a/album/cool-and-new-voulem1.yaml
+++ b/album/cool-and-new-voulem1.yaml
@@ -907,7 +907,7 @@ URLs:
 - https://www.youtube.com/watch?v=fGvEDsNa6mg
 Referenced Tracks:
 - track:megalovania-halloween
-- track:heir-of-grief
+- Heir of Grief
 - Sburban Countdown
 - Homestuck Anthem
 Art Tags:
diff --git a/album/cosmic-caretakers.yaml b/album/cosmic-caretakers.yaml
index f3fe80ac..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 [[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.
 ---
@@ -165,7 +165,7 @@ Art Tags:
 - Earth
 Referenced Tracks:
 - Beatdown (Strider Style)
-- track:umbral-ultimatum
+- 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 [[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.
@@ -353,7 +353,7 @@ Referenced Tracks:
 - Verdancy (Bassline)
 - Skaianet
 - Gardener
-- track:mutiny
+- Mutiny
 - Roundabout
 - Afraid of the Darko
 - Piss
diff --git a/album/diverging-delicacies.yaml b/album/diverging-delicacies.yaml
index 1ada3404..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:
@@ -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
diff --git a/album/dont-read-a-webcomic-called-homestuck.yaml b/album/dont-read-a-webcomic-called-homestuck.yaml
index c6b8706e..08b9c725 100644
--- a/album/dont-read-a-webcomic-called-homestuck.yaml
+++ b/album/dont-read-a-webcomic-called-homestuck.yaml
@@ -29,12 +29,13 @@ Referenced Tracks:
 ---
 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
+- Heir of Grief
 - Harlequin
 ---
 Track: Moonskater
@@ -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/exile.yaml b/album/exile.yaml
index fce24140..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
diff --git a/album/friendsymphony.yaml b/album/friendsymphony.yaml
index de356366..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:
@@ -277,7 +277,7 @@ Cover Artists:
 Referenced Tracks:
 - Courser
 - Sburban Jungle
-- track:umbral-ultimatum
+- Umbral Ultimatum
 ---
 Track: no *kills you*
 Artists:
diff --git a/album/gotta-hatch-em-all.yaml b/album/gotta-hatch-em-all.yaml
index 2f716553..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'
@@ -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
@@ -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/heinoustuck-vol-1.yaml b/album/heinoustuck-vol-1.yaml
index bc59071e..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'
@@ -150,7 +151,7 @@ Art Tags:
 - 'cw: body horror'
 - 'cw: blood'
 Referenced Tracks:
-- track:umbral-ultimatum
+- Umbral Ultimatum
 - Dissension (Original)
 ---
 Track: Trypophobic Canine
@@ -181,6 +182,7 @@ Art Tags:
 ---
 Track: Nightmare
 Directory: nightmare-heinoustuck
+Always Reference By Directory: true
 Artists:
 - karelianArmy
 Duration: '01:09'
diff --git a/album/homestuck-vol-10.yaml b/album/homestuck-vol-10.yaml
index 0f02a157..17da6535 100644
--- a/album/homestuck-vol-10.yaml
+++ b/album/homestuck-vol-10.yaml
@@ -776,7 +776,7 @@ Art Tags:
 - Jane
 Referenced Tracks:
 - Warhammer of Zillyhoo
-- track:calamity
+- Calamity
 - Walk-Stab-Walk (R&E)
 - Doctor
 - Dirgeish
diff --git a/album/homestuck-vol-5.yaml b/album/homestuck-vol-5.yaml
index 73fd969c..565114b6 100644
--- a/album/homestuck-vol-5.yaml
+++ b/album/homestuck-vol-5.yaml
@@ -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:
@@ -1457,7 +1457,7 @@ Referenced Tracks:
 - Upward Movement (Dave Owns)
 - Sburban Jungle
 - Beatdown (Strider Style)
-- track:mutiny
+- Mutiny
 - Skies of Skaia
 - Showtime (Original Mix)
 - Aggrieve
diff --git a/album/homestuck-vol-9.yaml b/album/homestuck-vol-9.yaml
index 6060b84e..35ff4385 100644
--- a/album/homestuck-vol-9.yaml
+++ b/album/homestuck-vol-9.yaml
@@ -1169,7 +1169,7 @@ Referenced Tracks:
 - Upward Movement (Dave Owns)
 - Sburban Jungle
 - Beatdown (Strider Style)
-- track:mutiny
+- Mutiny
 - Explore
 - track:penumbra-phantasm
 - Descend
diff --git a/album/intermishin.yaml b/album/intermishin.yaml
index 0638357b..a6b75d3a 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/jpeg.yaml b/album/jpeg.yaml
index bbdaac6b..a7fdf307 100644
--- a/album/jpeg.yaml
+++ b/album/jpeg.yaml
@@ -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.
diff --git a/album/lofam.yaml b/album/lofam.yaml
index 965d6040..858bd6f9 100644
--- a/album/lofam.yaml
+++ b/album/lofam.yaml
@@ -86,7 +86,7 @@ Referenced Tracks:
 - 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.
@@ -634,7 +634,7 @@ Referenced Tracks:
 - Eridan's Theme
 - The Beginning of Something Really Excellent
 - track:miracles
-- track:theme
+- Theme
 - Aggrieve
 - Showtime (Original Mix)
 - Showdown
@@ -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'
diff --git a/album/lofam2.yaml b/album/lofam2.yaml
index 79ce3d93..1183136c 100644
--- a/album/lofam2.yaml
+++ b/album/lofam2.yaml
@@ -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.
@@ -473,7 +473,7 @@ Referenced Tracks:
 - 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: |-
@@ -612,7 +612,7 @@ Referenced Tracks:
 - Showtime (Piano Refrain)
 - Showtime (Original Mix)
 - Sburban Jungle
-- track:i-dont-want-to-miss-a-thing
+- 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.
@@ -970,7 +970,7 @@ Referenced Tracks:
 - 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
@@ -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:
@@ -1666,7 +1666,7 @@ Referenced Tracks:
 - Dance of Thorns
 - 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 4d541d6f..4af2425f 100644
--- a/album/lofam3.yaml
+++ b/album/lofam3.yaml
@@ -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
diff --git a/album/lofam4.yaml b/album/lofam4.yaml
index bfde191c..5864e501 100644
--- a/album/lofam4.yaml
+++ b/album/lofam4.yaml
@@ -876,7 +876,7 @@ Referenced Tracks:
 - Beatdown (Strider Style)
 - Showtime (Original Mix)
 - Sburban Jungle
-- track:theme
+- Theme
 - track:crustacean
 - Walls Covered in Blood
 - The Lemonsnout Turnabout
@@ -942,7 +942,7 @@ Commentary: |-
     - [[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
-    - [[track:theme]] - 2:07-2:30
+    - [[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
@@ -2362,7 +2362,7 @@ Referenced Tracks:
 - Bilious
 - Earthsea Borealis
 - English
-- track:umbral-ultimatum
+- Umbral Ultimatum
 - Endless Climb
 - Even in Death
 Commentary: |-
@@ -2739,7 +2739,7 @@ Referenced Tracks:
 - Calamari Inkantation
 - Feel (Alive)
 - Hopes and Dreams
-- track:theme
+- Theme
 - September Pumpkin
 - Theme of Eastern Story
 - Magical Hopalong Cassidy Station
@@ -2771,7 +2771,7 @@ Commentary: |-
     - [[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
diff --git a/album/lofam5.yaml b/album/lofam5.yaml
index f6c5bf9a..eb43b3b2 100644
--- a/album/lofam5.yaml
+++ b/album/lofam5.yaml
@@ -211,7 +211,7 @@ Art Tags:
 Referenced Tracks:
 - track:penumbra-phantasm
 - Doctor
-- track:heir-of-grief
+- Heir of Grief
 - Moshi Moshi?
 Commentary: |-
     <i>FrostyMac:</i>
@@ -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|Heir of Grief]], right? Yeah me too, thought it was a perfect fit.
 ---
 Track: Collapse Reprise
 Artists:
@@ -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 c3241ca4..bc124cf3 100644
--- a/album/lofam5a2.yaml
+++ b/album/lofam5a2.yaml
@@ -695,7 +695,7 @@ Art Tags:
 - John
 Referenced Tracks:
 - Sburban Jungle
-- track:umbral-ultimatum
+- Umbral Ultimatum
 - The Lemonsnout Turnabout
 - Liquid Negrocity
 - Descend
@@ -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.
@@ -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
@@ -2820,7 +2820,7 @@ Referenced Tracks:
 - Unite Synchronization
 - Upward Movement (Dave Owns)
 - track:liquid-negrocity
-- track:umbral-ultimatum
+- Umbral Ultimatum
 - Doctor
 - Endless Climb
 - Flare
diff --git a/album/more-homestuck-fandom.yaml b/album/more-homestuck-fandom.yaml
index 0642abe8..43ce10ef 100644
--- a/album/more-homestuck-fandom.yaml
+++ b/album/more-homestuck-fandom.yaml
@@ -468,6 +468,7 @@ URLs:
 ---
 Track: Mother
 Directory: mother-malcolm-brown
+Always Reference By Directory: true
 Artists:
 - Malcolm Brown
 Duration: '2:09'
@@ -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
 ---
@@ -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'
@@ -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|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. 
 
diff --git a/album/of-troles-and-chiptumes.yaml b/album/of-troles-and-chiptumes.yaml
index d9b6443b..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
diff --git a/album/one-year-older.yaml b/album/one-year-older.yaml
index dad3b717..011ba686 100644
--- a/album/one-year-older.yaml
+++ b/album/one-year-older.yaml
@@ -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 192cc1d5..a1d34c12 100644
--- a/album/p-s.yaml
+++ b/album/p-s.yaml
@@ -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:
@@ -279,7 +279,7 @@ URLs:
 Referenced Tracks:
 - Skies of Skaia
 - Homestuck Anthem
-- track:theme
+- Theme
 - Crystalanthemums
 - The Beginning of Something Really Excellent
 - Eden
diff --git a/album/portalstuck-vol-1.yaml b/album/portalstuck-vol-1.yaml
index 1f35b766..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
diff --git a/album/references-beyond-homestuck.yaml b/album/references-beyond-homestuck.yaml
index e9492fad..107eb4e0 100644
--- a/album/references-beyond-homestuck.yaml
+++ b/album/references-beyond-homestuck.yaml
@@ -1175,6 +1175,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
@@ -5265,6 +5266,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/retcon-2018.yaml b/album/retcon-2018.yaml
index 471e60c8..15e305ee 100644
--- a/album/retcon-2018.yaml
+++ b/album/retcon-2018.yaml
@@ -49,7 +49,7 @@ Duration: '03:37'
 URLs:
 - https://8-bitshit.bandcamp.com/track/space
 Referenced Tracks:
-- track:umbral-ultimatum
+- Umbral Ultimatum
 ---
 Track: Interlude I
 Duration: '01:12'
diff --git a/album/s-collide.yaml b/album/s-collide.yaml
index f2d8bf6d..6afe7730 100644
--- a/album/s-collide.yaml
+++ b/album/s-collide.yaml
@@ -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-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 70d78408..c74f7ba0 100644
--- a/album/sburb-ost.yaml
+++ b/album/sburb-ost.yaml
@@ -210,7 +210,7 @@ Art Tags:
 - Earth
 Referenced Tracks:
 - Sburban Jungle
-- track:umbral-ultimatum
+- 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.
diff --git a/album/skaian-synthesis.yaml b/album/skaian-synthesis.yaml
index 7975998b..a4d7be42 100644
--- a/album/skaian-synthesis.yaml
+++ b/album/skaian-synthesis.yaml
@@ -40,7 +40,7 @@ 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
diff --git a/album/strife-2.yaml b/album/strife-2.yaml
index 9c006322..24702d86 100644
--- a/album/strife-2.yaml
+++ b/album/strife-2.yaml
@@ -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'
diff --git a/album/theres-no-place-like-home.yaml b/album/theres-no-place-like-home.yaml
index d154dbd6..3b645cff 100644
--- a/album/theres-no-place-like-home.yaml
+++ b/album/theres-no-place-like-home.yaml
@@ -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
@@ -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,7 +124,7 @@ Referenced Tracks:
 - Killed by BR8K Spider!!!!!!!!
 - Spider's Claw
 - Liquid Negrocity
-- track:the-ballad-of-jack-noir
+- The Ballad of Jack Noir
 - Atomyk Ebonpyre
 - Solar Sect of Mystic Wisdom ~ Nuclear Fusion
 - The Golden Towers
@@ -203,7 +203,7 @@ Referenced Tracks:
 - track:penumbra-phantasm
 - Thanks for Playing
 - Cascade (Beta)
-- track:heir-of-grief
+- Heir of Grief
 - Doctor
 - Descend
 ---
diff --git a/album/v8lume.yaml b/album/v8lume.yaml
index 4945363c..e792b405 100644
--- a/album/v8lume.yaml
+++ b/album/v8lume.yaml
@@ -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
@@ -1720,7 +1720,7 @@ Referenced Tracks:
 - Infinity Mechanism
 - Atomyk Ebonpyre
 - Showtime (Original Mix)
-- track:theme
+- Theme
 - Dissension (Original)
 - Aggrieve
 - The Thirteenth Hour
diff --git a/album/vinculum-vitae.yaml b/album/vinculum-vitae.yaml
index 4f428fdd..5b911ad1 100644
--- a/album/vinculum-vitae.yaml
+++ b/album/vinculum-vitae.yaml
@@ -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'
diff --git a/flashes.yaml b/flashes.yaml
index 95d9c08d..9ae94a3c 100644
--- a/flashes.yaml
+++ b/flashes.yaml
@@ -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'
@@ -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'
 ---