12 files changed, 29 insertions, 22 deletions
diff --git a/album/cool-and-new-voulem1.yaml b/album/cool-and-new-voulem1.yaml
index 8f226f3f..b35f3571 100644
--- a/album/cool-and-new-voulem1.yaml
+++ b/album/cool-and-new-voulem1.yaml
@@ -553,8 +553,8 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/can-you-give-me-a-hand
 - https://www.youtube.com/watch?v=8AZ556Deeb8
 Referenced Tracks:
-- RollerCoaster Tycoon Theme
 - track:showtime-piano-refrain
+- RollerCoaster Tycoon Theme
 - track:showtime-original-mix
 Art Tags:
 - Jhon
@@ -1408,7 +1408,7 @@ Referenced Tracks:
 - track:upward-movement-dave-owns
 - track:skies-of-skaia
 - Meet the Flintstones
-- Homestuck
+- Homestuck Anthem
 - Showdown
 - Feel (Alive)
 - track:carne-vale
@@ -1488,9 +1488,8 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/cool-and-new-web-comic
 - https://www.youtube.com/watch?v=hzWSa9d4GDQ
 Referenced Tracks:
-- RollerCoaster Tycoon Theme
 - Homestuck
-- Homestuck Anthem
+- RollerCoaster Tycoon Theme
 - Cascade (Beta)
 - Freefall
 Art Tags:
diff --git a/album/cyber-city-sound-pak.yaml b/album/cyber-city-sound-pak.yaml
index 34d224a7..632b6f4d 100644
--- a/album/cyber-city-sound-pak.yaml
+++ b/album/cyber-city-sound-pak.yaml
@@ -79,8 +79,9 @@ Lyrics: |-
     (The National Weather Service in Denver, Colorado has issued a Snow Squall Warning for South— and North— and North—)
 Commentary: |-
     <i>Cristata:</i>
-    <b>Your computer might be at risk</b>
-    Grandma is making spaghetti tonight
+    <p style="font-family:'Tahoma', 'MS Sans Serif', sans-serif">❌ <b>Your computer might be at risk</b>
+    <p style="font-family:'Tahoma', 'MS Sans Serif', sans-serif">Grandma is making<br>
+    spaghetti tonight
 ---
 Track: SMART RACE (Cristata Vs Hywell Mix)
 Duration: '5:14'
@@ -102,11 +103,11 @@ Referenced Tracks:
 - Attack of the Killer Queen
 Commentary: |-
     <i>Cristata:</i>
-    WINNER!
+    <p style="font-family:'MS Sans Serif', 'Tahoma', sans-serif"><b>WINNER!</b>
 
-    <b>YOU'VE WON!</b>
+    <p style="font-family:'MS Sans Serif', 'Tahoma', sans-serif"><big><b>YOU'VE WON!</b></big>
 
-    CLAIM YOUR FREE GAMECLAM 3 NOW !!!!!
+    <p style="font-family:'MS Sans Serif', 'Tahoma', sans-serif"><b>CLAIM YOUR FREE GAMECLAM 3 NOW !!!!!</b>
 ---
 Track: BIG SHOT (1997 Remix)
 Duration: '7:32'
@@ -182,7 +183,7 @@ Sampled Tracks:
 - track:upward-movement-dave-owns
 Commentary: |-
     <i>Cristata:</i>
-    <big>[redacted]</big>
+    <big><b>[redacted]</b></big>
 ---
 Track: FIELD OF HOPES AND DREAMS (Flare Mix)
 Duration: '10:25'
diff --git a/album/diverging-delicacies.yaml b/album/diverging-delicacies.yaml
index b1fa39de..88bd3098 100644
--- a/album/diverging-delicacies.yaml
+++ b/album/diverging-delicacies.yaml
@@ -205,7 +205,7 @@ Referenced Tracks:
 - track:penumbra-phantasm
 - Retconjuration
 - track:conflict
-- Homestuck
+- Homestuck Anthem
 ---
 Track: Betrayed
 Artists:
