Escape integer values, rename Originally Released As

23 files changed, 129 insertions, 238 deletions

diff --git a/album/comfortable-bugs.yaml b/album/comfortable-bugs.yaml
index 255c7529..e5b0c790 100644
--- a/album/comfortable-bugs.yaml
+++ b/album/comfortable-bugs.yaml
@@ -53,7 +53,7 @@ Lyrics: |-
     I'm so glad to have you on a
     Hard Reset
 ---
-Track: 69423
+Track: '69423'
 Duration: '4:03'
 URLs:
 - https://bowman.bandcamp.com/track/69423
diff --git a/album/exceptis-excipiendis.yaml b/album/exceptis-excipiendis.yaml
index 446d1f31..02197b61 100644
--- a/album/exceptis-excipiendis.yaml
+++ b/album/exceptis-excipiendis.yaml
@@ -52,7 +52,7 @@ Lyrics: |-
     A spiral of locusts<br>Rising up out of the elevator shaft<br>Through the metal latticework
     There is no light in me<br>This is not a place where bright young hopefuls go to die<br>Father one day you and I will both find peace<br>In the milk-blind eyes of the music box gods.
 ---
-Track: 97
+Track: '97'
 Contributors:
 - William Leonard (drums)
 Duration: '5:25'
diff --git a/album/hiveswap-act-2-ost.yaml b/album/hiveswap-act-2-ost.yaml
index 133d8334..0d3cb297 100644
--- a/album/hiveswap-act-2-ost.yaml
+++ b/album/hiveswap-act-2-ost.yaml
@@ -71,8 +71,7 @@ URLs:
 - https://youtu.be/S42nK1sihuc
 ---
 Track: Studio Space
-Also Released As:
-- Charun's Cave
+Originally Released As: Charun's Cave
 Artists:
 - Toby Fox
 Duration: '1:02'
@@ -92,8 +91,7 @@ Referenced Tracks:
 - Homestead
 ---
 Track: Homestead
-Also Released As:
-- beekeeper who? i dont know her.
+Originally Released As: beekeeper who? i dont know her.
 Artists:
 - James Roach
 Duration: '1:42'
@@ -102,8 +100,7 @@ URLs:
 - https://youtu.be/xDyuk7rRSVA
 ---
 Track: Shell Game
-Also Released As:
-- SERVICE CAR
+Originally Released As: SERVICE CAR
 Artists:
 - James Roach
 Duration: '4:05'
@@ -220,8 +217,7 @@ Referenced Tracks:
 ---
 Track: Old Secret
 Directory: old-secret-act2
-Also Released As:
-- track:old-secret
+Originally Released As: track:old-secret
 Artists:
 - James Roach
 Duration: '4:26'
diff --git a/album/homestuck-vol-1-4.yaml b/album/homestuck-vol-1-4.yaml
index 5922e0ad..8d901302 100644
--- a/album/homestuck-vol-1-4.yaml
+++ b/album/homestuck-vol-1-4.yaml
@@ -17,8 +17,7 @@ Group: From <i>Homestuck Vol. 1</i>
 ---
 Track: Showtime (Piano Refrain)
 Directory: showtime-piano-refrain-vol-1-4
-Also Released As:
-- track:showtime-piano-refrain
+Originally Released As: track:showtime-piano-refrain
 Artists:
 - Kevin Regamey
 Duration: '2:20'
@@ -30,8 +29,7 @@ Referenced Tracks:
 ---
 Track: Harlequin
 Directory: harlequin-vol-1-4
-Also Released As:
-- track:harlequin
+Originally Released As: track:harlequin
 Artists:
 - Mark Hadley
 Duration: '1:43'
@@ -41,8 +39,7 @@ URLs:
 ---
 Track: Showtime (Original Mix)
 Directory: showtime-original-mix-vol-1-4
-Also Released As:
-- track:showtime-original-mix
+Originally Released As: track:showtime-original-mix
 Artists:
 - Malcolm Brown
 Duration: '2:09'
@@ -52,8 +49,7 @@ URLs:
 ---
 Track: Aggrieve (Violin Refrain)
 Directory: aggrieve-violin-refrain-vol-1-4
-Also Released As:
-- track:aggrieve-violin-refrain
+Originally Released As: track:aggrieve-violin-refrain
 Artists:
 - Andrew Huo
 Contributors:
@@ -67,8 +63,7 @@ Referenced Tracks:
 ---
 Track: Sburban Countdown
 Directory: sburban-countdown-vol-1-4
-Also Released As:
-- track:sburban-countdown
+Originally Released As: track:sburban-countdown
 Artists:
 - Mark Hadley
 Duration: 0:38
@@ -80,8 +75,7 @@ Referenced Tracks:
 ---
 Track: Aggrieve
 Directory: aggrieve-vol-1-4
-Also Released As:
-- track:aggrieve
+Originally Released As: track:aggrieve
 Artists:
 - Mark Hadley
 Duration: '2:32'
@@ -91,8 +85,7 @@ URLs:
 ---
 Track: Showtime (Imp Strife Mix)
 Directory: showtime-imp-strife-mix-vol-1-4
-Also Released As:
-- track:showtime-imp-strife-mix
+Originally Released As: track:showtime-imp-strife-mix
 Artists:
 - Buzinkai
 - Curt Blakeslee (fanfare)
@@ -105,8 +98,7 @@ Referenced Tracks:
 ---
 Track: Nannaquin
 Directory: nannaquin-vol-1-4
-Also Released As:
-- track:nannaquin
+Originally Released As: track:nannaquin
 Artists:
 - Mark Hadley
 Duration: '1:24'
@@ -118,8 +110,7 @@ Referenced Tracks:
 ---
 Track: Skies of Skaia
 Directory: skies-of-skaia-vol-1-4
