merge preview

31 files changed, 890 insertions, 600 deletions

diff --git a/album/basement-tale.yaml b/album/basement-tale.yaml
index 05d66281..8dd4ac9b 100644
--- a/album/basement-tale.yaml
+++ b/album/basement-tale.yaml
@@ -1,6 +1,6 @@
 Album: Basement Tale
 Date: October 15, 2016
-Date Added: August 14, 2023
+Date Added: August 18, 2023
 Artists:
 - Cecily Renns
 URLs:
diff --git a/album/c-a-n-w-a-v-e.yaml b/album/c-a-n-w-a-v-e.yaml
index 63fef0b8..fdca569a 100644
--- a/album/c-a-n-w-a-v-e.yaml
+++ b/album/c-a-n-w-a-v-e.yaml
@@ -1,7 +1,7 @@
 Album: C A N W A V E
-Directory: c-a-n-w-a-v-e
+Directory: canwave
 Date: October 10, 2016
-Date Added: August 13, 2023
+Date Added: August 18, 2023
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/album/c-a-n-w-a-v-e
 - https://www.youtube.com/playlist?list=PLMXVVm-BDvr_AQ9lFA2Nx50aylTvSz-6z
@@ -18,7 +18,7 @@ Banner Dimensions: 1100x216
 Banner File Extension: jpg
 Wallpaper Artists:
 - Makin
-Wallpaper Style: 'opacity: 1'
+Wallpaper Style: 'opacity: 0.8;'
 Track Art File Extension: png
 Color: '#5bfcf4'
 Groups:
@@ -31,6 +31,8 @@ Commentary: |-
     ｉ'ｍ ｔｈｉｎｋｉｎｇ ｏｆ ｖａｐｏｒｗａｖｅ
     ｂｅｔｗｅｅｎ ｍｙ ｂｕｔｔｏｃｋｓ
 ---
+Section: Main album
+---
 Track: liquid vaporwavecity
 Artists:
 - Cecily Renns
@@ -261,6 +263,7 @@ Sampled Tracks:
 - Despot
 ---
 Track: A R I S E N A N E W
+Directory: arisen-anew-canwave
 Artists:
 - TirantBacon
 Cover Artists:
@@ -281,6 +284,7 @@ Lyrics: |-
     Toki no hime wa inu wo tometa<br>Toki no hime wa inu wo tometa<br>Toki no hime wa inu wo tometa<br>Toki no hime wa inu wo tometa<br>(<i>The princess of time stopped the dog</i>)
 ---
 Track: B E ^ T D O Vv N
+Directory: beatdovvn
 Artists:
 - TirantBacon
 Cover Artists:
@@ -334,6 +338,7 @@ Sampled Tracks:
 - Descend
 ---
 Track: B L λ C K
+Directory: black-canwave
 Artists:
 - artist:kobacat
 Cover Art File Extension: jpg
@@ -351,8 +356,8 @@ Sampled Tracks:
 - track:black
 ---
 Track: C R Y S T A L S
-Artists:
-- Interrobang
+Directory: crystals-canwave
+Originally Released As: track:crystals
 Cover Artists:
 - Cloudaria
 Art Tags:
@@ -363,10 +368,6 @@ Duration: '01:26'
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/c-r-y-s-t-a-l-s-2
 - https://youtu.be/PMEu8RnJEqQ
-Referenced Tracks:
-- Crystalmethequins
-Sampled Tracks:
-- Crystalmethequins
 ---
 Track: I don't wanna smoke an e-cig
 Artists:
@@ -636,7 +637,7 @@ Lyrics: |-
     Oooh, fall in the HUSH
 ---
 Track: 『ＣＬＩＭＢＩＮＧ∞ＴＯ∞ＩＮＦＩＮＩＴＹ』
-Directory: climbing-to-infinity-canwave
+Directory: climbing-to-infinity
 Artists:
 - SplitSuns
 Cover Artists:
diff --git a/album/call-and-new.yaml b/album/call-and-new.yaml
index 8cdb060d..e3a5138e 100644
--- a/album/call-and-new.yaml
+++ b/album/call-and-new.yaml
@@ -1,6 +1,6 @@
 Album: call and new
 Date: September 23, 2016, 12:00:02
-Date Added: August 10, 2023
+Date Added: August 18, 2023
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/album/call-and-new
 - https://www.youtube.com/playlist?list=PLMXVVm-BDvr8x2a7395wWFEW0ZCpHWDyj
@@ -429,6 +429,7 @@ Lyrics: |-
     (Let's get ready to Rumble!)
 ---
 Track: Let's Get Ready to μίμημα!
+Directory: lets-get-ready-to-mimhma
 Artists:
 - cookiefonster
 Duration: '1:17'
diff --git a/album/canwc-for-the-holidays.yaml b/album/canwc-for-the-holidays.yaml
index 7a2f2dd7..fb07fb68 100644
--- a/album/canwc-for-the-holidays.yaml
+++ b/album/canwc-for-the-holidays.yaml
@@ -1,6 +1,6 @@
 Album: CANWC for the Holidays
 Date: October 30, 2016, 12:01 AM
-Date Added: August 16, 2023
+Date Added: August 18, 2023
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/album/canwc-for-the-holidays
 - https://www.youtube.com/playlist?list=PLMXVVm-BDvr9R-ofsLG-ztzOmqYlOZlmW
@@ -446,6 +446,8 @@ Cover Artists:
 Art Tags:
 - Tavros
 - Terezi
+- 'cw: corpse'
+- 'cw: blood (abstract)'
 Duration: '02:16'
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/snowallavania
diff --git a/album/canwc-sound-test-1.yaml b/album/canwc-sound-test-1.yaml
index 77c6d98d..b64831d7 100644
--- a/album/canwc-sound-test-1.yaml
+++ b/album/canwc-sound-test-1.yaml
@@ -1,7 +1,7 @@
 Album: 'CaNWC Sound Test Vol.1: REVENGE OF THE GIIVASUNNER'
 Directory: canwc-sound-test-1
 Date: September 23, 2016, 12:00:04
-Date Added: August 12, 2023
+Date Added: August 18, 2023
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/album/canwc-sound-test-vol-1-revenge-of-the-giivasunner
 - https://www.youtube.com/playlist?list=PLMXVVm-BDvr--0O6Qy5O5cf6KrbaTPsff
@@ -20,7 +20,8 @@ Groups:
 - Fandom
 Commentary: |-
     <i>Cool and New Music Team:</i>
-    or "RotG" for short 
+    or "RotG" for short
+
     <i>Makin:</i>
     The RotG joke is a relic of 2016. A fanmusic group named Team Virgo (known for [[album:beforus]] and [[album:ancestral]]) had been teasing an album for a long time, or at least it seemed like they were. 
     RotG, the anticipated album, stood for Rubric of the Guardians, an album for Dad, Mom, Grandpa Harley, etc. The hype seemed to be building up to something big, but the album was delayed for so long that the CANMT decided to parody its hyped release by also teasing their own "RotG".
@@ -31,6 +32,9 @@ Commentary: |-
     Oh yeah, the album itself. It's all the tracks that were too offtopic or bad for the main albums. The only track purposefully made for it was [[track:lore]], which I'll discuss in its entry. The track art is a parody of [[artist:robert-j-lake]]'s <a href="https://spellmynamewithabang.bandcamp.com/album/stuckhome-syndrome-part-one-v1-years-in-the-past">Stuckhome Syndrome</a>. AND I have one last piece of trivia to share with you: we released four albums in one day, and <a href="https://www.youtube.com/watch?v=lwYhJaWVePk&list=PLoOnh0MiKsmIaQrZpqd5t1G7xOWf7_-EF">streamed them all</a> over an excruciating eight hours. Go check it out if you want to see a hundred people suffer.
 
     Wait I didn't mention that there's a fanmade <a href="https://sanctferum.tumblr.com/post/638058644066435072/homestuck-sound-test-12202020-edition">Homestuck sound tes</a>--
+
+    <i>Cool and New Music Team:</i>
+    (<a href="https://www.youtube.com/watch?v=Ervn4We6lEs">ST1 : ROTG</a>)
 ---
 Track: It's A Lovely Day To Be Named (voicep0.wav)
 Artists:
@@ -821,10 +825,10 @@ URLs:
 - https://youtu.be/wC-OWFvVV4c
 Referenced Tracks:
 - track:upward-movement-dave-owns
-- Crazy Bus Title Screen
+- CRAZYBUS Title Screen
 Sampled Tracks:
 - track:upward-movement-dave-owns
-- Crazy Bus Title Screen
+- CRAZYBUS Title Screen
 ---
 Track: derse gon give it to ya (brief)
 Artists:
@@ -1470,6 +1474,7 @@ Referenced Tracks:
 - Moonsetter
 ---
 Track: A E S T H E T O B Y S T Y L E
+Directory: aesthetobystyle
 Artists:
 - artist:kobacat
 Duration: '03:13'
diff --git a/album/carne-vale-fusion-collab.yaml b/album/carne-vale-fusion-collab.yaml
index 9aa93d46..43df8d38 100644
--- a/album/carne-vale-fusion-collab.yaml
+++ b/album/carne-vale-fusion-collab.yaml
@@ -1,6 +1,6 @@
 Album: Carne Vale Fusion Collab
 Date: October 25, 2016
-Date Added: August 15, 2023
+Date Added: August 18, 2023
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/carne-vale-fusion-collab
 - https://www.youtube.com/watch?v=BcV3FcAgROI
@@ -19,6 +19,17 @@ Art Tags:
 - Shrek
 - Calliope
 Cover Art File Extension: png
+Wallpaper File Extension: png
+Wallpaper Artists:
+- XenoZane
+- Bambosh
+- Hadron
+- greenTetrahedron
+- artist:kobacat
+- jakkyr
+- avocado
+- CreatorOfJanespeak
+Wallpaper Style: 'opacity: 0.65;'
 Color: '#ff0000'
 Groups:
 - Cool and New Music Team
diff --git a/album/cool-and-new-greatest-hits.yaml b/album/cool-and-new-greatest-hits.yaml
index beb8bad7..63d94362 100644
--- a/album/cool-and-new-greatest-hits.yaml
+++ b/album/cool-and-new-greatest-hits.yaml
@@ -1,10 +1,10 @@
 Album: Cool and New Greatest Hits
 Date: November 6, 2016
-Date Added: August 16, 2016
+Date Added: August 18, 2023
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/album/cool-and-new-greatest-hits
 Cover Artists:
-- Angela Sham
+- Aryll
 Art Tags:
 - Rose
 - Hecka Jef
@@ -13,6 +13,11 @@ Art Tags:
 - John
 Cover Art File Extension: png
 Track Art File Extension: png
+Wallpaper File Extension: png
+Wallpaper Artists:
+- Aryll
+- Niklink (edits for wiki)
+Wallpaper Style: 'opacity: 0.6;'
 Color: '#b536da'
 Groups:
 - Cool and New Music Team
@@ -293,6 +298,7 @@ Art Tags:
 - Rose
 - Hecka Jef
 - Hella Jeff
+- 'cw: cops'
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/feel-good-2
 - https://www.youtube.com/watch?v=B2myDAap5GI
diff --git a/album/cool-and-new-volume-7.yaml b/album/cool-and-new-volume-7.yaml
index 491729c1..67e4e802 100644
--- a/album/cool-and-new-volume-7.yaml
+++ b/album/cool-and-new-volume-7.yaml
@@ -1,7 +1,7 @@
 Album: 'COOL AND NEW Volume 7: At the Price of $104.13'
 Directory: cool-and-new-volume-7
 Date: October 15, 2016
-Date Added: August 14, 2023
+Date Added: August 18, 2023
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/album/cool-and-new-volume-7-at-the-price-of-10413
 - https://www.youtube.com/playlist?list=PLrF40eVdI4_v1GAlNHMwCWp9dphdV0j9P
@@ -29,6 +29,9 @@ Color: '#ff9700'
 Groups:
 - Cool and New Music Team
 - Fandom
+Commentary: |-
+    <i>XenoZane:</i>
+    (<a href="https://www.youtube.com/watch?v=eLJE5d3G5rk">volme 7 traiIer</a>)
 ---
 Section: Diks 1
 ---
@@ -340,6 +343,7 @@ Sampled Tracks:
 - Sad Jhon (Full)
 ---
 Track: Jhon et la Dégénération de la Père
+Directory: jhon-et-la-degeneration-de-la-pere
 Artists:
 - NyashAlex
 Cover Artists:
@@ -349,6 +353,7 @@ Art Tags:
 - Dadd
 - John
 - John's dad
+- 'cw: blood'
 Duration: '01:29'
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/jhon-et-la-d-g-n-ration-de-la-p-re
@@ -574,6 +579,7 @@ Referenced Tracks:
 - track:sburban-jungle
 ---
 Track: C O N S U M E
+Directory: consume
 Artists:
 - Double Hats Eyewear
 Cover Artists:
diff --git a/album/cool-and-new-volume-ii.yaml b/album/cool-and-new-volume-ii.yaml
index 0a444c89..cfdd3c8a 100644
--- a/album/cool-and-new-volume-ii.yaml
+++ b/album/cool-and-new-volume-ii.yaml
@@ -688,6 +688,8 @@ Art Tags:
 - Aradia
 Referenced Tracks:
 - Crystalmethequins
+Sampled Tracks:
+- Crystalmethequins
 ---
 Track: Penumbra Phanteaseum
 Artists:
diff --git a/album/cool-and-new-volume-sx.yaml b/album/cool-and-new-volume-sx.yaml
index 048c9a9c..0215010d 100644
--- a/album/cool-and-new-volume-sx.yaml
+++ b/album/cool-and-new-volume-sx.yaml
@@ -1,7 +1,7 @@
 Album: 'cool and new volume s*x: hair transplant'
 Directory: cool-and-new-volume-sx
 Date: September 23, 2016, 12:00:03
-Date Added: August 11, 2023
+Date Added: August 18, 2023
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/album/cool-and-new-volume-s-x-hair-transplant
 - https://www.youtube.com/playlist?list=PLMXVVm-BDvr_mA0qhPRoet8TZmvw7asTP
@@ -443,7 +443,7 @@ URLs:
 - https://youtu.be/B8oalWhp_1o
 Referenced Tracks:
 - track:sburban-jungle
-- Rainbow Road
+- Rainbow Road (Super Mario Kart)
 ---
 Track: Sweet Cravings and Pumpkin Jeff
 Artists:
@@ -472,7 +472,7 @@ Artists:
 Cover Artists:
 - avocado
 Art Tags:
-- Nepeta
+- 'cw: blood'
 Duration: '2:13'
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/sarabande-canon-edit
@@ -1365,6 +1365,7 @@ Cover Artists:
 - Makin
 Art Tags:
 - Jack Noir
+- 'cw: blood'
 Duration: '1:06'
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/ass-well-as-yellow
@@ -2005,6 +2006,7 @@ Cover Artists:
 - Griever
 Art Tags:
 - Nepeta
+- 'cw: blood'
 Duration: '5:56'
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/apex-predator
@@ -2131,6 +2133,7 @@ Referenced Tracks:
 - Descend
 ---
 Track: W H A T T I C K I N G
+Directory: whatticking
 Artists:
 - MrCheeze
 Cover Artists:
@@ -2145,6 +2148,7 @@ Referenced Tracks:
 - Non Compos Mentis
 ---
 Track: wano_vo_tse_1.wav
+Directory: wano-vo-tse-1-wav
 Artists:
 - artist:kobacat
 Cover Artists:
diff --git a/album/crossmound-vol-1.yaml b/album/crossmound-vol-1.yaml
index 8e1a7055..fed43586 100644
--- a/album/crossmound-vol-1.yaml
+++ b/album/crossmound-vol-1.yaml
@@ -1,5 +1,6 @@
 Album: Crossmound Vol. 1
 Date: March 23, 2023
+Date Added: August 18, 2023
 Color: '#f2d00e'
 Cover Artists:
 - GHSTHRLQN
diff --git a/album/cyber-city-sound-pak.yaml b/album/cyber-city-sound-pak.yaml
index 0cf9c828..e26ebc2f 100644
--- a/album/cyber-city-sound-pak.yaml
+++ b/album/cyber-city-sound-pak.yaml
@@ -2,7 +2,7 @@ Album: CYBER CITY SOUND PAK
 Artists:
 - Cristata
 Date: August 4, 2023
-Date Added: August 26, 2023
+Date Added: August 18, 2023
 URLs:
 - https://cristata.bandcamp.com/album/cyber-city-sound-pak
 Cover Artists:
diff --git a/album/gotta-hatch-em-all.yaml b/album/gotta-hatch-em-all.yaml
index 72da12ea..4b2a95c0 100644
--- a/album/gotta-hatch-em-all.yaml
+++ b/album/gotta-hatch-em-all.yaml
@@ -1,6 +1,6 @@
 Album: Gotta Hatch 'Em All!
 Date: July 22, 2023
-Date Added: August 26, 2023
+Date Added: August 18, 2023
 URLs:
 - https://sahcon.bandcamp.com/album/gotta-hatch-em-all-sahcon-2023-album
 - https://www.youtube.com/watch?v=TzdgUxWj7Tw
diff --git a/album/lofam4.yaml b/album/lofam4.yaml
index 387f08a9..b0235c7c 100644
--- a/album/lofam4.yaml
+++ b/album/lofam4.yaml
@@ -1678,8 +1678,8 @@ Commentary: |-
     (SFX: Toki yo Tomare.)
 ---
 Track: Climbing to Infinity
-Artists:
-- SplitSuns
+Directory: climbing-to-infinity-lofam4
+Originally Released As: track:climbing-to-infinity
 Duration: '4:28'
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/climbing-to-infinity
@@ -1688,11 +1688,9 @@ Cover Artists:
 - SplitSuns
 Art Tags:
 - LoLaR
-Referenced Tracks:
-- track:endless-climb
 Commentary: |-
     <i>SplitSuns:</i>
-    This track was amde for the [[group:canmt|Cool and New Music Team]]'s CANWAVE, an album entirely of Homestuck vaporwave parodies. This song in particular is a vaporwave edit of Endless Climb, hence the name. I tried to extends the vaporwave feel beyond just slowing the song down, splicing and editing the original song in interesting ways, adding 80's style instruments, and utilizing pitchbend and other distortion effects to provide an uneasy feel. The result is something that transcends meme status and enters "dream status," if you will. Actually that sounds kind of dumb. Forget I said that.
+    This track was amde for the [[group:canmt|Cool and New Music Team]]'s [[album:canwave|CANWAVE]], an album entirely of Homestuck vaporwave parodies. This song in particular is a vaporwave edit of Endless Climb, hence the name. I tried to extends the vaporwave feel beyond just slowing the song down, splicing and editing the original song in interesting ways, adding 80's style instruments, and utilizing pitchbend and other distortion effects to provide an uneasy feel. The result is something that transcends meme status and enters "dream status," if you will. Actually that sounds kind of dumb. Forget I said that.
     The track art is a parody of the cover of the vaporwave album "Shader Complete" by Sacred Tapestry.
 ---
 Track: Beatup (Shutdown)
@@ -2899,7 +2897,7 @@ Commentary: |-
     - [[Contra]] - 2:18-2:48
     - [[track:MeGaLoVania|MeGaLoVania]] - 2:50-3:05
     - [[Moshi Moshi?]] - 2:50-3:05
-    - [[Unintentional Touhou]] - 3:05-3:20
+    - [[track:unintentional-touhou]] - 3:05-3:20
     - [[CONTACT]] - 3:20-3:50
     - [[track:upward-movement-dave-owns|Upward Movement (Dave Owns)]] - 3:35-3:50
     - [[track:formation]] - 3:50-4:20
diff --git a/album/lofam5.yaml b/album/lofam5.yaml
index c88fde0d..b80e63b6 100644
--- a/album/lofam5.yaml
+++ b/album/lofam5.yaml
@@ -200,7 +200,7 @@ Commentary: |-
     This one I actually wrote a while ago. At this point I was just challenging myself to make as many homestuck covers in as many different styles as I could and I think this one is particularly special. Squiddles were already one of my favorite little lore spirals from homestuck so to be able to put a little bit more AU weirdness is something Im honored to be able to do.
 ---
 Track: On an Island Far Away
-Directory: on-an-island-far-away-lofam
+Directory: on-an-island-far-away-lofam5
 Artists:
 - Circlejourney
 Contributors:
@@ -453,7 +453,7 @@ Cover Artists:
 Art Tags:
 - LoLaR
 Referenced Tracks:
-- Climbing to Infinity
+- track:climbing-to-infinity
 - track:endless-climb
 Commentary: |-
     <i>Makin:</i>
diff --git a/album/median.yaml b/album/median.yaml
index c0bd71e7..c9395b49 100644
--- a/album/median.yaml
+++ b/album/median.yaml
@@ -1,6 +1,6 @@
 Album: Median
 Date: November 12, 2016
-Date Added: August 16, 2023
+Date Added: August 18, 2023
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/album/median
 - https://www.youtube.com/playlist?list=PLMXVVm-BDvr-dJnICrVXKSkgrXcFj6gII
@@ -10,7 +10,15 @@ Cover Artists:
 - NyashAlex
 Cover Art File Extension: png
 Track Art File Extension: png
-Color: '#ffffff'
+Wallpaper File Extension: png
+Wallpaper Artists:
+- NyashAlex
+- Niklink (edits for wiki)
+Wallpaper Style: |-
+    opacity: 0.8;
+    background-repeat: repeat;
+    background-size: auto;
+Color: '#cccccc'
 Groups:
 - Cool and New Music Team
 - Fandom
diff --git a/album/midnight-crew-drawing-dead.yaml b/album/midnight-crew-drawing-dead.yaml
index a8524f2b..b662e955 100644
--- a/album/midnight-crew-drawing-dead.yaml
+++ b/album/midnight-crew-drawing-dead.yaml
@@ -236,7 +236,7 @@ Referenced Tracks:
 - track:haunt
 Commentary: |-
     <i>Andrew Huo:</i>
-    Hauntjam and Hauntjelly are interesting things. They were actually made based on a short fruity loop that The Big Man Andrew did, called haunt.wav or haunt.mp3 or something like that. A jam on his theme, logically, would therefore be called "hauntjam," with the opportunity for naming puns including "hauntjelly." His theme appears mostly unchanged as the bassline for the first part of the pieces. At this point in terms of instrumentation, we were still mostly striving for faithfulness to the canon Midnight Crew "band," as can be seen in <a href="http://www.mspaintadventures.com/extras/ps000018.html">the Extras page</a> wherein the MC fill 'em with midnight (bottom), so Hauntjam employs trombone, string bass, piano, clarinet, and sax (I forget which because I've lost the file and am not a band person, but I think it was alto). From there on, it was fairly straightforward to write a haunting refrain and then solos for each instrument. I will admit I got a little writerblock'd for the second part, which was sort of a brief modulation to the dominant, so it sounds a little strange. But it still has its own little charm, with the almost annoying trill put in for a spooky ghost-like effect. In Hauntjam, Bowman did some good stuff with bringing out moving parts in the first refrain. In Hauntjelly, Xerxes emphasizes the spookiness by changing instruments for more electric organ.
+    Hauntjam and Hauntjelly are interesting things. They were actually made based on a short fruity loop that The Big Man Andrew did, called haunt.wav or haunt.mp3 or something like that. A jam on his theme, logically, would therefore be called "hauntjam," with the opportunity for naming puns including "hauntjelly." His theme appears mostly unchanged as the bassline for the first part of the pieces. At this point in terms of instrumentation, we were still mostly striving for faithfulness to the canon Midnight Crew "band," as can be seen in <a href="http://www.mspaintadventures.com/extras/ps000018.html">the Extras page</a> wherein the MC fill 'em with midnight (bottom), so Hauntjam employs trombone, string bass, piano, clarinet, and sax (I forget which because I've lost the file and am not a band person, but I think it was alto). From there on, it was fairly straightforward to write a haunting refrain and then solos for each instrument. I will admit I got a little writerblock'd for the second part, which was sort of a brief modulation to the dominant, so it sounds a little strange. But it still has its own little charm, with the almost annoying trill put in for a spooky ghost-like effect. In Hauntjam, Bowman did some good stuff with bringing out moving parts in the first refrain. In Hauntjelly, [[artist:ian-taylor|Xerxes]] emphasizes the spookiness by changing instruments for more electric organ.
 
     <i>Michael Guy Bowman:</i>
     I also went ahead a dropped some good synths and fairly convincing drum part on Andrew Huo's "Hauntjam".
