« get me outta code hell

rest of initial artistless - hsmusic-data - Data files for https://hsmusic.wiki - track, album, artist & flash info, etc
summary refs log tree commit diff
diff options
context:
space:
mode:
author(quasar) nebula <qznebula@protonmail.com>2026-03-11 09:57:19 -0300
committer(quasar) nebula <qznebula@protonmail.com>2026-03-11 09:57:19 -0300
commit88b9383b6075c0be9dc2305d9a753b4e93816368 (patch)
tree82942ccde04046f9a6d9b4e91b3b153a17b22106
parentc8286121cc69f7fc9df7c77238f304612fe85afc (diff)
rest of initial artistless preview
-rw-r--r--album/de-novo.yaml25
-rw-r--r--album/dear-children.yaml4
-rw-r--r--album/deltarune-remixes-pascal.yaml6
-rw-r--r--album/empty-diary-soundcirclet-remix.yaml4
-rw-r--r--album/exile.yaml15
-rw-r--r--album/fallen-down-short-and-sweet-mix.yaml6
-rw-r--r--album/fatebreak-volume-1.yaml14
-rw-r--r--album/feelings-jam.yaml4
-rw-r--r--album/foresight-and-retrospect.yaml2
-rw-r--r--album/freeroam-volume-1.yaml2
-rw-r--r--album/gate.yaml16
-rw-r--r--album/glitch.yaml6
-rw-r--r--album/hivebreak-vol-1.yaml237
-rw-r--r--album/homestuck-beta-kid-themes-op-12.yaml24
-rw-r--r--album/i-warned-you-about-stairs.yaml8
-rw-r--r--album/im-here-for-the-future.yaml2
-rw-r--r--album/in-isolation.yaml18
-rw-r--r--album/in-medias-res-autumn-cut.yaml4
-rw-r--r--album/infinite-cataclysm.yaml8
-rw-r--r--album/janestuck-volume-100.yaml2
-rw-r--r--album/janestuck-volume-2.yaml4
-rw-r--r--album/knife-to-meet-you.yaml2
-rw-r--r--album/loftlocked-vol-1.yaml3
-rw-r--r--album/make-music-throw-music.yaml6
-rw-r--r--album/mayhem-of-another-universe.yaml16
-rw-r--r--album/moonslayer.yaml10
-rw-r--r--album/paradox-struck-volume-1.yaml38
-rw-r--r--album/paths.yaml26
-rw-r--r--album/perfectly-generic-album-chaoticcomposer.yaml14
-rw-r--r--album/project-s-ost-vol-1.yaml4
-rw-r--r--album/project-skaia.yaml22
-rw-r--r--album/rust-apocalypse-anniversary-remaster.yaml2
-rw-r--r--album/sburb-beta.yaml14
-rw-r--r--album/shallow-shores.yaml2
-rw-r--r--album/so-i-herd-you-liek-homestuck.yaml42
-rw-r--r--album/someday-marcy-nabors.yaml4
-rw-r--r--album/stalemate-vol-2.yaml2
-rw-r--r--album/tale-of-arpege-clavier-chapter-1-of-92000000.yaml2
-rw-r--r--album/the-green-box-set-1.yaml84
-rw-r--r--album/the-homestuck-music-experience.yaml6
-rw-r--r--album/the-lands-of-scp-413.yaml12
-rw-r--r--album/the-mayview-mixtape.yaml28
-rw-r--r--album/the-planets.yaml42
-rw-r--r--album/the-underglow-knowledge-original-soundtrack.yaml5
-rw-r--r--album/uufo.yaml38
-rw-r--r--album/will-remix-for-food-remixes-vol-i.yaml60
-rw-r--r--artists.yaml9
-rw-r--r--static-page/changelog.yaml3
48 files changed, 508 insertions, 399 deletions
diff --git a/album/de-novo.yaml b/album/de-novo.yaml
index 2fc070e2..c7f24822 100644
--- a/album/de-novo.yaml
+++ b/album/de-novo.yaml
@@ -28,8 +28,10 @@ Duration: 1:21
 URLs:
 - https://viixyz.bandcamp.com/track/theme-cta
 Commentary: |-
