platform-specific names, mainly for bonus tracks

22 files changed, 317 insertions, 25 deletions

diff --git a/album/album-of-stories-and-imagination.yaml b/album/album-of-stories-and-imagination.yaml
index de97b394..f3a19f13 100644
--- a/album/album-of-stories-and-imagination.yaml
+++ b/album/album-of-stories-and-imagination.yaml
@@ -58,6 +58,12 @@ Commentary: |-
     First song of my homestuck inspired album!
 ---
 Track: Isle Of Artificial Life
+Additional Names:
+- Name: >-
+    Isle of Artificial Life
+  Annotation: >-
+    [SoundCloud](https://soundcloud.com/latadenata/isle-of-artificial-life),
+    [Newgrounds](https://www.newgrounds.com/audio/listen/1256063)
 Date First Released: October 15, 2023
 Duration: '02:09'
 URLs:
@@ -82,6 +88,12 @@ Commentary: |-
     Chill song based on the waves of the beach
 ---
 Track: Land Of Mafia And Crime
+Additional Names:
+- Name: >-
+    Land of Mafia and Crime
+  Annotation: >-
+    [SoundCloud](https://soundcloud.com/latadenata/land-of-mafia-and-crime),
+    [Newgrounds](https://www.newgrounds.com/audio/listen/1256065)
 Date First Released: October 16, 2023
 Duration: '01:42'
 URLs:
@@ -106,6 +118,12 @@ Commentary: |-
     A try to make an spanish guitar mafia style song.
 ---
 Track: Land Of Hunger And Savageness
+Additional Names:
+- Name: >-
+    Land of Hunger and Savageness
+  Annotation: >-
+    [SoundCloud](https://soundcloud.com/latadenata/land-of-hunger-and-savageness),
+    [Newgrounds](https://www.newgrounds.com/audio/listen/1256068)
 Date First Released: October 17, 2023
 Duration: '01:28'
 URLs:
@@ -163,6 +181,11 @@ Commentary: |-
     when you're stuck with an evil god
 ---
 Track: Night at the Artificial Isle
+Additional Names:
+- Name: >-
+    Night at the Isle of Artifical Life
+  Annotation: >-
+    [SoundCloud](https://soundcloud.com/latadenata/night-at-the-isle-of-artifical)
 Date First Released: October 19, 2023
 Duration: '01:21'
 Referenced Tracks:
@@ -384,6 +407,11 @@ Lyrics: |-
 Section: Bonus tracks
 ---
 Track: Techno-Dancing Beauty
+Additional Names:
+- Name: >-
+    (BONUS) Techno-Dancing Beauty
+  Annotation: >-
+    [YouTube](https://www.youtube.com/watch?v=j9fmh28dJHs)
 Date First Released: October 25, 2023
 Duration: '01:15'
 URLs:
diff --git a/album/anthology-i.yaml b/album/anthology-i.yaml
index 49ea99b3..b4ef35a6 100644
--- a/album/anthology-i.yaml
+++ b/album/anthology-i.yaml
@@ -273,11 +273,15 @@ Artists:
 URLs:
 - https://desynced.bandcamp.com/track/death-defied
 ---
-Section: Bonus tracks
+Section: Bonus track
 ---
-Track: "[BONUS] ~ What Could Have Been"
-Directory: what-could-have-been
-Duration: 2:45
+Track: What Could Have Been
+Additional Names:
+- Name: >-
+    [BONUS] ~ What Could Have Been
+  Annotation: >-
+    [Bandcamp](https://desynced.bandcamp.com/album/anthology-i)
+    Duration: 2:45
 Artists:
 - Levc
 Has Cover Art: false
diff --git a/album/catch-322.yaml b/album/catch-322.yaml
index 4df86954..818db1f9 100644
--- a/album/catch-322.yaml
+++ b/album/catch-322.yaml
@@ -268,8 +268,16 @@ URLs:
 ---
 Section: Bonus tracks
 ---
-Track: 'The Black Depths'
-Directory: the-black-depths
+Track: The Black Depths
+Additional Names:
+- Name: >-
+    BONUS: The Black Depths
+  Annotation: >-
+    [Bandcamp](https://vasterror.bandcamp.com/track/bonus-the-black-depths)
+- Name: >-
+    The Black Depths (Bonus)
+  Annotation: >-
+    album download
 Duration: '4:30'
 Artists:
 - Kate Mitchell
diff --git a/album/desynced-vol-1.yaml b/album/desynced-vol-1.yaml
index 8782bb23..e4e4b26f 100644
--- a/album/desynced-vol-1.yaml
+++ b/album/desynced-vol-1.yaml
@@ -551,6 +551,11 @@ Commentary: |-
 Section: Bonus tracks
 ---
 Track: Daughter (PX Tone)
+Additional Names:
+- Name: >-
+    [BONUS] Daughter (PX Tone)
+  Annotation: >-
+    [Bandcamp](https://desynced.bandcamp.com/track/bonus-daughter-px-tone)
 Artists:
 - Rowyn Berlan
 Duration: '2:18'
@@ -566,6 +571,11 @@ Referenced Tracks:
 - track:daughter-desynced
 ---
 Track: Happy Anthem
+Additional Names:
+- Name: >-
+    [BONUS] Happy Anthem
+  Annotation: >-
+    [Bandcamp](https://desynced.bandcamp.com/track/bonus-happy-anthem)
 Artists:
 - Levc
 Duration: '1:32'
diff --git a/album/faux-dramatica.yaml b/album/faux-dramatica.yaml
index a2c217e9..ba66c81c 100644
--- a/album/faux-dramatica.yaml
+++ b/album/faux-dramatica.yaml
@@ -178,6 +178,11 @@ Section: Bonus track
 ---
 Track: 'COGNITO HAZARD (Ft. Eddie Deezen)'
 Directory: cognito-hazard
+Additional Names:
+- Name: >-
+    BONUS: COGNITO HAZARD (Ft. Eddie Deezen)
+  Annotation: >-
+    [Bandcamp](https://vasterror.bandcamp.com/track/bonus-cognito-hazard-ft-eddie-deezen), album download
 Duration: 3:15
 Contributors:
 - Eddie Deezen (Sabine's vocals)
diff --git a/album/fighting-further.yaml b/album/fighting-further.yaml
index 853a742a..48e1bf5a 100644
--- a/album/fighting-further.yaml
+++ b/album/fighting-further.yaml
@@ -314,7 +314,8 @@ Additional Names:
 - Name: >-
     BONUS: Fool's Plea
   Annotation: >-
-    [Bandcamp](https://vasterror.bandcamp.com/track/bonus-fools-plea)
+    [Bandcamp](https://vasterror.bandcamp.com/track/bonus-fools-plea),
+    album download
 Artists:
 - Rabooski
 Cover Artists:
@@ -338,11 +339,9 @@ Additional Names:
 - Name: >-
     BONUS: On The Hunt For Something Dangerous [Beta]
   Annotation: >-
-    [Bandcamp](https://vasterror.bandcamp.com/track/bonus-on-the-hunt-for-something-dangerous-beta)
-- Name: >-
-    BONUS: On the Hunt for Something Dangerous [Beta]
-  Annotation: >-
-    [YouTube](https://www.youtube.com/watch?v=DhUpFZf5u50)
+    [Bandcamp](https://vasterror.bandcamp.com/track/bonus-on-the-hunt-for-something-dangerous-beta),
+    [YouTube](https://www.youtube.com/watch?v=DhUpFZf5u50),
+    album download
 Cover Artists:
 - expirequiem
 Duration: '1:41'
@@ -355,7 +354,8 @@ Additional Names:
 - Name: >-
     BONUS: LEFT 2 DIE
   Annotation: >-
-    [Bandcamp](https://vasterror.bandcamp.com/track/bonus-left-2-die)
+    [Bandcamp](https://vasterror.bandcamp.com/track/bonus-left-2-die),
+    album download
 Artists:
 - Ash Taylor
 Cover Artists:
diff --git a/album/nibiru.yaml b/album/nibiru.yaml
index 4fe1404f..69a7413c 100644
--- a/album/nibiru.yaml
+++ b/album/nibiru.yaml
@@ -70,6 +70,11 @@ URLs:
 - https://www.youtube.com/watch?v=DuH9Ul07rQ4
 ---
 Track: Redeye (feat. Kasane Teto)
+Additional Names:
+- Name: >-
+    Redeye
+  Annotation: >-
+    [YouTube album in-video](https://youtu.be/HWIbTv3W8Eo?t=41)
 Directory: redeye-nibiru
 Always Reference By Directory: true
 Duration: 3:38
@@ -461,8 +466,10 @@ Section: Bonus tracks
 ---
 Track: Until My Blood Runs Dry
 Additional Names:
-- Name: '[BONUS] ~ Until My Blood Runs Dry'
-  Annotation: '[Bandcamp](https://desynced.bandcamp.com/track/bonus-until-my-blood-runs-dry)'
+- Name: >-
+    [BONUS] ~ Until My Blood Runs Dry
+  Annotation: >-
+    [Bandcamp](https://desynced.bandcamp.com/track/bonus-until-my-blood-runs-dry)
 Duration: 3:44
 Artists:
 - Witch's Cadence
@@ -484,8 +491,10 @@ Track: Megalovania
 Directory: megalovania-nibiru
 Always Reference By Directory: true
 Additional Names:
-- Name: '[BONUS] ~ Megalovania'
-  Annotation: '[Bandcamp](https://desynced.bandcamp.com/track/bonus-megalovania)'
+- Name: >-
+    [BONUS] ~ Megalovania
+  Annotation: >-
+    [Bandcamp](https://desynced.bandcamp.com/track/bonus-megalovania)
 Duration: 3:34
 Artists:
 - Witch's Cadence
diff --git a/album/oceanfables-ethological.yaml b/album/oceanfables-ethological.yaml
index 1c665d12..b5599e25 100644
--- a/album/oceanfables-ethological.yaml
+++ b/album/oceanfables-ethological.yaml
@@ -45,6 +45,11 @@ Commentary: |-
 Section: Main album
 ---
 Track: For the Greater Good
+Additional Names:
+- Name: >-
+    For The Greater Good
+  Annotation: >-
+    [YouTube album in-video](https://youtu.be/YolNQv9QbJQ?t=0)
 Duration: '02:24'
 URLs:
 - https://nightslights.bandcamp.com/track/for-the-greater-good
@@ -250,6 +255,12 @@ Commentary: |-
     Either way I now know not to do that, and he sent me a great free multiband compressor, so I completely redid the master on every song. (So, make sure to thank Wight for why it sounds so much better than it would have)
 ---
 Track: Judgement By Genocide
+Additional Names:
+- Name: >-
+    Judgement by Genocide
+  Annotation: >-
+    [YouTube album timestamp](https://www.youtube.com/watch?v=YolNQv9QbJQ),
+    [YouTube album in-video](https://youtu.be/YolNQv9QbJQ?t=1758)
 Duration: '07:30'
 URLs:
 - https://nightslights.bandcamp.com/track/judgement-by-genocide
@@ -294,6 +305,16 @@ Commentary: |-
 Section: Bonus tracks
 ---
 Track: LUNE FUMO REAL
+Additional Names:
+- Name: >-
+    LUNE FUMO REAL (Bonus)
+  Annotation: >-
+    [Bandcamp](https://nightslights.bandcamp.com/track/lune-fumo-real-bonus),
+    [YouTube album in-video](https://youtu.be/YolNQv9QbJQ?t=2207)
+- Name: >-
+    (BONUS) - LUNE FUMO REAL
+  Annotation: >-
+    [YouTube album timestamp](https://www.youtube.com/watch?v=YolNQv9QbJQ)
 Duration: '01:32'
 URLs:
 - https://nightslights.bandcamp.com/track/lune-fumo-real-bonus
@@ -303,6 +324,16 @@ Commentary: |-
     It’s just a song I made because Nights drew a Lune Fumo, not much to say to be honest.
 ---
 Track: Ambiguous Amnesiac
+Additional Names:
+- Name: >-
+    Ambiguous Amnesiac (Bonus)
+  Annotation: >-
+    [Bandcamp](https://nightslights.bandcamp.com/track/ambiguous-amnesiac-bonus),
+    [YouTube album in-video](https://youtu.be/YolNQv9QbJQ?t=2299)
+- Name: >-
+    (BONUS) - Ambigious Amnesiac
+  Annotation: >-
+    [YouTube album timestamp](https://www.youtube.com/watch?v=YolNQv9QbJQ)
 Duration: '01:45'
 URLs:
 - https://nightslights.bandcamp.com/track/ambiguous-amnesiac-bonus
@@ -312,6 +343,16 @@ Commentary: |-
     This song is the oldest song on the album. I made it a couple months ago to be a Nino theme since he didn’t have that many songs really, but it was only a demo concept. I have been trying to make it into a fully fleshed out song, but we’ll just have to see when that happens
 ---
 Track: Oceanfalls Rap
+Additional Names:
+- Name: >-
+    Oceanfalls Rap (Bonus)
+  Annotation: >-
+    [Bandcamp](https://nightslights.bandcamp.com/track/oceanfalls-rap-bonus),
+    [YouTube album in-video](https://youtu.be/YolNQv9QbJQ?t=2404)
+- Name: >-
+    (BONUS) - Oceanfalls Rap
+  Annotation: >-
+    [YouTube album timestamp](https://www.youtube.com/watch?v=YolNQv9QbJQ)
 Duration: '02:30'
 URLs:
 - https://nightslights.bandcamp.com/track/oceanfalls-rap-bonus
diff --git a/album/oceanfables-ray-of-light.yaml b/album/oceanfables-ray-of-light.yaml
index 26bae191..3319544c 100644
--- a/album/oceanfables-ray-of-light.yaml
+++ b/album/oceanfables-ray-of-light.yaml
@@ -145,6 +145,11 @@ Section: Bonus track
 Track: Piano
 Directory: piano-oceanfables
 Always Reference By Directory: true
+Additional Names:
+- Name: >-
+    Piano Bonus
+  Annotation: >-
+    [Bandcamp](https://nightslights.bandcamp.com/track/piano-bonus)
 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 34f29058..a8ec36fc 100644
--- a/album/oceanfalls-vol-1.yaml
+++ b/album/oceanfalls-vol-1.yaml
@@ -170,6 +170,11 @@ Section: Bonus tracks
 ---
 Track: Firefly
 Directory: firefly-oceanfalls
+Additional Names:
+- Name: >-
+    Firefly [bonus]
+  Annotation: >-
+    [Bandcamp](https://nightslights.bandcamp.com/track/firefly-bonus)
 Duration: '1:31'
 URLs:
 - https://nightslights.bandcamp.com/track/firefly-bonus
diff --git a/album/oceanfalls-vol-2.yaml b/album/oceanfalls-vol-2.yaml
index c907a2f8..dfcc67ae 100644
--- a/album/oceanfalls-vol-2.yaml
+++ b/album/oceanfalls-vol-2.yaml
@@ -24,6 +24,11 @@ Wallpaper Style: 'opacity: 0.9;'
 Section: Main album
 ---
 Track: Into the Forest
+Additional Names:
+- Name: >-
+    Into The Forest
+  Annotation: >-
+    [YouTube album in-video](https://youtu.be/UyeKdsKg0vw?t=0)
 Artists:
 - dbnet18
 Duration: '2:10'
@@ -169,6 +174,11 @@ Cover Art Date: January 25, 2024
 # Unnamed one-off character, per leii
 ---
 Track: Nothing But a Small Request
+Additional Names:
+- Name: >-
+    Nothing but a small request
+  Annotation: >-
+    [YouTube album timestamp](https://www.youtube.com/watch?v=UyeKdsKg0vw)
 Artists:
 - whimsi
 Duration: '1:36'
@@ -396,6 +406,16 @@ Section: Bonus tracks
 ---
 Track: Atomic
 Directory: atomic-oceanfalls
+Additional Names:
+- Name: >-
+    Atomic (Bonus Track)
+  Annotation: >-
+    [Bandcamp](https://nightslights.bandcamp.com/track/atomic-bonus-track), minus artist name
+- Name: >-
+    Atomic (Bonus)
+  Annotation: >-
+    [YouTube album in-video](https://youtu.be/UyeKdsKg0vw?t=4197),
+    [YouTube album timestamp](https://www.youtube.com/watch?v=UyeKdsKg0vw)
 Always Reference By Directory: true
 Artists:
 - WHATISLOSTINTHEMINES
@@ -408,6 +428,16 @@ Art Tags:
 - Selene (Oceanfalls)
 ---
 Track: Kiss of Death
+Additional Names:
+- Name: >-
+    Kiss of Death (Bonus Track)
+  Annotation: >-
+    [Bandcamp](https://nightslights.bandcamp.com/track/kiss-of-death-bonus-track), minus artist name
+- Name: >-
+    Kiss of Death (Bonus)
+  Annotation: >-
+    [YouTube album in-video](https://youtu.be/UyeKdsKg0vw?t=4325),
+    [YouTube album timestamp](https://www.youtube.com/watch?v=UyeKdsKg0vw)
 Artists:
 - keyboard cait
 Duration: '2:02'
@@ -421,6 +451,19 @@ Art Tags:
 - 'cw: blood'
 ---
 Track: Kotori With A Gun Fusion Collab
+Additional Names:
+- Name: >-
+    Kotori With A Gun Fusion Collab (Bonus Track)
+  Annotation: >-
+    [Bandcamp](https://nightslights.bandcamp.com/track/kotori-with-a-gun-fusion-collab-bonus-track), minus artist names
+- Name: >-
+    Kotori With A Gun Fusion Collab (bonus)
+  Annotation: >-
+    [YouTube album in-video](https://youtu.be/UyeKdsKg0vw?t=4447)
+- Name: >-
+    Kotori with a Gun (Bonus)
+  Annotation: >-
+    [YouTube album timestamp](https://www.youtube.com/watch?v=UyeKdsKg0vw)
 Artists:
 - SplitSuns
 - yazshu
@@ -494,3 +537,6 @@ Art Tags:
 - Five (Oceanfalls)
 Referenced Tracks:
 - Snowfalls
+Commentary: |-
+    <i>Quasar Nebula:</i> (wiki editor)
+    This track isn't labelled "(Bonus Track)" on Bandcamp as [[track:atomic-oceanfalls|the]] [[track:kiss-of-death|previous]] [[track:kotori-with-a-gun-fusion-collab|three]] are. It's also not labelled "(bonus)" in the YouTube full album stream, and isn't included in the stream's timestamp list at all. ([It is part of the stream, though!](https://youtu.be/UyeKdsKg0vw?t=4641))
diff --git a/album/oceanfalls-vol-3.yaml b/album/oceanfalls-vol-3.yaml
index f1e6315d..3d51605e 100644
--- a/album/oceanfalls-vol-3.yaml
+++ b/album/oceanfalls-vol-3.yaml
@@ -116,6 +116,11 @@ Lyrics: |-
     (Meow)
 ---
 Track: Chased by Spirits
+Additional Names:
+- Name: >-
+    Chased By Spirits
+  Annotation: >-
+    [YouTube album timestamp](https://www.youtube.com/watch?v=0OCAUpSqkfs)
 Artists:
 - Kusoro
 Duration: '3:20'
@@ -311,6 +316,16 @@ Art Tags:
 Section: Bonus tracks
 ---
 Track: Sea Patrol (Ocean Calm)
+Additional Names:
+- Name: >-
+    Sea Patrol (Ocean Calm) (Bonus)
+  Annotation: >-
+    [Bandcamp](https://nightslights.bandcamp.com/track/sea-patrol-ocean-calm-bonus), minus artist name;
+    [YouTube album timestamp](https://www.youtube.com/watch?v=0OCAUpSqkfs)
+- Name: >-
+    (BONUS) SEA PATROL (OCEAN CALM)
+  Annotation: >-
+    [YouTube album in-video](https://youtu.be/0OCAUpSqkfs?t=3278), no specific capitalization
 Artists:
 - Hadron
 Duration: '2:19'
diff --git a/album/oceanfalls-vol-4.yaml b/album/oceanfalls-vol-4.yaml
index 3af5e907..3613f377 100644
--- a/album/oceanfalls-vol-4.yaml
+++ b/album/oceanfalls-vol-4.yaml
@@ -26,6 +26,12 @@ Wallpaper Style: 'opacity: 0.75;'
 Section: Main album
 ---
 Track: Up From the Depths
+Additional Names:
+- Name: >-
+    Up From The Depths
+  Annotation: >-
+    [YouTube album timestamp](https://www.youtube.com/watch?v=FCYAQhBv0kE),
+    [YouTube album in-video](https://youtu.be/FCYAQhBv0kE?t=0)
 Artists:
 - Wights End
 Duration: '05:24'
@@ -56,6 +62,12 @@ Referenced Tracks:
 - Rosen Wings
 ---
 Track: First Blood
+Additional Names:
+- Name: >-
+    <span style="color: #0439c4">First</span>
+    <span style="color: #f24448">Blood</span>
+  Annotation: >-
+    [YouTube album in-video](https://youtu.be/FCYAQhBv0kE?t=485)
 Artists:
 - nights
 Duration: '02:06'
@@ -205,6 +217,11 @@ Art Tags:
 - Corona (Oceanfalls)
 ---
 Track: The Sunderer's Reprisal
+Additional Names:
+- Name: >-
+    Sunderer's Reprisal
+  Annotation: >-
+    [YouTube album in-video](https://youtu.be/FCYAQhBv0kE?t=2512)
 Artists:
 - Wights End
 Duration: '03:55'
@@ -251,6 +268,12 @@ Referenced Tracks:
 - Emotional Moment
 ---
 Track: Spolia Opima
+Additional Names:
+- Name: >-
+    <span style="color: #7b1f58">Spolia</span>
+    <span style="color: #393a67">Opima</span>
+  Annotation: >-
+    [YouTube album in-video](https://youtu.be/FCYAQhBv0kE?t=3256)
 Artists:
 - RoZ8
 Duration: '04:26'
@@ -330,6 +353,15 @@ Referenced Tracks:
 Section: Bonus track
 ---
 Track: Know Thyself
+Additional Names:
+- Name: >-
+    Know Thyself (Bonus)
+  Annotation: >-
+    [Bandcamp](https://nightslights.bandcamp.com/track/know-thyself-bonus), minus artist name
+- Name: >-
+    Know Thyself [Bonus]
+  Annotation: >-
+    [YouTube album timestamp](https://www.youtube.com/watch?v=FCYAQhBv0kE)
 Artists:
 - keyboard cait
 Duration: '02:58'
diff --git a/album/oceanfalls-vol-five.yaml b/album/oceanfalls-vol-five.yaml
index 024b3c36..d9310d33 100644
--- a/album/oceanfalls-vol-five.yaml
+++ b/album/oceanfalls-vol-five.yaml
@@ -164,6 +164,12 @@ Referenced Tracks:
 - The Fifth Flower
 ---
 Track: Unfamiliar Territory (Director's Cut)
+Additional Names:
+- Name: >-
+    Unfamiliar Territory
+    <small>(Director's Cut)</small>
+  Annotation: >-
+    [YouTube album in-video](https://youtu.be/V4Jr3MlfWA4?t=1740)
 Artists:
 - Wights End
 Duration: '3:18'
@@ -220,6 +226,11 @@ Art Tags:
 Section: Bonus track
 ---
 Track: Face Thyself
+Additional Names:
+- Name: >-
+    Face Thyself (bonus)
+  Annotation: >-
+    [Bandcamp](https://nightslights.bandcamp.com/track/face-thyself-bonus)
 Artists:
 - keyboard cait
 Duration: '7:06'
diff --git a/album/pantheon.yaml b/album/pantheon.yaml
index c300f33e..a1698ed1 100644
--- a/album/pantheon.yaml
+++ b/album/pantheon.yaml
@@ -116,6 +116,11 @@ Referenced Tracks:
 Section: Bonus tracks
 ---
 Track: Flying Witch
+Additional Names:
+- Name: >-
+    [BONUS] ~ Flying Witch (Ft. Levc)
+  Annotation: >-
+    [Bandcamp](https://desynced.bandcamp.com/track/bonus-flying-witch-ft-levc)
 Duration: '3:28'
 Artists:
 - Rainy
@@ -132,6 +137,11 @@ Referenced Tracks:
 - track:daughter-desynced
 ---
 Track: Tsukuyomi (Remix)
+Additional Names:
+- Name: >-
+    [BONUS] ~ Tsukuyomi (Remix)
+  Annotation: >-
+    [Bandcamp](https://desynced.bandcamp.com/track/bonus-tsukuyomi-remix)
 Duration: '1:41'
 URLs:
 - https://www.youtube.com/watch?v=wb91nZJc5qE
@@ -144,6 +154,11 @@ Referenced Tracks:
 - track:luminary-pantheon
 ---
 Track: AUTOMATA
+Additional Names:
+- Name: >-
+    [BONUS] ~ AUTOMATA
+  Annotation: >-
+    [Bandcamp](https://desynced.bandcamp.com/track/bonus-automata)
 Duration: '1:13'
 URLs:
 - https://www.youtube.com/watch?v=TbYNB-UWIG0
@@ -163,6 +178,11 @@ Lyrics: |-
     (I'm sorry Dave. I'm afraid I can't do that.)
 ---
 Track: Josh's Theme
+Additional Names:
+- Name: >-
+    [BONUS] ~ Josh's Theme
+  Annotation: >-
+    [Bandcamp](https://desynced.bandcamp.com/track/bonus-joshs-theme)
 Duration: '2:33'
 URLs:
 - https://www.youtube.com/watch?v=3VHyQhqLlYk
@@ -176,6 +196,11 @@ Referenced Tracks:
 Track: Breakdown
 Directory: breakdown-pantheon
 Always Reference By Directory: true
+Additional Names:
+- Name: >-
+    [BONUS] ~ Breakdown
+  Annotation: >-
+    [Bandcamp](https://desynced.bandcamp.com/track/bonus-breakdown)
 Duration: '2:01'
 URLs:
 - https://www.youtube.com/watch?v=nsHHVTfndH0
diff --git a/album/repiton.yaml b/album/repiton.yaml
index 6608936a..123a6c73 100644
--- a/album/repiton.yaml
+++ b/album/repiton.yaml
@@ -179,7 +179,16 @@ URLs:
 ---
 Section: Bonus track
 ---
-Track: 'Where To Now?'
+Track: Where To Now?
+Additional Names:
+- Name: >-
+    BONUS: Where To Now?
+  Annotation: >-
+    [Bandcamp](https://vasterror.bandcamp.com/track/bonus-where-to-now)
+- Name: >-
+    Where To Now? (Bonus)
+  Annotation:
+    album download
 Duration: '2:39'
 URLs:
 - https://vasterror.bandcamp.com/track/bonus-where-to-now
diff --git a/album/sburban-neighborhood.yaml b/album/sburban-neighborhood.yaml
index 66d2050a..294fc1a2 100644
--- a/album/sburban-neighborhood.yaml
+++ b/album/sburban-neighborhood.yaml
@@ -436,6 +436,11 @@ Commentary: |-
 Section: Bonus tracks

 ---

 Track: Tangled Up

+Additional Names:

+- Name: >-

+    (Bonus) Tangled Up

+  Annotation: >-

+    [Bandcamp](https://sahcon.bandcamp.com/track/bonus-tangled-up), minus artist name

 Artists:

 - Crustacean Mother

 Duration: '4:10'

@@ -500,8 +505,13 @@ Lyrics: |-
     Every colour the ground beneath your feet

 ---

 Track: Black Nova / Green Moon

+Additional Names:

+- Name: >-

+    (Bonus) Black Nova / Green Moon

+  Annotation: >-

+    [Bandcamp](https://sahcon.bandcamp.com/track/bonus-black-nova-green-moon), minus artist name

 Artists:

- - Viceroy of Monte Cristo

+- Viceroy of Monte Cristo

 Duration: '4:39'

 URLs:

 - https://sahcon.bandcamp.com/track/bonus-black-nova-green-moon

@@ -511,6 +521,11 @@ Referenced Tracks:
 - Derse Dreamers

 ---

 Track: One Last Strife

+Additional Names:

+- Name: >-

+    (Bonus) One Last Strife

+  Annotation: >-

+    [Bandcamp](https://sahcon.bandcamp.com/track/bonus-one-last-strife), minus artist name

 Artists:

 - Levc

 Duration: '3:03'

diff --git a/album/vast-error-vol-2.yaml b/album/vast-error-vol-2.yaml
index 864f7159..c786c291 100644
--- a/album/vast-error-vol-2.yaml
+++ b/album/vast-error-vol-2.yaml
@@ -236,6 +236,11 @@ Section: Bonus tracks
 ---
 Track: Revelations
 Directory: revelations-vast-error
+Additional Names:
+- Name: >-
+    BONUS: Revelations
+  Annotation: >-
+    [Bandcamp](https://web.archive.org/web/20191119143052/https://vasterror.bandcamp.com/album/vast-error-vol-2)
 Artists:
 - dbnet18
 Referenced Tracks:
diff --git a/album/vast-error-vol-3.yaml b/album/vast-error-vol-3.yaml
index 02f2e71a..16cac592 100644
--- a/album/vast-error-vol-3.yaml
+++ b/album/vast-error-vol-3.yaml
@@ -3,7 +3,7 @@ Directory: vast-error-vol-3
 Date: December 18, 2017
 Date Added: October 25, 2023
 URLs:
-- https://archive.org/details/VastError_Volume1/
+- https://archive.org/details/VastError_Volume3/
 Cover Artists:
 - Sparaze
 - Joyfulldreams
@@ -263,6 +263,11 @@ Section: Bonus tracks
 ---
 Track: Gone
 Directory: gone-vast-error
+Additional Names:
+- Name: >-
+    BONUS: Gone
+  Annotation: >-
+    [Bandcamp](https://web.archive.org/web/20190323171648/https://vasterror.bandcamp.com/album/vast-error-vol-3)
 Artists:
 - WHATISLOSTINTHEMINES
 Duration: '02:34'
diff --git a/album/vast-error-vol-4.yaml b/album/vast-error-vol-4.yaml
index 4e576bac..8a7eacf1 100644
--- a/album/vast-error-vol-4.yaml
+++ b/album/vast-error-vol-4.yaml
@@ -456,7 +456,15 @@ URLs:
 Section: Bonus tracks
 ---
 Track: Nothing Special
-Directory: nothing-special
+Additional Names:
+- Name: >-
+    BONUS: Nothing Special
+  Annotation: >-
+    [Bandcamp](https://vasterror.bandcamp.com/track/bonus-nothing-special)
+- Name: >-
+    Nothing Special (Bonus)
+  Annotation: >-
+    album download
 Duration: '3:46'
 Artists:
 - Cristata
@@ -468,7 +476,15 @@ URLs:
 - https://music.deconreconstruction.com/albums/vast-error-vol-4?track=bonus-nothing-special
 ---
 Track: Twelve By Twelve
-Directory: twelve-by-twelve
+Additional Names:
+- Name: >-
+    BONUS: Twelve By Twelve
+  Annotation: >-
+    [Bandcamp](https://vasterror.bandcamp.com/track/bonus-twelve-by-twelve)
+- Name: >-
+    Twelve By Twelve (Bonus)
+  Annotation: >-
+    album download
 Duration: '2:48'
 Artists:
 - Nicholas Nakano
diff --git a/album/vast-error-vol-5-side-1.yaml b/album/vast-error-vol-5-side-1.yaml
index 76ba9812..717a38ec 100644
--- a/album/vast-error-vol-5-side-1.yaml
+++ b/album/vast-error-vol-5-side-1.yaml
@@ -547,7 +547,7 @@ Cover Artists:
 URLs:
 - https://vasterror.bandcamp.com/track/until-next-time
 ---
-Section: Bonus tracks
+Section: Bonus track
 ---
 Track: Arcalicious
 Additional Names:
diff --git a/album/vast-error-vol-5-side-2.yaml b/album/vast-error-vol-5-side-2.yaml
index b1d5cc0a..3ab8654d 100644
--- a/album/vast-error-vol-5-side-2.yaml
+++ b/album/vast-error-vol-5-side-2.yaml
@@ -14,8 +14,6 @@ Groups:
 - Deconreconstruction
 - Fandom
 ---
-Section: Main album
----
 Track: Rejoice And Be Merry
 Duration: '4:52'
 Artists: