« get me outta code hell

directories upon directories - hsmusic-data - Data files for https://hsmusic.wiki - track, album, artist & flash info, etc
summary refs log tree commit diff
path: root/album
diff options
context:
space:
mode:
author(quasar) nebula <qznebula@protonmail.com>2023-11-04 16:44:48 -0300
committer(quasar) nebula <qznebula@protonmail.com>2023-11-04 16:44:48 -0300
commiteeef1ccd74b5e63381f99be55b3864ee16d92e11 (patch)
treefcc601e54a3c21570a0dfc802b56f2f495d2aef5 /album
parent561eddba74bed82f1389898b451a65783966958f (diff)
directories upon directories
Diffstat (limited to 'album')
-rw-r--r--album/9.yaml38
-rw-r--r--album/_.yaml4
-rw-r--r--album/a-nameless-inheritance.yaml32
-rw-r--r--album/a-shade-of-blue.yaml1
-rw-r--r--album/a-viral-medium-vol-1.yaml2
-rw-r--r--album/aaaaaaaaaaaaaaaaaaaaa-a-single.yaml4
-rw-r--r--album/act-8-volume-1.yaml4
-rw-r--r--album/ancestral.yaml12
-rw-r--r--album/anew-again.yaml1
-rw-r--r--album/archive.yaml2
-rw-r--r--album/aspect-clock.yaml2
-rw-r--r--album/autumn-every-day.yaml2
-rw-r--r--album/basement-tale.yaml24
-rw-r--r--album/beforus.yaml4
-rw-r--r--album/bittersweet.yaml6
-rw-r--r--album/bowmania.yaml14
-rw-r--r--album/call-and-new-2-locomotif.yaml52
-rw-r--r--album/call-and-new-ii-emergency-phone-call.yaml4
-rw-r--r--album/call-and-new-v.yaml14
-rw-r--r--album/call-and-new.yaml6
-rw-r--r--album/canwave-2.yaml20
-rw-r--r--album/canwave-3.yaml10
-rw-r--r--album/canwave.yaml4
-rw-r--r--album/canwc-for-the-spookdays.yaml4
-rw-r--r--album/canwc-sound-test-1.yaml42
-rw-r--r--album/carne-vale-fusion-collab.yaml8
-rw-r--r--album/class-act-b-side.yaml6
-rw-r--r--album/class-act.yaml2
-rw-r--r--album/cool-and-new-greatest-hits.yaml4
-rw-r--r--album/cool-and-new-homestuck-2.yaml2
-rw-r--r--album/cool-and-new-homestuck-3.yaml10
-rw-r--r--album/cool-and-new-homestuck.yaml5
-rw-r--r--album/cool-and-new-volume-2.yaml2
-rw-r--r--album/cool-and-new-volume-3.yaml12
-rw-r--r--album/cool-and-new-volume-7.yaml4
-rw-r--r--album/cool-and-new-volume-ii.yaml2
-rw-r--r--album/cool-and-new-volume-sx.yaml14
-rw-r--r--album/cool-and-new-volume-v.yaml7
-rw-r--r--album/cool-and-new-voulem1.yaml6
-rw-r--r--album/corporate-holiday-hits.yaml2
-rw-r--r--album/cosmic-caretakers.yaml8
-rw-r--r--album/cyber-city-sound-pak.yaml2
-rw-r--r--album/cyclica.yaml4
-rw-r--r--album/dead-shufflers-anything-goes.yaml4
-rw-r--r--album/deltarune-ch1-ost.yaml12
-rw-r--r--album/deltarune-ch2-ost.yaml16
-rw-r--r--album/desynced-vol-1.yaml40
-rw-r--r--album/desynced-vol-2.yaml40
-rw-r--r--album/dialed-to-11.yaml2
-rw-r--r--album/diverging-delicacies.yaml12
-rw-r--r--album/early-access.yaml6
-rw-r--r--album/earthbound-halloween-hack.yaml10
-rw-r--r--album/election-season.yaml16
-rw-r--r--album/electric-daydreams.yaml2
-rw-r--r--album/empyreal-rhapsody.yaml5
-rw-r--r--album/entertaining-sound.yaml10
-rw-r--r--album/escaped-chasm.yaml4
-rw-r--r--album/faux-dramatica.yaml8
-rw-r--r--album/friendsim-2-volume-1.yaml22
-rw-r--r--album/friendsymphony.yaml4
-rw-r--r--album/glitchstuck-volume-1.yaml8
-rw-r--r--album/gotta-hatch-em-all.yaml4
-rw-r--r--album/gravity-makes-the-flame-rise.yaml6
-rw-r--r--album/greatest-hits-2.yaml14
-rw-r--r--album/guidestuck-volume-one.yaml6
-rw-r--r--album/heaven-sent.yaml2
-rw-r--r--album/heinoustuck-vol-1.yaml10
-rw-r--r--album/hiveswap-act-1-ost.yaml2
-rw-r--r--album/homestuck-2-beyond-canmt-vol-1.yaml4
-rw-r--r--album/homestuck-swagazaki.yaml2
-rw-r--r--album/homestuck-vol-10.yaml6
-rw-r--r--album/homestuck-vol-11.yaml2
-rw-r--r--album/homestuck-vol-6.yaml2
-rw-r--r--album/homestuck-vol-8.yaml2
-rw-r--r--album/hush.yaml8
-rw-r--r--album/i-am-writing-myself-a-dream-in-a-letter.yaml2
-rw-r--r--album/inhospitable-delisted.yaml6
-rw-r--r--album/intermishin.yaml11
-rw-r--r--album/ithaca.yaml4
-rw-r--r--album/jailbreak-vol-1.yaml22
-rw-r--r--album/jpeg.yaml10
-rw-r--r--album/labyrinths-heart.yaml10
-rw-r--r--album/le-canrivalry-album-is-mandatory.yaml36
-rw-r--r--album/lofam.yaml12
-rw-r--r--album/lofam2.yaml17
-rw-r--r--album/lofam3.yaml18
-rw-r--r--album/lofam4.yaml45
-rw-r--r--album/lofam5.yaml14
-rw-r--r--album/lofam5a2.yaml18
-rw-r--r--album/look-on-my-works-ye-mighty-and-despair.yaml3
-rw-r--r--album/megalovania-fusion-collab.yaml10
-rw-r--r--album/midnight-crew-drawing-dead.yaml2
-rw-r--r--album/moons-of-theseus.yaml8
-rw-r--r--album/more-homestuck-fandom.yaml35
-rw-r--r--album/muse-of-net.yaml8
-rw-r--r--album/nice-wizards-electronic-extravaganza.yaml4
-rw-r--r--album/oceanfables-ray-of-light.yaml10
-rw-r--r--album/oceanfalls-vol-1.yaml8
-rw-r--r--album/oceanfalls-vol-2.yaml12
-rw-r--r--album/oceanfalls-vol-3.yaml4
-rw-r--r--album/oceanfalls-vol-4.yaml4
-rw-r--r--album/oceanfalls-vol-five.yaml2
-rw-r--r--album/one-week-older.yaml10
-rw-r--r--album/p-s.yaml8
-rw-r--r--album/pantheon.yaml22
-rw-r--r--album/paths.yaml8
-rw-r--r--album/play-the-rain.yaml2
-rw-r--r--album/portalstuck-vol-1.yaml4
-rw-r--r--album/psycholonials-ep-2.yaml1
-rw-r--r--album/psycholonials-ep-3.yaml2
-rw-r--r--album/psycholonials-ep-4.yaml3
-rw-r--r--album/psycholonials-ep-5.yaml2
-rw-r--r--album/psycholonials-ep-7.yaml2
-rw-r--r--album/psycholonials-ep-9.yaml10
-rw-r--r--album/psycholonials.yaml92
-rw-r--r--album/qualia.yaml14
-rw-r--r--album/rappets-davekat-collection.yaml8
-rw-r--r--album/references-beyond-homestuck.yaml125
-rw-r--r--album/reminders-of-you-beta.yaml2
-rw-r--r--album/repiton.yaml12
-rw-r--r--album/retcon-2018.yaml9
-rw-r--r--album/rose-of-winter.yaml19
-rw-r--r--album/sburb-funkin-edition-ost.yaml8
-rw-r--r--album/sburban-neighborhood.yaml4
-rw-r--r--album/shortcuts.yaml1
-rw-r--r--album/slender-the-arrival-soundtrack.yaml22
-rw-r--r--album/someday.yaml4
-rw-r--r--album/songs-from-the-planet-earth.yaml4
-rw-r--r--album/songs-of-rivervale.yaml1
-rw-r--r--album/strife.yaml2
-rw-r--r--album/stuckhome-syndrome-part-one-v1.yaml50
-rw-r--r--album/sunday-night-strifin-act-1-plus-2-ost.yaml22
-rw-r--r--album/team-paradox.yaml8
-rw-r--r--album/the-ballad-of-megan-pouring.yaml2
-rw-r--r--album/the-consuming-shadow-ost.yaml21
-rw-r--r--album/the-funk-mclovin-homestuck-experience.yaml1
-rw-r--r--album/the-wanderers.yaml2
-rw-r--r--album/theres-no-place-like-home.yaml5
-rw-r--r--album/triassic-slump.yaml2
-rw-r--r--album/troleplanet.yaml2
-rw-r--r--album/tumblrstuck-bent-ost-volume-2.yaml1
-rw-r--r--album/ulterior-motives.yaml14
-rw-r--r--album/undertale-soundtrack.yaml26
-rw-r--r--album/v8lume.yaml8
-rw-r--r--album/vast-error-vol-1-3.yaml7
-rw-r--r--album/vast-error-vol-2.yaml4
-rw-r--r--album/vast-error-vol-3.yaml8
-rw-r--r--album/vast-error-vol-4.yaml14
-rw-r--r--album/vinculum-vitae.yaml4
-rw-r--r--album/virtue.yaml2
-rw-r--r--album/we-are-all-satellites.yaml8
-rw-r--r--album/weird-puzzle-tunes.yaml4
-rw-r--r--album/xenoplanetarium.yaml2
-rw-r--r--album/yes-we-canwc.yaml6
154 files changed, 1252 insertions, 406 deletions
diff --git a/album/9.yaml b/album/9.yaml
index 667bde2..56b91a2 100644
--- a/album/9.yaml
+++ b/album/9.yaml
@@ -104,7 +104,7 @@ URLs:
 Referenced Tracks:
 - Doctor
 - Gaia Queen
-- track:in-the-beginning-canwc
+- track:in-the-beginning-basement-tale
 - Muse of Nanchos
 - Aggrieve
 - track:midnight-suffer
@@ -127,7 +127,7 @@ Lyrics: |-
     D-D-D-D-DO IT!
 Commentary: |-
     <i>Discfortune:</i> (Composer)
-    Okay so when I make songs I usually start out with a dumb gimmick and then I haphazardly flesh it out to an acceptable point (ex. with 72.0x SHOWDOWN COMBO it was the name, with [[track:tick|Tick]] and [[track:tock|Tock]] it was the songs being able to be layered and panned, and with [[track:ringleader|Ringleader]] it was the time signature). Here I sort of started out with that--I was buying Dr. Pepper for a meme at the grocery store when an 11/8 tune came into my mind and I decided to run with it. It was pretty standard, and as usual I made progress rather slowly. The idea was to slowly build up time signatures to reflect the song building up in intensity and soundscape thickness (you might be able to pick out the song going from 11/8, to 12/8, to 13/4, to 14/8, to 4/4). Then later that week [[artist:cecily-renns|JohnJRenns]] gave a whole spiel on how people take too long to make songs for the sake of making them "the best ever" and that in order to improve we should be maximizing speed over quality to gain experience in retrospect. At first I said "okay that's a good idea maybe I'll do that" but then I thought to myself "no, f*** that, I'm going to do whatever the hell I want with this dumb song, it doesn't even need a gimmick". So I did that, and it took a long time, and it was a little bit tiring, but it was fun. I'll probably do this more often: just having fun. 
+    Okay so when I make songs I usually start out with a dumb gimmick and then I haphazardly flesh it out to an acceptable point (ex. with 72.0x SHOWDOWN COMBO it was the name, with [[track:tick|Tick]] and [[track:tock|Tock]] it was the songs being able to be layered and panned, and with [[track:ringleader-canmt|Ringleader]] it was the time signature). Here I sort of started out with that--I was buying Dr. Pepper for a meme at the grocery store when an 11/8 tune came into my mind and I decided to run with it. It was pretty standard, and as usual I made progress rather slowly. The idea was to slowly build up time signatures to reflect the song building up in intensity and soundscape thickness (you might be able to pick out the song going from 11/8, to 12/8, to 13/4, to 14/8, to 4/4). Then later that week [[artist:cecily-renns|JohnJRenns]] gave a whole spiel on how people take too long to make songs for the sake of making them "the best ever" and that in order to improve we should be maximizing speed over quality to gain experience in retrospect. At first I said "okay that's a good idea maybe I'll do that" but then I thought to myself "no, f*** that, I'm going to do whatever the hell I want with this dumb song, it doesn't even need a gimmick". So I did that, and it took a long time, and it was a little bit tiring, but it was fun. I'll probably do this more often: just having fun.
     The song uses a lot of synths, which is relatively new to me. But it was interesting to get a little bit more room to work with, EQ-wise. Also, my motif spacing was really weird. There's this one section before the piano Aggrieve where I vomited out like 3 or 4 motifs because I realized I wasn't being canwc-relevant enough. Probably the hardest part of making the song was the length. In general, it's really hard for me to make anything longer than 2 minutes because I hate looping/repeating sections.
     At the end of the day I guess the song was supposed to serve as the next in a long line of "songs that Crypt made to experiment with new genres"" but I think Spacetime Starstriker sounds too much like a more realized form of [[track:light-at-the-end-of-the-tunnel|Light at the End of the Tunnel]] from [[album:call-and-new-2-locomotif|Train Game]]. But hey, it got me to listen to more electronic music, which I almost never do outside of Homestuck. If I never release my solo album, imagine this as track three. Well, have fun with the rest of the album. It's probably our best one. Don't let [[artist:makin|Makin]] tell you otherwise. MEME
 ---
@@ -263,6 +263,8 @@ Commentary: |-
     <img src="media/misc/Simple-roller-coaster-clipart.jpg" width="150">
 ---
 Track: Stabby
+Directory: stabby-canmt
+Always Reference By Directory: true
 Artists:
 - Rom M
 Cover Artists:
@@ -863,7 +865,7 @@ URLs:
 - https://youtu.be/wcv8V3rZY48
 Referenced Tracks:
 - Lose Yourself
-- track:transcend
+- track:transcend-canmt
 - Sburban Jungle
 - Upward Movement (Dave Owns)
 - track:unintentional-touhou
@@ -881,7 +883,7 @@ Referenced Tracks:
 - track:conflict
 Sampled Tracks:
 - Lose Yourself
-- track:transcend
+- track:transcend-canmt
 - licord nacrasty
 - track:midnight-suffer
 - track:conflict
@@ -1087,7 +1089,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/cool-and-new-jungle
 - https://youtu.be/-35N2HANrPE
 Referenced Tracks:
-- Redial
+- track:redial-bomberman-hero
 - Sburban Jungle
 - Cool And New Countdown
 - I absolutely loathe this Drummer.
@@ -1098,7 +1100,7 @@ Referenced Tracks:
 - Another Jungle
 - track:jungle-3
 Sampled Tracks:
-- Redial
+- track:redial-bomberman-hero
 Commentary: |-
     <i>Difarem:</i> (Composer)
     I'm not really pleased with how this one turned out, especially the ending. It was originally concieved as a corresponding jungle for [[artist:mrcheeze|MrCheeze's]] [[track:cool-and-new-countdown|Cool and New Countdown]], from [[album:call-and-new|call and new]].
@@ -1495,6 +1497,8 @@ Commentary: |-
     European doctor pepper. Jpeg artifacts are intentional.
 ---
 Track: Endure
+Directory: endure-canmt
+Always Reference By Directory: true
 Artists:
 - Pipko Fanfare
 Cover Artists:
@@ -1539,7 +1543,7 @@ Referenced Tracks:
 - GameGrl (Original 1993 Mix)
 - The Nutshack Intro
 - Never Gonna Give You Up
-- Bonfire
+- track:bonfire-childish-gambino
 - Feel Good Inc.
 - I absolutely loathe this Drummer.
 - Tunak Tunak Tun
@@ -1547,7 +1551,7 @@ Referenced Tracks:
 - All Star
 - One Pound Fish
 - X Gon' Give It to Ya
-- Whales
+- track:whales-hail-mary-mallons
 - Put A Donk On It
 - JOHN DO THE WINDY THING
 - Without Me
@@ -1571,7 +1575,7 @@ Sampled Tracks:
 - GameGrl (Original 1993 Mix)
 - Never Gonna Give You Up
 - The Nutshack Intro
-- Bonfire
+- track:bonfire-childish-gambino
 - Feel Good Inc.
 - I absolutely loathe this Drummer.
 - Tunak Tunak Tun
@@ -1580,7 +1584,7 @@ Sampled Tracks:
 - All Star
 - One Pound Fish
 - X Gon' Give It to Ya
-- Whales
+- track:whales-hail-mary-mallons
 - Put A Donk On It
 - JOHN DO THE WINDY THING
 - Without Me
@@ -2081,6 +2085,8 @@ Commentary: |-
     This is probably the track art I'm most proud of for 9. I saw that it was an original composition, which I got really excited about - I could do practically whatever I wanted with the art. So, I'm proud to present my headcanon appearance for "o". Based off of the fact that he goes by a Hella Jeff image, he's a disturbingly high-resolution Hella Jeff clad in a dapper blue cloak, with a nancho around his neck, and two charismatic items (the Tetrix of the Arbitor and the Ink of Squid Pro Quo) fastened to his belt. Just what could he be doing with such holy materials...? Nobody knows, my friends. Nobody knows but him. In all honesty, I had a blast coming up with "o"'s delightfully disturbing visage, and yes, that giant "o" DID take quite a while to shade.
 ---
 Track: Downwards
+Directory: downwards-canmt
+Always Reference By Directory: true
 Artists:
 - StarlightCalliope
 Cover Artists:
@@ -2097,7 +2103,7 @@ Referenced Tracks:
 - End of the world
 - Flare
 - track:MeGaLoVania
-- track:transcend
+- track:transcend-canmt
 - Homestuck
 - track:moshi-moshi
 - Muse of Nanchos
@@ -2109,13 +2115,13 @@ Referenced Tracks:
 - justice must be a serve
 - Fighting Spirit
 - Rhythm Code
-- Plague
-- Infection
+- track:plague-canmt
+- track:infection-canmt
 - Tock
 - Tick
 - track:1-through-15
 - CONTACT
-- track:in-the-beginning-canwc
+- track:in-the-beginning-basement-tale
 - Ratboy Genius Theme Song
 - track:formation
 - Fruity Pebbles Jingle
@@ -2128,14 +2134,14 @@ Referenced Tracks:
 - Rex Duodecim Angelus
 - Aggrieve
 - Step's Theme
-- Vaccine
+- track:vaccine-canmt
 - Oh Boo Hoo
 - track:jungle-3
 - track:fighting-spirit-double-ascended-form
 - While the Iron's Hot
 - track:unintentional-touhou
 - Unintentional Anime (Piano Version)
-- track:ringleader
+- track:ringleader-canmt
 - Touchdown
 Sampled Tracks:
 - Upward Movement (Dave Owns)
diff --git a/album/_.yaml b/album/_.yaml
index 9980c86..97d8dde 100644
--- a/album/_.yaml
+++ b/album/_.yaml
@@ -437,6 +437,8 @@ URLs:
 - https://youtu.be/FDhPyrUiOb8
 ---
 Track: Strain
+Directory: strain-canmt
+Always Reference By Directory: true
 Artists:
 - TirantBacon
 - WarxTron
@@ -665,7 +667,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/chronic-infection
 - https://youtu.be/tvwQwsK7_1o
 Referenced Tracks:
-- Infection
+- track:infection-canmt
 - Chronic Jungle
 ---
 Track: Obana Never Gives Up
diff --git a/album/a-nameless-inheritance.yaml b/album/a-nameless-inheritance.yaml
index 931fb43..8c9aaa4 100644
--- a/album/a-nameless-inheritance.yaml
+++ b/album/a-nameless-inheritance.yaml
@@ -32,31 +32,43 @@ URLs:
 - https://parsecproductions.bandcamp.com/track/eerie-wind
 ---
 Track: Exploratory
+Directory: exploratory-a-nameless-inheritance
+Always Reference By Directory: true
 Duration: '4:30'
 URLs:
 - https://parsecproductions.bandcamp.com/track/exploratory
 ---
 Track: Execute
+Directory: execute-a-nameless-inheritance
+Always Reference By Directory: true
 Duration: '1:14'
 URLs:
 - https://parsecproductions.bandcamp.com/track/execute
 ---
 Track: Abandoned
+Directory: abandoned-a-nameless-inheritance
+Always Reference By Directory: true
 Duration: '2:00'
 URLs:
 - https://parsecproductions.bandcamp.com/track/abandoned
 ---
 Track: Enclosure
+Directory: enclosure-a-nameless-inheritance
+Always Reference By Directory: true
 Duration: '1:24'
 URLs:
 - https://parsecproductions.bandcamp.com/track/enclosure
 ---
 Track: Heart Attack
+Directory: heart-attack-a-nameless-inheritance
+Always Reference By Directory: true
 Duration: '1:12'
 URLs:
 - https://parsecproductions.bandcamp.com/track/heart-attack
 ---
 Track: Horrify
+Directory: horrify-a-nameless-inheritance
+Always Reference By Directory: true
 Duration: '1:20'
 URLs:
 - https://parsecproductions.bandcamp.com/track/horrify
@@ -67,16 +79,22 @@ URLs:
 - https://parsecproductions.bandcamp.com/track/exauguration
 ---
 Track: Exterminate
+Directory: exterminate-a-nameless-inheritance
+Always Reference By Directory: true
 Duration: '1:12'
 URLs:
 - https://parsecproductions.bandcamp.com/track/exterminate
 ---
 Track: Outbreak
+Directory: outbreak-a-nameless-inheritance
+Always Reference By Directory: true
 Duration: '1:20'
 URLs:
 - https://parsecproductions.bandcamp.com/track/outbreak
 ---
 Track: Lurk
+Directory: lurk-a-nameless-inheritance
+Always Reference By Directory: true
 Duration: '2:32'
 URLs:
 - https://parsecproductions.bandcamp.com/track/lurk
@@ -87,21 +105,29 @@ URLs:
 - https://parsecproductions.bandcamp.com/track/delurk
 ---
 Track: Terrify
+Directory: terrify-a-nameless-inheritance
+Always Reference By Directory: true
 Duration: '1:20'
 URLs:
 - https://parsecproductions.bandcamp.com/track/terrify
 ---
 Track: Undisturbed
+Directory: undisturbed-a-nameless-inheritance
+Always Reference By Directory: true
 Duration: '1:30'
 URLs:
 - https://parsecproductions.bandcamp.com/track/undisturbed
 ---
 Track: Ritual
+Directory: ritual-a-nameless-inheritance
+Always Reference By Directory: true
 Duration: '2:31'
 URLs:
 - https://parsecproductions.bandcamp.com/track/ritual
 ---
 Track: Doomed
+Directory: doomed-a-nameless-inheritance
+Always Reference By Directory: true
 Duration: '1:49'
 URLs:
 - https://parsecproductions.bandcamp.com/track/doomed
@@ -111,7 +137,7 @@ Duration: '1:43'
 URLs:
 - https://parsecproductions.bandcamp.com/track/more-doomed
 Referenced Tracks:
-- Doomed
+- track:doomed-a-nameless-inheritance
 ---
 Track: Edge Of Worlds
 Duration: '3:25'
@@ -121,6 +147,8 @@ Referenced Tracks:
 - track:legacy-a-nameless-inheritance
 ---
 Track: Heritage
+Directory: heritage-a-nameless-inheritance
+Always Reference By Directory: true
 Duration: '1:27'
 URLs:
 - https://parsecproductions.bandcamp.com/track/heritage
@@ -130,4 +158,6 @@ Referenced Tracks:
 Section: Bonus tracks
 ---
 Track: Bequest
+Directory: bequest-a-nameless-inheritance
+Always Reference By Directory: true
 Duration: '1:28'
diff --git a/album/a-shade-of-blue.yaml b/album/a-shade-of-blue.yaml
index e4f2083..9d5de8d 100644
--- a/album/a-shade-of-blue.yaml
+++ b/album/a-shade-of-blue.yaml
@@ -79,6 +79,7 @@ Art Tags:
 - Earth
 ---
 Track: Ignite
+Directory: ignite-a-shade-of-blue
 Cover Artists:
 - jakkyr
 Cover Art File Extension: jpg
diff --git a/album/a-viral-medium-vol-1.yaml b/album/a-viral-medium-vol-1.yaml
index 8f97615..1fb3af6 100644
--- a/album/a-viral-medium-vol-1.yaml
+++ b/album/a-viral-medium-vol-1.yaml
@@ -53,6 +53,8 @@ URLs:
 - https://soundcloud.com/aviralmedium/4-saturday-morning?in=aviralmedium/sets/volume1
 ---
 Track: News
+Directory: news-a-viral-medium
+Always Reference By Directory: true
 Duration: '2:52'
 URLs:
 - https://aviralmedium.bandcamp.com/track/news
diff --git a/album/aaaaaaaaaaaaaaaaaaaaa-a-single.yaml b/album/aaaaaaaaaaaaaaaaaaaaa-a-single.yaml
index 6cb36e7..b7abcc4 100644
--- a/album/aaaaaaaaaaaaaaaaaaaaa-a-single.yaml
+++ b/album/aaaaaaaaaaaaaaaaaaaaa-a-single.yaml
@@ -46,7 +46,7 @@ Referenced Tracks:
 - Artificial Intelligence Bomb
 - Under The Hat
 - Pony Chorale
-- Gnade
+- track:gnade-redditstuck
 - Touchdown
 - Muse of Nanchos
 - national treasure
@@ -59,7 +59,7 @@ Sampled Tracks:
 - iRRRRRRRRECONCILA8LE
 - Loud Nigra
 - The Nutshack Intro
-- Gnade
+- track:gnade-redditstuck
 - Bowman-o-Matic
 - Spider-Man
 Lyrics: |-
diff --git a/album/act-8-volume-1.yaml b/album/act-8-volume-1.yaml
index 9390d15..86ba7db 100644
--- a/album/act-8-volume-1.yaml
+++ b/album/act-8-volume-1.yaml
@@ -86,6 +86,8 @@ Referenced Tracks:
 - Penumbra Phantasm
 ---
 Track: Earthbound
+Directory: earthbound-act-8
+Always Reference By Directory: true
 Artists:
 - DoomedCloud
 Duration: '2:28'
@@ -160,6 +162,8 @@ Art Tags:
 Section: Bonus tracks
 ---
 Track: Medic
+Directory: medic-act-8
+Always Reference By Directory: true
 Artists:
 - dbnet18
 Duration: '1:03'
diff --git a/album/ancestral.yaml b/album/ancestral.yaml
index 059cbb8..6cb8402 100644
--- a/album/ancestral.yaml
+++ b/album/ancestral.yaml
@@ -454,6 +454,8 @@ Commentary: |-
     Capturing such a profound moment proved to be somewhat challenging, balancing struggle, triumph, and condescension all in one piece. The process of creating such a proud and arrogant face of victory washed over by the shadows of an unforeseeable future was very fun, eagerly claiming the crown for her own, for better of or for worse.
 ---
 Track: Rampage
+Directory: rampage-ancestral
+Always Reference By Directory: true
 Artists:
 - Mathias Ramalho
 Duration: '1:21'
@@ -528,6 +530,8 @@ Commentary: |-
     The Dolorosa makes the fateful decision to abandon the mother grub and care for the mutant anomaly, the Signless, setting into motion events far beyond her understanding, ones that will have far reaching consequences, even beyond her own timeline. The music begins as the ramifications of her decision quickly begin to unfold, following not just her efforst to keep the Signless safe on the surface, but the broader implications that her choice set in motion. The gears begin to turn...
 ---
 Track: Protector
+Directory: protector-ancestral
+Always Reference By Directory: true
 Artists:
 - Sean William Calhoun
 Duration: '6:12'
@@ -751,6 +755,8 @@ Commentary: |-
     This made me think of Darkleer's life in general so here he is, standing proud and doing his job, and then his slouched form bemoaning his existence after being banished.
 ---
 Track: Legacy
+Directory: legacy-ancestral
+Always Reference By Directory: true
 Artists:
 - aeolianChemist
 Duration: '3:56'
@@ -1532,6 +1538,8 @@ Commentary: |-
     I decided to focus on Darkleer struggling to reconcile his weakness towards two known criminals and how their influence forces him to question his loyalty to the Empress, as well as his role in enforcing her hemocaste system.
 ---
 Track: Leftovers
+Directory: leftovers-ancestral
+Always Reference By Directory: true
 Artists:
 - psithurist
 Duration: '4:08'
@@ -1577,6 +1585,8 @@ Commentary: |-
     The only time Pyralspite and Redglare are shown together in-comic they're busy raining hellfire on Mindfang's fleet, so I wanted to create a more intimate moment to showcase their relationship. A monstrous and powerful, but loving, dragon mother surrounds and protects her cocky, talented daughter with a dangerous passion for justice. I wanted it to look a bit like an aged photograph, like an old, warm memory, which is something the harpsichord made me think of. As we know, Pyralspite outlived Redglare by quite a lot.
 ---
 Track: Preach
+Directory: preach-ancestral
+Always Reference By Directory: true
 Artists:
 - Seijen
 Duration: '3:19'
@@ -1685,4 +1695,4 @@ URLs:
 - https://unofficialmspafans.bandcamp.com/track/bonus-leftovers-instrumental
 - https://www.youtube.com/watch?v=achjkhBpiKs
 Referenced Tracks:
-- Leftovers
+- track:leftovers-ancestral
diff --git a/album/anew-again.yaml b/album/anew-again.yaml
index 1b5e434..64e5aac 100644
--- a/album/anew-again.yaml
+++ b/album/anew-again.yaml
@@ -17,6 +17,7 @@ Commentary: |-
     Super special shoutouts to Ivy, Isiah, Honor, Sam, Rachel, RJ (and while I'm at it, the entire Homestuck music team, or at least the ones that I talk to), Riki, Cochet, Jijo, Sadie, the nxc scene, all the people in the like 5 different Skype groups I hang out in, and uh. Me. Shoutout to myself.
 ---
 Track: Decree
+Directory: decree-anew-again
 Duration: '2:58'
 URLs:
 - https://jamiepaige.bandcamp.com/track/decree
diff --git a/album/archive.yaml b/album/archive.yaml
index c53463d..a302be7 100644
--- a/album/archive.yaml
+++ b/album/archive.yaml
@@ -272,6 +272,8 @@ Commentary: |-
     Kickstarter reward for Michael Orr, 2012
 ---
 Track: Bandages
+Directory: bandages-archive
+Always Reference By Directory: true
 Duration: 0:56
 URLs:
 - https://bowman.bandcamp.com/track/bandages
diff --git a/album/aspect-clock.yaml b/album/aspect-clock.yaml
index b6b0a7f..74dd3aa 100644
--- a/album/aspect-clock.yaml
+++ b/album/aspect-clock.yaml
@@ -56,6 +56,8 @@ Referenced Tracks:
 - Penumbra Phantasm
 ---
 Track: Caretakers
+Directory: caretakers-aspect-clock
+Always Reference By Directory: true
 Duration: '02:15'
 URLs:
 - https://actomega.bandcamp.com/track/caretakers
diff --git a/album/autumn-every-day.yaml b/album/autumn-every-day.yaml
index 4e32116..176b965 100644
--- a/album/autumn-every-day.yaml
+++ b/album/autumn-every-day.yaml
@@ -489,6 +489,8 @@ Lyrics: |-
     You say the words that I can't say
 ---
 Track: Pass
+Directory: pass-autumn-every-day
+Always Reference By Directory: true
 Artists:
 - Jamie Paige
 - Marcy Nabors
diff --git a/album/basement-tale.yaml b/album/basement-tale.yaml
index ada3574..772fa95 100644
--- a/album/basement-tale.yaml
+++ b/album/basement-tale.yaml
@@ -24,7 +24,7 @@ Commentary: |-
     (<a href="https://www.youtube.com/watch?v=UbUTs-9XMC4&t=385">Community listening stream w/ chat</a>)
 ---
 Track: In the Beginning
-Directory: in-the-beginning-canwc
+Directory: in-the-beginning-basement-tale
 Cover Artists:
 - olkiswerve
 Art Tags:
@@ -51,7 +51,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/doomsday-strife
 - https://youtu.be/Q7zElND-y3s
 Referenced Tracks:
-- track:in-the-beginning-canwc
+- track:in-the-beginning-basement-tale
 Commentary: |-
     <i>Makin:</i> (team manager)
     Very loosely based on Undertale's [[track:enemy-approaching]]
@@ -86,6 +86,8 @@ Commentary: |-
     Very loosely based on Undertale's [[track:anticipation]]
 ---
 Track: Fragments
+Directory: fragments-basement-tale
+Always Reference By Directory: true
 Cover Artists:
 - avocado
 Art Tags:
@@ -95,10 +97,10 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/fragments
 - https://youtu.be/sjQGllBqflk
 Referenced Tracks:
-- track:in-the-beginning-canwc
+- track:in-the-beginning-basement-tale
 Commentary: |-
     <i>Makin:</i> (team manager)
-    Based on Undertale's [[track:memory]]
+    Based on Undertale's [[track:memory-undertale]]
 ---
 Track: Battle Against an Average Foe
 Cover Artists:
@@ -112,7 +114,7 @@ URLs:
 - https://youtu.be/-DN2avXK0Xk
 Referenced Tracks:
 - Doomsday Strife
-- track:in-the-beginning-canwc
+- track:in-the-beginning-basement-tale
 Commentary: |-
     <i>Makin:</i> (team manager)
     Based on Undertale's [[track:enemy-approaching]]
@@ -127,8 +129,8 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/basement-tale
 - https://youtu.be/YYUJTNvFuPY
 Referenced Tracks:
-- Fragments
-- track:in-the-beginning-canwc
+- track:fragments-basement-tale
+- track:in-the-beginning-basement-tale
 Commentary: |-
     <i>Makin:</i> (team manager)
     Based on Undertale's [[track:undertale]]
@@ -188,7 +190,7 @@ Referenced Tracks:
 - licord nacrasty
 - Rex Duodecim Angelus
 - Aggrieve
-- track:in-the-beginning-canwc
+- track:in-the-beginning-basement-tale
 Commentary: |-
     <i>Makin:</i> (team manager)
     Based on Homestuck's [[track:rex-duodecim-angelus]]
@@ -203,7 +205,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/cools-and-news
 - https://youtu.be/4G0Wtk_0xCA
 Referenced Tracks:
-- track:in-the-beginning-canwc
+- track:in-the-beginning-basement-tale
 - cool and new Jungle (Alpha Mix)
 Commentary: |-
     <i>Makin:</i> (team manager)
@@ -226,11 +228,11 @@ URLs:
 - https://youtu.be/cimDWeqH1DI
 Referenced Tracks:
 - RollerCoaster Tycoon Theme
-- track:in-the-beginning-canwc
+- track:in-the-beginning-basement-tale
 - Doomsday Strife
 - cool and new Jungle (Alpha Mix)
 - Battle Against a Boring Foe
-- Fragments
+- track:fragments-basement-tale
 - Battle Against an Average Foe
 - Basement Tale
 - Argia
diff --git a/album/beforus.yaml b/album/beforus.yaml
index 9aee9ec..fcf8883 100644
--- a/album/beforus.yaml
+++ b/album/beforus.yaml
@@ -1044,6 +1044,8 @@ Commentary: |-
     I wanted to really capture Damara's pre-snap personality here. She's got orange cloth over her eyes, representing how she feels she's been blind regarding what Rufioh has been up to. Meenah's hand is holding onto her throat, yet Damara remains oddly tranquil. SHe's fighting to work through all of this no matter how much it hurts. But in the end, she can only hold on so much for so long. And that's when the expression is less peaceful, more internally dead.
 ---
 Track: Timeout
+Directory: timeout-beforus
+Always Reference By Directory: true
 Artists:
 - psithurist
 Duration: '4:40'
@@ -1145,6 +1147,8 @@ Commentary: |-
     I was really happy wit hthis song from when I first put on this song and heard the slow, ominous opening. I think it really captures the sense of dread and mystery that surrounds the Scratch. Though the song has a three-part structure, visually I wanted to focus on the event itself. We only briefly see this in the comic, and it's a very striking scene. It was a lot of fun to draw the gigantic music box at the center of everything, and the various lighting effects were an interesting challenge.
 ---
 Track: Voided
+Directory: voided-beforus
+Always Reference By Directory: true
 Artists:
 - Cyclostome
 Duration: '2:22'
diff --git a/album/bittersweet.yaml b/album/bittersweet.yaml
index 2855d59..d16c672 100644
--- a/album/bittersweet.yaml
+++ b/album/bittersweet.yaml
@@ -452,6 +452,8 @@ Lyrics: |-
     So I dance in-between with the pyre to forge my blade
 ---
 Track: Ally
+Directory: ally-bittersweet
+Always Reference By Directory: true
 Contributors:
 - GUMI English
 Duration: '3:21'
@@ -520,6 +522,8 @@ Lyrics: |-
     You're my ally-alli, I'm so free to take you with me
 ---
 Track: Ballroom
+Directory: ballroom-bittersweet
+Always Reference By Directory: true
 Contributors:
 - Marcy Nabors
 - GUMI English
@@ -673,6 +677,8 @@ Lyrics: |-
     (And all I want is to stay with you)
 ---
 Track: Close
+Directory: close-bittersweet
+Always Reference By Directory: true
 Contributors:
 - Bluffy
 - Mattmatatt
diff --git a/album/bowmania.yaml b/album/bowmania.yaml
index e65882c..9c70618 100644
--- a/album/bowmania.yaml
+++ b/album/bowmania.yaml
@@ -484,9 +484,9 @@ Cover Artists:
 - Shadok
 Duration: '01:36'
 Referenced Tracks:
-- Casin
+- track:casin-glue70
 Sampled Tracks:
-- Casin
+- track:casin-glue70
 - Bowman's Credit Score
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/you-reposted-the-wrong-credit-score-seijen-blackrom-mix
@@ -1452,10 +1452,10 @@ Cover Artists:
 Cover Art File Extension: jpg
 Duration: '00:32'
 Referenced Tracks:
-- Casin
+- track:casin-glue70
 - 'Harrison: An American Musical'
 Sampled Tracks:
-- Casin
+- track:casin-glue70
 - 'Harrison: An American Musical'
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/casin-an-american-musical
@@ -1486,9 +1486,9 @@ Art Tags:
 - Bowman
 Duration: '04:56'
 Referenced Tracks:
-- Smooth
+- track:smooth-santana
 Sampled Tracks:
-- Smooth
+- track:smooth-santana
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/credit-smooth
 - https://youtu.be/nREkMkEDjPQ
@@ -1963,7 +1963,7 @@ Lyrics: |-
 
     (I'm THINKING of a Tensei between my [[album:strife-2]]. I don't even know how to read that? [wiki note: spelled 'Striife'] Could you guess what that is? It's not Radiation, it's my [[group:undertale-and-deltarune]], which you can get for 9.99 United States dollars on Steam, trademark.)
 
-    (I'm THINKING of an [[group:parsec-productions|AgentParsec]] between my [[group:clark-powell|Plazmataz]] and [[artist:erik-scheele|Jit]]. Could you ponder the answer to that? It's my [[artist:malcolm-brown|DragonXI]] and it ALSO is between my [[track:shadowed|Slender: The Eight Pages]].)
+    (I'm THINKING of an [[group:parsec-productions|AgentParsec]] between my [[group:clark-powell|Plazmataz]] and [[artist:erik-scheele|Jit]]. Could you ponder the answer to that? It's my [[artist:malcolm-brown|DragonXI]] and it ALSO is between my [[track:shadowed-slender|Slender: The Eight Pages]].)
 
     (I'm THINKING of a [[artist:cave-story|Cave Story]] between my [[artist:mother|Earthbound]]. I wonder if you can guess that. It is not Undertale as that is my Tensei between my Strife 2, it is actually my Homestuck.)
 
diff --git a/album/call-and-new-2-locomotif.yaml b/album/call-and-new-2-locomotif.yaml
index 36e9d83..63f3208 100644
--- a/album/call-and-new-2-locomotif.yaml
+++ b/album/call-and-new-2-locomotif.yaml
@@ -89,6 +89,8 @@ Referenced Tracks:
 - The Will to Fight (Original Mix) [Denizen Strife] 
 ---
 Track: Backtracking
+Directory: backtracking-canmt
+Always Reference By Directory: true
 Artists:
 - Kusoro
 Cover Artists:
@@ -145,7 +147,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/hijacking-jungle
 - https://youtu.be/e0RDJOz5XH0
 Referenced Tracks:
-- Backtracking
+- track:backtracking-canmt
 - Umbral Ultimatum
 - track:MeGaLoVania
 - Sburban Jungle
@@ -261,6 +263,8 @@ Commentary: |-
     This track also references an unreleased (or lost) track by Cerulean: "Midnight Dance".
 ---
 Track: Infection
+Directory: infection-canmt
+Always Reference By Directory: true
 Artists:
 - Difarem
 Cover Artists:
@@ -338,6 +342,8 @@ Referenced Tracks:
 - Have a Heart
 ---
 Track: Plague
+Directory: plague-canmt
+Always Reference By Directory: true
 Artists:
 - Cecily Renns
 Cover Artists:
@@ -347,13 +353,15 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/plague
 - https://youtu.be/CdyqtJXjJa0
 Referenced Tracks:
-- Infection
+- track:infection-canmt
 - Showtime (Original Mix)
 - Showtime (Piano Refrain)
 - 'NV: Strife'
 - Vriska Dance
 ---
 Track: Vaccine
+Directory: vaccine-canmt
+Always Reference By Directory: true
 Artists:
 - Kusoro
 Cover Artists:
@@ -363,7 +371,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/vaccine
 - https://youtu.be/CymbRGS_20w
 Referenced Tracks:
-- Infection
+- track:infection-canmt
 - Lotus
 - Showtime (Piano Refrain)
 - Sburban Countdown
@@ -449,7 +457,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/plagueback
 - https://youtu.be/77vZL6DsEpY
 Referenced Tracks:
-- Plague
+- track:plague-canmt
 - Switchback
 ---
 Track: don't hurt me
@@ -462,7 +470,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/dont-hurt-me
 - https://youtu.be/-3GB_7_fUUI
 Referenced Tracks:
-- Plague
+- track:plague-canmt
 Commentary: |-
     <i>Isoleucine:</i>
     idk what
@@ -480,10 +488,10 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/secretary-of-health-and-human-services-andrew-wakefield
 - https://youtu.be/4rpY7BnEQNI
 Referenced Tracks:
-- Vaccine
+- track:vaccine-canmt
 - All We're Gonna Get
 Sampled Tracks:
-- Vaccine
+- track:vaccine-canmt
 - All We're Gonna Get
 ---
 Track: Slick Beeps
@@ -654,6 +662,8 @@ Referenced Tracks:
 - Chorale for Jaspers
 ---
 Track: Converge
+Directory: converge-canmt
+Always Reference By Directory: true
 Artists:
 - Difarem
 Cover Artists:
@@ -734,7 +744,7 @@ Referenced Tracks:
 - HOW 2 DJ (vip excloosive feat. dabe)
 - Flare
 - Last Battle
-- Converge
+- track:converge-canmt
 - track:welcome-to-flavortown-battle-against-a-bodacious-foe
 - Cascade (Beta)
 - track:unite-synchronization
@@ -863,19 +873,19 @@ URLs:
 - https://youtu.be/2EBSsBwZAio
 Referenced Tracks:
 - Ich Bin Eine Spieldose
-- Whales
+- track:whales-hail-mary-mallons
 - X Gon' Give It to Ya
 - Interior Crocodile Alligator
-- Bonfire
+- track:bonfire-childish-gambino
 - DK Rap
 - Lose Yourself
 - All Star
 Sampled Tracks:
 - Ich Bin Eine Spieldose
-- Whales
+- track:whales-hail-mary-mallons
 - X Gon' Give It to Ya
 - Interior Crocodile Alligator
-- Bonfire
+- track:bonfire-childish-gambino
 - DK Rap
 - Lose Yourself
 Lyrics: |-
@@ -1065,7 +1075,7 @@ Referenced Tracks:
 - A new Track
 - Chronicala
 - Problem Sleuth Theme
-- Backtracking
+- track:backtracking-canmt
 - track:moshi-moshi
 - Courser
 - Sburban Jungle
@@ -1079,8 +1089,8 @@ Referenced Tracks:
 - track:welcome-to-flavortown-battle-against-a-bodacious-foe
 - Upward Movement (Dave Owns)
 - Ruins (With Strings)
-- Infection
-- Vaccine
+- track:infection-canmt
+- track:vaccine-canmt
 Commentary: |-
     <i>cookiefonster:</i> (Composer)
     0:00 "A new Station" by Shwan
@@ -1111,10 +1121,10 @@ Duration: '04:36'
 URLs:
 - https://soundcloud.com/difarem/train-meldey-next-to-last-station
 Referenced Tracks:
-- Infection
+- track:infection-canmt
 - Showtime (Original Mix)
-- Vaccine
-- Plague
+- track:vaccine-canmt
+- track:plague-canmt
 - Plagueback
 - I really hate Cooltown
 - don't hurt me
@@ -1123,7 +1133,7 @@ Referenced Tracks:
 - Secretary of Health and Human Services Andrew Wakefield
 - 'Dead Secretary: Zero Health'
 - Dogsong
-- Converge
+- track:converge-canmt
 - track:hurt-my-finger
 - Flare
 - Rhythm Code
@@ -1147,12 +1157,12 @@ Referenced Tracks:
 - All Star
 - Re-routed Repair
 - track:light-at-the-end-of-the-tunnel
-- Whales
+- track:whales-hail-mary-mallons
 - Ghost Train
 - No Credit Card
 Sampled Tracks:
 - L.A.
-- Whales
+- track:whales-hail-mary-mallons
 - No Credit Card
 Lyrics: |-
     [original lyrics have been preserved for posterity]
diff --git a/album/call-and-new-ii-emergency-phone-call.yaml b/album/call-and-new-ii-emergency-phone-call.yaml
index f4b6b16..6bee640 100644
--- a/album/call-and-new-ii-emergency-phone-call.yaml
+++ b/album/call-and-new-ii-emergency-phone-call.yaml
@@ -88,6 +88,8 @@ Referenced Tracks:
 - celerity chronicle
 ---
 Track: adventure
+Directory: adventure-canmt
+Always Reference By Directory: true
 Artists:
 - meems
 Duration: '00:34'
@@ -103,7 +105,7 @@ Duration: '00:33'
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/pain-game
 Referenced Tracks:
-- adventure
+- track:adventure-canmt
 ---
 Track: courser remix
 Artists:
diff --git a/album/call-and-new-v.yaml b/album/call-and-new-v.yaml
index 25f35a1..ac9c089 100644
--- a/album/call-and-new-v.yaml
+++ b/album/call-and-new-v.yaml
@@ -168,6 +168,8 @@ Referenced Tracks:
 - Courser
 ---
 Track: Deadline
+Directory: deadline-canmt
+Always Reference By Directory: true
 Artists:
 - Kusoro
 Duration: '01:51'
@@ -186,7 +188,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/dont-forget-to-save-ur-game
 - https://youtu.be/ALCTR4WFkvs
 Referenced Tracks:
-- Deadline
+- track:deadline-canmt
 - Gallant Gunshot
 ---
 Track: Save Your Game in XCOM
@@ -380,9 +382,11 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/nick-smalley-on-the-harmonium-ladies-and-gentlemen
 - https://youtu.be/UBTK4Gnnxcs
 Referenced Tracks:
-- Repent
+- track:repent-canmt
 ---
 Track: Repent
+Directory: repent-canmt
+Always Reference By Directory: true
 Artists:
 - whimsi
 Duration: '01:21'
@@ -529,7 +533,7 @@ URLs:
 - https://youtu.be/nNe61New5aw
 Referenced Tracks:
 - Insanatorium
-- Separator
+- track:separator-radiohead
 ---
 Track: Insanatorium
 Artists:
@@ -714,9 +718,9 @@ Duration: '03:39'
 URLs:
 - https://youtu.be/3E3v3UjmuvE
 Referenced Tracks:
-- Deadline
+- track:deadline-canmt
 - Nick Smalley on the Harmonium Ladies and Gentlemen
-- Repent
+- track:repent-canmt
 - Double Time
 - Nick Bostrom Pays For His Sins
 - despacito 2
diff --git a/album/call-and-new.yaml b/album/call-and-new.yaml
index 9ede1ae..f6395cf 100644
--- a/album/call-and-new.yaml
+++ b/album/call-and-new.yaml
@@ -51,7 +51,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/touchdown
 - https://youtu.be/KhABphsqDYY
 Referenced Tracks:
-- track:in-the-beginning-canwc
+- track:in-the-beginning-basement-tale
 ---
 Track: CONTACT
 Artists:
@@ -594,11 +594,11 @@ Referenced Tracks:
 - track:MeGaLoVania
 - Another Medium
 - Snow halation
-- track:focus
+- track:focus-super-hexagon
 Sampled Tracks:
 - national treasure
 - White Nuxxle Driver
-- track:focus
+- track:focus-super-hexagon
 Lyrics: |-
     もしきもちおこみたらおしにとかせおういても大丈夫
 ---
diff --git a/album/canwave-2.yaml b/album/canwave-2.yaml
index be8feb3..5da5b05 100644
--- a/album/canwave-2.yaml
+++ b/album/canwave-2.yaml
@@ -32,6 +32,8 @@ Commentary: |-
 Section: Main album
 ---
 Track: Intro
+Directory: intro-canwave-2
+Always Reference By Directory: true
 Artists:
 - ostrichlittledungeon
 Contributors:
@@ -410,9 +412,9 @@ Cover Artists:
 - Ephemerald
 Duration: '01:44'
 Referenced Tracks:
-- Dust
+- track:dust-moon
 Sampled Tracks:
-- Dust
+- track:dust-moon
 - Donald Trump Says China Remix
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/inauguration
@@ -489,10 +491,10 @@ Cover Art File Extension: jpg
 Duration: '01:43'
 Referenced Tracks:
 - Creata
-- Spleen
+- track:spleen-ruth-white
 Sampled Tracks:
 - Creata
-- Spleen
+- track:spleen-ruth-white
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/--13
 - https://youtu.be/m49Bqe0My14
@@ -588,6 +590,8 @@ Commentary: |-
     I guess I'll just write the most stupid interpretation in.
 ---
 Track: Median
+Directory: median-canmt
+Always Reference By Directory: true
 Artists:
 - ostrichlittledungeon
 Contributors:
@@ -765,16 +769,16 @@ Duration: '07:19'
 Referenced Tracks:
 - Cascade (Beta)
 - Savior of the Dreaming Dead (Cascade Cut)
-- Casin
-- Divinity
+- track:casin-glue70
+- track:divinity-porter-robinson
 - Cascading Events
 - Black Hole / Green Sun
 - Freefall
 Sampled Tracks:
 - Cascade (Beta)
 - Savior of the Dreaming Dead (Cascade Cut)
-- Casin
-- Divinity
+- track:casin-glue70
+- track:divinity-porter-robinson
 - Cascading Events
 - Black Hole / Green Sun
 - Freefall
diff --git a/album/canwave-3.yaml b/album/canwave-3.yaml
index 58c242f..851516d 100644
--- a/album/canwave-3.yaml
+++ b/album/canwave-3.yaml
@@ -246,10 +246,10 @@ URLs:
 - https://youtu.be/2H52hYJLIjA
 Referenced Tracks:
 - Strung Out Deeper Than The Night
-- Killers
+- track:killers-cboyardee
 Sampled Tracks:
 - Strung Out Deeper Than The Night
-- Killers
+- track:killers-cboyardee
 - Dilbert 2
 - Dilbert 3
 Lyrics: |-
@@ -386,7 +386,7 @@ Referenced Tracks:
 - It's Raining Somewhere Else
 - Watch Me (Whip / Nae Nae)
 - Moshi Starts a Business
-- Smooth
+- track:smooth-santana
 - Hotline Bling
 - track:ruins-undertale
 Sampled Tracks:
@@ -395,7 +395,7 @@ Sampled Tracks:
 - It's Raining Somewhere Else
 - Watch Me (Whip / Nae Nae)
 - Moshi Starts a Business
-- Smooth
+- track:smooth-santana
 - Hotline Bling
 - track:ruins-undertale
 ---
@@ -522,7 +522,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/flickwave
 - https://youtu.be/vZKYxBKbxO0
 Sampled Tracks:
-- Flicker
+- track:flicker-porter-robertson
 Lyrics: |-
     Watashi wa chōdo nani ga jūyō ka (<i>What exactly is important to me?</i>)
     Watashi wa chōdo nani ga jūyō ka (<i>What exactly is important to me?</i>)
diff --git a/album/canwave.yaml b/album/canwave.yaml
index f28c152..3b9d51c 100644
--- a/album/canwave.yaml
+++ b/album/canwave.yaml
@@ -64,9 +64,9 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/--3
 - https://youtu.be/J_8SVntuMIQ
 Referenced Tracks:
-- chase
+- track:chase-jjba
 Sampled Tracks:
-- chase
+- track:chase-jjba
 Lyrics: |-
     Taisetsu na mono wo ubawaresou
     Nichijou ni magirekonda akuma
diff --git a/album/canwc-for-the-spookdays.yaml b/album/canwc-for-the-spookdays.yaml
index 7e419bb..b59ce24 100644
--- a/album/canwc-for-the-spookdays.yaml
+++ b/album/canwc-for-the-spookdays.yaml
@@ -231,7 +231,7 @@ URLs:
 Referenced Tracks:
 - Where making this hapen
 - Pumpkin Cravings
-- Plague
+- track:plague-canmt
 - Haunted House (Super Mario 64)
 - Inspector Gadget Main Theme
 - revengn
@@ -241,6 +241,8 @@ Sampled Tracks:
 - Donkey Kong SFX
 ---
 Track: bones
+Directory: bones-canmt
+Always Reference By Directory: true
 Artists:
 - Interrobang
 Cover Artists:
diff --git a/album/canwc-sound-test-1.yaml b/album/canwc-sound-test-1.yaml
index 6b07599..6b3e9fe 100644
--- a/album/canwc-sound-test-1.yaml
+++ b/album/canwc-sound-test-1.yaml
@@ -133,9 +133,9 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/clownmans-credit-score
 - https://youtu.be/5TWQsj2PiLE
 Referenced Tracks:
-- Killers
+- track:killers-cboyardee
 Sampled Tracks:
-- Killers
+- track:killers-cboyardee
 - Bowman's Credit Score
 Lyrics: |-
     I'm
@@ -177,7 +177,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/i-am-caving-inside-a-story-doctor-origins-gone-sexual
 - https://youtu.be/dzIWfQ4ExeM
 Referenced Tracks:
-- Plantation
+- track:plantation-cave-story
 Sampled Tracks:
 - Bowman's Credit Score
 ---
@@ -281,6 +281,8 @@ URLs:
 - https://youtu.be/1CB6uZVLqt4
 ---
 Track: Ruses
+Directory: ruses-canmt
+Always Reference By Directory: true
 Artists:
 - CogentInvalid 
 Duration: '01:13'
@@ -449,6 +451,8 @@ Referenced Tracks:
 - Showtime (Original Mix)
 ---
 Track: Revival
+Directory: revival-canmt
+Always Reference By Directory: true
 Artists:
 - flamingfusion 
 Duration: '00:45'
@@ -469,6 +473,8 @@ URLs:
 - https://youtu.be/Ts1B45YwDAo
 ---
 Track: Decelerate
+Directory: decelerate-canmt
+Always Reference By Directory: true
 Artists:
 - Griever
 Duration: '02:24'
@@ -506,10 +512,10 @@ URLs:
 - https://youtu.be/zNKtkXSSb6U
 Referenced Tracks:
 - Do You Remem8er Me
-- chase
+- track:chase-jjba
 Sampled Tracks:
 - Do You Remem8er Me
-- chase
+- track:chase-jjba
 Lyrics: |-
     Taisetsu na mono wo ubawaresou
     Nichijou ni magirekonda akuma
@@ -891,10 +897,10 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/parade-of-man
 - https://youtu.be/OEx7l8XHjX4
 Referenced Tracks:
-- Parade
+- track:parade-justice
 - Dawn of Man
 Sampled Tracks:
-- Parade
+- track:parade-justice
 - Dawn of Man
 Commentary: |-
     <i>Makin:</i> (team manager)
@@ -1113,6 +1119,8 @@ Lyrics: |-
     With (sweet [unintelligible])
 ---
 Track: Theory
+Directory: theory-canmt
+Always Reference By Directory: true
 Artists:
 - nunndoes 
 Duration: '00:28'
@@ -1145,7 +1153,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/i-put-a-harmony-midi-into-a-japanese-9-bit-converter-program
 - https://youtu.be/hXT2cXyDIW4
 Referenced Tracks:
-- Harmony
+- track:harmony-runescape
 ---
 Track: halator of the snowing world
 Artists:
@@ -1205,10 +1213,10 @@ URLs:
 - https://youtu.be/0Igu3hTYjgI
 Referenced Tracks:
 - Takyon (Death Yon)
-- Killers
+- track:killers-cboyardee
 Sampled Tracks:
 - Takyon (Death Yon)
-- Killers
+- track:killers-cboyardee
 ---
 Track: missathing.midi
 Artists:
@@ -1511,10 +1519,10 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/harmonize-beta
 - https://youtu.be/vhEq07X8npM
 Referenced Tracks:
-- track:harmonize
+- track:harmonize-canmt
 - Fruity Pebbles Jingle
 Sampled Tracks:
-- track:harmonize
+- track:harmonize-canmt
 - Fruity Pebbles Jingle
 Lyrics: |-
     Oh Diet Dr Pepper is the flavor that I savor
@@ -1534,10 +1542,10 @@ URLs:
 - https://youtu.be/KQpJhB5y2uQ
 Referenced Tracks:
 - I'd like to see your diploma
-- track:focus
+- track:focus-super-hexagon
 Sampled Tracks:
 - I'd like to see your diploma
-- track:focus
+- track:focus-super-hexagon
 ---
 Track: K.K. Doctor
 Artists:
@@ -1638,6 +1646,8 @@ URLs:
 - https://youtu.be/q4ML2-_9FeA
 ---
 Track: Running
+Directory: running-canmt
+Always Reference By Directory: true
 Artists:
 - TirantBacon 
 Duration: '01:24'
@@ -1803,10 +1813,10 @@ URLs:
 - https://youtu.be/ITOMdF1_Fto
 Referenced Tracks:
 - Solar Voyage
-- Bonfire
+- track:bonfire-childish-gambino
 Sampled Tracks:
 - Solar Voyage
-- Bonfire
+- track:bonfire-childish-gambino
 Lyrics: |-
     OK, it's Childish Gambino, home girl drop it like the NASDAQ
     Move white girls like there's coke up my ass crack
diff --git a/album/carne-vale-fusion-collab.yaml b/album/carne-vale-fusion-collab.yaml
index bd38265..13c3721 100644
--- a/album/carne-vale-fusion-collab.yaml
+++ b/album/carne-vale-fusion-collab.yaml
@@ -52,7 +52,7 @@ Referenced Tracks:
 - track:carne-vale
 - Meet the Flintstones
 - We Are Number One
-- Bodies
+- track:bodies-drowning-pool
 - The Nutshack Intro
 - Rollin' (Air Raid Vehicle)
 - Upward Movement (Dave Owns)
@@ -77,7 +77,7 @@ Referenced Tracks:
 - Mr. Brightside
 - Land of Confusion
 - Roundabout
-- Sandstorm
+- track:darude-sandstorm
 - Interior Crocodile Alligator
 - All Star
 - Do the Homestuck
@@ -86,7 +86,7 @@ Referenced Tracks:
 - Snow halation
 Sampled Tracks:
 - track:carne-vale
-- Bodies
+- track:bodies-drowning-pool
 - DK Rap
 - The Nutshack Intro
 - Rollin'
@@ -113,7 +113,7 @@ Sampled Tracks:
 - Mr. Brightside
 - Land of Confusion
 - Roundabout
-- Sandstorm
+- track:darude-sandstorm
 - Interior Crocodile Alligator
 - All Star
 - Do the Homestuck
diff --git a/album/class-act-b-side.yaml b/album/class-act-b-side.yaml
index 263924b..5949f49 100644
--- a/album/class-act-b-side.yaml
+++ b/album/class-act-b-side.yaml
@@ -44,7 +44,7 @@ URLs:
 - https://funkmclovin.bandcamp.com/track/lawnmower
 - https://www.youtube.com/watch?v=eOxJH4XCHjE
 Referenced Tracks:
-- track:lawnmower
+- track:lawnmower-neil-cicierega
 ---
 Track: Lonely Rolling Star (English)
 Duration: '5:38'
@@ -70,7 +70,7 @@ URLs:
 - https://funkmclovin.bandcamp.com/track/fever
 - https://www.youtube.com/watch?v=gBaWWnmNtNU
 Referenced Tracks:
-- track:fever
+- track:fever-little-willie-john
 ---
 Track: Man of Constant Sorrow
 Duration: '2:56'
@@ -87,7 +87,7 @@ URLs:
 - https://funkmclovin.bandcamp.com/track/teenagers
 - https://www.youtube.com/watch?v=s9a-ddeXY80
 Referenced Tracks:
-- track:teenagers
+- track:teenagers-my-chemical-romance
 ---
 Track: Rainbow Connection
 Directory: rainbow-connection-funk-mclovin
diff --git a/album/class-act.yaml b/album/class-act.yaml
index a806665..67d6610 100644
--- a/album/class-act.yaml
+++ b/album/class-act.yaml
@@ -35,6 +35,8 @@ URLs:
 - https://funkmclovin.bandcamp.com/track/the-devil-was-beautiful
 ---
 Track: Away
+Directory: away-class-act
+Always Reference By Directory: true
 Duration: '2:41'
 URLs:
 - https://funkmclovin.bandcamp.com/track/away
diff --git a/album/cool-and-new-greatest-hits.yaml b/album/cool-and-new-greatest-hits.yaml
index 5e22cc7..e5e3dd2 100644
--- a/album/cool-and-new-greatest-hits.yaml
+++ b/album/cool-and-new-greatest-hits.yaml
@@ -255,7 +255,7 @@ URLs:
 ---
 Track: Transcend
 Directory: transcend-canwc-gh
-Originally Released As: track:transcend
+Originally Released As: track:transcend-canmt
 Duration: '03:01'
 Cover Artists:
 - Skyplayer
@@ -457,7 +457,7 @@ URLs:
 ---
 Track: Harmonize
 Directory: harmonize-canwc-gh
-Originally Released As: track:harmonize
+Originally Released As: track:harmonize-canmt
 Duration: '05:55'
 Cover Artists:
 - jakkyr
diff --git a/album/cool-and-new-homestuck-2.yaml b/album/cool-and-new-homestuck-2.yaml
index cdd1599..2a2b728 100644
--- a/album/cool-and-new-homestuck-2.yaml
+++ b/album/cool-and-new-homestuck-2.yaml
@@ -530,7 +530,7 @@ URLs:
 - https://youtu.be/iNxslq_Q-wI
 Referenced Tracks:
 - cool and new Anthem
-- Sandstorm
+- track:darude-sandstorm
 - Epitaph
 - Roundabout
 Sampled Tracks:
diff --git a/album/cool-and-new-homestuck-3.yaml b/album/cool-and-new-homestuck-3.yaml
index 2cecd88..569d1e6 100644
--- a/album/cool-and-new-homestuck-3.yaml
+++ b/album/cool-and-new-homestuck-3.yaml
@@ -285,12 +285,12 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/unbreakable-unity
 - https://youtu.be/AQZ5VZ60dKo
 Referenced Tracks:
-- Unbreakable Unity
+- An Unbreakable Union
 - Mutiny
 - Mutiny (crapapella)
 - Carefree Victory
 Sampled Tracks:
-- Unbreakable Unity
+- An Unbreakable Union
 - Mutiny
 - Feel (Alive)
 - Mutiny (crapapella)
@@ -659,14 +659,14 @@ Referenced Tracks:
 - Trickster Mode (Engage)
 - The Nutshack Intro
 - Doctor
-- Killers
+- track:killers-cboyardee
 Sampled Tracks:
 - We Are Number One
 - Trickster Mode (Engage)
 - 'Metal Gear Rising: Revengeance'
 - The Nutshack Intro
 - Doctor
-- Killers
+- track:killers-cboyardee
 Lyrics: |-
     Hey! (Memes. The DNA of the soul.)
     (It's the Nutshack, It's the Nutshack, It's the Nutshack, It's the Nutshack)
@@ -1088,7 +1088,7 @@ Referenced Tracks:
 - track:jungle-3
 - Muse of Nanchos
 - Meet the Flintstones
-- Intro
+- Gunshow 2 Theme (Instrumental)
 - RollerCoaster Tycoon Theme
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/revisit-rewind
diff --git a/album/cool-and-new-homestuck.yaml b/album/cool-and-new-homestuck.yaml
index f90cbfb..3ce0bb0 100644
--- a/album/cool-and-new-homestuck.yaml
+++ b/album/cool-and-new-homestuck.yaml
@@ -554,6 +554,7 @@ Commentary: |-
     So coooooool!
 ---
 Track: Contra
+Directory: contra-canmt
 Artists:
 - Noisemaker
 Cover Artists:
@@ -1143,7 +1144,7 @@ Referenced Tracks:
 - Black Rose / Green Sun
 - At The Price of Oblivion
 - air horn sad violin preview
-- Crawling
+- track:crawling-linkin-park
 Sampled Tracks:
 - Black Rose / Green Sun
 - Loud Nigra
@@ -1153,7 +1154,7 @@ Sampled Tracks:
 - At The Price of Oblivion
 - The Office S05E09
 - air horn sad violin preview
-- Crawling
+- track:crawling-linkin-park
 Lyrics: |-
     (Oh my God!) (Where's that DAMN fourth Chaos Emerald?)
     (Oh God!) (Free will is a myth. Religion is a joke.)
diff --git a/album/cool-and-new-volume-2.yaml b/album/cool-and-new-volume-2.yaml
index 47b3cc2..ce29883 100644
--- a/album/cool-and-new-volume-2.yaml
+++ b/album/cool-and-new-volume-2.yaml
@@ -370,7 +370,7 @@ URLs:
 - https://www.youtube.com/watch?v=woFGNaPpHIc
 Referenced Tracks:
 - track:guardian
-- Chopsticks
+- track:chopsticks-euphemia-allen
 - Penumbra Phantasm
 ---
 Track: 'jhon: rid roler costr'
diff --git a/album/cool-and-new-volume-3.yaml b/album/cool-and-new-volume-3.yaml
index 5b41f28..57b4309 100644
--- a/album/cool-and-new-volume-3.yaml
+++ b/album/cool-and-new-volume-3.yaml
@@ -103,6 +103,8 @@ Commentary: |-
     I'm currently playing Shovel Knight, so when I listened to this track, I had the vision of Rose in a strife in a 8-bits castle. It's the last track art I will make for this album, and while I "joined" the team not too long ago, I was really happy to be contribute to it, after all those years being a listener. Thank you CANMT!
 ---
 Track: Endurance
+Directory: endurance-canmt
+Always Reference By Directory: true
 Artists:
 - Pipko Fanfare
 Cover Artists:
@@ -116,7 +118,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/endurance
 - https://youtu.be/FMKdJD_x-oQ
 Referenced Tracks:
-- Endure
+- track:endure-canmt
 Commentary: |-
     <i>Pipko Fanfare:</i> (Composer)
     Nothing says "not totally self absorbed" like remixing your own song, right? >_> This started off more as just practice with arranging for my virtual orchestra but it ultimately came out pretty ok so here it is. I think my favorite detail is the "unison bend" in the high strings around 0:45 or so. (It sounds kinda like a train whistle.) That was a part of the original Endure too, but it sounds way cooler with realistic samples!
@@ -199,7 +201,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/twilight-rhythm
 - https://youtu.be/WzYOQUAcjcM
 Referenced Tracks:
-- you
+- track:you-dai
 Commentary: |-
     <i>Koba:</i> (Composer)
     i've been wanting to make an original composition for a team album for a while and since it's the final album, i figured there's probably no better time than doing it now since it's the final main album
@@ -293,7 +295,7 @@ URLs:
 - https://youtu.be/c06SrS_I-KE
 Commentary: |-
     <i>Pipko Fanfare:</i> (Composer)
-    It's hard to believe I've been with this team since vol 1 and here on our final album is only my second truly original song contribution! ([[track:endure]] was the first.) While Endure was a pretty typical toby-foxish-action-song, I think this one is a bit more sophisticated. Compositionally it's VERY simple - most of it doesn't even have a real melody! - but the effects work is some of my best to date. There are so many more interesting ways to represent The Corruption and how it seems to distort things we are familiar with than just intentionally using amateurish off-time melodies. Distortion, bitcrushing, reverse, stutter - used in a certain way, these kinds of things can be like the jpeg artifacts of audio in my opinion.
+    It's hard to believe I've been with this team since vol 1 and here on our final album is only my second truly original song contribution! ([[track:endure-canmt]] was the first.) While Endure was a pretty typical toby-foxish-action-song, I think this one is a bit more sophisticated. Compositionally it's VERY simple - most of it doesn't even have a real melody! - but the effects work is some of my best to date. There are so many more interesting ways to represent The Corruption and how it seems to distort things we are familiar with than just intentionally using amateurish off-time melodies. Distortion, bitcrushing, reverse, stutter - used in a certain way, these kinds of things can be like the jpeg artifacts of audio in my opinion.
 ---
 Track: I Will Never Forget
 Artists:
@@ -746,6 +748,8 @@ Commentary: |-
     This was a really fun track to make. Normally I'm a stickler for hardware accuracy in my chiptune but this time I just went ham and created a lovely hi-bit chaotic mess. It was a joy revisting old CANWC originals to find appropriate songs based around "bVI - bVII - i" to include. I hope some of the joy I experienced putting this together comes through when you listen to it.
 ---
 Track: Epilogue
+Directory: epilogue-canmt
+Always Reference By Directory: true
 Artists:
 - Cecily Renns
 Duration: '04:58'
@@ -967,7 +971,7 @@ Referenced Tracks:
 - RollerCoaster Tycoon Theme
 - Upward Movement (Dave Owns)
 - Lorule Castle
-- Endurance
+- track:endurance-canmt
 Commentary: |-
     <i>cctv:</i> (Composer)
     Now a while back I believe I once mentioned I was planning on combining a bunch of motifs and passages into a single combined recording. This is not that recording. I became disenchanted with that idea a while back, this improv here is about the best I ever did. It really sucks, it's not clean or well-thought out at all. Really wouldn't be surprised if this never makes it to the final album.
diff --git a/album/cool-and-new-volume-7.yaml b/album/cool-and-new-volume-7.yaml
index e732be5..f2ce64a 100644
--- a/album/cool-and-new-volume-7.yaml
+++ b/album/cool-and-new-volume-7.yaml
@@ -575,6 +575,8 @@ Lyrics: |-
     Jhon: Consume
 ---
 Track: Transcend
+Directory: transcend-canmt
+Always Reference By Directory: true
 Artists:
 - TirantBacon
 Cover Artists:
@@ -891,7 +893,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/focus
 - https://youtu.be/akdb2EPVWuA
 Referenced Tracks:
-- track:focus
+- track:focus-super-hexagon
 - Flare
 - Meet the Flintstones
 - Explore
diff --git a/album/cool-and-new-volume-ii.yaml b/album/cool-and-new-volume-ii.yaml
index ba3ced8..9829d12 100644
--- a/album/cool-and-new-volume-ii.yaml
+++ b/album/cool-and-new-volume-ii.yaml
@@ -1480,6 +1480,8 @@ Referenced Tracks:
 - Eternity Served Cold
 ---
 Track: dull
+Directory: dull-canmt
+Always Reference By Directory: true
 Artists:
 - Kusoro
 Cover Artists:
diff --git a/album/cool-and-new-volume-sx.yaml b/album/cool-and-new-volume-sx.yaml
index d4f63e4..c14d661 100644
--- a/album/cool-and-new-volume-sx.yaml
+++ b/album/cool-and-new-volume-sx.yaml
@@ -301,10 +301,10 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/rising-echoes
 - https://youtu.be/mMjRrrDnGVc
 Referenced Tracks:
-- Courage
+- track:courage-jjba
 - Upward Movement (Dave Owns)
 Sampled Tracks:
-- Courage
+- track:courage-jjba
 - Upward Movement (Dave Owns)
 ---
 Track: Moonslammer
@@ -1127,9 +1127,9 @@ Referenced Tracks:
 - track:MeGaLoVania
 - Bassline Junkie
 - One Pound Fish
-- Whales
+- track:whales-hail-mary-mallons
 - The Nutshack Intro
-- Bonfire
+- track:bonfire-childish-gambino
 - Crank That
 - Snow halation
 Sampled Tracks:
@@ -1150,9 +1150,9 @@ Sampled Tracks:
 - track:MeGaLoVania
 - Bassline Junkie
 - One Pound Fish
-- Whales
+- track:whales-hail-mary-mallons
 - The Nutshack Intro
-- Bonfire
+- track:bonfire-childish-gambino
 - Crank That
 - Bowman's Credit Score
 - Vinesauce Joel reacts to GRAND DAD
@@ -2058,6 +2058,8 @@ Referenced Tracks:
 - The Nutshack Intro
 ---
 Track: Harmonize
+Directory: harmonize-canmt
+Always Reference By Directory: true
 Artists:
 - artist:kobacat
 Cover Artists:
diff --git a/album/cool-and-new-volume-v.yaml b/album/cool-and-new-volume-v.yaml
index 6da4b09..84b641a 100644
--- a/album/cool-and-new-volume-v.yaml
+++ b/album/cool-and-new-volume-v.yaml
@@ -518,6 +518,7 @@ Sampled Tracks:
 - lsdjghklsdgj
 ---
 Track: Dentist
+Directory: dentist-canmt
 Artists:
 - Double Hats Eyewear
 Cover Artists:
@@ -558,12 +559,12 @@ Referenced Tracks:
 - Back to the Future
 - English
 - Sburban Jungle
-- Hoverboard
+- track:hoverboard-dirtyphonics
 - The Power of Love
 - Penumbra Phantasm
 - Eternity Served Cold
 Sampled Tracks:
-- Hoverboard
+- track:hoverboard-dirtyphonics
 - Back to the Future
 - The Power of Love
 Lyrics: |-
@@ -1042,7 +1043,7 @@ URLs:
 - https://www.youtube.com/watch?v=2OAgrmDAqUI
 Referenced Tracks:
 - Doctor
-- Teardrop
+- track:teardrop-massive-attack
 Commentary: |-
     <i>VulkanShawl:</i>
     So. This is the only track without my art skills. The Artist was mira. I like House M.D. and i think'd a mashup of House and Doctor would be funny. I love mira for this. *insert [[track:the-flintstones-the-rescue-of-dino-and-hoppy-title-themeending|grand dad]] joke here* thx mira anyways
diff --git a/album/cool-and-new-voulem1.yaml b/album/cool-and-new-voulem1.yaml
index e4033bc..2e5f6ca 100644
--- a/album/cool-and-new-voulem1.yaml
+++ b/album/cool-and-new-voulem1.yaml
@@ -550,6 +550,8 @@ Art Tags:
 - Jack Noir
 ---
 Track: Usurp
+Directory: usurp-canmt
+Always Reference By Directory: true
 Duration: '1:44'
 Artists:
 - flagellumVagueness
@@ -1144,6 +1146,8 @@ Art Tags:
 - Skaia
 ---
 Track: Tycoon
+Directory: tycoon-canmt
+Always Reference By Directory: true
 Duration: '3:23'
 Artists:
 - Noisemaker
@@ -1179,6 +1183,7 @@ Art Tags:
 - Jhon
 ---
 Track: V A P O R S T U C K
+Directory: vaporstuck-canmt
 Duration: '2:07'
 Artists:
 - Avianzo
@@ -1189,7 +1194,6 @@ URLs:
 - https://www.youtube.com/watch?v=rLvPAogDkaw
 Referenced Tracks:
 - Elevatorstuck
-Directory: vaporstuck-canv1
 Art Tags:
 - Jhon
 ---
diff --git a/album/corporate-holiday-hits.yaml b/album/corporate-holiday-hits.yaml
index 17572eb..5854880 100644
--- a/album/corporate-holiday-hits.yaml
+++ b/album/corporate-holiday-hits.yaml
@@ -14,6 +14,8 @@ Groups:
 - Fandom
 ---
 Track: Eve
+Directory: eve-vast-error
+Always Reference By Directory: true
 Artists:
 - Kohauro
 Duration: '02:10'
diff --git a/album/cosmic-caretakers.yaml b/album/cosmic-caretakers.yaml
index 9c0e208..db78be0 100644
--- a/album/cosmic-caretakers.yaml
+++ b/album/cosmic-caretakers.yaml
@@ -304,7 +304,7 @@ Referenced Tracks:
 - Beatdown (Strider Style)
 - This Is America
 - Giorgio by Moroder
-- Bodies
+- track:bodies-drowning-pool
 - Take Me Away
 - Running Hell
 - track:suicide-hotline-icp
@@ -356,7 +356,7 @@ Referenced Tracks:
 - Mutiny
 - Roundabout
 - Afraid of the Darko
-- Piss
+- track:piss-neil-cicierega
 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.
@@ -497,6 +497,8 @@ Commentary: |-
     Polypolyphemus is an intense track, so it's fitting for its art to capture the same intensity. Sollux's Biclops is captured right before its imminent demise as the troll's Mind Honey-induced flip out rips through the ceiling of his hive and surrounds the lusus in a multi-colored beam of energy. The meteors illuminating the night sky further illustrate the carnage present in the scene in a fashion that pops up time and time again in Homestuck proper. If only one of those meteors could break the chain around the Biclops' leg and set it free! Wait, the resulting impact would probably just kill the Biclops anyway. Never mind, that was a stupid idea.
 ---
 Track: Rangoon
+Directory: rangoon-cosmic-caretakers
+Always Reference By Directory: true
 Artists:
 - WHATISLOSTINTHEMINES
 Duration: '2:03'
@@ -799,6 +801,8 @@ Commentary: |-
     It's hard being a single mom when you are a teenage boy. At least Caliborn is sitting still for once.
 ---
 Track: Singularity
+Directory: singularity-cosmic-caretakers
+Always Reference By Directory: true
 Artists:
 - keyboard cait
 Duration: '4:55'
diff --git a/album/cyber-city-sound-pak.yaml b/album/cyber-city-sound-pak.yaml
index 55cb49b..f7c0dfb 100644
--- a/album/cyber-city-sound-pak.yaml
+++ b/album/cyber-city-sound-pak.yaml
@@ -218,7 +218,7 @@ URLs:
 Referenced Tracks:
 - Dialtone
 - THE WORLD REVOLVING
-- man
+- track:man-deltarune
 Commentary: |-
     <i>Cristata:</i>
     <p style="font-family:'Wingdings', 'Zapf Dingbats', 'Webdings', symbol">PICK UP THE PHONE OH MY GOD.<br>
diff --git a/album/cyclica.yaml b/album/cyclica.yaml
index 3088487..37b03bc 100644
--- a/album/cyclica.yaml
+++ b/album/cyclica.yaml
@@ -46,7 +46,7 @@ Art Tags:
 Referenced Tracks:
 - Rain
 - Sburban Resolution
-- Higher
+- track:higher-ost
 - track:dersite
 - Final Confrontation
 Commentary: |-
@@ -75,4 +75,4 @@ Commentary: |-
     0:00 - Durst
     1:30 - Ebgret
     2:57 - Spanish
-    5:40 - Monody
\ No newline at end of file
+    5:40 - Monody
diff --git a/album/dead-shufflers-anything-goes.yaml b/album/dead-shufflers-anything-goes.yaml
index 1a659b3..1470b0b 100644
--- a/album/dead-shufflers-anything-goes.yaml
+++ b/album/dead-shufflers-anything-goes.yaml
@@ -161,6 +161,8 @@ URLs:
 - https://vasterror.bandcamp.com/track/intermission-mimesiswing
 ---
 Track: Dismantled
+Directory: dismantled-vast-error
+Always Reference By Directory: true
 Artists:
 - pragmaticNihilist
 Cover Artists:
@@ -175,6 +177,8 @@ URLs:
 - https://vasterror.bandcamp.com/track/dismantled
 ---
 Track: Lovecraft
+Directory: lovecraft-vast-error
+Always Reference By Directory: true
 Artists:
 - sympolite
 Cover Artists:
diff --git a/album/deltarune-ch1-ost.yaml b/album/deltarune-ch1-ost.yaml
index e7d9f7f..5c361ff 100644
--- a/album/deltarune-ch1-ost.yaml
+++ b/album/deltarune-ch1-ost.yaml
@@ -44,6 +44,8 @@ Referenced Tracks:
 - Once Upon a Time
 ---
 Track: School
+Directory: school-deltarune
+Always Reference By Directory: true
 Duration: '1:20'
 URLs:
 - https://tobyfox.bandcamp.com/track/school
@@ -70,6 +72,8 @@ Referenced Tracks:
 - Nightmare Knight
 ---
 Track: Cliffs
+Directory: cliffs-deltarune
+Always Reference By Directory: true
 Duration: 0:35
 URLs:
 - https://tobyfox.bandcamp.com/track/cliffs
@@ -147,6 +151,8 @@ Sampled Tracks:
 - track:theme-rose-of-winter
 ---
 Track: Lantern
+Directory: lantern-deltarune
+Always Reference By Directory: true
 Duration: '1:08'
 URLs:
 - https://tobyfox.bandcamp.com/track/lantern
@@ -211,6 +217,8 @@ Referenced Tracks:
 - The Chase
 ---
 Track: Basement
+Directory: basement-deltarune
+Always Reference By Directory: true
 Duration: 0:27
 URLs:
 - https://tobyfox.bandcamp.com/track/basement
@@ -270,6 +278,8 @@ URLs:
 - https://open.spotify.com/track/2ASkgao4Nv7FtY9AjASDNQ
 ---
 Track: Gallery
+Directory: gallery-deltarune
+Always Reference By Directory: true
 Duration: 0:12
 URLs:
 - https://tobyfox.bandcamp.com/track/gallery
@@ -316,6 +326,8 @@ Referenced Tracks:
 - Don't Forget
 ---
 Track: Friendship
+Directory: friendship-deltarune
+Always Reference By Directory: true
 Duration: '2:40'
 URLs:
 - https://tobyfox.bandcamp.com/track/friendship
diff --git a/album/deltarune-ch2-ost.yaml b/album/deltarune-ch2-ost.yaml
index f9c4f2f..12e1a52 100644
--- a/album/deltarune-ch2-ost.yaml
+++ b/album/deltarune-ch2-ost.yaml
@@ -61,6 +61,8 @@ URLs:
 - https://open.spotify.com/track/2rZU9qk1HWqWrKA7BKOWyy?si=26323aa8cff44f60
 ---
 Track: Queen
+Directory: queen-deltarune
+Always Reference By Directory: true
 Duration: 0:56
 URLs:
 - https://tobyfox.bandcamp.com/track/queen
@@ -83,7 +85,7 @@ URLs:
 - https://www.youtube.com/watch?v=p1U5FjgwDhA&list=OLAK5uy_kADMv-61zFDA5jOl2rTBQpqaa8celjh54&index=7
 - https://open.spotify.com/track/7CaYooLVhBdkhRjSHrntgD?si=f725c024722f464e
 Referenced Tracks:
-- Queen
+- track:queen-deltarune
 ---
 Track: Almost To The Guys!
 Duration: 0:17
@@ -157,7 +159,7 @@ URLs:
 - https://www.youtube.com/watch?v=HZO3xw91eHw&list=OLAK5uy_kADMv-61zFDA5jOl2rTBQpqaa8celjh54&index=15
 - https://open.spotify.com/track/1GdTlOlPxxXhuA1Z4Tbf5H?si=71b76613bac64444
 Referenced Tracks:
-- Queen
+- track:queen-deltarune
 - Berdly
 ---
 Track: Faint Courage (Game Over)
@@ -257,7 +259,7 @@ URLs:
 - https://www.youtube.com/watch?v=j6baKyF2Ksc&list=OLAK5uy_kADMv-61zFDA5jOl2rTBQpqaa8celjh54&index=24
 - https://open.spotify.com/track/0v32fKwN5VpiZYEW9bwcmI?si=8f9d310da887492f
 Referenced Tracks:
-- Queen
+- track:queen-deltarune
 ---
 Track: Bluebird of Misfortune
 Duration: 0:49
@@ -275,7 +277,7 @@ URLs:
 - https://www.youtube.com/watch?v=q-5cXVcCOUs&list=OLAK5uy_kADMv-61zFDA5jOl2rTBQpqaa8celjh54&index=26
 - https://open.spotify.com/track/7tNsMfItoswjCO5oOQgbBB?si=2efa34198e6b46e9
 Referenced Tracks:
-- Queen
+- track:queen-deltarune
 ---
 Track: KEYGEN
 Duration: 0:15
@@ -331,7 +333,7 @@ URLs:
 - https://www.youtube.com/watch?v=vBjscyFC3jo&list=OLAK5uy_kADMv-61zFDA5jOl2rTBQpqaa8celjh54&index=32
 - https://open.spotify.com/track/1K45maA9jDR1kBRpojtPmO?si=20f0848ae88246d9
 Referenced Tracks:
-- Queen
+- track:queen-deltarune
 - Berdly
 ---
 Track: Giga Size
@@ -341,7 +343,7 @@ URLs:
 - https://www.youtube.com/watch?v=_bVl2e-Wxzg&list=OLAK5uy_kADMv-61zFDA5jOl2rTBQpqaa8celjh54&index=33
 - https://open.spotify.com/track/7gRPYFtMaq0KIOO7vIxCLd?si=b90063b5112343db
 Referenced Tracks:
-- Queen
+- track:queen-deltarune
 - Attack of the Killer Queen
 ---
 Track: Powers Combined
@@ -359,7 +361,7 @@ URLs:
 - https://open.spotify.com/track/7ARvBQv5g2gDmBGXM6VDCR?si=b8d69888ffc5404f
 Referenced Tracks:
 - Powers Combined
-- Queen
+- track:queen-deltarune
 - Attack of the Killer Queen
 ---
 Track: The Dark Truth
diff --git a/album/desynced-vol-1.yaml b/album/desynced-vol-1.yaml
index 427e398..7293535 100644
--- a/album/desynced-vol-1.yaml
+++ b/album/desynced-vol-1.yaml
@@ -28,7 +28,7 @@ Cover Artists:
 Art Tags:
 - Earth
 Referenced Tracks:
-- Daughter
+- track:daughter-desynced
 ---
 Track: Cutest Companion
 Artists:
@@ -55,8 +55,8 @@ Cover Artists:
 Art Tags:
 - Kate (Desynced)
 Referenced Tracks:
-- Daughter
-- Cooldown
+- track:daughter-desynced
+- track:cooldown-desynced
 ---
 Track: Temporal Guardian
 Artists:
@@ -71,7 +71,7 @@ Art Tags:
 - Kate's dad (Desynced)
 Referenced Tracks:
 - Bedelia
-- Daughter
+- track:daughter-desynced
 ---
 Track: Daughter (Short Ver.)
 Artists:
@@ -85,8 +85,8 @@ Cover Artists:
 Art Tags:
 - Kate (Desynced)
 Referenced Tracks:
-- Daughter
-- Cooldown
+- track:daughter-desynced
+- track:cooldown-desynced
 ---
 Track: A Very Forgiving Kind of Guy
 Artists:
@@ -102,6 +102,8 @@ Art Tags:
 - Earth
 ---
 Track: Cooldown
+Directory: cooldown-desynced
+Always Reference By Directory: true
 Artists:
 - Rainy
 Duration: '3:13'
@@ -126,12 +128,14 @@ Art Tags:
 - Kate (Desynced)
 - Kate's dad (Desynced)
 Referenced Tracks:
-- Cooldown
+- track:cooldown-desynced
 - Temporal Guardian
-- Daughter
+- track:daughter-desynced
 - Desynced Anthem
 ---
 Track: Eclipse
+Directory: eclipse-desynced
+Always Reference By Directory: true
 Artists:
 - Net
 Duration: '1:21'
@@ -168,8 +172,8 @@ Art Tags:
 - Kate (Desynced)
 Referenced Tracks:
 - Temporal Guardian
-- Cooldown
-- Daughter
+- track:cooldown-desynced
+- track:daughter-desynced
 ---
 Track: We'll Be Right Back
 Artists:
@@ -186,10 +190,12 @@ Art Tags:
 - 'cw: blood (abstract)'
 Referenced Tracks:
 - Vexation
-- Escapade
+- track:escapade-desynced
 - Liquid Negrocity
 ---
 Track: Daughter
+Directory: daughter-desynced
+Always Reference By Directory: true
 Artists:
 - Pascal van den Bos
 Duration: '1:57'
@@ -216,6 +222,8 @@ Referenced Tracks:
 - Lunar Dance
 ---
 Track: Lady
+Directory: lady-desynced
+Always Reference By Directory: true
 Artists:
 - Levc
 Duration: '1:57'
@@ -239,9 +247,11 @@ Cover Artists:
 Art Tags:
 - Gaea (Desynced)
 Referenced Tracks:
-- Daughter
+- track:daughter-desynced
 ---
 Track: Noir
+Directory: noir-desynced
+Always Reference By Directory: true
 Artists:
 - Pascal van den Bos
 Duration: '2:13'
@@ -253,7 +263,7 @@ Cover Artists:
 Art Tags:
 - Jack Noir
 Referenced Tracks:
-- Escapade
+- track:escapade-desynced
 ---
 Track: Lullaby for a Drifter
 Artists:
@@ -297,6 +307,8 @@ Referenced Tracks:
 - track:alpha-admission
 ---
 Track: Escapade
+Directory: escapade-desynced
+Always Reference By Directory: true
 Artists:
 - Pascal van den Bos
 Duration: '3:22'
@@ -342,7 +354,7 @@ Art Tags:
 - Kate (Desynced)
 - Earth
 Referenced Tracks:
-- Daughter
+- track:daughter-desynced
 ---
 Track: Happy Anthem
 Artists:
diff --git a/album/desynced-vol-2.yaml b/album/desynced-vol-2.yaml
index 31b617a..974ff30 100644
--- a/album/desynced-vol-2.yaml
+++ b/album/desynced-vol-2.yaml
@@ -27,8 +27,8 @@ Art Tags:
 - Josh (Desynced)
 - Enid (Desynced)
 Referenced Tracks:
-- Daughter
-- Cooldown
+- track:daughter-desynced
+- track:cooldown-desynced
 - Desynced Anthem
 - Lunar Dance
 - Vexation
@@ -131,6 +131,8 @@ Referenced Tracks:
 - track:asimov-3
 ---
 Track: Egress
+Directory: egress-desynced
+Always Reference By Directory: true
 Artists:
 - Rainy
 Duration: '2:38'
@@ -146,12 +148,14 @@ Art Tags:
 Referenced Tracks:
 - Mirror Mirror
 - track:alpha-admission
-- Daughter
+- track:daughter-desynced
 - Mother Dearest
-- Escapade
+- track:escapade-desynced
 - Tsukuyomi
 ---
 Track: Chat
+Directory: chat-desynced
+Always Reference By Directory: true
 Artists:
 - Levc
 Duration: '2:53'
@@ -205,7 +209,7 @@ Art Tags:
 - Gaea (Desynced)
 Referenced Tracks:
 - Mother Dearest
-- Daughter
+- track:daughter-desynced
 ---
 Track: Evanhenare1
 Artists:
@@ -297,7 +301,7 @@ Cover Artists:
 Art Tags:
 - Kate (Desynced)
 Referenced Tracks:
-- Daughter
+- track:daughter-desynced
 ---
 Track: Hell Riders
 Artists:
@@ -341,8 +345,8 @@ Art Tags:
 - Kate's dad (Desynced)
 - Masky (Desynced)
 Referenced Tracks:
-- Cooldown
-- Escapade
+- track:cooldown-desynced
+- track:escapade-desynced
 - Light of the Sun
 ---
 Track: ASIMOV 3つの法律 (Lofi Beats to Engineer alone to)
@@ -372,8 +376,8 @@ Cover Artists:
 Art Tags:
 - Kate (Desynced)
 Referenced Tracks:
-- Daughter
-- Cooldown
+- track:daughter-desynced
+- track:cooldown-desynced
 - Desynced Anthem
 - Friends to the End
 - Mother Dearest
@@ -418,7 +422,7 @@ Art Tags:
 Referenced Tracks:
 - Light of the Sun
 - Desynced Anthem
-- Daughter
+- track:daughter-desynced
 ---
 Track: Vantablack
 Artists:
@@ -434,9 +438,11 @@ Art Tags:
 Referenced Tracks:
 - Void of the Moon
 - Desynced Anthem
-- Daughter
+- track:daughter-desynced
 ---
 Track: Arrival
+Directory: arrival-desynced
+Always Reference By Directory: true
 Artists:
 - Pascal van den Bos
 Duration: '6:56'
@@ -452,19 +458,19 @@ Referenced Tracks:
 - track:alpha-admission
 - Fate of the Heir
 - Vexation
-- Escapade
-- track:noir
+- track:escapade-desynced
+- track:noir-desynced
 - Cutest Companion
 - Temporal Guardian
 - Heartbreaker
 - Mother Dearest
-- Cooldown
+- track:cooldown-desynced
 - A Very Forgiving Kind of Guy
 - Lunar Dance
 - Light of the Sun
-- track:eclipse
+- track:eclipse-desynced
 - Town of Breath
 - Lee's Theme
-- Daughter
+- track:daughter-desynced
 - Desynced Anthem
 - track:battle-elite-four-pokemon-black-and-white-versions
diff --git a/album/dialed-to-11.yaml b/album/dialed-to-11.yaml
index 112220a..32d5bbe 100644
--- a/album/dialed-to-11.yaml
+++ b/album/dialed-to-11.yaml
@@ -201,7 +201,7 @@ Art Tags:
 Referenced Tracks:
 - Never Gonna Give You Up
 - track:axel-f-crazy-frog
-- Sandstorm
+- track:darude-sandstorm
 - track:MeGaLoVania
 - Meow, Meow, Meow, Meow
 - At Doom's Gate [E1M1]
diff --git a/album/diverging-delicacies.yaml b/album/diverging-delicacies.yaml
index 353dae2..0b1e313 100644
--- a/album/diverging-delicacies.yaml
+++ b/album/diverging-delicacies.yaml
@@ -132,9 +132,9 @@ Referenced Tracks:
 - Strider Showdown (loop)
 - Character Theme for Dirk Strider
 - I Am An Island
-- Dominion
+- track:dominion-lofam3
 - Orange Hat
-- Rematch
+- track:rematch-paradox-music-team
 - Shut Me Down
 - track:synchronize-fansong
 - Good Morning, Dirk
@@ -170,7 +170,7 @@ Art Tags:
 - Caliborn
 - Lil Cal
 Referenced Tracks:
-- Singularity
+- track:singularity-cosmic-caretakers
 - HOMOSUCK. DIRECTOR'S CUT, OF THE YEAR EDITION.
 - Eternity Served Cold
 - Austin, Atlantis
@@ -207,6 +207,8 @@ Referenced Tracks:
 - Homestuck Anthem
 ---
 Track: Betrayed
+Directory: betrayed-diverging-delicacies
+Always Reference By Directory: true
 Artists:
 - Joe Ouellet
 Duration: '2:09'
@@ -261,6 +263,8 @@ Referenced Tracks:
 - Chorale for Jaspers
 ---
 Track: Come
+Directory: come-diverging-delicacies
+Always Reference By Directory: true
 Artists:
 - Grace Medley
 Duration: '3:45'
@@ -277,7 +281,7 @@ Referenced Tracks:
 - track:limelight
 - Voidlight
 - track:light-in-the-darkness
-- track:glide
+- track:glide-lofam4
 ---
 Track: Kamina Burana (Ascend to the highest point of the building)
 Directory: kamina-burana
diff --git a/album/early-access.yaml b/album/early-access.yaml
index 2623f86..cf77330 100644
--- a/album/early-access.yaml
+++ b/album/early-access.yaml
@@ -50,6 +50,8 @@ Commentary: |-
     Originally titled "OMEGA Anniversary Edition"
 ---
 Track: Cog
+Directory: cog-early-access
+Always Reference By Directory: true
 Artists:
 - Husr
 Duration: '2:08'
@@ -67,6 +69,8 @@ Commentary: |-
     Concerning Time.
 ---
 Track: Blastoff
+Directory: blastoff-early-access
+Always Reference By Directory: true
 Artists:
 - dbnet18
 - Husr (feat.)
@@ -85,6 +89,8 @@ Commentary: |-
     A track that me and Husr made for Act Omega, but the full version! Special thanks to Husr for composing most of this!
 ---
 Track: Extermination
+Directory: extermination-early-access
+Always Reference By Directory: true
 Artists:
 - Husr
 Duration: '2:32'
diff --git a/album/earthbound-halloween-hack.yaml b/album/earthbound-halloween-hack.yaml
index c99d040..ef89d3a 100644
--- a/album/earthbound-halloween-hack.yaml
+++ b/album/earthbound-halloween-hack.yaml
@@ -60,11 +60,13 @@ Commentary: |-
     I wanted to do this because it would make Twoson fun to walk around in again. It's a little boring to walk around in a place whose music you're already sick of even if you love it. I think even changing the notes a little revitalized the whole spirit of adventure. Along with the new color of Twoson it really reminds me of a very happy, brisk fall day. Even if I only changed a little, I love this song a lottttt. Totally and utterly symbolizes the happy originality of the beginning of the game.
 ---
 Track: Synchronicity
+Directory: synchronicity-ebhh
+Always Reference By Directory: true
 Duration: '3:18'
 URLs:
 - https://youtu.be/0mSxIiIXh8Q
 Referenced Tracks:
-- Synchrony
+- track:synchrony-brandish-the-planet-buster
 Commentary: |-
     <i>Toby Fox:</i>
     The song it plays at the beginning and when you go into the sewers. Although you would never know it, this song is a direct rip of "Synchronicity" from Brandish 2, which is a fantastic song. It took forever to get just perfect, I think it's the longest song it took me to compose because it had a lot of bugs when played in the actual game and plus if you didn't realize it's actually a minute and thirty seconds long... hahaha! I don't like my own arrangement too much (it's okay, good for EB I guess) but I love the game it comes from and its music so it's fine. Sort of another themesong for the game for me.
@@ -99,6 +101,8 @@ Commentary: |-
     This track has no official title. 
 ---
 Track: Sewers
+Directory: sewers-ebhh
+Always Reference By Directory: true
 Duration: '1:11'
 URLs:
 - https://youtu.be/sjCZt9JkCqc
@@ -109,6 +113,8 @@ Commentary: |-
     This track has no official title. 
 ---
 Track: Winters
+Directory: winters-ebhh
+Always Reference By Directory: true
 Duration: '0:45'
 URLs:
 - https://youtu.be/i7OlUrFjTZU
@@ -164,7 +170,7 @@ Duration: '0:49'
 URLs:
 - https://youtu.be/OD94KFAddBs
 Sampled Tracks:
-- Power
+- track:power-mother
 Commentary: |-
     <i>Jebb:</i> (Wiki editor)
     This track is a rip of the original version of "Power" from Earthbound, but unlike the original, it doesn't have the bass fade-in intro. It has no official title.
diff --git a/album/election-season.yaml b/album/election-season.yaml
index 2ffb546..e9924f6 100644
--- a/album/election-season.yaml
+++ b/album/election-season.yaml
@@ -92,6 +92,8 @@ Art Tags:
 - Phoebe (Desynced)
 ---
 Track: Absolution
+Directory: absolution-desynced
+Always Reference By Directory: true
 Artists:
 - Spad3s
 Duration: '6:11'
@@ -133,13 +135,15 @@ Art Tags:
 - Momo (Desynced)
 - Prospit
 Referenced Tracks:
-- Daughter
+- track:daughter-desynced
 - Mirror Mirror
 - Lunar Dance
-- Embryonic
+- track:embryonic-desynced
 - Vexation
 ---
 Track: Embryonic
+Directory: embryonic-desynced
+Always Reference By Directory: true
 Artists:
 - salex_r3kt
 Duration: '2:57'
@@ -197,7 +201,7 @@ Art Tags:
 - Jack Noir
 - 'cw: blood (abstract)'
 Referenced Tracks:
-- track:noir
+- track:noir-desynced
 ---
 Track: A Dime a Dozen
 Artists:
@@ -248,6 +252,8 @@ Art Tags:
 - Kate (Desynced)
 ---
 Track: Pokerface
+Directory: pokerface-desynced
+Always Reference By Directory: true
 Artists:
 - Levc
 Duration: '2:17'
@@ -269,7 +275,7 @@ Cover Artists:
 Art Tags:
 - Jack Noir
 Referenced Tracks:
-- track:noir
+- track:noir-desynced
 ---
 Track: Twilight Dreamers
 Artists:
@@ -290,6 +296,8 @@ Referenced Tracks:
 - Do You Dream of Electric Sheep?
 ---
 Track: Gestalt
+Directory: gestalt-desynced
+Always Reference By Directory: true
 Artists:
 - Rainy
 Duration: '4:00'
diff --git a/album/electric-daydreams.yaml b/album/electric-daydreams.yaml
index 2d193d2..c70c8e0 100644
--- a/album/electric-daydreams.yaml
+++ b/album/electric-daydreams.yaml
@@ -454,6 +454,8 @@ Commentary: |-
     (<a href="https://www.youtube.com/watch?v=pnVW71lwybY">Music video!</a>)
 ---
 Track: Purgatory
+Directory: purgatory-electric-daydreams
+Always Reference By Directory: true
 Duration: '5:20'
 URLs:
 - https://bowman.bandcamp.com/track/purgatory
diff --git a/album/empyreal-rhapsody.yaml b/album/empyreal-rhapsody.yaml
index ecd0a52..f18ab49 100644
--- a/album/empyreal-rhapsody.yaml
+++ b/album/empyreal-rhapsody.yaml
@@ -12,6 +12,7 @@ Cover Art File Extension: png
 Track Art File Extension: png
 Color: '#EAE8E9'
 Groups:
+- Nasqueron
 - Deconreconstruction
 - Fandom
 ---
@@ -35,6 +36,8 @@ URLs:
 - https://vasterror.bandcamp.com/track/anesidora
 ---
 Track: Inertia
+Directory: inertia-empyreal-rhapsody
+Always Reference By Directory: true
 Duration: '03:47'
 Cover Artists:
 - Xamag
@@ -109,6 +112,8 @@ URLs:
 - https://vasterror.bandcamp.com/track/archon
 ---
 Track: Tributary
+Directory: tributary-empyreal-rhapsody
+Always Reference By Directory: true
 Duration: '03:13'
 Cover Artists:
 - Xamag
diff --git a/album/entertaining-sound.yaml b/album/entertaining-sound.yaml
index 81949f4..d5034f9 100644
--- a/album/entertaining-sound.yaml
+++ b/album/entertaining-sound.yaml
@@ -131,6 +131,8 @@ Commentary: |-
     based on a true story
 ---
 Track: body
+Directory: body-entertaining-sound
+Always Reference By Directory: true
 Duration: '1:10'
 URLs:
 - https://conlangcritic.bandcamp.com/track/body
@@ -196,7 +198,7 @@ Referenced Tracks:
 - Bergentrückung
 - ASGORE
 - Heartache
-- Memory
+- track:memory-undertale
 - His Theme
 - Noisemaster Theme
 - Oh Whoa, What's This
@@ -222,7 +224,7 @@ Referenced Tracks:
 - Everybody Everybody
 - All Star
 - Peanut Butter Jelly
-- Badgers
+- track:badgers-mrweebl
 - Running in the 90's
 - Fabulous Secret Powers
 - Marisa Stole the Precious Thing
@@ -230,7 +232,7 @@ Referenced Tracks:
 - Caramelldansen
 - Showtime (Piano Refrain)
 - Nyanyanyanyanyanyanya!【Momo Momone】
-- Friday
+- track:friday-rebecca-black
 - Gangnam Style
 - I knew you were trouble Ft. Screaming goat
 - Yee
@@ -242,7 +244,7 @@ Referenced Tracks:
 - Classical Gas
 - CAT NO BANANA
 - Jump Up, Super Star!
-- Fireflies
+- track:fireflies-owl-city
 - Voidfish Duet
 - what year is it
 - Hotel Mario
diff --git a/album/escaped-chasm.yaml b/album/escaped-chasm.yaml
index e86fb01..31c6977 100644
--- a/album/escaped-chasm.yaml
+++ b/album/escaped-chasm.yaml
@@ -33,6 +33,8 @@ Commentary: |-
      The title for this track is an improvised version based on the file name, the original file name is "title_Toby"
 ---
 Track: House
+Directory: house-escaped-chasm
+Always Reference By Directory: true
 Artists:
 - Toby Fox
 Duration: '1:48'
@@ -97,6 +99,8 @@ Commentary: |-
      The title for this track is an improvised version based on the file name, the original file name is "temmie_demonman_last2"
 ---
 Track: Secret
+Directory: secret-escaped-chasm
+Always Reference By Directory: true
 Artists:
 - Toby Fox
 Duration: '1:05'
diff --git a/album/faux-dramatica.yaml b/album/faux-dramatica.yaml
index 5af2f40..80bf26a 100644
--- a/album/faux-dramatica.yaml
+++ b/album/faux-dramatica.yaml
@@ -36,7 +36,7 @@ Cover Artists:
 Contributors:
 - Veritas Unae (Aumtzi's vocals)
 Sampled Tracks:
-- Hackers
+- track:hackers-iain-softley
 - Killing In The Name
 URLs:
 - https://vasterror.bandcamp.com/track/too-slow
@@ -82,7 +82,7 @@ Cover Artists:
 Sampled Tracks:
 - Real American
 - Just Say No (Captain Lou)
-- Verified
+- track:verified-your-favorite-martian
 - Randy Savage Promo on Hulk Hogan (1989)
 URLs:
 - https://vasterror.bandcamp.com/track/dustcatcher-redux-ft-pylon
@@ -110,6 +110,8 @@ URLs:
 - https://vasterror.bandcamp.com/track/bite-the-hand-that-feeds-you
 ---
 Track: Turncoat
+Directory: turncoat-faux-dramatica
+Always Reference By Directory: true
 Duration: 6:00
 Cover Artists:
 - Tyson Northcutt
@@ -146,6 +148,8 @@ URLs:
 - https://vasterror.bandcamp.com/track/requiem-for-a-dying-planet-ft-the-emek-hefer-choir
 ---
 Track: Naught
+Directory: naught-faux-dramatica
+Always Reference By Directory: true
 Duration: 6:04
 Cover Artists:
 - captkirkland
diff --git a/album/friendsim-2-volume-1.yaml b/album/friendsim-2-volume-1.yaml
index 23394c9..73bea4b 100644
--- a/album/friendsim-2-volume-1.yaml
+++ b/album/friendsim-2-volume-1.yaml
@@ -25,6 +25,8 @@ URLs:
 - https://www.youtube.com/watch?v=NLB2Vc7FrY0
 ---
 Track: Title Theme
+Directory: title-theme-friendsim-2
+Always Reference By Directory: true
 Artists:
 - James Roach
 Duration: '04:25'
@@ -35,6 +37,8 @@ Commentary: |-
     i did it in the style of the originals, and played around with the [[track:homestuck|homestuck melody]] but made it different enough that it is its own thing
 ---
 Track: Credits Theme
+Directory: credits-theme-friendsim-2
+Always Reference By Directory: true
 Artists:
 - Funk McLovin
 Duration: '00:37'
@@ -87,6 +91,8 @@ Referenced Tracks:
 - Friendsim 2 Prologue End Fanfare
 ---
 Track: Prologue
+Directory: prologue-friendsim-2
+Always Reference By Directory: true
 Artists:
 - FrostyMac
 Duration: '02:53'
@@ -104,9 +110,11 @@ Duration: '01:26'
 URLs:
 - https://studiojune.bandcamp.com/track/detectives-prelude
 Referenced Tracks:
-- Investigation
+- track:investigation-friendsim-2
 ---
 Track: Investigation
+Directory: investigation-friendsim-2
+Always Reference By Directory: true
 Artists:
 - FrostyMac
 Duration: '01:12'
@@ -129,9 +137,11 @@ Duration: '01:12'
 URLs:
 - https://studiojune.bandcamp.com/track/investigation-chill-mix
 Referenced Tracks:
-- Investigation
+- track:investigation-friendsim-2
 ---
 Track: Trial Theme
+Directory: trial-theme-friendsim-2
+Always Reference By Directory: true
 Artists:
 - FrostyMac
 Duration: '02:13'
@@ -145,7 +155,7 @@ Duration: '01:58'
 URLs:
 - https://studiojune.bandcamp.com/track/cross-examining-the-witness
 Referenced Tracks:
-- Trial Theme
+- track:trial-theme-friendsim-2
 ---
 Track: Hot Pink Denial
 Artists:
@@ -248,6 +258,8 @@ URLs:
 - https://studiojune.bandcamp.com/track/wanshis-rp-extravaganza
 ---
 Track: Tavern
+Directory: tavern-friendsim-2
+Always Reference By Directory: true
 Artists:
 - Funk McLovin
 Duration: '01:32'
@@ -255,6 +267,8 @@ URLs:
 - https://studiojune.bandcamp.com/track/tavern
 ---
 Track: Dungeon
+Directory: dungeon-friendsim-2
+Always Reference By Directory: true
 Artists:
 - Funk McLovin
 Duration: '01:27'
@@ -271,6 +285,8 @@ URLs:
 - https://studiojune.bandcamp.com/track/join-the-skeleton-war
 ---
 Track: Baggage
+Directory: baggage-friendsim-2
+Always Reference By Directory: true
 Artists:
 - articulatelyComposed
 Duration: '01:12'
diff --git a/album/friendsymphony.yaml b/album/friendsymphony.yaml
index 2f04018..3068aaa 100644
--- a/album/friendsymphony.yaml
+++ b/album/friendsymphony.yaml
@@ -195,6 +195,8 @@ Referenced Tracks:
 - Gold Pilot
 ---
 Track: leech
+Directory: leech-friendsymphony
+Always Reference By Directory: true
 Artists:
 - Gryotharian
 Duration: '2:51'
@@ -220,7 +222,7 @@ Art Tags:
 - Folykl
 - Kuprum
 Referenced Tracks:
-- leech
+- track:leech-friendsymphony
 ---
 Track: Carefree Consternation
 Artists:
diff --git a/album/glitchstuck-volume-1.yaml b/album/glitchstuck-volume-1.yaml
index 21a9e67..e2879bb 100644
--- a/album/glitchstuck-volume-1.yaml
+++ b/album/glitchstuck-volume-1.yaml
@@ -29,9 +29,11 @@ URLs:
 Cover Artists:
 - Glitchstuck
 Referenced Tracks:
-- Altercate
+- track:altercate-glitchstuck
 ---
 Track: Altercate
+Directory: altercate-glitchstuck
+Always Reference By Directory: true
 Duration: '00:59'
 URLs: 
 - https://glitchstuck.bandcamp.com/track/altercate
@@ -66,11 +68,13 @@ URLs:
 Cover Artists:
 - Glitchstuck
 Referenced Tracks:
-- Redemption
+- track:redemption-glitchstuck
 Art Tags:
 - Squiddles
 ---
 Track: Redemption
+Directory: redemption-glitchstuck
+Always Reference By Directory: true
 Duration: '00:55'
 URLs: 
 - https://glitchstuck.bandcamp.com/track/redemption
diff --git a/album/gotta-hatch-em-all.yaml b/album/gotta-hatch-em-all.yaml
index 20bc050..89862bc 100644
--- a/album/gotta-hatch-em-all.yaml
+++ b/album/gotta-hatch-em-all.yaml
@@ -20,7 +20,7 @@ Commentary: |-
     <img src="media/misc/gotta-hatch-em-all-artwork.jpg" width="350">
 ---
 Track: Title Theme
-Directory: title-theme-sahcon
+Directory: title-theme-gotta-hatch-em-all
 Duration: 0:35
 Artists:
 - Funk McLovin
@@ -148,6 +148,8 @@ Referenced Tracks:
 - Spider's Claw
 ---
 Track: Fairies
+Directory: fairies-gotta-hatch-em-all
+Always Reference By Directory: true
 Duration: '1:00'
 Artists:
 - YoItsCro
diff --git a/album/gravity-makes-the-flame-rise.yaml b/album/gravity-makes-the-flame-rise.yaml
index c4e5771..c5b16bc 100644
--- a/album/gravity-makes-the-flame-rise.yaml
+++ b/album/gravity-makes-the-flame-rise.yaml
@@ -198,6 +198,8 @@ Lyrics: |-
     And ever and ever and ever and ever
 ---
 Track: Burnout
+Directory: burnout-gravity-makes-the-flame-rise
+Always Reference By Directory: true
 Contributors:
 - Melancholy Robot (drums)
 Duration: '4:30'
@@ -368,6 +370,8 @@ Lyrics: |-
     Oh oh oh
 ---
 Track: Manufacturers
+Directory: manufacturers-gravity-makes-the-flame-rise
+Always Reference By Directory: true
 Contributors:
 - Melancholy Robot (drums)
 Duration: '3:44'
@@ -475,6 +479,8 @@ Lyrics: |-
     They want to burn the government down
 ---
 Track: Anarchy
+Directory: anarchy-gravity-makes-the-flame-rise
+Always Reference By Directory: true
 Contributors:
 - Melancholy Robot (drums)
 Duration: '3:42'
diff --git a/album/greatest-hits-2.yaml b/album/greatest-hits-2.yaml
index 9480cb5..ef629dd 100644
--- a/album/greatest-hits-2.yaml
+++ b/album/greatest-hits-2.yaml
@@ -68,9 +68,9 @@ Art Tags:
 - Germy
 - Derse
 Referenced Tracks:
-- track:downwards
+- track:downwards-canmt
 Sampled Tracks:
-- track:downwards
+- track:downwards-canmt
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/downwards-2
 ---
@@ -132,14 +132,14 @@ Art Tags:
 - Spdaes Sleck
 - Felt Manor
 Referenced Tracks:
-- track:midnight
+- track:midnight-canmt
 Sampled Tracks:
-- track:midnight
+- track:midnight-canmt
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/midnight-2
 ---
 Track: Ringleader
-Originally Released As: track:ringleader
+Originally Released As: track:ringleader-canmt
 Directory: ringleader-greatest-hits-2
 Duration: '03:07'
 Cover Artists:
@@ -492,7 +492,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/starsetter-2
 ---
 Track: Endure
-Originally Released As: track:endure
+Originally Released As: track:endure-canmt
 Directory: endure-greatest-hits-2
 Duration: '02:59'
 Cover Artists:
@@ -603,7 +603,7 @@ Art Tags:
 - 'cw: cops'
 Referenced Tracks:
 - track:fighting-spirit-double-ascended-form
-- Plague
+- track:plague-canmt
 - RollerCoaster Tycoon 2 Theme
 Sampled Tracks:
 - track:fighting-spirit-double-ascended-form
diff --git a/album/guidestuck-volume-one.yaml b/album/guidestuck-volume-one.yaml
index 1d482b7..87eefc4 100644
--- a/album/guidestuck-volume-one.yaml
+++ b/album/guidestuck-volume-one.yaml
@@ -61,6 +61,8 @@ Cover Artists:
 - Mouse
 ---
 Track: Decay
+Directory: decay-guidestuck
+Always Reference By Directory: true
 Artists:
 - Alfy
 Duration: '03:33'
@@ -71,6 +73,8 @@ Cover Artists:
 - Adrienne Garcia
 ---
 Track: Naturae
+Directory: naturae-guidestuck
+Always Reference By Directory: true
 Artists:
 - HexVertigo
 Duration: '01:20'
@@ -242,6 +246,8 @@ Cover Artists:
 - apocryphalsovereign
 ---
 Track: Animosity
+Directory: animosity-guidestuck
+Always Reference By Directory: true
 Artists:
 - Lea Cason
 Duration: '02:59'
diff --git a/album/heaven-sent.yaml b/album/heaven-sent.yaml
index af7c287..036caa1 100644
--- a/album/heaven-sent.yaml
+++ b/album/heaven-sent.yaml
@@ -50,6 +50,8 @@ URLs:
 - https://swagazaki.bandcamp.com/track/nightosphere-bass-unfinished
 ---
 Track: Chroma
+Directory: chroma-heaven-sent
+Always Reference By Directory: true
 Artists:
 - Swagazaki
 - Chimune
diff --git a/album/heinoustuck-vol-1.yaml b/album/heinoustuck-vol-1.yaml
index 208e4e4..6240acd 100644
--- a/album/heinoustuck-vol-1.yaml
+++ b/album/heinoustuck-vol-1.yaml
@@ -63,6 +63,8 @@ Art Tags:
 - 'cw: eye horror'
 ---
 Track: Asylum
+Directory: asylum-heinoustuck
+Always Reference By Directory: true
 Artists:
 - Nicole Feltz
 Duration: '03:16'
@@ -124,6 +126,8 @@ Art Tags:
 - 'cw: blood'
 ---
 Track: Rooftop
+Directory: rooftop-heinoustuck
+Always Reference By Directory: true
 Artists:
 - HexVertigo
 Duration: '03:03'
@@ -169,6 +173,8 @@ Art Tags:
 - 'cw: blood'
 ---
 Track: Striving
+Directory: striving-heinoustuck
+Always Reference By Directory: true
 Artists:
 - HexVertigo
 Duration: '04:36'
@@ -196,6 +202,8 @@ Referenced Tracks:
 - Clockwork Melody
 ---
 Track: Rainforest
+Directory: rainforest-heinoustuck
+Always Reference By Directory: true
 Artists:
 - Sarcastic Fringehead
 Duration: '01:20'
@@ -212,6 +220,8 @@ Referenced Tracks:
 - Sburban Jungle
 ---
 Track: Ignition
+Directory: ignition-heinoustuck
+Always Reference By Directory: true
 Artists:
 - eridamnit
 Duration: '02:33'
diff --git a/album/hiveswap-act-1-ost.yaml b/album/hiveswap-act-1-ost.yaml
index 6bfa00b..2e2a0ae 100644
--- a/album/hiveswap-act-1-ost.yaml
+++ b/album/hiveswap-act-1-ost.yaml
@@ -318,7 +318,7 @@ URLs:
 - https://homestuck.bandcamp.com/track/filthy-nuclear-bunker-2
 - https://youtu.be/Du1cFu4zl4o
 Referenced Tracks:
-- Nuclear
+- track:nuclear-james-roach
 - Rustblood
 MIDI Project Files:
 - Title: MIDI by Unknown
diff --git a/album/homestuck-2-beyond-canmt-vol-1.yaml b/album/homestuck-2-beyond-canmt-vol-1.yaml
index e664983..2738275 100644
--- a/album/homestuck-2-beyond-canmt-vol-1.yaml
+++ b/album/homestuck-2-beyond-canmt-vol-1.yaml
@@ -47,7 +47,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/starship-strife
 - https://youtu.be/YRV4HftO7hg
 Referenced Tracks:
-- Dissonance
+- track:dissonance-quincy-pringle
 - Atomyk Ebonpyre
 - The Lemonsnout Turnabout
 - Doctor
@@ -117,6 +117,8 @@ Referenced Tracks:
 - Moonsetter
 - Despot
 - Upward Movement (Dave Owns)
+Sampled Tracks:
+- that one sample prevalent in 666 Kill Chop Deluxe, 1:33
 ---
 Track: Ship of Theseus
 Artists:
diff --git a/album/homestuck-swagazaki.yaml b/album/homestuck-swagazaki.yaml
index 71e4b4e..4e7dca8 100644
--- a/album/homestuck-swagazaki.yaml
+++ b/album/homestuck-swagazaki.yaml
@@ -62,6 +62,8 @@ Referenced Tracks:
 - English
 ---
 Track: Sacrifice
+Directory: sacrifice-homestuck-swagazaki
+Always Reference By Directory: true
 Duration: '02:17'
 URLs: 
 - https://swagazaki.bandcamp.com/track/sacrifice
diff --git a/album/homestuck-vol-10.yaml b/album/homestuck-vol-10.yaml
index de5f201..a24f01c 100644
--- a/album/homestuck-vol-10.yaml
+++ b/album/homestuck-vol-10.yaml
@@ -431,7 +431,7 @@ Commentary: |-
     <i>Kiko B.:</i>
     This gentle but haunting refrain from Buzinkai reminded me of those calm-but-ominous moments in my favorite adventure games, particularly a fantastic little game called Cave Story. Given the title of the track, a castle-exploration scene seemed to be a given.
     I knew I wanted to draw the trolls, and liked the idea of depicting Terezi and Vriska during the post-retcon timeline. So I went with one of the castles we see in a Dream Bubble.
-    Although, compared to the vibe the song gives off, The Scourge Sisters seem a little too excited to be exploring this creepy old place. The piece needed something to give it a more ominous tone. A scrapped concept involved Karkat and the Mayor, so I put them in the forefront here to add a sense of urgency and foreboding - they're probably not in any actual danger, but Karkat's not gonna let his beloved Mayor get wrapped up in Terezi and Vriska's castle-plundering shenanigans. Visually, I was mianly inspired by the illustrations seen during the ending credits of Cave Story, and how effectively they used limited, almost monochromatic color palettes. I cycled through a lot of different colors for the piece before deciding on the blue/purple gradient here.
+    Although, compared to the vibe the song gives off, The Scourge Sisters seem a little too excited to be exploring this creepy old place. The piece needed something to give it a more ominous tone. A scrapped concept involved Karkat and the Mayor, so I put them in the forefront here to add a sense of urgency and foreboding - they're probably not in any actual danger, but Karkat's not gonna let his beloved Mayor get wrapped up in Terezi and Vriska's castle-plundering shenanigans. Visually, I was mainly inspired by the illustrations seen during the ending credits of Cave Story, and how effectively they used limited, almost monochromatic color palettes. I cycled through a lot of different colors for the piece before deciding on the blue/purple gradient here.
     Still not sure which one I like best!
     In hindsight, I could have easily set this piece in any of the castles on Prospit or Derse, but then I couldn't easily include the Mayor. And I really, REALLY wanted to draw the Mayor.
     Besides, pursuing a more obscure concept forced me to get more creative with the scenario and composition.
@@ -572,7 +572,7 @@ Referenced Tracks:
 Commentary: |-
     <i>Luke Benjamins:</i>
     I actually wrote the melody for this track almost five years ago, for a project that never got off the ground. As far as I can remember, I didn't have any particular inspiration when I wrote it, musical or otherwise. It's the catchiest tune I've ever made, yet I couldn't tell you how it came to me exactly. This version is a completely unique take on this melody compared to the original context, giving it a very different Feel. I wasn't able to do any of the audio production for this track, but I did guide RJ as to how I Feel it should be put together. We ended up pushing the deadline too much with this one, and there are still a couple things I wish had been changed, but like with any creative work, you need to draw the line somewhere, lest you polish it endlessly.
-    In the end, I'm gald to finally share it with the world in some form, and I hope the world enjoys it.
+    In the end, I'm glad to finally share it with the world in some form, and I hope the world enjoys it.
     <i>Robert J! Lake:</i>
     This is really Luke's song. I started the project file but he made it his own. The crow noises are mine.
     (<a href="https://www.youtube.com/watch?v=Yngy9XIzRLY&lc=UgheYBDHMQfgt3gCoAEC">YouTube</a>)
@@ -657,7 +657,7 @@ Referenced Tracks:
 - Doctor
 - Cascade (Beta)
 - Time on My Side
-- Hydrogen
+- track:hydrogen-moon
 - Beatdown (Strider Style)
 - Upward Movement (Dave Owns)
 - Penumbra Phantasm
diff --git a/album/homestuck-vol-11.yaml b/album/homestuck-vol-11.yaml
index 9230c3e..1f26ae6 100644
--- a/album/homestuck-vol-11.yaml
+++ b/album/homestuck-vol-11.yaml
@@ -53,7 +53,7 @@ Referenced Tracks:
 - Mutiny
 - Guardian V2
 - Desperado
-- track:contention
+- track:contention-lofam3
 - Unbound (loop)
 - Kinetic Verdancy
 ---
diff --git a/album/homestuck-vol-6.yaml b/album/homestuck-vol-6.yaml
index 1a2671c..4c37571 100644
--- a/album/homestuck-vol-6.yaml
+++ b/album/homestuck-vol-6.yaml
@@ -50,7 +50,7 @@ URLs:
 - https://homestuck.bandcamp.com/track/frost-3
 - https://youtu.be/57FwbcQ4LIA
 Referenced Tracks:
-- Flow
+- track:flow-solatrus
 Sheet Music Files:
 - Title: Piano score by almostsix
   Files:
diff --git a/album/homestuck-vol-8.yaml b/album/homestuck-vol-8.yaml
index cf64012..7c37e9c 100644
--- a/album/homestuck-vol-8.yaml
+++ b/album/homestuck-vol-8.yaml
@@ -365,7 +365,7 @@ Art Tags:
 - Frogs
 - LoFaF
 Referenced Tracks:
-- Terra
+- track:terra-solatrus
 - track:frost-vol6
 Commentary: |-
     <i>Solatrus:</i>
diff --git a/album/hush.yaml b/album/hush.yaml
index e94ce6d..d55bf93 100644
--- a/album/hush.yaml
+++ b/album/hush.yaml
@@ -202,6 +202,8 @@ Lyrics: |-
     All I wanna do
 ---
 Track: Tribes
+Directory: tribes-hush
+Always Reference By Directory: true
 Duration: '3:51'
 URLs:
 - https://bowman.bandcamp.com/track/tribes
@@ -242,6 +244,8 @@ Lyrics: |-
     How can anybody choose what they believe?
 ---
 Track: Redshifts
+Directory: redshifts-hush
+Always Reference By Directory: true
 Duration: '4:36'
 URLs:
 - https://bowman.bandcamp.com/track/redshifts
@@ -284,6 +288,8 @@ Lyrics: |-
     You'll know you're not the only one
 ---
 Track: Rage
+Directory: rage-hush
+Always Reference By Directory: true
 Duration: '4:16'
 URLs:
 - https://bowman.bandcamp.com/track/rage
@@ -462,6 +468,8 @@ Commentary: |-
     (<a href="https://www.youtube.com/watch?v=SD5i7HfQYPc">Music video!</a>)
 ---
 Track: Chameleon
+Directory: chameleon-hush
+Always Reference By Directory: true
 Duration: '4:08'
 URLs:
 - https://bowman.bandcamp.com/track/chameleon
diff --git a/album/i-am-writing-myself-a-dream-in-a-letter.yaml b/album/i-am-writing-myself-a-dream-in-a-letter.yaml
index 12fa40e..2233f42 100644
--- a/album/i-am-writing-myself-a-dream-in-a-letter.yaml
+++ b/album/i-am-writing-myself-a-dream-in-a-letter.yaml
@@ -35,7 +35,7 @@ URLs:
 - https://nasqueron.bandcamp.com/track/dreaming-pool-2
 Referenced Tracks:
 - track:summer-noah-noble
-- Howl
+- track:howl-allen-ginsberg
 Lyrics: |-
     All green things growing under every sky,<br>All hands reaching into grave,<br>Every horse's chest drums out the sound, the<br>Beating beating of hearts, feet and fists,<br>On the ground, on the ground, on your body;<br>On your body, on your skin,<br>And every building falls and flowers grow;<br>And seabirds cry the sounds<br>Of Now and Here and Salt and Fear and Open;<br>And the eyes of the fox are open, and the eyes<br>Of the rabbit are open, and the grass<br>Will never stop, and the sun<br>Rolls down your mountain bones, leaving<br>Scorched grass,<br>And a lamb, eyes closed and stiff and cold,<br>In your arms so heavy;<br>Soft soft its skull and gold and dull,<br>We wait for rain.
     What sphinx of cement and aluminum bashed open their skulls and ate up their brains and imagination?<br>Moloch! Solitude! Filth! Ugliness! Ashcans and unobtainable dollars! Children screaming under the stairways! Boys sobbing in armies! Old men weeping in the parks!<br>Moloch! Moloch! Nightmare of Moloch! Moloch the loveless! Mental Moloch! Moloch the heavy judger of men!<br>Moloch the incomprehensible prison! Moloch the crossbone soulless jailhouse and Congress of sorrows! Moloch whose buildings are judgment! Moloch the vast stone of war! Moloch the stunned governments!<br>Moloch whose mind is pure machinery! Moloch whose blood is running money! Moloch whose fingers are ten armies! Moloch whose breast is a cannibal dynamo! Moloch whose ear is a smoking tomb!<br>Moloch whose eyes are a thousand blind windows! Moloch whose skyscrapers stand in the long streets like endless Jehovahs! Moloch whose factories dream and croak in the fog! Moloch whose smoke-stacks and antennae crown the cities!<br>Moloch whose love is endless oil and stone! Moloch whose soul is electricity and banks! Moloch whose poverty is the specter of genius! Moloch whose fate is a cloud of sexless hydrogen! Moloch whose name is the Mind!<br>Moloch in whom I sit lonely! Moloch in whom I dream Angels! Crazy in Moloch! Cocksucker in Moloch! Lacklove and manless in Moloch!<br>Moloch who entered my soul early! Moloch in whom I am a consciousness without a body! Moloch who frightened me out of my natural ecstasy! Moloch whom I abandon! Wake up in Moloch! Light streaming out of the sky!<br>Moloch! Moloch! Robot apartments! invisible suburbs! skeleton treasuries! blind capitals! demonic industries! spectral nations! invincible madhouses! granite cocks! monstrous bombs!<br>They broke their backs lifting Moloch to Heaven! Pavements, trees, radios, tons! lifting the city to Heaven which exists and is everywhere about us!<br>Visions! omens! hallucinations! miracles! ecstasies! gone down the American river!<br>Dreams! adorations! illuminations! religions! the whole boatload of sensitive bullshit!<br>Breakthroughs! over the river! flips and crucifixions! gone down the flood! Highs! Epiphanies! Despairs! Ten years' animal screams and suicides! Minds! New loves! Mad generation! down on the rocks of Time!<br>Real holy laughter in the river! They saw it all! the wild eyes! the holy yells! They bade farewell! They jumped off the roof! to solitude! waving! carrying flowers! Down to the river! into the street!
diff --git a/album/inhospitable-delisted.yaml b/album/inhospitable-delisted.yaml
index 6b11160..d082314 100644
--- a/album/inhospitable-delisted.yaml
+++ b/album/inhospitable-delisted.yaml
@@ -29,6 +29,8 @@ URLs:
 Has Cover Art: false
 ---
 Track: Misconduct
+Directory: misconduct-inhospitable
+Always Reference By Directory: true
 Date First Released: November 28, 2017
 Duration: '3:06'
 URLs:
@@ -41,6 +43,8 @@ URLs:
 - https://nuclear333.bandcamp.com/track/faultline-flatfoots
 ---
 Track: Regrets
+Directory: regrets-inhospitable
+Always Reference By Directory: true
 Date First Released: November 28, 2017
 Duration: '2:03'
 URLs:
@@ -69,7 +73,7 @@ URLs:
 - https://nuclear333.bandcamp.com/track/perspective-inbound
 Commentary: |-
     <i>tempest2k:</i>
-    This track reused the art from [[track:regrets]] in the original too.
+    This track reused the art from [[track:regrets-inhospitable]] in the original too.
 ---
 Track: Deep in the Planet
 Date First Released: November 28, 2017
diff --git a/album/intermishin.yaml b/album/intermishin.yaml
index e383956..d692b8d 100644
--- a/album/intermishin.yaml
+++ b/album/intermishin.yaml
@@ -395,7 +395,7 @@ Commentary: |-
     The basic idea here is pretty simple - combine Spades Sleck and Robbie Rotten to get utter hell. The background is meant to invoke the first panel of the Intermishin - you can see the gateways, the flame, the shitty rug, and a clock throughout the image. At first I just wanted to draw a hyperrealistic version of Sleck's shitty head, but along the way that turned into making his head be a reasonable facsimilie of Robbie's own head. I also modeled Sleck's knife off of the knife he wields very early on, but tried to make it look three-dimensional, once again attempting to convey a hyperrealistic shitty drawing. I made this track art before the album cover, and looking back, those principles are clearly echoed in it as well. The Midnight Crew's lines look pretty much as clean as the Felt because of how "hyperrealistically shitty" I went, so I had to go back and .jpeg them up a bit. I didn't do that with this because... I'm lazy??
 ---
 Track: Midnight
-Directory: midnight
+Directory: midnight-canmt
 Artists:
 - TirantBacon
 Cover Artists:
@@ -739,6 +739,8 @@ Commentary: |-
     <img src="media/misc/i-love-the-die.png" width="219">
 ---
 Track: Inaugural
+Directory: inaugural-canmt
+Always Reference By Directory: true
 Artists:
 - Cecily Renns
 Cover Artists:
@@ -862,13 +864,13 @@ Referenced Tracks:
 - track:1-through-15
 - The Fixed Clock
 - track:scratching-consequences
-- track:midnight
+- track:midnight-canmt
 - track:stab-stab-stab
 Sampled Tracks:
 - track:1-through-15
 - The Fixed Clock
 - track:scratching-consequences
-- track:midnight
+- track:midnight-canmt
 - track:stab-stab-stab
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/variating-sides
@@ -884,7 +886,8 @@ Commentary: |-
     I quite literally lose my shit over anything intermission related so I had the time of my life drawing this track art. While I can’t give an exact number, I can say this piece took me around 15+ hours. I experimented a lot with the lineart as I lined with a brush I was fairly inexperienced with. I chose a brush which emulated inking as I felt it made the characters look much more eye-catching. I also felt it made the entire image itself look harsher which I believe reflects the rather rough nature of the intermishin (and intermission) pretty well. I probably enjoyed drawing Vaska (Vrasky?Vaksaks? Snowmom?) the most and admittedly took inspiration from manga when lining and shading her hair. I overlaid the image with a texture and applied a lot of saturation to finish this piece off as I wanted the end result to look kind of like an old vinyl cover. Overall, I am very very happy with how this turned out! 
 ---
 Track: Ringleader
-Directory: ringleader
+Directory: ringleader-canmt
+Always Reference By Directory: true
 Artists:
 - Discfortune
 Contributors:
diff --git a/album/ithaca.yaml b/album/ithaca.yaml
index b11c8da..dbe9182 100644
--- a/album/ithaca.yaml
+++ b/album/ithaca.yaml
@@ -38,6 +38,8 @@ Lyrics: |-
     Watches with its lonely eye
 ---
 Track: Ascension
+Directory: ascension-ithaca
+Always Reference By Directory: true
 Artists:
 - Michael Guy Bowman
 - James Dever
@@ -240,6 +242,8 @@ Lyrics: |-
     And I'd never once tried to fight for myself
 ---
 Track: Noun
+Directory: noun-ithaca
+Always Reference By Directory: true
 Duration: '5:14'
 URLs:
 - https://bowman.bandcamp.com/track/noun
diff --git a/album/jailbreak-vol-1.yaml b/album/jailbreak-vol-1.yaml
index b75e189..b6a7f67 100644
--- a/album/jailbreak-vol-1.yaml
+++ b/album/jailbreak-vol-1.yaml
@@ -49,6 +49,8 @@ Commentary:
 Section: Main album
 ---
 Track: Fanfare
+Directory: fanfare-jailbreak
+Always Reference By Directory: true
 Artists:
 - Robert J! Lake
 Duration: 0:13
@@ -109,6 +111,8 @@ Cover Artists:
 - Robert J! Lake
 ---
 Track: Assail
+Directory: assail-jailbreak
+Always Reference By Directory: true
 Artists:
 - Erik Scheele
 Duration: '2:41'
@@ -119,6 +123,8 @@ Cover Artists:
 - Robert J! Lake
 ---
 Track: Confrontation
+Directory: confrontation-jailbreak
+Always Reference By Directory: true
 Artists:
 - Andrew Huo
 Duration: '2:06'
@@ -152,6 +158,8 @@ Cover Artists:
 - Ginnie Sea
 ---
 Track: Bars
+Directory: bars-jailbreak
+Always Reference By Directory: true
 Artists:
 - Robert J! Lake
 - Luke Benjamins
@@ -353,6 +361,8 @@ Referenced Tracks:
 - Squiddles!
 ---
 Track: Distanced
+Directory: distanced-jailbreak
+Always Reference By Directory: true
 Artists:
 - Robert J! Lake
 Duration: '2:08'
@@ -399,7 +409,7 @@ Duration: '43:06'
 URLs:
 - https://www.youtube.com/watch?v=ITGuz64rQQg
 Lyrics: |-
-    [[track:fanfare|-FANFARE-]]
+    [[track:fanfare-jailbreak|-FANFARE-]]
     GFD: Welcome to "Holy Shit, Sesame Street's YouTube was porned, and also I guess Jailbreak is happening".
     RJ!: It's the album commentary, yeah.
     Nick: This is... Welcome, this is me.
@@ -578,7 +588,7 @@ Lyrics: |-
     GFD: I feel like that would be better than what we had it as.
     RJ!: No more talking. Jit: Okay.
 
-    [[track:assail|-ASSAIL-]]
+    [[track:assail-jailbreak|-ASSAIL-]]
     Nick: I love this one.
     RJ!: I love this one too. Hi, Jit.
     Nick: Forget everything else, this song's the best.
@@ -615,7 +625,7 @@ Lyrics: |-
     GFD: God has all the time in the world, though. Literally.
     Nick: Woah, what the hell was that?
 
-    [[track:confrontation|-CONFRONTATION-]]
+    [[track:confrontation-jailbreak|-CONFRONTATION-]]
     GFD: Oh, here we go.
     Jit: This is— RJ!: [bad song imitation] Jit: —more Adghar. RJ!: Yeah, definitely.
     Nick: So, what is this? GFD: Me and RJ were part, were inspirations for the song, a little bit. You can hear quotes from some of my songs that had never actually been out ever. Uh...
@@ -685,8 +695,8 @@ Lyrics: |-
     Jit: Does he even have any tracks on this album?
     RJ!: No, he does not have any tra—
 
-    [[track:bars|-BARS-]]
-    GFD: Oh, here's [[track:bars|Bars]]. Here's [[track:bars|Bars]] coming on.
+    [[track:bars-jailbreak|-BARS-]]
+    GFD: Oh, here's [[track:bars-jailbreak|Bars]]. Here's [[track:bars-jailbreak|Bars]] coming on.
     RJ!: I made this. Yeah, I made this.
     GFD: Yeah, RJ made this and I helped a little bit, except actually the whole song was me the whole time! You didn't expect that, did you?
     RJ!: Why was that so funny to you? Jit: Was it really all you?
@@ -896,7 +906,7 @@ Lyrics: |-
     RJ!: Pik, Pick, Pic Skull. Nick: No, don't say it, don't say it.
     Jit: Is this really from Cave Story?
     GFD: No, it's not. RJ!: No, it's not actually from Cave Story. Jit: Okay, good.
-    GFD: Just like RJ actually made [[track:bars|Bars]]. [laughter] Oh, wait... Man, it's missing all the oomph that it used to have. It's all uh—
+    GFD: Just like RJ actually made [[track:bars-jailbreak|Bars]]. [laughter] Oh, wait... Man, it's missing all the oomph that it used to have. It's all uh—
     RJ!: It's more...  Nick: YOU'RE missing the oomph. RJ!: Softer than—
     GFD: It's wimpier.
     Nick: You're wimpier.
diff --git a/album/jpeg.yaml b/album/jpeg.yaml
index dd1fdb3..1b7c701 100644
--- a/album/jpeg.yaml
+++ b/album/jpeg.yaml
@@ -129,7 +129,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/jhon-vs-dabe
 - https://youtu.be/gr9noez_p5I
 Referenced Tracks:
-- Otherworld
+- track:otherworld-final-fantasy-ix
 Sampled Tracks:
 - Soldier 76 voice lines from Overwatch
 Commentary: |-
@@ -293,7 +293,7 @@ URLs:
 - https://www.youtube.com/watch?v=vWVnTl4ovos
 Referenced Tracks:
 - Aggrieve
-- Smack
+- track:smack-khonjin-house
 - RollerCoaster Tycoon Theme
 Sampled Tracks:
 - rose pragnant
@@ -426,6 +426,8 @@ Lyrics: |-
     Big Bad Beta Kids
 ---
 Track: Terminal
+Directory: terminal-canmt
+Always Reference By Directory: true
 Artists:
 - Grace Medley
 Cover Artists:
@@ -979,7 +981,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/ultimate-hope
 - https://youtu.be/e70cRYWymzc
 Referenced Tracks:
-- Homicide
+- track:homicide-danganronpa
 - Emerald Terror
 - track:moshi-moshi
 - Doctor
@@ -1005,7 +1007,7 @@ URLs:
 - https://youtu.be/4OQ0bQgNbOE
 Referenced Tracks:
 - licord nacrasty
-- Discordant
+- track:discordant-cecily-renns
 - RollerCoaster Tycoon Theme
 - track:unintentional-touhou
 - Oppa Toby Style
diff --git a/album/labyrinths-heart.yaml b/album/labyrinths-heart.yaml
index 1ab6ead..77f1ec0 100644
--- a/album/labyrinths-heart.yaml
+++ b/album/labyrinths-heart.yaml
@@ -28,18 +28,24 @@ URLs:
 - https://youtu.be/MCQjTIw6VY8
 ---
 Track: Minotaur
+Directory: minotaur-labyrinths-heart
+Always Reference By Directory: true
 Duration: '3:36'
 URLs:
 - https://clarkpowell.bandcamp.com/track/minotaur
 - https://youtu.be/NOIaL69tDHI
 ---
 Track: Pleas
+Directory: pleas-labyrinths-heart
+Always Reference By Directory: true
 Duration: '3:06'
 URLs:
 - https://clarkpowell.bandcamp.com/track/pleas
 - https://youtu.be/F13Mw50d3Zk
 ---
 Track: Forgotten
+Directory: forgotten-labyrinths-heart
+Always Reference By Directory: true
 Duration: '4:22'
 URLs:
 - https://clarkpowell.bandcamp.com/track/forgotten
@@ -71,6 +77,8 @@ URLs:
 - https://youtu.be/VvREunKFvkQ
 ---
 Track: Shoreline
+Directory: shoreline-labyrinths-heart
+Always Reference By Directory: true
 Duration: '3:48'
 URLs:
 - https://clarkpowell.bandcamp.com/track/shoreline
@@ -95,6 +103,8 @@ URLs:
 - https://youtu.be/_uI2KZD9IYc
 ---
 Track: Fission
+Directory: fission-labyrinths-heart
+Always Reference By Directory: true
 Duration: '2:30'
 URLs:
 - https://clarkpowell.bandcamp.com/track/fission
diff --git a/album/le-canrivalry-album-is-mandatory.yaml b/album/le-canrivalry-album-is-mandatory.yaml
index 22e8d0c..ecbc851 100644
--- a/album/le-canrivalry-album-is-mandatory.yaml
+++ b/album/le-canrivalry-album-is-mandatory.yaml
@@ -81,11 +81,11 @@ Referenced Tracks:
 - Ghostbusters
 - Island In The Sun
 - Space Jam
-- Smooth
-- Shelter
+- track:smooth-santana
+- track:shelter-porter-robinson
 - Dr. Pepper
-- September
-- Bonfire
+- track:september-earth-wind-fire
+- track:bonfire-childish-gambino
 - One Week
 - Michael Bowman Remix
 - Respect Your Elders (Leffen Diss Track)
@@ -98,7 +98,7 @@ Referenced Tracks:
 - Guy Fieri takes you to FLAVORTOWN
 - Moshi Moshi?
 - Thundersnail
-- Linger
+- track:linger-the-cranberries
 - Unknown from M.E.
 - Where The Guns At
 - Science Blaster
@@ -106,7 +106,7 @@ Referenced Tracks:
 - track:MeGaLoVania
 - GameBro (Original 1990 Mix)
 - Chocolate Rain
-- Whales
+- track:whales-hail-mary-mallons
 - Freak On a Leash
 - Put A Donk On It
 - Crank That
@@ -134,11 +134,11 @@ Sampled Tracks:
 - Ghostbusters
 - Island In The Sun
 - Space Jam
-- Smooth
-- Shelter
+- track:smooth-santana
+- track:shelter-porter-robinson
 - Dr. Pepper
-- September
-- Bonfire
+- track:september-earth-wind-fire
+- track:bonfire-childish-gambino
 - One Week
 - Michael Bowman Remix
 - Hotline Bling (Kidz Bop)
@@ -152,7 +152,7 @@ Sampled Tracks:
 - Guy Fieri takes you to FLAVORTOWN
 - Moshi Moshi?
 - Thundersnail
-- Linger
+- track:linger-the-cranberries
 - Unknown from M.E.
 - Where The Guns At
 - Science Blaster
@@ -160,7 +160,7 @@ Sampled Tracks:
 - track:MeGaLoVania
 - GameBro (Original 1990 Mix)
 - Chocolate Rain
-- Whales
+- track:whales-hail-mary-mallons
 - Freak On a Leash
 - Put A Donk On It
 - Crank That
@@ -380,9 +380,9 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/canrival-feat-anthony-hamilton
 Referenced Tracks:
 - le canrival
-- Carnival
+- track:carnival-gorillaz
 Sampled Tracks:
-- Carnival
+- track:carnival-gorillaz
 Lyrics: |-
     We play to win, just to find the dark
     Go home again, and we both fall out
@@ -432,7 +432,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/le-sheltre
 Referenced Tracks:
 - le canrival
-- Shelter
+- track:shelter-porter-robinson
 Lyrics: |-
     I could never find the right way to tell you
     Have you noticed I've been gone?
@@ -660,7 +660,7 @@ Referenced Tracks:
 - track:thyme-on-my-fries
 - soldier game
 - Trouble Busters
-- Bonfire
+- track:bonfire-childish-gambino
 - Takyon (Death Yon)
 Sampled Tracks:
 - Crank That
@@ -675,7 +675,7 @@ Sampled Tracks:
 - track:thyme-on-my-fries
 - soldier game
 - Trouble Busters
-- Bonfire
+- track:bonfire-childish-gambino
 - Takyon (Death Yon)
 Lyrics: |-
     Soulja Boy off in this ho
@@ -842,7 +842,7 @@ Referenced Tracks:
 - Your Best Nightmare
 - le canrival
 - Crank That
-- Sandstorm
+- track:darude-sandstorm
 - Conflict!
 - Meet the Flintstones
 - Moshi Moshi?
diff --git a/album/lofam.yaml b/album/lofam.yaml
index 9a3e533..43fd9c8 100644
--- a/album/lofam.yaml
+++ b/album/lofam.yaml
@@ -96,6 +96,8 @@ Commentary: |-
     Fun fact: I didn't realise for a while that "Homestuck" and "Alternia" were technically remixes themselves, making this a 3x remix-of-remix combob.
 ---
 Track: Downtime
+Directory: downtime-lofam
+Always Reference By Directory: true
 Artists:
 - Thomas Ibarra
 Duration: '2:15'
@@ -137,6 +139,8 @@ Commentary: |-
     Credit to AndrewNeo of Skaia.net for the track's name.
 ---
 Track: Meltwater
+Directory: meltwater-lofam
+Always Reference By Directory: true
 Artists:
 - Elaine Wang
 Duration: '5:04'
@@ -298,7 +302,7 @@ Art Tags:
 - Terezi
 - Vriska
 Referenced Tracks:
-- Vigilante
+- track:vigilante-lofam
 Commentary: |-
     <i>Brenna Curran:</i>
     <code style="color: #008b8b">1:34 4M, TH3 12TH OF 6TH P3R1G33, ST4NDOFF.</code>
@@ -331,6 +335,8 @@ Commentary: |-
     A nice, simple piece. Fashion in Homestuck is associated with Kanaya in my mind so I came up with the idea of Kanaya seeking to escape something, and then halfway through the song the klaxon alarm kicks in. Thus we get this piece of art.
 ---
 Track: Clockbreaker
+Directory: clockbreaker-lofam
+Always Reference By Directory: true
 Artists:
 - Mal McGannon
 Duration: '2:40'
@@ -998,6 +1004,8 @@ Commentary: |-
     This happened through my RP twitter account and I was totally drunk when I made the gif at 3 am. Now Shadolith is one of my fav musicians.
 ---
 Track: Vigilante
+Directory: vigilante-lofam
+Always Reference By Directory: true
 Artists:
 - Brenna Curran
 Duration: '2:00'
@@ -1344,6 +1352,8 @@ Commentary: |-
     <i>Pose as a team, because shit just got real.</i>
 ---
 Track: Farewell
+Directory: farewell-lofam
+Always Reference By Directory: true
 Artists:
 - Fuzz
 Duration: '4:04'
diff --git a/album/lofam2.yaml b/album/lofam2.yaml
index 5f45c66..0235193 100644
--- a/album/lofam2.yaml
+++ b/album/lofam2.yaml
@@ -171,6 +171,8 @@ Commentary: |-
     <i>"EUUUUUUUUNGH," GROANS THE ABDUCTEE MOOSE AS IT RISES.</i>
 ---
 Track: Rectify
+Directory: rectify-lofam2
+Always Reference By Directory: true
 Artists:
 - Thomas Ibarra
 Duration: '2:52'
@@ -188,7 +190,7 @@ Referenced Tracks:
 - 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.
+    My second entry to the music contest, Rectify, was a follow-up to [[track:irradiated-lofam2]] 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.
 ---
 Track: Rabbunctious!
 Artists:
@@ -516,6 +518,8 @@ Commentary: |-
     I have been listening to Horizon's renditions of Homestuck music with her lyrics for a while now, and Flare has always been my favorite one she did. I hoped I could make a picture that represents the feeling of closeness beween the four kids in getting through the game that I feel in the words she wrote.
 ---
 Track: Sports
+Directory: sports-lofam2
+Always Reference By Directory: true
 Artists:
 - Jamie Paige
 Duration: '1:34'
@@ -670,6 +674,8 @@ Commentary: |-
     Listening to Fighting Spirit the first time kind of got me nostalgic for the old Strife pages, with their chiptune music. You know, waaaay back in the beginning of the comic when the Beta kids were still on planet Earth and were being harassed by trolls. So nearly a year later, I figured that a strife page would make for an excellent cover. Admittedly action poses have always been a weakness of mine, so I probably drew each kid at least twice for this cover until I was satisfied. Still though, I'm happy with how the art came out. Hopefully I did this awesome track justice.
 ---
 Track: Irradiated
+Directory: irradiated-lofam2
+Always Reference By Directory: true
 Artists:
 - Thomas Ibarra
 Duration: '2:21'
@@ -825,6 +831,8 @@ Commentary: |-
     <center><i><big>BNORKEL</big></i></center>
 ---
 Track: Four
+Directory: four-lofam2
+Always Reference By Directory: true
 Artists:
 - Trent West
 Duration: '4:11'
@@ -962,6 +970,7 @@ Referenced Tracks:
 - Lotus
 - 'BL1ND JUST1C3 : 1NV3ST1G4T1ON !!'
 - Chorale for Jaspers
+- Sburban Jungle
 - Another Jungle
 - Let's All Rock the Heist
 - Derse Dreamers
@@ -1038,6 +1047,8 @@ Commentary: |-
     - 10:53 - [[At The Price of Oblivion]]
 ---
 Track: Trapped
+Directory: trapped-lofam2
+Always Reference By Directory: true
 Artists:
 - Yan Rodriguez
 Duration: '1:25'
@@ -1433,6 +1444,8 @@ Commentary: |-
     I initially had no idea what I was going to do for this song. I skimmed through the tracks and noticed this one by Willow Ascenzo (who did some of my favorites on coloUrs and mayhem: Universe A like [[Teal Hunter]] and [[Violet Mariner]]), and I was instantly sold probably because of my love for pipe organs. Anyway, for a lack of better inspiration, I used the description left on soundcloud - "Final battle with Lord English." Tie that to Aranea's mentioning that Jake was destined to beat Lord English, and I had my inspiration. The lineart took much longer than it should have since my tablet had been freaking out and I haven't gotten the new one yet, but the coloring went quite smoothly.
 ---
 Track: Gangsta
+Directory: gangsta-lofam2
+Always Reference By Directory: true
 Artists:
 - Dante Basco
 Duration: '2:59'
@@ -1630,6 +1643,8 @@ Commentary: |-
     The moral of the story is, people should write their own dang commentary or else this happens.
 ---
 Track: Prophecy
+Directory: prophecy-lofam2
+Always Reference By Directory: true
 Artists:
 - David Dycus
 Duration: '2:26'
diff --git a/album/lofam3.yaml b/album/lofam3.yaml
index 98451c4..5705665 100644
--- a/album/lofam3.yaml
+++ b/album/lofam3.yaml
@@ -203,7 +203,7 @@ Referenced Tracks:
 - Dirgeish
 - Despot
 - Scourge Sisters
-- Vigilante
+- track:vigilante-lofam
 - A Fashionable Escape
 - track:layers-upon-layers
 - Iron Infidel
@@ -424,6 +424,8 @@ Commentary: |-
     Karkat furiously playing the marinba ostinato.
 ---
 Track: Medium
+Directory: medium-lofam3
+Always Reference By Directory: true
 Artists:
 - Arzenic
 Duration: '3:07'
@@ -585,6 +587,8 @@ Commentary: |-
     This track was actually slated to be on LOFAM 2 originally, but got pushed back for some reason or other. This art's been around since then. Very dramatic.
 ---
 Track: Waveform
+Directory: waveform-lofam3
+Always Reference By Directory: true
 Artists:
 - keyboard cait
 Duration: '3:07'
@@ -958,6 +962,8 @@ Commentary: |-
     I also learnt that I can't draw psionic blasts for my life.
 ---
 Track: Dominion
+Directory: dominion-lofam3
+Always Reference By Directory: true
 Artists:
 - Thomas Ferkol
 Duration: '2:32'
@@ -1022,6 +1028,8 @@ Commentary: |-
     I was beyond excited to get to be part of another fan album, especially to be drawing for a song connected to Dirk's planet, since he's one of my absolute favorite characters. Every kid/troll's planet reflects them and also challenges them at the same time. LOTAK is one of the more dangerous planets, with its constant raging lightning storms and the most powerful denizen at its center, fitting for Dirk who is a determined, skilled fighter. The planet is also a contrast, a planet full of tall buildings for someone who grew up in an ocean surrounded by nothing. I really wanted to show LOTAK as an extension, or part of, DIrk himself. The song itself gives a sense of floating, or as the musi artist said themselves, a very spacey feeling, so I tried to capture this as well, with the overview shot of the planet that Dirk appears to be floating over. I hope that others who look at my piece will feel I managed to pictuer the song well in my drawing for it.
 ---
 Track: Contention
+Directory: contention-lofam3
+Always Reference By Directory: true
 Artists:
 - Marcy Nabors
 Duration: '5:52'
@@ -1139,6 +1147,8 @@ Commentary: |-
     I wanted to go with a simple but striking design that worked on two levels: the large diamond with the grey layers, which looks good as a thumbnail on a small ipod screen or similar, and the silhouetted shadowy type DDs that are more apparent when you view the art at full size. I'm really happy with how well it worked out!
 ---
 Track: Invertebrate
+Directory: invertebrate-lofam3
+Always Reference By Directory: true
 Artists:
 - Astro Kid
 Duration: '3:15'
@@ -1175,6 +1185,8 @@ Commentary: |-
     Originally this track was intended for Parcel Mistress, but after learning more about Dirk's character I thought it fit him better. Thank you to LOFAM and all the talented musicians and artists who made this album possible!
 ---
 Track: Scabbard
+Directory: scabbard-lofam3
+Always Reference By Directory: true
 Artists:
 - Yan Rodriguez
 Duration: '2:06'
@@ -1336,6 +1348,8 @@ Commentary: |-
     I had been wanting to make a full set of functional, repearing titles anyway for use in maybe making a simple platforme,r so I decided to make use of them and create a sort of "If mspa was a game in the 16 bit era" thing. The spirtes were also an excellent opportunity to test out the sprite base I've been working on making from scratch.
 ---
 Track: Insomniac
+Directory: insomniac-lofam3
+Always Reference By Directory: true
 Artists:
 - Princey The Kid
 Duration: '4:25'
@@ -1435,7 +1449,7 @@ Referenced Tracks:
 - track:frost-vol6
 Commentary: |-
     <i>Block Monster:</i> (Nick Smalley & Solatrus)
-    We started this song back in January 2012, during one of our regular hanging-out-<i>probably</i>-drinking collaborative sessions. We got talking about the fact that Frost had been remixed a couple times (once by us, and [[track:meltwater|the other]] by orngje223). One of us (probably Nick) wondered what Frost would sound like as a really cliched remix, to which Jeremy sarcastically pointed out that the only people who ever remix Frost is himself and his friends. This idea was, obviously, a total joke; nevertheless, we kept at it. The song ended up getting to a point where we realized the joke had been lost, and something awesome took its place. To put it simply, what started out as us dicking around ended up becoming one of the coolest songs we've done together.
+    We started this song back in January 2012, during one of our regular hanging-out-<i>probably</i>-drinking collaborative sessions. We got talking about the fact that Frost had been remixed a couple times (once by us, and [[track:meltwater-lofam|the other]] by orngje223). One of us (probably Nick) wondered what Frost would sound like as a really cliched remix, to which Jeremy sarcastically pointed out that the only people who ever remix Frost is himself and his friends. This idea was, obviously, a total joke; nevertheless, we kept at it. The song ended up getting to a point where we realized the joke had been lost, and something awesome took its place. To put it simply, what started out as us dicking around ended up becoming one of the coolest songs we've done together.
     <i>devonianecho:</i>
     Doing art for a dance remix of Frost wouldn't have proved tricky if not for a perplexing (but very cool) track title. And so, here we have Jade and some frogs integrated as part of a... metaphoric-circuitboard-type-thing by Echidna. I think if you imagine the song set to a trippy frog-gathering montage on LOFAF with this imagery, you'll get a better idea of what I was aiming for. At any rate, I'm really happy with how it turned out, and I hope I've done the track the justice it absolutely deserves.
 ---
diff --git a/album/lofam4.yaml b/album/lofam4.yaml
index 998197a..0811c55 100644
--- a/album/lofam4.yaml
+++ b/album/lofam4.yaml
@@ -87,6 +87,8 @@ Commentary: |-
     This piece was a very unique experience for me because it involved drawing something I was rather unfamiliar with. Before I started this piece I knew from the beginning I wanted something rather dynamic and fun and I feel the result stayed true to the image I had in mind. This piece was certainly difficult, but after some trial and error things eventually started coming together nicely. I ended up having a lot of fun trying out new brushes and mixing my favourite colors together to get a final result I was very pleased with.
 ---
 Track: Merge
+Directory: merge-lofam4
+Always Reference By Directory: true
 Artists:
 - Kouta
 - polysaw
@@ -103,7 +105,7 @@ Referenced Tracks:
 - 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.
+    After writing [[track:denizen-lofam4]], 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.
     <i>polysaw:</i>
     Producing Merge was one of the most exciting projects I'd worked on in a long time. Kouta and I made a great team, and working with her pushed both of our boundaries well beyond our comfort zones. We got a lot of doubt from our friends about working with the caw and meow samples, but we were sure it was the perfect way to bring the song together. We were also heavy-handed with leitmotif from the original soundtrack, focusing on blending them in a way that was both interesting to listen to and recognizable. This was made with the utmost care, so give it a listen or ten.
     <i>Circlejourney:</i>
@@ -157,6 +159,8 @@ Commentary: |-
     This was such a fun song and it reminded me of one of my favorite parts of Homestuck - the fun and adventure. It feels so welcoming and warm and triumphant, and I really tried to capture that here!
 ---
 Track: Reunited
+Directory: reunited-lofam4
+Always Reference By Directory: true
 Artists:
 - Shandy
 Duration: '4:21'
@@ -199,6 +203,8 @@ Commentary: |-
     The song that Mmetafour made was an electronic 8-bit style mix, so, logically, I took the role of drawing (or rather, "spriting") the art for this track. As you may know, the song symbolizes Prospit from A6A6A1 after it gets destroyed, so I did two scenes in one: Jane and Jake after their godtier transformations, and our heroes encountering Jack English for the first time. Come to think of it, that act was really messed up, wasn't it? Anyway, the song is amazing, and I really liked how the art came out. I hope you enjoy it too!
 ---
 Track: Altitude
+Directory: altitude-lofam4
+Always Reference By Directory: true
 Artists:
 - Whimsy
 Duration: '2:34'
@@ -221,7 +227,7 @@ Commentary: |-
 ---
 Track: Midnight
 Directory: midnight-lofam4
-Originally Released As: track:midnight
+Originally Released As: track:midnight-canmt
 Duration: '2:47'
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/midnight
@@ -386,6 +392,8 @@ Commentary: |-
     A little known power held by the clearly very fictional and not at all real troll folklore creatures known as "Rainbow Drinkers" is to create flashing green silhouettes of themselves whenever they dance. This of course, holds no practical purpose whatsoever, except for the theoretical seduction of aliens who happen to resemble flighty broads.
 ---
 Track: Intermission
+Directory: intermission-lofam4
+Always Reference By Directory: true
 Artists:
 - Joe Ouellet
 Duration: '5:09'
@@ -448,6 +456,8 @@ Commentary: |-
     Formation has a very 80's vibe to it, so I decided to aim towards more of a Hotline Miami feel for the accompanying artwork. I'm not sure how well I achieved that, but I figure a combination of bright colours and guns is at least veering in the right direction.
 ---
 Track: Scales
+Directory: scales-lofam4
+Always Reference By Directory: true
 Artists:
 - Helena Ruth
 Duration: '3:35'
@@ -477,6 +487,8 @@ Commentary: |-
     the track is really pretty in a melancholic and reminiscing way so I wanted to encorporate things from earlier in the comic (the tree, the hanging scalemates, and the pink flowers) into a sadder scene that's near the end? The tree's also a clever metaphor for branching paths and al that lol and also it looks cool
 ---
 Track: Glide
+Directory: glide-lofam4
+Always Reference By Directory: true
 Artists:
 - Veritas Unae
 Duration: '1:47'
@@ -595,6 +607,8 @@ Commentary: |-
     At one point I described this as something along the lines of "electric Scottish war music", and that still stands. The melody in this song is absolutely iconic, if you ask me, and it gets INCREDIBLY ampled. Maybe enough to see what lies under that voltaic fault. (Spoiler: It's just a lot of xenon.) Also, the lyrics to this song are "DANGER HIGH VOLTAGE". That is all.
 ---
 Track: Ghosts
+Directory: ghosts-lofam4
+Always Reference By Directory: true
 Artists:
 - David Dycus
 Duration: '3:04'
@@ -630,7 +644,7 @@ Art Tags:
 Referenced Tracks:
 - Gold Pilot
 - Courser
-- Courage
+- track:courage-jjba
 Commentary: |-
     <i>Interrobang:</i>
     This song began when I was messing around and thought I wanted to make some v&nbsp;a&nbsp;p&nbsp;o&nbsp;r&nbsp;w&nbsp;a&nbsp;v&nbsp;e. I really like the glitchy sections of Gold Pilot, and my initial plan was to slow those parts down, loop them, add drums, etc - the usual vaporwave stuff - that's also how it got its name, thanks to its project file. However once this started to happen I realized what I had written was very different, and that it had turned into some strange Gold Pilot remix. While I worked on other things for UMSPAF and CANMT, this song was on the back burner and I wasn't sure I'd actually finish it, but I stuck with it and just added things as they came to me (I'll admit that Lambda showing some interest in the song was a bit of motivation). At some point one of the later versions ended up getting accepted to LOFAM4, which was a surprise to be sure, but a welcome one, and so I wrapped up production.
@@ -831,6 +845,8 @@ Commentary: |-
     In my opinion, this track art perfectly fits the "calm before the storm" vibe of a middle before an end, like Disc 2 is before the endgame-themed Disc 3. I'll also note it looks incredibly fitting for the cover of a vinyl record, and with those bright colors and jazzy writing I'd check that hypothetical cover out the moment I saw it.
 ---
 Track: Hiatus
+Directory: hiatus-lofam4
+Always Reference By Directory: true
 Artists:
 - Kevin Grant
 Duration: '2:45'
@@ -1187,6 +1203,8 @@ Commentary: |-
     In this piece by sonotcanon, Jade looks down on the city of Prospit from one of the... Prospit Towers. I'd say that sitting like that on a window pane is unsafe, but then I remembered that dreamselves can, you know, fly, so whatever.
 ---
 Track: Red
+Directory: red-lofam4
+Always Reference By Directory: true
 Artists:
 - Tamara Fritz
 Duration: '2:58'
@@ -1210,6 +1228,8 @@ Commentary: |-
     I needed to draw something equally cute for this cute track. I made this almost exclusively with MS Paint save for the final effects on the art, which were done with SAI.
 ---
 Track: Daydreamer
+Directory: daydreamer-lofam4
+Always Reference By Directory: true
 Artists:
 - electric lantern
 Duration: '1:48'
@@ -1396,7 +1416,7 @@ Commentary: |-
 ---
 Track: Ringleader
 Directory: ringleader-lofam4
-Originally Released As: track:ringleader
+Originally Released As: track:ringleader-canmt
 Duration: '3:07'
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/ringleader
@@ -1470,7 +1490,7 @@ Referenced Tracks:
 - Monochromatic Shenanigans
 - Rouge on the Rox
 - JUST1C3 R41NS FROM 4BOV3
-- Daydreamer
+- track:daydreamer-lofam4
 - Sburban Metro
 Commentary: |-
     <i>Veritas Unae:</i>
@@ -1727,7 +1747,7 @@ Cover Artists:
 Referenced Tracks:
 - Audio Commentary Featuring Robert J! Lake, Nick Smalley, Luke "GFD" Benjamins, and Erik "Jit" Scheele
 - Pumpkin Cravings
-- Assail
+- track:assail-jailbreak
 - Jackknive
 Commentary: |-
     <i>Mathias Ramalho:</i>
@@ -1863,6 +1883,8 @@ Commentary: |-
     Sollux is about to get down. Gotta give out some FRESH BEATS. Gotta JAM YOUR EYEBALLS AND EARHOLES WITH SOME SWEET ASS TUNES. CHECK IT OUT YO.
 ---
 Track: Reconciled
+Directory: reconciled-lofam4
+Always Reference By Directory: true
 Artists:
 - Shandy
 Duration: '4:07'
@@ -2193,7 +2215,8 @@ Art Tags:
 Referenced Tracks:
 - Gold Pilot
 - English
-- Intro
+- Gunshow 2 Theme (Instrumental)
+- track:intro-canwave-2
 - track:of-gods-and-witches
 - Science Blaster
 - track:formation
@@ -2294,6 +2317,8 @@ Commentary: |-
     Also johndave is a bad ship suck it viko
 ---
 Track: Shatter
+Directory: shatter-lofam4
+Always Reference By Directory: true
 Artists:
 - Kanishka
 Duration: '1:58'
@@ -2320,6 +2345,8 @@ Commentary: |-
     "Boom boom boom boom<br>I want you in my room<br>Let's spend the night together<br>From now until forever<br>Boom boom boom boom<br>I wanna double boom<br>Let's spend the night together<br>Together in my room" - Vengaboys
 ---
 Track: Denizen
+Directory: denizen-lofam4
+Always Reference By Directory: true
 Artists:
 - Kouta
 Duration: '5:46'
@@ -2495,6 +2522,8 @@ Commentary: |-
     I love dealing with dark foreground figures against bright backgrounds, so this was fun to add the final touches to. I got a sense of what Quietserval was going for this drawing from talking to them, and tried to realise that in its fullest.
 ---
 Track: Everlasting
+Directory: everlasting-lofam4
+Always Reference By Directory: true
 Artists:
 - Joe Ouellet
 Duration: '4:40'
@@ -2874,7 +2903,7 @@ Commentary: |-
     - [[track:jungle-3]] - 4:13-4:20, 4:28-4:35
     - [[Muse of Nanchos]] - 4:20-4:35
     - [[Meet the Flintstones]] - 4:35-4:49
-    - [[Intro]] - 4:50-5:29
+    - [[track:gunshow-2-theme-instrumental|Intro (Gunshow 2 Theme)]] - 4:50-5:29
     - [[RollerCoaster Tycoon Theme]] - 5:33-6:12
 ---
 Track: Homestuck Sonata
diff --git a/album/lofam5.yaml b/album/lofam5.yaml
index 36e7ca8..c3a5003 100644
--- a/album/lofam5.yaml
+++ b/album/lofam5.yaml
@@ -253,7 +253,7 @@ Art Tags:
 Referenced Tracks:
 - Prospit Dreamers
 - Cascade (Beta)
-- track:midnight
+- track:midnight-canmt
 Commentary: |-
     <i>ft-rj:</i>
     believe me, if I didn't know what I was doing nearly 2 years ago when I made this, I sure don't when I'm writing this commentary. I liked the melody so I made a song, duh
@@ -319,7 +319,7 @@ Referenced Tracks:
 - The Beginning of Something Really Excellent
 - Courser
 - track:carefree-action
-- Snowfall
+- track:snowfall-paradox-music-team
 Commentary: |-
     <i>Rainy:</i>
     This song is is a redo of my very first piece of homestuck fanmusic I ever did. I wanted a remix of a lesser known homestuck song so I decided to do a remix of Toby Fox's [[Jadesprite]].
@@ -381,6 +381,8 @@ Commentary: |-
     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.
 ---
 Track: Dreamers
+Directory: dreamers-lofam5
+Always Reference By Directory: true
 Artists:
 - Scorpyus
 Duration: '5:29'
@@ -535,6 +537,8 @@ Commentary: |-
     Rose and Dave chilling on Derse, with some horrorterrors looming above. (I've taken some artistic liberties with the horrorterrors, in being conjoined into a single mass they kinda resemble the horrorterrors in my fanventure The Tapestry more than canon Homestuck ones)
 ---
 Track: Wayward
+Directory: wayward-lofam5
+Always Reference By Directory: true
 Artists:
 - Shwan
 Duration: '3:06'
@@ -1003,7 +1007,7 @@ Commentary: |-
     I made this song shortly after reading Detective Pony, when Dirk Strider was fresh on my mind and skyrocketing to the top of my all-time favorite characters. I wanted to do something specifically for the offscreen period between the end of homestuck and the epilogues, his journey to becoming what he is now, his acceptance of becoming the villain, etc. Mainly, just really love Dirk. Also, it's an excuse to give some love to some of his more underrated songs. (Basically anything that isn't [[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
-Originally Released As: track:strain
+Originally Released As: track:strain-canmt
 Directory: strain-lofam5
 Duration: '2:27'
 URLs:
@@ -1154,8 +1158,8 @@ Commentary: |-
     There was a lot going on in the production of this, and none of it had to do with the final track. A long, long time ago, before any of my other submissions, I was going to do a Caliborn track, with the intent of being presented as a track that Caliborn himself produced. But at that time, there weren't many other submissions for this album yet, and a disturbingly high percentage of them were cherub related, so I dropped it. A year later, I was working on a remix of the afterword theme from Pesterquest, but it wasn't really clicking right. The heavy bass synths and bitcrushed drums weren't working for the style of the track. Around the same time, I finally got my hands on the incredibly elusive midi of [[track:carne-vale]], which has been my favorite homestuck song since the first time I heard it, and has yet to be dethroned. So I had the crazy notion, that the instruments I was using for my Pesterquest remix would work fantastically if I decided to go back to a Caliborn track, now that I could properly reference [[track:carne-vale]]. (I had been trying to figure out that bassline by ear for, oh lord, something like 3 years.) And, I ended up with what might be one of my favorite compositions of mine to date. Had it stuck in my head for months. Cleaned up the mixing over the next little while, and the rest is history. I had two names for it for a while, Teeth and Blood, and Space Crusader. Originally I was going to go with both, have one of those little ~ things in between, but I decided that Space Crusader, while it fit the vibe of the song, didn't really fit the vibe of Caliborn, so I dropped it.
 ---
 Track: Predomination
+Directory: predomination-lofam5
 Originally Released As: track:how-jack-and-calliope-ran-away
-Directory: predomination
 Duration: '4:13'
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/predomination
@@ -1276,6 +1280,8 @@ Commentary: |-
     I like to think Caliborn worked really hard on this one, maybe it's hanging over a mantelpiece in Lord English's manor somewhere. He's added some tasteful JPEG artifacts and plastic wrap filters to his style, I'm so proud of him!
 ---
 Track: Reunion
+Directory: reunion-lofam5
+Always Reference By Directory: true
 Artists:
 - Not Eno
 Duration: '3:14'
diff --git a/album/lofam5a2.yaml b/album/lofam5a2.yaml
index a7f7768..ecec986 100644
--- a/album/lofam5a2.yaml
+++ b/album/lofam5a2.yaml
@@ -83,7 +83,7 @@ URLs:
 - https://unofficialmspafans.bandcamp.com/track/s-disc-1
 - https://www.youtube.com/watch?v=FxTJ0EZhcL8
 Referenced Tracks:
-- track:intermission
+- track:intermission-lofam4
 Commentary: |-
     <i>Grace Medley:</i>
     That’s right, baby. Dis(c/k) jingles are fucking back. I want to give a huge shoutout to [[artist:lambda-bledsoe|Lambda]], who always championed the importance of the jingle when [[album:lofam4|LOFAM 4]] was in development, uh... \*checks calendar, screams for twenty solid seconds* years ago. I do this mainly because I stole her idea wholesale. LOFAM 4 took the melodies of its jingles from LOFAMs (LsOFAM?) [[album:lofam|1]], [[album:lofam2|2]], and [[album:lofam3|3]] respectively, and since this album also got to being absolutely bloody huge like that one did, it would be fun to do the same by quoting something from 4, then [[album:lofam5|5]], then 5 act 2 – and since you’re reading this alongside the very start of the album, that means maybe you haven’t even heard what the last one references yet. Exciting!
@@ -218,6 +218,8 @@ Commentary: |-
     I felt very strongly about making this watercolor, but also, was too lazy to actually get my paints out. It was fun trying to replicate my watercolor style digitally.
 ---
 Track: Dictator
+Directory: dictator-lofam5a2
+Always Reference By Directory: true
 Artists:
 - Thomas Ferkol
 Duration: '3:44'
@@ -656,6 +658,8 @@ Commentary: |-
     Rose at the Incipisphere's edge. The funky-looking stuff along the margins is partially my own creation and partially edited from some fractal art SolusLunes posted on his Newgrounds page.
 ---
 Track: Beckoning
+Directory: beckoning-lofam5a2
+Always Reference By Directory: true
 Artists:
 - bb-panzu
 Duration: '1:23'
@@ -980,7 +984,7 @@ Commentary: |-
 ---
 Track: Prologue
 Directory: prologue-lofam5a2
-Originally Released As: track:prologue
+Originally Released As: track:prologue-friendsim-2
 Duration: '2:53'
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/prologue
@@ -1171,7 +1175,7 @@ Art Tags:
 - Karkat
 Referenced Tracks:
 - Crustacean
-- risen
+- track:risen-terry-a-davis
 Commentary: |-
     <i>Gryotharian:</i>
     Title is pretty self explanatory. Karkat. TempleOS. I guess? Don't ask from where or why I came up with the concept for this track, I couldn't tell you. I thought briefly about downloading templeOS and using the hymn generator myself for parts of this song but that was far too much effort and loses the recognizability of Risen. I'm a nerd for weird internet history and like referencing weird internet history shit. So does homestuck, so why not? Why \*shouldn't* Karkat lose his mind and learn Holy C? can you answer me that, god? Can you answer me that? (Stay tuned next time for Karkat kills an educated adult and accepts the 4 corner simultaneous 24 hour days that occur within a single rotation of Alternia)
@@ -1240,6 +1244,8 @@ Commentary: |-
     I inspired myself of the Moonsetter arttrack which had Dirk and was like... It feels more upbeat, I have to add some dirkjake endgame. So I referenced this one scene in [[flash:8130|[S]Credits]] with Robot Lord English and gave Jake the Lara Croft outfit because he looks stunning in it
 ---
 Track: Puppeteer
+Directory: puppeteer-lofam5a2
+Always Reference By Directory: true
 Artists:
 - Thomas Ferkol
 Duration: '4:55'
@@ -1252,7 +1258,7 @@ Art Tags:
 - Dirk
 Commentary: |-
     <i>Makin:</i> (album management)
-    You didn’t like Ferkol’s [[track:dictator|previous Dirk track in this album]]? Well, deal with it, here’s another one. That guy just won’t stop showing up in unexpected sequels.
+    You didn’t like Ferkol’s [[track:dictator-lofam5a2|previous Dirk track in this album]]? Well, deal with it, here’s another one. That guy just won’t stop showing up in unexpected sequels.
 
     By the way, yes, this is a visual reference to the cover of “[[track:sweet-dreams-timaeus|Sweet Dreams, Timaeus]]” from [[album:homestuck-vol-9|Homestuck Vol. 9]]. 
 ---
@@ -1560,7 +1566,7 @@ Commentary: |-
 ---
 Track: Chroma
 Directory: chroma-lofam5a2
-Originally Released As: track:chroma
+Originally Released As: track:chroma-heaven-sent
 Duration: '3:02'
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/chroma
@@ -2610,6 +2616,8 @@ Commentary: |-
     Come on, kid, eat up. You’ve barely even touched your mutant god-frog.
 ---
 Track: Movement
+Directory: movement-lofam5a2
+Always Reference By Directory: true
 Artists:
 - Morris
 Duration: '2:46'
diff --git a/album/look-on-my-works-ye-mighty-and-despair.yaml b/album/look-on-my-works-ye-mighty-and-despair.yaml
index e596727..0662cd3 100644
--- a/album/look-on-my-works-ye-mighty-and-despair.yaml
+++ b/album/look-on-my-works-ye-mighty-and-despair.yaml
@@ -24,6 +24,7 @@ Additional Files:
   - bg.jpg
 ---
 Track: Mothership
+Directory: mothership-look-on-my-works
 Duration: '3:48'
 URLs:
 - https://bowman.bandcamp.com/track/mothership
@@ -226,6 +227,8 @@ Commentary: |-
     (<a href="https://www.youtube.com/watch?v=TGQn4ZUgHa4">Music video!</a>)
 ---
 Track: Unstoppable
+Directory: unstoppable-look-on-my-works
+Always Reference By Directory: true
 Duration: '5:03'
 URLs:
 - https://bowman.bandcamp.com/track/unstoppable
diff --git a/album/megalovania-fusion-collab.yaml b/album/megalovania-fusion-collab.yaml
index 2425adc..981dbdb 100644
--- a/album/megalovania-fusion-collab.yaml
+++ b/album/megalovania-fusion-collab.yaml
@@ -65,7 +65,7 @@ Referenced Tracks:
 - Running in the 90's
 - Put A Donk On It
 - Crank That
-- Bonfire
+- track:bonfire-childish-gambino
 - Bassline Junkie
 - One Pound Fish
 - Space Jam
@@ -74,11 +74,11 @@ Referenced Tracks:
 - X Gon' Give It to Ya
 - The Nutshack Intro
 - Feel Good Inc.
-- Whales
+- track:whales-hail-mary-mallons
 - Snow halation
 - Battle Against an Average Foe
 - Argia
-- Fragments
+- track:fragments-basement-tale
 - Slider
 - Skaian Skirmish
 - Mutiny (crapapella)
@@ -100,7 +100,7 @@ Sampled Tracks:
 - Wii Shop Channel
 - Put A Donk On It
 - Crank That
-- Bonfire
+- track:bonfire-childish-gambino
 - Bassline Junkie
 - One Pound Fish
 - Space Jam
@@ -109,7 +109,7 @@ Sampled Tracks:
 - X Gon' Give It to Ya
 - The Nutshack Intro
 - Feel Good Inc.
-- Whales
+- track:whales-hail-mary-mallons
 - Snow halation
 - Skaian Skirmish
 - Mutiny (crapapella)
diff --git a/album/midnight-crew-drawing-dead.yaml b/album/midnight-crew-drawing-dead.yaml
index cae67b1..2696229 100644
--- a/album/midnight-crew-drawing-dead.yaml
+++ b/album/midnight-crew-drawing-dead.yaml
@@ -233,7 +233,7 @@ URLs:
 - https://homestuck.bandcamp.com/track/hauntjam-2
 - https://youtu.be/K9s0vr15Gvw
 Referenced Tracks:
-- track:haunt
+- track:haunt-andrew-hussie
 Commentary: |-
     <i>Andrew Huo:</i>
     Hauntjam and Hauntjelly are interesting things. They were actually made based on a short fruity loop that The Big Man Andrew did, called haunt.wav or haunt.mp3 or something like that. A jam on his theme, logically, would therefore be called "hauntjam," with the opportunity for naming puns including "hauntjelly." His theme appears mostly unchanged as the bassline for the first part of the pieces. At this point in terms of instrumentation, we were still mostly striving for faithfulness to the canon Midnight Crew "band," as can be seen in <a href="http://www.mspaintadventures.com/extras/ps000018.html">the Extras page</a> wherein the MC fill 'em with midnight (bottom), so Hauntjam employs trombone, string bass, piano, clarinet, and sax (I forget which because I've lost the file and am not a band person, but I think it was alto). From there on, it was fairly straightforward to write a haunting refrain and then solos for each instrument. I will admit I got a little writerblock'd for the second part, which was sort of a brief modulation to the dominant, so it sounds a little strange. But it still has its own little charm, with the almost annoying trill put in for a spooky ghost-like effect. In Hauntjam, Bowman did some good stuff with bringing out moving parts in the first refrain. In Hauntjelly, [[artist:ian-taylor|Xerxes]] emphasizes the spookiness by changing instruments for more electric organ.
diff --git a/album/moons-of-theseus.yaml b/album/moons-of-theseus.yaml
index b4f5d28..fe33ea9 100644
--- a/album/moons-of-theseus.yaml
+++ b/album/moons-of-theseus.yaml
@@ -117,6 +117,8 @@ Commentary: |-
     The varied parts of Home take you by the hand and guide you on a journey throughout time and space. It is my belief that by listening, you're taking the same journey Grace, myself, and all the other creatives involved in this album took in the process of making the project a reality. It's been a long and winding road, but I wouldn't have had it any other way. Thank you.
 ---
 Track: Traveling
+Directory: traveling-moons-of-theseus
+Always Reference By Directory: true
 Artists:
 - keyboard cait
 Contributors:
@@ -145,7 +147,7 @@ Referenced Tracks:
 - Old Buggy Now
 - Light Of Apollo
 - Wrong Or Right
-- Purgatory
+- track:purgatory-electric-daydreams
 - Chain Of Prospit
 Lyrics: |-
     I see the dawn rise again<br>The radiance anew<br>I catch my breath<br>I see the world spanning out<br>Unbounded in the view<br>The limit is my home
@@ -155,11 +157,13 @@ Lyrics: |-
     And the travel never ends<br>And you want to witness all<br>And you'll witness all you can
 Commentary: |-
     <i>keyboard cait:</i>
-    The opening chords of this song were originally part of a scrapped attempt on [[track:singularity]], a song from the previous album on the bandcamp, [[album:cosmic-caretakers]]. That was the penultimate song on that album, and this is the second on this album. So in a way, they're like weird bookends. More to the point though, this song ended up as an unintentional but fortuitous continuation to the "voyage" brought up in Home, both physical and metaphysical. In literal terms the lyrics are about the crossing of humans along the Bering Strait, but another interpretation is that they're a reflection of a process all humans go through: the pursuit of a purpose, the satisfaction of completing a goal, and the perennial urge to find new things to do, new things to learn, to experience, to travel. It's a fundamental feeling, true from the dawn of you, to your last sail on the pumpkin tide.
+    The opening chords of this song were originally part of a scrapped attempt on [[track:singularity-cosmic-caretakers]], a song from the previous album on the bandcamp, [[album:cosmic-caretakers]]. That was the penultimate song on that album, and this is the second on this album. So in a way, they're like weird bookends. More to the point though, this song ended up as an unintentional but fortuitous continuation to the "voyage" brought up in Home, both physical and metaphysical. In literal terms the lyrics are about the crossing of humans along the Bering Strait, but another interpretation is that they're a reflection of a process all humans go through: the pursuit of a purpose, the satisfaction of completing a goal, and the perennial urge to find new things to do, new things to learn, to experience, to travel. It's a fundamental feeling, true from the dawn of you, to your last sail on the pumpkin tide.
     <i>Tipsy:</i>
     Naturally when everyone else is going for wild, creative concepts, I fall back on making it Homestuck... when I heard Cait's song it made me think of the Battlefield, and when I read the lyrics, I thought, what better thing to depict than the moment Mobius Trip and Hadron Kaleido look into the clouds for the first time and witness the secrets of the universe?
 ---
 Track: Unchained
+Directory: unchained-moons-of-theseus
+Always Reference By Directory: true
 Artists:
 - Kanishka
 Duration: '3:24'
diff --git a/album/more-homestuck-fandom.yaml b/album/more-homestuck-fandom.yaml
index c4e0a5f..56cdd22 100644
--- a/album/more-homestuck-fandom.yaml
+++ b/album/more-homestuck-fandom.yaml
@@ -55,7 +55,7 @@ URLs:
 - https://hsmusic.wiki/media/misc/archive/Bane.mp3
 Commentary: |-
     <i>Mark J. Hadley:</i>
-    Whew... this is a really, REALLY old one of mine. I wrote the first version of "Bane" in 2001, and this version (the 'latest' one) was written in 2005. It's been a long time since I did anything with this theme, but I still really like it. I've been thinking about making a [[track:bane|newer version]] of it (since surely I've gotten better over the past decade, right?).
+    Whew... this is a really, REALLY old one of mine. I wrote the first version of "Bane" in 2001, and this version (the 'latest' one) was written in 2005. It's been a long time since I did anything with this theme, but I still really like it. I've been thinking about making a [[track:bane-p-s|newer version]] of it (since surely I've gotten better over the past decade, right?).
 
     I kind of regret not slipping this theme into Homestuck somewhere; I feel like this could have easily been a recurring signature theme for projects I work on (like [[group:toby-fox|Toby Fox]] does with '[[track:megalovania-halloween|Megalovania]]').
 ---
@@ -105,6 +105,8 @@ Lyrics: |-
     Adrien Brody Adrien Brody Adrien Brody Adrien Brody
 ---
 Track: Calliope
+Directory: calliope-malcolm-brown
+Always Reference By Directory: true
 Artists:
 - Malcolm Brown
 Duration: '1:08'
@@ -124,6 +126,8 @@ URLs:
 - https://spellmynamewithabang.tumblr.com/day/2012/05/14
 ---
 Track: Cats
+Directory: cats-toby-fox
+Always Reference By Directory: true
 Artists:
 - Toby Fox
 Duration: '1:36'
@@ -272,9 +276,11 @@ Duration: '1:30'
 URLs:
 - https://hsmusic.wiki/media/misc/archive/Feel%20%28Old%20Ver.%29.mp3
 Referenced Tracks:
-- Feel
+- track:feel-luke-benjamins
 ---
 Track: Feel
+Directory: feel-luke-benjamins
+Always Reference By Directory: true
 Artists: 
 - Luke Benjamins
 Duration: '1:07'
@@ -307,6 +313,8 @@ Referenced Tracks:
 - Dissension (Original)
 ---
 Track: Flow
+Directory: flow-solatrus
+Always Reference By Directory: true
 Artists:
 - Solatrus
 Duration: '6:26'
@@ -322,7 +330,7 @@ URLs:
 - https://soundcloud.com/dragonxvi/ham-and-steak-unused-homestuck-music
 Referenced Tracks:
 - Rex English
-- Calliope
+- track:calliope-malcolm-brown
 - You're So Rad
 - Unite Synchronization
 - Homestuck Anthem
@@ -330,6 +338,8 @@ Referenced Tracks:
 - Doctor
 ---
 Track: haunt
+Directory: haunt-andrew-hussie
+Always Reference By Directory: true
 Artists:
 - Andrew Hussie
 Duration: '2:33'
@@ -773,6 +783,8 @@ Referenced Tracks:
 - track:three-in-the-morning
 ---
 Track: Valor
+Directory: valor-toby-fox
+Always Reference By Directory: true
 Artists:
 - Toby Fox
 Duration: '2:23'
@@ -951,6 +963,8 @@ Lyrics: |-
     (Sup.)
 ---
 Track: Gnade
+Directory: gnade-redditstuck
+Always Reference By Directory: true
 Artists:
 - Gordian
 Duration: '3:24'
@@ -1407,13 +1421,6 @@ Lyrics: |-
 URLs:
 - https://youtu.be/ZQt9rWYhv7E
 ---
-Track: Overlook
-Artists:
-- Cerulean
-Duration: '3:16'
-URLs:
-- https://vasterror.bandcamp.com/track/overlook
----
 Track: Penumbra Phantasm
 Date First Released: March 16, 2022
 Directory: penumbra-phantasm-morris
@@ -1899,6 +1906,8 @@ URLs:
 - https://hsmusic.wiki/media/misc/archive/food.mp3
 ---
 Track: Higher
+Directory: higher-ost
+Always Reference By Directory: true
 Artists:
 - ostrichlittledungeon
 Duration: '1:54'
@@ -2133,6 +2142,8 @@ URLs:
 - https://soundcloud.com/user-471799957/nv-strife
 ---
 Track: Rematch
+Directory: rematch-paradox-music-team
+Always Reference By Directory: true
 Artists:
 - Pascal van den Bos
 Duration: '2:15'
@@ -2141,6 +2152,8 @@ URLs:
 - https://www.youtube.com/watch?v=V3MhvkhUXz8
 ---
 Track: Snowfall
+Directory: snowfall-paradox-music-team
+Always Reference By Directory: true
 Artists:
 - Rainy
 Duration: '6:25'
@@ -2178,6 +2191,8 @@ URLs:
 - https://potatoboss.bandcamp.com/track/vexation
 ---
 Track: Wanderlust
+Directory: wanderlust-paradox-music-team
+Always Reference By Directory: true
 Artists:
 - Gordian
 Duration: '3:52'
diff --git a/album/muse-of-net.yaml b/album/muse-of-net.yaml
index 5ebdd14..52805f3 100644
--- a/album/muse-of-net.yaml
+++ b/album/muse-of-net.yaml
@@ -267,7 +267,7 @@ Duration: '01:40'
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/nuklear-power
 Referenced Tracks:
-- Nuclear
+- track:nuclear-james-roach
 MIDI Project Files:
 - Title: MIDI by Musenet
   Files:
@@ -377,7 +377,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/voidnulls-untitled
 ---
 Track: Nightmare
-Directory: nightmare-muse-of-net
+Directory: nightmare-canmt
 Always Reference By Directory: true
 Artists:
 - Interrobang
@@ -484,6 +484,8 @@ MIDI Project Files:
   - 'Triptych.mid'
 ---
 Track: Conflicted
+Directory: conflicted-canmt
+Always Reference By Directory: true
 Artists:
 - MrCheeze
 Duration: '01:50'
@@ -536,4 +538,4 @@ Duration: '0:43'
 URLs:
 - https://youtu.be/QLm6d_WETgQ
 Referenced Tracks:
-- track:nightmare-muse-of-net
+- track:nightmare-canmt
diff --git a/album/nice-wizards-electronic-extravaganza.yaml b/album/nice-wizards-electronic-extravaganza.yaml
index afd61a6..c599433 100644
--- a/album/nice-wizards-electronic-extravaganza.yaml
+++ b/album/nice-wizards-electronic-extravaganza.yaml
@@ -45,6 +45,7 @@ Commentary: |-
 ---
 Track: Sunrise
 Directory: sunrise-nice-wizard
+Always Reference By Directory: true
 Duration: '2:32'
 URLs:
 - https://nicewizard.bandcamp.com/track/sunrise
@@ -53,6 +54,8 @@ Commentary: |-
     An attempt at something more classical sounding than my usual stuff. It went pretty alright, I think!
 ---
 Track: Connect
+Directory: connect-nice-wizard
+Always Reference By Directory: true
 Duration: '3:08'
 URLs:
 - https://nicewizard.bandcamp.com/track/connect
@@ -62,6 +65,7 @@ Commentary: |-
 ---
 Track: Machina
 Directory: machina-nice-wizard
+Always Reference By Directory: true
 Duration: '3:22'
 URLs:
 - https://nicewizard.bandcamp.com/track/machina
diff --git a/album/oceanfables-ray-of-light.yaml b/album/oceanfables-ray-of-light.yaml
index 81fca4d..83eab8f 100644
--- a/album/oceanfables-ray-of-light.yaml
+++ b/album/oceanfables-ray-of-light.yaml
@@ -52,16 +52,22 @@ Sampled Tracks:
 - Upward Movement (Dave Owns)
 ---
 Track: Chiptune
+Directory: chiptune-oceanfables
+Always Reference By Directory: true
 Duration: '01:07'
 URLs:
 - https://nightslights.bandcamp.com/track/chiptune
 ---
 Track: Reed
+Directory: reed-oceanfables
+Always Reference By Directory: true
 Duration: '01:36'
 URLs:
 - https://nightslights.bandcamp.com/track/reed
 ---
 Track: Starfish
+Directory: starfish-oceanfables
+Always Reference By Directory: true
 Duration: '01:55'
 URLs:
 - https://nightslights.bandcamp.com/track/starfish
@@ -74,6 +80,8 @@ Sampled Tracks:
 - dog samples from undertale, no?
 ---
 Track: Swag
+Directory: swag-oceanfables
+Always Reference By Directory: true
 Duration: '01:40'
 URLs:
 - https://nightslights.bandcamp.com/track/swag
@@ -131,6 +139,8 @@ Art Tags:
 - Ruta (Oceanfalls)
 ---
 Track: Piano
+Directory: piano-oceanfables
+Always Reference By Directory: true
 Duration: '01:24'
 URLs:
 - https://nightslights.bandcamp.com/track/piano-bonus
diff --git a/album/oceanfalls-vol-1.yaml b/album/oceanfalls-vol-1.yaml
index 9ce95ec..d1f3a12 100644
--- a/album/oceanfalls-vol-1.yaml
+++ b/album/oceanfalls-vol-1.yaml
@@ -59,6 +59,8 @@ Art Tags:
 - Five (Oceanfalls)
 ---
 Track: Illusions
+Directory: illusions-oceanfalls
+Always Reference By Directory: true
 Duration: '2:37'
 URLs:
 - https://nightslights.bandcamp.com/track/illusions
@@ -82,6 +84,8 @@ Art Tags:
 - Reed (Oceanfalls)
 ---
 Track: Surge
+Directory: surge-oceanfalls
+Always Reference By Directory: true
 Duration: '1:26'
 URLs:
 - https://nightslights.bandcamp.com/track/surge
@@ -107,6 +111,8 @@ Art Tags:
 - Kotori (Oceanfalls)
 ---
 Track: Iceshards
+Directory: iceshards-oceanfalls
+Always Reference By Directory: true
 Duration: '1:29'
 URLs:
 - https://nightslights.bandcamp.com/track/iceshards
@@ -125,6 +131,8 @@ Referenced Tracks:
 - Yellow and Purple
 ---
 Track: Performance
+Directory: performance-oceanfalls
+Always Reference By Directory: true
 Duration: '1:33'
 URLs:
 - https://nightslights.bandcamp.com/track/performance
diff --git a/album/oceanfalls-vol-2.yaml b/album/oceanfalls-vol-2.yaml
index f7f4cd9..8e219b2 100644
--- a/album/oceanfalls-vol-2.yaml
+++ b/album/oceanfalls-vol-2.yaml
@@ -95,6 +95,8 @@ Cover Artists:
 - penelope
 ---
 Track: Reminiscence
+Directory: reminiscence-oceanfalls
+Always Reference By Directory: true
 Artists:
 - WHATISLOSTINTHEMINES
 Duration: '2:42'
@@ -108,7 +110,7 @@ Duration: '1:57'
 URLs:
 - https://nightslights.bandcamp.com/track/arias-house
 Referenced Tracks:
-- Illusions
+- track:illusions-oceanfalls
 ---
 Track: Arts and Crafts
 Artists:
@@ -151,6 +153,8 @@ Art Tags:
 - 'cw: blood'
 ---
 Track: Crystalline
+Directory: crystalline-oceanfalls
+Always Reference By Directory: true
 Artists:
 - Hadron
 Duration: '3:00'
@@ -332,6 +336,8 @@ URLs:
 Section: Bonus tracks
 ---
 Track: Atomic
+Directory: atomic-oceanfalls
+Always Reference By Directory: true
 Artists:
 - WHATISLOSTINTHEMINES
 Duration: '2:15'
@@ -370,13 +376,13 @@ Cover Artists:
 Referenced Tracks:
 - Ironside
 - This Is America
-- Ultimate
+- track:ultimate-denzel-curry
 - Look At Me! (Minecraft Parody)
 Sampled Tracks: 
 - Meet the Engineer
 - Ironside
 - This Is America
-- Ultimate
+- track:ultimate-denzel-curry
 - Look At Me! (Minecraft Parody)
 Lyrics: |-
     (How am I gonna stop some big mean Mother-Hubbard from tearin' me a structurally superfluous new behind? The answer? Use a gun.)
diff --git a/album/oceanfalls-vol-3.yaml b/album/oceanfalls-vol-3.yaml
index 67d1d88..f316104 100644
--- a/album/oceanfalls-vol-3.yaml
+++ b/album/oceanfalls-vol-3.yaml
@@ -60,6 +60,8 @@ Art Tags:
 - 'cw: body horror (abstract)'
 ---
 Track: Rambling
+Directory: rambling-oceanfalls
+Always Reference By Directory: true
 Artists:
 - Kusoro
 Duration: '1:43'
@@ -168,6 +170,8 @@ Art Tags:
 - Corona (Oceanfalls)
 ---
 Track: Cinders
+Directory: cinders-oceanfalls
+Always Reference By Directory: true
 Artists:
 - Hadron
 Duration: '2:36'
diff --git a/album/oceanfalls-vol-4.yaml b/album/oceanfalls-vol-4.yaml
index db11e4e..8e2b7fb 100644
--- a/album/oceanfalls-vol-4.yaml
+++ b/album/oceanfalls-vol-4.yaml
@@ -107,7 +107,7 @@ Cover Artists:
 Art Tags:
 - Reed (Oceanfalls)
 Referenced Tracks:
-- Reed
+- track:reed-oceanfables
 ---
 Track: Burning Wood Blocks
 Artists:
@@ -205,7 +205,7 @@ Cover Artists:
 Art Tags:
 - Corona (Oceanfalls)
 Referenced Tracks:
-- Illusions
+- track:illusions-oceanfalls
 ---
 Track: Sea of Tranquility
 Artists:
diff --git a/album/oceanfalls-vol-five.yaml b/album/oceanfalls-vol-five.yaml
index 232de49..c14e7b0 100644
--- a/album/oceanfalls-vol-five.yaml
+++ b/album/oceanfalls-vol-five.yaml
@@ -87,6 +87,8 @@ Referenced Tracks:
 - Happy Birthday to You
 ---
 Track: Mayday
+Directory: mayday-oceanfalls
+Always Reference By Directory: true
 Artists:
 - RoZ8
 Duration: '2:07'
diff --git a/album/one-week-older.yaml b/album/one-week-older.yaml
index 87d8a36..a99ce60 100644
--- a/album/one-week-older.yaml
+++ b/album/one-week-older.yaml
@@ -21,6 +21,8 @@ Commentary: |-
     it's been one week since you looked at me 
 ---
 Track: November
+Directory: november-one-week-older
+Always Reference By Directory: true
 Duration: '01:45'
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/november
@@ -122,6 +124,8 @@ Referenced Tracks:
 - English
 ---
 Track: Sunset
+Directory: sunset-one-week-older
+Always Reference By Directory: true
 Duration: '02:00'
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/sunset
@@ -134,6 +138,7 @@ Referenced Tracks:
 ---
 Track: Utopia
 Directory: utopia-one-week-older
+Always Reference By Directory: true
 Duration: '02:16'
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/utopia
@@ -161,6 +166,7 @@ Referenced Tracks:
 ---
 Track: Medley
 Directory: medley-one-week-older
+Always Reference By Directory: true
 Duration: '04:02'
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/bonus-medley
@@ -260,6 +266,8 @@ Referenced Tracks:
 - Negastrife
 ---
 Track: Daddy
+Directory: daddy-one-week-older
+Always Reference By Directory: true
 Duration: '02:37'
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/daddy
@@ -335,7 +343,7 @@ Art Tags:
 - Earth
 Referenced Tracks:
 - Your Best Friend
-- Tycoon
+- track:tycoon-canmt
 - Once Upon a Time
 Lyrics: |-
     (shrimpies!) (caneda)
diff --git a/album/p-s.yaml b/album/p-s.yaml
index bf26fcf..60cfdfe 100644
--- a/album/p-s.yaml
+++ b/album/p-s.yaml
@@ -149,6 +149,8 @@ Referenced Tracks:
 - Skaianet
 ---
 Track: Whiteout
+Directory: whiteout-p-s
+Always Reference By Directory: true
 Artists:
 - David Dycus
 Duration: '4:24'
@@ -231,6 +233,8 @@ Lyrics: |-
     This will be the end!<br>Come with me and we'll Ascend!<br>Solving puzzles Universal,<br>In our Sburban Reversal!<br>All these Ruins we Explore,<br>Could it be there's something more?<br>Pester me, I'm not alone,<br>I'm just Stuck inside my Home!
 ---
 Track: Bane
+Directory: bane-p-s
+Always Reference By Directory: true
 Artists:
 - Mark J. Hadley
 Duration: '6:06'
@@ -240,6 +244,8 @@ Referenced Tracks:
 - track:bane-old
 ---
 Track: Interstellar
+Directory: interstellar-p-s
+Always Reference By Directory: true
 Artists:
 - Thomas Ferkol
 Duration: '3:43'
@@ -265,7 +271,7 @@ Referenced Tracks:
 - Thunderhead
 - English
 - Black Hole / Green Sun
-- track:glide
+- track:glide-lofam4
 - Sburban Jungle
 - track:ruins
 - Penumbra Phantasm
diff --git a/album/pantheon.yaml b/album/pantheon.yaml
index fd9d374..8c54cd0 100644
--- a/album/pantheon.yaml
+++ b/album/pantheon.yaml
@@ -38,6 +38,8 @@ Referenced Tracks:
 - Divine Tapestry
 ---
 Track: Matriarch
+Directory: matriarch-pantheon
+Always Reference By Directory: true
 Duration: '4:39'
 URLs:
 - https://desynced.bandcamp.com/track/matriarch
@@ -50,9 +52,11 @@ Art Tags:
 Referenced Tracks:
 - Winds of Change
 - Mother Dearest
-- Daughter
+- track:daughter-desynced
 ---
 Track: Tyrant
+Directory: tyrant-pantheon
+Always Reference By Directory: true
 Duration: '3:52'
 URLs:
 - https://desynced.bandcamp.com/track/tyrant
@@ -65,6 +69,8 @@ Referenced Tracks:
 - Mirror Mirror
 ---
 Track: Luminary
+Directory: luminary-pantheon
+Always Reference By Directory: true
 Duration: '3:30'
 URLs:
 - https://desynced.bandcamp.com/track/luminary
@@ -79,6 +85,8 @@ Referenced Tracks:
 - Lunar Dance
 ---
 Track: Nemesis
+Directory: nemesis-pantheon
+Always Reference By Directory: true
 Duration: '3:52'
 URLs:
 - https://desynced.bandcamp.com/track/nemesis
@@ -92,6 +100,8 @@ Referenced Tracks:
 - What was Ya'll Thinking?
 ---
 Track: Machina
+Directory: machina-pantheon
+Always Reference By Directory: true
 Duration: '4:47'
 URLs:
 - https://desynced.bandcamp.com/track/machina
@@ -128,8 +138,8 @@ Art Tags:
 - Gaea (Desynced)
 Referenced Tracks:
 - Wind Waker
-- Daughter
-- Cooldown
+- track:daughter-desynced
+- track:cooldown-desynced
 ---
 Track: Tsukuyomi (Remix)
 Duration: '1:41'
@@ -142,7 +152,7 @@ Art Tags:
 - Hemera (Desynced)
 Referenced Tracks:
 - Tsukuyomi
-- Luminary
+- track:luminary-pantheon
 ---
 Track: AUTOMATA
 Duration: '1:13'
@@ -177,6 +187,8 @@ Referenced Tracks:
 - What was Ya'll Thinking?
 ---
 Track: Breakdown
+Directory: breakdown-pantheon
+Always Reference By Directory: true
 Duration: '2:01'
 URLs:
 - https://www.youtube.com/watch?v=nsHHVTfndH0
@@ -186,7 +198,7 @@ Art Tags:
 - Kate's dad (Desynced)
 - Masky (Desynced)
 Referenced Tracks:
-- Cooldown
+- track:cooldown-desynced
 - Winds of Change
 - Bedelia
 Sampled Tracks:
diff --git a/album/paths.yaml b/album/paths.yaml
index db7144b..b82246f 100644
--- a/album/paths.yaml
+++ b/album/paths.yaml
@@ -57,7 +57,7 @@ URLs:
 ---
 Track: Isolate
 Directory: isolate-paths
-Originally Released As: track:isolate
+Originally Released As: track:isolate-slender
 Duration: '2:45'
 URLs:
 - https://parsecproductions.bandcamp.com/track/isolate
@@ -93,7 +93,7 @@ Commentary: |-
 ---
 Track: Lurk
 Directory: lurk-paths
-Originally Released As: track:lurk
+Originally Released As: track:lurk-a-nameless-inheritance
 Duration: '2:32'
 URLs:
 - https://parsecproductions.bandcamp.com/track/lurk-2
@@ -107,7 +107,7 @@ URLs:
 ---
 Track: Bane
 Directory: bane-paths
-Originally Released As: track:bane
+Originally Released As: track:bane-p-s
 Duration: '6:05'
 URLs:
 - https://parsecproductions.bandcamp.com/track/bane
@@ -121,7 +121,7 @@ URLs:
 ---
 Track: Dawn
 Directory: dawn-paths
-Originally Released As: track:dawn
+Originally Released As: track:dawn-the-consuming-shadow
 Duration: '1:51'
 URLs:
 - https://parsecproductions.bandcamp.com/track/dawn-2
diff --git a/album/play-the-rain.yaml b/album/play-the-rain.yaml
index 4025177..d4b0ee0 100644
--- a/album/play-the-rain.yaml
+++ b/album/play-the-rain.yaml
@@ -102,6 +102,8 @@ Referenced Tracks:
 - 'BL1ND JUST1C3 : 1NV3ST1G4T1ON !!'
 ---
 Track: Stalemate
+Directory: stalemate-play-the-rain
+Always Reference By Directory: true
 Artists:
 - Lark Mordancy
 Duration: '02:53'
diff --git a/album/portalstuck-vol-1.yaml b/album/portalstuck-vol-1.yaml
index 5219355..aaedf7b 100644
--- a/album/portalstuck-vol-1.yaml
+++ b/album/portalstuck-vol-1.yaml
@@ -64,6 +64,8 @@ URLs:
 - https://www.youtube.com/watch?v=qQkfaUOqymI
 ---
 Track: Malfunction
+Directory: malfunction-portalstuck
+Always Reference By Directory: true
 Duration: '1:06'
 URLs:
 - https://portalstuck.bandcamp.com/track/malfunction
@@ -79,6 +81,8 @@ Referenced Tracks:
 - Even in Death
 ---
 Track: Invincible
+Directory: invincible-portalstuck
+Always Reference By Directory: true
 Duration: '3:22'
 URLs:
 - https://portalstuck.bandcamp.com/track/invincible
diff --git a/album/psycholonials-ep-2.yaml b/album/psycholonials-ep-2.yaml
index 6df6327..75f2b8e 100644
--- a/album/psycholonials-ep-2.yaml
+++ b/album/psycholonials-ep-2.yaml
@@ -36,6 +36,7 @@ URLs:
 - https://psycholonials.bandcamp.com/track/the-cold-hand
 ---
 Track: Together
+Directory: together-psycholonials-ep-2
 Originally Released As: Day That Never Came
 Duration: '2:04'
 URLs:
diff --git a/album/psycholonials-ep-3.yaml b/album/psycholonials-ep-3.yaml
index 0baafa3..90fcdaf 100644
--- a/album/psycholonials-ep-3.yaml
+++ b/album/psycholonials-ep-3.yaml
@@ -36,7 +36,7 @@ URLs:
 - https://psycholonials.bandcamp.com/track/time-is-helpless
 ---
 Track: Through The Play
-Originally Released As: Pleas
+Originally Released As: track:pleas-labyrinths-heart
 Duration: '3:13'
 URLs:
 - https://psycholonials.bandcamp.com/track/through-the-play
diff --git a/album/psycholonials-ep-4.yaml b/album/psycholonials-ep-4.yaml
index 4c84806..2af48af 100644
--- a/album/psycholonials-ep-4.yaml
+++ b/album/psycholonials-ep-4.yaml
@@ -30,6 +30,7 @@ Additional Files:
   - banner.png
 ---
 Track: Outlaw
+Directory: outlaw-psycholonials-ep-4
 Originally Released As: Pencil Holder (demo version)
 Duration: '3:57'
 URLs:
@@ -42,6 +43,8 @@ URLs:
 - https://psycholonials.bandcamp.com/track/a-screaming-inside
 ---
 Track: Breakthroughs
+Directory: breakthroughs-psycholonials-ep-4
+Always Reference By Directory: true
 Duration: '2:14'
 URLs:
 - https://psycholonials.bandcamp.com/track/breakthroughs
diff --git a/album/psycholonials-ep-5.yaml b/album/psycholonials-ep-5.yaml
index 44bbd53..b8a44d3 100644
--- a/album/psycholonials-ep-5.yaml
+++ b/album/psycholonials-ep-5.yaml
@@ -35,7 +35,7 @@ URLs:
 - https://psycholonials.bandcamp.com/track/in-the-works
 ---
 Track: Ephemeral Muse
-Originally Released As: Harrigan
+Originally Released As: track:harrigan-we-are-all-satellites
 Duration: '4:46'
 URLs:
 - https://psycholonials.bandcamp.com/track/ephemeral-muse
diff --git a/album/psycholonials-ep-7.yaml b/album/psycholonials-ep-7.yaml
index 5b280a6..11b9373 100644
--- a/album/psycholonials-ep-7.yaml
+++ b/album/psycholonials-ep-7.yaml
@@ -37,7 +37,7 @@ Referenced Tracks:
 - Voice I Never Heard
 ---
 Track: Such A Shame
-Originally Released As: Miranda
+Originally Released As: track:miranda-we-are-all-satellites
 Duration: '3:25'
 URLs:
 - https://psycholonials.bandcamp.com/track/such-a-shame
diff --git a/album/psycholonials-ep-9.yaml b/album/psycholonials-ep-9.yaml
index 21077c2..9ee8449 100644
--- a/album/psycholonials-ep-9.yaml
+++ b/album/psycholonials-ep-9.yaml
@@ -39,15 +39,17 @@ Duration: '4:33'
 URLs:
 - https://psycholonials.bandcamp.com/track/edge-of-dawn
 Referenced Tracks:
-- Shoreline
+- track:shoreline-labyrinths-heart
 ---
 Track: Threshold
+Directory: threshold-psycholonials-ep-9
+Always Reference By Directory: true
 Duration: '1:47'
 URLs:
 - https://psycholonials.bandcamp.com/track/threshold
 ---
 Track: We Were Right About Everything
-Originally Released As: Lunatic
+Originally Released As: track:lunatic-we-are-all-satellites
 Duration: '5:51'
 URLs:
 - https://psycholonials.bandcamp.com/track/we-were-right-about-everything
@@ -63,7 +65,7 @@ URLs:
 - https://psycholonials.bandcamp.com/track/zhen
 ---
 Track: The Successor
-Originally Released As: Forgotten
+Originally Released As: track:forgotten-labyrinths-heart
 Duration: '4:22'
 URLs:
 - https://psycholonials.bandcamp.com/track/the-successor
@@ -79,4 +81,4 @@ Duration: '4:08'
 URLs:
 - https://psycholonials.bandcamp.com/track/ephemeral-muse-final-remix
 Referenced Tracks:
-- Harrigan
+- track:harrigan-we-are-all-satellites
diff --git a/album/psycholonials.yaml b/album/psycholonials.yaml
index e4c6e08..0a31464 100644
--- a/album/psycholonials.yaml
+++ b/album/psycholonials.yaml
@@ -32,7 +32,7 @@ Additional Files:
 Section: From EP 1
 ---
 Track: Summer That Never Was
-Directory: summer-that-never-was-ost
+Directory: summer-that-never-was-psycholonials
 Originally Released As: Star I Never Caught
 Duration: '3:50'
 URLs:
@@ -40,7 +40,7 @@ URLs:
 - https://open.spotify.com/track/64mI4TSiB8uu3lJmThh2Pm
 ---
 Track: Morning Ritual
-Directory: morning-ritual-ost
+Directory: morning-ritual-psycholonials
 Originally Released As: Puzzle I Never Solved
 Duration: '2:47'
 URLs:
@@ -48,7 +48,7 @@ URLs:
 - https://open.spotify.com/track/3U73BkOHYfS4kWaePTQAxm
 ---
 Track: What's Wasting Me
-Directory: whats-wasting-me-ost
+Directory: whats-wasting-me-psycholonials
 Originally Released As: track:whats-wasting-me
 Duration: '2:35'
 URLs:
@@ -58,7 +58,7 @@ URLs:
 Section: From EP 2
 ---
 Track: The Cold Hand
-Directory: the-cold-hand-ost
+Directory: the-cold-hand-psycholonials
 Originally Released As: Sigh I Never Breathed
 Duration: '2:21'
 URLs:
@@ -66,7 +66,7 @@ URLs:
 - https://open.spotify.com/track/0UhtxV3zRVSMNKGzrWFNuv
 ---
 Track: Together
-Directory: together-ost
+Directory: together-psycholonials
 Originally Released As: Day That Never Came
 Duration: '2:04'
 URLs:
@@ -74,7 +74,7 @@ URLs:
 - https://open.spotify.com/track/5fAqAdxpZcLjDnaRlD5f60
 ---
 Track: The Influencer
-Directory: the-influencer-ost
+Directory: the-influencer-psycholonials
 Originally Released As: Woman I Never Met
 Duration: '2:26'
 URLs:
@@ -82,7 +82,7 @@ URLs:
 - https://open.spotify.com/track/7rDTdq4EptIIaxfHczQQoj
 ---
 Track: Just Dreams
-Directory: just-dreams-ost
+Directory: just-dreams-psycholonials
 Originally Released As: People I Never Knew
 Duration: '3:10'
 URLs:
@@ -90,7 +90,7 @@ URLs:
 - https://open.spotify.com/track/3KQG73E12y5Wl1Vo7WG7cb
 ---
 Track: I Have Some Ideas
-Directory: i-have-some-ideas-ost
+Directory: i-have-some-ideas-psycholonials
 Originally Released As: All but Alone
 Duration: '4:10'
 URLs:
@@ -100,7 +100,7 @@ URLs:
 Section: From EP 3
 ---
 Track: Time Is Helpless
-Directory: time-is-helpless-ost
+Directory: time-is-helpless-psycholonials
 Originally Released As: track:requiem-labyrinths-heart
 Duration: '4:36'
 URLs:
@@ -108,15 +108,15 @@ URLs:
 - https://open.spotify.com/track/4k75TPmKhhBHkrkrGgJdqb
 ---
 Track: Through The Play
-Directory: through-the-play-ost
-Originally Released As: Pleas
+Directory: through-the-play-psycholonials
+Originally Released As: track:pleas-labyrinths-heart
 Duration: '3:13'
 URLs:
 - https://psycholonials.bandcamp.com/track/through-the-play-2
 - https://open.spotify.com/track/3f4fancHgYFJGviyktVNLa
 ---
 Track: Just Almost
-Directory: just-almost-ost
+Directory: just-almost-psycholonials
 Originally Released As: Song I Never Played
 Duration: '1:37'
 URLs:
@@ -126,7 +126,7 @@ URLs:
 Section: From EP 4
 ---
 Track: Outlaw
-Directory: outlaw-ost
+Directory: outlaw-psycholonials
 Originally Released As: Pencil Holder (demo version)
 Duration: '3:57'
 URLs:
@@ -134,7 +134,7 @@ URLs:
 - https://open.spotify.com/track/4S4Oyq95eiOypptWqDeEM7
 ---
 Track: A Screaming Inside
-Directory: a-screaming-inside-ost
+Directory: a-screaming-inside-psycholonials
 Originally Released As: Dante
 Duration: '2:14'
 URLs:
@@ -142,15 +142,15 @@ URLs:
 - https://open.spotify.com/track/0gnd9GNrY41ejYwqb5CNwq
 ---
 Track: Breakthroughs
-Directory: breakthroughs-ost
-Originally Released As: track:breakthroughs
+Directory: breakthroughs-psycholonials
+Originally Released As: track:breakthroughs-psycholonials-ep-4
 Duration: '2:14'
 URLs:
 - https://psycholonials.bandcamp.com/track/breakthroughs-2
 - https://open.spotify.com/track/5cr7lxn0RXTj51HEJrsBbQ
 ---
 Track: Nervous Energy
-Directory: nervous-energy-ost
+Directory: nervous-energy-psycholonials
 Originally Released As: A Romance of Protons and Neutrons
 Duration: '4:28'
 URLs:
@@ -158,7 +158,7 @@ URLs:
 - https://open.spotify.com/track/54G0LScgF65Ch7bHWXmsrk
 ---
 Track: Now And Forever
-Directory: now-and-forever-ost
+Directory: now-and-forever-psycholonials
 Originally Released As: track:now-and-forever
 Duration: '3:59'
 URLs:
@@ -168,7 +168,7 @@ URLs:
 Section: From EP 5
 ---
 Track: In The Works
-Directory: in-the-works-ost
+Directory: in-the-works-psycholonials
 Originally Released As: track:in-the-works
 Duration: '4:22'
 URLs:
@@ -176,15 +176,15 @@ URLs:
 - https://open.spotify.com/track/1KTM56IDeOhMOBv8HmEOy8
 ---
 Track: Ephemeral Muse
-Directory: ephemeral-muse-ost
-Originally Released As: Harrigan
+Directory: ephemeral-muse-psycholonials
+Originally Released As: track:harrigan-we-are-all-satellites
 Duration: '4:46'
 URLs:
 - https://psycholonials.bandcamp.com/track/ephemeral-muse-2
 - https://open.spotify.com/track/3wMjNIOUK2EAONoA3sX36D
 ---
 Track: Blood On Their Hands
-Directory: blood-on-their-hands-ost
+Directory: blood-on-their-hands-psycholonials
 Originally Released As: Dusk for the Age of Miracles
 Duration: '2:46'
 URLs:
@@ -194,7 +194,7 @@ URLs:
 Section: From EP 6
 ---
 Track: The Administrator
-Directory: the-administrator-ost
+Directory: the-administrator-psycholonials
 Originally Released As: Cruel Ulysses
 Duration: '2:21'
 URLs:
@@ -202,7 +202,7 @@ URLs:
 - https://open.spotify.com/track/2kHU4sux0wCzD2c7NQeda2
 ---
 Track: Means Of Conquest
-Directory: means-of-conquest-ost
+Directory: means-of-conquest-psycholonials
 Originally Released As: Country I Never Saw
 Duration: '3:55'
 URLs:
@@ -210,7 +210,7 @@ URLs:
 - https://open.spotify.com/track/59ESzKgMAGKbwK69rwRyJi
 ---
 Track: Twelve Clown Salute
-Directory: twelve-clown-salute-ost
+Directory: twelve-clown-salute-psycholonials
 Originally Released As: track:twelve-clown-salute
 Duration: '2:19'
 URLs:
@@ -220,7 +220,7 @@ URLs:
 Section: From EP 7
 ---
 Track: The March
-Directory: the-march-ost
+Directory: the-march-psycholonials
 Originally Released As: track:the-march
 Duration: '2:46'
 URLs:
@@ -228,15 +228,15 @@ URLs:
 - https://open.spotify.com/track/1CuKshuD0soQDmBxRr3tTh
 ---
 Track: Such A Shame
-Directory: such-a-shame-ost
-Originally Released As: Miranda
+Directory: such-a-shame-psycholonials
+Originally Released As: track:miranda-we-are-all-satellites
 Duration: '3:25'
 URLs:
 - https://psycholonials.bandcamp.com/track/such-a-shame-2
 - https://open.spotify.com/track/1XksnO0m84cUh7PFuhiSsT
 ---
 Track: Break This
-Directory: break-this-ost
+Directory: break-this-psycholonials
 Originally Released As: track:break-this
 Duration: '1:21'
 URLs:
@@ -246,7 +246,7 @@ URLs:
 Section: From EP 8
 ---
 Track: In The Loop
-Directory: in-the-loop-ost
+Directory: in-the-loop-psycholonials
 Originally Released As: the Chillest Beat
 Duration: '2:38'
 URLs:
@@ -254,7 +254,7 @@ URLs:
 - https://open.spotify.com/track/3ILu9zH2LuB9e3CP6SfxTZ
 ---
 Track: 'Flare: Insurrection Remix'
-Directory: flare-insurrection-remix-ost
+Directory: flare-insurrection-remix-psycholonials
 Originally Released As: Flare (Green Sun Remix)
 Duration: '4:08'
 URLs:
@@ -262,7 +262,7 @@ URLs:
 - https://open.spotify.com/track/3fPWLONmFI8UBJgZUyqONb
 ---
 Track: 'Summer That Never Was: Firebrand Remix'
-Directory: summer-that-never-was-firebrand-remix-ost
+Directory: summer-that-never-was-firebrand-remix-psycholonials
 Originally Released As: track:summer-that-never-was-firebrand-remix
 Duration: '3:55'
 URLs:
@@ -272,7 +272,7 @@ URLs:
 Section: From EP 9
 ---
 Track: Fix This
-Directory: fix-this-ost
+Directory: fix-this-psycholonials
 Originally Released As: track:fix-this
 Duration: '1:54'
 URLs:
@@ -280,7 +280,7 @@ URLs:
 - https://open.spotify.com/track/0qy3cn12yEIMAP4Tev55Kw
 ---
 Track: Edge Of Dawn
-Directory: edge-of-dawn-ost
+Directory: edge-of-dawn-psycholonials
 Originally Released As: track:edge-of-dawn
 Duration: '4:33'
 URLs:
@@ -288,23 +288,23 @@ URLs:
 - https://open.spotify.com/track/3wgateK1DRUbM2pgLbWJbL
 ---
 Track: Threshold
-Directory: threshold-ost
-Originally Released As: track:threshold
+Directory: threshold-psycholonials
+Originally Released As: track:threshold-psycholonials-ep-9
 Duration: '1:47'
 URLs:
 - https://psycholonials.bandcamp.com/track/threshold-2
 - https://open.spotify.com/track/1HNcbJcICXmCNXFcFJNTKa
 ---
 Track: We Were Right About Everything
-Directory: we-were-right-about-everything-ost
-Originally Released As: Lunatic
+Directory: we-were-right-about-everything-psycholonials
+Originally Released As: track:lunatic-we-are-all-satellites
 Duration: '5:51'
 URLs:
 - https://psycholonials.bandcamp.com/track/we-were-right-about-everything-2
 - https://open.spotify.com/track/2d8q0b4wRtdWpJl3Hm5VFD
 ---
 Track: Feeling I Can't Shake
-Directory: feeling-i-cant-shake-ost
+Directory: feeling-i-cant-shake-psycholonials
 Originally Released As: track:feeling-i-cant-shake
 Duration: '2:26'
 URLs:
@@ -312,7 +312,7 @@ URLs:
 - https://open.spotify.com/track/6Gi8uMvQnxKVR3Nc1Bw0o9
 ---
 Track: Zhen
-Directory: zhen-ost
+Directory: zhen-psycholonials
 Originally Released As: track:zhen
 Duration: '2:42'
 URLs:
@@ -320,15 +320,15 @@ URLs:
 - https://open.spotify.com/track/69gFF5kuyCSJdBiRntGPFL
 ---
 Track: The Successor
-Directory: the-successor-ost
-Originally Released As: Forgotten
+Directory: the-successor-psycholonials
+Originally Released As: track:forgotten-labyrinths-heart
 Duration: '4:22'
 URLs:
 - https://psycholonials.bandcamp.com/track/the-successor-2
 - https://open.spotify.com/track/2nGoAZvwC4m9juSN2rD2H9
 ---
 Track: Love Song
-Directory: love-song-ost
+Directory: love-song-psycholonials
 Originally Released As: Gay Love Song for Four Cellos
 Duration: '3:54'
 URLs:
@@ -336,18 +336,18 @@ URLs:
 - https://open.spotify.com/track/51KqiAops6wegL9HBWNZI3
 ---
 Track: 'Ephemeral Muse: Final Remix'
-Directory: ephemeral-muse-final-remix-ost
+Directory: ephemeral-muse-final-remix-psycholonials
 Duration: '4:08'
 URLs:
 - https://psycholonials.bandcamp.com/track/ephemeral-muse-final-remix-2
 - https://open.spotify.com/track/3oIQx0z9rNmEew41Ruxinb
 Referenced Tracks:
-- Harrigan
+- track:harrigan-we-are-all-satellites
 ---
 Section: Bonus tracks
 ---
 Track: 'Together: Vocal Remix'
-Originally Released As: Someday
+Originally Released As: track:someday-clark-powell
 Duration: '2:56'
 URLs:
 - https://open.spotify.com/track/37viwKrZf0k5atmUR40D30
diff --git a/album/qualia.yaml b/album/qualia.yaml
index 072925c..d2b4912 100644
--- a/album/qualia.yaml
+++ b/album/qualia.yaml
@@ -16,6 +16,8 @@ Commentary: |-
     I hope it's not a disappointment.
 ---
 Track: The Intro
+Directory: the-intro-qualia
+Always Reference By Directory: true
 Duration: '2:13'
 URLs:
 - https://buzinkaistudios.bandcamp.com/track/the-intro
@@ -25,6 +27,8 @@ Commentary: |-
     Somewhere, in the cosmos, a story begins.
 ---
 Track: Science
+Directory: science-qualia
+Always Reference By Directory: true
 Duration: '2:04'
 URLs:
 - https://buzinkaistudios.bandcamp.com/track/science
@@ -34,6 +38,8 @@ Commentary: |-
     The science team thinks they have made a breakthrough! But at what cost?
 ---
 Track: The Sewer
+Directory: the-sewer-qualia
+Always Reference By Directory: true
 Duration: 0:45
 URLs:
 - https://buzinkaistudios.bandcamp.com/track/the-sewer
@@ -43,6 +49,8 @@ Commentary: |-
     We have to get our feet wet.
 ---
 Track: The Race
+Directory: the-race-qualia
+Always Reference By Directory: true
 Duration: '1:49'
 URLs:
 - https://buzinkaistudios.bandcamp.com/track/the-race
@@ -61,6 +69,8 @@ Commentary: |-
     Anna is who you imagine when you hear her sing this. Isn't she lovely?
 ---
 Track: The Demon
+Directory: the-demon-qualia
+Always Reference By Directory: true
 Duration: '1:41'
 URLs:
 - https://buzinkaistudios.bandcamp.com/track/the-demon
@@ -90,6 +100,8 @@ Commentary: |-
     You'll come back, right?
 ---
 Track: Phoenix
+Directory: phoenix-qualia
+Always Reference By Directory: true
 Duration: '1:25'
 URLs:
 - https://buzinkaistudios.bandcamp.com/track/phoenix
@@ -99,6 +111,8 @@ Commentary: |-
     From the ashes.
 ---
 Track: Staff Roll
+Directory: staff-roll-qualia
+Always Reference By Directory: true
 Duration: 0:50
 URLs:
 - https://buzinkaistudios.bandcamp.com/track/staff-roll-2
diff --git a/album/rappets-davekat-collection.yaml b/album/rappets-davekat-collection.yaml
index 96def7f..19a3833 100644
--- a/album/rappets-davekat-collection.yaml
+++ b/album/rappets-davekat-collection.yaml
@@ -19,6 +19,8 @@ Commentary: |-
     (if you really really really want canonical context for this, just imagine it taking place in the dream bubbles)
 ---
 Track: Davekat
+Directory: davekat-rappets
+Always Reference By Directory: true
 Duration: '1:57'
 URLs:
 - https://telesfnf.bandcamp.com/track/davekat
@@ -30,9 +32,9 @@ Commentary: |-
 Track: Davekat ALT
 Duration: '1:55'
 Referenced Tracks:
-- Davekat 
+- track:davekat-rappets
 Sampled Tracks:
-- Davekat 
+- track:davekat-rappets
 URLs:
 - https://telesfnf.bandcamp.com/track/davekat-alt
 ---
@@ -41,7 +43,7 @@ Duration: '1:57'
 URLs:
 - https://telesfnf.bandcamp.com/track/davekat-instrumental
 Referenced Tracks:
-- Davekat 
+- track:davekat-rappets
 ---
 Track: Davekat ALT [Instrumental]
 Duration: '1:55'
diff --git a/album/references-beyond-homestuck.yaml b/album/references-beyond-homestuck.yaml
index af6f6d0..fdd88db 100644
--- a/album/references-beyond-homestuck.yaml
+++ b/album/references-beyond-homestuck.yaml
@@ -829,6 +829,8 @@ Lyrics: |-
     <i>[[An Apple Disaster!!]]</i>
 ---
 Track: man
+Directory: man-deltarune
+Always Reference By Directory: true
 # No official release, duration is from the in-game audio loop.
 Artists:
 - Toby Fox
@@ -960,9 +962,9 @@ Duration: '05:47'
 URLs:
 - https://astrokid.bandcamp.com/track/noun-astro-kids-pronoun-remix
 Referenced Tracks:
-- Noun
+- track:noun-ithaca
 Sampled Tracks:
-- Noun
+- track:noun-ithaca
 Lyrics: |-
     Though I forget myself
     I'm sure there's something else
@@ -1047,6 +1049,8 @@ Lyrics: |-
     If you were me you'd do the same
 ---
 Track: Nuclear
+Directory: nuclear-james-roach
+Always Reference By Directory: true
 # Unreleased, but shows up as often in James Roach's discography as Megalovania does in Toby Fox's
 Artists:
 - James Roach
@@ -1174,6 +1178,8 @@ URLs:
 - https://www.youtube.com/watch?v=EOA5M74kv5k
 ---
 Track: Terra
+Directory: terra-solatrus
+Always Reference By Directory: true
 Artists:
 - Solatrus
 Duration: '4:05'
@@ -1888,6 +1894,8 @@ URLs:
 - https://www.youtube.com/watch?v=-7WQn-SXY
 ---
 Track: Beginning
+Directory: beginning-castlevania-draculas-curse
+Always Reference By Directory: true
 # From Castlevania III: Dracula's Curse
 # The original official release combines this track with several others from the same game for its inclusion on the CD, so it doesn't have a "canonical" duration. But it starts at 2:46 and fades out ending at 4:30, which is what's used for the duration here.
 # Note that Castlevania III's NES release has a different rendition of the soundtrack from its original Famicom release, running on a different sound chip. They're essentially the same songs, but the Famicom original is what is listed here.
@@ -2364,6 +2372,8 @@ URLs:
 - https://www.youtube.com/watch?v=KYdRWC6MCgM
 ---
 Track: Dissonance
+Directory: dissonance-quincy-pringle
+Always Reference By Directory: true
 Artists:
 - Quincy Pringle
 Duration: '1:52'
@@ -2717,6 +2727,8 @@ Lyrics: |-
     One more last fist bump...
 ---
 Track: Focus
+Directory: focus-super-hexagon
+Always Reference By Directory: true
 Artists:
 - Super Hexagon
 - Chipzel
@@ -3011,6 +3023,8 @@ URLs:
 - https://open.spotify.com/track/4F9muAB4BFreVBPDW6mVVi
 ---
 Track: Harmony
+Directory: harmony-runescape
+Always Reference By Directory: true
 Artists:
 - Runescape
 - artist:ian-taylor-runescape
@@ -3067,6 +3081,8 @@ URLs:
 - https://www.youtube.com/watch?v=O0xKAphIF8A
 ---
 Track: Homicide
+Directory: homicide-danganronpa
+Always Reference By Directory: true
 # Vastly better known by its transliteration "Ikoroshia"
 # JP: イコロシア
 # Official release:
@@ -3128,6 +3144,8 @@ URLs:
 - https://www.youtube.com/watch?v=vMTqSl-usYI
 ---
 Track: Infinite
+Directory: infinite-sonic-forces
+Always Reference By Directory: true
 # Official release:
 #   Sonic Forces Vocal Traxx - On the Edge
 # Reference:
@@ -3887,6 +3905,8 @@ Lyrics: |-
     Yeah, yeeeahhhh...
 ---
 Track: Otherworld
+Directory: otherworld-final-fantasy-ix
+Always Reference By Directory: true
 # Official release:
 #   FINAL FANTASY IX Original Soundtrack
 # Reference:
@@ -3971,6 +3991,8 @@ URLs:
 - https://www.youtube.com/watch?v=-1EPegIzD2M
 ---
 Track: Plantation
+Directory: plantation-cave-story
+Always Reference By Directory: true
 # The original Cave Story's soundtrack hasn't been officially released.
 Artists:
 - Cave Story
@@ -3996,6 +4018,8 @@ URLs:
 - https://www.youtube.com/watch?v=MjZIjHu0OfY
 ---
 Track: Power
+Directory: power-mother
+Always Reference By Directory: true
 # Most often known as "The Power" but for some reason in the official release it's titled differently.
 # JP: パワー
 # Official release:
@@ -4085,6 +4109,8 @@ URLs:
 - https://www.youtube.com/watch?v=9xlMErV9Fts
 ---
 Track: Redial
+Directory: redial-bomberman-hero
+Always Reference By Directory: true
 # JP: redial
 # Official release:
 #   "Bomberman Hero" Original Soundtrack
@@ -4399,6 +4425,7 @@ URLs:
 - https://www.youtube.com/watch?v=tcpTuxh7E34
 ---
 Track: Slider
+Directory: slider-super-mario-64
 # JP: スライダー
 # Official release:
 #   スーパーマリオ64 オリジナルサウンドトラック
@@ -4611,6 +4638,8 @@ URLs:
 - https://www.youtube.com/watch?v=VjSUpctGEUQ
 ---
 Track: Synchrony
+Directory: synchrony-brandish-the-planet-buster
+Always Reference By Directory: true
 # JP: Synchrony
 # Official release:
 #   ミュージック・フロム・ブランディッシュ2 ザ・プラネット・バスター
@@ -5235,6 +5264,8 @@ URLs:
 - https://youtu.be/psMnbEmvx7w
 ---
 Track: you
+Directory: you-dai
+Always Reference By Directory: true
 # Official release:
 #   Higurashi no Naku Koro ni Kai Original Sound Version & Extra Sounds "Thanks/you"
 #   ひぐらしのなく頃に解 Original Sound Version & Extra Sounds 「Thanks/you」
@@ -5862,6 +5893,8 @@ Lyrics: |-
     (The power is YOURS!)
 ---
 Track: chase
+Directory: chase-jjba
+Always Reference By Directory: true
 Artists:
 - JoJo's Bizarre Adventure
 - batta
@@ -5920,6 +5953,7 @@ URLs:
 - https://www.youtube.com/watch?v=CL_3mlOPnGI
 ---
 Track: Courage
+Directory: courage-jjba
 Always Reference By Directory: true
 Artists:
 - JoJo's Bizarre Adventure
@@ -7135,6 +7169,8 @@ Lyrics: |-
     Row! Row! Fight the power!
 ---
 Track: Mailtime
+Directory: mailtime-blues-clues
+Always Reference By Directory: true
 Artists:
 - Blue's Clues
 - Nick Balaban
@@ -7845,6 +7881,8 @@ URLs:
 - https://www.youtube.com/watch?v=a6g5zrz1O-w
 ---
 Track: Smack
+Directory: smack-khonjin-house
+Always Reference By Directory: true
 Artists:
 - Khonjin House
 - SHADOWFOX2
@@ -9982,6 +10020,8 @@ Lyrics: |-
     To ev'ry home
 ---
 Track: Chopsticks
+Directory: chopsticks-euphemia-allen
+Always Reference By Directory: true
 Artists:
 - Euphemia Allen
 URLs:
@@ -12602,6 +12642,8 @@ Referenced Tracks:
 - track:megalovania-undertale
 ---
 Track: Badgers
+Directory: badgers-mrweebl
+Always Reference By Directory: true
 Artists:
 - MrWeebl
 Duration: '1:13'
@@ -13420,6 +13462,8 @@ Lyrics: |-
     Da ba dee da ba di, da ba dee da ba di 
 ---
 Track: Bodies
+Directory: bodies-drowning-pool
+Always Reference By Directory: true
 Artists:
 - Drowning Pool
 Duration: '3:21'
@@ -13637,6 +13681,8 @@ Lyrics: |-
     Nothing really matters to me
 ---
 Track: Bonfire
+Directory: bonfire-childish-gambino
+Always Reference By Directory: true
 Artists:
 - Childish Gambino
 Duration: '3:21'
@@ -14103,6 +14149,8 @@ Commentary: |-
     There are official English lyrics to this song but they change things to mention 'memes' and 'YouTube clips', so I just ran the lyrics through Google Translate instead.
 ---
 Track: Carnival
+Directory: carnival-gorillaz
+Always Reference By Directory: true
 Artists:
 - Gorillaz
 Duration: '2:15'
@@ -14209,6 +14257,8 @@ Lyrics: |-
     That you had to leave me alone?
 ---
 Track: Casin
+Directory: casin-glue70
+Always Reference By Directory: true
 Artists:
 - glue70
 Duration: '1:46'
@@ -14790,6 +14840,8 @@ Lyrics: |-
     Now watch me—
 ---
 Track: Crawling
+Directory: crawling-linkin-park
+Always Reference By Directory: true
 Artists:
 - Linkin Park
 - Don Gilmore (production)
@@ -15775,6 +15827,8 @@ Lyrics: |-
 #     So take your tyranny away
 ---
 Track: Discordant
+Directory: discordant-cecily-renns
+Always Reference By Directory: true
 Artists:
 - Cecily Renns
 Duration: '2:24'
@@ -15835,6 +15889,8 @@ Lyrics: |-
     It's so discordant
 ---
 Track: Divinity
+Directory: divinity-porter-robinson
+Always Reference By Directory: true
 Artists:
 - Porter Robinson
 Contributors:
@@ -16396,6 +16452,8 @@ Lyrics: |-
     Snoop
 ---
 Track: Dust
+Directory: dust-moon
+Always Reference By Directory: true
 Artists:
 - M.O.O.N.
 Duration: '5:00'
@@ -16403,6 +16461,8 @@ URLs:
 - https://www.youtube.com/watch?v=DpRUKLKCY-w
 ---
 Track: Earth
+Directory: earth-smile
+Always Reference By Directory: true
 Artists:
 - Smile
 Duration: '4:04'
@@ -16795,6 +16855,8 @@ Commentary: |-
     Best known under the names "HEHEYYEYAAEYAAAEYAEYAA" or "He-Man Sings".
 ---
 Track: Faint
+Directory: faint-linkin-park
+Always Reference By Directory: true
 Artists:
 - Linkin Park
 Duration: '2:42'
@@ -17100,6 +17162,8 @@ Lyrics: |-
     To the D to the E to the, to the, to the, to the, to the, to the...
 ---
 Track: Fever
+Directory: fever-little-willie-john
+Always Reference By Directory: true
 Artists:
 - Eddie Cooley
 - Otis Blackwell
@@ -17189,6 +17253,8 @@ Referenced Tracks:
 - track:final-savage-all-voice
 ---
 Track: Fireflies
+Directory: fireflies-owl-city
+Always Reference By Directory: true
 Artists:
 - Owl City
 Contributors:
@@ -17319,6 +17385,8 @@ Lyrics: |-
     Five years
 ---
 Track: Flicker
+Directory: flicker-porter-robinson
+Always Reference By Directory: true
 Artists:
 - Porter Robinson
 Duration: '4:39'
@@ -17495,6 +17563,8 @@ Lyrics: |-
     Oh
 ---
 Track: Friday
+Directory: friday-rebecca-black
+Always Reference By Directory: true
 Artists:
 - Clarence Jey
 - Patrice Wilson
@@ -18250,6 +18320,8 @@ Lyrics: |-
     That the ones we hurt are you and me?
 ---
 Track: Gentleman
+Directory: gentleman-psy
+Always Reference By Directory: true
 Artists:
 - PSY
 Duration: '3:12'
@@ -19119,6 +19191,8 @@ Lyrics: |-
     You ain't nothin' but a hound dog
 ---
 Track: Hoverboard
+Directory: hoverboard-dirtyphonics
+Always Reference By Directory: true
 Artists:
 - Dirtyphonics
 Duration: '4:24'
@@ -19130,6 +19204,8 @@ Sampled Tracks:
 - Back to the Future
 ---
 Track: Hydrogen
+Directory: hydrogen-moon
+Always Reference By Directory: true
 Artists:
 - M.O.O.N.
 Duration: '4:50'
@@ -20014,6 +20090,8 @@ Lyrics: |-
     To bring me back to life
 ---
 Track: If
+Directory: if-placeboing
+Always Reference By Directory: true
 Artists:
 - placeboing
 Duration: '2:00'
@@ -20951,6 +21029,8 @@ Lyrics: |-
     You wanna try 
 ---
 Track: Killers
+Directory: killers-cboyardee
+Always Reference By Directory: true
 Artists:
 - CBoyardee
 Duration: '2:57'
@@ -21255,6 +21335,8 @@ Lyrics: |-
     So long
 ---
 Track: Lawnmower
+Directory: lawnmower-neil-cicierega
+Always Reference By Directory: true
 Artists:
 - Neil Cicierega
 Duration: '3:13'
@@ -21479,6 +21561,8 @@ URLs:
 - https://www.youtube.com/watch?v=dn4sCGi0E6Q
 ---
 Track: Linger
+Directory: linger-the-cranberries
+Always Reference By Directory: true
 Artists:
 - The Cranberries
 Duration: '4:37'
@@ -22490,6 +22574,7 @@ Lyrics: |-
     Never!
 ---
 Track: Miserlou
+Always Reference By Directory: true
 Artists:
 - Dick Dale
 Duration: '2:17'
@@ -23233,7 +23318,7 @@ URLs:
 - https://www.youtube.com/watch?v=ydl38eJ6W3I
 Referenced Tracks:
 - Jupiter, the Bringer of Jollity
-- Earth
+- track:earth-smile
 Lyrics: |-
     Floating is a feeling, that can never be described
     Goodbye April morning, goodbye lady, goodbye
@@ -23829,6 +23914,8 @@ URLs:
 - https://soundcloud.com/killthecopyright/phantom-sage-detrace-panic-kill-the-copyright-release
 ---
 Track: Parade
+Directory: parade-justice
+Always Reference By Directory: true
 Artists:
 - Justice
 Duration: '4:00'
@@ -24143,6 +24230,8 @@ URLs:
 - https://www.youtube.com/watch?v=3r8EkbN3DCk
 ---
 Track: Piss
+Directory: piss-neil-cicierega
+Always Reference By Directory: true
 Artists:
 - Neil Cicierega
 Duration: '4:57'
@@ -24844,6 +24933,8 @@ URLs:
 - https://www.youtube.com/watch?v=7-MJZJjJs4A
 ---
 Track: risen
+Directory: risen-terry-a-davis
+Always Reference By Directory: true
 Artists:
 - Terry A. Davis
 Duration: '0:11'
@@ -25250,6 +25341,8 @@ URLs:
 - https://www.youtube.com/watch?v=r1-R8mbmLHY
 ---
 Track: Sandstorm
+Directory: darude-sandstorm
+Always Reference By Directory: true
 Artists:
 - Darude
 - JS16
@@ -25387,6 +25480,8 @@ URLs:
 - https://lapfox.bandcamp.com/track/self-coffinizing-prototype-ver
 ---
 Track: Separator
+Directory: separator-radiohead
+Always Reference By Directory: true
 Artists:
 - Radiohead
 Duration: '5:19'
@@ -25427,6 +25522,8 @@ Lyrics: |-
     When at last you give in
 ---
 Track: September
+Directory: september-earth-wind-fire
+Always Reference By Directory: true
 Artists:
 - Earth, Wind & Fire
 Duration: '3:35'
@@ -25605,6 +25702,8 @@ Lyrics: |-
     Ha-ha, Nate Dogg! 
 ---
 Track: Shelter
+Directory: shelter-porter-robinson
+Always Reference By Directory: true
 Artists:
 - Porter Robinson
 - Madeon
@@ -25638,6 +25737,8 @@ Lyrics: |-
     Until... 
 ---
 Track: Smooth
+Directory: smooth-santana
+Always Reference By Directory: true
 Artists:
 - Santana
 Contributors:
@@ -25782,6 +25883,8 @@ Lyrics: |-
     (Hahahaha)
 ---
 Track: Spleen
+Directory: spleen-ruth-white
+Always Reference By Directory: true
 Artists:
 - Ruth White
 Duration: '3:05'
@@ -26520,6 +26623,8 @@ Lyrics: |-
     Alright that's tight what its like to experience - Takyon 
 ---
 Track: Teardrop
+Directory: teardrop-massive-attack
+Always Reference By Directory: true
 Artists:
 - Massive Attack
 - Elizabeth Fraser (lyrics)
@@ -26720,6 +26825,8 @@ Lyrics:
     Technologic
 ---
 Track: Teenagers
+Directory: teenagers-my-chemical-romance
+Always Reference By Directory: true
 Artists:
 - My Chemical Romance
 - Rob Cavallo (production)
@@ -28452,6 +28559,8 @@ Lyrics: |-
     OGG
 ---
 Track: Ultimate
+Directory: ultimate-denzel-curry
+Always Reference By Directory: true
 Artists:
 - Denzel Curry
 - Ronny J
@@ -28741,6 +28850,8 @@ Lyrics: |-
     Aw, ow!
 ---
 Track: Verified
+Directory: verified-your-favorite-martian
+Always Reference By Directory: true
 Duration: 2:52
 Artists:
 - Your Favorite Martian
@@ -29276,6 +29387,8 @@ Lyrics: |-
     (What is a juggalo?)
 ---
 Track: Whales
+Directory: whales-hail-mary-mallons
+Always Reference By Directory: true
 Artists:
 - Hail Mary Mallons
 Duration: '2:15'
@@ -30254,7 +30367,7 @@ URLs:
 - https://www.youtube.com/watch?v=IdzI3tmvrCc
 Sampled Tracks:
 - Shake That
-- Casin
+- track:casin-glue70
 Lyrics: |-
     Two to the one, from the one to the three
     I like good pussy and I like good tree
@@ -30424,6 +30537,8 @@ Commentary: |-
     Flowey's laugh is not a new asset and can be recognized in other media. It was originally a Warner Bros. sound effect mostly used in Pink Panther cartoons and has appeared in titles such as the PlayStation title <a href="https://www.youtube.com/watch?v=2aBa-iQSkxc">Tomba!</a> and the Homestuck soundtrack [[track:the-lordling]], also by Toby Fox.
 ---
 Track: Hackers
+Directory: hackers-iain-softley
+Always Reference By Directory: true
 Duration: 1:47:00
 Artists:
 - Hackers
@@ -30443,6 +30558,8 @@ URLs:
 - https://www.youtube.com/watch?v=Mh5LY4Mz15o
 ---
 Track: Howl
+Directory: howl-allen-ginsberg
+Always Reference By Directory: true
 Artists:
 - Allen Ginsberg
 URLs:
diff --git a/album/reminders-of-you-beta.yaml b/album/reminders-of-you-beta.yaml
index ed4311b..506bb63 100644
--- a/album/reminders-of-you-beta.yaml
+++ b/album/reminders-of-you-beta.yaml
@@ -41,6 +41,6 @@ Track: 'Face Yourself [Beta]'
 Duration: '03:44'
 Referenced Tracks:
 - All Star
-- Faint
+- track:faint-linkin-park
 URLs:
 - https://vasterror.bandcamp.com/track/side-1-who-you-were-beta
diff --git a/album/repiton.yaml b/album/repiton.yaml
index 5344c59..771d0b4 100644
--- a/album/repiton.yaml
+++ b/album/repiton.yaml
@@ -16,6 +16,8 @@ Groups:
 - Fandom
 ---
 Track: Methodology
+Directory: methodology-repiton
+Always Reference By Directory: true
 Duration: '3:56'
 URLs:
 - https://vasterror.bandcamp.com/track/methodology
@@ -56,13 +58,15 @@ Duration: '3:22'
 URLs:
 - https://vasterror.bandcamp.com/track/thats-right
 Referenced Tracks:
-- September
+- track:september-earth-wind-fire
 Sampled Tracks:
 - Episodes of The Simpsons
 - Episodes of The Fairly Odd Parents
 - The Lego Movie
 ---
 Track: Survival
+Directory: survival-repiton
+Always Reference By Directory: true
 Cover Artists:
 - grechushka
 Duration: '2:51'
@@ -85,6 +89,8 @@ URLs:
 - https://vasterror.bandcamp.com/track/intermission-risk
 ---
 Track: Moonlight
+Directory: moonlight-repiton
+Always Reference By Directory: true
 Cover Artists:
 - koroke
 Duration: '3:01'
@@ -104,7 +110,7 @@ Cover Artists:
 - big chalupa
 Duration: '3:17'
 Referenced Tracks:
-- Oversaturated
+- track:oversaturated-vast-error
 URLs:
 - https://vasterror.bandcamp.com/track/tyrant
 ---
@@ -133,6 +139,8 @@ URLs:
 - https://vasterror.bandcamp.com/track/remember
 ---
 Track: Promise
+Directory: promise-repiton
+Always Reference By Directory: true
 Cover Artists:
 - Calibratorg
 Duration: '3:03'
diff --git a/album/retcon-2018.yaml b/album/retcon-2018.yaml
index 40f1b8a..7da671f 100644
--- a/album/retcon-2018.yaml
+++ b/album/retcon-2018.yaml
@@ -30,8 +30,9 @@ Additional Files:
   - banner.png
 ---
 Track: Time
-Duration: '03:38'
 Directory: time-retcon
+Always Reference By Directory: true
+Duration: '03:38'
 URLs:
 - https://8-bitshit.bandcamp.com/track/time
 Referenced Tracks:
@@ -39,6 +40,7 @@ Referenced Tracks:
 ---
 Track: '-'
 Directory: descend-retcon
+Always Reference By Directory: true
 Duration: '00:19'
 URLs:
 - https://8-bitshit.bandcamp.com/track/-
@@ -46,6 +48,8 @@ Referenced Tracks:
 - track:descend
 ---
 Track: Space
+Directory: space-retcon
+Always Reference By Directory: true
 Duration: '03:37'
 URLs:
 - https://8-bitshit.bandcamp.com/track/space
@@ -60,6 +64,8 @@ Referenced Tracks:
 - Explore
 ---
 Track: Regicide
+Directory: regicide-retcon
+Always Reference By Directory: true
 Duration: '06:45'
 URLs:
 - https://8-bitshit.bandcamp.com/track/regicide
@@ -88,6 +94,7 @@ Referenced Tracks:
 - Eternity Served Cold
 ---
 Track: Closure...?
+Directory: closure-retcon
 Duration: '03:42'
 URLs:
 - https://8-bitshit.bandcamp.com/track/closure
diff --git a/album/rose-of-winter.yaml b/album/rose-of-winter.yaml
index f9ebcd5..1327180 100644
--- a/album/rose-of-winter.yaml
+++ b/album/rose-of-winter.yaml
@@ -22,15 +22,17 @@ Groups:
 - Beyond
 ---
 Track: Theme
+Directory: theme-rose-of-winter
+Always Reference By Directory: true
 Artists:
 - Toby Fox
 Duration: '1:37'
-Directory: theme-rose-of-winter
-Always Reference By Directory: true
 URLs:
 - https://youtu.be/vWhUfWQX8-Q
 ---
 Track: Danger
+Directory: danger-rose-of-winter
+Always Reference By Directory: true
 Artists:
 - Toby Fox
 Duration: '0:57'
@@ -44,9 +46,11 @@ Duration: '1:42'
 URLs:
 - https://youtu.be/oKaZpC7QJTo
 Referenced Tracks:
-- Emotionless
+- track:emotionless-rose-of-winter
 ---
 Track: Emotionless
+Directory: emotionless-rose-of-winter
+Always Reference By Directory: true
 Artists:
 - Toby Fox
 Duration: '0:42'
@@ -54,6 +58,8 @@ URLs:
 - https://youtu.be/8l76d6yzdmw
 ---
 Track: Heroism
+Directory: heroism-rose-of-winter
+Always Reference By Directory: true
 Artists:
 - Toby Fox
 Duration: '1:00'
@@ -63,16 +69,19 @@ Referenced Tracks:
 - track:theme-rose-of-winter
 ---
 Track: Legend
+Directory: legend-rose-of-winter
+Always Reference By Directory: true
 Artists:
 - Toby Fox
 Duration: '1:04'
 URLs:
 - https://youtu.be/DP5I7qkHjTY
-Directory: legend-rose-of-winter
 Referenced Tracks:
-- Heroism
+- track:heroism-rose-of-winter
 ---
 Track: Tension
+Directory: tension-rose-of-winter
+Always Reference By Directory: true
 Artists:
 - Toby Fox
 Duration: '0:51'
diff --git a/album/sburb-funkin-edition-ost.yaml b/album/sburb-funkin-edition-ost.yaml
index a91100d..ccca0fb 100644
--- a/album/sburb-funkin-edition-ost.yaml
+++ b/album/sburb-funkin-edition-ost.yaml
@@ -23,7 +23,9 @@ Color: '#97C400'
 Groups:
 - Fandom
 ---
-Track: ABSCOND 
+Track: ABSCOND
+Directory: abscond-sburb-funkin-edition
+Always Reference By Directory: true
 Duration: '3:34'
 Cover Artists:
 - "SBURB: Funkin' Edition"
@@ -40,6 +42,8 @@ URLs:
 - https://soundcloud.com/rerollroxy/friday-night-funkin-sburb-funkin-edition-abscond-dave-vs-bro
 ---
 Track: gamzee
+Directory: gamzee-sburb-funkin-edition
+Always Reference By Directory: true
 Duration: '2:27'
 Cover Artists:
 - "SBURB: Funkin' Edition"
@@ -62,7 +66,7 @@ Art Tags:
 - Jane
 - LoPaN
 Referenced Tracks:
-- gamzee
+- track:gamzee-sburb-funkin-edition
 - track:megalovania-undertale
 Commentary: |-
     <i>rerollroxy:</i>
diff --git a/album/sburban-neighborhood.yaml b/album/sburban-neighborhood.yaml
index 5481a3b..dab643c 100644
--- a/album/sburban-neighborhood.yaml
+++ b/album/sburban-neighborhood.yaml
@@ -88,6 +88,8 @@ Commentary: |-
     This was inspired by listening to a lot of Gemini and Frankie Knuckles, I wasn't able to really replicate their sound (mainly cause my voice sucks) but it was a great challenge and a lot of fun. The name of the track is based off of all of the house sets that I love that are always labeled Live at (insert venue here).

 ---

 Track: Remember

+Directory: remember-sburban-neighborhood

+Always Reference By Directory: true

 Artists:

 - Cerulean

 Duration: '3:24'

@@ -408,7 +410,7 @@ URLs:
 Duration: '7:44'

 Referenced Tracks:

 - Vast Error

-- Overlook

+- track:overlook-vast-error

 - Liquid Negrocity

 - Sburban Jungle

 - Beatdown (Strider Style)

diff --git a/album/shortcuts.yaml b/album/shortcuts.yaml
index 10267e2..d22f117 100644
--- a/album/shortcuts.yaml
+++ b/album/shortcuts.yaml
@@ -125,6 +125,7 @@ Commentary: |-
     Loop 1 is the formal name for the Mopac Expressway in Austin, Texas. On the occasions where it's not crowded with stop-and-go commuters, it's a quick way to cut through the quieter reaches of town, navigating through rolling prairie and surreal corporate offices. This track pulls from the sound of krautrock, copping the motorik beat and droning sensibilities of Neu! - a recording from the inside of a car riding along this would-be-autobahn slowly fades in over the escalating loops.
 ---
 Track: Pulse
+Directory: pulse-shortcuts
 Artists:
 - David Ellis
 Contributors:
diff --git a/album/slender-the-arrival-soundtrack.yaml b/album/slender-the-arrival-soundtrack.yaml
index f4bb365..d482b97 100644
--- a/album/slender-the-arrival-soundtrack.yaml
+++ b/album/slender-the-arrival-soundtrack.yaml
@@ -26,6 +26,8 @@ URLs:
 - https://www.youtube.com/watch?v=fT9lKoYUxxo
 ---
 Track: Ponder
+Directory: ponder-slender
+Always Reference By Directory: true
 Duration: '0:29'
 URLs:
 - https://www.youtube.com/watch?v=LdXOHLh1Ol0
@@ -36,11 +38,15 @@ URLs:
 - https://www.youtube.com/watch?v=9XJpsGp7OmQ
 ---
 Track: Tainted
+Directory: tainted-slender
+Always Reference By Directory: true
 Duration: 0:48
 URLs:
 - https://www.youtube.com/watch?v=dpU_1HZLxxg
 ---
 Track: Shadowed
+Directory: shadowed-slender
+Always Reference By Directory: true
 Duration: '2:24'
 URLs:
 - https://www.youtube.com/watch?v=Y2gDoxLZwqU
@@ -51,26 +57,36 @@ Referenced Tracks:
 - Page 7 theme
 ---
 Track: Distance
+Directory: distance-slender
+Always Reference By Directory: true
 Duration: '1:00'
 URLs:
 - https://www.youtube.com/watch?v=8XjwRTHBrEY
 ---
 Track: Conceal
+Directory: conceal-slender
+Always Reference By Directory: true
 Duration: '2:00'
 URLs:
 - https://www.youtube.com/watch?v=RoKhESGC2hQ
 ---
 Track: Isolate
+Directory: isolate-slender
+Always Reference By Directory: true
 Duration: '2:45'
 URLs:
 - https://www.youtube.com/watch?v=p5DQ7QSIwwU
 ---
 Track: Suspended
+Directory: suspended-slender
+Always Reference By Directory: true
 Duration: '1:21'
 URLs:
 - https://www.youtube.com/watch?v=Wuxc99ZbU3M
 ---
 Track: Constricted
+Directory: constricted-slender
+Always Reference By Directory: true
 Duration: '1:06'
 URLs:
 - https://www.youtube.com/watch?v=RtswRWtHS_o
@@ -88,11 +104,15 @@ URLs:
 - https://www.youtube.com/watch?v=hKRRZ8PK8_0
 ---
 Track: Corrupted
+Directory: corrupted-slender
+Always Reference By Directory: true
 Duration: 0:56
 URLs:
 - https://www.youtube.com/watch?v=rRnaaR--lvk
 ---
 Track: Responsible
+Directory: responsible-slender
+Always Reference By Directory: true
 Duration: '2:00'
 URLs:
 - https://www.youtube.com/watch?v=8ozjfcptHBg
@@ -111,6 +131,8 @@ Cover Artists:
 - Blue Isle Studios
 ---
 Track: Willow
+Directory: willow-slender
+Always Reference By Directory: true
 Date First Released: October 15, 2014
 Artists:
 - Brenden Frank
diff --git a/album/someday.yaml b/album/someday.yaml
index bdec95d..17499d8 100644
--- a/album/someday.yaml
+++ b/album/someday.yaml
@@ -21,6 +21,8 @@ Wallpaper Artists:
 Listed on Homepage: false
 ---
 Track: Someday
+Directory: someday-clark-powell
+Always Reference By Directory: true
 Artists:
 - Clark Powell
 Contributors:
@@ -39,4 +41,4 @@ Duration: '4:41'
 URLs:
 - https://clarkpowell.bandcamp.com/track/someday-astro-kid-remix
 Referenced Tracks:
-- Someday
+- track:someday-clark-powell
diff --git a/album/songs-from-the-planet-earth.yaml b/album/songs-from-the-planet-earth.yaml
index 533500c..2019b83 100644
--- a/album/songs-from-the-planet-earth.yaml
+++ b/album/songs-from-the-planet-earth.yaml
@@ -359,6 +359,8 @@ Lyrics: |-
     (Everything I ever did, I did for her. Now she's gone. But I'm still here. Sometimes... I wonder if she can see me. What would she think of me now?)
 ---
 Track: Pink
+Directory: pink-planet-earth
+Always Reference By Directory: true
 Artists:
 - Levc
 Duration: '3:40'
@@ -882,6 +884,8 @@ Referenced Tracks:
 - Stronger Than You
 ---
 Track: Mistakes
+Directory: mistakes-planet-earth
+Always Reference By Directory: true
 Artists:
 - Cerulean
 Duration: '1:33'
diff --git a/album/songs-of-rivervale.yaml b/album/songs-of-rivervale.yaml
index f6bf034..9e157a7 100644
--- a/album/songs-of-rivervale.yaml
+++ b/album/songs-of-rivervale.yaml
@@ -79,6 +79,7 @@ Commentary: |-
     Théo sets out to uncover the mysteries of the Cloud Factory and save the valley.
 ---
 Track: Lakeside
+Directory: lakeside-rivervale
 Duration: '03:24'
 URLs:
 - https://cloudfactorycomics.bandcamp.com/track/lakeside
diff --git a/album/strife.yaml b/album/strife.yaml
index ae8a375..7cbc425 100644
--- a/album/strife.yaml
+++ b/album/strife.yaml
@@ -71,7 +71,7 @@ URLs:
 Referenced Tracks:
 - Moon Over the Castle
 - Bloody Tears
-- track:beginning
+- track:beginning-castlevania-draculas-curse
 - Recruitment Theme
 Sheet Music Files:
 - Title: Violin line by Clawtooth
diff --git a/album/stuckhome-syndrome-part-one-v1.yaml b/album/stuckhome-syndrome-part-one-v1.yaml
index 9d17e01..68dba2c 100644
--- a/album/stuckhome-syndrome-part-one-v1.yaml
+++ b/album/stuckhome-syndrome-part-one-v1.yaml
@@ -189,6 +189,8 @@ URLs:
 - https://spellmynamewithabang.bandcamp.com/track/alone-but-not-lonely-2
 ---
 Track: Lost
+Directory: lost-stuckhome-syndrome
+Always Reference By Directory: true
 Duration: '02:22'
 URLs:
 - https://spellmynamewithabang.bandcamp.com/track/lost
@@ -423,6 +425,8 @@ Track: Curb Stomp the Finale (Remotivate Yourself!)
 Duration: '02:38'
 ---
 Track: Entropy
+Directory: entropy-stuckhome-syndrome
+Always Reference By Directory: true
 Duration: '02:26'
 ---
 Track: TAB RUSH
@@ -563,6 +567,8 @@ Lyrics: |-
     Oh, I'm afraid I just "blue" myself.
 ---
 Track: Islander
+Directory: islander-stuckhome-syndrome
+Always Reference By Directory: true
 Duration: '02:45'
 ---
 Track: Jane's Dragon
@@ -600,6 +606,8 @@ Track: Go Rest Our Heroes
 Duration: '01:23'
 ---
 Track: Hope
+Directory: hope-stuckhome-syndrome
+Always Reference By Directory: true
 Duration: '02:08'
 ---
 Track: Sortable Loss
@@ -630,6 +638,8 @@ Track: A Day in the Kingdom of Light
 Duration: '01:17'
 ---
 Track: Exiled
+Directory: exiled-stuckhome-syndrome
+Always Reference By Directory: true
 Duration: '02:05'
 ---
 Track: Vagabonding
@@ -656,12 +666,16 @@ Track: Sleepytime Tea for Sleepytime Me
 Duration: '01:33'
 ---
 Track: Sunglasses
+Directory: sunglasses-stuckhome-syndrome
+Always Reference By Directory: true
 Duration: '02:45'
 ---
 Track: Spades' Licks
 Duration: '02:09'
 ---
 Track: Sandles
+Directory: sandles-stuckhome-syndrome
+Always Reference By Directory: true
 Duration: '02:09'
 ---
 Track: Bass Trick
@@ -680,6 +694,8 @@ Track: Bad Taste
 Duration: '00:30'
 ---
 Track: Pocketwatch
+Directory: pocketwatch-stuckhome-syndrome
+Always Reference By Directory: true
 Duration: '02:35'
 Sampled Tracks:
 - Clockwork Melody
@@ -720,6 +736,8 @@ Track: Walking and Walking and Waiting and Waiting
 Duration: '00:40'
 ---
 Track: Prototyping
+Directory: prototyping-stuckhome-syndrome
+Always Reference By Directory: true
 Duration: '00:43'
 ---
 Track: Too Happy
@@ -735,6 +753,8 @@ Track: Tech Hop
 Duration: '00:23'
 ---
 Track: Questline
+Directory: questline-stuckhome-syndrome
+Always Reference By Directory: true
 Duration: '00:33'
 ---
 Track: Quindance
@@ -760,6 +780,8 @@ Sampled Tracks:
 - Amen, Brother
 ---
 Track: Cruxtruder
+Directory: cruxtruder-stuckhome-syndrome
+Always Reference By Directory: true
 Duration: '01:21'
 ---
 Track: Bad Future
@@ -778,15 +800,21 @@ Track: Some Today I'll Get This Right
 Duration: '01:57'
 ---
 Track: Cloudling
+Directory: cloudling-stuckhome-syndrome
+Always Reference By Directory: true
 Duration: '01:35'
 ---
 Track: Ghosts, Buster
 Duration: '01:32'
 ---
 Track: Halfways
+Directory: halfways-stuckhome-syndrome
+Always Reference By Directory: true
 Duration: '01:14'
 ---
 Track: Hardly
+Directory: hardly-stuckhome-syndrome
+Always Reference By Directory: true
 Duration: '00:45'
 ---
 Track: Harley's Quin
@@ -863,6 +891,8 @@ Track: Paranoise
 Duration: '01:39'
 ---
 Track: Other
+Directory: other-stuckhome-syndrome
+Always Reference By Directory: true
 Duration: '00:53'
 ---
 Track: Comfortable Shenanigans
@@ -951,6 +981,8 @@ Track: Imp Party
 Duration: '00:27'
 ---
 Track: Subspace
+Directory: subspace-stuckhome-syndrome
+Always Reference By Directory: true
 Duration: '01:36'
 ---
 Track: The K Stands for Karkat
@@ -1035,6 +1067,8 @@ Track: Inflammable Infirmary
 Duration: '02:27'
 ---
 Track: Crush
+Directory: crush-stuckhome-syndrome
+Always Reference By Directory: true
 Duration: '02:49'
 ---
 Track: Chilled Child
@@ -1131,6 +1165,8 @@ Track: Meme Number
 Duration: '00:15'
 ---
 Track: Within
+Directory: within-stuckhome-syndrome
+Always Reference By Directory: true
 Duration: '00:40'
 ---
 Track: Paintlicking
@@ -1176,6 +1212,8 @@ Sampled Tracks:
 - Heat
 ---
 Track: Weirdo
+Directory: weirdo-stuckhome-syndrome
+Always Reference By Directory: true
 Duration: '00:19'
 ---
 Track: Sudden Weather Change
@@ -1188,6 +1226,8 @@ Track: bad music
 Duration: '01:25'
 ---
 Track: Underneath
+Directory: underneath-stuckhome-syndrome
+Always Reference By Directory: true
 Duration: '03:10'
 ---
 Track: Asskick Prelude
@@ -1247,6 +1287,8 @@ Track: No Going Back.
 Duration: '00:32'
 ---
 Track: Static
+Directory: static-stuckhome-syndrome
+Always Reference By Directory: true
 Duration: '02:18'
 ---
 Track: Squish Squash
@@ -1338,6 +1380,8 @@ Track: Queen of Tiny Teenies
 Duration: '00:47'
 ---
 Track: Nerds
+Directory: nerds-stuckhome-syndrome
+Always Reference By Directory: true
 Duration: '00:23'
 ---
 Track: Stupid Immortal Skull Monster Life
@@ -1350,6 +1394,8 @@ Track: Squiddlesneaks
 Duration: '00:51'
 ---
 Track: Pesterchum
+Directory: pesterchum-stuckhome-syndrome
+Always Reference By Directory: true
 Duration: '00:22'
 ---
 Track: stalacticicle
@@ -1629,6 +1675,8 @@ Track: Groove Row
 Duration: '03:12'
 ---
 Track: Smoothly
+Directory: smoothly-stuckhome-syndrome
+Always Reference By Directory: true
 Duration: '00:48'
 ---
 Track: Unununununtrustable
@@ -1667,6 +1715,8 @@ Track: Sandy Beach on Saturn
 Duration: '03:39'
 ---
 Track: Moonlit
+Directory: moonlit-stuckhome-syndrome
+Always Reference By Directory: true
 Duration: '01:25'
 ---
 Track: Telescoping Lens
diff --git a/album/sunday-night-strifin-act-1-plus-2-ost.yaml b/album/sunday-night-strifin-act-1-plus-2-ost.yaml
index d138cad..294e8ef 100644
--- a/album/sunday-night-strifin-act-1-plus-2-ost.yaml
+++ b/album/sunday-night-strifin-act-1-plus-2-ost.yaml
@@ -142,6 +142,8 @@ URLs:
 - https://strifinsoundteam.bandcamp.com/track/cant-abscond
 ---
 Track: Sleepwalk
+Directory: sleepwalk-sunday-night-strifin
+Always Reference By Directory: true
 Artists:
 - bould
 Cover Artists:
@@ -160,6 +162,8 @@ URLs:
 - https://strifinsoundteam.bandcamp.com/track/sleepwalk
 ---
 Track: Verdancy
+Directory: verdancy-sunday-night-strifin
+Always Reference By Directory: true
 Artists:
 - WorldEndWonder
 Cover Artists:
@@ -175,6 +179,8 @@ URLs:
 - https://strifinsoundteam.bandcamp.com/track/verdancy
 ---
 Track: Grimdark
+Directory: grimdark-sunday-night-strifin
+Always Reference By Directory: true
 Artists:
 - bould
 Cover Artists:
@@ -281,6 +287,8 @@ URLs:
 - https://strifinsoundteam.bandcamp.com/track/check-it
 ---
 Track: Playtime
+Directory: playtime-sunday-night-strifin
+Always Reference By Directory: true
 Artists:
 - TeeDeeGee
 Cover Artists:
@@ -302,6 +310,8 @@ URLs:
 - https://strifinsoundteam.bandcamp.com/track/playtime
 ---
 Track: Halloween Hack
+Directory: halloween-hack-sunday-night-strifin
+Always Reference By Directory: true
 Artists:
 - bould
 Cover Artists:
@@ -315,6 +325,8 @@ URLs:
 - https://strifinsoundteam.bandcamp.com/track/halloween-hack
 ---
 Track: Catfight
+Directory: catfight-sunday-night-strifin
+Always Reference By Directory: true
 Artists:
 - TeeDeeGee
 Cover Artists:
@@ -331,6 +343,8 @@ URLs:
 - https://youtu.be/Wt5t0XMtY6g
 ---
 Track: Heinous
+Directory: heinous-sunday-night-strifin
+Always Reference By Directory: true
 Artists:
 - WorldEndWonder
 Cover Artists:
@@ -381,6 +395,8 @@ URLs:
 - https://strifinsoundteam.bandcamp.com/track/8r8k
 ---
 Track: Shenanigans
+Directory: shenanigans-sunday-night-strifin
+Always Reference By Directory: true
 Artists:
 - bould
 Cover Artists:
@@ -540,9 +556,9 @@ Referenced Tracks:
 - Aggrievance
 - Aggrievocation
 - track:MeGaLoVania
-- Sleepwalk
-- Verdancy
-- Grimdark
+- track:sleepwalk-sunday-night-strifin
+- track:verdancy-sunday-night-strifin
+- track:grimdark-sunday-night-strifin
 - Grimdate
 URLs:
 - https://strifinsoundteam.bandcamp.com/track/aggrievety
diff --git a/album/team-paradox.yaml b/album/team-paradox.yaml
index 3946702..b530906 100644
--- a/album/team-paradox.yaml
+++ b/album/team-paradox.yaml
@@ -35,7 +35,7 @@ Commentary: |-
 
     To those of you who have taken the time to make fanart of Team Paradox, I would like to thank you greatly for this. Nothing thrills me more than seeing artwork of our trolls, and my fanart folder is growing preposterously large. So many thanks to you all for being a constant beacon of awesomeness brightening up my days. A super special shout out to [[artist:esabelle-ryngin|Esabelle]], who made the gorgeous cover art for the album, along with a vast swath of other fantastic arts for us. Stay classy!
 
-    Again on the more specific side, I would like to extend my great appreciation to [[artist:charles-neudorf|Crazy-8]] and Sadochist, who created the phenomenal tracks [[track:distortion-land-of-light-and-noise|Distortion]], [[Crazed Royal]] and [[Aliesh's Lullaby]], and [[Hollow]] and [[Pure]] respectively. I'm just going to take a time out for a moment from writing this to fondly regard how awful the punctuation in that last sentence was and hope the point still got through. Moving on. Being a musician myself, I can appreciate the immense amount of work that goes into creating a song, and here are these two who are consistently churning out more awesome tunes to grace our humble thrad. So many thanks to both of you for gracing this album with your unique styles.
+    Again on the more specific side, I would like to extend my great appreciation to [[artist:charles-neudorf|Crazy-8]] and Sadochist, who created the phenomenal tracks [[track:distortion-land-of-light-and-noise|Distortion]], [[Crazed Royal]] and [[Aliesh's Lullaby]], and [[track:hollow-team-paradox]] and [[track:pure-team-paradox]] respectively. I'm just going to take a time out for a moment from writing this to fondly regard how awful the punctuation in that last sentence was and hope the point still got through. Moving on. Being a musician myself, I can appreciate the immense amount of work that goes into creating a song, and here are these two who are consistently churning out more awesome tunes to grace our humble thrad. So many thanks to both of you for gracing this album with your unique styles.
 
     Finally, I would like to thank the rest of the team. [[artist:red-pen]], blacksheepDaydreamer, Beep, Metaflare and Tribor, without any one of them the team would simply not be complete. Each brings dynamic and unique elements to the table to help put together this awesome story. I just wanted to say what a phenomenal pleasure it has been working with each and every one of you on Team Paradox over the last year, and I look forwards to continuing to do so.
 
@@ -108,6 +108,8 @@ Art Tags:
 - Alternia
 ---
 Track: Pure
+Directory: pure-team-paradox
+Always Reference By Directory: true
 Artists:
 - Sadochist
 Duration: '2:42'
@@ -159,6 +161,8 @@ Art Tags:
 - Alternia
 ---
 Track: Hollow
+Directory: hollow-team-paradox
+Always Reference By Directory: true
 Artists:
 - Sadochist
 Duration: '1:56'
@@ -298,6 +302,8 @@ Art Tags:
 - BQ
 ---
 Track: Advanse
+Directory: advanse-team-paradox
+Always Reference By Directory: true
 Artists:
 - mediokreKarapase
 Duration: '3:14'
diff --git a/album/the-ballad-of-megan-pouring.yaml b/album/the-ballad-of-megan-pouring.yaml
index 0412bca..e1f1784 100644
--- a/album/the-ballad-of-megan-pouring.yaml
+++ b/album/the-ballad-of-megan-pouring.yaml
@@ -137,4 +137,4 @@ Referenced Tracks:
 - Feel Good Inc.
 - Homestuck Anthem
 - Bridal Chorus
-- Wanderlust
+- track:wanderlust-paradox-music-team
diff --git a/album/the-consuming-shadow-ost.yaml b/album/the-consuming-shadow-ost.yaml
index 819adc8..8dab023 100644
--- a/album/the-consuming-shadow-ost.yaml
+++ b/album/the-consuming-shadow-ost.yaml
@@ -22,6 +22,8 @@ URLs:
 - https://parsecproductions.bandcamp.com/track/the-consuming-shadow
 ---
 Track: Driven
+Directory: driven-the-consuming-shadow
+Always Reference By Directory: true
 Duration: '4:00'
 URLs:
 - https://parsecproductions.bandcamp.com/track/driven
@@ -32,32 +34,43 @@ URLs:
 - https://parsecproductions.bandcamp.com/track/rust-debris
 ---
 Track: Rotund
+Directory: rotund-the-consuming-shadow
+Always Reference By Directory: true
 Duration: 0:30
 URLs:
 - https://parsecproductions.bandcamp.com/track/rotund
 ---
 Track: Unnatural
+Directory: unnatural-the-consuming-shadow
+Always Reference By Directory: true
 Duration: 0:40
 URLs:
 - https://parsecproductions.bandcamp.com/track/unnatural
 ---
 Track: Haunted
+Directory: haunted-the-consuming-shadow
+Always Reference By Directory: true
 Duration: 0:30
 URLs:
 - https://parsecproductions.bandcamp.com/track/haunted
 ---
 Track: Secretive
+Directory: secretive-the-consuming-shadow
+Always Reference By Directory: true
 Duration: 0:40
 URLs:
 - https://parsecproductions.bandcamp.com/track/secretive
 ---
 Track: Unfathomable
+Directory: unfathomable-the-consuming-shadow
+Always Reference By Directory: true
 Duration: '1:32'
 URLs:
 - https://parsecproductions.bandcamp.com/track/unfathomable
 ---
 Track: Sacrifice
 Directory: sacrifice-the-consuming-shadow
+Always Reference By Directory: true
 Duration: '1:51'
 URLs:
 - https://parsecproductions.bandcamp.com/track/sacrifice
@@ -75,6 +88,8 @@ URLs:
 - https://parsecproductions.bandcamp.com/track/eternal-servant
 ---
 Track: Broken
+Directory: broken-the-consuming-shadow
+Always Reference By Directory: true
 Duration: '1:51'
 URLs:
 - https://parsecproductions.bandcamp.com/track/broken
@@ -87,16 +102,22 @@ URLs:
 - https://parsecproductions.bandcamp.com/track/stored-away
 ---
 Track: Encompass
+Directory: encompass-the-consuming-shadow
+Always Reference By Directory: true
 Duration: 0:30
 URLs:
 - https://parsecproductions.bandcamp.com/track/encompass
 ---
 Track: Ancient
+Directory: ancient-the-consuming-shadow
+Always Reference By Directory: true
 Duration: 0:40
 URLs:
 - https://parsecproductions.bandcamp.com/track/ancient
 ---
 Track: Dawn
+Directory: dawn-the-consuming-shadow
+Always Reference By Directory: true
 Duration: '1:51'
 URLs:
 - https://parsecproductions.bandcamp.com/track/dawn
diff --git a/album/the-funk-mclovin-homestuck-experience.yaml b/album/the-funk-mclovin-homestuck-experience.yaml
index 863c5ce..a0d76ed 100644
--- a/album/the-funk-mclovin-homestuck-experience.yaml
+++ b/album/the-funk-mclovin-homestuck-experience.yaml
@@ -15,6 +15,7 @@ Groups:
 - Fandom
 ---
 Track: Introduction
+Directory: introduction-the-funk-mclovin-homestuck-experience
 Duration: 0:50
 URLs:
 - https://funkmclovin.bandcamp.com/track/introduction
diff --git a/album/the-wanderers.yaml b/album/the-wanderers.yaml
index 4f1264d..466e3c8 100644
--- a/album/the-wanderers.yaml
+++ b/album/the-wanderers.yaml
@@ -142,7 +142,7 @@ Cover Artists:
 Art Tags:
 - WV
 Referenced Tracks:
-- Mailtime
+- track:mailtime-blues-clues
 Sampled Tracks:
 - Judge Dredd
 Lyrics: |-
diff --git a/album/theres-no-place-like-home.yaml b/album/theres-no-place-like-home.yaml
index df6f665..8844b2b 100644
--- a/album/theres-no-place-like-home.yaml
+++ b/album/theres-no-place-like-home.yaml
@@ -23,6 +23,8 @@ Commentary: |-
     Thanks to PotatoBoss for his feedback and help with credits checking<br>HP : <a href="http://potatoboss.net/">potatoboss.net</a><br>Twitter : <a href="https://twitter.com/potatomoosik">twitter.com/potatomoosik</a><br>Youtube : <a href="https://www.youtube.com/channel/UCx8RbZLXx8lcr-yBHPEr_vA">www.youtube.com/channel/UCx8RbZLXx8lcr-yBHPEr_vA</a><br>Bandcamp : <a href="https://potatoboss.bandcamp.com/">potatoboss.bandcamp.com</a>
 ---
 Track: Confined
+Directory: confined-no-place-like-home
+Always Reference By Directory: true
 Duration: '4:04'
 URLs:
 - https://teeveemusic.bandcamp.com/track/confined
@@ -208,7 +210,8 @@ Referenced Tracks:
 - Descend
 ---
 Track: MeGaLoVania (cover)
-Directory: megalovania-tee-vee
+Directory: megalovania-no-place-like-home
+Always Reference By Directory: true
 Duration: '2:51'
 URLs:
 - https://teeveemusic.bandcamp.com/track/cover
diff --git a/album/triassic-slump.yaml b/album/triassic-slump.yaml
index 031448a..22e47ac 100644
--- a/album/triassic-slump.yaml
+++ b/album/triassic-slump.yaml
@@ -375,6 +375,8 @@ Lyrics: |-
     and I think I want to die alone
 ---
 Track: Meteors
+Directory: meteors-triassic-slump
+Always Reference By Directory: true
 Duration: '7:24'
 URLs:
 - https://what.bandcamp.com/track/meteors
diff --git a/album/troleplanet.yaml b/album/troleplanet.yaml
index cd454dd..4127179 100644
--- a/album/troleplanet.yaml
+++ b/album/troleplanet.yaml
@@ -136,7 +136,7 @@ URLs:
 Referenced Tracks:
 - Endless Climb
 - Explore
-- Ascension
+- track:ascension-ithaca
 - Reconstructing More Science
 - U.N. Owen Was Her?
 - Flare
diff --git a/album/tumblrstuck-bent-ost-volume-2.yaml b/album/tumblrstuck-bent-ost-volume-2.yaml
index 7303fd2..0267e67 100644
--- a/album/tumblrstuck-bent-ost-volume-2.yaml
+++ b/album/tumblrstuck-bent-ost-volume-2.yaml
@@ -108,6 +108,7 @@ Commentary: |-
 Section: Bonus tracks
 ---
 Track: Surmount
+Directory: surmount-tumblrstuck
 Duration: '1:43'
 URLs:
 - https://hsmusic.wiki/media/misc/archive/Surmount.mp3
diff --git a/album/ulterior-motives.yaml b/album/ulterior-motives.yaml
index fab8b62..1a881cc 100644
--- a/album/ulterior-motives.yaml
+++ b/album/ulterior-motives.yaml
@@ -231,6 +231,8 @@ Lyrics: |-
     Fall in love with a girl like you
 ---
 Track: Communion
+Directory: communion-ulterior-motives
+Always Reference By Directory: true
 Duration: '2:24'
 URLs:
 - https://bowman.bandcamp.com/track/communion
@@ -290,6 +292,8 @@ Lyrics: |-
     Just a piece to remain when you die
 ---
 Track: Sabotage
+Directory: sabotage-ulterior-motives
+Always Reference By Directory: true
 Duration: '4:08'
 URLs:
 - https://bowman.bandcamp.com/track/sabotage
@@ -427,6 +431,8 @@ Lyrics: |-
     When I think about you
 ---
 Track: Interlude
+Directory: interlude-ulterior-motives
+Always Reference By Directory: true
 Duration: '0:53'
 URLs:
 - https://bowman.bandcamp.com/track/interlude
@@ -435,6 +441,8 @@ Lyrics: |-
     (Strange, the way time goes by.)
 ---
 Track: Mechanism
+Directory: mechanism-ulterior-motives
+Always Reference By Directory: true
 Duration: '3:00'
 URLs:
 - https://bowman.bandcamp.com/track/mechanism
@@ -499,6 +507,8 @@ Lyrics: |-
     The mechanism of the heart (Mechanism of the heart)
 ---
 Track: Saint
+Directory: saint-ulterior-motives
+Always Reference By Directory: true
 Duration: '2:41'
 URLs:
 - https://bowman.bandcamp.com/track/saint
@@ -589,6 +599,8 @@ Lyrics: |-
     And I know that man is me
 ---
 Track: Powerline
+Directory: powerline-ulterior-motives
+Always Reference By Directory: true
 Duration: '2:43'
 URLs:
 - https://bowman.bandcamp.com/track/powerline
@@ -653,6 +665,8 @@ Lyrics: |-
     Come get electric
 ---
 Track: Utopia
+Directory: utopia-ulterior-motives
+Always Reference By Directory: true
 Duration: '3:20'
 URLs:
 - https://bowman.bandcamp.com/track/utopia
diff --git a/album/undertale-soundtrack.yaml b/album/undertale-soundtrack.yaml
index 99489b4..2912b0f 100644
--- a/album/undertale-soundtrack.yaml
+++ b/album/undertale-soundtrack.yaml
@@ -208,6 +208,8 @@ Referenced Tracks:
 - Snowy
 ---
 Track: Shop
+Directory: shop-undertale
+Always Reference By Directory: true
 Duration: 0:50
 URLs:
 - https://tobyfox.bandcamp.com/track/shop
@@ -254,6 +256,8 @@ Referenced Tracks:
 - Snowdin Town
 ---
 Track: Premonition
+Directory: premonition-undertale
+Always Reference By Directory: true
 Duration: '1:01'
 URLs:
 - https://tobyfox.bandcamp.com/track/premonition
@@ -306,6 +310,8 @@ Referenced Tracks:
 - track:ruins-undertale
 ---
 Track: Memory
+Directory: memory-undertale
+Always Reference By Directory: true
 Duration: '1:15'
 URLs:
 - https://tobyfox.bandcamp.com/track/memory
@@ -368,6 +374,8 @@ Referenced Tracks:
 - The One Horse Open Sleigh
 ---
 Track: Chill
+Directory: chill-undertale
+Always Reference By Directory: true
 Duration: 0:56
 URLs:
 - https://tobyfox.bandcamp.com/track/chill
@@ -440,7 +448,7 @@ URLs:
 - https://www.youtube.com/watch?v=3LhZWVRp6f4
 - https://open.spotify.com/track/5lLuAtrQXTi204GNxkEenv
 Referenced Tracks:
-- Hotel
+- track:hotel-undertale
 ---
 Track: Metal Crusher
 Duration: '1:03'
@@ -479,6 +487,8 @@ Referenced Tracks:
 - Enemy Approaching
 ---
 Track: Hotel
+Directory: hotel-undertale
+Always Reference By Directory: true
 Duration: '1:27'
 URLs:
 - https://tobyfox.bandcamp.com/track/hotel
@@ -494,10 +504,12 @@ URLs:
 - https://www.youtube.com/watch?v=ltzrV-_v-tI
 - https://open.spotify.com/track/3llcyZnL04lIUQAiBCFng1
 Referenced Tracks:
-- Hotel
+- track:hotel-undertale
 - Once Upon a Time
 ---
 Track: Confession
+Directory: confession-undertale
+Always Reference By Directory: true
 Duration: 0:42
 URLs:
 - https://tobyfox.bandcamp.com/track/confession
@@ -575,7 +587,7 @@ URLs:
 - https://www.youtube.com/watch?v=E7jf_9zdy-E
 - https://open.spotify.com/track/1PVw70FUrm08BuED8bdiPb
 Referenced Tracks:
-- Hotel
+- track:hotel-undertale
 ---
 Track: CORE
 Duration: '2:46'
@@ -669,6 +681,8 @@ URLs:
 - https://open.spotify.com/track/7g2vS40kPg9PVMc8muxzBb
 ---
 Track: Barrier
+Directory: barrier-undertale
+Always Reference By Directory: true
 Duration: 0:31
 URLs:
 - https://tobyfox.bandcamp.com/track/barrier
@@ -716,6 +730,8 @@ Referenced Tracks:
 - Terezi's Theme
 ---
 Track: Finale
+Directory: finale-undertale
+Always Reference By Directory: true
 Duration: '1:52'
 URLs:
 - https://www.youtube.com/watch?v=5qajT8lS2ok
@@ -755,7 +771,7 @@ URLs:
 - https://www.youtube.com/watch?v=0T8AROoIh44
 - https://open.spotify.com/track/4uS9yFLe90uxnAz5VXqHQv
 Referenced Tracks:
-- Barrier
+- track:barrier-undertale
 ---
 Track: Fallen Down (Reprise)
 Duration: '2:30'
@@ -838,6 +854,8 @@ Referenced Tracks:
 - Once Upon a Time
 ---
 Track: Respite
+Directory: respite-undertale
+Always Reference By Directory: true
 Duration: '1:54'
 URLs:
 - https://www.youtube.com/watch?v=USVk9tGQXbo
diff --git a/album/v8lume.yaml b/album/v8lume.yaml
index 375b9cc..678b136 100644
--- a/album/v8lume.yaml
+++ b/album/v8lume.yaml
@@ -830,6 +830,8 @@ Commentary: |-
     I should probably look up guides on how to draw arms and hands. Body-proportion wise, this is one of the best things I've drawn. The colour aura is my personal favourite part of this track art. That's pretty much all there is to say on the matter.
 ---
 Track: Quartet
+Directory: quartet-canmt
+Always Reference By Directory: true
 Artists:
 - Griever
 Cover Artists:
@@ -946,7 +948,7 @@ Referenced Tracks:
 - licord nacrasty
 - Oppa Toby Style
 - Kid Radd Theme
-- track:in-the-beginning-canwc
+- track:in-the-beginning-basement-tale
 Lyrics: |-
     (Wee woo wee woo slep polise.)
 
@@ -1628,6 +1630,8 @@ Commentary: |-
     I can't believe that I had a chance to work on a track art for o's track.
 ---
 Track: Arise
+Directory: arise-canmt
+Always Reference By Directory: true
 Artists:
 - Wights End
 Cover Artists:
@@ -1717,7 +1721,7 @@ Referenced Tracks:
 - Another Jungle
 - Crustacean
 - The Lemonsnout Turnabout
-- track:in-the-beginning-canwc
+- track:in-the-beginning-basement-tale
 - track:unintentional-touhou
 - track:moshi-moshi
 - Even in Death
diff --git a/album/vast-error-vol-1-3.yaml b/album/vast-error-vol-1-3.yaml
index 57d68fd..162f50e 100644
--- a/album/vast-error-vol-1-3.yaml
+++ b/album/vast-error-vol-1-3.yaml
@@ -113,7 +113,7 @@ URLs:
 ---
 Track: Bias
 Directory: bias-vol-1-3
-Originally Released As: Bias
+Originally Released As: track:bias-vast-error
 Cover Artists:
 - Joyfulldreams
 Duration: '03:00'
@@ -159,6 +159,7 @@ URLs:
 - https://vasterror.bandcamp.com/track/starry-night-2
 ---
 Track: Clamor
+Directory: clamor-vast-error
 Cover Artists:
 - Xagave
 Duration: '01:53'
@@ -248,7 +249,7 @@ URLs:
 ---
 Track: Oversaturated
 Directory: oversaturated-vol-1-3
-Originally Released As: Oversaturated
+Originally Released As: track:oversaturated-vast-error
 Cover Artists:
 - razzberrysheep
 Duration: '04:27'
@@ -293,7 +294,7 @@ URLs:
 ---
 Track: Poetic
 Directory: poetic-vol-1-3
-Originally Released As: Poetic
+Originally Released As: track:poetic-vast-error
 Cover Artists:
 - groeuf
 Duration: '02:07'
diff --git a/album/vast-error-vol-2.yaml b/album/vast-error-vol-2.yaml
index e1bb8a4..4202063 100644
--- a/album/vast-error-vol-2.yaml
+++ b/album/vast-error-vol-2.yaml
@@ -71,6 +71,8 @@ URLs:
 - https://vasterror.bandcamp.com/track/terran-wanderer-2
 ---
 Track: Bias
+Directory: bias-vast-error
+Always Reference By Directory: true
 Artists:
 - sympolite
 Cover Artists:
@@ -112,7 +114,7 @@ Artists:
 Cover Artists:
 - Joyfulldreams
 Referenced Tracks:
-- Miserlou
+- track:miserlou
 - Do the Bartman
 Duration: '01:44'
 URLs:
diff --git a/album/vast-error-vol-3.yaml b/album/vast-error-vol-3.yaml
index 3bfa1ed..eea1974 100644
--- a/album/vast-error-vol-3.yaml
+++ b/album/vast-error-vol-3.yaml
@@ -63,6 +63,8 @@ URLs:
 - https://vasterror.bandcamp.com/track/cosmic-significance-2
 ---
 Track: Oversaturated
+Directory: oversaturated-vast-error
+Always Reference By Directory: true
 Artists:
 - pragmaticNihilist
 Cover Artists:
@@ -81,6 +83,8 @@ URLs:
 - https://vasterror.bandcamp.com/track/alone-in-the-rain-2
 ---
 Track: Poetic
+Directory: poetic-vast-error
+Always Reference By Directory: true
 Artists:
 - Wheals
 Cover Artists:
@@ -181,6 +185,8 @@ URLs:
 - https://vasterror.bandcamp.com/track/mother-of-the-stars-2
 ---
 Track: Particle
+Directory: particle-vast-error
+Always Reference By Directory: true
 Artists:
 - Ian Kraemer
 Cover Artists:
@@ -208,6 +214,8 @@ URLs:
 - https://vasterror.bandcamp.com/track/song-for-the-lost-2
 ---
 Track: Time
+Directory: time-vast-error
+Always Reference By Directory: true
 Artists:
 - Ian Kraemer
 Cover Artists:
diff --git a/album/vast-error-vol-4.yaml b/album/vast-error-vol-4.yaml
index eb2f9fd..5f3d7d0 100644
--- a/album/vast-error-vol-4.yaml
+++ b/album/vast-error-vol-4.yaml
@@ -21,6 +21,8 @@ Groups:
 - Fandom
 ---
 Track: Nostalgia
+Directory: nostalgia-vast-error
+Always Reference By Directory: true
 Duration: '2:02'
 Artists:
 - Rachel Rose Mitchell
@@ -39,6 +41,8 @@ URLs:
 - https://vasterror.bandcamp.com/track/road-to-recovery
 ---
 Track: Immortal
+Directory: immortal-vast-error
+Always Reference By Directory: true
 Duration: '3:31'
 Artists:
 - Circlejourney
@@ -71,6 +75,8 @@ URLs:
 - https://vasterror.bandcamp.com/track/radical-statical
 ---
 Track: Predestination
+Directory: predestination-vast-error
+Always Reference By Directory: true
 Duration: '3:16'
 Artists:
 - Cristata
@@ -82,6 +88,8 @@ URLs:
 - https://vasterror.bandcamp.com/track/predestination
 ---
 Track: Corporate
+Directory: corporate-vast-error
+Always Reference By Directory: true
 Duration: '2:54'
 Artists:
 - Whimsy
@@ -210,7 +218,7 @@ Cover Artists:
 Art Tags:
 - 'cw: blood (abstract)'
 Referenced Tracks:
-- Oversaturated
+- track:oversaturated-vast-error
 URLs:
 - https://vasterror.bandcamp.com/track/cheap-boxed-wine
 ---
@@ -325,6 +333,8 @@ Artists:
 - pragmaticNihilist
 Cover Artists:
 - Acyl
+Referenced Tracks:
+- track:oversaturated-vast-error
 URLs:
 - https://vasterror.bandcamp.com/track/oversaturated-elevator-mix
 ---
@@ -387,7 +397,7 @@ Referenced Tracks:
 - Cosmic Significance
 - Moment's Notice
 - Six By Six
-- Oversaturated
+- track:oversaturated-vast-error
 - Solana
 URLs:
 - https://vasterror.bandcamp.com/track/pandora
diff --git a/album/vinculum-vitae.yaml b/album/vinculum-vitae.yaml
index bf80439..da32a5d 100644
--- a/album/vinculum-vitae.yaml
+++ b/album/vinculum-vitae.yaml
@@ -141,6 +141,8 @@ Referenced Tracks:
 - The Ballad of Jack Noir
 ---
 Track: Unification
+Directory: unification-vinculum-vitae
+Always Reference By Directory: true
 Duration: '4:06'
 URLs:
 - https://lordcakespy.bandcamp.com/track/unification
@@ -161,6 +163,8 @@ Referenced Tracks:
 Section: Bonus tracks
 ---
 Track: Entangled
+Directory: entangled-vinculum-vitae
+Always Reference By Directory: true
 Duration: '4:13'
 Referenced Tracks:
 - Serenade
diff --git a/album/virtue.yaml b/album/virtue.yaml
index 7719f00..e085b6b 100644
--- a/album/virtue.yaml
+++ b/album/virtue.yaml
@@ -15,6 +15,8 @@ Groups:
 Cover Art File Extension: jpg
 ---
 Track: Virtue
+Directory: virtue-jamie-paige
+Always Reference By Directory: true
 Duration: '5:42'
 URLs:
 - https://jamiepaige.bandcamp.com/track/virtue-2
diff --git a/album/we-are-all-satellites.yaml b/album/we-are-all-satellites.yaml
index b5d3159..6986953 100644
--- a/album/we-are-all-satellites.yaml
+++ b/album/we-are-all-satellites.yaml
@@ -14,6 +14,8 @@ Groups:
 Listed on Homepage: false
 ---
 Track: Harrigan
+Directory: harrigan-we-are-all-satellites
+Always Reference By Directory: true
 Duration: '4:32'
 URLs:
 - https://clarkpowell.bandcamp.com/track/harrigan
@@ -25,11 +27,15 @@ URLs:
 - https://clarkpowell.bandcamp.com/track/she-needs-to-come-home
 ---
 Track: Mischief
+Directory: mischief-we-are-all-satellites
+Always Reference By Directory: true
 Duration: '3:44'
 URLs:
 - https://clarkpowell.bandcamp.com/track/mischief
 ---
 Track: Miranda
+Directory: miranda-we-are-all-satellites
+Always Reference By Directory: true
 Duration: '3:22'
 URLs:
 - https://clarkpowell.bandcamp.com/track/miranda
@@ -45,6 +51,8 @@ URLs:
 - https://clarkpowell.bandcamp.com/track/a-heaven-broad-and-ochre
 ---
 Track: Lunatic
+Directory: lunatic-we-are-all-satellites
+Always Reference By Directory: true
 Duration: '5:48'
 URLs:
 - https://clarkpowell.bandcamp.com/track/lunatic
diff --git a/album/weird-puzzle-tunes.yaml b/album/weird-puzzle-tunes.yaml
index 0b28c44..e4880d5 100644
--- a/album/weird-puzzle-tunes.yaml
+++ b/album/weird-puzzle-tunes.yaml
@@ -186,6 +186,8 @@ Art Tags:
 - Ace Dick
 ---
 Track: Aggress
+Directory: aggress-weird-puzzle-tunes
+Always Reference By Directory: true
 Artists:
 - WHATISLOSTINTHEMINES
 Duration: '2:46'
@@ -246,7 +248,7 @@ Cover Artists:
 Art Tags:
 - Problem Sleuth
 Referenced Tracks:
-- Aggress
+- track:aggress-weird-puzzle-tunes
 - Battle Against An Imaginary Foe
 - Problem Sleuth Theme
 ---
diff --git a/album/xenoplanetarium.yaml b/album/xenoplanetarium.yaml
index 2c68c79..3ea8797 100644
--- a/album/xenoplanetarium.yaml
+++ b/album/xenoplanetarium.yaml
@@ -232,6 +232,8 @@ Commentary: |-
     I love Terezi, as much as I never draw her... and I also love drawing landscapes! Two dragonmoms with one meteor!
 ---
 Track: Acquiesce
+Directory: acquiesce-xenoplanetarium
+Always Reference By Directory: true
 Artists:
 - psithurist
 Duration: '4:25'
diff --git a/album/yes-we-canwc.yaml b/album/yes-we-canwc.yaml
index ad9fc3b..b8f59bb 100644
--- a/album/yes-we-canwc.yaml
+++ b/album/yes-we-canwc.yaml
@@ -232,7 +232,7 @@ Referenced Tracks:
 - The Star-Spangled Banner
 - track:green-hill-zone
 - America the Beautiful
-- Infinite
+- track:infinite-sonic-forces
 Lyrics: |-
     (Rings)
     (Seven hundred and twenty)
@@ -448,10 +448,10 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/battle-against-a-baby-president
 - https://youtu.be/BalJWUmuW9U
 Referenced Tracks:
-- If
+- track:if-placeboing
 - Penumbra Phantasm
 Sampled Tracks:
-- If
+- track:if-placeboing
 Lyrics: |-
     (if, if, if, if, if)
     (if, if, if, if, if)