-Also Released As:
-- track:skies-of-skaia
+Originally Released As: track:skies-of-skaia
 Artists:
 - Mark Hadley
 Duration: '2:45'
@@ -131,8 +122,7 @@ Group: From <i>Homestuck Vol. 2</i>
 ---
 Track: Harlequin (Rock Version)
 Directory: harlequin-rock-version-vol-1-4
-Also Released As:
-- track:harlequin-rock-version
+Originally Released As: track:harlequin-rock-version
 Artists:
 - Michael Guy Bowman
 - Joseph Aylsworth
@@ -158,8 +148,7 @@ Referenced Tracks:
 ---
 Track: Upward Movement (Dave Owns)
 Directory: upward-movement-dave-owns-vol-1-4
-Also Released As:
-- track:upward-movement-dave-owns
+Originally Released As: track:upward-movement-dave-owns
 Artists:
 - Kalibration
 Duration: '4:20'
@@ -171,8 +160,7 @@ Referenced Tracks:
 ---
 Track: Vagabounce
 Directory: vagabounce-vol-1-4
-Also Released As:
-- track:vagabounce
+Originally Released As: track:vagabounce
 Artists:
 - David Ko
 Duration: '1:13'
@@ -182,8 +170,7 @@ URLs:
 ---
 Track: Explore
 Directory: explore-vol-1-4
-Also Released As:
-- track:explore
+Originally Released As: track:explore
 Artists:
 - Buzinkai
 - Michael Guy Bowman
@@ -211,8 +198,7 @@ Commentary: |-
 ---
 Track: Showtime Remix
 Directory: showtime-remix-vol-1-4
-Also Released As:
-- track:showtime-remix
+Originally Released As: track:showtime-remix
 Artists:
 - Gabe Nezovic
 Duration: '2:02'
@@ -226,8 +212,7 @@ Sampled Tracks:
 ---
 Track: Aggrieve Remix
 Directory: aggrieve-remix-vol-1-4
-Also Released As:
-- track:aggrieve-remix
+Originally Released As: track:aggrieve-remix
 Artists:
 - Gabe Nezovic
 Duration: '2:11'
@@ -241,8 +226,7 @@ Sampled Tracks:
 ---
 Track: Verdancy (Bassline)
 Directory: verdancy-bassline-vol-1-4
-Also Released As:
-- track:verdancy-bassline
+Originally Released As: track:verdancy-bassline
 Artists:
 - Kalibration
 Duration: 0:52
@@ -266,8 +250,7 @@ Group: From <i>Homestuck Vol. 3</i>
 ---
 Track: Beatdown (Strider Style)
 Directory: beatdown-strider-style-vol-1-4
-Also Released As:
-- track:beatdown-strider-style
+Originally Released As: track:beatdown-strider-style
 Artists:
 - Curt Blakeslee
 Duration: '2:32'
@@ -277,8 +260,7 @@ URLs:
 ---
 Track: Harleboss
 Directory: harleboss-vol-1-4
-Also Released As:
-- track:harleboss
+Originally Released As: track:harleboss
 Artists:
 - Malcolm Brown
 Duration: '2:47'
@@ -290,8 +272,7 @@ Referenced Tracks:
 ---
 Track: Beatdown Round 2
 Directory: beatdown-round-2-vol-1-4
-Also Released As:
-- track:beatdown-round-2
+Originally Released As: track:beatdown-round-2
 Artists:
 - Curt Blakeslee
 Duration: '2:27'
@@ -303,8 +284,7 @@ Referenced Tracks:
 ---
 Track: Dissension (Original)
 Directory: dissension-original-vol-1-4
-Also Released As:
-- track:dissension-original
+Originally Released As: track:dissension-original
 Artists:
 - David Ko
 Duration: '1:47'
@@ -314,8 +294,7 @@ URLs:
 ---
 Track: Dissension (Remix)
 Directory: dissension-remix-vol-1-4
-Also Released As:
-- track:dissension-remix
+Originally Released As: track:dissension-remix
 Artists:
 - David Ko
 Duration: '2:03'
@@ -327,8 +306,7 @@ Referenced Tracks:
 ---
 Track: Ohgodwhat
 Directory: ohgodwhat-vol-1-4
-Also Released As:
-- track:ohgodwhat
+Originally Released As: track:ohgodwhat
 Artists:
 - Nick Smalley
 Duration: '1:06'
@@ -338,8 +316,7 @@ URLs:
 ---
 Track: Ohgodwhat Remix
 Directory: ohgodwhat-remix-vol-1-4
-Also Released As:
-- track:ohgodwhat-remix
+Originally Released As: track:ohgodwhat-remix
 Artists:
 - Michael Guy Bowman
 Duration: '1:05'
@@ -351,8 +328,7 @@ Referenced Tracks:
 ---
 Track: Rediscover Fusion
 Directory: rediscover-fusion-vol-1-4
-Also Released As:
-- track:rediscover-fusion
+Originally Released As: track:rediscover-fusion
 Artists:
 - BurnedKirby
 Duration: '1:36'
@@ -362,8 +338,7 @@ URLs:
 ---
 Track: Explore Remix
 Directory: explore-remix-vol-1-4
-Also Released As:
-- track:explore-remix
+Originally Released As: track:explore-remix
 Artists:
 - Gabe Nezovic
 Duration: '2:00'
@@ -377,8 +352,7 @@ Sampled Tracks:
 ---
 Track: Chorale for Jaspers
 Directory: chorale-for-jaspers-vol-1-4
-Also Released As:
-- track:chorale-for-jaspers
+Originally Released As: track:chorale-for-jaspers
 Artists:
 - Michael Guy Bowman
 Duration: '1:15'
