« get me outta code hell

hsmusic-data - Data files for https://hsmusic.wiki - track, album, artist & flash info, etc
summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--album/a-viral-medium-vol-1.yaml4
-rw-r--r--album/act-7.yaml2
-rw-r--r--album/alternia.yaml2
-rw-r--r--album/alterniabound.yaml6
-rw-r--r--album/beforus.yaml2
-rw-r--r--album/beyond-canon.yaml2
-rw-r--r--album/capricious-mistress-single.yaml2
-rw-r--r--album/cherubim.yaml2
-rw-r--r--album/coloUrs-and-mayhem-universe-a.yaml2
-rw-r--r--album/coloUrs-and-mayhem-universe-b.yaml2
-rw-r--r--album/cool-and-new-voulem1.yaml2
-rw-r--r--album/exile.yaml2
-rw-r--r--album/friendsim-2-volume-1.yaml2
-rw-r--r--album/genesis-frog.yaml2
-rw-r--r--album/heinoustuck-vol-1.yaml2
-rw-r--r--album/hiveswap-act-1-ost.yaml2
-rw-r--r--album/hiveswap-act-2-ost.yaml2
-rw-r--r--album/hiveswap-friendsim.yaml2
-rw-r--r--album/homestuck-vol-1-4.yaml2
-rw-r--r--album/homestuck-vol-1.yaml2
-rw-r--r--album/homestuck-vol-10.yaml2
-rw-r--r--album/homestuck-vol-2.yaml2
-rw-r--r--album/homestuck-vol-3.yaml2
-rw-r--r--album/homestuck-vol-4.yaml2
-rw-r--r--album/homestuck-vol-5.yaml2
-rw-r--r--album/homestuck-vol-6.yaml2
-rw-r--r--album/homestuck-vol-7.yaml2
-rw-r--r--album/homestuck-vol-8.yaml2
-rw-r--r--album/homestuck-vol-9.yaml2
-rw-r--r--album/lofam.yaml14
-rw-r--r--album/lofam2.yaml12
-rw-r--r--album/lofam3.yaml2
-rw-r--r--album/medium.yaml2
-rw-r--r--album/midnight-crew-drawing-dead.yaml2
-rw-r--r--album/mobius-trip-and-hadron-kaleido.yaml2
-rw-r--r--album/nice-wizards-electronic-extravaganza.yaml2
-rw-r--r--album/of-troles-and-chiptumes.yaml4
-rw-r--r--album/one-year-older.yaml2
-rw-r--r--album/ophiuchus-full-suite.yaml2
-rw-r--r--album/p-s.yaml1
-rw-r--r--album/portalstuck-vol-1.yaml2
-rw-r--r--album/prospit-and-derse.yaml2
-rw-r--r--album/psycholonials-ep-1.yaml1
-rw-r--r--album/psycholonials-ep-2.yaml1
-rw-r--r--album/psycholonials-ep-3.yaml1
-rw-r--r--album/psycholonials-ep-4.yaml1
-rw-r--r--album/psycholonials-ep-5.yaml1
-rw-r--r--album/psycholonials-ep-6.yaml1
-rw-r--r--album/psycholonials-ep-7.yaml1
-rw-r--r--album/psycholonials-ep-8.yaml1
-rw-r--r--album/psycholonials-ep-9.yaml1
-rw-r--r--album/references-beyond-homestuck.yaml583
-rw-r--r--album/rust-apocalypse.yaml2
-rw-r--r--album/s-collide.yaml2
-rw-r--r--album/sburb.yaml2
-rw-r--r--album/song-of-skaia.yaml2
-rw-r--r--album/squiddles.yaml2
-rw-r--r--album/strife.yaml2
-rw-r--r--album/symphony-impossible-to-play.yaml2
-rw-r--r--album/team-paradox.yaml2
-rw-r--r--album/the-felt.yaml2
-rw-r--r--album/the-grubbles.yaml2
-rw-r--r--album/the-wanderers.yaml2
-rw-r--r--album/tumblrstuck-bent-ost-volume-1.yaml2
-rw-r--r--artists.yaml13
-rw-r--r--flashes.yaml6
-rw-r--r--groups.yaml46
-rw-r--r--homepage.yaml39
-rw-r--r--static-page/changelog.yaml16
-rw-r--r--tags.yaml180
70 files changed, 701 insertions, 328 deletions
diff --git a/album/a-viral-medium-vol-1.yaml b/album/a-viral-medium-vol-1.yaml
index 44646b47..6339b676 100644
--- a/album/a-viral-medium-vol-1.yaml
+++ b/album/a-viral-medium-vol-1.yaml
@@ -16,7 +16,7 @@ Banner Artists:
 - Niklink (edits for wiki)
 Banner File Extension: png
 Banner Dimensions: 975x180
-Color: '#884eb1'
+Color: '#9967bc'
 Groups:
 - Fandom
 Additional Files:
@@ -104,4 +104,4 @@ Artists:
 Duration: '2:32'
 URLs:
 - https://aviralmedium.bandcamp.com/track/skate-or-dont-ft-noisemaker
-- https://soundcloud.com/aviralmedium/12-skate-or-dont?in=aviralmedium/sets/volume1
\ No newline at end of file
+- https://soundcloud.com/aviralmedium/12-skate-or-dont?in=aviralmedium/sets/volume1
diff --git a/album/act-7.yaml b/album/act-7.yaml
index 470398c7..a12a92c9 100644
--- a/album/act-7.yaml
+++ b/album/act-7.yaml
@@ -13,7 +13,7 @@ Default Track Cover Artists:
 - Homestuck
 Color: '#c7ff43'
 Groups:
-- Official
+- group:official
 Art Tags:
 - Alternate Calliope
 - Green Sun
diff --git a/album/alternia.yaml b/album/alternia.yaml
index 0ffaba50..17e0a8c3 100644
--- a/album/alternia.yaml
+++ b/album/alternia.yaml
@@ -13,7 +13,7 @@ Cover Artists:
 Color: '#cc44ff'
 Groups:
 - Toby Fox
-- Official
+- group:official
 Art Tags:
 - Karkat
 - Terezi
diff --git a/album/alterniabound.yaml b/album/alterniabound.yaml
index c447c9f2..31c0673d 100644
--- a/album/alterniabound.yaml
+++ b/album/alterniabound.yaml
@@ -8,7 +8,7 @@ Cover Artists:
 - Hanni Brosh
 Color: '#00a4a4'
 Groups:
-- Official
+- group:official
 Art Tags:
 - Karkat
 - Terezi
@@ -163,7 +163,7 @@ Commentary: |-
     Inspired by Lexxy's awesome Art Team Tip Jar wallpaper and the scene in which Terezi conducts a rather silly investigation RP into Tavros' murder. It's a delightful bit of dark humour sandwiched between lots of murder and grimdark.
     It's a combination of her theme (Elements of 'The Lemonsnout Turnabout') blended into a track inspired by various pieces from the Pheonix Wright / Gyakuten Saiban games and a bit of those modern, dancey crime drama series' theme tunes (NCIS springs to mind). Sburban Countdown also makes an appearance because it's awesome and fits really well.
     I've also tried to sync in bits of the story as it happens, so you'll hear a bit of Gamzee honking in the distanec, andthe whole thing builds up to that special climax.
-    <code style="color: #008282">HOP3 YOU L1K3 1T, 1T W4S 4 PL34SUR3 TO M4K3!</code>
+    <code style="color: #008b8b">HOP3 YOU L1K3 1T, 1T W4S 4 PL34SUR3 TO M4K3!</code>
     <i>Toby Fox:</i>
     People kept asking me for a Phoenix Wright remix of Lemonsnout Turnabout, so Malcolm creating this was essentially a miracle, especially considering he hadn't been around since [[Squiddidle!]].
     Thank you Malcolm. That kiss at the end? That's me kissing you.
