more artistless, basically through CLASS ACT

14 files changed, 249 insertions, 174 deletions

diff --git a/album/adminstuck-volume-1.yaml b/album/adminstuck-volume-1.yaml
index c437b17e..189e77c0 100644
--- a/album/adminstuck-volume-1.yaml
+++ b/album/adminstuck-volume-1.yaml
@@ -16,13 +16,13 @@ Groups:
 - Fandom
 Color: '#fbe600'
 Commentary: |-
-    <i>Lace Luxim:</i> ([Bandcamp about blurb](https://adminstuck.bandcamp.com/album/adminstuck-volume-1-eclectic-depreciation), excerpt)
+    @@ [Bandcamp about blurb](https://adminstuck.bandcamp.com/album/adminstuck-volume-1-eclectic-depreciation), excerpt
 
     You've heard the story before. Four kids, one game, and the quest to create a new universe. You've been told this tale before. Four young adults, one game, and their journey to create their universe anew.
 
     Read the comic here: [mspfa.com?s=20770&p=1](http://mspfa.com/?s=20770&p=1)
 Crediting Sources: |-
-    <i>Lace Luxim:</i> ([Bandcamp about blurb](https://adminstuck.bandcamp.com/album/adminstuck-volume-1-eclectic-depreciation), excerpt)
+    @@ [Bandcamp about blurb](https://adminstuck.bandcamp.com/album/adminstuck-volume-1-eclectic-depreciation), excerpt
 
     Album Art- [[artist:set0kaiba]]
 
diff --git a/album/adminstuck-volume-2.yaml b/album/adminstuck-volume-2.yaml
index 20416964..94572cf7 100644
--- a/album/adminstuck-volume-2.yaml
+++ b/album/adminstuck-volume-2.yaml
@@ -17,13 +17,13 @@ Groups:
 - Fandom
 Color: '#878799'
 Commentary: |-
-    <i>Lace Luxim:</i> ([Bandcamp about blurb](https://adminstuck.bandcamp.com/album/adminstuck-volume-2-end-of-summer-days), excerpt)
+    @@ [Bandcamp about blurb](https://adminstuck.bandcamp.com/album/adminstuck-volume-2-end-of-summer-days), excerpt
 
     The story continues, reaching the peak of oddity. Surely, things can't get any stranger.
 
     Read the comic here: [mspfa.com?s=20770&p=1](http://mspfa.com/?s=20770&p=1)
 Crediting Sources: |-
-    <i>Lace Luxim:</i> ([Bandcamp about blurb](https://adminstuck.bandcamp.com/album/adminstuck-volume-2-end-of-summer-days), excerpt)
+    @@ [Bandcamp about blurb](https://adminstuck.bandcamp.com/album/adminstuck-volume-2-end-of-summer-days), excerpt
 
     Album Art- [[artist:set0kaiba]]
 
diff --git a/album/alternian-misadventures-volume-1.yaml b/album/alternian-misadventures-volume-1.yaml
index 9a14741d..17526802 100644
--- a/album/alternian-misadventures-volume-1.yaml
+++ b/album/alternian-misadventures-volume-1.yaml
@@ -40,7 +40,7 @@ Duration: 02:49
 URLs:
 - https://dvojka.bandcamp.com/track/apathy
 Commentary: |-
-    <i>Xszelor:</i> ([Bandcamp blurb](https://dvojka.bandcamp.com/track/apathy))
+    @@ [Bandcamp blurb](https://dvojka.bandcamp.com/track/apathy)
 
     Tom Novac Theme
 ---
@@ -49,7 +49,7 @@ Duration: 02:01
 URLs:
 - https://dvojka.bandcamp.com/track/hewwo-ive-murdered-your-family
 Commentary: |-
-    <i>Xszelor:</i> ([Bandcamp blurb](https://dvojka.bandcamp.com/track/hewwo-ive-murdered-your-family))
+    @@ [Bandcamp blurb](https://dvojka.bandcamp.com/track/hewwo-ive-murdered-your-family)
 
     Carline Sullen Theme
 ---
@@ -62,7 +62,7 @@ Referenced Tracks:
 URLs:
 - https://dvojka.bandcamp.com/track/timekeeper
 Commentary: |-
-    <i>Xszelor:</i> ([Bandcamp blurb](https://dvojka.bandcamp.com/track/timekeeper))
+    @@ [Bandcamp blurb](https://dvojka.bandcamp.com/track/timekeeper)
 
     Vic Arne Theme
 ---
@@ -71,7 +71,7 @@ Duration: 02:24
 URLs:
 - https://dvojka.bandcamp.com/track/stupid-sadistic-suicidal
 Commentary: |-
-    <i>Xszelor:</i> ([Bandcamp blurb](https://dvojka.bandcamp.com/track/stupid-sadistic-suicidal))
+    @@ [Bandcamp blurb](https://dvojka.bandcamp.com/track/stupid-sadistic-suicidal)
 
     Alex Shatter Theme
 ---
@@ -82,7 +82,7 @@ Duration: 02:47
 URLs:
 - https://dvojka.bandcamp.com/track/idk
 Commentary: |-
-    <i>Xszelor:</i> ([Bandcamp blurb](https://dvojka.bandcamp.com/track/idk))
+    @@ [Bandcamp blurb](https://dvojka.bandcamp.com/track/idk)
 
     Tim Leere Theme
 ---
@@ -93,7 +93,7 @@ Duration: 02:20
 URLs:
 - https://dvojka.bandcamp.com/track/omen
 Commentary: |-
-    <i>Xszelor:</i> ([Bandcamp blurb](https://dvojka.bandcamp.com/track/omen))
+    @@ [Bandcamp blurb](https://dvojka.bandcamp.com/track/omen)
 
     Demian Shatter Theme
 ---
@@ -102,7 +102,7 @@ Duration: 02:17
 URLs:
 - https://dvojka.bandcamp.com/track/dicemaster
 Commentary: |-
-    <i>Xszelor:</i> ([Bandcamp blurb](https://dvojka.bandcamp.com/track/dicemaster))
+    @@ [Bandcamp blurb](https://dvojka.bandcamp.com/track/dicemaster)
 
     Dev Leere Theme
 ---
@@ -111,7 +111,7 @@ Duration: 03:45
 URLs:
 - https://dvojka.bandcamp.com/track/whats-down
 Commentary: |-
-    <i>Xszelor:</i> ([Bandcamp blurb](https://dvojka.bandcamp.com/track/whats-down))
+    @@ [Bandcamp blurb](https://dvojka.bandcamp.com/track/whats-down)
 
     Andrew Cervisto Theme
 ---
@@ -122,7 +122,7 @@ Duration: 03:23
 URLs:
 - https://dvojka.bandcamp.com/track/deliverance
 Commentary: |-
-    <i>Xszelor:</i> ([Bandcamp blurb](https://dvojka.bandcamp.com/track/deliverance))
+    @@ [Bandcamp blurb](https://dvojka.bandcamp.com/track/deliverance)
 
     Jack Vacker Theme
 ---
@@ -133,7 +133,7 @@ Duration: 02:35
 URLs:
 - https://dvojka.bandcamp.com/track/en-garde
 Commentary: |-
-    <i>Xszelor:</i> ([Bandcamp blurb](https://dvojka.bandcamp.com/track/en-garde))
+    @@ [Bandcamp blurb](https://dvojka.bandcamp.com/track/en-garde)
 
     Edmond Armue Theme
 
diff --git a/album/archive.yaml b/album/archive.yaml
index 7272d4c5..d0c12ac2 100644
--- a/album/archive.yaml
+++ b/album/archive.yaml
@@ -202,7 +202,7 @@ Commentary: |-
 
     JUNGLE BOOGIE: https://bowman.bandcamp.com/track/jungle-boogie
 
-    <i>Michael Guy Bowman:</i> ([Bandcamp about blurb](https://bowman.bandcamp.com/track/jungle-boogie))
+    @@ [Bandcamp about blurb](https://bowman.bandcamp.com/track/jungle-boogie)
 
     Outtake from [[album:homestuck-vol-10|Homestuck Vol. 10]], 2016
 ---
@@ -219,7 +219,7 @@ URLs:
 Referenced Tracks:
 - Crimesters Credits
 Commentary: |-
-    <i>Michael Guy Bowman:</i> ([Bandcamp about blurb](https://bowman.bandcamp.com/track/crimesters-theme))
+    @@ [Bandcamp about blurb](https://bowman.bandcamp.com/track/crimesters-theme)
 
     Commission for [[artist:emery-ferguson|Emery Ferguson]], 2015
 ---
@@ -234,7 +234,7 @@ URLs:
 - https://open.spotify.com/track/553l3U5o0j6qxlADQDoyd9
 - https://music.apple.com/album/crimesters-credits/1774149625?i=1774149628
 Commentary: |-
-    <i>Michael Guy Bowman:</i> ([Bandcamp about blurb](https://bowman.bandcamp.com/track/crimesters-credits))
+    @@ [Bandcamp about blurb](https://bowman.bandcamp.com/track/crimesters-credits)
 
     Commission for [[artist:emery-ferguson|Emery Ferguson]], 2015
 
@@ -250,7 +250,7 @@ URLs:
 - https://open.spotify.com/track/5twBstgHee3J5gICFIDWKl
 - https://music.apple.com/album/just-destroy-it/1774149625?i=1774149629
 Commentary: |-
-    <i>Michael Guy Bowman:</i> ([Bandcamp about blurb](https://bowman.bandcamp.com/track/just-destroy-it))
+    @@ [Bandcamp about blurb](https://bowman.bandcamp.com/track/just-destroy-it)
 
     Commission for Lindsay Hejl, 2014
 ---
@@ -262,7 +262,7 @@ URLs:
 - https://open.spotify.com/track/4KDxTMcOmw8RJ1BzqXc4gG
 - https://music.apple.com/album/got-it/1774149625?i=1774149630
 Commentary: |-
-    <i>Michael Guy Bowman:</i> ([Bandcamp about blurb](https://bowman.bandcamp.com/track/got-it))
+    @@ [Bandcamp about blurb](https://bowman.bandcamp.com/track/got-it)
 
     Soundcloud, 2013
 
@@ -311,7 +311,7 @@ Lyrics: |-
     I rise to meet the coming day
     But someone's laughing far away
 Commentary: |-
-    <i>Michael Guy Bowman:</i> ([Bandcamp about blurb](https://bowman.bandcamp.com/track/awake-2013-version))
+    @@ [Bandcamp about blurb](https://bowman.bandcamp.com/track/awake-2013-version)
 
     Soundcloud, 2013
 
@@ -327,7 +327,7 @@ URLs:
 - https://open.spotify.com/track/6vKMyMH4JC0RPYfA5qE5TZ
 - https://music.apple.com/album/polyominoes/1774149625?i=1774149632
 Commentary: |-
-    <i>Michael Guy Bowman:</i> ([Bandcamp about blurb](https://bowman.bandcamp.com/track/polyominoes))
+    @@ [Bandcamp about blurb](https://bowman.bandcamp.com/track/polyominoes)
 
     Soundcloud, 2013
 
@@ -373,7 +373,7 @@ Lyrics: |-
     Just a bunch of peculiar people
     Looking for a party to crash
 Commentary: |-
-    <i>Michael Guy Bowman:</i> ([Bandcamp about blurb](https://bowman.bandcamp.com/track/airwaves))
+    @@ [Bandcamp about blurb](https://bowman.bandcamp.com/track/airwaves)
 
     Soundcloud, 2013
 ---
@@ -385,7 +385,7 @@ URLs:
 - https://open.spotify.com/track/4Pa6jHSQuaEARSF25RLgrn
 - https://music.apple.com/album/gondwanaland/1774149625?i=1774149634
 Commentary: |-
-    <i>Michael Guy Bowman:</i> ([Bandcamp about blurb](https://bowman.bandcamp.com/track/gondwanaland))
+    @@ [Bandcamp about blurb](https://bowman.bandcamp.com/track/gondwanaland)
 
     Soundcloud, 2013
 
@@ -403,7 +403,7 @@ URLs:
 - https://open.spotify.com/track/0WXT0iSsNg2FsPzwRTtyMh
 - https://music.apple.com/album/slow-bay/1774149625?i=1774149635
 Commentary: |-
-    <i>Michael Guy Bowman:</i> ([Bandcamp about blurb](https://bowman.bandcamp.com/track/slow-bay))
+    @@ [Bandcamp about blurb](https://bowman.bandcamp.com/track/slow-bay)
 
     Soundcloud, 2013
 
@@ -419,7 +419,7 @@ URLs:
 - https://open.spotify.com/track/7iVxDNXivejUw9WRZSZwuV
 - https://music.apple.com/album/the-new-window/1774149625?i=1774149636
 Commentary: |-
-    <i>Michael Guy Bowman:</i> ([Bandcamp about blurb](https://bowman.bandcamp.com/track/the-new-window))
+    @@ [Bandcamp about blurb](https://bowman.bandcamp.com/track/the-new-window)
 
     Soundcloud, 2013
 
@@ -435,7 +435,7 @@ URLs:
 - https://open.spotify.com/track/5Kv05DOhXxPwOfdmvLHwrr
 - https://music.apple.com/album/electroverture/1774149625?i=1774149637
 Commentary: |-
-    <i>Michael Guy Bowman:</i> ([Bandcamp about blurb](https://bowman.bandcamp.com/track/electroverture))
+    @@ [Bandcamp about blurb](https://bowman.bandcamp.com/track/electroverture)
 
     Commission for Cari Garafalo, 2013
 ---
@@ -488,7 +488,7 @@ Lyrics: |-
     He married them and very soon
     They went upon their aba daba honeymoon
 Commentary: |-
-    <i>Michael Guy Bowman:</i> ([Bandcamp about blurb](https://bowman.bandcamp.com/track/aba-daba-honeymoon))
+    @@ [Bandcamp about blurb](https://bowman.bandcamp.com/track/aba-daba-honeymoon)
 
     Commission for Chris Sweet, 2013
 
@@ -575,7 +575,7 @@ Lyrics: |-
 
     (Mwah!)
 Commentary: |-
-    <i>Michael Guy Bowman:</i> ([Bandcamp about blurb](https://bowman.bandcamp.com/track/valentine-to-sarah-from-julian))
+    @@ [Bandcamp about blurb](https://bowman.bandcamp.com/track/valentine-to-sarah-from-julian)
 
     Kickstarter reward for Julian Low (dedicated to Sarah), 2012
 
@@ -599,7 +599,7 @@ Lyrics: |-
     Make it bounce
     Make it bounce
 Commentary: |-
-    <i>Michael Guy Bowman:</i> ([Bandcamp about blurb](https://bowman.bandcamp.com/track/make-it-bounce))
+    @@ [Bandcamp about blurb](https://bowman.bandcamp.com/track/make-it-bounce)
 
     Kickstarter reward for McKinley Freeman, 2012
 
@@ -639,7 +639,7 @@ Lyrics: |-
     Perhaps these things cannot be learned
     Nothing there but diamonds and diamonds and diamonds and diamonds and diamonds and diamonds and diamonds and diamonds
 Commentary: |-
-    <i>Michael Guy Bowman:</i> ([Bandcamp about blurb](https://bowman.bandcamp.com/track/diamonds-and-diamonds-and-diamonds))
+    @@ [Bandcamp about blurb](https://bowman.bandcamp.com/track/diamonds-and-diamonds-and-diamonds)
 
     Kickstarter reward for Michael Orr, 2012
 
@@ -696,7 +696,7 @@ Lyrics: |-
     I rise to meet the coming day
     But someone's laughing far away
 Commentary: |-
-    <i>Michael Guy Bowman:</i> ([Bandcamp about blurb](https://bowman.bandcamp.com/track/awake-2012-version))
+    @@ [Bandcamp about blurb](https://bowman.bandcamp.com/track/awake-2012-version)
 
     Kickstarter reward for Kaolin Maia Cash, 2012
 
@@ -793,7 +793,7 @@ Lyrics: |-
 
     "Okay, back to work."
 Commentary: |-
-    <i>Michael Guy Bowman:</i> ([Bandcamp about blurb](https://bowman.bandcamp.com/track/mad-science))
+    @@ [Bandcamp about blurb](https://bowman.bandcamp.com/track/mad-science)
 
     Kickstarter reward for Nich Maragos, 2012
 
@@ -831,7 +831,7 @@ Lyrics: |-
     This calm, this light, this air, this body
     This sunset
 Commentary: |-
-    <i>Michael Guy Bowman:</i> ([Bandcamp about blurb](https://bowman.bandcamp.com/track/this-sunset))
+    @@ [Bandcamp about blurb](https://bowman.bandcamp.com/track/this-sunset)
 
     Kickstarter reward for Leigh-Ann Peach, 2012
 
@@ -855,7 +855,7 @@ URLs:
 - https://open.spotify.com/track/4B6kaTgrQYBFeZ7S0D33Tc
 - https://music.apple.com/album/millennium-bug/1774149625?i=1774149646
 Commentary: |-
-    <i>Michael Guy Bowman:</i> ([Bandcamp about blurb](https://bowman.bandcamp.com/track/millennium-bug))
+    @@ [Bandcamp about blurb](https://bowman.bandcamp.com/track/millennium-bug)
 
     Kickstarter reward for Sixar, 2012
 
@@ -905,7 +905,7 @@ Lyrics: |-
     Though it's dark here on land, when we're both holding hands
     All the lights up above will be ours
 Commentary: |-
-    <i>Michael Guy Bowman:</i> ([Bandcamp about blurb](https://bowman.bandcamp.com/track/know-that-youre-mine))
+    @@ [Bandcamp about blurb](https://bowman.bandcamp.com/track/know-that-youre-mine)
 
     Kickstarter reward for Kalen Boley, 2012
 
@@ -952,7 +952,7 @@ Lyrics: |-
     Body of the aether's night
     Takes you on your maiden flight!
 Commentary: |-
-    <i>Michael Guy Bowman:</i> ([Bandcamp about blurb](https://bowman.bandcamp.com/track/far-away))
+    @@ [Bandcamp about blurb](https://bowman.bandcamp.com/track/far-away)
 
     Kickstarter reward for Jon Drobny, 2012
 
@@ -986,7 +986,7 @@ Lyrics: |-
     (Faster, still!)
     (Yes!)
 Commentary: |-
-    <i>Michael Guy Bowman:</i> ([Bandcamp about blurb](https://bowman.bandcamp.com/track/ismelda-the-bearded-mermaid))
+    @@ [Bandcamp about blurb](https://bowman.bandcamp.com/track/ismelda-the-bearded-mermaid)
 
     Kickstarter reward for Brad Griffin, 2012
 
@@ -1020,7 +1020,7 @@ Lyrics: |-
     The Bandages
     The Bandages
 Commentary: |-
-    <i>Michael Guy Bowman:</i> ([Bandcamp about blurb](https://bowman.bandcamp.com/track/bandages))
+    @@ [Bandcamp about blurb](https://bowman.bandcamp.com/track/bandages)
 
     Kickstarter reward for Colin "Bandages" Burns, 2012
 
@@ -1050,7 +1050,7 @@ URLs:
 - https://open.spotify.com/track/1pFymHKpHGd4Sq4g6b8fTc
 - https://music.apple.com/album/get-start/1774149625?i=1774149741
 Commentary: |-
-    <i>Michael Guy Bowman:</i> ([Bandcamp about blurb](https://bowman.bandcamp.com/track/get-start))
+    @@ [Bandcamp about blurb](https://bowman.bandcamp.com/track/get-start)
 
     Kickstarter reward for Alex Coady, 2012
 
@@ -1089,7 +1089,7 @@ Lyrics: |-
     For this is the best day of the year
     Happy birthday to
 Commentary: |-
-    <i>Michael Guy Bowman:</i> ([Bandcamp about blurb](https://bowman.bandcamp.com/track/you-are-the-birthday-girl))
+    @@ [Bandcamp about blurb](https://bowman.bandcamp.com/track/you-are-the-birthday-girl)
 
     Kickstarter reward for [[artist:solatrus|Jeremy Iamurri]], 2012
 
@@ -1134,7 +1134,7 @@ Lyrics: |-
     For this is the best day of the year
     Happy birthday to
 Commentary: |-
-    <i>Michael Guy Bowman:</i> ([Bandcamp about blurb](https://bowman.bandcamp.com/track/you-are-the-birthday-boy))
+    @@ [Bandcamp about blurb](https://bowman.bandcamp.com/track/you-are-the-birthday-boy)
 
     Kickstarter reward for [[artist:solatrus|Jeremy Iamurri]], 2012
 
@@ -1184,7 +1184,7 @@ Lyrics: |-
     Testing our attention span
     Oh why'd we join the marching band?
 Commentary: |-
-    <i>Michael Guy Bowman:</i> ([Bandcamp about blurb](https://bowman.bandcamp.com/track/in-the-marching-band))
+    @@ [Bandcamp about blurb](https://bowman.bandcamp.com/track/in-the-marching-band)
 
     Kickstarter reward for Mason Herschberg, 2012
 
@@ -1250,7 +1250,7 @@ Lyrics: |-
     When the war is over, then you'll see why
     Explosion Force, they do it right!
 Commentary: |-
-    <i>Michael Guy Bowman:</i> ([Bandcamp about blurb](https://bowman.bandcamp.com/track/explosion-force-they-do-it-right))
+    @@ [Bandcamp about blurb](https://bowman.bandcamp.com/track/explosion-force-they-do-it-right)
 
     Kickstarter reward for Jeremy Geist, 2012
 
@@ -1290,7 +1290,7 @@ URLs:
 - https://open.spotify.com/track/7pHrLpYww8llgrRd0JE5Ut
 - https://music.apple.com/album/conro-corp-anthem/1774149625?i=1774149746
 Commentary: |-
-    <i>Michael Guy Bowman:</i> ([Bandcamp about blurb](https://bowman.bandcamp.com/track/conro-corp-anthem))
+    @@ [Bandcamp about blurb](https://bowman.bandcamp.com/track/conro-corp-anthem)
 
     Kickstarter reward for Connor Norris, 2012
 
diff --git a/album/background-noise.yaml b/album/background-noise.yaml
index 5a1271a7..e5a00497 100644
--- a/album/background-noise.yaml
+++ b/album/background-noise.yaml
@@ -17,13 +17,15 @@ Groups:
 - dbnet18
 - Fandom
 Commentary: |-
-    <i>dbnet18:</i> ([Bandcamp about blurb](https://dbnet18.bandcamp.com/album/background-noise))
+    @@ [Bandcamp about blurb](https://dbnet18.bandcamp.com/album/background-noise)
+
     Background Noise is a Vast Error side album by dbnet18 dedicated to various OCs.
 
     <i>dbnet18:</i> (Music Refs document file)
     Album made in 2018 for some Vast Error Troll OCs from people in the community! A sequel was planned then cancelled, might start it up again when I have time.
 Crediting Sources: |-
-    <i>dbnet18:</i> ([Bandcamp credits blurb](https://dbnet18.bandcamp.com/album/background-noise))
+    @@ [Bandcamp credits blurb](https://dbnet18.bandcamp.com/album/background-noise)
+
     Cover art done by [[artist:groeuf]].
     
     Track art by:<br>
@@ -48,7 +50,8 @@ Referenced Tracks:
 URLs:
 - https://dbnet18.bandcamp.com/track/disc-1
 Crediting Sources: |-
-    <i>dbnet18:</i> ([Bandcamp credits blurb](https://dbnet18.bandcamp.com/track/disc-1))
+    @@ [Bandcamp credits blurb](https://dbnet18.bandcamp.com/track/disc-1)
+
     Music by [[artist:dbnet18]]<br>
     Art by [[artist:groeuf]]
 ---
@@ -62,7 +65,8 @@ Art Tags:
 URLs:
 - https://dbnet18.bandcamp.com/track/bloodsucker
 Crediting Sources: |-
-    <i>dbnet18:</i> ([Bandcamp credits blurb](https://dbnet18.bandcamp.com/track/bloodsucker))
+    @@ [Bandcamp credits blurb](https://dbnet18.bandcamp.com/track/bloodsucker)
+
     Music by [[artist:dbnet18]]<br>
     Art by [[artist:xamag]]
 
@@ -77,7 +81,8 @@ Art Tags:
 URLs:
 - https://dbnet18.bandcamp.com/track/master-of-ceremonies
 Crediting Sources: |-
-    <i>dbnet18:</i> ([Bandcamp credits blurb](https://dbnet18.bandcamp.com/track/master-of-ceremonies))
+    @@ [Bandcamp credits blurb](https://dbnet18.bandcamp.com/track/master-of-ceremonies)
+
     Music by [[artist:dbnet18]]<br>
     Art by [[artist:bakudadadan]]
 
@@ -100,13 +105,15 @@ Sampled Tracks:
 URLs:
 - https://dbnet18.bandcamp.com/track/meme-team
 Crediting Sources: |-
-    <i>dbnet18:</i> ([Bandcamp credits blurb](https://dbnet18.bandcamp.com/track/meme-team), excerpt)
+    @@ [Bandcamp credits blurb](https://dbnet18.bandcamp.com/track/meme-team), excerpt
+
     Music by [[artist:dbnet18]]<br>
     Art by [[artist:bakudadadan]]
 
     Troll design by [[artist:bakudadadan]]
 Referencing Sources: |-
-    <i>dbnet18:</i> ([Bandcamp credits blurb](https://dbnet18.bandcamp.com/track/meme-team), excerpt)
+    @@ [Bandcamp credits blurb](https://dbnet18.bandcamp.com/track/meme-team), excerpt
+
     Samples:<br>
     [["VRChat Club Penguin Family"]] by Jameskii<br>
     [["Samsquamptch"]] from Trailer Park Boys<br>
@@ -125,7 +132,8 @@ Art Tags:
 URLs:
 - https://dbnet18.bandcamp.com/track/sorrow
 Crediting Sources: |-
-    <i>dbnet18:</i> ([Bandcamp credits blurb](https://dbnet18.bandcamp.com/track/sorrow))
+    @@ [Bandcamp credits blurb](https://dbnet18.bandcamp.com/track/sorrow)
+
     Music by [[artist:dbnet18]]<br>
     Art by [[artist:groeuf]]
 
@@ -140,7 +148,8 @@ Art Tags:
 URLs:
 - https://dbnet18.bandcamp.com/track/ambrosia-fizz
 Crediting Sources: |-
-    <i>dbnet18:</i> ([Bandcamp credits blurb](https://dbnet18.bandcamp.com/track/ambrosia-fizz))
+    @@ [Bandcamp credits blurb](https://dbnet18.bandcamp.com/track/ambrosia-fizz)
+
     Music by [[artist:dbnet18]]<br>
     Art by [[artist:ancient]]
 
@@ -156,7 +165,8 @@ Art Tags:
 URLs:
 - https://dbnet18.bandcamp.com/track/regression
 Crediting Sources: |-
-    <i>dbnet18:</i> ([Bandcamp credits blurb](https://dbnet18.bandcamp.com/track/regression))
+    @@ [Bandcamp credits blurb](https://dbnet18.bandcamp.com/track/regression)
+
     Music by [[artist:dbnet18]]<br>
     Art by [[artist:feartehk]]
 
@@ -171,7 +181,8 @@ Art Tags:
 URLs:
 - https://dbnet18.bandcamp.com/track/anti-vigilante
 Crediting Sources: |-
-    <i>dbnet18:</i> ([Bandcamp credits blurb](https://dbnet18.bandcamp.com/track/anti-vigilante))
+    @@ [Bandcamp credits blurb](https://dbnet18.bandcamp.com/track/anti-vigilante)
+
     Music by [[artist:dbnet18]]<br>
     Art by [[artist:sweet-yam]]
 
@@ -190,7 +201,8 @@ Cover Artists:
 URLs:
 - https://dbnet18.bandcamp.com/track/disc-2
 Crediting Sources: |-
-    <i>dbnet18:</i> ([Bandcamp credits blurb](https://dbnet18.bandcamp.com/track/disc-2))
+    @@ [Bandcamp credits blurb](https://dbnet18.bandcamp.com/track/disc-2)
+
     Music by [[artist:dbnet18]]<br>
     Art by [[artist:groeuf]]
 ---
@@ -208,13 +220,15 @@ Sampled Tracks:
 URLs:
 - https://dbnet18.bandcamp.com/track/nerfed
 Crediting Sources: |-
-    <i>dbnet18:</i> ([Bandcamp credits blurb](https://dbnet18.bandcamp.com/track/nerfed), excerpt)
+    @@ [Bandcamp credits blurb](https://dbnet18.bandcamp.com/track/nerfed), excerpt
+
     Music by [[artist:dbnet18]]<br>
     Art by [[artist:anonymous-artist]]
 
     Troll design by Chroma
 Referencing Sources: |-
-    <i>dbnet18:</i> ([Bandcamp credits blurb](https://dbnet18.bandcamp.com/track/nerfed), excerpt)
+    @@ [Bandcamp credits blurb](https://dbnet18.bandcamp.com/track/nerfed), excerpt
+
     Samples:<br>
     [[Alf Plush Commercial - Coleco (1986)|"Alf Plush Doll Commerical (1986)"]]<br>
     [["Hulk Hogan Vitamins"]]<br>
@@ -230,7 +244,8 @@ Art Tags:
 URLs:
 - https://dbnet18.bandcamp.com/track/clown-case
 Crediting Sources: |-
-    <i>dbnet18:</i> ([Bandcamp credits blurb](https://dbnet18.bandcamp.com/track/clown-case))
+    @@ [Bandcamp credits blurb](https://dbnet18.bandcamp.com/track/clown-case)
+
     Music by [[artist:dbnet18]]<br>
     Art by [[artist:fennwayz]]
 
@@ -246,7 +261,8 @@ Art Tags:
 URLs:
 - https://dbnet18.bandcamp.com/track/if-only
 Crediting Sources: |-
-    <i>dbnet18:</i> ([Bandcamp credits blurb](https://dbnet18.bandcamp.com/track/if-only))
+    @@ [Bandcamp credits blurb](https://dbnet18.bandcamp.com/track/if-only)
+
     Music by [[artist:dbnet18]]<br>
     Lineart by [[artist:xamag]]<br>
     Coloring by [[artist:bakudadadan]]
@@ -262,7 +278,8 @@ Art Tags:
 URLs:
 - https://dbnet18.bandcamp.com/track/internal-corruption
 Crediting Sources: |-
-    <i>dbnet18:</i> ([Bandcamp credits blurb](https://dbnet18.bandcamp.com/track/internal-corruption))
+    @@ [Bandcamp credits blurb](https://dbnet18.bandcamp.com/track/internal-corruption)
+
     Music by [[artist:dbnet18]]<br>
     Art by [[artist:xamag]]
 
@@ -277,7 +294,8 @@ Art Tags:
 URLs:
 - https://dbnet18.bandcamp.com/track/meteorlite
 Crediting Sources: |-
-    <i>dbnet18:</i> ([Bandcamp credits blurb](https://dbnet18.bandcamp.com/track/meteorlite))
+    @@ [Bandcamp credits blurb](https://dbnet18.bandcamp.com/track/meteorlite)
+
     Music by [[artist:dbnet18]]<br>
     Art by [[artist:bee]]
 
@@ -293,7 +311,8 @@ Art Tags:
 URLs:
 - https://dbnet18.bandcamp.com/track/brilliant
 Crediting Sources: |-
-    <i>dbnet18:</i> ([Bandcamp credits blurb](https://dbnet18.bandcamp.com/track/brilliant))
+    @@ [Bandcamp credits blurb](https://dbnet18.bandcamp.com/track/brilliant)
+
     Music by [[artist:dbnet18]]<br>
     Art by [[artist:anonymous-artist]]
 
@@ -308,7 +327,8 @@ Art Tags:
 URLs:
 - https://dbnet18.bandcamp.com/track/inglorious
 Crediting Sources: |-
-    <i>dbnet18:</i> ([Bandcamp credits blurb](https://dbnet18.bandcamp.com/track/inglorious))
+    @@ [Bandcamp credits blurb](https://dbnet18.bandcamp.com/track/inglorious)
+
     Music by [[artist:dbnet18]]<br>
     Art by [[artist:jackaxed]]
 
@@ -338,6 +358,7 @@ Commentary: |-
     <i>dbnet18:</i>
     01100010 01110101 01110100 00100000 01101001 01110011 00100000 01101001 01110100 00100000 01110010 01100101 01100001 01101100 01101100 01111001 00100000 01101111 01110110 01100101 01110010 00111111
 Crediting Sources: |-
-    <i>dbnet18:</i> ([Bandcamp credits blurb](https://dbnet18.bandcamp.com/track/the-end))
+    @@ [Bandcamp credits blurb](https://dbnet18.bandcamp.com/track/the-end)
+
     Music by [[artist:dbnet18]]<br>
     Art by [[artist:groeuf]]
diff --git a/album/battle-rival-hugh-remix-pokemon-bw2.yaml b/album/battle-rival-hugh-remix-pokemon-bw2.yaml
index 8fbc2d1c..4fdf2559 100644
--- a/album/battle-rival-hugh-remix-pokemon-bw2.yaml
+++ b/album/battle-rival-hugh-remix-pokemon-bw2.yaml
@@ -26,7 +26,7 @@ Commentary: |-
 
     This song has been stuck in my head for weeks now, so here's a cool remix i did of it! Definitely one of my favorite rival battle themes.
 Crediting Sources: |-
-    <i>Pascal van den Bos:</i> ([Bandcamp credits blurb](https://potatoboss.bandcamp.com/track/battle-rival-hugh-remix-pok-mon-bw2-bw2))
+    @@ [Bandcamp credits blurb](https://potatoboss.bandcamp.com/track/battle-rival-hugh-remix-pok-mon-bw2-bw2)
 
     Original by: [[artist:go-ichinose|Go Ichinose 【一之瀬剛】]]
 
@@ -34,4 +34,4 @@ Crediting Sources: |-
 
     <i>Quasar Nebula:</i> (wiki editor, 11/2/2025)
 
-    The art link above is to a page on pixiv Encyclopedia. The artwork featured there is the one used as the cover for this single: [(pixiv.net link)](https://www.pixiv.net/en/artworks/26666677)
\ No newline at end of file
+    The art link above is to a page on pixiv Encyclopedia. The artwork featured there is the one used as the cover for this single: [(pixiv.net link)](https://www.pixiv.net/en/artworks/26666677)
diff --git a/album/beneath-the-shade.yaml b/album/beneath-the-shade.yaml
index b140fd3b..69ba3eff 100644
--- a/album/beneath-the-shade.yaml
+++ b/album/beneath-the-shade.yaml
@@ -53,5 +53,6 @@ Commentary: |-
     <i>pomabug:</i> ([Bandcamp about blurb](https://pomabug.bandcamp.com/track/beneath-the-shade) / [YouTube description](https://youtu.be/bDK11UOnlwU), excerpt)
     GLORY TO THE JUNE EGBERT EMPIRE. IN HONOR OF [[artist:buzinkai|BUZINKAI]]. MAY SHE REST IN PEACE.
 Referencing Sources: |-
-    <i>pomabug:</i> ([Bandcamp credits blurb](https://pomabug.bandcamp.com/track/beneath-the-shade))
+    @@ [Bandcamp credits blurb](https://pomabug.bandcamp.com/track/beneath-the-shade)
+
     based on [["Doctor"]] by [[artist:buzinkai]] and [["Penumbra Phantasm"]] by [[artist:toby-fox]]
diff --git a/album/blue-room.yaml b/album/blue-room.yaml
index b063d72a..ea0b5d85 100644
--- a/album/blue-room.yaml
+++ b/album/blue-room.yaml
@@ -21,7 +21,8 @@ Commentary: |-
 
     IT'S BLUE
 Crediting Sources: |-
-    <i>Pascal van den Bos:</i> ([Bandcamp credits blurb](https://potatoboss.bandcamp.com/album/blue-room), excerpt)
+    @@ [Bandcamp credits blurb](https://potatoboss.bandcamp.com/album/blue-room), excerpt
+
     Cover art:<br>
     Picture by: [[artist:zorah-lagerwerf]]
 
@@ -85,7 +86,7 @@ Lyrics: |-
 
     (Huh, waar is het laatste akkoordje, DANGIT)
 Crediting Sources: |-
-    <i>Pascal van den Bos:</i> ([Bandcamp credits blurb](https://potatoboss.bandcamp.com/track/blue-room))
+    @@ [Bandcamp credits blurb](https://potatoboss.bandcamp.com/track/blue-room)
 
     Vocals, Piano & Bass by: [[artist:edward-esser]]
 
@@ -152,7 +153,7 @@ Lyrics: |-
     It should be right, up all night
     But first I gotta know what your skin looks like girl
 Crediting Sources: |-
-    <i>Pascal van den Bos:</i> ([Bandcamp credits blurb](https://potatoboss.bandcamp.com/track/got-no-clue))
+    @@ [Bandcamp credits blurb](https://potatoboss.bandcamp.com/track/got-no-clue)
 
     Drums, Bass, Horns, Strings, Saxophone & Mixing by: [[artist:pascal-van-den-bos]]
 
@@ -207,12 +208,12 @@ Lyrics: |-
     I want you every day, please don't go away
     I want you in my life
 Crediting Sources: |-
-    <i>Pascal van den Bos:</i> ([Bandcamp credits blurb](https://potatoboss.bandcamp.com/track/on-my-mind), excerpt)
+    @@ [Bandcamp credits blurb](https://potatoboss.bandcamp.com/track/on-my-mind), excerpt
 
     Piano & Vocals by: [[artist:edward-esser]]
 
     Synths, Bass, Drums, Strings, Oboe, Saxophone, Glockenspiel & Mixing by: [[artist:pascal-van-den-bos]]
 Referencing Sources: |-
-    <i>Pascal van den Bos:</i> ([Bandcamp credits blurb](https://potatoboss.bandcamp.com/track/on-my-mind), excerpt)
+    @@ [Bandcamp credits blurb](https://potatoboss.bandcamp.com/track/on-my-mind), excerpt
 
     [[Rock Your Baby]] by: [[artist:george-mccrae]]
diff --git a/album/chained-official-soundtrack.yaml b/album/chained-official-soundtrack.yaml
index b533ec39..c3200393 100644
--- a/album/chained-official-soundtrack.yaml
+++ b/album/chained-official-soundtrack.yaml
@@ -186,15 +186,15 @@ URLs:
 - https://gryotharian.bandcamp.com/track/5-headed-ouroboros
 Commentary: |-
     <i>Gryotharian:</i> ([Bandcamp about blurb](https://gryotharian.bandcamp.com/track/5-headed-ouroboros))
-    A story that eats itself.
-    The threads are unravelling
-    Like
-    Spaghetti.
-    Someone ought to start slurping those up.
+    A story that eats itself.<br>
+    The threads are unravelling<br>
+    Like<br>
+    Spaghetti.<br>
+    Someone ought to start slurping those up.<br>
     Perhaps someone will.
 
-    Have you examined your cardigan lately?
-    I haven't.
+    Have you examined your cardigan lately?<br>
+    I haven't.<br>
     I'm overdu3.
 ---
 Track: City of SBIRB
diff --git a/album/chaos-sisters-original-soundtrack.yaml b/album/chaos-sisters-original-soundtrack.yaml
index 08a98ac5..c9c6700b 100644
--- a/album/chaos-sisters-original-soundtrack.yaml
+++ b/album/chaos-sisters-original-soundtrack.yaml
@@ -21,43 +21,47 @@ Groups:
 - Beyond
 Commentary: |-
     <i>Marcy Nabors:</i> ([Bandcamp about blurb](https://shadolith.bandcamp.com/album/chaos-sisters-original-soundtrack))
-    The original soundtrack for the game Chaos Sisters by TukeArt!
+    The original soundtrack for the game Chaos Sisters by [[artist:tukeart|TukeArt]]!
 
     https://store.steampowered.com/app/2664300/Chaos_Sisters/
 Crediting Sources: |-
-    <i>Marcy Nabors:</i> ([Bandcamp credits blurb](https://shadolith.bandcamp.com/album/chaos-sisters-original-soundtrack))
-    Cover art by TukeArt (Tuukka Saarenketo) - tukeart.bsky.social
+    @@ [Bandcamp credits blurb](https://shadolith.bandcamp.com/album/chaos-sisters-original-soundtrack), excerpt
 
-    Music by Marcy Nabors, Tuukka Saarenketo, and Jaakko Saarenketo
-    Mastered by Marcy Nabors
+    Cover art by [[artist:tukeart|TukeArt (Tuukka Saarenketo)]]
+
+    Music by [[artist:marcy-nabors]], [[artist:tukeart|Tuukka Saarenketo]], and [[artist:jaakko-saarenketo]]<br>
+    Mastered by [[artist:marcy-nabors]]
 ---
 Track: Bickering Thorns
 Duration: 2:16
 Artists:
 - Marcy Nabors
-- TukeArt
+- TukeArt (as Tuukka Saarenketo)
 URLs:
 - https://shadolith.bandcamp.com/track/bickering-thorns
 Crediting Sources: |-
-    <i>Marcy Nabors:</i> ([Bandcamp credits blurb](https://shadolith.bandcamp.com/track/bickering-thorns))
-    Composed by Marcy Nabors and Tuukka Saarenketo
-    Arranged by Marcy Nabors
+    @@ [Bandcamp credits blurb](https://shadolith.bandcamp.com/track/bickering-thorns)
+
+    Composed by [[artist:marcy-nabors]] and [[artist:tukeart|Tuukka Saarenketo]]<br>
+    Arranged by [[artist:marcy-nabors]]
 ---
 Track: Embers in the Shadows
 Duration: 1:17
 URLs:
 - https://shadolith.bandcamp.com/track/embers-in-the-shadows
 Crediting Sources: |-
-    <i>Marcy Nabors:</i> ([Bandcamp credits blurb](https://shadolith.bandcamp.com/track/embers-in-the-shadows))
-    Composed and Arranged by Marcy Nabors
+    @@ [Bandcamp credits blurb](https://shadolith.bandcamp.com/track/embers-in-the-shadows)
+
+    Composed and Arranged by [[artist:marcy-nabors]]
 ---
 Track: Shining in the Darkness
 Duration: 6:57
 URLs:
 - https://shadolith.bandcamp.com/track/shining-in-the-darkness
 Crediting Sources: |-
-    <i>Marcy Nabors:</i> ([Bandcamp credits blurb](https://shadolith.bandcamp.com/track/shining-in-the-darkness))
-    Composed and arranged by Marcy Nabors
+    @@ [Bandcamp credits blurb](https://shadolith.bandcamp.com/track/shining-in-the-darkness)
+
+    Composed and arranged by [[artist:marcy-nabors]]
 ---
 Track: Trial by Fire
 Suffix Directory: true
@@ -66,24 +70,27 @@ Duration: 1:39
 URLs:
 - https://shadolith.bandcamp.com/track/trial-by-fire
 Crediting Sources: |-
-    <i>Marcy Nabors:</i> ([Bandcamp credits blurb](https://shadolith.bandcamp.com/track/trial-by-fire))
-    Composed and arranged by Marcy Nabors
+    @@ [Bandcamp credits blurb](https://shadolith.bandcamp.com/track/trial-by-fire)
+
+    Composed and arranged by [[artist:marcy-nabors]]
 ---
 Track: Monument to Betrayal
 Duration: 4:16
 URLs:
 - https://shadolith.bandcamp.com/track/monument-to-betrayal
 Crediting Sources: |-
-    <i>Marcy Nabors:</i> ([Bandcamp credits blurb](https://shadolith.bandcamp.com/track/monument-to-betrayal))
-    Composed and arranged by Marcy Nabors
+    @@ [Bandcamp credits blurb](https://shadolith.bandcamp.com/track/monument-to-betrayal)
+
+    Composed and arranged by [[artist:marcy-nabors]]
 ---
 Track: Under the Crystal Sky
 Duration: 4:01
 URLs:
 - https://shadolith.bandcamp.com/track/under-the-crystal-sky
 Crediting Sources: |-
-    <i>Marcy Nabors:</i> ([Bandcamp credits blurb](https://shadolith.bandcamp.com/track/under-the-crystal-sky))
-    Composed and arranged by Marcy Nabors
+    @@ [Bandcamp credits blurb](https://shadolith.bandcamp.com/track/under-the-crystal-sky)
+
+    Composed and arranged by [[artist:marcy-nabors]]
 ---
 Track: Grave Demeanour
 Duration: 4:04
@@ -92,67 +99,74 @@ Artists:
 URLs:
 - https://shadolith.bandcamp.com/track/grave-demeanour
 Crediting Sources: |-
-    <i>Marcy Nabors:</i> ([Bandcamp credits blurb](https://shadolith.bandcamp.com/track/grave-demeanour))
-    Composed and arranged by Jaakko Saarenketo
+    @@ [Bandcamp credits blurb](https://shadolith.bandcamp.com/track/grave-demeanour)
+
+    Composed and arranged by [[artist:jaakko-saarenketo]]
 ---
 Track: The Silence Before
 Duration: 3:58
 URLs:
 - https://shadolith.bandcamp.com/track/the-silence-before
 Crediting Sources: |-
-    <i>Marcy Nabors:</i> ([Bandcamp credits blurb](https://shadolith.bandcamp.com/track/the-silence-before))
-    Composed and arranged by Marcy Nabors
+    @@ [Bandcamp credits blurb](https://shadolith.bandcamp.com/track/the-silence-before)
+
+    Composed and arranged by [[artist:marcy-nabors]]
 ---
 Track: Souls to Waste
 Duration: 2:22
 URLs:
 - https://shadolith.bandcamp.com/track/souls-to-waste
 Crediting Sources: |-
-    <i>Marcy Nabors:</i> ([Bandcamp credits blurb](https://shadolith.bandcamp.com/track/souls-to-waste))
-    Composed and arranged by Marcy Nabors
+    @@ [Bandcamp credits blurb](https://shadolith.bandcamp.com/track/souls-to-waste)
+
+    Composed and arranged by [[artist:marcy-nabors]]
 ---
 Track: Breaching Rancor
 Duration: 4:05
 URLs:
 - https://shadolith.bandcamp.com/track/breaching-rancor
 Crediting Sources: |-
-    <i>Marcy Nabors:</i> ([Bandcamp credits blurb](https://shadolith.bandcamp.com/track/breaching-rancor))
-    Composed and arranged by Marcy Nabors
+    @@ [Bandcamp credits blurb](https://shadolith.bandcamp.com/track/breaching-rancor)
+
+    Composed and arranged by [[artist:marcy-nabors]]
 ---
 Track: Price of Hatred
 Duration: 6:10
 Artists:
 - Marcy Nabors
-- TukeArt
+- TukeArt (as Tuukka Saarenketo)
 URLs:
 - https://shadolith.bandcamp.com/track/price-of-hatred
 Crediting Sources: |-
-    <i>Marcy Nabors:</i> ([Bandcamp credits blurb](https://shadolith.bandcamp.com/track/price-of-hatred))
-    Composed by Marcy Nabors and Tuukka Saarenketo
-    Arranged by Marcy Nabors
+    @@ [Bandcamp credits blurb](https://shadolith.bandcamp.com/track/price-of-hatred)
+
+    Composed by [[artist:marcy-nabors]] and [[artist:tukeart|Tuukka Saarenketo]]<br>
+    Arranged by [[artist:marcy-nabors]]
 ---
 Track: Will Echoing Through History
 Duration: 2:31
 Artists:
 - Marcy Nabors
-- TukeArt
+- TukeArt (as Tuukka Saarenketo)
 URLs:
 - https://shadolith.bandcamp.com/track/will-echoing-through-history
 Crediting Sources: |-
-    <i>Marcy Nabors:</i> ([Bandcamp credits blurb](https://shadolith.bandcamp.com/track/will-echoing-through-history))
-    Composed by Marcy Nabors and Tuukka Saarenketo
+    @@ [Bandcamp credits blurb](https://shadolith.bandcamp.com/track/will-echoing-through-history)
+
+    Composed by Marcy Nabors and [[artist:tukeart|Tuukka Saarenketo]]<br>
     Arranged by Marcy Nabors
 ---
 Track: Father Below
 Duration: 3:55
 Artists:
 - Marcy Nabors
-- TukeArt
+- TukeArt (as Tuukka Saarenketo)
 Referenced Tracks:
 - Will Echoing Through History
 URLs:
 - https://shadolith.bandcamp.com/track/father-below
 Crediting Sources: |-
-    <i>Marcy Nabors:</i> ([Bandcamp credits blurb](https://shadolith.bandcamp.com/track/father-below))
-    Composed by Marcy Nabors and Tuukka Saarenketo
+    @@ [Bandcamp credits blurb](https://shadolith.bandcamp.com/track/father-below)
+
+    Composed by Marcy Nabors and [[artist:tukeart|Tuukka Saarenketo]]<br>
     Arranged by Marcy Nabors
diff --git a/album/class-act-b-side.yaml b/album/class-act-b-side.yaml
index 4a79c271..a34d7407 100644
--- a/album/class-act-b-side.yaml
+++ b/album/class-act-b-side.yaml
@@ -40,15 +40,17 @@ URLs:
 Referenced Tracks:
 - Accept My Shaft
 Commentary: |-
-    <i>Funk McLovin:</i> ([Bandcamp about blurb](https://funkmclovin.bandcamp.com/track/accept-my-shaft), excerpt)
-
-    Originally by Ninja Sex Party (Daniel Avidan and Brian Wecht)
-
     <i>Funk McLovin:</i> ([YouTube description](https://www.youtube.com/watch?v=IDt2HHrjqC0), excerpt)
 
     Month 2 of Song A Day kicks off with a favorite: ACCEPT MY SHAFT
+Referencing Sources: |-
+    @@ [Bandcamp about blurb](https://funkmclovin.bandcamp.com/track/accept-my-shaft), excerpt
+
+    Originally by Ninja Sex Party (Daniel Avidan and Brian Wecht)
 
-    Original song by NINJA SEX PARTY: [youtube.com/watch?v=nxvz325stqw](https://www.youtube.com/watch?v=nxvz325stqw)
+    @@ [YouTube description](https://www.youtube.com/watch?v=IDt2HHrjqC0), excerpt
+
+    Original song by NINJA SEX PARTY
 ---
 Track: Get It On
 Suffix Directory: true
@@ -64,13 +66,13 @@ URLs:
 Referenced Tracks:
 - Get It On
 Commentary: |-
-    <i>Funk McLovin:</i> ([Bandcamp about blurb](https://funkmclovin.bandcamp.com/track/get-it-on), excerpt)
-
-    Originally by Bill Chase
-
     <i>Funk McLovin:</i> ([YouTube description](https://www.youtube.com/watch?v=TALiw8ahfzA), excerpt)
 
     This one's an old favorite. Enjoy.
+Referencing Sources: |-
+    @@ [Bandcamp about blurb](https://funkmclovin.bandcamp.com/track/get-it-on), excerpt
+
+    Originally by Bill Chase
 ---
 Track: LAWNMOWER
 Suffix Directory: true
@@ -80,12 +82,12 @@ URLs:
 - https://www.youtube.com/watch?v=eOxJH4XCHjE
 Referenced Tracks:
 - track:lawnmower-neil-cicierega
-Commentary: |-
-    <i>Funk McLovin:</i> ([Bandcamp about blurb](https://funkmclovin.bandcamp.com/track/lawnmower), excerpt)
+Referencing Sources: |-
+    @@ [Bandcamp about blurb](https://funkmclovin.bandcamp.com/track/lawnmower), excerpt
 
     Originally by Lemon Demon (Niel Cicierga)
 
-    <i>Funk McLovin:</i> ([YouTube description](https://www.youtube.com/watch?v=eOxJH4XCHjE), excerpt)
+    @@ [YouTube description](https://www.youtube.com/watch?v=eOxJH4XCHjE), excerpt
 
     Originally by Lemon Demon
 ---
@@ -102,17 +104,19 @@ URLs:
 Referenced Tracks:
 - Lonely Rolling Star
 Commentary: |-
-    <i>Funk McLovin:</i> ([Bandcamp about blurb](https://funkmclovin.bandcamp.com/track/lonely-rolling-star-english), excerpt)
+    @@ [YouTube description](https://www.youtube.com/watch?v=Vt4VSTqOUdg), excerpt
+
+    Song-a-day 234
+Referencing Sources: |-
+    @@ [Bandcamp about blurb](https://funkmclovin.bandcamp.com/track/lonely-rolling-star-english), excerpt
 
     Lyrics: [katamari.fandom.com/wiki/Lonely_Rolling_Star](https://katamari.fandom.com/wiki/Lonely_Rolling_Star?oldid=15479)
 
     Originally featured in Katamari Damacy
 
-    <i>Funk McLovin:</i> ([YouTube description](https://www.youtube.com/watch?v=Vt4VSTqOUdg), excerpt)
+    @@ [YouTube description](https://www.youtube.com/watch?v=Vt4VSTqOUdg), excerpt
 
     Loosely based on: [katamari.fandom.com/wiki/Lonely_Rolling_Star](https://katamari.fandom.com/wiki/Lonely_Rolling_Star?oldid=15479)
-
-    Song-a-day 234
 ---
 Track: Hey Baby
 Suffix Directory: true
@@ -127,8 +131,8 @@ URLs:
 - https://www.youtube.com/watch?v=r7RbFsG2TOg
 Referenced Tracks:
 - Hey! Baby
-Commentary: |-
-    <i>Funk McLovin:</i> ([Bandcamp about blurb](https://funkmclovin.bandcamp.com/track/hey-baby), excerpt)
+Referencing Sources: |-
+    @@ [Bandcamp about blurb](https://funkmclovin.bandcamp.com/track/hey-baby), excerpt
 
     Originally by Bruce Chanel
 ---
@@ -145,8 +149,8 @@ URLs:
 - https://www.youtube.com/watch?v=gBaWWnmNtNU
 Referenced Tracks:
 - track:fever-little-willie-john
-Commentary: |-
-    <i>Funk McLovin:</i> ([Bandcamp about blurb](https://funkmclovin.bandcamp.com/track/fever), excerpt)
+Referencing Sources: |-
+    @@ [Bandcamp about blurb](https://funkmclovin.bandcamp.com/track/fever), excerpt
 
     Traditional Jazz
 ---
@@ -158,15 +162,17 @@ URLs:
 Referenced Tracks:
 - I Am A Man Of Constant Sorrow
 Commentary: |-
-    <i>Funk McLovin:</i> ([Bandcamp about blurb](https://funkmclovin.bandcamp.com/track/man-of-constant-sorrow), excerpt)
-
-    Originally featured in the film "O Brother Where Art Thou?"
-
     <i>Funk McLovin:</i> ([YouTube description](https://www.youtube.com/watch?v=mKyqO5LIw6w), excerpt)
 
     A song about loss and love. Watch "O Brother Where Art Thou"
 
+    @@ [YouTube description](https://www.youtube.com/watch?v=mKyqO5LIw6w), excerpt
+
     Song a Day Day 55
+Referencing Sources: |-
+    @@ [Bandcamp about blurb](https://funkmclovin.bandcamp.com/track/man-of-constant-sorrow), excerpt
+
+    Originally featured in the film "O Brother Where Art Thou?"
 ---
 Track: Teenagers
 Suffix Directory: true
@@ -182,15 +188,17 @@ URLs:
 Referenced Tracks:
 - track:teenagers-my-chemical-romance
 Commentary: |-
-    <i>Funk McLovin:</i> ([Bandcamp about blurb](https://funkmclovin.bandcamp.com/track/teenagers), excerpt)
+    @@ [YouTube description](https://www.youtube.com/watch?v=s9a-ddeXY80), excerpt
+
+    Song-a-day 189
+Referencing Sources: |-
+    @@ [Bandcamp about blurb](https://funkmclovin.bandcamp.com/track/teenagers), excerpt
 
     Originally by My Chemical Romance (Brendon Urie)
 
-    <i>Funk McLovin:</i> ([YouTube description](https://www.youtube.com/watch?v=s9a-ddeXY80), excerpt)
+    @@ [YouTube description](https://www.youtube.com/watch?v=s9a-ddeXY80), excerpt, excerpt
 
     Originally by My Chemical Romance
-
-    Song-a-day 189
 ---
 Track: Rainbow Connection
 Suffix Directory: true
@@ -201,12 +209,14 @@ URLs:
 Referenced Tracks:
 - Rainbow Connection
 Commentary: |-
-    <i>Funk McLovin:</i> ([Bandcamp about blurb](https://funkmclovin.bandcamp.com/track/rainbow-connection), excerpt)
+    <i>Funk McLovin:</i> ([YouTube description](https://www.youtube.com/watch?v=dpfBbrJwcDg), excerpt)
 
-    Originally by the Muppets (Jim Henson)
+    This one was fun! I choose to interpret this as a gay anthem.
 
-    <i>Funk McLovin:</i> ([YouTube description](https://www.youtube.com/watch?v=dpfBbrJwcDg), excerpt)
+    @@ [YouTube description](https://www.youtube.com/watch?v=dpfBbrJwcDg), excerpt
 
     Song A Day 2020 Day 54
+Referencing Sources: |-
+    @@ [Bandcamp about blurb](https://funkmclovin.bandcamp.com/track/rainbow-connection), excerpt
 
-    This one was fun! I choose to interpret this as a gay anthem.
+    Originally by the Muppets (Jim Henson)
diff --git a/album/class-act.yaml b/album/class-act.yaml
index 620f6ab3..54929e12 100644
--- a/album/class-act.yaml
+++ b/album/class-act.yaml
@@ -72,15 +72,17 @@ URLs:
 - https://music.apple.com/album/the-devil-was-beautiful/1643021697?i=1643021701
 - https://www.youtube.com/watch?v=FD6Y7Cqul_c
 Commentary: |-
-    <i>Funk McLovin:</i> ([Bandcamp about blurb](https://funkmclovin.bandcamp.com/track/the-devil-was-beautiful), excerpt)
-
-    Lyrics by Davi: [(Dead Wordpress link)](https://home.blog/2020/05/02/the-devil-was-beautiful/)
-
     <i>Funk McLovin:</i> ([YouTube description](https://www.youtube.com/watch?v=FD6Y7Cqul_c), excerpt)
 
-    Special thanks to ADRI for the wonderful lyrics. As always, you're a devil-lover.
+    Special thanks to [[artist:davi|ADRI]] for the wonderful lyrics. As always, you're a devil-lover.
+
+    @@ [YouTube description](https://www.youtube.com/watch?v=FD6Y7Cqul_c), excerpt
 
     Song a Day 139
+Referencing Sources: |-
+    <i>Funk McLovin:</i> ([Bandcamp about blurb](https://funkmclovin.bandcamp.com/track/the-devil-was-beautiful), excerpt)
+
+    Lyrics by Davi: [(Dead Wordpress link)](https://home.blog/2020/05/02/the-devil-was-beautiful/)
 
     <i>Quasar Nebula:</i> (wiki editor, 8/18/2024)
 
@@ -101,7 +103,7 @@ URLs:
 - https://music.apple.com/album/away/1643021697?i=1643021703
 - https://www.youtube.com/watch?v=GGkP5ejgtac
 Commentary: |-
-    <i>Funk McLovin:</i> ([YouTube description](https://www.youtube.com/watch?v=GGkP5ejgtac), excerpt)
+    @@ [YouTube description](https://www.youtube.com/watch?v=GGkP5ejgtac), excerpt
 
     Song a Day 71
 ---
@@ -118,7 +120,7 @@ URLs:
 - https://music.apple.com/album/im-in-love-with-mothman/1643021697?i=1643021704
 - https://www.youtube.com/watch?v=EGYkkQowP40
 Commentary: |-
-    <i>Funk McLovin:</i> ([YouTube description](https://www.youtube.com/watch?v=EGYkkQowP40), excerpt)
+    @@ [YouTube description](https://www.youtube.com/watch?v=EGYkkQowP40), excerpt
 
     Previously: Spooktober Day 24
 ---
@@ -154,7 +156,9 @@ Additional Names:
     [YouTube title](https://www.youtube.com/watch?v=orO3kCI8Oe0)
 Artists:
 - Funk McLovin
-- Davi
+- Davi (featuring)
+Contributors:
+- Davi (lyrics, vocals)
 Duration: 0:58
 URLs:
 - https://funkmclovin.bandcamp.com/track/button-eyes-ft-davi
@@ -162,15 +166,17 @@ URLs:
 - https://music.apple.com/album/button-eyes-feat-davi/1643021697?i=1643021706
 - https://www.youtube.com/watch?v=orO3kCI8Oe0
 Commentary: |-
-    <i>Funk McLovin:</i> ([Bandcamp about blurb](https://funkmclovin.bandcamp.com/track/button-eyes-ft-davi), excerpt)
-
-    Lyrics and Vocals by Davi
-
     <i>Funk McLovin:</i> ([YouTube description](https://www.youtube.com/watch?v=orO3kCI8Oe0), excerpt)
 
-    Thanks to ADRI for the singing and the lyrics!
+    Thanks to [[artist:davi|ADRI]] for the singing and the lyrics!
+
+    @@ [YouTube description](https://www.youtube.com/watch?v=orO3kCI8Oe0), excerpt
 
     Song-a-day 211
+Crediting Sources: |-
+    @@ [Bandcamp about blurb](https://funkmclovin.bandcamp.com/track/button-eyes-ft-davi), excerpt
+
+    Lyrics and Vocals by [[artist:davi|Davi]]
 ---
 Track: Japanese Spider Crab
 Additional Names:
@@ -185,15 +191,17 @@ URLs:
 - https://music.apple.com/album/japanese-spider-crab/1643021697?i=1643021707
 - https://www.youtube.com/watch?v=sOUscy6ycK4
 Commentary: |-
-    <i>Funk McLovin:</i> ([Bandcamp about blurb](https://funkmclovin.bandcamp.com/track/japanese-spider-crab))
-
-    Formerly part of the ANIMALIA LP: [(Dead YouTube link)](https://www.youtube.com/playlist?list=PLOVvrdnGToXVRCM2rFQGMxfbLuGJRYSQh)
-
     <i>Funk McLovin:</i> ([YouTube description](https://www.youtube.com/watch?v=sOUscy6ycK4), excerpt)
 
     A song about my favorite crustacean...
 
+    @@ [YouTube description](https://www.youtube.com/watch?v=sOUscy6ycK4), excerpt
+
     Song-A-Day 195
+
+    @@ [Bandcamp about blurb](https://funkmclovin.bandcamp.com/track/japanese-spider-crab)
+
+    Formerly part of the ANIMALIA LP: [(dead YouTube link)](https://www.youtube.com/playlist?list=PLOVvrdnGToXVRCM2rFQGMxfbLuGJRYSQh)
 ---
 Track: Sneaky People Exploding In Love
 Additional Names:
@@ -208,7 +216,7 @@ URLs:
 - https://music.apple.com/album/sneaky-people-exploding-in-love/1643021697?i=1643021708
 - https://www.youtube.com/watch?v=Em42RIev5SA
 Commentary: |-
-    <i>Funk McLovin:</i> ([YouTube description](https://www.youtube.com/watch?v=Em42RIev5SA), excerpt)
+    @@ [YouTube description](https://www.youtube.com/watch?v=Em42RIev5SA), excerpt
 
     Song A Day 75
 ---
@@ -231,6 +239,8 @@ Commentary: |-
 
     Special thanks to ROXY and the PARADOX MUSIC TEAM
 
+    @@ [YouTube description](https://www.youtube.com/watch?v=cAOcj-fjY_Y), excerpt
+
     Song A Day 176
 ---
 Track: WAKE UP
@@ -241,6 +251,6 @@ URLs:
 - https://music.apple.com/album/wake-up/1643021697?i=1643021710
 - https://www.youtube.com/watch?v=_Nk-3mJg6o8
 Commentary: |-
-    <i>Funk McLovin:</i> ([YouTube description](https://www.youtube.com/watch?v=_Nk-3mJg6o8), excerpt)
+    @@ [YouTube description](https://www.youtube.com/watch?v=_Nk-3mJg6o8), excerpt
 
     Song a DAy 80
diff --git a/album/the-funk-mclovin-homestuck-experience.yaml b/album/the-funk-mclovin-homestuck-experience.yaml
index a38ca567..7c88f307 100644
--- a/album/the-funk-mclovin-homestuck-experience.yaml
+++ b/album/the-funk-mclovin-homestuck-experience.yaml
@@ -174,6 +174,8 @@ Commentary: |-
 
     A Homestuck fan song inspired by Jade Harley's pacific island and what growing up on it must have been like.
 
+    @@ [YouTube description](https://www.youtube.com/watch?v=y0jzBu7IZWU), excerpt
+
     [Song A Day 52]
 ---
 Track: GameGoth
@@ -225,7 +227,7 @@ Lyrics: |-
     Another victim claimed to the darkest gaming ace
     Hahahaha!
 Commentary: |-
-    <i>Funk McLovin:</i> ([Bandcamp about blurb](https://funkmclovin.bandcamp.com/track/gamegoth))
+    @@ [Bandcamp about blurb](https://funkmclovin.bandcamp.com/track/gamegoth)
 
     Made for the GOTHSTUCK ZINE: [twitter.com/gothstuckzine](https://x.com/gothstuckzine)
 
@@ -237,6 +239,8 @@ Commentary: |-
     [[GameBro (Original 1990 Mix)]]<br>
     [[GameGrl (Original 1993 Mix)]]
 
+    @@ [YouTube description](https://www.youtube.com/watch?v=QLHdyAM4ujs), excerpt
+
     [Song a Day 2020 Day 28]
 ---
 Track: Less Pale, More Pail
@@ -275,9 +279,11 @@ Lyrics: |-
 Commentary: |-
     <i>Funk McLovin:</i> ([YouTube description](https://www.youtube.com/watch?v=LYQj9F5fLMI), excerpt)
 
-    Song A Day: Day 41
-
     I don't even like Cronus.
+
+    @@ [YouTube description](https://www.youtube.com/watch?v=LYQj9F5fLMI), excerpt
+
+    Song A Day: Day 41
 ---
 Track: 'Steel Bastille: Heart of Light, Crown of Thorns'
 Date First Released: February 26, 2020
@@ -299,6 +305,8 @@ Commentary: |-
 
     A Rose Lalonde Robot fan song. I was vibin'.
 
+    @@ [YouTube description](https://www.youtube.com/watch?v=8DDPym9XkRk), excerpt
+
     Song a Day 57
 ---
 Track: Vrissy's Theme
@@ -312,16 +320,22 @@ Duration: 2:29
 URLs:
 - https://funkmclovin.bandcamp.com/track/vrissys-theme
 - https://www.youtube.com/watch?v=w86Mq0kLnwQ
+Referenced Tracks:
+- Vriska's Theme
 Commentary: |-
     <i>Funk McLovin:</i> ([Bandcamp about blurb](https://funkmclovin.bandcamp.com/track/vrissys-theme))
 
     I used the chords for [[Vriska's Theme]] in this.
 
-    <i>Funk McLovin:</i> ([YouTube description](https://www.youtube.com/watch?v=w86Mq0kLnwQ), excerpt)
+    @@ [YouTube description](https://www.youtube.com/watch?v=w86Mq0kLnwQ), excerpt
 
     Song-a-day Day 2: Vrissy's Theme
 
     This is not an official track. Homestuck^2 and Vrissy belong to What Pumpkin Studios.
+Referencing Sources: |-
+    <i>[[artist:quasar-nebula|Lan]]:</i> (wiki editor, 2/11/2026)
+
+    For future reference, there was a whole conversation between me and [[artist:ruby]] over whether or not this counts as a track reference. ([#hsmusic-chat](https://discord.com/channels/749042497610842152/779895315750715422/1471107576249716797), today)
 ---
 Track: Vogue Rogue
 Date First Released: January 6, 2020
@@ -335,11 +349,11 @@ URLs:
 - https://funkmclovin.bandcamp.com/track/vogue-rogue
 - https://www.youtube.com/watch?v=ttk-q7BonIE
 Commentary: |-
-    <i>Funk McLovin:</i> ([Bandcamp about blurb](https://funkmclovin.bandcamp.com/track/vogue-rogue))
+    @@ [Bandcamp about blurb](https://funkmclovin.bandcamp.com/track/vogue-rogue)
 
     Roxy Lalonde
 
-    <i>Funk McLovin:</i> ([YouTube description](https://www.youtube.com/watch?v=ttk-q7BonIE), excerpt)
+    @@ [YouTube description](https://www.youtube.com/watch?v=ttk-q7BonIE), excerpt
 
     Song-a-Day 6
 
@@ -402,6 +416,8 @@ Commentary: |-
 
     SPECIAL THANKS TO ZERROX for the loop : )
 
+    @@ [YouTube description](https://www.youtube.com/watch?v=btUK0HAPXeQ), excerpt
+
     Song a Day 2020 number 94
 ---
 Track: Vriska's Theme (Off The Shits Edition)
diff --git a/static-page/changelog.yaml b/static-page/changelog.yaml
index 9a48df41..8113778e 100644
--- a/static-page/changelog.yaml
+++ b/static-page/changelog.yaml
@@ -375,6 +375,7 @@ Content: |-
         - changed [[track:familiar-unbeatable-demo-tapes]] to be by [[artist:unbeatable]], rather than by [[artist:peak-divide]] and [[artist:rj-lake]]
         - changed [[track:homework-salad-by-night]] to be by [[artist:vasily-nikolaev]], rather than by [[artist:peak-divide]] (or [[artist:unbeatable]])
     - changed [[track:the-adventure-continues-for-horizon-heights-act-1]], [[track:before-the-sequel-title-screen]], and [[track:breakfast-time-for-horizon-heights-boss-act-phase-2]] to credit "franchise" artist [[artist:sonic-the-hedgehog-fanmedia]] instead of [[artist:sonic-the-hedgehog]] (thanks, Lan, ruby, Cello!)
+    - changed track credits across [[album:chaos-sisters-original-soundtrack]] to credit [[artist:tukeart]] as Tuukka Saarenketo
     <!-- structural or organizational changes for art tags -->
     - sorted tags which fall under various [[tag:location-classifications]], including [[tag:astronomical-bodies]] and [[tag:locations-in-the-medium]], alphabetically (thanks, Lan!)
     - moved [[tag:deer-desynced]] tag out of removed "Consorts (Desynced)" tag, now directly under [[tag:characters-from-desynced]] instead (thanks, Lan, Jebb!)
@@ -661,6 +662,7 @@ Content: |-
     - fixed Bandcamp credits blurb for [[album:jailbreak-vol-1]] listing [[artist:cadalyst]] instead of [[artist:rebecca-harding]] (thanks, Lilith!)
     - fixed some sneaky capitalization errors where the name of the track on the wiki was used, instead of the capitalization written in source commentary, in [[track:dance-stab-dance]], [[track:a-life-worth-living]], and [[track:cinders-oceanfalls]] (thanks, Lan!)
     - fixed some line break errors in commentary or other content text for [[track:vivid-spectrum]], [[track:versus-hardmode-remix]], [[track:remains-of-formed-pain]], [[album:grim-chain-of-feast]], [[album:demo-2019-2021-vicious-valor]], [[track:legion]], [[album:rites-of-bloodgrinded]], [[album:faces-of-oglogoth]], [[track:im-a-member-of-the-midnight-crew-soapstone]], [[track:adventurous-ascent-single-version]], and [[track:infinite-cataclysm]] (thanks, Tangle!)
+    - fixed some line break errors in commentary or other content text for [[track:5-headed-ouroboros]] and [[album:chaos-sisters-original-soundtrack]] (thanks, Lan!)
     - fixed broken image embed in [[track:aaaaaaaaaaaaa-post-canon-version]] (for "In the Court of the Crimson King")
     - made a handful of formatting or transcription tweaks across YouTube video commentary for [[album:of-troles-and-chiptumes]] (thanks, cookiefonster!)
     - fixed Bandcamp link in booklet commentary for [[track:dwelling-among-the-dream-bubbles]] (was to a functioning, but outdated, "the-divide-ep" URL; thanks, Lilith!)