@@ -388,8 +362,7 @@ URLs:
 ---
 Track: Pony Chorale
 Directory: pony-chorale-vol-1-4
-Also Released As:
-- track:pony-chorale
+Originally Released As: track:pony-chorale
 Artists:
 - Michael Guy Bowman
 Contributors:
@@ -405,8 +378,7 @@ Group: From <i>Homestuck Vol. 4</i>
 ---
 Track: Revelawesome
 Directory: revelawesome-vol-1-4
-Also Released As:
-- track:revelawesome
+Originally Released As: track:revelawesome
 Artists:
 - Malcolm Brown
 Duration: 0:43
@@ -416,8 +388,7 @@ URLs:
 ---
 Track: Hardlyquin
 Directory: hardlyquin-vol-1-4
-Also Released As:
-- track:hardlyquin
+Originally Released As: track:hardlyquin
 Artists:
 - Mark Hadley
 Duration: '1:38'
@@ -429,8 +400,7 @@ Referenced Tracks:
 ---
 Track: Carefree Victory
 Directory: carefree-victory-vol-1-4
-Also Released As:
-- track:carefree-victory
+Originally Released As: track:carefree-victory
 Artists:
 - Andrew Huo
 - Toby Fox
@@ -443,8 +413,7 @@ Referenced Tracks:
 ---
 Track: Ballad of Awakening
 Directory: ballad-of-awakening-vol-1-4
-Also Released As:
-- track:ballad-of-awakening
+Originally Released As: track:ballad-of-awakening
 Artists:
 - Malcolm Brown
 Duration: '3:08'
@@ -454,8 +423,7 @@ URLs:
 ---
 Track: Sburban Jungle
 Directory: sburban-jungle-vol-1-4
-Also Released As:
-- track:sburban-jungle
+Originally Released As: track:sburban-jungle
 Artists:
 - Michael Guy Bowman
 Duration: '3:39'