@@ -305,7 +305,7 @@ Referenced Tracks:
 Commentary: |-
     <i>David Ko:</i>
     (Tavros' Battle Theme)
-    <code style="color: #a15000">uHHH...I DON'T REALLY KNOW HOW TO BEGIN THIS COMMENTARY.</code> So I might as well just introduce myself as MightyMoose. I do a lot of really short tunes for Homestuck that are often more silly than epic-sounding. And this is another one! More specifically, this is a remix of Radiation's "dESPERADO ROCKET CHAIRS" in the style of a Pokem-- er, Fiduspawn battle.
+    <code style="color: #c36100">uHHH...I DON'T REALLY KNOW HOW TO BEGIN THIS COMMENTARY.</code> So I might as well just introduce myself as MightyMoose. I do a lot of really short tunes for Homestuck that are often more silly than epic-sounding. And this is another one! More specifically, this is a remix of Radiation's "dESPERADO ROCKET CHAIRS" in the style of a Pokem-- er, Fiduspawn battle.
     As a handful of you on the forums may know, I've always been a bit of a Pokemon fan. Other songs included in Alternia have focused more on SGRUB or Flarping, but I've wanted to do a Fiduspawn song for a while now. This song kind of acts as an homage to both Tavros and the old Pokemon games. I tried to invoke the style of the battles in the classic Game Bro Boy versions when creating this song.
     Listen closely and you can hear snippets of other Homestuck pieces! I absolutely love doing this. (Most of my other songs feature the opening notes of Vagabounce somewhere. [[artist:david-ko|Ooh, go find them!]] It's like a treasure hunt!)
     <i>Toby Fox:</i>
diff --git a/album/beforus.yaml b/album/beforus.yaml
index eb5a6b91..1fdc1385 100644
--- a/album/beforus.yaml
+++ b/album/beforus.yaml
@@ -1072,7 +1072,7 @@ Art Tags:
 - Meenah
 Commentary: |-
     <i>Sean William Calhoun:</i>
-    <code style="color: #005682">ARANEA: You look into the future and see a life lasting for may8e thousands of sweeps, with nothing to look forward to,"</code>
+    <code style="color: #3796c6">ARANEA: You look into the future and see a life lasting for may8e thousands of sweeps, with nothing to look forward to,"</code>
     A lament of waiting - for the Beforan trolls, it was not a violent end like Game Over, but a longer, hopeless failure to reach conclusion, with a game that they could not win, but that also would not kill them (until Meenah blew them up). The piano runs throughout, frequently chiming the passage of time, sometimes becoming more elaborate as strings take up the melody. Near the end, a solo cello plays af inal dolorous utterance of the melody before evanescing into the void.
     <i>Elanor Pam:</i>
     Choosing what to depict in this image was a struggle. The song itself brings such a sense of grim finality! Ultimately, I ran with the moment that kickstarted the Beforan's even longer wait; the remains of the destroyed battlefield hangi n the sky as the defeated trolls await their impending doom.
diff --git a/album/beyond-canon.yaml b/album/beyond-canon.yaml
index f3c58619..e46c926f 100644
--- a/album/beyond-canon.yaml
+++ b/album/beyond-canon.yaml
@@ -9,7 +9,7 @@ Cover Artists:
 - Xamag
 Color: '#f2a400'
 Groups:
-- Official
+- group:official
 Art Tags:
 - Dirk
 Commentary: |-
diff --git a/album/capricious-mistress-single.yaml b/album/capricious-mistress-single.yaml
index f08cc18f..81ba712d 100644
--- a/album/capricious-mistress-single.yaml
+++ b/album/capricious-mistress-single.yaml
@@ -9,7 +9,7 @@ Has Track Art: false
 Cover Artists:
 - coffee-and-paperbags
 Cover Art File Extension: png
-Color: '#7f01f9'
+Color: '#a34bff'
 Groups:
 - Fandom
 Art Tags:
diff --git a/album/cherubim.yaml b/album/cherubim.yaml
index 3ece3145..3dbeaf2a 100644
--- a/album/cherubim.yaml
+++ b/album/cherubim.yaml
@@ -10,7 +10,7 @@ Cover Artists:
 - Shelby Cragg (coloring & logo)
 Color: '#ff7600'
 Groups:
-- Official
+- group:official
 Art Tags:
 - Calliope
 - Caliborn
diff --git a/album/coloUrs-and-mayhem-universe-a.yaml b/album/coloUrs-and-mayhem-universe-a.yaml
index 49d7e17d..d3076031 100644
--- a/album/coloUrs-and-mayhem-universe-a.yaml
+++ b/album/coloUrs-and-mayhem-universe-a.yaml
@@ -9,7 +9,7 @@ Cover Artists:
 - Shelby Cragg
 Color: '#9292e2'
 Groups:
-- Official
+- group:official
 Art Tags:
 - Aradia
 - Tavros
diff --git a/album/coloUrs-and-mayhem-universe-b.yaml b/album/coloUrs-and-mayhem-universe-b.yaml
index 5b8b6e5f..c7b9481d 100644
--- a/album/coloUrs-and-mayhem-universe-b.yaml
+++ b/album/coloUrs-and-mayhem-universe-b.yaml
@@ -9,7 +9,7 @@ Cover Artists:
 - Shelby Cragg
 Color: '#a5d2e2'
 Groups:
-- Official
+- group:official
 Art Tags:
 - John
 - Rose
diff --git a/album/cool-and-new-voulem1.yaml b/album/cool-and-new-voulem1.yaml
index 184d4a68..cce7750b 100644
--- a/album/cool-and-new-voulem1.yaml
+++ b/album/cool-and-new-voulem1.yaml
@@ -9,7 +9,7 @@ Banner Dimensions: 1100x100
 Banner File Extension: png
 Cover Art File Extension: png
 Track Art File Extension: png
-Color: '#0164ff'
+Color: '#00aaff'
 Groups:
 - Cool and New Music Team
 - Fandom
diff --git a/album/exile.yaml b/album/exile.yaml
index 20a66f31..bdec7e50 100644
--- a/album/exile.yaml
+++ b/album/exile.yaml
@@ -5,7 +5,7 @@ Date: June 14, 2010
 Date Added: May 5, 2022
 Has Cover Art: false
 Has Track Art: false
-Color: '#8C285a'
+Color: '#cc4d8c'
 Groups:
 - Fandom
 URLs:
diff --git a/album/friendsim-2-volume-1.yaml b/album/friendsim-2-volume-1.yaml
index b7d6a25d..35534659 100644
--- a/album/friendsim-2-volume-1.yaml
+++ b/album/friendsim-2-volume-1.yaml
@@ -11,7 +11,7 @@ Cover Artists:
 Cover Art File Extension: png
 Art Tags:
 - Alternia
-Color: '#C21E92'
+Color: '#de2aa9'
 Groups:
 - Fandom
 Commentary: |-
diff --git a/album/genesis-frog.yaml b/album/genesis-frog.yaml
index 78d39cc1..02ab2b46 100644
--- a/album/genesis-frog.yaml
+++ b/album/genesis-frog.yaml
@@ -11,7 +11,7 @@ Cover Artists:
 - Sylladexter
 Color: '#00aa77'
 Groups:
-- Official
+- group:official
 Art Tags:
 - Consorts
 - Frogs
diff --git a/album/heinoustuck-vol-1.yaml b/album/heinoustuck-vol-1.yaml
index a70be4b6..0ad88d39 100644
--- a/album/heinoustuck-vol-1.yaml
+++ b/album/heinoustuck-vol-1.yaml
@@ -11,7 +11,7 @@ Art Tags:
 - 'cw: body horror'
 - 'cw: blood'
 - 'cw: eye horror'
-Color: '#56648a'
+Color: '#6c7ba4'
 Track Art File Extension: png
 Groups:
 - Fandom
diff --git a/album/hiveswap-act-1-ost.yaml b/album/hiveswap-act-1-ost.yaml
index db0936c5..0dda6092 100644
--- a/album/hiveswap-act-1-ost.yaml
+++ b/album/hiveswap-act-1-ost.yaml
@@ -13,7 +13,7 @@ Cover Artists:
 - Mallory Dyer
 Color: '#33cc77'
 Groups:
-- Official
+- group:official
 Art Tags:
 - Joey
 - Alternia
diff --git a/album/hiveswap-act-2-ost.yaml b/album/hiveswap-act-2-ost.yaml
index 2924c74d..eed4dd2f 100644
--- a/album/hiveswap-act-2-ost.yaml
+++ b/album/hiveswap-act-2-ost.yaml
@@ -10,7 +10,7 @@ Cover Artists:
 - Secily Iopara (edits for wiki)
 Color: '#f8f0cb'
 Groups:
-- Official
+- group:official
 Art Tags:
 - Joey
 - Xefros
diff --git a/album/hiveswap-friendsim.yaml b/album/hiveswap-friendsim.yaml
index a227bc83..62dc0151 100644
--- a/album/hiveswap-friendsim.yaml
+++ b/album/hiveswap-friendsim.yaml
@@ -13,7 +13,7 @@ Default Track Cover Artists:
 - Homestuck
 Color: '#d3ff8f'
 Groups:
-- Official
+- group:official
 Art Tags:
 - MSPA Reader
 - Boldir
diff --git a/album/homestuck-vol-1-4.yaml b/album/homestuck-vol-1-4.yaml
index 8183ade8..d7852258 100644
--- a/album/homestuck-vol-1-4.yaml
+++ b/album/homestuck-vol-1-4.yaml
@@ -11,7 +11,7 @@ Default Track Cover Artists:
 - Homestuck
 Color: '#aaccff'
 Groups:
-- Official
+- group:official
 ---
 Color: '#38f43d'
 Group: From <i>Homestuck Vol. 1</i>
diff --git a/album/homestuck-vol-1.yaml b/album/homestuck-vol-1.yaml
index b3eb63f4..078099c9 100644
--- a/album/homestuck-vol-1.yaml
+++ b/album/homestuck-vol-1.yaml
@@ -9,7 +9,7 @@ Default Track Cover Artists:
 - Homestuck
 Color: '#38f43d'
 Groups:
-- Official
+- group:official
 ---
 Group: Main album
 ---
diff --git a/album/homestuck-vol-10.yaml b/album/homestuck-vol-10.yaml
index f7f168ff..5d5e9193 100644
--- a/album/homestuck-vol-10.yaml
+++ b/album/homestuck-vol-10.yaml
@@ -9,7 +9,7 @@ Cover Artists:
 - Lexxy
 Color: '#0088ff'
 Groups:
-- Official
+- group:official
 Art Tags:
 - John
 - Rose
diff --git a/album/homestuck-vol-2.yaml b/album/homestuck-vol-2.yaml
index 2632e4f3..5a113ac4 100644
--- a/album/homestuck-vol-2.yaml
+++ b/album/homestuck-vol-2.yaml
@@ -9,7 +9,7 @@ Default Track Cover Artists:
 - Homestuck
 Color: '#cb87f6'
 Groups:
-- Official
+- group:official
 ---
 Track: Harlequin (Rock Version)
 Artists:
diff --git a/album/homestuck-vol-3.yaml b/album/homestuck-vol-3.yaml
index a1203bca..81c17e1f 100644
--- a/album/homestuck-vol-3.yaml
+++ b/album/homestuck-vol-3.yaml
@@ -9,7 +9,7 @@ Default Track Cover Artists:
 - Homestuck
 Color: '#ef001d'
 Groups:
-- Official
+- group:official
 ---
 Track: Beatdown (Strider Style)
 Artists:
diff --git a/album/homestuck-vol-4.yaml b/album/homestuck-vol-4.yaml
index ad83e837..975d0052 100644
--- a/album/homestuck-vol-4.yaml
+++ b/album/homestuck-vol-4.yaml
@@ -9,7 +9,7 @@ Default Track Cover Artists:
 - Homestuck
 Color: '#51a2fd'
 Groups:
-- Official
+- group:official
 Additional Files:
 - Title: SBURB Wallpaper
   Files:
diff --git a/album/homestuck-vol-5.yaml b/album/homestuck-vol-5.yaml
index 28c45848..be145b48 100644
--- a/album/homestuck-vol-5.yaml
+++ b/album/homestuck-vol-5.yaml
@@ -9,7 +9,7 @@ Cover Artists:
 - Lexxy
 Color: '#00aaff'
 Groups:
-- Official
+- group:official
 Art Tags:
 - John
 - Rose
diff --git a/album/homestuck-vol-6.yaml b/album/homestuck-vol-6.yaml
index 20f60169..3e8fe9ac 100644
--- a/album/homestuck-vol-6.yaml
+++ b/album/homestuck-vol-6.yaml
@@ -12,7 +12,7 @@ Default Track Cover Artists:
 - Homestuck
 Color: '#6699ff'
 Groups:
-- Official
+- group:official
 Art Tags:
 - John
 - Jade
diff --git a/album/homestuck-vol-7.yaml b/album/homestuck-vol-7.yaml
index bd5985fc..903aeaa7 100644
--- a/album/homestuck-vol-7.yaml
+++ b/album/homestuck-vol-7.yaml
@@ -10,7 +10,7 @@ Cover Artists:
 - Homestuck
 Color: '#b536da'
 Groups:
-- Official
+- group:official
 Art Tags:
 - Dave
 - Rose
diff --git a/album/homestuck-vol-8.yaml b/album/homestuck-vol-8.yaml
index 3a67be30..eb994234 100644
--- a/album/homestuck-vol-8.yaml
+++ b/album/homestuck-vol-8.yaml
@@ -9,7 +9,7 @@ Cover Artists:
 - Homestuck
 Color: '#4ac925'
 Groups:
-- Official
+- group:official
 Art Tags:
 - LoWaS
 - LoLaR
diff --git a/album/homestuck-vol-9.yaml b/album/homestuck-vol-9.yaml
index 77b76c52..33e16514 100644
--- a/album/homestuck-vol-9.yaml
+++ b/album/homestuck-vol-9.yaml
@@ -9,7 +9,7 @@ Cover Artists:
 - Lazylaz
 Color: '#f2a400'
 Groups:
-- Official
+- group:official
 Art Tags:
 - Jane
 - Roxy
diff --git a/album/lofam.yaml b/album/lofam.yaml
index d1a7ea43..bfc299ae 100644
--- a/album/lofam.yaml
+++ b/album/lofam.yaml
@@ -290,13 +290,13 @@ Art Tags:
 - Vriska
 Commentary: |-
     <i>Brenna Curran:</i>
-    <code style="color: #008282">1:34 4M, TH3 12TH OF 6TH P3R1G33, ST4NDOFF.</code>
-    <code style="color: #008282">1 C4N T4ST3 TH3 V1C3 1N TH3 41R TON1GHT. 1T H4NGS H34VY L1K3 4 LOWL1F3 D4NC1NG W1TH TH3 G4LLOWS.</code>
-    <code style="color: #008282">1M TR4CK1NG DOWN 4 P3RP W1THOUT 4 PURPOS3. 4 MURD3ROUS GR1FT3R OF TH3 MOST TURNCO4T3D K1ND.</code>
-    <code style="color: #008282">MY ONLY TRU3 COMP4N1ONS 4R3 4 SOFT PLUSH, H4RD JUST1C3 4ND TH3 M34N STR33TS B34T DOWN BY 3V3RY GOON 4ND GUN TO 3V3R K1SS TH3 P4V3M3NT.</code>
-    <code style="color: #008282">T41LS, TH3YR3 GO1NG DOWN.</code>
-    <code style="color: #008282">H34DS...</code>
-    <code style="color: #008282">1 COULD N3V3R S33 TH4T S1D3 OF TH3 CO1N.</code>
+    <code style="color: #008b8b">1:34 4M, TH3 12TH OF 6TH P3R1G33, ST4NDOFF.</code>
+    <code style="color: #008b8b">1 C4N T4ST3 TH3 V1C3 1N TH3 41R TON1GHT. 1T H4NGS H34VY L1K3 4 LOWL1F3 D4NC1NG W1TH TH3 G4LLOWS.</code>
+    <code style="color: #008b8b">1M TR4CK1NG DOWN 4 P3RP W1THOUT 4 PURPOS3. 4 MURD3ROUS GR1FT3R OF TH3 MOST TURNCO4T3D K1ND.</code>
+    <code style="color: #008b8b">MY ONLY TRU3 COMP4N1ONS 4R3 4 SOFT PLUSH, H4RD JUST1C3 4ND TH3 M34N STR33TS B34T DOWN BY 3V3RY GOON 4ND GUN TO 3V3R K1SS TH3 P4V3M3NT.</code>
+    <code style="color: #008b8b">T41LS, TH3YR3 GO1NG DOWN.</code>
+    <code style="color: #008b8b">H34DS...</code>
+    <code style="color: #008b8b">1 COULD N3V3R S33 TH4T S1D3 OF TH3 CO1N.</code>
     <i>melodiousDiscord:</i>
     After a fierce battle with the Marquise Mindfang, Redglare flees the battle feeling content that she has dealt a blow to her arch-nemesis. Mindfang looks down focusing her powers and concentrating on her foe, but to no avail. The Neophyte has already guarded her mind against the invasion. And so with a cackle from one, and a curse from the other the two combatants go their separate ways until their next encounter.
 ---
diff --git a/album/lofam2.yaml b/album/lofam2.yaml
index c0ac6fad..8d464c79 100644
--- a/album/lofam2.yaml
+++ b/album/lofam2.yaml
@@ -305,12 +305,12 @@ Lyrics: |-
     Criminal, Criminal! To the window!<br>Criminal, Criminal! It's your fault, you know.<br>Criminal, Criminal! It's your time to go.<br>I'll secure the rope and you're out with a throw.
 Commentary: |-
     <i>Rachel Rose Mitchell:</i>
-    <code style="color: #008282">L3T TH1S B3 4 L3SSON TO 4LL OF TH3 PROSP3CT1V3 CR1M1N4LS OUT TH3R3</code>
-    <code style="color: #008282">1 4M 4LW4YS W4TCH1NG</code>
-    <code style="color: #008282">F1GUR4T1V3LY</code>
-    <code style="color: #008282">&gt;:]</code>
-    <code style="color: #008282">&gt;:]</code>
-    <code style="color: #008282">&gt;:]</code>
+    <code style="color: #008b8b">L3T TH1S B3 4 L3SSON TO 4LL OF TH3 PROSP3CT1V3 CR1M1N4LS OUT TH3R3</code>
+    <code style="color: #008b8b">1 4M 4LW4YS W4TCH1NG</code>
+    <code style="color: #008b8b">F1GUR4T1V3LY</code>
+    <code style="color: #008b8b">&gt;:]</code>
+    <code style="color: #008b8b">&gt;:]</code>
+    <code style="color: #008b8b">&gt;:]</code>
 ---
 Track: Squiddles In Sunglasses
 Artists:
diff --git a/album/lofam3.yaml b/album/lofam3.yaml
index d05b3d3f..f6fb27df 100644
--- a/album/lofam3.yaml
+++ b/album/lofam3.yaml
@@ -1078,7 +1078,7 @@ Referenced Tracks:
 - Final Stand
 Commentary: |-
     <i>Veritas Unae:</i>
-    <code style="color: #a10000">CAA: f0r a demon wh0 is indestructible<br>CAA: 0mnip0tent<br>CAA: and enraged</code>
+    <code style="color: #eb0000">CAA: f0r a demon wh0 is indestructible<br>CAA: 0mnip0tent<br>CAA: and enraged</code>
     Although MeGaLoVania is an awesome track for [S] Wake, I felt that it didn't really tell the story of how Aradia arose, and eventually faced Jack and vanished through his frame into the realm of the Green Sun. And with my love of psych0ruins and Liquid Negrocity / Black leading me to sessions on the piano playing around with the song, a steady chain of events started forming as I played around with the medley. Imagine the events of Aradia's half of [S] Wake playing, plus those pages that come a little while after where Aradia stops Jack in time (note the 'ticking' of the high notes late in the piece!) Of course, I had to pay homage to the original track used for the flash. What you hear is played live, too! (albeit through a MIDI keyboard) Many thanks to Lunatic again for providing assistance - it's insane the air this guy's got.
     <i>Lauren:</i>
     Since Aradia came back to life she's been entertaining nuts, and I had this image of her sitting with a calm smile on her face while Jack is trapped and PISSED. I thought it would be fun since Aradia takes everything so in stride, and when she first becomes God Tier she freezes Jack mere seconds before he kills her, with a big smile on her face and no worries. I wanted to go with something like this, Jack being trapped in 'time' and Aradia sitting by sweetly.
diff --git a/album/medium.yaml b/album/medium.yaml
index 6ba20eab..cb5f2ae3 100644
--- a/album/medium.yaml
+++ b/album/medium.yaml
@@ -17,7 +17,7 @@ Art Tags:
 Color: '#22ccff'
 Groups:
 - Clark Powell
-- Official
+- group:official
 Wallpaper Artists:
 - Cindy Dominguez
 - Quasar Nebula (edits for wiki)
diff --git a/album/midnight-crew-drawing-dead.yaml b/album/midnight-crew-drawing-dead.yaml
index bd948968..bbdfb3dc 100644
--- a/album/midnight-crew-drawing-dead.yaml
+++ b/album/midnight-crew-drawing-dead.yaml
@@ -21,7 +21,7 @@ Art Tags:
 - HB
 Color: '#dd0000'
 Groups:
-- Official
+- group:official
 Additional Files:
 - Title: Album Cover Wallpaper (shared separately)
   Files:
diff --git a/album/mobius-trip-and-hadron-kaleido.yaml b/album/mobius-trip-and-hadron-kaleido.yaml
index d2828194..2fff1e96 100644
--- a/album/mobius-trip-and-hadron-kaleido.yaml
+++ b/album/mobius-trip-and-hadron-kaleido.yaml
@@ -17,7 +17,7 @@ Default Track Cover Artists:
 Color: '#eecc22'
 Groups:
 - Michael Guy Bowman
-- Official
+- group:official
 Art Tags:
 - Mobius Trip
 Additional Files:
diff --git a/album/nice-wizards-electronic-extravaganza.yaml b/album/nice-wizards-electronic-extravaganza.yaml
index db977030..d4b3c9b8 100644
--- a/album/nice-wizards-electronic-extravaganza.yaml
+++ b/album/nice-wizards-electronic-extravaganza.yaml
@@ -8,7 +8,7 @@ URLs:
 Has Track Art: false
 Cover Artists:
 - Nice Wizard
-Color: '#636acc'
+Color: '#6d74cf'
 Groups:
 - Fandom
 Commentary: |-
diff --git a/album/of-troles-and-chiptumes.yaml b/album/of-troles-and-chiptumes.yaml
index 1e32a715..bc76eb44 100644
--- a/album/of-troles-and-chiptumes.yaml
+++ b/album/of-troles-and-chiptumes.yaml
@@ -16,7 +16,7 @@ Art Tags:
 - Alternia
 Cover Art File Extension: png
 Track Art File Extension: png
-Color: '#842f9e'
+Color: '#cc44ff'
 Groups:
 - Cool and New Music Team
 - Fandom
