movies and tv beyond homestuck improvements

mainly lyrics, adding artists, moved some tracks from 'other music'

6 files changed, 1217 insertions, 111 deletions

diff --git a/album/alterniabound.yaml b/album/alterniabound.yaml
index 4c71e1c..b786dbe 100644
--- a/album/alterniabound.yaml
+++ b/album/alterniabound.yaml
@@ -62,7 +62,7 @@ Art Tags:
 - Green Sun
 Referenced Tracks:
 - psych0ruins
-- My Little Pony Theme
+- 'My Little Pony: Friendship is Magic Theme'
 Sampled Tracks:
 - Dr. Who
 Lyrics: |-
diff --git a/album/ancestral.yaml b/album/ancestral.yaml
index 7bc696d..a2b5fe6 100644
--- a/album/ancestral.yaml
+++ b/album/ancestral.yaml
@@ -1412,7 +1412,7 @@ Art Tags:
 - The Signless
 - The Disciple
 Referenced Tracks:
-- Story of Tonight
+- The Story of Tonight
 - Burn
 Commentary: |-
     <i>Navochao:</i>
diff --git a/album/of-troles-and-chiptumes.yaml b/album/of-troles-and-chiptumes.yaml
index 6009b37..33449a0 100644
--- a/album/of-troles-and-chiptumes.yaml
+++ b/album/of-troles-and-chiptumes.yaml
@@ -276,7 +276,7 @@ Art Tags:
 - Hella Jeff
 Referenced Tracks:
 - Rex Duodecim Angelus
-- My Little Pony Theme
+- 'My Little Pony: Friendship is Magic Theme'
 - Karkat's Theme
 - Archagent Everlasting
 - track:atomyk-ebonpyre
diff --git a/album/references-beyond-homestuck.yaml b/album/references-beyond-homestuck.yaml
index 0bc1af0..dabdfb3 100644
--- a/album/references-beyond-homestuck.yaml
+++ b/album/references-beyond-homestuck.yaml
@@ -1621,9 +1621,123 @@ Group: Music composed for movies and television
 Track: Burn
 Artists:
 - 'Hamilton: An American Musical'
+- Lin-Manuel Miranda
+Contributors:
+- Phillipa Soo (vocals)
 Duration: '3:45'
 URLs:
 - https://www.youtube.com/watch?v=a0k0FJrY4a8
+Lyrics: |-
+    I saved every letter you wrote me
+    From the moment I read them
+    I knew you were mine
+    You said you were mine
+    I thought you were mine
+
+    Do you know what Angelica said
+    When we saw your first letter arrive?
+    She said
+    Be careful with that one, love
+    He will do what it takes to survive
+
+    You and your words flooded my senses
+    Your sentences left me defenseless
+    You built me palaces out of paragraphs
+    You built cathedrals
+
+    I’m re-reading the letters you wrote me
+    I’m searching and scanning for answers
+    In every line
+    For some kind of sign
+    And when you were mine
+    The world seemed to
+    Burn
+    Burn
+
+    You published the letters she wrote you
+    You told the whole world how you brought
+    This girl into our bed
+    In clearing your name, you have ruined our lives
+    Do you know what Angelica said
+    When she read what you’d done?
+    She said
+    You have married an Icarus
+    He has flown too close to the sun
+
+    You and your words, obsessed with your legacy...
+    Your sentences border on senseless
+    And you are paranoid in every paragraph
+    How they perceive you
+    You, you, you…
+
+    I’m erasing myself from the narrative
+    Let future historians wonder how Eliza
+    Reacted when you broke her heart
+    You have torn it all apart
+    I am watching it burn
+    Watching it burn
+
+    The world has no right to my heart
+    The world has no place in our bed
+    They don’t get to know what I said
+    I’m burning the memories
+    Burning the letters that might have redeemed you
+
+    You forfeit all rights to my heart
+    You forfeit the place in our bed
+    You sleep in your office instead
+    With only the memories
+    Of when you were mine
+    I hope that you burn
+---
+Track: Can You Feel the Love Tonight
+Artists:
+- Elton John
+Duration: '4:01'
+URLs:
+- https://www.youtube.com/watch?v=fTtgVSxfr5M
+Lyrics: |-
+    There's a calm surrender
+    To the rush of day
+    When the heat of a rolling wind
+    Can be turned away
+
+    An enchanted moment
+    And it sees me through
+    It's enough for this restless warrior
+    Just to be with you
+
+    And can you feel the love tonight?
+    It is where we are
+    It's enough for this wide-eyed wanderer
+    That we got this far
+
+    And can you feel the love tonight
+    How it's laid to rest?
+    It's enough to make kings and vagabonds
+    Believe the very best
+
+    There's a time for everyone
+    If they only learn
+    That the twisting kaleidoscope
+    Moves us all in turn
+
+    There's a rhyme and reason
+    To the wild outdoors
+    When the heart of this star-crossed voyager
+    Beats in time with yours
+
+    And can you feel the love tonight?
+    It is where we are
+    It's enough for this wide-eyed wanderer
+    That we got this far
+
+    And can you feel the love tonight
+    How it's laid to rest?
+    It's enough to make kings and vagabonds
+    Believe the very best
+    It's enough to make kings and vagabonds
+    Believe the very best
 ---
 Track: Captain Planet and the Planeteers End Title
 Artists:
@@ -1635,6 +1749,30 @@ Duration: '1:01'
 URLs:
 - https://hsmusic.github.io/misc/cp_close.mp3
 - https://www.youtube.com/watch?v=v1QYQpHdzpw
+Lyrics: |-
+    Earth!
+    Fire!
+    Wind! Water!
+    Heart! GO PLANET!
+    (With your powers combined, I am Captain Planet!)
+
+    Captain Planet! He's a hero!
+    Gonna take pollution down to zero!
+    He's our powers magnified
+    And he's fighting on the planet's side
+
+    Captain Planet! He's a hero!
+    Gonna take pollution down to zero!
+    Gonna help him put asunder
+    Bad guys who like to loot and plunder
+
+    (You'll pay for this Captain Planet!)
+
+    We're the Planeteers! You can be one too!
+    'Cause saving our planet is the thing to do!
+    Looting and polluting is not the way
+    Hear what Captain Planet has to say!
+    (The power is YOURS!)
 ---
 Track: Courage
 Artists:
@@ -1730,7 +1868,7 @@ Lyrics: |-
     Drift
     Away 
 ---
-Track: Family Guy Main Theme
+Track: Family Guy Main Title
 Artists:
 - Family Guy
 - Walter Murphy
@@ -1742,6 +1880,19 @@ Contributors:
 Duration: '0:32'
 URLs:
 - https://www.youtube.com/watch?v=VileKLJz6tQ
+Lyrics: |-
+    It seems today that all you see
+    Is violence in movies and sex on TV
+    But where are those good old-fashioned values
+    On which we used to rely?
+
+    Lucky there's a family guy!
+    Lucky there's a man who
+    Positively can do
+    All the things that make us
+    Laugh and cry!
+
+    He's our Family Guy!
 ---
 Track: Futurama Main Theme
 Artists:
@@ -1862,9 +2013,93 @@ Lyrics: |-
 Track: Ghostbusters
 Artists:
 - Ghostbusters
+- Ray Parker Jr.
 Duration: '4:03'
 URLs:
 - https://www.youtube.com/watch?v=m9We2XsVZfc
+Lyrics: |-
+    Ghostbusters!
+
+    If there's something strange
+    In your neighborhood
+    Who you gonna call?
+    Ghostbusters!
+
+    If there's something weird
+    And it don't look good
+    Who you gonna call?
+    Ghostbusters!
+
+    I ain't 'fraid of no ghost
+    I ain't 'fraid of no ghost
+
+    If you're seeing things
+    Running through your head
+    Who can you call?
+    Ghostbusters!
+
+    An invisible man
+    Sleepin' in your bed
+    Ow! Who you gonna call?
+    Ghostbusters!
+
+    I ain't 'fraid of no ghost
+    I ain't 'fraid of no ghost
+
+    Who you gonna call?
+    Ghostbusters!
+    If you're all alone
+    Pick up the phone
+    And call
+    Ghostbusters!
+
+    I ain't 'fraid of no ghost
+    Ooh, I hear it likes the girls
+    Hm, I ain't 'fraid of no ghost
+    Yeah, yeah, yeah, yeah
+
+    Who you gonna call?
+    Ghostbusters!
+
+    Mmm, if you've had a dose of a
+    Freaky ghost, baby
+    You better call
+    Ghostbusters! Ow!
+
+    Lemme tell ya something
+    Bustin' makes me feel good
+
+    I ain't 'fraid of no ghost
+    I ain't 'fraid of no ghost
+
+    Don't get caught alone, oh no
+    Ghostbusters!
+
+    When it comes through your door
+    Unless you just a-want some more
+    I think you better call
+    Ghostbusters!
+
+    Ow! Who you gonna call?
+    Ghostbusters!
+    Who you gonna call?
+    Ghostbusters!
+    Uh, think you better call
+    Ghostbusters!
+    Ha-ha, who you gonna call?
+    Ghostbusters!
+    I can't hear you, who you gonna call?
+    Ghostbusters!
+    Louder
+    Ghostbusters!
+    Who you gonna call?
+    Ghostbusters!
+    Who can you call?
+    Ghostbusters!
+    Who you gonna call?
+    Ghostbusters!
+    Uh, it likes the girls too
+    Ghostbusters!
 ---
 Track: Haven't You Noticed (I'm A Star)
 Artists:
@@ -1909,6 +2144,145 @@ Duration: '3:00'
 URLs:
 - https://www.youtube.com/watch?v=vhSHXGM7kgE
 ---
+Track: How Do I Live
+Artists:
+- Diane Warren
+Contributors:
+- Trisha Yearwood (performance in Con Air)
+Duration: '3:55'
+URLs:
+- https://www.youtube.com/watch?v=Sjx-T7_CGQA
+Lyrics: |-
+    How do I
+    Get through one night without you?
+    If I had to live without you
+    What kinda life would that be?
+
+    Oh and I
+    I need you in my arms, need you to hold
+    You're my world, my heart, my soul
+    If you ever leave
+    Well, baby you would take away everything
+    Good in my life
+
+    Without you
+    There'd be no sun in my sky
+    There would be no love in my life
+    There'd be no world left for me
+
+    And I
+    Baby I don't know what I would do
+    I'd be lost if I lost you
+    If you ever leave
+    Baby you would take away everything
+    Real in my life
+
+    And tell me now
+    How do I live without you?
+    I want to know
+    How do I breathe without you?
+    If you ever go
+    How do I ever
+    Ever survive?
+    How do I, how do I
+    Oh how do I live?
+
+    If you ever leave
+    Baby you would take away everything
+    I need you with me
+    Baby 'cause you know that you're everything
+    Good in my life
+
+    And tell me now
+    How do I live without you?
+    I want to know
+    How do I breathe without you?
+    If you ever go
+    How do I ever
+    Ever survive?
+    How do I, how do I
+    Oh how do I live?
+
+    How do I live
+    Without you baby
+
+    How do I live...
+---
+Track: I Don't Want to Miss a Thing
+Directory: i-dont-want-to-miss-a-thing-aerosmith
+Artists:
+- Diane Warren
+Contributors:
+- Aerosmith (performance in Armageddon)
+Duration: '4:54'
+URLs:
+- https://www.youtube.com/watch?v=JkK8g6FMEXE
+Lyrics: |-
+    I could stay awake just to hear you breathin'
+    Watch you smile while you are sleeping
+    While you're far away and dreaming
+    I could spend my life in this sweet surrender
+    I could stay lost in this moment forever
+    Where every moment spent with you is a moment I treasure
+
+    Don't wanna close my eyes
+    I don't wanna fall asleep
+    'Cause I'd miss you, babe
+    And I don't wanna miss a thing
+    'Cause even when I dream of you (Even when I dream)
+    The sweetest dream would never do
+    I'd still miss you, babe
+    And I don't wanna miss a thing
+
+    Lying close to you, feeling your heart beating
+    And I'm wondering what you're dreaming
+    Wonderin' if it's me you're seeing
+    Then I kiss your eyes and thank God we're together
+    And I just wanna stay with you
+    In this moment forever
+    Forever and ever
+
+    I don't wanna close my eyes
+    I don't wanna fall asleep
+    'Cause I'd miss you, babe
+    And I don't wanna miss a thing
+    'Cause even when I dream of you (Even when I dream)
+    The sweetest dream would never do
+    I'd still miss you, babe
+    And I don't wanna miss a thing
+
+    I don't wanna miss one smile
+    I don't wanna miss one kiss
+    Well, I just wanna be with you
+    Right here with you, just like this
+    I just wanna hold you close
+    I feel your heart so close to mine
+    And just stay here in this moment
+    For all the rest of time
+    Yeah, (Yeah) Yeah, (Yeah) Yeah!
+
+    Don't wanna close my eyes
+    Don't wanna fall asleep
+    'Cause I'd miss you, babe
+    And I don't wanna miss a thing
+    'Cause even when I dream of you (Even when I dream)
+    The sweetest dream would never do
+    I'd still miss you, babe
+    And I don't wanna miss a thing
+
+    I don't wanna close my eyes
+    I don't wanna fall asleep
+    'Cause I'd miss you, babe
+    And I don't wanna miss a thing
+    'Cause even when I dream of you
+    The sweetest dream would never do
+    I'd still miss you, babe
+    And I don't wanna miss a thing
+
+    Don't wanna close my eyes
+    I don't wanna fall asleep, yeah
+    I don't wanna miss a thing
+---
 Track: JoJo ~Sono Chi no Sadame~
 Artists:
 - JoJo's Bizarre Adventure
@@ -1916,6 +2290,57 @@ Artists:
 Duration: '4:24'
 URLs:
 - https://www.youtube.com/watch?v=sugUX1PtUc4