-    <i>viixyz:</i> ([Bandcamp about blurb](https://viixyz.bandcamp.com/track/theme-cta))
+    @@ [Bandcamp about blurb](https://viixyz.bandcamp.com/track/theme-cta)
+
     *Can't Trust Anybody
+
     Theme of OCTOBER
 ---
 Track: Turnover
@@ -43,7 +45,8 @@ Duration: 1:32
 URLs:
 - https://viixyz.bandcamp.com/track/theme-turnover
 Commentary: |-
-    <i>viixyz:</i> ([Bandcamp about blurb](https://viixyz.bandcamp.com/track/theme-turnover))
+    @@ [Bandcamp about blurb](https://viixyz.bandcamp.com/track/theme-turnover)
+
     Theme of KODY DANIELS
 ---
 Track: XDXDHYPERSPACE!!!
@@ -56,7 +59,8 @@ Duration: 1:48
 URLs:
 - https://viixyz.bandcamp.com/track/theme-xdxdhyperspace
 Commentary: |-
-    <i>viixyz:</i> ([Bandcamp about blurb](https://viixyz.bandcamp.com/track/theme-xdxdhyperspace))
+    @@ [Bandcamp about blurb](https://viixyz.bandcamp.com/track/theme-xdxdhyperspace)
+
     Theme of REED SHIGIRA
 ---
 Track: Everstrife
@@ -69,7 +73,8 @@ Duration: 1:48
 URLs:
 - https://viixyz.bandcamp.com/track/theme-everstrife
 Commentary: |-
-    <i>viixyz:</i> ([Bandcamp about blurb](https://viixyz.bandcamp.com/track/theme-everstrife))
+    @@ [Bandcamp about blurb](https://viixyz.bandcamp.com/track/theme-everstrife)
+
     Theme of KATY CASANOV
 ---
 Track: CANCER.
@@ -82,7 +87,8 @@ Duration: 2:10
 URLs:
 - https://viixyz.bandcamp.com/track/theme-cancer
 Commentary: |-
-    <i>viixyz:</i> ([Bandcamp about blurb](https://viixyz.bandcamp.com/track/theme-cancer))
+    @@ [Bandcamp about blurb](https://viixyz.bandcamp.com/track/theme-cancer)
+
     Theme of WREN MOORMAN
 ---
 Section: DEMO
@@ -97,7 +103,8 @@ Duration: 1:57
 URLs:
 - https://viixyz.bandcamp.com/track/demo-broken-pages
 Commentary: |-
-    <i>viixyz:</i> ([Bandcamp about blurb](https://viixyz.bandcamp.com/track/demo-broken-pages))
+    @@ [Bandcamp about blurb](https://viixyz.bandcamp.com/track/demo-broken-pages)
+
     Rough idea that eventually became [[track:cta|CTA*]]
 ---
 Track: Catdirge
@@ -110,7 +117,8 @@ Duration: 1:08
 URLs:
 - https://viixyz.bandcamp.com/track/demo-catdirge
 Commentary: |-
-    <i>viixyz:</i> ([Bandcamp about blurb](https://viixyz.bandcamp.com/track/demo-catdirge))
+    @@ [Bandcamp about blurb](https://viixyz.bandcamp.com/track/demo-catdirge)
+
     Rough idea that eventually became [[XDXDHYPERSPACE!!!]]
 ---
 Track: just like a horror movie
@@ -123,7 +131,8 @@ Duration: 1:36
 URLs:
 - https://viixyz.bandcamp.com/track/demo-just-like-a-horror-movie
 Commentary: |-
-    <i>viixyz:</i> ([Bandcamp about blurb](https://viixyz.bandcamp.com/track/demo-just-like-a-horror-movie))
+    @@ [Bandcamp about blurb](https://viixyz.bandcamp.com/track/demo-just-like-a-horror-movie)
+
     Rough idea for a Wren song.
 ---
 Section: BONUS
diff --git a/album/dear-children.yaml b/album/dear-children.yaml
index 83e499b1..079dca8d 100644
--- a/album/dear-children.yaml
+++ b/album/dear-children.yaml
@@ -34,7 +34,7 @@ Referenced Tracks:
 URLs:
 - https://soundcloud.com/eidolonorpheus/chickadee-warped
 Commentary: |-
-    <i>Thomas Ferkol:</i> ([SoundCloud description](https://soundcloud.com/eidolonorpheus/chickadee-warped))
+    @@ [SoundCloud description](https://soundcloud.com/eidolonorpheus/chickadee-warped)
 
     A darker version of the Chickadee Cemetery theme from Dear Children ([dear-children.com](https://web.archive.org/web/20230910183429/http://dear-children.com/))
 ---
@@ -56,7 +56,7 @@ Track Artwork:
   Origin Details: >-
     From [page 265](https://web.archive.org/web/20180120044306/http://dear-children.com/comic/page_0265/)
 Commentary: |-
-    <i>Thomas Ferkol:</i> ([SoundCloud description](https://soundcloud.com/eidolonorpheus/page-265-dawn))
+    @@ [SoundCloud description](https://soundcloud.com/eidolonorpheus/page-265-dawn)
 
     [dear-children.com/comic/page_0265/](https://web.archive.org/web/20180120044306/http://dear-children.com/comic/page_0265/)
 ---
diff --git a/album/deltarune-remixes-pascal.yaml b/album/deltarune-remixes-pascal.yaml
index 21336be4..8720329d 100644
--- a/album/deltarune-remixes-pascal.yaml
+++ b/album/deltarune-remixes-pascal.yaml
@@ -25,7 +25,8 @@ Groups:
 - Pascal van den Bos
 - Beyond
 Crediting Sources: |-
-    <i>Pascal van den Bos:</i> ([Bandcamp credits blurb](https://potatoboss.bandcamp.com/album/deltarune-remixes), excerpt)
+    @@ [Bandcamp credits blurb](https://potatoboss.bandcamp.com/album/deltarune-remixes), excerpt
+
     Music by: [[artist:pascal-van-den-bos]]
 
     Art by: [[artist:moot]]
@@ -78,5 +79,6 @@ Referenced Tracks:
 URLs:
 - https://potatoboss.bandcamp.com/track/vs-susie-cover
 Crediting Sources: |-
-    <i>Pascal van den Bos:</i> ([Bandcamp credits blurb](https://potatoboss.bandcamp.com/track/vs-susie-cover), excerpt)
+    @@ [Bandcamp credits blurb](https://potatoboss.bandcamp.com/track/vs-susie-cover), excerpt
+
     Original transcription by: [[artist:caelan-kier]]
diff --git a/album/empty-diary-soundcirclet-remix.yaml b/album/empty-diary-soundcirclet-remix.yaml
index 19ee7a01..7dbeec5c 100644
--- a/album/empty-diary-soundcirclet-remix.yaml
+++ b/album/empty-diary-soundcirclet-remix.yaml
@@ -11,8 +11,8 @@ Cover Art File Extension: png
 Color: '#21a8d7'
 Groups:
 - Beyond
-Commentary: |-
-    <i>SoundCirclet:</i> ([Bandcamp credits blurb](https://soundcirclet.bandcamp.com/album/empty-diary-soundcirclet-remix))
+Crediting Sources: |-
+    @@ [Bandcamp credits blurb](https://soundcirclet.bandcamp.com/album/empty-diary-soundcirclet-remix)
 
     -ORIGINAL SONG CREDITS-
 
diff --git a/album/exile.yaml b/album/exile.yaml
index eda03cf8..552b268e 100644
--- a/album/exile.yaml
+++ b/album/exile.yaml
@@ -8,15 +8,16 @@ Groups:
 - Fandom
 URLs:
 - https://archive.org/details/exile-pinkushion
-Commentary: |-
-    <i>Bill Bolin:</i> ([Bandcamp credits blurb](https://web.archive.org/web/20100831100247/pinkushion.bandcamp.com/album/exile))
+Crediting Sources: |-
+    <i>Bill Bolin:</i> ([Bandcamp credits blurb](https://web.archive.org/web/20100831100247/pinkushion.bandcamp.com/album/exile), excerpt)
+
     Remixed works:<br>
-    [[Showtime (Original Mix)|"Showtime"]] written by [[artist:malcolm-brown|Malcom Brown]]<br>
-    [[Skies of Skaia|"Skies of Skaia"]] written by [[artist:mark-j-hadley|Mark Hadley]]<br>
+    [[Showtime (Original Mix)|"Showtime"]] written by [[artist:malcolm-brown]]<br>
+    [["Skies of Skaia"]] written by [[artist:mark-j-hadley]]<br>
     [[Beatdown (Strider Style)|"Beatdown"]] written by [[artist:curt-blakeslee]]<br>
-    [[Rediscover Fusion|"RS5"]] AKA [[Rediscover Fusion|"Rediscover Fusion"]] written by [[artist:burnedkirby]]<br>
-    [[Hawkeye|"Hawkeye"]] written by [[artist:toby-fox|Toby "Radiation" Fox]]<br>
-    [[Five-Four Stress|"Stress"]] written by [[artist:buzinkai|George Buzinkai]]
+    [[Rediscover Fusion|"RS5"]] AKA [["Rediscover Fusion"]] written by [[artist:burnedkirby]]<br>
+    [["Hawkeye"]] written by [[artist:toby-fox]]<br>
+    [[Five-Four Stress|"Stress"]] written by [[artist:buzinkai]]
 ---
 Track: Calamity
 Suffix Directory: true
diff --git a/album/fallen-down-short-and-sweet-mix.yaml b/album/fallen-down-short-and-sweet-mix.yaml
index 8effb79e..56e5dfd3 100644
--- a/album/fallen-down-short-and-sweet-mix.yaml
+++ b/album/fallen-down-short-and-sweet-mix.yaml
@@ -22,7 +22,9 @@ URLs:
 - https://potatoboss.bandcamp.com/track/fallen-down-short-and-sweet-mix
 Commentary: |-
     <i>Pascal van den Bos:</i> ([Bandcamp about blurb](https://potatoboss.bandcamp.com/track/fallen-down-short-and-sweet-mix))
+
     Happy 5th anniversary Undertale!
 Crediting Sources: |-
-    <i>Pascal van den Bos:</i> ([Bandcamp credits blurb](https://potatoboss.bandcamp.com/track/fallen-down-short-and-sweet-mix))
-    [["Fallen Down"]] by: Toby Fox
\ No newline at end of file
+    @@ [Bandcamp credits blurb](https://potatoboss.bandcamp.com/track/fallen-down-short-and-sweet-mix)
+
+    [["Fallen Down"]] by: Toby Fox
diff --git a/album/fatebreak-volume-1.yaml b/album/fatebreak-volume-1.yaml
index b3b394a0..2e47696b 100644
--- a/album/fatebreak-volume-1.yaml
+++ b/album/fatebreak-volume-1.yaml
@@ -17,7 +17,7 @@ Color: '#DAB4E5'
 Groups:
 - Fandom
 Commentary: |-
-    <i>Fatebreak Music Team:</i> ([Bandcamp about blurb](https://fatebreak.bandcamp.com/album/fatebreak-volume-1))
+    @@ [Bandcamp about blurb](https://fatebreak.bandcamp.com/album/fatebreak-volume-1)
 
     OST for the Homestuck fanventure [Fatebreak](https://mspfa.com/?s=23639), a story about 12 trolls who wreck the multiverse by doing everything they weren't supposed to.
 ---
@@ -31,7 +31,7 @@ Referenced Tracks:
 URLs:
 - https://fatebreak.bandcamp.com/track/touch-the-stars
 Commentary: |-
-    <i>GeminiMoonlight:</i> ([Bandcamp about blurb](https://fatebreak.bandcamp.com/track/touch-the-stars))
+    @@ [Bandcamp about blurb](https://fatebreak.bandcamp.com/track/touch-the-stars)
 
     Theme for Auriax Astyra, gold pilot.
 ---
@@ -46,7 +46,7 @@ Referenced Tracks:
 URLs:
 - https://fatebreak.bandcamp.com/track/heartstrings
 Commentary: |-
-    <i>Fatebreak Music Team:</i> ([Bandcamp about blurb](https://fatebreak.bandcamp.com/track/heartstrings))
+    @@ [Bandcamp about blurb](https://fatebreak.bandcamp.com/track/heartstrings)
 
     Theme for Cerida Kepler, hidden empath.
 ---
@@ -59,7 +59,7 @@ Duration: 02:40
 URLs:
 - https://fatebreak.bandcamp.com/track/viridian-suede
 Commentary: |-
-    <i>Fatebreak Music Team:</i> ([Bandcamp about blurb](https://fatebreak.bandcamp.com/track/viridian-suede))
+    @@ [Bandcamp about blurb](https://fatebreak.bandcamp.com/track/viridian-suede)
 
     Theme for Seytus Caufer, olive mastermind.
 ---
@@ -72,7 +72,7 @@ Duration: 01:21
 URLs:
 - https://fatebreak.bandcamp.com/track/snow-day
 Commentary: |-
-    <i>Fatebreak Music Team:</i> ([Bandcamp about blurb](https://fatebreak.bandcamp.com/track/snow-day))
+    @@ [Bandcamp about blurb](https://fatebreak.bandcamp.com/track/snow-day)
 
     Theme for Silena Lyncis, jade healer.
 ---
@@ -85,7 +85,7 @@ Duration: 01:32
 URLs:
 - https://fatebreak.bandcamp.com/track/equip-your-quiver
 Commentary: |-
-    <i>Fatebreak Music Team:</i> ([Bandcamp about blurb](https://fatebreak.bandcamp.com/track/equip-your-quiver))
+    @@ [Bandcamp about blurb](https://fatebreak.bandcamp.com/track/equip-your-quiver)
 
     Theme for Oryyan Vaelus, indigo hunter.
 ---
@@ -98,6 +98,6 @@ Duration: 02:30
 URLs:
 - https://fatebreak.bandcamp.com/track/marching-reign
 Commentary: |-
-    <i>Fatebreak Music Team:</i> ([Bandcamp about blurb](https://fatebreak.bandcamp.com/track/marching-reign))
+    @@ [Bandcamp about blurb](https://fatebreak.bandcamp.com/track/marching-reign)
 
     Theme for Syldis Polyda, violet tyrant.
diff --git a/album/feelings-jam.yaml b/album/feelings-jam.yaml
index 7008055d..a689acfa 100644
--- a/album/feelings-jam.yaml
+++ b/album/feelings-jam.yaml
@@ -15,8 +15,8 @@ Commentary: |-
 
     This is an album about my feelings and issues and stuff.<br>
     Uh, that's really all there is to say about it. It's free! Have a gander.
-
-    <i>Catboss:</i> ([Bandcamp credits blurb](https://catboss.bandcamp.com/album/feelings-jam))
+Crediting Sources: |-
+    @@ [Bandcamp credits blurb](https://catboss.bandcamp.com/album/feelings-jam)
 
     Music by [[artist:catboss]]<br>
     Art by [[artist:clara-loh]]
diff --git a/album/foresight-and-retrospect.yaml b/album/foresight-and-retrospect.yaml
index 75280ce8..76a25f80 100644
--- a/album/foresight-and-retrospect.yaml
+++ b/album/foresight-and-retrospect.yaml
@@ -103,7 +103,7 @@ Commentary: |-
 
     This track I wrote way back in 2019 and never got around to publishing. The song is pretty shamelessly inspired by some of [[artist:tensei|Joren "Tensei" De Bruin's]] work (but with the twist of being synth centric) which is why I've been so hesitant to release it, but at the end of the day, it wasn't doing any good burning a hole in my harddrive. I now associate this song with the Unforeseen, but coincidentally the title kind of reflects the track itself in a way.
 
-    <i>Wights End, Nights:</i> ([YouTUbe premiere live chat](https://youtu.be/A2XcAmgH3Ko?t=347))
+    <i>Wights End, Nights:</i> ([YouTube premiere live chat](https://youtu.be/A2XcAmgH3Ko?t=347))
 
     *Wights End:* this one I wrote back in 2018 I think and never ended up doing anything with it
 
diff --git a/album/freeroam-volume-1.yaml b/album/freeroam-volume-1.yaml
index 1c0ef345..750997a2 100644
--- a/album/freeroam-volume-1.yaml
+++ b/album/freeroam-volume-1.yaml
@@ -43,7 +43,7 @@ Commentary: |-
 
     This album is comprised of [9] full tracks!
 
-    <i>Freeroam:</i> ([Tumblr](https://www.tumblr.com/freeroam-fanadventure/163273063657/freeroam-volume-one-is-here-enjoy-a-free-nine), excerpt)
+    @@ [Tumblr](https://www.tumblr.com/freeroam-fanadventure/163273063657/freeroam-volume-one-is-here-enjoy-a-free-nine), excerpt
 
     <b>[FREEROAM] - Volume One</b> is here! Enjoy a free nine piece album by a set of eight <i>extremely</i> talented musicians as a present for the One Year Anniversary of the comic, [FREEROAM]! Thank you to all the musicians and the album artist [[artist:silentneptune]] for each of their fantastic contributions towards this album! Enjoy, and happy One Year of FREEROAM!
 ---
diff --git a/album/gate.yaml b/album/gate.yaml
index 64c3c91a..cc2207b4 100644
--- a/album/gate.yaml
+++ b/album/gate.yaml
@@ -30,7 +30,7 @@ Duration: 03:03
 URLs:
 - https://kalibration.bandcamp.com/track/its-always-demons-with-you
 Commentary: |-
-    <i>Kalibration:</i> ([Bandcamp about blurb](https://kalibration.bandcamp.com/track/its-always-demons-with-you))
+    @@ [Bandcamp about blurb](https://kalibration.bandcamp.com/track/its-always-demons-with-you)
 
     Circle 1
 ---
@@ -39,7 +39,7 @@ Duration: 01:46
 URLs:
 - https://kalibration.bandcamp.com/track/bird-walk
 Commentary: |-
-    <i>Kalibration:</i> ([Bandcamp about blurb](https://kalibration.bandcamp.com/track/bird-walk))
+    @@ [Bandcamp about blurb](https://kalibration.bandcamp.com/track/bird-walk)
 
     Circle 2
 ---
@@ -50,7 +50,7 @@ Duration: 02:54
 URLs:
 - https://kalibration.bandcamp.com/track/threshold
 Commentary: |-
-    <i>Kalibration:</i> ([Bandcamp about blurb](https://kalibration.bandcamp.com/track/threshold))
+    @@ [Bandcamp about blurb](https://kalibration.bandcamp.com/track/threshold)
 
     Circle 3
 ---
@@ -61,7 +61,7 @@ Duration: 02:25
 URLs:
 - https://kalibration.bandcamp.com/track/organs
 Commentary: |-
-    <i>Kalibration:</i> ([Bandcamp about blurb](https://kalibration.bandcamp.com/track/organs))
+    @@ [Bandcamp about blurb](https://kalibration.bandcamp.com/track/organs)
 
     Circle 4
 ---
@@ -70,7 +70,7 @@ Duration: 02:39
 URLs:
 - https://kalibration.bandcamp.com/track/sunrise-over-halsted
 Commentary: |-
-    <i>Kalibration:</i> ([Bandcamp about blurb](https://kalibration.bandcamp.com/track/sunrise-over-halsted))
+    @@ [Bandcamp about blurb](https://kalibration.bandcamp.com/track/sunrise-over-halsted)
 
     Circle 5
 ---
@@ -79,7 +79,7 @@ Duration: 02:13
 URLs:
 - https://kalibration.bandcamp.com/track/systems-rituals
 Commentary: |-
-    <i>Kalibration:</i> ([Bandcamp about blurb](https://kalibration.bandcamp.com/track/systems-rituals))
+    @@ [Bandcamp about blurb](https://kalibration.bandcamp.com/track/systems-rituals)
 
     Circle 6
 ---
@@ -100,7 +100,7 @@ Contributors:
 URLs:
 - https://kalibration.bandcamp.com/track/petrichor-ft-ivy-hollivana
 Commentary: |-
-    <i>Kalibration:</i> ([Bandcamp about blurb](https://kalibration.bandcamp.com/track/petrichor-ft-ivy-hollivana))
+    @@ [Bandcamp about blurb](https://kalibration.bandcamp.com/track/petrichor-ft-ivy-hollivana)
 
     Circle 7
 ---
@@ -109,7 +109,7 @@ Duration: 07:03
 URLs:
 - https://kalibration.bandcamp.com/track/its-always-ghosts-with-me
 Commentary: |-
-    <i>Kalibration:</i> ([Bandcamp about blurb](https://kalibration.bandcamp.com/track/its-always-ghosts-with-me))
+    @@ [Bandcamp about blurb](https://kalibration.bandcamp.com/track/its-always-ghosts-with-me)
 
     Circle 8
 
diff --git a/album/glitch.yaml b/album/glitch.yaml
index a56d2605..6f37f145 100644
--- a/album/glitch.yaml
+++ b/album/glitch.yaml
@@ -9,7 +9,7 @@ Color: '#ddd57a'
 Groups:
 - Beyond
 Commentary: |-
-    <i>Andrew Huo:</i> ([Bandcamp about blurb](https://andrewhuo.bandcamp.com/album/glitch))
+    @@ [Bandcamp about blurb](https://andrewhuo.bandcamp.com/album/glitch)
 
     Download the full album to acquire both a loopable and full (concluding) version.
 
@@ -20,7 +20,7 @@ Duration: 1:52
 URLs:
 - https://andrewhuo.bandcamp.com/track/glitch-loopable-version
 Commentary: |-
-    <i>Andrew Huo:</i> ([Bandcamp about blurb](https://andrewhuo.bandcamp.com/track/glitch-loopable-version))
+    @@ [Bandcamp about blurb](https://andrewhuo.bandcamp.com/track/glitch-loopable-version)
 
     This version can seamlessly loop.
 ---
@@ -29,7 +29,7 @@ Duration: 2:12
 URLs:
 - https://andrewhuo.bandcamp.com/track/glitch-full-version
 Commentary: |-
-    <i>Andrew Huo:</i> ([Bandcamp about blurb](https://andrewhuo.bandcamp.com/track/glitch-full-version))
+    @@ [Bandcamp about blurb](https://andrewhuo.bandcamp.com/track/glitch-full-version)
 
     This version ends with a conclusion.
 Referenced Tracks:
diff --git a/album/hivebreak-vol-1.yaml b/album/hivebreak-vol-1.yaml
index 0774db14..539a55ad 100644
--- a/album/hivebreak-vol-1.yaml
+++ b/album/hivebreak-vol-1.yaml
@@ -13,7 +13,8 @@ Groups:
 URLs:
 - https://eighteenelbows.bandcamp.com/album/hivebreak-vol-1
 Commentary: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp about blurb](https://eighteenelbows.bandcamp.com/album/hivebreak-vol-1))
+    <i>Eighteen "Elbows"</i>: ([Bandcamp about blurb](https://eighteenelbows.bandcamp.com/album/hivebreak-vol-1))
+
     This album is based on characters, concepts, and story elements from the Homestuck fanventure, Hivebreak. Which you can read at [tinyurl.com/Hivebreak](https://mspfa.com/?s=11632&p=1) !!!
 
     Mainly consisting of covers from a multitude of sources, mostly from a diverse selection of video games, though some are covers of classical pieces and there are a few original pieces as well!
@@ -35,10 +36,12 @@ Referenced Tracks:
 URLs:
 - https://eighteenelbows.bandcamp.com/track/hivebroken
 Crediting Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/hivebroken), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/hivebroken), excerpt
+
     By [[artist:opra-zebb]]
 Referencing Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/hivebroken), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/hivebroken), excerpt
+
     Original song is [[track:alternia]] from [[album:alterniabound]] by [[artist:seth-peelle]]
 ---
 Track: Departure
@@ -52,10 +55,12 @@ Referenced Tracks:
 URLs:
 - https://eighteenelbows.bandcamp.com/track/departure
 Crediting Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/departure), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/departure), excerpt
+
     By [[artist:opra-zebb]]
 Referencing Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/departure), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/departure), excerpt
+
     Original song is [[Gritzy Desert]] from Mario & Luigi: Partners in Time by [[artist:yoko-shimomura]]
 ---
 Track: Spooky Antics
@@ -67,10 +72,12 @@ Referenced Tracks:
 URLs:
 - https://eighteenelbows.bandcamp.com/track/spooky-antics
 Crediting Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/spooky-antics), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/spooky-antics), excerpt
+
     By [[artist:not-eno]]
 Referencing Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/spooky-antics), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/spooky-antics), excerpt
+
     Original song is [[track:danse-macabre|Danse Macabre]] by [[artist:camille-saint-saens]]
 ---
 Track: Treacherous Spookiness
@@ -82,13 +89,16 @@ Referenced Tracks:
 URLs:
 - https://eighteenelbows.bandcamp.com/track/treacherous-spookiness
 Commentary: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp about blurb](https://eighteenelbows.bandcamp.com/track/treacherous-spookiness), excerpt)
+    @@ [Bandcamp about blurb](https://eighteenelbows.bandcamp.com/track/treacherous-spookiness), excerpt
+
     Also known as Jeje In The Weje Part 4
 Crediting Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/treacherous-spookiness), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/treacherous-spookiness), excerpt
+
     By [[artist:opra-zebb]]
 Referencing Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/treacherous-spookiness), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/treacherous-spookiness), excerpt
+
     original song is [[The Castle Depths|Peach's Castle - Act 1]] from Mario & Luigi: Bowser's Inside Story by [[artist:yoko-shimomura]]
 ---
 Track: The Decline of Bronze
@@ -98,7 +108,8 @@ Artists:
 URLs:
 - https://eighteenelbows.bandcamp.com/track/the-decline-of-bronze
 Crediting Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/the-decline-of-bronze))
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/the-decline-of-bronze)
+
     An original piece by [[artist:not-eno]].
 ---
 Track: Someday I'll Fly
@@ -110,10 +121,12 @@ Referenced Tracks:
 URLs:
 - https://eighteenelbows.bandcamp.com/track/someday-ill-fly
 Crediting Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/someday-ill-fly), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/someday-ill-fly), excerpt
+
     By [[artist:opra-zebb]]
 Referencing Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/someday-ill-fly), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/someday-ill-fly), excerpt
+
     original song is [[Revolution 9]] from The White Album by [[artist:the-beatles]]
 ---
 Track: Wishful Thinking
@@ -127,10 +140,12 @@ Referenced Tracks:
 URLs:
 - https://eighteenelbows.bandcamp.com/track/wishful-thinking
 Crediting Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/wishful-thinking), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/wishful-thinking), excerpt
+
     By [[artist:not-eno]]
 Referencing Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/wishful-thinking), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/wishful-thinking), excerpt
+
     original song is [[track:lucy-in-the-sky-with-diamonds|Lucy in the Sky With Diamonds]] from Sgt. Pepper's Lonely Hearts Club Band By [[artist:the-beatles]]
 ---
 Track: Cyberspace
@@ -144,10 +159,12 @@ Referenced Tracks:
 URLs:
 - https://eighteenelbows.bandcamp.com/track/cyberspace
 Crediting Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/cyberspace), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/cyberspace), excerpt
+
     By [[artist:not-eno]]
 Referencing Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/cyberspace), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/cyberspace), excerpt
+
     Original song is [[track:cyberspace|Cyberspace]] from System Shock by [[artist:greg-lopiccolo|Greg LoPiccolo]] [[artist:tim-ries]]
 ---
 Track: A Loving Haunting
@@ -157,7 +174,8 @@ Artists:
 URLs:
 - https://eighteenelbows.bandcamp.com/track/a-loving-haunting
 Crediting Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/a-loving-haunting))
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/a-loving-haunting)
+
     An original piece by [[artist:opra-zebb]].
 ---
 Track: Failure of the Waking World
@@ -169,10 +187,12 @@ Referenced Tracks:
 URLs:
 - https://eighteenelbows.bandcamp.com/track/failure-of-the-waking-world
 Crediting Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/failure-of-the-waking-world), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/failure-of-the-waking-world), excerpt
+
     By [[artist:opra-zebb]]
 Referencing Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/failure-of-the-waking-world), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/failure-of-the-waking-world), excerpt
+
     original song is [[Savior of the Waking World]] from [[album:homestuck-vol-5]] by [[artist:toby-fox]].
 ---
 Track: The Iron Vale (Carne Vale)
@@ -184,10 +204,12 @@ Referenced Tracks:
 URLs:
 - https://eighteenelbows.bandcamp.com/track/the-iron-vale-carne-vale
 Crediting Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/the-iron-vale-carne-vale), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/the-iron-vale-carne-vale), excerpt
+
     By [[artist:not-eno]]
 Referencing Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/the-iron-vale-carne-vale), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/the-iron-vale-carne-vale), excerpt
+
     Original song is [[Carne Vale]] from [[album:cherubim]] by [[artist:malcolm-brown]]
 ---
 Track: Alternian Skirmish
@@ -199,10 +221,12 @@ Referenced Tracks:
 URLs:
 - https://eighteenelbows.bandcamp.com/track/alternian-skirmish
 Crediting Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/alternian-skirmish), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/alternian-skirmish), excerpt
+
     By [[artist:opra-zebb]]
 Referencing Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/alternian-skirmish), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/alternian-skirmish), excerpt
+
     Original song is [[track:course-1-bgm|Race Theme]] from Mach Rider by [[artist:hideki-kanazashi]]
 ---
 Track: A Newer Mewer Disciple
@@ -214,10 +238,12 @@ Referenced Tracks:
 URLs:
 - https://eighteenelbows.bandcamp.com/track/a-newer-mewer-disciple
 Crediting Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/a-newer-mewer-disciple), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/a-newer-mewer-disciple), excerpt
+
     By [[artist:opra-zebb]]
 Referencing Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/a-newer-mewer-disciple), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/a-newer-mewer-disciple), excerpt
+
     Original song is [[Rainy Day]] from Animal Crossing by [[artist:kazumi-totaka]]
 ---
 Track: Killing Spr33
@@ -229,10 +255,12 @@ Referenced Tracks:
 URLs:
 - https://eighteenelbows.bandcamp.com/track/killing-spr33
 Crediting Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/killing-spr33), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/killing-spr33), excerpt
+
     By [[artist:opra-zebb]]
 Referencing Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/killing-spr33), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/killing-spr33), excerpt
+
     Original song is [[Ricco Harbor]] from Super Mario Sunshine By [[artist:koji-kondo]]
 ---
 Track: The Leijon Legion
@@ -244,10 +272,12 @@ Referenced Tracks:
 URLs:
 - https://eighteenelbows.bandcamp.com/track/the-leijon-legion
 Crediting Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/the-leijon-legion), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/the-leijon-legion), excerpt
+
     By [[artist:not-eno]]
 Referencing Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/the-leijon-legion), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/the-leijon-legion), excerpt
+
     Original song is [[Friendship is Paramount]] from [[album:squiddles|Squiddles ~SIng~along~]] by [[artist:seth-peelle]]
 ---
 Track: Guardian of the Sanguinem
@@ -259,10 +289,12 @@ Referenced Tracks:
 URLs:
 - https://eighteenelbows.bandcamp.com/track/guardian-of-the-sanguinem
 Crediting Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/guardian-of-the-sanguinem), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/guardian-of-the-sanguinem), excerpt
+
     By [[artist:not-eno]]
 Referencing Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/guardian-of-the-sanguinem), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/guardian-of-the-sanguinem), excerpt
+
     Original song is [[Cara Mia Addio]] from Portal 2 by [[artist:mike-morasky]]
 ---
 Track: The Tears Just Keep Happening
@@ -274,10 +306,12 @@ Referenced Tracks:
 URLs:
 - https://eighteenelbows.bandcamp.com/track/the-tears-just-keep-happening
 Crediting Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/the-tears-just-keep-happening), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/the-tears-just-keep-happening), excerpt
+
     By [[artist:opra-zebb]]
 Referencing Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/the-tears-just-keep-happening), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/the-tears-just-keep-happening), excerpt
+
     Original song is [[Ai No Uta]] by [[artist:strawberry-flower]]
 ---
 Track: A Pile Of Love
@@ -289,12 +323,14 @@ Referenced Tracks:
 URLs:
 - https://eighteenelbows.bandcamp.com/track/a-pile-of-love
 Crediting Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/a-pile-of-love), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/a-pile-of-love), excerpt
+
     By [[artist:opra-zebb]]
 
     MIDI RECREATION BY IKEY NASAR HE BASICALLY DID ALL OF THE WORK HERE SO FUCK YOU OPRA ZEBB
 Referencing Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/a-pile-of-love), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/a-pile-of-love), excerpt
+
     Original Song is [[track:mamida-ga-afureta|Namida Ga Afureta]] by [[artist:strawberry-flower]].
 ---
 Track: Official Business
@@ -306,10 +342,12 @@ Referenced Tracks:
 URLs:
 - https://eighteenelbows.bandcamp.com/track/official-business
 Crediting Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/official-business), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/official-business), excerpt
+
     By [[artist:not-eno]]
 Referencing Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/official-business), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/official-business), excerpt
+
     Original song is [[Trollcops]] from [[album:alterniabound]] by [[artist:erik-scheele]]
 ---
 Track: Aqua Spelunking!!!!!!!!
@@ -321,10 +359,12 @@ Referenced Tracks:
 URLs:
 - https://eighteenelbows.bandcamp.com/track/aqua-spelunking
 Crediting Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/aqua-spelunking), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/aqua-spelunking), excerpt
+
     By [[artist:not-eno]]
 Referencing Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/aqua-spelunking), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/aqua-spelunking), excerpt
+
     Original song is [[track:cave-treasure-cove|Cave]] from Treasure Cove! by The Learning Company
 ---
 Track: New Age Rockin' Gamblignant
@@ -336,10 +376,12 @@ Referenced Tracks:
 URLs:
 - https://eighteenelbows.bandcamp.com/track/new-age-rockin-gamblignant
 Crediting Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/new-age-rockin-gamblignant), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/new-age-rockin-gamblignant), excerpt
+
     By [[artist:not-eno]]
 Referencing Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/new-age-rockin-gamblignant), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/new-age-rockin-gamblignant), excerpt
+
     original song is [[Spider8reath]] from [[album:homestuck-vol-7]] by [[artist:tensei]].
 ---
 Track: Milk-Infested Robots
@@ -351,10 +393,12 @@ Referenced Tracks:
 URLs:
 - https://eighteenelbows.bandcamp.com/track/milk-infested-robots
 Crediting Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/milk-infested-robots), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/milk-infested-robots), excerpt
+
     By [[artist:opra-zebb]]
 Referencing Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/milk-infested-robots), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/milk-infested-robots), excerpt
+
     Original song is [[track:eternal-star|The Eternal Star]] from Mario Party by [[artist:yasunori-mitsuda]]
 ---
 Track: Sacrificial
@@ -381,12 +425,14 @@ URLs:
 Lyrics: |-
     HONK
 Crediting Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/draft-dodgers), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/draft-dodgers), excerpt
+
     By [[artist:opra-zebb]]
 
     The word "honk" is being screamed by http://mrbiggsproductions.tumblr.com/
 Referencing Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/draft-dodgers), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/draft-dodgers), excerpt
+
     Original song is [[Toy Block Tower]] from Wario Land 4 by [[artist:ryoji-yoshitomi]].
 ---
 Track: Purpley Armada
@@ -398,10 +444,12 @@ Referenced Tracks:
 URLs:
 - https://eighteenelbows.bandcamp.com/track/purpley-armada
 Crediting Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/purpley-armada), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/purpley-armada), excerpt
+
     By [[artist:not-eno]]
 Referencing Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/purpley-armada), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/purpley-armada), excerpt
+
     original song is [[Purple Tyrant]] from [[album:coloUrs-and-mayhem-universe-a]] by [[artist:kevin-grant]].
 ---
 Track: Purple Persecutor
@@ -413,10 +461,12 @@ Referenced Tracks:
 URLs:
 - https://eighteenelbows.bandcamp.com/track/purple-persecutor
 Crediting Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/purple-persecutor), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/purple-persecutor), excerpt
+
     By [[artist:opra-zebb]]
 Referencing Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/purple-persecutor), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/purple-persecutor), excerpt
+
     Original song is [[track:cog-building-boss|Cog Building (Final Floor)]] from Toontown Online by [[artist:jamie-christopherson]].
 ---
 Track: Piratey Warfare
@@ -428,10 +478,12 @@ Referenced Tracks:
 URLs:
 - https://eighteenelbows.bandcamp.com/track/piratey-warfare
 Crediting Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/piratey-warfare), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/piratey-warfare), excerpt
+
     By [[artist:opra-zebb]]
 Referencing Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/piratey-warfare), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/piratey-warfare), excerpt
+
     original song is [[Mt. Blaze]] from Pokemon Mystery Dungeon Blue/Red Rescue Team, by [[artist:arata-iiyoshi]] & [[artist:atsuhiro-ishizuna]]
 ---
 Track: Prince of Pirates
@@ -443,10 +495,12 @@ Referenced Tracks:
 URLs:
 - https://eighteenelbows.bandcamp.com/track/prince-of-pirates
 Crediting Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/prince-of-pirates), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/prince-of-pirates), excerpt
+
     By [[artist:not-eno]]
 Referencing Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/prince-of-pirates), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/prince-of-pirates), excerpt
+
     Original song is [[track:at-dooms-gate-e1m1|At Doom's Gate]] from Doom by [[artist:bobby-prince]]
 ---
 Track: Feferi's Absolutely Fucked Up Adventure!!! 38D
@@ -458,11 +512,13 @@ Referenced Tracks:
 URLs:
 - https://eighteenelbows.bandcamp.com/track/feferis-absolutely-fucked-up-adventure-38d
 Crediting Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/feferis-absolutely-fucked-up-adventure-38d), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/feferis-absolutely-fucked-up-adventure-38d), excerpt
+
     By [[artist:opra-zebb]]
 Referencing Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/feferis-absolutely-fucked-up-adventure-38d), excerpt)
-    Original song is Fuchsia Witch from [[album:coloUrs-and-mayhem-universe-a]] by [[artist:david-dycus]]
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/feferis-absolutely-fucked-up-adventure-38d), excerpt
+
+    Original song is [[Fuchsia Witch]] from [[album:coloUrs-and-mayhem-universe-a]] by [[artist:david-dycus]]
 ---
 Track: Just Like Old Times
 Duration: 1:29
@@ -475,10 +531,12 @@ Sampled Tracks:
 URLs:
 - https://eighteenelbows.bandcamp.com/track/just-like-old-times
 Crediting Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/just-like-old-times), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/just-like-old-times), excerpt
+
     By [[artist:opra-zebb]]
 Referencing Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/just-like-old-times), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/just-like-old-times), excerpt
+
     Original Song is [[Lum King]] from Rayman Origins by [[artist:christophe-heral]]. The scream-like sound effect by the end is from Little Inferno and the laughter is from the end of [[Hate You]] from [[album:homestuck-vol-9]] by [[artist:toby-fox]]
 ---
 Track: Conquest
@@ -492,10 +550,12 @@ Referenced Tracks:
 URLs:
 - https://eighteenelbows.bandcamp.com/track/conquest
 Crediting Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/conquest), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/conquest), excerpt
+
     By [[artist:not-eno]]
 Referencing Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/conquest), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/conquest), excerpt
+
     Original song is [[Purple Bard]] from coloUrs and mayhem: Universe A by [[artist:eligecos]]
 ---
 Track: Condescension
@@ -509,10 +569,12 @@ Referenced Tracks:
 URLs:
 - https://eighteenelbows.bandcamp.com/track/condescension
 Crediting Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/condescension), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/condescension), excerpt
+
     By [[artist:opra-zebb]]
 Referencing Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/condescension), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/condescension), excerpt
+
     original song is [[Full of Danger]] from Mario Party by [[artist:yasunori-mitsuda]]
 ---
 Track: True Discord
@@ -524,10 +586,12 @@ Referenced Tracks:
 URLs:
 - https://eighteenelbows.bandcamp.com/track/true-discord
 Crediting Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/true-discord), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/true-discord), excerpt
+
     By [[artist:opra-zebb]]
 Referencing Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/true-discord), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/true-discord), excerpt
+
     original song is [[Showdown with Cackletta!|Final Cackletta Battle]] from Mario & Luigi: Superstar Saga by [[artist:yoko-shimomura]]
 ---
 Track: Imminent Doom
@@ -539,13 +603,16 @@ Referenced Tracks:
 URLs:
 - https://eighteenelbows.bandcamp.com/track/imminent-doom
 Crediting Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/imminent-doom), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/imminent-doom), excerpt
+
     By [[artist:opra-zebb]]
 Referencing Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/imminent-doom), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/imminent-doom), excerpt
+
     original song is [[track:64-000-question|The theme for $64,000 - $500,000 Questions]] in Who Wants to be a Millionaire, by [[artist:cole-porter]]
 
     <i>Jebb:</i> (wiki editor)
+
     The composer for the Who Wants to be a Millionaire TV Show is actually [[artist:matthew-strachan]], the original credit is wrongly attributed to [[artist:cole-porter]], who actually composed the 1956 song ["Who Wants to Be a Millionaire?"](https://www.youtube.com/watch?v=MnVTH_nCbuk)
 ---
 Track: Adventure in the Woods
@@ -557,10 +624,12 @@ Referenced Tracks:
 URLs:
 - https://eighteenelbows.bandcamp.com/track/adventure-in-the-woods
 Crediting Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/adventure-in-the-woods), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/adventure-in-the-woods), excerpt
+
     By [[artist:not-eno]]
 Referencing Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/adventure-in-the-woods), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/adventure-in-the-woods), excerpt
+
     original song is [[B-Doing Woods (World 2-1)|B-Doing Woods]] from Pac-Man World 2 by [[artist:david-logan]]
 ---
 Track: CATHEDRAL OF FUN AND MORE FUN
@@ -572,10 +641,12 @@ Referenced Tracks:
 URLs:
 - https://eighteenelbows.bandcamp.com/track/cathedral-of-fun-and-more-fun
 Crediting Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/cathedral-of-fun-and-more-fun), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/cathedral-of-fun-and-more-fun), excerpt
+
     By [[artist:opra-zebb]]
 Referencing Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/cathedral-of-fun-and-more-fun), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/cathedral-of-fun-and-more-fun), excerpt
+
     original song is [[track:rooftop-run-day|Rooftop Run]] from Sonic Unleashed by [[artist:tomoya-ohtani]]
 ---
 Track: Dance of the Lusii
@@ -587,10 +658,12 @@ Referenced Tracks:
 URLs:
 - https://eighteenelbows.bandcamp.com/track/dance-of-the-lusii
 Crediting Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/dance-of-the-lusii), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/dance-of-the-lusii), excerpt
+
     By [[artist:opra-zebb]]
 Referencing Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/dance-of-the-lusii), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/dance-of-the-lusii), excerpt
+
     Original song is [[Dance of Thorns]] from [[album:strife]] by [[artist:tensei]]
 ---
 Track: The Two Moons
@@ -600,7 +673,8 @@ Artists:
 URLs:
 - https://eighteenelbows.bandcamp.com/track/the-two-moons
 Crediting Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/the-two-moons))
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/the-two-moons)
+
     An original piece by [[artist:opra-zebb]].
 ---
 Track: The Itch