@@ -326,4 +326,4 @@ Lyrics: |-
     [Choking noises]
     [Exclamations of pain]
     (I've got a toast. To Captain Bender, he's the best... at being a big jerk who's stupid and his big ugly face is as dumb as a butt!)
-    (I've got a toast. To Captain Bender, he's the best... at being a big jerk who's stupid and his big ugly face is as dumb as a butt!) (Eh, I've heard better.)
\ No newline at end of file
+    (I've got a toast. To Captain Bender, he's the best... at being a big jerk who's stupid and his big ugly face is as dumb as a butt!) (Eh, I've heard better.)
diff --git a/album/one-year-older.yaml b/album/one-year-older.yaml
index 13f867d4..9d8d2496 100644
--- a/album/one-year-older.yaml
+++ b/album/one-year-older.yaml
@@ -10,7 +10,7 @@ Cover Artists:
 - Killian Ng
 Color: '#00aaff'
 Groups:
-- Official
+- group:official
 Art Tags:
 - John's dad
 Commentary: |-
diff --git a/album/ophiuchus-full-suite.yaml b/album/ophiuchus-full-suite.yaml
index 58f82c44..5bf0ba38 100644
--- a/album/ophiuchus-full-suite.yaml
+++ b/album/ophiuchus-full-suite.yaml
@@ -9,7 +9,7 @@ Cover Artists:
 - WarxTron
 Cover Art File Extension: png
 Has Track Art: false
-Color: '#844D9E'
+Color: '#9c67b5'
 Groups:
 - Fandom
 ---
diff --git a/album/p-s.yaml b/album/p-s.yaml
index 8b8a5603..a39c7565 100644
--- a/album/p-s.yaml
+++ b/album/p-s.yaml
@@ -113,7 +113,6 @@ Duration: '4:44'
 URLs:
 - https://casualsunday.bandcamp.com/track/apexhalation
 Referenced Tracks:
-- Historia Crux
 - track:ballad-of-awakening
 - Lifdoff
 - Ham And Steak
diff --git a/album/portalstuck-vol-1.yaml b/album/portalstuck-vol-1.yaml
index 57a384c4..7cb3256a 100644
--- a/album/portalstuck-vol-1.yaml
+++ b/album/portalstuck-vol-1.yaml
@@ -10,7 +10,7 @@ Has Track Art: false
 Cover Artists:
 - Babiri Hachi
 Cover Art File Extension: png
-Color: '#4C4CE0'
+Color: '#7070df'
 Groups:
 - Fandom
 Commentary: |-
diff --git a/album/prospit-and-derse.yaml b/album/prospit-and-derse.yaml
index ac18822d..1e8b3562 100644
--- a/album/prospit-and-derse.yaml
+++ b/album/prospit-and-derse.yaml
@@ -11,7 +11,7 @@ Cover Artists:
 - Molly Gur
 Color: '#cc44cc'
 Groups:
-- Official
+- group:official
 Art Tags:
 - John
 - Rose
diff --git a/album/psycholonials-ep-1.yaml b/album/psycholonials-ep-1.yaml
index 4a16c616..2d900cad 100644
--- a/album/psycholonials-ep-1.yaml
+++ b/album/psycholonials-ep-1.yaml
@@ -22,6 +22,7 @@ Wallpaper Artists:
 - Andrew Hussie
 - Niklink (edits for wiki)
 Listed on Homepage: false
+Listed in Galleries: false
 Additional Files:
 - Title: Bandcamp Banner
   Files:
diff --git a/album/psycholonials-ep-2.yaml b/album/psycholonials-ep-2.yaml
index c1764108..c18bfc78 100644
--- a/album/psycholonials-ep-2.yaml
+++ b/album/psycholonials-ep-2.yaml
@@ -22,6 +22,7 @@ Wallpaper Artists:
 - Andrew Hussie
 - Niklink (edits for wiki)
 Listed on Homepage: false
+Listed in Galleries: false
 Additional Files:
 - Title: Bandcamp Banner
   Files:
diff --git a/album/psycholonials-ep-3.yaml b/album/psycholonials-ep-3.yaml
index 7f749d26..8ac507ee 100644
--- a/album/psycholonials-ep-3.yaml
+++ b/album/psycholonials-ep-3.yaml
@@ -22,6 +22,7 @@ Wallpaper Artists:
 - Andrew Hussie
 - Niklink (edits for wiki)
 Listed on Homepage: false
+Listed in Galleries: false
 Additional Files:
 - Title: Bandcamp Banner
   Files:
diff --git a/album/psycholonials-ep-4.yaml b/album/psycholonials-ep-4.yaml
index fa60236a..b409d380 100644
--- a/album/psycholonials-ep-4.yaml
+++ b/album/psycholonials-ep-4.yaml
@@ -22,6 +22,7 @@ Wallpaper Artists:
 - Andrew Hussie
 - Niklink (edits for wiki)
 Listed on Homepage: false
+Listed in Galleries: false
 Additional Files:
 - Title: Bandcamp Banner
   Files:
diff --git a/album/psycholonials-ep-5.yaml b/album/psycholonials-ep-5.yaml
index e43554fe..16cedb34 100644
--- a/album/psycholonials-ep-5.yaml
+++ b/album/psycholonials-ep-5.yaml
@@ -22,6 +22,7 @@ Wallpaper Artists:
 - Andrew Hussie
 - Niklink (edits for wiki)
 Listed on Homepage: false
+Listed in Galleries: false
 Additional Files:
 - Title: Bandcamp Banner
   Files:
diff --git a/album/psycholonials-ep-6.yaml b/album/psycholonials-ep-6.yaml
index cfd44ae4..5645758d 100644
--- a/album/psycholonials-ep-6.yaml
+++ b/album/psycholonials-ep-6.yaml
@@ -22,6 +22,7 @@ Wallpaper Artists:
 - Andrew Hussie
 - Niklink (edits for wiki)
 Listed on Homepage: false
+Listed in Galleries: false
 Additional Files:
 - Title: Bandcamp Banner
   Files:
diff --git a/album/psycholonials-ep-7.yaml b/album/psycholonials-ep-7.yaml
index 4de89a45..772ac174 100644
--- a/album/psycholonials-ep-7.yaml
+++ b/album/psycholonials-ep-7.yaml
@@ -22,6 +22,7 @@ Wallpaper Artists:
 - Andrew Hussie
 - Niklink (edits for wiki)
 Listed on Homepage: false
+Listed in Galleries: false
 Additional Files:
 - Title: Bandcamp Banner
   Files:
diff --git a/album/psycholonials-ep-8.yaml b/album/psycholonials-ep-8.yaml
index 3f2a0c7d..b250c8be 100644
--- a/album/psycholonials-ep-8.yaml
+++ b/album/psycholonials-ep-8.yaml
@@ -22,6 +22,7 @@ Wallpaper Artists:
 - Andrew Hussie
 - Niklink (edits for wiki)
 Listed on Homepage: false
+Listed in Galleries: false
 Additional Files:
 - Title: Bandcamp Banner
   Files:
diff --git a/album/psycholonials-ep-9.yaml b/album/psycholonials-ep-9.yaml
index 1b0acff6..8142df2e 100644
--- a/album/psycholonials-ep-9.yaml
+++ b/album/psycholonials-ep-9.yaml
@@ -22,6 +22,7 @@ Wallpaper Artists:
 - Andrew Hussie
 - Niklink (edits for wiki)
 Listed on Homepage: false
+Listed in Galleries: false
 Additional Files:
 - Title: Bandcamp Banner
   Files:
diff --git a/album/references-beyond-homestuck.yaml b/album/references-beyond-homestuck.yaml
index 9f0b1285..422249b2 100644
--- a/album/references-beyond-homestuck.yaml
+++ b/album/references-beyond-homestuck.yaml
@@ -385,29 +385,46 @@ URLs:
 Group: Music from video games
 ---
 Track: A Bell is Tolling
+Directory: a-bell-is-tolling
+# JP: 八点鐘
+# Official release:
+#   聖剣伝説2 オリジナル・サウンド・ヴァージョン
+# Reference:
+#   https://vgmdb.net/album/721
 Artists:
 - Secret of Mana
 - Hiroki Kikuta
 Duration: '1:33'
 URLs:
-- https://www.youtube.com/watch?v=jRYZI0ZpPGs
+- https://youtu.be/gMrwcjyeIVE
 ---
 Track: Bad Apple!!
+# Official release:
+#   Yougakudan no Rekishi 1 ~ Akyu's Untouched Score vol.1
+# Reference:
+#   https://en.touhouwiki.net/wiki/Lotus_Land_Story/Music
+#   https://en.touhouwiki.net/wiki/Akyu%27s_Untouched_Score_vol.1
 Artists:
 - Touhou Project
 - ZUN
-Duration: '3:00'
+Duration: '3:13'
 URLs:
-- https://www.youtube.com/watch?v=35YXCbyTOrw
+- https://youtu.be/S-wnMPOV-5g
 ---
 Track: Battle! (Colress)
-Artists:
-- Pokémon
+# JP: 戦闘!アクロマ
+# Official release:
+#   Pokémon Black 2 & Pokémon White 2: Super Music Collection
+#   ニンテンドーDS ポケモンブラック2・ホワイト2 スーパーミュージックコンプリート
+# Reference:
+#   https://bulbapedia.bulbagarden.net/wiki/Pokémon_Black_2_%26_Pokémon_White_2:_Super_Music_Collection
+Artists:
+- artist:pokemon
 - Hitomi Sato
 - Go Ichinose
-Duration: '5:00'
+Duration: '3:49'
 URLs:
-- https://www.youtube.com/watch?v=NvQBpb6eqp8
+- https://www.youtube.com/watch?v=X-jiXa1xMAE
 Referenced Tracks:
 - Colress's Theme
 Lyrics: |-
@@ -426,86 +443,132 @@ Lyrics: |-
     Three
 ---
 Track: Battle! (Elite Four) (Pokémon Black & White Versions)
+# JP: 戦闘!四天王
+# Official release:
+#   Pokémon Black & Pokémon White: Super Music Collection
+#   ニンテンドーDS ポケモンブラック・ホワイト スーパーミュージックコレクション
+# Reference:
+#   https://bulbapedia.bulbagarden.net/wiki/Pokémon_Black_%26_Pokémon_White:_Super_Music_Collection
 Directory: battle-elite-four-pokemon-black-and-white-versions
 Artists:
-- Pokémon
+- artist:pokemon
 - Junichi Masuda
 - Go Ichinose
-Duration: '3:00'
+Duration: '2:51'
 URLs:
-- https://www.youtube.com/watch?v=llnXhrCn9Yo
+- https://www.youtube.com/watch?v=xTIX7f9wFB8
 ---
 Track: Battle! Wild Pokémon (Pokémon Red & Blue Versions)
+# JP: 戦い(VS野生ポケモン)
+# Official release:
+#   ゲームボーイ「ポケモン」のサウンドがまるごと入って、遊べるCD
+# Reference:
+#   https://bulbapedia.bulbagarden.net/wiki/Game_Boy:_Entire_Pokémon_Sounds_Collection_CD
 Directory: battle-wild-pokemon-pokemon-red-and-blue-versions
 Artists:
-- Pokémon
+- artist:pokemon
 - Junichi Masuda
-Duration: '1:15'
+Duration: '1:30'
 URLs:
-- https://www.youtube.com/watch?v=eBNcjvxLfFc
+- https://www.youtube.com/watch?v=vgBoQUaEKpk
 ---
 Track: Beginning
+# From Castlevania III: Dracula's Curse
+# The original official release combines this track with several others from the same game for its inclusion on the CD, so it doesn't have a "canonical" duration. But it starts at 2:46 and fades out ending at 4:30, which is what's used for the duration here.
+# Note that Castlevania III's NES release has a different rendition of the soundtrack from its original Famicom release, running on a different sound chip. They're essentially the same songs, but the Famicom original is what is listed here.
+# JP: [full track] 新たなる決意
+# JP: [subsection] Beginning (教会,町,墓場ステージ)
+# Official release:
+#   悪魔城ドラキュラ ファミコン・ベスト
+# Reference:
+#   https://vgmdb.net/album/121
 Artists:
 - Castlevania
 - Jun Funahashi
-Duration: '1:50'
+Duration: '1:44'
 URLs:
-- https://www.youtube.com/watch?v=ptgaCJSF7j8
+- https://youtu.be/zapJY3hm-dc?t=166
 ---
 Track: Bloody Tears
+# From Castlevania II: Simon's Quest
+# Released on the same album as Beginning, but it has its own dedicated track vs. Castlevania III's OST.
+# JP: Bloody Tears (昼の道BGM)
+# Official release:
+#   悪魔城ドラキュラ ファミコン・ベスト
+# Reference:
+#   https://vgmdb.net/album/121
 Artists:
 - Castlevania
 - Kenichi Matsubara
-Duration: '3:25'
+Duration: '1:05'
 URLs:
-- https://www.youtube.com/watch?v=e2oZtvjg5oA
+- https://www.youtube.com/watch?v=VP1nVVvi1Vw
 ---
 Track: Bon Voyage, Amigo
+# From Mother 3, which had two arrangement soundtracks but no official release of the in-game GBA soundtrack.
+# Reference:
+#   https://en.wikipedia.org/wiki/Music_of_the_Mother_series
+#   http://starmen.net/merchandise/music/m3cd.php
 Artists:
 - EarthBound
 - Keiichi Suzuki
 - Hirokazu Tanaka
-Duration: '2:12'
 URLs:
 - https://www.youtube.com/watch?v=5OtDm2qgpWw
 ---
 Track: Boss Battle
 Directory: boss-battle-pokemon-typing-adventure
+# No official release
 Artists:
-- Pokémon
+- artist:pokemon
 - Azusa Chiba
 - Masaharu Iwata
-- Kimihiro Abe 
-Duration: '2:17'
+- Kimihiro Abe
 URLs:
 - https://www.youtube.com/watch?v=s9SKrNZnnCM
 ---
 Track: Breath of the Wild Theme
+# JP: メインテーマ
+# Official release:
+#   ゼルダの伝説 ブレス オブ ザ ワイルド オリジナルサウンドトラック
+# Reference:
+#   https://vgmdb.net/album/75832
 Artists:
 - The Legend of Zelda
 - Manaka Kataoka
-- Yasuaki Iwata
-- Hajime Wakai
-Duration: '1:55'
+Duration: '2:01'
 URLs:
-- https://www.youtube.com/watch?v=cPWBG6_jn4Y
+- https://www.youtube.com/watch?v=GY4WjuVTdvY
 ---
 Track: Bright Spinning Planet
+# JP: 回る光はプラネット
+# Official release:
+#   星のカービィ ロボボプラネット オリジナルサウンドトラック
+#   Kirby: Planet Robobot Original Soundtrack
+# Reference:
+#   https://vgmdb.net/album/63000
 Artists:
 - Kirby
 - Hirokazu Ando
-Duration: '1:09'
+Duration: '1:10'
 URLs:
-- https://www.youtube.com/watch?v=VOwsYDtnFOE
+- https://www.youtube.com/watch?v=6Kb1WMZBG9k
 - https://open.spotify.com/track/48wfJa6hyfiXB0RZnzUKRJ
 ---
 Track: Calamari Inkantation
+# JP: シオカラ節
+# Official release:
+#   スプラトゥーン オリジナルサウンドトラック -スプラチューン-
+# Reference:
+#   https://vgmdb.net/album/54591
 Artists:
 - Splatoon
 - Shiho Fujii
-Duration: '3:18'
+- keity.pop (vocals)
+- Mari Kikuma (vocals)
+Duration: '2:34'
 URLs:
-- https://www.youtube.com/watch?v=k4k1NdUEUP4
+- https://youtu.be/abXjYrCqan0
 Lyrics: |-
     Ya weni marei mirekyarahire
     Juri yu mirekerason
@@ -542,37 +605,56 @@ Lyrics: |-
     Ha ha ha ha
 ---
 Track: Colress's Theme
-Artists:
-- Pokémon
+# JP: アクロマのテーマ
+# Official release:
+#   Pokémon Black 2 & Pokémon White 2: Super Music Collection
+#   ニンテンドーDS ポケモンブラック2・ホワイト2 スーパーミュージックコンプリート
+# Reference:
+#   https://bulbapedia.bulbagarden.net/wiki/Pokémon_Black_2_%26_Pokémon_White_2:_Super_Music_Collection
+Artists:
+- artist:pokemon
 - Hitomi Sato
-Duration: '0:30'
+Duration: '1:06'
 URLs:
-- https://www.youtube.com/watch?v=UHZY3R5j12o
+- https://www.youtube.com/watch?v=LgO0WKqIQ3c
 ---
 Track: Corridors of Time
+# Chrono Trigger's OST is notoriously (to us) difficult to find uploads of on YouTube, so the linked URL may have duration or slight differences from its soundtrack release.
+# JP: 時の回廊
+# Official release:
+#   クロノ・トリガー・オリジナル・サウンド・ヴァージョン
+# Reference:
+#   https://vgmdb.net/album/18
 Artists:
 - Chrono Trigger
 - Yasunori Mitsuda
-Duration: '3:00'
+Duration: '3:01'
 URLs:
 - https://www.youtube.com/watch?v=BXo3DrXHY8w
 ---
 Track: Chrono Trigger
+# (See Corridors of Time for info on soundtrack/YouTube differences)
+# JP: クロノ・トリガー
+# Official release:
+#   クロノ・トリガー・オリジナル・サウンド・ヴァージョン
+# Reference:
+#   https://vgmdb.net/album/18
 Artists:
 - Chrono Trigger
 - Yasunori Mitsuda
 Duration: '2:00'
 URLs:
-- https://archive.org/download/chrono_trigger_osv/02%20-%20Chrono%20Trigger.mp3
+- https://www.youtube.com/watch?v=nO3Ap0xOcAE
 ---
 Track: DK Rap
+# Duration is from the first musical (0:17) to the disc scratch (3:27) on the in-game music video
 Artists:
 - Donkey Kong
 - Grant Kirkhope
 Contributors:
 - George Andreas (lyrics, vocals)
 - Chris Sutherland (vocals)
-Duration: '3:28'
+Duration: '3:10'
 URLs:
 - https://www.youtube.com/watch?v=q-yZ7_enlWA
 Lyrics: |-
@@ -649,16 +731,22 @@ Lyrics: |-
     Ahh yeah!
 ---
 Track: Doll Judgement ~ The Girl Who Played with People's Shapes
+# No official release of the in-game track
 Artists:
 - Touhou Project
 - ZUN
-Duration: '5:30'
 URLs:
 - https://www.youtube.com/watch?v=lVwstM4vZC8
 Referenced Tracks:
 - Romantic Children
 ---
 Track: Dragon Roost Island
+# JP: 竜の島
+# Official release:
+#   ゼルダの伝説 ~風のタクト~ オリジナル・サウンド・トラックス
+#   The Legend of Zelda ~The Wind Waker~ Original Sound Tracks
+# Reference:
+#   https://vgmdb.net/album/418
 Artists:
 - The Legend of Zelda
 - Kenta Nagata
@@ -670,97 +758,129 @@ URLs:
 - https://www.youtube.com/watch?v=s7fqllhtdHI
 ---
 Track: Dungeon Theme
+# The only upload I could find of the apparent original soundtrack release, on "The Legend of Zelda SOUND & DRAMA", was on Niconico: https://www.nicovideo.jp/watch/sm16507868 - I don't think it's possible to link timestamps on nicovideo.jp though.
+# JP: 地下
+# Official release:
+#   ゼルダの伝説 "サウンド&ドラマ"
+# Reference:
+#   https://vgmdb.net/album/885
 Directory: dungeon-theme-zelda1
 Artists:
 - The Legend of Zelda
 - Koji Kondo
-Duration: '3:00'
+Duration: '1:05'
 URLs:
-- https://www.youtube.com/watch?v=cMssCMqMHuk
+- https://youtu.be/IDp0Mu1E1Bw
 ---
 Track: Eight Melodies
+# From Mother (EarthBound Beginnings), which doesn't seem to have received an official soundtrack release (besides several arrangements)
 Artists:
 - EarthBound
 - Keiichi Suzuki
 - Hirokazu Tanaka
-Duration: '2:20'
 URLs:
 - https://www.youtube.com/watch?v=W8WSZwX2xhg
 ---
 Track: Eternal Recurrence
+# JP: 永劫回帰
+# Official release:
+#   聖剣伝説2 オリジナル・サウンド・ヴァージョン
+# Reference:
+#   https://vgmdb.net/album/721
 Artists:
 - Secret of Mana
 - Hiroki Kikuta
 Duration: '2:12'
 URLs:
-- https://www.youtube.com/watch?v=70Di1JbvdDI
+- https://youtu.be/KTNfNzLiZBA
 ---
 Track: Fall of Fall ~ Autumnal Waterfall
+# No official release of the in-game track
 Artists:
 - Touhou Project
 - ZUN
-Duration: '3:00'
 URLs:
 - https://www.youtube.com/watch?v=-F3_Cj-fMWw
 ---
 Track: Fear of the Heavens
+# JP: 天使の怖れ
+# Official release:
+#   聖剣伝説2 オリジナル・サウンド・ヴァージョン
+# Reference:
+#   https://vgmdb.net/album/721
 Artists:
 - Secret of Mana
 - Hiroki Kikuta
 Duration: '1:42'
 URLs:
-- https://www.youtube.com/watch?v=dGna-qHdg-k
+- https://youtu.be/xgM9f0CSFe8
 ---
 Track: File Select (Super Mario 64)
+# JP: ファイルセレクト
+# Official release:
+#   スーパーマリオ64 オリジナルサウンドトラック
+# Reference:
+#   https://vgmdb.net/album/137
 Directory: file-select-sm64
 Artists:
 - Super Mario
 - Koji Kondo
-Duration: 0:20
+Duration: 0:44
 URLs:
-- https://www.youtube.com/watch?v=hrJNgLGbYg0
+- https://youtu.be/vJIjtjGUR9Q?t=1968
 ---
 Track: Frog's Theme
+# (See Corridors of Time for info on soundtrack/YouTube differences)
+# JP: カエルのテーマ
+# Official release:
+#   クロノ・トリガー・オリジナル・サウンド・ヴァージョン
+# Reference:
+#   https://vgmdb.net/album/18
 Artists:
 - Chrono Trigger
 - Yasunori Mitsuda
-Duration: '1:49'
+Duration: '1:50'
 URLs:
-- https://www.youtube.com/watch?v=H10bdZsclJ0
+- https://www.youtube.com/watch?v=EFBlzu96RkU
 ---
 Track: Galactic Nova
+# No official release of the in-game track (or Kirby Super Star's in-game soundtrack at all)
 Artists:
 - Kirby
 - Jun Ishikawa
-Duration: '0:50'
 URLs:
 - https://www.youtube.com/watch?v=hPT77G3LGwA
 ---
 Track: Game Over
 Directory: game-over-bootleg
+# This... obviously never had an official release... duh...
 Artists:
 - Felix the Cat
 - Unknown Artist
-Duration: '0:38'
 URLs:
 - https://www.youtube.com/watch?v=e17PCwAFIA4
 ---
 Track: Gaster's Theme
+# No official release, duration is from the in-game audio loop.
 Artists:
 - 'Toby Fox'
 Directory: gasters-theme-undertale
-Duration: 0:34
+Duration: 0:17
 URLs:
-- https://youtu.be/n0dgaYe2LZw
+- https://www.youtube.com/watch?v=CFn8xs157Gw
 ---
 Track: GO MY WAY!!
+# Official release:
+#   THE IDOLM@STER MASTERWORK 01 GO MY WAY!!
+# Reference:
+#   https://vgmdb.net/album/9053
 Artists:
 - THE iDOLM@STER
-- Satoru Kousaki
+- artist:satoru-kosaki
 - yura
-Duration: '2:09'
+Duration: '4:51'
 URLs:
-- https://www.youtube.com/watch?v=iYcRQBrUbd0
+- https://youtu.be/x0KzJYb7kCo
 Lyrics: |-
     GO MY WAY!! Go mae e! (<i>GO MY WAY!! Go in front!</i>)
     Ganbatte yukimashou (<i>Let's go forward with our best</i>)
@@ -804,22 +924,40 @@ Lyrics: |-
     Kono yubi ni tomare (<i>Come rest on this finger</i>)
 ---
 Track: Ground Theme (Super Mario Bros.)
+# SMB soundtrack was released on vinyl and cassette simultaneously, the cassette release (linked below) has an extra track (SMB Suite) but the first track is the same duration, at least.
+# Original release:
+#   スーパーマリオブラザーズ オリジナル・サウンドトラック
+# Reference:
+#   https://vgmdb.net/album/3436
+#   https://vgmdb.net/album/507
 Artists:
 - Super Mario
 - Koji Kondo
-Duration: '1:22'
+Duration: '2:42'
 URLs:
-- https://www.youtube.com/watch?v=NTa6Xbzfq1U
+- https://www.youtube.com/watch?v=O3q_hXrgp8w
 ---
 Track: Guile's Theme
+# From Street Fighter II, which was released in several different versions but... carried the same soundtrack... I think?
+# Original release:
+#   ストリートファイターII コレクターズBOX ビデオセット
+#   STREET FIGHTER II Perfect Original Version [PCCB-00124~3]
+# Reference:
+#   https://vgmdb.net/album/1520
 Artists:
 - Street Fighter
 - Yoko Shimomura
-Duration: '4:05'
+Duration: '2:24'
 URLs:
-- https://www.youtube.com/watch?v=nSsggxGdFpM
+- https://youtu.be/jfEiEjfTUys?t=853
 ---
 Track: Haltmann Works Co. HQ
+# JP: ハルトマンワークスカンパニーHQ
+# Official release:
+#   星のカービィ ロボボプラネット オリジナルサウンドトラック
+#   Kirby: Planet Robobot Original Soundtrack
+# Reference:
+#   https://vgmdb.net/album/63000
 Artists:
 - Kirby
 - Hirokazu Ando
@@ -831,69 +969,54 @@ Referenced Tracks:
 - Haltmann Works Co. Theme Song
 ---
 Track: Haltmann Works Co. Theme Song
+# JP: ハルトマンワークスカンパニーのテーマ
+# Official release:
+#   星のカービィ ロボボプラネット オリジナルサウンドトラック
+#   Kirby: Planet Robobot Original Soundtrack
+# Reference:
+#   https://vgmdb.net/album/63000
 Artists:
 - Kirby
 - Hirokazu Ando
-Duration: '1:25'
+Duration: '1:26'
 URLs:
 - https://www.youtube.com/watch?v=RPLz7UIeQv8
 - https://open.spotify.com/track/4F9muAB4BFreVBPDW6mVVi
 ---
-Track: Historia Crux
-Artists:
-- Final Fantasy
-- Mitsuto Suzuki
-Duration: '4:28'
-URLs:
-- https://www.youtube.com/watch?v=W50atec80dM
-Lyrics: |-
-    Stars shine in the deep sky
-    Endless stories of the distant yesterdays
-
-    Take me in your arms
-    Keep me in your heart
-    Take me in your arms
-    Keep me in your heart
-
-    Time is flying by
-    The only moment is now
-    The only moment is now
-    Feel that everything is real
-    Everything is real in dream
-
-    Going on a trip to somewhere
-    Never been across time and space
-
-    Time and space
-    Time and space
-    Time and space
-    Time and space
----
 Track: Hotel Mario
+# No official release
 Artists:
 - Super Mario
 - Max Steiner
-Duration: 0:54
 URLs:
 - https://www.youtube.com/watch?v=28ZcsyOayLM
 ---
 Track: Hydrocity Zone (Act 2)
+# Among other tracks from Sonic 3 & Knuckles which ostensibly involved contributions from Michael Jackson or his crew, this track was never officially released.
 Artists:
 - Sonic the Hedgehog
 - Masayuki Nagao
-Duration: '1:55'
 URLs:
 - https://www.youtube.com/watch?v=PNYL4w-qxcE
 ---
 Track: Icirrus City
-Artists:
-- Pokémon
+# JP: セッカシティ
+# Official release:
+#   Pokémon Black & Pokémon White: Super Music Collection
+#   ニンテンドーDS ポケモンブラック・ホワイト スーパーミュージックコレクション
+# Reference:
+#   https://bulbapedia.bulbagarden.net/wiki/Pokémon_Black_%26_Pokémon_White:_Super_Music_Collection
+Artists:
+- artist:pokemon
 - Shota Kageyama
-Duration: '2:05'
+Duration: '1:46'
 URLs:
 - https://www.youtube.com/watch?v=vMTqSl-usYI
 ---
 Track: Jump Up, Super Star!
+# Officially released as an iTunes single.
+# Reference:
+#   https://vgmdb.net/album/72172
 Artists:
 - Super Mario
 - Naoto Kubo
@@ -902,7 +1025,7 @@ Contributors:
 - Kate Higgins (English vocals)
 Duration: '4:09'
 URLs:
-- https://www.youtube.com/watch?v=e9r5hx47kxM
+- https://youtu.be/Pj_IqEMGJZ4
 Sampled Tracks:
 - super mario bros jump and coin collect sfx
 Lyrics: |-
@@ -996,6 +1119,11 @@ Lyrics: |-
     So, let's do the odyssey
 ---
 Track: Katamari on the Rocks
+# JP: 塊オンザロック~メインテーマ
+# Official release:
+#   塊魂サウンドトラック「塊フォルテッシモ魂」
+# Reference:
+#   https://vgmdb.net/album/174
 Artists:
 - Katamari Damacy
 - Yuu Miyake
@@ -1003,6 +1131,7 @@ Artists:
 Contributors:
 - Masayuki Tanaka (vocals)
 - Tomomi Suzuki (vocals)
+- artist:satoru-kosaki (trumpet)
 Duration: '5:57'
 URLs:
 - https://www.youtube.com/watch?v=iMH49ieL4es
@@ -1061,14 +1190,20 @@ Lyrics: |-
     Nana nananananana na na Katamari Damacy
 ---
 Track: Layton's Theme
+# JP: レイトン教授のテーマ
+# Official release:
+#   レイトン教授メインテーマ トリロジーCD
+# Reference:
+#   https://vgmdb.net/album/10563
 Artists:
 - Professor Layton
 - Tomohito Nishiura
-Duration: '2:10'
+Duration: '1:55'
 URLs:
-- https://www.youtube.com/watch?v=lL6on-bOybk
+- https://www.youtube.com/watch?v=oys0fnIcgt8
 ---
 Track: Left-Hand Remix
+# The Rhythm Heaven franchise has only had a couple soundtrack soundtrack releases, and none for Rhythm Heaven Megamix.
 Artists:
 - Rhythm Heaven
 - Mitsuo Terada
@@ -1076,7 +1211,6 @@ Artists:
 - Asuka Ito
 - Yumi Takahashi
 - Megumi Inoue
-Duration: '2:55'
 URLs:
 - https://www.youtube.com/watch?v=2xNDTPbdO80
 Lyrics: |-
@@ -1089,6 +1223,10 @@ Lyrics: |-
     Pose for the fans!
 ---
 Track: Lonely Rolling Star
+# Official release:
+#   塊魂サウンドトラック「塊フォルテッシモ魂」
+# Reference:
+#   https://vgmdb.net/album/174
 Artists:
 - Katamari Damacy
 - Yoshihito Yano
@@ -1160,29 +1298,34 @@ Lyrics: |-
 ---
 Track: Megalovania
 Directory: megalovania-halloween
+# No official release (RIP)
 Artists:
 - Toby Fox
-Duration: '1:59'
 URLs:
 - https://www.youtube.com/watch?v=iIowwZThIXM
 ---
 Track: Moon Over the Castle
+# Original release:
+#   グランツーリスモ オリジナル・ゲームサウンドトラック
+# Reference:
+#   https://vgmdb.net/album/3582
 Artists:
 - Gran Turismo
 - Masahiro Andoh
-Duration: '5:20'
+Duration: '5:25'
 URLs:
-- https://www.youtube.com/watch?v=PKdZBkEQYxI
+- https://youtu.be/LLXtfo6eXbE
 ---
 Track: Moonsong
+# The original Cave Story's soundtrack hasn't been officially released.
 Artists:
 - Cave Story
 - Daisuke Amaya
-Duration: '2:41'
 URLs:
 - https://www.youtube.com/watch?v=q09KoR7g018
 ---
 Track: Native Faith
+# No official release of the in-game track
 Artists:
 - Touhou Project
 - ZUN
@@ -1191,24 +1334,32 @@ URLs:
 - https://www.youtube.com/watch?v=P7dLp2Eb7cg
 ---
 Track: Neos City (Night)
+# No official release
+# Reference:
+#   https://vgmdb.net/product/9892
 Artists:
-- Pokémon
+- artist:pokemon
 - Hiroki Hashimoto
-Duration: '2:15'
 URLs:
 - https://www.youtube.com/watch?v=PTQBFoM_cVw
 ---
 Track: Objection! 2001
+# JP: 成歩堂龍一 ~異議あり! 2001
+# Official release:
+#   逆転裁判+逆転裁判2 オリジナル・サウンドトラック
+# Reference:
+#   https://vgmdb.net/album/2600
 Artists:
 - Ace Attorney
 - Masakazu Sugimori
 Contributors:
 - Naoto Tanaka (arrangement)
-Duration: '1:13'
+Duration: '1:22'
 URLs:
 - https://www.youtube.com/watch?v=_I34nshlOPk
 ---
 Track: Old Friends
+# Official release on Bandcamp
 Artists:
 - Transistor
 - Darren Korb
@@ -1218,48 +1369,61 @@ URLs:
 - https://www.youtube.com/watch?v=ql8K3KJyWgY
 ---
 Track: One Fateful Night
+# (See Eight Melodies, no official soundtrack release)
 Artists:
 - EarthBound
 - Keiichi Suzuki
 - Hirokazu Tanaka
-Duration: '0:46'
 URLs:
 - https://www.youtube.com/watch?v=bQzYJBTBVEc
 ---
 Track: Onett Theme
+# (See Eight Melodies, no official soundtrack release)
 Artists:
 - EarthBound
 - Keiichi Suzuki
 - Hirokazu Tanaka
-Duration: '2:24'
 URLs:
 - https://www.youtube.com/watch?v=XKfXsTkA71I
 ---
 Track: Pushing Onwards
+# Official release on Bandcamp (OK, also the guy's own site)
+# Reference:
+#   https://vgmdb.net/album/17623
 Artists:
 - VVVVVV
 - Magnus Pålsson
 Duration: '3:39'
 URLs:
+- https://souleyedigitalmusic.bandcamp.com/track/pushing-onwards
 - https://www.youtube.com/watch?v=25m3Gk7mRQM
 ---
 Track: Reconstructing More Science
+# Official release in a lovely free download
+# Reference:
+#   https://vgmdb.net/album/29202
 Artists:
 - Portal
 - Mike Morasky
-Duration: '2:36'
+Duration: '2:37'
 URLs:
 - https://www.youtube.com/watch?v=WAeiqxNH3W0
 ---
 Track: Recruitment Theme
+# Official release has this track as a medley of other in-game BGM at the end of an album mostly comprising arrangements; duration is from timestamps 41:33 to 42:07 on the album as a whole.
+# Official release:
+#   ファイアーエムブレム ~キャラクターテーマ集~
+# Reference:
+#   https://vgmdb.net/album/5570
 Artists:
 - Fire Emblem
 - Yuka Tsujiyoko
-Duration: '1:44'
+Duration: '0:34'
 URLs:
 - https://www.youtube.com/watch?v=9xlMErV9Fts
 ---
 Track: Right-Hand Remix
+# (See Left-Hand Remix for release info)
 Artists:
 - Rhythm Heaven
 - Mitsuo Terada
@@ -1267,7 +1431,6 @@ Artists:
 - Asuka Ito
 - Yumi Takahashi
 - Megumi Inoue
-Duration: '2:27'
 URLs:
 - https://www.youtube.com/watch?v=I81rQxSXz-s
 Lyrics: |-
@@ -1298,6 +1461,7 @@ Lyrics: |-
     One two
 ---
 Track: RollerCoaster Tycoon 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
@@ -1306,6 +1470,7 @@ URLs:
 - https://www.youtube.com/watch?v=KT45kiI5FYw
 ---
 Track: Romantic Children
+# No official release of the in-game track
 Artists:
 - Touhou Project
 - ZUN
@@ -1314,21 +1479,23 @@ URLs:
 - https://www.youtube.com/watch?v=SmIdewKUmW4
 ---
 Track: Room of Dog
+# No official release, duration is from the in-game audio loop.
 Artists:
 - 'Toby Fox'
-Duration: '1:12'
+Duration: '0:35'
 URLs:
-- https://www.youtube.com/watch?v=L_QPBlD3hkU
+- https://www.youtube.com/watch?v=grGnVeKCcvc
 ---
 Track: Running Hell
+# The original Cave Story's soundtrack hasn't been officially released.
 Artists:
 - Cave Story
 - Daisuke Amaya
-Duration: '2:28'
 URLs:
 - https://www.youtube.com/watch?v=VQPqmS5iGzY
 ---
 Track: Ryuunosuke Akutagawa's "Kappa" ~ Candid Friend
+# No official release of the in-game track
 Artists:
 - Touhou Project
 - ZUN
@@ -1337,13 +1504,17 @@ URLs:
 - https://www.youtube.com/watch?v=XdNpKz8_VTA
 ---
 Track: Say "I Gotta Believe!"
+# Official release:
+#   パラッパラッパー2 ― オリジナル・サウンドトラック
+# Reference:
+#   https://vgmdb.net/album/1511
 Artists:
 - PaRappa the Rapper
 - De La Soul
 - Takako Hirasawa
-Duration: '4:34'
+Duration: '4:16'
 URLs:
-- https://www.youtube.com/watch?v=AOaT98I-dRo
+- https://www.youtube.com/watch?v=o9y6oGe8V-g
 Lyrics: |-
     Say "Alright!" (Alright!)
     Say "Oh yeah!" (Oh yeah!)
@@ -1446,22 +1617,29 @@ Lyrics: |-
     Oh yeah, oh yeah, oh yeah, oh yeah, yay
 ---
 Track: Schala's Theme
+# (See Corridors of Time for info on soundtrack/YouTube differences)
+# JP: サラのテーマ
+# Official release:
+#   クロノ・トリガー・オリジナル・サウンド・ヴァージョン
+# Reference:
+#   https://vgmdb.net/album/18
 Artists:
 - Chrono Trigger
 - Yasunori Mitsuda
 Duration: '2:48'
 URLs:
-- https://www.youtube.com/watch?v=-iPLxszqpW4
+- https://www.youtube.com/watch?v=ilTggSxYi04
 ---
 Track: September Pumpkin
+# No official release of the in-game track
 Artists:
 - Touhou Project
 - ZUN
-Duration: '5:00'
 URLs:
 - https://www.youtube.com/watch?v=JjHPGJ3wr5E
 ---
 Track: Silencio
+# Uploaded from in-game files (pretty sure anyway)
 Artists:
 - 'OFF'
 - Alias Conrad Coldwood
@@ -1472,49 +1650,61 @@ Lyrics: |-
     [Largely indecipherable French whispering]
 ---
 Track: Sleeping Terror
+# No official release of the in-game track
 Artists:
 - Touhou Project
 - ZUN
-Duration: '4:30'
 URLs:
 - https://www.youtube.com/watch?v=tcpTuxh7E34
 ---
 Track: Slider
+# JP: スライダー
+# Official release:
+#   スーパーマリオ64 オリジナルサウンドトラック
+# Reference:
+#   https://vgmdb.net/album/137
 Artists:
 - Super Mario
 - Koji Kondo
 Duration: '1:14'
 URLs:
-- https://www.youtube.com/watch?v=l7I8dYKeke8
+- https://youtu.be/vJIjtjGUR9Q?t=401
 ---
 Track: Smiles and Tears
+# (See Eight Melodies, no official soundtrack release)
 Artists:
 - EarthBound
 - Keiichi Suzuki
 - Hirokazu Tanaka
-Duration: '5:49'
 URLs:
 - https://www.youtube.com/watch?v=vkAmD8A3CRk
 ---
 Track: Solar Sect of Mystic Wisdom ~ Nuclear Fusion
+# No official release of the in-game track
 Artists:
 - Touhou Project
 - ZUN
-Duration: '5:45'
 URLs:
 - https://www.youtube.com/watch?v=Xy_-7OXophY
 ---
 Track: Soul 0 System
+# JP: Soul 0 System~回歴スル追約ノ忘レ貝
+# Official release:
+#   星のカービィ ロボボプラネット オリジナルサウンドトラック
+#   Kirby: Planet Robobot Original Soundtrack
+# Reference:
+#   https://vgmdb.net/album/63000
 Artists:
 - Kirby
 - Hirokazu Ando
-Duration: '1:20'
+Duration: '4:11'
 URLs:
 - https://www.youtube.com/watch?v=QMXmQkfNpGs
 Referenced Tracks:
 - Galactic Nova
 ---
 Track: Splatoon "Squid Kid" TV Commercial
+# This is a TV ad.
 Artists:
 - Splatoon
 - Unknown Artist
@@ -1537,16 +1727,26 @@ Lyrics: |-
     Splatatatatatatata Splatoon! 
 ---
 Track: Steam Gardens
+# JP: スチームガーデン
+# Official release:
+#   スーパーマリオ オデッセイ オリジナルサウンドトラック
+# Reference:
+#   https://vgmdb.net/album/73671
 Artists:
 - Super Mario
 - Koji Kondo
 Contributors:
 - The Super Mario Players (performance)
-Duration: '3:25'
+Duration: '3:44'
 URLs:
-- https://www.youtube.com/watch?v=-rfoYSmx0rk
+- https://youtu.be/-rfoYSmx0rk
 ---
 Track: Stone Tower Temple
+# JP: ロックビルの神殿 (表)
+# Official release:
+#   ゼルダの伝説 ムジュラの仮面 オリジナル・サウンドトラック
+# Reference:
+#   https://vgmdb.net/album/1678
 Artists:
 - The Legend of Zelda
 - Koji Kondo
@@ -1555,62 +1755,81 @@ URLs:
 - https://www.youtube.com/watch?v=oMSCjGJp8Gk
 ---
 Track: Super Dry Dance
+# (See Eight Melodies, no official soundtrack release)
 Artists:
 - EarthBound
 - Keiichi Suzuki
 - Hirokazu Tanaka
-Duration: '1:49'
 URLs:
 - https://www.youtube.com/watch?v=VjSUpctGEUQ
 ---
 Track: Terra's Theme
+# JP: ティナのテーマ
+# Official release:
+#   ファイナルファンタジーVI オリジナル・サウンド・ヴァージョン
+# Reference:
+#   https://vgmdb.net/album/40
 Artists:
 - Final Fantasy
 - Nobuo Uematsu
-Duration: '3:50'
+Duration: '3:53'
 URLs:
-- https://www.youtube.com/watch?v=PiI7rDqv9FQ
+- https://youtu.be/SrDiiVn1VCk
 ---
 Track: The Decisive Battle (Final Fantasy VI)
+# JP: 決戦
+#   ファイナルファンタジーVI オリジナル・サウンド・ヴァージョン
+# Reference:
+#   https://vgmdb.net/album/40
 Artists:
 - Final Fantasy
 - Nobuo Uematsu
-Duration: '0:53'
+Duration: '2:02'
 URLs:
-- https://www.youtube.com/watch?v=bMOa3rjtHkE
+- https://youtu.be/WmBPTpvYyIY
 ---
 Track: 'The Flintstones: The Rescue of Dino & Hoppy - Title Theme/Ending'
+# No official release, too bad
 Artists:
 - The Flintstones
 - Yasuko Yamada
 - Naoto Yagishita
-Duration: '1:02'
 URLs:
 - https://www.youtube.com/watch?v=U3-0w9eVENw
 Referenced Tracks:
 - Meet the Flintstones
 ---
 Track: The Little Sprite
+# JP: 妖精族のこども
+# Official release:
+#   聖剣伝説2 オリジナル・サウンド・ヴァージョン
+# Reference:
+#   https://vgmdb.net/album/721
 Artists:
 - Secret of Mana
 - Hiroki Kikuta
-Duration: 0:40
+Duration: 0:52
 URLs:
-- https://www.youtube.com/watch?v=HZjNMWmstWo
+- https://youtu.be/UrA3yf_W_I4
 ---
 Track: The Primal Scene of Japan the Girl Saw
+# No official release of the in-game track
 Artists:
 - Touhou Project
 - ZUN
-Duration: '3:00'
 URLs:
 - https://www.youtube.com/watch?v=okDBNnAjItU
 ---
 Track: The Stains of Time
+# Official release:
+#   METAL GEAR RISING REVENGEANCE Vocal Tracks
+# Reference:
+#   https://vgmdb.net/album/36558
 Artists:
 - Metal Gear
 - Logan Mader
 - Jamie Christopherson
+- Maniac Agenda
 Contributors:
 - Kit Walters (vocals)
 Duration: '2:10'
@@ -1639,14 +1858,23 @@ Lyrics: |-
     My dreams disappear
 ---
 Track: Theme of Eastern Story
+# This doesn't exactly have an "official in-game release"... but it wasn't exactly composed for one game either, serving more as a theme for the Touhou series. The duration here is pulled from Akyu's Untouched Score vol.5.
+# JP: テーマ・オブ・イースタンストーリー
+# References:
+#   https://en.touhouwiki.net/wiki/Theme_of_Eastern_Story
 Artists:
 - Touhou Project
 - ZUN
-Duration: '3:00'
+Duration: '5:01'
 URLs:
-- https://www.youtube.com/watch?v=qGwASZn0ZKA
+- https://youtu.be/WGEEAhl0EDw
 ---
 Track: Thin RED Line
+# JP: Thin RED Line-アラクネ テーマ曲
+# Official release:
+#   ブレイブルー オリジナルサウンドトラック
+# Reference:
+#   https://vgmdb.net/album/10946
 Artists:
 - BlazBlue
 - Daisuke Ishiwatari
@@ -1655,37 +1883,54 @@ URLs:
 - https://www.youtube.com/watch?v=hrvamz7tncY
 ---
 Track: Title (Mega Man 3)
+# Official release:
+#   カプコン ミュージック ジェネレーション ファミコン音楽全集 ロックマン 1~6
+# References:
+#   https://vgmdb.net/album/255
 Artists:
 - Mega Man
-Duration: '1:30'
+Duration: '1:23'
 URLs:
-- https://www.youtube.com/watch?v=2GPIijXue1k
+- https://youtu.be/krRaLoxdhrE
 ---
 Track: Title (The Legend of Zelda)
+# (See dungeon-theme-zelda1 for release info)
+# JP: タイトル
+# Official release:
+#   ゼルダの伝説 "サウンド&ドラマ"
+# Reference:
+#   https://vgmdb.net/album/885
 Artists:
 - The Legend of Zelda
 - Koji Kondo
 Duration: '1:20'
 URLs:
-- https://www.youtube.com/watch?v=uyMKWJ5e1kg
+- https://youtu.be/-CPrdomMoA4
 ---
 Track: To Make the End of Battle
+# JP: TO MAKE THE END OF BATTLE (タイトル)
+# Official release:
+#   ミュージック・フロム・イース II
+# Reference:
+#   https://vgmdb.net/album/1279
 Artists:
 - Ys
 - Yuzo Koshiro
-Duration: '4:43'
+Duration: '2:15'
 URLs:
-- https://www.youtube.com/watch?v=Y9Mam93QIQo
+- https://youtu.be/c2Wb5A-Tt3w
 ---
 Track: Tomboyish Girl in Love
+# Oh boy, this one's gotten around a lot.
+# No in-game release though!
 Artists:
 - Touhou Project
 - ZUN
-Duration: '3:00'
 URLs:
 - https://www.youtube.com/watch?v=JIZ12EQ2SFg
 ---
 Track: Totaka's Song
+# As Niklink commentates, this one's more a... melody...? abstract work...? than an individual track, so no official release, and a given duration wouldn't really fit it anyway. (It's about 30 seconds to a minute long though.)
 Artists:
 - Kazumi Totaka
 URLs:
@@ -1695,32 +1940,53 @@ Commentary: |-
     Originally found in Mario Paint and known as 'Mario Paint song', it was its discovery in Animal Crossing as a secret track you could only hear by requesting 'K.K. Song' from K.K. Slider that clued fans in as to its true nature, as the character is based on Nintendo composer Kazumi Totaka. Versions of this song have been hidden in almost every game he has been involved in, usually by idling in some specific part of the game for several minutes.
 ---
 Track: Toxic Caves
+# This friggen' game got its soundtrack released on vinyl in 2022! What were the chances!? Nice!
+# Official release:
+#   Sonic Spinball
+# Reference:
+#   https://vgmdb.net/album/121665
 Artists:
 - Sonic the Hedgehog
 - Howard Drossin
-Duration: '3:05'
+Duration: '3:29'
 URLs:
-- https://www.youtube.com/watch?v=bkWUJfIotfU
+- https://youtu.be/KYhA2RisjP0?t=43
 ---
 Track: Turnabout Sisters Theme 2001
+# JP: 綾里真宵 ~逆転姉妹のテーマ 2001
+# Official release:
+#   逆転裁判+逆転裁判2 オリジナル・サウンドトラック
+# Reference:
+#   https://vgmdb.net/album/2600
 Artists:
 - Ace Attorney
 - Masakazu Sugimori
 Contributors:
 - Naoto Tanaka (arrangement)
-Duration: '2:45'
+Duration: '2:41'
 URLs:
 - https://www.youtube.com/watch?v=upOhRRYVGkA
 ---
 Track: Ultimate Koopa
+# JP: クッパ3号
+# Official release:
+#   スーパーマリオ64 オリジナルサウンドトラック
+# Reference:
+#   https://vgmdb.net/album/137
 Artists:
 - Super Mario
 - Koji Kondo
 Duration: '2:50'
 URLs:
-- https://www.youtube.com/watch?v=Bv9ou1vzVXE
+- https://youtu.be/vJIjtjGUR9Q?t=2447
 ---
 Track: Vagrant Counting Song of Retrospection
+# JP: この一撃に桃球レボリューション
+# Official release:
+#   星のカービィ ロボボプラネット オリジナルサウンドトラック
+#   Kirby: Planet Robobot Original Soundtrack
+# Reference:
+#   https://vgmdb.net/album/63000
 Artists:
 - Kirby
 - Hirokazu Ando
@@ -1734,6 +2000,10 @@ Referenced Tracks:
 - Haltmann Works Co. HQ
 ---
 Track: Vela-Nova
+# Official release:
+#   SONIC RUSH Original Groove Rush.
+# Reference:
+#   https://vgmdb.net/album/1651
 Artists:
 - Sonic the Hedgehog
 - Hideki Naganuma
@@ -1771,6 +2041,12 @@ Lyrics: |-
     (Ah, let's do it.)
 ---
 Track: Venturing into the Mechanized World
+# JP: キカイのせかいのだいぼうけん
+# Official release:
+#   星のカービィ ロボボプラネット オリジナルサウンドトラック
+#   Kirby: Planet Robobot Original Soundtrack
+# Reference:
+#   https://vgmdb.net/album/63000
 Artists:
 - Kirby
 - Hirokazu Ando
@@ -1782,37 +2058,44 @@ Referenced Tracks:
 - Haltmann Works Co. Theme Song
 ---
 Track: Waluigi Pinball / Wario Stadium
+# No official release
 Artists:
 - Super Mario
 - Shinobu Tanaka
-Duration: '2:11'
 URLs:
 - https://www.youtube.com/watch?v=psIuCn2jVNk
 ---
 Track: Where The Guns At
+# Official release on Bandcamp
 Artists:
 - Nuclear Throne
 - Jukio Kallio
 - Joonas Turner (gun SFX)
 Duration: '2:20'
 URLs:
-- https://www.youtube.com/watch?v=fe359yiaPi8
 - https://jukiokallio.bandcamp.com/track/where-the-guns-at-feat-joonas-turner
+- https://www.youtube.com/watch?v=fe359yiaPi8
 ---
 Track: Wind Scene
+# (See Corridors of Time for info on soundtrack/YouTube differences)
+# JP:  風の憧憬
+# Official release:
+#   クロノ・トリガー・オリジナル・サウンド・ヴァージョン
+# Reference:
+#   https://vgmdb.net/album/18
 Artists:
 - Chrono Trigger
 - Yasunori Mitsuda
-Duration: '1:33'
+Duration: '3:23'
 URLs:
-- https://www.youtube.com/watch?v=DY5vmx0YvgE
+- https://youtu.be/psMnbEmvx7w
 ---
 Track: You Gained a Level!
+# (See Eight Melodies, no official soundtrack release)
 Artists:
 - EarthBound
 - Keiichi Suzuki
 - Hirokazu Tanaka
-Duration: 0:23
 URLs:
 - https://www.youtube.com/watch?v=k-dOcqJoCrs
 ---
diff --git a/album/rust-apocalypse.yaml b/album/rust-apocalypse.yaml
index c23b9d6a..744fd629 100644
--- a/album/rust-apocalypse.yaml
+++ b/album/rust-apocalypse.yaml
@@ -8,7 +8,7 @@ URLs:
 Has Track Art: false
 Cover Artists:
 - Ducky Senpai
-Color: '#a10000'
+Color: '#eb0000'
 Groups:
 - Fandom
 Art Tags:
diff --git a/album/s-collide.yaml b/album/s-collide.yaml
index 393aa1b4..5dc52893 100644
--- a/album/s-collide.yaml
+++ b/album/s-collide.yaml
@@ -13,7 +13,7 @@ Art Tags:
 - Earth
 Color: '#cc3322'
 Groups:
-- Official
+- group:official
 Wallpaper Artists:
 - Rah-Bop
 ---
diff --git a/album/sburb.yaml b/album/sburb.yaml
index be6a646c..04210dd5 100644
--- a/album/sburb.yaml
+++ b/album/sburb.yaml
@@ -12,7 +12,7 @@ Cover Artists:
 - Killian Ng
 Color: '#34cdff'
 Groups:
-- Official
+- group:official
 Art Tags:
 - John
 - Rose
diff --git a/album/song-of-skaia.yaml b/album/song-of-skaia.yaml
index 261f0d6d..6667a13d 100644
--- a/album/song-of-skaia.yaml
+++ b/album/song-of-skaia.yaml
@@ -17,7 +17,7 @@ Art Tags:
 - Derse
 Color: '#02b7ff'
 Groups:
-- Official
+- group:official
 ---
 Track: 'Null'
 Duration: '2:32'
diff --git a/album/squiddles.yaml b/album/squiddles.yaml
index 1ff8e0bf..24a5da22 100644
--- a/album/squiddles.yaml
+++ b/album/squiddles.yaml
@@ -8,7 +8,7 @@ Cover Artists:
 - Cindy Dominguez
 Color: '#bb44ff'
 Groups:
-- Official
+- group:official
 Art Tags:
 - Squiddles
 Banner Artists:
diff --git a/album/strife.yaml b/album/strife.yaml
index d90a5c6b..25bace66 100644
--- a/album/strife.yaml
+++ b/album/strife.yaml
@@ -13,7 +13,7 @@ Cover Artists:
 Color: '#e83240'
 Groups:
 - Tensei
-- Official
+- group:official
 Art Tags:
 - Dave's bro
 - Jack Noir
diff --git a/album/symphony-impossible-to-play.yaml b/album/symphony-impossible-to-play.yaml
index 2d728ca7..496cb9c0 100644
--- a/album/symphony-impossible-to-play.yaml
+++ b/album/symphony-impossible-to-play.yaml
@@ -13,7 +13,7 @@ Cover Artists:
 Color: '#dd5544'
 Groups:
 - Clark Powell
-- Official
+- group:official
 Banner Artists:
 - Homestuck
 - Niklink (edits for wiki)
diff --git a/album/team-paradox.yaml b/album/team-paradox.yaml
index 6952ef3a..75d347a1 100644
--- a/album/team-paradox.yaml
+++ b/album/team-paradox.yaml
@@ -11,7 +11,7 @@ Cover Art File Extension: png
 Track Art File Extension: png
 Art Tags:
 - Skaia
-Color: '#a23c4e'
+Color: '#c25b6d'
 Groups:
 - Fandom
 Additional Files:
diff --git a/album/the-felt.yaml b/album/the-felt.yaml
index f61f3327..1ea68ad9 100644
--- a/album/the-felt.yaml
+++ b/album/the-felt.yaml
@@ -11,7 +11,7 @@ Default Track Cover Artists:
 - Homestuck
 Color: '#33aa55'
 Groups:
-- Official
+- group:official
 Art Tags:
 - Snowman
 Wallpaper Artists:
diff --git a/album/the-grubbles.yaml b/album/the-grubbles.yaml
index 63189dcd..e2dfe094 100644
--- a/album/the-grubbles.yaml
+++ b/album/the-grubbles.yaml
@@ -11,7 +11,7 @@ Cover Artists:
 - The Grubbels
 Color: '#dd0000'
 Groups:
-- Official
+- group:official
 ---
 Track: Broom Temperature
 Duration: '1:58'
diff --git a/album/the-wanderers.yaml b/album/the-wanderers.yaml
index 340ccfee..a03bcec7 100644
--- a/album/the-wanderers.yaml
+++ b/album/the-wanderers.yaml
@@ -7,7 +7,7 @@ Cover Artists:
 - Lauren Ross
 Color: '#ffcc66'
 Groups:
-- Official
+- group:official
 Art Tags:
 - WV
 - PM
diff --git a/album/tumblrstuck-bent-ost-volume-1.yaml b/album/tumblrstuck-bent-ost-volume-1.yaml
index 0183aeb6..5f693318 100644
--- a/album/tumblrstuck-bent-ost-volume-1.yaml
+++ b/album/tumblrstuck-bent-ost-volume-1.yaml
@@ -13,7 +13,7 @@ Cover Art File Extension: png
 Art Tags:
 - Skaia
 - Veil
-Color: '#0161ff'
+Color: '#2175ff'
 Groups:
 - Tumblrstuck/bent
 - Fandom
diff --git a/artists.yaml b/artists.yaml
index 8c0f79bf..459ecc7a 100644
--- a/artists.yaml
+++ b/artists.yaml
@@ -2267,6 +2267,10 @@ Artist: Keiichi Suzuki
 ---
 Artist: Keita Takahashi
 ---
+Artist: keity.pop
+Aliases:
+- Yuki Mizutani
+---
 Artist: Kelsie Urias
 ---
 Artist: Kenichi Matsubara
@@ -2762,6 +2766,8 @@ URLs:
 ---
 Artist: Margaret Cobb
 ---
+Artist: Mari Kikuma
+---
 Artist: MariEaster
 ---
 Artist: Marimo
@@ -3965,7 +3971,10 @@ URLs:
 ---
 Artist: Sarcastic Fringehead
 ---
-Artist: Satoru Kousaki
+Artist: Satoru Kōsaki
+Directory: satoru-kosaki
+Aliases:
+- Satoru Kousaki
 ---
 Artist: Saw
 ---
@@ -5501,6 +5510,8 @@ URLs:
 Artist: Máni Svavarsson
 Directory: mani-svavarsson
 ---
+Artist: Maniac Agenda
+---
 Artist: mediokreKarapase
 URLs:
 - https://mediokrek.tumblr.com/
diff --git a/flashes.yaml b/flashes.yaml
index 36f344a5..a3829f61 100644
--- a/flashes.yaml
+++ b/flashes.yaml
@@ -478,7 +478,7 @@ Flash: '[S] Descend.'
 Page: '1940'
 ---
 Color: '#0000ff'
-Act: 'Act 5 Act 1 - <span style="color: #008282">MOB1US DOUBL3 R34CH4ROUND</span>'
+Act: 'Act 5 Act 1 - <span style="color: #008b8b">MOB1US DOUBL3 R34CH4ROUND</span>'
 Anchor: a5a1
 ---
 Date: June 22, 2010
@@ -902,7 +902,7 @@ Featured Tracks:
 Flash: '[S] Jane: Get mail.'
 Page: '4282'
 ---
-Color: '#a10000'
+Color: '#eb0000'
 Act: Act 6 Intermission 1 - corpse party
 Anchor: a6i1
 ---
@@ -1434,7 +1434,7 @@ Flash: '[S] GAME OVER.'
 Page: '6901'
 ---
 Color: '#4466ff'
-Act: 'Act 6 Act 6 Intermission 4 - <span style="color: #008282">F1X TH1S</span>'
+Act: 'Act 6 Act 6 Intermission 4 - <span style="color: #008b8b">F1X TH1S</span>'
 Anchor: a6a6i4
 ---
 Date: November 24, 2014
diff --git a/groups.yaml b/groups.yaml
index 38295506..4cb7fda5 100644
--- a/groups.yaml
+++ b/groups.yaml
@@ -1,8 +1,23 @@
 Color: '#0088ff'
 Category: HSMusic
 ---
+Group: Official Discography
+Directory: official
 URLs:
 - https://homestuck.bandcamp.com/music
+Featured Albums:
+- Homestuck Vol. 1-4
+- Homestuck Vol. 10
+- Beyond Canon
+- AlterniaBound
+- Homestuck Vol. 8
+- Hiveswap Act 1 OST
+- 'coloUrs and mayhem: Universe A'
+- The Wanderers
+- Mobius Trip and Hadron Kaleido
+- Strife!
+- Genesis Frog
+- One Year Older
 Description: |-
     Albums released on Homestuck's official Bandcamp: the canon foundational to and long inspiring its massive fan community.
     <hr class="split">
@@ -11,8 +26,21 @@ Description: |-
     No official word was given regarding purposes for this distancing, but the consequences were clear: these compilations were the future; fan-contributed track art would be left in the past.
     With no ill intent towards those in charge of managing the Bandcamp, we (alongside many fans) found this disheartening, and more than a little disrespectful towards the effort and creativity of the fans responsible for the wonderful gallery of art created for Homestuck's expansive discography. So, when official decisions baffled, fans took action and tried something different; <a href="https://www.reddit.com/r/homestuck/comments/dwtc4w/i_made_a_wiki_for_homestuck_albums_including/">we released the Homestuck Music Wiki for the first time</a> on 15 November 2019, just three weeks after the Bandcamp restructure.
     Since then, we've been working with a variety of community members (listeners and musicians alike!) to improve and expand the wiki ever further; today, we hope it stands both a practical resource and a celebratory testament to the history - and future - of Homestuck music!
-Group: Official
 ---
+Group: Fandom
+Featured Albums:
+- Land of Fans and Music 5
+- P[S]
+- Diverging Delicacies
+- Beforus
+- Heaven;Sent
+- Friendsymphony
+- Songs Unsung
+- There's No Place Like Home
+- Perfectly Generic Album
+- SBURBAN NEIGHBORHOOD
+- Land of Fans and Music
+- Pantheon
 Description: |-
     Albums created by the Homestuck fan community, released independently.
     <hr class="split">
@@ -21,14 +49,26 @@ Description: |-
     (That story is really hers to tell, and that she did in the introduction to the [[album:lofam]] booklet. Give it a visit!)
     With the ball now rolling, fan musicians were creating and collaborating more than ever before; now they weren't just making music for themselves and for each other, to be shared on only a single colossal forum thread - their music would have a home!
     The community grew ever stronger and larger from there, and the albums below are just a portion of the result. With a fair amount of luck, this wiki has come to be a second home for the albums we share; we encourage you to explore: delve deep, find yourself lost, and discover something new!
-Group: Fandom
 ---
+Group: Beyond
+Featured Albums:
+- Psycholonials
+- Shortcuts
+- Oceanfalls Vol. 3
+- Songs from the Planet Earth
+- DELTARUNE Chapter 2 OST
+- We Are All Satellites
+- Exceptis Excipiendis
+- Labyrinth's Heart
+- album:are-you-lost
+- CLASS ACT
+- Ulterior Motives
+- Archive
 Description: |-
     Albums from a musical landscape beyond Homestuck, by artists with roots in the comic's own community.
     <hr class="split">
     Countless artists together made an early abode in the community around Homestuck, expanding their sound as they shared their music with other artists and listeners alike; many, in turn, would put their experience into works beyond the webcomic. Some began personal discographies; some scored games and other new projects, finding followings altogether anew; some joined together, collaboratively creating in a spirit inspired by the comic community's own fan-groups.
     Each of these musicians found roots in Homestuck, in time branching out beyond; the albums in this area of the wiki are a small selection of what they've gone on to create. We encourage you to delve in and explore; every album is its own unique work, and many familiar faces await within!
-Group: Beyond
 ---
 Group: Additional Tracks
 Description: |-
diff --git a/homepage.yaml b/homepage.yaml
index b01c665c..51552310 100644
--- a/homepage.yaml
+++ b/homepage.yaml
@@ -6,17 +6,44 @@ Sidebar Content: |-
     <hr>
     [[news]]
 ---
-Row: Official
+Row: Official Discography
 Type: albums
-Display Style: montage
-Group: Official
-Count: 18
+Display Style: carousel
+Group: group:official
+Count: 10
 Actions:
 - '[[group-gallery:official|Explore Official!]]'
 - '[[group-gallery:fandom|Fandom]]'
 - '[[group-gallery:beyond|Beyond]]'
+
 ---
 Row: New Additions
 Type: albums
-Group: new-additions
-Count: 6
+Albums:
+- album:lofam5
+- album:deltarune-ch2-ost
+- album:ulterior-motives
+
+- album:friendsim-2-volume-1
+- album:pantheon
+- album:songs-unsung
+
+- album:cool-and-new-voulem1
+- album:cool-and-new-volume-2
+- album:cool-and-new-volume-ii
+- album:of-troles-and-chiptumes
+
+- album:sburban-neighborhood
+- album:skaias-the-limit
+- album:songs-from-the-planet-earth
+- album:s-press-play
+
+- album:homestuck-swagazaki
+- album:heaven-sent
+- album:ophiuchus-full-suite
+- album:homestuck-for-orchestra-ep
+
+- album:tumblrstuck-bent-ost-volume-1
+- album:team-paradox
+- album:bee-forus-seatbelt-safebee
+- album:sburb-ost-bonus-dlc
diff --git a/static-page/changelog.yaml b/static-page/changelog.yaml
index 714e4827..2472e8d2 100644
--- a/static-page/changelog.yaml
+++ b/static-page/changelog.yaml
@@ -25,16 +25,26 @@ Style: |-
 Content: |-
     <h2 id="12-jun-2077" class="major-release"><a href="#12-jun-2077">[[date:12 June 2077]] - (Preview changelog!)</a></h2>
     <h3>site changes</h3>
-    - (nebula writes about all the site changes here)
+    - major restructure of all internal data structures as well as data file format, laying foundations for all following changes and additions to wiki features and lending much better to interoperability with outside code and internal data validation and error reporting
+        - improved automatic data error reporting lead to many dozens of diverse data issues that had previously slipped by getting fixed this update, much improving overall wiki quality and raising the baseline level of data consistency
     - new Additional Files feature added, including downloadable album booklets and other goodies, present across many official albums: [[album:midnight-crew-drawing-dead]], [[album:homestuck-vol-4]], [[album:homestuck-vol-5]], [[album:alternia]], [[album:squiddles]], [[album:strife]], [[album:alterniabound]], [[album:homestuck-vol-7]], [[album:mobius-trip-and-hadron-kaleido]], [[album:sburb]], [[album:the-wanderers]], [[album:homestuck-vol-8]], [[album:coloUrs-and-mayhem-universe-a]], [[album:coloUrs-and-mayhem-universe-b]], [[album:homestuck-vol-9]], [[album:symphony-impossible-to-play]], [[album:one-year-older]], [[album:cherubim]], and [[album:homestuck-vol-10]]
         - includes all booklets and resources released with official albums that aren't included in downloads from the recent (2019) official Homestuck Bandcamp restructure
         - files from solo re-releases are included and shared publicly on the wiki with permission from their original artists
         - includes unedited versions of Bandcamp banners and backgrounds used throughout the wiki
         - includes a few wallpapers and sheet music shared separately by the creators
+    - page headers, such as the main titles of albums and tracks, are now styled to be "sticky" - they follow the page scroll stuck to the top of the screen so you can always identify what page you're viewing at a glance
+    - new metadata for "social embeds" included on all album and track pages, making nice modals appear when linking to HSMusic from sites like Discord or... like... Facebook
+    - metadata for the page "theme color" makes elements of some web browsers subtly take on the color of the page (Safari and mobile)
+    - support added for uncompressed PNG album and track artworks
+        - these don't replace the compressed jpeg thumbnails, but when you click art to view it in full, you'll get its lossless PNG format when available
+        - mostly newly added albums for now, but more official and fandom artwork will be brought over soon
+    - listing changes:
+        - "new" [[listing:albums/by-date-added|Albums - by Date Added]] listing, which has actually existed since [[news-entry:the-my-ex-wife-is-a-real-bitch-update|May 2021]], but was previously somehow at <a href="https://github.com/hsmusic/hsmusic-wiki/issues/53">a typo'd path</a> and wasn't accessible from the listing index
+        - [[listing:tracks/with-lyrics|Tracks - with Lyrics]] listing now sorts by album date instead of track date, i.e. so all tracks from the same album are always grouped together (thanks, Geese!)
+        - [[listing:tracks/by-times-referenced|Tracks - by Times Referenced]] listing now excludes re-release tracks (such as [[track:black-vol-1-4]] from [[album:homestuck-vol-1-4]])
     - [[album:unreleased-tracks]] has been completely reorganized, with many tracks having been moved to new organizational albums [[album:more-homestuck-fandom]] and [[album:references-beyond-homestuck]], all collected under new [[group:additional-tracks]] group
-    - "new" [[listing:albums/by-date-added|Albums - by Date Added]] listing, which has actually existed since [[news-entry:the-my-ex-wife-is-a-real-bitch-update|May 2021]], but was previously somehow at <a href="https://notabug.org/hsmusic/hsmusic-wiki/issues/53">a typo'd path</a> and wasn't accessible from the listing index
     - "Tracks that reference..." lists are now grouped by Beyond and Additional Tracks as well, instead of grouping everything that's not an official Homestuck track under Fandom
-    - re-release tracks (such as [[track:black-vol-1-4]] from [[album:homestuck-vol-1-4]]) are no longer displayed in "Tracks that referenec" lists, and aren't counted in the [[listing:tracks/by-times-referenced|Tracks - by Times Referenced]] listing
+    - re-release tracks (such as [[track:black-vol-1-4]] from [[album:homestuck-vol-1-4]]) are no longer displayed in "Tracks that reference" lists
     - colored track sections were removed from [[album:unreleased-tracks]] since it's been divided into [[group:additional-tracks|more specific albums anyway]], but they're now used in other areas of the site, including [[album:prospit-and-derse]] and [[album:homestuck-vol-1-4]]
     - though not all art has been ported yet, many albums and tracks (including most new ones) now have full resolution PNG artwork, accessible by clicking the cover art (thumbnails are still downscaled JPEGs to reduce data usage when generally browsing the wiki), as well as PNG banner and backgrounds where applicable
     - "short name" for the wiki changed has been chagned from "HSMusic" to "HSMusic Wiki" - this shows up in browser tab titles, the site navigation bar, and social embeds like Discord
diff --git a/tags.yaml b/tags.yaml
index 36fbdf4e..fe3e68a8 100644
--- a/tags.yaml
+++ b/tags.yaml
@@ -1,13 +1,13 @@
-Color: '#4c56e6'
+Color: '#5c66e8'
 Tag: John
 ---
-Color: '#4c56e6'
+Color: '#5c66e8'
 Tag: June
 ---
-Color: '#4c56e6'
+Color: '#5c66e8'
 Tag: Jhon
 ---
-Color: '#4c56e6'
+Color: '#5c66e8'
 Tag: John (Heinoustuck)
 ---
 Color: '#b536da'
@@ -61,28 +61,28 @@ Tag: Kankri
 Color: '#7c7e81'
 Tag: Karkat's lusus
 ---
-Color: '#a10000'
+Color: '#eb0000'
 Tag: Aradia
 ---
-Color: '#a10000'
+Color: '#eb0000'
 Tag: The Handmaid
 ---
-Color: '#a10000'
+Color: '#eb0000'
 Tag: Damara
 ---
-Color: '#a10000'
+Color: '#eb0000'
 Tag: Aradia's lusus
 ---
-Color: '#a15000'
+Color: '#c36100'
 Tag: Tavros
 ---
-Color: '#a15000'
+Color: '#c36100'
 Tag: The Summoner
 ---
-Color: '#a15000'
+Color: '#c36100'
 Tag: Rufioh
 ---
-Color: '#a15000'
+Color: '#c36100'
 Tag: Tavros' lusus
 ---
 Color: '#a1a100'
@@ -97,106 +97,106 @@ Tag: Mituna
 Color: '#a1a100'
 Tag: Sollux's lusus
 ---
-Color: '#416600'
+Color: '#588a00'
 Tag: Nepeta
 ---
-Color: '#416600'
+Color: '#588a00'
 Tag: The Disciple
 ---
-Color: '#416600'
+Color: '#588a00'
 Tag: Meulin
 ---
-Color: '#416600'
+Color: '#588a00'
 Tag: Nepeta's lusus
 ---
-Color: '#008141'
+Color: '#008f48'
 Tag: Kanaya
 ---
-Color: '#008141'
+Color: '#008f48'
 Tag: The Dolorosa
 ---
-Color: '#008141'
+Color: '#008f48'
 Tag: Porrim
 ---
-Color: '#008141'
+Color: '#008f48'
 Tag: Kanaya's lusus
 ---
-Color: '#008282'
+Color: '#008b8b'
 Tag: Terezi
 ---
-Color: '#008282'
+Color: '#008b8b'
 Tag: Terexi
 ---
-Color: '#008282'
+Color: '#008b8b'
 Tag: Redglare
 ---
-Color: '#008282'
+Color: '#008b8b'
 Tag: Latula
 ---
-Color: '#005682'
+Color: '#3796c6'
 Tag: Vriska
 ---
-Color: '#005682'
+Color: '#3796c6'
 Tag: Mindfang
 ---
-Color: '#005682'
+Color: '#3796c6'
 Tag: Aranea
 ---
-Color: '#005682'
+Color: '#3796c6'
 Tag: Vriska's lusus
 ---
-Color: '#1313be'
+Color: '#c6c6f0'
 Tag: Equius
 ---
-Color: '#1313be'
+Color: '#c6c6f0'
 Tag: Equihorse
 ---
-Color: '#1313be'
+Color: '#c6c6f0'
 Tag: The Expatriate
 ---
-Color: '#1313be'
+Color: '#c6c6f0'
 Tag: Horuss
 ---
-Color: '#1313be'
+Color: '#c6c6f0'
 Tag: Equius's lusus
 ---
-Color: '#6800d6'
+Color: '#a34bff'
 Tag: Gamzee
 ---
-Color: '#6800d6'
+Color: '#a34bff'
 Tag: Gametez
 ---
-Color: '#6b00d6'
+Color: '#a34bff'
 Tag: The Grand Highblood
 ---
-Color: '#6b00d6'
+Color: '#a34bff'
 Tag: Kurloz
 ---
-Color: '#6b00d6'
+Color: '#a34bff'
 Tag: Gamzee's lusus
 ---
-Color: '#9e009e'
+Color: '#db00db'
 Tag: Eridan
 ---
-Color: '#9e009e'
+Color: '#db00db'
 Tag: Dualscar
 ---
-Color: '#9e009e'
+Color: '#db00db'
 Tag: Cronus
 ---
-Color: '#9e009e'
+Color: '#db00db'
 Tag: Eridan's lusus
 ---
-Color: '#77003c'
+Color: '#e30072'
 Tag: Feferi
 ---
-Color: '#77003c'
+Color: '#e30072'
 Tag: The Condesce
 ---
-Color: '#77003c'
+Color: '#e30072'
 Tag: Meenah
 ---
-Color: '#77003c'
+Color: '#e30072'
 Tag: Feferi's lusus
 ---
 Color: '#a1a3a6'
@@ -301,7 +301,7 @@ Tag: Gate
 Color: '#f7addc'
 Tag: Lotus
 ---
-Color: '#008141'
+Color: '#008f48'
 Tag: Matriorb
 ---
 Color: '#808080'
@@ -310,19 +310,19 @@ Tag: Tumor
 Color: '#00ff00'
 Tag: Green Sun
 ---
-Color: '#ffffff'
+Color: '#e0e0e0'
 Tag: God Cat
 ---
-Color: '#ffffff'
+Color: '#e0e0e0'
 Tag: Becquerel
 ---
-Color: '#ffffff'
+Color: '#e0e0e0'
 Tag: Beq
 ---
-Color: '#ffffff'
+Color: '#e0e0e0'
 Tag: John's dad
 ---
-Color: '#ffffff'
+Color: '#e0e0e0'
 Tag: Dadd
 ---
 Color: '#00d5f2'
@@ -337,7 +337,7 @@ Tag: Dave's bro
 Color: '#1f9400'
 Tag: Jade's grandpa
 ---
-Color: '#4c56e6'
+Color: '#5c66e8'
 Tag: Jane's grandpa
 ---
 Color: '#b536da'
@@ -349,7 +349,7 @@ Tag: Dirk's bro
 Color: '#4ac925'
 Tag: Jake's grandma
 ---
-Color: '#ffffff'
+Color: '#e0e0e0'
 Tag: Femorafreack
 ---
 Color: '#e0e0e0'
@@ -361,10 +361,10 @@ Tag: PM
 Color: '#ffea00'
 Tag: AR
 ---
-Color: '#ffffff'
+Color: '#e0e0e0'
 Tag: WQ
 ---
-Color: '#ffffff'
+Color: '#e0e0e0'
 Tag: WK
 ---
 Color: '#7b7b7b'
@@ -391,22 +391,22 @@ Tag: DD
 Color: '#c39797'
 Tag: Dacronian Dignity
 ---
-Color: '#7b7b7b'
+Color: '#8a8a8a'
 Tag: Jack Noir
 ---
-Color: '#ffffff'
+Color: '#e0e0e0'
 Tag: Serenity
 ---
-Color: '#ffffff'
+Color: '#e0e0e0'
 Tag: Doc Scratch
 ---
-Color: '#ffffff'
+Color: '#e0e0e0'
 Tag: Snowman
 ---
-Color: '#ffffff'
+Color: '#e0e0e0'
 Tag: AH
 ---
-Color: '#ffffff'
+Color: '#e0e0e0'
 Tag: MSPA Reader
 ---
 Color: '#2ed73a'
@@ -427,7 +427,7 @@ Tag: Sweet Bro
 Color: '#f34a5e'
 Tag: Swet Bro
 ---
-Color: '#023cff'
+Color: '#4570ff'
 Tag: Hella Jeff
 ---
 Color: '#f34a5e'
@@ -445,19 +445,13 @@ Tag: Jude
 Color: '#f42123'
 Tag: Xefros
 ---
-Color: '#a15000'
-Tag: Dammek
----
-Color: '#77003c'
-Tag: Trizza
----
 Color: '#0671cd'
 Tag: Harry
 ---
-Color: '#5e00bd'
+Color: '#a44bff'
 Tag: Tavvy
 ---
-Color: '#005682'
+Color: '#3796c6'
 Tag: Vrissy
 ---
 Color: '#f42123'
@@ -580,7 +574,7 @@ Tag: Mobius Trip
 Color: '#ff01fe'
 Tag: Hadron Kaleido
 ---
-Color: '#7d34eb'
+Color: '#8e4fee'
 Tag: Alternia
 ---
 Color: '#d743be'
@@ -622,10 +616,10 @@ Tag: LoBaF
 Color: '#00d5f2'
 Tag: LoCaH
 ---
-Color: '#1313be'
+Color: '#c6c6f0'
 Tag: LoCaS
 ---
-Color: '#77003c'
+Color: '#e30072'
 Tag: LoDaG
 ---
 Color: '#4ac925'
@@ -640,10 +634,10 @@ Tag: LoHaC
 Color: '#b536da'
 Tag: LoLaR
 ---
-Color: '#416600'
+Color: '#588a00'
 Tag: LoLCaT
 ---
-Color: '#005682'
+Color: '#3796c6'
 Tag: LoMaT
 ---
 Color: '#1f9400'
@@ -655,28 +649,28 @@ Tag: LoPaH
 Color: '#ff6ff2'
 Tag: LoPaN
 ---
-Color: '#008141'
+Color: '#008f48'
 Tag: LoRaF
 ---
 Color: '#f2a400'
 Tag: LoTaK
 ---
-Color: '#6800d6'
+Color: '#a34bff'
 Tag: LoTaM
 ---
-Color: '#a10000'
+Color: '#eb0000'
 Tag: LoQaM
 ---
-Color: '#a15000'
+Color: '#c36100'
 Tag: LoSaZ
 ---
-Color: '#008282'
+Color: '#008b8b'
 Tag: LoTaF
 ---
-Color: '#9e009e'
+Color: '#db00db'
 Tag: LoWaA
 ---
-Color: '#4c56e6'
+Color: '#666fe9'
 Tag: LoWaS
 ---
 Color: '#7c7e81'
@@ -688,10 +682,10 @@ Tag: Prospit
 Color: '#4bdcf9'
 Tag: Skaia
 ---
-Color: '#6a6a6a'
+Color: '#7c7c7c'
 Tag: Veil
 ---
-Color: '#6800d6'
+Color: '#a34bff'
 Tag: Dark Carnival
 ---
 Color: '#84fff2'
@@ -700,10 +694,10 @@ Tag: Sans
 Color: '#ce3382'
 Tag: Kate (Desynced)
 ---
-Color: '#6e3382'
+Color: '#a75ec0'
 Tag: Kate's dad (Desynced)
 ---
-Color: '#4545f9'
+Color: '#6a6afa'
 Tag: Evan (Desynced)
 ---
 Color: '#dd1c1c'
@@ -715,10 +709,10 @@ Tag: Josh (Desynced)
 Color: '#fba500'
 Tag: Enid (Desynced)
 ---
-Color: '#0b1f81'
+Color: '#5771f1'
 Tag: Lee (Desynced)
 ---
-Color: '#5c0474'
+Color: '#c91ef7'
 Tag: '"Her" (Desynced)'
 ---
 Color: '#e9e9e9'
@@ -730,7 +724,7 @@ Tag: Skaia (Desynced)
 Color: '#3091ef'
 Tag: Gaea (Desynced)
 ---
-Color: '#850b59'
+Color: '#e9139c'
 Tag: Ananke (Desynced)
 ---
 Color: '#f8701e'
@@ -742,7 +736,7 @@ Tag: Styx (Desynced)
 Color: '#ffc331'
 Tag: Phoebe (Desynced)
 ---
-Color: '#8d58b5'
+Color: '#9868bc'
 Tag: Aria (Oceanfalls)
 ---
 Color: '#a3cb6a'
@@ -774,7 +768,7 @@ Tag: Reed (Oceanfalls)
 ---
 Tag: Ruit (Oceanfalls)
 ---
-Color: '#5b4fd4'
+Color: '#786edb'
 Tag: Ruta (Oceanfalls)
 ---
 Color: '#fef49f'
@@ -856,4 +850,4 @@ Tag: genitalia
 Is CW: true
 ---
 Tag: racial slur
-Is CW: true
\ No newline at end of file
+Is CW: true