« get me outta code hell

hsmusic-data - Data files for https://hsmusic.wiki - track, album, artist & flash info, etc
summary refs log tree commit diff
path: root/album
diff options
context:
space:
mode:
Diffstat (limited to 'album')
-rw-r--r--album/coloUrs-and-mayhem-universe-a.yaml4
-rw-r--r--album/coloUrs-and-mayhem-universe-b.yaml29
-rw-r--r--album/lofam2.yaml6
-rw-r--r--album/lofam3.yaml9
-rw-r--r--album/lofam5a2.yaml67
-rw-r--r--album/p-s.yaml2
-rw-r--r--album/rust-apocalypse-anniversary-remaster.yaml14
-rw-r--r--album/rust-apocalypse.yaml7
8 files changed, 105 insertions, 33 deletions
diff --git a/album/coloUrs-and-mayhem-universe-a.yaml b/album/coloUrs-and-mayhem-universe-a.yaml
index 2376de96..08549578 100644
--- a/album/coloUrs-and-mayhem-universe-a.yaml
+++ b/album/coloUrs-and-mayhem-universe-a.yaml
@@ -375,10 +375,12 @@ Commentary: |-
 
     Stay tuned for [[Rust Servant]] commentary on Friday!
 
-    <i>Myotishi:</i> ([DeviantArt](https://www.deviantart.com/myotishi/art/Redglare-217647950), track artist, full size artwork)
+    <i>Myotishi:</i> (full size artwork)
 
     <img src="media/misc/teal-hunter-full.png" width="480" warning="hanging (abstract)">
 
+    <i>Myotishi:</i> (track artist, [DeviantArt](https://www.deviantart.com/myotishi/art/Redglare-217647950), 7/10/2011)
+
     my favorite ancestor
 ---
 Track: Cobalt Corsair
diff --git a/album/coloUrs-and-mayhem-universe-b.yaml b/album/coloUrs-and-mayhem-universe-b.yaml
index 6e53e56e..aa4b7fad 100644
--- a/album/coloUrs-and-mayhem-universe-b.yaml
+++ b/album/coloUrs-and-mayhem-universe-b.yaml
@@ -240,7 +240,7 @@ Commentary: |-
 
     *(Continued in [[track:cyan-beast]])*
 
-    <i>David Ellis:</i> (composer, [Tumblr](https://ducksual.tumblr.com/post/21739915695/cyan-beastblue-atom-commentary), excerpt, 4/24/2012)
+    <i>David Ellis:</i> ([Tumblr](https://ducksual.tumblr.com/post/21739915695/cyan-beastblue-atom-commentary), excerpt, 4/24/2012)
 
     First off, people seem to have been saying a lot of nice stuff about the two tunes I wrote and I’d just like to say thanks!
 
@@ -304,7 +304,7 @@ Commentary: |-
 
     Side note, the working title for 'Cyan Beast' was 'Heir of the Dog'. Which is probably worse.
 
-    <i>David Ellis:</i> (composer, [Tumblr](https://ducksual.tumblr.com/post/21739915695/cyan-beastblue-atom-commentary), excerpt, 4/24/2012)
+    <i>David Ellis:</i> ([Tumblr](https://ducksual.tumblr.com/post/21739915695/cyan-beastblue-atom-commentary), excerpt, 4/24/2012)
 
     *(Continued from [[track:blue-atom]])*
 
@@ -759,13 +759,13 @@ Commentary: |-
 
     <img src="media/misc/coloUrs-and-mayhem-universe-b-music-of-asia.png" width="322">
 
-    <i>Twirlin' Curtis:</i> (composer, [Twitter](https://x.com/TwirlinCurtis/status/1779219653723611218), 4/13/2024)
+    <i>Twirlin' Curtis:</i> ([Twitter](https://x.com/TwirlinCurtis/status/1779219653723611218), 4/13/2024)
 
     > What!?!??! Me and my homestuck buddies had you blasting on a car stereo!
 
     yea yea yea!!! I used to make chiptune under the name Solarbear!!
 
-    <i>Twirlin' Curtis:</i> (composer, [Twitter](https://x.com/TwirlinCurtis/status/1779569011820204306), 4/14/2024)
+    <i>Twirlin' Curtis:</i> ([Twitter](https://x.com/TwirlinCurtis/status/1779569011820204306), 4/14/2024)
 
     > HOLY SHIT???
 
@@ -829,7 +829,8 @@ MIDI Project Files:
   Files:
   - 'Clockstopper - pixelseph.mid'
 Commentary: |-
-    <i>paradiddlesjosh:</i> ([Newgrounds description](https://www.newgrounds.com/audio/listen/466582))
+    <i>paradiddlesjosh:</i> (co-composer, [Newgrounds description](https://www.newgrounds.com/audio/listen/466582), excerpt)
+
     Here we are, NG. This is the twenty-sixth and final entry of Project 26. A combined 40 hours between me and [[artist:pixelseph]] went into this ending track, between the writing, recording, mixing, remixing and mastering processes (not to mention the software crashes, OH SHIT UNDO actions and other time wasters), but it's finally done.
 
     We consulted a college level textbook on the art of mixing in order to get the soundscape just right for this piece. The result is nothing short of beautiful, in our collective opinion.
@@ -840,12 +841,14 @@ Commentary: |-
 
     This isn't the completely finished product, though. Seph and I are submitting this piece to the Homestuck Music Contest, where it will be featured in the next Homestuck album if it wins (and that means it's now a piece of commercial music). That means, if it's on NG, we're violating our own copyright by having it available for free when it shouldn't be. This file, however, is the unmastered final cut, so it's technically a different file with a different (Creative Commons) license (and you can totally tell because we didn't even bother to chop off the nine seconds of silence at the end). I'll upload the mastered version if we don't win, though. :P
 
-    TIME/TEMPO: 5'55"/127/135/120/16 0/105 BPM (4/4 and 6/4 time)<br>
-    KEY: C Minor<br>
-    ORIGINAL THEMES: [[Beatdown (Strider Style)|"Beatdown (Strider Style)"]] and [[Beatdown Round 2|"Beatdown Round 2"]] by [[artist:curt-blakeslee]], [[Atomyk Ebonpyre|"Atomyk Ebonpyre"]] by [[artist:toby-fox|Toby "Radiation" Fox]] and [[track:upward-movement-dave-owns|"Upward Movement (Dave Owns)"]] by [[artist:kalibration]]. Some melodic work in the breakdown of "Beatdown" by Joseph Brown (pixelseph/viaSatellite).<br>
-    MIDI TRANSCRIPTIONS: "Beatdown (Strider Style)" and "Atomyk Ebonpyre" by [[artist:mrcheeze|MrCheese]] on the MSPA forum. "Upward Movement" was transcribed for piano by BRPXQZME on the MSPA forum.
+    <b>TIME/TEMPO:</b> 5'55"/127/135/120/16 0/105 BPM (4/4 and 6/4 time)<br>
+    <b>KEY:</b> C Minor
+
+    <b>ORIGINAL THEMES:</b> [[Beatdown (Strider Style)|"Beatdown (Strider Style)"]] and [[Beatdown Round 2|"Beatdown Round 2"]] by [[artist:curt-blakeslee]], [[Atomyk Ebonpyre|"Atomyk Ebonpyre"]] by [[artist:toby-fox]] and [[track:upward-movement-dave-owns|"Upward Movement (Dave Owns)"]] by [[artist:kalibration]]. Some melodic work in the breakdown of "Beatdown" by Joseph Brown (pixelseph/viaSatellite).<br>
+
+    <b>MIDI TRANSCRIPTIONS:</b> "Beatdown (Strider Style)" and "Atomyk Ebonpyre" by [[artist:mrcheeze|MrCheese]] on the MSPA forum. "Upward Movement" was transcribed for piano by BRPXQZME on the MSPA forum.
 
-    SOUNDFONTS USED (* denotes a new soundfont):<br>
+    <b>SOUNDFONTS USED</b> (* denotes a new soundfont):<br>
     SGM v2.01 (Shakuhachi, Koto, Room Kit)<br>
     Musica Theoria (Standard Kit 1)<br>
     Metal Drums* (MetlDrums 3 Soak)<br>
@@ -899,7 +902,7 @@ Sheet Music Files:
   Files:
   - 'Dapper Duelling Piano Rough - Max Wright.pdf'
 Commentary: |-
-    <i>Max Wright:</i> (composer, ([Tumblr](https://imbrog.tumblr.com/post/21076871581/dapper-dueling-context), 4/14/2012)
+    <i>Max Wright:</i> (composer, [Tumblr](https://imbrog.tumblr.com/post/21076871581/dapper-dueling-context), 4/14/2012)
 
     >So, I was a HUGE fan of Dapper Dueling when you first put up the original version, but I LOVE what you did with it for the Homestuck music contest. I can't wait to see what you came up with next, because holy crap you are talented. What inspired you with this one, since it's telling me to ask you something? It has a very Firefly, Joss Whedon sort of feel to it, which I personally really like about it.
 
@@ -921,11 +924,11 @@ Commentary: |-
 
     Also, while composing, I imagined Dapper Dueling to fit a fight scene similar to this ([dead link](https://www.youtube.com/watch?v=BGCMfprPJoA)), from Sherlock Holmes (2009).
 
-    <i>Max Wright:</i> (composer, [YouTube description](https://youtu.be/clnLNQkB5O4), excerpt)
+    <i>Max Wright:</i> ([YouTube description](https://youtu.be/clnLNQkB5O4), excerpt, 12/14/2011)
 
     This was my interpretation of a Jake Strife theme. After the intensity of [[Cobalt Corsair]] I wanted to make something fun to listen to, and ended up with this. Imagine Jake English bouncing nimbly from side to side, facing off to wrestle his eager opponent.
 
-    <i>Soju:</i> (track artist, [Tumblr](https://sojubrew.tumblr.com/post/12754503873), [DeviantArt](https://www.deviantart.com/shilloshilloh/art/Homestuck-Jake-English-268874606), excerpt)
+    <i>Soju:</i> (track artist, [Tumblr](https://sojubrew.tumblr.com/post/12754503873) / [DeviantArt](https://www.deviantart.com/shilloshilloh/art/Homestuck-Jake-English-268874606), excerpt, 11/13/2011)
 
     Obligatory Jake art, 30 min doodle that I took too seriously ;7;
 
diff --git a/album/lofam2.yaml b/album/lofam2.yaml
index 12bd180b..8c83ed74 100644
--- a/album/lofam2.yaml
+++ b/album/lofam2.yaml
@@ -2027,7 +2027,7 @@ Commentary: |-
 
     I've always liked the idea behind [[album:mobius-trip-and-hadron-kaleido]], and the mysterious character canvas that the album brought across. So, from there, I wanted to contribute my own ideas of how MTaHK were represented, and ended up with Embittered Shore. I wanted the piece to have that [[artist:michael-guy-bowman|'Bowman']] quality to it, while still refraining from outright copying his ideas off in any particular way - the heavy use of guitars and fleeting synths was my way of capturing the emotion that Bowman injects into his music, to bring across his characterisation. Ultimately, the piece ends the way it started - it is a brief window through which the troubled characters may be projected and represented.
 
-    <i>Max Wright:</i> (composer, [Tumblr](https://imbrog.tumblr.com/post/17542231858/homestuck-music-contest-entry-2-embittered), 2/13/2012)
+    <i>Max Wright:</i> ([Tumblr](https://imbrog.tumblr.com/post/17542231858/homestuck-music-contest-entry-2-embittered), 2/13/2012)
 
     <b>Homestuck Music Contest Entry #2 - Embittered Shore</b> <i>(MT&HK)</i>
 
@@ -2041,11 +2041,11 @@ Commentary: |-
 
     when "unofficial" music becomes Official
 
-    <i>Tavia Morra:</i> (track artwork, [SoundCloud](https://soundcloud.com/mxwright/embittered-shore))
+    <i>Tavia Morra:</i> ([SoundCloud artwork](https://soundcloud.com/mxwright/embittered-shore))
 
     <img src="media/misc/embittered-shore.jpg" width="300">
 
-    <i>Tavia Morra:</i> (full size SoundCloud track artwork, [Tumblr](https://www.tumblr.com/seeyoutmorra/17291334167/heres-a-fun-fake-poster-i-made-for-a-mobius-trip), 2/8/2012)
+    <i>Tavia Morra:</i> (full-size artwork, [Tumblr](https://www.tumblr.com/seeyoutmorra/17291334167/heres-a-fun-fake-poster-i-made-for-a-mobius-trip), 2/8/2012)
 
     <img src="media/misc/embittered-shore-full.jpg" width="300">
 
diff --git a/album/lofam3.yaml b/album/lofam3.yaml
index 1d095d44..0f679ae2 100644
--- a/album/lofam3.yaml
+++ b/album/lofam3.yaml
@@ -1905,14 +1905,13 @@ Commentary: |-
 
     But really, it was never meant to.
 
-    <i>Max Wright:</i> ([Tumblr](https://imbrog.tumblr.com/post/29921577143/maid-in-spades-this-is-a-piece-i-did-in-reply-to), 8/21/2012)
-    
-    Maid in Spades
-
-    This is a piece I did in reply to [[track:pirates-of-alternia-dead-trolls-chest|THIS]] remix, by [[artist:willow-ascenzo|wellmanicuredmusic]], of [[Cobalt Corsair]]. So this is a remix of [[Rust Servant]], a swingin' romp that uses the same thematic material in a jazzier way. Does it fit the character of the handmaid? Nope, but it was never meant to.
     <i>dodostad:</i> (track artist)
 
     The song is very uplifting, but you can't really draw Handmaid without making her glare really hard, can you?
+
+    <i>Max Wright:</i> ([Tumblr](https://imbrog.tumblr.com/post/29921577143/maid-in-spades-this-is-a-piece-i-did-in-reply-to), excerpt, 8/21/2012)
+
+    This is a piece I did in reply to [[track:pirates-of-alternia-dead-trolls-chest|THIS]] remix, by [[artist:willow-ascenzo|wellmanicuredmusic]], of [[Cobalt Corsair]]. So this is a remix of [[Rust Servant]], a swingin' romp that uses the same thematic material in a jazzier way. Does it fit the character of the handmaid? Nope, but it was never meant to.
 ---
 Track: Gears and Chandeliers
 Artists:
diff --git a/album/lofam5a2.yaml b/album/lofam5a2.yaml
index e090da12..a46af79d 100644
--- a/album/lofam5a2.yaml
+++ b/album/lofam5a2.yaml
@@ -1931,6 +1931,11 @@ Commentary: |-
     Biggest shout out to Tee-vee, who performed all the guitars for this
 ---
 Track: deadkidsGodhood
+Additional Names:
+- Name: >-
+    deadkidsGodhood (Even in Death Remix)
+  Annotation: >-
+    [Newgrounds](https://www.newgrounds.com/audio/listen/1207752)
 Artists:
 - Pixels & Paradiddles
 - pixelseph
@@ -1958,6 +1963,31 @@ Commentary: |-
     While her buddy revivifies in the backline, Rose prepares to give a very bad dog an exclusive sneak preview eldritch sommelier taste test of the Furthest Ring. Or she would be, if her ghost-white eyes weren’t betraying her ultimate fate.
 
     This track is probably my fave on the album, so glad I got to do art for it!
+
+    <i>pixelseph:</i> ([Newgrounds short description](https://www.newgrounds.com/playlist/275797/pixels-paradiddles-homestuck-ep))
+
+    A heavier take on [[track:even-in-death|Even in Death]], from Homestuck Vol. 7
+
+    <i>pixelseph, paradiddlesjosh:</i> ([Newgrounds description](https://www.newgrounds.com/audio/listen/1207752), excerpt, 4/14/2023)
+
+    Every single needs a B-side.
+
+    This one and the recent <b>[[Clockstopper (New Game+ All Clocks%)]]</b> were incepted during 2020, because [[media:misc/there-was-time-now.gif|there was finally enough time]]. Conceptually, it's like <b>Tool</b> meets Homestuck composer [[artist:tensei|Joren "Tensei" de Bruin]] (particularly from [[album:strife|his Strife record]]).
+
+    <b>Time/Tempo:</b> 2'42" / 120bpm (4/4)<br>
+    <b>KEY:</b> D Minor
+
+    <b>ORIGINAL THEMES:</b> [[track:even-in-death|"Even in Death"]] by [[artist:clark-powell]], [[track:upward-movement-dave-owns|"Upward Movement"]] by [[artist:kalibration]], motifs from [[track:savior-of-the-dreaming-dead|"Savior of the Dreaming Dead"]] by [[artist:malcolm-brown]] (which quotes [[track:savior-of-the-waking-world|"Savior of the Waking World"]] by [[artist:toby-fox]]).
+
+    <b>SAMPLES USED:</b> "Boom - Cavernous B" from Flame Sound's Inferno SFX pack.
+
+    <b>VSTi USED:</b> Adam Szapo Viper v1.0.8, Decidedly Decent Sampler (Clockscape), NI Kontakt 6 (Embertone Arcane v1.01 "Seance"), Spitfire Audio BBC Symphony Orchestra Core, Spitfire Audio LABS (Autograph Grand, Percussion), Spitfire Audio Originals - Media Toolkit, Spitfire Audio Original - Cinematic Percussion, Toontrack Superior Drummer 2
+
+    <b>VST Effects:</b> Arturia Pre 1973, Arturia Delay TAPE-201, Arturia Rev PLATE-140, iZotope Vinyl, iZotope Trash 2, NI Supercharger, Slate TH-U Overloud, Plugin Alliance Black Box Analog Design HG-2, Plugin Alliance Brainworx Subfilter, Plugin Alliance Shadow Hills Mastering Compressor, Presonus Binaural Pan, Presonus Bitcrusher, Presonus Fat Channel, Presonus Flanger, Presonus Gate, Presonus Pro EQ, Presonus RedLightDist, Presonus X-Trem, Tokyo Dawn Labs TDR Nova
+
+    Guitars recorded using a Line 6 JTV-59 Variax through a Line 6 Helix LT into an SSL-2 interface. Basses recorded using a Hackenbacker through a Line 6 Helix into an SSL-2 interface. Arranged, recorded, engineered, and mixed in Presonus Studio One 4.
+
+    Like, review, subscribe, all that jazz. Enjoy!
 ---
 Track: GALACTIC INCOHERENCE ~ Cosmic NaN Propagation
 Artists:
@@ -3043,11 +3073,46 @@ Referenced Tracks:
 - Atomyk Ebonpyre
 - Upward Movement (Dave Owns)
 Commentary: |-
-    <i>pixelseph:</i> (& paradiddlesjosh)
+    <i>pixelseph, paradiddlesjosh:</i>
     “Clockstopper” from [[album:coloUrs-and-mayhem-universe-b|coloUrs & mayhem Universe B]], but it's from 2023 and Dave needed to destroy every single clock in Sburb. No one asked for more Castlevania/Megaman/Otacore vibes on this track, but we brought it anyway. Enjoy your New Game+.
 
     <i>Awkward:</i>
     That's the last time I'm drawing Dave five times in the same piece, suffice to say (those timetables were absolutely evil trying to line). Loved working with the colours though, imposing reds with fiery overblown glow dodges will always be one of my favourite combos.
+
+    <i>pixelseph:</i> ([Newgrounds short description](https://www.newgrounds.com/playlist/275797/pixels-paradiddles-homestuck-ep))
+
+    [[Clockstopper]], but if it were made in 2023
+
+    <i>pixelseph, paradiddlesjosh:</i> ([Newgrounds description](https://www.newgrounds.com/audio/listen/1207576), excerpt, 4/13/2023)
+
+    Hi, it's been a while. Noses to the grindstone, and all that hustle. Y'all know how it goes. Don't need to belabor the point.
+
+    Happy 413, have a remix Josh and I have been cooking up for a while and found the time/space to release it.
+
+    <b>EDIT:</b> it's the A-side to [[track:deadkidsgodhood|this track]], 'cause you know singles always come in pairs.
+
+    Details below.
+
+    <b>TIME/TEMPO:</b> 5'48” / 138bpm, 69bpm (nice), 128bpm, 118bpm, 160bpm, 106bpm (4/4, 6/4, and 11/8 time)<br>
+    <b>KEY:</b> C Minor
+
+    <b>ORIGINAL THEMES:</b> [[track:beatdown-strider-style|"Beatdown (Strider Style)"]] and [[track:beatdown-round-2|"Beatdown Round 2"]] by [[artist:curt-blakeslee]], [[track:atomyk-ebonpyre|"Atomyk Ebonpyre"]] by [[artist:toby-fox]] and [[track:upward-movement-dave-owns|"Upward Movement (Dave Owns)"]] by [[artist:kalibration]]. Some melodic work in the breakdown of "Beatdown" by Joseph Brown (chocosoda/pixelseph).
+
+    <b>MIDI TRANSCRIPTIONS:</b> "Beatdown (Strider Style)" and "Atomyk Ebonpyre" by [[artist:mrcheeze|MrCheese]] on the MSPA forum. "Upward Movement" was transcribed for piano by BRPXQZME on the MSPA forum.
+
+    <b>SAMPLES USED:</b> "Computer Glitching, Digital Data Corruption, 02 04, Loop" by Jonathan Shaw (InspectorJ of Freesound.org), "Smashing Wooden Fence A, Wav" by Jonathan Shaw (InspectorJ of Freesound.org), "Factory Ambience Loop 1" from the Ancient Game Iron Forge pack
+
+    <b>VSTi USED:</b> Adam Szapo Viper v1.0.8, Arturia Analog Lab V Intro, Decidedly Decent Sampler (Clockscape), NI Battery 4, NI Kontakt 6 (Twenty Five), Presonus Mai Tai, Spitfire Audio BBC Symphony Orchestra Core, Spitfire Audio LABS (Autograph Grand, Percussion), Spitfire Audio Originals - Media Toolkit, Spitfire Audio Original - Cinematic Percussion, Toontrack Superior Drummer 2, YCMK Magical8BitPlug 2
+
+    <b>VST Effects:</b> Arturia Pre 1973, Arturia Delay TAPE-201, Arturia Rev PLATE-140, Arturia Chorus JUN-6, iZotope Neutron 3 Elements, iZotope Vinyl, iZotope Trash 2, NI Guitar Rig 6, NI Supercharger, Slate TH-U Overloud, Plugin Alliance Black Box Analog Design HG-2, Plugin Alliance Brainworx Subfilter, Plugin Alliance Shadow Hills Mastering Compressor, Presonus Binaural Pan, Presonus Bitcrusher, Presonus Fat Channel, Presonus Flanger, Presonus Gate, Presonus Pro EQ, Presonus RedLightDist, Tokyo Dawn Labs TDR Nova
+
+    Guitars recorded using a Line 6 JTV-59 Variax through a Line 6 Helix LT into an SSL-2 interface. Basses recorded using a Schecter C-4 through a Line 6 Helix into an SSL-2 interface. Arranged, recorded, engineered, and mixed in Presonus Studio One 4.
+
+    No one asked for more Castlevania/Megaman/Otacore vibes on this track, but we brought it anyway. Enjoy your New Game+.
+
+    Like, comment, subscribe, review, all the fun stuff!
+
+    ~Pixels and Paradiddles
 ---
 Track: The Ballad of Moro and San
 Artists:
diff --git a/album/p-s.yaml b/album/p-s.yaml
index 917f9dad..a90e7c4c 100644
--- a/album/p-s.yaml
+++ b/album/p-s.yaml
@@ -447,7 +447,7 @@ Commentary: |-
 
     Pow! Here's something nobody was asking for - a rootin tootin brawling theme for Skylla Koriga. The in-game music felt a little too relaxed at times given all the action, so this song here takes names, chews cud and kicks ass.
 
-    Consider this a successor to [[Dapper Dueling]], an older track of mine that was used as the BGM for the Skylla route.
+    Consider this a successor to [[Dapper Dueling]], an older track of mine that was used as the BGM for [[flash:fs-vol3|the Skylla route]].
 ---
 Track: Infinity's Lament
 Artists:
diff --git a/album/rust-apocalypse-anniversary-remaster.yaml b/album/rust-apocalypse-anniversary-remaster.yaml
index 2f69e4ab..d63d5e29 100644
--- a/album/rust-apocalypse-anniversary-remaster.yaml
+++ b/album/rust-apocalypse-anniversary-remaster.yaml
@@ -20,6 +20,16 @@ Additional Files:
   Files:
   - rust 2014 alt 1.png
   - rust 2014 alt 2.png
+Commentary: |-
+    <i>Willow Ascenzo:</i> ([Bandcamp about blurb](https://wellmanicuredmusic.bandcamp.com/album/rust-apocalypse-anniversary-remaster))
+
+    A remastered version of [[Rust Apocalypse]], released on the anniversary of the original track, which was itself an arrangement and expansion of [[track:rust-servant|a track I composed]] for the Homestuck album [[album:coloUrs-and-mayhem-universe-a]]. This version has been remastered from the original stem tracks for a brighter, clearer sound, and parts of the choir have been redone for additional clarity.
+
+    <i>Willow Ascenzo:</i> ([Bandcamp credits blurb](https://wellmanicuredmusic.bandcamp.com/album/rust-apocalypse-anniversary-remaster), excerpt)
+
+    Based on [[track:rust-servant|"Rust Servant"]], composed in 2012 by [[artist:willow-ascenzo|Willow Ascenzo]], originally released April 2012 on [[album:coloUrs-and-mayhem-universe-a|"coloUrs and mayhem: Universe A"]] via Homestuck and What Pumpkin Studios
+
+    Original [[track:rust-apocalypse|"Rust Apocalypse"]] released in January 2013 by Willow Ascenzo
 ---
 Track: Rust Apocalypse [Anniversary Remaster]
 Duration: '07:36'
@@ -30,10 +40,6 @@ Cover Artists:
 Referenced Tracks:
 - Rust Apocalypse
 Commentary: |-
-    <i>Willow Ascenzo:</i>
-
-    A remastered version of [[Rust Apocalypse]], released on the anniversary of the original track, which was itself an arrangement and expansion of [[track:rust-servant|a track I composed]] for the Homestuck album [[album:coloUrs-and-mayhem-universe-a]]. This version has been remastered from the original stem tracks for a brighter, clearer sound, and parts of the choir have been redone for additional clarity.
-
     <i>Willow Ascenzo:</i> ([Tumblr](https://wellmanicuredmusic.tumblr.com/post/72285232982), excerpt, 1/5/2014)
 
     I said I wouldn't have any new music to ring in the new year with, and that's still true, but I listened to [[Rust Apocalypse]] and realized that with my growth in skills and technological advances over the past year I could make the track sound so much clearer and richer than the original release! Marvel at actually hearing more intelligible words in the opening!
diff --git a/album/rust-apocalypse.yaml b/album/rust-apocalypse.yaml
index 3b391207..5f34c1d3 100644
--- a/album/rust-apocalypse.yaml
+++ b/album/rust-apocalypse.yaml
@@ -48,10 +48,7 @@ Commentary: |-
 Track: Rust Witch
 Directory: rust-witch-ascenzo
 Additional Names:
-- Name: >-
-    Rust Handmaid
-  Annotation: >-
-    [Tumblr](https://mousegard.tumblr.com/post/36108866335), working title
+- Rust Handmaid (working title)
 Duration: '3:47'
 URLs:
 - https://wellmanicuredmusic.bandcamp.com/track/rust-witch
@@ -152,4 +149,4 @@ Originally Released As: Violet Mariner
 Duration: '2:45'
 Color: '#db00db'
 URLs:
-- https://wellmanicuredmusic.bandcamp.com/track/violet-mariner-original
\ No newline at end of file
+- https://wellmanicuredmusic.bandcamp.com/track/violet-mariner-original