@@ -353,7 +353,7 @@ URLs:
 Track: Hauntjelly
 Artists:
 - Andrew Huo
-- Ian Taylor
+- artist:ian-taylor
 Art Tags:
 - The Felt
 - Felt Manor
diff --git a/album/oceanfables-ray-of-light.yaml b/album/oceanfables-ray-of-light.yaml
index 0fdc1ad2..2af32968 100644
--- a/album/oceanfables-ray-of-light.yaml
+++ b/album/oceanfables-ray-of-light.yaml
@@ -2,7 +2,7 @@ Album: 'Oceanfables: Ray of Light'
 Artists:
 - Ray "TheRadGuy" Mikey
 Date: March 18, 2022
-Date Added: August 26, 2023
+Date Added: August 18, 2023
 URLs:
 - https://nightslights.bandcamp.com/album/oceanfables-ray-of-light
 - https://www.youtube.com/watch?v=O_yN3ORNqI4
diff --git a/album/oceanfalls-vol-4.yaml b/album/oceanfalls-vol-4.yaml
index fd66efa4..1cc2c4da 100644
--- a/album/oceanfalls-vol-4.yaml
+++ b/album/oceanfalls-vol-4.yaml
@@ -1,6 +1,6 @@
 Album: Oceanfalls Vol. 4
 Date: January 25, 2023
-Date Added: August 26, 2023
+Date Added: August 18, 2023
 URLs:
 - https://nightslights.bandcamp.com/album/oceanfalls-vol-4
 - https://www.youtube.com/watch?v=FCYAQhBv0kE
diff --git a/album/oceanfalls-vol-five.yaml b/album/oceanfalls-vol-five.yaml
index 048495eb..1027ac7a 100644
--- a/album/oceanfalls-vol-five.yaml
+++ b/album/oceanfalls-vol-five.yaml
@@ -1,6 +1,6 @@
 Album: Oceanfalls Vol. Five
 Date: May 17, 2023
-Date Added: Auguest 26, 2023
+Date Added: August 18, 2023
 URLs:
 - https://nightslights.bandcamp.com/album/oceanfalls-vol-five
 - https://www.youtube.com/watch?v=V4Jr3MlfWA4
diff --git a/album/references-beyond-homestuck.yaml b/album/references-beyond-homestuck.yaml
index 4ee6e5da..da13524f 100644
--- a/album/references-beyond-homestuck.yaml
+++ b/album/references-beyond-homestuck.yaml
@@ -631,14 +631,6 @@ Commentary: |-
     Terra is one of a few tracks I managed to finish in 2009, and is also the first track that I started using my current logo in, however in a much earlier form.
     This song was originally intended to be used in a game, however, it never came to fruition.
 ---
-Track: The Sweet Science
-Artists:
-- Vulfpeck
-Duration: '1:56'
-URLs:
-- https://vulfpeck.bandcamp.com/track/the-sweet-science
-- https://www.youtube.com/watch?v=dw42Ym3KAYw
----
 Track: the Chillest Beat
 Artists:
 - Clark Powell
@@ -1151,10 +1143,11 @@ Duration: '2:29'
 URLs:
 - https://www.youtube.com/watch?v=180sjeAMKPE
 ---
-Track: Crazy Bus Title Screen
+Track: CRAZYBUS Title Screen
 # No official release
 Artists:
-- Nicolás Maduro
+- CRAZYBUS
+- Tom Scripts
 Duration: '3:49'
 URLs:
 - https://www.youtube.com/watch?v=sC0cvwnG0Ik
@@ -1207,185 +1200,139 @@ URLs:
 Track: Do the Bartman
 Artists:
 - Bryan Loren
+Contributors:
+- Nancy Cartwright (vocals)
+- Michael Jackson (vocals)
+- Dan Castellaneta (additional voices)
+- Julie Kavner (additional voices)
+- Yeardley Smith (additional voices)
+- Matt Groening (additional voices)
 URLs:
 - https://www.youtube.com/watch?v=B-W6punNMjU
 Lyrics: |-
+    (Bart? Bart! Bart! BAAAART!) (I didn't do it. Nobody saw me do it. You can't prove anything.)
+
     Yo! Hey, what's happening, dude?
-    I'm the guy with the rep for being rude.
-    Terrorizing people wherever I go,
-    It's not intentional, just keepin' the flow.
+    I'm the guy with the rep for being rude
+    Terrorizing people wherever I go
+    It's not intentional, just keepin' the flow
     
-    Fixin' test scores to get the best scores.
-    Droppin' banana peels all over the floor.
-    I'm the kid that made delinquency an art,
-    Last name Simpson, first name Bart.
+    Fixin' test scores to get the best scores
+    Droppin' banana peels all over the floor
+    I'm the kid that made delinquency an art
+    Last name Simpson, first name Bart!
     
-    I'm here today to introduce the next phase,
-    The next step in the big Bart craze.
-    I've got a dance real easy to do;
-    I learned it with no rhythm, and so can you.
+    I'm here today to introduce the next phase
+    The next step in the big Bart craze
+    I've got a dance real easy to do
+    I learned it with no rhythm, and so can you! (Uh!)
     
-    So move your body if you've got the notion,
-    Front to back in a rock-like motion.
-    Now that you've got it, if you think you can,
-    Do it to the music--that's the Bartman.
+    So move your body if you've got the notion
+    Front to back in a rock-like motion
+    Now that you've got it, if you think you can
+    Do it to the music, that's the Bartman!
     
-    Everybody, if you can, do the Bartman.
-    Whoa!
-    Shake your body, turn it out if you can, man.
-    Shake it out, man!
-    Front to the back, to the side if you can, can.
-    Bartman!
-    Everybody in the house do the Bartman.
-    Uh-huh.
-    Everybody, if you can, do the Bartman.
-    Shake your body, turn it out if you can, man.
-    Whoa, mama!
-    Front to the back, to the side if you can, can.
-    Whoa.
-    Everybody in the house do the Bartman.
+    Everybody, if you can, do the Bartman (Whoa!)
+    Shake your body, turn it out if you can, man (Shake it out, man!)
+    Front to the back, to the side if you can, can (Bartman!)
+    Everybody in the house do the Bartman (Uh-huh)
+    Everybody, if you can, do the Bartman
+    Shake your body, turn it out if you can, man (Whoa, mama!)
+    Front to the back, to the side if you can, can (Whoa)
+    Everybody in the house do the Bartman
     
