even more singles

- albums with one track, lost-and-found -> flyaway
- artist singles, kezinox
- artist singles, circlejourney

also loads of commentary citations (the works), some crediting
fixes, some additional names, some commentary cleanup, rework
for flyways, ref fix for christmas time is here, and probably
other stuff

41 files changed, 488 insertions, 332 deletions

diff --git a/album/a-memory-finds-its-name.yaml b/album/a-memory-finds-its-name.yaml
index 0cd63105..b7896999 100644
--- a/album/a-memory-finds-its-name.yaml
+++ b/album/a-memory-finds-its-name.yaml
@@ -711,9 +711,6 @@ Commentary: |-
     I’m fond of writing songs about fictional characters (moreso than about my own life), especially characters that I created myself. This one’s about Ruthenia, the main character of Eagles and Swans, at a time when she’s questioning everything about her past.
 
     It’s definitely the hardest one to sing on this album, and honestly I feel it was made for the penultimate position. I’m happy to finally have the chance to channel my inner musical theatre lover, and would love to write more for this musical whenever I’ve got the time.
-
-    <i>Circlejourney:</i> (track cover)
-    <img src="media/misc/memorialisation-track-cover.jpg" width="250">
 ---
 Track: Year In, Year Out
 Duration: 03:30
diff --git a/album/between-sky-and-sea.yaml b/album/between-sky-and-sea.yaml
index 8d5cdf9e..79d49f81 100644
--- a/album/between-sky-and-sea.yaml
+++ b/album/between-sky-and-sea.yaml
@@ -18,7 +18,8 @@ Groups:
 - Circlejourney
 - Beyond
 Commentary: |-