diff --git a/album/homestuck-vol-1-4.yaml b/album/homestuck-vol-1-4.yaml
index 28e2484d..28ff75a7 100644
--- a/album/homestuck-vol-1-4.yaml
+++ b/album/homestuck-vol-1-4.yaml
@@ -258,8 +258,6 @@ Duration: '2:02'
 URLs:
 - https://homestuck.bandcamp.com/track/showtime-remix-3
 - https://youtu.be/ENWA9aNEkXk
-Referenced Tracks:
-- track:showtime-piano-refrain
 Sampled Tracks:
 - track:showtime-piano-refrain
 ---
diff --git a/album/homestuck-vol-10.yaml b/album/homestuck-vol-10.yaml
index 69b8c160..dedcb599 100644
--- a/album/homestuck-vol-10.yaml
+++ b/album/homestuck-vol-10.yaml
@@ -216,9 +216,9 @@ Art Tags:
 - Dream Bubbles
 Referenced Tracks:
 - track:showtime-piano-refrain
-- track:showtime-original-mix
 - track:aggrieve-violin-refrain
 - Liquid Negrocity
+- track:showtime-original-mix
 - Checkmate
 - Gaia Queen
 Lyrics: |-
diff --git a/album/homestuck-vol-2.yaml b/album/homestuck-vol-2.yaml
index a00f1340..d937df61 100644
--- a/album/homestuck-vol-2.yaml
+++ b/album/homestuck-vol-2.yaml
@@ -155,8 +155,6 @@ Duration: '2:02'
 URLs:
 - https://homestuck.bandcamp.com/track/showtime-remix-3
 - https://youtu.be/VliU0X6XVpA
-Referenced Tracks:
-- track:showtime-piano-refrain
 Sampled Tracks:
 - track:showtime-piano-refrain
 ---
diff --git a/album/homestuck-vol-6.yaml b/album/homestuck-vol-6.yaml
index 9a071f39..9757fdd9 100644
--- a/album/homestuck-vol-6.yaml
+++ b/album/homestuck-vol-6.yaml
@@ -417,7 +417,7 @@ URLs:
 - https://homestuck.bandcamp.com/track/elevatorstuck-2
 - https://youtu.be/9namZe_rorQ
 Referenced Tracks:
-- Homestuck Anthem
+- Homestuck
 Sheet Music Files:
 - Title: Flute line by Optimatum
   Files:
diff --git a/album/lofam2.yaml b/album/lofam2.yaml
index 2051a5f1..63285bea 100644
--- a/album/lofam2.yaml
+++ b/album/lofam2.yaml
@@ -610,8 +610,8 @@ Cover Art File Extension: jpg
 Art Tags:
 - John
 Referenced Tracks:
-- track:showtime-original-mix
 - track:showtime-piano-refrain
+- track:showtime-original-mix
 - track:sburban-jungle
 - track:i-dont-want-to-miss-a-thing
 Commentary: |-
diff --git a/album/sburb-ost.yaml b/album/sburb-ost.yaml
index 40636ae3..ccf59511 100644
--- a/album/sburb-ost.yaml
+++ b/album/sburb-ost.yaml
@@ -1255,6 +1255,7 @@ Art Tags:
 - Denizens
 Referenced Tracks:
 - track:showtime-original-mix
+- track:showtime-piano-refrain
 Commentary: |-
     <i>Kevin Grant:</i>
     This song started out as a chiptune, but due to computer failures, I lost all of my work. I decided to remake it in non-chiptune form. It's supposed to sound menacing while at the same time spurring you into action. A real fight-or-die situation would have music like this. Overall, I just tried to have fun with this piece, drawing inspiration from songs like [[Chaotic Strength]] and [[Tomahawk Head]]. While I don't think the song is as good as it could be, other obligations (and further computer failures) caused me leave it a bit unpolished.
diff --git a/album/sburban-neighborhood.yaml b/album/sburban-neighborhood.yaml
index 22d6c650..f5e01a87 100644
--- a/album/sburban-neighborhood.yaml
+++ b/album/sburban-neighborhood.yaml
@@ -357,7 +357,7 @@ URLs:
 - https://sahcon.bandcamp.com/track/lofistuck
 Referenced Tracks:
 - Elevatorstuck