+Lyrics: |-
+    (JoJo! JoJo! JoJo!)
+    (JoJo! JoJo! JoJo!)
+    
+    Sora koboreochita futatsu no hoshi ga (<i>Twin stars spilled in the sky</i>)
+    Hikari to yami no minamo suikomareteyuku (<i>that absorb the liquid surface of light and darkness</i>)
+    Hikiau yō ni kasanaru hamon (<i>Ripples that overlap like attracting each other</i>)
+
+    Hokori no michi wo yuku mono ni taiyō no michibiki wo (<i>The guidance of the sun to those who go on the path of pride</i>)
+    Yabō no hate wo mezasu mono ni ikenie wo (<i>A sacrifice to those who aim for the end of their ambitions</i>)
+
+    (JoJo! JoJo! JoJo!)
+    (JoJo! JoJo! JoJo!)
+
+    Furueru hodo kokoro moetsukiru hodo atsuku (<i>A heart that trembles and is heating up enough to burn</i>)
+    Sono te kara hanate kodō karada minagiru yūki de (<i>Let it beat from those hands with the courage that fills your body</i>)
+    Mayoi naki kakugo ni kassai wo (<i>Cheers for your determination without hesitation</i>)
+    Sono chi no sadame (<i>The fate of that blood</i>)
+    JoJo!
+
+    Sai wa nagerareta susumu shikanai (<i>The die is cast, he has no choice but to advance</i>)
+    Kimyō na rasen no naka korogaritsuzukeru (<i>He continues to roll in a strange spiral</i>)
+    Eien wo samayō bōkensha (<i>An adventurer who eternally wanders</i>)
+
+    Kyōfu wo mitome tatsu mono ni ōgon no tamashī wo (<i>A golden soul for those who admit his fears</i>)
+    Soshite deatta futari no tame ni tatakai wo (<i>And fight for the two who met</i>)
+
+    (JoJo! JoJo! JoJo!)
+    (JoJo! JoJo! JoJo!)
+
+    Maku ga aita you na owarinaki monogatari (<i>An endless story that seems to have risen the curtain</i>)
+    Inochi ga butsukaru hibana seishun no hibi wo terase yo (<i>The sparks that strike against your life illuminate the days of your youth</i>)
+    Kimi to iu mirai ni kōun wo! (<i>Good luck in your future!</i>)
+    Sono chi no sadame (<i>The fate of that blood</i>)
+    JoJo!
+
+    Nidoto hodokenai karamiatta sadame (<i>A entangled fate that never unravels</i>)
+    Subete wa koko kara hajimatteita no sa (<i>Everything started here</i>)
+
+    Furueru hodo kokoro moetsukiru hodo atsuku (<i>A heart that trembles and is heating up enough to burn</i>)
+    Sono te kara hanate kodō karada minagiru yūki de (<i>Let it beat from those hands with the courage that fills your body</i>)
+    Mayoi naki kakugo ni kassai wo! (<i>Cheers for your determination without hesitation</i>)
+
+    Maku ga aita you na owarinaki monogatari (<i>An endless story that seems to have risen the curtain.</i>)
+    Inochi ga butsukaru hibana seishun no hibi wo terase yo (<i>The sparks that strike against your life illuminate the days of your youth.</i>)
+    Kimi to iu mirai ni kōun wo! (<i>Good luck" in your future!</i>)
+    Sono chi no sadame (<i>The fate of that blood</i>)
+    JoJo!
+    
+    (JoJo! JoJo! JoJo!)
+    (JoJo! JoJo! JoJo!)
 ---
 Track: Lapis Lazuli
 Artists:
@@ -1949,6 +2374,13 @@ Contributors:
 Duration: 0:15
 URLs:
 - https://www.youtube.com/watch?v=-KRtN6-DgrY
+Lyrics: |-
+    (Mailtime!)
+
+    Here's the mail it never fails
+    It makes me wanna wag my tail
+    When it comes I wanna wail
+    MAIL!
 ---
 Track: Meet the Flintstones
 Artists:
@@ -1959,15 +2391,79 @@ Artists:
 Duration: 0:35
 URLs:
 - https://www.youtube.com/watch?v=2s13X66BFd8
+Lyrics: |-
+    (Yabba-dabba-doo!)
+
+    Flintstones, meet the Flintstones
+    They're the modern Stone Age family
+    From the town of Bedrock
+    They're a page right out of history
+
+    Let's ride with the family down the street
+    Through the courtesy of Fred's two feet
+
+    When you're with the Flintstones
+    Have a yabba-dabba-doo time
+    A dabba-doo time
+    We'll have a gay old time!
+---
+Track: 'My Little Pony: Friendship is Magic Theme'
+Artists:
+- My Little Pony
+- Daniel Ingram
+- Lauren Faust (lyrics)
+Contributors:
+- Shannon Chan-Kent (vocals)
+- Rebecca Shoichet (vocals)
+- Ashleigh Ball (vocals)
+- Kazumi Evans (vocals)
+- Andrea Libman (vocals)
+Duration: '0:36'
+URLs:
+- https://www.youtube.com/watch?v=3Y_Ps4ETwo0
+Referenced Tracks:
+- My Little Pony Theme
+Lyrics: |-
+    My Little Pony, My Little Pony
+    Ahh, ahh, ahh, ahhh...
+
+    My Little Pony!
+    I used to wonder what friendship could be
+    My Little Pony!
+    Until you all shared its magic with me
+
+    Big adventure!
+    Tons of fun!
+    A beautiful heart
+    Faithful and strong!
+    Sharing kindness!
+
+    It's an easy feat!
+    And magic makes it all complete!
+
+    You have my little ponies
+    Do you know you're all my very best friends?
 ---
 Track: My Little Pony Theme
 Artists:
 - My Little Pony
 - Ford Klinder
 - Anne Bryant
-Duration: '1:55'
+- Barry Harman (lyrics)
+Duration: '0:44'
 URLs:
 - https://www.youtube.com/watch?v=QP_rIAkb_v8
+Lyrics: |-
+    My Little Pony, My Little Pony
+    What will today's adventure be?
+    My Little Pony, My Little Pony
+    Will there be exciting sights to see?
+
+    Where will you wander? Hither and yonder
+    Letting your heart be your guide
+    My Little Pony, My Little Pony
+    I'll be there right by your side
+    I'll be there right by your side
 ---
 Track: Part Of Your World
 Artists:
@@ -2093,9 +2589,54 @@ Directory: rainbow-connection-muppets
 Artists:
 - The Muppets
 - Paul Williams
+- Kenneth Ascher
+Contributors:
+- Jim Henson (vocals)
 Duration: '3:15'
 URLs:
 - https://www.youtube.com/watch?v=69PQuw0r3oM
+Lyrics: |-
+    Why are there so many
+    Songs about rainbows
+    And what's on the other side?
+    Rainbows are visions
+    But only illusions
+    And rainbows have nothing to hide
+
+    So we've been told and some choose to believe it
+    I know they're wrong wait and see
+    Someday we'll find it, the rainbow connection
+    The lovers, the dreamers and me
+
+    Who said that every wish
+    Would be heard and answered
+    When wished on the morning star?
+    Somebody thought of that
+    And someone believed it
+    Look what it's done so far
+
+    What's so amazing that keeps us stargazing
+    And what do we think we might see?
+    Someday we'll find it, the rainbow connection
+    The lovers, the dreamers and me
+
+    All of us under its spell
+    We know that it's probably magic
+
+    Have you been half asleep
+    And have you heard voices?
+    I've heard them calling my name
+    Is this the sweet sound
+    That calls the young sailors?
+    The voice might be one and the same
+
+    I've heard it too many times to ignore it
+    It's something that I'm supposed to be
+    Someday we'll find it, the rainbow connection
+    The lovers, the dreamers and me
+
+    Da-da-da-dee-da-da dum
+    Da-da-da-da-dee-da-da-doo
 ---
 Track: Red Like Roses Part II
 Artists:
@@ -2194,6 +2735,76 @@ Duration: '4:01'
 URLs:
 - https://www.youtube.com/watch?v=Sv93yQE8bRo
 ---
+Track: Running in the 90's
+Artists:
+- Max Coveri
+Duration: '4:46'
+URLs:
+- https://www.youtube.com/watch?v=BJ0xBCwkg3E
+Lyrics: |-
+    Modem talking, modern walking in the streets
+    New desire
+    Take me higher, lift me higher with your speed
+    I need fire
+
+    Get the satellite, if you want to see me
+    Talking on the net, I know the way you like it
+    Get your credit card 'cause I need no money
+    All I wanna get is you, baby
+
+    Running in the 90's
+    Is a new way I like to be
+    I'm just running in the 90's
+    Come on, baby run to me
+    We are running in the 90's
+    It's a new way to set me free
+    I'm just running in the 90's
+    Yes, I wanna know, yes, I wanna see
+
+    Cyber talking, cybersex is on the line
+    New desire
+    Take me higher, boost me higher with your mind
+    Set me on fire
+
+    Get the satellite, if you want to see me
+    Talking on the net, I know the way you like it
+    Get your credit card 'cause I need no money
+    All I wanna get is you, baby
+
+    Running in the 90's
+    Is a new way I like to be
+    I'm just running in the 90's
+    Come on, baby run to me
+    We are running in the 90's
+    It's a new way to set me free
+    I'm just running in the 90's
+    Yes, I wanna know, yes, I wanna see
+
+    New desire
+    I need fire
+
+    Running in the 90's
+    Is a new way I like to be
+    I'm just running in the 90's
+    Come on, baby run to me
+    We are running in the 90's
+    It's a new way to set me free
+    I'm just running in the 90's
+    Yes, I wanna know, yes, I wanna see
+
+    Take me higher
+    Lift me higher with your speed
+    I need fire
+    Get the satellite
+    Talking on the net
+    Get your credit card
+    All I wanna get
+
+    Running in the 90's
+    Running in the 90's
+    Running in the 90's
+    Running in the 90's
+---
 Track: Safe Return
 Artists:
 - 'Avatar: The Last Airbender'
@@ -2203,21 +2814,193 @@ Duration: 0:20
 URLs:
 - https://www.youtube.com/watch?v=lOgFt70GB4c
 ---
+Track: Snow halation
+Artists:
+- Love Live!
+- Takahiro Yamada
+Contributors:
+- Aki Hata (lyrics)
+Duration: '4:16'
+URLs:
+- https://www.youtube.com/watch?v=tmWQiLixGOI
+Lyrics: |-
+    Fushigi da ne ima no kimochi (<i>This feeling, it's strange, isn't it?</i>)
+    Sora kara futte kita mitai (<i>It's almost as though it came fluttering down from the sky</i>)
+    Tokubetsu na kisetsu no iro ga tokimeki o miseru yo (<i>The color of this special season fills me with excitement</i>)
+
+    Hajimete deatta toki kara (<i>From the moment we met</i>)
+    Yokan ni sawagu kokoro no Melody (<i>The melody of my heart has been ringing with premonitions</i>)
+    Tomerarenai tomaranai na ze (<i>It can’t be stopped, it won’t be stopped- why?</i>)
+
+    Todokete (<i>Ring out</i>)
+    Setsunasa ni wa namae o tsukeyou ka "Snow halation"? (<i>Shall I name this heart-rending pain "Snow halation"?</i>)
+    Omoi ga kasanaru made matezu ni (<i>I can’t wait for our feelings to resonate</i>)
+    Kuyashii kedo suki tte junjou (<i>It’s frustrating, but it’s a pure-hearted devotion called love</i>)
+    Binetsu no naka tameratte mo dame da ne (<i>Even in this mild fever, I can’t hesitate</i>)
+    Tobikomu yuuki ni sansei mamonaku Start! (<i>I'll accept the courage to dive in; it's about to start!</i>)
+
+    Oto mo naku kehai mo naku (<i>Without a sound, nor a sign</i>)
+    Shizuka ni unmei wa kawaru (<i>Our fate changes silently</i>)
+    Korekara no mirai ni mune no kodou ga hayaku naru (<i>At the thought of the coming future, my heartbeat quickens</i>)
+
+    Tatoeba komatta toki ni wa (<i>When you feel troubled</i>)
+    Sugu kaketsukete dakishimetakute (<i>I’ll come running right away, wanting to hug you tightly</i>)
+    Doko ni ite mo dokodemo Fly high! (<i><Wherever you are, no matter where, I'll Fly high!/i>)
+
+    Isoide (<i>Hurry up</i>)
+    Itsu no ma ni ka ookiku nari sugita "True emotion" (<i>Before I knew it, my true emotions grew too large to contain</i>)
+    Yume dake miteru you ja tsurai yo (<i>It's painful to never do more than dream of it</i>)
+    Koibito wa kimi tte iitai! (<i>I want you to be mine!</i>)
+    Yasashii me ga tomadotteru iya da yo (<i>I don't want to be bewildered by your gentle eyes</i>)
+    Kono mama ikki ni aijou azukete Please!! (<i>Accept all my love for you as it is, Please!</i>)
+
+    Todokete (<i>Ring out</i>)
+    Setsunasa ni wa namae o tsukeyou ka "Snow halation"? (<i>Shall I name this heart-rending pain "Snow halation"?</i>)
+    Omoi ga kasanaru made matezu ni (<i>I can’t wait for our feelings to resonate</i>)
+    Kuyashii kedo suki tte junjou (<i>It’s frustrating, but it’s a pure-hearted devotion called love</i>)
+    Binetsu no naka tameratte mo dame da ne (<i>Even in this mild fever, I can’t hesitate</i>)
+    Tobikomu yuuki ni sansei mamonaku Start! (<i>I'll accept the courage to dive in; it's about to start!</i>)
+---
 Track: Space Jam
 Artists:
 - Space Jam
 - Quad City DJ's
-Duration: '4:10'
+Duration: '5:05'
 URLs:
 - https://www.youtube.com/watch?v=J9FImc2LOr8
----
-Track: Story of Tonight
-Artists:
-- 'Hamilton: An American Musical'
-- Lin-Manuel Miranda
-Duration: '1:32'
-URLs:
-- https://www.youtube.com/watch?v=3vqwrepaMR0
+Lyrics: |-
+    Everybody get up it's time to slam now
+    We got a real jam goin' down
+    Welcome to the Space Jam
+    Here's your chance, do your dance
+    At the Space Jam
+    Alright
+
+    Come on and slam, and welcome to the jam
+    Come on and slam, if you wanna jam
+    (Uhuh)
+    (Uhuh)
+
+    Hey you, watcha gonna do (Uhuh)
+    Hey you, watcha gonna do
+    Hey you, watcha gonna do (Uhuh)
+    Hey you, watcha gonna do
+
+    Party people in the house let's go
+    It's your boy Hay Ski a'ight so
+    Pass that thing and watch me flex
+    Behind my back, you know what's next
+    To the jam, all in your face
+    Wassup (Wassup), just feel the bass
+    Drop it, rock it, down the room
+    Shake it, quake it, space kaboom
+
+    Just work that body, work that body
+    Make sure you don't hurt nobody
+    Get wild and lose your mind
+    Take this thing into overtime
+    Hey DJ, turn it up
+    QCD, gon' burn it up
+    C'mon y'all get on the floor
+    So hey, let's go a'ight
+
+    Everybody get up it's time to slam now
+    We got a real jam goin' down
+    Welcome to the Space Jam
+    Here's your chance, do your dance
+    At the Space Jam
+    Alright
+
+    Wave your hands in the air if you feel fine
+    We're gonna take it into overtime
+    Welcome to the Space Jam
+    Here's your chance, do your dance
+    At the Space Jam
+    Alright
+
+    C'mon it's time to get hyped say whoop! (There it is!)
+    C'mon all the fellas say whoop! (There it is!)
+    C'mon one time for the ladies say whoop! (There it is!)
+    Now all the fellas say whoop! (There it is!)
+
+    C'mon and run, baby run
+    C'mon, c'mon, do it, run baby run
+    Yeah, you want a hoop, so shoot, baby shoot
+    Oh, it's time to hoop, so shoot, baby shoot, baby
+
+    C'mon and slam, and welcome to the jam
+    C'mon and slam, if you wanna jam
+    C'mon and slam, and welcome to the jam
+    C'mon and slam, if you wanna jam
+
+    Slam, bam, thank you ma'am
+    Get on the floor and jam
+    It's the QCD on the microphone
+    Girl you got me in the zone
+    (Move) C'mon, c'mon and start the game
+    (Move) Break it down an' tell me your name
+    (Move) We the team, I'm the coach
+    (Move) Let's dance all night from coast to coast
+
+    Just slide, from left to right
+    Just slide, yourself the night
+    QCD, drop the base
+    3-1-1 all in your face
+    Jam on it, let's have some fun
+    Jam on it, one on one
+    You run the "O" and I run the "D"
+    So c'mon baby just jam for me
+
+    Everybody get up it's time to slam now
+    We got a real jam goin' down
+    Welcome to the Space Jam
+    Here's your chance, do your dance
+    At the Space Jam
+    Alright
+
+    (Wave your hands) Wave your hands in the air if you feel fine
+    We're gonna take it into overtime
+    Welcome to the Space Jam
+    Here's your chance, do your dance
+    At the Space Jam
+    Alright
+
+    (Wave your hands) Hey ladies! (Yeah!)
+    Y'all ready to stop? (No!)
+    Y'all wanna know why? (Why?)
+    'Cause it's a Slam Jam
+    Fellas! (Yeah!)
+    Y'all ready to stop? (No!)
+    Y'all wanna know why? (Why?)
+    It's time to Slam Jam!
+
+    Everybody get up it's time to slam now
+    We got a real jam goin' down
+    Welcome to the Space Jam
+    Here's your chance, do your dance
+    At the Space Jam
+    Alright
+
+    Wave your hands in the air if you feel fine
+    We're gonna take it into overtime
+    Welcome to the Space Jam
+    Here's your chance, do your dance
+    At the Space Jam
+    Alright
+
+    C'mon, everybody say nah-nah-nah-nah-nah
+    C'mon, c'mon, let me hear you say hey-ey-ey oh
+    C'mon, c'mon, everybody, nah-nah-nah-nah-nah
+    Just take the time to say hey-ey-ey oh
+
+    Check it out, check it out
+    Y'all ready for this? (You know it!)
+    Nah, y'all ain't ready
+    Y'all ready for this? (You know it!)
+    C'mon check it out, y'all ready to jam? (You know it!)
+    Nah, I, I don't think so
+    Y'all ready to jam? (You know it!)
+    C'mon
 ---
 Track: Stronger Than You
 Artists:
@@ -2303,16 +3086,124 @@ Lyrics: |-
 Track: Supercalifragilisticexpialidocious
 Artists:
 - Mary Poppins
+- Sherman Brothers
+Contributors:
+- Julie Andrews (vocals)
+- Dick Van Dyke (vocals)
 Duration: '3:00'
 URLs:
 - https://www.youtube.com/watch?v=uZNRzc3hWvE
+Lyrics: |-
+    It's... Supercalifragilisticexpialidocious!
+    Even though the sound of it is something quite atrocious
+    If you say it loud enough, you'll always sound precocious
+    Supercalifragilisticexpialidocious!
+
+    Um diddle diddle diddle um diddle ay
+    Um diddle diddle diddle um diddle ay
+    Um diddle diddle diddle um diddle ay
+    Um diddle diddle diddle um diddle ay
+
+    Because I was afraid to speak
+    When I was just a lad
+    Me father gave me nose a tweak
+    And told me I was bad
+    But then one day I learned a word
+    That saved me achin' nose
+    The biggest word you ever heard
+    And this is how it goes
+
+    Oh! Supercalifragilisticexpialidocious!
+    Even though the sound of it is something quite atrocious
+    If you say it loud enough, you'll always sound precocious
+    Supercalifragilisticexpialidocious!
+
+    Um diddle diddle diddle um diddle ay
+    Um diddle diddle diddle um diddle ay
+    Um diddle diddle diddle um diddle ay
+    Um diddle diddle diddle um diddle ay
+
+    He traveled all around the world
+    And everywhere he went,
+    He'd use his word and all would say
+    There goes a clever gent
+
+    When Dukes and Maharajas pass
+    the time of day with me
+    I say me special word and then
+    They ask me out to tea
+
+    Oh! Supercalifragilisticexpialidocious!
+    Even though the sound of it is something quite atrocious
+    If you say it loud enough, you'll always sound precocious
+    Supercalifragilisticexpialidocious!
+
+    Um diddle diddle diddle um diddle ay
+    Um diddle diddle diddle um diddle ay!
+
+    (You know, you can say it backwards, which is dociousaliexpilistic-fragilcalirupus, but that's going a bit too far, don't you think?)
+    (Indubitably.)
+
+    So when the cat has got your tongue
+    There's no need for dismay (Hear hear!)
+    Just summon up this word and then
+    You've got a lot to say
+    But better use it carefully
+    Ir it could change your life
+
+    (For example...)
+    (Yes?)
+    (One night I said it to me girl, and now me girl's me wife! Ow! And a lovely thing she is, too!)
+
+    She's... Supercalifragilisticexpialidocious!
+    Supercalifragilisticexpialidocious!
+    Supercalifragilisticexpialidocious!
+    Supercalifragilisticexpialidocious! 
 ---
 Track: The Court of Miracles
 Artists:
-- Disney
+- The Hunchback of Notre Dame
+- Alan Menken
+- Stephen Schwartz (lyrics)
+Contributors:
+- Paul Kandel (vocals)
 Duration: '1:30'
 URLs:
 - https://www.youtube.com/watch?v=xq7z_xMGPM8
+Lyrics: |-
+    Maybe you've heard of a terrible place
+    Where the scoundrels of Paris collect in a lair
+    Maybe you've heard of that mythical place
+    Called the Court of Miracles
+    (Hello, you're there!)
+
+    Where the lame can walk
+    And the blind can see
+    But the dead don't talk
+    So you won't be around to reveal what you've found
+
+    We have a method for spies and intruders
+    Rather like hornets protecting their hive
+    Here in the Court of Miracles
+    Where it's a miracle if you get out alive!
+
+    Justice is swift in the Court of Miracles
+    I am the lawyers and judge all in one
+    We like to get the trial over with quickly
+    Because it's the sentence that's really the fun!
+
+    (Any last words?)
+    [muffled speech]
+    (That's what they all say.)
+
+    Now that we've seen all the evidence
+    (Wait! I object!) (Overruled!)
+    (I object!) (Quiet!)
+    (Dang.)
+
+    We find you totally innocent
+    Which is the worst crime of all
+    So you're going to hang!
 ---
 Track: The Nutshack Intro
 Artists:
@@ -2322,6 +3213,40 @@ Artists:
 Duration: '1:06'
 URLs:
 - https://www.youtube.com/watch?v=9bSGlMd1Y7Q
+Lyrics: |-
+    It's the Nutshack! (Yo.) (Yee, yee.)
+    It's the Nutshack! (What he say?) (Hooaugh!) (Hey...)
+    It's the Nutshack! (Oh yeah!) (Ye-yeah!)
+    It's the Nutshack! (Hey, I'm in that shit!) (Yeah, it's the Nutshack...)
+    It's the Nutshack! (Don't forget your boy Angel!)
+    It's the Nutshack! (It's the Nutshack!) (Rainbow Scout...)
+    It's the Nutshack! (It's the Nutshack!) (Yeah!)
+    It's the Nutshack! (It's the Nutshack.)
+    It's the Nutshack! (Hey!)
+    It's the Nutshack! (This beat's knockin'!)
+    It's the Nutshack!
+    It's the Nutshack!
+
+    Hooaugh!
+    Phil's from the soul, Jack's from the P.I
+    Horatio the Horat so big-eyed
+    Tito Dick, "Dickman" baby
+    He reaised Phil and loves the ladies
+
+    Jack is cool and he's lazy, he's still learnin'
+    Otherwise Cherry Pie, he's still a virgin (Ooh.)
+    Chita, meet the freak of the week-ah (Week-ah!)
+    Phil's homegirl, God Jack wanna keep her
+
+    But it's not happenin' neither (No), shake it like a seizure
+    Hold on, let me spark this, take a breather (Yeaaah-hahah!)
+    Breathe the reefer in my lungs
+    I got grapes, what you watching, son-sah?
+
+    It's the Nutshack! (Yah!)
+    It's the Nutshack! (Aaah!)
+    It's the Nutshack!
+    It's the Nutshack!
 ---
 Track: The Raising Fighting Spirit
 Artists:
@@ -2337,14 +3262,130 @@ Artists:
 - Danny Elfman
 Duration: '1:28'
 URLs:
-- https://www.youtube.com/watch?v=HXec1gfg21w
+- https://www.youtube.com/watch?v=cwbT9iCXiVo
+Lyrics: |-
+    The Simpsons...
+---
+Track: The Story of Tonight
+Artists:
+- 'Hamilton: An American Musical'
+- Lin-Manuel Miranda
+Contributors:
+- Anthony Ramos (vocals)
+- Okieriete Onaodowan (vocals)
+- Daveed Diggs (vocals)
+Duration: '1:32'
+URLs:
+- https://www.youtube.com/watch?v=3vqwrepaMR0
+Lyrics: |-
+    I may not live to see our glory!
+    (I may not live to see our glory!)
+    But I will gladly join the fight!
+    (But I will gladly join the fight!)
+    And when our children tell our story
+    (And when our children tell our story)
+    They'll tell the story of tonight
+
+    Let's have another round tonight
+    Let's have another round tonight
+    Let's have another round tonight
+
+    Raise a glass to freedom
+    Something they can never take away
+    No matter what they tell you
+
+    Raise a glass to the four of us
+    Tomorrow there'll be more of us
+    Telling the story of tonight
+    They'll tell the story of tonight
+
+    Raise a glass to freedom
+    Something they can never take away
+    No matter what they tell you
+    Let's have another round tonight
+
+    Raise a glass to the four of us
+    Tomorrow there'll be more of us
+    Telling the story of tonight
+    Let's have another round tonight
+    They'll tell the story of tonight
+
+    Raise a glass to freedom
+    They'll tell the story of tonight
+    Raise a glass to freedom
+    They'll tell the story of tonight
+    They'll tell the story of tonight
 ---
 Track: The Time Is Now
 Artists:
 - John Cena
+- Tha Trademarc
 Duration: '2:56'
 URLs:
 - https://www.youtube.com/watch?v=svjMiqVeiG8
+Sampled Tracks:
+- The song contains samples of "Ante Up" by M.O.P. which in turn samples "Soul Sister, Brown Sugar" by Sam & Dave, and Pete Schofield and The Canadians' rendition of "The Night the Lights Went Out in Georgia" originally by Vicki Lawrence.
+Lyrics: |-
+    Krrr, amadou!
+
+    Your time is up, my time is now
+    You can't see me, my time is now
+    It's the franchise, boy I'm shining now
+    You can't see me, my time is now!
+
+    In case you forgot or fell off, I'm still hot, knock your shell off
+    My money stack fat plus I can't turn the swell off
+    The franchise, doing big business, I live this
+    It's automatic I win this, oh, you hear those horns, you finished
+
+    A soldier, and I stay under you fighting
+    Plus I'm storming on you chumps like I'm thunder and lightning
+    Ain't no way you breaking me, kid, I'm harder than nails
+    Plus I keep it on lock like I'm part of the jail
+
+    I'm slaughtering stale competition, I got the whole block wishing
+    They could run with my division but they gone fishing
+    With no bait, kid, your boy hold weight
+    I got my soul straight, I brush your mouth like Colgate
+
+    In any weather, I'm never better, your boy's so hot
+    You'll never catch me in the next man's sweater
+    If they hate, let 'em hate, I drop ya whole clan
+    Lay yo' ass down for the three-second tan
+
+    Krrr, amadou!
+    Your time is up, my time is now
+    You can't see me, my time is now
+    It's the franchise, boy I'm shining now
+    You can't see me, my time is now!
+
+    Yeah, uh
+    It's gonna be what it's gon' be
+    Five pounds of courage buddy, beige tint pants with a gold T
+    Uh, it's a war dance and victory step
+    A raw stance is a gift when you insist it's my rep
+    John Cena, Trademarc, y'all are so-so and talk about
+    The bread you make but don't know the recipe for dough, though
+    Aimin' guns in all your photos, that's a no-no
+    When this pop, you'll lip lock, your big talk's a blatant no-show
+    See what happens when the ice age melt
+    You see monetary status is not what matters, but it helps
+    I rock a timepiece by Benny, if any
+    The same reason y'all could love me is the same reason y'all condemn me
+    A man's measured by the way that he thinks
+    Not clothing lines, ice links, leather and minks
+    I spent twenty-plus years seeking knowledge of self
+    So, for now, Marc Predka's living live for wealth
+
+    Krrr, amadou!
+    Your time is up, my time is now
+    You can't see me, my time is now
+    It's the franchise, boy I'm shining now
+    You can't see me, my time is now!
+    Your time is up, my time is now
+    You can't see me, my time is now
+    It's the franchise, boy, I'm shining now
+    You can't see me, my time is now!
 ---
 Track: Tower of Mistakes
 Artists:
@@ -2381,9 +3422,66 @@ Contributors:
 - Stefán Karl (vocals)
 - Björn Thors (vocals)
 - Snorri Engilbertsson (vocals)
-Duration: '2:50'
+Duration: '2:44'
 URLs:
 - https://www.youtube.com/watch?v=PfYnvDL0Qcw
+Lyrics: |-
+    (Are you a, a real villain?)
+    (Well, uh, technically uh... nah.)
+    (Have you ever caught a good guy, like a like a real superhero?)
+    (Nah.)
+    (Have you ever tried a disguise?)
+    (Nah, nah...)
+    (Alright! I can see that I will have to teach you how to be villains!)
+
+    Hey!
+    We are Number One
+    Hey!
+    We are Number One
+
+    Now listen closely
+    Here's a little lesson in trickery
+    This is going down in history
+    If you wanna be a villain number one
+    You have to chase a superhero on the run
+
+    Just follow my moves, and sneak around
+    Be careful not to make a sound
+    (Shh!)
+    (No, don't touch that!)
+
+    We are Number One
+    Hey!
+    We are Number One
+    We are Number One
+
+    (Ha ha ha!)
+    Now look at this net, that I just found
+    When I say go, be ready to throw
+    Go!
+    Throw it at him, not me!
+    Ugh, let's try something else
+
+    Now watch and learn, here's the deal
+    He'll slip and slide on this banana peel!
+    (Ha ha ha, *gasp*!)
+    (What are you doing!?)
+
+    Ba-ba-biddly-ba-ba-ba-ba, ba-ba-ba-ba-ba-ba-ba
+    We are Number One
+    Hey!
+    Ba-ba-biddly-ba-ba-ba-ba, ba-ba-ba-ba-ba-ba-ba
+    Villain Number One!
+
+    Ba-ba-biddly-ba-ba-ba-ba, ba-ba-ba-ba-ba-ba-ba
+    We are Number One
+    Hey!
+    Ba-ba-biddly-ba-ba-ba-ba, ba-ba-ba-ba-ba-ba-ba
+
+    We are Number One
+    We are Number One
+    We are Number One
+    Hey hey!
 ---
 Track: We Are The Crystal Gems
 Artists:
@@ -2530,14 +3628,55 @@ Artists:
 Duration: 0:09
 URLs:
 - https://www.youtube.com/watch?v=q6EoRBvdVPQ
+Lyrics: |-
+    Bokbok bokbok bok bokbok bok, bok bok
+    Bokbok bokbok bok bokbok—
+    yee
+    😒
 ---
 Track: You're A Mean One, Mr. Grinch
 Artists:
 - Albert Hague (music)
 - Theodor Geisel (lyrics)
+Contributors:
+- Thurl Ravenscroft
 Duration: '3:00'
 URLs:
 - https://www.youtube.com/watch?v=3Hj3U18FHgQ
+Lyrics: |-
+    You're a mean one, Mr. Grinch
+    You really are a heel
+    You're as cuddly as a cactus, you're as charming as an eel, Mr. Grinch
+    You're a bad banana with a... greasy black peel!
+
+    You're a monster, Mr. Grinch
+    Your heart's an empty hole
+    Your brain is full of spiders, you've got garlic in your soul, Mr. Grinch
+    I wouldn't touch you with a... thirty-nine-and-a-half foot pole!
+
+    You're a vile one, Mr. Grinch
+    You have termites in your smile
+    You have all the tender sweetness of a seasick crocodile, Mr. Grinch
+    (Given a choice between the two of you I'd take..)
+    The seasick crocodile!
+
+    You're a foul one, Mr. Grinch
+    You're a nasty-wasty skunk
+    Your heart is full of unwashed socks, your soul is full of gunk, Mr. Grinch
+    (The three words that best describe you are as follows, and I quote:)
+    Stink, stank, stunk!
+
+    You're a rotter, Mr. Grinch
+    You're the king of sinful sots
+    Your heart's a dead tomato splotched with moldy purple spots, Mr. Grinch
+    (Your soul is an appalling dump heap overflowing with the most disgraceful assortment of deplorable rubbish imaginable, mangled up in...)
+    Tangled up knots!
+
+    You nauseate me, Mr. Grinch
+    With a nauseous super naus
+    You're a crooked dirty jockey and you drive a crooked hoss, Mr. Grinch
+    (You're a three decker sauerkraut and toadstool sandwich...)
+    With arsenic sauce!
 ---
 Group: Traditional music
 ---
@@ -2767,7 +3906,7 @@ Referenced Tracks:
 - Vagrant Counting Song of Retrospection
 - Meet the Flintstones
 - 'The Flintstones: The Rescue of Dino & Hoppy - Title Theme/Ending'
-- Family Guy Main Theme
+- Family Guy Main Title
 - Venturing into the Mechanized World
 - Interior Crocodile Alligator
 - GO MY WAY!!
@@ -2905,13 +4044,6 @@ Lyrics: |-
 
     A-DRI-EN-BRODY
 ---
-Track: Can You Feel the Love Tonight
-Artists:
-- Elton John
-Duration: '4:01'
-URLs:
-- https://www.youtube.com/watch?v=fTtgVSxfr5M
----
 Track: Caramelldansen
 Artists:
 - Caramell
@@ -3446,15 +4578,6 @@ Duration: '3:51'
 URLs:
 - https://www.youtube.com/watch?v=LB5YkmjalDg
 ---
-Track: How Do I Live
-Artists:
-- Diane Warren
-Contributors:
-- Trisha Yearwood (performance in Con Air)
-Duration: '3:55'
-URLs:
-- https://www.youtube.com/watch?v=Sjx-T7_CGQA
----
 Track: Hydrogen
 Artists:
 - M.O.O.N.
@@ -3462,16 +4585,6 @@ Duration: '4:50'
 URLs:
 - https://www.youtube.com/watch?v=SNE2oCZH_4k
 ---
-Track: I Don't Want to Miss a Thing
-Directory: i-dont-want-to-miss-a-thing-aerosmith
-Artists:
-- Diane Warren
-Contributors:
-- Aerosmith (performance in Armageddon)
-Duration: '4:54'
-URLs:
-- https://www.youtube.com/watch?v=JkK8g6FMEXE
----
 Track: I Knew You Were Trouble
 Artists:
 - Taylor Swift
@@ -3807,13 +4920,6 @@ Duration: '8:30'
 URLs:
 - https://www.youtube.com/watch?v=DwPWGUhEtP0
 ---
-Track: Running in the 90's
-Artists:
-- Max Coveri
-Duration: '4:46'
-URLs:
-- https://www.youtube.com/watch?v=BJ0xBCwkg3E
----
 Track: Scary Monsters And Nice Sprites
 Artists:
 - Skrillex
@@ -3847,53 +4953,6 @@ Referenced Tracks:
 - Slider
 - Meet the Flintstones
 ---
-Track: Snow halation
-Artists:
-- Love Live!
-- Takahiro Yamada
-Contributors:
-- Aki Hata (lyrics)
-Duration: '4:16'
-URLs:
-- https://www.youtube.com/watch?v=tmWQiLixGOI
-Lyrics: |-
-    Fushigi da ne ima no kimochi (<i>This feeling, it's strange, isn't it?</i>)
-    Sora kara futte kita mitai (<i>It's almost as though it came fluttering down from the sky</i>)
-    Tokubetsu na kisetsu no iro ga tokimeki o miseru yo (<i>The color of this special season fills me with excitement</i>)
-
-    Hajimete deatta toki kara (<i>From the moment we met</i>)
-    Yokan ni sawagu kokoro no Melody (<i>The melody of my heart has been ringing with premonitions</i>)
-    Tomerarenai tomaranai na ze (<i>It can’t be stopped, it won’t be stopped- why?</i>)
-
-    Todokete (<i>Ring out</i>)
-    Setsunasa ni wa namae o tsukeyou ka "Snow halation"? (<i>Shall I name this heart-rending pain "Snow halation"?</i>)
-    Omoi ga kasanaru made matezu ni (<i>I can’t wait for our feelings to resonate</i>)
-    Kuyashii kedo suki tte junjou (<i>It’s frustrating, but it’s a pure-hearted devotion called love</i>)
-    Binetsu no naka tameratte mo dame da ne (<i>Even in this mild fever, I can’t hesitate</i>)
-    Tobikomu yuuki ni sansei mamonaku Start! (<i>I'll accept the courage to dive in; it's about to start!</i>)
-
-    Oto mo naku kehai mo naku (<i>Without a sound, nor a sign</i>)
-    Shizuka ni unmei wa kawaru (<i>Our fate changes silently</i>)
-    Korekara no mirai ni mune no kodou ga hayaku naru (<i>At the thought of the coming future, my heartbeat quickens</i>)
-
-    Tatoeba komatta toki ni wa (<i>When you feel troubled</i>)
-    Sugu kaketsukete dakishimetakute (<i>I’ll come running right away, wanting to hug you tightly</i>)
-    Doko ni ite mo dokodemo Fly high! (<i><Wherever you are, no matter where, I'll Fly high!/i>)
-
-    Isoide (<i>Hurry up</i>)
-    Itsu no ma ni ka ookiku nari sugita "True emotion" (<i>Before I knew it, my true emotions grew too large to contain</i>)
-    Yume dake miteru you ja tsurai yo (<i>It's painful to never do more than dream of it</i>)
-    Koibito wa kimi tte iitai! (<i>I want you to be mine!</i>)
-    Yasashii me ga tomadotteru iya da yo (<i>I don't want to be bewildered by your gentle eyes</i>)
-    Kono mama ikki ni aijou azukete Please!! (<i>Accept all my love for you as it is, Please!</i>)
-
-    Todokete (<i>Ring out</i>)
-    Setsunasa ni wa namae o tsukeyou ka "Snow halation"? (<i>Shall I name this heart-rending pain "Snow halation"?</i>)
-    Omoi ga kasanaru made matezu ni (<i>I can’t wait for our feelings to resonate</i>)
-    Kuyashii kedo suki tte junjou (<i>It’s frustrating, but it’s a pure-hearted devotion called love</i>)
-    Binetsu no naka tameratte mo dame da ne (<i>Even in this mild fever, I can’t hesitate</i>)
-    Tobikomu yuuki ni sansei mamonaku Start! (<i>I'll accept the courage to dive in; it's about to start!</i>)
----
 Track: Stone halation
 Artists:
 - SilvaGunner
diff --git a/artists.yaml b/artists.yaml
index a409b0a..0173d3d 100644
--- a/artists.yaml
+++ b/artists.yaml
@@ -230,6 +230,8 @@ Artist: Andiavang
 URLs:
 - https://andiavang.tumblr.com/
 ---
+Artist: Andrea Libman
+---
 Artist: Andrea McNeil
 ---
 Artist: Andrew "Rainy" Obeng
@@ -291,6 +293,8 @@ Artist: Anthony McCarthy
 ---
 Artist: Anthony Parfilko
 ---
+Artist: Anthony Ramos
+---
 Artist: Aradia Jones
 URLs:
 - https://aradia-jones-blog-blog.tumblr.com/
@@ -354,6 +358,8 @@ Artist: Ash Paulsen
 URLs:
 - https://twitter.com/AshPaulsen
 ---
+Artist: Ashleigh Ball
+---
 Artist: Ashley Jones
 ---
 Artist: Asiul
@@ -452,6 +458,8 @@ Artist: Baron Knoxburry
 URLs:
 - https://battleofthebits.org/barracks/Profile/Baron+Knoxburry/
 ---
+Artist: Barry Harman
+---
 Artist: Bea
 URLs:
 - https://twitter.com/beackupburner
@@ -961,6 +969,8 @@ Artist: Dana Smart
 ---
 Artist: Daniel Angstadt
 ---
+Artist: Daniel Ingram
+---
 Artist: Daniel McDonald
 ---
 Artist: Danna Vital
@@ -990,6 +1000,8 @@ Artist: Darren Korb
 URLs:
 - https://twitter.com/DarrenKorb
 ---
+Artist: Daveed Diggs
+---
 Artist: Davi
 URLs:
 - https://twitter.com/hello_davi
@@ -1078,6 +1090,8 @@ Artist: Diana Ross
 ---
 Artist: Diane Warren
 ---
+Artist: Dick Van Dyke
+---
 Artist: dick2bombs
 ---
 Artist: Difarem
@@ -1092,8 +1106,6 @@ Artist: Dinah Washington
 ---
 Artist: Dinosaur Adventure
 ---
-Artist: Disney
----
 Artist: Dizzy
 Aliases:
 - Emily Tuohy
@@ -1799,6 +1811,8 @@ URLs:
 - https://www.instagram.com/jessicawoulfe/
 - https://jessicawoulfe.artstation.com/
 ---
+Artist: Jim Henson
+---
 Artist: JoJo's Bizarre Adventure
 ---
 Artist: Jodi Benson
@@ -1908,6 +1922,8 @@ Artist: Julian Dominguez
 URLs:
 - https://twitter.com/stetcred
 ---
+Artist: Julie Andrews
+---
 Artist: JulieTunes
 URLs:
 - https://soundcloud.com/ec-dm
@@ -2026,6 +2042,8 @@ Aliases:
 URLs:
 - https://twitter.com/KazeeSnep
 ---
+Artist: Kazumi Evans
+---
 Artist: Keaton Monger
 Aliases:
 - keatonkeaton999
@@ -2047,6 +2065,8 @@ Artist: Kelsie Urias
 ---
 Artist: Kenichi Matsubara
 ---
+Artist: Kenneth Ascher
+---
 Artist: Kenta Nagata
 ---
 Artist: Kera Jones
@@ -2218,6 +2238,8 @@ URLs:
 ---
 Artist: Lauren Collis
 ---
+Artist: Lauren Faust
+---
 Artist: Lauren Ross
 Aliases:
 - Sockpuppy
@@ -2955,11 +2977,6 @@ Artist: Nymelord
 ---
 Artist: O Brother, Where Art Thou?
 ---
-Artist: OMOCAT
-URLs:
-- https://twitter.com/_omocat
-- http://omo-cat.com/home/
----
 Artist: Oasis
 ---
 Artist: Odera Igbokwe
@@ -2968,6 +2985,8 @@ URLs:
 - https://www.instagram.com/oderaigbokwe/
 - https://www.odera.net/
 ---
+Artist: Okieriete Onaodowan
+---
 Artist: Oliver Hendricks
 ---
 Artist: Olivia Olson
@@ -2977,6 +2996,11 @@ URLs:
 - https://caledfwelsh.tumblr.com/
 - https://soundcloud.com/caled-fwelsh
 ---
+Artist: OMOCAT
+URLs:
+- https://twitter.com/_omocat
+- http://omo-cat.com/home/
+---
 Artist: OneDragonArmy
 ---
 Artist: OpsCat
@@ -3043,6 +3067,8 @@ Artist: Paul Henderson
 URLs:
 - https://twitter.com/PaulsRockinTwit
 ---
+Artist: Paul Kandel
+---
 Artist: Paul Tuttle Starr
 URLs:
 - https://paultuttlestarr.bandcamp.com/
@@ -3082,6 +3108,8 @@ URLs:
 ---
 Artist: Phillip Huang
 ---
+Artist: Phillipa Soo
+---
 Artist: Phoenix Wright
 ---
 Artist: Phos
@@ -3277,6 +3305,8 @@ URLs:
 ---
 Artist: Ray McDougall
 ---
+Artist: Ray Parker Jr.
+---
 Artist: Rebecca Black
 ---
 Artist: Rebecca Harding
@@ -3295,6 +3325,8 @@ URLs:
 ---
 Artist: Rebecca Sugar
 ---
+Artist: Rebecca Shoichet
+---
 Artist: Red Hot Chili Peppers
 ---
 Artist: Red Pen
@@ -3629,6 +3661,8 @@ URLs:
 - https://www.deviantart.com/superflatpsychosis
 - https://twitter.com/SuperflatPsyche
 ---
+Artist: Shannon Chan-Kent
+---
 Artist: Shelby Cragg
 URLs:
 - https://shelbycragg.tumblr.com/
@@ -3641,6 +3675,8 @@ Artist: Shellsea
 URLs:
 - https://fuchsiaheiress.tumblr.com/
 ---
+Artist: Sherman Brothers
+---
 Artist: Shiho Fujii
 ---
 Artist: Shinji Ushiroda
@@ -3822,9 +3858,11 @@ Directory: stefan-karl
 ---
 Artist: Stemage
 ---
+Artist: Stephen Burns
+---
 Artist: Stephen "Jeebes" Wiley
 ---
-Artist: Stephen Burns
+Artist: Stephen Schwartz
 ---
 Artist: Steve Blum
 ---
@@ -4008,6 +4046,8 @@ Aliases:
 Context Notes: |-
     Tracks by Tetroxideo, aka Itoan have been retained for the sake of preserving the intended structure and form of albums they appear on; however, it should be noted that this artist engaged in systematic catfishing, blackmailing, and distribution of revenge porn.
 ---
+Artist: Tha Trademarc
+---
 Artist: The D
 ---
 Artist: The Flintstones
@@ -4023,6 +4063,8 @@ Artist: The Haydn Quartet
 URLs:
 - https://en.wikipedia.org/wiki/Haydn_Quartet_(vocal_ensemble)
 ---
+Artist: The Hunchback of Notre Dame
+---
 Artist: THE iDOLM@STER
 ---
 Artist: The Knack
@@ -4101,6 +4143,8 @@ URLs:
 ---
 Artist: Thomas Oliphant
 ---
+Artist: Thurl Ravenscroft
+---
 Artist: Timothy Mulhollan
 ---
 Artist: Timothy Reed
diff --git a/static-pages.yaml b/static-pages.yaml
index b1a6782..3542be2 100644
--- a/static-pages.yaml
+++ b/static-pages.yaml
@@ -187,7 +187,8 @@ Content: |-
     - edited banner for [[album:bashful-hearts-out]] to preserve pixelated look
     - fixed 'edits for wiki' attribution for altered banners missing for some albums
     - added [[track:the-ballad-of-jack-noir-original]], [[track:conflict]], [[track:haunt]] and [[track:mother-malcolm-brown]] to [[album:more-homestuck-fandom]] for referencing
-    - added [[track:i-knew-you-were-trouble]], [[track:im-a-believer]], and [[track:whats-up]] to [[album:references-beyond-homestuck]] for referencing references (thanks, Gibus Wearing Brony!), also [[track:colresss-theme]], [[track:katamari-on-the-rocks]], and [[track:soul-0-system]]
+    - added [[track:i-knew-you-were-trouble]], [[track:im-a-believer]], and [[track:whats-up]] to [[album:references-beyond-homestuck]] for referencing references (thanks, Gibus Wearing Brony!), also [[track:colresss-theme]], [[track:katamari-on-the-rocks]], [[track:my-little-pony-friendship-is-magic-theme]], and [[track:soul-0-system]]
+        - new artists: [[artist:andrea-libman]], [[artist:ashleigh-ball]], [[artist:daniel-ingram]], [[artist:kazumi-evans]], [[artist:keita-takahashi]], [[artist:lauren-faust]], [[artist:rebecca-shoichet]], [[artist:shannon-chan-kent]], [[artist:yuu-miyake]]
     <h3>data changes</h3>
     - added information for separate 'sampling' reference field to many tracks (mainly in [[group:official]], [[group:homestuck-gaiden]], and [[album:lofam5]]), not visible for now until support is implemented
         - some reference information will have appeared to disappear until then as it has been moved to samples
@@ -196,7 +197,7 @@ Content: |-
     - added [[flash:sbahj-movie-1]] to the Miscellaneous section of Flashes & Games and [[track:sbahj-the-movie-1]] to [[album:unreleased-tracks]]
     - [[flash:338|Dave's Phat Beat Machine]] no longer features [[track:john-do-the-windy-thing]] after the demise of Flash
         - 'cp_close.mp3' has been retitled [[track:captain-planet-and-the-planeteers-end-title]] and is now in [[album:references-beyond-homestuck]] with new artists [[artist:murray-mcfadden]], [[artist:timothy-mulhollan]], and [[artist:nicholas-boxer]]
-    - added lyrics for [[track:gameglr]], [[track:g4m38l0rg]], [[track:pencil-holder-demo-version]], [[track:battle-colress]], [[track:calamari-inkantation]], [[track:dk-rap]], [[track:go-my-way]], [[track:historia-crux]], [[track:jump-up-super-star]], [[track:left-hand-remix]], [[track:right-hand-remix]], [[track:lonely-rolling-star]], [[track:say-i-gotta-believe]], [[track:vela-nova]]
+    - added lyrics for [[track:gameglr]], [[track:g4m38l0rg]], [[track:pencil-holder-demo-version]], [[track:battle-colress]], [[track:calamari-inkantation]], [[track:dk-rap]], [[track:go-my-way]], [[track:historia-crux]], [[track:jump-up-super-star]], [[track:left-hand-remix]], [[track:right-hand-remix]], [[track:lonely-rolling-star]], [[track:say-i-gotta-believe]], [[track:vela-nova]], [[track:burn]], [[track:can-you-feel-the-love-tonight]], [[track:captain-planet-and-the-planeteers-end-title]], [[track:family-guy-main-title]], [[track:ghostbusters]], [[track:how-do-i-live]], [[track:jojo-sono-chi-no-sadame]], [[track:mailtime]], [[track:meet-the-flintstones]], [[track:my-little-pony-theme]], [[track:rainbow-connection-muppets]], [[track:running-in-the-90s]], [[track:space-jam]], [[track:supercalifragilisticexpialidocious]], [[track:the-court-of-miracles]], [[track:the-story-of-tonight]], [[track:the-time-is-now]], [[track:we-are-number-one]], [[track:yee]], [[track:youre-a-mean-one-mr-grinch]]
     - fixed incorrect title for [[track:skaian-dreams-remix]]
     - fixed artist/contributor confusion between the original and rereleased versions of [[track:harleboss]] and [[track:explore]] (thanks, Niklink!)
     - fixed [[track:contention-vol4]] not attributing [[group:toby-fox]]
@@ -220,6 +221,8 @@ Content: |-
         - refined artist credits for some previously "Lost in History" tracks, including [[track:deck-the-halls]], [[track:tempus-adest-floridum]] in [[track:good-king-wenceslas]], and [[track:the-star-spangled-banner]]
     - added specific artist credits to most video game tracks under [[album:references-beyond-homestuck]] (in addition to existing franchise artists), plus a few from other outside media! (thanks a bunch, FF!)
         - new artists: [[artist:aki-hata]], [[artist:allister-brimble]], [[artist:anne-bryant]], [[artist:asuka-ito]], [[artist:benjamin-wynn]], [[artist:bjorn-thors]], [[artist:daisuke-amaya]], [[artist:de-la-soul]], [[artist:delia-derbyshire]], [[artist:estelle-swaray]], [[artist:ford-klinder]], [[artist:go-ichinose]], [[artist:hideki-naganuma]], [[artist:hiroaki-tominaga]], [[artist:hirokazu-tanaka]], [[artist:hiroki-hashimoto]], [[artist:hiroki-kikuta]], [[artist:hitomi-sato]], [[artist:hoyt-curtin]], [[artist:jeremy-zuckerman]], [[artist:joseph-barbera]], [[artist:jun-funahashi]], [[artist:junichi-masuda]], [[artist:kate-higgins]], [[artist:keiichi-suzuki]], [[artist:kenichi-matsubara]], [[artist:koji-kondo]], [[artist:lin-manuel-miranda]], [[artist:ludwig-ickert]], [[artist:magnus-palsson]], [[artist:manaka-kataoka]], [[artist:mani-svavarsson]], [[artist:masahiro-andoh]], [[artist:masakazu-sugimori]], [[artist:masayuki-nagao]], [[artist:max-coveri]], [[artist:max-steiner]], [[artist:megumi-inoue]], [[artist:messiah]], [[artist:mitsuo-terada]], [[artist:mitsuto-suzuki]], [[artist:naoto-kubo]], [[artist:naoto-tanaka]], [[artist:nick-balaban]], [[artist:nobuo-uematsu]], [[artist:nump]], [[artist:paul-williams]], [[artist:quad-city-djs]], [[artist:rebecca-sugar]], [[artist:revergo]], [[artist:rob-tunstall]], [[artist:ron-grainer]], [[artist:saki-kabata]], [[artist:sean-burnes]], [[artist:shiho-fujii]], [[artist:shinji-ushiroda]], [[artist:shota-kageyama]], [[artist:snorri-engilbertsson]], [[artist:stefan-karl]], [[artist:stephen-burns]], [[artist:takahiro-yamada]], [[artist:takako-hirasawa]], [[artist:the-refreshments]], [[artist:the-super-mario-players]], [[artist:tommy-tallarico]], [[artist:tomohito-nishiura]], [[artist:toshio-masuda]], [[artist:william-hanna]], [[artist:yasuaki-iwata]], [[artist:yasuharu-takanashi]], [[artist:yasunori-mitsuda]], [[artist:yoko-shimomura]], [[artist:yoshihito-yano]], [[artist:yugo-kanno]], [[artist:yuka-tsujiyoko]], [[artist:yumi-takahashi]], and [[artist:zun]]
+    - added specific artist credits to [[album:references-beyond-homestuck]] tracks from movies, television, or theater:
+        - new artists: [[artist:anthony-ramos]], [[artist:barry-harman]], [[artist:daveed-diggs]], [[artist:dick-van-dyke]], [[artist:jim-henson]], [[artist:julie-andrews]], [[artist:kenneth-ascher]], [[artist:okieriete-onaodowan]], [[artist:paul-kandel]], [[artist:phillipa-soo]], [[artist:ray-parker-jr]], [[artist:sherman-brothers]], [[artist:stephen-schwartz]], [[artist:tha-trademarc]], [[artist:thurl-ravenscroft]]
     - renamed tracks from [[artist:silvagunner]] to their Bandcamp release names, for ease of reference reading and disambiguation (thanks, vriska/leo!)
         - added specific artists for these tracks too!
         - new artists: [[artist:mth]], [[artist:the-voice-inside-your-head]], [[artist:the-yabba-dabba-mus]], [[artist:zvaari]]
@@ -248,7 +251,7 @@ Content: |-
     - fixed [[track:typheus]] not being listed in the reference list for [[track:heir-of-grief]]
     - fixed [[track:audio-commentary-featuring-robert-j-lake-nick-smalley-luke-gfd-benjamins-and-erik-jit-scheele]] not being listed in the reference list for [[track:robert-jailbreak]] (and added lyrics) (thanks, Celeste & Niklink!)   
     - fixed [[Toby Fox Has Written Hundreds of Unique Original Songs]] referencing [[track:ruins]] (by Erik Scheele) instead of [[track:ruins-undertale]] (by Toby Fox)
-    - fixed [[track:story-of-tonight]] being named "Tomorrow There'll Be More Of Us" (thanks, Celeste!)
+    - fixed [[track:the-story-of-tonight]] being named "Tomorrow There'll Be More Of Us" (thanks, Celeste!)
     - fixed [[artist:christina-rossetti]] having a typo in their name (thanks, Geese!)
     - fixed [[track:gay-love-song-for-four-cellos]] not being marked as the original release for [[track:love-song]]
     - fixed [[track:spare-friendship-maam]] having incorrect artwork
@@ -266,11 +269,11 @@ Content: |-
     - fixed incorrect capitalization for [[album:sburb-ost]]
     - fixed duration of [[track:super-mario-bros-the-movie]], which was previously 1:04:14 (thanks, FF!)
     - renamed [[track:michael-bowman-remix]], [[track:battle-elite-four-pokemon-black-and-white-versions]], [[track:battle-wild-pokemon-pokemon-red-and-blue-versions]] [[track:file-select-sm64]], and [[track:the-decisive-battle-final-fantasy-vi]] for clarity
-    - renamed [[artist:professor-layton]] from 'Professor Layton and the Curious Village'
+    - renamed [[artist:professor-layton]] from 'Professor Layton and the Curious Village' and [[artist:the-hunchback-of-notre-dame]] from 'Disney'
     - added Bandcamp links back to [[group:clark-powell]]'s albums: [[album:we-are-all-satellites]], [[album:namesake]], [[album:someday]], and [[album:labyrinths-heart]] (thanks, Celeste!)
     - added Bandcamp link to [[album:perfectly-generic-object]] (thanks, vriska/leo!)
     - replaced dead Youtube links to [[album:the-felt]], [[track:constant-conquest]], [[track:celestial-fantasia]], [[track:corridors-of-time]], [[track:icirrus-city]], [[track:historia-crux]], [[track:left-hand-remix]], [[track:terras-theme]], [[track:the-decisive-battle-final-fantasy-vi]], [[track:fear-of-the-heavens]], all tracks from [[artist:earthbound]], and removed dead Youtube link from [[track:planetarium]] (thanks, foreverFlummoxed, Sgeo, Celeste!)
-        - also replaced dead YouTube links to [[track:a-bell-is-tolling]], [[track:bloody-tears]], [[track:chrono-trigger]], [[track:eternal-recurrence]], [[track:frogs-theme]], [[track:historia-crux]] (again), [[track:laytons-theme]], [[track:neos-city-night]], [[track:schalas-theme]], [[track:steam-gardens]], [[track:stone-tower-temple]], [[track:the-decisive-battle-final-fantasy-vi]] (again!), [[track:the-little-sprite]], [[track:ultimate-koopa]], [[track:waluigi-pinball-wario-stadium]], [[track:wind-scene]]
+        - also replaced dead YouTube links to [[track:a-bell-is-tolling]], [[track:bloody-tears]], [[track:chrono-trigger]], [[track:eternal-recurrence]], [[track:frogs-theme]], [[track:historia-crux]] (again), [[track:laytons-theme]], [[track:neos-city-night]], [[track:schalas-theme]], [[track:steam-gardens]], [[track:stone-tower-temple]], [[track:the-decisive-battle-final-fantasy-vi]] (again!), [[track:the-little-sprite]], [[track:the-simpsons-theme]], [[track:ultimate-koopa]], [[track:waluigi-pinball-wario-stadium]], [[track:wind-scene]]
     - changed YouTube links to [[track:guiles-theme]] and [[track:milky-way-wishes-shooting]] to the correct versions
     - added Youtube embeds for relevant videos to [[album:homestuck-vol-10]] and [[track:fly]] (thanks, Niklink!)
     - added listen links to [[artist:bill-bolin]]'s tracks on the official Homestuck albums (thanks, Niklink!)