add canwave 3

10 files changed, 1166 insertions, 19 deletions

diff --git a/album/act-8-volume-1.yaml b/album/act-8-volume-1.yaml
index 9e0ce3d4..409bb719 100644
--- a/album/act-8-volume-1.yaml
+++ b/album/act-8-volume-1.yaml
@@ -68,6 +68,7 @@ Art Tags:
 - Dream Bubbles
 ---
 Track: Penumbra Phantasm
+Always Reference By Directory: true
 Directory: penumbra-phantasm-act-8
 Artists:
 - dbnet18
diff --git a/album/aspect-clock.yaml b/album/aspect-clock.yaml
index 2418486a..1040acd2 100644
--- a/album/aspect-clock.yaml
+++ b/album/aspect-clock.yaml
@@ -164,6 +164,7 @@ Referenced Tracks:
 - A Taste for Adventure
 ---
 Track: Penumbra Phantasm
+Always Reference By Directory: true
 Directory: penumbra-phantasm-aspect-clock
 Duration: '04:13'
 URLs:
diff --git a/album/canwave-3.yaml b/album/canwave-3.yaml
new file mode 100644
index 00000000..03d859ec
--- /dev/null
+++ b/album/canwave-3.yaml
@@ -0,0 +1,565 @@
+Album: CANWAVE 3
+Date: March 25, 2018
+Date Added: September 21, 2023
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/album/canwave-3
+- https://www.youtube.com/playlist?list=PLMXVVm-BDvr_qFwf0k0NgRBVYGp9_rlKy
+Cover Artists:
+- yazshu
+Cover Art File Extension: png
+Track Art File Extension: png
+Banner Artists:
+- yazshu
+- Makin (edits for wiki)
+Banner Dimensions: 1100x216
+Banner File Extension: png
+Wallpaper Artists:
+- yazshu
+- Makin (edits for wiki)
+Wallpaper Style: 'opacity: 0.9;'
+Wallpaper File Extension: jpg
+Color: '#c7b2ff'
+Groups:
+- Cool and New Music Team
+- Fandom
+Commentary: |-
+    <i>Cool and New Music Team:</i>
+    (Animation test for a cancelled CANWAVE 3 animation by [[artist:shadok]])
+    <img src="media/misc/canwave-test-4.gif" width="720" height="576">
+---
+Track: Roundabout
+Directory: roundabout-canwave-3
+Always Reference By Directory: true
+Artists:
+- yazshu
+Cover Artists:
+- yazshu
+Duration: '00:55'
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/roundabout
+- https://youtu.be/s6G5p7TOLPk
+Referenced Tracks:
+- Roundabout
+- Made in Heaven
+Sampled Tracks:
+- Roundabout
+- Made in Heaven
+---
+Track: Vapor BLΛNKocity
+Directory: vapor-blankocity
+Artists:
+- cosmicTerrorist
+Cover Artists:
+- cosmicTerrorist
+- SplitSuns
+Duration: '02:32'
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/vapor-bl-nkocity
+- https://youtu.be/4rsk-i-i4uc
+Referenced Tracks:
+- Sburban Jungle
+- Liquid Negrocity
+- Flare
+- licord nacrasty
+- RollerCoaster Tycoon Theme
+- Oppa Toby Style
+- Upward Movement (Dave Owns)
+- Penumbra Phantasm
+Sampled Tracks:
+- Windows SFX
+- Nintendo SFX
+- Michael Bowman Remix
+- Snake Eyes (1998)
+- GameBro (Original 1990 Mix)
+- Donald Trump speeches
+Lyrics: |-
+    (Bowman)
+    (Bowman)
+    (Bowman)
+    (Bowman)
+    (Boner) [At this point Mayor samples from Mayor Maynot begin]
+    (Boner)
+    (Boner)
+    (Boner)
+    (Bowman)
+    (Bowman)
+    (Bowman)
+    (Bowman)
+    (Boner)
+    (Boner)
+    (Boner)
+    (Boner)
+    (Bowman)
+    (Bowman)
+    (Bowman)
+    (Bowman)
+    (Boner)
+    (Boner)
+    (Boner)
+    (Boner)
+
+    [Unintelligible GameBro and Donald Trump samples]
+---
+Track: ~~ GARBAGE ~~ 「 総たわごと 」~~ ultimate fakeout~~
+Directory: garbage-ultimate-fakeout
+Artists:
+- sylvarn
+Cover Artists:
+- ackro
+- Scarodactyl
+Art Tags:
+- Lord English
+Duration: '04:02'
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/garbage-ultimate-fakeout
+- https://youtu.be/ukpWjrVsG4U
+Referenced Tracks:
+- Unintentional Touhou
+- can you give me a HAND
+- Carne Vale
+- Meme Voyage
+- I absolutely loathe this Drummer.
+Sampled Tracks:
+- Unintentional Touhou
+- can you give me a HAND
+- Carne Vale
+- Bowman's Credit Score
+- Meme Voyage
+- I absolutely loathe this Drummer.
+Lyrics: |-
+    Raiden: Envy, greed
+    Monsoon: Magnetic force!
+    Raiden: Despair, memes
+    Monsoon: Nature's force!
+
+    Raiden: Envy, greed
+    Monsoon: Too fast for that
+    Raiden: Despair, memes
+    Monsoon: Now there's a pretty meme
+
+    Raiden: Envy, greed
+    Raiden: How about full of shit?
+    Raiden: Despair, memes
+    Raiden: Is that a meme?
+
+    Raiden: Envy, greed
+    Monsoon: That's game over
+    Raiden: Despair, memes
+
+    [kick, snare from I absolutely loathe this Drummer. set to the beat of Carne Vale]
+---
+Track: S E C R E T - V A P O R - R O M ]
+Directory: secret-vapor-rom
+Artists:
+- Minish
+Cover Artists:
+- Minish
+Duration: '00:55'
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/s-e-c-r-e-t-v-a-p-o-r-r-o-m
+- https://youtu.be/ie8K3Fy24WU
+Referenced Tracks:
+- Secret ROM
+Sampled Tracks:
+- Secret ROM
+---
+Track: (INTRACTIVE™) VIRTUAL AVATAR SELECTION SCREEN
+Artists:
+- william_
+Cover Artists:
+- ackro
+Art Tags:
+- Fresh Jimmy
+- WV
+Duration: '01:56'
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/intractive-virtual-avatar-selection-screen
+- https://youtu.be/P36jLicXmuU
+Referenced Tracks:
+- (intractive?) Character Selection Screen
+Sampled Tracks:
+- (intractive?) Character Selection Screen
+---
+Track: 暗闇の中の光
+Directory: light-in-the-darkness
+Artists:
+- SplitSuns
+Cover Artists:
+- SplitSuns
+Duration: '7:45'
+URLs:
+- https://soundcloud.com/splitsuns/light-in-the-darkness
+- https://youtu.be/749Di8pT9B0
+Referenced Tracks:
+- Voidlight
+Commentary: |-
+    <i>SplitSuns:</i>
+    ...When the hell did I get 100 followers?? I give my thanks to all of you for listening to my shitty music, haha.
+    This is one of my tracks for the CaNMT's almost-vaporware all-vaporwave album, CANWAVE 3. In its current iteration it's a take on 2814's sample-free approach to the vapor aesthetic through ambient and techno albums such as 新しい日の誕生 and Rain Temple. It's one of my most complex songs yet and it took a lot of work to make, but the end result is something very awe-inspiring, even to me.
+    (Originally this song was a straight-up cover of Voidlight that was much more laid-back and repetitive, but I scrapped it in favor of this version. Maybe I'll upload that old version somewhere along the line.)
+---
+Track: ~ * ＳｅＣＲｅＴ ~ ＦｅｅＬｉＮＧｓ * ~
+Directory: secret-feelings
+Artists:
+- Pipko Fanfare
+Cover Artists:
+- ackro
+Art Tags:
+- Joey
+- Xefros
+- Alternia
+Duration: '01:29'
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/--17
+- https://youtu.be/k5w0Vt9bZWk
+Referenced Tracks:
+- track:old-secret
+- Feeling Good
+Sampled Tracks:
+- track:old-secret
+- Feeling Good
+Lyrics: |-
+    Fish in the sea, you know how I feel
+    River runnin' free, you know how I feel
+    Blossom on the tree, you know how I feel
+    It's a new dawn, it's a new day, it's a new life for me
+    And I'm feelin' good
+
+    I'm feelin' good
+---
+Track: カジュアルな金曜日//CASUALFRIDAYS
+Directory: casualfridays
+Artists:
+- olkiswerve
+Cover Artists:
+- olkiswerve
+Duration: '03:23'
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/casualfridays
+- https://youtu.be/2H52hYJLIjA
+Referenced Tracks:
+- Strung Out Deeper Than The Night
+- Killers
+Sampled Tracks:
+- Strung Out Deeper Than The Night
+- Killers
+- Dilbert 2
+- Dilbert 3
+Lyrics: |-
+    (I think you should kill yourself Dilbert)
+
+    (You stupid bitch, you stupid fucking bitch, I can't believe how dumb you are. Jesus christ I can't believe how dumb you are. You're the dumbest motherfuck--)
+
+    (Ranch... or cool ranch... or... ranch?)
+
+    (Oh yeah, forgot to tell you I always loved you)
+---
+Track: ᚨ ᛖ ᚻ ᛁ ~ 時楽 ~ ᛚ ᛟ ᚷ ᚾ
+Directory: time-music
+Artists:
+- Akalabeth
+Cover Artists:
+- Bambosh
+Duration: '01:55'
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/--18
+- https://youtu.be/twtQWGE8r0Q
+---
+Track: Warmth
+Artists:
+- ostrichlittledungeon
+Cover Artists:
+- olkiswerve
+Duration: '02:35'
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/warmth
+- https://youtu.be/QL3ABo9qa2o
+Referenced Tracks:
+- Uwa!! So Temperate♫
+Sampled Tracks:
+- Google's Ideological Echo Chamber
+- Hidden Impacts of Climate Change
+- Uwa!! So Temperate♫
+- Donald Trump speeches
+- Half Life SFX
+- Super Mario 3D World SFX
+- Super Mario 64 SFX
+- Mega Man SFX
+- Kid Pix SFX
+Lyrics: |-
+    (China)
+    (China)
+    (Bowser?)
+    (China)
+
+    (Fifty million dollars a year for the coal industry alone)
+    (We have to start creating jobs, we have to start creating wealth)
+    (That is what this is all about, bringing back our jobs, bringing back our dreams)
+
+    (Nation's completely wiped off the map because of sea level rise)
+    (It really is a matter of raw survival)
+    
+    (So long, gay Bowser!)
+---
+Track: Ton'neru o Sanpo Suru (インストルメンタル)
+Directory: tonneru-o-sanpo-suru
+Artists:
+- artist:kobacat
+Cover Artists:
+- Bambosh
+- Cloudaria
+Duration: '02:06'
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/tonneru-o-sanpo-suru
+- https://youtu.be/EQMmV19F-_w
+Referenced Tracks:
+- Light at the End of the Tunnel
+Sampled Tracks:
+- Light at the End of the Tunnel
+- That's For Cats
+- Adventures Three
+Lyrics: |-
+      (Man Michael, I'm so happy you're in town)
+      [unintelligible]
+      (Hahahahaha, hahahahaha)
+      [Michael Bowman's "That's For Cats" continues playing unintelligibly]
+
+      [Some of Michael Bowman's "Adventures Three" plays unintelligibly]
+---
+Track: ARPEGGIATOR SUNSET
+Artists:
+- Interrobang
+Cover Artists:
+- Bambosh
+Art Tags:
+- Jhon
+- John
+Duration: '01:39'
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/arpeggiator-sunset
+- https://youtu.be/tp0xV2HQsLk
+Commentary: |-
+    <i>Makin:</i> (Wiki person)
+    This references "Sunrise over Zebes" by Interrobang, an as-of-yet unreleased song.
+---
+Track: F E L T (フェルト)
+Directory: felt-canwave-3
+Artists:
+- cosmicTerrorist
+Cover Artists:
+- olkiswerve
+Duration: '02:44'
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/f-e-l-t
+- https://youtu.be/ZKfpei0xuYs
+Referenced Tracks:
+- Jade Dragon
+- Rhapsody in Green
+- English
+Sampled Tracks:
+- Jade Dragon
+- Rhapsody in Green
+- English
+---
+Track: ruind shop
+Artists:
+- Difarem
+Cover Artists:
+- cookiefonster
+Art Tags:
+- Consorts
+Duration: '06:08'
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/ruind-shop
+- https://youtu.be/IJQWuu05-nw
+Referenced Tracks:
+- Ruins (With Strings)
+- Wii Shop Channel
+- It's Raining Somewhere Else
+- Watch Me (Whip / Nae Nae)
+- Moshi Starts a Business
+- Smooth
+- Hotline Bling
+- track:ruins-undertale
+Sampled Tracks:
+- Ruins (With Strings)
+- Wii Shop Channel
+- It's Raining Somewhere Else
+- Watch Me (Whip / Nae Nae)
+- Moshi Starts a Business
+- Smooth
+- Hotline Bling
+- track:ruins-undertale
+---
+Track: F∞ クライミング『CLIMBING』
+Directory: f-climbing
+Artists:
+- SplitSuns
+Cover Artists:
+- SplitSuns
+Art Tags:
+- LoLaR
+Duration: '02:48'
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/f-climbing
+- https://youtu.be/_B9M2DB5PiI
+Referenced Tracks:
+- track:climbing-to-infinity
+- Endless Climb
+---
+Track: Subtropical Urbanization
+Artists:
+- olkiswerve
+Cover Artists:
+- Bambosh
+- Cloudaria
+Art Tags:
+- Gate
+- Earth
+Duration: '04:08'
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/subtropical-urbanization
+- https://youtu.be/7PYAu-hH_1I
+Referenced Tracks:
+- Sburban Jungle
+- Like Herod
+Sampled Tracks:
+- Sburban Jungle
+- Like Herod
+---
+Track: Λ Ғ ߠ Є Ԗ Ը ا िƎ
+Directory: afterlife
+Artists:
+- Kal-la-kal-la
+Cover Artists:
+- TheCosmere64
+Duration: '05:33'
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/--20
+- https://youtu.be/7qtH2fD5G_M
+Referenced Tracks:
+- Back to Life
+- Dreamers and The Dead
+Sampled Tracks:
+- Back to Life
+- Dreamers and The Dead
+Lyrics: |-
+    (O child of noble family, listen without distraction. On the tenth day the blood drinking manifestation of the Ratna family, called Blessed Ratna-Heruka, will appear before you from the southern quarter of your brain)
+
+    (His body is dark yellow in color, with three heads, six arms, and four legs spread wide apart; the right face is white, the left one red, and the center one blazing dark yellow; his six hands hold a jewel in the first on the right, a trident bearing three human heads in the middle, and a club in the last, a bell in the first on the left, a skull-cup in the middle, and a trident in the last)
+
+    (His consort Padma Krodheshvari embraces his body, with her right hand clasped around his neck and her left hand holding a skull full of blood to his mouth)
+
+    (Do not be afraid of him, do not be terrified, do not be bewildered, recognize him as the form of your own mind)
+---
+Track: hey___~
+Directory: hey-canwave-3
+Artists:
+- Interrobang
+Cover Artists:
+- Lucas Adelman
+Duration: '03:27'
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/hey
+- https://youtu.be/V_9m7qX7bkc
+Referenced Tracks:
+- It's Never Over (Hey Orpheus)
+Sampled Tracks:
+- It's Never Over (Hey Orpheus)
+---
+Track: マイケルボーマンリミックスリミックスリミックス
+Directory: how-do-i-live-wub-machine-remix-remix-remix
+Artists:
+- Difarem
+Cover Artists:
+- Bambosh
+- Hadron
+Cover Art File Extension: jpg
+Duration: '02:03'
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/--21
+- https://youtu.be/LMjsEk9aN_4
+Referenced Tracks:
+- track:how-do-i-live-wub-machine-remix
+Sampled Tracks:
+- track:how-do-i-live-wub-machine-remix
+---
+Track: thisissynthwaveright.mp3.wav
+Artists:
+- Wheals
+Cover Artists:
+- TheCosmere64
+Art Tags:
+- Snowman
+Duration: '03:23'
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/thisissynthwaveright-mp3-wav
+- https://youtu.be/NnzIK84z804
+Referenced Tracks:
+- Temporal Piano
+- Temporary Secretary
+---
+Track: Flickwave !! 私はちょうど何が重要か
+Directory: flickwave
+Artists:
+- Ragzilla
+Cover Artists:
+- TheCosmere64
+Art Tags:
+- Jade
+Duration: '02:30'
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/flickwave
+- https://youtu.be/vZKYxBKbxO0
+Sampled Tracks:
+- Flicker
+Lyrics: |-
+    Watashi wa chōdo nani ga jūyō ka (<i>What exactly is important to me?</i>)
+    Watashi wa chōdo nani ga jūyō ka (<i>What exactly is important to me?</i>)
+    Watashi wa chōdo nani ga jūyō ka (<i>What exactly is important to me?</i>)
+    Watashi wa chōdo nani ga jūyō ka (<i>What exactly is important to me?</i>)
+    Watashi wa chōdo nani ga jūyō ka (<i>What exactly is important to me?</i>)
+    Watashi wa chōdo nani ga jūyō ka (<i>What exactly is important to me?</i>)
+    Watashi wa chōdo nani ga jūyō ka mitsukeyou toshite iru watashi wa (<i>"I'm just trying to find what's really important to me"</i>)
+    Watashi wa chōdo nani ga jūyō ka (<i>What exactly is important to me?</i>)
+    Watashi wa chōdo nani ga jūyō ka (<i>What exactly is important to me?</i>)
+    Watashi wa chōdo nani ga jūyō ka mitsukeyou toshite iru watashi wa (<i>"I'm just trying to find what's really important to me"</i>)
+    Watashi wa chōdo nani ga jūyō ka (<i>What exactly is important to me?</i>)
+    Watashi wa chōdo nani ga jūyō ka (<i>What exactly is important to me?</i>)
+    Watashi wa chōdo nani ga jūyō ka mitsukeyou toshite iru watashi wa (<i>"I'm just trying to find what's really important to me"</i>)
+
+    Jibun-tachi no seikatsu no torakku o ushinau hōhō desu (<i>It's a way to lose the track of our own lives</i>)
+
+    Watashi wa chōdo nani ga jūyō ka (<i>What exactly is important to me?</i>)
+    Watashi wa chōdo nani ga jūyō ka (<i>What exactly is important to me?</i>)
+
+    Watashi wa chōdo nani ga jūyō ka (<i>What exactly is important to me?</i>)
+    Watashi wa chōdo nani ga jūyō ka (<i>What exactly is important to me?</i>)
+    Watashi wa chōdo nani ga jūyō ka mitsukeyou toshite iru watashi wa (<i>"I'm just trying to find what's really important to me"</i>)
+
+    Watashi wa chōdo nani ga jūyō ka (<i>What exactly is important to me?</i>)
+    Watashi wa chōdo nani ga jūyō ka (<i>What exactly is important to me?</i>)
+    Watashi wa chōdo nani ga jūyō ka mitsukeyou toshite iru watashi wa (<i>"I'm just trying to find what's really important to me"</i>)
+---
+Track: Made in Heaven
+Directory: made-in-heaven-canwave-3
+Always Reference By Directory: true
+Artists:
+- SplitSuns
+Cover Artists:
+- yazshu
+Duration: '01:58'
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/made-in-heaven
+- https://youtu.be/3lpYbmbve-k
+Referenced Tracks:
+- The Prophets Song
+- The Show Must Go On
+- Made in Heaven
+- Roundabout 
+Sampled Tracks:
+- JoJo's Bizarre Adventure SFX
+- The Prophets Song
+- The Show Must Go On
+- Made in Heaven
+- Roundabout
\ No newline at end of file
diff --git a/album/greatest-hits-2.yaml b/album/greatest-hits-2.yaml
index 235c784d..5aeacbd0 100644
--- a/album/greatest-hits-2.yaml
+++ b/album/greatest-hits-2.yaml
@@ -609,7 +609,7 @@ Art Tags:
 Referenced Tracks:
 - track:fighting-spirit-double-ascended-form
 - Plague
-- RollerCoaster Tycoon Theme
+- RollerCoaster Tycoon 2 Theme
 Sampled Tracks:
 - track:fighting-spirit-double-ascended-form
 URLs:
diff --git a/album/lofam4.yaml b/album/lofam4.yaml
index edddda09..e1c80b66 100644
--- a/album/lofam4.yaml
+++ b/album/lofam4.yaml
@@ -1667,7 +1667,7 @@ Art Tags:
 - LoLaR
 Commentary: |-
     <i>SplitSuns:</i>
-    This track was amde for the [[group:canmt|Cool and New Music Team]]'s [[album:canwave|CANWAVE]], an album entirely of Homestuck vaporwave parodies. This song in particular is a vaporwave edit of Endless Climb, hence the name. I tried to extends the vaporwave feel beyond just slowing the song down, splicing and editing the original song in interesting ways, adding 80's style instruments, and utilizing pitchbend and other distortion effects to provide an uneasy feel. The result is something that transcends meme status and enters "dream status," if you will. Actually that sounds kind of dumb. Forget I said that.
+    This track was made for the [[group:canmt|Cool and New Music Team]]'s [[album:canwave|CANWAVE]], an album entirely of Homestuck vaporwave parodies. This song in particular is a vaporwave edit of Endless Climb, hence the name. I tried to extends the vaporwave feel beyond just slowing the song down, splicing and editing the original song in interesting ways, adding 80's style instruments, and utilizing pitchbend and other distortion effects to provide an uneasy feel. The result is something that transcends meme status and enters "dream status," if you will. Actually that sounds kind of dumb. Forget I said that.
     The track art is a parody of the cover of the vaporwave album "Shader Complete" by Sacred Tapestry.
 ---
 Track: Beatup (Shutdown)
diff --git a/album/lofam5.yaml b/album/lofam5.yaml
index 575526b4..643a6b96 100644
--- a/album/lofam5.yaml
+++ b/album/lofam5.yaml
@@ -416,8 +416,8 @@ Commentary: |-
     I originally had very different art in mind for this track, but every time I heard it, it made me think of someone falling through the center of Derse. The use of the [[Atomyk Ebonpyre]] motif decided that that person would be Dave, and while it didn't really end up being the center of the planet, I feel like I captured the vibe well enough.
 ---
 Track: F∞ クライミング『CLIMBING』
-Artists:
-- SplitSuns
+Originally Released As: track:f-climbing
+Directory: f-climbing-lofam4
 Duration: '2:50'
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/f-climbing
@@ -426,9 +426,6 @@ Cover Artists:
 - SplitSuns
 Art Tags:
 - LoLaR
-Referenced Tracks:
-- track:climbing-to-infinity
-- Endless Climb
 Commentary: |-
     <i>Makin:</i>
     This track originates from CANWAVE 3, a vaporwave album for the [[group:canmt|Cool and New Music Team]]. Yes, we cursed the world with three of them, but it was all worth it if only for this SplitSuns track. For the less leitmotif-aware, this is a take on [[Endless Climb]] by [[artist:buzinkai]]. Rest in peace.
diff --git a/album/more-homestuck-fandom.yaml b/album/more-homestuck-fandom.yaml
index 9e5e271a..8da5f477 100644
--- a/album/more-homestuck-fandom.yaml
+++ b/album/more-homestuck-fandom.yaml
@@ -1503,20 +1503,15 @@ Referenced Tracks:
 ---
 Section: From the Cool and New Music Team
 ---
-Track: 暗闇の中の光
-Directory: light-in-the-darkness
+Track: マ​イ​ケ​ル​ボ​ウ​マ​ン​リ​ミ​ッ​ク​ス remix
+Directory: how-do-i-live-wub-machine-remix
 Artists:
-- SplitSuns
-Duration: '7:45'
-URLs:
-- https://soundcloud.com/splitsuns/light-in-the-darkness
+- Difarem
+Duration: '1:42'
 Referenced Tracks:
-- Voidlight
-Commentary: |-
-    <i>SplitSuns:</i>
-    ...When the hell did I get 100 followers?? I give my thanks to all of you for listening to my shitty music, haha.
-    This is one of my tracks for the CaNMT's almost-vaporware all-vaporwave album, CANWAVE 3. In its current iteration it's a take on 2814's sample-free approach to the vapor aesthetic through ambient and techno albums such as 新しい日の誕生 and Rain Temple. It's one of my most complex songs yet and it took a lot of work to make, but the end result is something very awe-inspiring, even to me.
-    (Originally this song was a straight-up cover of Voidlight that was much more laid-back and repetitive, but I scrapped it in favor of this version. Maybe I'll upload that old version somewhere along the line.)
+- How Do I Live (Bunny Back in the Box Version)
+Sampled Tracks:
+- How Do I Live (Bunny Back in the Box Version)
 ---
 Track: Doctor's Ringtone (No SFX)
 Artists:
diff --git a/album/references-beyond-homestuck.yaml b/album/references-beyond-homestuck.yaml
index 33b62c5e..093bb9ab 100644
--- a/album/references-beyond-homestuck.yaml
+++ b/album/references-beyond-homestuck.yaml
@@ -3459,6 +3459,15 @@ Duration: '2:57'
 URLs:
 - https://www.youtube.com/watch?v=KT45kiI5FYw
 ---
+Track: RollerCoaster Tycoon 2 Theme
+# No official release; duration is from the in-game music file, which is a straight start-to-end loop.
+Artists:
+- RollerCoaster Tycoon
+- Allister Brimble
+Duration: '1:43'
+URLs:
+- https://www.youtube.com/watch?v=oENUA2B1_uM
+---
 Track: Romantic Children
 # No official release of the in-game track
 Artists:
@@ -14071,6 +14080,38 @@ Lyrics: |-
     Sha, sha-ba-da, sha-ba-da-ca, feel good
     Sha, sha-ba-da, sha-ba-da-ca, feel good
 ---
+Track: Feeling Good
+Artists:
+- Nina Simone
+Duration: '3:02'
+URLs:
+- https://www.youtube.com/watch?v=oHRNrgDIJfo
+Lyrics: |-
+    Birds flyin' high, you know how I feel
+    Sun in the sky, you know how I feel
+    Breeze driftin' on by, you know how I feel
+    It's a new dawn, it's a new day, it's a new life for me
+    Yeah, it's a new dawn, it's a new day, it's a new life for me, ooooooooh
+    And I'm feelin' good
+
+    Fish in the sea, you know how I feel
+    River runnin' free, you know how I feel
+    Blossom on the tree, you know how I feel
+    It's a new dawn, it's a new day, it's a new life for me
+    And I'm feelin' good
+
+    Dragonfly out in the sun, you know what I mean, don't you know
+    Butterflies all havin' fun, you know what I mean
+    Sleep in peace when day is done: that's what I mean
+    And this old world is a new world and a bold world for me
+
+    Stars when you shine, you know how I feel
+    Scent of the pine, you know how I feel
+    Oh, freedom is mine, and I know how I feel
+    It's a new dawn, it's a new day, it's a new life for me
+
+    And I'm feelin'... good 
+---
 Track: Fergalicious
 Artists:
 - Fergie
@@ -14325,6 +14366,60 @@ Lyrics: |-
     It's hard to say that I'd rather stay awake when I'm asleep
     Because my dreams are bursting at the seams
 ---
+Track: Flicker
+Artists:
+- Porter Robinson
+Duration: '4:39'
+URLs:
+- https://www.youtube.com/watch?v=sjAY0ab6KfU
+Lyrics: |-
+    Watashi wa chōdo nani ga jūyō ka (<i>What exactly is important to me?</i>)
+    Watashi wa chōdo nani ga jūyō ka (<i>What exactly is important to me?</i>)
+    Watashi wa chōdo nani ga jūyō ka (<i>What exactly is important to me?</i>)
+    Mitsukeyou to shite iru (<i>I'm trying to find out</i>)
+    Watashi wa (<i>I am</i>)
+    Watashi wa chōdo nani ga jūyō ka (<i>What exactly is important to me?</i>)
+    Watashi wa chōdo nani ga- (<i>What exactly is-</i>)
+    Watashi wa chōdo nani ga jūyō ka (<i>What exactly is important to me?</i>)
+
+    Watashi wa chōdo nani ga jūyō ka (<i>What exactly is important to me?</i>)
+    Watashi wa chōdo (<i>What exactly</i>)
+    Watashi wa chō (<i>What ex</i>)
+
+    Jinsei okane wo toruto kanso (<i>When money is taken from life, it feels dry</i>)
+
+    Watashi wa chōdo nani ga jū (<i>What exactly is impor</i>)
+    Watashi wa chōdo (<i>What exactly</i>)
+    Watashi wa chōdo (<i>What exactly</i>)
+    Watashi wa chōdo (<i>What exactly</i>)
+
+    Watashi wa chōdo nani ga jūyō ka (<i>What exactly is important to me?</i>)
+    Watashi wa chōdo nani ga jūyō ka (<i>What exactly is important to me?</i>)
+    Watashi wa chōdo nani ga jūyō ka (<i>What exactly is important to me?</i>)
+    Mitsukeyou to shite iru (<i>I'm trying to find out</i>)
+    Watashi wa (<i>I am</i>)
+    Watashi wa chōdo nani ga jūyō ka (<i>What exactly is important to me?</i>)
+    Watashi wa chōdo nani ga (<i>What exactly is</i>)
+    Watashi wa chōdo nani ga jūyō ka (<i>What exactly is important to me?</i>)
+
+    Jibun-tachi no seikatsu no torakku o ushinau hōhō desu (<i>It's a way to lose the track of our own lives</i>)
+
+    Watashi wa chōdo nani ga jū- (<i>What exactly is impor-</i>)
+    Watashi wa chōdo (<i>What exactly</i>)
+    Watashi wa chōdo (<i>What exactly</i>)
+    Watashi wa chōdo (<i>What exactly</i>)
+
+    Watashi wa chōdo (<i>What exactly</i>)
+    Watashi wa chōdo (<i>What exactly</i>)
+    Watashi wa chōdo (<i>What exactly</i>)
+
+    Watashi wa chōdo (<i>What exactly</i>)
+    Watashi wa chōdo (<i>What exactly</i>)
+    Watashi wa chōdo (<i>What exactly</i>)
+
+    U u u u u
+    Watashi wa chōdo nani ga jūyō ka (<i>What exactly is important to me?</i>)
+---
 Track: Fly Me To The Moon
 # This track tecnically originally came out in 1954 by Kaye Ballard as "In Other Words"
 # But basically everyone referencing it is referencing the Frank Sinatra version
@@ -15779,6 +15874,86 @@ Lyrics: |-
     Here, there, and everywhere
     Hip, hip
 ---
+Track: Hotline Bling
+Artists:
+- Drake
+Duration: '4:30'
+URLs:
+- https://www.youtube.com/watch?v=uxpDa-c-4Mc
+Lyrics: |-
+    You used to call me on my
+    You used to, you used to
+    Yeah
+
+    You used to call me on my cell phone
+    Late-night when you need my love
+    Call me on my cell phone
+    Late-night when you need my love
+    And I know when that hotline bling
+    That can only mean one thing
+    I know when that hotline bling
+    That can only mean one thing
+
+    Ever since I left the city, you
+    Got a reputation for yourself now
+    Everybody knows and I feel left out
+    Girl, you got me down, you got me stressed out
+    'Cause ever since I left the city, you
+    Started wearing less and goin' out more
+    Glasses of champagne out on the dance floor
+    Hangin' with some girls I've never seen before
+
+    You used to call me on my cell phone
+    Late-night when you need my love
+    Call me on my cell phone
+    Late-night when you need my love
+    I know when that hotline bling
+    That can only mean one thing
+    I know when that hotline bling
+    That can only mean one thing
+
+    Ever since I left the city, you, you, you
+    You and me, we just don't get along
+    You make me feel like I did you wrong
+    Going places where you don't belong
+    Ever since I left the city, you
+    You got exactly what you asked for
+    Running out of pages in your passport
+    Hangin' with some girls I've never seen before
+
+    You used to call me on my cell phone
+    Late-night when you need my love
+    Call me on my cell phone
+    Late-night when you need my love
+    And I know when that hotline bling
+    That can only mean one thing
+    I know when that hotline bling
+    That can only mean one thing
+
+    These days, all I do is
+    Wonder if you're bendin' over backwards for someone else
+    Wonder if you're rolling up a Backwoods for someone else
+    Doing things I taught you, gettin' nasty for someone else
+    You don't need no one else
+    You don't need nobody else, no
+    Why you never alone?
+    Why you always touching road?
+    Used to always stay at home
+    Be a good girl, you was in the zone
+    Yeah, you should just be yourself
+    Right now, you're someone else
+
+    You used to call me on my cell phone
+    Late-night when you need my love
+    Call me on my cell phone
+    Late-night when you need my love
+    And I know when that hotline bling
+    That can only mean one thing
+    I know when that hotline bling
+    That can only mean one thing
+
+    Ever since I left the city 
+---
 Track: Hoverboard
 Artists:
 - Dirtyphonics
@@ -16763,6 +16938,123 @@ Lyrics: |-
     Why did we deserve to be revived
     Why was any and everything alive
 ---
+Track: It's Never Over (Hey Orpheus)
+# Ambiguously written as It's Never Over (Oh Orpheus) too, but this name is used in official releases
+Artists:
+- Arcade Fire
+Duration: '6:44'
+URLs:
+- https://www.youtube.com/watch?v=XfDPX7tKyFE
+Lyrics: |-
+    Hey, Orpheus!
+    I'm behind you
+    Don't turn around
+    I can find you
+
+    Just wait until it's over
+    Wait until it's through
+    And if I call for you
+    Oh, Orpheus!
+    Just sing for me all night
+    We'll wait until it's over
+    Wait until it's through
+
+    You say it's not me, it's you
+
+    Hey, Orpheus!
+    De l'autre côté de l'eau
+    Comme un écho
+    Just wait until it's over
+    Wait until it's through
+
+    And if I shout for you
+    Never doubt
+    Don't turn around too soon
+    Just wait until it's over
+    Wait until it's through
+
+    It seems so important now
+    But you will get over
+    Seems so important now
+    But you will get over
+    And when you get over
+    And when you get older
+    Then you will remember
+    Why it was so important then
+
+    Seems like a big deal now
+    But you will get over
+    Seems like a big deal now
+    You will get over
+    When you get over
+    When you get older
+    Then you will discover
+    That it's never over
+
+    Hey, Eurydice!
+    Can you see me?
+    I will sing your name
+    Till you're sick of me
+    Just wait until it's over
+    Just wait until it's through
+
+    And if you call for me
+    This frozen seaIt melts beneath me
+    Just wait until it's over
+    Wait until it's through
+
+    Seems like a big deal now
+    You will get over
+    Seems like a big deal now
+    You will get over
+    And when you get over
+    When you get older
+    You will remember
+
+    He told you he'd wake you up
+    When it was over
+    He told you he'd wake you up
+    When it was over
+    Now that it's over
+    Now that you're older
+    Then you will discover
+
+    It's never over (it's never over)
+    It's never over (it's never over)
+    It's never over (it's never over)
+    It's never over (it's never over)
+    It's never over (it's never over)
+    It's never over (it's never over)
+    It's never over (it's never over)
+
+    Sometime (Sometime)
+    Sometime (Sometime)
+    Boy, they're gonna eat you alive (eat you alive)
+    But it's never gonna happen now
+    We'll figure it out somehow
+
+    Sometime (Sometime)
+    Sometime (Sometime)
+    Boy, they're gonna eat you alive (eat you alive)
+    But it's never gonna happen now
+    We'll figure it out somehow
+
+    'Cause it's never over
+    It's never over (it's never over)
+    It's never over (it's never over)
+    It's never over (it's never over)
+    It's never over (it's never over)
+    And it's never over (it's never over)
+    It's never over (it's never over)
+
+    We stood beside
+    A frozen seaI saw you out
+    In front of me
+    Reflected light
+    A hollow moon
+    Oh Orpheus, Eurydice
+    Its over too soon
+---
 Track: It's Your Move
 Artists:
 - Steve Kipner
@@ -17455,6 +17747,13 @@ URLs:
 Sampled Tracks:
 - check whosampled
 ---
+Track: Like Herod
+Artists:
+- Mogwai
+Duration: '11:41'
+URLs:
+- https://www.youtube.com/watch?v=dn4sCGi0E6Q
+---
 Track: Linger
 Artists:
 - The Cranberries
@@ -17793,6 +18092,74 @@ Commentary: |-
     <i>Niklink:</i>
     The song originates with Coward's 1932 revue "Words and Music"; no recording exists, however. Dinah Washington's 1961 version (her second time recording it) is the most popular and enduring version.
 ---
+Track: Made in Heaven
+Artists:
+- Queen
+Duration: '5:25'
+URLs:
+- https://www.youtube.com/watch?v=171skzi5BKc
+Lyrics: |-
+    I'm taking my ride with destiny
+    Willing to play my part
+    Living with painful memories
+    Loving with all my heart
+
+    Made in heaven, made in heaven
+    It was all meant to be, yeah
+    Made in heaven, made in heaven
+    That's what they say
+    Can't you see?
+    That's what everybody says to me
+    Can't you see?
+
+    Oh I know, I know, I know that it's true
+    Yes, it's really meant to be
+    Deep in my heart
+
+    I'm having to learn to pay the price
+    They're turning me upside down
+    Waiting for possibilities
+    Don't see too many around
+
+    Made in heaven, made in heaven
+    It's for all to see
+    Made in heaven, made in heaven
+    That's what everybody says
+    Everybody says to me
+    It was really meant to be
+    Oh, can't you see?
+    Yeah, everybody, everybody says
+    Yes, it was meant to be, yeah
+
+    When stormy weather comes around
+    It was made in heaven
+    When sunny skies
+    Break through behind the clouds
+    I wish it could last forever, yeah
+    Wish it could last forever, forever
+
+    Made in heaven
+
+    I'm playing my role in history
+    Looking to find my goal
+    Taking in all this misery
+    But giving in all my soul
+
+    Made in heaven, made in heaven
+    It was all meant to be, yeah
+    Made in heaven, made in heaven
+    That's what everybody says
+    Wait and see, it was really meant to be
+    So plain to see
+    Yeah, everybody, everybody
+    Everybody tells me so
+    Yes, it was plain to see
+    Yes, it was meant to be
+
+    Written in the stars
+    Written in the stars
+    Written in the stars 
+---
 Track: Marble Soda
 Artists:
 - Shawn Wasabi
@@ -21085,6 +21452,33 @@ URLs:
 Referenced Tracks:
 - Stronger Than You
 ---
+Track: Strung Out Deeper Than The Night
+# Also known as 夜より深く (Deeper Than the Night)
+Artists:
+- Les Rallizes Dénudés
+Duration: '6:24'
+URLs:
+- https://www.youtube.com/watch?v=tlKb0_qYt-I
+Lyrics: |-
+    Yoru yori mo fukaku yami yori mo kuraku (<i>Deeper than the night, darker than darkness</i>)
+    Omae ga mezameta tokoro chi to kyōki o mono ni shita (<i>When you awakened, embracing death and madness</i>)
+    Moeagaru sora no shita de kuroi tsubasa o hiroge (<i>Beneath the blazing sky, spreading black wings wide</i>)
+    Omae ga nozomina no sa kuroi taiyō no nobotta nochi de (<i>After the black sun you desire has risen</i>)
+    Kōrinohonō no naka de iku tabi deaudarou (<i>You'll encounter, amidst the descending flames</i>)
+    Mayonaka no shiroi dokueki (<i>The white venom at midnight</i>)
+    Karada no naka o shiroi uma ga hashiru (<i>A white horse runs within your body</i>)
+    Ame no naka de iki taeta ue take mono wa (<i>Those who died in the rain</i>)
+    Mado o tobitatte (<i>Fly out the window</i>)
+    Omae wa kagami o uchikudaku (<i>You shatter the mirror</i>)
+    Omae wa yoru o uchikudaku (<i>You shatter the night</i>)
+    Sasayaki no tenshi ga omae o tsutsumi (<i>Whispering angels envelop you</i>)
+    Aoki toiki o omae no chūshin made okurikomu (<i>Sending a blue sigh deep within you</i>)
+    Omae ga nozomina no sa kuroi taiyō no nobotta nochi de (<i>After the black sun you desire has risen</i>)
+    Omae o tsutsumikomi omae no toiki o (<i>It envelops you, sending your sigh</i>)
+    Omae no chūshin made okurikomu (<i>Deep within you</i>)
+    Yoru yori mo fukaku yami yori mo kuraku (<i>Deeper than the night, darker than darkness</i>)
+    Omae ga mezameta tokoro shi to kyōki o mono ni shita (<i>When you awakened, embracing death and madness</i>)
+---
 Track: Spooky Scary Skeletons
 Artists:
 - Andrew Gold
@@ -21796,6 +22190,69 @@ Lyrics: |-
     So darken your clothes or strike a violent pose
     Maybe they'll leave you alone, but not me
 ---
+Track: Temporary Secretary
+Artists:
+- Paul McCartney
+Duration: '3:14'
+URLs:
+- https://www.youtube.com/watch?v=5EeTkF-SLxE
+Lyrics: |-
+    Mister Marks, can you find for me
+    Someone strong and sweet fitting on my knee?
+    She can keep her job if she gets it wrong
+    Ah, but, Mister Marks, I won't need her long
+    All I need is help for a little while
+    We can take dictation and learn to smile
+    And a temporary secretary
+    Is what I need for to do the job
+    I need a
+
+    Temporary secretary, temporary secretary
+    Temporary secretary, temporary secretary
+
+    Mister Marks, could you send her quick?
+    'Cause my regular has been getting sick
+    I need a
+
+    Temporary secretary, temporary secretary
+
+    Mister Marks, I can pay her well
+    If she comes along and can stay a spell
+    I will promise now that I'll treat her right
+    And will rarely keep her 'til late at night
+    I need a
+
+    She can be a belly dancer
+    I don't need a true romancer
+    She can be a diplomat
+    But I don't need a girl like that
+    She can be a neurosurgeon
+    If she's doing nothing urgent
+    What I need's a temporary, temporary secretary
+    I need a, I need a
+
+    Temporary secretary, temporary secretary
+    Temporary secretary, temporary secretary
+    Temporary secretary, temporary secretary
+
+    Now, Mister Marks, when I send her back
+    Will you please make sure she stays on the right track?
+    Well, I know how hard it is for young girls these days
+    In the face of everything, to stay on the right track
+
+    She can be a belly dancer
+    I don't need a true romancer
+    She can be a diplomat
+    But I don't need a girl like that
+    She can be a neurosurgeon
+    If she's doing nothing urgent
+    What I need's a temporary, temporary secretary
+
+    Temporary secretary, (I need a) temporary secretary
+    Temporary secretary, temporary secretary
+    (I need a) Temporary secretary, temporary secretary (Oh)
+    Temporary secretary
+---
 Track: The Cave You Fear
 Artists:
 - Michael Markowski
@@ -22040,6 +22497,120 @@ Lyrics: |-
     I have the fire, I have the force
     I have the power to make my evil take its course
 ---
+Track: The Prophets Song
+Artists:
+- Queen
+Duration: '8:20'
+URLs:
+- https://www.youtube.com/watch?v=HzdjMLKKdgk
+Lyrics: |-
+    Oh, oh, people of the earth
+    "Listen to the warning,"
+    The seer he said
+    Beware the storm that gathers here
+    Listen to the wise man.
+
+    I dreamed I saw on a moonlit stair
+    Spreading his hands on the multitude there
+    A man who cried for a love gone stale
+    And ice cold hearts of charity bare.
+    I watched as fear took the old man's gaze
+    Hopes of the young in troubled graves
+    "I see no day," I heard him say
+    So grey is the face of every mortal.
+
+    Oh, oh, people of the earth
+    "Listen to the warning,"
+    The prophet he said
+    For soon the cold of night will fall
+    Summoned by your own hand.
+
+    Oh, oh, children of the land
+    Quicken to the new life
+    Take my hand
+    Fly and find the new green bough
+    Return like the white dove.
+
+    He told of death as a bone white haze
+    Taking the lost and the unloved babe
+    Late too late all the wretches run
+    These kings of beasts now counting their days.
+
+    From mother's love is the son estranged
+    Married his own his precious gain
+    The earth will shake in two will break
+    And death all around will be your dowry
+
+    Oh, oh, people of the earth
+    "Listen to the warning,"
+    the seer he said
+    For those who hear and mark my words
+    Listen to the good plan
+
+    Oh, oh, oh, oh and two by two my human zoo
+    They'll be running for to come
+    Running for to come out of the rain
+
+    Oh, flee for your life
+    Who heed me not, let all your treasure make you
+    Oh, fear for your life
+    Deceive you not, the fires of hell will take you
+    Should death await you
+
+    Ah, people can you hear me?
+    And now I know, and now I know
+    And now I know, and now I know
+    That you can hear me
+    And now I know, and now I know
+    And now I know, now I know
+    Now I know, now I know
+    Now I know, now I know
+    Now I know
+    The earth will shake in two will break
+    The earth will shake in two will break
+    Death all around around around around
+    Around around around around
+
+    Now I know, now I know
+    Now I know, now I know
+    Now I know, now I know
+    Now I know, now I know
+    Now I know, now I know
+    Now I know
+    Whoa, whoa, whoa, whoa
+    Whoa, whoa, whoa, whoa⟓
+
+    Listen to the wise listen to the wise listen to the wise
+    Listen to the wise listen to the wise man
+    La la
+    La la la la la la
+    La la la la la la
+    La la la la la la
+    La la la la la la
+    La la la la la la
+    La la la la la la
+    La la
+    La la
+    La la
+    Come here (I - You)
+    Come here (I - You)
+    Come here (I - You)
+    Come here (I - You)
+
+    Ah ah ah ah ah
+    Listen to the man listen to the man listen to the man listen to the madman
+
+    God gave you grace to purge this place
+    And peace all around may be your fortune
+
+    Oh, oh, children of the land
+    Love is still the answer take my hand
+    The vision fades a voice I hear
+    "Listen to the madman!"
+
+    Ooh, but still I fear and still I dare not
+    Laugh at the madman!
+---
 Track: The Riddle Wants To Be
 Artists:
 - Madder Mortem
diff --git a/album/slender-the-arrival-soundtrack.yaml b/album/slender-the-arrival-soundtrack.yaml
index 811bb8ed..f4bb3651 100644
--- a/album/slender-the-arrival-soundtrack.yaml
+++ b/album/slender-the-arrival-soundtrack.yaml
@@ -81,6 +81,8 @@ URLs:
 - https://www.youtube.com/watch?v=lLFtlOWPyeA
 ---
 Track: Flicker
+Directory: flicker-slender
+Always Reference By Directory: true
 Duration: '2:24'
 URLs:
 - https://www.youtube.com/watch?v=hKRRZ8PK8_0
diff --git a/artists.yaml b/artists.yaml
index 1e30f94e..98c0cd24 100644
--- a/artists.yaml
+++ b/artists.yaml
@@ -459,6 +459,8 @@ Artist: Archeia
 URLs:
 - https://divisionheaven.me/
 ---
+Artist: Arcade Fire
+---
 Artist: Arctures
 ---
 Artist: Ari Hunt
@@ -1995,6 +1997,8 @@ Aliases:
 ---
 Artist: Dr. Luke
 ---
+Artist: Drake
+---
 Artist: Drake Stillman
 ---
 Artist: Dragon Ball
@@ -3903,6 +3907,9 @@ Artist: Leondra
 ---
 Artist: Leppu
 ---
+Artist: Les Rallizes Dénudés
+Directory: les-rallizes-denudes
+---
 Artist: Leslie Hung
 URLs:
 - https://twitter.com/lesliehung
@@ -4616,6 +4623,8 @@ URLs:
 ---
 Artist: Modest Mussorgsky
 ---
+Artist: Mogwai
+---
 Artist: Molly
 Dead URLs:
 - https://tiddycakes.tumblr.com/
@@ -4917,6 +4926,8 @@ Artist: Niklink
 ---
 Artist: Nikolai Rimsky-Korsakov
 ---
+Artist: Nina Simone
+---
 Artist: Ninja Sex Party
 ---
 Artist: Nirvana
@@ -4999,6 +5010,8 @@ Aliases:
 ---
 Artist: The Party
 ---
+Artist: TheCosmere64
+---
 Artist: Thinking Suit
 ---
 Artist: Nova
@@ -5210,6 +5223,8 @@ URLs:
 ---
 Artist: Paul Kandel
 ---
+Artist: Paul McCartney
+---
 Artist: Paul Tuttle Starr
 URLs:
 - https://paultuttlestarr.bandcamp.com/