8 files changed, 21 insertions, 23 deletions
diff --git a/album/ancestral.yaml b/album/ancestral.yaml
index e1d41fe5..2450b71a 100644
--- a/album/ancestral.yaml
+++ b/album/ancestral.yaml
@@ -1407,7 +1407,7 @@ Art Tags:
 - The Signless
 - The Disciple
 Referenced Tracks:
-- track:tomorrow-therell-be-more-of-us-hamilton
+- Story of Tonight
 - Burn
 Commentary: |-
     <i>Navochao:</i>
diff --git a/album/cool-and-new-voulem1.yaml b/album/cool-and-new-voulem1.yaml
index bfa96fe2..4a3db4a7 100644
--- a/album/cool-and-new-voulem1.yaml
+++ b/album/cool-and-new-voulem1.yaml
@@ -268,7 +268,7 @@ Lyrics: |-
 Track: licord nacrasty
 Duration: '2:14'
 Artists:
-- Sir Felix
+- artist:kobacat
 Cover Artists:
 - miraculousAvantgarde
 URLs:
@@ -445,7 +445,7 @@ Referenced Tracks:
 Directory: anthem-canv1
 Commentary: |-
     <i>No Funny Name:</i>
-    <iframe width="560" height="315" src="https://www.youtube-nocookie.com/embed/sLEzMa1gJTg" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
+    (<a href="https://www.youtube.com/watch?v=sLEzMa1gJTg">Video of the track being 'recorded live', as it were.</a>)
 
     <i>Niklink:</i>
     It's depressingly common for collaborative fandom albums to run into trouble getting art delivered for all their tracks in time. I don't really blame them, drawing is hard enough without knowing that it's probably going to be playing second fiddle to the music anyways. But nevertheless I knew I could phone this one in without any artistic skill, so I took it off the un-arted song pile. The secret is: there's actually an online tool that generates Minecraft logo-style text.
@@ -613,7 +613,7 @@ Track: upp word(s) movmeant (Fanon Edit)
 Directory: upp-words-movmeant-fanon-edit
 Duration: '3:47'
 Artists:
-- Sir Felix
+- artist:kobacat
 Contributors:
 - Pipko Fanfare (Drums)
 - Ngame (Drums)
@@ -651,9 +651,6 @@ Sampled Tracks:
 Art Tags:
 - Dabe
 - Dave
