cat no banana fixes

also added leo's changes to changelog and standardized to vriska/leo

6 files changed, 146 insertions, 28 deletions

diff --git a/album/entertaining-sound.yaml b/album/entertaining-sound.yaml
index 414d3057..bf9abb5a 100644
--- a/album/entertaining-sound.yaml
+++ b/album/entertaining-sound.yaml
@@ -240,7 +240,7 @@ Referenced Tracks:
 - I Really, Really, Really Like This Image
 - GLORIOUS MIDI UNICORN
 - Classical Gas
-- He Not Like the Banana
+- CAT NO BANANA
 - Jump Up, Super Star!
 - Fireflies
 - Voidfish Duet
diff --git a/album/references-beyond-homestuck.yaml b/album/references-beyond-homestuck.yaml
index 12b9fd2b..4a0825f8 100644
--- a/album/references-beyond-homestuck.yaml
+++ b/album/references-beyond-homestuck.yaml
@@ -6857,6 +6857,48 @@ Lyrics: |-
     Was what I did so wrong, so wrong
     That you had to leave me alone?
 ---
+Track: CAT NO BANANA
+Artists:
+- JOSHDUB
+Duration: '1:49'
+URLs:
+- https://soundcloud.com/joshdubgaming/cat-no-banana
+Referenced Tracks:
+- Good Day
+Lyrics: |-
+    (G'day, mate.) (The banana) (It's a good day to have a good day)
+    (That's how you say it?) (Angry) (It's a good day to have a good day) (G'day, mate, hahaha.)
+    (He not like the banana) (Yah.)
+    (It's a good day to have a good day) (Angry) Commence! (It's a good day to have a good day)
+    (Cat no banana)
+
+    I woke up this morning like I gotta get going
+    Tomorrow's not promised so I live in the moment
+    It's a good day to have a good day
+    It's a good day to have a good day (Cat no banana)
+    I woke up this morning like I gotta get going (He not like)
+    Tomorrow's not promised so I live in the moment (The banana)
+    It's a good day to have a good day (Angry)
+    It's a good day to have a good day (Cat no banana)
+
+    Woke up this morning with my mind on my money
+    Hard work payin' off, I don't owe nobody nuttin'
+    On my west coast tip, so you know I'm trying to function
+    And touch a private part even though we in public (Cat no banana)
+    You playing hard to get, but I'm thinking easy does it
+    To have a good time, that's all I ever wanted
+    I dreamt that a genie came and gave me three wishes
+    A Cuban link chain, fly clothes, and bad women (Cat no banana)
+
+    I'm street dreamin', on the beach even (He not like)
+    With some high aimed kicks from the last season— moment (The banana)
+    It's a good day to have a good day (Angry)
+    It's a good day to have a good day (Cat no banana)
+    (He not like)
+    (The banana)
+    It's a good day to have a good day (Angry)
+    It's a good day to have a good day (Cat no banana)
+---
 Track: Classical Gas
 Artists:
 - Mason Williams
@@ -8567,6 +8609,83 @@ Lyrics: |-
     Though it's the end of the world, don't blame yourself, now
     And if it's true, I will surro—
 ---
+Track: Good Day
+Artists:
+- Flash Garments
+- J-Mac
+Duration: '3:14'
+URLs:
+- https://www.youtube.com/watch?v=TM9VKk6XRpo
+Lyrics: |-
+    (G'day, mate. That's how you say it? G'day, mate, hahaha.)
+    (Yah.)
+    Commence!
+
+    I woke up this morning like I gotta get going
+    Tomorrow's not promised so I live in the moment
+    It's a good day to have a good day
+    It's a good day to have a good day
+    I woke up this morning like I gotta get going
+    Tomorrow's not promised so I live in the moment
+    It's a good day to have a good day
+    It's a good day to have a good day
+
+    Woke up this morning with my mind on my money
+    Hard work payin' off, I don't owe nobody nuttin'
+    On my west coast tip, so you know I'm trying to function
+    And touch a private part even though we in public
+    You playing hard to get, but I'm thinking easy does it
+    To have a good time, that's all I ever wanted
+    I dreamt that a genie came and gave me three wishes
+    A Cuban link chain, fly clothes, and bad women
+    I'm street dreamin', on the beach even
+    With some high aimed kicks from the last season
+    'Cause I know nobody got 'em that's the main reason
+    So I'm dressed to impress and get the better treatment
+
+    Slow down
+    Can't lose 'cause I don't know how
+    One day then I gotta skip town
+    No negative energy allowed
+    I'mma show you how
+
+    I woke up this morning like I gotta get going
+    Tomorrow's not promised so I live in the moment
+    It's a good day to have a good day
+    It's a good day to have a good day
+    I woke up this morning like I gotta get going
+    Tomorrow's not promised so I live in the moment
+    It's a good day to have a good day
+    It's a good day to have a good day
+
+    This is that life that a guy can get used to
+    Get everyone inside the club with no issues
+    Surrounded by women that normally diss you
+    Don't complicate life, it can all be so simple
+    Thank God for the people that got put in my life
+    Good times, so fun I would have did that twi-twice
+    Rolex what I call spendin' quality time
+    Call the air clear, lenses they coverin' my eyes
+    Black, golden, oh man, got you open
+    Take action and focus, now we rollin'
+    With the cameras flashin' in the daylight
+    Good day like Australians who make a great night
+
+    Just lately
+    I don't believe hopes or maybes
+    Hard work means you can't get lazy
+    The 80s made me, I'm so awesome
+    (I deserve to ride foreign)
+
+    I woke up this morning like I gotta get going
+    Tomorrow's not promised so I live in the moment
+    It's a good day to have a good day
+    It's a good day to have a good day
+    I woke up this morning like I gotta get going
+    Tomorrow's not promised so I live in the moment
+    It's a good day to have a good day
+    It's a good day to have a good day
+---
 Track: Grand Dad's Secret Slide
 Artists:
 - SilvaGunner
@@ -8612,20 +8731,6 @@ URLs:
 - https://www.youtube.com/watch?v=6Nvf9y7G9zU
 - https://battleofthebits.org/arena/Entry/grrrarrr/6241/
 ---
-Track: He Not Like the Banana
-Artists:
-- Cat No Banana
-Duration: 0:15
-URLs:
-- https://www.youtube.com/watch?v=jDEwbsWj2Qo
-Lyrics: |-
-    He not like
-    The banana
-    (It's a good day to have a good day)
-    Angry
-    (It's a good day to have a good day)
-    Cat no banana
----
 Track: Hey! Baby
 Artists:
 - Bruce Channel
diff --git a/artists.yaml b/artists.yaml
index a767ab6c..f6b156e0 100644
--- a/artists.yaml
+++ b/artists.yaml
@@ -1445,6 +1445,10 @@ Artist: FlareDragon
 URLs:
 - https://flare-dragon.tumblr.com/
 ---
+Artist: Flash Garments
+Aliases:
+- Derek Shaw
+---
 Artist: flashygoodness
 URLs:
 - https://flashygoodness.bandcamp.com/
@@ -1809,6 +1813,10 @@ Artist: J. Durnal
 ---
 Artist: J-Airshiper
 ---
+Artist: J-Mac
+Aliases:
+- John McCall
+---
 Artist: J.N. Wiedle
 Aliases:
 - Jones N. Wiedle
@@ -2026,6 +2034,8 @@ Artist: Joseph Jowett
 ---
 Artist: Joseph Mohr
 ---
+Artist: JOSHDUB
+---
 Artist: Jukio Kallio
 ---
 Artist: Jule Styne
diff --git a/news.yaml b/news.yaml
index 4e24be70..0a4a2ec8 100644
--- a/news.yaml
+++ b/news.yaml
@@ -12,7 +12,7 @@ Content: |-
     With the main release I'll have a much more thorough news entry, but I want to give thanks to everyone who's contributed to this update now too:
     - Niklink (<em>loads</em> of data entry resulting in a whole bunch of new albums on the wiki, finding tons of obscure and missed albums not yet on the wiki, offering ideas and feedback, spotting data errors and many code bugs, and politely wrangling me to Make It Hapen)
     - koba (putting together data for albums from [[group:canmt]] in a spreadsheet, including all-new track reference lists, which is gradually getting the full music wiki album treatment)
-    - leo (doing the initial data for [[album:deltarune-ch2-ost]] and adding other goodies under [[group:undertale-and-deltarune]], and spotting data errors)
+    - vriska/leo (doing the initial data for [[album:deltarune-ch2-ost]] and adding other goodies under [[group:undertale-and-deltarune]], and spotting data errors)
     - gio (convincing me to make a better data format for the wiki and writing the txt -&gt; YAML converter for it, which lead to a Lot of data processing changes and helped bring to light lots of miscellaneous data errors across the wiki)
     - Celeste (initial new setting/locale art tags for all track art, tags for [[group:oceanfalls]], many art tags and data fixes)
     - Cello (spotting data errors and missing tracks under [[album:strife-2]])
@@ -97,7 +97,7 @@ Content: |-
     <i>Wait, what?</i>
     Aranoyas! Wow, we sure have no idea how <em>that</em> got in the release title field! This update brings a redesign to the album sidebars, and lots of data fixes and additions across the site. Much thanks to everyone in the Discord community for throwing in suggestions and additions all throughout this update - details, as ever, past the split!
     <hr class="split">
-    <i>As ever, thank you to everyone who sent feedback and kind messages during development! We're also very grateful for all [[static:donate|supporters of the wiki]], including: enchantingHunter, leo homestuck, and Nights!</i>
+    <i>As ever, thank you to everyone who sent feedback and kind messages during development! We're also very grateful for all [[static:donate|supporters of the wiki]], including: enchantingHunter, vriska/leo, and Nights!</i>
     Like mentioned in the summary, this update is brought to you in most significant part by everyone in the [[static:discord|community Discord server]]. So, for these release notes, I figured I'd go over the contributions of everyone who threw a hand in!
     From <b>Niklink</b>, we've a variety of additions and input:
     - The new [[album:psycholonials]] complete album has been released, and with it, we've added information about the original releases of many tracks from the game, most from earlier, since-unlisted releases by [[group:clark-powell]]. Niklink located all of these throughout the release of each EP, and helped with the track lists for the [[flash:psycholonials]] flash/game pages!
@@ -139,7 +139,7 @@ Content: |-
     <i>Independent works from four artists, plus a variety of stylistic tweaks and additions!</i>
     Heya! We've got another smaller update to share this time, though with plenty of wonderful music brought to the wiki from a set of four solo artists. Find details and listening recommendations past the split!
     <hr class="split">
-    <i>As ever, thank you to everyone who sent feedback and kind messages during development! We're also very grateful for all [[static:donate|supporters of the wiki]], including: enchantingHunter, leo homestuck, and Nights!</i>
+    <i>As ever, thank you to everyone who sent feedback and kind messages during development! We're also very grateful for all [[static:donate|supporters of the wiki]], including: enchantingHunter, vriska/leo, and Nights!</i>
     Last update was another heavily development-focused one; reworking the codebase to support localization was a fairly daunting task. With that largely complete, though, we had the chance to focus on the core of the wiki again - music!
     So, building on the addition of solo musician groups in [[news-entry:retrace-retexture]], we've a lovely set of independent albums and tracks to share from four artists this time. You might recognize a few of their names!
     From [[group:cristata]], the artist behind [[album:perfectly-generic-album]] as well as the [[group:unofficial-mspa-fans|UMSPAF]] track [[track:party-god]], we have the all-new experimental dance album, [[album:are-you-lost]]. It's released under the alias [[artist:hywell]], and features remixes primarily of tracks from Undertale and Deltarune, though there's a trace or two of Homestuck to be found as well, if you're attentive!
@@ -169,7 +169,7 @@ Content: |-
     <i>Looking for volunteer translators to help bring the wiki to different languages!</i>
     Hello again! We have a smaller update to share this month - mostly polish and internal restructuring. It's all in the aims of making the site more accessible; we're now <b>looking for translators</b> to help bring the site around the world! Details, as usual, past the split.
     <hr class="split">
-    <i>As ever, thank you to everyone who sent feedback and kind messages during development! We're also very grateful for all [[static:donate|supporters of the wiki]], including: Nights, enchantingHunter, and leo homestuck!</i>
+    <i>As ever, thank you to everyone who sent feedback and kind messages during development! We're also very grateful for all [[static:donate|supporters of the wiki]], including: Nights, enchantingHunter, and vriska/leo!</i>
     As mentioned in the intro, we're looking for translators to help make the site more accessible for people around the world. We've done our best to streamline and make the process as simple as possible; please visit this <a href="https://docs.google.com/document/d/1WLkw1Q-OECXdaNB4LB8neL92F1JNL0q1gGn8zVpZLec/edit">Wiki Localization - Project Outline</a> document for all the info!
     TL;DR: Join the <a href="discord/">Community Discord Server</a> and drop a message, and we'll give you permission to edit the <a href="https://docs.google.com/spreadsheets/d/1BUSanXH5FNU0thJAcW5bw41UuuxKbMHkGsPxt9eyQ4U/edit#gid=0">Working Sheets</a> (plus the team chat, where you can discuss translation and ask any related questions). Enter translated values for the provided reference strings; then, to get a second pair of eyes from another translator, write a sign-off name and mark the row for review!
     There are currently less than 300 (all very short) messages to translate across the wiki. <b>You don't need prior, professional translation experience to join;</b> anyone who knows another language in addition to English is welcome to contribute what they'd like!
@@ -199,7 +199,7 @@ Content: |-
     <i>Album wallpapers, internal changes, and more!</i>
     Hi again! We hope the month's been as kind as possible to you all. As planned, we have a new monthly update! The wiki's undergoing some significant internal improvements, but we have a host of new features, and, of course, wonderful albums and artists to share, as well. Thanks go out to our very first patrons - details of all past the split!
     <hr class="split">
-    <i>As ever, thank you to everyone who sent feedback and kind messages during development! We're also very grateful for all [[static:donate|supporters of the wiki]], including: Nights, enchantingHunter, and leo homestuck!</i>
+    <i>As ever, thank you to everyone who sent feedback and kind messages during development! We're also very grateful for all [[static:donate|supporters of the wiki]], including: Nights, enchantingHunter, and vriska/leo!</i>
     This update is another code-heavy one internally, with lots of changes and additions to make improving the wiki easier - and there's still more to come! But first, here's a summary of the new music shared on the wiki this release (check 'em out!):
     - From [[group:michael-guy-bowman]]:
         - All of his albums! He's created some really wonderful music, and we're super happy to share it here.
@@ -237,7 +237,7 @@ Content: |-
     As in last month's entry: the meta around the wiki! :)
     - Again, thanks graciously to our first supporters on <a href="https://www.patreon.com/qznebula">Patreon</a> and <a href="https://liberapay.com/nebula">Liberapay</a>! I really didn't expect it to step up from the ground so quickly. In case you missed it, we updated the tiers on Patreon; the profile names of supporters will show up as part of news entries, as well as on the [[static:about|About &amp; Credits]] page.
     - The [[static:discord|Community Discord Server]] grew pretty significantly over the development of this release! Working with everyone there was a blast. Thanks to feedback, we restructured the wiki a little, too: there are new #devblog, #devblog-discussion, and #git-update channels, all for keeping up with and discussing particular progress on the wiki! No more need to go through chat backlog; the info's all here. :3
-    - <a href="https://leo60228.space/">leo homestuck</a> released an awesome tool called <a href="https://leo60228.space/hsmusicifier-automatically-add-track-art-to-id3-tags-including-fan-anthologies-and-post-2019-bandcamp/">hsmusicifier</a>! It adds track art and artist information from HSMusic to your own music library, and has <a href="https://leo60228.space/hsmusicifier-0-2-0-add-track-art-and-artist-info-to-your-homestuck-music-collection-in-any-format/">a bunch</a> of <a href="https://leo60228.space/hsmusicifier-0-3-0-split-up-bundled-albums-with-additional-flexibility-for-art/">other utilities</a> too. Our car dashboard shows track art for what's currently playing; it's been a wonder to have the original art restored, as well as the anthology fanart for albums like [[album:homestuck-vol-5]] and [[album:beyond-canon]] show up there!
+    - <a href="https://leo60228.space/">leo</a> released an awesome tool called <a href="https://leo60228.space/hsmusicifier-automatically-add-track-art-to-id3-tags-including-fan-anthologies-and-post-2019-bandcamp/">hsmusicifier</a>! It adds track art and artist information from HSMusic to your own music library, and has <a href="https://leo60228.space/hsmusicifier-0-2-0-add-track-art-and-artist-info-to-your-homestuck-music-collection-in-any-format/">a bunch</a> of <a href="https://leo60228.space/hsmusicifier-0-3-0-split-up-bundled-albums-with-additional-flexibility-for-art/">other utilities</a> too. Our car dashboard shows track art for what's currently playing; it's been a wonder to have the original art restored, as well as the anthology fanart for albums like [[album:homestuck-vol-5]] and [[album:beyond-canon]] show up there!
     As ever, thank you for the support and feedback. Besides the Discord, [[static:feedback|our usual channels remain open]], so you're much encouraged to share any comments or music suggestions for the coming releases!
     <i>~ Quasar Nebula</i>
 ---
diff --git a/static-page/changelog.yaml b/static-page/changelog.yaml
index 1ecc846d..f5a5abd1 100644
--- a/static-page/changelog.yaml
+++ b/static-page/changelog.yaml
@@ -136,8 +136,8 @@ Content: |-
     - edited banner for [[album:bashful-hearts-out]] to preserve pixelated look
     - fixed 'edits for wiki' attribution for altered banners missing for some albums
     - added [[track:the-ballad-of-jack-noir-original]], [[track:conflict]], [[track:haunt]] and [[track:mother-malcolm-brown]] to [[album:more-homestuck-fandom]] for referencing
-    - added [[track:i-knew-you-were-trouble]], [[track:im-a-believer]], and [[track:whats-up]] to [[album:references-beyond-homestuck]] for referencing references (thanks, Gibus Wearing Brony!), also [[track:axel-f]], [[track:colresss-theme]], [[track:doll-judgement-the-girl-who-played-with-peoples-shapes]], [[track:dont-cry-out-loud]], [[track:earth]], [[track:farewell-song]], [[track:im-a-man-of-constant-sorrow]], [[track:johnny-fill-up-the-bowl]], [[track:jupiter-the-bringer-of-jollity]], [[track:katamari-on-the-rocks]], [[track:my-little-pony-friendship-is-magic-theme]], [[track:nos-galan]], [[track:nyanyanyanyanyanyanya]], [[track:romantic-children]], [[track:shchedryk]], [[track:soul-0-system]], [[track:the-anacreontic-song]]
-        - new artists: [[artist:andrea-libman]], [[artist:ashleigh-ball]], [[artist:beverly-hills-cop]], [[artist:carole-bayer-sager]], [[artist:daniel-ingram]], [[artist:david-tickle]], [[artist:dick-burnett]], [[artist:gustav-holst]], [[artist:harold-faltermeyer]], [[artist:j-durnal]], [[artist:john-ceiriog-hughes]], [[artist:kazumi-evans]], [[artist:keita-takahashi]], [[artist:lauren-faust]], [[artist:melissa-manchester]], [[artist:neil-diamond]], [[artist:peter-allen]], [[artist:peter-j-wilhousky]], [[artist:ralph-tomlinson]], [[artist:rebecca-shoichet]], [[artist:shannon-chan-kent]], [[artist:smile]], [[artist:talhaiarn]], [[artist:the-stanley-brothers]], [[artist:yuu-miyake]]
+    - added [[track:i-knew-you-were-trouble]], [[track:im-a-believer]], and [[track:whats-up]] to [[album:references-beyond-homestuck]] for referencing references (thanks, Gibus Wearing Brony!), also [[track:axel-f]], [[track:colresss-theme]], [[track:doll-judgement-the-girl-who-played-with-peoples-shapes]], [[track:dont-cry-out-loud]], [[track:earth]], [[track:farewell-song]], [[track:good-day]], [[track:im-a-man-of-constant-sorrow]], [[track:johnny-fill-up-the-bowl]], [[track:jupiter-the-bringer-of-jollity]], [[track:katamari-on-the-rocks]], [[track:my-little-pony-friendship-is-magic-theme]], [[track:nos-galan]], [[track:nyanyanyanyanyanyanya]], [[track:romantic-children]], [[track:shchedryk]], [[track:soul-0-system]], [[track:the-anacreontic-song]]
+        - new artists: [[artist:andrea-libman]], [[artist:ashleigh-ball]], [[artist:beverly-hills-cop]], [[artist:carole-bayer-sager]], [[artist:daniel-ingram]], [[artist:david-tickle]], [[artist:dick-burnett]], [[artist:flash-garments]], [[artist:gustav-holst]], [[artist:harold-faltermeyer]], [[artist:j-durnal]], [[artist:j-mac]], [[artist:john-ceiriog-hughes]], [[artist:kazumi-evans]], [[artist:keita-takahashi]], [[artist:lauren-faust]], [[artist:melissa-manchester]], [[artist:neil-diamond]], [[artist:peter-allen]], [[artist:peter-j-wilhousky]], [[artist:ralph-tomlinson]], [[artist:rebecca-shoichet]], [[artist:shannon-chan-kent]], [[artist:smile]], [[artist:talhaiarn]], [[artist:the-stanley-brothers]], [[artist:yuu-miyake]]
     <h3>data changes</h3>
     - added information for separate 'sampling' reference field to many tracks (mainly in [[group:official]], [[group:homestuck-gaiden]], and [[album:lofam5]]), not visible for now until support is implemented
         - some reference information will have appeared to disappear until then as it has been moved to samples
@@ -146,7 +146,7 @@ Content: |-
     - added [[flash:sbahj-movie-1]] to the Miscellaneous section of Flashes & Games and [[track:sbahj-the-movie-1]] to [[album:unreleased-tracks]]
     - [[flash:338|Dave's Phat Beat Machine]] no longer features [[track:john-do-the-windy-thing]] after the demise of Flash
         - 'cp_close.mp3' has been retitled [[track:captain-planet-and-the-planeteers-end-title]] and is now in [[album:references-beyond-homestuck]] with new artists [[artist:murray-mcfadden]], [[artist:timothy-mulhollan]], and [[artist:nicholas-boxer]]
-    - added lyrics for [[track:gameglr]], [[track:g4m38l0rg]], [[track:pencil-holder-demo-version]], [[track:battle-colress]], [[track:calamari-inkantation]], [[track:historia-crux]], [[track:jump-up-super-star]], [[track:left-hand-remix]], [[track:right-hand-remix]], [[track:lonely-rolling-star]], [[track:say-i-gotta-believe]], [[track:silencio]], [[track:vela-nova]], [[track:burn]], [[track:can-you-feel-the-love-tonight]], [[track:captain-planet-and-the-planeteers-end-title]], [[track:ghostbusters]], [[track:how-do-i-live]], [[track:jojo-sono-chi-no-sadame]], [[track:mailtime]], [[track:meet-the-flintstones]], [[track:potato-knishes]], [[track:rainbow-connection]], [[track:running-in-the-90s]], [[track:space-jam]], [[track:stronger-than-you]], [[track:supercalifragilisticexpialidocious]], [[track:the-court-of-miracles]], [[track:the-story-of-tonight]], [[track:the-ultimate-showdown-of-ultimate-destiny]], [[track:we-are-number-one]], [[track:yee]], [[track:youre-a-mean-one-mr-grinch]], [[track:youre-standing-on-my-neck]], [[track:aba-daba-honeymoon]], [[track:ah-vous-dirai-je-maman]], [[track:bedelia]], [[track:carol-of-the-bells]], [[track:deck-the-halls]], [[track:frosty-the-snowman]], [[track:funiculi-funicula]], [[track:god-rest-you-merry-gentlemen]], [[track:good-king-wenceslas]], [[track:greensleeves]], [[track:la-cucaracha]], [[track:la-espero]], [[track:let-it-snow-let-it-snow-let-it-snow]], [[track:magnificat]], [[track:polovtsian-dances]], [[track:santa-claus-is-comin-to-town]], [[track:silent-night]], [[track:tempus-adest-floridum]], [[track:the-first-noel]], [[track:the-one-horse-open-sleigh]], [[track:the-star-spangled-banner]], [[track:toreador-song]], [[track:lisa-frank-420-modern-computing]], [[track:a-song-about-a-circle-constant]], [[track:accept-my-shaft]], [[track:all-star]], [[track:axel-f-crazy-frog]], [[track:badgers]], [[track:big-enough]], [[track:bodies]], [[track:bouncy-ball]], [[track:caramelldansen]], [[track:careless-whisper]], [[track:crank-that]], [[track:creeping-in-my-soul]], [[track:crystal-kingdom-part-one]], [[track:crystal-kingdom-part-four]], [[track:danger-high-voltage]], [[track:dark-necessities]], [[track:drop-it-like-its-hot]], [[track:et]], [[track:everybody-everybody]], [[track:fantasy-costco-jingle]], [[track:fever]], [[track:fireflies]], [[track:friday]], [[track:fuck-tha-police]], [[track:gangnam-style]], [[track:get-it-on]], [[track:giorgio-by-moroder]], [[track:goodbye-to-the-underground]], [[track:griffin-space-jam]], [[track:he-not-like-the-banana]], [[track:hey-baby]], [[track:i-am-a-man-of-constant-sorrow]], [[track:i-knew-you-were-trouble]], [[track:i-knew-you-were-trouble-ft-screaming-goat]], [[track:im-a-believer]], [[track:im-a-believer-smash-mouth]], [[track:i-really-really-really-like-this-image]], [[track:im-a-member-of-the-midnight-crew]], [[track:isle-unto-thyself]], [[track:its-your-move]], [[track:it-dont-mean-a-thing-if-it-aint-got-that-swing]], [[track:jet-black]], [[track:lawnmower]], [[track:lose-yourself]], [[track:mad-about-the-boy]], [[track:marisa-stole-the-precious-thing]], [[track:master-of-puppets]], [[track:miracles-icp]], [[track:never-gonna-give-you-up]], [[track:nova-solis]], [[track:nyanyanyanyanyanyanyamomo-momone]], [[track:paint-it-black]], [[track:peanut-butter-jelly]], [[track:piss]], [[track:pokemon-go-song]], [[track:prana-ferox]], [[track:redbone]], [[track:rosanna]], [[track:roundabout]], [[track:stone-halation]], [[track:swan-song-set-it-off]], [[track:take-me-away]], [[track:teenagers]], [[track:the-next-episode]], [[track:the-number-of-the-beast]], [[track:the-riddle-wants-to-be]], [[track:the-witch]], [[track:this-is-america]], [[track:two-trucks]], [[track:uptown-funk]], [[track:viva-la-vida]], [[track:what-is-a-juggalo]], [[track:wonderwall]], [[track:wow-wow]]
+    - added lyrics for [[track:gameglr]], [[track:g4m38l0rg]], [[track:pencil-holder-demo-version]], [[track:battle-colress]], [[track:calamari-inkantation]], [[track:historia-crux]], [[track:jump-up-super-star]], [[track:left-hand-remix]], [[track:right-hand-remix]], [[track:lonely-rolling-star]], [[track:say-i-gotta-believe]], [[track:silencio]], [[track:vela-nova]], [[track:burn]], [[track:can-you-feel-the-love-tonight]], [[track:captain-planet-and-the-planeteers-end-title]], [[track:ghostbusters]], [[track:how-do-i-live]], [[track:jojo-sono-chi-no-sadame]], [[track:mailtime]], [[track:meet-the-flintstones]], [[track:potato-knishes]], [[track:rainbow-connection]], [[track:running-in-the-90s]], [[track:space-jam]], [[track:stronger-than-you]], [[track:supercalifragilisticexpialidocious]], [[track:the-court-of-miracles]], [[track:the-story-of-tonight]], [[track:the-ultimate-showdown-of-ultimate-destiny]], [[track:we-are-number-one]], [[track:yee]], [[track:youre-a-mean-one-mr-grinch]], [[track:youre-standing-on-my-neck]], [[track:aba-daba-honeymoon]], [[track:ah-vous-dirai-je-maman]], [[track:bedelia]], [[track:carol-of-the-bells]], [[track:deck-the-halls]], [[track:frosty-the-snowman]], [[track:funiculi-funicula]], [[track:god-rest-you-merry-gentlemen]], [[track:good-king-wenceslas]], [[track:greensleeves]], [[track:la-cucaracha]], [[track:la-espero]], [[track:let-it-snow-let-it-snow-let-it-snow]], [[track:magnificat]], [[track:polovtsian-dances]], [[track:santa-claus-is-comin-to-town]], [[track:silent-night]], [[track:tempus-adest-floridum]], [[track:the-first-noel]], [[track:the-one-horse-open-sleigh]], [[track:the-star-spangled-banner]], [[track:toreador-song]], [[track:lisa-frank-420-modern-computing]], [[track:a-song-about-a-circle-constant]], [[track:accept-my-shaft]], [[track:all-star]], [[track:axel-f-crazy-frog]], [[track:badgers]], [[track:big-enough]], [[track:bodies]], [[track:bouncy-ball]], [[track:caramelldansen]], [[track:careless-whisper]], [[track:cat-no-banana]], [[track:crank-that]], [[track:creeping-in-my-soul]], [[track:crystal-kingdom-part-one]], [[track:crystal-kingdom-part-four]], [[track:danger-high-voltage]], [[track:dark-necessities]], [[track:drop-it-like-its-hot]], [[track:et]], [[track:everybody-everybody]], [[track:fantasy-costco-jingle]], [[track:fever]], [[track:fireflies]], [[track:friday]], [[track:fuck-tha-police]], [[track:gangnam-style]], [[track:get-it-on]], [[track:giorgio-by-moroder]], [[track:goodbye-to-the-underground]], [[track:griffin-space-jam]], [[track:hey-baby]], [[track:i-am-a-man-of-constant-sorrow]], [[track:i-knew-you-were-trouble]], [[track:i-knew-you-were-trouble-ft-screaming-goat]], [[track:im-a-believer]], [[track:im-a-believer-smash-mouth]], [[track:i-really-really-really-like-this-image]], [[track:im-a-member-of-the-midnight-crew]], [[track:isle-unto-thyself]], [[track:its-your-move]], [[track:it-dont-mean-a-thing-if-it-aint-got-that-swing]], [[track:jet-black]], [[track:lawnmower]], [[track:lose-yourself]], [[track:mad-about-the-boy]], [[track:marisa-stole-the-precious-thing]], [[track:master-of-puppets]], [[track:miracles-icp]], [[track:never-gonna-give-you-up]], [[track:nova-solis]], [[track:nyanyanyanyanyanyanyamomo-momone]], [[track:paint-it-black]], [[track:peanut-butter-jelly]], [[track:piss]], [[track:pokemon-go-song]], [[track:prana-ferox]], [[track:redbone]], [[track:rosanna]], [[track:roundabout]], [[track:stone-halation]], [[track:swan-song-set-it-off]], [[track:take-me-away]], [[track:teenagers]], [[track:the-next-episode]], [[track:the-number-of-the-beast]], [[track:the-riddle-wants-to-be]], [[track:the-witch]], [[track:this-is-america]], [[track:two-trucks]], [[track:uptown-funk]], [[track:viva-la-vida]], [[track:what-is-a-juggalo]], [[track:wonderwall]], [[track:wow-wow]]
     - added commentary to multiple traditional [[album:references-beyond-homestuck]] tracks, providing snippets of context
     - fixed incorrect title for [[track:skaian-dreams-remix]]
     - fixed artist/contributor confusion between the original and rereleased versions of [[track:harleboss]] and [[track:explore]] (thanks, Niklink!)
@@ -210,7 +210,8 @@ Content: |-
     - fixed [[track:walk-smash-walk]] not being listed in the reference list for [[track:walk-stab-walk-rande]] (thanks, Sgeo!)
     - fixed [[Amen, Brother]] not being listed in the reference list for [[Airtime]] (thanks, Gibus Wearing Brony!)
     - fixed [[track:corrupting-tranquility]] (a new track by new artist [[artist:daydream-anatomy]]) not being listed in the reference list for [[track:skaia-ad-infinitum]]
-    - fixed [[track:megalo-strike-back]] and [[track:even-in-death]], not being listed in the reference list for [[track:megalo-in-death]]
+    - fixed [[track:another-him]] and [[track:liquid-negrocity]] not being listed in the reference list for [[track:another-noir-extended-void-mix]], and [[track:gasters-theme]] being incorrectly listed in the same
+    - fixed [[track:megalo-strike-back]] and [[track:even-in-death]] not being listed in the reference list for [[track:megalo-in-death]]
     - fixed [[track:fabulous-secret-powers]] not being listed in the reference list for [[track:oh-2017]] (thanks, Niklink!)
     - fixed [[track:aggrieve-remix]] referencing [[track:aggrieve]] instead of [[track:aggrieve-violin-refrain]]
     - fixed [[track:white-host-green-room]] referencing [[track:the-king-in-red]] instead of [[track:the-king-in-red-beta]] (thanks, Cello!)
@@ -223,6 +224,7 @@ Content: |-
     - fixed [[track:heir-seer-knight-witch]] being named "~ Heir - Seer - Knight - Witch ~"
     - fixed [[track:blood-for-my-ancestors]] listing [[track:summer]] and [[track:howl]] as references
     - fixed [[track:the-story-of-tonight]] being named "Tomorrow There'll Be More Of Us" (thanks, Celeste!)
+    - fixed [[track:cat-no-banana]] being named "He Not Like The Banana" and being attributed to "Cat No Banana" instead of [[artist:joshdub]]
     - fixed [[track:fabulous-secret-powers]] being named "HEYYEYAAEYAAAEYAEYAA"
     - fixed [[track:i-am-a-man-of-constant-sorrow]] being named "Man of Constant Sorrow"
     - fixed [[track:peanut-butter-jelly]] being named "Peanut Butter Jelly Time"
@@ -247,6 +249,7 @@ Content: |-
     - renamed [[artist:professor-layton]] from 'Professor Layton and the Curious Village' and [[artist:the-hunchback-of-notre-dame]] from 'Disney'
     - added Bandcamp links back to [[group:clark-powell]]'s albums: [[album:we-are-all-satellites]], [[album:namesake]], [[album:someday]], and [[album:labyrinths-heart]] (thanks, Celeste!)
     - added Bandcamp link to [[album:perfectly-generic-object]] (thanks, vriska/leo!)
+    - added YouTube links to [[album:perfectly-generic-album]] (thanks, vriska/leo!)
     - replaced many YouTube links in [[album:references-beyond-homestuck]] to official uploads where possible
     - replaced dead YouTube links to [[album:the-felt]], [[track:constant-conquest]], [[track:skaian-starstorm]], [[track:celestial-fantasia]], [[track:corridors-of-time]], [[track:icirrus-city]], [[track:historia-crux]], [[track:left-hand-remix]], [[track:terras-theme]], [[track:the-decisive-battle-final-fantasy-vi]], [[track:fear-of-the-heavens]], all tracks from [[artist:earthbound]], and removed dead YouTube link from [[track:planetarium]] (thanks, foreverFlummoxed, Sgeo, Celeste!)
         - also replaced dead YouTube links to [[track:a-bell-is-tolling]], [[track:bloody-tears]], [[track:chrono-trigger]], [[track:danger-high-voltage]], [[track:eternal-recurrence]], [[track:frogs-theme]], [[track:ghostbusters]],[[track:historia-crux]] (again), [[track:laytons-theme]], [[track:neos-city-night]], [[track:schalas-theme]], [[track:steam-gardens]], [[track:stone-tower-temple]], [[track:the-decisive-battle-final-fantasy-vi]] (again!), [[track:the-little-sprite]], [[track:the-number-of-the-beast]], [[track:the-simpsons-theme]], [[track:ultimate-koopa]], [[track:waluigi-pinball-wario-stadium]], [[track:wind-scene]], [[track:wonderwall]]
@@ -350,7 +353,7 @@ Content: |-
 
     <h2 id="16-jul-2021"><a href="#16-jul-2021">[[date:16 July 2021]]</a></h2>
     <h3>data changes</h3>
-    - added blood CW tag to [[track:eternity-served-cold]] (thanks, leo!)
+    - added blood CW tag to [[track:eternity-served-cold]] (thanks, vriska/leo!)
     - added [[track:sburban-jungle]] to reference list of [[track:void-session]] (thanks, Niklink!)
 
     <h2 id="7-jul-2021"><a href="#7-jul-2021">[[date:7 July 2021]] - Wiki Finalization</a></h2>
@@ -406,7 +409,7 @@ Content: |-
         - [[track:oh-2017]] references [[track:woah]]
         - added [[track:sweet-victory]] as the track referenced (i.e. featured) in [[track:what-year-is-it]]
         - added bandcamp links to all referenced [[artist:silvagunner]] tracks
-        - ty nata for reference fixes and leo for bandcamp links!
+        - ty nata for reference fixes and vriska/leo for bandcamp links!
 
     <h2 id="12-may-2021" class="major-release"><a href="#12-may-2021">[[date:12 May 2021]] - the my ex-wife is a real bitch update</a></h2>
     (news entry: [[news-entry:the-my-ex-wife-is-a-real-bitch-update]])
diff --git a/static-page/donate.yaml b/static-page/donate.yaml
index ebdc74c6..fcb3c592 100644
--- a/static-page/donate.yaml
+++ b/static-page/donate.yaml
@@ -5,5 +5,5 @@ Content: |-
     For a few months during 2021, we welcomed donations to help support wiki development. Donations are now closed, but we remain in gratitude to everyone who gave, including:
     - Nights
     - enchantingHunter
-    - leo homestuck
+    - vriska/leo
     - Gradis