-    <i>Circlejourney:</i>
+    <i>Circlejourney:</i> ([Bandcamp about blurb](https://circlejourney.bandcamp.com/album/between-sky-and-sea))
+
     My fourth album, Between Sky and Sea, is perhaps my most inspired to date. It is half an hour of uplifting synth orchestrals with a handful of contrasting tracks thrown in.
 
     Several of the tracks here are among my favourites ever, including Like Flying, Fuchsia Moonrise, The Journey and Acquiescence.
@@ -43,7 +44,8 @@ Duration: 03:56
 URLs:
 - https://circlejourney.bandcamp.com/track/fuchsia-moonrise
 Commentary: |-
-    <i>Circlejourney:</i>
+    <i>Circlejourney:</i> ([Bandcamp about blurb](https://circlejourney.bandcamp.com/track/fuchsia-moonrise))
+
     Composed for the Homestuck fan album, Beforus. Do not publicise before the album's release!
 ---
 Track: Watching The Leaves Turn Red
diff --git a/album/capricious-mistress-single.yaml b/album/capricious-mistress-single.yaml
index d0d0b79d..e2b4ce17 100644
--- a/album/capricious-mistress-single.yaml
+++ b/album/capricious-mistress-single.yaml
@@ -1,31 +1,37 @@
-Album: Capricious Mistress - Single
+Album: Capricious Mistress
+Directory: capricious-mistress-single
+Style: single
 Artists:
 - Kezinox
 Date: March 17, 2012
 Date Added: January 1, 2023
 URLs:
 - https://sinisterpsyche.bandcamp.com/album/capricious-mistress-single
+- https://www.youtube.com/watch?v=z8ub2EY50sU
+- https://soundcloud.com/kezinox/capricious-mistress
 Cover Artists:
-- Coffuu
+- Coffuu (artwork)
+- Kezinox (layout for single)
 Cover Art File Extension: png
 Color: '#a34bff'
 Groups:
 - Fandom
 Art Tags:
 - Gamzee
-Commentary: |-
-    <i>Kezinox:</i> ([Tumblr post](https://wickedcadence.tumblr.com/post/10139905090/httpsoundcloudcomsinister-psychecapricious-mi), excerpt, 9/14/2011)
-
-    Basically a club dance theme for Fem!Gamzee. not sure how I arrived and settled on that idea, (probably from listening to \[[Tents and Mirth](https://web.archive.org/web/20100830182827/http://tindeck.com/listen/ebft)] too much), but thats what happened.
-
-    Also, a shout out to [[artist:coffuu]] for drawing the picture and being ok with me using it as the art.
 ---
 Track: Capricious Mistress
+Additional Names:
+- Name: >-
+    Capricious Mistress - Single
+  Annotation: >-
+    [Bandcamp album title](https://sinisterpsyche.bandcamp.com/album/capricious-mistress-single)
+- Name: >-
+    Capricious Mistress (DEMO)
+  Annotation: >-
+    [YouTube title](https://www.youtube.com/watch?v=z8ub2EY50sU),
+    [SoundCloud title](https://soundcloud.com/kezinox/capricious-mistress),
+    minus artist name
 Duration: 3:40
-URLs:
-- https://sinisterpsyche.bandcamp.com/track/capricious-mistress
-- https://www.youtube.com/watch?v=z8ub2EY50sU
-- https://soundcloud.com/kezinox/capricious-mistress
 Referenced Tracks:
 - Entrance of the Gladiators
 Commentary: |-
@@ -37,6 +43,12 @@ Commentary: |-
 
     This is pretty much a demo version, there's an effect that I'm gonna remove if I ever bother to release an EP since this will certainly be on it.
 
+    <i>Kezinox:</i> ([Tumblr post](https://wickedcadence.tumblr.com/post/10139905090/httpsoundcloudcomsinister-psychecapricious-mi), excerpt, 9/14/2011)
+
+    Basically a club dance theme for Fem!Gamzee. not sure how I arrived and settled on that idea, (probably from listening to \[[Tents and Mirth](https://web.archive.org/web/20100830182827/http://tindeck.com/listen/ebft)] too much), but thats what happened.
+
+    Also, a shout out to [[artist:coffuu]] for drawing the picture and being ok with me using it as the art.
+
     <i>Kezinox:</i> ([Tumblr post](https://wickedcadence.tumblr.com/post/10139905090/httpsoundcloudcomsinister-psychecapricious-mi), excerpt)
 
     Holy hell. 400 hits? Damn, now I wish I could upload the good version. This version has the accent percussion too loud and a nasty sounding effect that kills it in some places. But maybe that’s just me being anal. Glad so many people liked it! If I ever can justify buying a SC membership I’ll get the better version up for everyone.
@@ -44,3 +56,7 @@ Commentary: |-
     <i>Kezinox:</i> ([SoundCloud description](https://soundcloud.com/kezinox/capricious-mistress), excerpt)
 
     Note: Since people keep asking the reason this has so many hits is due to the fact that I posted it to tumblr and it got an assload of reblogs. There are also a couple people using it as their background music on youtube and I asked them to credit me in the description.
+Crediting Sources: |-
+    <i>Quasar Nebula:</i> (wiki editor, 7/18/2025)
+
+    We're following the same reasoning as for this artist's other single, [[track:fuchsia-ruler-single]] - illustration by [[artist:coffuu]], layout and text by [[artist:kezinox]].
diff --git a/album/cartographer-symphony.yaml b/album/cartographer-symphony.yaml
index 2fca57a7..81c538a5 100644
--- a/album/cartographer-symphony.yaml
+++ b/album/cartographer-symphony.yaml
@@ -17,7 +17,8 @@ Groups:
 - Circlejourney
 - Beyond
 Commentary: |-
-    <i>Circlejourney:</i>
+    <i>Circlejourney:</i> ([SoundCloud description](https://soundcloud.com/circlejourney/sets/cartographer-symphony), excerpt)
+
     I've always wanted to write a symphony...so I finally did that. And dang, was this an involved project, although it took much shorter than I was anticipating (six days).
 
     Compositionally, it's where I want it to be; production-wise, I don't see myself spending more time on it. Perhaps I'll polish it someday, but this is what you have for now.
diff --git a/album/coastal-dreaming.yaml b/album/coastal-dreaming.yaml
index 60d6f911..3288bce3 100644
--- a/album/coastal-dreaming.yaml
+++ b/album/coastal-dreaming.yaml
@@ -17,7 +17,8 @@ Groups:
 - Circlejourney
 - Beyond
 Commentary: |-
-    <i>Circlejourney:</i>
+    <i>Circlejourney:</i> ([Bandcamp about blurb](https://circlejourney.bandcamp.com/album/coastal-dreaming))
+
     This is, in some ways, a departure from my style in my previous two albums. Alongside the orchestral pieces and upbeat pop, you have some experiments with new sounds. True to the title, there is no shortage of nautically-inspired tracks in this album (as usual, really).
 ---
 Section: Main album
@@ -27,7 +28,8 @@ Duration: 05:05
 URLs:
 - https://circlejourney.bandcamp.com/track/rose-in-light
 Commentary: |-
-    <i>Circlejourney:</i>
+    <i>Circlejourney:</i> ([Bandcamp about blurb](https://circlejourney.bandcamp.com/track/rose-in-light))
+
     The way sunlight glows through rose petals.
 ---
 Track: You Say
@@ -35,7 +37,8 @@ Duration: 03:31
 URLs:
 - https://circlejourney.bandcamp.com/track/you-say
 Commentary: |-
-    <i>Circlejourney:</i>
+    <i>Circlejourney:</i> ([Bandcamp about blurb](https://circlejourney.bandcamp.com/track/you-say))
+
     Originally planned to have lyrics, but scrapped the idea. A self-empowerment type deal.
 ---
 Track: Adventure
@@ -45,7 +48,8 @@ Duration: 01:53
 URLs:
 - https://circlejourney.bandcamp.com/track/adventure
 Commentary: |-
-    <i>Circlejourney:</i>
+    <i>Circlejourney:</i> ([Bandcamp about blurb](https://circlejourney.bandcamp.com/track/adventure))
+
     The feeling of entering the first dungeon in a game.
 ---
 Track: Coastal Dreaming
@@ -53,7 +57,8 @@ Duration: 04:16
 URLs:
 - https://circlejourney.bandcamp.com/track/coastal-dreaming
 Commentary: |-
-    <i>Circlejourney:</i>
+    <i>Circlejourney:</i> ([Bandcamp about blurb](https://circlejourney.bandcamp.com/track/coastal-dreaming))
+
     Sailing a small boat along the coast.
 ---
 Track: Voyage
@@ -63,7 +68,8 @@ Duration: 04:10
 URLs:
 - https://circlejourney.bandcamp.com/track/voyage
 Commentary: |-
-    <i>Circlejourney:</i>
+    <i>Circlejourney:</i> ([Bandcamp about blurb](https://circlejourney.bandcamp.com/track/voyage))
+
     You're on a large ship crossing the ocean, and the night sky is clear and deep. You're navigating by the stars.
 ---
 Track: Rainy Day Conversation
@@ -76,7 +82,8 @@ Duration: 03:05
 URLs:
 - https://circlejourney.bandcamp.com/track/waterside-sunset
 Commentary: |-
-    <i>Circlejourney:</i>
+    <i>Circlejourney:</i> ([Bandcamp about blurb](https://circlejourney.bandcamp.com/track/waterside-sunset))
+
     Sipping a cocktail at the deck's edge while watching the sun set on the river.
 ---
 Track: Get Ready
@@ -84,7 +91,8 @@ Duration: 03:16
 URLs:
 - https://circlejourney.bandcamp.com/track/get-ready
 Commentary: |-
-    <i>Circlejourney:</i>
+    <i>Circlejourney:</i> ([Bandcamp about blurb](https://circlejourney.bandcamp.com/track/get-ready))
+
     Inspired by 90's anime theme songs.
 ---
 Track: Jalan Senja
@@ -94,7 +102,8 @@ Referenced Tracks:
 URLs:
 - https://circlejourney.bandcamp.com/track/jalan-senja
 Commentary: |-
-    <i>Circlejourney:</i>
+    <i>Circlejourney:</i> ([Bandcamp about blurb](https://circlejourney.bandcamp.com/track/jalan-senja))
+
     Commissioned by Felicia P Natasha. The title means "Afternoon Walk". Looping walk music.
 ---
 Track: 'Ruins: Crack in the Sky'
@@ -102,7 +111,8 @@ Duration: 00:58
 URLs:
 - https://circlejourney.bandcamp.com/track/ruins-crack-in-the-sky
 Commentary: |-
-    <i>Circlejourney:</i>
+    <i>Circlejourney:</i> ([Bandcamp about blurb](https://circlejourney.bandcamp.com/track/ruins-crack-in-the-sky))
+
     Commissioned by Felicia P Natasha. Looping boss battle music.
 ---
 Track: Rural Mystery
@@ -110,7 +120,8 @@ Duration: 03:23
 URLs:
 - https://circlejourney.bandcamp.com/track/rural-mystery
 Commentary: |-
-    <i>Circlejourney:</i>
+    <i>Circlejourney:</i> ([Bandcamp about blurb](https://circlejourney.bandcamp.com/track/rural-mystery))
+
     Misty ruins in a pastoral landscape
 ---
 Track: Glory
@@ -120,7 +131,8 @@ Duration: 01:08
 URLs:
 - https://circlejourney.bandcamp.com/track/glory
 Commentary: |-
-    <i>Circlejourney:</i>
+    <i>Circlejourney:</i> ([Bandcamp about blurb](https://circlejourney.bandcamp.com/track/glory))
+
     A victory march kind of track.
 ---
 Track: Despite This Existential Loneliness
@@ -128,7 +140,8 @@ Duration: 01:44
 URLs:
 - https://circlejourney.bandcamp.com/track/despite-this-existential-loneliness
 Commentary: |-
-    <i>Circlejourney:</i>
+    <i>Circlejourney:</i> ([Bandcamp about blurb](https://circlejourney.bandcamp.com/track/despite-this-existential-loneliness))
+
     Background music for a game I was working on. Feeling alone in the world. More specifically, alone in a small log cabin at the top of a mountain. Imagine the crackle of fire in the background.
 ---
 Track: The Banner I Unfurl (Instrumental)
@@ -136,7 +149,8 @@ Duration: 01:18
 URLs:
 - https://circlejourney.bandcamp.com/track/the-banner-i-unfurl-instrumental
 Commentary: |-
-    <i>Circlejourney:</i>
+    <i>Circlejourney:</i> ([Bandcamp about blurb](https://circlejourney.bandcamp.com/track/the-banner-i-unfurl-instrumental))
+
     Background music for an animation I did. It's about pledging one's life to another.
 ---
 Track: The Horizon
@@ -146,7 +160,8 @@ Referenced Tracks:
 URLs:
 - https://circlejourney.bandcamp.com/track/the-horizon
 Commentary: |-
-    <i>Circlejourney:</i>
+    <i>Circlejourney:</i> ([Bandcamp about blurb](https://circlejourney.bandcamp.com/track/the-horizon))
+
     A ship gets lost and finally reaches the horizon. The climax of the Compass story.
 ---
 Track: Unconditionally - Katy Perry (Music Box Arrangement)
diff --git a/album/compass-original-soundtrack.yaml b/album/compass-original-soundtrack.yaml
index 0eed4f4e..f9967016 100644
--- a/album/compass-original-soundtrack.yaml
+++ b/album/compass-original-soundtrack.yaml
@@ -1,5 +1,6 @@
 Album: 'Compass: Original Soundtrack'
 Directory Suffix: compass-ost
+Hide Duration: true
 Artists:
 - Circlejourney
 Date: June 17, 2020
@@ -18,8 +19,9 @@ Groups:
 - Circlejourney
 - Beyond
 Commentary: |-
-    <i>Circlejourney:</i>
-    Original soundtrack for Compass, an interactive comic about two travellers sailing to the edge of the world. Finally complete after 4 years, read Compass at:  [compass.circlejourney.net](https://compass.circlejourney.net)  !
+    <i>Circlejourney:</i> ([Bandcamp about blurb](https://circlejourney.bandcamp.com/album/compass-original-soundtrack))
+
+    Original soundtrack for Compass, an interactive comic about two travellers sailing to the edge of the world. Finally complete after 4 years, read Compass at: [compass.circlejourney.net](https://compass.circlejourney.net) !
 ---
 Track: Compass
 Suffix Directory: true
diff --git a/album/compass.yaml b/album/compass.yaml
index 7e69958f..d965b8da 100644
--- a/album/compass.yaml
+++ b/album/compass.yaml
@@ -14,7 +14,8 @@ Groups:
 - Circlejourney
 - Beyond
 Commentary: |-
-    <i>Circlejourney:</i>
+    <i>Circlejourney:</i> ([Bandcamp about blurb](https://circlejourney.bandcamp.com/album/compass))
+
     This is the compilation of my MIDI compositions, featuring everything from when I began using soundfonts (2008) to last December (2012).
 ---
 Track: Dreamt
diff --git a/album/confinis.yaml b/album/confinis.yaml
index 9ef9b983..66e83a01 100644
--- a/album/confinis.yaml
+++ b/album/confinis.yaml
@@ -1,8 +1,10 @@
 Album: confinis
+Style: single
 Date: October 21, 2012
 Date Added: April 13, 2024
 URLs:
 - https://ohanadyomene.bandcamp.com/track/confinis
+- https://youtu.be/HJPqT3t8d74
 Artists:
 - horizon
 Cover Artists:
@@ -14,19 +16,17 @@ Art Tags:
 Groups:
 - horizon
 - Fandom
-Commentary: |-
-    <i>horizon:</i>
-    As a theme for the Disciple/Signless(Sufferer) pairing, I wanted the song to be haunting, cold, and foreboding, but still beautiful and rich.
-
-    The word confinis is latin for "beside" or "adjacent to" -- in astrology, it is another word for semisextile, which is an aspect of 30°. Such angles only occur when two planets are in two signs next to each other; in this case I'm referring to Cancer and Leo. The song (and image, for that matter) both follow this concept of 'togetherness', no matter what may face them -- and you'll see that The Disciple keeps her promise, as she is found in our night sky beside the prophet Cancerian.
 ---
 Track: confinis
 Duration: 3:15
-URLs:
-- https://ohanadyomene.bandcamp.com/track/confinis
-- https://youtu.be/HJPqT3t8d74
 Lyrics: |-
     Though rain shall fall and blood shall spill
     I swear on the stars shining up above
     Through war and strife, and winter's chill
     I'll stay by your side, my love
+Commentary: |-
+    <i>horizon:</i> ([Bandcamp about blurb](https://ohanadyomene.bandcamp.com/track/confinis))
+
+    As a theme for the Disciple/Signless(Sufferer) pairing, I wanted the song to be haunting, cold, and foreboding, but still beautiful and rich.
+
+    The word confinis is latin for "beside" or "adjacent to" -- in astrology, it is another word for semisextile, which is an aspect of 30°. Such angles only occur when two planets are in two signs next to each other; in this case I'm referring to Cancer and Leo. The song (and image, for that matter) both follow this concept of 'togetherness', no matter what may face them -- and you'll see that The Disciple keeps her promise, as she is found in our night sky beside the prophet Cancerian.
diff --git a/album/dreamers-diarchy.yaml b/album/dreamers-diarchy.yaml
index df44befc..21a6120d 100644
--- a/album/dreamers-diarchy.yaml
+++ b/album/dreamers-diarchy.yaml
@@ -24,7 +24,7 @@ Groups:
 - Circlejourney
 - Fandom
 Commentary: |-
-    <i>Circlejourney:</i>
+    <i>Circlejourney:</i> ([Bandcamp about blurb](https://circlejourney.bandcamp.com/album/dreamers-diarchy), excerpt)
 
     A Homestuck fan release about Prospit and Derse.
 
diff --git a/album/everflow.yaml b/album/everflow.yaml
index 15440a1a..f62edacf 100644
--- a/album/everflow.yaml
+++ b/album/everflow.yaml
@@ -1,4 +1,5 @@
 Album: EVERFLOW
+Style: single
 Date: December 24, 2021
 Date Added: April 13, 2024
 URLs:
@@ -12,17 +13,11 @@ Color: '#E78D97'
 Groups:
 - horizon
 - Beyond
-Commentary: |-
-    <i>horizon:</i> ([Bandcamp about blurb](https://ohanadyomene.bandcamp.com/track/everflow))
-
-    a companion to [Sleepwalking](https://youtu.be/KKzAi69-x4s) and [[album:the-gap]], EVERFLOW is the final in a trio about growing to understand and accept the passage of time. special thanks to yeon for the art and the title suggestion.
 ---
 Track: EVERFLOW
 Duration: 02:44
 Contributors:
 - lilYeonYeon (title)
-URLs:
-- https://ohanadyomene.bandcamp.com/track/everflow
 Lyrics: |-
     I know how time can feel like rivers in a storm in winter
     And I've learned the irony can keep us safe from going deeper
@@ -67,6 +62,10 @@ Lyrics: |-
     And time
     Itself
     Will hold our hands
+Commentary: |-
+    <i>horizon:</i> ([Bandcamp about blurb](https://ohanadyomene.bandcamp.com/track/everflow))
+
+    a companion to [Sleepwalking](https://youtu.be/KKzAi69-x4s) and [[album:the-gap]], EVERFLOW is the final in a trio about growing to understand and accept the passage of time. special thanks to yeon for the art and the title suggestion.
 ---
 Track: EVERFLOW (instrumental)
 Duration: 02:44
diff --git a/album/fate-and-choice-music-for-stardust.yaml b/album/fate-and-choice-music-for-stardust.yaml
index ea08aefc..d39b13e7 100644
--- a/album/fate-and-choice-music-for-stardust.yaml
+++ b/album/fate-and-choice-music-for-stardust.yaml
@@ -19,7 +19,7 @@ Groups:
 - Circlejourney
 - Beyond
 Commentary: |-
-    <i>Circlejourney:</i> ([Twitter commentary](https://twitter.com/circlejourney/status/1644911237539696641))
+    <i>Circlejourney:</i> ([Twitter](https://twitter.com/circlejourney/status/1644911237539696641))
     New EP! Music for [Stardust](https://www.webtoons.com/en/canvas/stardust/list?title_no=416148) by Holly France.
 ---
 Track: Means To An End
@@ -29,7 +29,7 @@ URLs:
 - https://open.spotify.com/track/5z3L5mjoX2k8jbKUklojbK
 - https://music.apple.com/album/means-to-an-end/1681407284?i=1681407285
 Commentary: |-
-    <i>Circlejourney:</i> ([Twitter commentary](https://twitter.com/circlejourney/status/1202265927183548416))
+    <i>Circlejourney:</i> ([Twitter](https://twitter.com/circlejourney/status/1202265927183548416))
     Music commission delivery! This is a short opening theme for Holly France's project [Stardust](https://www.webtoons.com/en/canvas/stardust/list?title_no=416148).
 ---
 Track: I Wouldn't Worry
@@ -39,7 +39,7 @@ URLs:
 - https://open.spotify.com/track/38RgdP2kxmn7BsQt63jWOX
 - https://music.apple.com/album/i-wouldnt-worry/1681407284?i=1681407586
 Commentary: |-
-    <i>Circlejourney:</i> ([Twitter commentary](https://twitter.com/circlejourney/status/1280162485970952193))
+    <i>Circlejourney:</i> ([Twitter](https://twitter.com/circlejourney/status/1280162485970952193))
     A theme music commission for Holly France, for the comic Stardust (http://instagram.com/stardust.comic)! Commissioner said it's an ending theme, heheh.
     FL project preview: https://twitter.com/circlejourney/status/1279997207932833793
 ---
@@ -50,7 +50,7 @@ URLs:
 - https://open.spotify.com/track/0Y27Jj2toNE0tXxP039quj
 - https://music.apple.com/album/blood-dirt-and-coffee/1681407284?i=1681407587
 Commentary: |-
-    <i>Circlejourney:</i> ([Twitter commentary](https://twitter.com/circlejourney/status/1346452097500209152))
+    <i>Circlejourney:</i> ([Twitter](https://twitter.com/circlejourney/status/1346452097500209152))
     Blood, Dirt, Coffee--a commission for Holly France! It's always a joy working with a jazzy feel in my music, and I'm very happy with how this came together. Thank you again for the commission!
 ---
 Track: Destiny's Traitor
diff --git a/album/fly-away.yaml b/album/fly-away.yaml
index 2b7c5810..018ecbfe 100644
--- a/album/fly-away.yaml
+++ b/album/fly-away.yaml
@@ -1,10 +1,11 @@
 Album: Fly Away
+Style: single
 Artists:
 - Circlejourney
 Date: August 18, 2019
 Date Added: April 13, 2024
 URLs:
-- https://www.youtube.com/playlist?list=OLAK5uy_mkhHOQuucPmUPX6ouPCk1dDiNhsVivfTM
+- https://youtu.be/XEOtnhzLxlY
 - https://open.spotify.com/album/4cztzE16rgDifdpthOyoD8
 - https://music.apple.com/album/fly-away-single/1477266242
 Cover Artists:
@@ -20,10 +21,6 @@ Directory: fly-away-single
 Duration: 03:35
 Referenced Tracks:
 - track:fly-away-2010
-URLs:
-- https://youtu.be/XEOtnhzLxlY
-- https://open.spotify.com/track/0JvEVDdh3r7B4AYIYlZ8XX
-- https://music.apple.com/album/fly-away/1477266242?i=1477266247
 Lyrics: |-
     Oh must this be?
     Is this the end?
diff --git a/album/flyways.yaml b/album/flyways.yaml
index f51ee454..a9b1da7c 100644
--- a/album/flyways.yaml
+++ b/album/flyways.yaml
@@ -20,9 +20,12 @@ Groups:
 - Circlejourney
 - Beyond
 Commentary: |-
-    <i>Circlejourney:</i>
+    <i>Circlejourney:</i> ([Bandcamp about blurb](https://circlejourney.bandcamp.com/album/flyways))
+
     This is a song about migrating and starting life over after hitting a breakpoint - a single continuous 15-minute track in four parts, structured like a symphony (and yet not).
 ---
+Section: Separate parts
+---
 Track: Rise With the Sun
 Duration: 04:11
 URLs:
@@ -59,7 +62,12 @@ URLs:
 - https://open.spotify.com/track/25vi2UJlSv7hzkIIUhOSyU
 - https://music.apple.com/album/how-far-youve-wandered/1597858331?i=1597858337
 ---
+Section: Full track
+Description: >-
+    Exclusive to the Bandcamp release, though not a bonus or hidden track.
+---
 Track: Flyways (Full)
+Count In Artist Totals: false
 Duration: 15:02
 Sampled Tracks:
 - Rise With the Sun
@@ -69,5 +77,6 @@ Sampled Tracks:
 URLs:
 - https://circlejourney.bandcamp.com/track/flyways-full
 Commentary: |-
-    <i>Circlejourney:</i>
+    <i>Circlejourney:</i> ([Bandcamp about blurb](https://circlejourney.bandcamp.com/track/flyways-full))
+
     It's all four tracks in a single file...if you prefer to listen to it like that without the breaks
diff --git a/album/fortune.yaml b/album/fortune.yaml
index 0900b969..aa8deb95 100644
--- a/album/fortune.yaml
+++ b/album/fortune.yaml
@@ -1,4 +1,5 @@
 Album: FORTUNE
+Style: single
 Date: April 18, 2019
 Date Added: April 13, 2024
 URLs:
@@ -17,24 +18,9 @@ Color: '#816521'
 Groups:
 - horizon
 - Beyond
-Commentary: |-
-    <i>horizon:</i> ([Bandcamp about blurb](https://ohanadyomene.bandcamp.com/track/fortune))
-
-    full illustration/official audio: [www.youtube.com/watch?v=cLpxTU--0XU](https://youtu.be/cLpxTU--0XU)
-
-    before anything else, this is ultimately a demo! it will be edited more when i go through the big album cleanup later this year, but i have a soft spot for where it is right now, and i don't want to make any more changes until i know what it's going to be paired with. anyway!
-
-    it's difficult for me to talk about this song. i started writing it three years ago in response to the clarion call of a very negative relationship that an ex was trying to revive. "i'm only a body to this person," i thought at the time.
-
-    eventually that line became the chorus, but over the years since i began writing it, my frustration with the subject matter -- greed, abuse, lack of empathy -- broke through into a satirical parroting-back of the things some people would prefer us to be: ever-accommodating supplies of attention and catharsis.
-
-    i wanted to reclaim those "i'm only a body" lines and transform them into something as haunting on its face as it was to me personally... but i also wanted people to know what a surprise they'll be in for should they view others as such.
 ---
 Track: FORTUNE
 Duration: 4:23
-URLs:
-- https://ohanadyomene.bandcamp.com/track/fortune
-- https://youtu.be/cLpxTU--0XU
 Lyrics: |-
     Gnihtemos rof gnitiaw neeb ev'i
     Em enifer dna ni emoc
@@ -99,3 +85,15 @@ Lyrics: |-
     Come put out the fire in me
     If that's how you see me
     If you think it'd be easy
+Commentary: |-
+    <i>horizon:</i> ([Bandcamp about blurb](https://ohanadyomene.bandcamp.com/track/fortune))
+
+    full illustration/official audio: [www.youtube.com/watch?v=cLpxTU--0XU](https://youtu.be/cLpxTU--0XU)
+
+    before anything else, this is ultimately a demo! it will be edited more when i go through the big album cleanup later this year, but i have a soft spot for where it is right now, and i don't want to make any more changes until i know what it's going to be paired with. anyway!
+
+    it's difficult for me to talk about this song. i started writing it three years ago in response to the clarion call of a very negative relationship that an ex was trying to revive. "i'm only a body to this person," i thought at the time.
+
+    eventually that line became the chorus, but over the years since i began writing it, my frustration with the subject matter -- greed, abuse, lack of empathy -- broke through into a satirical parroting-back of the things some people would prefer us to be: ever-accommodating supplies of attention and catharsis.
+
+    i wanted to reclaim those "i'm only a body" lines and transform them into something as haunting on its face as it was to me personally... but i also wanted people to know what a surprise they'll be in for should they view others as such.
diff --git a/album/fuchsia-ruler-single.yaml b/album/fuchsia-ruler-single.yaml
index d3672021..bc6ad531 100644
--- a/album/fuchsia-ruler-single.yaml
+++ b/album/fuchsia-ruler-single.yaml
@@ -1,25 +1,40 @@
-Album: Fuchsia Ruler - Single
+Album: Fuchsia Ruler
+Directory: fuchsia-ruler-single
+Always Reference By Directory: true
+Style: single
 Artists:
 - Kezinox
 Date: April 3, 2012
 Date Added: January 1, 2023
 URLs:
 - https://sinisterpsyche.bandcamp.com/album/fuchsia-ruler-single
-Cover Artists:
-- Mel
-Cover Art File Extension: png
+Cover Artwork:
+- File Extension: png
+  Artists:
+  - Mel (artwork)
+  - Kezinox (layout for single)
+  Referenced Artworks:
+  - Fuchsia Ruler
+  Tags:
+  - The Condesce
 Color: '#f8017b'
 Groups:
 - Fandom
-Art Tags:
-- The Condesce
-Commentary: |-
-    <i>Kezinox:</i>
-    Originally known by the name Witc)(ing )(our [a theme for the Condesce], Fuchsia Ruler was an entry for the Homestuck Album Contest. Since it did in fact win, and was placed on the contest album I had to wait until now to upload it here. You can now download it either from my bandcamp here as a single, or, if you're a fan of homestuck i'd encourage you to download it here from the homestuck bandcamp along with the rest of the album.
 ---
 Track: Fuchsia Ruler
 Directory: fuchsia-ruler-single
 Main Release: track:fuchsia-ruler
+Additional Names:
+- Name: >-
+    Fuchsia Ruler - Single
+  Annotation: >-
+    [Bandcamp album title](https://sinisterpsyche.bandcamp.com/album/fuchsia-ruler-single)
 Duration: 4:07
-URLs:
-- https://sinisterpsyche.bandcamp.com/track/fuchsia-ruler
+Commentary: |-
+    <i>Kezinox:</i> ([Bandcamp about blurb](https://sinisterpsyche.bandcamp.com/album/fuchsia-ruler-single), excerpt)
+
+    Originally known by the name Witc)(ing )(our [a theme for the Condesce], Fuchsia Ruler was an entry for the Homestuck Album Contest. Since it did in fact win, and was placed on the contest album I had to wait until now to upload it here. You can now download it either from my bandcamp here as a single, or, if you're a fan of homestuck i'd encourage you to download it here from the homestuck bandcamp along with the rest of the album.
+Crediting Sources: |-
+    <i>Quasar Nebula:</i> (wiki editor, 7/18/2025)
+
+    This release doesn't include any credits for its cover artwork, but it's a composition framing the cover produced for the artworks-half of [[album:coloUrs-and-mayhem-universe-a|the music contest]]. We figure Kezinox independently prepared the layout, text, etc for the single.
diff --git a/album/funkstuck-24.yaml b/album/funkstuck-24.yaml
index 45ae8056..85683722 100644
--- a/album/funkstuck-24.yaml
+++ b/album/funkstuck-24.yaml
@@ -1,5 +1,6 @@
 Album: FUNKSTUCK//24
 Directory: funkstuck-24
+Style: single
 Artists:
 - James Roach
 Date: March 14, 2024
@@ -25,6 +26,11 @@ Groups:
 - group:official
 Art Tags:
 - Battlefield
+---
+Track: FUNKSTUCK//24
+Duration: 2:45
+Contributors:
+- Ash Taylor (guitar)
 Commentary: |-
     <i>Requiem Cafe:</i> ([event website blurb](https://web.archive.org/web/20240316212939/https://www.requiemcafe.com/))
 
@@ -37,25 +43,12 @@ Commentary: |-
     One of Homestuck’s beloved artists, [[artist:hone|HONE]], has joined with us to release never-before-seen Homestuck art, including gorgeous key art of Homestuck's cast!
 
     Grab a drink, dig into a snack, and break out the gray body paint!
----
-Track: FUNKSTUCK//24
-Duration: 2:45
-Contributors:
-- Ash Taylor (guitar)
-URLs:
-- https://www.youtube.com/watch?v=tbgqffL_nes
-- https://open.spotify.com/track/1sVS0HNrHBJyhfrK0cLLB3
-- https://music.apple.com/album/funkstuck-24/1735981459?i=1735981460
-- https://music.wixstatic.com/preview/2c6886_b92d7c7245ed400791556cc808796e35-128.mp3
-Review Points:
-- Date Recorded: May 27, 2024
-  Field: Contributors
-  Notes: |-
-    Guitar credit is via [a tweet](https://twitter.com/hamesatron/status/1768682410219376941) from James Roach:
+Crediting Sources: |-
+    <i>James Roach:</i> ([Twitter](https://twitter.com/hamesatron/status/1768682410219376941), 3/15/2024)
 
-    > guitar by @estroBiologist<br>
-    > also available for streaming on spotify
+    guitar by [[artist:ash-taylor|@estroBiologist]]<br>
+    also available for streaming on spotify
 
-    And [a tweet](https://twitter.com/estroBiologist/status/1768685516763840611) from Ash Taylor:
+    <i>Ash Taylor:</i> ([Twitter](https://twitter.com/estroBiologist/status/1768685516763840611), excerpt, 3/15/2024)
 
-    > psst. hey. guess who did guitar on this :3
+    psst. hey. guess who did guitar on this :3
diff --git a/album/future-people.yaml b/album/future-people.yaml
index 1797bc03..e068c6ac 100644
--- a/album/future-people.yaml
+++ b/album/future-people.yaml
@@ -1,4 +1,5 @@
 Album: FUTURE PEOPLE
+Style: single
 Artists:
 - peak divide
 - Rachel Lake (featuring)
@@ -6,6 +7,7 @@ Date: August 19, 2024
 Date Added: April 13, 2025
 URLs:
 - https://peakdivide.bandcamp.com/track/future-people
+- https://www.youtube.com/watch?v=jxnqBZHDhUY
 Cover Artists:
 - D-CELL GAMES #artist unknown
 Cover Art File Extension: png
@@ -20,9 +22,6 @@ Contributors:
 - rj lake (composition)
 - Clara Maddux (composition, arrangement, guitars, drums, mixing, mastering)
 Duration: 4:15
-URLs:
-- https://peakdivide.bandcamp.com/track/future-people
-- https://www.youtube.com/watch?v=jxnqBZHDhUY
 Lyrics: |-
     <i>peak divide:</i> ([Bandcamp lyrics](https://peakdivide.bandcamp.com/track/future-people))
 
diff --git a/album/homestuck-15th-anniversary-medley.yaml b/album/homestuck-15th-anniversary-medley.yaml
index 8791288a..cd3d45b5 100644
--- a/album/homestuck-15th-anniversary-medley.yaml
+++ b/album/homestuck-15th-anniversary-medley.yaml
@@ -1,9 +1,5 @@
 Album: Homestuck 15th Anniversary Medley
-Additional Names:
-- Name: >-
-    Homestuck Anniversary Medley DX
-  Annotation: >-
-    alternate name, [YouTube](https://www.youtube.com/watch?v=4C2Ay3KPa5s)
+Style: single
 Date: April 13, 2024
 Date Added: April 13, 2024
 Artists:
@@ -18,12 +14,6 @@ URLs:
 Groups:
 - Fandom
 Color: '#1e92fd'
-Commentary: |-
-    <i>tsundereCat [TC]:</i> ([YouTube description](https://www.youtube.com/watch?v=4C2Ay3KPa5s), excerpt)
-
-    A celebration five years in the making.
-
-    Can't believe it's been fifteen years already. That means it's been eight years since I joined the fandom. Wild.
 ---
 Track: Homestuck 15th Anniversary Medley
 Additional Names:
@@ -31,11 +21,11 @@ Additional Names:
     Homestuck 15th Anniversary Medley (or, Homestuck Anniversary Medley DX)
   Annotation: >-
     [YouTube](https://www.youtube.com/watch?v=4C2Ay3KPa5s)
-- Name: Homestuck Anniversary Medley DX
-  Annotation: alternate name
+- Name: >-
+    Homestuck Anniversary Medley DX
+  Annotation: >-
+    alternate name, [YouTube](https://www.youtube.com/watch?v=4C2Ay3KPa5s)
 Duration: 9:34
-URLs:
-- https://www.youtube.com/watch?v=4C2Ay3KPa5s
 Referenced Tracks:
 - Sburban Jungle
 - Terezi's Theme
@@ -90,3 +80,9 @@ Sampled Tracks:
 - Moonsetter
 Lyrics: |-
     (Happy 15th birthday, Homestuck! Here's to fifteen more years before THE FOG CONSUMES US ALL.)
+Commentary: |-
+    <i>tsundereCat [TC]:</i> ([YouTube description](https://www.youtube.com/watch?v=4C2Ay3KPa5s), excerpt)
+
+    A celebration five years in the making.
+
+    Can't believe it's been fifteen years already. That means it's been eight years since I joined the fandom. Wild.
diff --git a/album/i-wanna-fr-ck-terezi.yaml b/album/i-wanna-fr-ck-terezi.yaml
index 81d4022e..42dbe30a 100644
--- a/album/i-wanna-fr-ck-terezi.yaml
+++ b/album/i-wanna-fr-ck-terezi.yaml
@@ -1,5 +1,6 @@
 Album: i wanna fr*ck terezi
 Directory: i-wanna-fr-ck-terezi
+Style: single
 Date: May 8, 2019
 Date Added: October 25, 2023
 Artists: 
@@ -20,21 +21,9 @@ Color: '#008282'
 Groups:
 - Cool and New Music Team
 - Fandom
-Commentary: |-
-    <i>Cool and New Music Team:</i>
-    Lyrics by GPT-2:
-    <img src="media/misc/i-wanna-fuck-terezi-lyrics.png" width="383" height="357"/>
-
-    <img src="media/misc/i-wanna-fuck-terezi-commentary.png" width="584" height="140"/>
-
-    <i>Makin:</i> (Wiki editor, 11/20/2024)
-    The album artwork references the cover art for [[artist:kanye-west]]'s "The Life of Pablo".
-    <img src="media/misc/references/the-life-of-pablo.jpg" width="150">
 ---
 Track: i wanna fr*ck terezi
 Duration: 1:32
-URLs:
-- https://coolandnewwebcomic.bandcamp.com/track/i-wanna-fr-ck-terezi
 Referenced Tracks:
 - Sunslammer
 Sampled Tracks:
@@ -63,3 +52,13 @@ Lyrics: |-
     I wanna fuck Terezi at night from down below
     I wanna fuck Terezi the last minute I think I'll die
     And all
+Commentary: |-
+    <i>Cool and New Music Team:</i>
+    Lyrics by GPT-2:
+    <img src="media/misc/i-wanna-fuck-terezi-lyrics.png" width="383" height="357"/>
+
+    <img src="media/misc/i-wanna-fuck-terezi-commentary.png" width="584" height="140"/>
+
+    <i>Makin:</i> (Wiki editor, 11/20/2024)
+    The album artwork references the cover art for [[artist:kanye-west]]'s "The Life of Pablo".
+    <img src="media/misc/references/the-life-of-pablo.jpg" width="150">
diff --git a/album/if-one-shall-indulge.yaml b/album/if-one-shall-indulge.yaml
index 059dda93..96ab5ba9 100644
--- a/album/if-one-shall-indulge.yaml
+++ b/album/if-one-shall-indulge.yaml
@@ -19,8 +19,9 @@ URLs:
 - https://open.spotify.com/track/05Zt21t2Bf4Se1MkKnFpsa
 - https://www.youtube.com/watch?v=ln5PaIZawWE
 Commentary: |-
-    <i>Circlejourney:</i>
-    A theme for Beatrice commissioned by [Josefin B](https://hsmusic.wiki/artist/josefin-b/).
+    <i>Circlejourney:</i> ([YouTube description](https://www.youtube.com/watch?v=ln5PaIZawWE), excerpt)
+
+    A theme for Beatrice commissioned by [[artist:josefin-b|Josefin B]].
 ---
 Track: This is not a pipe
 Duration: 02:13
@@ -28,5 +29,6 @@ URLs:
 - https://open.spotify.com/track/3CNhNJnmfEw19wuDqCQeHA
 - https://www.youtube.com/watch?v=_W-iSphH7bA
 Commentary: |-
-    <i>Circlejourney:</i>
-    A theme for Cecil commissioned by [Josefin B](https://hsmusic.wiki/artist/josefin-b/).
+    <i>Circlejourney:</i> ([YouTube description](https://www.youtube.com/watch?v=_W-iSphH7bA), excerpt)
+
+    A theme for Cecil commissioned by [[artist:josefin-b|Josefin B]].
diff --git a/album/im-a-member-of-the-midnight-crew-soapstone.yaml b/album/im-a-member-of-the-midnight-crew-soapstone.yaml
index 94c8c1ed..ae9c01e6 100644
--- a/album/im-a-member-of-the-midnight-crew-soapstone.yaml
+++ b/album/im-a-member-of-the-midnight-crew-soapstone.yaml
@@ -1,9 +1,11 @@
 Album: I'm a Member of the Midnight Crew
 Directory: im-a-member-of-the-midnight-crew-soapstone
+Style: single
 Date: April 13, 2023
 Date Added: April 13, 2024
 URLs:
 - https://soapstone.bandcamp.com/album/im-a-member-of-the-midnight-crew
+- https://youtu.be/VZ8kRr58Wr0
 Artists:
 - Soapstone
 Cover Artists:
@@ -15,19 +17,6 @@ Art Tags:
 - Vriska
 Groups:
 - Fandom
-Commentary: |-
-    <i>Soapstone:</i>
-    happy 4/13! homestuck is awesome. ive been a homestuck fan for like... nearly 8 years?? which is pretty crazy to think about! here's what i guess is a little tribute to it
-
-    THE MIDNIGHT CREW RUSE WAS A
-    DISTACTION
-
-    this is my first time playing drums in a song, and i will be real with you, i had to do quite a bit of editing to them. but im pretty proud of how they turned out!
-
-    on the topic of soapstone music, i will not promise soapstone album will be out this year, because i promised that in 2022, and 2021. but i will try my damng hardest. 2023 year of the soapstone
-
-    <i>Soapstone:</i> (post-lofam 5a2)
-    HEY! i updated this song and it's on the homestuck fan-music compilation [[album:lofam5a2|Land of Fans and Music 5 Act 2]] (along with another original soapstone tune!). i will probably keep the version here the same as it was when i released it but if you'd like to hear a better version along with 98 other awesome tracks by other artists then check this out: [unofficialmspafans.bandcamp.com/track/im-a-member-of-the-midnight-crew-special-soapstone-version](https://unofficialmspafans.bandcamp.com/track/im-a-member-of-the-midnight-crew-special-soapstone-version)
 ---
 Track: I'm a Member of the Midnight Crew
 Directory: im-a-member-of-the-midnight-crew-soapstone
@@ -36,9 +25,6 @@ Duration: 3:19
 Cover Artists:
 - Soapstone
 Cover Art Dimensions: 1400x1583
-URLs:
-- https://soapstone.bandcamp.com/album/im-a-member-of-the-midnight-crew
-- https://youtu.be/VZ8kRr58Wr0
 Referenced Tracks:
 - track:im-a-member-of-the-midnight-crew
 - I'm a Member of the Midnight Crew (Post-Punk Version)
@@ -84,3 +70,25 @@ Lyrics: |-
     Early to bed, and you'll miss all the fun
     Bring your wife and trouble, it will never trouble you
     Make her a member of the midnight crew!
+Commentary: |-
+    <i>Soapstone:</i> ([Bandcamp about blurb](https://soapstone.bandcamp.com/album/im-a-member-of-the-midnight-crew), excerpt)
+
+    happy 4/13! homestuck is awesome. ive been a homestuck fan for like... nearly 8 years?? which is pretty crazy to think about! here's what i guess is a little tribute to it
+
+    THE MIDNIGHT CREW RUSE WAS A<br>
+    DISTACTION
+
+    this is my first time playing drums in a song, and i will be real with you, i had to do quite a bit of editing to them. but im pretty proud of how they turned out!
+
+    on the topic of soapstone music, i will not promise soapstone album will be out this year, because i promised that in 2022, and 2021. but i will try my damng hardest. 2023 year of the soapstone
+
+    <i>Soapstone:</i> ([Bandcamp about blurb](https://soapstone.bandcamp.com/album/im-a-member-of-the-midnight-crew), excerpt)
+
+    HEY! i updated this song and it's on the homestuck fan-music compilation [[album:lofam5a2|Land of Fans and Music 5 Act 2]] (along with another original soapstone tune!). i will probably keep the version here the same as it was when i released it but if you'd like to hear a better version along with 98 other awesome tracks by other artists then check this out: [unofficialmspafans.bandcamp.com/track/im-a-member-of-the-midnight-crew-special-soapstone-version](https://unofficialmspafans.bandcamp.com/track/im-a-member-of-the-midnight-crew-special-soapstone-version)
+Crediting Sources: |-
+    <i>Soapstone:</i> ([Bandcamp credits blurb](https://soapstone.bandcamp.com/album/im-a-member-of-the-midnight-crew))
+
+    original song by [[artist:eddie-morton|eddie morton]] (i think? there's sheet music for the song that doesn't mention his name, so i don't know if he was the original composer. his version is what this is based off anyway)<br>
+    interpolates elements of [[I'm a Member of the Midnight Crew (Post-Punk Version)]] by [[artist:michael-guy-bowman]], and i guess the distorted electric guitar is a reference to Revolution by the Beatles?? for some reason
+
+    all everything performed and produced and mixed by sopapapstone
diff --git a/album/laknat-suria.yaml b/album/laknat-suria.yaml
index 11276b1a..0a434954 100644
--- a/album/laknat-suria.yaml
+++ b/album/laknat-suria.yaml
@@ -1,4 +1,5 @@
 Album: Laknat Suria
+Style: single
 Artists:
 - Circlejourney
 Date: May 24, 2021
@@ -13,12 +14,10 @@ Color: '#FF948E'
 Groups:
 - Circlejourney
 - Beyond
-Commentary: |-
-    <i>Circlejourney:</i> ([Twitter commentary](https://twitter.com/circlejourney/status/1399718547991891969))
-    Another music commission from May--a battle theme for @farideacs' D&D OC Ida (art also by him)! I've never thought of traditional Malay instruments, electronic and rock combined like this and love how well it works. Thank you for the comm!
 ---
 Track: Laknat Suria
 Duration: 02:58
-URLs:
-- https://open.spotify.com/track/4Gg1reDCVog5w1UQqU73vd
-- https://youtu.be/jS1G-AvLvIw
+Commentary: |-
+    <i>Circlejourney:</i> ([Twitter](https://twitter.com/circlejourney/status/1399718547991891969))
+
+    Another music commission from May--a battle theme for @farideacs' D&D OC Ida (art also by him)! I've never thought of traditional Malay instruments, electronic and rock combined like this and love how well it works. Thank you for the comm!
diff --git a/album/layers-coasters-upon-coasters.yaml b/album/layers-coasters-upon-coasters.yaml
index 26dc44b1..d02f270b 100644
--- a/album/layers-coasters-upon-coasters.yaml
+++ b/album/layers-coasters-upon-coasters.yaml
@@ -51,6 +51,11 @@ Color: '#c4c8c7'
 Groups:
 - Cool and New Music Team
 - Fandom
+---
+Track: LAYERS (coasters upon coasters)
+Duration: 5:04
+Referenced Tracks:
+- Doctor
 Commentary: |-
     <i>Cool and New Music Team:</i>
     Everyone is here! LAYERS (coasters upon coasters) has each team member make their own individual song overlay, then puts em all together.
@@ -58,11 +63,3 @@ Commentary: |-
     Music video: [www.youtube.com/watch?v=kPHeyigJYrk](https://www.youtube.com/watch?v=kPHeyigJYrk)
 
     Inspired by "[[track:layers-upon-layers|Layers Upon Layers]]" by [[artist:marcy-nabors]] and [[artist:jamie-paige]]
----
-Track: LAYERS (coasters upon coasters)
-Duration: 5:04
-URLs:
-- https://coolandnewwebcomic.bandcamp.com/track/layers-coasters-upon-coasters
-- https://www.youtube.com/watch?v=kPHeyigJYrk
-Referenced Tracks:
-- Doctor
diff --git a/album/lordmaker.yaml b/album/lordmaker.yaml
index dc146b58..fd33e7fb 100644
--- a/album/lordmaker.yaml
+++ b/album/lordmaker.yaml
@@ -1,14 +1,7 @@
 Album: LORDMAKER
+Style: single
 Date: April 13, 2024
 Date Added: April 13, 2024
-Additional Names:
-- Name: >-
-    𝐋𝐎𝐑𝐃𝐌𝐀𝐊𝐄𝐑 (Homestuck 15 Year Anniversary)
-  Annotation: >-
-    [YouTube](https://www.youtube.com/watch?v=rwKiTYFp_eA)
-- Name: >-
-    LORDMAKER (Homestuck 15 Year Anniversary)
-    YouTube, normalized
 Artists:
 - Gryotharian
 Cover Artists:
@@ -18,10 +11,6 @@ URLs:
 Groups:
 - Fandom
 Color: '#e70e14'
-Commentary: |-
-    <i>Gryotharian:</i> ([YouTube](https://www.youtube.com/watch?v=rwKiTYFp_eA))
-
-    can you tell this is rushed too? its chistmas for homestuck fans and one of these years ill be ready. Give the BEST BOY some love.
 ---
 Track: LORDMAKER
 Additional Names:
@@ -29,9 +18,10 @@ Additional Names:
     𝐋𝐎𝐑𝐃𝐌𝐀𝐊𝐄𝐑 (Homestuck 15 Year Anniversary)
   Annotation: >-
     [YouTube](https://www.youtube.com/watch?v=rwKiTYFp_eA)
+- Name: >-
+    LORDMAKER (Homestuck 15 Year Anniversary)
+    YouTube, normalized
 Duration: 2:47
-URLs:
-- https://www.youtube.com/watch?v=rwKiTYFp_eA
 Referenced Tracks:
 - English
 - Liquid Negrocity
@@ -59,3 +49,7 @@ Lyrics: |-
 
     (Make her a member of the midnight crew!)  <!-- 1:55 -->
     (Make her a member of the midnight crew!)
+Commentary: |-
+    <i>Gryotharian:</i> ([YouTube](https://www.youtube.com/watch?v=rwKiTYFp_eA))
+
+    can you tell this is rushed too? its chistmas for homestuck fans and one of these years ill be ready. Give the BEST BOY some love.
diff --git a/album/losing-heart.yaml b/album/losing-heart.yaml
index 4a472f84..40bc835c 100644
--- a/album/losing-heart.yaml
+++ b/album/losing-heart.yaml
@@ -19,7 +19,7 @@ Additional Names:
 - Name: >-
     Losing Heart (Solo)
   Annotation: >-
-    [Bandcamp album name](https://nuclear333.bandcamp.com/album/losing-heart-solo)
+    [Bandcamp album title](https://nuclear333.bandcamp.com/album/losing-heart-solo)
 Duration: 1:27
 Commentary: |-
     <i>tempest2k:</i> ([Bandcamp about blurb](https://nuclear333.bandcamp.com/album/losing-heart-solo), excerpt)
diff --git a/album/lost-and-found.yaml b/album/lost-and-found.yaml
index 74ed152b..0e84986d 100644
--- a/album/lost-and-found.yaml
+++ b/album/lost-and-found.yaml
@@ -1,4 +1,5 @@
 Album: lost-and-found
+Style: single
 Date: July 29, 2013
 Date Added: April 13, 2024
 URLs:
@@ -13,15 +14,9 @@ Color: '#F8F4D1'
 Groups:
 - horizon
 - Beyond
-Commentary: |-
-    <i>horizon:</i> ([Bandcamp about blurb](https://ohanadyomene.bandcamp.com/track/lost-and-found))
-
-    sadder than it sounds.
 ---
 Track: lost-and-found
 Duration: 5:24
-URLs:
-- https://ohanadyomene.bandcamp.com/track/lost-and-found
 Lyrics: |-
     I have been dreaming of all i could've done differently
     I only ever seem to say what i mean while you sleep
@@ -74,3 +69,7 @@ Lyrics: |-
     And i'm starting
     To call you
     Home
+Commentary: |-
+    <i>horizon:</i> ([Bandcamp about blurb](https://ohanadyomene.bandcamp.com/track/lost-and-found))
+
+    sadder than it sounds.
diff --git a/album/old-world.yaml b/album/old-world.yaml
index c804bdc0..8c524b32 100644
--- a/album/old-world.yaml
+++ b/album/old-world.yaml
@@ -19,7 +19,7 @@ Additional Names:
 - Name: >-
     Old World (Solo)
   Annotation: >-
-    [Bandcamp album name](https://nuclear333.bandcamp.com/album/old-world-solo)
+    [Bandcamp album title](https://nuclear333.bandcamp.com/album/old-world-solo)
 Duration: 3:01
 Commentary: |-
     <i>tempest2k:</i> ([Bandcamp about blurb](https://nuclear333.bandcamp.com/album/old-world-solo), excerpt)
diff --git a/album/references-beyond-homestuck.yaml b/album/references-beyond-homestuck.yaml
index e0b2eb34..5e1f8b06 100644
--- a/album/references-beyond-homestuck.yaml
+++ b/album/references-beyond-homestuck.yaml
@@ -11911,6 +11911,53 @@ Lyrics: |-
     Shouhai wo wakeru nowa (<i>Victory is decided by your tenacity</i>)
     Shuunen sa dakara I Chase You (<i>That's why I'll chase you</i>)
 ---
+Track: Christmas Time is Here (Vocal)
+Artists:
+- Peanuts
+- Vince Guaraidi
+Duration: 2:45
+URLs:
+- https://vinceguaraldi.bandcamp.com/track/christmas-time-is-here-vocal
+- https://www.youtube.com/watch?v=4PzetPqepXA
+Lyrics: |-
+    <i>[[artist:quasar-nebula|Lanolin]]:</i> (wiki lyrics)
+
+    *(0:09-1:25)*
+
+    Christmas time is here
+    Happiness and cheer
+    Fun for all that children call
+    Their favorite time of year
+
+    Snowflakes in the air
+    Carols everywhere
+    Olden times and ancient rhymes
+    Of love and dreams to share
+
+    Sleigh bells in the air
+    Beauty everywhere
+    Yuletide by the fireside
+    And joyful memories there
+
+    Christmas time is here
+    We'll be drawing near<sup>[*]</sup>
+    Oh, that we could always see
+    Such spirit through the year
+
+    *(2:05-2:43)*
+
+    Sleigh bells in the air
+    Beauty everywhere
+    Yuletide by the fireside
+    And joyful memories there
+
+    Christmas time is here
+    We'll be drawing near
+    Oh, that we could always see
+    Such spirit through the year
+
+    ["We'll be drawing near" is sometimes heard as "families drawing near". The lyric used is taken from the [2018 official lyric video](https://www.youtube.com/watch?v=u6UlfmqZnN4).]
+---
 Track: Concerning Hobbits
 Artists:
 - The Lord of the Rings
diff --git a/album/single-christmastime-is-here-lo-fi.yaml b/album/single-christmastime-is-here-lo-fi.yaml
index 26fe1375..0119e1d0 100644
--- a/album/single-christmastime-is-here-lo-fi.yaml
+++ b/album/single-christmastime-is-here-lo-fi.yaml
@@ -18,7 +18,23 @@ Groups:
 - Beyond
 ---
 Track: christmas time is here (lo-fi)
+Additional Names:
+- Name: >-
+    SINGLE: christmastime is here (lo-fi)
+  Annotation: >-
+    [Bandcamp album title](https://hames.bandcamp.com/album/single-christmastime-is-here-lo-fi)
+- Name: >-
+    christmastime is here
+  Annotation: >-
+    [Spotify single title](https://open.spotify.com/album/6DWAB3E3dTQvJol5aH5I5V)
+- Name: >-
+    christmastime is here (lofi)
+  Annotation: >-
+    cover artwork
 Duration: 5:52
+Referenced Tracks:
+- Christmas Time is Here (Vocal)
 Commentary: |-
-    <i>James Roach:</i> ([Twitter commentary](https://twitter.com/hamesatron/status/1601301915412807681))
+    <i>James Roach:</i> ([Twitter](https://twitter.com/hamesatron/status/1601301915412807681))
+
     first single in a while. friends suggested i do a little lofi christmas cover for the holidays.
diff --git a/album/some-other-horizon.yaml b/album/some-other-horizon.yaml
index a2d1d4c9..db30c969 100644
--- a/album/some-other-horizon.yaml
+++ b/album/some-other-horizon.yaml
@@ -81,8 +81,9 @@ Duration: 01:01
 URLs:
 - https://circlejourney.bandcamp.com/track/bee-safe
 Commentary: |-
-    <i>Circlejourney:</i>
-    This was also featured on the album Bee-forus: Seatbelt Safebee by unofficialmspafans.
+    <i>Circlejourney:</i> ([Bandcamp about blurb](https://circlejourney.bandcamp.com/track/bee-safe))
+
+    This was also featured on the album [[album:bee-forus-seatbelt-safebee|Bee-forus: Seatbelt Safebee]] by unofficialmspafans.
 ---
 Track: Saturday Nights at the HQ
 Referenced Tracks:
@@ -91,13 +92,19 @@ Duration: 01:55
 URLs:
 - https://circlejourney.bandcamp.com/track/saturday-nights-at-the-hq
 Commentary: |-
-    <i>Circlejourney:</i>
-    Inspired by this comic:  [three-legged-cow.tumblr.com/post/148266429288](https://bradbradleyart.tumblr.com/post/148266429288/finally-been-playin-overwatch-so-heres-some)
+    <i>Circlejourney:</i> ([Bandcamp about blurb](https://circlejourney.bandcamp.com/track/saturday-nights-at-the-hq))
+
+    Inspired by this comic: [three-legged-cow.tumblr.com/post/148266429288](https://bradbradleyart.tumblr.com/post/148266429288/finally-been-playin-overwatch-so-heres-some)
 ---
 Track: Memorialisation
+Additional Names:
+- Name: >-
+    Memorialisation (ft. Magnoliajades)
+  Annotation: >-
+    [Bandcamp](https://circlejourney.bandcamp.com/track/memorialisation-ft-magnoliajades)
 Artists:
 - Circlejourney
-- magnoliajades
+- magnoliajades (featuring)
 Duration: 03:33
 Cover Artists:
 - Circlejourney
@@ -163,7 +170,8 @@ Lyrics: |-
     And you can't watch me
     Destroy this memorial today.
 Commentary: |-
-    <i>Circlejourney:</i>
+    <i>Circlejourney:</i> ([Bandcamp about blurb](https://circlejourney.bandcamp.com/track/memorialisation-ft-magnoliajades))
+
     Maggie's art/personal blog can be found at [magnoliajades.tumblr.com](https://magnoliajades.tumblr.com/)!
 ---
 Section: Bonus tracks
diff --git a/album/summer-by-the-sea.yaml b/album/summer-by-the-sea.yaml
index b6f1f8c7..7b6213ff 100644
--- a/album/summer-by-the-sea.yaml
+++ b/album/summer-by-the-sea.yaml
@@ -56,5 +56,6 @@ Lyrics: |-
     In a summer (fantasy)
     Come float away with me
 Commentary: |-
-    <i>Circlejourney:</i> (SoundCloud commentary)
+    <i>Circlejourney:</i> ([SoundCloud description](https://soundcloud.com/circlejourney/summer-by-the-sea), excerpt)
+
     I think of this as Pala's theme song. Nostalgic and summery the way her design and story always felt to me.
diff --git a/album/the-changing-light.yaml b/album/the-changing-light.yaml
index 78818bf1..a0e8d9e4 100644
--- a/album/the-changing-light.yaml
+++ b/album/the-changing-light.yaml
@@ -23,7 +23,8 @@ Groups:
 - Circlejourney
 - Beyond
 Commentary: |-
-    <i>Circlejourney:</i>
+    <i>Circlejourney:</i> ([Bandcamp about blurb](https://circlejourney.bandcamp.com/album/the-changing-light))
+
     So this is a bit different. About half a year ago, I was made aware of the existence of concept albums. The idea seemed incredibly cool, so I figured I would try making one for my next album...or, well, EP.
 
     It was an organic process, fuelled by the act of living in itself (which is more inspiring than I gave it credit for). There are some songs that could have been on this album but aren't.
diff --git a/album/the-gap.yaml b/album/the-gap.yaml
index 2d9f4196..fb536c1c 100644
--- a/album/the-gap.yaml
+++ b/album/the-gap.yaml
@@ -1,4 +1,5 @@
 Album: the gap
+Style: single
 Date: November 19, 2021
 Date Added: April 13, 2024
 URLs:
@@ -20,34 +21,11 @@ Color: '#4CC235'
 Groups:
 - horizon
 - Beyond
-Commentary: |-
-    <i>horizon:</i> ([Bandcamp about blurb](https://ohanadyomene.bandcamp.com/track/the-gap))
-
-    ( )
-
-    <i>horizon:</i> ([YouTube description](https://www.youtube.com/watch?v=NWP8cMreYNM), excerpt)
-
-    "There must be blood, the girl thought. There must always be blood. The Green Wind said that, so it must be true. It will all be hard and bloody, but there will be wonders, too, or else why bring me here at all? And it’s the wonders I’m after, even if I have to bleed for them."
-
-    -- from The Girl Who Circumnavigated Fairyland in a Ship of Her Own Making, a novel in a series by Catherynne M. Valente
-
-    ✼ 　 ҉ 　✼ 　 ҉ 　✼
-
-    months in the making, i have finally created something i am happy to share -- something that feels like it's saying what i want to say. it's struggling to raise its voice but doing so anyway.
-
-    the quote above is from my absolute favorite author in the world, and there's a vague reference to the novel quoted at the end of this song. if you're feeling lost in this big, terrifying world, i highly recommend her writing. i would never have made it this far without the worlds she's created, and whatever comes of this is thanks to you, her, and so many other wonderful, creative people.
-
-    that being said, the dedication here lies elsewhere -- in the name. or lack thereof? but that means it's for you anyway. so enjoy :)
-
-    (also the person speaking at the end is tripp i stole it from a dnd recording shhhhh don't tell him)
 ---
 Track: the gap
 Duration: 4:28
 Contributors:
 - Trippcaptor (end vocals)
-URLs:
-- https://ohanadyomene.bandcamp.com/track/the-gap
-- https://youtu.be/NWP8cMreYNM
 Lyrics: |-
     Not a word i could say
     Not a breath i could take
@@ -120,6 +98,26 @@ Lyrics: |-
     Changing times till the
     Universe learns to sing with me
 Commentary: |-
+    <i>horizon:</i> ([Bandcamp about blurb](https://ohanadyomene.bandcamp.com/track/the-gap))
+
+    ( )
+
+    <i>horizon:</i> ([YouTube description](https://www.youtube.com/watch?v=NWP8cMreYNM), excerpt)
+
+    "There must be blood, the girl thought. There must always be blood. The Green Wind said that, so it must be true. It will all be hard and bloody, but there will be wonders, too, or else why bring me here at all? And it’s the wonders I’m after, even if I have to bleed for them."
+
+    -- from The Girl Who Circumnavigated Fairyland in a Ship of Her Own Making, a novel in a series by Catherynne M. Valente
+
+    ✼ 　 ҉ 　✼ 　 ҉ 　✼
+
+    months in the making, i have finally created something i am happy to share -- something that feels like it's saying what i want to say. it's struggling to raise its voice but doing so anyway.
+
+    the quote above is from my absolute favorite author in the world, and there's a vague reference to the novel quoted at the end of this song. if you're feeling lost in this big, terrifying world, i highly recommend her writing. i would never have made it this far without the worlds she's created, and whatever comes of this is thanks to you, her, and so many other wonderful, creative people.
+
+    that being said, the dedication here lies elsewhere -- in the name. or lack thereof? but that means it's for you anyway. so enjoy :)
+
+    (also the person speaking at the end is tripp i stole it from a dnd recording shhhhh don't tell him)
+Crediting Sources: |-
     <i>horizon:</i> ([Bandcamp credits blurb](https://ohanadyomene.bandcamp.com/track/the-gap))
 
     lyrics, composition, production, etc: [[artist:horizon|OPHELIA ANADYOMENE]]<br>
diff --git a/album/the-sky-beyond-our-bay.yaml b/album/the-sky-beyond-our-bay.yaml
index 2deaff94..61c0aeef 100644
--- a/album/the-sky-beyond-our-bay.yaml
+++ b/album/the-sky-beyond-our-bay.yaml
@@ -20,7 +20,8 @@ Groups:
 - Circlejourney
 - Beyond
 Commentary: |-
-    <i>Circlejourney:</i>
+    <i>Circlejourney:</i> ([Bandcamp about blurb](https://circlejourney.bandcamp.com/album/the-sky-beyond-our-bay))
+
     "You make me feel like I'm flying." An album themed around my latest novel project, [Offshore](https://circlejourney.net/offshore/), a concept album themed around the sailing duo at the heart of the story, and the the struggles and highs of their lives.
 ---
 Section: Main album
diff --git a/album/the-sky-is-ours.yaml b/album/the-sky-is-ours.yaml
index 701cf2e0..dbed24b4 100644
--- a/album/the-sky-is-ours.yaml
+++ b/album/the-sky-is-ours.yaml
@@ -25,7 +25,8 @@ Additional Files:
   Files:
   - bg.jpg
 Commentary: |-
-    <i>Circlejourney:</i>
+    <i>Circlejourney:</i> ([Bandcamp about blurb](https://circlejourney.bandcamp.com/album/the-sky-is-ours))
+
     2020 has been a year of discovery and recovery. I hope this album captures the way it has felt for me.
 ---
 Section: Main album
diff --git a/album/time-and-tide.yaml b/album/time-and-tide.yaml
index 39864ed9..d2cd5c08 100644
--- a/album/time-and-tide.yaml
+++ b/album/time-and-tide.yaml
@@ -28,10 +28,12 @@ Groups:
 - Circlejourney
 - Beyond
 Commentary: |-
-    <i>Circlejourney:</i>
+    <i>Circlejourney:</i> ([Bandcamp about blurb](https://circlejourney.bandcamp.com/album/time-and-tide))
+
     An album one year in the making.
 
     <i>Circlejourney:</i> (booklet commentary)
+
     TO THE PERSON READING THIS,
 
     Thank you for listening to Time and Tide! (If you’ve somehow come upon this booklet by itself, here’s a link to the album.)
@@ -104,12 +106,13 @@ URLs:
 - https://open.spotify.com/track/5e55Gg5rDMqmL1QrxBlbsj
 - https://music.apple.com/album/cosmic-significance/1477359846?i=1477359849
 Commentary: |-
-    <i>Circlejourney:</i>
-    This track was also released on the Vast Error fan album, [[album:vast-error-vol-3]].
+    <i>Circlejourney:</i> ([Bandcamp about blurb](https://circlejourney.bandcamp.com/track/cosmic-significance), excerpt)
 
-    [Vast Error](https://www.deconreconstruction.com/vasterror) is a webcomic by [[artist:austinado|Austinado]] and [[artist:sparaze|Sparaze]] that can be read here:  [mspfa.com?s=2302](https://mspfa.com/?s=2302)
+    This track was also released on the Vast Error fan album, [[album:vast-error-vol-3]].
+    [Vast Error](https://www.deconreconstruction.com/vasterror) is a webcomic by [[artist:austinado|Austinado]] and [[artist:sparaze|Sparaze]] that can be read here: [mspfa.com?s=2302](https://mspfa.com/?s=2302)
 
     <i>Circlejourney:</i> (booklet commentary)
+
     I wear my Celtic Woman influence on my sleeve. The solo violin on harp/string ensemble gradually joined by drums, the frequent borrowing from Dorian mode...yeah, that’s Celtic Woman-style, alright.
 
     To understand what the track is really about, you have to read Austinado and Sparaze’s comic, Vast Error. It’s good, I highly recommend it. In summary, this track is about the players of the game looking on at their universe-changing destiny, which has existed eons longer than they have, and wondering how they will contend with it.
@@ -204,10 +207,12 @@ URLs:
 - https://open.spotify.com/track/1sAaZUelC1rhcADnCtDUSV
 - https://music.apple.com/album/chariot/1477359846?i=1477359852
 Commentary: |-
-    <i>Circlejourney:</i>
+    <i>Circlejourney:</i> ([Bandcamp about blurb](https://circlejourney.bandcamp.com/track/chariot))
+
     This track will be released on a [[album:solar-sessions|future Handshake Collaborations album]].
 
     <i>Circlejourney:</i> (booklet commentary)
+
     Speaking of Celtic-inspired new age music…
 
     Chariot is about the sun. The title references the god Helios, and the track itself is a riff on the structure and style of [Reel Around the Sun](https://youtu.be/HHNZuj6U8jo), one of my favourite works of music, with a spacey touch introduced by the glitching.
@@ -272,10 +277,11 @@ URLs:
 - https://open.spotify.com/track/405ULaWeoi2PDBglOTbfXc
 - https://music.apple.com/album/emptiness/1477359846?i=1477359855
 Commentary: |-
-    <i>Circlejourney:</i>
+    <i>Circlejourney:</i> ([Bandcamp about blurb](https://circlejourney.bandcamp.com/track/emptiness))
+
     This track was also released on [INHOSPITABLE Volume 1: Consciousness](https://web.archive.org/web/20201114054951/https://inhospitable.bandcamp.com/album/inhospitable-volume-1)
 
-    INHOSPITABLE is a webcomic by [[artist:tempest2k|Roxanne Heikens]] that can be read at  [inhospitablecomic.mspfa.com](https://mspfa.com/?s=18681&p=1).
+    INHOSPITABLE is a webcomic by [[artist:tempest2k|Roxanne Heikens]] that can be read at [inhospitablecomic.mspfa.com](https://mspfa.com/?s=18681&p=1).
 
     <i>Circlejourney:</i> (booklet commentary)
     This track was part of a music compilation for INHOSPITABLE, a comic by my friend Roxe. It’s a image-rich, dialogue-light story, and you’ll come to notice the eerie greyscale static and the silence that characterise a great part of the webcomic.
@@ -346,9 +352,14 @@ Commentary: |-
 Track: Shipwreck
 Suffix Directory: true
 Always Reference By Directory: true
+Additional Names:
+- Name: >-
+    Shipwreck (ft. SerialSymphony)
+  Annotation: >-
+    [Bandcamp](https://circlejourney.bandcamp.com/track/shipwreck-ft-serialsymphony)
 Artists:
 - Circlejourney
-- SerialSymphony
+- SerialSymphony (featuring)
 Duration: 04:47
 URLs:
 - https://circlejourney.bandcamp.com/track/shipwreck-ft-serialsymphony
diff --git a/album/whats-soon-to-be-lost.yaml b/album/whats-soon-to-be-lost.yaml
index 25598b18..170efa4b 100644
--- a/album/whats-soon-to-be-lost.yaml
+++ b/album/whats-soon-to-be-lost.yaml
@@ -15,7 +15,7 @@ Groups:
 - Circlejourney
 - Beyond
 Commentary: |-
-    <i>Circlejourney:</i> ([Twitter commentary](https://twitter.com/circlejourney/status/1645799436084461578))
+    <i>Circlejourney:</i> ([Twitter](https://twitter.com/circlejourney/status/1645799436084461578))
     What's Soon To Be Lost 🌅 a mini compilation of some of my favourite past commission work (with an electronic flavour). Featuring music made for @yuzusprout and @asteriddled!
     Album preview video: https://twitter.com/circlejourney/status/1645799436084461578
 ---
@@ -26,7 +26,7 @@ URLs:
 - https://open.spotify.com/track/5ZxXrUexozgulTXBKV9o0u
 - https://music.apple.com/album/neither-here-nor-there/1681414293?i=1681414294
 Commentary: |-
-    <i>Circlejourney:</i> ([Twitter commentary](https://twitter.com/circlejourney/status/1491599177721081858))
+    <i>Circlejourney:</i> ([Twitter](https://twitter.com/circlejourney/status/1491599177721081858))
     OH I never posted this! It's a commission for @yuzusprout for their character Miyu and it continues to be one of my fave commissions I've done.  Had so much fun exploring synths and effects and pushed my skills a bunch with this one. Enjoy!
 ---
 Track: Seeking
@@ -39,7 +39,7 @@ URLs:
 - https://music.apple.com/album/seeking/1681414293?i=1681414295
 - https://soundcloud.com/circlejourney-comms/seeking-commission-for-yuzusprout
 Commentary: |-
-    <i>Circlejourney:</i> ([Twitter commentary](https://twitter.com/circlejourney/status/1398818616615735298))
+    <i>Circlejourney:</i> ([Twitter](https://twitter.com/circlejourney/status/1398818616615735298))
     It's not always I'm commissioned to make something 4 minutes long with >7 instruments, but this track for @yuzusprout's characters Miyu and Eden was a pleasure to work on and I'm excited about how it came out!
 ---
 Track: Nightmarish Dreamweaver
diff --git a/album/wherever-you-were.yaml b/album/wherever-you-were.yaml
index 7796c30f..14a27e99 100644
--- a/album/wherever-you-were.yaml
+++ b/album/wherever-you-were.yaml
@@ -1,4 +1,5 @@
 Album: Wherever You Were
+Style: single
 Artists:
 - Circlejourney
 Date: August 8, 2023
@@ -14,71 +15,6 @@ Color: '#EEB9FD'
 Groups:
 - Circlejourney
 - Beyond
-Commentary: |-
-    <i>Circlejourney:</i>
-    ☁️🌊 the sky and the sea try for centuries to reach each other.
-
-    This is a character song for Marin and Cielo, the leads of my webcomic [Compass](https://compass.circlejourney.net). Many thanks to Céleste for lending her vocal talents to the song and taking on Marin's part so wonderfully 💙 Check out her music and other works at: https://pinkie.horse
-
-    <i>Circlejourney:</i> (Tumblr commentary)
-    I'm proud to share Wherever You Were, a song about Marin and Cielo from my webcomic [Compass](https://compass.circlejourney.net)! The sea and the sky, gazing at each other since the start of time, yet unable to reach each other.
-
-    My friend @irlpinkiepie sang Marin's part, I couldn't be happier that we got to collaborate. Check out her music and other works [here](https://pinkie.horse)!
-
-    OK so. I typed up a big ramble about the process of making this song, which was more complicated than almost anything else I’ve ever done - gonna tack it on here, in case that interests anyone…
-
-    <b>THE SONGWRITING BIT</b>
-
-    I didn’t know what this song would become when I started it. It was just a piano doodle that eventually became the 8-bar refrain in the intro. Almost off the bat, though, I began to feel like it was showing my Vienna Teng + 2010s Broadway influence - you can really hear the [Stray Italian Greyhound](https://youtu.be/BBbVUPf6NOw) and [Harbor](https://youtu.be/ss7aFUbwzec) in it, with a side of…something else, maybe [A Thousand Miles](https://youtu.be/Cwkej79U3ek)?
-
-    It became apparent that the instrumental was missing a melody, so I also started to draft one by humming (it’s how I do it on most of my music now). The first line <i>“All my life / I’ve sought a safer seashore”</i> emerged pretty quickly.
-
-    With the melody + rhythm that was forming, I wanted an AABBA rhyme scheme starting with this line - like a limerick, but with the last few lines way more clipped. <i>“And felt like I wanted something more / Than to watch the days go by / What am I / Waiting here for?”</i> These got written quite effortlessly as well.
-
-    I really liked the play on expectations with <i>“What am I… / waiting here for?”</i> earlier, so I echoed that structure in the second half, with <i>“Going where… / ever you were.”</i>
-
-    * Second half of the chorus is my favourite part of this whole song btw. One of my favourite set of rhymes that I’ve ever written.
-
-    Up till this point, I wasn’t sure what the song was about, other than dreaming of travelling on the ocean. I actually thought it would turn into an Offshore song at first. But as it went, the second half of the chorus mentioned the POV character sailing in search of something, and I went…that doesn’t make sense, why are they waiting on the shore in the first half, and then sailing in the second half. What if it were two characters…wait that’s just <i>Compass</i>?
-
-    Once I knew it was about Marin and Cielo, I distinguished the voices: Cielo’s part would have the “soaring” notes and Marin’s would be an octave below. I also threw in the melodic quote from [[track:coastal-dreaming]] (which is very near and dear to me). After the chorus I pulled my favourite key change (tonic major to submediant major) and then, moved into the verse.
-
-    I have to confess: the first 2.5 lines actually wholesale quote a less-known Homestuck fan track I made, appropriately titled [[track:on-an-island-far-away]]. Doubly appropriate because the Compass comic has a few Homestuck references, too.
-
-    At this point, most of my lyrical and musical choices were trying to convey a sentiment of, to quote the venerable Ms Jepsen, “before you came into my life, I missed you so bad.” I’ve always been fascinated with the idea of longing for, or missing, something you have never known, or a sense of déjà vu, which Compass is also very much about. Quoting my older music that I haven’t listened to in a while was a personal indulgence of that feeling.
-
-    Following on that, I did a mirrory thing again with this verse’s lyrics:
-
-    * <i>“What is forecast”</i> <=> <i>“What’s this memory”</i>
-    * <i>“What is glowing out at sea”</i> <=> <i>“What is gazing from the shore”</i>
-    * <i>“Voice from the past / My future bliss”</i> <=> <i>“Voice from a dream / A truth I miss”</i>
-    * Combining the rhymes of these two halves with <i>“For me”</i> (“for” rhymes with “shore”, “me” rhymes with “sea”)
-    * I was going for the visual of Marin and Cielo looking longingly out at the shore / the sea, but not quite sure what they’re longing for?
-
-    This verse actually also gestures to the Coastal Dreaming lyrics I had in my head for years, though I never wrote them down: <i>“for I am sailing between our worlds / you are the light waiting on the shore for me / you are the sky spreading out its endless wings / and I’m the sea // for I am sailing, alone on the tide / you are the bells of the port, ringing for me / you are my journey, and every story / is a dream I dream”</i>
-
-    I wrote the bridge with the AABBA rhyme scheme, and the line “I will bend… …time to find you” to once again echo that structure I mentioned farther up. All of this lyric stuff happened almost effortlessly, I didn’t have to think too hard about the rhymes, they were just always right there. Which never happens. Wild.
-    
-    <b>THE PERFORMANCE/PRODUCTION BIT</b>
-
-    I sang both parts in the demo, but I found that I couldn’t reliably hit the B2 in Marin’s part. I didn’t like the way it sounded with my voice, so I began to consider collaborators. I thought of @ irlpinkiepie first because she’s read <i>Compass</i> and also has known my music for a long time. I had heard her singing once (incidentally the song in question was appropriate to making the connection too) - anyway if you’re reading this post rn, thank you so so much for agreeing to collab. You absolutely killed it and I was so pleased hearing those harmonies for the first time.
-
-    Something about having different vocalists for different characters <i>really</i> cements it as a character song, and for that reason I was happy I got to do Cielo’s part (he’s one of my all time OC faves), and as an actual duet instead of harmonising with myself as usual.
-
-    Pinkie’s part was recorded with a webcam mic, which meant certain frequencies had to be “unearthed” from the audio while others (e.g. certain resonant frequencies) had to be punched out (literally, I used very narrow EQ bands to poke out certain frequencies).
-    <img src="media/misc/frequency1.png" width="299" length="96">
-    <img src="media/misc/frequency2.png" width="299" length="96">
-
-    (Yeah, two instances of Parametric EQ, because there were just not enough knobs for everything I wanted to do)
-
-    I’m actually really really happy with how much I was able to match it up with my recording, despite taking it in a dead-end direction for half a day (and having to start over from an older version of the project). The effect stack is #MusicCrimes though:
-    <img src="media/misc/musiccrimes.jpg" width="294" length="295">
-
-    Having the vocal parts slightly stereo panned also made way for me to make a visualiser video with Marin and Cielo on the correct side of the screen. So, this does bring up the small issue that I’m losing hearing in my right ear, meaning I was constantly flipping the left/right channels as I worked on it, and till now I still second guess whether the audio is properly balanced…another quirk of the production making its way into the song’s final form, I guess.
-
-    In the course of putting the track together, I also made an a capella version for fun. It’s not as refined (I tuned down the instrumental to match the slightly off-key singing lol), but I was going for the rough choral feel, so it probably works. But it’s a bit weird playing the OG song and this version one after another, because of the slight detune.
-
-    Aaaand that’s become a 1000 word essay. Circlejourney OUT
 ---
 Track: Wherever You Were
 Duration: 04:07
@@ -87,10 +23,6 @@ Contributors:
 Referenced Tracks:
 - Coastal Dreaming
 - track:on-an-island-far-away
-URLs:
-- https://youtu.be/12-X6UEjOHw
-- https://open.spotify.com/track/3Y0zkZaKqe7MePjCufjjh8
-- https://music.apple.com/album/wherever-you-were/1701757446?i=1701757447
 Lyrics: |-
     All my life
     I've sought a safer seashore
@@ -152,6 +84,76 @@ Lyrics: |-
     Asking strangers (That I forgot)
     If you're there, going where
     Ever you were
+Commentary: |-
+    <i>Circlejourney:</i> ([YouTube description](https://www.youtube.com/watch?v=12-X6UEjOHw))
+
+    ☁️🌊 the sky and the sea try for centuries to reach each other.
+
+    This is a character song for Marin and Cielo, the leads of my webcomic [Compass](https://compass.circlejourney.net). Many thanks to Céleste for lending her vocal talents to the song and taking on Marin's part so wonderfully 💙 Check out her music and other works at: [https://pinkie.horse](https://pinkie.horse)
+
+    <i>Circlejourney:</i> ([Tumblr](https://www.tumblr.com/circlejourneyart/725136361140699137/light-by-light-line-by-line-chart-sight-by))
+
+    I'm proud to share Wherever You Were, a song about Marin and Cielo from my webcomic [Compass](https://compass.circlejourney.net)! The sea and the sky, gazing at each other since the start of time, yet unable to reach each other.
+
+    My friend @irlpinkiepie sang Marin's part, I couldn't be happier that we got to collaborate. Check out her music and other works [here](https://pinkie.horse)!
+
+    <i>Circlejourney:</i> ([Tumblr](https://www.tumblr.com/circlejourney/725189243717238784/the-songwriting-bit), 8/9/2023)
+
+    OK so. I typed up a big ramble about the process of making this song, which was more complicated than almost anything else I’ve ever done - gonna tack it on here, in case that interests anyone…
+
+    <b>THE SONGWRITING BIT</b>
+
+    I didn’t know what this song would become when I started it. It was just a piano doodle that eventually became the 8-bar refrain in the intro. Almost off the bat, though, I began to feel like it was showing my Vienna Teng + 2010s Broadway influence - you can really hear the [Stray Italian Greyhound](https://youtu.be/BBbVUPf6NOw) and [Harbor](https://youtu.be/ss7aFUbwzec) in it, with a side of…something else, maybe [A Thousand Miles](https://youtu.be/Cwkej79U3ek)?
+
+    It became apparent that the instrumental was missing a melody, so I also started to draft one by humming (it’s how I do it on most of my music now). The first line <i>“All my life / I’ve sought a safer seashore”</i> emerged pretty quickly.
+
+    With the melody + rhythm that was forming, I wanted an AABBA rhyme scheme starting with this line - like a limerick, but with the last few lines way more clipped. <i>“And felt like I wanted something more / Than to watch the days go by / What am I / Waiting here for?”</i> These got written quite effortlessly as well.
+
+    I really liked the play on expectations with <i>“What am I… / waiting here for?”</i> earlier, so I echoed that structure in the second half, with <i>“Going where… / ever you were.”</i>
+
+    - Second half of the chorus is my favourite part of this whole song btw. One of my favourite set of rhymes that I’ve ever written.
+
+    Up till this point, I wasn’t sure what the song was about, other than dreaming of travelling on the ocean. I actually thought it would turn into an Offshore song at first. But as it went, the second half of the chorus mentioned the POV character sailing in search of something, and I went…that doesn’t make sense, why are they waiting on the shore in the first half, and then sailing in the second half. What if it were two characters…wait that’s just <i>Compass</i>?
+
+    Once I knew it was about Marin and Cielo, I distinguished the voices: Cielo’s part would have the “soaring” notes and Marin’s would be an octave below. I also threw in the melodic quote from [[track:coastal-dreaming]] (which is very near and dear to me). After the chorus I pulled my favourite key change (tonic major to submediant major) and then, moved into the verse.
+
+    I have to confess: the first 2.5 lines actually wholesale quote a less-known Homestuck fan track I made, appropriately titled [[track:on-an-island-far-away]]. Doubly appropriate because the Compass comic has a few Homestuck references, too.
+
+    At this point, most of my lyrical and musical choices were trying to convey a sentiment of, to quote the venerable Ms Jepsen, “before you came into my life, I missed you so bad.” I’ve always been fascinated with the idea of longing for, or missing, something you have never known, or a sense of déjà vu, which Compass is also very much about. Quoting my older music that I haven’t listened to in a while was a personal indulgence of that feeling.
+
+    Following on that, I did a mirrory thing again with this verse’s lyrics:
+
+    - <i>“What is forecast”</i> <=> <i>“What’s this memory”</i>
+    - <i>“What is glowing out at sea”</i> <=> <i>“What is gazing from the shore”</i>
+    - <i>“Voice from the past / My future bliss”</i> <=> <i>“Voice from a dream / A truth I miss”</i>
+    - Combining the rhymes of these two halves with <i>“For me”</i> (“for” rhymes with “shore”, “me” rhymes with “sea”)
+    - I was going for the visual of Marin and Cielo looking longingly out at the shore / the sea, but not quite sure what they’re longing for?
+
+    This verse actually also gestures to the Coastal Dreaming lyrics I had in my head for years, though I never wrote them down: <i>“for I am sailing between our worlds / you are the light waiting on the shore for me / you are the sky spreading out its endless wings / and I’m the sea // for I am sailing, alone on the tide / you are the bells of the port, ringing for me / you are my journey, and every story / is a dream I dream”</i>
+
+    I wrote the bridge with the AABBA rhyme scheme, and the line “I will bend… …time to find you” to once again echo that structure I mentioned farther up. All of this lyric stuff happened almost effortlessly, I didn’t have to think too hard about the rhymes, they were just always right there. Which never happens. Wild.
+
+    <b>THE PERFORMANCE/PRODUCTION BIT</b>
+
+    I sang both parts in the demo, but I found that I couldn’t reliably hit the B2 in Marin’s part. I didn’t like the way it sounded with my voice, so I began to consider collaborators. I thought of @ irlpinkiepie first because she’s read <i>Compass</i> and also has known my music for a long time. I had heard her singing once (incidentally the song in question was appropriate to making the connection too) - anyway if you’re reading this post rn, thank you so so much for agreeing to collab. You absolutely killed it and I was so pleased hearing those harmonies for the first time.
+
+    Something about having different vocalists for different characters <i>really</i> cements it as a character song, and for that reason I was happy I got to do Cielo’s part (he’s one of my all time OC faves), and as an actual duet instead of harmonising with myself as usual.
+
+    Pinkie’s part was recorded with a webcam mic, which meant certain frequencies had to be “unearthed” from the audio while others (e.g. certain resonant frequencies) had to be punched out (literally, I used very narrow EQ bands to poke out certain frequencies).
+
+    <img src="media/misc/frequency1.png" width="299" length="96">
+    <img src="media/misc/frequency2.png" width="299" length="96">
+
+    (Yeah, two instances of Parametric EQ, because there were just not enough knobs for everything I wanted to do)
+
+    I’m actually really really happy with how much I was able to match it up with my recording, despite taking it in a dead-end direction for half a day (and having to start over from an older version of the project). The effect stack is #MusicCrimes though:
+    <img src="media/misc/musiccrimes.jpg" width="294" length="295">
+
+    Having the vocal parts slightly stereo panned also made way for me to make a visualiser video with Marin and Cielo on the correct side of the screen. So, this does bring up the small issue that I’m losing hearing in my right ear, meaning I was constantly flipping the left/right channels as I worked on it, and till now I still second guess whether the audio is properly balanced…another quirk of the production making its way into the song’s final form, I guess.
+
+    In the course of putting the track together, I also made an a capella version for fun. It’s not as refined (I tuned down the instrumental to match the slightly off-key singing lol), but I was going for the rough choral feel, so it probably works. But it’s a bit weird playing the OG song and this version one after another, because of the slight detune.
+
+    Aaaand that’s become a 1000 word essay. Circlejourney OUT
 ---
 Track: Wherever You Were (Choral)
 Duration: 04:06
diff --git a/album/worlds-await.yaml b/album/worlds-await.yaml
index ddde1cc0..141cac5b 100644
--- a/album/worlds-await.yaml
+++ b/album/worlds-await.yaml
@@ -14,7 +14,8 @@ Groups:
 - Circlejourney
 - Beyond
 Commentary: |-
-    <i>Circlejourney:</i>
+    <i>Circlejourney:</i> ([Bandcamp about blurb](https://circlejourney.bandcamp.com/album/worlds-await))
+
     Music is amazingly compact. It is strange how twelve hours of work could go into a four minute track. It's as if one could hide an entire world within each.
 
     And that's what I feel music is. Hearing a new piece of music is like discovering a new world, feeling its wind and basking in its honey sun.
@@ -35,7 +36,8 @@ Cover Artists:
 URLs:
 - https://circlejourney.bandcamp.com/track/spin
 Commentary: |-
-    <i>Circlejourney:</i>
+    <i>Circlejourney:</i> ([Bandcamp about blurb](https://circlejourney.bandcamp.com/track/spin))
+
     This was composed as a tie-in for my novel project [Revolving Door](https://rd.circlejourney.net/). Through the shifts in style and mood, and the interaction of theme melodies, I try to recreate personalities and relationships of various characters in musical form, telling a multiplicity of stories.
 ---
 Track: Vesper
@@ -49,15 +51,17 @@ Referenced Tracks:
 URLs:
 - https://circlejourney.bandcamp.com/track/vesper
 Commentary: |-
-    <i>Circlejourney:</i>
-    An extension of the fourth theme featured in Spin, belonging to the character Vesper, a soldier who has devoted her life to service and whose leaderly drive is rivalled only by her loyalty.
+    <i>Circlejourney:</i> ([Bandcamp about blurb](https://circlejourney.bandcamp.com/track/vesper))
+
+    An extension of the fourth theme featured in [[track:spin-worlds-await|Spin]], belonging to the character Vesper, a soldier who has devoted her life to service and whose leaderly drive is rivalled only by her loyalty.
 ---
 Track: Time Corridors
 Duration: 01:25
 URLs:
 - https://circlejourney.bandcamp.com/track/time-corridors
 Commentary: |-
-    <i>Circlejourney:</i>
+    <i>Circlejourney:</i> ([Bandcamp about blurb](https://circlejourney.bandcamp.com/track/time-corridors))
+
     A maze that leads through past and future. A chase by a nameless entity yet to exist.
 ---
 Track: Guiding Light
@@ -67,7 +71,8 @@ Cover Artists:
 URLs:
 - https://circlejourney.bandcamp.com/track/guiding-light
 Commentary: |-
-    <i>Circlejourney:</i>
+    <i>Circlejourney:</i> ([Bandcamp about blurb](https://circlejourney.bandcamp.com/track/guiding-light))
+
     Another tie-in for [Revolving Door](https://rd.circlejourney.net/), this time relating to a chapter of the same title. A girl has just been saved from prison by a young man she does not know (and a rather well-dressed one, at that), and he is taking her to see the city she has not laid eyes on for years.
 ---
 Track: MIDNIGHT BLACK
@@ -75,7 +80,8 @@ Duration: 03:26
 URLs:
 - https://circlejourney.bandcamp.com/track/midnight-black
 Commentary: |-
-    <i>Circlejourney:</i>
+    <i>Circlejourney:</i> ([Bandcamp about blurb](https://circlejourney.bandcamp.com/track/midnight-black))
+
     I relate this piece to a certain black-haired Mage in Of the Dragon, of the Stars.
 ---
 Track: Frost and Clockwork
@@ -85,7 +91,8 @@ Cover Artists:
 URLs:
 - https://circlejourney.bandcamp.com/track/frost-and-clockwork
 Commentary: |-
-    <i>Circlejourney:</i>
+    <i>Circlejourney:</i> ([Bandcamp about blurb](https://circlejourney.bandcamp.com/track/frost-and-clockwork))
+
     My tribute to the webcomic Homestuck, which changed me in the best way. The melody came to me while I was reading, and the title is a reference to the names of two characters' planets.
 ---
 Track: Over the Hills
@@ -93,7 +100,8 @@ Duration: 01:22
 URLs:
 - https://circlejourney.bandcamp.com/track/over-the-hills
 Commentary: |-
-    <i>Circlejourney:</i>
+    <i>Circlejourney:</i> ([Bandcamp about blurb](https://circlejourney.bandcamp.com/track/over-the-hills))
+
     A circling dance, a ritual fire, a folk tune sung to drums and wine. Somewhere over the hills.
 ---
 Track: Thousand Tribes River
@@ -101,7 +109,8 @@ Duration: 01:12
 URLs:
 - https://circlejourney.bandcamp.com/track/thousand-tribes-river
 Commentary: |-
-    <i>Circlejourney:</i>
+    <i>Circlejourney:</i> ([Bandcamp about blurb](https://circlejourney.bandcamp.com/track/thousand-tribes-river))
+
     Commissioned and titled by my friend Felicia Prasaja Natasha for a trailer project she was working on.
 ---
 Track: 'Ruins: Crumbled Staircase'
@@ -109,7 +118,8 @@ Duration: 00:37
 URLs:
 - https://circlejourney.bandcamp.com/track/ruins-crumbled-staircase
 Commentary: |-
-    <i>Circlejourney:</i>
+    <i>Circlejourney:</i> ([Bandcamp about blurb](https://circlejourney.bandcamp.com/track/ruins-crumbled-staircase))
+
     Commissioned and titled by my friend Felicia Prasaja Natasha for a trailer project she was working on.
 ---
 Track: Marketplaces
@@ -119,7 +129,8 @@ Duration: 01:25
 URLs:
 - https://circlejourney.bandcamp.com/track/marketplaces
 Commentary: |-
-    <i>Circlejourney:</i>
+    <i>Circlejourney:</i> ([Bandcamp about blurb](https://circlejourney.bandcamp.com/track/marketplaces))
+
     Composed as background music for my visual novel [Compass](https://compass.circlejourney.net/). Travellers seeking strange wares at a faraway coastal marketplace.
 ---
 Track: Common Test 2
@@ -127,7 +138,8 @@ Duration: 01:16
 URLs:
 - https://circlejourney.bandcamp.com/track/common-test-2
 Commentary: |-
-    <i>Circlejourney:</i>
+    <i>Circlejourney:</i> ([Bandcamp about blurb](https://circlejourney.bandcamp.com/track/common-test-2))
+
     The repeating piano motif features my 2012 CT2 grades.
 ---
 Track: "'A' Levels"
@@ -135,7 +147,8 @@ Duration: 01:43
 URLs:
 - https://circlejourney.bandcamp.com/track/a-levels
 Commentary: |-
-    <i>Circlejourney:</i>
+    <i>Circlejourney:</i> ([Bandcamp about blurb](https://circlejourney.bandcamp.com/track/a-levels))
+
     The repeating piano motif features my 'A' levels grades.
 ---
 Track: Of the Morning
@@ -143,7 +156,8 @@ Duration: 03:28
 URLs:
 - https://circlejourney.bandcamp.com/track/of-the-morning
 Commentary: |-
-    <i>Circlejourney:</i>
+    <i>Circlejourney:</i> ([Bandcamp about blurb](https://circlejourney.bandcamp.com/track/of-the-morning))
+
     The theme for Zethis, the White Knight in Of the Dragon, of the Stars, evoking the pastel colours of morning.
 ---
 Track: Unsaid
@@ -154,11 +168,9 @@ Cover Artists:
 - Circlejourney
 URLs:
 - https://circlejourney.bandcamp.com/track/unsaid
-Commentary: |-
-    <i>Circlejourney:</i>
-    Written for my a midterm assignment Flash comic. It is the culmination of a story about friends who have grown apart, to the point that they cannot utter a sincere goodbye though one is about to leave the country.
+Lyrics: |-
+    <i>Circlejourney:</i> (artist's lyrics, unused)
 
-    <i>Circlejourney:</i> (unused lyrics)
     So it comes to this, this parody of
     Everything we used to be, my friends
     I'm not hurt, I'm just afraid
@@ -169,3 +181,7 @@ Commentary: |-
     It's kind of sad that the fire will die without a sound
     Now the wheel's turning round
     And all I feel is the pounding of a thousand words unsaid
+Commentary: |-
+    <i>Circlejourney:</i> ([Bandcamp about blurb](https://circlejourney.bandcamp.com/track/unsaid))
+
+    Written for my a midterm assignment Flash comic. It is the culmination of a story about friends who have grown apart, to the point that they cannot utter a sincere goodbye though one is about to leave the country.
diff --git a/artists.yaml b/artists.yaml
index 5e2f6238..b5db37ba 100644
--- a/artists.yaml
+++ b/artists.yaml
@@ -10657,6 +10657,8 @@ URLs:
 - https://twitter.com/peakdivide
 - https://linktr.ee/peakdivide
 ---
+Artist: Peanuts
+---
 Artist: Pendulum
 ---
 Artist: penelope
@@ -14796,6 +14798,8 @@ Dead URLs:
 ---
 Artist: Vince de Vera
 ---
+Artist: Vince Guaraidi
+---
 Artist: Vinks
 URLs:
 - https://marquisespinneretmindfang.tumblr.com/
diff --git a/static-page/changelog.yaml b/static-page/changelog.yaml
index 7e99b4ab..a77dde4c 100644
--- a/static-page/changelog.yaml
+++ b/static-page/changelog.yaml
@@ -164,7 +164,7 @@ Content: |-
     - added SoundCloud commentary to [[track:heir-seer-knight-witch]] (thanks, Lan!)
     - added YouTube commentary to [[track:end-of-act]] (thanks, Lan!)
     - added Tumblr commentary to [[album:comfortable-bugs]] (thanks, Lilith, Lan!)
-    - added Bandcamp crediting sources to [[track:empress]], [[track:army-of-the-wicked-god]], [[album:grim-chain-of-feast]], [[album:war-marks]], [[album:rites-of-bloodgrinded]], [[track:his-honorable-tyranny]], [[album:genesis-genocide]], [[album:faces-of-oglogoth]], and [[album:jugglanoids-from-outer-space]] (thanks, Tangle!)
+    - added Bandcamp crediting sources to [[track:empress]], [[track:army-of-the-wicked-god]], [[album:grim-chain-of-feast]], [[album:war-marks]], [[album:rites-of-bloodgrinded]], [[track:his-honorable-tyranny]], [[album:genesis-genocide]], [[album:faces-of-oglogoth]], [[track:im-a-member-of-the-midnight-crew-soapstone]], and [[album:jugglanoids-from-outer-space]] (thanks, Tangle!)
     <!-- artwork additions -->
     - added full-size artworks to [[track:at-the-price-of-oblivion]], [[track:even-in-death]], [[track:trial-and-execution]], [[track:spider8reath]], [[track:lifdoff]], [[track:havoc-to-be-wrought]], and [[track:earthsea-borealis]] (thanks, Meulanie, Lan!)
     - added higher-res artworks to [[track:maplehoofs-adventure]] and [[track:emerald-terror]] (thanks, Meulanie, Makin, Lan!)
@@ -175,8 +175,12 @@ Content: |-
     <!-- art tag additions -->
     - added character tags: [[tag:ethan-adminstuck]], [[tag:jackson-adminstuck]], [[tag:jane-dave-janestuck]], [[tag:jane-jade-janestuck]], [[tag:jane-john-janestuck]], [[tag:jane-rose-janestuck]], [[tag:jane-roxy-janestuck]], [[tag:jordan-adminstuck]], [[tag:matt-adminstuck]] (thanks, Lan, Lilith!)
     <!-- additional name additions -->
-    - added additional names to tracks: (thanks, Lan!)
-        - [[track:old-world]] and [[track:losing-heart]] (Bandcamp album name)
+    - added additional names to tracks: (thanks, Lan, Jackie!)
+        - [[track:capricious-mistress]] (Bandcamp, YouTube, SoundCloud)
+        - [[track:fuchsia-ruler]] (Bandcamp)
+        - [[track:memorialisation]] and [[track:shipwreck-time-and-tide]] (Bandcamp)
+        - [[track:old-world]] and [[track:losing-heart]] (Bandcamp)
+        - [[track:christmas-time-is-here-lo-fi]] (Bandcamp, Spotify)
     <!-- additional file additions -->
     - added MIDI files by HunZhen to [[track:nightlife-extended]] and [[track:jades-lullaby]] (thanks, HunZhen, Lan!)
     <!-- link additions -->
@@ -188,10 +192,12 @@ Content: |-
     - replaced YouTube listening link for [[track:end-of-act]] with artist's upload (thanks, Lilith, Lan!)
     - replaced YouTube listening link for [[track:danger-on-the-dance-floor-mid-boss]] with official upload (thanks, ruby!)
     <!-- citation additions -->
-    - added citation for YouTube commentary on [[track:the-raddest]] (thanks, Lan!)
-    - added citations for Bandcamp commentary on [[track:another-noir]], [[track:perfectly-generic-object]], [[track:empress]], [[track:candles-potency]], [[track:army-of-the-wicked-god]], [[track:remains-of-formed-pain]], [[album:grim-chain-of-feast]], [[album:demo-2019-2021-vicious-valor]], [[album:war-marks]], [[track:legion]], [[album:rites-of-bloodgrinded]], [[album:genesis-genocide]], [[album:faces-of-oglogoth]], [[album:jugglanoids-from-outer-space]], [[track:stratosphere]], [[track:terra-solatrus]], [[album:endless]], [[album:somnium-remastered]], [[track:vivid-spectrum]], [[track:chilled-processor]], [[track:old-world]], and [[track:losing-heart]] (thanks, Tangle, Lan!)
+    - added citations for YouTube commentary on [[track:the-raddest]] and [[album:if-one-shall-indulge]] (thanks, Lan!)
+    - added citations for Bandcamp commentary on [[track:capricious-mistress]], [[track:fuchsia-ruler-single]], [[track:confinis]], [[track:another-noir]], [[track:perfectly-generic-object]], [[track:empress]], [[track:candles-potency]], [[track:army-of-the-wicked-god]], [[track:remains-of-formed-pain]], [[album:grim-chain-of-feast]], [[album:demo-2019-2021-vicious-valor]], [[album:war-marks]], [[track:legion]], [[album:rites-of-bloodgrinded]], [[album:genesis-genocide]], [[album:faces-of-oglogoth]], [[track:im-a-member-of-the-midnight-crew-soapstone]], [[album:jugglanoids-from-outer-space]], [[album:dreamers-diarchy]], [[track:stratosphere]], [[track:terra-solatrus]], [[album:endless]], [[album:somnium-remastered]], [[album:compass]], [[track:vivid-spectrum]], [[album:worlds-await]], [[album:coastal-dreaming]], [[album:some-other-horizon]], [[track:chilled-processor]], [[album:time-and-tide]], [[album:the-changing-light]], [[track:old-world]], [[track:losing-heart]], [[album:the-sky-is-ours]], [[album:flyways]], and [[album:the-sky-beyond-our-bay]] (thanks, Tangle, Lan!)
+    - added citations for SoundCloud commentary on [[album:cartographer-symphony]] and [[track:summer-by-the-sea]] (thanks, Lan!)
     - added citation for newsletter commentary on [[track:skies-forever-blue]] (thanks, Whisper!)
     - added citation for Fangamer commentary on [[track:the-greatest-living-show]] (thanks, Lan!)
+    - added citation for Tumblr commentary on [[track:wherever-you-were]] (thanks, Lan!)
     - added dates for Tumblr commentary on [[track:crystalmethequins-broken-bad]] and [[track:the-greatest-living-show]] (thanks, Lan!)
     - added date and citation link for Discord commentary on [[track:dave-striders-cool-mixtape]] (thanks, Lan!)
     <h3>data changes</h3>
@@ -209,6 +215,7 @@ Content: |-
         - [[track:wilted-petal]], [[track:burn-bright]], [[track:mind-over-chatter]], [[track:face-the-reaper-time-keeper]], [[track:battle-against-perfection]], and [[track:fundamentals-of-matter]] (placeholder)
     <!-- album overarching presentation -->
     - restructured [[album:ophiuchus-full-suite]] into a two-halves album, representing the full suite as a single track as well as its individual parts (moved from a section in [[album:more-homestuck-fandom]]), with track artwork and revised commentary
+    - restructured [[album:flyways]] similarly as [[album:ophiuchus-full-suite]]
     <!-- album presentational tweaks -->
     - revised [[track:center-of-brilliance]] and [[track:candles-and-clockwork-alpha-version]] to present artwork assets from Bandcamp first, with alternatively sourced higher-res cuts as secondary artworks instead (thanks, Lan, Tangle!)
     - revised color of [[album:seven-seas]] to match newly added cover artwork (thanks, Jebb!)
@@ -266,12 +273,17 @@ Content: |-
     - fixed [[track:trial-truth-pt-2]] not referencing [[track:the-truth-inhibitor]] (Inhibitor; thanks, Lilith!)
     - fixed [[track:ikari-instrumental]] not referencing [[track:ikari]] (vocal version; thanks, Lilith!)
     - fixed [[track:hopes-and-dreams]], [[track:save-the-world]], and [[track:last-goodbye]] not referencing [[track:penumbra-phantasm]] (thanks, ruby, Makin, Jebb, Interrobang, Witch's Cadence, Monckat, Red Rax, Rainy, Meulanie, Jackie, Lan!)
+    - fixed [[track:christmas-time-is-here-lo-fi]] not referencing [[track:christmas-time-is-here-vocal]] (thanks, Lilith, Tangle, Lan!)
     - fixed [[track:radiation-is-now-on-youtube]] referencing [[track:bro-hop]] instead of sampling it (thanks, Lilith, Jackie!)
     - fixed [[track:cobalt-corsair]] artwork not referencing [[track:teal-hunter]] artwork (thanks, Lan!)
     - fixed [[track:old-secret]] artwork ([[album:hiveswap-friendsim]]) not referencing [[album:hiveswap-act-1-ost]] album cover (thanks, Jackie!)
+    - fixed [[track:fuchsia-ruler-single]] (single) artwork not referencing [[track:fuchsia-ruler]] ([[album:coloUrs-and-mayhem-universe-a]]; thanks, Jackie!)
     - added various referencing sources to [[track:dissension-remix]], [[track:white]], [[track:octoroon-rangoon]], [[track:clockwork-sorrow]], [[track:hopes-and-dreams]], [[track:save-the-world]], and [[track:last-goodbye]] (thanks, Lan!)
     <!-- crediting fixes -->
+    - fixed [[track:capricious-mistress]] and [[track:fuchsia-ruler-single]] (single) artworks not crediting [[artist:kezinox]] for 'layout for single' (thanks, Jackie!)
     - fixed [[track:end-of-act]] not crediting [[artist:psithurist]] as part of the choir (thanks, Lan!)
+    - fixed [[track:memorialisation]] crediting [[artist:magnoliajades]] as a standard co-artist rather than a featured artist (thanks, Lan!)
+    - fixed [[track:shipwreck-time-and-tide]] crediting [[artist:serialsymphony]] as a standard co-artist rather than a featured artist (thanks, Lan!)
     - fixed [[track:bad-apple-lovelight]] not crediting [[artist:nomico]] as a featured artist, and not crediting [[artist:harukapakapa]] for lyrics (thanks, Lan!)
     - fixed [[track:never-gonna-give-you-up]] crediting [[artist:stock-aitken-waterman]] as artist and [[artist:rick-astley]] as contributor, instead of the reverse (thanks, Lan!)
     <!-- merged artists -->
@@ -312,7 +324,7 @@ Content: |-
     - fixed misplaced commentary for [[track:ophiuchus-full-suite-lofam5]] ([[album:lofam5]] - was placed on [[track:ophiuchus-full-suite|original release]] instead; thanks, Whisper!)
     - 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:adventurous-ascent-single-version]], and [[track:infinite-cataclysm]] (thanks, Tangle!)
+    - 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 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!)