-    It wasn't long ago, just a couple of weeks,
-    I got in trouble, yeah, pretty deep.
-    Homer was yellin',
-    Bart!
-    Mom was too,
-    Because I put mothballs in the beef stew.
-    Punishment time, in the air lurks gloom,
-    Sitting by myself, confined to my room.
-    When all else fails, nothin' else left to do,
-    I turn on the music, so I can feel the groove.
+    It wasn't long ago, just a couple of weeks
+    I got in trouble, yeah, pretty deep
+    Homer was yellin' (Bart!) Mom was too
+    Because I put mothballs in the beef stew
+
+    Punishment time, in the air lurks gloom
+    Sitting by myself, confined to my room
+    When all else fails, nothin' else left to do
+    I turn on the music, so I can feel the groove
     
-    Move your body, if you've got the notion.
-    Whoa, I'm feelin' the groove now, baby!
-    Front to back in a rock-like motion.
-    Bring it back, whoa!
-    Move you hips from side to side now.
-    Do the Bartman!
-    Don't ya slip, let your feet glide now.
-    Whoa, Lisa. Ha!
-    If ya got the groove, ya gotta use it.
-    Ha, ha, ha!
-    Light rhythm in time with the music.
-    Ha, ha, ha. Check it out, man.
-    You just might start a chain reaction.
-    If you can do the Bart, you're bad like Michael Jackson.
+    Move your body, if you've got the notion (Whoa, I'm feelin' the groove now, baby!)
+    Front to back in a rock-like motion (Bring it back, whoa!)
+    Move you hips from side to side now (Do the Bartman!)
+    Don't ya slip, let your feet glide now (Whoa, Lisa, ha!)
+    If ya got the groove, ya gotta use it (Ha, ha, ha!)
+    Light rhythm in time with the music (Ha, ha, ha, check it out, man)
+    You just might start a chain reaction
+    If you can do the Bart, you're bad like Michael Jackson
     
