« get me outta code hell

review: additional tracks - hsmusic-data - Data files for https://hsmusic.wiki - track, album, artist & flash info, etc
summary refs log tree commit diff
diff options
context:
space:
mode:
authorNiklink <25875275+Niklink@users.noreply.github.com>2023-09-08 17:01:12 -0400
committerNiklink <25875275+Niklink@users.noreply.github.com>2023-09-08 17:02:57 -0400
commitf17525bef7f5bbb2e387394fcd13c0a8c1e3be47 (patch)
tree0d9285ae01704ba4bf3ad6336ab79448050f3ea5
parent32dfbafe9a45e74e6f432dc68e5adda58984cab2 (diff)
review: additional tracks
also changelog
-rw-r--r--album/9.yaml11
-rw-r--r--album/bowmania.yaml8
-rw-r--r--album/canwave-2.yaml14
-rw-r--r--album/cool-and-new-homestuck-2.yaml12
-rw-r--r--album/cool-and-new-sonic-team.yaml2
-rw-r--r--album/references-beyond-homestuck.yaml2049
-rw-r--r--album/v8lume.yaml6
-rw-r--r--artists.yaml65
-rw-r--r--static-page/changelog.yaml20
9 files changed, 1236 insertions, 951 deletions
diff --git a/album/9.yaml b/album/9.yaml
index f033d2b7..e75311c4 100644
--- a/album/9.yaml
+++ b/album/9.yaml
@@ -518,7 +518,6 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/starsetter
 - https://youtu.be/DSpCAx81Haw
 Referenced Tracks:
-- Sunsetter
 - track:sburban-jungle
 Commentary: |-
     <i>cosmicTerrorist:</i> (Composer)
@@ -1114,7 +1113,7 @@ Referenced Tracks:
 - I absolutely loathe this Drummer.
 - Flare
 - RollerCoaster Tycoon Theme
-- Secret of the Forest
+- track:secret-of-the-forest-retro-remix-revue
 - Rhythm Code
 - Another Jungle
 - track:jungle-3
@@ -1422,11 +1421,9 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/please-kill-me-remastered-vol-9-edition
 - https://youtu.be/ON9wK6fLLs0
 Referenced Tracks:
-- GameBro (Original 1990 Mix)
-- The Nutshack Intro
+- please kill me.
 Sampled Tracks:
-- GameBro (Original 1990 Mix)
-- The Nutshack Intro
+- please kill me.
 Lyrics: |-
     It's the Nutshack! (Yo.) (Yee, yee.)
     It's the Nutshack! (What he say?) (Hooaugh!) (Hey...)
@@ -1466,7 +1463,7 @@ Commentary: |-
     life is pain
 
     <i>greenTetrahedron:</i> (Artist)
-    i just took the peanut from the original [[track:please-kill-me|please kill me]] and used it as a brush and then added motion blur 
+    i just took the peanut from the original please kill me and used it as a brush and then added motion blur 
 ---
 Track: Corrupted Collision
 Artists:
diff --git a/album/bowmania.yaml b/album/bowmania.yaml
index 728d1afa..b28772e0 100644
--- a/album/bowmania.yaml
+++ b/album/bowmania.yaml
@@ -714,10 +714,10 @@ Cover Artists:
 - GoomFloops
 Duration: '00:23'
 Referenced Tracks:
-- Let Me Hit It (Audiostalkers Remix)
+- Let Me Hit It (Audiostalkers)
 - Michael Bowman Remix
 Sampled Tracks:
-- Let Me Hit It (Audiostalkers Remix)
+- Let Me Hit It (Audiostalkers)
 - Michael Bowman Remix
 - 'Harrison: An American Musical'
 URLs:
@@ -1067,10 +1067,10 @@ Art Tags:
 - Sonic
 Duration: '03:17'
 Referenced Tracks:
-- Breakfast Time
+- Breakfast Time - For Horizon Heights Boss Act Phase 2
 - Michael Bowman Remix
 Sampled Tracks:
-- Breakfast Time
+- Breakfast Time - For Horizon Heights Boss Act Phase 2
 - Michael Bowman Remix
 - Bowman's Credit Score
 - Bumper to Bumper
diff --git a/album/canwave-2.yaml b/album/canwave-2.yaml
index 418de476..971fd0db 100644
--- a/album/canwave-2.yaml
+++ b/album/canwave-2.yaml
@@ -429,21 +429,21 @@ Lyrics: |-
     China China China ChinaChina
     China China China ChinaChina
     ChinaChinaChina I'm from ChinaChina
-    China ChinaChina I have people that I know in
+    China ChinaChinChina I have people that I know in
     China China China ChinaChina 
     China China China ChinaChina
     ChinaChinaChina I'm from ChinaChina
     China ChinaChina I have people that I know in
 
-    China China
+    China China China
     ChinaChinaChinaChina
-    China China
+    China China China
     ChinaChinaChinaChina
 
     I've been saying China China China China China China
-    China China
+    China China China
     China, I like China
-    I go to China ChinaChinaChinaChina ChinaChina ChinaChina
+    I go to China ChinaChinaChinaChina China ChinaChina, ChinaChina
     China I go to China, China ChinaChinaChinaChinaChinaChina
 
     China China ChiChina, I go to China
@@ -454,8 +454,8 @@ Lyrics: |-
     I know China, I love China, China China
     China ChiChina, China
     China China China China
-    China all the time China
-    I love China
+    China all the time
+    China China China China China!
 
     (And by the way, I love China.)
 ---
diff --git a/album/cool-and-new-homestuck-2.yaml b/album/cool-and-new-homestuck-2.yaml
index 6943919a..32fbd33c 100644
--- a/album/cool-and-new-homestuck-2.yaml
+++ b/album/cool-and-new-homestuck-2.yaml
@@ -668,10 +668,12 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/critical-error
 - https://youtu.be/cQUUd5Xgj54
 Referenced Tracks:
-- track:lisa-frank-420-modern-computing
-- Seinfeld Theme
+- Gold Pilot
 - Meet the Flintstones
+- Seinfeld Theme
+- track:lisa-frank-420-modern-computing
 Sampled Tracks:
+- Seinfeld Theme
 - track:lisa-frank-420-modern-computing
 Commentary: |- 
     <i>Dream Narwhal:</i> (Composer)
@@ -682,6 +684,8 @@ Commentary: |-
 
     <i>Cloudaria:</i> (Artist)
     I was bored and wanted to see what had spots open on the spreadsheet, chose this because gold pilot is a good song. for the track art i kinda combined the different things this song was about - the glitched entry to the alpha session and sollux's ancestor - no becquerel unfortunately since i forgot the fact that gold pilot was originally a bec song before the title change while i was making this. fun fact: the code in the background was made by me dicking around in hackertyper and screenshotting it
+Lyrics: |-
+    (Goodbye.)
 ---
 Track: Vegetal Colina
 Artists:
@@ -931,7 +935,7 @@ Referenced Tracks:
 - Disney Bootlegs - JonTron
 - Oppa Toby Style
 - track:explore
-- track:blue-eiffel-65
+- Blue (Da Ba Dee) (DJ Ponte Ice Pop Mix)
 - Lord Spanish
 - Galo Sengen
 - ASSAULT
@@ -1117,7 +1121,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/eternity-served-medium-well-avec-cr-me-de-champignons-a-k-a-eternity-served-spicy
 - https://www.youtube.com/watch?v=gWXCAlyax9w
 Referenced Tracks:
-- track:penumbra-phantasm
+- track:showtime-original-mix
 - Hate You
 - Derse Dreamers
 - track:doctor
diff --git a/album/cool-and-new-sonic-team.yaml b/album/cool-and-new-sonic-team.yaml
index 4eacc392..a5e11c7e 100644
--- a/album/cool-and-new-sonic-team.yaml
+++ b/album/cool-and-new-sonic-team.yaml
@@ -75,7 +75,7 @@ Duration: '02:52'
 Cover Artists:
 - Hadron
 Referenced Tracks:
-- Lights, Camera, Action!
+- Lights, Camera, Action! (Studiopolis Zone Act 1)
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/studiopolis-zone
 - https://youtu.be/g6TQodEXPOE
diff --git a/album/references-beyond-homestuck.yaml b/album/references-beyond-homestuck.yaml
index ca2834a8..a88dc192 100644
--- a/album/references-beyond-homestuck.yaml
+++ b/album/references-beyond-homestuck.yaml
@@ -33,7 +33,7 @@ Lyrics: |-
     I'm thinking of a number
     I'm thinking of a number
     I'm I'm I'm I'm I'm thinking of a number
-    I'm I'm I'm I'm I'm I'm I'm I'm I'm----
+    I'm I'm I'm I'm I'm I'm I'm I'm I'm—
 
     Keep your eyes on the airwaves
     Don't look down if you don't want to fall
@@ -143,10 +143,10 @@ Lyrics: |-
     All I wanna do
 
     A person, name, a thing, or place
-    there's something else I'll
-    there's something else I'll
-    there's something else I'll
-    person--name-- orplace
+    There's something else I'll
+    There's something else I'll
+    There's something else I'll
+    Person— name— or place
 
     The noun
 
@@ -167,10 +167,10 @@ Lyrics: |-
     I'll make the sound
     The noun
 
-    there's something else I'll
-    there's something else I'll
-    there's something else I'll
-    person--name--or place
+    There's something else I'll
+    There's something else I'll
+    There's something else I'll
+    Person— name— or place
 
     The noun
 
@@ -199,10 +199,10 @@ Lyrics: |-
     I'll make the sound
     The noun (The noun, the noun)
 
-    there's something else I'll
-    there's something else I'll
-    there's something else I'll
-    person--name--or place
+    There's something else I'll
+    There's something else I'll
+    There's something else I'll
+    Person— name— or place
 
     The noun (The noun, the noun)
 
@@ -261,6 +261,15 @@ Lyrics: |-
     Then you have a weird chord change<br>Because it's a newer Touhou song
     Then they make a joke about apple pie
 ---
+Track: Backyard Fun Theme
+# Also known as "funmusic.mp3"
+# The song in the background of Backyard Fun, unreleased
+Artists:
+- Michael Guy Bowman
+Duration: '3:56'
+URLs:
+- https://www.youtube.com/watch?v=pa7xBUKruEw&t=52s
+---
 Track: Bogey Theme
 Artists:
 - Mark J. Hadley
@@ -301,6 +310,66 @@ URLs:
 Referenced Tracks:
 - WELCOME TO THE CITY
 ---
+Track: Discordant
+Artists:
+- Cecily Renns
+Duration: '2:24'
+URLs:
+- https://johnjrenns.bandcamp.com/track/discordant-2
+Lyrics: |-
+    Jere we go again
+    Makin' some music and shit
+    Just open that FL studio
+    The easiest thing to do, hey
+
+    Yeah thats right
+    I'll open that SGM
+    The piano roll will be my domain
+    What's so fucking hard 'bout that
+
+    But I do have to admit
+    This life's not that easy as it sounds
+    Theres just one little problem
+    Something about my melody
+
+    It's discordant
+    Why is it so damn hard to find the right harmony
+    It's so discordant
+    Listen to it then you'll see
+    It's so discordant
+
+    Alright then
+    I think I've figured it out
+    There's something wrong about the chord progression
+    I've just gotta fix that then
+    But it looks
+    Like the chord is all fine and nice
+    Then is it the fucking scale that's off
+    I dont know cause it's too confusing
+
+    Maybe this life isn't for me
+    Maybe I should give up and quit composing
+    No no no I can't say that
+    Even if it's hard it's so fun
+
+    It's discordant
+    Look at all these people saying my music sucks but
+    It's really alright and well
+    This is the life I've chosen
+    I'll believe in it
+
+    Piano solo
+
+    Wait
+    There we go, sorry
+
+    It's discordant
+    Why is it so damn hard to find the right harmony
+    It's so discordant
+    Listen to it then youll see
+    It's so discordant
+    It's so discordant
+---
 Track: Dusk for the Age of Miracles
 Artists:
 - Clark Powell
@@ -766,16 +835,16 @@ Lyrics: |-
     Though I forget myself
     I'm sure there's something else
     I'll come around
-    I'll make the sound (somewhere)
+    I'll make the sound (Somewhere)
     The noun
 
     A person, name, a thing, or place
-    the no--
+    The no—
 
-    there's something else I'll
-    there's something else I'll
-    there's something else I'll
-    person--name-- or place
+    There's something else I'll
+    There's something else I'll
+    There's something else I'll
+    Person— name— or place
 
     The noun
 
@@ -796,11 +865,10 @@ Lyrics: |-
     I'll make the sound
     The noun
 
-    there's something else I'll
-    there's something else I'll
-    there's something else I'll
-    person--name--or place
-
+    There's something else I'll
+    There's something else I'll
+    There's something else I'll
+    Person— name— or place
     The noun
 
     In my car I'm on my way from where I live to where you are right now
@@ -828,10 +896,10 @@ Lyrics: |-
     I'll make the sound
     The noun (The noun, the noun)
 
-    there's something else I'll
-    there's something else I'll
-    there's something else I'll
-    person--name--or place
+    There's something else I'll
+    There's something else I'll
+    There's something else I'll
+    Person— name— or place
 
     The noun (The noun, the noun)
 
@@ -1066,16 +1134,6 @@ Duration: '3:57'
 URLs:
 - https://www.youtube.com/watch?v=MLHR9ltzuWM
 ---
-Track: Knight Artorias
-# Official release:
-#   DARK SOULS with ARTORIAS OF THE ABYSS EDITION Original Soundtrack
-# Reference:
-#   https://vgmdb.net/album/36023
-Artists:
-- Dark Souls
-- Motoi Sakuraba
-Duration: '3:15'
----
 Track: At Doom's Gate [E1M1]
 # Only released as an arranged version. Original MS-DOS release of game uses MIDI files with playback varying based on user hardware but contains specific additional sound information for OPL and GUS synthesizers. URL is to OPL recording.
 # Sources:
@@ -1199,6 +1257,87 @@ URLs:
 - https://youtu.be/i41KoE0iMYU
 Referenced Tracks:
 - Bad Apple!!