-Commentary: |-
-    <i>Sir Felix:</i>
-    you're welcome [[artist:cookiefonster|cookie]]
 Lyrics: |-
     Fushigi da ne ima no kimochi (This feeling, it's strange, isn't it?)
     Sora kara futte kita mitai (It's almost as though it came fluttering down from the sky)
@@ -1330,7 +1327,7 @@ Lyrics: |-
     KETCUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUP
 Commentary: |-
     <i>Monifate:</i>
-    <iframe width="560" height="315" src="https://www.youtube-nocookie.com/embed/vAg2HGPrjWs?start=2212" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
+    (<a href="https://www.youtube.com/watch?v=vAg2HGPrjWs?t=2212">Song's original performance in Sweet Bro and Hella Jeff the Moive</a>)
 ---
 Track: SpaceBro
 Duration: '3:26'
diff --git a/album/homestuck-vol-10.yaml b/album/homestuck-vol-10.yaml
index 7e96f508..7766d8fc 100644
--- a/album/homestuck-vol-10.yaml
+++ b/album/homestuck-vol-10.yaml
@@ -44,9 +44,9 @@ Commentary: |-
     <i>Lexxy:</i> (cover artist)
     Homestuck will always hold a warm, nostalgic place in my heart, so despite drafting up a handful of concepts - from the graphic and representational to the tongue-in-cheek referential - I ultimately ended up going with the one that expressed that affection the most.
     <i>Homestuck:</i>
-    <iframe width="560" height="315" src="https://www.youtube-nocookie.com/embed/BpNO1KqORXo" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
+    (<a href="https://www.youtube.com/watch?v=BpNO1KqORXo">Official promo video by What Pumpkin</a>)
     <i>Paul Henderson:</i>
-    <iframe width="560" height="315" src="https://www.youtube-nocookie.com/embed/jusfjbsO_qY" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
+    (<a href="https://www.youtube.com/watch?v=jusfjbsO_qY">Unofficial promo written by Robert J! Lake</a>)
 ---
 Track: Creata
 Artists:
diff --git a/album/lofam2.yaml b/album/lofam2.yaml
index 48491c8d..be545f72 100644
--- a/album/lofam2.yaml
+++ b/album/lofam2.yaml
@@ -337,6 +337,7 @@ Cover Artists:
 Art Tags:
 - Sawtooth
 - Squarewave
+- Roxy
 - Underlings
 - 'cw: alcohol'
 Referenced Tracks:
diff --git a/album/mobius-trip-and-hadron-kaleido.yaml b/album/mobius-trip-and-hadron-kaleido.yaml
index 4d38c1d7..9f1e1b21 100644
--- a/album/mobius-trip-and-hadron-kaleido.yaml
+++ b/album/mobius-trip-and-hadron-kaleido.yaml
@@ -107,7 +107,7 @@ Lyrics: |-
     And you're on your way of work<br>But you just can't work it out<br>And you can't recall the details<br>Or what it was about<br>So you hustle through your morning<br>And you waste your afternoon<br>And at night you still are wondering<br>If you'll dream again so soon<br>And you lay awake and wonder<br>And you never get your sleep<br>'Cause you're still waiting for the answers<br>But you never hear a peep<br>And you die alone and angry<br>And you're wrapped up in a shroud<br>And the world's far below you<br>And your feet are in the clouds
 Commentary: |-
     <i>Tavia Morra:</i>
-    <iframe width="560" height="315" src="https://www.youtube-nocookie.com/embed/CUDkBTYWtGk" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
+    (<a href="https://www.youtube.com/watch?v=CUDkBTYWtGk">Music video!</a>)
 ---
 Track: Lies With The Sea
 Duration: '4:46'
diff --git a/album/unreleased-tracks.yaml b/album/unreleased-tracks.yaml
index 2ad4288e..99ef829b 100644
--- a/album/unreleased-tracks.yaml
+++ b/album/unreleased-tracks.yaml
@@ -1357,7 +1357,7 @@ URLs:
 - https://www.youtube.com/watch?v=jusfjbsO_qY
 Commentary: |-
     <i>Paul Henderson:</i>
-    <iframe width="560" height="315" src="https://www.youtube-nocookie.com/embed/jusfjbsO_qY" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
+    (<a href="https://www.youtube.com/watch?v=jusfjbsO_qY">Original video!</a>)
 ---
 Track: Homestuck Title Screen
 Artists:
@@ -3425,6 +3425,14 @@ Duration: '2:00'
 URLs:
 - https://www.youtube.com/watch?v=wz_NK5HgR6Q
 ---
+Track: Story of Tonight
+Artists:
+- 'Hamilton: An American Musical'
+- Lin-Manuel Miranda
+Duration: '1:00'
+URLs:
+- https://www.youtube.com/watch?v=Lsbx9MBFAYM
+---
 Track: Stronger Than You
 Artists:
 - Steven Universe
@@ -3698,15 +3706,6 @@ Duration: '3:00'
 URLs:
 - https://www.youtube.com/watch?v=JIZ12EQ2SFg
 ---
-Track: Tomorrow There'll Be More Of Us
-Directory: tomorrow-therell-be-more-of-us-hamilton
-Artists:
-- 'Hamilton: An American Musical'
-- Lin-Manuel Miranda
-Duration: '1:00'
-URLs:
-- https://www.youtube.com/watch?v=Lsbx9MBFAYM
----
 Track: Toreador Song
 Artists:
 - Georges Bizet
diff --git a/artists.yaml b/artists.yaml
index 1a39fbbb..6ff94a77 100644
--- a/artists.yaml
+++ b/artists.yaml
@@ -1722,6 +1722,8 @@ URLs:
 ---
 Artist: koba
 Directory: kobacat
+Aliases:
+- Sir Felix
 URLs:
 - https://twitter.com/kensabrush
 - https://www.youtube.com/c/kobacats/
@@ -4428,8 +4430,6 @@ URLs:
 ---
 Artist: sidewalkbanana
 ---
-Artist: Sir Felix
----
 Artist: sketchcomplex
 URLs:
 - https://sketchcomplex.tumblr.com/
diff --git a/static-pages.yaml b/static-pages.yaml
index ec0cd994..6b7b07a6 100644
--- a/static-pages.yaml
+++ b/static-pages.yaml
@@ -163,6 +163,7 @@ Content: |-
     - fixed [[track:aggrieve-remix]] referencing [[track:aggrieve]] instead of [[track:aggrieve-violin-refrain]]
     - fixed [[track:white-host-green-room]] referencing [[track:the-king-in-red]] instead of [[track:the-king-in-red-beta]] (thanks, Cello!)
     - 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 a number of syntax errors in data files, thanks to improved parsing and data review by Gio (thank you!):
         - fixed artist commentary not showing up for [[track:frogsong]] and [[track:schrodingers-harbinger]]
         - fixed Instagram link not showing up for artist [[artist:dsnake]]