-    Everybody, if you can, do the Bartman.
-    Oh, yeah!
-    Shake your body, turn it out if you can, man.
-    Shake yo' body!
-    Front to the back, to the side if you can, can.
-    Huh!
-    Everybody in the house do the Bartman.
-    Yeah, do the Bartman.
-    Everybody, if you can, do the Bartman.
-    Everybody, yeah, do the Bartman.
-    Shake your body, turn it out if you can, man.
-    Shake it out.
-    Front to the back, to the side if you can, can.
-    Whoa, mama.
-    Everybody in the house do the Bartman.
-    I'm bad, I'm bad!
+    Everybody, if you can, do the Bartman (Oh, yeah!)
+    Shake your body, turn it out if you can, man (Shake yo' body!)
+    Front to the back, to the side if you can, can (Huh!)
+    Everybody in the house do the Bartman (Yeah, do the Bartman)
+    Everybody, if you can, do the Bartman (Everybody, yeah, do the Bartman)
+    Shake your body, turn it out if you can, man (Shake it out)
+    Front to the back, to the side if you can, can (Whoa, mama!)
+    Everybody in the house do the Bartman (I'm bad, I'm bad)
     
-    Do the Bartman.
-    Do the Bartman!
-    Everybody back and forth, from side to side.
-    Do the Bartman.
-    Do the Bartman!
+    Do the Bartman (Do the Bartman!)
+    Everybody back and forth, from side to side
+    Do the Bartman (Do the Bartman!)
     Pick your feet up off the floor, let 'em glide!
-    Do the Bartman.
-    Do the Bartman!
-    She can do it, he can do it, so can I.
-    Do the Bartman.
-    Do the Bartman!
-    Now here's a dance beat that you can't deny.
+    Do the Bartman (Do the Bartman!)
+    She can do it, he can do it, so can I
+    Do the Bartman (Do the Bartman!)
+    Now here's a dance beat that you can't deny
     
-    Turn it down! Will you stop that infernal racket?!
-    Do the Bartman!
-    
-    Oh, my ears! Lisa! Put that saxophone away!
-    You can't touch this.
-    I didn't do it. Nobody saw me do it. You can't prove anything.
-    
-    Oops!
+    (Turn it down! Will you stop that infernal racket?!)
+    Do the Bartman!    
+    (Oh, my ears! Lisa! Put that saxophone away! You can't touch this! I didn't do it. Nobody saw me do it. You can't prove anything.)
     
-    Now I'm in the house, feeling good to be home,
-    Till Lisa starts blowing that damn saxophone.
-    And if it was mine, you know they'd take it away,
-    But still I'm feeling good, so that's okay.
+    Now I'm in the house, feeling good to be home
+    'Till Lisa starts blowing that damn saxophone
+    And if it was mine, you know they'd take it away
+    But still I'm feeling good, so that's okay
     
-    I'm up in my room, just a singin' a song,
-    Listen to the kick drum, kickin' along.
-    Yeah, Lisa likes jazz; she's their number one fan,
-    But I know I'm bad, 'cause I do the Bartman.
+    I'm up in my room, just a singin' a song
+    Listen to the kick drum, kickin' along
+    Yeah, Lisa likes jazz; she's their number one fan
+    But I know I'm bad, 'cause I do the Bartman
     
-    Everybody, if you can, do the Bartman.
-    Hey, everybody!
-    Shake your body, turn it out if you can, man.
-    Need I remind you?
-    Front to the back, to the side if you can, can.
-    I am Bart, Bart-man.
-    Everybody in the house do the Bartman.
-    Shake it out.
+    Everybody, if you can, do the Bartman (Hey, everybody!)
+    Shake your body, turn it out if you can, man (Need I remind you?)
+    Front to the back, to the side if you can, can (Uh! I am Bart, Bart-man. Huh)
+    Everybody in the house do the Bartman (Shake it out.)
     
-    Do the Bartman.
-    Do the Bartman!
-    Everybody back and forth, from side to side.
-    Do the Bartman.
-    Do the Bartman!
-    She can do it, he can do it, so can I.
+    Do the Bartman (Do the Bartman!)
+    Everybody back and forth, from side to side
+    Do the Bartman (Do the Bartman!)
+    She can do it, he can do it, so can I
     
-    Move your body, if you've got the notion.
-    Move it.
-    Front to back in a rock-like motion.
-    Swing it!
-    Move your hips from side to side now.
-    Don't ya slip, let your feet glide now.
-    If ya got the groove, ya gotta use it.
-    Dooby, dooby, dooby, dooby, doo, wop, bop, bop!
-    Light rhythm in time with the music.
-    Dabba doo, dabba doo, dab it!
-    You just might start a chain reaction.
-    Dabba dab, doo dab
-    Hee, hee, hee. I'm a Bartman.
+    Move your body, if you've got the notion (Move it)
+    Front to back in a rock-like motion (Swing it!)
+    Move your hips from side to side now
+    Don't ya slip, let your feet glide now
+    If ya got the groove, ya gotta use it (Dooby, dooby, dooby, dooby, doo, wop, bop, bop!)
+    Light rhythm in time with the music (Dabba doo, dabba doo, dab it!)
+    You just might start a chain reaction (Dabba dab, doo dab)
+    Hee, hee, hee, I'm a Bartman
     
-    Everybody, if you can, do the Bartman.
-    Swing it, baby.
-    Shake your body, turn it out if you can, man.
-    Hoo-uh.
-    Front to the back, to the side if you can, can.
-    Oh yeah. I'm bad. Real bad.
-    Everybody in the house do the Bartman.
-    Whoa, mama.
+    Everybody, if you can, do the Bartman (Swing it, baby)
+    Shake your body, turn it out if you can, man (Hoo-uh)
+    Front to the back, to the side if you can, can. (Oh yeah. I'm bad. Real bad.)
+    Everybody in the house do the Bartman (Whoa, mama)    
+    Everybody, if you can, do the Bartman (Do the Bartman)
+    Shake your body, turn it out if you can, man
+    Front to the back, to the side if you can, can (Ha, ha!)
+    Everybody in the house do the Bartman (Oh yeah!)
     
-    Everybody, if you can, do the Bartman.
-    Do the Bartman.
-    Shake your body, turn it out if you can, man.
-    Front to the back, to the side if you can, can.
-    Ha, ha!
-    Everybody in the house do the Bartman.
-    Oh yeah!
+    Do the Bartman!    
+    Move your body, if you've got the notion (You call that dancing? Ha!)
+    Front to back in a rock-like motion (Watch this move) (Do the Bartman)
+    Move you hips from side to side now (Ooh, uh uh, uh, ai, ai, yeah!) (Everybody in the house do the Bartman)
     
-    Do the Bartman.
-    
-    Move your body, if you've got the notion.
-    You call that dancing? Ha!
-    Front to back in a rock-like motion.
-    (Do the Bartman)
-    Watch this move.
-    Move you hips from side to side now.
-    (Everybody in the house do the Bartman)
-    Ooh, uh uh, uh, ai, ai. Yeah!
-    Don't ya slip, let your feet glide now.
-    (Do the Bartman)
-    If ya got the groove, ya gotta use it.
-    Ha, ha, ha! Swing it!
-    Jack your body in time with the music.
-    You just might start a chain reaction.
-    Eat your heart out, Michael! Woop!
-    Everybody in the house do the Bartman.
-    Do the Bartman.
+    Don't ya slip, let your feet glide now (Do the Bartman)
+    If ya got the groove, ya gotta use it (Ha, ha, ha! Swing it!)
+    Jack your body in time with the music
+    You just might start a chain reaction (Eat your heart out, Michael! Woop!)
+    Everybody in the house do the Bartman
+    Do the Bartman!
+
+    (You're grounded!) (Oh, wow, man!)
 ---
 Track: Doctor Frog
 # Track named in-game, no official releases
@@ -1620,7 +1567,8 @@ URLs:
 - https://www.youtube.com/watch?v=hrJNgLGbYg0
 ---
 Track: Focus
-Artists: 
+Artists:
+- Super Hexagon
 - Chipzel
 Duration: '2:42'
 URLs:
@@ -1663,6 +1611,7 @@ URLs:
 Track: Gardens 1 (Scribblenauts)
 # No official release of the in-game track (or Scribblenauts' in-game soundtrack at all)
 Artists:
+- Scribblenauts
 - David J. Franco
 URLs:
 - https://www.youtube.com/watch?v=Nstqu4RpsMA
@@ -1737,6 +1686,9 @@ Artists:
 - Jun Ishikawa
 URLs:
 - https://www.youtube.com/watch?v=Se1uh3PS78Y
+Commentary: |-
+    <i>Niklink:</i>
+    Also known as 'Get Up and Go-urmet!' and 'Gourmet Go Go'.
 ---
 Track: Ground Theme (Super Mario Bros.)
 # SMB soundtrack was released on vinyl and cassette simultaneously, the cassette release (linked below) has an extra track (SMB Suite) but the first track is the same duration, at least.
@@ -1798,6 +1750,14 @@ URLs:
 - https://www.youtube.com/watch?v=RPLz7UIeQv8
 - https://open.spotify.com/track/4F9muAB4BFreVBPDW6mVVi
 ---
+Track: Harmony
+Artists:
+- Runescape
+- artist:ian-taylor-runescape
+Duration: '3:07'
+URLs:
+- https://www.youtube.com/watch?v=0Z3odpfwCpE
+---
 Track: Hero's End
 # The original Cave Story's soundtrack hasn't been officially released.
 Artists:
@@ -1835,57 +1795,6 @@ Artists:
 URLs:
 - https://www.youtube.com/watch?v=PNYL4w-qxcE
 ---
-Track: I Don't Want To Set The World On Fire
-Artists:
-- The Ink Spots
-URLs:
-- https://www.youtube.com/watch?v=TmIwm5RElRs
-Lyrics: |-
-    I don't want to set the world on fire
-    I just want to start
-    A flame in your heart
-    
-    In my heart, I have but one desire
-    And that one is you
-    No other will do
-    
-    I've lost all ambition
-    For worldly acclaim
-    I just want to be the one you love
-    And with your admission
-    That you feel the same
-    I'll have reached the goal I'm dreaming of
-    Believe me
-    
-    I don't want to set the world on fire
-    I just want to start
-    A flame in your heart
-    
-    I don't want to set the world on fire, honey
-    I love you too much
-    I just want to start
-    A great big flame
-    Down in your heart
-    
-    You see
-    Way down inside of me
-    Darlin', I have only one desire
-    And that one desire is you
-    And I know
-    Nobody else ain't gonna do
-    
-    I've lost all ambition
-    For worldly acclaim
-    I just want to be the one you love
-    And with your admission
-    That you feel the same
-    I'll have reached the goal I'm dreaming of
-    Believe me
-    
-    I don't want to set the world on fire
-    I just want to start
-    A flame in your heart
----
 Track: Icirrus City
 # JP: セッカシティ
 # Official release:
@@ -2200,7 +2109,6 @@ Lyrics: |-
     Saa mae wo muite yukou (<i>So face forward and keep going!</i>)
 ---
 Track: The Masked King
-# Almost universally known as "Masked Dedede" in all but the compilation release
 # Official release:
 #  The Masked King in Kirby's Dream Collection Special Edition Compilation Soundtrack
 # Reference: 
@@ -2211,6 +2119,9 @@ Artists:
 Duration: '1:10'
 URLs:
 - https://www.youtube.com/watch?v=DCE1HizbnTU
+Commentary: |-
+    <i>Niklink:</i>
+    Commonly known as 'Masked Dedede's Theme' but never explicitly named as such, this name is instead taken from a compilation album, the only time it's been released.
 ---
 Track: Maya Fey - Turnabout Sisters 2001
 # JP: 綾里真宵　～逆転姉妹のテーマ 2001
@@ -2246,17 +2157,13 @@ Track: Menu (Super Smash Bros. for Nintendo 3DS / Wii U)
 #   大乱闘スマッシュブラザーズ for Nintendo 3DS / for Wii U 特選サウンドテスト
 # Reference:
 #   https://vgmdb.net/album/50394
+Artists:
+- Super Smash Bros.
+- Junichi Nakatsuru
 Duration: '2:12'
 URLs:
 - https://www.youtube.com/watch?v=Z2OjZM9Qvpc
 ---
-Track: Miserlou
-Artists:
-- Dick Dale
-URLs:
-- https://www.youtube.com/watch?v=MXB6T55oytE
-- https://dickdale.bandcamp.com/track/miserlou
----
 Track: Moon Over the Castle
 # Original release:
 #   グランツーリスモ オリジナル・ゲームサウンドトラック
@@ -2385,6 +2292,15 @@ URLs:
 - https://souleyedigitalmusic.bandcamp.com/track/pushing-onwards
 - https://www.youtube.com/watch?v=25m3Gk7mRQM
 ---
+Track: Rainbow Road (Super Mario Kart)
+# No official release.
+Artists:
+- Super Mario
+- Soyo Oka
+Duration: '4:37'
+URLs:
+- https://www.youtube.com/watch?v=kR7azqI6wik
+---
 Track: Reconstructing More Science
 # Official release in a lovely free download
 # Reference:
@@ -2450,6 +2366,7 @@ Lyrics: |-
 Track: RoboCop Gameboy Title Theme
 # No official release. Duration and name taken from oldest upload.
 Artists:
+- RoboCop
 - Jonathan Dunn
 Duration: '5:46'
 URLs:
@@ -2776,10 +2693,11 @@ Referenced Tracks:
 ---
 Track: Space Pirates
 Artists:
+- Castle Crashers
 - Waterflame
-Duration: '2:45'
+Duration: '2:59'
 URLs:
-- https://www.youtube.com/watch?v=Cu7HaeRHMhM
+- https://waterflame.bandcamp.com/track/space-pirates
 ---
 Track: Splatoon "Squid Kid" TV Commercial
 # This is a TV ad.
@@ -3252,56 +3170,56 @@ Duration: '4:05'
 URLs:
 - https://www.youtube.com/watch?v=k8ozVkIkr-g
 Lyrics: |-
-    Zankoku na tenshi no you ni
-    Shonen yo, shinwa ni nare...
-
-    Aoi kaze ga ima mune no doa wo tataitemo,
-    Watashi dake wo tada mitsumete
-    Hohoenderu Anata
-    Sotto Fureru mono
-    Motomeru koto ni muchuu de,
-    Unmei sae mada shiranai itaikena hitomi
-
-    Dakedo itsuka kizuku deshou
-    Sono senaka ni wa
-    Haruka mirai mezasu tame no
-    Hane ga aru koto...
-
-    Zankoku na tenshi no te-ze
-    Madobe kara yagate tobitatsu
-    Hotobashiru atsui patosu de
-    Omoide wo uragiru nara
-    O-zora wo daite kagayaku
-    Shonen yo, shinwa ni nare
-
-    Zutto nemutteru watashi no ai no yurikago
-    Anata dake ga yume no shisha ni
-    Yobareru asa ga kuru
-    Hosoi kubisuji wo tsukiakari ga utsushiteru
-    Sekai-ju- no toki wo tomete
-    Tojikometai kedo...
-
-    Moshi mo futari aeta koto ni imi ga aru nara,
-    Watashi wa, sou, jiyu- wo shiru
-    Tame no Baiburu
-
-    Zankoku na tenshi no te-ze
-    Kanashimi ga soshite hajimaru
-    Dakishimeta inochi no katachi
-    Sono yume ni mezameta toki
-    Dare yori mo hikari wo hanatsu
-    Shonen yo, shinwa ni nare
-
-    Hito wa ai wo tsumugi nagara rekishi wo tsukuru
-    Megami nante narenai mama
-    Watashi wa ikiru...
-
-    Zankoku na tenshi no te-ze
-    Madobe kara yagate tobitatsu
-    Hotobashiru atsui patosu de
-    Omoide wo uragiru nara
-    O-zora wo daite kagayaku
-    Shonen yo, shinwa ni nare
+    Zankoku na tenshi no you ni (<i>Like a cruel angel</i>)
+    Shonen yo, shinwa ni nare (<i>Young boy, become the legend!</i>)
+
+    Aoi kaze ga ima mune no doa wo tataitemo (<i>A blue wind is now knocking at the door to your heart, and yet</i>)
+    Watashi dake wo tada mitsumete (<i>You are merely gazing at me</i>)
+    Hohoenderu Anata (<i>And smiling</i>)
+    Sotto Fureru mono (<i>Something gently touching</i>)
+    Motomeru koto ni muchuu de (<i>You're so intent on seeking it out</i>)
+    Unmei sae mada shiranai itaikena hitomi (<i>That you can't even see your fate yet with such innocent eyes</i>)
+
+    Dakedo itsuka kizuku deshou (<i>But someday I think you'll find out</i>)
+    Sono senaka ni wa (<i>That what's on your back</i>)
+    Haruka mirai mezasu tame no (<i>Are wings that are for</i>)
+    Hane ga aru koto (<i>Heading for the far-off future</i>)
+
+    Zankoku na tenshi no te-ze (<i>The cruel angel's thesis</i>)
+    Madobe kara yagate tobitatsu (<i>Will soon take flight through the window</i>)
+    Hotobashiru atsui patosu de (<i>With surging, hot pathos</i>)
+    Omoide wo uragiru nara (<i>If you betray your memories</i>)
+    O-zora wo daite kagayaku (<i>Embracing this sky and shining</i>)
+    Shonen yo, shinwa ni nare (<i>Young boy, become the legend!</i>)
+
+    Zutto nemutteru watashi no ai no yurikago (<i>Sleeping for a long time in the cradle of my love</i>)
+    Anata dake ga yume no shisha ni (<i>The morning is coming when you alone will be called</i>)
+    Yobareru asa ga kuru (<i>By a messenger of dreams</i>)
+    Hosoi kubisuji wo tsukiakari ga utsushiteru (<i>Moonlight reflects off the nape of your slender neck</i>)
+    Sekai-ju- no toki wo tomete (<i>Stopping time all throughout the world</i>)
+    Tojikometai kedo (<i>I want to confine them, but</i>)
+
+    Moshi mo futari aeta koto ni imi ga aru nara (<i>So if two people being brought together by fate has any meaning</i>)
+    Watashi wa, sou, jiyu- wo shiru (<i>I think that it is a bible</i>)
+    Tame no Baiburu (<i>For learning freedom</i>)
+
+    Zankoku na tenshi no te-ze (<i>The cruel angel's thesis</i>)
+    Kanashimi ga soshite hajimaru (<i>The sorrow then begins</i>)
+    Dakishimeta inochi no katachi (<i>You held tight to the form of life</i>)
+    Sono yume ni mezameta toki (<i>When you woke up from that dream</i>)
+    Dare yori mo hikari wo hanatsu (<i>You shine brighter than anyone else</i>)
+    Shonen yo, shinwa ni nare (<i>Young boy, become the legend!</i>)
+
+    Hito wa ai wo tsumugi nagara rekishi wo tsukuru (<i>People create history while weaving love</i>)
+    Megami nante narenai mama (<i>Even knowing I'll never be a goddess or anything like that</i>)
+    Watashi wa ikiru (<i>I live on</i>)
+
+    Zankoku na tenshi no te-ze (<i>The cruel angel's thesis</i>)
+    Madobe kara yagate tobitatsu (<i>Will soon take flight through the window</i>)
+    Hotobashiru atsui patosu de (<i>With surging, hot pathos</i>)
+    Omoide wo uragiru nara (<i>If you betray your memories</i>)
+    O-zora wo daite kagayaku (<i>Embracing this sky and shining</i>)
+    Shonen yo, shinwa ni nare (<i>Young boy, become the legend!</i>)
 ---
 Track: Art of the Dress
 Artists:
@@ -3383,45 +3301,59 @@ URLs:
 Track: BLOODY STREAM
 Artists:
 - JoJo's Bizarre Adventure
-- artist:coda-jojo
+- artist:toshiyuki-omori (composition)
+- MACARONI☆ (arrangement)
+- Saori Kodama (lyrics)
+Contributors:
+- artist:coda-jojo (performance)
 Duration: '4:21'
 URLs:
 - https://www.youtube.com/watch?v=hmpJqJLsR48
 Lyrics: |-
-    Shijima no soko kara mezameru sono hashiratachi toki wo koe
-    Shinku no chishio ga tachiagaru yuuki wo hikiawaseru
+    Shijima no soko kara (<i>From the depths of silence </i>)
+    Mezameru sono hashiratachi toki wo koe (<i>Those pillars awaken beyond time</i>)
+    Shinku no chishio ga (<i>Crimson blood</i>)
+    Tachiagaru yuuki wo hikiawaseru (<i>That brings the courage to stand up</i>)
+
+    Uketsugu ai wo sadame to yobu nara (<i>If inherited love is called fate</i>)
+    Hohoemu me de tsugi no te wo (<i>Take your next step with smiling eyes</i>)
+
+    Yami wo azamuite setsuna wo kawashite (<i>Fool darkness, dodge in an instant</i>)
+    Yaiba surinuke yatsura no suki wo tsuke (<i>Avoid the blade, find an opening and strike</i>)
+    Tsuranuita omoi ga mirai wo hiraku (<i>Penetrating feelings open the future</i>)
 
-    Uketsugu ai wo sadame to yobu nara
-    Hohoemu me de tsugi no te wo
+    Like a Bloody Storm atsuku Like a Bloody Stone (<i>Like a bloody storm, hot like a bloody stone</i>)
+    Ketsumyaku ni kizamareta innen ni (<i>The destiny written into your lineage</i>)
+    Ukiagaru kienai hokori no kizuna (<i>The undying bonds of honor arise</i>)
+    Nigirishimete (<i>Take hold of them</i>)
 
-    Yami wo azamuite setsuna wo kawashite
-    Yaiba surinuke yatsura no suki wo tsuke
-    Tsuranuita omoi ga mirai wo hiraku
-    Like a Bloody Storm atsuku Like a Bloody Stone
-    Ketsumyaku ni kizamareta innen ni
-    Ukiagaru kienai hokori no kizuna nigirishimete
+    Minagiru chikara ni (<i><The rising power</i>)
+    Uchitsukeru kodou wa akashi tomo no koe (<i>Hit by your heartbeat is the proof of a friend's voice</i>)
+    Nijinda itami to (<i>With blurred pain</i>)
+    Ima ikinuku imi wo kawashi nagara (<i>Now while you exchange the meaning of surviving</i>)
 
-    Minagiru chikara ni uchitsukeru kodou wa akashi tomo no koe
-    Nijinda itami to ima ikinuku imi wo kawashi nagara
+    Omae no ishi ga yoake wo michibiku (<i>Your will leads the dawn</i>)
+    Mabayui hodo no kedakasa de (<i>With dazzling nobility</i>)
 
-    Omae no ishi ga yoake wo michibiku
-    Mabayui hodo no kedakasa de
+    Hikari sasu oka e shakunetsu no sora e (<i>Towards the shining hills, towards the scorching sky</i>)
+    Tamashii ga butsukariau tabiji e (<i>Towards the journey where souls collide</i>)
+    Kanashimi ni nurareta mirai wo sukue (<i>Save a future painted with sadness</i>)
 
-    Hikari sasu oka e shakunetsu no sora e
-    Tamashii ga butsukariau tabiji e
-    Kanashimi ni nurareta mirai wo sukue
-    Like a Bloody Soul moyase Like a Bloody Star
-    Honoo saki kaze wo tachi sono saki e
-    Osorezu ni nani mo tamerawazu susume nagare no naka
+    Like a Bloody Soul moyase Like a Bloody Star (<i>Like a bloody soul, burn up like a bloody star</i>)
+    Honoo saki kaze wo tachi sono saki e (<i>Cut the tearing wind of fire and go beyond</i>)
+    Osorezu ni nani mo tamerawazu susume  (<i>Don't be afraid at all and advance without hesitation</i>)
+    Nagare no naka (<i>In the stream</i>)
 
-    Kyoumei suru unmei no hamon kokoro ni
+    Kyoumei suru unmei no hamon kokoro ni (<i>Let the ripple of destiny resonate in your heart</i>)
 
-    Yami wo azamuite setsuna wo kawashite
-    Yaiba surinuke yatsura no suki wo tsuke
-    Tsuranuita omoi ga mirai wo hiraku
-    Like a Bloody Storm atsuku Like a Bloody Stone
-    Ketsumyaku ni kizamareta innen ni
-    Ukiagaru kienai hokori no kizuna nigirishimete
+    Yami wo azamuite setsuna wo kawashite (<i>Fool darkness, dodge in an instant</i>)
+    Yaiba surinuke yatsura no suki wo tsuke (<i>Avoid the blade, find an opening and strike</i>)
+    Tsuranuita omoi ga mirai wo hiraku (<i>Penetrating feelings open the future</i>)
+
+    Like a Bloody Storm atsuku Like a Bloody Stone (<i>Like a bloody storm, hot like a bloody stone</i>)
+    Ketsumyaku ni kizamareta innen ni (<i>The destiny written into your lineage</i>)
+    Ukiagaru kienai hokori no kizuna (<i>The undying bonds of honor arise</i>)
+    Nigirishimete (<i>Take hold of them</i>)
 ---
 Track: Burn
 Artists:
@@ -3586,50 +3518,51 @@ Track: chase
 Artists:
 - JoJo's Bizarre Adventure
 - batta
+- Tatsu Hoshino (lyrics)
 Duration: '2:25'
 URLs:
 - https://www.youtube.com/watch?v=eiHqkDoFFFU
 Lyrics: |-
-    Taisetsu na mono wo ubawaresou
-    Nichijou ni magirekonda akuma
-    Heion nara tokku ni kuzuresatteru
+    Taisetsu na mono wo ubawaresou (<i>My most precious things seem about to be stolen</i>)
+    Nichijou ni magirekonda akuma (<i>By a demon that's burrowed into my everyday life</i>)
+    Heion nara tokku ni kuzuresatteru (<i>My peaceful moments have already collapsed</i>)
 
-    Nanigenai soshite, sarigenai
-    Kidzukanai uchi ni ubawareteita
-    Torikaeshi ni iku nara ima sa
+    Nanigenai soshite, sarigenai (<i>Being unconcerned, so nonchalant, </i>)
+    Kidzukanai uchi ni ubawareteita (<i>Before I even noticed, it'd been torn away</i>)
+    Torikaeshi ni iku nara ima sa (<i>If I'm gonna get it back, I have to act right away!</i>)
 
-    Tsuranuita ya no you na surudosa de
-    Butsukeau kokoro wa utsukushii
+    Tsuranuita ya no you na surudosa de (<i>With the sharpness of a piercing arrow</i>)
+    Butsukeau kokoro wa utsukushii (<i>These colliding hearts are a thing of beauty!</i>)
 
-    Doko mademo Chase You
-    Itsumo Chase You
-    Ore wa Chase You nigeba wa nai
-    Hashiridase Chase You
-    Asu mo Chase You
-    Tatakitsuketeyaru nosa
+    Doko mademo Chase You (<i>I'll chase you anywhere</i>)
+    Itsumo Chase You (<i>I'll chase you anytime</i>)
+    Ore wa Chase You nigeba wa nai (<i>You know I'll chase you, there is no escape </i>)
+    Hashiridase Chase You (<i>Start running, chase you</i>)
+    Asu mo Chase You (<i>Again tomorrow, chase you</i>)
+    Tatakitsuketeyaru nosa (<i>Until I've kicked your goddamn ass!</i>)
 
-    Shouhai wo wakeru nowa
-    Shuunen sa dakara I Chase You
+    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>)
 
-    Tsuranuita ya no you na surudosa de
-    Butsukeau kokoro wa utsukushii
+    Tsuranuita ya no you na surudosa de (<i>With the sharpness of a piercing arrow</i>)
+    Butsukeau kokoro wa utsukushii (<i>These colliding hearts are a thing of beauty!</i>)
 
-    Doko mademo Chase You
-    Itsumo Chase You
-    Ore wa Chase You nigeba wa nai
-    Hashiridase Chase You
-    Asu mo Chase You
-    Tatakitsuketeyaru nosa
+    Doko mademo Chase You (<i>I'll chase you anywhere</i>)
+    Itsumo Chase You (<i>I'll chase you anytime</i>)
+    Ore wa Chase You nigeba wa nai (<i>You know I'll chase you, there is no escape </i>)
+    Hashiridase Chase You (<i>Start running, chase you</i>)
+    Asu mo Chase You (<i>Again tomorrow, chase you</i>)
+    Tatakitsuketeyaru nosa (<i>Until I've kicked your goddamn ass!</i>)
 
     Ch ch chase You
     Ch ch chase You
-    Ch ch chase You yume wo miteita yo
+    Ch ch chase You yume wo miteita yo (<i>I've been chasing this dream</i>)
 
     Ch ch chase You
-    Ch ch chase You mada same wa shinai
+    Ch ch chase You mada same wa shinai (<i>Still not ready to wake up</i>)
 
-    Shouhai wo wakeru nowa
-    Shuunen sa dakara I Chase You
+    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: Courage
 Artists:
@@ -4789,13 +4722,6 @@ Lyrics: |-
     Da-da-da-dee-da-da dum
     Da-da-da-da-dee-da-da-doo
 ---
-Track: Rainbow Road
-Artists:
-- Soyo Oka
-Duration: '4:37'
-URLs:
-- https://www.youtube.com/watch?v=kR7azqI6wik
----
 Track: Ratboy Genius Theme Song
 Artists:
 - Ratboy Genius
@@ -5328,15 +5254,6 @@ Lyrics: |-
     O-o-o-o-of
     Lo-o-o-o-ove
 ---
-Track: Stronger Than You (Instrumental)
-Artists:
-- Mémoire
-- Steven Universe
-- Rebecca Sugar
-Duration: '2:52'
-URLs:
-- https://www.youtube.com/watch?v=4kRu6grBiGY
----
 Track: Supercalifragilisticexpialidocious
 Artists:
 - Mary Poppins
@@ -7120,12 +7037,6 @@ Artists:
 URLs:
 - https://www.youtube.com/watch?v=kLp_Hh6DKWc
 ---
-Track: It's Beginning to Look a Lot Like Christmas
-Artists:
-- Meredith Willson
-URLs:
-- https://www.youtube.com/watch?v=aiQh7ir0TXI
----
 Track: Johnny Fill Up the Bowl
 Artists:
 - Traditional
@@ -7494,6 +7405,43 @@ Commentary: |-
     
     The words are from the King James Bible, Revelation 19:6, 11:15, and 19:16. The Book of Revelation claims to be written by 'John' on the island of Patmos. Christian tradition claims this to be John the Apostle and also John the Evangelist (author of the Gospel of John), but scholars generally consider these to be three different people and separate the author of Revelation as 'John of Patmos'.
 ---
+Track: Misirlou
+Artists:
+- Traditional
+URLs:
+- https://www.youtube.com/watch?v=LW6qGy3RtwY
+Lyrics: |-
+    Misirlou mou ee glikia sou ee matia (<i>My Egyptian girl, your sweet gaze</i>)
+    Floga m'ehi anapsi mes'stin kardia (<i>Lit a flame in my heart</i>)
+    Ah, ya habibi, ah ya leleli ah (<i>Oh my love, oh leleli</i>)
+    Ta dio sou hili stazoune meli aman (<i>Your two lips are dripping honey, oh my</i>)
+    
+    Aman Misirlou (<i>Oh my, Egyptian girl!</i>)
+    Trela tha m'erthi, den ipofero pia (<i>Craziness will come to me, I can't suffer any more!</i>)
+    Ah tha se klepso mesa ap'tin Arapia (<i>Oh, I will kidnap you from inside Arabia!</i>)
+    
+    Aman Misirlou (<i>Oh my, Egyptian girl!</i>)
+    Trela tha m'erthi, den ipofero pia (<i>Craziness will come to me, I can't suffer any more!</i>)
+    Ah tha se klepso mesa ap'tin Arapia (<i>Oh, I will kidnap you from inside Arabia!</i>)
+    
+    Mavromata Misirlou mou treli (<i>My crazy black-eyed Egyptian</i>)
+    Ti zoi mou allazo m'ena fili (<i>My life I change with one kiss</i>)
+    Ah ya habibi m'ena filaki ah <i>Oh my love, with one kiss, oh</i>)
+    Ap'to diko sou to stomataki, aman (<i>From your mouth, oh my!</i>)
+    
+    Aman Misirlou (<i>Oh my, Egyptian girl!</i>)
+    Trela tha m'erthi, den ipofero pia (<i>Craziness will come to me, I can't suffer any more!</i>)
+    Ah tha se klepso mesa ap'tin Arapia (<i>Oh, I will kidnap you from inside Arabia!</i>)
+    
+    Aman Misirlou (<i>Oh my, Egyptian girl!</i>)
+    Trela tha m'erthi, den ipofero pia (<i>Craziness will come to me, I can't suffer any more!</i>)
+    Ah tha se klepso mesa ap'tin Arapia (<i>Oh, I will kidnap you from inside Arabia!</i>)
+    
+    Aman Misirlou (<i>Oh my, Egyptian girl!</i>)
+Commentary: |-
+    <i>Niklink:</i>
+    This folk dates back to at least the 1920s, but its origins probably lie further back. The title ('Μισιρλού') translates to 'Egyptian (feminine)' therefore this song is also known as 'Egyptian Girl'. The earliest known recording by Theodotos Demetriades, from 1927, is linked.
+---
 Track: Moonlight Sonata
 Artists:
 - Ludwig van Beethoven
@@ -8250,40 +8198,40 @@ Artists:
 URLs:
 - https://www.youtube.com/watch?v=jBwL3y-Wlms
 Lyrics: |-
-    We Three Kings of Orient are,
-    Bearing gifts we traverse afar,
-    Field and fountain,
-    Moor and mountain,
-    Following yonder Star.
-
-    O Star of Wonder, Star of Night,
-    Star with Royal Beauty bright,
-    Westward leading,
-    Still proceeding,
-    Guide us to Thy perfect Light.
-
-    Born a King on Bethlehem plain,
-    Gold I bring to crown Him again,
-    King for ever,
+    We Three Kings of Orient are
+    Bearing gifts we traverse afar
+    Field and fountain
+    Moor and mountain
+    Following yonder Star
+
+    O Star of Wonder, Star of Night
+    Star with Royal Beauty bright
+    Westward leading
+    Still proceeding
+    Guide us to Thy perfect Light
+
+    Born a King on Bethlehem plain
+    Gold I bring to crown Him again
+    King for ever
     Ceasing never
-    Over us all to reign.
+    Over us all to reign
 
-    Frankincense to offer have I,
-    Incense owns a Deity nigh:
+    Frankincense to offer have I
+    Incense owns a Deity nigh
     Prayer and praising
-    All men raising,
-    Worship Him God on High.
+    All men raising
+    Worship Him God on High
 
     Myrrh is mine; its bitter perfume
-    Breathes a life of gathering gloom;—
-    Sorrowing, sighing,
-    Bleeding, dying,
-    Sealed in the stone-cold tomb.
+    Breathes a life of gathering gloom
+    Sorrowing, sighing
+    Bleeding, dying
+    Sealed in the stone-cold tomb
 
-    Glorious now behold Him arise,
-    King, and God, and Sacrifice;
-    Heav'n sings Hallelujah:
-    Hallelujah the earth replies.
+    Glorious now behold Him arise
+    King, and God, and Sacrifice
+    Heav'n sings Hallelujah
+    Hallelujah the earth replies
 ---
 Track: Westminister Quarters
 Artists:
@@ -12240,13 +12188,6 @@ URLs:
 - https://www.youtube.com/watch?v=6Nvf9y7G9zU
 - https://battleofthebits.org/arena/Entry/grrrarrr/6241/
 ---
-Track: Harmony
-Artists:
-- James Hannigan
-Duration: '3:07'
-URLs:
-- https://www.youtube.com/watch?v=0Z3odpfwCpE
----
 Track: Happy Happy Christmas
 # Also known as 'it is a mystery'
 Artists:
@@ -12327,54 +12268,54 @@ URLs:
 - https://www.youtube.com/watch?v=UYIAfiVGluk
 Lyrics: |-
     Where are we? What the hell is going on?
-    The dust has only just begun to fall,
-    Crop circles in the carpet, sinking, feeling.
-    Spin me 'round again and rub my eyes.
-    This can't be happening.
+    The dust has only just begun to fall
+    Crop circles in the carpet, sinking, feeling
+    Spin me 'round again and rub my eyes
+    This can't be happening
     When busy streets amass with people
-    Would stop to hold their heads heavy.
+    Would stop to hold their heads heavy
 
-    Hide and seek.
-    Trains and sewing machines.
-    All those years they were here first.
+    Hide and seek
+    Trains and sewing machines
+    All those years they were here first
 
     Oily marks appear on walls
-    Where pleasure moments hung before.
-    The takeover, the sweeping insensitivity of this still life.
+    Where pleasure moments hung before
+    The takeover, the sweeping insensitivity of this still life
 
-    Hide and seek.
-    Trains and sewing machines. (Oh, you won't catch me around here)
-    Blood and tears (hearts),
-    They were here first.
+    Hide and seek
+    Trains and sewing machines (Oh, you won't catch me around here)
+    Blood and tears (hearts)
+    They were here first
 
     Mmm, what you say?
-    Mm, that you only meant well? Well, of course you did.
+    Mm, that you only meant well? Well, of course you did
     Mmm, what you say?
-    Mm, that it's all for the best? Of course it is.
+    Mm, that it's all for the best? Of course it is
     Mmm, what you say?
-    Mm, that it's just what we need? And you decided this.
+    Mm, that it's just what we need? And you decided this
     What you say?
-    Mmm, what did She say?
-
-    Ransom notes keep falling out your mouth.
-    Mid-sweet talk, newspaper word cut-outs.
-    Speak no feeling, no I don't believe you.
-    You don't care a bit. You don't care a bit.
-
-    (hide and seek)
-    Ransom notes keep falling out your mouth.
-    Mid-sweet talk, newspaper word cut-outs.
-    (hide and seek)
-    Speak no feeling, no I don't believe you.
-    You don't care a bit. You don't care a bit.
-
-    (hide and seek)
-    You don't care a bit.
-    You don't care a bit.
-    You don't care a bit.
-    (hide and seek)
-    You don't care a bit.
-    You don't care a bit.
+    Mmm, what did you
+
+    Ransom notes keep falling out your mouth
+    Mid-sweet talk, newspaper word cut-outs
+    Speak no feeling, no I don't believe you
+    You don't care a bit. You don't care a bit
+
+    (Hide and seek)
+    Ransom notes keep falling out your mouth
+    Mid-sweet talk, newspaper word cut-outs
+    (Hide and seek)
+    Speak no feeling, no I don't believe you
+    You don't care a bit, you don't care a bit
+
+    (Hide and seek)
+    You don't care a bit
+    You don't care a bit
+    You don't care a bit
+    (Hde and seek)
+    You don't care a bit
+    You don't care a bit
 ---
 Track: Hip To Be Square
 Artists:
@@ -12876,9 +12817,96 @@ Lyrics: |-
     Down, down
     Oh, such a groove)
 ---
+Track: I Don't Want to Set the World on Fire
+Artists:
+- Bennie Benjamin
+- Eddie Durham
+- Sol Marcus
+- Eddie Seiler
+Contributors:
+- Harlan Leonard and his Rockets (performance)
+Duration: '2:57'
+URLs:
+- https://www.youtube.com/watch?v=lwixRNCE6Ls
+Lyrics: |-
+    I don't want to set the world on fire
+    I just want to start
+    A flame in your heart
+    
+    In my heart, I have but one desire
+    And that one is you
+    No other will do
+    
+    I've lost all ambition
+    For worldly acclaim
+    I just want to be the one you love
+    And with your admission
+    That you feel the same
+    I'll have reached the goal I'm dreaming of
+    
+    I don't want to set the world on fire
+    I just want to start
+    A flame in your heart
+---
+Track: I Don't Want to Set the World on Fire
+Directory: i-dont-want-to-set-the-world-on-fire-ink-spots
+Artists:
+- The Ink Spots
+Duration: '3:00'
+URLs:
+- https://www.youtube.com/watch?v=TmIwm5RElRs
+Referenced Tracks:
+- track:i-dont-want-to-set-the-world-on-fire
+Lyrics: |-
+    I don't want to set the world on fire
+    I just want to start
+    A flame in your heart
+    
+    In my heart, I have but one desire
+    And that one is you
+    No other will do
+    
+    I've lost all ambition
+    For worldly acclaim
+    I just want to be the one you love
+    And with your admission
+    That you feel the same
+    I'll have reached the goal I'm dreaming of
+    Believe me
+    
+    I don't want to set the world on fire
+    I just want to start
+    A flame in your heart
+    
+    I don't want to set the world on fire, honey
+    I love you too much
+    I just want to start
+    A great big flame
+    Down in your heart
+    
+    You see
+    Way down inside of me
+    Darlin', I have only one desire
+    And that one desire is you
+    And I know
+    Nobody else ain't gonna do
+    
+    I've lost all ambition
+    For worldly acclaim
+    I just want to be the one you love
+    And with your admission
+    That you feel the same
+    I'll have reached the goal I'm dreaming of
+    Believe me
+    
+    I don't want to set the world on fire
+    I just want to start
+    A flame in your heart
+---
 Track: I Love Kanye
 Artists:
 - Kanye West
+- Malik Jones
 Duration: '0:44'
 URLs:
 - https://www.youtube.com/watch?v=ch8g-sJb6ow
@@ -13103,6 +13131,53 @@ Lyrics: |-
 
     (Thanks, Lori.)
 ---
+Track: It's Beginning to Look a Lot Like Christmas
+Artists:
+- Meredith Willson
+URLs:
+- https://www.youtube.com/watch?v=KmddeUJJEuU
+Lyrics: |-
+    It's beginning to look a lot like Christmas
+    Everywhere you go
+    Take a look in the five and ten, glistening once again
+    With candy canes and silver lanes aglow
+
+    It's beginning to look a lot like Christmas
+    Toys in every store
+    But the prettiest sight to see is the holly that will be
+    On your own front door
+
+    A pair of Hop-a-long boots and a pistol that shoots
+    Is the wish of Barney and Ben
+    Dolls that will talk and will go for a walk
+    Is the hope for Janice and Jen
+    And Mom and Dad can hardly wait for school to start again
+
+    It's beginning to look a lot like Christmas
+    Everywhere you go
+    Now there's a tree in the Grand Hotel, one in the park as well
+    The sturdy kind that doesn't mind the snow
+
+    It's beginning to look a lot like Christmas
+    Soon the bells will start
+    And the thing that will make 'em ring is the carol that you sing
+    Right within your heart
+
+    A pair of Hop-a-long boots and a pistol that shoots
+    Is the wish of Barney and Ben
+    Dolls that will talk and will go for a walk
+    Is the hope for Janice and Jen
+    And Mom and Dad can hardly wait for school to start again
+    Haah aha aha aha aha aha aha!
+
+    It's beginning to look a lot like Christmas
+    Soon the bells will start
+    And the thing that will make 'em ring is the carol that you sing
+    Right within your heart
+Commentary: |-
+    <i>Niklink:</i>
+    Originally titled 'It's Beginning to Look Like Christmas'.
+---
 Track: Isle Unto Thyself
 Artists:
 - Miracle Musical
@@ -13540,6 +13615,17 @@ Lyrics: |-
     Wanna try?
     You wanna try 
 ---
+Track: Killers
+Artists:
+- CBoyardee
+Duration: '2:57'
+Referenced Tracks:
+- RoboCop Gameboy Title Theme
+Commentary: |-
+    <i>Makin:</i>
+    A straight remix made as a soundtrack for <a href="https://www.youtube.com/watch?v=flWuvkNWuS4">Dilbert 3</a>.
+    Also known as 'robocop.mp3' or Space Station 13's 'Title2'.
+---
 Track: Land of Confusion
 Artists:
 - Genesis
@@ -14367,6 +14453,16 @@ Lyrics: |-
     And don't sleep on it!
     Never!
 ---
+Track: Miserlou
+Artists:
+- Dick Dale
+Duration: '2:17'
+URLs:
+- https://dickdale.bandcamp.com/track/miserlou
+- https://www.youtube.com/watch?v=MXB6T55oytE
+Referenced Tracks:
+- Misirlou
+---
 Track: Mr. Brightside
 Artists:
 - The Killers
@@ -16255,6 +16351,15 @@ Lyrics: |-
     I'm drowning in waves
     Don't tear me away
 ---
+Track: Stronger Than You (Instrumental)
+Artists:
+- Mémoire
+Duration: '2:52'
+URLs:
+- https://www.youtube.com/watch?v=4kRu6grBiGY
+Referenced Tracks:
+- Stronger Than You
+---
 Track: Spanish Waltz
 Artists:
 - Urbanus
@@ -17055,6 +17160,14 @@ Lyrics: |-
     To be
     To be
 ---
+Track: The Sweet Science
+Artists:
+- Vulfpeck
+Duration: '1:56'
+URLs:
+- https://vulfpeck.bandcamp.com/track/the-sweet-science
+- https://www.youtube.com/watch?v=dw42Ym3KAYw
+---
 Track: The Ultimate Showdown of Ultimate Destiny
 Artists:
 - Neil Cicierega
@@ -17806,6 +17919,7 @@ Track: Ultimate
 Artists:
 - Denzel Curry
 - Ronny J
+Duration: '3:09'
 URLs:
 - https://www.youtube.com/watch?v=w4oHBoeuZ10
 Lyrics: |-
@@ -18431,8 +18545,11 @@ Track: White Nuxxle Driver
 Artists:
 - Rotteen
 Duration: '2:27'
+Sampled Tracks:
+- born slippy.NUXX by Underworld
+- SPACE FIGHT by 山岡 晃
 Lyrics: |-
-    もしきもちおこみたらおしにとかせおういても大丈夫
+    [Broken japanese]
 
     I feel the raving more and more
     I like to jump right on the floor
@@ -18863,7 +18980,11 @@ Artists:
 - SHOKK
 Duration: '3:18'
 URLs:
-- https://www.youtube.com/watch?v=IdzI3tmvrCc&t=0s
+- https://www.youtube.com/watch?v=IdzI3tmvrCc
+Sampled Tracks:
+- Eminem - Shake That ft. Nate Dogg
+- glue70 - Casin
+- Casin in turn samples Kool & The Gang’s 1983 song 'Joanna'
 Lyrics: |-
     Two to the one, from the one to the three
     I like good pussy and I like good tree
@@ -19010,17 +19131,6 @@ Artists:
 - Jurassic Park
 Duration: '2:06:30'
 ---
-Track: Killers
-Artists:
-- CBoyardee
-Duration: '2:57'
-Referenced Tracks:
-- RoboCop Gameboy Title Theme
-Commentary: |-
-    <i>Makin:</i>
-    A straight remix made as a soundtrack for <a href="https://www.youtube.com/watch?v=flWuvkNWuS4">Dilbert 3</a>.
-    Also known as 'robocop.mp3' or Space Station 13's 'Title2'.
----
 Track: Magical Dream Bed
 Artists:
 - TomSka
diff --git a/album/s-hecka-jef.yaml b/album/s-hecka-jef.yaml
index 7bfcbb6d..5f986f2f 100644
--- a/album/s-hecka-jef.yaml
+++ b/album/s-hecka-jef.yaml
@@ -1,7 +1,7 @@
 Album: s]hecka jef
 Directory: 's-hecka-jef'
 Date: October 30, 2016
-Date Added: August 15, 2023
+Date Added: August 18, 2023
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/album/s-hecka-jef
 - https://www.youtube.com/playlist?list=PLMXVVm-BDvr-F8SqOY64tdDaM9GI7pz3y
@@ -54,6 +54,7 @@ Art Tags:
 - Swet Bro
 - Hella Jeff
 - Sweet Bro
+- 'cw: blood (abstract)'
 Duration: '01:11'
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/death-of-swet-bro
@@ -71,6 +72,7 @@ Commentary: |-
     <img src="media/misc/areyounext.gif" width="650" height="300">
 ---
 Track: てhe Deep Lament of heckacious jeferey
+Directory: the-deep-lament-of-heckacious-jeferey
 Artists:
 - Cecily Renns
 - Bambosh
diff --git a/album/spelunky-classic.yaml b/album/spelunky-classic.yaml
index 8b400b39..2ddfdb9e 100644
--- a/album/spelunky-classic.yaml
+++ b/album/spelunky-classic.yaml
@@ -1,5 +1,6 @@
 Album: Spelunky Classic
 Date: December 21, 2008
+Date Added: August 18, 2023
 Color: '#c7ac92'
 URLs:
 - https://www.youtube.com/watch?v=jDG1moK6SCI
diff --git a/album/squiddles.yaml b/album/squiddles.yaml
index a3000a01..082f2133 100644
--- a/album/squiddles.yaml
+++ b/album/squiddles.yaml
@@ -141,7 +141,7 @@ URLs:
 ---
 Track: Squiddle Parade
 Artists:
-- Ian Taylor
+- artist:ian-taylor
 Duration: 0:50
 URLs:
 - https://youtu.be/gqd8XTRwzoI
diff --git a/album/unreleased-tracks.yaml b/album/unreleased-tracks.yaml
index 6d16f54c..4b1bc738 100644
--- a/album/unreleased-tracks.yaml
+++ b/album/unreleased-tracks.yaml
@@ -86,7 +86,7 @@ URLs:
 Track: '08'
 Directory: phat8
 Artists:
-- xerxes333
+- artist:ian-taylor
 Duration: 0:28
 URLs:
 - https://youtu.be/S4x2-mkXgGI?t=81
@@ -94,7 +94,7 @@ URLs:
 Track: '09'
 Directory: phat9
 Artists:
-- xerxes333
+- artist:ian-taylor
 Duration: 0:28
 URLs:
 - https://youtu.be/S4x2-mkXgGI?t=90
diff --git a/album/vast-error-vol-1-3.yaml b/album/vast-error-vol-1-3.yaml
index 933340ff..bbdfc1d5 100644
--- a/album/vast-error-vol-1-3.yaml
+++ b/album/vast-error-vol-1-3.yaml
@@ -1,8 +1,8 @@
 Album: Vast Error Vol. 1-3
 Directory: vast-error-vol-1-3
 Date: June 1, 2021
-Date Added: August 13, 2023
-Wallpaper Style: 'opacity: 0.90;'
+Date Added: August 18, 2023
+Wallpaper Style: 'opacity: 0.85;'
 Wallpaper File Extension: png
 Wallpaper Artists:
 - Vast Error
@@ -381,7 +381,7 @@ Artists:
 Cover Artists:
 - ValkyrieMoon
 Referenced Tracks:
-- I Don't Want To Set The World On Fire
+- track:i-dont-want-to-set-the-world-on-fire-ink-spots
 Lyrics: |-
     I don't want to set the world on fire
     I just want to start
@@ -438,6 +438,8 @@ Cover Artists:
 Duration: '03:46'
 URLs:
 - https://vasterror.bandcamp.com/track/sortir-2
+Referenced Tracks:
+- Descend
 ---
 Track: Vast Error
 Artists:
diff --git a/artists.yaml b/artists.yaml
index cb5a3814..b8d7b8c9 100644
--- a/artists.yaml
+++ b/artists.yaml
@@ -446,6 +446,7 @@ Dead URLs:
 - https://www.deviantart.com/artseke
 ---
 Artist: Arvo Pärt
+Directory: arvo-part
 ---
 Artist: Aryll
 Aliases:
@@ -633,6 +634,8 @@ URLs:
 ---
 Artist: Benjamin Wynn
 ---
+Artist: Bennie Benjamin
+---
 Artist: Benny James
 Aliases:
 - BennyIsConfused
@@ -903,6 +906,8 @@ Artist: Carole Bayer Sager
 ---
 Artist: Casey Lee Williams
 ---
+Artist: Castle Crashers
+---
 Artist: Castlevania
 ---
 Artist: Casual Sunday
@@ -1102,8 +1107,10 @@ Artist: Cobin Pangilinan
 Artist: coda
 Aliases:
 - Ken Snyder
+- yogurtbox
+- codatrigger
 URLs:
-- https://bc.s3m.us/
+- https://yogurtbox.bandcamp.com/
 - https://soundcloud.com/coda
 - https://twitter.com/codatrigger
 - https://about.me/ken.snyder
@@ -1189,6 +1196,8 @@ URLs:
 ---
 Artist: Crazy Frog
 ---
+Artist: CRAZYBUS
+---
 Artist: CreamBouo
 Aliases:
 - Creamboo
@@ -1318,6 +1327,8 @@ URLs:
 ---
 Artist: Dalmationer
 ---
+Artist: Dan Castellaneta
+---
 Artist: Dan Hernbrott
 ---
 Artist: Dan Miller
@@ -1625,6 +1636,8 @@ Artist: E.N.
 ---
 Artist: Eddie Cooley
 ---
+Artist: Eddie Durham
+---
 Artist: Eddie Morton
 Aliases:
 - Ed Morton
@@ -1632,6 +1645,8 @@ Aliases:
 ---
 Artist: Eddie Offord
 ---
+Artist: Eddie Seiler
+---
 Artist: Edvard Grieg
 ---
 Artist: Ee Va How
@@ -2179,6 +2194,8 @@ URLs:
 ---
 Artist: Happening.tv
 ---
+Artist: Harlan Leonard and his Rockets
+---
 Artist: Harley Allen
 ---
 Artist: Harold Arlen
@@ -2312,6 +2329,14 @@ URLs:
 - http://www.iosysos.com/
 ---
 Artist: Ian Taylor
+Directory: ian-taylor
+Aliases:
+- xerxes333
+---
+Artist: Ian Taylor
+Directory: ian-taylor-runescape
+Aliases:
+- Mod Ian
 ---
 Artist: Ian White
 URLs:
@@ -2418,8 +2443,6 @@ URLs:
 ---
 Artist: James Ellis
 ---
-Artist: James Hannigan
----
 Artist: James Lord Pierpont
 ---
 Artist: James Roach
@@ -2703,6 +2726,8 @@ URLs:
 ---
 Artist: Julie Andrews
 ---
+Artist: Julie Kavner
+---
 Artist: JulieTunes
 URLs:
 - https://soundcloud.com/ec-dm
@@ -2721,6 +2746,8 @@ Artist: Jun Ishikawa
 ---
 Artist: Junichi Masuda
 ---
+Artist: Junichi Nakatsuru
+---
 Artist: Jurassic Park
 ---
 Artist: Justice
@@ -3299,7 +3326,7 @@ Artist: M.O.O.N.
 URLs:
 - https://musicofthemoon.com/
 ---
-Artist: MK_97
+Artist: MACARONI☆
 ---
 Artist: Macintosh Plus
 Aliases:
@@ -3383,6 +3410,10 @@ URLs:
 - https://dragonxvi.tumblr.com/
 - https://twitter.com/DragonXVI
 ---
+Artist: Malik Jones
+Aliases:
+- Malik Yusef
+---
 Artist: Malik Refaat
 ---
 Artist: Mallory Dyer
@@ -3497,6 +3528,8 @@ Artist: Matt Cummings
 URLs:
 - https://twitter.com/EiffelArt
 ---
+Artist: Matt Groening
+---
 Artist: Matt Lee
 URLs:
 - https://nicewizard.bandcamp.com/
@@ -3622,6 +3655,8 @@ URLs:
 - https://michaelguybowman.com/
 - http://instagram.com/mguybowman/
 ---
+Artist: Michael Jackson
+---
 Artist: Michael Markowski
 URLs:
 - https://www.michaelmarkowski.com/
@@ -3743,6 +3778,8 @@ Artist: Mixt
 URLs:
 - https://paperbarkscrolls.tumblr.com/
 ---
+Artist: MK_97
+---
 Artist: Mmetafour
 URLs:
 - https://soundcloud.com/mmetafour
@@ -3863,6 +3900,8 @@ Artist: Naoto Tanaka
 ---
 Artist: Naoto Yagishita
 ---
+Artist: Nancy Cartwright
+---
 Artist: narcolepsyDriver
 Aliases:
 - Narcolepsy Driver
@@ -3985,8 +4024,6 @@ URLs:
 ---
 Artist: Nico J. Dolloso
 ---
-Artist: Nicolás Maduro
----
 Artist: Nicole Feltz
 Aliases:
 - Ruby Ruby
@@ -4688,6 +4725,8 @@ Artist: Robin S
 ---
 Artist: Roblox
 ---
+Artist: RoboCop
+---
 Artist: Robogauntlet
 URLs:
 - https://twitter.com/clavich0rd
@@ -4765,6 +4804,8 @@ Artist: Rune
 URLs:
 - https://what-the-fuck-is-homestuck.tumblr.com/
 ---
+Artist: Runescape
+---
 Artist: Russell Shaw
 ---
 Artist: Rutares
@@ -4897,6 +4938,8 @@ URLs:
 - https://soundcloud.com/scott_stutzman
 - https://www.youtube.com/@ScottStutzmanLagoon
 ---
+Artist: Scribblenauts
+---
 Artist: scumstar
 ---
 Artist: Seagrot
@@ -5181,6 +5224,8 @@ URLs:
 - https://twitter.com/SojuBeats
 - https://sojubeats.tumblr.com/
 ---
+Artist: Sol Marcus
+---
 Artist: Solarbear
 ---
 Artist: Solatrus
@@ -5368,8 +5413,12 @@ Aliases:
 URLs:
 - https://twitter.com/_sassacre_
 ---
+Artist: Super Hexagon
+---
 Artist: Super Mario
 ---
+Artist: Super Smash Bros.
+---
 Artist: SuryaAsura
 URLs:
 - https://twitter.com/suryaasura/
@@ -5413,6 +5462,8 @@ URLs:
 - https://twitter.com/sympolite
 - https://sympolite.bandcamp.com/
 ---
+Artist: Tatsu Hoshino
+---
 Artist: T-Bone Burnett
 ---
 Artist: Takahiro Yamada
@@ -5728,6 +5779,8 @@ Artist: Tom McFaul
 ---
 Artist: Tom Scharpling
 ---
+Artist: Tom Scripts
+---
 Artist: Tommy Tallarico
 ---
 Artist: Tomohito Nishiura
@@ -5750,7 +5803,8 @@ Artist: Toru Minegishi
 ---
 Artist: Toshio Masuda
 ---
-Artist: Toshiyuki Ōmori 
+Artist: Toshiyuki Ōmori
+Directory: toshiyuki-omori
 ---
 Artist: Toto
 ---
@@ -5940,6 +5994,10 @@ URLs:
 - https://soundcloud.com/user-98942170
 ---
 Artist: Waterflame
+Aliases:
+- Matthew Harwood
+URLs:
+- https://waterflame.bandcamp.com/
 ---
 Artist: Wayne Sharpe
 ---
@@ -6080,6 +6138,8 @@ Artist: Yasuko Yamada
 ---
 Artist: Yasushi Watanabe
 ---
+Artist: Yeardley Smith
+---
 Artist: Yee-Tvae Corinst
 ---
 Artist: Yellowstockings
@@ -6556,6 +6616,7 @@ URLs:
 Artist: Hideki Naganuma
 ---
 Artist: Hidetoshi Satō
+Directory: hidetoshi-sato
 ---
 Artist: Hiroaki Tominaga
 ---
@@ -7139,8 +7200,6 @@ URLs:
 - https://twitter.com/wumbyu
 - https://www.instagram.com/wumbyu/
 ---
-Artist: xerxes333
----
 Artist: xkoraxayomex
 ---
 Artist: Yasuharu Takanashi
diff --git a/groups.yaml b/groups.yaml
index 30b899af..c4e89dc2 100644
--- a/groups.yaml
+++ b/groups.yaml
@@ -1,5 +1,5 @@
-Color: '#0088ff'
 Category: HSMusic
+Color: '#0088ff'
 ---
 Group: Official Discography
 Directory: official
@@ -74,22 +74,18 @@ Group: Additional Tracks
 Description: |-
     Organizational "albums" for grouping tracks that have been referenced by other tracks or featured in flashes and games. Though these aren't real album releases, they contain lots of interesting music and media that have become part of Homestuck's musical landscape!
 ---
-Color: '#ffec14'
 Category: Fan-musician groups
+Color: '#ffec14'
 ---
+Group: Casual Sunday
 URLs:
-- https://homestuckgaiden.bandcamp.com/
-Description: >-
-    Sharing some of the first unofficial albums, the Homestuck Gaiden was a home for
-    albums not accepted or marked for [[group:official]] release.
-Group: Homestuck Gaiden
----
-URLs:
-- https://unofficialmspafans.bandcamp.com/
+- https://casualsunday.bandcamp.com/
 Description: |-
-    The eventual merger of a variety of earlier groups, the Unofficial MSPA Fans (UMSPAF) are the musicians behind a diverse selection of Homestuck fan albums.
-Group: Unofficial MSPA Fans
+    <i>"people who have made music by themselves and who are just now figuring out how to do it with other people.<br>we're still learning"</i>
+    <hr class="split">
+    Artists primarily from the Homestuck Music Team, now doing their own thing as a collaborative group.
 ---
+Group: Cool and New Music Team
 Directory: canmt
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/
@@ -98,117 +94,117 @@ Description: |-
     muisc for cool and new web comic, a story based on homestuck but better
     <hr class="split">
     Ostensibly a music-making collective for Cool and New Web Comic, a torrential content output led to dozens of albums with varying degrees of relevancy to the fanventure. Currently inactive.
-Group: Cool and New Music Team
 ---
+Group: Homestuck Gaiden
 URLs:
-- https://casualsunday.bandcamp.com/
+- https://homestuckgaiden.bandcamp.com/
 Description: |-
-    <i>"people who have made music by themselves and who are just now figuring out how to do it with other people.<br>we're still learning"</i>
-    <hr class="split">
-    Artists primarily from the Homestuck Music Team, now doing their own thing as a collaborative group.
-Group: Casual Sunday
+    Sharing some of the first unofficial albums, the Homestuck Gaiden was a home for albums not accepted or marked for [[group:official]] release.
+---
+Group: Unofficial MSPA Fans
+URLs:
+- https://unofficialmspafans.bandcamp.com/
+Description: |-
+    The eventual merger of a variety of earlier groups, the Unofficial MSPA Fans (UMSPAF) are the musicians behind a diverse selection of Homestuck fan albums.
 ---
-Color: '#fc9003'
 Category: Solo musicians
+Color: '#fc9003'
 ---
+Group: Clark Powell
 URLs:
 - https://clarkpowell.bandcamp.com/
 - https://soundcloud.com/plazmataz
-Description: >-
-    Composer of [[album:medium]] and [[album:symphony-impossible-to-play]] as well
-    as dozens of tracks across the Homestuck discography, and artist behind several
-    independent albums whose tracks were recompiled and featured as the soundtrack
-    for [[group:psycholonials]].
-Group: Clark Powell
+Description: |-
+    Composer of [[album:medium]] and [[album:symphony-impossible-to-play]] as well as dozens of tracks across the Homestuck discography, and artist behind several independent albums whose tracks were recompiled and featured as the soundtrack for [[group:psycholonials]].
 ---
+Group: Cristata
 URLs:
 - https://smoothiefruitee.bandcamp.com/
-Description: >-
-    Artist behind [[album:perfectly-generic-album]] and more, and creator of crossover
-    fanventure <a href="https://mspfa.com/?s=33534&p=1">Deltastuck</a>. Releases under
-    a number of aliases.
-Group: Cristata
+Description: |-
+    Artist behind [[album:perfectly-generic-album]] and more, and creator of crossover fanventure <a href="https://mspfa.com/?s=33534&p=1">Deltastuck</a>. Releases under a number of aliases.
 ---
+Group: Funk McLovin
 URLs:
 - https://funkmclovin.bandcamp.com/
 - https://www.youtube.com/channel/UCIyu12_DBaAkDfFq-UQuHNw
-Description: <i>"Funk McLovin, AKA Jojo Raber, is some kind of entity. We don't know
-    more than this."</i>
-Group: Funk McLovin
+Description: |-
+    <i>"Funk McLovin, AKA Jojo Raber, is some kind of entity. We don't know more than this."</i>
 ---
+Group: Michael Guy Bowman
 URLs:
 - https://bowman.bandcamp.com/
-Description: >-
-    Renowned for [[track:sburban-jungle]], his official solo album [[album:mobius-trip-and-hadron-kaleido]]
-    and many other hit Homestuck releases, Bowman has gone on to create his own expansive
-    personal discography since.
-Group: Michael Guy Bowman
+Description: |-
+    Renowned for [[track:sburban-jungle]], his official solo album [[album:mobius-trip-and-hadron-kaleido]] and many other hit Homestuck releases, Bowman has gone on to create his own expansive personal discography since.
 ---
+Group: Nasqueron
 URLs:
 - https://nasqueron.bandcamp.com/
-Description: >-
-    Artist behind tracks across a wide variety of fan albums (where she's credited
-    as [[artist:kal-la-kal-la]]), with two experimental noise-poetry albums by her
-    own solo release.
-Group: Nasqueron
+Description: |-
+    Artist behind tracks across a wide variety of fan albums (where she's credited as [[artist:kal-la-kal-la]]), with two experimental noise-poetry albums by her own solo release.
 ---
+Group: Parsec Productions
 URLs:
 - https://parsecproductions.bandcamp.com/
-Description: >-
+Description: |-
     Best known to Homestuck fans for creating some of its [[track:skies-of-skaia|foundational]] [[track:aggrieve|themes]], and to the internet at large for Slender: The Eight Pages and [[album:slender-the-arrival-soundtrack|its sequel]], Mark J. Hadley is a multitalented composer and independent developer.
-Group: Parsec Productions
 ---
+Group: Secily Iopara
 URLs:
 - https://nuclear333.bandcamp.com/
-Description: >-
-    Co-creator of the webcomic <a href="https://inhospitable.net/">INHOSPITABLE</a>,
-    and musician with a history spanning half a decade. Plural internet artist.
-Group: Secily Iopara
+Description: |-
+    Co-creator of the webcomic <a href="https://inhospitable.net/">INHOSPITABLE</a>, and musician with a history spanning half a decade. Plural internet artist.
 ---
+Group: Tensei
 URLs:
 - https://tenseimusic.bandcamp.com/
-Description: >-
-    Rock composer behind hit 2011 release [[album:strife]] and overall guitarist and
-    musician behind a whole host of memorable tracks. He's gone on to release the
-    2017 sequel [[album:strife-2]] and a variety of other collaborative tracks since
-    Homestuck!
-Group: Tensei
+Description: |-
+    Rock composer behind hit 2011 release [[album:strife]] and overall guitarist and musician behind a whole host of memorable tracks. He's gone on to release the 2017 sequel [[album:strife-2]] and a variety of other collaborative tracks since Homestuck!
 ---
+Group: Toby Fox
 URLs:
 - https://tobyfox.bandcamp.com/
-Description: >-
-    Artist of well over 100 tracks in Homestuck's musical canon (including the elusive
-    [[track:penumbra-phantasm]]), Toby Fox went on to compose the much-renowned soundtracks
-    to his games [[group:undertale-and-deltarune]], firmly planting his place in modern
-    game and internet history.
-Group: Toby Fox
+Description: |-
+    Artist of well over 100 tracks in Homestuck's musical canon (including the elusive [[track:penumbra-phantasm]]), Toby Fox went on to compose the much-renowned soundtracks to his games [[group:undertale-and-deltarune]], firmly planting his place in modern game and internet history.
 ---
+Group: what is lost in the mines?
 URLs:
 - https://what.bandcamp.com/
-Description: <i>"we're all simply fluttering away"</i>
-Group: what is lost in the mines?
+Description: |-
+    <i>"we're all simply fluttering away"</i>
 ---
-Color: '#c466ff'
 Category: Fandom projects
+Color: '#c466ff'
 ---
+Group: Deconreconstruction
+Directory: deconrecon
+URLs:
+- https://vasterror.bandcamp.com/
+- https://twitter.com/Deconrecon_
+- https://www.deconreconstruction.com/
+- https://music.deconreconstruction.com/
+Description: |-
+    Studio consisting of many creators from the Homestuck fan community and beyond, responsible for <a href="https://www.deconreconstruction.com/vasterror/1">Vast Error</a>, <a href="https://deconreconstruction.itch.io/snowbound-blood">its spinoffs</a>, and other projects.
+    <hr class="split">
+    Vast Error is a fanventure from early 2013 that takes the Homestuck setting and inspiration from traditional fan-adventures to create its own storyline with original mechanics. Musicians and artists from past Homestuck fan albums and beyond have created many albums and works for it and its playable spinoff, Snowbound Blood.
+---
+Group: Desynced
 URLs:
 - https://desynced.bandcamp.com/
 - https://twitter.com/DesyncedTeam
 - https://desynced.xyz/
-Description: >-
-    A fanventure by a talented team of authors, artists and musicians, in the works
-    since 2017 and updating since early 2020!
-Group: Desynced
+Description: |-
+    A fanventure by a talented team of authors, artists and musicians, in the works since 2017 and updating since early 2020!
 ---
+Group: Stuck at Home Con
 URLs:
 - https://sahcon.bandcamp.com/
 - https://sahcon.com/
-Description: >-
+Description: |-
     Affectionately abbreviated to SAHCon, this yearly online fan convention started its run in 2019.
     <hr class="split">
     Since 2021, every edition of SAHCon has featured the premiere of a new fan album created for the event, featuring a variety of musicians.
-Group: Stuck at Home Con
 ---
+Group: The Genesis Project
 URLs:
 - https://genesis-project.bandcamp.com/
 - https://genesis-project-news.tumblr.com/
@@ -219,8 +215,8 @@ Description: |-
     Quoting its official site, The Genesis Project is...
     <blockquote>...from a 2.5d perspective, with RPG mechanics. There's a big focus on character customization, short play sessions that allow you to explore all options in game, and playing with others through a multiplayer system.</blockquote>
     While still in development, it's completely free to <a href="https://www.sburb.me/download/">download</a> and play on any common OS!
-Group: The Genesis Project
 ---
+Group: Tumblrstuck/bent
 Directory: tumblrstuck-bent
 URLs:
 - https://sammneiland.bandcamp.com/
@@ -228,23 +224,11 @@ Description: |-
     Music by [[artist:samm-neiland]] from MSPA-themed fanventures based around the "Tumblrstuck" meme/fad.
     <hr class="split">
     Mainly based on the MSPA conjunction tumblr based fan-adventures "Malbent" and "Glitchedstuck".
-Group: Tumblrstuck/bent
 ---
-Directory: deconrecon
-URLs:
-- https://www.deconreconstruction.com/
-- https://music.deconreconstruction.com/
-- https://twitter.com/Deconrecon_
-- https://vasterror.bandcamp.com/
-Description: |-
-    A studio consisting many creators from the Homestuck fan community and beyond, responsible for creating works such as <a href="https://www.deconreconstruction.com/vasterror/1">Vast Error</a>, <a href="https://deconreconstruction.itch.io/snowbound-blood">Snowbound Blood</a> and more.
-    <hr class="split">
-    Vast Error is a fanventure started from early 2013 that takes inspirations from Homestuck and traditional fan-adventures, creating it's own storyline with original mechanics and more. Various musicians and artists from past Homestuck fan albums and beyond have created many albums and works related to it and the playable spinoff to it, Snowbound Blood.
-Group: Deconreconstruction
----
-Color: '#32c7fe'
 Category: Projects beyond Homestuck
+Color: '#32c7fe'
 ---
+Group: Oceanfalls
 URLs:
 - https://nightslights.bandcamp.com/
 - https://www.patreon.com/oceanfalls
@@ -253,8 +237,8 @@ Description: |-
     A scrapped game project turned into a webcomic, created by [[artist:nights]].
     <hr class="split">
     One of many webcomics drawing early inspiration from Homestuck and the MSPA format, Oceanfalls stands out for being a totally distinct story from the world of Homestuck and SBURB, and it has its own community of fan musicians and artists contributing to its album-spanning soundtrack!
-Group: Oceanfalls
 ---
+Group: Psycholonials
 URLs:
 - https://psycholonials.bandcamp.com/
 - https://www.psycholonials.com/
@@ -262,8 +246,8 @@ Description: |-
     <i>Psycholonials.</i>
     <hr class="split">
     "All chapters of Psycholonials will be released along with an EP album. If a song from the current chapter doesn't appear in the latest EP, it will appear in a future EP."
-Group: Psycholonials
 ---
+Group: UNDERTALE & DELTARUNE
 URLs:
 - https://tobyfox.bandcamp.com/
 - https://undertale.com/
@@ -274,4 +258,3 @@ Description: |-
     Besides being an acclaimed game with its own much-deserved passionate fanbase, the soundtrack of UNDERTALE - single-handedly composed by [[artist:toby-fox]], who also developed the game largely on his own - is well recognized for its extensive use of leitmotifs. Musical themes are reused all throughout the soundtrack; several have even made their way beyond their original context and been referenced by fan musicians in their own Homestuck tracks!
     DELTARUNE is Toby Fox's current project, a continuation of sorts set in an alternate reality; the first chapter has been released for free, and the remaining chapters (and their soundtrack) will be released as a set when the game is complete.
     Much as Homestuck's discography helped foster a community of creation and collaboration, the music and reach of UNDERTALE and DELTARUNE have inspired countless up-and-coming musicians to create remixes and delve into music creation with their own talents and ideas.
-Group: UNDERTALE & DELTARUNE
diff --git a/homepage.yaml b/homepage.yaml
index e4b58f34..18091117 100644
--- a/homepage.yaml
+++ b/homepage.yaml
@@ -35,20 +35,23 @@ Albums:
 Row: New Additions
 Type: albums
 Albums:
-- album:oceanfalls-vol-five
 - album:gotta-hatch-em-all
 - album:vast-error-vol-1-3
-
 - album:cyber-city-sound-pak
-- album:crossmound-vol-1
-- album:cool-and-new-volume-7
 
-- album:oceanfalls-vol-4
 - album:oceanfables-ray-of-light
-- album:carne-vale-fusion-collab
-- album:s-hecka-jef
+- album:oceanfalls-vol-4
+- album:oceanfalls-vol-five
+
+- album:cool-and-new-greatest-hits
+- album:crossmound-vol-1
+- album:spelunky-classic
 
 - album:call-and-new
 - album:cool-and-new-volume-sx
+- album:canwave
 - album:basement-tale
-- album:spelunky-classic
+- album:cool-and-new-volume-7
+- album:carne-vale-fusion-collab
+- album:s-hecka-jef
+- album:median
\ No newline at end of file
diff --git a/news.yaml b/news.yaml
index a2ae0148..42880dfc 100644
--- a/news.yaml
+++ b/news.yaml
@@ -1,3 +1,80 @@
+Name: Iridescent Noon
+Directory: iridescent-noon
+Date: August 18, 2023
+Content: |-
+    Hello, again! Nineteen new albums from the present and the past accompany a massive overhaul to the wiki codebase, amongst data fixes, bug shooing, site polish and more. Check past the split for all the details!
+
+    <hr class="split">
+
+    Many albums make their way to the wiki today! In an exciting turn, many of these were some of the first album additions of folk outside the established data wranglers. In summary:
+
+    - All the recent releases from [[group-gallery:oceanfalls]], with thanks to Niklink! Check out [[album:oceanfalls-vol-4]], anniversary album [[album:oceanfalls-vol-five]], and solo set [[album:oceanfables-ray-of-light]]!
+
+    - A full <em>eleven</em> albums from [[group-gallery:canmt]], courtesy of Makin! These include team albums [[album:cool-and-new-volume-7]], [[album:call-and-new]]; solos and collabs like [[album:basement-tale]] and [[album:carne-vale-fusion-collab]]; and more!
+
+    - The first Vast Error albums, finally, on the wiki! [[album:vast-error-vol-1-3]] was contributed by koba, and more from [[group:deconrecon]] is certainly on the way.
+
+    - The latest extravaganze from [[group-gallery:stuck-at-home-con]], [[album:gotta-hatch-em-all]]!! Friendly faces and familiar motifs abound in this annual release!
+
+    - Soundtrack to the ongoing fanventure <a href="https://mspfa.com/?s=45123">Crossmound</a>, [[album:crossmound-vol-1]]! Thanks to Guffy, from their music team, for helping out with this one.
+
+    - From [[group-gallery:cristata|Cristata and hywell]] of [[album:are-you-lost]] renown and more, [[album:cyber-city-sound-pak]], a new DELTARUNE techno-breakcore remix album!
+
+    - And some very early indie-retro music from [[artist:buzinkai]] and co, 2008 soundtrack to [[album:spelunky-classic]].
+
+    Thanks a bunch to everyone who contributed new albums, as well as to all who sent in data fixes! Between last major update and this one, there were actually several smaller releases featuring loads of fixes and smaller adjustments - full details, as ever, are in [[static:changelog#18-aug-2023|the changelog]]!
+
+    <hr>
+
+    Although most of the code work for this update was purely internal, almost all the pages on the site have been touched up just a little! A few highlights:
+
+    * Album gallery pages (for example, [[album-gallery:homestuck-vol-8]]) now show each track's cover artists beneath the track's name. (They're [[album-gallery:mobius-trip-and-hadron-kaleido|combined into one message]] if all tracks have the same illustrator.)
+    * Artist info pages (for example, [[artist:toby-fox]]) get a neat new expanded group-contributions list! By default, it's sorted by count (number of tracks or artworks), but you can click to sort it by duration if you like.
+    * A bunch of little polishing changes to album and track info pages! Stuff like clearer wording, moving "listen" links higher up, and fixing up some spacing issues should make the pages at the very heart of the wiki a good bit nicer to explore.
+    * A whole slew of bug fixes which made [[listing-index:-|listings]] not <em>quite</em> as consistent as you'd expect, other pages being broken in corner cases, and certain content pretty much just breaking the page layout got fixed! Nothing too thrilling, but lots to help the whole site feel more consistent and bug-free.
+
+    Of course, the rest of the changes are right there in [[static:changelog|the changelog]], and we're looking to put similar attention to detail to everything on the site going forward. (Your feedback and suggestions would be [[static:feedback|most welcome]]!)
+
+    <hr>
+
+    <i>Technical jargon ahead! Skip this section... if you must... and you dare!</i>
+
+    This update marks the completion of a major code rework that involved essentially rewriting the "frontend" code from scratch. (That's the code that creates all the HTML and web content you interact with. Data processing went largely untouched, having been [[news-entry:ball-drop-23|structurally redesigned]] over [[news-entry:a-preview-draws-near|the course of 2022]], though it also had a few improvements here and there.)
+
+    This big code rework doesn't do much to the website itself - the goal was actually to "port" the old website with no substantial changes, so you wouldn't even notice the transition! - but it does make it dramatically easier to develop new site features and improve existing ones. All the changes listed above (plus the rest [[static:changelog#18-aug-2023|in the changelog]]) were much easier to implement and get working quite right thanks to that rework.
+
+    That's for a couple reasons: you get instant feedback any time you make a code change (instead of having to reboot the whole HSMusic process), and site components are all structured in a consistent, clear manner, making it easier to spot edge cases and fix bugs. And both of those advantages go triply so for designing completely new components - and entire pages and wiki-spanning features that were previously far too daunting!
+
+    Back when we were first setting out with the rework, one of the goals (maybe the biggest one) was to make the website automatically and instantaneously react to changes in data files. This was with the goal of helping people who write data files see their changes immediately - as for code updates, it would have cut rebooting HSMusic out of the data-writing equation. This didn't end up coming to pass. It would have necessitated certain foundational changes to the data engine, and certain even deeper changes to how site components are written - neither of which I was confident are really the right direction to go. I felt if I was going to attempt them at all, I had to be sure I was doing it right, and I felt way out of my waters at that level!
+
+    Instead, I took a slightly more conservative approach to the code rework, which puts one thing first and absolutely foremost: writing clear, malleable code. I basically broke up everything you see on the website into clear, self-contained components, each of which goes through a few clearly-defined steps. They process input data (from another component or the wiki's global "all the data" object), pull out just the parts they need, define relationships to shared or sub-components, and finally put everything together into real HTML that goes on the website.
+
+    Each of those steps only does what it needs to, and the kind of work it does is separate from the rest. The part that generates HTML doesn't process live data objects. The part that queries input data doesn't tell the website engine what other components are going to be included in this component. The part that extracts "raw" data (like artist names or track durations) for direct display does so separately from the rest of the component.
+
+    All this makes it far easier to trace exactly where values are coming from, why information is organized the way it is, and gives a coherent structure for new components to follow. It helps keep arbitrary infrastructure from leaking into logic, pretty much boiling site components down into the essence of exactly what work they're intended to do. It's honestly all to a point where [[listing:all-sheet-music-files|multiple-layered components]] more or less <a href="https://github.com/hsmusic/hsmusic-wiki/blob/2badc89d1fd8f04c0f63d4a81a1386dfcbe6617b/src/content/dependencies/listAllAdditionalFilesTemplate.js">write</a> <a href="https://github.com/hsmusic/hsmusic-wiki/blob/2badc89d1fd8f04c0f63d4a81a1386dfcbe6617b/src/content/dependencies/generateListAllAdditionalFilesChunk.js">themselves</a>. Elements which were <a href="https://github.com/hsmusic/hsmusic-wiki/commit/4a1997b0edd7de4b124c17e3cdeb1a47ecea1095">previously</a> <a href="https://github.com/hsmusic/hsmusic-wiki/blob/64990187b7a35b3c1db8e169f83591b557bb9121/src/util/link.js">hard-coded</a> are <a href="https://github.com/hsmusic/hsmusic-wiki/blob/preview/src/content/dependencies/generateContentHeading.js">components</a> <a href="https://github.com/hsmusic/hsmusic-wiki/blob/preview/src/content/dependencies/linkThing.js">now</a>. Complex feature additions focus on <a href="https://github.com/hsmusic/hsmusic-wiki/commit/5625d4eed0e86fa0ac4a8bbc28cdac447d87c3d3">just the behavior</a>, and far less time goes to <a href="https://github.com/hsmusic/hsmusic-wiki/commit/e674b186ff755eaa8fb26f5885ac997e0ff0330e">adapting content to infrastructure</a> - instead of <a href="https://github.com/hsmusic/hsmusic-wiki/commit/1fe5de18a35a51b251c08995e619a5a526425236">the other way</a> <a href="https://github.com/hsmusic/hsmusic-wiki/commit/05df0a1199dca320e0c8b92d210e6ab6e9676dfb?diff=split">around</a>!
+
+    All that is a bunch of technical gobbledygook to say that the wiki's code is better, and it's a whole lot easier to add new features and make existing ones better. Making this happen has been pretty much our entire programming world for the last four months, and we're both relieved and so proud it's complete!
+
+    (Oh, and a little illustrious bird or two informed me that build times to get the server up and running were reduced about 20 seconds... and various automated data checks help keep everything even more stable than before... so it ended up making data work swifter and smoother anyway! Now that's good news to me.)
+
+    <hr>
+
+    So, what's next?
+
+    Well, you can expect parts of the site that have gone untouched for ages to get a whole lot of critical attention, until they're the best we can figure out how to make 'em be. You can expect us to focus a lot more on designing cool new features, and a lot less on worrying how to make the code part happen. I might sound like a broken record, but ideas that have been gestating only in the back of people's minds for a year or longer are suddenly, truly attainable!
+
+    On the data end, there are more faces than ever before interested in bringing new albums to the wiki. ([[static:discord|You could become one of them!]]) Everyone's made a fantastic and stunning push for bringing their own additions over just the last few weeks, and that kind of energy and enthusiasm is seriously treasured - and exciting!
+
+    Personally, I'm feeling about done with sweeping infrastructural code changes for a good while, so I'm freed up - after a break! - to really get into data-related projects I've been wanting to experiment with for a long while. (Music videos, "singleton" tracks, reference data timestamps... all sorts! No promises, but we'll see!)
+
+    Thanks so much to everyone who contributed to this update, whether you were one of those adding albums, or you reported data errors, suggested feature ideas, or just sent us kind words! We owe you all deep gratitude.
+
+    Did you know you can check out [[static:changelog#18-aug-2023|all the latest changes]]... [[static:changelog#18-aug-2023|in the changelog]]!? It's true! Not only that, but [[static:changelog#14-jul-2023|a whole bunch]] of [[static:changelog#27-apr-2023|previous fixes]] and [[static:changelog#22-apr-2023|other assorted improvements]] since last major release, too! And <em>just about everyone</em> is credited there?? Wow! Now that's sure what <em>I'd</em> love to be reading right about now!
+
+    ✨
+
+    <i>~ Quasar Nebula</i>
+---
 Name: happy birthday nannasprite
 Directory: happy-birthday-nannasprite
 Date: April 13, 2023
diff --git a/static-page/changelog.yaml b/static-page/changelog.yaml
index 653f2283..9dc7879a 100644
--- a/static-page/changelog.yaml
+++ b/static-page/changelog.yaml
@@ -28,8 +28,8 @@ Style: |-
         margin-bottom: 0.6em;
     }
 Content: |-
-    <h2 id="25-oct-2413" class="major-release"><a href="#25-oct-2413">[[date:25 October 2413]]</a></h3>
-    (news entry: link)
+    <h2 id="18-aug-2023" class="major-release"><a href="#18-aug-2023">[[date:18 August 2023]] - Iridescent Noon</a></h3>
+    (news entry: [[news-entry:iridescent-noon]])
     <h3>site changes</h3>
     - major rework of how each website page's contents are generated, making it way easier to prototype new features or test changes, and allowing for better stability as code internals are expanded or updated
     - <b>album & track pages:</b>
@@ -77,19 +77,26 @@ Content: |-
         - added [[album:oceanfables-ray-of-light]] by [[artist:ray-theradguy-mikey]]!
         - added [[album:oceanfalls-vol-4]]!
         - added [[album:oceanfalls-vol-five]]!
-    - added six albums from [[group:canmt]]! (thanks, Makin!)
+    - added ELEVEN albums from [[group:canmt]]! (thanks, Makin!)
         - added [[album:call-and-new]]!
         - added [[album:cool-and-new-volume-sx]]!
         - added [[album:canwc-sound-test-1]]!
-        - added [[album:c-a-n-w-a-v-e]]!
+        - added [[album:canwave]]!
         - added [[album:basement-tale]] by [[artist:cecily-renns]]!
         - added [[album:cool-and-new-volume-7]]!
+        - added [[album:carne-vale-fusion-collab]]!
+        - added [[album:s-hecka-jef]]!
+        - added [[album:canwc-for-the-holidays]]!
+        - added [[album:cool-and-new-greatest-hits]]!
+        - added [[album:median]]!
     - added [[album:gotta-hatch-em-all]] from [[group:stuck-at-home-con]]!
+    - added [[album:vast-error-vol-1-3]] from [[group:deconrecon]]! (thanks, koba!)
     - added [[album:crossmound-vol-1]]!
     - added [[album:cyber-city-sound-pak]] by [[group:cristata]]!
     - added [[album:spelunky-classic]] by [[artist:buzinkai]] and [[artist:jon-perry]]!
     <h3>other additions</h3>
     - added a [[group:stuck-at-home-con]] group page!
+    - added a [[group:deconrecon]] group page!
     - added site backgrounds to [[album:oceanfalls-vol-2]] and [[album:oceanfalls-vol-3]] (thanks, nights!)
     - added high res artwork to [[album:oceanfalls-vol-1]], [[album:contritum]], [[album:oceanfalls-vol-2]], and [[album:oceanfalls-vol-3]]
     - added audio commentary transcription to [[track:ace-of-trump]] and [[track:homefree]]
@@ -100,6 +107,7 @@ Content: |-
     - added lyrics to [[track:nows-your-chance-to-be-a]]
     <h3>data changes</h3>
     - changed the site banner for [[album:homestuck-vol-7]] and [[album:oceanfalls-vol-1]] to better display the original artwork
+    - fixed [[artist:ian-taylor]] having some artist credits under a different name
     - fixed [[artist:keyboard-cait]] having some artist credits under a different name
     - fixed [[artist:aris-martinian]] having some artist credits under a different name
     - removed full album listening link for [[album:alternia]] due to missing bonus tracks