+Lyrics: |-
+    Nagareteku toki no naka de demo kedarusa ga hora guruguru mawatte
+    (<i>Even in the midst of flowing time, I feel languid, look, spinning around and around</i>)
+    Watashi kara hanareru kokoro mo mienaiwa sou shiranai?
+    (<i>I can't even see the heart that's leaving me, didn't you know?</i>)
+    Jibun kara ugoku koto mo naku toki no sukima ni nagasare tsuzukete
+    (<i>I can't even get myself to move, I continue to be washed down the cracks of time</i>)
+    Shiranai wa mawari no koto nado watashi wa watashi sore dake
+    (<i>I don't know anything about what's around me, I'm just me and no more</i>)
+
+    Yume miteru? Nani mo mitenai? Kataru mo muda na jibun no kotoba
+    (<i>Am I dreaming? Or seeing nothing? My words are useless even if I speak</i>)
+    Kanashimu nante tsukareru dake yo nani mo kanjizu sugoseba ii no
+    (<i>I'm just tired of being sad, I should go on without feeling anything</i>)
+    Tomadou kotoba ataerarete mo jibun no kokoro tada uwa no sora
+    (<i>Even if you give me the words I'm at a loss for, my heart just won't pay attention</i>)
+    Moshi watashi kara ugoku no naraba subete kaeru no nara kuro ni suru
+    (<i>If I move myself away, if I change everything, I’ll turn it all black</i>)
+
+    Konna jibun ni mirai wa aru no? Konna sekai ni watashi wa iru no?
+    (<i>Is there a future for someone like me? Will I still exist in a world like this?</i>)
+    Ima setsunai no? Ima kanashii no? Jibun no koto mo wakaranai mama
+    (<i>Is this painful? Is it sad? Not even knowing myself</i>)
+    Ayumu koto sae tsukareru dake yo hito no koto nado shiri mo shinaiwa
+    (<i>I'm just tired even of walking, I don't even understand people</i>)
+    Konna watashi mo kawareru no nara moshi kawareru no nara shiro ni naru
+    (<i>If someone like me can change, if I can change, will I turn white?</i>)
+
+    Nagareteku toki no naka de demo kedarusa ga hora guruguru mawatte
+    (<i>Even in the midst of flowing time, I feel languid, look, spinning around and around</i>)
+    Watashi kara hanareru kokoro mo mienaiwa sou shiranai?
+    (<i>I can't even see the heart that's leaving me, didn't you know?</i>)
+    Jibun kara ugoku koto mo naku toki no sukima ni nagasare tsuzukete
+    (<i>I can't even get myself to move, I continue to be washed down the cracks of time</i>)
+    Shiranai wa mawari no koto nado watashi wa watashi sore dake
+    (<i>I don't know anything about what's around me, I'm just me and no more</i>)
+
+    Yume miteru? Nani mo mitenai? Kataru mo muda na jibun no kotoba
+    (<i>Am I dreaming? Or seeing nothing? My words are useless even if I speak</i>)
+    Kanashimu nante tsukareru dake yo nani mo kanjizu sugoseba ii no
+    (<i>I'm just tired of being sad, I should go on without feeling anything</i>)
+    Tomadou kotoba ataerarete mo jibun no kokoro tada uwa no sora
+    (<i>Even if you give me the words I'm at a loss for, my heart just won't pay attention</i>)
+    Moshi watashi kara ugoku no naraba subete kaeru no nara kuro ni suru
+    (<i>If I can move, if I change everything, I’ll turn it all black</i>)
+
+    Muda na jikan ni mirai wa aru no? Konna tokoro ni watashi wa iru no?
+    (<i>Is there a future to come out of this useless time? Will I exist in a place like this?</i>)
+    Watashi no koto wo iitai naraba kotoba ni suru no nara rokudenashi
+    (<i>If I wanted to tell you what kind of person I am, the words I'd use would be "good for nothing"</i>)
+    Konna tokoro ni watashi wa iru no? Konna jikan ni watashi wa iru no?
+    (<i>Will I exist in a place like this? Will I exist in a time like this?</i>)
+    Konna watashi mo kawareru no nara moshi kawareru no nara shiro ni naru
+    (<i>If someone like me can change, if I can change, will I turn white?</i>)
+
+    Ima yume miteru? Nani mo mitenai? Kataru mo muda na jibun no kotoba
+    (<i>Am I dreaming now? Or seeing nothing? My words are useless even if I speak</i>)
+    Kanashimu nante tsukareru dake yo nani mo kanjizu sugoseba ii no
+    (<i>I'm just tired of being sad, I should go on without feeling anything</i>)
+    Tomadou kotoba ataeraretemo jibun no kokoro tada uwa no sora
+    (<i>Even if you give me the words I'm at a loss for, my heart just won't pay attention</i>)
+    Moshi watashi kara ugoku no naraba subete kaeru no nara kuro ni suru
+    (<i>If I can move, if I change everything, I’ll turn it all black</i>)
+
+    Ugoku no naraba ugoku no naraba subete kowasuwa subete kowasuwa
+    (<i>If I move, if I move, I’ll destroy everything, I’ll destroy everything</i>)
+    Kanashimu naraba kanashimu naraba watashi no kokoro shiroku kawareru?
+    (<i>If I grieve, if I grieve, can my heart turn white?</i>)
+    Anata no koto mo watashi no koto mo subete no koto mo mada shiranai no
+    (<i>I still don’t know about you, about myself, about everything</i>)
+    Omoi mabuta wo aketa no naraba subete kowasu no nara kuro ni nare!
+    (<i>If I can open my heavy eyelids, if I break everything, then turn black!</i>)
+---
+Track: Battle Against A Gorgeous Foe
+# From the fangame Mother 4's (now Oddity, with the name Mother 4 being taken by a different fangame) unreleased soundtrack
+Artists:
+- Oddity
+- nelward
+Duration: '1:41'
+URLs:
+- https://www.youtube.com/watch?v=pBr0VWbDwpk
 ---
 Track: Battle! (Champion) (Pokémon Gold & Silver Versions)
 # JP: 戦闘!チャンピオン
@@ -1246,14 +1385,6 @@ Lyrics: |-
     Five
     Three
 ---
-Track: Battle Against A Gorgeous Foe
-# From the fangame Mother 4's unreleased soundtrack
-Artists:
-- nelward
-Duration: '1:41'
-URLs:
-- https://www.youtube.com/watch?v=pBr0VWbDwpk
----
 Track: Battle! (Elite Four) (Pokémon Black & White Versions)
 # JP: 戦闘!四天王
 # Official release:
@@ -1311,6 +1442,17 @@ Duration: '0:55'
 URLs:
 - https://www.youtube.com/watch?v=eQq2v6kBKSM
 ---
+Track: Before the Sequel - Title Screen
+# From Sonic Before the Sequel '12 Original Sound Track
+# Reference:
+#   https://vgmdb.net/album/34568
+Artists:
+- Sonic the Hedgehog
+- Falk Au Yeong
+Duration: '0:30'
+URLs:
+- https://www.youtube.com/watch?v=-7WQn-SXY
+---
 Track: Beginning
 # From Castlevania III: Dracula's Curse
 # The original official release combines this track with several others from the same game for its inclusion on the CD, so it doesn't have a "canonical" duration. But it starts at 2:46 and fades out ending at 4:30, which is what's used for the duration here.
@@ -1328,55 +1470,6 @@ Duration: '1:44'
 URLs:
 - https://youtu.be/zapJY3hm-dc?t=166
 ---
-Track: Cosmic Eternity ~ Believe in Yourself
-# From SONIC THE HEDGEHOG CD Original Soundtrack 20th Anniversary Edition 
-# Reference:
-#   https://vgmdb.net/album/29131
-Artists:
-- Sonic the Hedgehog
-- Masafumi Ogata
-Duration: '3:08'
-URLs:
-- https://www.youtube.com/watch?v=5AW7xQ_Dxjk
-Lyrics: |-
-    Waah! Teleportation! Yeah! Waah! Za-ba-doo-bap-bap!
-
-    Waah! Teleportation! Yeah! Waah! Shibby-doo-boo! Yeah!
-
-    In the end, who's on your side?
-    Who can you trust, in the middle of the night?
-    Where will you be, if you can't find you?
-    There's no place to go, nothing to do
-    If you gotta do something, gotta do something
-    Believe in yourself - yourself - yourself - hey
-
-    Extraordinary things can happen if you believe in yourself
-    You've got to have some faith in yourself
-    If you want respect from your friends
-
-    Don't re-arrange, no need to change
-    Stay like you are, keep it all the same
-    But as you move along in your life
-    Keep an open mind and don't forget
-    That if ya gotta do something, gotta do something
-    Believe in yourself - yourself - yourself - hey
-
-    Extraordinary things can happen if you believe in yourself
-    You've got to have some faith in yourself
-    If you want respect from your friends
-
-    When you feel tight, look at yourself!
-    Inside your heart you will find a special place to unwind
-    When you feel right, look at yourself
-    Inside your mind you will see
-    Cosmic eternity
-
-    When you feel tight, look at yourself!
-    Inside your heart you will find a special place to unwind
-    When you feel right, look at yourself
-    Inside your mind you will see
-    Cosmic eternity
----
 Track: Bloody Tears
 # From Castlevania II: Simon's Quest
 # Released on the same album as Beginning, but it has its own dedicated track vs. Castlevania III's OST.
@@ -1439,14 +1532,55 @@ Artists:
 URLs:
 - https://www.youtube.com/watch?v=s9SKrNZnnCM
 ---
-Track: Breakfast Time
-# From Sonic ATS: OST, the soundtrack for the fangame "Sonic: After the Sequel"
+Track: Breakfast Time - For Horizon Heights Boss Act Phase 2
+# From Sonic After the Sequel Original Sound Track
+# Reference:
+#   https://vgmdb.net/album/40053
 Artists:
 - Sonic the Hedgehog
-- KgZ
-Duration: '3:08'
+- James Landino
+Duration: '3:10'
 URLs:
 - https://www.youtube.com/watch?v=-7WQn-SXYZ
+Referenced Tracks:
+- The Adventure Continues - For Horizon Heights Act 1
+Sampled Tracks:
+- Nickelodeon Breakfast Time Commercial - https://www.youtube.com/watch?v=uRhxBnbByTU
+Lyrics: |-
+    Break time! Breakfast time! Break time! Breakfast time! (What?)
+    Break time! Breakfast time! Breakbreakbreakbreak breakfast time!
+    Break time! Breakfast time! Break time! Breakfast time! (What?)
+    Break time! Breakfast time! Breakbreakbreak brrrr-b-b-b-b—
+
+    Break time! Break-breakfast time! Break time! Break-breakfast time! (What?)
+    Break time! Break-breakfast time! Br-br-break-br-br-breakfast time!
+    Break time! Break-breakfast time! Break time! Break-breakfast time! (What?)
+    Break time! Break time! Breakbreakbreak brrrr-b-b-b-b—
+
+    Breakfast! Break-breakfast! Break-brea-break-breakfast time!
+    Break-breakfast! Break-breakfast! Break-brea-break-breakfast time!
+    Breakfast! Break-breakfast! Break-breakfast! Break-breakfast!
+    Break-breakbreak break-break-break breakfast time!
+
+    Break time! Breakfast time! Break time! Breakfast time! (What?)
+    Break time! Breakfast time! Breakbreakbreakbreak breakfast time!
+    Break time! Breakfast time! Break time! Breakfast time! (What?)
+    Break time! Breakfast time! Breakbreakbreak brrrr-b-b-b-b—
+
+    Break time! Break-breakfast time! Break time! Break-breakfast time! (What?)
+    Break time! Break-breakfast time! Br-br-break-br-br-breakfast time!
+    Break time! Break-breakfast time! Break time! Break-breakfast time! (What?)
+    Break time! Break time! Breakbreakbreak brrrr-b-b-b-b—
+
+    Breakfast! Break-breakfast! Break-brea-break-breakfast time!
+    Break-breakfast! Break-breakfast! Break-brea-break-breakfast time!
+    Breakfast! Break-breakfast! Break-breakfast! Break-breakfast!
+    Break-breakbreak break-break-break breakfast time!
+
+    Break time! Breakfast time! Break time! Breakfast time! (What?)
+    Break time! Breakfast time! Breakbreakbreakbreak breakfast time!
+    Break time! Breakfast time! Break time! Breakfast time! (What?)
+    Break time! Breakfast time! Breakbreakbreak brrrr-b-b-b-b—
 ---
 Track: Breath of the Wild Theme
 # JP: メインテーマ
@@ -1567,6 +1701,55 @@ Duration: '3:01'
 URLs:
 - https://www.youtube.com/watch?v=BXo3DrXHY8w
 ---
+Track: Cosmic Eternity ~ Believe in Yourself
+# From SONIC THE HEDGEHOG CD Original Soundtrack 20th Anniversary Edition 
+# Reference:
+#   https://vgmdb.net/album/29131
+Artists:
+- Sonic the Hedgehog
+- Masafumi Ogata
+Duration: '3:08'
+URLs:
+- https://www.youtube.com/watch?v=5AW7xQ_Dxjk
+Lyrics: |-
+    Waah! Teleportation! Yeah! Waah! Za-ba-doo-bap-bap!
+
+    Waah! Teleportation! Yeah! Waah! Shibby-doo-boo! Yeah!
+
+    In the end, who's on your side?
+    Who can you trust, in the middle of the night?
+    Where will you be, if you can't find you?
+    There's no place to go, nothing to do
+    If you gotta do something, gotta do something
+    Believe in yourself - yourself - yourself - hey
+
+    Extraordinary things can happen if you believe in yourself
+    You've got to have some faith in yourself
+    If you want respect from your friends
+
+    Don't re-arrange, no need to change
+    Stay like you are, keep it all the same
+    But as you move along in your life
+    Keep an open mind and don't forget
+    That if ya gotta do something, gotta do something
+    Believe in yourself - yourself - yourself - hey
+
+    Extraordinary things can happen if you believe in yourself
+    You've got to have some faith in yourself
+    If you want respect from your friends
+
+    When you feel tight, look at yourself!
+    Inside your heart you will find a special place to unwind
+    When you feel right, look at yourself
+    Inside your mind you will see
+    Cosmic eternity
+
+    When you feel tight, look at yourself!
+    Inside your heart you will find a special place to unwind
+    When you feel right, look at yourself
+    Inside your mind you will see
+    Cosmic eternity
+---
 Track: Chrono Trigger
 # (See Corridors of Time for info on soundtrack/YouTube differences)
 # JP: クロノ・トリガー
@@ -1651,143 +1834,6 @@ Duration: '2:58'
 URLs:
 - https://www.youtube.com/watch?v=KYdRWC6MCgM
 ---
-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
-    
-    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! (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!
-    
-    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
-    
-    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)
-    
-    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
-    
-    (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
-    
-    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 (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
-    
-    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 (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)
-    
-    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
 Artists:
@@ -1797,33 +1843,6 @@ Artists:
 URLs:
 - https://www.youtube.com/watch?v=yL4LkJ4wfLU
 ---
-Track: Say There
-# Also known as Donkey Ollie Intro
-# Source: this actual licensing document https://www.boatangel.com/licenses/ADO_BELA.pdf
-Artists: 
-- Thomas Del McLain
-Duration: '0:40'
-URLs:
-- https://www.youtube.com/watch?v=MZca59u4ApU
-Lyrics: |-
-    (Hello everybody!)
-    Say there
-    Have you heard the story
-    about the Donkie Ollie, Ollie
-    Say there
-    have you heard the story
-    Ollie is his name
-
-    Everywhere that Donkey Ollie travels
-    folks will shout hooray
-
-    (Hooray!)
-
-    Say there
-    Have you heard the story
-    Ollie is his name
-    Ollie is his name
----
 Track: DK Rap
 # Duration is from the first musical (0:17) to the disc scratch (3:27) on the in-game music video
 Artists:
@@ -1972,6 +1991,15 @@ Artists:
 URLs:
 - https://www.youtube.com/watch?v=W8WSZwX2xhg
 ---
+Track: Epona's Song
+# Unreleased fragment of "LonLon Ranch" (or the other way around?), played in ocarina
+Artists:
+- The Legend of Zelda
+- Koji Kondo
+Duration: '0:08'
+URLs:
+- https://www.youtube.com/watch?v=1oNyPb5HsC0
+---
 Track: Eternal Recurrence
 # JP: 永劫回帰
 # Official release:
@@ -2383,6 +2411,8 @@ Artists:
 Duration: '3:25'
 URLs:
 - https://www.youtube.com/watch?v=t6JgG__XbRA
+Referenced Tracks:
+- Title (The Legend of Zelda)
 ---
 Track: Icirrus City
 # JP: セッカシティ
@@ -2580,6 +2610,18 @@ Lyrics: |-
     Nana nananananana na na Katamari Damacy
     Nana nananananana na na Katamari Damacy
 ---
+Track: Knight Artorias
+# Official release:
+#   DARK SOULS with ARTORIAS OF THE ABYSS EDITION Original Soundtrack
+# Reference:
+#   https://vgmdb.net/album/36023
+Artists:
+- Dark Souls
+- Motoi Sakuraba
+Duration: '3:15'
+URLs:
+- https://www.youtube.com/watch?v=vK0w67B4EtU
+---
 Track: Lambda Core
 # https://joelnielsen.bandcamp.com/album/black-mesa-terra-soundtrack-definitive-edition-vol-1-2
 Artists:
@@ -2631,14 +2673,20 @@ Lyrics: |-
     Whoa, you go big guy!
     Pose for the fans!
 ---
-Track: Epona's Song
-# Unreleased fragment of "LonLon Ranch" (or the other way around?), played in ocarina
+Track: Lights, Camera, Action! (Studiopolis Zone Act 1)
+# Or "Studiopolis Zone Act 1"
+# Official release:
+#   Sonic Mania (Original Soundtrack) [Selected Edition] 
+# Reference
+#   https://vgmdb.net/album/74207
 Artists:
-- The Legend of Zelda
-- Koji Kondo
-Duration: '0:08'
+- Sonic the Hedgehog
+- Tee Lopes
+Duration: '3:07'
 URLs:
-- https://www.youtube.com/watch?v=1oNyPb5HsC0
+- https://www.youtube.com/watch?v=NIWyZmFSep0
+Lyrics: |-
+    Lights, camera, action!
 ---
 Track: Lonely Rolling Star
 # Official release:
@@ -3089,6 +3137,7 @@ Track: Redial
 # Reference:
 #   https://vgmdb.net/album/270
 Artists:
+- Bomberman
 - Jun Chikuma
 Duration: '2:14'
 URLs:
@@ -3317,6 +3366,20 @@ Duration: '2:48'
 URLs:
 - https://www.youtube.com/watch?v=ilTggSxYi04
 ---
+Track: Secret of the Forest
+# (See Corridors of Time for info on soundtrack/YouTube differences)
+# JP: サラのテーマ
+# Official release:
+#   クロノ・トリガー・オリジナル・サウンド・ヴァージョン
+# Reference:
+#   https://vgmdb.net/album/18
+Artists:
+- Chrono Trigger
+- Yasunori Mitsuda
+Duration: '3:01'
+URLs:
+- https://www.youtube.com/watch?v=fKex3QoPc8A
+---
 Track: September Pumpkin
 # No official release of the in-game track
 Artists:
@@ -3547,21 +3610,6 @@ Duration: '2:00'
 URLs:
 - https://www.youtube.com/watch?v=oMSCjGJp8Gk
 ---
-Track: Lights, Camera, Action!
-# Or "Studiopolis Zone Act 1"
-# Official release:
-#   Sonic Mania (Original Soundtrack) [Selected Edition] 
-# Reference
-#   https://vgmdb.net/album/74207
-Artists:
-- Sonic the Hedgehog
-- Tee Lopes
-Duration: '3:07'
-URLs:
-- https://www.youtube.com/watch?v=NIWyZmFSep0
-Lyrics: |-
-    Ding, ding, ding
----
 Track: Super Dry Dance
 # (See Eight Melodies, no official soundtrack release)
 Artists:
@@ -3584,6 +3632,19 @@ Duration: '3:53'
 URLs:
 - https://youtu.be/SrDiiVn1VCk
 ---
+Track: The Adventure Continues - For Horizon Heights Act 1
+# From Sonic After the Sequel Original Sound Track
+# Reference:
+#   https://vgmdb.net/album/40053
+Artists:
+- Sonic the Hedgehog
+- James Landino
+Duration: '4:13'
+URLs:
+- https://www.youtube.com/watch?v=-7WQn-SXYZ
+Referenced Tracks:
+- Before the Sequel - Title Screen
+---
 Track: The Decisive Battle (Final Fantasy VI)
 # JP: 決戦
 #   ファイナルファンタジーVI オリジナル・サウンド・ヴァージョン
@@ -4112,26 +4173,26 @@ URLs:
 ---
 Track: Big Bad Beetleborgs Theme
 Artists:
+- Big Bad Beetleborgs
 - Billy Forrester
 - Jeremy Sweet
 Duration: '1:03'
 URLs:
 - https://soundcloud.com/prmhub/big-bad-beetleborgs-theme
 Lyrics: |-
-    Three Typical Average kids
-    inside a haunted mansion
+    Three typical average kids
+    Inside a haunted mansion
     Just by a chance freed a ghost
-    who made them Beetleborgs
-    Beetleborgs!
-    Big Bad Beetleborgs
+    Who made them Beetleborgs (Beetleborgs!)
+
+    Big Bad Beetleborgs!
     Big Bad Beetleborgs!
-    Hey look now
-    they're superheroes
-    with all these superpowers
-    Cool!
+
+    Hey look now, they're superheroes
+    Armed with superpowers (Cool!)
     Taken from a comic strip
-    and now they're Beetleborgs
-    Beetleborgs!
+    And now they're Beetleborgs (Beetleborgs!)
+
     Big Bad Beetleborgs
     Big Bad Beetleborgs! 
 ---
@@ -4351,45 +4412,6 @@ Lyrics: |-
     Hear what Captain Planet has to say!
     (The power is YOURS!)
 ---
-Track: Casin
-Artists:
-- glue70
-Duration: '1:46'
-URLs:
-- https://www.youtube.com/watch?v=3Z1h2VE0hzs
-Lyrics: |-
-    Gives me her love
-    Oh stay
-    To please the girl and be
-    Gives me her love
-    Oh stay
-    To please the girl
-    Gives me her love
-    Oh stay
-    to please the girl and be
-    Gives me her love
-    Oh stay
-    To please the girl
-    You're the one, the one for me
-
-    Gives me her love
-    Oh stay
-    To please the girl and be
-    Gives me her love
-    Oh stay
-    To please the girl
-    Gives me her love
-    Oh stay
-    to please the girl and be
-    Gives me her love
-    Oh stay
-    To please the girl
-
-    Gives me her love
-    Oh stay
-    To please the girl and be
-    Gives me her love...
----
 Track: chase
 Artists:
 - JoJo's Bizarre Adventure
@@ -4448,6 +4470,143 @@ Duration: '2:38'
 URLs:
 - https://www.youtube.com/watch?v=Rpc8K-zQoYM
 ---
+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
+    
+    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! (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!
+    
+    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
+    
+    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)
+    
+    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
+    
+    (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
+    
+    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 (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
+    
+    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 (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)
+    
+    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 Who Theme
 Artists:
 - Doctor Who
@@ -4808,6 +4967,7 @@ Track: Gravity Falls Main Title Theme
 # Not to be confused with a false "full version", 0:41 is all there is
 # Source: https://gravityfalls.fandom.com/wiki/Gravity_Falls_Main_Title_Theme
 Artists:
+- Gravity Falls
 - Brad Breeck
 Duration: '0:41'
 URLs:
@@ -5063,6 +5223,7 @@ URLs:
 Track: Jimmy Neutron Theme Song
 # Source: https://jimmyneutron.fandom.com/wiki/Jimmy_Neutron_Theme_Song
 Artists:
+- 'Jimmy Neutron: Boy Genius'
 - Brian Causey
 URLs:
 - https://www.youtube.com/watch?v=qUxNwKACbjA
@@ -5082,7 +5243,7 @@ Lyrics: |-
     He rescues the day from sure destruction
     (He-he-help!)
 
-    This is the theme song…
+    This is the theme song...
     (AAAAAH!)
 
     Of Jimmy Neutron!
@@ -5653,18 +5814,18 @@ Lyrics: |-
 
     I will travel across the land
     Searching far and wide
-    Teach Pokemon to understand
+    Teach Pokémon to understand
     The power that's inside
 
-    Pokemon! Gotta catch 'em all! (It's you and me)
-    I know it's my destiny,
-    Pokemon! Oh you're my best friend
+    Pokémon! Gotta catch 'em all! (It's you and me)
+    I know it's my destiny
+    Pokémon! Oh you're my best friend
     In a world we must defend
-    Pokemon! Gotta catch 'em all! (A heart so true)
-    Our courage will pull us through,
+    Pokémon! Gotta catch 'em all! (A heart so true)
+    Our courage will pull us through
 
-    You teach me and I'll teach you,
-    Pokemon! Gotta catch'em all, (gotta catch 'em all!)
+    You teach me and I'll teach you
+    Pokémon! Gotta catch'em all! (Gotta catch 'em all!)
 
     Yeah!
 
@@ -5673,35 +5834,35 @@ Lyrics: |-
     I will battle every day
     To claim my rightful place
     Come with me,
-    The time is right,
+    The time is right
     There's no better team
     Arm in arm we'll win the fight!
     It's always been our dream!
 
-    Pokemon! Gotta catch 'em all! (It's you and me)
-    I know it's my destiny,
-    Pokemon! Oh you're my best friend
+    Pokémon! Gotta catch 'em all! (It's you and me)
+    I know it's my destiny
+    Pokémon! Oh you're my best friend
     In a world we must defend
-    Pokemon! Gotta catch 'em all! (A heart so true)
-    Our courage will pull us through,
+    Pokémon! Gotta catch 'em all! (A heart so true)
+    Our courage will pull us through
 
-    You teach me and I'll teach you,
-    Pokemon! Gotta catch'em all, (gotta catch 'em all!)
+    You teach me and I'll teach you
+    Pokémon! Gotta catch'em all! (Gotta catch 'em all!)
 
     Gotta catch'em all!
 
     Gotta catch'em all!
     Gotta catch'em all! Yeah!
 
-    Pokemon! Gotta catch 'em all! (It's you and me)
-    I know it's my destiny,
-    Pokemon! Oh you're my best friend
+    Pokémon! Gotta catch 'em all! (It's you and me)
+    I know it's my destiny
+    Pokémon! Oh you're my best friend
     In a world we must defend
-    Pokemon! Gotta catch 'em all! (A heart so true)
+    Pokémon! Gotta catch 'em all! (A heart so true)
     Our courage will pull us through
 
     You teach me and I'll teach you,
-    Pokemon! Gotta catch'em all, (gotta catch 'em all, Pokemon!)
+    Pokémon! Gotta catch'em all! (Gotta catch 'em all, Pokémon!)
 ---
 Track: Potato Knishes
 Artists:
@@ -5931,8 +6092,37 @@ Duration: 0:25
 URLs:
 - https://www.youtube.com/watch?v=lOgFt70GB4c
 ---
+Track: Say There
+# Also known as Donkey Ollie Intro
+# Source: this actual licensing document https://www.boatangel.com/licenses/ADO_BELA.pdf
+Artists: 
+- The Adventures of Donkey Ollie
+- Thomas Del McLain
+Duration: '0:40'
+URLs:
+- https://www.youtube.com/watch?v=MZca59u4ApU
+Lyrics: |-
+    (Hello everybody!)
+    Say there
+    Have you heard the story
+    about the Donkie Ollie, Ollie
+    Say there
+    have you heard the story
+    Ollie is his name
+
+    Everywhere that Donkey Ollie travels
+    folks will shout hooray
+
+    (Hooray!)
+
+    Say there
+    Have you heard the story
+    Ollie is his name
+    Ollie is his name
+---
 Track: Seinfeld Theme
 Artists:
+- Seinfeld
 - Jonathan Wolff
 Duration: '0:52'
 URLs:
@@ -5940,6 +6130,7 @@ URLs:
 ---
 Track: Smack
 Artists:
+- Khonjin House
 - SHADOWFOX2
 Duration: '5:16'
 URLs:
@@ -6514,7 +6705,9 @@ Lyrics: |-
 ---
 Track: The Creativity Song
 Artists:
-- 405Okced
+- Don't Hug Me I'm Scared
+- Joe Pelling
+- Becky Sloan (writing)
 Duration: '2:58'
 URLs:
 - https://www.youtube.com/watch?v=aGR2EuMs1sc
@@ -6523,45 +6716,51 @@ Lyrics: |-
     Mine is being creative
     How do you get the idea?
     I just try to think creatively
-    Now when you look at this orange,
+
+    Now when you look at this orange
     Tell me please, what do you see?
     It's just a boring old orange!
     Maybe to you, but not to me
-    I see a silly face! (wow!)
+
+    I see a silly face! (Wow!)
     Walking around and smiling at me
     I don't see what you mean
     'Cause you're not thinking creatively!
+
     So take a look at my hair (Cool!)
     I use my hair to express myself
     That sounds really boring
     I use my hair to express myself
-    Now when you stare at the clouds in the sky
-    Don't you find it exciting? (No)
-    Come on, take another look (Oh right!)
-    I can see a hat, I can see a cat
-    I can see a man with a baseball bat
-    I can see a dog, I can see a frog 
-
 
+    (Now when you stare at the clouds in the sky, don't you find it exciting?) (No.)
+    (Come on, take another look!) (Oh wait!)
 
+    I can see a hat, I can see a cat
+    I can see a man with a baseball bat
+    I can see a dog, I can see a frog
     I can see a ladder leaning on a log
+
     Think you're getting the hang of it now
     Using your minds, to have a good time
     I might paint a picture of a clown
     Whoa there, friend, you might need to slow down!
+
     Here's another good tip! (Yeah?)
-    Of how to be a creative wit
+    Of how to be a creative whiz kid
     Kids, go and collect some leaves and sticks
     And arrange them into your favorite color
     Blue! Red! Green!
     Green is not a creative color
+
     There's one more thing that you need to know
     Before you let your creativity flow
     Listen to your heart, listen to the rain
     Listen to the voices in your brain
     Come on guys, let's get creative!
     Get creative!
-    Now, let's all agree to never be creative again
+
+    Now, let's all agree
+    To never be creative again
 ---
 Track: The Good, the Bad and the Ugly
 Artists:
@@ -7514,35 +7713,35 @@ Artists:
 URLs:
 - https://www.youtube.com/watch?v=jA8IWhBIev0
 Lyrics: |-
-    Should old acquaintance be forgot,
-    and never brought to mind?
-    Should old acquaintance be forgot,
-    and auld lang syne?
+    Should old acquaintance be forgot
+    And never brought to mind?
+    Should old acquaintance be forgot
+    And auld lang syne?
 
-    For auld lang syne, my dear,
-    for auld lang syne,
-    we'll take a cup of kindness yet,
-    for auld lang syne.
+    For auld lang syne, my dear
+    For auld lang syne
+    We'll take a cup of kindness yet
+    for auld lang syne
 
     And surely you'll buy your pint cup!
-    and surely I'll buy mine!
-    And we'll take a cup o' kindness yet,
-    for auld lang syne.
+    And surely I'll buy mine!
+    And we'll take a cup o' kindness yet
+    For auld lang syne
 
-    We two have run about the hills,
-    and picked the daisies fine;
-    But we've wandered many a weary foot,
-    since auld lang syne.
+    We two have run about the hills
+    And picked the daisies fine
+    But we've wandered many a weary foot
+    Since auld lang syne
 
-    We two have paddled in the stream,
-    from morning sun till dine;
+    We two have paddled in the stream
+    Drom morning sun till dine
     But seas between us broad have roared
-    since auld lang syne.
+    Since auld lang syne
 
     And there's a hand my trusty friend!
     And give me a hand o' thine!
-    And we'll take a right good-will draught,
-    for auld lang syne.
+    And we'll take a right good-will draught
+    For auld lang syne
 ---
 Track: Bedelia
 Artists:
@@ -7601,6 +7800,22 @@ Artists:
 - Richard Wagner
 URLs:
 - https://www.youtube.com/watch?v=vFTnFErJEu4
+Lyrics: |-
+    Treulich geführt ziehet dahin (<i>Faithfully guided, draw near</i>)
+    Wo euch der Segen der Liebe bewahr'! (<i>To where the blessing of love shall preserve you!</i>)
+    Siegreicher Mut, Minnegewinn (<i>Triumphant courage, the reward of love</i>)
+    Eint euch in Treue zum seligsten Paar (<i>Joins you in faith as the happiest of couples!</i>)
+    Streiter der Tugend, schreite voran! (<i>Champion of virtue, proceed!</i>)
+    Zierde der Jugend, schreite voran! (<i>Jewel of youth, proceed!</i>)
+    Rauschen des Festes seid nun entronnen (<i>Flee now the splendour of the wedding feast</i>)
+    Wonne des Herzens sei euch gewonnen! (<i>May the delights of the heart be yours!</i>)
+
+    Duftender Raum, zur Liebe geschmückt (<i>This sweet-smelling room, decked for love</i>)
+    Nehm' euch nun auf, dem Glanze entrückt (<i>Now takes you in, away from the splendour</i>)
+    Treulich geführt ziehet nun ein (<i>Faithfully guided, draw now near</i>)
+    Wo euch der Segen der Liebe bewahr'! (<i>To where the blessing of love shall preserve you!</i>)
+    Siegreicher Mut, Minne so rein (<i>Triumphant courage, love so pure</i>)
+    Eint euch in Treue zum seligsten Paar (<i>Joins you in faith as the happiest of couples!</i>)
 ---
 Track: Canon in D
 Artists:
@@ -8739,6 +8954,13 @@ Commentary: |-
     <i>Niklink:</i>
     The lyrics by [[artist:talhaiarn]] were publshed in 1862, alongside the original [[track:deck-the-halls]] lyrics. (Thank you to megatti from the HSMusic Wiki for providing a translation!) However the most popular Welsh lyrics for this melody were published in 1873 by [[artist:john-ceiriog-hughes]], and are shown here as alternate lyrics. They're not only completely different but also were published alongside another completely separate set of English lyrics, 'Soon The Hoar Old Year Will Leave Us' by John Oxenford. The original melody dates back to 16th-century Wales.
 ---
+Track: Pictures at an Exhibition - Promenade
+Artists:
+- Modest Mussorgsky
+Duration: '1:40'
+URLs:
+- https://www.youtube.com/watch?v=PdSecL8Ytrg
+---
 Track: Polovtsian Dances
 Artists:
 - Alexander Borodin
@@ -10109,6 +10331,16 @@ Lyrics: |-
 
     Bem bem
 ---
+Track: Backbone
+Artists:
+- Sean Evans
+Duration: '5:58'
+URLs:
+- https://soundcloud.com/nine-zero-music/backbone
+Referenced Tracks:
+- Nyeh Heh Heh!
+- track:megalovania-undertale
+---
 Track: Badgers
 Artists:
 - MrWeebl
@@ -10174,6 +10406,8 @@ Artists:
 Duration: '3:21'
 URLs:
 - https://www.youtube.com/watch?v=cR2XilcGYOo
+Sampled Tracks:
+- Hook
 Lyrics: |-
     Shout to all my lost boys
     Sh-sh-sh-sh-sh-shout to all my lost boys
@@ -10193,11 +10427,13 @@ Lyrics: |-
 
     Bangarang
     You feel the
+
     Bangarang
     You feel the bass
 
     Bangarang
     You feel the
+
     Bangarang
     You feel the bass
 
@@ -10224,7 +10460,8 @@ Lyrics: |-
 
     You feel the
 
-    Bangarang. Bass!
+    Bangarang
+    Bass!
 
     Shout to all my lost boys
     Sh-sh-sh-sh-sh-shout to all my lost boys
@@ -10240,7 +10477,7 @@ Lyrics: |-
 
     Shout to all my lost boys
     Sh-sh-sh-sh-sh-shout to all my lost boys
-    Bangarang! Bass!
+    Bangarang!
 
     Shout to all my lost boys
     Sh-sh-sh-sh-sh-shout to all my lost boys
@@ -10271,7 +10508,7 @@ Lyrics: |-
     You feel the bass
 
     Hey, still ain't got my marbles, but I got these beats banging out the back of my toy car
-    Aye yo! I'm eating fun-dip right now, not giving a fuck. 
+    Aye yo! I'm eating fun-dip right now, not giving a fuck
 ---
 Track: Bassline Junkie
 Artists:
@@ -10587,7 +10824,6 @@ Lyrics: |-
     Represent, baby, baby, uh 
 ---
 Track: Blue (Da Ba Dee) (DJ Ponte Ice Pop Mix)
-Directory: 'blue-eiffel-65'
 Artists:
 - Eiffel 65
 Duration: '6:26'
@@ -11086,6 +11322,52 @@ Lyrics: |-
     Was what I did so wrong, so wrong
     That you had to leave me alone?
 ---
+Track: Casin
+Artists:
+- glue70
+Duration: '1:46'
+URLs:
+- https://www.youtube.com/watch?v=3Z1h2VE0hzs
+Lyrics: |-
+    Gives me her love
+    Oh stay
+    To please the girl and be
+    Gives me her love
+    Oh stay
+    To please the girl
+    Gives me her love
+    Oh stay
+    to please the girl and be
+    Gives me her love
+    Oh stay
+    To please the girl
+    You're the one, the one for me
+
+    Gives me her love
+    Oh stay
+    To please the girl and be
+    Gives me her love
+    Oh stay
+    To please the girl
+    Gives me her love
+    Oh stay
+    to please the girl and be
+    Gives me her love
+    Oh stay
+    To please the girl
+
+    Gives me her love
+    Oh stay
+    To please the girl and be
+    Gives me her love...
+---
+Track: casino night
+Artists:
+- pilotredsun
+Duration: '2:43'
+URLs:
+- https://pilotredsun.bandcamp.com/track/casino-night
+---
 Track: Casio VL-1 Demo
 Artists:
 - Unknown Artist
@@ -11400,16 +11682,15 @@ Sampled Tracks:
 URLs:
 - https://www.youtube.com/watch?v=OfEyeBNih_Q
 Lyrics: |-
-    No way Sheen,
-    No way Sheen,
+    No way Sheen, no way Sheen
     You're not as big a fan as Jimmy's dad as I am!
     Oh yeah? What's his favorite color?
-    It's PIE!
-    HAH it's magenta!
-    Old daddy is bye-bye baby, I'm going all the way to the top.
-    Concerts, movies, maybe an animated animat-!
-    Nothing's gonna stop me kid-kid-kid!
-    Dad I ugh... Please?
+    It's PIE! HAH, it's magenta!
+
+    Old daddy is bye-bye baby, I'm going all the way to the top!
+    Concerts, movies, maybe an animated animat—!
+    Nothing's gonna stop me kid kid-kid!
+    Dad I ugh... please?
     Okay, alright I get it...
 ---
 Track: Crystal Kingdom - Part One
@@ -11577,67 +11858,6 @@ URLs:
 - https://pascalpotatovandenbos.bandcamp.com/track/diamond-dust
 - https://www.youtube.com/watch?v=7bfC_-fWy84
 ---
-Track: Discordant
-Artists:
-- Cecily Renns
-Duration: '2:24'
-URLs:
-- https://johnjrenns.bandcamp.com/track/discordant-2
-Lyrics: |-
-    here we go again
-    makin some music and shit
-    just open that FL studio
-    the easiest thing to do, hey
-
-    yeah thats right
-    ill open that sgm
-    the piano roll will be my domain
-    whats so fucking hard bout that
-
-    But i do have to admit
-    this lifes not that easy as it sounds
-    theres just one little problem
-    something about my melody
-
-    its Discordant
-    why is it so damn hard to find the right harmony
-    its so Discordant
-    listen to it then youll see
-    its so Discordant
-
-    alright then
-    i think ive figured it out
-    theres something wrong about the chord progression
-    ive just gotta fix that then
-    but it looks
-    like the chord is all fine and nice
-    then is it the fucking scale thats off
-    i dont know cause its too confusing
-
-    maybe this life isnt for me
-    maybe i should give up and quit composing
-    no no no I cant say that
-    even if its hard its so fun
-
-    its Discordant
-    look at all these people saying my music sucks but
-    its really alright and well
-    this is the life ive chosen
-    ill believe in it
-
-    PIANO SOLO
-
-    wait
-    there we go, sorry
-
-    its Discordant
-    why is it so damn hard to find the right harmony
-    its so Discordant
-    listen to it then youll see
-    its so Discordant
-
-    its so discordant.
----
 Track: Divinity
 Artists:
 - Porter Robinson
@@ -11761,6 +11981,55 @@ Lyrics: |-
     With a cheer and a smile
     Always do your best!
 ---
+Track: Donald Trump Says China Remix
+Artists:
+- Chris Kogos
+Duration: '1:44'
+URLs:
+- https://www.youtube.com/watch?v=RbM2F-cfN0A
+Lyrics: |-
+    Let's say China
+    China China China ChiChina ChinaChina China
+    ChinaChinaChinaChinaChinaChina ChinaChinaChina
+    I have to have my China
+
+    China China ChinaChinaChina China ChinaChinaChinaChina China
+    China China and a ChinaChinaChinaChina China China
+    I know China very well
+
+    China China China ChinaChina
+    China China China ChinaChina
+    ChinaChinaChina I'm from ChinaChina
+    China ChinaChinChina I have people that I know in
+    China China China ChinaChina 
+    China China China ChinaChina
+    ChinaChinaChina I'm from ChinaChina
+    China ChinaChina I have people that I know in
+
+    China China China
+    ChinaChinaChinaChina
+    China China China
+    ChinaChinaChinaChina
+
+    I've been saying China China China China China China
+    China China China
+    China, I like China
+    I go to China ChinaChinaChinaChina China ChinaChina, ChinaChina
+    China I go to China, China ChinaChinaChinaChinaChinaChina
+
+    China China ChiChina, I go to China
+    China China ChiChina, ChinaChina
+    China, you went to China
+    China China, get a job in China
+
+    I know China, I love China, China China
+    China ChiChina, China
+    China China China China
+    China all the time
+    China China China China China!
+
+    (And by the way, I love China.)
+---
 Track: Don't Cry Out Loud
 Artists:
 - Peter Allen (composition)
@@ -12606,6 +12875,41 @@ Lyrics: |-
     Fever (Fever, burn through) in the mornin'
     And fever all through the night
 ---
+Track: Final Savage All Voice
+# JP: 最終鬼畜全部声
+# Official release:
+#   Touhou Homerun
+#   東方ホムーラン
+# Reference:
+#   https://vgmdb.net/album/4281
+Artists:
+- Beat Throat Mario
+Contributors:
+- beatMARIO (vocals)
+Duration: '2:37'
+URLs:
+- https://www.youtube.com/watch?v=4MKrYxtCLyY
+Referenced Tracks:
+- U.N. Owen Was Her?
+---
+Track: Final Savage All Voice
+# JP: 最終鬼畜全部声
+# Official release:
+#   Touhou Hits Covers -Ska Punk Flavor-
+# Reference:
+#   https://en.touhouwiki.net/wiki/Touhou_Hits_Covers_-Ska_Punk_Flavor-
+Directory: final-savage-all-voice-ska-punk-flavor
+Artists:
+- ARM
+Contributors:
+- miko (vocals)
+- Momiji Yamamoto (vocals)
+Duration: '3:30'
+URLs:
+- https://www.youtube.com/watch?v=Za0kamPfdeE
+Referenced Tracks:
+- track:final-savage-all-voice
+---
 Track: Fireflies
 Artists:
 - Owl City
@@ -12668,7 +12972,9 @@ Track: Fly Me To The Moon
 # But basically everyone referencing it is referencing the Frank Sinatra version
 # ...or the Evangelion version
 Artists:
-- Frank Sinatra
+- Bart Howard
+Contributors:
+- Frank Sinatra (performance)
 Duration: '2:30'
 URLs:
 - https://www.youtube.com/watch?v=ZEcqHA7dbwM
@@ -12678,24 +12984,24 @@ Lyrics: |-
     Let me see what spring is like
     On a-Jupiter and Mars
 
-    In other words: hold my hand
-    In other words: baby, kiss me
+    In other words, hold my hand
+    In other words, baby, kiss me
 
     Fill my heart with song
     And let me sing for ever more
     You are all I long for
     All I worship and adore
 
-    In other words: please, be true
-    In other words: I love you
+    In other words, please, be true
+    In other words, I love you
 
     Fill my heart with song
     Let me sing for ever more
     You are all I long for
     All I worship and adore
 
-    In other words: please, be true
-    In other words, in other words: I love you 
+    In other words, please, be true
+    In other words, in other words... I love you 
 ---
 Track: Friday
 Artists:
@@ -13235,8 +13541,8 @@ Lyrics: |-
     Teyuu ka kinō mo Shibuya sukina tabemono wa shīzāsarada (<i>Speaking of which, I love the Caesar salad from Shibuya from yesterday</i>)
     Ganguromesshu karakonrenzu paraparadansu no mō renshū (<i>Ganguro makeup, colored contact lenses, practicing Para Para dance</i>)
     Paradaisu ni tōsui hyōgen-chū gyaru otoko STAY TUNE (<i>Expressing in a trance in paradise, Gyaru male STAY TUNE</i>)
-    Kimu jara gin jaragingiragin (oi!) (<i>Spangle, glare, and glittering</i>)
-    109 Sēru wa jingi-nashi (oi!) (<i>The 109 sale is merciless</i>)
+    Kimu jara gin jaragingiragin (Oi!) (<i>Spangle, glare, and glittering</i>)
+    109 Sēru wa jingi-nashi (Oi!) (<i>The 109 sale is merciless</i>)
     Zenshin baribari yappari bīsan (<i>The whole body is all muscular, definitely handsome</i>)
 
     Kinoko o tabemashita (<i>I ate mushrooms</i>)
@@ -13246,30 +13552,30 @@ Lyrics: |-
     Chōshi agatte kita ~a (<i>I started feeling high</i>)
     (GO! GO! GO! GO!)
     Min'na ga daisukida (<i>Everyone loves it</i>)
-    (GO! GO! Fu Fu -!)
+    (GO! GO! Fu Fu!)
 
     Butcha ke maji de kanari yoku ne? (<i>Really good-looking, right?</i>)
     Tsu ̄ ka wadai sōzen (<i>Always the topic of conversation</i>)
     Buchi age haitenshon no hakai-ryoku de (<i>With the destructive power of being very high tension</i>)
     GAL otoko no dai bōken OK? (<i>Gal guy's big adventure OK?</i>)
     PARTY zombie ore wa nonki (<i>I'm a carefree party zombie</i>)
-    toriaezu kurabu chō daisuki (<i>First of all, I love clubs</i>)
+    Toriaezu kurabu chō daisuki (<i>First of all, I love clubs</i>)
     Gashigashi odorou batchi koi yo (<i>Let's dance hard, come on!</i>)
-    nanka 1-nichi suge ̄ koi yo (<i>Somehow, today is so awesome</i>)
+    Nanka 1-nichi suge ̄ koi yo (<i>Somehow, today is so awesome</i>)
     "Iketamenzugyaruonii-kei" (<i>"Cool-faced gyaru sister"</i>)
-    janru kankei naku oinihikude (<i>No matter the genre, I'm attracted to it</i>)
-    Tsuini deatta to shitte (hoshi) (<i>Finally realized when I met (wanted) her</i>)
-    ine chansu nanka sō sō mettani nai ze (<i>Such chances are very rare</i>)
+    Janru kankei naku oinihikude (<i>No matter the genre, I'm attracted to it</i>)
+    Tsuini deatta to shitte (Hoshi) (<i>Finally realized when I met (wanted) her</i>)
+    Ine chansu nanka sō sō mettani nai ze (<i>Such chances are very rare</i>)
     Geki yaba kawa GAL kara kimoota made (<i>From super cool gyaru to creepy feelings</i>)
     OK yorokonde! No kimottama de (<i>OK with pleasure! No weird vibes</i>)
     Kono rappu like a hirotta Kimu hora pōn to tsukaeba (<i>This rap, like a picked up Kimu, feels good when used</i>)
     Ore-tachi yappa saikō (<i>We are really the best</i>)
-    ikutsu ni natta tte majisaikō (<i>No matter how old, still the best</i>)
+    Ikutsu ni natta tte majisaikō (<i>No matter how old, still the best</i>)
     Muteki no mōdo saikyō densetsu (<i>Unbeatable mode, legendary strongest</i>)
-    home rarete nobiru taipu de ̄ su (<i>Type that gets praised and grows</i>)
-    Sentā hashitte kire o ane-kei (oi!) (<i>Running to the center, love the older sister vibe</i>)
-    Gangan'api tte soku ban GET (oi!) (<i>Very appealing, immediately GET</i>)
-    Chaku kyo / Manatari wanko/ dota tte mo
+    Home rarete nobiru taipu de ̄ su (<i>Type that gets praised and grows</i>)
+    Sentā hashitte kire o ane-kei (Oi!) (<i>Running to the center, love the older sister vibe</i>)
+    Gangan'api tte soku ban GET (Oi!) (<i>Very appealing, immediately GET</i>)
+    Chaku kyo / Manatari wanko / Dota tte mo
 
     Kinoko o tabemashita (<i>I ate mushrooms</i>)
     (GO! GO! GO! GO!)
@@ -13278,16 +13584,16 @@ Lyrics: |-
     Chōshi agatte kita ~a (<i>I started feeling high</i>)
     (GO! GO! GO! GO!)
     Min'na ga daisukida (<i>Everyone loves it</i>)
-    (GO! GO! Fu Fu -!)
+    (GO! GO! Fu Fu!)
 
     Berfāre (<i>Belfry</i>)
-    egzairu (<i>Exile</i>)
-    donkihōte- (<i>Don Quixote</i>)
-    uka hiroba (<i>Plaza above</i>)
+    Egzairu (<i>Exile</i>)
+    Donkihōte- (<i>Don Quixote</i>)
+    Uka hiroba (<i>Plaza above</i>)
     Mino monta (<i>Mino Monta - a television presenter</i>)
     A life (eraifu) (<i>A life</i>)
-    bishamonten (<i>Bishamonten - Buddhist deity</i>)
-    babanbabanbanban (<i>Sound effect, like bam-bam-bam</i>)
+    Bishamonten (<i>Bishamonten - Buddhist deity</i>)
+    Babanbabanbanban (<i>Sound effect, like bam-bam-bam</i>)
     (Gakkō shūshoku kekkon rōgo) (<i>School, job hunting, marriage, retirement</i>)
 
     Kinoko o tabemashita (<i>I ate mushrooms</i>)
@@ -13297,7 +13603,7 @@ Lyrics: |-
     Chōshi agatte kita ~a (<i>I started feeling high</i>)
     (GO! GO! GO! GO!)
     Min'na ga daisukida (<i>Everyone loves it</i>)
-    (GO! GO! Fu Fu -!)
+    (GO! GO! Fu Fu!)
 ---
 Track: Gangnam Style
 Artists:
@@ -14082,10 +14388,10 @@ Lyrics: |-
     But retain less
     Retain less
     -tain less
-    -tain less
-    Less
+    -ain less
     Less
     Less
+    Less...
 ---
 Track: I'm A Believer
 Artists:
@@ -15058,73 +15364,81 @@ Duration: '4:23'
 URLs:
 - https://www.youtube.com/watch?v=GvD3CHA48pA
 Lyrics: |-
-    Seiya sessesse seiya. (<i>Seiya shining bright, seiya.</i>)
-    Seiya sessesse seiya. (<i>Seiya shining bright, seiya.</i>)
-    Soiya sossosso soiya. (<i>Soiya echoing strong, soiya.</i>)
-    Soiya sossosso soiya. (<i>Soiya echoing strong, soiya.</i>)
+    Seiya sessesse seiya (<i>Seiya shining bright, seiya</i>)
+    Seiya sessesse seiya (<i>Seiya shining bright, seiya</i>)
+    Soiya sossosso soiya (<i>Soiya echoing strong, soiya</i>)
+    Soiya sossosso soiya (<i>Soiya echoing strong, soiya</i>)
 
-    (Ossu.) Namida koborete mo (<i>(Alright.) Even if tears spill out,</i>)
-    (Ossu.) tachimukatte yukooze! (<i>(Alright.) Let's stand up and face it!</i>)
+    (Ossu) Namida koborete mo (<i>(Alright) Even if tears spill out</i>)
+    (Ossu) Tachimukatte yukooze! (<i>(Alright) Let's stand up and face it!</i>)
 
-    Hitasura seiya soiya tatakau-nda (<i>With determination, seiya, soiya, we'll fight,</i>)
-    kobushi o motto kokoro o motto (<i>With more clenched fists, with more heart,</i>)
-    zenbu zenbu togisumashite. (<i>Sharpening everything, everything.</i>)
-    (Wo'oo wo'oo wo'oo.)
+    Hitasura seiya soiya tatakau-nda (<i>With determination, seiya, soiya, we'll fight</i>)
+    Kobushi o motto kokoro o motto (<i>With more clenched fists, with more heart</i>)
+    Zenbu zenbu togisumashite (<i>Sharpening everything, everything</i>)
+    (Wo'oo wo'oo wo'oo)
 
-    Mada mada seiya soiya tatakau-nda (<i>Still, seiya, soiya, we'll continue to fight,</i>)
-    kanashiku natte tachiagare-naku natte mo. (<i>Even if we become sad, even if we can't stand up.</i>)
-    (Aa ossu ossu.) (<i>(Ah, alright, alright.)</i>)
+    Mada mada seiya soiya tatakau-nda (<i>Still, seiya, soiya, we'll continue to fight</i>)
+    Kanashiku natte tachiagare-naku natte mo (<i>Even if we become sad, even if we can't stand up</i>)
+    (Aa ossu ossu.) (<i>Ah, alright, alright</i>)
 
-    Seiya sessesse seiya. (<i>Seiya shining bright, seiya.</i>)
-    Seiya sessesse seiya. (<i>Seiya shining bright, seiya.</i>)
-    Soiya sossosso soiya. (<i>Soiya echoing strong, soiya.</i>)
-    Soiya soso soiya. (<i>Soiya echoing, soiya.</i>)
+    Seiya sessesse seiya (<i>Seiya shining bright, seiya</i>)
+    Seiya sessesse seiya (<i>Seiya shining bright, seiya</i>)
+    Soiya sossosso soiya (<i>Soiya echoing strong, soiya</i>)
+    Soiya soso soiya (<i>Soiya echoing, soiya</i>)
 
-    (Ossu.) Kokoro orarete mo (<i>(Alright.) Even if the heart is broken,</i>)
-    (Ossu.) tachimukatte yukooze! (<i>(Alright.) Let's stand up and face it!</i>)
+    (Ossu) Kokoro orarete mo (<i>(Alright) Even if the heart is broken</i>)
+    (Ossu) Tachimukatte yukooze! (<i>(Alright) Let's stand up and face it!</i>)
 
-    Hitasura seiya soiya tatakau-nda (<i>With determination, seiya, soiya, we'll fight,</i>)
-    kobushi o motto kokoro o motto (<i>With more clenched fists, with more heart,</i>)
-    zenbu zenbu togisumashite. (<i>Sharpening everything, everything.</i>)
-    (Wo'oo wo'oo wo'oo.)
+    Hitasura seiya soiya tatakau-nda (<i>With determination, seiya, soiya, we'll fight</i>)
+    Kobushi o motto kokoro o motto (<i>With more clenched fists, with more heart</i>)
+    Zenbu zenbu togisumashite (<i>Sharpening everything, everything</i>)
+    (Wo'oo wo'oo wo'oo)
 
-    Mada mada seiya soiya tatakau-nda (<i>Still, seiya, soiya, we'll continue to fight,</i>)
-    kanashiku natte tachiagare-naku natte mo. (<i>Even if we become sad, even if we can't stand up.</i>)
+    Mada mada seiya soiya tatakau-nda (<i>Still, seiya, soiya, we'll continue to fight</i>)
+    Kanashiku natte tachiagare-naku natte mo (<i>Even if we become sad, even if we can't stand up</i>)
 
-    (Wo'oo wo'oo wo'oo.)
-    (Wo'oo wo'oo wo'oo.)
+    (Wo'oo wo'oo wo'oo)
+    (Wo'oo wo'oo wo'oo)
 
-    Seiya soiya tatakau-nda (<i>Seiya, soiya, we'll fight,</i>)
-    (Wo'oo wo'oo wo'oo.)
-    zenbu zenbu togisumashite. (<i>Sharpening everything, everything.</i>)
-    (Wo'oo wo'oo wo'oo.)
+    Seiya soiya tatakau-nda (<i>Seiya, soiya, we'll fight</i>)
+    (Wo'oo wo'oo wo'oo)
+    zenbu zenbu togisumashite (<i>Sharpening everything, everything</i>)
+    (Wo'oo wo'oo wo'oo)
 
-    Seiya soiya tatakau-nda (<i>Seiya, soiya, we'll fight,</i>)
-    (Wo'oo wo'oo wo'oo.)
-    zenbu zenbu togisumashite. (<i>Sharpening everything, everything.</i>)
-    (Wo'oo wo'oo wo'oo.)
+    Seiya soiya tatakau-nda (<i>Seiya, soiya, we'll fight</i>)
+    (Wo'oo wo'oo wo'oo)
+    zenbu zenbu togisumashite. (<i>Sharpening everything, everything</i>)
+    (Wo'oo wo'oo wo'oo)
 
-    Hitasura seiya soiya tatakau-nda (<i>With determination, seiya, soiya, we'll fight,</i>)
-    kobushi o motto kokoro o motto (<i>With more clenched fists, with more heart,</i>)
-    zenbu zenbu togisumashite. (<i>Sharpening everything, everything.</i>)
+    Hitasura seiya soiya tatakau-nda (<i>With determination, seiya, soiya, we'll fight</i>)
+    Kobushi o motto kokoro o motto (<i>With more clenched fists, with more heart</i>)
+    Zenbu zenbu togisumashite (<i>Sharpening everything, everything</i>)
     (Wo'oo wo'oo wo'oo.)
 
-    Mada mada seiya soiya tatakau-nda (<i>Still, seiya, soiya, we'll continue to fight,</i>)
-    kanashiku natte tachiagare-naku natte mo. (<i>Even if we become sad, even if we can't stand up.</i>)
+    Mada mada seiya soiya tatakau-nda (<i>Still, seiya, soiya, we'll continue to fight</i>)
+    Kanashiku natte tachiagare-naku natte mo (<i>Even if we become sad, even if we can't stand up</i>)
 
     Hashire! (<i>Run!</i>)
-    (Seiya soiya tatakau-nda) (<i>Seiya, soiya, we'll fight,</i>)
-    (zenbu zenbu togisumashite.) (<i>Sharpening everything, everything.</i>)
-    (Wo'oo wo'oo wo'oo.)
+    (Seiya soiya tatakau-nda) (<i>Seiya, soiya, we'll fight</i>)
+    (Zenbu zenbu togisumashite.) (<i>Sharpening everything, everything</i>)
+    (Wo'oo wo'oo wo'oo)
 
     Hashire! (<i>Run!</i>)
-    (Seiya soiya tatakau-nda) (<i>Seiya, soiya, we'll fight,</i>)
-    (zenbu zenbu togisumashite.) (<i>Sharpening everything, everything.</i>)
+    (Seiya soiya tatakau-nda) (<i>Seiya, soiya, we'll fight</i>)
+    (Zenbu zenbu togisumashite) (<i>Sharpening everything, everything</i>)
 
-    (Wo'oo wo'oo wo'oo.)
-    (Wo'oo wo'oo wo'oo.)
-    (Wo'oo wo'oo wo'oo.)
-    (Wo'oo wo'oo wo'oo.)
+    (Wo'oo wo'oo wo'oo)
+    (Wo'oo wo'oo wo'oo)
+    (Wo'oo wo'oo wo'oo)
+    (Wo'oo wo'oo wo'oo)
+---
+Track: Keyboard Combos
+Artists:
+- Arctures
+Duration: '0:30'
+URLs:
+- https://soundcloud.com/arctures/2016-discord-spot-keyboard-combos
+- https://www.youtube.com/watch?v=rWrjwUm3Oi4
 ---
 Track: Killer Queen
 Artists:
@@ -15213,10 +15527,10 @@ Duration: '3:00'
 URLs:
 - https://www.youtube.com/watch?v=n57gOxtGyow
 Lyrics: |-
-    L.A., L.A .(L.A., L.A.)
+    L.A., L.A. (L.A., L.A.)
 
     No work, all play
-    Every day in L.A
+    Every day in L.A.
     And those 9-5s
     You gotta say bye-bye
     Sipping on Mai Tais
@@ -15237,7 +15551,7 @@ Lyrics: |-
     I've got a thing for you
     You're the type of drug I could be addicted to
     I've got a thing for you
-    L.A., L.A
+    L.A., L.A.
 
     I've got a thing for you
 
@@ -15251,7 +15565,7 @@ Lyrics: |-
     Wanna wanna Malibu, just can't speed
     Stuck in traffic, still lookin' fly
     With the sun in my eye
-    Lovin' every minute of this L.A livin'
+    Lovin' every minute of this L.A. livin'
     'Cuz there ain't no limit
 
     I've got a thing for you
@@ -15265,10 +15579,10 @@ Lyrics: |-
     You can sell your soul, I bought my own bags
     Cattle calls may break my balls
     Droppin' names never hurt me, see
-    Gold is how, through streets of hay [?]
+    Gold is how, the streets of hay
     15 minutes with a chance of fame
     Ask anybody and you'll know they'll say
-    They all wanna live and die in L.A!
+    They all wanna live and die in L.A.!
 
     I've got a thing for you
 ---
@@ -15407,7 +15721,7 @@ Lyrics: |-
     Lawnmower
     Lawnmower
 ---
-Track: Let Me Hit It (Audiostalkers Remix)
+Track: Let Me Hit It (Audiostalkers)
 Artists:
 - Sporty-O
 Duration: '2:25'
@@ -15785,6 +16099,8 @@ Artists:
 Duration: '2:49'
 URLs:
 - https://www.youtube.com/watch?v=qAeybdD5UoQ
+Sampled Tracks:
+- dude, you do not even WANT to know
 Lyrics: |-
     (Please enjoy it!)
 
@@ -15908,24 +16224,24 @@ URLs:
 - https://www.youtube.com/watch?v=a39mp3d_BpA
 Lyrics: |-
     Nemutteru toki mo anata yasashii no shitteru? (<i>Do you know you're gentle even when you're sleeping?</i>)
-    Woohoo itoshikute odeko ni kisu o shita (<i>Woohoo, I love you. I kissed your forehead.</i>)
-    Nandomo moufu watashi ni kakete kureru kara (<i>Because you keep covering me with the blanket many times.</i>)
-    Woohoo marumatte samui ni kimatteru (<i>Woohoo, curling up, it's decided that it's cold.</i>)
-    Dakara hanbun kakenaoshiterun datte ba (<i>That's why I'm trying to cover half of it again.</i>)
-    Woohoo neboke teru awatete modoshiteru (<i>Woohoo, you're half-asleep, hastily putting it back.</i>)
-    Dakara hanbun wa anata ni kakerun datte ba (<i>That's why I'm trying to cover you with half of it.</i>)
-    Woohoo okashii no mata zenbu kureteru (<i>Woohoo, it's funny, you're giving me everything again.</i>)
-    Yasashii jikan eien no kakera de tsukutta yubiwa ageru ne (<i>The gentle time, I'll give you the ring made from the fragments of eternity.</i>)
+    Woohoo itoshikute odeko ni kisu o shita (<i>Woohoo, I love you, I kissed your forehead.</i>)
+    Nandomo moufu watashi ni kakete kureru kara (<i>Because you keep covering me with the blanket many times</i>)
+    Woohoo marumatte samui ni kimatteru (<i>Woohoo, curling up, it's decided that it's cold</i>)
+    Dakara hanbun kakenaoshiterun datte ba (<i>That's why I'm trying to cover half of it again</i>)
+    Woohoo neboke teru awatete modoshiteru (<i>Woohoo, you're half-asleep, hastily putting it back</i>)
+    Dakara hanbun wa anata ni kakerun datte ba (<i>That's why I'm trying to cover you with half of it</i>)
+    Woohoo okashii no mata zenbu kureteru (<i>Woohoo, it's funny, you're giving me everything again</i>)
+    Yasashii jikan eien no kakera de tsukutta yubiwa ageru ne (<i>The gentle time, I'll give you the ring made from the fragments of eternity</i>)
     Arigato watashi o mitsukete kurete darlin'? (<i>Thank you for finding me, darlin'?</i>)
-    Kokoro ga sou shitai tte itteru (<i>My heart is saying it wants to be that way.</i>)
+    Kokoro ga sou shitai tte itteru (<i>My heart is saying it wants to be that way</i>)
     Issho ni iyou yo issho ni nemurou marry me? (<i>Let's be together, let's sleep together, marry me?</i>)
     Unmei o futari de tashikame yo? (<i>Shall we verify our fate together?</i>)
     Ude ni noseta atama omoku nai ka na? (<i>Isn't my head heavy when I lay it on your arm?</i>)
-    Kitto anata no koto dakara (<i>Because it's you, for sure.</i>)
+    Kitto anata no koto dakara (<i>Because it's you, for sure</i>)
     Woohoo gaman shite shibire chatte ru no ka na? (<i>Woohoo, are you enduring and getting numb?</i>)
-    Yasashii kimochi mainichi sukoshi zutsu moratta biizu tsunaida (<i>Gentle feelings, every day, the beads we got little by little, connected them.</i>)
+    Yasashii kimochi mainichi sukoshi zutsu moratta biizu tsunaida (<i>Gentle feelings, every day, the beads we got little by little, connected them</i>)
     Arigato watashi o aishite kurete darlin'? (<i>Thank you for loving me, darlin'?</i>)
-    Kokoro ga mou hanarenai tte itteru (<i>My heart says it won't leave anymore.</i>)
+    Kokoro ga mou hanarenai tte itteru (<i>My heart says it won't leave anymore</i>)
     Issho ni iyou yo issho ni nemurou marry me? (<i>Let's be together, let's sleep together, marry me?</i>)
     Unmei no ito kata musubi shi chau yo? ii? darlin', marry me? (<i>Should I tie the thread of destiny tightly? Okay? Darlin', marry me?</i>)
 ---
@@ -16266,6 +16582,8 @@ Artists:
 Duration: '12:07'
 URLs:
 - https://www.youtube.com/watch?v=axwpgn3GRMs
+Sampled Tracks:
+- The audio of 2Pac’s voice is taken from an actual interview with Sveriges Radio Station (P3)
 Lyrics: |-
     Oh, oh, whoa
     Uh, yeah
@@ -16378,7 +16696,7 @@ Lyrics: |-
     As I lead this army, make room for mistakes and depression
     And if you riding with me, nigga, let me ask this question, nigga
 
-    "I remember you was conflicted
+    (I remember you was conflicted
     Misusing your influence
     Sometimes I did the same
     Abusing my power, full of resentment
@@ -16401,118 +16719,34 @@ Lyrics: |-
     Forgetting all the pain and hurt we caused each other in these streets
     If I respect you, we unify and stop the enemy from killing us
     But I don't know, I'm no mortal man
-    Maybe I'm just another nigga"
-    Shit and that's all I wrote
-    I was gonna call it "Another Nigga" but, it ain't really a poem
-    I just felt like it's something you probably could relate to
-    Other than that, now that I finally got a chance to holler at you
-    I always wanted to ask you about a certain situa-
-    About a metaphor actually, uh, you spoke on the ground
-    What you mean by that, what the ground represent?
-
-    The ground is gonna open up and swallow the evil
-    (Right)
-    That's how I see it, my word is bond
-    I see—and the ground is the symbol for the poor people
-    (Right)
-    The poor people is gonna open up this whole world
-    And swallow up the rich people
-    'Cause the rich people gonna be so fat
-    And they gonna be so appetizing, you know what I'm saying wealthy, appetizing
-    The poor gonna be so poor, and hungry
-    (Right)
-    You know what I'm saying, it's gonna be like
-    You know what I'm saying, it's gonna be
-    There might, there might be some cannibalism out this muh-fu-
-    They might eat the rich, you know what I'm saying?
-
-    Aight so let me ask you this then
-    Do you see yourself as somebody that's rich
-    Or somebody that made the best of their own opportunities?
-
-    I see myself as a natural born hustler
-    A true hustler in every sense of the word
-    I took nothin', I took the opportunities
-    I worked at the most menial and degrading job
-    And built myself up so I could get it to where I owned it
-    I went from having somebody managing me
-    To me hiring the person that works my management company
-    I changed everything, I realized my destiny
-    In a matter of five years, you know what I'm saying?
-    I made myself a millionaire, I made millions for a lot of people
-    Now it's time to make millions for myself, you know what I'm saying?
-    I made millions for the record companies
-    I made millions for these movie companies
-    Now I make millions for, for us
-
-    And through your different avenues of success
-    How would you say you managed to keep a level of sanity?
-
-    By my faith in God, by my faith in the game
-    And by my faith in "All good things come to those that stay true"
-    (Right)
-    You know what I'm saying?
-    And it was happening to me for a reason
-    You know what I'm saying, I was noticing, shit
-    I was punching the right buttons and it was happening
-    So it's no problem, you know
-    I mean, it's a problem but I'm not finna let them know
-    I'm finna go straight through
-
-    Would you consider yourself a fighter at heart or somebody that
-    Somebody that only reacts when they back is against the wall?
-
-    Shit, I like to think that at every opportunity I've ever been, uh
-    Threatened with resistance, it's been met with resistance
-    And not only me but, it goes down my family tree
-    You know what I'm saying, it's in my veins to fight back
-
-    Aight well, how long will you think it take before niggas be like
-    "We fighting a war, I'm fighting a war I can't win
-    And I wanna lay it all down"
-
-    In this country, a black man only have like
-    5 years we can exhibit maximum strength
-    And that's right now while you a teenager, while you still strong
-    While you still wanna lift weights, while you still wanna shoot back
-    'Cause once you turn 30 it's like
-    They take the heart and soul out of a man
-    Out of a black man, in this country
-    And you don't wanna fight no more
-    And if you don't believe me, you can look around
-    You don't see no loud mouth 30-year old motherfuckers
-
-    That's crazy, because me being one of your offsprings
-    Of the legacy you left behind, I can truly tell you that
-    There's nothing but turmoil goin' on so, I wanted to ask you
-    What you think is the future for me and my generation today?
-
-    I think that niggas is tired of grabbin' shit out the stores
-    And next time it's a riot it's gonna be like, uh, bloodshed
-    For real, I don't think America know that
-    I think America think we was just playing
-    And it's gonna be some more playing but
-    It ain't gonna be no playing
-    It's gonna be murder, you know what I'm saying?
-    It's gonna be like Nat Turner, 1831, up in this motherfucker
-    You know what I'm saying, it's gonna happen
-
-    That's crazy, man, in my opinion
-    Only hope that we kinda have left is music and vibrations
-    Lot a people don't understand how important it is, you know
-    Sometimes I can like, get behind a mic
-    And I don't know what type of energy I'ma push out
-    Or where it comes from, trip me out sometimes
-
-    Because it's spirits, we ain't even really rappin'
-    We just letting our dead homies tell stories for us
-    (Damn)
-
-    I wanted to read one last thing to you
-    It's actually something a good friend had wrote
-    Describing my world, it says:
-
-    "The caterpillar is a prisoner to the streets that conceived it
+    Maybe I'm just another nigga)
+
+    (Shit, that's all I wrote. I was gonna call it "Another Nigga" but, it ain't really a poem. I just felt like it's something you probably could relate to. Other than that, now that I finally got a chance to holler at you. I always wanted to ask you about a certain situa- About a metaphor actually, uh, you spoke on the ground. What you mean by that, what the ground represent?)
+    (The ground is gonna open up and swallow the evil.)
+    (Right.)
+    (That's how I see it, my word is bond. I see—and the ground is the symbol for the poor people)
+    (Right.)
+    (The poor people is gonna open up this whole world and swallow up the rich people 'cause the rich people gonna be so fat. And they gonna be so appetizing, you know what I'm sayin' wealthy, appetizing the poor gonna be so poor, and hungry.)
+    (Right.)
+    (You know what I'm saying, it's gonna be like, you know what I'm saying, it's gonna be, there might, there might be some cannibalism out this muh-fu- They might eat the rich, you know what I'm saying?)
+    (Aight so let me ask you this then. Do you see yourself as somebody that's rich. Or somebody that made the best of their own opportunities?)
+    (I see myself as a natural born hustler. A true hustler in every sense of the word, I took nothin', I took the opportunities, I worked at the most menial and degrading job, and built myself up so I could get it to where I owned it. I went from having somebody managing me, to me hiring the person that works my management company. I changed everything, I realized my destiny in a matter of five years, you know what I'm saying? I made myself a millionaire, I made millions for a lot of people, now it's time to make millions for myself, you know what I'm saying? I made millions for the record companies, I made millions for these movie companies, now I make millions for, for us.)
+    (And through your different avenues of success, how would you say you managed to keep a level of sanity?)
+    (By my faith in God, by my faith in the game, and by my faith in "All good things come to those that stay true".)
+    (Right.)
+    (You know what I'm saying? And it was happening to me for a reason, you know what I'm saying, I was noticing, shit, I was punching the right buttons and it was happening. So it's no problem, you know I mean, it's a problem but I'm not finna let them know, I'm finna go straight through.)
+    (Would you consider yourself a... a fighter at heart or somebody that... somebody that only reacts when they back is against the wall?)
+    (Shit, I like to think that at every opportunity I've ever been, uh, threatened with resistance, it's been met with resistance. And not only me but, it goes down my family tree. You know what I'm saying, it's in my veins to fight back.)
+    (Aight well, how long will you think it take before niggas be like, "We fighting a war, I'm fighting a war I can't win and I wanna lay it all down".)
+    (In this country, a black man only have like 5 years we can exhibit maximum strength, and that's right now while you a teenager, while you still strong, while you still wanna lift weights, while you still wanna shoot back.'Cause once you turn 30 it's like they take the heart and soul out of a man, out of a black man, in this country, and you don't wanna fight no more. And if you don't believe me, you can look around, you don't see no loud mouth 30-year old motherfuckers.)
+    (That's crazy, because me being one of your offsprings of the legacy you left behind, I can truly tell you that, there's nothing but turmoil goin' on so, I wanted to ask you, what you think is the future for me and my generation today?)
+    (I think that niggas is tired of grabbin' shit out the stores and next time it's a riot it's gonna be like, uh, bloodshed, for real. I don't think America know that, I think America think we was just playing and it's gonna be some more playing but, it ain't gonna be no playing. It's gonna be murder, you know what I'm saying? It's gonna be like Nat Turner, 1831, up in this motherfucker. You know what I'm saying? It's gonna happen.)
+    (That's crazy, man, in my opinion only hope that we kinda have left is music and vibrations. Lot a people don't understand how important it is, you know. Sometimes I can like, get behind a mic and I don't know what type of energy I'ma push out or where it comes from, trip me out sometimes.)
+    (Because it's spirits, we ain't even really rappin', we just letting our dead homies tell stories for us.)
+    (Damn.)
+    (I wanted to read one last thing to you. It's actually something a good friend had wrote, describing my world, it says:)
+
+    (The caterpillar is a prisoner to the streets that conceived it
     Its only job is to eat or consume everything around it
     In order to protect itself from this mad city
     While consuming its environment
@@ -16536,10 +16770,10 @@ Lyrics: |-
     Finally free, the butterfly sheds light on situations
     That the caterpillar never considered, ending the internal struggle
     Although the butterfly and caterpillar are completely different
-    They are one and the same"
-    What's your perspective on that?
-
-    Pac? Pac? Pac?! 
+    They are one and the same)
+    
+    (What's your perspective on that?)
+    (Pac? Pac? Pac?!)
 ---
 Track: Mr. Brightside
 Artists:
@@ -17446,6 +17680,10 @@ URLs:
 Track: Party Rock Anthem
 Artists:
 - LMFAO
+- GoonRock
+- Peter Schroeder
+Contributors:
+- Lauren Bennett (feat.)
 Duration: '4:36'
 URLs:
 - https://www.youtube.com/watch?v=KQ6zr6kCPj8
@@ -17629,13 +17867,6 @@ Lyrics: |-
     Where he at? Where he at? Where he at? Where he at?
     Now there he go, there he go, there he go, there he go
 ---
-Track: Pictures at an Exhibition - Promenade
-Artists:
-- Modest Mussorgsky
-Duration: '1:40'
-URLs:
-- https://www.youtube.com/watch?v=PdSecL8Ytrg
----
 Track: Piss
 Artists:
 - Neil Cicierega
@@ -18280,13 +18511,43 @@ Lyrics: |-
     Twenty four before my love you'll see
     I'll be there with you
 ---
-Track: Roustabout (Bassnectar Remix)
+Track: Roustabout
 Artists:
 - Beats Antique
+Duration: '4:00'
+URLs:
+- https://www.youtube.com/watch?v=1gM_C9v3c1s
+---
+Track: Roustabout (Bassnectar Remix)
+Artists:
 - Bassnectar
 Duration: '3:05'
 URLs:
 - https://www.youtube.com/watch?v=u8AD4rVEqno
+Referenced Tracks:
+- Roustabout
+Sampled Tracks:
+- Roustabout
+Lyrics: |-
+    Yeah
+
+    K to the A Y A
+    K to the A Y A Y A Y A Y phone
+    My microphone must the detect the check
+    K to the A Y A double T A
+    K to the A Y A
+    K to the A Y A Y A Y A Y phone
+    My microphone must the detect the check
+    K to the A Y A double T A
+
+    Yeah
+    My microphone must the detect the check, bass
+
+    Bass
+
+    Yeah
+
+    Bass
 ---
 Track: Running in the 90's
 Artists:
@@ -18473,11 +18734,14 @@ URLs:
 - https://soundcloud.com/spellingphailer/science-blaster
 ---
 Track: Secret of the Forest
+Directory: secret-of-the-forest-retro-remix-revue
 Artists:
 - Retro Remix Revue
 Duration: '5:47'
 URLs:
 - https://www.youtube.com/watch?v=Nq7VZJpJ9h4
+Referenced Tracks:
+- track:secret-of-the-forest
 ---
 Track: Shake That
 Artists:
@@ -18590,61 +18854,6 @@ Lyrics: |-
     And my boy, and his boy – and his boy, and his girl
     Ha-ha, Nate Dogg! 
 ---
-Track: Ska Punk Flavor
-# Also known as 最終鬼畜全部声
-Artists:
-- IOSYS
-Duration: '3:30'
-URLs:
-- https://www.youtube.com/watch?v=Za0kamPfdeE
-Referenced Tracks:
-- U.N. Owen Was Her?
----
-Track: 『SPLASH FREE』50% OFF Cover
-Artists:
-- Sparky
-Contributors:
-- Octopimp (additional vocals)
-Duration: '1:31'
-URLs:
-- https://www.youtube.com/watch?v=IxK0SLbFa0g
-Referenced Tracks:
-- SPLASH FREE
-Sampled Tracks:
-- SPLASH FREE
-Lyrics: |-
-    Make us free na splash! (<i>A splash that makes us free!</i>)
-    Kasaneta hikari no kontorasuto abite (<i>Bask in the contrast of the overlapping light</i>)
-    Feel so free na kyō tobikomu (<i>Feel so free today, dive right into</i>)
-    Oretachi no brand new blue, yeah (<i>Our brand new blue, yeah</i>)
-    Omou yō ni sei! Sei! Sei! A-oh! (<i>True to myself as I dive! Dive! Dive!</i>)
-    Jibunrashiku kick! Kick! Kick! A-oh! (<i>My own style in my kick! Kick! Kick!</i>)
-    Tsukamitai nda pull! Pull! Pull! A-oh! (<i>I want to know that feeling, so pull! Pull! Pull!</i>)
-    Todoki-sō na deep! Deep! Deep! Splash free! (<i>It's just within reach, the deep! Deep! Deep! Splash free!</i>)
-
-    [Unintelligible] Yeah!
-    What up sluts it's ya boy NG
-    Bout to drop a rhyme on these bitch buoys
-    Sho' 'nuff, I'm shota tough (Hah)
-    Haters always on me 'cause they think I'm just small stuff
-    Kiddie pools, swam up from the bottom now I'm killin' fools
-    Thug Life anime school
-    Catch me stuntin' with my Iwatobi crew (What?)
-    Makoto, Rei and my boy Haru
-    Splash! Flow just like water and cash!
-    Call me H2-oh, damn!
-    Other MCs get straight up tidal wave slammed! (Ha, ha)
-    My gang goes ham and when you see us swimmin' better know we're in demand!
-    Rackin it up top shelf La Croix, yo crew is on sale, 50% off! (Ruh!)
-
-    Make us free na splash! (Uh, hahahah, yeah!) [Unintelligible] (<i>A splash that makes us free!</i>)
-    Kasaneta hikari no kontorasuto no naka (What, that's right, uh, uh, uh, uh) (<i>Amid the contrast of overlapping light</i>)
-    Itsu made mo owaranai (<i>This moment will last forever</i>)
-    Natsu ni me o korashite yeah (You my man! Yeah! Yeah!) (<i>Set your sights on summer</i>)
-    Omoiomoi ni sei! Sei! Sei! A-oh! (What up!) (<i>True to myself as I dive! Dive! Dive!</i>)
-    Te o nobashita deep! Deep! Deep! Splash free! (<i>Hands outstretched to the deep! Deep! Deep! Splash free!</i>)
-    (Hahahaha)
----
 Track: Smooth
 Artists:
 - Santana
@@ -18712,6 +18921,116 @@ Lyrics: |-
     Let's don't forget about it
     Let's don't forget about it 
 ---
+Track: Solresol
+Artists:
+- Melomane
+Duration: '3:14'
+URLs:
+- https://melomane.bandcamp.com/track/solresol
+- https://www.youtube.com/watch?v=XPISqn7VfNY
+Lyrics: |-
+    Solresol
+    All of the things that I'm trying to say could be sung in tones
+    Sailing along on a lyrical boat
+    Let the meaning escape your throat
+    It's a revelation of massive scope called Solresol
+
+    Sudre the man, violin in hand, master planner
+    Said "No need for words, we can sing like birds with grammar"
+
+    Solresol
+    Eliminate all the pointless chitchat with musical notes
+    And once again we go back to the Seine, we go back to the source
+    Good son of France invented a dance in Morse code
+
+    I'm drowning in waves
+    Don't tear me away
+---
+Track: Spanish Waltz
+Artists:
+- Urbanus
+Duration: '0:37'
+URLs:
+- https://www.newgrounds.com/audio/listen/86480
+---
+Track: 『SPLASH FREE』50% OFF Cover
+Artists:
+- Sparky
+Contributors:
+- Octopimp (additional vocals)
+Duration: '1:31'
+URLs:
+- https://www.youtube.com/watch?v=IxK0SLbFa0g
+Referenced Tracks:
+- SPLASH FREE
+Sampled Tracks:
+- SPLASH FREE
+Lyrics: |-
+    Make us free na splash! (<i>A splash that makes us free!</i>)
+    Kasaneta hikari no kontorasuto abite (<i>Bask in the contrast of the overlapping light</i>)
+    Feel so free na kyō tobikomu (<i>Feel so free today, dive right into</i>)
+    Oretachi no brand new blue, yeah (<i>Our brand new blue, yeah</i>)
+    Omou yō ni sei! Sei! Sei! A-oh! (<i>True to myself as I dive! Dive! Dive!</i>)
+    Jibunrashiku kick! Kick! Kick! A-oh! (<i>My own style in my kick! Kick! Kick!</i>)
+    Tsukamitai nda pull! Pull! Pull! A-oh! (<i>I want to know that feeling, so pull! Pull! Pull!</i>)
+    Todoki-sō na deep! Deep! Deep! Splash free! (<i>It's just within reach, the deep! Deep! Deep! Splash free!</i>)
+
+    [Unintelligible] Yeah!
+    What up sluts it's ya boy NG
+    Bout to drop a rhyme on these bitch buoys
+    Sho' 'nuff, I'm shota tough (Hah)
+    Haters always on me 'cause they think I'm just small stuff
+    Kiddie pools, swam up from the bottom now I'm killin' fools
+    Thug Life anime school
+    Catch me stuntin' with my Iwatobi crew (What?)
+    Makoto, Rei and my boy Haru
+    Splash! Flow just like water and cash!
+    Call me H2-oh, damn!
+    Other MCs get straight up tidal wave slammed! (Ha, ha)
+    My gang goes ham and when you see us swimmin' better know we're in demand!
+    Rackin it up top shelf La Croix, yo crew is on sale, 50% off! (Ruh!)
+
+    Make us free na splash! (Uh, hahahah, yeah!) [Unintelligible] (<i>A splash that makes us free!</i>)
+    Kasaneta hikari no kontorasuto no naka (What, that's right, uh, uh, uh, uh) (<i>Amid the contrast of overlapping light</i>)
+    Itsu made mo owaranai (<i>This moment will last forever</i>)
+    Natsu ni me o korashite yeah (You my man! Yeah! Yeah!) (<i>Set your sights on summer</i>)
+    Omoiomoi ni sei! Sei! Sei! A-oh! (What up!) (<i>True to myself as I dive! Dive! Dive!</i>)
+    Te o nobashita deep! Deep! Deep! Splash free! (<i>Hands outstretched to the deep! Deep! Deep! Splash free!</i>)
+    (Hahahaha)
+---
+Track: Spleen
+Artists:
+- Ruth White
+Duration: '3:05'
+URLs:
+- https://www.youtube.com/watch?v=b7vWLz9iGsk
+Sampled Tracks:
+- Spleen poem by Charles Baudelaire
+Lyrics: |-
+    When the low, heavy sky weighs like a lid
+    On the spirit aching for the light
+    And when, embracing the horizon
+    It pours on us a black day which is sadder than any night
+
+    When the earth is turned into a dripping dungeon
+    In which Hope, like a bat, flutters blindly
+    And bruises its timid wing and tender head
+    Against the walls and rotted ceilings
+
+    When the rain, stretching down its long streaks of water
+    Imitates the bars of an enormous prison
+    And a silent throng of loathsome spiders come
+    And weave their webs inside our brains
+
+    Then suddenly, the bells swing angrily
+    And hurl their hideous uproar into the sky
+    Like a band of wandering spirits who wail relentlessly
+    And long hearses, without drums or music
+    Move in a slow procession through my soul
+    And defeated Hope bursts into tears
+    And the fierce tyrant Anguish
+    Sets his black banner on my bowed head
+---
 Track: Step's Theme
 Artists:
 - Aris Martinian
@@ -18790,31 +19109,6 @@ Lyrics: |-
     This fever over me, won't be gone, won't just let me be free
     I wish I was ancient history, I'll have a grand dad time
 ---
-Track: Solresol
-Artists:
-- Melomane
-Duration: '3:14'
-URLs:
-- https://melomane.bandcamp.com/track/solresol
-- https://www.youtube.com/watch?v=XPISqn7VfNY
-Lyrics: |-
-    Solresol
-    All of the things that I'm trying to say could be sung in tones
-    Sailing along on a lyrical boat
-    Let the meaning escape your throat
-    It's a revelation of massive scope called Solresol
-
-    Sudre the man, violin in hand, master planner
-    Said "No need for words, we can sing like birds with grammar"
-
-    Solresol
-    Eliminate all the pointless chitchat with musical notes
-    And once again we go back to the Seine, we go back to the source
-    Good son of France invented a dance in Morse code
-
-    I'm drowning in waves
-    Don't tear me away
----
 Track: Stronger Than You (Instrumental)
 Artists:
 - Mémoire
@@ -18824,46 +19118,6 @@ URLs:
 Referenced Tracks:
 - Stronger Than You
 ---
-Track: Spanish Waltz
-Artists:
-- Urbanus
-Duration: '0:37'
-URLs:
-- https://www.newgrounds.com/audio/listen/86480
----
-Track: Spleen
-Artists:
-- Ruth White
-Duration: '3:05'
-URLs:
-- https://www.youtube.com/watch?v=b7vWLz9iGsk
-Sampled Tracks:
-- Spleen poem by Charles Baudelaire
-Lyrics: |-
-    When the low, heavy sky weighs like a lid
-    On the spirit aching for the light
-    And when, embracing the horizon
-    It pours on us a black day which is sadder than any night
-
-    When the earth is turned into a dripping dungeon
-    In which Hope, like a bat, flutters blindly
-    And bruises its timid wing and tender head
-    Against the walls and rotted ceilings
-
-    When the rain, stretching down its long streaks of water
-    Imitates the bars of an enormous prison
-    And a silent throng of loathsome spiders come
-    And weave their webs inside our brains
-
-    Then suddenly, the bells swing angrily
-    And hurl their hideous uproar into the sky
-    Like a band of wandering spirits who wail relentlessly
-    And long hearses, without drums or music
-    Move in a slow procession through my soul
-    And defeated Hope bursts into tears
-    And the fierce tyrant Anguish
-    Sets his black banner on my bowed head
----
 Track: Suicide Hotline
 Directory: suicide-hotline-icp
 Artists:
@@ -19367,7 +19621,10 @@ Lyrics:
     Touch it, bring it, pay it, watch it
     Turn it, leave it, start - format it
 
-    Technologic [4x]
+    Technologic
+    Technologic
+    Technologic
+    Technologic
 
     Buy it, use it, break it, fix it
     Trash it, change it, mail - upgrade it
@@ -19467,9 +19724,19 @@ Lyrics:
     Touch it, bring it, pay it, watch it
     Turn it, leave it, start - format it
 
-    Technologic [8x]
+    Technologic
+    Technologic
+    Technologic
+    Technologic
+    Technologic
+    Technologic
+    Technologic
+    Technologic
 
-    Technologic [4x]
+    Technologic
+    Technologic
+    Technologic
+    Technologic
 ---
 Track: Teenagers
 Artists:
@@ -19546,6 +19813,7 @@ URLs:
 - https://www.youtube.com/watch?v=p2IF4ZqbyfU
 ---
 Track: The Microsoft Sound
+# aka the win95 startup jingle
 Artists:
 - Brian Eno
 Duration: '0:06'
@@ -20383,10 +20651,10 @@ Lyrics: |-
     Tunak tunak tun, tunak tunak tun, tunak tunak tun, da da da
     Tunak tunak tun, tunak tunak tun, tunak tunak tun, da da da
 
-    Dholna kadeh mere nal ha**, mainu dil valli da**, nahin taan teri meri ba** (<i>Beloved, sometimes with me, give me your heart, otherwise our matter</i>)
-    Dholna kadeh mere nal ha**, mainu dil valli da**, nahin taan teri meri ba** (<i>Beloved, sometimes with me, give me your heart, otherwise our matter</i>)
-    Dholna kadeh mere nal ha**, mainu dil valli da**, nahin taan teri meri ba** (<i>Beloved, sometimes with me, give me your heart, otherwise our matter</i>)
-    Dholna kadeh mere nal ha**, mainu dil valli da**, nahin taan teri meri ba** (<i>Beloved, sometimes with me, give me your heart, otherwise our matter</i>)
+    Dholna kadeh mere nal hass, mainu dil valli dass, nahin taan teri meri bass (<i>Beloved, sometimes with me, give me your heart, otherwise our matter</i>)
+    Dholna kadeh mere nal hass, mainu dil valli dass, nahin taan teri meri bass (<i>Beloved, sometimes with me, give me your heart, otherwise our matter</i>)
+    Dholna kadeh mere nal hass, mainu dil valli dass, nahin taan teri meri bass (<i>Beloved, sometimes with me, give me your heart, otherwise our matter</i>)
+    Dholna kadeh mere nal hass, mainu dil valli dass, nahin taan teri meri bass (<i>Beloved, sometimes with me, give me your heart, otherwise our matter</i>)
     Dholna...
 
     Tunak tunak tun, tunak tunak tun, tunak tunak tun, da da da
@@ -21989,43 +22257,53 @@ Duration: '2:40'
 URLs:
 - https://www.youtube.com/watch?v=y2cQvZPX3OY
 Lyrics: |-
-    get so fuckin dark in here
-    come come fuck apart in here
-    i die in the process
-    you die in the process
-    kettle drum roll hard shit
-    fuck i said fucker dont start shit
-    come come fuck apart in here
-    i hover above you
-    life pulled out your mouth
-    i become you
-    opening of the mouth
-    unlawful possession
-    jellyfish in cold sweat deep end
-    hollow shell twitch disconnection
-    pupils swell
-    my entrance
-    hijacked no questions asked
-    stretch you on like latex mask
-    my sigils your epitaph
-    come come fuck apart in here i die
-    im not you
-    fear
-    you wear it well
-    mademoiselle
-    heres to your destiny
-    hysterics scream help
-    dont worry in a few youll all be somewhere else
-    prepare yourselves
-    freelance motherfucker
-    get so fuckin dark in here
-    come come fuck apart in here
-    i die in the process
-    you die in the process
-    kettle drum roll hard shit
-    fuck i said fucker dont start shit
-    emerald tablet apartment toxic
-    come come fuck apart in here
+    Get so fuckin dark in here
+    Come come fuck apart in here
+    I die in the process
+    You die in the process
+    Kettle drum roll hard shit
+    Fuck I said fucker don't start shit
+
+    Come come fuck apart in here I
+
+    Come come fuck apart in here I
+    I hover above you
+    Life pulled out your mouth
+    I become you
+    Opening of the mouth
+    Unlawful possession
+    Jellyfish in cold sweat deep end
+    Hollow shell twitch disconnection
+    Pupils swell
+    My entrance
+    Hijacked no questions asked
+    Stretch you on like latex mask
+    My sigils your epitaph
+    
+    Come come fuck apart in here I
+
+    Come come fuck apart in here I... die
+
+    I'm not you, I'm not you, I'm not you
+    Fear
+    You wear it well
+    Mademoiselle
+    Here's to your destiny
+    Hysterics scream help
+    Don't worry in a few you'll all be somewhere else
+    Prepare yourselves
+    Freelance motherfucker
+
+    Get so fuckin dark in here
+    Come come fuck apart in here
+    I die in the process
+    You die in the process
+    Kettle drum roll hard shit
+    Fuck I said fucker don't start shit
+    Emerald tablet apartment toxic
+    Come come fuck apart in here I
+
+    Come come fuck apart in here I
 ---
 Track: You reposted in the wrong neighborhood
 Artists:
@@ -22142,37 +22420,6 @@ Artists:
 URLs:
 - https://en.wikipedia.org/wiki/Baby_Face_Morgan
 ---
-Track: Backbone
-Artists:
-- Sean Evans
-Duration: '5:58'
-URLs:
-- https://soundcloud.com/nine-zero-music/backbone
----
-Track: Backyard Fun Theme
-# Also known as "funmusic.mp3"
-# The song in the background of Backyard Fun, unreleased
-Artists:
-- Michael Guy Bowman
-Duration: '3:56'
-URLs:
-- https://www.youtube.com/watch?v=pa7xBUKruEw&t=52s
----
-Track: casino night
-Artists:
-- pilotredsun
-Duration: '2:43'
-URLs:
-- https://pilotredsun.bandcamp.com/track/casino-night
----
-Track: Keyboard Combos
-Artists:
-- Arctures
-Duration: '0:30'
-URLs:
-- https://soundcloud.com/arctures/2016-discord-spot-keyboard-combos
-- https://www.youtube.com/watch?v=rWrjwUm3Oi4
----
 Track: Disney Bootlegs - JonTron
 # Specifically, the Circle of Life mini-cover
 Artists:
@@ -22184,52 +22431,6 @@ Lyrics:
     Oh my go-o-o-od
     Oh my god, my god
 ---
-Track: Donald Trump Says China Remix
-Artists:
-- Chris Kogos
-Duration: '1:44'
-URLs:
-- https://www.youtube.com/watch?v=RbM2F-cfN0A
-Lyrics: |-
-    (approximate)
-    Let's say China
-    China China China China China China China China
-    China China China China China China China China China
-    I have to have my China
-    China China China China China China China China China China
-    China China and a China China China China China China
-    I know China very well
-    China China China
-    China China
-    China China China 
-    China China
-    China China China China China I'm from China
-    China China China China China China I have people that I know in
-    China China China
-    China China 
-    China China China China I'm from China China China China
-    I have people that I know in
-    China China China
-    China China China
-    China China China
-    China China China
-    I've been saying China China China China China China
-    China China China China China China
-    I go to China China China China China China China China China
-    China China China I have to have my China
-    China China China
-    China China China I've been saying
-    China China China China China China
-    China China China China
-    China China China I have China China China
-    I go to China China China China China
-    China China China China China China China
-    China China China China China China China
-    China China China China China China China
-    China I love China China China China China
-    China all the time China 
-    (And by the way, I love China)
----
 Track: Flowey's Laugh
 Artists:
 - Warner Bros.
diff --git a/album/v8lume.yaml b/album/v8lume.yaml
index 2c8d1dbd..8d0e7de1 100644
--- a/album/v8lume.yaml
+++ b/album/v8lume.yaml
@@ -1170,7 +1170,7 @@ Art Tags:
 - Dave
 Duration: '01:53'
 Referenced Tracks:
-- Lotus (Bloom)
+- Lotus
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/dabestep-ultramegamix-w-aditionel-drumbs
 - https://youtu.be/FJ6_Ru6UOhs
@@ -1663,7 +1663,7 @@ Referenced Tracks:
 - track:midnight-suffer
 - Crank That
 - Michael Bowman Remix
-- Ska Punk Flavor
+- track:final-savage-all-voice-ska-punk-flavor
 - U.N. Owen Was Her?
 - This Saturnine Existence
 - track:moshi-moshi
@@ -1678,7 +1678,7 @@ Sampled Tracks:
 - Waters of Nazareth
 - Hopes and Dreams
 - Michael Bowman Remix
-- Ska Punk Flavor
+- track:final-savage-all-voice-ska-punk-flavor
 - Bangarang
 - Sad Jhon (Full)
 URLs:
diff --git a/artists.yaml b/artists.yaml
index 2d3246af..c902ac60 100644
--- a/artists.yaml
+++ b/artists.yaml
@@ -412,6 +412,16 @@ Aliases:
 URLs:
 - https://ostrichlittledungeon.bandcamp.com/
 ---
+Artist: ARM
+Aliases:
+- Ude-san
+- Mr. Arm
+- Maou
+- Evil Lord
+- 腕さん
+- 魔王
+- ARM_IOSYS
+---
 Artist: Armageddon
 ---
 Artist: Artemis251
@@ -605,6 +615,8 @@ URLs:
 ---
 Artist: Barry Harman
 ---
+Artist: Bart Howard
+---
 Artist: barzamin
 ---
 Artist: Bass Bumpers
@@ -634,6 +646,17 @@ URLs:
 - https://twitter.com/beackupburner
 - https://beesmygod.tumblr.com/
 ---
+Artist: Beat Throat Mario
+Aliases:
+- ビート喉まりお
+---
+Artist: beatMARIO
+Aliases:
+- Beat Mario
+- ビートまりお
+---
+Artist: Becky Sloan
+---
 Artist: Beats Antique
 ---
 Artist: Beast72
@@ -663,6 +686,8 @@ Artist: Beta
 ---
 Artist: Beverly Hills Cop
 ---
+Artist: Big Bad Beetleborgs
+---
 Artist: Bijan Eghtesady
 ---
 Artist: Bill Bolin
@@ -766,6 +791,8 @@ Aliases:
 ---
 Artist: Bobby Prince
 ---
+Artist: Bomberman
+---
 Artist: Brad Breeck
 ---
 Artist: Brad Griffin
@@ -1595,6 +1622,8 @@ Artist: Donomon
 URLs:
 - https://donomon.tumblr.com/
 ---
+Artist: Don't Hug Me I'm Scared
+---
 Artist: Doom
 ---
 Artist: DoomedCloud
@@ -1844,6 +1873,10 @@ Artist: Fabricio Podestá
 ---
 Artist: Facetious (Alex Votl) & Friends
 ---
+Artist: Falk Au Yeong
+Aliases:
+- Falk
+---
 Artist: Family Guy
 ---
 Artist: Fatamogo
@@ -2110,6 +2143,10 @@ Artist: goldcray
 ---
 Artist: Golden_Skylord
 ---
+Artist: GoonRock
+Aliases:
+- David Listenbee
+---
 Artist: GoomFloops
 ---
 Artist: Gordian
@@ -2133,6 +2170,8 @@ Artist: Gran Turismo
 ---
 Artist: Grant Kirkhope
 ---
+Artist: Gravity Falls
+---
 Artist: Greenagon
 ---
 Artist: Griever
@@ -2483,6 +2522,12 @@ URLs:
 ---
 Artist: James Ellis
 ---
+Artist: James Landino
+Aliases:
+- KgZ
+URLs:
+- https://soundcloud.com/jameslandino
+---
 Artist: James Lord Pierpont
 ---
 Artist: James Roach
@@ -2599,6 +2644,8 @@ Artist: Jim Henson
 ---
 Artist: Jimmy Barnes
 ---
+Artist: 'Jimmy Neutron: Boy Genius'
+---
 Artist: Ji Pyeong Kwon
 Aliases:
 - Ji Pyeongkeyon
@@ -2621,6 +2668,8 @@ Artist: Joe Ouellet
 URLs:
 - https://soundcloud.com/doublejoeseven-1
 ---
+Artist: Joe Pelling
+---
 Artist: Joe Teague
 ---
 Artist: Johann Pachelbel
@@ -2968,7 +3017,7 @@ URLs:
 - https://soundcloud.com/kezinox/
 - https://www.youtube.com/user/Kezinox
 ---
-Artist: KgZ
+Artist: Khonjin House
 ---
 Artist: Khoroshonov
 ---
@@ -3153,6 +3202,8 @@ URLs:
 - https://twitter.com/supershigi
 - https://www.laurashigihara.com/
 ---
+Artist: Lauren Bennett
+---
 Artist: Lauren Collis
 ---
 Artist: Lauren Faust
@@ -3884,6 +3935,10 @@ URLs:
 ---
 Artist: Molly Lewis
 ---
+Artist: Momiji Yamamoto
+Aliases:
+- 山本椛
+---
 Artist: Momo
 Aliases:
 - Momora
@@ -4233,6 +4288,8 @@ Dead URLs:
 ---
 Artist: Oasis
 ---
+Artist: Oddity
+---
 Artist: Odera Igbokwe
 URLs:
 - https://twitter.com/OderaIgbokwe
@@ -4387,6 +4444,8 @@ Artist: Perry Sullivan
 ---
 Artist: Peter Allen
 ---
+Artist: Peter Schroeder
+---
 Artist: Peter J. Wilhousky
 ---
 Artist: Peter West
@@ -5071,6 +5130,8 @@ Context Notes: >-
     and form of albums they appear on, however, it should be noted that this artist
     has made several statements defending neo-Nazi comic Stonetoss.
 ---
+Artist: Seinfeld
+---
 Artist: Selan Pike
 URLs:
 - https://selanpike.tumblr.com/
@@ -5716,6 +5777,8 @@ Context Notes: |-
 ---
 Artist: Tha Trademarc
 ---
+Artist: The Adventures of Donkey Ollie
+---
 Artist: The Big Apple Band
 ---
 Artist: The Cat Herd
diff --git a/static-page/changelog.yaml b/static-page/changelog.yaml
index 9dc7879a..555d7fd5 100644
--- a/static-page/changelog.yaml
+++ b/static-page/changelog.yaml
@@ -28,6 +28,26 @@ Style: |-
         margin-bottom: 0.6em;
     }
 Content: |-
+    <h2 id="16-sep-2099"><a href="#16-sep-2099">[[date:16 September 2099]]</a> - Allan please add details</h2>
+    <h3>albums</h3>
+    - added TWELVE albums from [[group:canmt]]! (thanks, Makin!)
+        - added [[album:cool-and-new-homestuck-2]]!
+        - added [[album:cool-and-new-homestuck-3]]!
+        - added [[album:take-my-song-in-a-completely-different-direction]]!
+        - added [[album:v8lume]]!
+        - added [[album:canwave-2]]!
+        - added [[album:bowmania]]!
+        - added [[album:cool-and-new-sonic-team]]!
+        - added [[album:intermishin]]!
+        - added [[album:the-ballad-of-megan-pouring]]!
+        - added [[album:call-and-new-2-locomotif]]!
+        - added [[album:jpeg]]!
+        - added [[album:9]]!
+    <h3>other additions</h3>
+    - added proper 'lyrics' to [[track:brodylovania]]
+    <h3>data fixes</h3>
+    - fixed [[track:you-reposted-in-the-wrong-neighborhood]] not referencing [[track:shake-that]] or [[track:casin]]
+
     <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>