@@ -465,8 +433,7 @@ URLs:
 ---
 Track: Three in the Morning (RJ's I Can Barely Sleep In This Casino Remix)
 Directory: three-in-the-morning-rj-vol-1-4
-Also Released As:
-- track:three-in-the-morning-rj
+Originally Released As: track:three-in-the-morning-rj
 Artists:
 - Robert J! Lake
 Duration: '6:29'
@@ -480,8 +447,7 @@ Sampled Tracks:
 ---
 Track: Doctor
 Directory: doctor-vol-1-4
-Also Released As:
-- track:doctor
+Originally Released As: track:doctor
 Artists:
 - Buzinkai
 Contributors:
@@ -496,8 +462,7 @@ Referenced Tracks:
 ---
 Track: Endless Climb
 Directory: endless-climb-vol-1-4
-Also Released As:
-- track:endless-climb
+Originally Released As: track:endless-climb
 Artists:
 - Buzinkai
 Duration: '1:24'
@@ -507,8 +472,7 @@ URLs:
 ---
 Track: Atomyk Ebonpyre
 Directory: atomyk-ebonpyre-vol-1-4
-Also Released As:
-- track:atomyk-ebonpyre
+Originally Released As: track:atomyk-ebonpyre
 Artists:
 - Toby Fox
 Duration: '1:10'
@@ -518,8 +482,7 @@ URLs:
 ---
 Track: Black
 Directory: black-vol-1-4
-Also Released As:
-- track:black
+Originally Released As: track:black
 Artists:
 - Toby Fox
 Duration: '2:24'
diff --git a/album/inhospitable-delisted.yaml b/album/inhospitable-delisted.yaml
index 3dc976a1..704462da 100644
--- a/album/inhospitable-delisted.yaml
+++ b/album/inhospitable-delisted.yaml
@@ -22,8 +22,7 @@ Commentary: |-
     Dedicated to those who helped make the original release a reality. May you find success in any walk of life you choose to take from here. Should you find yourself looking back on this experience, fondly or otherwise, I hope you can at least be proud of how far you've come since this humble project.
 ---
 Track: INHOSPITABLE (Old Title)
-Also Released As:
-- Main Theme - INHOSPITABLE
+Originally Released As: Main Theme - INHOSPITABLE
 Date First Released: November 28, 2017
 Duration: 0:59
 URLs:
diff --git a/album/lofam3.yaml b/album/lofam3.yaml
index c442ef32..53c38687 100644
--- a/album/lofam3.yaml
+++ b/album/lofam3.yaml
@@ -275,7 +275,7 @@ Commentary: |-
     <i><b>Veritas Unae:</b></i>
     no, but really, SOO GOOOOD
 ---
-Track: 720413
+Track: '720413'
 Artists:
 - Lark Mordancy
 Duration: '3:18'
@@ -295,7 +295,7 @@ Art Tags:
 - Jake
 Referenced Tracks:
 - track:sburban-jungle
-- 69423
+- '69423'
 Commentary: |-
     <i>Lark Mordancy:</i>
     Sburban Jungle has been stuck in my head since the moment I first heard it in Homestuck, and the rest of Michael Guy Bowman's work is equally memorable. For this piece, I chose to mix Sburban Jungle with 69423 from his album Comfortable Bugs. As for the title, well, I'm thinking of a number between 450 and 850...
diff --git a/album/lofam5.yaml b/album/lofam5.yaml
index 55fe4322..82f1465b 100644
--- a/album/lofam5.yaml
+++ b/album/lofam5.yaml
@@ -218,8 +218,7 @@ Commentary: |-
 ---
 Track: Alpha Admission
 Directory: alpha-admission-lofam5
-Also Released As:
-- track:alpha-admission
+Originally Released As: track:alpha-admission
 Artists:
 - Pascal van den Bos
 Duration: '3:47'
diff --git a/album/midnight-crew-drawing-dead.yaml b/album/midnight-crew-drawing-dead.yaml
index d469b510..0f755f72 100644
--- a/album/midnight-crew-drawing-dead.yaml
+++ b/album/midnight-crew-drawing-dead.yaml
@@ -206,8 +206,7 @@ Sampled Tracks:
 ---
 Track: Nightlife (Extended)
 Directory: nightlife-extended-mc-dd
-Also Released As:
-- track:nightlife-extended
+Originally Released As: track:nightlife-extended
 Artists:
 - Bill Bolin
 Duration: '2:34'
diff --git a/album/nuclears-explosion-1.yaml b/album/nuclears-explosion-1.yaml
index aa9ba18d..dd90de11 100644
--- a/album/nuclears-explosion-1.yaml
+++ b/album/nuclears-explosion-1.yaml
@@ -38,8 +38,7 @@ URLs:
 ---
 Track: Phantasmic Foe
 Directory: phantasmic-foe-nuclears-explosion
-Also Released As:
-- track:phantasmic-foe
+Originally Released As: track:phantasmic-foe
 Duration: '1:18'
 URLs:
 - https://nuclear333.bandcamp.com/track/phantasmic-foe
@@ -74,8 +73,7 @@ URLs:
 ---
 Track: Defuse a Bomb
 Directory: defuse-a-bomb-nuclears-explosion
-Also Released As:
-- track:defuse-a-bomb
+Originally Released As: track:defuse-a-bomb
 Duration: '1:22'
 URLs:
 - https://nuclear333.bandcamp.com/track/defuse-a-bomb
@@ -193,8 +191,7 @@ Commentary: |-
 ---
 Track: The Point of Going Home
 Directory: the-point-of-going-home-nuclears-explosion
-Also Released As:
-- track:the-point-of-going-home
+Originally Released As: track:the-point-of-going-home
 Duration: '1:23'
 URLs:
 - https://nuclear333.bandcamp.com/track/the-point-of-going-home
diff --git a/album/psycholonials-ep-1.yaml b/album/psycholonials-ep-1.yaml
index 7131a2fe..0adc631a 100644
--- a/album/psycholonials-ep-1.yaml
+++ b/album/psycholonials-ep-1.yaml
@@ -20,15 +20,13 @@ Wallpaper Artists:
 Listed on Homepage: false
 ---
 Track: Summer That Never Was
-Also Released As:
-- Star I Never Caught
+Originally Released As: Star I Never Caught
 Duration: '3:50'
 URLs:
 - https://psycholonials.bandcamp.com/track/summer-that-never-was
 ---
 Track: Morning Ritual
-Also Released As:
-- Puzzle I Never Solved
+Originally Released As: Puzzle I Never Solved
 Duration: '2:47'
 URLs:
 - https://psycholonials.bandcamp.com/track/morning-ritual
diff --git a/album/psycholonials-ep-2.yaml b/album/psycholonials-ep-2.yaml
index 3ccd2c30..c5a18ea2 100644
--- a/album/psycholonials-ep-2.yaml
+++ b/album/psycholonials-ep-2.yaml
@@ -20,36 +20,31 @@ Wallpaper Artists:
 Listed on Homepage: false
 ---
 Track: The Cold Hand
-Also Released As:
-- Sigh I Never Breathed
+Originally Released As: Sigh I Never Breathed
 Duration: '2:21'
 URLs:
 - https://psycholonials.bandcamp.com/track/the-cold-hand
 ---
 Track: Together
-Also Released As:
-- Day That Never Came
+Originally Released As: Day That Never Came
 Duration: '2:04'
 URLs:
 - https://psycholonials.bandcamp.com/track/together
 ---
 Track: The Influencer
-Also Released As:
-- Woman I Never Met
+Originally Released As: Woman I Never Met
 Duration: '2:26'
 URLs:
 - https://psycholonials.bandcamp.com/track/the-influencer
 ---
 Track: Just Dreams
-Also Released As:
-- People I Never Knew
+Originally Released As: People I Never Knew
 Duration: '3:10'
 URLs:
 - https://psycholonials.bandcamp.com/track/just-dreams
 ---
 Track: I Have Some Ideas
-Also Released As:
-- All but Alone
+Originally Released As: All but Alone
 Duration: '4:10'
 URLs:
 - https://psycholonials.bandcamp.com/track/i-have-some-ideas
diff --git a/album/psycholonials-ep-3.yaml b/album/psycholonials-ep-3.yaml
index 48c3d298..61cbbd6a 100644
--- a/album/psycholonials-ep-3.yaml
+++ b/album/psycholonials-ep-3.yaml
@@ -20,22 +20,19 @@ Wallpaper Artists:
 Listed on Homepage: false
 ---
 Track: Time Is Helpless
-Also Released As:
-- track:requiem-labyrinths-heart
+Originally Released As: track:requiem-labyrinths-heart
 Duration: '4:36'
 URLs:
 - https://psycholonials.bandcamp.com/track/time-is-helpless
 ---
 Track: Through The Play
-Also Released As:
-- Pleas
+Originally Released As: Pleas
 Duration: '3:13'
 URLs:
 - https://psycholonials.bandcamp.com/track/through-the-play
 ---
 Track: Just Almost
-Also Released As:
-- Song I Never Played
+Originally Released As: Song I Never Played
 Duration: '1:37'
 URLs:
 - https://psycholonials.bandcamp.com/track/just-almost
diff --git a/album/psycholonials-ep-4.yaml b/album/psycholonials-ep-4.yaml
index 4f9a0be7..32c996dc 100644
--- a/album/psycholonials-ep-4.yaml
+++ b/album/psycholonials-ep-4.yaml
@@ -20,15 +20,13 @@ Wallpaper Artists:
 Listed on Homepage: false
 ---
 Track: Outlaw
-Also Released As:
-- Pencil Holder (demo version)
+Originally Released As: Pencil Holder (demo version)
 Duration: '3:57'
 URLs:
 - https://psycholonials.bandcamp.com/track/outlaw
 ---
 Track: A Screaming Inside
-Also Released As:
-- Dante
+Originally Released As: Dante
 Duration: '2:14'
 URLs:
 - https://psycholonials.bandcamp.com/track/a-screaming-inside
@@ -39,8 +37,7 @@ URLs:
 - https://psycholonials.bandcamp.com/track/breakthroughs
 ---
 Track: Nervous Energy
-Also Released As:
-- A Romance of Protons and Neutrons
+Originally Released As: A Romance of Protons and Neutrons
 Duration: '4:28'
 URLs:
 - https://psycholonials.bandcamp.com/track/nervous-energy
diff --git a/album/psycholonials-ep-5.yaml b/album/psycholonials-ep-5.yaml
index ccbeeb97..b2e3ef2f 100644
--- a/album/psycholonials-ep-5.yaml
+++ b/album/psycholonials-ep-5.yaml
@@ -25,15 +25,13 @@ URLs:
 - https://psycholonials.bandcamp.com/track/in-the-works
 ---
 Track: Ephemeral Muse
-Also Released As:
-- Harrigan
+Originally Released As: Harrigan
 Duration: '4:46'
 URLs:
 - https://psycholonials.bandcamp.com/track/ephemeral-muse
 ---
 Track: Blood On Their Hands
-Also Released As:
-- Dusk for the Age of Miracles
+Originally Released As: Dusk for the Age of Miracles
 Duration: '2:46'
 URLs:
 - https://psycholonials.bandcamp.com/track/blood-on-their-hands
diff --git a/album/psycholonials-ep-6.yaml b/album/psycholonials-ep-6.yaml
index 266a0f4a..aa8b7705 100644
--- a/album/psycholonials-ep-6.yaml
+++ b/album/psycholonials-ep-6.yaml
@@ -20,15 +20,13 @@ Wallpaper Artists:
 Listed on Homepage: false
 ---
 Track: The Administrator
-Also Released As:
-- Cruel Ulysses
+Originally Released As: Cruel Ulysses
 Duration: '2:21'
 URLs:
 - https://psycholonials.bandcamp.com/track/the-administrator
 ---
 Track: Means Of Conquest
-Also Released As:
-- Country I Never Saw
+Originally Released As: Country I Never Saw
 Duration: '3:55'
 URLs:
 - https://psycholonials.bandcamp.com/track/means-of-conquest
diff --git a/album/psycholonials-ep-7.yaml b/album/psycholonials-ep-7.yaml
index 11f1137e..7697e0c6 100644
--- a/album/psycholonials-ep-7.yaml
+++ b/album/psycholonials-ep-7.yaml
@@ -27,8 +27,7 @@ Referenced Tracks:
 - Voice I Never Heard
 ---
 Track: Such A Shame
-Also Released As:
-- Miranda
+Originally Released As: Miranda
 Duration: '3:25'
 URLs:
 - https://psycholonials.bandcamp.com/track/such-a-shame
diff --git a/album/psycholonials-ep-8.yaml b/album/psycholonials-ep-8.yaml
index 271df34f..1dfed837 100644
--- a/album/psycholonials-ep-8.yaml
+++ b/album/psycholonials-ep-8.yaml
@@ -20,15 +20,13 @@ Wallpaper Artists:
 Listed on Homepage: false
 ---
 Track: In The Loop
-Also Released As:
-- the Chillest Beat
+Originally Released As: the Chillest Beat
 Duration: '2:38'
 URLs:
 - https://psycholonials.bandcamp.com/track/in-the-loop
 ---
 Track: 'Flare: Insurrection Remix'
-Also Released As:
-- Flare (Green Sun Remix)
+Originally Released As: Flare (Green Sun Remix)
 Duration: '4:08'
 URLs:
 - https://psycholonials.bandcamp.com/track/flare-insurrection-remix
diff --git a/album/psycholonials-ep-9.yaml b/album/psycholonials-ep-9.yaml
index 712cab1e..30465b74 100644
--- a/album/psycholonials-ep-9.yaml
+++ b/album/psycholonials-ep-9.yaml
@@ -37,8 +37,7 @@ URLs:
 - https://psycholonials.bandcamp.com/track/threshold
 ---
 Track: We Were Right About Everything
-Also Released As:
-- Lunatic
+Originally Released As: Lunatic
 Duration: '5:51'
 URLs:
 - https://psycholonials.bandcamp.com/track/we-were-right-about-everything
@@ -54,8 +53,7 @@ URLs:
 - https://psycholonials.bandcamp.com/track/zhen
 ---
 Track: The Successor
-Also Released As:
-- Forgotten
+Originally Released As: Forgotten
 Duration: '4:22'
 URLs:
 - https://psycholonials.bandcamp.com/track/the-successor
diff --git a/album/psycholonials.yaml b/album/psycholonials.yaml
index 914d490b..b8387e56 100644
--- a/album/psycholonials.yaml
+++ b/album/psycholonials.yaml
@@ -24,24 +24,21 @@ Group: From <i>EP 1</i>
 ---
 Track: Summer That Never Was
 Directory: summer-that-never-was-ost
-Also Released As:
-- Star I Never Caught
+Originally Released As: Star I Never Caught
 Duration: '3:50'
 URLs:
 - https://psycholonials.bandcamp.com/track/summer-that-never-was-2
 ---
 Track: Morning Ritual
 Directory: morning-ritual-ost
-Also Released As:
-- Puzzle I Never Solved
+Originally Released As: Puzzle I Never Solved
 Duration: '2:47'
 URLs:
 - https://psycholonials.bandcamp.com/track/morning-ritual-2
 ---
 Track: What's Wasting Me
 Directory: whats-wasting-me-ost
-Also Released As:
-- track:whats-wasting-me
+Originally Released As: track:whats-wasting-me
 Duration: '2:35'
 URLs:
 - https://psycholonials.bandcamp.com/track/whats-wasting-me-2
@@ -50,40 +47,35 @@ Group: From <i>EP 2</i>
 ---
 Track: The Cold Hand
 Directory: the-cold-hand-ost
-Also Released As:
-- Sigh I Never Breathed
+Originally Released As: Sigh I Never Breathed
 Duration: '2:21'
 URLs:
 - https://psycholonials.bandcamp.com/track/the-cold-hand-2
 ---
 Track: Together
 Directory: together-ost
-Also Released As:
-- Day That Never Came
+Originally Released As: Day That Never Came
 Duration: '2:04'
 URLs:
 - https://psycholonials.bandcamp.com/track/together-2
 ---
 Track: The Influencer
 Directory: the-influencer-ost
-Also Released As:
-- Woman I Never Met
+Originally Released As: Woman I Never Met
 Duration: '2:26'
 URLs:
 - https://psycholonials.bandcamp.com/track/the-influencer-2
 ---
 Track: Just Dreams
 Directory: just-dreams-ost
-Also Released As:
-- People I Never Knew
+Originally Released As: People I Never Knew
 Duration: '3:10'
 URLs:
 - https://psycholonials.bandcamp.com/track/just-dreams-2
 ---
 Track: I Have Some Ideas
 Directory: i-have-some-ideas-ost
-Also Released As:
-- All but Alone
+Originally Released As: All but Alone
 Duration: '4:10'
 URLs:
 - https://psycholonials.bandcamp.com/track/i-have-some-ideas-2
@@ -92,24 +84,21 @@ Group: From <i>EP 3</i>
 ---
 Track: Time Is Helpless
 Directory: time-is-helpless-ost
-Also Released As:
-- track:requiem-labyrinths-heart
+Originally Released As: track:requiem-labyrinths-heart
 Duration: '4:36'
 URLs:
 - https://psycholonials.bandcamp.com/track/time-is-helpless-2
 ---
 Track: Through The Play
 Directory: through-the-play-ost
-Also Released As:
-- Pleas
+Originally Released As: Pleas
 Duration: '3:13'
 URLs:
 - https://psycholonials.bandcamp.com/track/through-the-play-2
 ---
 Track: Just Almost
 Directory: just-almost-ost
-Also Released As:
-- Song I Never Played
+Originally Released As: Song I Never Played
 Duration: '1:37'
 URLs:
 - https://psycholonials.bandcamp.com/track/just-almost-2
@@ -118,40 +107,35 @@ Group: From <i>EP 4</i>
 ---
 Track: Outlaw
 Directory: outlaw-ost
-Also Released As:
-- Pencil Holder (demo version)
+Originally Released As: Pencil Holder (demo version)
 Duration: '3:57'
 URLs:
 - https://psycholonials.bandcamp.com/track/outlaw-2
 ---
 Track: A Screaming Inside
 Directory: a-screaming-inside-ost
-Also Released As:
-- Dante
+Originally Released As: Dante
 Duration: '2:14'
 URLs:
 - https://psycholonials.bandcamp.com/track/a-screaming-inside-2
 ---
 Track: Breakthroughs
 Directory: breakthroughs-ost
-Also Released As:
-- track:breakthroughs
+Originally Released As: track:breakthroughs
 Duration: '2:14'
 URLs:
 - https://psycholonials.bandcamp.com/track/breakthroughs-2
 ---
 Track: Nervous Energy
 Directory: nervous-energy-ost
-Also Released As:
-- A Romance of Protons and Neutrons
+Originally Released As: A Romance of Protons and Neutrons
 Duration: '4:28'
 URLs:
 - https://psycholonials.bandcamp.com/track/nervous-energy-2
 ---
 Track: Now And Forever
 Directory: now-and-forever-ost
-Also Released As:
-- track:now-and-forever
+Originally Released As: track:now-and-forever
 Duration: '3:59'
 URLs:
 - https://psycholonials.bandcamp.com/track/now-and-forever-2
@@ -160,24 +144,21 @@ Group: From <i>EP 5</i>
 ---
 Track: In The Works
 Directory: in-the-works-ost
-Also Released As:
-- track:in-the-works
+Originally Released As: track:in-the-works
 Duration: '4:22'
 URLs:
 - https://psycholonials.bandcamp.com/track/in-the-works-2
 ---
 Track: Ephemeral Muse
 Directory: ephemeral-muse-ost
-Also Released As:
-- Harrigan
+Originally Released As: Harrigan
 Duration: '4:46'
 URLs:
 - https://psycholonials.bandcamp.com/track/ephemeral-muse-2
 ---
 Track: Blood On Their Hands
 Directory: blood-on-their-hands-ost
-Also Released As:
-- Dusk for the Age of Miracles
+Originally Released As: Dusk for the Age of Miracles
 Duration: '2:46'
 URLs:
 - https://psycholonials.bandcamp.com/track/blood-on-their-hands-2
@@ -186,24 +167,21 @@ Group: From <i>EP 6</i>
 ---
 Track: The Administrator
 Directory: the-administrator-ost
-Also Released As:
-- Cruel Ulysses
+Originally Released As: Cruel Ulysses
 Duration: '2:21'
 URLs:
 - https://psycholonials.bandcamp.com/track/the-administrator-2
 ---
 Track: Means Of Conquest
 Directory: means-of-conquest-ost
-Also Released As:
-- Country I Never Saw
+Originally Released As: Country I Never Saw
 Duration: '3:55'
 URLs:
 - https://psycholonials.bandcamp.com/track/means-of-conquest-2
 ---
 Track: Twelve Clown Salute
 Directory: twelve-clown-salute-ost
-Also Released As:
-- track:twelve-clown-salute
+Originally Released As: track:twelve-clown-salute
 Duration: '2:19'
 URLs:
 - https://psycholonials.bandcamp.com/track/twelve-clown-salute-2
@@ -212,8 +190,7 @@ Group: From <i>EP 7</i>
 ---
 Track: The March
 Directory: the-march-ost
-Also Released As:
-- track:the-march
+Originally Released As: track:the-march
 Duration: '2:46'
 URLs:
 - https://psycholonials.bandcamp.com/track/the-march-2
@@ -222,16 +199,14 @@ Referenced Tracks:
 ---
 Track: Such A Shame
 Directory: such-a-shame-ost
-Also Released As:
-- Miranda
+Originally Released As: Miranda
 Duration: '3:25'
 URLs:
 - https://psycholonials.bandcamp.com/track/such-a-shame-2
 ---
 Track: Break This
 Directory: break-this-ost
-Also Released As:
-- track:break-this
+Originally Released As: track:break-this
 Duration: '1:21'
 URLs:
 - https://psycholonials.bandcamp.com/track/break-this-2
@@ -240,24 +215,21 @@ Group: From <i>EP 8</i>
 ---
 Track: In The Loop
 Directory: in-the-loop-ost
-Also Released As:
-- the Chillest Beat
+Originally Released As: the Chillest Beat
 Duration: '2:38'
 URLs:
 - https://psycholonials.bandcamp.com/track/in-the-loop-2
 ---
 Track: 'Flare: Insurrection Remix'
 Directory: flare-insurrection-remix-ost
-Also Released As:
-- Flare (Green Sun Remix)
+Originally Released As: Flare (Green Sun Remix)
 Duration: '4:08'
 URLs:
 - https://psycholonials.bandcamp.com/track/flare-insurrection-remix-2
 ---
 Track: 'Summer That Never Was: Firebrand Remix'
 Directory: summer-that-never-was-firebrand-remix-ost
-Also Released As:
-- track:summer-that-never-was-firebrand-remix
+Originally Released As: track:summer-that-never-was-firebrand-remix
 Duration: '3:55'
 URLs:
 - https://psycholonials.bandcamp.com/track/summer-that-never-was-firebrand-remix-2
@@ -266,16 +238,14 @@ Group: From <i>EP 9</i>
 ---
 Track: Fix This
 Directory: fix-this-ost
-Also Released As:
-- track:fix-this
+Originally Released As: track:fix-this
 Duration: '1:54'
 URLs:
 - https://psycholonials.bandcamp.com/track/fix-this-2
 ---
 Track: Edge Of Dawn
 Directory: edge-of-dawn-ost
-Also Released As:
-- track:edge-of-dawn
+Originally Released As: track:edge-of-dawn
 Duration: '4:33'
 URLs:
 - https://psycholonials.bandcamp.com/track/edge-of-dawn-2
@@ -284,48 +254,42 @@ Referenced Tracks:
 ---
 Track: Threshold
 Directory: threshold-ost
-Also Released As:
-- track:threshold
+Originally Released As: track:threshold
 Duration: '1:47'
 URLs:
 - https://psycholonials.bandcamp.com/track/threshold-2
 ---
 Track: We Were Right About Everything
 Directory: we-were-right-about-everything-ost
-Also Released As:
-- Lunatic
+Originally Released As: Lunatic
 Duration: '5:51'
 URLs:
 - https://psycholonials.bandcamp.com/track/we-were-right-about-everything-2
 ---
 Track: Feeling I Can't Shake
 Directory: feeling-i-cant-shake-ost
-Also Released As:
-- track:feeling-i-cant-shake
+Originally Released As: track:feeling-i-cant-shake
 Duration: '2:26'
 URLs:
 - https://psycholonials.bandcamp.com/track/feeling-i-cant-shake-2
 ---
 Track: Zhen
 Directory: zhen-ost
-Also Released As:
-- track:zhen
+Originally Released As: track:zhen
 Duration: '2:42'
 URLs:
 - https://psycholonials.bandcamp.com/track/zhen-2
 ---
 Track: The Successor
 Directory: the-successor-ost
-Also Released As:
-- Forgotten
+Originally Released As: Forgotten
 Duration: '4:22'
 URLs:
 - https://psycholonials.bandcamp.com/track/the-successor-2
 ---
 Track: Love Song
 Directory: love-song-ost
-Also Released As:
-- track:love-song
+Originally Released As: track:love-song
 Duration: '3:54'
 URLs:
 - https://psycholonials.bandcamp.com/track/love-song-2
@@ -341,8 +305,7 @@ Referenced Tracks:
 Group: Bonus tracks
 ---
 Track: 'Together: Vocal Remix'
-Also Released As:
-- Someday
+Originally Released As: Someday
 Artists:
 - Clark Powell
 - Astro Kid
diff --git a/album/rust-apocalypse.yaml b/album/rust-apocalypse.yaml
index d12558d7..aead04db 100644
--- a/album/rust-apocalypse.yaml
+++ b/album/rust-apocalypse.yaml
@@ -65,22 +65,19 @@ Referenced Tracks:
 Group: Bonus tracks
 ---
 Track: Rust Servant (original)
-Also Released As:
-- Rust Servant
+Originally Released As: Rust Servant
 Duration: '4:48'
 URLs:
 - https://wellmanicuredmusic.bandcamp.com/track/rust-servant-original
 ---
 Track: Teal Hunter (original)
-Also Released As:
-- Teal Hunter
+Originally Released As: Teal Hunter
 Duration: '2:31'
 URLs:
 - https://wellmanicuredmusic.bandcamp.com/track/teal-hunter-original
 ---
 Track: Violet Mariner (original)
-Also Released As:
-- Violet Mariner
+Originally Released As: Violet Mariner
 Duration: '2:45'
 URLs:
 - https://wellmanicuredmusic.bandcamp.com/track/violet-mariner-original
diff --git a/album/shortcuts.yaml b/album/shortcuts.yaml
index 7d501f24..03085574 100644
--- a/album/shortcuts.yaml
+++ b/album/shortcuts.yaml
@@ -34,7 +34,7 @@ Commentary: |-
     <i>Marcy Nabors:</i>
     Ashburn is your quintessential D.C. suburb. Quiet save for birds, barking dogs, and the subtle but constant drone of faraway highway noise, it’s a beautiful and peaceful place to live. Unfortunately, life in Ashburn can get a bit dull after high school: Friends leave for college and there’s no easy public transportation to the hour-away city, so there’s not much to do outside the house except take walks through the scenic woods and hillsides. If you’re not the outdoorsy type (and especially if you work from home), a reclusive life can be easy to fall into. With this song I intend to convey the strange dichotomy between the semi-natural beauty of Ashburn’s ample wooded landscape and carefully maintained lawns, and the ever-present plasticity that permeates both the town and my necessarily internet-centric lifestyle.
 ---
-Track: 14121
+Track: '14121'
 Artists:
 - Catboss
 Duration: '4:16'
diff --git a/album/unreleased-tracks.yaml b/album/unreleased-tracks.yaml
index 1f7f7c1f..a8c4be5f 100644
--- a/album/unreleased-tracks.yaml
+++ b/album/unreleased-tracks.yaml
@@ -24,7 +24,7 @@ Duration: '1:00'
 URLs:
 - https://www.youtube.com/watch?v=CSMMmOtRLiU
 ---
-Track: 1
+Track: '01'
 Directory: phat1
 Artists:
 - Andrew Hussie
@@ -32,7 +32,7 @@ Duration: 0:28
 URLs:
 - https://youtu.be/S4x2-mkXgGI?t=6
 ---
-Track: 2
+Track: '02'
 Directory: phat2
 Artists:
 - Andrew Hussie
@@ -40,7 +40,7 @@ Duration: 0:28
 URLs:
 - https://youtu.be/S4x2-mkXgGI?t=16
 ---
-Track: 3
+Track: '03'
 Directory: phat3
 Artists:
 - Gabe Nezovic
@@ -48,7 +48,7 @@ Duration: 0:28
 URLs:
 - https://youtu.be/S4x2-mkXgGI?t=29
 ---
-Track: 4
+Track: '04'
 Directory: phat4
 Artists:
 - Gabe Nezovic
@@ -56,7 +56,7 @@ Duration: 0:28
 URLs:
 - https://youtu.be/S4x2-mkXgGI?t=40
 ---
-Track: 5
+Track: '05'
 Directory: phat5
 Artists:
 - Gabe Nezovic
@@ -64,7 +64,7 @@ Duration: 0:28
 URLs:
 - https://youtu.be/S4x2-mkXgGI?t=50
 ---
-Track: 6
+Track: '06'
 Directory: phat6
 Artists:
 - Robert J! Lake
@@ -72,7 +72,7 @@ Duration: 0:28
 URLs:
 - https://youtu.be/S4x2-mkXgGI?t=63
 ---
-Track: 7
+Track: '07'
 Directory: phat7
 Artists:
 - Robert J! Lake
@@ -96,7 +96,7 @@ Duration: 0:28
 URLs:
 - https://youtu.be/S4x2-mkXgGI?t=90
 ---
-Track: 10
+Track: '10'
 Directory: phat10
 Artists:
 - Kalibration
@@ -104,7 +104,7 @@ Duration: 0:28
 URLs:
 - https://youtu.be/S4x2-mkXgGI?t=103
 ---
-Track: 11
+Track: '11'
 Directory: phat11
 Artists:
 - Gabe Nezovic
@@ -112,7 +112,7 @@ Duration: 0:28
 URLs:
 - https://youtu.be/S4x2-mkXgGI?t=116
 ---
-Track: 12
+Track: '12'
 Directory: phat12
 Artists:
 - Robert J! Lake
@@ -120,7 +120,7 @@ Duration: 0:28
 URLs:
 - https://youtu.be/S4x2-mkXgGI?t=131
 ---
-Track: 13
+Track: '13'
 Directory: phat13
 Artists:
 - Robert J! Lake
@@ -128,7 +128,7 @@ Duration: 0:28
 URLs:
 - https://youtu.be/S4x2-mkXgGI?t=140
 ---
-Track: 14
+Track: '14'
 Directory: phat14
 Artists:
 - Robert J! Lake
@@ -136,7 +136,7 @@ Duration: 0:28
 URLs:
 - https://youtu.be/S4x2-mkXgGI?t=152
 ---
-Track: 15
+Track: '15'
 Directory: phat15
 Artists:
 - Robert J! Lake
@@ -144,7 +144,7 @@ Duration: 0:28
 URLs:
 - https://youtu.be/S4x2-mkXgGI?t=164
 ---
-Track: 16
+Track: '16'
 Directory: phat16
 Artists:
 - Robert J! Lake
diff --git a/album/we-are-all-satellites.yaml b/album/we-are-all-satellites.yaml
index eb4370db..cd6124d3 100644
--- a/album/we-are-all-satellites.yaml
+++ b/album/we-are-all-satellites.yaml
@@ -45,6 +45,6 @@ Track: An Old One
 Duration: '3:04'
 Has URLs: false
 ---
-Track: 15874
+Track: '15874'
 Duration: '2:19'
 Has URLs: false