-- Homestuck
+- Homestuck Anthem
 Commentary: |-
     <i>sunsprite:</i>
     Cro originally suggested doing Lofi [[Elevatorstuck]], so there's that. Absolutely loved the idea and started doing that right when I first read it in the chat.
diff --git a/album/unreleased-tracks.yaml b/album/unreleased-tracks.yaml
index 76e15873..b86f3e90 100644
--- a/album/unreleased-tracks.yaml
+++ b/album/unreleased-tracks.yaml
@@ -702,7 +702,7 @@ Cover Artists:
 - Homestuck
 Referenced Tracks:
 - track:showtime-piano-refrain
-- Homestuck
+- track:harlequin
 Commentary: |-
     <i>James Roach:</i>
     SO! PesterQuest is out. We've been sitting on this one for a while. This first route has been done for a while. It was supposed to come out back on 6/12 but our new publisher had us sit on it for reasons that are beyond even me. Anyway, big ups to Malcolm and Mark for letting me use their themes.
@@ -1050,10 +1050,10 @@ Cover Artists:
 Referenced Tracks:
 - Rex Duodecim Angelus
 - Moonsetter
-- Homestuck
+- track:sburban-jungle
 - track:penumbra-phantasm
 - Unite Synchronization
-- track:MeGaLoVania
+- track:upward-movement-dave-owns
 - Homestuck Anthem
 - WORST END
 Commentary: |-
diff --git a/static-page/changelog.yaml b/static-page/changelog.yaml
index 00fdb813..3826e075 100644
--- a/static-page/changelog.yaml
+++ b/static-page/changelog.yaml
@@ -79,11 +79,21 @@ Content: |-
     - fixed [[track:black-rose-green-sun]] not referencing [[track:macabre]] (thanks, Makin!)
     - fixed [[track:terezi-owns]] not referencing [[track:crystalanthemums]] (thanks, JG!)
     - fixed [[track:black-holes-dozen]] not referencing [[track:the-thirteenth-troll]] (thanks, Monckat!)
+    - fixed [[track:the-will-to-fight-original-mix]] not referencing [[track:showtime-piano-refrain]]
     - fixed [[track:nuclear-winterfalls]] not referencing [[track:snowfalls]]
     - fixed [[track:fiduspawn-go]] referencing [[track:sunslammer]] instead of [[track:sunsetter]] (thanks, Makin!)
+    - fixed [[track:normal-song-name]] referencing [[track:homestuck]] and [[track:MeGaLovania]] instead of [[track:sburban-jungle]] and [[track:upward-movement-dave-owns]]
     - fixed [[track:are-you-lost]] referencing [[track:fallen-down]] instead of [[track:lost-girl]]
+    - fixed [[track:showtime-remix]] referencing [[track:showtime-piano-refrain]] (still in sampling list)
     - fixed [[track:yellow-and-purple]] and [[track:illusions]] having incorrect listening links
     - fixed [[track:game-hypothesis]] having an incorrect listening link (thanks, FF!)
+    - fixed various errors regarding [[track:homestuck-anthem]] and [[track:homestuck]]
+        - fixed [[track:elevatorstuck]] referencing [[track:homestuck-anthem]] instead of [[track:homestuck]]
+        - fixed [[track:sometimes-i-call-andrew-hussie-andy-and-so-far-he-hasnt-corrected-me]] referencing [[track:homestuck]] instead of [[track:harlequin]]
+        - fixed [[track:irrelevance-event-horizon]] referencing [[track:homestuck]] instead of [[track:homestuck-anthem]]
+        - fixed [[track:lofistuck]] referencing [[track:homestuck]] instead of [[track:homestuck-anthem]]
+        - fixed [[track:25x-showdown-combo]] referencing [[track:homestuck]] instead of [[track:homestuck-anthem]]
+        - fixed [[track:cool-and-new-web-comic]] referencing [[track:homestuck-anthem]]
     - fixed many missing references for [[album:perfectly-generic-album]] tracks
         - fixed [[track:new-and-improved]] not referencing [[track:penumbra-phantasm]]
         - fixed [[track:gasters-theme-pga]] not referencing [[track:megalovania-undertale]]