@@ -610,7 +684,8 @@ Artists:
 URLs:
 - https://eighteenelbows.bandcamp.com/track/the-itch
 Crediting Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/the-itch))
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/the-itch)
+
     An original piece by [[artist:opra-zebb]].
 ---
 Track: A Hop, Skip, And a-FUCK
@@ -622,10 +697,12 @@ Referenced Tracks:
 URLs:
 - https://eighteenelbows.bandcamp.com/track/a-hop-skip-and-a-fuck
 Crediting Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/a-hop-skip-and-a-fuck), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/a-hop-skip-and-a-fuck), excerpt
+
     By [[artist:not-eno]]
 Referencing Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/a-hop-skip-and-a-fuck), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/a-hop-skip-and-a-fuck), excerpt
+
     original song is [[Omelette Sandwich]] from [[album:the-felt]] by [[artist:mark-j-hadley]].
 ---
 Track: Suckers.
@@ -639,10 +716,12 @@ Referenced Tracks:
 URLs:
 - https://eighteenelbows.bandcamp.com/track/suckers
 Crediting Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/suckers), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/suckers), excerpt
+
     By [[artist:opra-zebb]]
 Referencing Sources: |-
-    <i>"Eighteen" Elbows:</i> ([Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/suckers), excerpt)
+    @@ [Bandcamp credits blurb](https://eighteenelbows.bandcamp.com/track/suckers), excerpt
+
     original song is [[track:puzzles|Puzzle]] from Professor Layton & The Curious Village by [[artist:tomohito-nishiura]]
 ---
 Section: Bonus track
diff --git a/album/homestuck-beta-kid-themes-op-12.yaml b/album/homestuck-beta-kid-themes-op-12.yaml
index c54be684..efd7d013 100644
--- a/album/homestuck-beta-kid-themes-op-12.yaml
+++ b/album/homestuck-beta-kid-themes-op-12.yaml
@@ -27,12 +27,14 @@ Referenced Tracks:
 URLs:
 - https://casualclassical.bandcamp.com/track/hammerkind-op-12-no-1
 Referencing Sources: |-
-    <i>casualclassical:</i> ([Tumblr](https://casualclassical.tumblr.com/post/780747598188445696/michelle-k-chen-hammerkind-op-12-no-1-themes), excerpt)
+    @@ [Tumblr](https://casualclassical.tumblr.com/post/780747598188445696/michelle-k-chen-hammerkind-op-12-no-1-themes), excerpt
+
     Themes used:
      - [[track:showtime-original-mix|“Showtime”]] by [[artist:malcolm-brown]]
      - [[“Doctor”]] by [[artist:buzinkai]]
 Crediting Sources: |-
-    <i>casualclassical:</i> ([Tumblr](https://casualclassical.tumblr.com/post/780747598188445696/michelle-k-chen-hammerkind-op-12-no-1-themes), excerpt)
+    @@ [Tumblr](https://casualclassical.tumblr.com/post/780747598188445696/michelle-k-chen-hammerkind-op-12-no-1-themes), excerpt
+
     Picture credit: [1](https://www.shutterstock.com/video/clip-9673598-moving-mechanical-hammers-inside-piano-mechanism-dolly) - [2](https://www.electrochem.org/ecsnews/large-scale-wind-power-could-cause-warming) - [3](https://www.npr.org/sections/pictureshow/2022/08/12/1114236533/pete-mauney-photographs-fireflies)
 ---
 Track: Needlekind (Op. 12 No. 2)
@@ -43,12 +45,14 @@ Referenced Tracks:
 URLs:
 - https://casualclassical.bandcamp.com/track/needlekind-op-12-no-2
 Referencing Sources: |-
-    <i>casualclassical:</i> ([Tumblr](https://casualclassical.tumblr.com/post/780747915660492800/michelle-k-chen-needlekind-op-12-no-2-themes), excerpt)
+    @@ [Tumblr](https://casualclassical.tumblr.com/post/780747915660492800/michelle-k-chen-needlekind-op-12-no-2-themes), excerpt
+
     Themes used:
      - [[“Aggrieve”]] by [[artist:mark-j-hadley]]
      - [[“Chorale For Jaspers”]] by [[artist:michael-guy-bowman]]
 Crediting Sources: |-
-    <i>casualclassical:</i> ([Tumblr](https://casualclassical.tumblr.com/post/780747915660492800/michelle-k-chen-needlekind-op-12-no-2-themes), excerpt)
+    @@ [Tumblr](https://casualclassical.tumblr.com/post/780747915660492800/michelle-k-chen-needlekind-op-12-no-2-themes), excerpt
+
     Picture credit: [1](https://phamoxmusic.com/instrument-violin/) - [2](https://wallpaperaccess.com/open-book) - [3](htthttps://mungfali.com/explore/Rainbow-Rain-Wallpaper)
 ---
 Track: Bladekind (Op. 12 No. 3)
@@ -59,12 +63,14 @@ Referenced Tracks:
 URLs:
 - https://casualclassical.bandcamp.com/track/bladekind-op-12-no-3
 Referencing Sources: |-
-    <i>casualclassical:</i> ([Tumblr](https://casualclassical.tumblr.com/post/780748279894917120/michelle-k-chen-bladekind-op-12-no-3-themes), excerpt)
+    @@ [Tumblr](https://casualclassical.tumblr.com/post/780748279894917120/michelle-k-chen-bladekind-op-12-no-3-themes), excerpt
+
     Themes used:
      - [[track:beatdown-strider-style|“Beatdown”]] by [[artist:curt-blakeslee]]
      - [[“Atomyk Ebonpyre”]] by [[artist:toby-fox]]
 Crediting Sources: |-
-    <i>casualclassical:</i> ([Tumblr](https://casualclassical.tumblr.com/post/780748279894917120/michelle-k-chen-bladekind-op-12-no-3-themes), excerpt)
+    @@ [Tumblr](https://casualclassical.tumblr.com/post/780748279894917120/michelle-k-chen-bladekind-op-12-no-3-themes), excerpt
+
     Picture credit: [1](https://ar.inspiredpencil.com/pictures-2023/vinyl-record-player) - [2](https://au.pinterest.com/pin/246853623295987835/) - [3](https://wallpapersafari.com/hawaii-volcano-wallpaper/)
 ---
 Track: Riflekind (Op. 12 No. 4)
@@ -75,10 +81,12 @@ Referenced Tracks:
 URLs:
 - https://casualclassical.bandcamp.com/track/riflekind-op-12-no-4
 Referencing Sources: |-
-    <i>casualclassical:</i> ([Tumblr](https://casualclassical.tumblr.com/post/780748603323006976/michelle-k-chen-riflekind-op-12-no-4-themes), excerpt)
+    @@ [Tumblr](https://casualclassical.tumblr.com/post/780748603323006976/michelle-k-chen-riflekind-op-12-no-4-themes), excerpt
+
     Themes used:
      - [[“The Beginning of Something Really Excellent”]] by [[artist:rj-lake]]
      - [[track:dissension-original|“Dissension”]] by [[artist:david-ko]]
 Crediting Sources: |-
-    <i>casualclassical:</i> ([Tumblr](https://casualclassical.tumblr.com/post/780748603323006976/michelle-k-chen-riflekind-op-12-no-4-themes), excerpt)
+    @@ [Tumblr](https://casualclassical.tumblr.com/post/780748603323006976/michelle-k-chen-riflekind-op-12-no-4-themes), excerpt
+
     Picture credit: [1](https://www.gear4music.nl/nl/Gitaar-and-Basgitaar/Ibanez-SR305EB-5-String-Bass-Weathered-Black/297A) - [2](https://wallpaperaccess.com/moon-and-stars) - [3](https://regex.info/blog/2014-01-09/2367)
diff --git a/album/i-warned-you-about-stairs.yaml b/album/i-warned-you-about-stairs.yaml
index f3548a77..d1234e42 100644
--- a/album/i-warned-you-about-stairs.yaml
+++ b/album/i-warned-you-about-stairs.yaml
@@ -30,7 +30,7 @@ Commentary: |-
 
     [raidsrc.me/stairs](https://raidsrc.me/stairs)
 
-    <i>Raid:</i> ([Bandcamp credits blurb](https://rudecustard.bandcamp.com/album/i-warned-you-about-stairs))
+    @@ [Bandcamp credits blurb](https://rudecustard.bandcamp.com/album/i-warned-you-about-stairs)
 
     Composer: [[artist:raid|Rude Custard]]<br>
     Arranger: [[artist:raid|Rude Custard]]<br>
@@ -46,10 +46,10 @@ Commentary: |-
     Photographer: [[artist:raid|Rude Custard]]<br>
     unless otherwise specified.
 
-    [[Doctor|"Doctor"]] by [[artist:buzinkai|George Buzinkai]], [[artist:clark-powell]], and [[artist:michael-vallejo]].<br>
+    [["Doctor"]] by [[artist:buzinkai]], [[artist:clark-powell]], and [[artist:michael-vallejo]].<br>
     [[Beatdown (Strider Style)|"Beatdown"]] by [[artist:curt-blakeslee]].<br>
-    [[Black|"Black"]] by [[artist:toby-fox]].<br>
-    [[Mother|"Mother"]] by [[artist:erik-scheele]].
+    [["Black"]] by [[artist:toby-fox]].<br>
+    [["Mother"]] by [[artist:erik-scheele]].
 
     <i>Raid:</i>
 
diff --git a/album/im-here-for-the-future.yaml b/album/im-here-for-the-future.yaml
index bed963b4..03ba6198 100644
--- a/album/im-here-for-the-future.yaml
+++ b/album/im-here-for-the-future.yaml
@@ -16,7 +16,7 @@ Cover Art File Extension: png
 Track: I'm Here for the Future
 Duration: 2:43
 Lyrics: |-
-    <i>Svix:</i> ([artist's lyrics](https://www.furaffinity.net/view/3453787/))
+    @@ [artist's lyrics](https://www.furaffinity.net/view/3453787/)
 
     Take my hand I'll help you stand
     and then we'll journey through all the things we've planned
diff --git a/album/in-isolation.yaml b/album/in-isolation.yaml
index f41f562d..58e5cc16 100644
--- a/album/in-isolation.yaml
+++ b/album/in-isolation.yaml
@@ -24,14 +24,6 @@ Commentary: |-
     Recorded in February 2011<br>
     Additional overdubs and mixing done in 2012/2013.
 
-    <i>David Ellis:</i> ([Bandcamp credits blurb](https://alunaticsdaydream.bandcamp.com/album/in-isolation))
-
-    Words and Music by [[artist:david-ellis]]
-
-    [[artist:malik-refaat]]: Saxophones on [['Our Choice']] and [['Last Message']]
-
-    Artwork by [[artist:tom-yorath]]
-
     <i>David Ellis:</i> ([Tumblr](https://alunaticsdaydream.tumblr.com/post/65531001748/in-isolation-by-a-lunatics-daydream-i-now-have), 10/30/2013)
 
     <b>[In Isolation by A Lunatic's Daydream](https://alunaticsdaydream.bandcamp.com/album/in-isolation)</b>
@@ -45,6 +37,14 @@ Commentary: |-
     Also [[artist:malik-refaat]] makes an appearance playing saxophone on [[Our Choice|'Our Choice']] and [[Last Message|'Last Message']].
 
     Artwork by [[artist:tom-yorath]].
+Crediting Sources: |-
+    @@ [Bandcamp credits blurb](https://alunaticsdaydream.bandcamp.com/album/in-isolation)
+
+    Words and Music by [[artist:david-ellis]]
+
+    [[artist:malik-refaat]]: Saxophones on [['Our Choice']] and [['Last Message']]
+
+    Artwork by [[artist:tom-yorath]]
 ---
 Section: Main album
 ---
@@ -348,7 +348,7 @@ Lyrics: |-
 
     And I'd give all I knew for one more night with you.
 Referencing Sources: |-
-    <i>David Ellis:</i> ([SoundCloud description](https://soundcloud.com/a-lunatics-daydream/escape-velocity-bonus), excerpt, 3/7/2011)
+    @@ [SoundCloud description](https://soundcloud.com/a-lunatics-daydream/escape-velocity-bonus), excerpt, 3/7/2011
 
     Creative Commons samples:<br>
     [[track:tunnel-ambience-timbre|"Tunnel Ambience"]] by [[artist:timbre]]
diff --git a/album/in-medias-res-autumn-cut.yaml b/album/in-medias-res-autumn-cut.yaml
index a9b4687e..4feea245 100644
--- a/album/in-medias-res-autumn-cut.yaml
+++ b/album/in-medias-res-autumn-cut.yaml
@@ -17,8 +17,8 @@ Groups:
 - Fandom
 Cover Art File Extension: png
 Track Art File Extension: png
-Commentary: |-
-    <i>autumnalEquinox:</i> ([Bandcamp credits blurb](https://autumnaleqvinox.bandcamp.com/album/in-medias-res-autumn-cut), excerpt)
+Crediting Sources: |-
+    @@ [Bandcamp credits blurb](https://autumnaleqvinox.bandcamp.com/album/in-medias-res-autumn-cut), excerpt
 
     Album Cover background by [[artist:tyson-northcutt|fireworkcat25]] and [[artist:sparaze]].
 ---
diff --git a/album/infinite-cataclysm.yaml b/album/infinite-cataclysm.yaml
index 8f53e26f..ca7952ee 100644
--- a/album/infinite-cataclysm.yaml
+++ b/album/infinite-cataclysm.yaml
@@ -33,7 +33,7 @@ Commentary: |-
 
     This is a Homestuck fan music track that will be appearing on my next fan-album "Friends Beyond The Ring".
 Crediting Sources: |-
-    <i>LudicrousFalcon:</i> ([Bandcamp credits blurb](https://ludicrousfalcon.bandcamp.com/track/infinite-cataclysm), excerpt)
+    @@ [Bandcamp credits blurb](https://ludicrousfalcon.bandcamp.com/track/infinite-cataclysm), excerpt
 
     Composer and Mixer - LudicrousFalcon<br>
     Album Art: LudicrousFalcon & [Homestuck.com](https://www.homestuck.com)<br>
@@ -42,10 +42,10 @@ Crediting Sources: |-
     Additional album images sourced and drawn by LudicrousFalcon, distorted with paint.net<br>
     [additional image source](https://www.deviantart.com/falconhawk5/art/Smooch-988462982)
 Referencing Sources: |-
-    <i>LudicrousFalcon:</i> ([Bandcamp credits blurb](https://ludicrousfalcon.bandcamp.com/track/infinite-cataclysm), excerpt)
+    @@ [Bandcamp credits blurb](https://ludicrousfalcon.bandcamp.com/track/infinite-cataclysm), excerpt
 
-    Track references [["Crystamanthequins"]] by [[artist:erik-scheele|Erik "Jit" Scheele]], from [[album:homestuck-vol-5|Homestuck Volume 5]]
+    Track references [["Crystamanthequins"]] by [[artist:erik-scheele]], from [[album:homestuck-vol-5|Homestuck Volume 5]]
 
-    Track references [["Doctor"]] by [[artist:buzinkai]], [[artist:michael-vallejo]] and [[artist:clark-powell|Clark "Plazmataz" Powell]], from [[album:homestuck-vol-4|Homestuck Volume 4]]
+    Track references [["Doctor"]] by [[artist:buzinkai]], [[artist:michael-vallejo]] and [[artist:clark-powell]], from [[album:homestuck-vol-4|Homestuck Volume 4]]
 
     Track references [["Sburban Jungle"]] by By [[artist:michael-guy-bowman]] from [[album:homestuck-vol-4|Homestuck Volume 4]]
diff --git a/album/janestuck-volume-100.yaml b/album/janestuck-volume-100.yaml
index d046c648..bbe9a694 100644
--- a/album/janestuck-volume-100.yaml
+++ b/album/janestuck-volume-100.yaml
@@ -17,7 +17,7 @@ Groups:
 - Fandom
 Color: '#fc9c00'
 Crediting Sources: |-
-    <i>CreatorOfJanespeak:</i> ([Bandcamp credits blurb](https://janestuckofficial.bandcamp.com/album/janestuck-volume-100), excerpt)
+    @@ [Bandcamp credits blurb](https://janestuckofficial.bandcamp.com/album/janestuck-volume-100), excerpt
 
     Album art by [[artist:creatorofjanespeak]]
 
diff --git a/album/janestuck-volume-2.yaml b/album/janestuck-volume-2.yaml
index e5706e0e..4465f3bf 100644
--- a/album/janestuck-volume-2.yaml
+++ b/album/janestuck-volume-2.yaml
@@ -24,7 +24,7 @@ Additional Files:
   - solarrise.png
   - Solarslam_final.png
 Crediting Sources: |-
-    <i>CreatorOfJanespeak:</i> ([Bandcamp credits blurb](https://janestuckofficial.bandcamp.com/album/janestuck-volume-2), excerpt)
+    @@ [Bandcamp credits blurb](https://janestuckofficial.bandcamp.com/album/janestuck-volume-2), excerpt
 
     Album art by [[artist:creatorofjanespeak]]
 
@@ -116,7 +116,7 @@ Referenced Tracks:
 - Jane's Theme
 - Cupcake Girl
 Referencing Sources: |-
-    <i>Nexx Mowarek:</i> ([Bandcamp about blurb](https://janestuckofficial.bandcamp.com/track/pure-breath-tainted-light), excerpt)
+    @@ [Bandcamp about blurb](https://janestuckofficial.bandcamp.com/track/pure-breath-tainted-light), excerpt
 
     References<br>
     [["Savior of the Corrupted Lands"]] by Nexx Mowarek<br>
diff --git a/album/knife-to-meet-you.yaml b/album/knife-to-meet-you.yaml
index c3a6be36..5b2a7b21 100644
--- a/album/knife-to-meet-you.yaml
+++ b/album/knife-to-meet-you.yaml
@@ -25,7 +25,7 @@ Commentary: |-
     <i>dbnet18:</i> ([Bandcamp about blurb](https://dbnet18.bandcamp.com/track/knife-to-meet-you))
     This is a track for a fantroll named Connil!
 Crediting Sources: |-
-    <i>dbnet18:</i> ([Bandcamp credits blurb](https://dbnet18.bandcamp.com/track/knife-to-meet-you))
+    @@ [Bandcamp credits blurb](https://dbnet18.bandcamp.com/track/knife-to-meet-you)
 
     Track by [[artist:dbnet18]]<br>
     Track art by [[artist:bakudadadan]]<br>
diff --git a/album/loftlocked-vol-1.yaml b/album/loftlocked-vol-1.yaml
index aa504f1c..2b3acf2a 100644
--- a/album/loftlocked-vol-1.yaml
+++ b/album/loftlocked-vol-1.yaml
@@ -16,7 +16,7 @@ Commentary: |-
    This album is a collaboration of people I've managed to fool into thinking that this comic was worth any of their time.
 
    I'm greatly pleased to present to you 15 great songs (and 2 equally sweet bonus ones). Don't forget to take a gander at the cool track art we've made!
-
+Crediting Sources: |-
    <i>PatManDX:</i> ([Bandcamp credits blurb](https://loftlocked.bandcamp.com/album/loftlocked-vol-1))
 
    Music by the talents of [[artist:rnd|Rnd (Kurt)]], [[artist:veritas-unae|Veritas Unae (Scott)]], [[artist:tiresiasarchivist|tiresiasArchivist (Matt)]].
@@ -239,6 +239,7 @@ URLs:
 - https://loftlocked.bandcamp.com/track/thunderhead
 Commentary: |-
     <i>Veritas Unae:</i> ([Bandcamp about blurb](https://loftlocked.bandcamp.com/track/thunderhead))
+
     The song is very chaotic, representing a world dominated by an [REDACTED] thunderstorm. I tried to bring a balance between tranquility and complete rage, counterbalancing the world of the player with the player [REDACTED].
 
     <i>Veritas Unae:</i> ([SoundCloud description](https://soundcloud.com/veritasunae/thunderhead), excerpt, 3/3/2014)
diff --git a/album/make-music-throw-music.yaml b/album/make-music-throw-music.yaml
index 66e85a45..8f060dfd 100644
--- a/album/make-music-throw-music.yaml
+++ b/album/make-music-throw-music.yaml
@@ -19,13 +19,13 @@ Color: '#d8f548'
 Groups:
 - Beyond
 Commentary: |-
-    <i>sleepytimejesse:</i> ([Bandcamp about blurb](https://sleepytimejesse.bandcamp.com/album/make-music-throw-music-a-yoshis-island-tribute))
+    @@ [Bandcamp about blurb](https://sleepytimejesse.bandcamp.com/album/make-music-throw-music-a-yoshis-island-tribute)
 
     Join Yoshi on a new adventure! Swing, fly, and dive into the mysterious caverns of the island where new baddies await!
 
     "Make Music, Throw Music" is a compilation of artists paying homage to the music of Nintendo's Yoshi's Island (SNES). All music is composed using the new Yoshi's Island soundfont ripped and compiled from the game by [[artist:william-kage]].
-
-    <i>sleepytimejesse:</i> ([Bandcamp credits blurb](https://sleepytimejesse.bandcamp.com/album/make-music-throw-music-a-yoshis-island-tribute), excerpt)
+Crediting Sources: |-
+    @@ [Bandcamp credits blurb](https://sleepytimejesse.bandcamp.com/album/make-music-throw-music-a-yoshis-island-tribute), excerpt
 
     Project Director and Co-Producer: [[artist:sleepytimejesse]]
 
diff --git a/album/mayhem-of-another-universe.yaml b/album/mayhem-of-another-universe.yaml
index 080e9e23..05533956 100644
--- a/album/mayhem-of-another-universe.yaml
+++ b/album/mayhem-of-another-universe.yaml
@@ -12,7 +12,7 @@ Groups:
 - Fandom
 Color: '#fe0000'
 Commentary: |-
-    <i>M.Frisk:</i> ([Bandcamp about blurb](https://mfrisk.bandcamp.com/album/mayhem-of-another-universe-2))
+    @@ [Bandcamp about blurb](https://mfrisk.bandcamp.com/album/mayhem-of-another-universe-2)
     OST of The Fan Adventure "Another Reset"
 ---
 Track: Reminiscence of The Space
@@ -22,7 +22,7 @@ Duration: '2:57'
 URLs:
 - https://mfrisk.bandcamp.com/track/reminiscence-of-the-space
 Commentary: |-
-    <i>M.Frisk:</i> ([Bandcamp about blurb](https://mfrisk.bandcamp.com/track/reminiscence-of-the-space))
+    @@ [Bandcamp about blurb](https://mfrisk.bandcamp.com/track/reminiscence-of-the-space)
     Thom's Theme
 ---
 Track: ANSWER ME FIREFLY
@@ -33,7 +33,7 @@ Artists:
 URLs:
 - https://mfrisk.bandcamp.com/track/answer-me-firefly-2
 Commentary: |-
-    <i>M.Frisk:</i> ([Bandcamp about blurb](https://mfrisk.bandcamp.com/track/answer-me-firefly-2))
+    @@ [Bandcamp about blurb](https://mfrisk.bandcamp.com/track/answer-me-firefly-2)
     Jill's Theme
 ---
 Track: Deadpool's Soul
@@ -41,7 +41,7 @@ Duration: '0:19'
 URLs:
 - https://mfrisk.bandcamp.com/track/deadpools-soul
 Commentary: |-
-    <i>M.Frisk:</i> ([Bandcamp about blurb](https://mfrisk.bandcamp.com/track/deadpools-soul))
+    @@ [Bandcamp about blurb](https://mfrisk.bandcamp.com/track/deadpools-soul)
     Reid's Theme
 ---
 Track: Sonata of Knowledge
@@ -52,10 +52,10 @@ Artists:
 URLs:
 - https://mfrisk.bandcamp.com/track/sonata-of-knowledge
 Commentary: |-
-    <i>M.Frisk:</i> ([Bandcamp about blurb](https://mfrisk.bandcamp.com/track/sonata-of-knowledge))
+    @@ [Bandcamp about blurb](https://mfrisk.bandcamp.com/track/sonata-of-knowledge)
     Lisa's Theme
 
-    <i>Jebb:</i> (Wiki editor, 02/04/2025)
+    <i>Jebb:</i> (wiki editor, 02/04/2025)
     This track is very likely inspired by [Champion Cynthia Encounter Music](https://youtu.be/cho2NsCKZZc) from Pokemon Diamond/Pearl.
 ---
 Track: Sunset Crew
@@ -63,7 +63,7 @@ Duration: '3:09'
 URLs:
 - https://mfrisk.bandcamp.com/track/sunset-crew
 Commentary: |-
-    <i>M.Frisk:</i> ([Bandcamp about blurb](https://mfrisk.bandcamp.com/track/sunset-crew))
+    @@ [Bandcamp about blurb](https://mfrisk.bandcamp.com/track/sunset-crew)
     Thom's composition
 ---
 Track: DOOMED TIMELINE INTERMISSION
@@ -71,5 +71,5 @@ Duration: '6:08'
 URLs:
 - https://mfrisk.bandcamp.com/track/doomed-timeline-intermission
 Commentary: |-
-    <i>M.Frisk:</i> ([Bandcamp about blurb](https://mfrisk.bandcamp.com/track/doomed-timeline-intermission))
+    @@ [Bandcamp about blurb](https://mfrisk.bandcamp.com/track/doomed-timeline-intermission)
     Journey Theme.
diff --git a/album/moonslayer.yaml b/album/moonslayer.yaml
index b636007a..cef1ac18 100644
--- a/album/moonslayer.yaml
+++ b/album/moonslayer.yaml
@@ -38,11 +38,6 @@ Commentary: |-
    An electronic jazz rock VGM type cover of [[Moonsetter]] by Toby Fox.<br>
    [Check it out on YouTube too.](https://www.youtube.com/watch?v=K9KKJQEMQ7o)
 
-   <i>Raid:</i> ([Bandcamp credits blurb](https://rudecustard.bandcamp.com/track/moonslayer))
-
-   Arrangement, performance, recording, and mixing by me<br>
-   Original tune by [[artist:toby-fox]]
-
    <i>Raid:</i> ([YouTube description](https://www.youtube.com/watch?v=K9KKJQEMQ7o), excerpt)
 
    Happy 4/13. Homestuck is getting old. I'm getting old, too. I will graduate from college and turn 22 this year. But my love of music, especially of music from Homestuck, will never get old. So here's a fun little remix of Toby Fox's [["Moonsetter."]] Copious amounts of virtual distorted electric guitar, jazz piano, and intense rock drumming included. Enjoy.
@@ -52,3 +47,8 @@ Commentary: |-
    <i>Raid:</i> (["Moonslayer extended description"](https://pastebin.com/GQ1epnKH))
 
    Why'd I call it Moonslayer? Well, I was looking for a cool edgy yet catchy little name to title this track while riffing off the Homestuck Music Team's theme of titling tracks Moon/Sun + word that starts with S. Moonsetter is the name of the original track. [[Moonshatter]] and [[Sunsetter]] are the names of a couple of Toby Fox's other Homestuck music contributions. [[Moonsweater]] is the name of a track on [[album:homestuck-vol-10|Homestuck Volume 10]] by [[artist:david-ellis|A Lunatic's Daydream]]. So you see what I mean. I considered Moonslammer, like [[Sunslammer]] by [[artist:seth-peelle|Beatfox]], but that wasn't edgy enough for me. So I settled on Moonslayer. Yeah. "Moonslayer" brings up catastrophic, apocalyptic images of destroying the moon, but not just destroying the moon-slaying it, as though the moon were a living entity capable of being conquered. A spirit. A god or goddess, maybe. A constant observer of mankind. Something personified, and then killed. Very edgy. Absolutely perfect.
+Crediting Sources: |-
+   <i>Raid:</i> ([Bandcamp credits blurb](https://rudecustard.bandcamp.com/track/moonslayer))
+
+   Arrangement, performance, recording, and mixing by me<br>
+   Original tune by [[artist:toby-fox]]
diff --git a/album/paradox-struck-volume-1.yaml b/album/paradox-struck-volume-1.yaml
index fcd3f158..b8dff5db 100644
--- a/album/paradox-struck-volume-1.yaml
+++ b/album/paradox-struck-volume-1.yaml
@@ -23,7 +23,7 @@ Cover Art File Extension: jpg
 URLs:
 - https://paradoxstruck.bandcamp.com/track/the-ghostly-composer
 Crediting Sources: |-
-    <i>gr1mv4d3r:</i> ([Bandcamp credits blurb](https://paradoxstruck.bandcamp.com/track/the-ghostly-composer))
+    @@ [Bandcamp credits blurb](https://paradoxstruck.bandcamp.com/track/the-ghostly-composer)
     track art: [[artist:petenans]]
 ---
 Track: Trollish Antics
@@ -33,7 +33,7 @@ Cover Artists:
 URLs:
 - https://paradoxstruck.bandcamp.com/track/trollish-antics
 Crediting Sources: |-
-    <i>gr1mv4d3r:</i> ([Bandcamp credits blurb](https://paradoxstruck.bandcamp.com/track/trollish-antics))
+    @@ [Bandcamp credits blurb](https://paradoxstruck.bandcamp.com/track/trollish-antics)
     track art: [[artist:steamjunk23]]
 ---
 Track: Niko Ectobiology
@@ -47,7 +47,7 @@ Referenced Tracks:
 URLs:
 - https://paradoxstruck.bandcamp.com/track/niko-ectobiology
 Crediting Sources: |-
-    <i>gr1mv4d3r:</i> ([Bandcamp credits blurb](https://paradoxstruck.bandcamp.com/track/niko-ectobiology))
+    @@ [Bandcamp credits blurb](https://paradoxstruck.bandcamp.com/track/niko-ectobiology)
     track art: [[artist:retroguardiann]]
 ---
 Track: Interrogation on a Purple Moon
@@ -57,7 +57,7 @@ Cover Artists:
 URLs:
 - https://paradoxstruck.bandcamp.com/track/interrogation-on-a-purple-moon
 Crediting Sources: |-
-    <i>gr1mv4d3r:</i> ([Bandcamp credits blurb](https://paradoxstruck.bandcamp.com/track/interrogation-on-a-purple-moon))
+    @@ [Bandcamp credits blurb](https://paradoxstruck.bandcamp.com/track/interrogation-on-a-purple-moon)
     track art: [[artist:ardentavian]]
 ---
 Track: The New Recruit
@@ -68,7 +68,7 @@ Cover Art File Extension: jpg
 URLs:
 - https://paradoxstruck.bandcamp.com/track/the-new-recruit
 Crediting Sources: |-
-    <i>gr1mv4d3r:</i> ([Bandcamp credits blurb](https://paradoxstruck.bandcamp.com/track/the-new-recruit))
+    @@ [Bandcamp credits blurb](https://paradoxstruck.bandcamp.com/track/the-new-recruit)
     track art: [[artist:z3drum]]
 ---
 Track: The Ghastly Troll
@@ -78,7 +78,7 @@ Cover Artists:
 URLs:
 - https://paradoxstruck.bandcamp.com/track/the-ghastly-troll
 Crediting Sources: |-
-    <i>gr1mv4d3r:</i> ([Bandcamp credits blurb](https://paradoxstruck.bandcamp.com/track/the-ghastly-troll))
+    @@ [Bandcamp credits blurb](https://paradoxstruck.bandcamp.com/track/the-ghastly-troll)
     track art: [[artist:paramourprophet]]
 ---
 Track: Vitras' Theme
@@ -89,7 +89,7 @@ Cover Art File Extension: jpg
 URLs:
 - https://paradoxstruck.bandcamp.com/track/vitras-theme
 Crediting Sources: |-
-    <i>gr1mv4d3r:</i> ([Bandcamp credits blurb](https://paradoxstruck.bandcamp.com/track/vitras-theme))
+    @@ [Bandcamp credits blurb](https://paradoxstruck.bandcamp.com/track/vitras-theme)
     track art: [[artist:lanky-h0rror]]
 ---
 Track: Gamer Boy
@@ -99,7 +99,7 @@ Cover Artists:
 URLs:
 - https://paradoxstruck.bandcamp.com/track/gamer-boy
 Crediting Sources: |-
-    <i>gr1mv4d3r:</i> ([Bandcamp credits blurb](https://paradoxstruck.bandcamp.com/track/gamer-boy))
+    @@ [Bandcamp credits blurb](https://paradoxstruck.bandcamp.com/track/gamer-boy)
     track art: [[artist:petcusine]]
 ---
 Track: SP0R@D1C1TY
@@ -110,7 +110,7 @@ Cover Art File Extension: jpg
 URLs:
 - https://paradoxstruck.bandcamp.com/track/sp0r-d1c1ty
 Crediting Sources: |-
-    <i>gr1mv4d3r:</i> ([Bandcamp credits blurb](https://paradoxstruck.bandcamp.com/track/sp0r-d1c1ty))
+    @@ [Bandcamp credits blurb](https://paradoxstruck.bandcamp.com/track/sp0r-d1c1ty)
     track art: [[artist:punkadorks]]
 ---
 Track: PYROMANIA
@@ -120,7 +120,7 @@ Cover Artists:
 URLs:
 - https://paradoxstruck.bandcamp.com/track/pyromania
 Crediting Sources: |-
-    <i>gr1mv4d3r:</i> ([Bandcamp credits blurb](https://paradoxstruck.bandcamp.com/track/pyromania))
+    @@ [Bandcamp credits blurb](https://paradoxstruck.bandcamp.com/track/pyromania)
     track art: [[artist:cemetaryfun]]
 ---
 Track: Zephyr's Theme
@@ -130,7 +130,7 @@ Cover Artists:
 URLs:
 - https://paradoxstruck.bandcamp.com/track/zephyrs-theme
 Crediting Sources: |-
-    <i>gr1mv4d3r:</i> ([Bandcamp credits blurb](https://paradoxstruck.bandcamp.com/track/zephyrs-theme))
+    @@ [Bandcamp credits blurb](https://paradoxstruck.bandcamp.com/track/zephyrs-theme)
     track art: [[artist:unlik3lygrader]]
 ---
 Track: Memories Lament
@@ -145,7 +145,7 @@ Art Tags:
 URLs:
 - https://paradoxstruck.bandcamp.com/track/memories-lament
 Crediting Sources: |-
-    <i>gr1mv4d3r:</i> ([Bandcamp credits blurb](https://paradoxstruck.bandcamp.com/track/memories-lament))
+    @@ [Bandcamp credits blurb](https://paradoxstruck.bandcamp.com/track/memories-lament)
     track art: [[artist:zombiesateherbrains]]
 ---
 Track: Slick Swindler
@@ -155,7 +155,7 @@ Cover Artists:
 URLs:
 - https://paradoxstruck.bandcamp.com/track/slick-swindler
 Crediting Sources: |-
-    <i>gr1mv4d3r:</i> ([Bandcamp credits blurb](https://paradoxstruck.bandcamp.com/track/slick-swindler))
+    @@ [Bandcamp credits blurb](https://paradoxstruck.bandcamp.com/track/slick-swindler)
     track art: [[artist:deadmoronsociety]]
 ---
 Track: Subservient Highblood
@@ -167,7 +167,7 @@ Art Tags:
 URLs:
 - https://paradoxstruck.bandcamp.com/track/subservient-highblood
 Crediting Sources: |-
-    <i>gr1mv4d3r:</i> ([Bandcamp credits blurb](https://paradoxstruck.bandcamp.com/track/subservient-highblood))
+    @@ [Bandcamp credits blurb](https://paradoxstruck.bandcamp.com/track/subservient-highblood)
     track art: [[artist:rayquazaxd]]
 ---
 Track: Fright Rush
@@ -181,7 +181,7 @@ Referenced Tracks:
 URLs:
 - https://paradoxstruck.bandcamp.com/track/fright-rush
 Crediting Sources: |-
-    <i>gr1mv4d3r:</i> ([Bandcamp credits blurb](https://paradoxstruck.bandcamp.com/track/fright-rush))
+    @@ [Bandcamp credits blurb](https://paradoxstruck.bandcamp.com/track/fright-rush)
     track art: [[artist:ender]]
 ---
 Track: Assassination Mission
@@ -193,7 +193,7 @@ Art Tags:
 URLs:
 - https://paradoxstruck.bandcamp.com/track/assassination-mission
 Crediting Sources: |-
-    <i>gr1mv4d3r:</i> ([Bandcamp credits blurb](https://paradoxstruck.bandcamp.com/track/assassination-mission))
+    @@ [Bandcamp credits blurb](https://paradoxstruck.bandcamp.com/track/assassination-mission)
     track art: [[artist:spamton-aka-spamton]]
 ---
 Track: The Question Game
@@ -203,7 +203,7 @@ Cover Artists:
 URLs:
 - https://paradoxstruck.bandcamp.com/track/the-question-game
 Crediting Sources: |-
-    <i>gr1mv4d3r:</i> ([Bandcamp credits blurb](https://paradoxstruck.bandcamp.com/track/the-question-game))
+    @@ [Bandcamp credits blurb](https://paradoxstruck.bandcamp.com/track/the-question-game)
     track art: [[artist:epic-juice]]
 ---
 Track: CHR0MAT1KK
@@ -215,5 +215,5 @@ Art Tags:
 URLs:
 - https://paradoxstruck.bandcamp.com/track/chr0mat1kk
 Crediting Sources: |-
-    <i>gr1mv4d3r:</i> ([Bandcamp credits blurb](https://paradoxstruck.bandcamp.com/track/chr0mat1kk))
-    track art: [[artist:eerily-arsenic]]
\ No newline at end of file
+    @@ [Bandcamp credits blurb](https://paradoxstruck.bandcamp.com/track/chr0mat1kk)
+    track art: [[artist:eerily-arsenic]]
diff --git a/album/paths.yaml b/album/paths.yaml
index c12737a3..c720331f 100644
--- a/album/paths.yaml
+++ b/album/paths.yaml
@@ -36,7 +36,7 @@ Duration: 3:39
 URLs:
 - https://parsecproductions.bandcamp.com/track/aggrievocation
 Commentary: |-
-    <i>Mark J. Hadley:</i> ([Bandcamp about blurb](https://parsecproductions.bandcamp.com/track/aggrievocation))
+    @@ [Bandcamp about blurb](https://parsecproductions.bandcamp.com/track/aggrievocation)
     Originally appeared in [[album:homestuck-vol-10|"Homestuck Vol. 10"]]
 ---
 Track: Slender
@@ -45,7 +45,7 @@ Duration: 2:06
 URLs:
 - https://parsecproductions.bandcamp.com/track/slender
 Commentary: |-
-    <i>Mark J. Hadley:</i> ([Bandcamp about blurb](https://parsecproductions.bandcamp.com/track/slender))
+    @@ [Bandcamp about blurb](https://parsecproductions.bandcamp.com/track/slender)
     Originally appeared in "Slender: The Eight Pages"
 ---
 Track: Forge Multitask
@@ -54,7 +54,7 @@ Duration: 3:28
 URLs:
 - https://parsecproductions.bandcamp.com/track/forge-multitask
 Commentary: |-
-    <i>Mark J. Hadley:</i> ([Bandcamp about blurb](https://parsecproductions.bandcamp.com/forge-multitask))
+    @@ [Bandcamp about blurb](https://parsecproductions.bandcamp.com/forge-multitask)
     Originally appeared in [[album:dare|"Dare"]]
 ---
 Track: Train Hard!
@@ -69,7 +69,7 @@ Duration: 2:45
 URLs:
 - https://parsecproductions.bandcamp.com/track/isolate
 Commentary: |-
-    <i>Mark J. Hadley:</i> ([Bandcamp about blurb](https://parsecproductions.bandcamp.com/track/isolate))
+    @@ [Bandcamp about blurb](https://parsecproductions.bandcamp.com/track/isolate)
     Originally appeared in "Slender: The Arrival"
 ---
 Track: Carefree Action
@@ -78,7 +78,7 @@ Duration: 2:08
 URLs:
 - https://parsecproductions.bandcamp.com/track/carefree-action
 Commentary: |-
-    <i>Mark J. Hadley:</i> ([Bandcamp about blurb](https://parsecproductions.bandcamp.com/track/carefree-action))
+    @@ [Bandcamp about blurb](https://parsecproductions.bandcamp.com/track/carefree-action)
     Originally appeared in [[album:homestuck-vol-8|"Homestuck Vol. 8"]]
 ---
 Track: Edge of Worlds
@@ -87,7 +87,7 @@ Duration: 3:25
 URLs:
 - https://parsecproductions.bandcamp.com/track/edge-of-worlds-2
 Commentary: |-
-    <i>Mark J. Hadley:</i> ([Bandcamp about blurb](https://parsecproductions.bandcamp.com/track/edge-of-worlds-2))
+    @@ [Bandcamp about blurb](https://parsecproductions.bandcamp.com/track/edge-of-worlds-2)
     Originally appeared in [[album:a-nameless-inheritance|"A Nameless Inheritance"]]
 ---
 Track: Galaxy Hearts
@@ -96,7 +96,7 @@ Duration: 2:53
 URLs:
 - https://parsecproductions.bandcamp.com/track/galaxy-hearts
 Commentary: |-
-    <i>Mark J. Hadley:</i> ([Bandcamp about blurb](https://parsecproductions.bandcamp.com/track/galaxy-hearts))
+    @@ [Bandcamp about blurb](https://parsecproductions.bandcamp.com/track/galaxy-hearts)
     Originally appeared in [[album:homestuck-vol-8|"Homestuck Vol. 8"]]
 ---
 Track: Chromaestro
@@ -114,7 +114,7 @@ Duration: 2:32
 URLs:
 - https://parsecproductions.bandcamp.com/track/lurk-2
 Commentary: |-
-    <i>Mark J. Hadley:</i> ([Bandcamp about blurb](https://parsecproductions.bandcamp.com/track/lurk-2))
+    @@ [Bandcamp about blurb](https://parsecproductions.bandcamp.com/track/lurk-2)
     Originally appeared in [[album:a-nameless-inheritance|"A Nameless Inheritance"]]
 ---
 Track: Furni-Chore
@@ -123,7 +123,7 @@ Duration: 1:34
 URLs:
 - https://parsecproductions.bandcamp.com/track/furni-chore
 Commentary: |-
-    <i>Mark J. Hadley:</i> ([Bandcamp about blurb](https://parsecproductions.bandcamp.com/furni-chore))
+    @@ [Bandcamp about blurb](https://parsecproductions.bandcamp.com/furni-chore)
     Originally appeared in [[album:dare|"Dare"]]
 ---
 Track: Bane
@@ -132,7 +132,7 @@ Duration: 6:05
 URLs:
 - https://parsecproductions.bandcamp.com/track/bane
 Commentary: |-
-    <i>Mark J. Hadley:</i> ([Bandcamp about blurb](https://parsecproductions.bandcamp.com/bane))
+    @@ [Bandcamp about blurb](https://parsecproductions.bandcamp.com/bane)
     Originally appeared in [[album:p-s|"P.[S\]."]]
 ---
 Track: Final Stand
@@ -141,7 +141,7 @@ Duration: 3:32
 URLs:
 - https://parsecproductions.bandcamp.com/track/final-stand
 Commentary: |-
-    <i>Mark J. Hadley:</i> ([Bandcamp about blurb](https://parsecproductions.bandcamp.com/final-stand))
+    @@ [Bandcamp about blurb](https://parsecproductions.bandcamp.com/final-stand)
     Originally appeared in [[album:dare|"Dare"]]
 ---
 Track: Dawn
@@ -150,7 +150,7 @@ Duration: 1:51
 URLs:
 - https://parsecproductions.bandcamp.com/track/dawn-2
 Commentary: |-
-    <i>Mark J. Hadley:</i> ([Bandcamp about blurb](https://parsecproductions.bandcamp.com/track/dawn-2))
+    @@ [Bandcamp about blurb](https://parsecproductions.bandcamp.com/track/dawn-2)
     Originally appeared in ["The Consuming Shadow"](https://store.steampowered.com/app/403830/)
 ---
 Track: Song of Skaia
@@ -159,7 +159,7 @@ Duration: 6:27
 URLs:
 - https://parsecproductions.bandcamp.com/track/song-of-skaia-2
 Commentary: |-
-    <i>Mark J. Hadley:</i> ([Bandcamp about blurb](https://parsecproductions.bandcamp.com/track/song-of-skaia-2))
+    @@ [Bandcamp about blurb](https://parsecproductions.bandcamp.com/track/song-of-skaia-2)
     Originally appeared in [[album:song-of-skaia|"Song of Skaia"]]
 ---
 Track: The Raddest
diff --git a/album/perfectly-generic-album-chaoticcomposer.yaml b/album/perfectly-generic-album-chaoticcomposer.yaml
index 289e49fa..d2c74242 100644
--- a/album/perfectly-generic-album-chaoticcomposer.yaml
+++ b/album/perfectly-generic-album-chaoticcomposer.yaml
@@ -27,7 +27,7 @@ Referenced Tracks:
 URLs:
 - https://soundcloud.com/chaoticcomposer/rustblood
 Referencing Sources: |-
-    <i>chaoticComposer:</i> ([SoundCloud description](https://soundcloud.com/chaoticcomposer/rustblood), excerpt)
+    @@ [SoundCloud description](https://soundcloud.com/chaoticcomposer/rustblood), excerpt
     Original: [[Rustblood]] by [[artist:james-roach]] and [[artist:toby-fox]]
 ---
 Track: Derse Dreamers [Cover]
@@ -38,7 +38,7 @@ Referenced Tracks:
 URLs:
 - https://soundcloud.com/chaoticcomposer/derse-dreamers
 Referencing Sources: |-
-    <i>chaoticComposer:</i> ([SoundCloud description](https://soundcloud.com/chaoticcomposer/derse-dreamers), excerpt)
+    @@ [SoundCloud description](https://soundcloud.com/chaoticcomposer/derse-dreamers), excerpt
     Original: [[Derse Dreamers]] by [[artist:solatrus]]
 ---
 Track: Dead Shuffle [Cover]
@@ -49,7 +49,7 @@ Referenced Tracks:
 URLs:
 - https://soundcloud.com/chaoticcomposer/dead-shuffle
 Referencing Sources: |-
-    <i>chaoticComposer:</i> ([SoundCloud description](https://soundcloud.com/chaoticcomposer/dead-shuffle), excerpt)
+    @@ [SoundCloud description](https://soundcloud.com/chaoticcomposer/dead-shuffle), excerpt
     Original: [[Dead Shuffle]] by [[artist:mark-j-hadley]]
 ---
 Track: Vriska’s Theme [Cover]
@@ -60,7 +60,7 @@ Referenced Tracks:
 URLs:
 - https://soundcloud.com/chaoticcomposer/vriskas-theme
 Referencing Sources: |-
-    <i>chaoticComposer:</i> ([SoundCloud description](https://soundcloud.com/chaoticcomposer/vriskas-theme), excerpt)
+    @@ [SoundCloud description](https://soundcloud.com/chaoticcomposer/vriskas-theme), excerpt
     Original: [[Vriska's Theme]] by [[artist:toby-fox]]
 ---
 Track: Karkat’s Theme [Cover]
@@ -71,7 +71,7 @@ Referenced Tracks:
 URLs:
 - https://soundcloud.com/chaoticcomposer/karkats-theme
 Referencing Sources: |-
-    <i>chaoticComposer:</i> ([SoundCloud description](https://soundcloud.com/chaoticcomposer/karkats-theme), excerpt)
+    @@ [SoundCloud description](https://soundcloud.com/chaoticcomposer/karkats-theme), excerpt
     Original: [[Karkat's Theme]] by [[artist:toby-fox]]
 ---
 Track: Black [Cover]
@@ -82,5 +82,5 @@ Referenced Tracks:
 URLs:
 - https://soundcloud.com/chaoticcomposer/black
 Referencing Sources: |-
-    <i>chaoticComposer:</i> ([SoundCloud description](https://soundcloud.com/chaoticcomposer/black), excerpt)
-    Original: [[Black]] by [[artist:toby-fox]]
\ No newline at end of file
+    @@ [SoundCloud description](https://soundcloud.com/chaoticcomposer/black), excerpt
+    Original: [[Black]] by [[artist:toby-fox]]
diff --git a/album/project-s-ost-vol-1.yaml b/album/project-s-ost-vol-1.yaml
index 78de7513..b008beb2 100644
--- a/album/project-s-ost-vol-1.yaml
+++ b/album/project-s-ost-vol-1.yaml
@@ -29,13 +29,13 @@ Art Tags:
 - John
 - Earth
 Commentary: |-
-    <i>Project [S]:</i> ([YouTube video description](https://www.youtube.com/watch?v=XpPS_QSXG58))
+    @@ [YouTube video description](https://www.youtube.com/watch?v=XpPS_QSXG58)
 
     Happy 4/13!
 
     We are excited to introduce to you the first Project Soundpage OST album. This album features 7 tracks featured in the [Project [S\] Act 1 Episode 1 animatic](https://www.youtube.com/watch?v=vMmNFa4jE9o), 6 unused tracks intended for that episode, and 3 bonus tracks just for fun!
 
-    <i>Project [S]:</i> ([Tumblr post](https://project-s-official.tumblr.com/post/747132815583412224))
+    @@ [Tumblr post](https://project-s-official.tumblr.com/post/747132815583412224)
 
     [[root:media/misc/project-s-vol-1-trailer.mp4|Now That's What I Call [S\]]]
 ---
diff --git a/album/project-skaia.yaml b/album/project-skaia.yaml
index f07c0727..ff5c7d62 100644
--- a/album/project-skaia.yaml
+++ b/album/project-skaia.yaml
@@ -32,7 +32,8 @@ URLs:
 - https://soundcloud.com/musical_panini/pulse-of-the-storm
 Commentary: |-
     <i>Musical Panini:</i> ([SoundCloud description](https://soundcloud.com/musical_panini/pulse-of-the-storm))
-    Perfect holiday location. Tem/tem^8
+
+    Perfect holiday location. Tem/tem^8<br>
     Part of a little project I got going
 ---
 Track: Super Hot Fried Rice
@@ -44,7 +45,8 @@ URLs:
 - https://soundcloud.com/musical_panini/super-hot-fried-rice
 Commentary: |-
     <i>Musical Panini:</i> ([SoundCloud description](https://soundcloud.com/musical_panini/super-hot-fried-rice))
-    LANCE SMELLS LEL XDDDDDDDD
+
+    LANCE SMELLS LEL XDDDDDDDD<br>
     Part of a little project I got going
 ---
 Track: Flight Through A Spectrum
@@ -56,7 +58,8 @@ URLs:
 - https://soundcloud.com/musical_panini/flight-through-a-spectrum
 Commentary: |-
     <i>Musical Panini:</i> ([SoundCloud description](https://soundcloud.com/musical_panini/flight-through-a-spectrum))
-    JINGLE BELLS, REILLY SMELLS
+
+    JINGLE BELLS, REILLY SMELLS<br>
     Part of a little project I got going
 ---
 Track: Warm Glow On Cold Steel
@@ -68,7 +71,8 @@ URLs:
 - https://soundcloud.com/musical_panini/warm-glow-on-cold-steel
 Commentary: |-
     <i>Musical Panini:</i> ([SoundCloud description](https://soundcloud.com/musical_panini/warm-glow-on-cold-steel))
-    *Insert comment about Connor smelling*
+
+    \*Insert comment about Connor smelling\*
 ---
 Track: Power Surge
 Date First Released: January 13, 2016
@@ -79,6 +83,7 @@ URLs:
 - https://soundcloud.com/musical_panini/power-surge
 Commentary: |-
     <i>Musical Panini:</i> ([SoundCloud description](https://soundcloud.com/musical_panini/power-surge))
+
     Because my dumb friend wanted to hear this
 ---
 Track: Evergrowing Confusion
@@ -90,7 +95,8 @@ URLs:
 - https://soundcloud.com/musical_panini/evergrowing-confusion
 Commentary: |-
     <i>Musical Panini:</i> ([SoundCloud description](https://soundcloud.com/musical_panini/evergrowing-confusion))
-    The first of Project Skaia
+
+    The first of Project Skaia<br>
     Land of Weeds and Confusion
 ---
 Track: Sudden Change of Pace
@@ -102,7 +108,8 @@ URLs:
 - https://soundcloud.com/musical_panini/sudden-change-of-pace
 Commentary: |-
     <i>Musical Panini:</i> ([SoundCloud description](https://soundcloud.com/musical_panini/sudden-change-of-pace))
-    Wow I did this fast! Second song for Project Skaia
+
+    Wow I did this fast! Second song for Project Skaia<br>
     Land of Vicissitude and Impulse
 ---
 Track: Sticky Notes
@@ -114,5 +121,6 @@ URLs:
 - https://soundcloud.com/musical_panini/sticky-notes
 Commentary: |-
     <i>Musical Panini:</i> ([SoundCloud description](https://soundcloud.com/musical_panini/sticky-notes))
-    Track number 3 of Project Skaia
+
+    Track number 3 of Project Skaia<br>
     Land of Notes and Slime
diff --git a/album/rust-apocalypse-anniversary-remaster.yaml b/album/rust-apocalypse-anniversary-remaster.yaml
index 05f491b4..1c60339d 100644
--- a/album/rust-apocalypse-anniversary-remaster.yaml
+++ b/album/rust-apocalypse-anniversary-remaster.yaml
@@ -28,7 +28,7 @@ Commentary: |-
     <i>Willow Ascenzo:</i> ([Bandcamp about blurb](https://wellmanicuredmusic.bandcamp.com/album/rust-apocalypse-anniversary-remaster))
 
     A remastered version of [[Rust Apocalypse]], released on the anniversary of the original track, which was itself an arrangement and expansion of [[track:rust-servant|a track I composed]] for the Homestuck album [[album:coloUrs-and-mayhem-universe-a]]. This version has been remastered from the original stem tracks for a brighter, clearer sound, and parts of the choir have been redone for additional clarity.
-
+Crediting Sources: |-
     <i>Willow Ascenzo:</i> ([Bandcamp credits blurb](https://wellmanicuredmusic.bandcamp.com/album/rust-apocalypse-anniversary-remaster), excerpt)
 
     Based on [["Rust Servant"]], composed in 2012 by [[artist:willow-ascenzo|Willow Ascenzo]], originally released April 2012 on [[album:coloUrs-and-mayhem-universe-a|"coloUrs and mayhem: Universe A"]] via Homestuck and What Pumpkin Studios
diff --git a/album/sburb-beta.yaml b/album/sburb-beta.yaml
index 74a33960..6991c87a 100644
--- a/album/sburb-beta.yaml
+++ b/album/sburb-beta.yaml
@@ -24,7 +24,8 @@ Color: '#4be14e'
 Groups:
 - Fandom
 Commentary: |-
-    <i>pomabug:</i> ([Bandcamp about blurb](https://pomabug.bandcamp.com/album/sburb-beta), excerpt)
+    @@ [Bandcamp about blurb](https://pomabug.bandcamp.com/album/sburb-beta), excerpt
+
     © SKAIANET SYSTEMS INCORPORATED. ALL RIGHTS RESERVED.
 ---
 Track: Physician
@@ -37,7 +38,8 @@ URLs:
 - https://pomabug.bandcamp.com/track/physician
 - https://youtu.be/Wg1nD54jKDY
 Referencing Sources: |-
-    <i>pomabug:</i> ([Bandcamp credits blurb](https://pomabug.bandcamp.com/track/physician))
+    @@ [Bandcamp credits blurb](https://pomabug.bandcamp.com/track/physician)
+
     based on [["Doctor"]] by [[artist:buzinkai]]
 ---
 Track: Rose Indefinitely
@@ -49,7 +51,8 @@ URLs:
 - https://pomabug.bandcamp.com/track/rose-indefinitely
 - https://youtu.be/9zgUl6SKNn4
 Referencing Sources: |-
-    <i>pomabug:</i> ([Bandcamp credits blurb](https://pomabug.bandcamp.com/track/rose-indefinitely))
+    @@ [Bandcamp credits blurb](https://pomabug.bandcamp.com/track/rose-indefinitely)
+
     based on [["Endless Climb"]] by [[artist:buzinkai]], references [["Chorale for Jaspers"]] by [[artist:michael-guy-bowman]]
 ---
 Track: Record High
@@ -62,5 +65,6 @@ URLs:
 - https://pomabug.bandcamp.com/track/record-high
 - https://youtu.be/Rzs9ZByfoD0
 Referencing Sources: |-
-    <i>pomabug:</i> ([Bandcamp credits blurb](https://pomabug.bandcamp.com/track/record-high))
-    based on [["Atomyk Ebonpyre"]] by [[artist:toby-fox]], references [["Showtime (Original Mix)"]] by [[artist:malcolm-brown]] and [["Upward Movement (Dave Owns)"]] by [[artist:kalibration]]
\ No newline at end of file
+    @@ [Bandcamp credits blurb](https://pomabug.bandcamp.com/track/record-high)
+
+    based on [["Atomyk Ebonpyre"]] by [[artist:toby-fox]], references [["Showtime (Original Mix)"]] by [[artist:malcolm-brown]] and [["Upward Movement (Dave Owns)"]] by [[artist:kalibration]]
diff --git a/album/shallow-shores.yaml b/album/shallow-shores.yaml
index 081ef61b..5f761f4f 100644
--- a/album/shallow-shores.yaml
+++ b/album/shallow-shores.yaml
@@ -118,7 +118,7 @@ URLs:
 - https://open.spotify.com/track/0iWhJmG6sv0bRUBWTfQZle
 - https://music.apple.com/song/%E6%B5%85%E5%B2%B8/1807575760
 Lyrics: |-
-    <i>Circlejourney:</i> ([artist's lyrics](https://circlejourney.bandcamp.com/track/-))
+    @@ [artist's lyrics](https://circlejourney.bandcamp.com/track/-)
 
     当潮汐退去,你慢慢涉海
     涟漪温柔,泡沫苍白
diff --git a/album/so-i-herd-you-liek-homestuck.yaml b/album/so-i-herd-you-liek-homestuck.yaml
index 5abe4403..d3dc130c 100644
--- a/album/so-i-herd-you-liek-homestuck.yaml
+++ b/album/so-i-herd-you-liek-homestuck.yaml
@@ -28,8 +28,8 @@ URLs:
 - https://sidewalkbanana.bandcamp.com/track/eridans-theme-remix
 Referenced Tracks:
 - Eridan's Theme
-Commentary: |-
-    <i>sidewalkbanana:</i> ([Bandcamp about blurb](https://sidewalkbanana.bandcamp.com/track/aggrieve-short-remix))
+Referencing Sources: |-
+    @@ [Bandcamp about blurb](https://sidewalkbanana.bandcamp.com/track/aggrieve-short-remix)
 
     [[Eridans theme]] by [[artist:toby-fox|Toby "Radiation" Fox]]
 ---
@@ -40,8 +40,8 @@ URLs:
 - https://sidewalkbanana.bandcamp.com/track/aggrieve-short-remix
 Referenced Tracks:
 - Aggrieve
-Commentary: |-
-    <i>sidewalkbanana:</i> ([Bandcamp about blurb](https://sidewalkbanana.bandcamp.com/track/aggrieve-short-remix))
+Referencing Sources: |-
+    @@ [Bandcamp about blurb](https://sidewalkbanana.bandcamp.com/track/aggrieve-short-remix)
 
     [[track:aggrieve]] by [[artist:mark-j-hadley|Mark Hadley]]
 ---
@@ -62,19 +62,19 @@ Referenced Tracks:
 - Black
 - Hanging reminder
 Commentary: |-
-    <i>sidewalkbanana:</i> ([Bandcamp about blurb](https://sidewalkbanana.bandcamp.com/track/hanging-black))
+    <i>sidewalkbanana:</i> ([Newgrounds description](https://www.newgrounds.com/audio/listen/442187))
 
-    [[track:black]] by [[artist:toby-fox|Toby "Radiation" Fox]]<br>
+    i was trying out reason at school at had some spare midi files laying around and this is the result. enjoy.
+Referencing Sources: |-
+    @@ [Bandcamp about blurb](https://sidewalkbanana.bandcamp.com/track/hanging-black)
+
+    [[track:black]] by [[artist:toby-fox]]<br>
     With a little bit of [[hanging reminder]] thrown in.
 
-    <i>sidewalkbanana:</i> ([Bandcamp credits blurb](https://sidewalkbanana.bandcamp.com/track/hanging-black))
+    @@ [Bandcamp credits blurb](https://sidewalkbanana.bandcamp.com/track/hanging-black)
 
     [[artist:andrew-hussie|Andrew hussie]] for homestuck<br>
-    [[artist:toby-fox|Toby "Radiation" Fox]] for [[BLACK]]
-
-    <i>sidewalkbanana:</i> ([Newgrounds description](https://www.newgrounds.com/audio/listen/442187))
-
-    i was trying out reason at school at had some spare midi files laying around and this is the result. enjoy.
+    [[artist:toby-fox]] for [[BLACK]]
 ---
 Track: Showdown remix
 Suffix Directory: true
@@ -83,10 +83,10 @@ URLs:
 - https://sidewalkbanana.bandcamp.com/track/showdown-remix
 Referenced Tracks:
 - Showdown
-Commentary: |-
-    <i>sidewalkbanana:</i> ([Bandcamp about blurb](https://sidewalkbanana.bandcamp.com/track/in-search-of-justice))
+Referencing Sources: |-
+    @@ [Bandcamp about blurb](https://sidewalkbanana.bandcamp.com/track/in-search-of-justice)
 
-    [[track:showdown|By]] [[artist:toby-fox|Toby Radiation Fox]]
+    [[track:showdown|By]] [[artist:toby-fox]]
 ---
 Track: In search of justice
 Duration: 4:00
@@ -94,10 +94,10 @@ URLs:
 - https://sidewalkbanana.bandcamp.com/track/in-search-of-justice
 Referenced Tracks:
 - Walk-Stab-Walk (R&E)
-Commentary: |-
-    <i>sidewalkbanana:</i> ([Bandcamp about blurb](https://sidewalkbanana.bandcamp.com/track/in-search-of-justice))
+Referencing Sources: |-
+    @@ [Bandcamp about blurb](https://sidewalkbanana.bandcamp.com/track/in-search-of-justice)
 
-    Remix of [[track:walk-stab-walk-r-and-e|Walk_Stab_Walk]] by [[artist:erik-scheele|Erik "Jit" Scheele]]
+    Remix of [[track:walk-stab-walk-r-and-e|Walk_Stab_Walk]] by [[artist:erik-scheele]]
 ---
 Track: Homefree Remix.
 Suffix Directory: true
@@ -107,7 +107,7 @@ URLs:
 Referenced Tracks:
 - Homefree
 - Skies of Skaia
-Commentary: |-
-    <i>sidewalkbanana:</i> ([Bandcamp about blurb](https://sidewalkbanana.bandcamp.com/track/homefree-remix))
+Referencing Sources: |-
+    @@ [Bandcamp about blurb](https://sidewalkbanana.bandcamp.com/track/homefree-remix)
 
-    [[track:homefree]] by [[artist:hilary-troiano|Hilary "Pie" Troiano]]
+    [[track:homefree]] by [[artist:hilary-troiano]]
diff --git a/album/someday-marcy-nabors.yaml b/album/someday-marcy-nabors.yaml
index 85c60fa7..6ebab9cb 100644
--- a/album/someday-marcy-nabors.yaml
+++ b/album/someday-marcy-nabors.yaml
@@ -18,7 +18,7 @@ Groups:
 - Marcy Nabors
 - Beyond
 Crediting Sources: |-
-    <i>Marcy Nabors:</i> ([Bandcamp credits blurb](https://shadolith.bandcamp.com/track/someday))
+    @@ [Bandcamp credits blurb](https://shadolith.bandcamp.com/track/someday)
     Album art by Lune at lunedraws.tumblr.com
 ---
 Track: Someday
@@ -26,4 +26,4 @@ Directory: someday-marcy-nabors
 Always Reference By Directory: true
 Duration: 5:43
 URLs:
-- https://shadolith.bandcamp.com/track/someday
\ No newline at end of file
+- https://shadolith.bandcamp.com/track/someday
diff --git a/album/stalemate-vol-2.yaml b/album/stalemate-vol-2.yaml
index a983332e..18e9517f 100644
--- a/album/stalemate-vol-2.yaml
+++ b/album/stalemate-vol-2.yaml
@@ -151,7 +151,7 @@ Cover Artists:
 Referenced Tracks:
 - Get Up
 Crediting Sources: |-
-    <i>Stalemate:</i> ([Bandcamp about blurb](https://stalematecomic.bandcamp.com/track/absolutely-nothing), excerpt)
+    @@ [Bandcamp about blurb](https://stalematecomic.bandcamp.com/track/absolutely-nothing), excerpt
 
     Track art by: [[artist:spilledcereals|[SpilledCereals\]]], digitalized by [[artist:infinite|[infinite\]]]
 ---
diff --git a/album/tale-of-arpege-clavier-chapter-1-of-92000000.yaml b/album/tale-of-arpege-clavier-chapter-1-of-92000000.yaml
index d97d4b06..efa7e7db 100644
--- a/album/tale-of-arpege-clavier-chapter-1-of-92000000.yaml
+++ b/album/tale-of-arpege-clavier-chapter-1-of-92000000.yaml
@@ -27,7 +27,7 @@ Commentary: |-
 
     I used to be into Homestuck, once upon a time. Enough to RP, even. The less said about what was both an embarrassing escapade and a really unhappy time in my life in retrospect, the better. However, a smattering of fan music came about as a result of this brief obsession, all of which is collected under here for your listening pleasure- with a bonus remix of [[Gold Mage]] by YM2612 wizard [[artist:haunter|BlastProcessed]]!
 
-    <i>Decon Theed, repeatedScales|[[artist:repeatedscales]]:</i> ([Bandcamp credits blurb](https://103records.bandcamp.com/album/the-ever-so-unfortunate-tale-of-the-right-honorable-arpege-clavier-chapter-1-of-92000000), excerpt)
+    @@ [Bandcamp credits blurb](https://103records.bandcamp.com/album/the-ever-so-unfortunate-tale-of-the-right-honorable-arpege-clavier-chapter-1-of-92000000), excerpt
 
     all music composed by [[artist:decon-theed]]
 
diff --git a/album/the-green-box-set-1.yaml b/album/the-green-box-set-1.yaml
index f53d042a..e50bde94 100644
--- a/album/the-green-box-set-1.yaml
+++ b/album/the-green-box-set-1.yaml
@@ -34,13 +34,13 @@ Cover Artists:
 URLs:
 - https://iodbc.bandcamp.com/track/s-cape
 Commentary: |-
-    <i>iodbc - The Black Box:</i> ([Bandcamp about blurb](https://iodbc.bandcamp.com/track/s-cape))
+    @@ [Bandcamp about blurb](https://iodbc.bandcamp.com/track/s-cape)
 
     Commissioned by [[artist:sodiumcadaver|sodiumCadaver]].
 
     Intended for use in ["Losange."](https://mspfa.com/?s=22420)
 
-    <i>iodbc - The Black Box:</i> ([Bandcamp credits blurb](https://iodbc.bandcamp.com/track/s-cape))
+    @@ [Bandcamp credits blurb](https://iodbc.bandcamp.com/track/s-cape)
 
     Track art is an edited portion of "Losange."
 ---
@@ -56,7 +56,7 @@ Art Tags:
 URLs:
 - https://iodbc.bandcamp.com/track/stargazer
 Commentary: |-
-    <i>iodbc - The Black Box:</i> ([Bandcamp about blurb](https://iodbc.bandcamp.com/track/stargazer))
+    @@ [Bandcamp about blurb](https://iodbc.bandcamp.com/track/stargazer)
 
     Commissioned by [[artist:zerio|Zerio]].
 
@@ -72,7 +72,7 @@ Cover Artists:
 URLs:
 - https://iodbc.bandcamp.com/track/through-the-light-between-worlds
 Commentary: |-
-    <i>iodbc - The Black Box:</i> ([Bandcamp about blurb](https://iodbc.bandcamp.com/track/through-the-light-between-worlds))
+    @@ [Bandcamp about blurb](https://iodbc.bandcamp.com/track/through-the-light-between-worlds)
 
     Commissioned by [[artist:zerio|Zerio]].
 
@@ -97,7 +97,7 @@ Sampled Tracks:
 URLs:
 - https://iodbc.bandcamp.com/track/bronze-mechanic
 Commentary: |-
-    <i>iodbc - The Black Box:</i> ([Bandcamp about blurb](https://iodbc.bandcamp.com/track/bronze-mechanic))
+    @@ [Bandcamp about blurb](https://iodbc.bandcamp.com/track/bronze-mechanic)
 
     Commissioned by [[artist:glazelazer|glazelazer]].
 
@@ -111,7 +111,7 @@ Cover Artists:
 URLs:
 - https://iodbc.bandcamp.com/track/crashing-down
 Commentary: |-
-    <i>iodbc - The Black Box:</i> ([Bandcamp about blurb](https://iodbc.bandcamp.com/track/crashing-down))
+    @@ [Bandcamp about blurb](https://iodbc.bandcamp.com/track/crashing-down)
 
     Commissioned by [[artist:zachary-torroni|Zachary Torroni]].
 
@@ -127,13 +127,13 @@ Art Tags:
 URLs:
 - https://iodbc.bandcamp.com/track/convergence-emmys-theme
 Commentary: |-
-    <i>iodbc - The Black Box:</i> ([Bandcamp about blurb](https://iodbc.bandcamp.com/track/convergence-emmys-theme))
+    @@ [Bandcamp about blurb](https://iodbc.bandcamp.com/track/convergence-emmys-theme)
 
     Commissioned by [[artist:animeseinfeld]].
 
     Intended for use in ["Hexane."](https://mspfa.com?s=1032)
 
-    <i>iodbc - The Black Box:</i> ([Bandcamp credits blurb](https://iodbc.bandcamp.com/track/convergence-emmys-theme))
+    @@ [Bandcamp credits blurb](https://iodbc.bandcamp.com/track/convergence-emmys-theme)
 
     Download the full album here: [hexane.bandcamp.com/album/hexane-volume-6](https://hexane.bandcamp.com/album/hexane-volume-6)
 ---
@@ -147,13 +147,13 @@ Art Tags:
 URLs:
 - https://iodbc.bandcamp.com/track/requiem-of-renewal-laraminias-theme
 Commentary: |-
-    <i>iodbc - The Black Box:</i> ([Bandcamp about blurb](https://iodbc.bandcamp.com/track/requiem-of-renewal-laraminias-theme))
+    @@ [Bandcamp about blurb](https://iodbc.bandcamp.com/track/requiem-of-renewal-laraminias-theme)
 
     Commissioned by [[artist:animeseinfeld]].
 
     Intended for use in ["Hexane."](https://mspfa.com?s=1032)
 
-    <i>iodbc - The Black Box:</i> ([Bandcamp credits blurb](https://iodbc.bandcamp.com/track/requiem-of-renewal-laraminias-theme))
+    @@ [Bandcamp credits blurb](https://iodbc.bandcamp.com/track/requiem-of-renewal-laraminias-theme)
 
     This track is part of the MARTYR Hexane Album. Download the full album here: [hexane.bandcamp.com/album/martyr](https://hexane.bandcamp.com/album/martyr)
 
@@ -170,13 +170,13 @@ Art Tags:
 URLs:
 - https://iodbc.bandcamp.com/track/reverse-engineering-qamarkinos-theme
 Commentary: |-
-    <i>iodbc - The Black Box:</i> ([Bandcamp about blurb](https://iodbc.bandcamp.com/track/reverse-engineering-qamarkinos-theme))
+    @@ [Bandcamp about blurb](https://iodbc.bandcamp.com/track/reverse-engineering-qamarkinos-theme)
 
     Commissioned by [[artist:animeseinfeld]].
 
     Intended for use in ["Hexane."](https://mspfa.com?s=1032)
 
-    <i>iodbc - The Black Box:</i> ([Bandcamp credits blurb](https://iodbc.bandcamp.com/track/reverse-engineering-qamarkinos-theme))
+    @@ [Bandcamp credits blurb](https://iodbc.bandcamp.com/track/reverse-engineering-qamarkinos-theme)
 
     Download the full album here: [hexane.bandcamp.com/album/hexane-volume-6](https://hexane.bandcamp.com/album/hexane-volume-6)
 ---
@@ -188,13 +188,13 @@ Referenced Tracks:
 URLs:
 - https://iodbc.bandcamp.com/track/teal-maestro-acoustic-refrain
 Commentary: |-
-    <i>iodbc - The Black Box:</i> ([Bandcamp about blurb](https://iodbc.bandcamp.com/track/teal-maestro-acoustic-refrain))
+    @@ [Bandcamp about blurb](https://iodbc.bandcamp.com/track/teal-maestro-acoustic-refrain)
 
     Commissioned by [[artist:glazelazer]].
 
     Intended for use in ["Moonsplit."](https://mspfa.com?s=23973)
 
-    <i>iodbc - The Black Box:</i> ([Bandcamp credits blurb](https://iodbc.bandcamp.com/track/teal-maestro-acoustic-refrain))
+    @@ [Bandcamp credits blurb](https://iodbc.bandcamp.com/track/teal-maestro-acoustic-refrain)
 
     Album art pending.
 ---
@@ -208,13 +208,13 @@ Art Tags:
 URLs:
 - https://iodbc.bandcamp.com/track/phantasm-of-the-mind-thereminas-theme
 Commentary: |-
-    <i>iodbc - The Black Box:</i> ([Bandcamp about blurb](https://iodbc.bandcamp.com/track/phantasm-of-the-mind-thereminas-theme))
+    @@ [Bandcamp about blurb](https://iodbc.bandcamp.com/track/phantasm-of-the-mind-thereminas-theme)
 
     Commissioned by [[artist:animeseinfeld]].
 
     Intended for use in ["Hexane."](https://mspfa.com?s=1032)
 
-    <i>iodbc - The Black Box:</i> ([Bandcamp credits blurb](https://iodbc.bandcamp.com/track/phantasm-of-the-mind-thereminas-theme))
+    @@ [Bandcamp credits blurb](https://iodbc.bandcamp.com/track/phantasm-of-the-mind-thereminas-theme)
 
     Download the full album here: [hexane.bandcamp.com/album/hexane-volume-6](https://hexane.bandcamp.com/album/hexane-volume-6)
 ---
@@ -231,13 +231,13 @@ Referenced Tracks:
 URLs:
 - https://iodbc.bandcamp.com/track/s-nepeta-hunt-unused
 Commentary: |-
-    <i>iodbc - The Black Box:</i> ([Bandcamp about blurb](https://iodbc.bandcamp.com/track/s-nepeta-hunt-unused))
+    @@ [Bandcamp about blurb](https://iodbc.bandcamp.com/track/s-nepeta-hunt-unused)
 
     Commissioned by [[artist:shootdawhoop99|Shootdawhoop99]].
 
     Intended for use in ["Alternate Mewniverse."](https://mspfa.com?s=15542)
 
-    <i>iodbc - The Black Box:</i> ([Bandcamp credits blurb](https://iodbc.bandcamp.com/track/s-nepeta-hunt-unused))
+    @@ [Bandcamp credits blurb](https://iodbc.bandcamp.com/track/s-nepeta-hunt-unused)
 
     Album art is an edited portion of "Alternate Mewniverse."
 ---
@@ -254,13 +254,13 @@ Referenced Tracks:
 URLs:
 - https://iodbc.bandcamp.com/track/s-nepeta-hunt
 Commentary: |-
-    <i>iodbc - The Black Box:</i> ([Bandcamp about blurb](https://iodbc.bandcamp.com/track/s-nepeta-hunt))
+    @@ [Bandcamp about blurb](https://iodbc.bandcamp.com/track/s-nepeta-hunt)
 
     Commissioned by [[artist:shootdawhoop99|Shootdawhoop99]].
 
     Intended for use in ["Alternate Mewniverse."](https://mspfa.com?s=15542)
 
-    <i>iodbc - The Black Box:</i> ([Bandcamp credits blurb](https://iodbc.bandcamp.com/track/s-nepeta-hunt))
+    @@ [Bandcamp credits blurb](https://iodbc.bandcamp.com/track/s-nepeta-hunt)
 
     Album art is an edited portion of "Alternate Mewniverse."
 ---
@@ -274,7 +274,7 @@ Art Tags:
 URLs:
 - https://iodbc.bandcamp.com/track/dunwich-lullabies
 Commentary: |-
-    <i>iodbc - The Black Box:</i> ([Bandcamp about blurb](https://iodbc.bandcamp.com/track/dunwich-lullabies))
+    @@ [Bandcamp about blurb](https://iodbc.bandcamp.com/track/dunwich-lullabies)
 
     Commissioned by 0verandoverandover.
 
@@ -292,13 +292,13 @@ Art Tags:
 URLs:
 - https://iodbc.bandcamp.com/track/viridian-suede
 Commentary: |-
-    <i>iodbc - The Black Box:</i> ([Bandcamp about blurb](https://iodbc.bandcamp.com/track/viridian-suede))
+    @@ [Bandcamp about blurb](https://iodbc.bandcamp.com/track/viridian-suede)
 
     Commissioned by [[artist:chestnut|Chestnut]].
 
     Intended for use in [Fatebreak](https://mspfa.com/?s=23639).
 
-    <i>iodbc - The Black Box:</i> ([Bandcamp credits blurb](https://iodbc.bandcamp.com/track/viridian-suede))
+    @@ [Bandcamp credits blurb](https://iodbc.bandcamp.com/track/viridian-suede)
 
     This track is part of [[album:fatebreak-volume-1|Fatebreak Volume 1]].
 
@@ -325,7 +325,7 @@ Referenced Tracks:
 URLs:
 - https://iodbc.bandcamp.com/track/cruoric-competitors
 Commentary: |-
-    <i>iodbc - The Black Box:</i> ([Bandcamp about blurb](https://iodbc.bandcamp.com/track/cruoric-competitors))
+    @@ [Bandcamp about blurb](https://iodbc.bandcamp.com/track/cruoric-competitors)
 
     Commissioned by [[artist:shootdawhoop99|Shootdawhoop99]].
 ---
@@ -339,13 +339,13 @@ Cover Artists:
 URLs:
 - https://iodbc.bandcamp.com/track/through-the-haze
 Commentary: |-
-    <i>iodbc - The Black Box:</i> ([Bandcamp about blurb](https://iodbc.bandcamp.com/track/through-the-haze))
+    @@ [Bandcamp about blurb](https://iodbc.bandcamp.com/track/through-the-haze)
 
     Commissioned by [[artist:infinite|infiniteinconvenience]].
 
     Intended for use in [STALEMATE](https://mspfa.com?s=25171).
 
-    <i>iodbc - The Black Box:</i> ([Bandcamp credits blurb](https://iodbc.bandcamp.com/track/through-the-haze))
+    @@ [Bandcamp credits blurb](https://iodbc.bandcamp.com/track/through-the-haze)
 
     Track art by [[artist:infinite|infiniteinconvenience]].
 
@@ -361,13 +361,13 @@ Cover Artists:
 URLs:
 - https://iodbc.bandcamp.com/track/in-the-deep
 Commentary: |-
-    <i>iodbc - The Black Box:</i> ([Bandcamp about blurb](https://iodbc.bandcamp.com/track/in-the-deep))
+    @@ [Bandcamp about blurb](https://iodbc.bandcamp.com/track/in-the-deep)
 
     Commissioned by [[artist:infinite|infiniteinconvenience]].
 
     Intended for use in [STALEMATE](https://mspfa.com?s=25171).
 
-    <i>iodbc - The Black Box:</i> ([Bandcamp credits blurb](https://iodbc.bandcamp.com/track/in-the-deep))
+    @@ [Bandcamp credits blurb](https://iodbc.bandcamp.com/track/in-the-deep)
 
     This track is part of the Stalemate Vol. 1 Album. Download the full album here: [stalematecomic.bandcamp.com/album/stalemate-vol-1](https://stalematecomic.bandcamp.com/album/stalemate-vol-1)
 ---
@@ -379,7 +379,7 @@ Cover Artists:
 URLs:
 - https://iodbc.bandcamp.com/track/a-taste-of-heaven-and-hell
 Commentary: |-
-    <i>iodbc - The Black Box:</i> ([Bandcamp about blurb](https://iodbc.bandcamp.com/track/a-taste-of-heaven-and-hell))
+    @@ [Bandcamp about blurb](https://iodbc.bandcamp.com/track/a-taste-of-heaven-and-hell)
 
     Commissioned by [[artist:feartehk|FearTehk]].
 ---
@@ -393,13 +393,13 @@ Cover Artists:
 URLs:
 - https://iodbc.bandcamp.com/track/off-the-path
 Commentary: |-
-    <i>iodbc - The Black Box:</i> ([Bandcamp about blurb](https://iodbc.bandcamp.com/track/off-the-path))
+    @@ [Bandcamp about blurb](https://iodbc.bandcamp.com/track/off-the-path)
 
     Commissioned by [[artist:infinite|infiniteinconvenience]].
 
     Intended for use in [STALEMATE](https://mspfa.com?s=25171).
 
-    <i>iodbc - The Black Box:</i> ([Bandcamp credits blurb](https://iodbc.bandcamp.com/track/off-the-path))
+    @@ [Bandcamp credits blurb](https://iodbc.bandcamp.com/track/off-the-path)
 
     This track is part of the Stalemate Vol. 1 Album. Download the full album here: [stalematecomic.bandcamp.com/album/stalemate-vol-1](https://stalematecomic.bandcamp.com/album/stalemate-vol-1)
 ---
@@ -411,7 +411,7 @@ Cover Artists:
 URLs:
 - https://iodbc.bandcamp.com/track/slammin-through-time
 Commentary: |-
-    <i>iodbc - The Black Box:</i> ([Bandcamp about blurb](https://iodbc.bandcamp.com/track/slammin-through-time))
+    @@ [Bandcamp about blurb](https://iodbc.bandcamp.com/track/slammin-through-time)
 
     Commissioned by [[artist:ouhrin-siegru|Ouhrin Siegru]].
 ---
@@ -425,13 +425,13 @@ Cover Artists:
 URLs:
 - https://iodbc.bandcamp.com/track/final-movement
 Commentary: |-
-    <i>iodbc - The Black Box:</i> ([Bandcamp about blurb](https://iodbc.bandcamp.com/track/final-movement))
+    @@ [Bandcamp about blurb](https://iodbc.bandcamp.com/track/final-movement)
 
     Commissioned by [[artist:infinite|infiniteinconvenience]].
 
     Intended for use in [STALEMATE](https://mspfa.com?s=25171).
 
-    <i>iodbc - The Black Box:</i> ([Bandcamp credits blurb](https://iodbc.bandcamp.com/track/final-movement))
+    @@ [Bandcamp credits blurb](https://iodbc.bandcamp.com/track/final-movement)
 
     This track is part of the Stalemate Vol. 1 Album. Download the full album here: [stalematecomic.bandcamp.com/album/stalemate-vol-1](https://stalematecomic.bandcamp.com/album/stalemate-vol-1)
 ---
@@ -443,7 +443,7 @@ Cover Artists:
 URLs:
 - https://iodbc.bandcamp.com/track/the-green-lion-roars
 Commentary: |-
-    <i>iodbc - The Black Box:</i> ([Bandcamp about blurb](https://iodbc.bandcamp.com/track/the-green-lion-roars))
+    @@ [Bandcamp about blurb](https://iodbc.bandcamp.com/track/the-green-lion-roars)
 
     Commissioned by [[artist:feartehk|FearTehk]].
 ---
@@ -455,7 +455,7 @@ Cover Artists:
 URLs:
 - https://iodbc.bandcamp.com/track/the-forgotten-star
 Commentary: |-
-    <i>iodbc - The Black Box:</i> ([Bandcamp about blurb](https://iodbc.bandcamp.com/track/the-forgotten-star))
+    @@ [Bandcamp about blurb](https://iodbc.bandcamp.com/track/the-forgotten-star)
 
     Commissioned by [[artist:captain-moonstone|Captain_moonstone]].
 ---
@@ -465,7 +465,7 @@ Date First Released: July 10, 2018
 URLs:
 - https://iodbc.bandcamp.com/track/press-a-to-start
 Commentary: |-
-    <i>iodbc - The Black Box:</i> ([Bandcamp about blurb](https://iodbc.bandcamp.com/track/press-a-to-start))
+    @@ [Bandcamp about blurb](https://iodbc.bandcamp.com/track/press-a-to-start)
 
     Commissioned by [[artist:chestnut|Chestnut]].
 
@@ -486,7 +486,7 @@ Referenced Tracks:
 URLs:
 - https://iodbc.bandcamp.com/track/nepsim
 Commentary: |-
-    <i>iodbc - The Black Box:</i> ([Bandcamp about blurb](https://iodbc.bandcamp.com/track/nepsim))
+    @@ [Bandcamp about blurb](https://iodbc.bandcamp.com/track/nepsim)
 
     Commissioned by [[artist:shootdawhoop99|Shootdawhoop99]].
 Review Points:
@@ -515,11 +515,11 @@ Referenced Tracks:
 URLs:
 - https://iodbc.bandcamp.com/track/the-litterbox
 Commentary: |-
-    <i>iodbc - The Black Box:</i> ([Bandcamp about blurb](https://iodbc.bandcamp.com/track/the-litterbox), excerpt)
+    @@ [Bandcamp about blurb](https://iodbc.bandcamp.com/track/the-litterbox), excerpt
 
     Commissioned by [[artist:shootdawhoop99|Shootdawhoop99]].
 
-    <i>iodbc - The Black Box:</i> ([Bandcamp credits blurb](https://iodbc.bandcamp.com/track/the-litterbox))
+    @@ [Bandcamp credits blurb](https://iodbc.bandcamp.com/track/the-litterbox)
 
     Album art is an edited portion of "Alternate Mewniverse."
 Review Points:
@@ -542,7 +542,7 @@ Art Tags:
 URLs:
 - https://iodbc.bandcamp.com/track/ritzs-theme
 Commentary: |-
-    <i>iodbc - The Black Box:</i> ([Bandcamp about blurb](https://iodbc.bandcamp.com/track/ritzs-theme))
+    @@ [Bandcamp about blurb](https://iodbc.bandcamp.com/track/ritzs-theme)
 
     Commissioned by [[artist:sonicbinch|Rose]]. Intended for use in [Shackstuck](https://mspfa.com?s=539).
 ---
@@ -561,6 +561,6 @@ Referenced Tracks:
 URLs:
 - https://iodbc.bandcamp.com/track/debt-to-be-paid
 Commentary: |-
-    <i>iodbc - The Black Box:</i> ([Bandcamp about blurb](https://iodbc.bandcamp.com/track/debt-to-be-paid))
+    @@ [Bandcamp about blurb](https://iodbc.bandcamp.com/track/debt-to-be-paid)
 
     Intended for use in ["Alternate Mewniverse."](https://mspfa.com?s=15542)
diff --git a/album/the-homestuck-music-experience.yaml b/album/the-homestuck-music-experience.yaml
index 84b77718..825c92fe 100644
--- a/album/the-homestuck-music-experience.yaml
+++ b/album/the-homestuck-music-experience.yaml
@@ -171,7 +171,7 @@ Referenced Tracks:
 - Welcome to the Black Parade
 - track:megalovania-undertale
 Lyrics: |-
-    <i>Funk McLovin:</i> ([artist's lyrics](https://www.youtube.com/watch?v=DK4hc59Ifag))
+    @@ [artist's lyrics](https://www.youtube.com/watch?v=DK4hc59Ifag)
 
     When I was 13 I
     Ejected the disc tray from my PC
@@ -323,7 +323,7 @@ URLs:
 Referenced Tracks:
 - Little Flower (original)
 Lyrics: |-
-    <i>Funk McLovin:</i> ([artist's lyrics](https://www.youtube.com/watch?v=TFhTEVQfk40))
+    @@ [artist's lyrics](https://www.youtube.com/watch?v=TFhTEVQfk40)
 
     Though not alive my eyes have seen
     Epochs rise and fall
@@ -519,7 +519,7 @@ URLs:
 - https://funkmclovin.bandcamp.com/track/sopor-pie
 - https://www.youtube.com/watch?v=Ohz44XFvtLc
 Lyrics: |-
-    <i>Funk McLovin:</i> ([artist's lyrics](https://www.youtube.com/watch?v=Ohz44XFvtLc))
+    @@ [artist's lyrics](https://www.youtube.com/watch?v=Ohz44XFvtLc)
 
     [What's up mother-fuckers and mother-fuck-ettes? This is Gamzee Makara, here to tell you about my signature recipe.]
 
diff --git a/album/the-lands-of-scp-413.yaml b/album/the-lands-of-scp-413.yaml
index e06d48d3..0d6b1db3 100644
--- a/album/the-lands-of-scp-413.yaml
+++ b/album/the-lands-of-scp-413.yaml
@@ -14,6 +14,7 @@ Groups:
 - Fandom
 Commentary: |-
     <i>Jebb:</i> (wiki editor, sometime 2/6/2025 - 2/28/2025)
+
     The composer's only upload of this album is the linked SoundCloud playlist, which does not provide a particular release date. For the wiki we've reused the date of the most recent track, [[track:rulers-and-walls]]. Each track in this album is also individually dated with its SoundCloud upload date.
 ---
 Track: Alloy And Animation
@@ -25,6 +26,7 @@ URLs:
 - https://soundcloud.com/spinydoughnut33/alloy-and-animation
 Commentary: |-
     <i>Spiny:</i> ([SoundCloud description](https://soundcloud.com/spinydoughnut33/alloy-and-animation))
+
     Metal seas, metal land...
 
     Is there anything on this land that's *not* made of metal?!
@@ -32,11 +34,8 @@ Commentary: |-
     Well, now there is.
 
     <i>Spiny:</i> ([SoundCloud tags](https://soundcloud.com/spinydoughnut33/alloy-and-animation))
-    #Orchestral
-
-    #what genre is this
 
-    #i honestly have no clue
+    #Orchestral #what genre is this #i honestly have no clue
 ---
 Track: Rulers And Walls
 Additional Names:
@@ -47,7 +46,8 @@ URLs:
 - https://soundcloud.com/spinydoughnut33/rulers-and-walls
 Commentary: |-
     <i>Spiny:</i> ([SoundCloud description](https://soundcloud.com/spinydoughnut33/rulers-and-walls))
-    Man, why can't everyone just get along?
+
+    Man, why can't everyone just get along?<br>
     The world may never know.
 ---
 Track: Trinkets And Clutter
@@ -59,6 +59,7 @@ URLs:
 - https://soundcloud.com/spinydoughnut33/trinkets-and-clutter
 Commentary: |-
     <i>Spiny:</i> ([SoundCloud description](https://soundcloud.com/spinydoughnut33/trinkets-and-clutter))
+
     This land is a paradox; So full of stuff, yet completely empty.
 ---
 Track: Spotlights And Gossip
@@ -70,4 +71,5 @@ URLs:
 - https://soundcloud.com/spinydoughnut33/spotlights-and-gossip
 Commentary: |-
     <i>Spiny:</i> ([SoundCloud description](https://soundcloud.com/spinydoughnut33/spotlights-and-gossip))
+
     Nobody walks on LoSaG. There's too much foot traffic.
diff --git a/album/the-mayview-mixtape.yaml b/album/the-mayview-mixtape.yaml
index 954176a0..c5bbf5cb 100644
--- a/album/the-mayview-mixtape.yaml
+++ b/album/the-mayview-mixtape.yaml
@@ -29,11 +29,11 @@ Additional Files:
   - banner.png
   - bg.png
 Commentary: |-
-    <i>Paranatural Fanmusic Team:</i> ([Bandcamp blurb](https://paranaturalfanmusicteam.bandcamp.com/album/the-mayview-mixtape), excerpt)
+    @@ [Bandcamp blurb](https://paranaturalfanmusicteam.bandcamp.com/album/the-mayview-mixtape), excerpt
 
     Most kids in the extra-normal town of Mayview have surely thought at one point or another that their life would be much cooler with some fitting background music to accompany their time at school, with friends, or fighting power-hungry spirits. This mixtape will give such a soul exactly what they're looking for. It's host to songs dedicated to numerous characters, locales, and villains from Paranatural, with contributions from an array of talented musicians and artists across the fandom.
 Crediting Sources: |-
-    <i>Paranatural Fanmusic Team:</i> ([Bandcamp blurb](https://paranaturalfanmusicteam.bandcamp.com/album/the-mayview-mixtape), excerpt)
+    @@ [Bandcamp blurb](https://paranaturalfanmusicteam.bandcamp.com/album/the-mayview-mixtape), excerpt
 
     Organized by the Paranatural Fanmusic Team managers.
 
@@ -73,7 +73,7 @@ URLs:
 - https://paranaturalfanmusicteam.bandcamp.com/track/dont-be-a-stranger
 - https://soundcloud.com/poisonedelite/dont-be-a-stranger
 Crediting Sources: |-
-    <i>Paranatural Fanmusic Team:</i> ([Bandcamp credits blurb](https://paranaturalfanmusicteam.bandcamp.com/track/dont-be-a-stranger), excerpt)
+    @@ [Bandcamp credits blurb](https://paranaturalfanmusicteam.bandcamp.com/track/dont-be-a-stranger), excerpt
 
     Music by [[artist:poisonedelite]]
 
@@ -89,7 +89,7 @@ URLs:
 - https://paranaturalfanmusicteam.bandcamp.com/track/some-cruddy-convenience-store
 - https://soundcloud.com/whats-this-thing-here/some-cruddy-convenience-store
 Crediting Sources: |-
-    <i>Paranatural Fanmusic Team:</i> ([Bandcamp credits blurb](https://paranaturalfanmusicteam.bandcamp.com/track/some-cruddy-convenience-store), excerpt)
+    @@ [Bandcamp credits blurb](https://paranaturalfanmusicteam.bandcamp.com/track/some-cruddy-convenience-store), excerpt
 
     Music by [[artist:whatislostinthemines]]
 
@@ -105,7 +105,7 @@ URLs:
 - https://paranaturalfanmusicteam.bandcamp.com/track/johnny-boy
 - https://soundcloud.com/whats-this-thing-here/johnny-boy
 Crediting Sources: |-
-    <i>Paranatural Fanmusic Team:</i> ([Bandcamp credits blurb](https://paranaturalfanmusicteam.bandcamp.com/track/some-cruddy-convenience-store), excerpt)
+    @@ [Bandcamp credits blurb](https://paranaturalfanmusicteam.bandcamp.com/track/some-cruddy-convenience-store), excerpt
 
     Music by [[artist:whatislostinthemines]]
 
@@ -123,7 +123,7 @@ Track Artwork:
 URLs:
 - https://paranaturalfanmusicteam.bandcamp.com/track/possessing-startling-hair
 Crediting Sources: |-
-    <i>Paranatural Fanmusic Team:</i> ([Bandcamp credits blurb](https://paranaturalfanmusicteam.bandcamp.com/track/possessing-startling-hair), excerpt)
+    @@ [Bandcamp credits blurb](https://paranaturalfanmusicteam.bandcamp.com/track/possessing-startling-hair), excerpt
 
     Music by [[artist:meems]]
 
@@ -149,7 +149,7 @@ URLs:
 - https://paranaturalfanmusicteam.bandcamp.com/track/forge
 - https://soundcloud.com/eidolonorpheus/forge
 Crediting Sources: |-
-    <i>Paranatural Fanmusic Team:</i> ([Bandcamp credits blurb](https://paranaturalfanmusicteam.bandcamp.com/track/forge), excerpt)
+    @@ [Bandcamp credits blurb](https://paranaturalfanmusicteam.bandcamp.com/track/forge), excerpt
 
     Music by [[artist:thomas-ferkol]]
 
@@ -169,7 +169,7 @@ Commentary: |-
 
     It's finally out! I've been eagerly waiting for this! (this track was made and finished around mid-September last year so you might get the idea), this upload might sound a little different to the Bandcamp ver. due to slight modifications that were made because I was bored, no worries though since Soundcloud is bad anyways :v
 Crediting Sources: |-
-    <i>Paranatural Fanmusic Team:</i> ([Bandcamp credits blurb](https://paranaturalfanmusicteam.bandcamp.com/track/her-friend-her-sorrow), excerpt)
+    @@ [Bandcamp credits blurb](https://paranaturalfanmusicteam.bandcamp.com/track/her-friend-her-sorrow), excerpt
 
     Music by [[artist:mathias-ramalho]]
 
@@ -187,7 +187,7 @@ URLs:
 - https://paranaturalfanmusicteam.bandcamp.com/track/the-midnight-visitor
 - https://soundcloud.com/whats-this-thing-here/the-midnight-visitor
 Crediting Sources: |-
-    <i>Paranatural Fanmusic Team:</i> ([Bandcamp credits blurb](https://paranaturalfanmusicteam.bandcamp.com/track/the-midnight-visitor), excerpt)
+    @@ [Bandcamp credits blurb](https://paranaturalfanmusicteam.bandcamp.com/track/the-midnight-visitor), excerpt
 
     Music by [[artist:whatislostinthemines]]
 
@@ -212,7 +212,7 @@ Commentary: |-
 
     Slipped my mind to share this one before - track 8 from The Mayview Mixtape, an album we put out not long ago of Paranatural fan music. Went about as full-on bossa nova as I could w/ this.
 Crediting Sources: |-
-    <i>Paranatural Fanmusic Team:</i> ([Bandcamp credits blurb](https://paranaturalfanmusicteam.bandcamp.com/track/boss-a-nova), excerpt)
+    @@ [Bandcamp credits blurb](https://paranaturalfanmusicteam.bandcamp.com/track/boss-a-nova), excerpt
 
     Music by [[artist:kal-la-kal-la]]
 
@@ -233,7 +233,7 @@ Track Artwork:
 URLs:
 - https://paranaturalfanmusicteam.bandcamp.com/track/foreward
 Crediting Sources: |-
-    <i>Paranatural Fanmusic Team:</i> ([Bandcamp credits blurb](https://paranaturalfanmusicteam.bandcamp.com/track/foreward), excerpt)
+    @@ [Bandcamp credits blurb](https://paranaturalfanmusicteam.bandcamp.com/track/foreward), excerpt
 
     Music by [[artist:arcav]]
 
@@ -253,7 +253,7 @@ Commentary: |-
 
     This is my contribution to the Paranatural Fanmusic Team's debut album, "The Mayview Mixtape". When I heard that such a project was being organized for Paranatural, I knew I had to make a song about Forge, one of my favorite spirits from the comic. I took a lot of cues from 80's-themed horror film soundtracks, such as Disasterpeace's work on the film "It Follows". I've been sitting on this song since last September, so I'm glad it's finally released! Enjoy.
 Crediting Sources: |-
-    <i>Paranatural Fanmusic Team:</i> ([Bandcamp credits blurb](https://paranaturalfanmusicteam.bandcamp.com/track/stoker-of-nightmares), excerpt)
+    @@ [Bandcamp credits blurb](https://paranaturalfanmusicteam.bandcamp.com/track/stoker-of-nightmares), excerpt
 
     Music by [[artist:splitsuns]]
 
@@ -268,7 +268,7 @@ Cover Artists:
 URLs:
 - https://paranaturalfanmusicteam.bandcamp.com/track/new-kid
 Crediting Sources: |-
-    <i>Paranatural Fanmusic Team:</i> ([Bandcamp credits blurb](https://paranaturalfanmusicteam.bandcamp.com/track/new-kid), excerpt)
+    @@ [Bandcamp credits blurb](https://paranaturalfanmusicteam.bandcamp.com/track/new-kid), excerpt
 
     Music by [[artist:serialsymphony]]
 
@@ -283,7 +283,7 @@ Cover Artists:
 URLs:
 - https://paranaturalfanmusicteam.bandcamp.com/track/mayview
 Crediting Sources: |-
-    <i>Paranatural Fanmusic Team:</i> ([Bandcamp credits blurb](https://paranaturalfanmusicteam.bandcamp.com/track/mayview), excerpt)
+    @@ [Bandcamp credits blurb](https://paranaturalfanmusicteam.bandcamp.com/track/mayview), excerpt
 
     Music by [[artist:noisemaker]]
 
diff --git a/album/the-planets.yaml b/album/the-planets.yaml
index 85fd002a..ef0769b6 100644
--- a/album/the-planets.yaml
+++ b/album/the-planets.yaml
@@ -96,7 +96,7 @@ Color: '#666fe9'
 URLs:
 - https://duckysenpai.bandcamp.com/track/shade
 Commentary: |-
-    <i>Ducky Senpai:</i> ([Bandcamp blurb](https://duckysenpai.bandcamp.com/track/shade))
+    @@ [Bandcamp blurb](https://duckysenpai.bandcamp.com/track/shade)
 
     Land of Wind and Shade
 ---
@@ -106,7 +106,7 @@ Color: '#b536da'
 URLs:
 - https://duckysenpai.bandcamp.com/track/rain
 Commentary: |-
-    <i>Ducky Senpai:</i> ([Bandcamp blurb](https://duckysenpai.bandcamp.com/track/rain))
+    @@ [Bandcamp blurb](https://duckysenpai.bandcamp.com/track/rain)
 
     Land of Light and Rain
 ---
@@ -116,7 +116,7 @@ Color: '#e00707'
 URLs:
 - https://duckysenpai.bandcamp.com/track/clockwork
 Commentary: |-
-    <i>Ducky Senpai:</i> ([Bandcamp blurb](https://duckysenpai.bandcamp.com/track/clockwork))
+    @@ [Bandcamp blurb](https://duckysenpai.bandcamp.com/track/clockwork)
 
     Land of Heat and Clockwork
 ---
@@ -126,7 +126,7 @@ Color: '#4ac925'
 URLs:
 - https://duckysenpai.bandcamp.com/track/frost
 Commentary: |-
-    <i>Ducky Senpai:</i> ([Bandcamp blurb](https://duckysenpai.bandcamp.com/track/frost))
+    @@ [Bandcamp blurb](https://duckysenpai.bandcamp.com/track/frost)
 
     Land of Frost and Frogs
 ---
@@ -136,7 +136,7 @@ Color: '#00d5f2'
 URLs:
 - https://duckysenpai.bandcamp.com/track/helium
 Commentary: |-
-    <i>Ducky Senpai:</i> ([Bandcamp blurb](https://duckysenpai.bandcamp.com/track/helium))
+    @@ [Bandcamp blurb](https://duckysenpai.bandcamp.com/track/helium)
 
     Land of Crypts and Helium
 ---
@@ -146,7 +146,7 @@ Color: '#1f9400'
 URLs:
 - https://duckysenpai.bandcamp.com/track/xenon
 Commentary: |-
-    <i>Ducky Senpai:</i> ([Bandcamp blurb](https://duckysenpai.bandcamp.com/track/xenon))
+    @@ [Bandcamp blurb](https://duckysenpai.bandcamp.com/track/xenon)
 
     Land of Mounds and Xenon
 ---
@@ -156,7 +156,7 @@ Color: '#ff6ff2'
 URLs:
 - https://duckysenpai.bandcamp.com/track/neon
 Commentary: |-
-    <i>Ducky Senpai:</i> ([Bandcamp blurb](https://duckysenpai.bandcamp.com/track/neon))
+    @@ [Bandcamp blurb](https://duckysenpai.bandcamp.com/track/neon)
 
     Land of Pyramids and Neon
 ---
@@ -166,7 +166,7 @@ Color: '#f2a400'
 URLs:
 - https://duckysenpai.bandcamp.com/track/krypton
 Commentary: |-
-    <i>Ducky Senpai:</i> ([Bandcamp blurb](https://duckysenpai.bandcamp.com/track/krypton))
+    @@ [Bandcamp blurb](https://duckysenpai.bandcamp.com/track/krypton)
 
     Land of Tombs and Krypton
 ---
@@ -176,7 +176,7 @@ Color: '#eb0000'
 URLs:
 - https://duckysenpai.bandcamp.com/track/melody
 Commentary: |-
-    <i>Ducky Senpai:</i> ([Bandcamp blurb](https://duckysenpai.bandcamp.com/track/melody))
+    @@ [Bandcamp blurb](https://duckysenpai.bandcamp.com/track/melody)
 
     Land of Quartz and Melody
 ---
@@ -186,7 +186,7 @@ Color: '#c36100'
 URLs:
 - https://duckysenpai.bandcamp.com/track/zephyr
 Commentary: |-
-    <i>Ducky Senpai:</i> ([Bandcamp blurb](https://duckysenpai.bandcamp.com/track/zephyr))
+    @@ [Bandcamp blurb](https://duckysenpai.bandcamp.com/track/zephyr)
 
     Land of Sand and Zephyr
 ---
@@ -196,7 +196,7 @@ Color: '#a1a100'
 URLs:
 - https://duckysenpai.bandcamp.com/track/fire
 Commentary: |-
-    <i>Ducky Senpai:</i> ([Bandcamp blurb](https://duckysenpai.bandcamp.com/track/fire))
+    @@ [Bandcamp blurb](https://duckysenpai.bandcamp.com/track/fire)
 
     Land of Brains and Fire
 ---
@@ -206,7 +206,7 @@ Color: '#ff0000'
 URLs:
 - https://duckysenpai.bandcamp.com/track/haze
 Commentary: |-
-    <i>Ducky Senpai:</i> ([Bandcamp blurb](https://duckysenpai.bandcamp.com/track/haze))
+    @@ [Bandcamp blurb](https://duckysenpai.bandcamp.com/track/haze)
 
     Land of Pulse and Haze
 ---
@@ -216,7 +216,7 @@ Color: '#588a00'
 URLs:
 - https://duckysenpai.bandcamp.com/track/tea
 Commentary: |-
-    <i>Ducky Senpai:</i> ([Bandcamp blurb](https://duckysenpai.bandcamp.com/track/tea))
+    @@ [Bandcamp blurb](https://duckysenpai.bandcamp.com/track/tea)
 
     Land of Little Cubes and Tea
 ---
@@ -226,7 +226,7 @@ Color: '#008f48'
 URLs:
 - https://duckysenpai.bandcamp.com/track/rays
 Commentary: |-
-    <i>Ducky Senpai:</i> ([Bandcamp blurb](https://duckysenpai.bandcamp.com/track/rays))
+    @@ [Bandcamp blurb](https://duckysenpai.bandcamp.com/track/rays)
 
     Land of Rays and Frogs
 ---
@@ -236,7 +236,7 @@ Color: '#008b8b'
 URLs:
 - https://duckysenpai.bandcamp.com/track/flow
 Commentary: |-
-    <i>Ducky Senpai:</i> ([Bandcamp blurb](https://duckysenpai.bandcamp.com/track/flow))
+    @@ [Bandcamp blurb](https://duckysenpai.bandcamp.com/track/flow)
 
     Land of Thought and Flow
 ---
@@ -246,7 +246,7 @@ Color: '#3796c6'
 URLs:
 - https://duckysenpai.bandcamp.com/track/treasure
 Commentary: |-
-    <i>Ducky Senpai:</i> ([Bandcamp blurb](https://duckysenpai.bandcamp.com/track/treasure))
+    @@ [Bandcamp blurb](https://duckysenpai.bandcamp.com/track/treasure)
 
     Land of Maps and Treasure
 ---
@@ -256,7 +256,7 @@ Color: '#487aef'
 URLs:
 - https://duckysenpai.bandcamp.com/track/silence
 Commentary: |-
-    <i>Ducky Senpai:</i> ([Bandcamp blurb](https://duckysenpai.bandcamp.com/track/silence))
+    @@ [Bandcamp blurb](https://duckysenpai.bandcamp.com/track/silence)
 
     Land of Caves and Silence
 ---
@@ -266,7 +266,7 @@ Color: '#a34bff'
 URLs:
 - https://duckysenpai.bandcamp.com/track/mirth
 Commentary: |-
-    <i>Ducky Senpai:</i> ([Bandcamp blurb](https://duckysenpai.bandcamp.com/track/mirth))
+    @@ [Bandcamp blurb](https://duckysenpai.bandcamp.com/track/mirth)
 
     Land of Tents and Mirth
 ---
@@ -276,7 +276,7 @@ Color: '#db00db'
 URLs:
 - https://duckysenpai.bandcamp.com/track/angels
 Commentary: |-
-    <i>Ducky Senpai:</i> ([Bandcamp blurb](https://duckysenpai.bandcamp.com/track/angels))
+    @@ [Bandcamp blurb](https://duckysenpai.bandcamp.com/track/angels)
 
     Land of Wrath and Angels
 ---
@@ -286,7 +286,7 @@ Color: '#e30072'
 URLs:
 - https://duckysenpai.bandcamp.com/track/glass
 Commentary: |-
-    <i>Ducky Senpai:</i> ([Bandcamp blurb](https://duckysenpai.bandcamp.com/track/glass))
+    @@ [Bandcamp blurb](https://duckysenpai.bandcamp.com/track/glass)
 
     Lands of Dew and Glass
 ---
@@ -296,6 +296,6 @@ Color: '#888888'
 URLs:
 - https://duckysenpai.bandcamp.com/track/mayhem
 Commentary: |-
-    <i>Ducky Senpai:</i> ([Bandcamp blurb](https://duckysenpai.bandcamp.com/track/mayhem))
+    @@ [Bandcamp blurb](https://duckysenpai.bandcamp.com/track/mayhem)
 
     Land of Colours and Mayhem
diff --git a/album/the-underglow-knowledge-original-soundtrack.yaml b/album/the-underglow-knowledge-original-soundtrack.yaml
index a5be65c0..aa173c5f 100644
--- a/album/the-underglow-knowledge-original-soundtrack.yaml
+++ b/album/the-underglow-knowledge-original-soundtrack.yaml
@@ -24,7 +24,8 @@ Groups:
 - Beyond
 Commentary: |-
     <i>Marcy Nabors:</i> ([Bandcamp about blurb](https://shadolith.bandcamp.com/album/the-underglow-knowledge-original-soundtrack))
-    The original soundtrack for Pitch Drop's debut visual novel THE UNDERGLOW: Knowledge.
+
+    The original soundtrack for Pitch Drop's debut visual novel THE UNDERGLOW: Knowledge.<br>
     https://pitch-drop.itch.io/underglow-knowledge
 ---
 Track: Ἀphōs
@@ -57,4 +58,4 @@ URLs:
 Track: Droplets
 Duration: 3:54
 URLs:
-- https://shadolith.bandcamp.com/track/droplets
\ No newline at end of file
+- https://shadolith.bandcamp.com/track/droplets
diff --git a/album/uufo.yaml b/album/uufo.yaml
index cd74c0ff..4fd23a73 100644
--- a/album/uufo.yaml
+++ b/album/uufo.yaml
@@ -307,15 +307,15 @@ URLs:
 Sampled Tracks:
 - Amen, Brother
 Crediting Sources: |-
-    <i>Camellia:</i> ([Bandcamp](https://cametek.bandcamp.com/track/final-blenderman-appeared-feat-richaadeb) / [Spotify](https://open.spotify.com/track/6akSQRNLL6GcpVixzKrI8a) track title)
+    @@ [Bandcamp](https://cametek.bandcamp.com/track/final-blenderman-appeared-feat-richaadeb) / [Spotify](https://open.spotify.com/track/6akSQRNLL6GcpVixzKrI8a) track title
 
     FINAL BLENDERMAN APPEARED. (feat. RichaadEB)
 
-    <i>Camellia:</i> ([Apple Music title](https://music.apple.com/album/final-blenderman-appeared-feat-richaadeb/1572224128?i=1572224359))
+    @@ [Apple Music title](https://music.apple.com/album/final-blenderman-appeared-feat-richaadeb/1572224128?i=1572224359)
 
     Final Blenderman Appeared. (feat. RichaadEB)
 
-    <i>Camellia:</i> ([Bandcamp credits blurb](https://cametek.bandcamp.com/track/final-blenderman-appeared-feat-richaadeb), excerpt)
+    @@ [Bandcamp credits blurb](https://cametek.bandcamp.com/track/final-blenderman-appeared-feat-richaadeb), excerpt
 
     Gt: [[artist:richaadeb|RichaadEB]]
 ---
@@ -347,7 +347,7 @@ Sampled Tracks:
 - track:join-call-discord
 # - track:notification
 Crediting Sources: |-
-    <i>Camellia:</i> ([Bandcamp credits blurb](https://cametek.bandcamp.com/track/wysi-when-you-see-it))
+    @@ [Bandcamp credits blurb](https://cametek.bandcamp.com/track/wysi-when-you-see-it)
 
     [[artist:aireu|Aireu]] (for sampled voice)
 ---
@@ -470,15 +470,15 @@ URLs:
 Sampled Tracks:
 - Amen, Brother
 Crediting Sources: |-
-    <i>Camellia:</i> ([Bandcamp title](https://cametek.bandcamp.com/track/bermuda-triangle-feat-the8bitdrummer))
+    @@ [Bandcamp title](https://cametek.bandcamp.com/track/bermuda-triangle-feat-the8bitdrummer)
 
     Bermuda Δ Triangle (feat. The8BitDrummer)
 
-    <i>Camellia:</i> ([Spotify](https://open.spotify.com/track/658IaKIiFzUZRfPs2qCKFs) / [Apple Music](https://music.apple.com/album/bermuda-triangle-feat-the8bitdrummer/1572224128?i=1572224364) title)
+    @@ [Spotify](https://open.spotify.com/track/658IaKIiFzUZRfPs2qCKFs) / [Apple Music](https://music.apple.com/album/bermuda-triangle-feat-the8bitdrummer/1572224128?i=1572224364) title
 
     Bermuda Triangle (feat. The8BitDrummer)
 
-    <i>Camellia:</i> ([Bandcamp credits blurb](https://cametek.bandcamp.com/track/bermuda-triangle-feat-the8bitdrummer), excerpt)
+    @@ [Bandcamp credits blurb](https://cametek.bandcamp.com/track/bermuda-triangle-feat-the8bitdrummer), excerpt
 
     Drs: The8BitDrummer
 ---
@@ -512,7 +512,7 @@ URLs:
 Sampled Tracks:
 - '[ASMR] Nyanners Makes Satisfying Slime Noises in Your Ears'
 Crediting Sources: |-
-    <i>Camellia:</i> ([Bandcamp credits blurb](https://cametek.bandcamp.com/track/slime-incident))
+    @@ [Bandcamp credits blurb](https://cametek.bandcamp.com/track/slime-incident)
 
     [[artist:nyatasha-nyanners|Nyatasha Nyanners]] (for sampled voice and for naming)<br>
     [www.youtube.com/watch?v=lLcBdvmlCx4](https://www.youtube.com/watch?v=lLcBdvmlCx4)
@@ -537,7 +537,7 @@ Commentary: |-
     And finally it's out as [Microwave Proof] by Camellia! Please check it out, actually it proves almost every single sounds are made with Phase Plant, for real.<br>
     Also you can use the code CAM50 until the end of this month (Dec 2021) to get 50% discount. That's awesome! Thank you @Kilohearts ❤
 Crediting Sources: |-
-    <i>Camellia:</i> ([Bandcamp credits blurb](https://cametek.bandcamp.com/track/the-cat-evolved-into-the-microwave-proof-cat))
+    @@ [Bandcamp credits blurb](https://cametek.bandcamp.com/track/the-cat-evolved-into-the-microwave-proof-cat)
 
     Phase Plant (by Kilohearts) Preset Demosong<br>
     [kilohearts.com/products/phase_plant](https://kilohearts.com/products/phase_plant)
@@ -694,7 +694,7 @@ Lyrics: |-
     Lala la la la la Lala la la la
     Lala la la la la la la la la la la la la...)
 Crediting Sources: |-
-    <i>Camellia:</i> ([Bandcamp credits blurb](https://cametek.bandcamp.com/track/zombie-circus))
+    @@ [Bandcamp credits blurb](https://cametek.bandcamp.com/track/zombie-circus)
 
     Vo: [[artist:hatsune-miku|初音ミク (Hatsune Miku)]]
 ---
@@ -740,11 +740,11 @@ URLs:
 - https://open.spotify.com/track/4qcCNHS6ocONlaPv0wldRX
 - https://music.apple.com/album/purge-my-existence-out-of-this-world-feat-btmc/1572224128?i=1572224617
 Crediting Sources: |-
-    <i>Camellia:</i> ([Bandcamp](https://cametek.bandcamp.com/track/purge-my-existence-out-of-this-world-feat-btmc) / [Spotify](https://open.spotify.com/track/4qcCNHS6ocONlaPv0wldRX) title)
+    @@ [Bandcamp](https://cametek.bandcamp.com/track/purge-my-existence-out-of-this-world-feat-btmc) / [Spotify](https://open.spotify.com/track/4qcCNHS6ocONlaPv0wldRX) title
 
     Purge My Existence Out Of This World (feat. BTMC)
 
-    <i>Camellia:</i> ([Bandcamp credits blurb](https://cametek.bandcamp.com/track/purge-my-existence-out-of-this-world-feat-btmc), excerpt)
+    @@ [Bandcamp credits blurb](https://cametek.bandcamp.com/track/purge-my-existence-out-of-this-world-feat-btmc), excerpt
 
     Vo: [[artist:btmc|BTMC]]
 ---
@@ -772,7 +772,7 @@ Commentary: |-
     this song samples a [[artist:woops]] stream. i haven't been able to find out which stream exactly.
     here's an explanation: [(Twitch link)](https://www.twitch.tv/videos/1083981829?t=1h28m50s)
 Crediting Sources: |-
-    <i>Camellia:</i> ([Bandcamp credits blurb](https://cametek.bandcamp.com/track/ghoul))
+    @@ [Bandcamp credits blurb](https://cametek.bandcamp.com/track/ghoul)
 
     [[artist:dankruptmemer|DankruptMemer]] (for naming)<br>
     [[artist:woops|woops]] (for sampled voice)
@@ -797,11 +797,11 @@ URLs:
 - https://open.spotify.com/track/5KUuhSzEJdir1iiXhsV22c
 - https://music.apple.com/album/myths-you-forgot-feat-toby-fox/1572224128?i=1572224622
 Crediting Sources: |-
-    <i>Camellia:</i> ([Bandcamp title](https://cametek.bandcamp.com/track/myths-you-forgot-feat-toby-fox))
+    @@ [Bandcamp title](https://cametek.bandcamp.com/track/myths-you-forgot-feat-toby-fox)
 
     Myths You Forgot (feat. Toby Fox)
 
-    <i>Camellia:</i> ([Bandcamp credits blurb](https://cametek.bandcamp.com/track/myths-you-forgot-feat-toby-fox), excerpt)
+    @@ [Bandcamp credits blurb](https://cametek.bandcamp.com/track/myths-you-forgot-feat-toby-fox), excerpt
 
     Featuring [[artist:toby-fox|Toby Fox]]
 ---
@@ -885,7 +885,7 @@ URLs:
 Referenced Tracks:
 - THE MUZZLE FACING
 Commentary: |-
-    <i>Camellia:</i> ([Bandcamp credits blurb](https://cametek.bandcamp.com/track/bonus-track-3-the-muzzle-facing-long-muzzled-version))
+    @@ [Bandcamp credits blurb](https://cametek.bandcamp.com/track/bonus-track-3-the-muzzle-facing-long-muzzled-version)
 
     From WACCA (Marvelous Inc.)<br>
     [wacca.marv.jp](https://wacca.marv.jp)
@@ -914,7 +914,7 @@ URLs:
 Referenced Tracks:
 - '#1f1e33'
 Commentary: |-
-    <i>Camellia:</i> ([Bandcamp credits blurb](https://cametek.bandcamp.com/track/bonus-track-3-the-muzzle-facing-long-muzzled-version))
+    @@ [Bandcamp credits blurb](https://cametek.bandcamp.com/track/bonus-track-3-the-muzzle-facing-long-muzzled-version)
 
     From Arcaea ©lowiro<br>
     [arcaea.app](https://arcaea.app/)
@@ -1063,10 +1063,10 @@ Commentary: |-
 
     A song released as a commemorative song after Camellia's reaching the 80,000 Twitter followers, 6,000 Discord server members, and 50,000 YouTube channel subscribers. Produced as Drum'n'Bass / Drumstep / Hardcore with ethnic, celtic and somewhat 'world' atmosphere. The story is about going on a journey to find the "threshold" such as the end / the begin, the edge of the ground that proves "this world is an artificial, everlasting world".
 Crediting Sources: |-
-    <i>Camellia:</i> ([Bandcamp about blurb](https://cametek.bandcamp.com/track/looking-for-edge-of-ground), excerpt)
+    @@ [Bandcamp about blurb](https://cametek.bandcamp.com/track/looking-for-edge-of-ground), excerpt
 
     The vocal is [[artist:hatsune-miku|Hatsune miku]] (VOCALOID).
 
-    <i>Camellia:</i> ([YouTube title](https://www.youtube.com/watch?v=oyJf72je2U0))
+    @@ [YouTube title](https://www.youtube.com/watch?v=oyJf72je2U0)
 
     [U.U.F.O.] Tr.27 Bonus Track 5: 大地の閾を探して [Looking for Edge of Ground] feat. 初音ミク (Hatsune Miku)
diff --git a/album/will-remix-for-food-remixes-vol-i.yaml b/album/will-remix-for-food-remixes-vol-i.yaml
index cc323134..80f5f514 100644
--- a/album/will-remix-for-food-remixes-vol-i.yaml
+++ b/album/will-remix-for-food-remixes-vol-i.yaml
@@ -15,7 +15,7 @@ Commentary: |-
 
     A collection of remixes for various artists that I've done between January of 2012 and April of 2013.
 Crediting Sources: |-
-    <i>Riki Tsuji:</i> ([Bandcamp credits blurb](https://astrokid.bandcamp.com/album/will-remix-for-food-remixes-vol-i), excerpt)
+    @@ [Bandcamp credits blurb](https://astrokid.bandcamp.com/album/will-remix-for-food-remixes-vol-i), excerpt
 
     Includes remixes of:<br>
     [[artist:michael-guy-bowman]]<br>
@@ -129,11 +129,11 @@ Lyrics: |-
     I only have myself to blame
     If you were me you'd do the same
 Crediting Sources: |-
-    <i>Riki Tsuji:</i> ([Bandcamp track artists & track name](https://astrokid.bandcamp.com/track/noun-astro-kids-pronoun-remix))
+    @@ [Bandcamp track artists & track name](https://astrokid.bandcamp.com/track/noun-astro-kids-pronoun-remix)
 
     [[artist:michael-guy-bowman|Michael Guy Bowman]] - [[track:noun-ithaca|Noun]] ([[artist:riki-tsuji|Astro Kid]]'s Pronoun Remix)
 
-    <i>Riki Tsuji:</i> ([Bandcamp credits blurb](https://astrokid.bandcamp.com/track/noun-astro-kids-pronoun-remix), excerpt)
+    @@ [Bandcamp credits blurb](https://astrokid.bandcamp.com/track/noun-astro-kids-pronoun-remix), excerpt
 
     Originally produced by [[artist:michael-guy-bowman|Michael Guy Bowman]]
 ---
@@ -147,11 +147,11 @@ Referenced Tracks:
 Sampled Tracks:
 - Cerulean Skies
 Crediting Sources: |-
-    <i>Riki Tsuji:</i> ([Bandcamp track artists & track name](https://astrokid.bandcamp.com/track/cerulean-skies-astro-kids-extremely-loud-and-incredibly-rude-remix))
+    @@ [Bandcamp track artists & track name](https://astrokid.bandcamp.com/track/cerulean-skies-astro-kids-extremely-loud-and-incredibly-rude-remix)
 
     [[artist:michael-guy-bowman|Michael Guy Bowman]] - [[Cerulean Skies]] ([[artist:riki-tsuji|Astro Kid]]'s Extremely Loud And Incredibly Rude Remix)
 
-    <i>Riki Tsuji:</i> ([Bandcamp credits blurb](https://astrokid.bandcamp.com/track/cerulean-skies-astro-kids-extremely-loud-and-incredibly-rude-remix), excerpt)
+    @@ [Bandcamp credits blurb](https://astrokid.bandcamp.com/track/cerulean-skies-astro-kids-extremely-loud-and-incredibly-rude-remix), excerpt
 
     Originally produced by [[artist:michael-guy-bowman|Michael Guy Bowman]]
 ---
@@ -162,11 +162,11 @@ Duration: 4:43
 URLs:
 - https://astrokid.bandcamp.com/track/laser-missile-fireball-powerclaw-astro-kids-robot-disco-spaceship-blastersword-remix
 Crediting Sources: |-
-    <i>Riki Tsuji:</i> ([Bandcamp track artists & track name](https://astrokid.bandcamp.com/track/laser-missile-fireball-powerclaw-astro-kids-robot-disco-spaceship-blastersword-remix))
+    @@ [Bandcamp track artists & track name](https://astrokid.bandcamp.com/track/laser-missile-fireball-powerclaw-astro-kids-robot-disco-spaceship-blastersword-remix)
 
     [[artist:rj-lake|Robert J! Lake]] - [[Laser Missile Fireball Powerclaw]] ([[artist:riki-tsuji|Astro Kid]]'s Robot Disco Spaceship Blastersword Remix)
 
-    <i>Riki Tsuji:</i> ([Bandcamp credits blurb](https://astrokid.bandcamp.com/track/laser-missile-fireball-powerclaw-astro-kids-robot-disco-spaceship-blastersword-remix), excerpt)
+    @@ [Bandcamp credits blurb](https://astrokid.bandcamp.com/track/laser-missile-fireball-powerclaw-astro-kids-robot-disco-spaceship-blastersword-remix), excerpt
 
     Originally produced by [[artist:rj-lake|Robert J! Lake]]
 ---
@@ -184,7 +184,7 @@ Referenced Tracks:
 Sampled Tracks:
 - hidden memory
 Lyrics: |-
-    <i>stab something:</i> ([artist's lyrics](https://stabsomething.bandcamp.com/track/hidden-memory-astro-kid-vocal-remix))
+    @@ [artist's lyrics](https://stabsomething.bandcamp.com/track/hidden-memory-astro-kid-vocal-remix)
 
     "what are you listening to?"
     a melody from a far off dream
@@ -232,11 +232,11 @@ Lyrics: |-
     as the alarm rings out your wakeup call
     you drift and then forget it all
 Crediting Sources: |-
-    <i>Riki Tsuji:</i> ([Bandcamp track artists & track name](https://astrokid.bandcamp.com/track/hidden-memory-astro-kid-remix-vocal-ver))
+    @@ [Bandcamp track artists & track name](https://astrokid.bandcamp.com/track/hidden-memory-astro-kid-remix-vocal-ver)
 
     [[artist:stab-something|stab something]] - [[hidden memory]] ([[artist:riki-tsuji|Astro Kid]] Remix) [vocal ver.]
 
-    <i>Riki Tsuji:</i> ([Bandcamp credits blurb](https://astrokid.bandcamp.com/track/hidden-memory-astro-kid-remix-vocal-ver), excerpt)
+    @@ [Bandcamp credits blurb](https://astrokid.bandcamp.com/track/hidden-memory-astro-kid-remix-vocal-ver), excerpt
 
     Originally produced by [[artist:stab-something|stab something]]
 ---
@@ -248,11 +248,11 @@ Duration: 5:04
 URLs:
 - https://astrokid.bandcamp.com/track/tempest-destroyed-by-astro-kid
 Crediting Sources: |-
-    <i>Riki Tsuji:</i> ([Bandcamp track artists & track name](https://astrokid.bandcamp.com/track/tempest-destroyed-by-astro-kid))
+    @@ [Bandcamp track artists & track name](https://astrokid.bandcamp.com/track/tempest-destroyed-by-astro-kid)
 
     [[artist:solatrus|Jeremy Iamurri]] - [[track:tempest-spiritwake|Tempest]] (destroyed by Astro Kid)
 
-    <i>Riki Tsuji:</i> ([Bandcamp credits blurb](https://astrokid.bandcamp.com/track/tempest-destroyed-by-astro-kid), excerpt)
+    @@ [Bandcamp credits blurb](https://astrokid.bandcamp.com/track/tempest-destroyed-by-astro-kid), excerpt
 
     Originally produced by [[artist:solatrus|Jeremy Iamurri]]
 ---
@@ -271,11 +271,11 @@ Sampled Tracks:
 URLs:
 - https://astrokid.bandcamp.com/track/breaking-down-feat-tamara-fritz-broken-by-astro-kid
 Crediting Sources: |-
-    <i>Riki Tsuji:</i> ([Bandcamp track artists & track name](https://astrokid.bandcamp.com/track/breaking-down-feat-tamara-fritz-broken-by-astro-kid))
+    @@ [Bandcamp track artists & track name](https://astrokid.bandcamp.com/track/breaking-down-feat-tamara-fritz-broken-by-astro-kid)
 
     [[artist:glowfonik|glowfonik]] - Breaking Down (feat. [[artist:tamara-fritz|Tamara Fritz]]) [broken by [[artist:riki-tsuji|Astro Kid]]]
 
-    <i>Riki Tsuji:</i> ([Bandcamp credits blurb](https://astrokid.bandcamp.com/track/breaking-down-feat-tamara-fritz-broken-by-astro-kid), excerpt)
+    @@ [Bandcamp credits blurb](https://astrokid.bandcamp.com/track/breaking-down-feat-tamara-fritz-broken-by-astro-kid), excerpt
 
     Originally produced by [[artist:glowfonik|glowfonik]]
 ---
@@ -289,11 +289,11 @@ Sampled Tracks:
 URLs:
 - https://astrokid.bandcamp.com/track/innocence-carefree-sailing-remix-by-astro-kid
 Crediting Sources: |-
-    <i>Riki Tsuji:</i> ([Bandcamp track artists & track name](https://astrokid.bandcamp.com/track/innocence-carefree-sailing-remix-by-astro-kid))
+    @@ [Bandcamp track artists & track name](https://astrokid.bandcamp.com/track/innocence-carefree-sailing-remix-by-astro-kid)
 
     [[artist:jamie-paige|hrmnzr]] - [[track:innocence-sailing|Innocence]] (Carefree Sailing Remix by [[artist:riki-tsuji|Astro Kid]])
 
-    <i>Riki Tsuji:</i> ([Bandcamp credits blurb](https://astrokid.bandcamp.com/track/innocence-carefree-sailing-remix-by-astro-kid), excerpt)
+    @@ [Bandcamp credits blurb](https://astrokid.bandcamp.com/track/innocence-carefree-sailing-remix-by-astro-kid), excerpt
 
     Originally produced by [[artist:jamie-paige|hrmnzr]]
 ---
@@ -319,11 +319,11 @@ Referenced Tracks:
 Sampled Tracks:
 - dream diary
 Crediting Sources: |-
-    <i>Riki Tsuji:</i> ([Bandcamp track artists & track name](https://astrokid.bandcamp.com/track/dream-diary-feat-easy-girl-astro-kid-remix-feat-asterik), excerpt)
+    @@ [Bandcamp track artists & track name](https://astrokid.bandcamp.com/track/dream-diary-feat-easy-girl-astro-kid-remix-feat-asterik), excerpt
 
     [[artist:stab-something|stab something]] - dream diary feat. [[artist:rj-lake|easy girl]] ([[artist:riki-tsuji|Astro Kid]] Remix feat. [[artist:asterik|asterik]])
 
-    <i>Riki Tsuji:</i> ([Bandcamp credits blurb](https://astrokid.bandcamp.com/track/dream-diary-feat-easy-girl-astro-kid-remix-feat-asterik), excerpt)
+    @@ [Bandcamp credits blurb](https://astrokid.bandcamp.com/track/dream-diary-feat-easy-girl-astro-kid-remix-feat-asterik), excerpt
 
     Originally produced by [[artist:stab-something|stab something]]
 
@@ -352,11 +352,11 @@ Referenced Tracks:
 Sampled Tracks:
 - track:chemical-glowfonik
 Crediting Sources: |-
-    <i>Riki Tsuji:</i> ([Bandcamp track artists & track name](https://astrokid.bandcamp.com/track/chemical-remixed-by-cadence-cube-and-astro-kid))
+    @@ [Bandcamp track artists & track name](https://astrokid.bandcamp.com/track/chemical-remixed-by-cadence-cube-and-astro-kid)
 
     [[artist:glowfonik|glowfonik]] - [[track:chemical-glowfonik|Chemical]] (remixed by [[artist:cadence-cube|Cadence Cube]] and [[artist:riki-tsuji|Astro Kid]])
 
-    <i>Riki Tsuji:</i> ([Bandcamp credits blurb](https://astrokid.bandcamp.com/track/chemical-remixed-by-cadence-cube-and-astro-kid), excerpt)
+    @@ [Bandcamp credits blurb](https://astrokid.bandcamp.com/track/chemical-remixed-by-cadence-cube-and-astro-kid), excerpt
 
     Originally produced by [[artist:glowfonik]]
 
@@ -371,11 +371,11 @@ Referenced Tracks:
 Sampled Tracks:
 - track:forever-excerpt
 Crediting Sources: |-
-    <i>Riki Tsuji:</i> ([Bandcamp track artists & track name](https://astrokid.bandcamp.com/track/forever-astro-kid-remix-official-version))
+    @@ [Bandcamp track artists & track name](https://astrokid.bandcamp.com/track/forever-astro-kid-remix-official-version)
 
     [[artist:excerpt|Excerpt]] - [[track:forever-excerpt|Forever]] ([[artist:riki-tsuji|Astro Kid]] remix) [official version]
 
-    <i>Riki Tsuji:</i> ([Bandcamp credits blurb](https://astrokid.bandcamp.com/track/forever-astro-kid-remix-official-version), excerpt)
+    @@ [Bandcamp credits blurb](https://astrokid.bandcamp.com/track/forever-astro-kid-remix-official-version), excerpt
 
     Originally produced by [[artist:excerpt]]
 ---
@@ -391,11 +391,11 @@ Referenced Tracks:
 Sampled Tracks:
 - Lie To Me
 Crediting Sources: |-
-    <i>Riki Tsuji:</i> ([Bandcamp track artists & track name](https://astrokid.bandcamp.com/track/lie-to-me-orchestrated-by-astro-kid-and-plazmataz))
+    @@ [Bandcamp track artists & track name](https://astrokid.bandcamp.com/track/lie-to-me-orchestrated-by-astro-kid-and-plazmataz)
 
     [[artist:haunter|IKarus]] vs [[artist:glowfonik|glowfonik]] - [[Lie To Me]] (orchestrated by [[artist:riki-tsuji|Astro Kid]] and [[artist:clark-powell|Plazmataz]])
 
-    <i>Riki Tsuji:</i> ([Bandcamp credits blurb](https://astrokid.bandcamp.com/track/lie-to-me-orchestrated-by-astro-kid-and-plazmataz), excerpt)
+    @@ [Bandcamp credits blurb](https://astrokid.bandcamp.com/track/lie-to-me-orchestrated-by-astro-kid-and-plazmataz), excerpt
 
     Originally produced by [[artist:haunter|IKarus]] and [[artist:glowfonik]]
 
@@ -410,7 +410,7 @@ Referenced Tracks:
 Sampled Tracks:
 - track:magnetize-astro-kid
 Crediting Sources: |-
-    <i>Riki Tsuji:</i> ([Bandcamp credits blurb](https://astrokid.bandcamp.com/track/magnetize-tectonic-remix-by-astro-kid), excerpt)
+    @@ [Bandcamp credits blurb](https://astrokid.bandcamp.com/track/magnetize-tectonic-remix-by-astro-kid), excerpt
 
     Originally produced by [[artist:riki-tsuji|Astro Kid]]
 
@@ -428,11 +428,11 @@ Referenced Tracks:
 Sampled Tracks:
 - Twisting Up, Wringing Out
 Crediting Sources: |-
-    <i>Riki Tsuji:</i> ([Bandcamp track artists & track name](https://astrokid.bandcamp.com/track/twisting-up-wringing-out-astro-kid-remix))
+    @@ [Bandcamp track artists & track name](https://astrokid.bandcamp.com/track/twisting-up-wringing-out-astro-kid-remix)
 
     [[artist:jamie-paige|hrmnzr]] feat. [[artist:dakota-medina|[Dakota Medina\]]] - [[Twisting Up, Wringing Out]] ([[artist:riki-tsuji|Astro Kid]] remix)
 
-    <i>Riki Tsuji:</i> ([Bandcamp credits blurb](https://astrokid.bandcamp.com/track/twisting-up-wringing-out-astro-kid-remix), excerpt)
+    @@ [Bandcamp credits blurb](https://astrokid.bandcamp.com/track/twisting-up-wringing-out-astro-kid-remix), excerpt
 
     Originally produced by [[artist:jamie-paige|hrmnzr]]
 
@@ -448,11 +448,11 @@ Referenced Tracks:
 Sampled Tracks:
 - Blackheart (Original Mix)
 Crediting Sources: |-
-    <i>Riki Tsuji:</i> ([Bandcamp track artists & track name](https://astrokid.bandcamp.com/track/blackheart-astro-kid-remix))
+    @@ [Bandcamp track artists & track name](https://astrokid.bandcamp.com/track/blackheart-astro-kid-remix)
 
     [[artist:cadence-cube|Cadence Cube]] - [[track:blackheart-original-mix|Blackheart]] ([[artist:riki-tsuji|Astro Kid]] remix)
 
-    <i>Riki Tsuji:</i> ([Bandcamp credits blurb](https://astrokid.bandcamp.com/track/blackheart-astro-kid-remix), excerpt)
+    @@ [Bandcamp credits blurb](https://astrokid.bandcamp.com/track/blackheart-astro-kid-remix), excerpt
 
     Originally produced by [[artist:cadence-cube]]
 ---
@@ -465,7 +465,7 @@ Referenced Tracks:
 Sampled Tracks:
 - track:dive-astro-kid
 Crediting Sources: |-
-    <i>Riki Tsuji:</i> ([Bandcamp credits blurb](https://astrokid.bandcamp.com/track/dive-starfall-remix-by-astro-kidi), excerpt)
+    @@ [Bandcamp credits blurb](https://astrokid.bandcamp.com/track/dive-starfall-remix-by-astro-kidi), excerpt
 
     Originally produced by [[artist:riki-tsuji|Astro Kid]]
 
diff --git a/artists.yaml b/artists.yaml
index a9eccb12..5272c55d 100644
--- a/artists.yaml
+++ b/artists.yaml
@@ -5051,8 +5051,6 @@ URLs:
 - https://twitter.com/FatCat96864561
 - https://gamebanana.com/members/2028092
 ---
-Artist: Fatebreak Music Team
----
 Artist: father2006
 ---
 Artist: fatuousScribbles
@@ -5292,12 +5290,9 @@ URLs:
 - https://freckledoctopus.tumblr.com/
 ---
 Artist: Frédéric Chopin
-
 ---
 Artist: Free!
 ---
-Artist: Freeroam
----
 Artist: The Fresh Prince of Bel-Air
 ---
 Artist: Freshy Kanal
@@ -11257,10 +11252,6 @@ URLs:
 ---
 Artist: Paranatural
 ---
-Artist: Paranatural Fanmusic Team
-URLs:
-- https://paranaturalfanmusicteam.bandcamp.com
----
 Artist: PaRappa the Rapper
 ---
 Artist: The Party
diff --git a/static-page/changelog.yaml b/static-page/changelog.yaml
index 0ebd5fdb..eb143683 100644
--- a/static-page/changelog.yaml
+++ b/static-page/changelog.yaml
@@ -689,6 +689,7 @@ Content: |-
         - fixed duration of [[track:underworld-theme]] (was 1:05, now 0:54)
     - fixed duration of [[track:console-wars]] (was 2:35, now 2:04; thanks, Snow, Lilith!)
     - fixed duration of [[track:skullheart-duskwalk]] (was 10:32, now 2:51; thanks, Snow, Lilith!)
+    - fixed duration of [[track:sleeper-agent]] (was 1:16, now 2:54; thanks, Lan!)
     - fixed durations of [[track:emmy]], [[track:fly-away]], and [[track:till-tomorrow]] (thanks, wertercatt!)
     - fixed duration of [[track:danger-on-the-dance-floor-mid-boss]] to align with soundtrack release (was 2:02, now 2:07; thanks, ruby!)
     - fixed duration of [[track:bad-apple]] ([[artist:zun]]) to align with soundtrack release (was 3:13, now 3:15; thanks, Lan!)
@@ -831,7 +832,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 some line break errors in commentary or other content text for [[album:project-skaia]], [[album:the-lands-of-scp-413]], [[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!)