Merge branch 'preview' into refs-beyond-fixes-merge

21 files changed, 1064 insertions, 432 deletions

diff --git a/album/hiveswap-act-1-ost.yaml b/album/hiveswap-act-1-ost.yaml
index 2e2a0ae..412f560 100644
--- a/album/hiveswap-act-1-ost.yaml
+++ b/album/hiveswap-act-1-ost.yaml
@@ -13,6 +13,8 @@ Cover Artists:
 Cover Art File Extension: png
 Color: '#33cc77'
 Groups:
+- James Roach
+- Toby Fox
 - group:official
 Art Tags:
 - Joey
@@ -243,7 +245,7 @@ URLs:
 - https://youtu.be/47IOSYnYiRc
 Referenced Tracks:
 - Rustblood
-- track:drone-pq
+- track:drone-pesterquest
 Commentary: |-
     <i>Toby Fox:</i>
     I think I was asked to make this sound kind of 80's back when the game was going to be in 3D. I mean, either that, or I made it sound kind of 80's for no reason. Anyway, it's just an arrangement of Xefros's theme that I made for when tense stuff is happening.
diff --git a/album/hiveswap-act-2-ost.yaml b/album/hiveswap-act-2-ost.yaml
index b7126b5..c427613 100644
--- a/album/hiveswap-act-2-ost.yaml
+++ b/album/hiveswap-act-2-ost.yaml
@@ -9,6 +9,8 @@ Cover Artists:
 Cover Art File Extension: png
 Color: '#f8f0cb'
 Groups:
+- James Roach
+- Toby Fox
 - group:official
 Art Tags:
 - Joey
@@ -313,6 +315,6 @@ URLs:
 - https://homestuck.bandcamp.com/track/drone
 - https://youtu.be/AGgey4ok3pc
 Referenced Tracks:
-- track:drone-pq
+- track:drone-pesterquest
 - Intermission 1
 - Rustblood
diff --git a/album/hiveswap-friendsim.yaml b/album/hiveswap-friendsim.yaml
index e9a4024..50b679d 100644
--- a/album/hiveswap-friendsim.yaml
+++ b/album/hiveswap-friendsim.yaml
@@ -14,6 +14,7 @@ Default Track Cover Artists:
 Cover Art File Extension: png
 Color: '#d3ff8f'
 Groups:
+- James Roach
 - group:official
 Art Tags:
 - MSPA Reader
@@ -398,12 +399,12 @@ URLs:
 - https://homestuck.bandcamp.com/track/turns-out-its-like-the-shoe
 - https://soundcloud.com/jamesroachmusic/lmao-i-still-dont-know-if-its-nicky-or-nike-like-the-shoe-not-like-the-name-mike
 Referenced Tracks:
-- track:drone-pq
+- track:drone-pesterquest
 Commentary: |-
     <i>James Roach:</i>
     (Nihkee's theme)
     i started streaming my work now since its less of a surprise who the characters are. i went through like... five different versions of this track. this was gonna be disco i dont know what i was thinking.
-    we ended up going with this one which is actually meant for a different part of ACT 2. In ACT 1, the song "[[track:keep-your-head-down]]" has a [[track:drone-pq|rhythmic motif]] that I use in the climax of this song. I wont tell you what its for but... think of whats happening during that song in ACT 1, and know that it will be a much bigger deal when you eventually see it. i don't have any information wrt "when" that would be helpful to you. its barely even helpful to me. a real "buddy, they dont even let ME fuck the flag" situation. this is a reference to a popular tweet. im not an insane person i swear.
+    we ended up going with this one which is actually meant for a different part of ACT 2. In ACT 1, the song "[[track:keep-your-head-down]]" has a [[track:drone-pesterquest|rhythmic motif]] that I use in the climax of this song. I wont tell you what its for but... think of whats happening during that song in ACT 1, and know that it will be a much bigger deal when you eventually see it. i don't have any information wrt "when" that would be helpful to you. its barely even helpful to me. a real "buddy, they dont even let ME fuck the flag" situation. this is a reference to a popular tweet. im not an insane person i swear.
     anyway nihkees sprite is absolutely fucking ripped. the size of this lad. the A in LGBTQA+ stands for ABSOLUTE UNIT apparently.
     I know it does not please do not @ me i am so fucking tired.
 ---
diff --git a/album/lofam5.yaml b/album/lofam5.yaml
index 56dd8d1..0b8c00f 100644
--- a/album/lofam5.yaml
+++ b/album/lofam5.yaml
@@ -648,7 +648,7 @@ Cover Artists:
 Art Tags:
 - Karkat
 Referenced Tracks:
-- track:crustacean-pq
+- track:crustacean-pesterquest
 Commentary: |-
     <i>Makin:</i> (album management)
     Damn did you know this track references "[[Crustacean]]" by [[group:toby-fox|Toby "Radiation" Fox]]???
diff --git a/album/more-homestuck-fandom.yaml b/album/more-homestuck-fandom.yaml
index dc45864..91625da 100644
--- a/album/more-homestuck-fandom.yaml
+++ b/album/more-homestuck-fandom.yaml
@@ -2,7 +2,7 @@ Album: More Homestuck Fandom
 Has Track Numbers: false
 Groups:
 - Additional Tracks
-Color: '#6c75f5'
+Color: '#7d88fa'
 ---
 Section: Fanmusic from the official team
 ---
@@ -116,6 +116,30 @@ Lyrics: |-
     Adrien Brody Adrien Brody Adrien Brody Adrien Brody
     Adrien Brody Adrien Brody Adrien Brody Adrien Brody
 ---
+Track: Busker's Theme
+Artists:
+- James Roach
+Duration: '0:47'
+URLs:
+- https://jamesroach.tumblr.com/post/172233581852/originally-there-was-a-troll-in-act-2-code
+- https://hsmusic.wiki/media/misc/archive/Busker's%20Theme.mp3
+Commentary: |-
+    <i>James Roach:</i> ([Tumblr](https://jamesroach.tumblr.com/post/172233581852/originally-there-was-a-troll-in-act-2-code))
+
+    Originally there was a troll in act 2 code named “Busker” that was the alternian version of those like.. one man bands you see when you go to venice beach [or like on the subway or w/e](https://www.youtube.com/watch?v=PfINfEhxnLA). Just him and his weird accordion that also somehow made all these extra sounds.
+
+    Anyway if you went up to him and did the right dialogue he would play you his song, which was this. I think he got written out because he was kind of a one note character ‘,:^]
+
+    <i>mkteres:</i> ([Tumblr](https://jamesroach.tumblr.com/post/182161109567/mkteres-jamesroachmusic-originally-there-was))
+
+    <img src="media/misc/busker-mkteres.jpg" width="275">
+
+    well imma just put my interpretation of busker here
+
+    <i>James Roach:</i> ([Tumblr](https://jamesroach.tumblr.com/post/182161109567/mkteres-jamesroachmusic-originally-there-was))
+
+    <small>#nice. i think they were... cerulean? i dont remember</small>
+---
 Track: Calliope
 Directory: calliope-malcolm-brown
 Always Reference By Directory: true
diff --git a/album/namco-high-official-soundtrack.yaml b/album/namco-high-official-soundtrack.yaml
new file mode 100644
index 0000000..3900e48
--- /dev/null
+++ b/album/namco-high-official-soundtrack.yaml
@@ -0,0 +1,133 @@
+Album: NAMCO HIGH OFFICIAL SOUNDTRACK
+Has Track Numbers: false
+Color: '#ee4e9d'
+Date: December 17, 2013
+Artists:
+- Ryan Francis
+Cover Artists:
+- Ahvia
+- Namco High
+Cover Art File Extension: png
+Wallpaper Artists:
+- Ahvia
+- Quasar Nebula (edits for wiki)
+Groups:
+- Beyond
+Additional Files:
+- Title: Namco High website background
+  Files:
+  - bg.jpg
+Commentary: |-
+    <i>Quasar Nebula:</i> (wiki editor)
+
+    [[flash:namco-high|Namco High]] is a collaborative visual novel where you play as the Cousin to the main character of Katamari Damacy (and related games), and get to meet and/or seduce a host of characters from various game franchises of Namco Bandai... as well as... characters from Homestuck, too!?
+
+    The digital soundtrack [was released](https://web.archive.org/web/20131118183641/http://www.namcohigh.com:80/) as part of the game's pre-order ["Deluxe Pak"](https://web.archive.org/web/20131119225142/http://www.welovefine.com/7003-deluxe-pack.html#.UoXPyZRZ7qE). Although the track names are official, they don't appear to have been numbered, so the order used here is arbitrary.
+
+    The in-game files, listed as additional names, include both .ogg and .m4a versions of each track. The digital soundtrack packages those same in-game tracks as .mp3 with proper metadata (except for track numbers).
+---
+Track: Title Theme
+Directory: title-theme-namco-high
+Always Reference By Directory: true
+Additional Names:
+- namcotheme (game filename)
+Referenced Tracks:
+- Namco High (Be True To Yourself)
+Duration: 1:36
+URLs:
+- https://www.youtube.com/watch?v=-17X8revmwc
+---
+Track: School Times
+Additional Names:
+- school (game filename)
+Duration: 2:09
+URLs:
+- https://www.youtube.com/watch?v=aL7aNkwNrUg
+---
+Track: Around Town
+Additional Names:
+- aroundtown (game filename)
+Duration: 0:38
+URLs:
+- https://www.youtube.com/watch?v=e-HKNpS-yx4
+---
+Track: Private Times
+Additional Names:
+- privatetimes (game filename)
+Duration: 0:32
+URLs:
+- https://www.youtube.com/watch?v=z4YUSJeSRUc
+---
+Track: Sad Times
+Additional Names:
+- sadtimes (game filename)
+Duration: 1:06
+URLs:
+- https://www.youtube.com/watch?v=HnkiknLZU8k
+---
+Track: Romance Times
+Additional Names:
+- romance (game filename)
+Duration: 0:37
+URLs:
+- https://www.youtube.com/watch?v=gXifOOgAwzM
+---
+Track: Upbeat Times
+Additional Names:
+- upbeat
+Duration: 1:49
+URLs:
+- https://www.youtube.com/watch?v=IWi80QmUEw4
+---
+Track: Upbeat Times (Half)
+Additional Names:
+- upbeat_half
+Duration: 2:33
+Referenced Tracks:
+- Upbeat Times
+URLs:
+- https://www.youtube.com/watch?v=H_PyGnlM2w4
+---
+Track: Battle Music
+Additional Names:
+- bosstheme
+Duration: 2:08
+Referenced Tracks:
+- Namco High (Be True To Yourself)
+URLs:
+- https://www.youtube.com/watch?v=Q8ace06keaQ
+---
+Track: Namco High (Be True To Yourself)
+Additional Names:
+- credits
+Contributors:
+- Mary Thomas (vocals)
+Duration: 2:43
+URLs:
+- https://www.youtube.com/watch?v=QuWdIDEwjRk
+Lyrics: |-
+    Be true to yourself
+    Namco High
+
+    Please have a good time
+    Be satisfied with life
+    Take the high road
+    Remember the moon is watching us
+
+    Don't have an itch
+    The coffee's not going cold
+    Work your way for me
+    Therefore I'm here
+
+    (Hey!
+    How's it going?
+    Good! How 'bout you?
+    Geometry's really hard, I think I need help
+    Oh, well, I'm really good at it, so... if you need help just hit me up!
+    Awesome! Yeah, I'll do that)
+
+    Be true to yourself
+    Namco High
+
+    Be true to yourself
+    Namco High
diff --git a/album/oceanfalls-vol-2.yaml b/album/oceanfalls-vol-2.yaml
index ee8c580..c907a2f 100644
--- a/album/oceanfalls-vol-2.yaml
+++ b/album/oceanfalls-vol-2.yaml
@@ -3,6 +3,7 @@ Date: April 27, 2019
 Date Added: January 12, 2021
 URLs:
 - https://nightslights.bandcamp.com/album/oceanfalls-vol-2
+- https://www.youtube.com/watch?v=UyeKdsKg0vw
 Cover Artists:
 - nights
 Color: '#ca7150'
@@ -37,8 +38,16 @@ Artists:
 Duration: '1:17'
 URLs:
 - https://nightslights.bandcamp.com/track/a-wild-monster-appeared
+Cover Artists:
+- "[AT]"
+Cover Art Date: January 25, 2024
 Referenced Tracks:
 - track:battle-wild-pokemon-pokemon-red-and-blue-versions
+Art Tags:
+- Nino (Oceanfalls)
+- Five (Oceanfalls)
+- 'cw: blood'
+- 'cw: body horror'
 ---
 Track: Moongaze
 Artists:
@@ -62,6 +71,7 @@ Cover Artists:
 Art Tags:
 - Nino (Oceanfalls)
 - Five (Oceanfalls)
+- Ludwig (Oceanfalls)
 ---
 Track: Deep Into the Dead Forest
 Artists:
@@ -84,6 +94,7 @@ Cover Artists:
 - Wights End
 Art Tags:
 - Aria (Oceanfalls)
+- Ludwig (Oceanfalls)
 ---
 Track: Long Ago
 Artists:
@@ -102,6 +113,11 @@ Artists:
 Duration: '2:42'
 URLs:
 - https://nightslights.bandcamp.com/track/reminiscence
+Cover Artists:
+- Wights End
+Cover Art Date: January 25, 2024
+Art Tags:
+- Aria (Oceanfalls)
 ---
 Track: Aria's House
 Artists:
@@ -111,6 +127,11 @@ URLs:
 - https://nightslights.bandcamp.com/track/arias-house
 Referenced Tracks:
 - track:illusions-oceanfalls
+Cover Artists:
+- n3rdysk3tch3s
+Cover Art Date: January 25, 2024
+Art Tags:
+- Aria (Oceanfalls)
 ---
 Track: Arts and Crafts
 Artists:
@@ -124,6 +145,7 @@ Art Tags:
 - Five (Oceanfalls)
 - Solis (Oceanfalls)
 - Lune (Oceanfalls)
+- Sis (Oceanfalls)
 ---
 Track: Monstertown
 Artists:
@@ -131,6 +153,9 @@ Artists:
 Duration: '1:18'
 URLs:
 - https://nightslights.bandcamp.com/track/monstertown
+Cover Artists:
+- Wights End
+Cover Art Date: January 25, 2024
 ---
 Track: No Horn No Cash No Service
 Artists:
@@ -138,6 +163,10 @@ Artists:
 Duration: '2:24'
 URLs:
 - https://nightslights.bandcamp.com/track/no-horn-no-cash-no-service
+Cover Artists:
+- leiirue
+Cover Art Date: January 25, 2024
+# Unnamed one-off character, per leii
 ---
 Track: Nothing But a Small Request
 Artists:
@@ -173,6 +202,10 @@ URLs:
 - https://nightslights.bandcamp.com/track/encounter-with-hostile-maids
 Cover Artists:
 - yazshu
+Art Tags:
+- Avarita (Oceanfalls)
+- Gula (Oceanfalls)
+- Ira (Oceanfalls)
 ---
 Track: Dear Little Queen
 Artists:
@@ -219,6 +252,12 @@ Artists:
 Duration: '1:38'
 URLs:
 - https://nightslights.bandcamp.com/track/remember-you
+Cover Artists:
+- Nights
+Cover Art Date: January 25, 2024
+Art Tags:
+- Nino (Oceanfalls)
+- Aria (Oceanfalls)
 ---
 Track: Sage Chains
 Artists:
@@ -237,6 +276,12 @@ Artists:
 Duration: '2:38'
 URLs:
 - https://nightslights.bandcamp.com/track/swaying-chains
+Cover Artists:
+- yazshu
+Cover Art Date: January 25, 2024
+Art Tags:
+- Corona (Oceanfalls)
+- 'cw: blood (abstract)'
 ---
 Track: In Another World
 Artists:
@@ -314,6 +359,15 @@ Artists:
 Duration: '1:49'
 URLs:
 - https://nightslights.bandcamp.com/track/the-fifth-flower
+Cover Artists:
+- Hiklight
+Cover Art Date: January 25, 2024
+Art Tags:
+- Five (Oceanfalls)
+- Reed (Oceanfalls)
+- Meimona (Oceanfalls)
+- Nino (Oceanfalls)
+- Aria (Oceanfalls)
 ---
 Track: Left in a Forest
 Artists:
@@ -332,6 +386,11 @@ Artists:
 Duration: '1:36'
 URLs:
 - https://nightslights.bandcamp.com/track/court-of-one-thousand-and-one-pawns
+Cover Artists:
+- nights
+Cover Art Date: January 25, 2024
+Art Tags:
+- Suvillan (Oceanfalls)
 ---
 Section: Bonus tracks
 ---
diff --git a/album/oceanfalls-vol-3.yaml b/album/oceanfalls-vol-3.yaml
index 76a9c59..430a69b 100644
--- a/album/oceanfalls-vol-3.yaml
+++ b/album/oceanfalls-vol-3.yaml
@@ -34,6 +34,8 @@ URLs:
 - https://nightslights.bandcamp.com/track/a-long-time-ago
 Cover Artists:
 - nights
+Art Tags:
+- Lady Oshen (Oceanfalls)
 ---
 Track: The Cavern of Illusions
 Artists:
@@ -98,6 +100,7 @@ Art Tags:
 - Nino (Oceanfalls)
 - Meimona (Oceanfalls)
 - Kaji (Oceanfalls)
+- Boyfriend (Oceanfalls)
 ---
 Track: Best Boyfriend
 Artists:
@@ -107,6 +110,8 @@ URLs:
 - https://nightslights.bandcamp.com/track/best-boyfriend
 Cover Artists:
 - nights
+Art Tags:
+- Boyfriend (Oceanfalls)
 Lyrics: |-
     (Meow)
 ---
@@ -134,6 +139,9 @@ Cover Artists:
 - nights
 Art Tags:
 - Kaji (Oceanfalls)
+- Blackfin (Oceanfalls)
+- Warty (Oceanfalls)
+- Weddell (Oceanfalls)
 ---
 Track: Galactic Princess Selene Opening 1
 Artists:
@@ -181,6 +189,8 @@ URLs:
 - https://nightslights.bandcamp.com/track/cinders
 Cover Artists:
 - Hadron
+Art Tags:
+- Marzipan Aries (Oceanfalls)
 ---
 Track: Raven Hood (Mei Appears)
 Artists:
@@ -216,6 +226,7 @@ Cover Artists:
 - nights
 Art Tags:
 - Selene (Oceanfalls)
+- Cats
 Referenced Tracks:
 - ANGRY CAT OwO
 ---
@@ -238,6 +249,8 @@ URLs:
 - https://nightslights.bandcamp.com/track/onyxs-theme
 Cover Artists:
 - nights
+Art Tags:
+- Onyx (Oceanfalls)
 ---
 Track: Tale of Valkyries
 Artists:
@@ -250,6 +263,7 @@ Cover Artists:
 Art Tags:
 - Nino (Oceanfalls)
 - Meimona (Oceanfalls)
+- Herja Aquarius (Oceanfalls)
 ---
 Track: Ytu Rendy
 Artists:
@@ -281,6 +295,7 @@ Referenced Tracks:
 - Galactic Princess Selene Opening 1
 Art Tags:
 - Selene (Oceanfalls)
+- Cats
 ---
 Track: Kaji's Theme
 Artists:
@@ -305,5 +320,8 @@ Cover Artists:
 - Hadron
 Art Tags:
 - Kaji (Oceanfalls)
+- Blackfin (Oceanfalls)
+- Warty (Oceanfalls)
+- Weddell (Oceanfalls)
 Referenced Tracks:
 - Sea Patrol (Ocean Quarrel)
diff --git a/album/oceanfalls-vol-4.yaml b/album/oceanfalls-vol-4.yaml
index 4d93b5b..3af5e90 100644
--- a/album/oceanfalls-vol-4.yaml
+++ b/album/oceanfalls-vol-4.yaml
@@ -89,6 +89,7 @@ Cover Artists:
 - Griffin Wayne
 Art Tags:
 - Meimona (Oceanfalls)
+- Boyfriend (Oceanfalls)
 ---
 Track: Beloved Little Prodigy
 Artists:
@@ -123,6 +124,7 @@ URLs:
 Cover Artists:
 - nights
 Art Tags:
+- Sis (Oceanfalls)
 - Solis (Oceanfalls)
 ---
 Track: Inept Quartet
@@ -152,6 +154,7 @@ Cover Artists:
 - Hiklight
 Art Tags:
 - Kaji (Oceanfalls)
+- Warty (Oceanfalls)
 ---
 Track: Limefalls
 Artists:
diff --git a/album/oceanfalls-vol-five.yaml b/album/oceanfalls-vol-five.yaml
index 55d00d2..024b3c3 100644
--- a/album/oceanfalls-vol-five.yaml
+++ b/album/oceanfalls-vol-five.yaml
@@ -14,6 +14,7 @@ Art Tags:
 - Five (Oceanfalls)
 - Solis (Oceanfalls)
 - Lune (Oceanfalls)
+- Sis (Oceanfalls)
 Cover Art File Extension: png
 Track Art File Extension: png
 Wallpaper File Extension: png
@@ -44,6 +45,8 @@ Art Tags:
 - Aria (Oceanfalls)
 - Reed (Oceanfalls)
 - Nino (Oceanfalls)
+- Ludwig (Oceanfalls)
+- Boyfriend (Oceanfalls)
 ---
 Track: Memories of Home
 Artists:
@@ -82,6 +85,8 @@ URLs:
 - https://nightslights.bandcamp.com/track/metal-and-meat
 Cover Artists:
 - nights
+Art Tags:
+- Ruby (Oceanfalls)
 ---
 Track: Birthday Girl
 Artists:
@@ -114,6 +119,8 @@ URLs:
 - https://nightslights.bandcamp.com/track/hollowed-halls
 Cover Artists:
 - InkyKnight
+Art Tags:
+- Sis (Oceanfalls)
 ---
 Track: Emblems of a Magnum Opus
 Artists:
@@ -124,6 +131,9 @@ URLs:
 - https://nightslights.bandcamp.com/track/emblems-of-a-magnum-opus
 Cover Artists:
 - nights
+Art Tags:
+- Zachery (Oceanfalls)
+- Sis (Oceanfalls)
 ---
 Track: Hazardous Path
 Artists:
diff --git a/album/pesterquest-soundtrack.yaml b/album/pesterquest-soundtrack.yaml
new file mode 100644
index 0000000..f7bd734
--- /dev/null
+++ b/album/pesterquest-soundtrack.yaml
@@ -0,0 +1,638 @@
+Album: Pesterquest Soundtrack
+Color: '#5fdce6'
+Date: September 13, 2021
+Cover Artists:
+- Homestuck
+Default Track Cover Artists:
+- Homestuck
+Artists:
+- James Roach
+Groups:
+- James Roach
+- group:official
+Art Tags:
+- Feferi
+- Nepeta
+- Karkat
+- Terezi
+- Rose
+- Roxy
+- Jake
+- Gamzee
+- John
+- Dirk
+- Sollux
+- Jane
+- Kanaya
+URLs:
+- https://store.steampowered.com/app/1358520/Pesterquest_Soundtrack/
+Additional Files:
+- Title: Steam store page banner
+  Files:
+  - banner.jpg
+Commentary: |-
+    <i>Homestuck:</i> ([Steam](https://store.steampowered.com/app/1358520/Pesterquest_Soundtrack/), excerpt)
+
+    Enjoy the fine-grooving tunes of Pesterquest, the grimsical episodic visual novel adventure set in the darkly funny Homestuck universe.
+
+    <i>Quasar Nebula:</i> (wiki editor)
+
+    This soundtrack released exclusively on Steam as paid DLC for Pesterquest; it's got some quirks, discussed below, but is probably the best and only official release of Pesterquest's we'll ever see.
+
+    Most tracks were originally composed by [[artist:james-roach]] for Pesterquest; almost all of his tracks were included on this soundtrack release, though six were not:
+
+    - [[track:2chords]] ("Dave Route Prelude")
+    - [[track:drone-pesterquest]] (not credited)
+    - [[track:its-a-cover-of-made-of-time]] (not credited)
+    - [[track:its-nothing]] (not credited)
+    - [[track:mspar-remember]] ("Chaos Audio")
+    - [[track:normal-song-name]] ("Afterw@rd Theme")
+
+    Various tracks from prior releases were [[flash-act:pesterquest|featured throughout Pesterquest]]. Some of these were re-released on this soundtrack, while others weren't. Featured in Pesterquest from earlier Homestuck releases, and not on this soundtrack:
+
+    - [[track:worst-end]], by [[artist:james-roach]] ("Prologue Theme")
+    - [[track:end-of-friendvangelion]], by [[artist:james-roach]] (not credited)
+    - [[track:superego]], by [[artist:yan-rodriguez]] ("Vriska's Theme")
+    - [[track:bronze-rebel]], by [[artist:yan-rodriguez]] ("Tavros' Theme")
+    - [[track:the-la2t-frontiier]], by [[artist:toby-fox]] ("Eridan & Sollux battle")
+    - [[track:stress]], by [[artist:buzinkai]] and [[artist:toby-fox]] ("Dirk's Theme")
+    - [[track:embittered-shore]], by [[artist:max-wright]] ("Reader's Theme")
+
+    Pesterquest features several tracks by artists who weren't formally part of the Homestuck music team. Across the lists above and the main track list, these are tracks featured from the Homestuck fan community:
+
+    - [[track:superego]], from [[album:coloUrs-and-mayhem-universe-a]]
+    - [[track:indigo-heir]], from [[album:coloUrs-and-mayhem-universe-a]]
+    - [[track:bronze-rebel]], from [[album:coloUrs-and-mayhem-universe-a]]
+    - [[track:embittered-shore]], from [[album:lofam2]]
+
+    [[album:hiveswap-friendsim|In Roachian fashion,]] most track names have slight (to significant) differences between their soundtrack release on Steam, individual track releases on SoundCloud, and the in-game credits list. All of these are noted on each track; on the wiki, the album's track list extracts the "main" part of the name of each track as part of the Steam release.
+
+    The album cover artwork is from the Steam library; track artworks for select James Roach tracks are from their releases on SoundCloud.
+
+    <i>Quasar Nebula:</i> (wiki editor)
+
+    During the timeframe where this album hadn't yet been released on Steam, [[artist:tempest2k]] and other fans compiled the new tracks featured in Pesterquest into an album ready for anyone's music library, including full metadata and track artworks. This lacks the tracks featured elsewhere on Homestuck's discography, so it compliments the rest of a Homestuck library quite well. [Visit this compilation on Google Drive.](https://drive.google.com/drive/folders/19VFFzHkeUl_ss83zezBe9qHIYUWjgRsN)
+
+    (Reach out through [tempest2k's carrd](https://tempestbreeze.carrd.co) if you want your own tracks removed from this compilation, or [[static:feedback|to the wiki]] if you require the download link removed from HSMusic outright.)
+---
+Track: "Friendvangelion: Rebuild"
+Additional Names:
+- Name: >-
+    the note desolation plays
+  Annotation: >-
+    [SoundCloud](https://soundcloud.com/jamesroachmusic/the-note-desolation-plays)
+- Name: >-
+    Main Theme "Friendvangelion: Rebuild"
+  Annotation: >-
+    [Steam](https://store.steampowered.com/app/1358520/Pesterquest_Soundtrack/)
+- Name: >-
+    Menu Theme, *"Friendvangelion: Rebuild"*
+  Annotation: >-
+    in-game credits
+Art Tags:
+- Earth
+Duration: '2:54'
+URLs:
+- https://soundcloud.com/jamesroachmusic/the-note-desolation-plays
+- https://www.youtube.com/watch?v=hnBMOTxQfJ4
+Referenced Tracks:
+- Homestuck
+Commentary: |-
+    <i>James Roach:</i> ([SoundCloud](https://soundcloud.com/jamesroachmusic/the-note-desolation-plays))
+
+    how mysterious
+---
+Track: sometimes i call andrew hussie 'andy' and so far he hasn't corrected me
+Additional Names:
+- Name: >-
+    John's Theme "sometimes i call andrew hussie 'andy' and so far he hasn't corrected me"
+  Annotation: >-
+    [Steam](https://store.steampowered.com/app/1358520/Pesterquest_Soundtrack/)
+- Name: >-
+    PESTERQUEST: sometimes i call andrew hussie 'andy' and so far he hasn't corrected me
+  Annotation: >-
+    [SoundCloud](https://soundcloud.com/jamesroachmusic/pesterquest-sometimes-i-call-andrew-hussie-andy-and-so-far-he-hasnt-corrected-me)
+- Name: >-
+    John's Theme, *"sometimes i call andrew hussie 'andy' and so far he hasn't corrected me"*
+  Annotation: >-
+    in-game credits
+Art Tags:
+- John
+Duration: '4:34'
+URLs:
+- https://soundcloud.com/jamesroachmusic/pesterquest-sometimes-i-call-andrew-hussie-andy-and-so-far-he-hasnt-corrected-me
+- https://www.youtube.com/watch?v=xSrT-SDN-uA
+Referenced Tracks:
+- Showtime (Piano Refrain)
+- Harlequin
+Commentary: |-
+    <i>James Roach:</i> ([SoundCloud](https://soundcloud.com/jamesroachmusic/pesterquest-sometimes-i-call-andrew-hussie-andy-and-so-far-he-hasnt-corrected-me))
+
+    SO! PesterQuest is out. We've been sitting on this one for a while. [[flash:pq-vol1|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 [[artist:malcolm-brown|Malcolm]] and [[artist:mark-j-hadley|Mark]] for letting me use their themes.
+
+    I don't know if I'll have as much time or energy to do the tracks for pesterquest like i did for [[album:hiveswap-friendsim|friendsim]] since i got a new job. I will try my best.
+---
+Track: please support The Trevor Project
+Additional Names:
+- Name: >-
+    Rose's Theme "please support The Trevor Project"
+  Annotation: >-
+    [Steam](https://store.steampowered.com/app/1358520/Pesterquest_Soundtrack/)
+- Name: >-
+    PESTERQUEST: please support The Trevor Project
+  Annotation: >-
+    [SoundCloud](https://soundcloud.com/jamesroachmusic/pesterquest-please-support-the-trevor-project)
+- Name: >-
+    Rose's Theme, *"please support [The Trevor Project](https://www.thetrevorproject.org/)"*
+  Annotation: >-
+    in-game credits
+Art Tags:
+- Rose
+- Earth
+Duration: '3:19'
+URLs:
+- https://soundcloud.com/jamesroachmusic/pesterquest-please-support-the-trevor-project
+- https://www.youtube.com/watch?v=urbot0kfsz8
+Referenced Tracks:
+- Endless Climb
+Commentary: |-
+    <i>James Roach:</i> ([SoundCloud](https://soundcloud.com/jamesroachmusic/pesterquest-please-support-the-trevor-project))
+
+    I wasn't certain how to approach this one. I knew if I was going to use the theme from [[track:endless-climb|endless climb]] it wouldn't feel right accepting any money for it. These things don't exactly pay well to begin with tbh, so i thought I would use the platform i've been given to try and do something... even a little positive.
+
+    at first the song was just going to be called "play the rain" because naming it something stupid, while keeping up with tradition, seemed like it would be in bad taste. at some point while i was working on it i started looking into various charities i could donate the proceeds to, and it hit me that i could just ask to make the title in the credits a link to the charity.
+
+    suicide is something that is hard for me to talk about. its very personal. i tend to internalize feelings in order not to.. bother anyone. a few months ago i called a suicide hotline when i hit a really low point and i think just the act of calling made me feel... in charge somehow? feelings are fucked up. don't be afraid to talk to someone. even if it is a stranger at the other end of a call. take that step. you're not bad for feeling that way.
+
+    so anyway. endless climb was one of the very first homestuck songs that really drew me in, and doing a cover of it all those years ago really got me back into taking composition seriously. it could easily be argued that this song changed my life for the better.
+
+    if you want to know more about the trevor project, or just suicide prevention in general visit [thetrevorproject.org](https://www.thetrevorproject.org/)
+---
+Track: ill probably just name this one something normal oh no wait oh jeez aw beans
+Additional Names:
+- Name: >-
+    Dave's Theme "ill probably just name this one something normal oh no aw beans"
+  Annotation: >-
+    [Steam](https://store.steampowered.com/app/1358520/Pesterquest_Soundtrack/)
+- Name: >-
+    PESTERQUEST: ill probably just name this one something normal oh no wait oh jeez aw beans
+  Annotation: >-
+    [SoundCloud](https://soundcloud.com/jamesroachmusic/pesterquest-ill-probably-just-name-this-one-something-normal-oh-no-wait-oh-jeez-aw-beans)
+- Name: >-
+    Dave's Theme, *"ill probably just name this one something normal oh no wait oh jeez aw beans"*
+  Annotation: >-
+    in-game credits
+Art Tags:
+- Dave
+Duration: '4:50'
+URLs:
+- https://soundcloud.com/jamesroachmusic/pesterquest-ill-probably-just-name-this-one-something-normal-oh-no-wait-oh-jeez-aw-beans
+- https://www.youtube.com/watch?v=DREQ4rJUXXQ
+Referenced Tracks:
+- Davesprite
+Commentary: |-
+    <i>James Roach:</i> ([SoundCloud](https://soundcloud.com/jamesroachmusic/pesterquest-ill-probably-just-name-this-one-something-normal-oh-no-wait-oh-jeez-aw-beans))
+
+    well cats outta the bag i did [[flash:pq-vol3|the dave route]]. when [[artist:andrew-hussie|andrew]] approached me about writing it i had very little writing experience outside of my personal projects. im glad andrew had faith in me and i hope you guys like it. itll come out at 11 AM EDT.
+
+    for this one and the next routes music im gonna try and keep with the tradition of uploading it the morning of.
+---
+Track: 24/7 lo fi anime beats to question your sexuality to
+Directory: 24-7-lo-fi-anime-beats-to-question-your-sexuality-to
+Additional Names:
+- Name: >-
+    Dave's other Theme "24/7 lo fi anime beats to question your sexuality to"
+  Annotation: >-
+    [Steam](https://store.steampowered.com/app/1358520/Pesterquest_Soundtrack/)
+- Name: >-
+    PESTERQUEST: 24/7 lo fi anime beats to question your sexuality to
+  Annotation: >-
+    [SoundCloud](https://soundcloud.com/jamesroachmusic/pesterquest-247-lo-fi-anime-beats-to-question-your-sexuality-to)
+- Name: >-
+    Dave's Ending Theme, *"24/7 lo fi anime beats to question your sexuality to"*
+  Annotation: >-
+    in-game credits
+Duration: '2:51'
+URLs:
+- https://soundcloud.com/jamesroachmusic/pesterquest-247-lo-fi-anime-beats-to-question-your-sexuality-to
+- https://www.youtube.com/watch?v=0I2ufAhRbf0
+Referenced Tracks:
+- 2chords
+- Upward Movement (Dave Owns)
+- Sburban Jungle
+Commentary: |-
+    <i>James Roach:</i> ([SoundCloud](https://soundcloud.com/jamesroachmusic/pesterquest-247-lo-fi-anime-beats-to-question-your-sexuality-to))
+
+    i just wanted to do more than one song so [[track:ill-probably-just-name-this-one-something-normal-oh-no-wait-oh-jeez-aw-beans|i did two]] [[track:2chords|and a half]]. hope you like it. thanks for all the support! also im in this image can u find me LMAO
+---
+Track: Carefree Victory (REMIX) ft. Spell-n-Speak
+Directory: carefree-victory-remix
+Additional Names:
+- Name: >-
+    Jade's Theme "Carefree Victory (REMIX) ft. Spell-n-Speak"
+  Annotation: >-
+    [Steam](https://store.steampowered.com/app/1358520/Pesterquest_Soundtrack/)
+- Name: >-
+    PESTERQUEST: JAMES ROACH (FT. SPEAK-N-SAY) - CAREFREE VICTORY (REMIX)
+  Annotation: >-
+    [SoundCloud](https://soundcloud.com/jamesroachmusic/pesterquest-james-roach-ft-speak-n-say-carefree-victory-remix)
+- Name: >-
+    Jade's Theme, *"JAMES ROACH (FEAT. SPEAK-N-SAY) - CAREFREE VICTORY (REMIX)"
+  Annotation: >-
+    in-game credits
+Art Tags:
+- Jade
+Duration: '6:02'
+URLs:
+- https://soundcloud.com/jamesroachmusic/pesterquest-james-roach-ft-speak-n-say-carefree-victory-remix
+- https://www.youtube.com/watch?v=c8aZFD8ic9A&
+Referenced Tracks:
+- track:carefree-action
+- Carefree Victory
+Sampled Tracks:
+- Speak-N-Say
+Lyrics: |-
+    (<i>Arf</i>)
+
+    A B C D
+    1 2 3 4
+    E F G H
+    5 6 7 8
+
+    I J K
+    L M N
+    O P Q
+    R S T
+
+    U V W X
+    Y
+    Z
+    Correct
+
+    (<i>Arf</i>)
+
+    A B C D
+    1 2 3 4
+    E F G H
+    5 6 7 8
+
+    Above ancient angel anything
+    Beauty believe blood built
+    Bullet butcher child circuit
+    Danger
+    Danger
+
+    (<i>Arf</i>)
+
+    Bark
+Commentary: |-
+    <i>James Roach:</i> ([SoundCloud](https://soundcloud.com/jamesroachmusic/pesterquest-james-roach-ft-speak-n-say-carefree-victory-remix))
+
+    jades theme! wow we've really come a long way huh fellas?
+
+    i always really liked [[track:carefree-victory|carefree victory]] and its really one of the only songs that felt like uniquely hers. towards the end i try and do something that like... every homestuck musician i think tries at least once: getting all 4 of the kid's instruments to play something nice together. i think i did alright, i subbed in beatboxing for daves turntables cause its not like you can just carry those anywhere. i guess as opposed to johns piano?? LMAO
+
+    musically i have jade start on bass, and as more of her friends come in she gets a little more confident in her basslines. anyway thats my fanfic.
+
+    this is the last new piece i'll be doing for the forseeable future, or until i feel like doing another one which might be immediately. ive been doing this on a largely volunteer basis for a while since the budget constraints were tight and we need to pay the bg and sprite artists a reasonable amount. I wanted all four kids to have music by me and i think we'll be digging into the homestuck archive for other stuff.
+
+    anyway i hope you've enjoyed the ride! its been a little bittersweet at times for me but i'll miss posting new stuff every two weeks.
+---
+Track: Darling Kanaya
+Directory: darling-kanaya-pesterquest
+Originally Released As: track:darling-kanaya
+Has Cover Art: false
+Duration: '2:03'
+URLs:
+- https://homestuck.bandcamp.com/track/darling-kanaya-2
+- https://www.youtube.com/watch?v=1Llz7cjM3uk
+---
+Track: CRUSTacean
+Directory: crustacean-pesterquest
+Always Reference By Directory: true
+Additional Names:
+- Name: >-
+    Karkat's Theme "CRUSTacean"
+  Annotation: >-
+    [Steam](https://store.steampowered.com/app/1358520/Pesterquest_Soundtrack/)
+- Name: >-
+    PESTERQUEST: CRUSTacean
+  Annotation: >-
+    [SoundCloud](https://soundcloud.com/jamesroachmusic/pesterquest-crustacean)
+- Name: >-
+    Karkat's Theme, *"CRUSTacean"*
+  Annotation: >-
+    in-game credits
+Art Tags:
+- Karkat
+Duration: '5:28'
+URLs:
+- https://soundcloud.com/jamesroachmusic/pesterquest-crustacean
+- https://www.youtube.com/watch?v=9hdPSPGCK3Q
+Referenced Tracks:
+- Crustacean
+Commentary: |-
+    <i>James Roach:</i> ([SoundCloud](https://soundcloud.com/jamesroachmusic/pesterquest-crustacean))
+
+    there are a handful of people out there who really thought we were just gonna put [[track:karkalicious|karkalicious]] in there.
+---
+Track: mIrAcLeS
+Originally Released As: track:miracles
+Directory: miracles-pesterquest
+Additional Names:
+- Name: >-
+    Gamzee's Theme "mIrAcLeS"
+  Annotation: >-
+    [Steam](https://store.steampowered.com/app/1358520/Pesterquest_Soundtrack/)
+- Name: >-
+    Gamzee's Theme, *"mIrAcLeS"*
+  Annotation: >-
+    in-game credits
+Has Cover Art: false
+Duration: '2:31'
+URLs:
+- https://homestuck.bandcamp.com/track/miracles-2
+- https://www.youtube.com/watch?v=YHr0f-eM4ag
+---
+Track: Midnight Calliope
+Originally Released As: track:midnight-calliope
+Directory: midnight-calliope-pesterquest
+Additional Names:
+- Name: >-
+    Gamzee's Other Theme "Midnight Calliope"
+  Annotation: >-
+    [Steam](https://store.steampowered.com/app/1358520/Pesterquest_Soundtrack/)
+- Name: >-
+    Gamzee's Theme 2, *"Midnight Calliope"*
+  Annotation: >-
+    in-game credits
+Has Cover Art: false
+Duration: '1:50'
+URLs:
+- https://homestuck.bandcamp.com/track/midnight-calliope-2
+- https://www.youtube.com/watch?v=PLHr3EwaVJ8
+---
+Track: CH3CK TH3 M3T4D4T4
+Additional Names:
+- Name: >-
+    Terezi's Theme "CH3CK TH3 M3T4D4T4"
+  Annotation: >-
+    [Steam](https://store.steampowered.com/app/1358520/Pesterquest_Soundtrack/)
+- Name: >-
+    PESTERQUEST: Terezi's theme, "CH3CK TH3 M3T4D4T4"
+  Annotation: >-
+    [SoundCloud](https://soundcloud.com/jamesroachmusic/pesterquest-terezis-theme-ch3ck-th3-m3t4d4t4)
+- Name: >-
+    Terezi's Theme, <img src="media/misc/terezi-qr.png" width="143" height="143" inline pixelate>
+  Annotation: >-
+    in-game credits
+Additional Files:
+- Title: Original in-game credits image
+  Files:
+  - qr.png
+Art Tags:
+- Terezi
+Duration: '4:19'
+URLs:
+- https://soundcloud.com/jamesroachmusic/pesterquest-terezis-theme-ch3ck-th3-m3t4d4t4
+- https://www.youtube.com/watch?v=DuGQM9YsyXo
+Referenced Tracks:
+- The Lemonsnout Turnabout
+Commentary: |-
+    <i>James Roach:</i> ([SoundCloud](https://soundcloud.com/jamesroachmusic/pesterquest-terezis-theme-ch3ck-th3-m3t4d4t4))
+
+    dont actually do that you clowns
+---
+Track: Indigo Heir
+Originally Released As: track:indigo-heir
+Directory: indigo-heir-pesterquest
+Additional Names:
+- Name: >-
+    Equius's Theme "Indigo Heir"
+  Annotation: >-
+    [Steam](https://store.steampowered.com/app/1358520/Pesterquest_Soundtrack/)
+- Name: >-
+    Equius' Theme, *"Indigo Heir"*
+  Annotation: >-
+    in-game credits
+Has Cover Art: false
+Duration: '5:00'
+URLs:
+- https://homestuck.bandcamp.com/track/indigo-heir
+- https://www.youtube.com/watch?v=Xu2Aky_-gD8
+---
+Track: yeah it is
+Additional Names:
+- Name: >-
+    Aradia's Theme "yeah it is"
+  Annotation: >-
+    [Steam](https://store.steampowered.com/app/1358520/Pesterquest_Soundtrack/)
+- Name: >-
+    PESTERQUEST: ARADIA's THEME "yeah, it is"
+  Annotation: >-
+    [SoundCloud](https://soundcloud.com/jamesroachmusic/pesterquest-aradias-theme-yeah-it-is)
+- Name: >-
+    Aradia's Theme, *"yeah, it is"*
+  Annotation: >-
+    in-game credits
+Art Tags:
+- Aradia
+- Alternia
+Contributors:
+- Tamara Fritz (vocals)
+Duration: '5:41'
+URLs:
+- https://soundcloud.com/jamesroachmusic/pesterquest-aradias-theme-yeah-it-is
+- https://www.youtube.com/watch?v=MDqXkGBFPg0
+Referenced Tracks:
+- it's a cover of 'made of time'
+- track:MeGaLoVania
+Commentary: |-
+    <i>James Roach:</i> ([SoundCloud](https://soundcloud.com/jamesroachmusic/pesterquest-aradias-theme-yeah-it-is))
+
+    big ups to [[artist:tamara-fritz|Tamara "TOTALSPIFFAGE" Fritz]] for really knocking it outta the park with these vocals.
+---
+Track: KWCOM DOT WAV
+Additional Names:
+- Name: >-
+    Sollux's Theme "KWCOM DOT WAV"
+  Annotation: >-
+    [Steam](https://store.steampowered.com/app/1358520/Pesterquest_Soundtrack/)
+- Name: >-
+    Sollux's Theme, *"KWCOM DOT WAV"*
+  Annotation: >-
+    in-game credits
+Has Cover Art: false
+Duration: '4:53'
+URLs:
+- https://www.youtube.com/watch?v=zrtnPsoAkQg
+---
+Track: Requiem
+Directory: requiem-pesterquest
+Originally Released As: track:requiem
+Additional Names:
+- Name: >-
+    Nepeta's Theme "Requiem"
+  Annotation: >-
+    [Steam](https://store.steampowered.com/app/1358520/Pesterquest_Soundtrack/)
+- Name: >-
+    Nepeta's Theme, *"Requiem"*
+  Annotation: >-
+    in-game credits
+Has Cover Art: false
+Duration: '4:38'
+URLs:
+- https://clarkpowell.bandcamp.com/track/requiem
+- https://www.youtube.com/watch?v=3kWFQy0kWC4
+---
+Track: THIS TIME ITS ERIDAN
+Additional Names:
+- Name: >-
+    Eridan's Theme "THIS TIME ITS ERIDAN"
+  Annotation: >-
+    [Steam](https://store.steampowered.com/app/1358520/Pesterquest_Soundtrack/)
+- Name: >-
+    PESTERQUEST - THIS TIME ITS ERIDAN (I FORGOT WHAT I NAMED THIS)
+  Annotation: >-
+    [SoundCloud](https://soundcloud.com/jamesroachmusic/pesterquest-this-time-its-eridan-i-forgot-what-i-named-this)
+- Name: >-
+    Busker's Theme mk II
+  Annotation: >-
+    in-game credits
+Art Tags:
+- Eridan
+Duration: '3:58'
+URLs:
+- https://soundcloud.com/jamesroachmusic/pesterquest-this-time-its-eridan-i-forgot-what-i-named-this
+- https://www.youtube.com/watch?v=sw8smnspCmU
+Referenced Tracks:
+- Busker's Theme
+Commentary: |-
+    <i>James Roach:</i> ([SoundCloud](https://soundcloud.com/jamesroachmusic/pesterquest-this-time-its-eridan-i-forgot-what-i-named-this))
+
+    in its base form this song used to be about a cat and is like more than a decade old
+---
+Track: Love You
+Directory: love-you-pesterquest
+Originally Released As: track:love-you-feferis-theme
+Additional Names:
+- Name: >-
+    Feferi's Theme "Love You"
+  Annotation: >-
+    [Steam](https://store.steampowered.com/app/1358520/Pesterquest_Soundtrack/)
+- Name: >-
+    Feferi's Theme, *"Love You (Feferi's Theme)"*
+  Annotation: >-
+    in-game credits
+Has Cover Art: false
+Duration: '1:58'
+URLs:
+- https://homestuck.bandcamp.com/track/love-you-feferis-theme-2
+- https://www.youtube.com/watch?v=9IRcdrNsmho
+---
+Track: i guess
+Additional Names:
+- Name: >-
+    Jane's Theme "i guess"
+  Annotation: >-
+    [Steam](https://store.steampowered.com/app/1358520/Pesterquest_Soundtrack/)
+- Name: >-
+    Jane's Theme, *"i guess"*
+  Annotation: >-
+    in-game credits
+Has Cover Art: false
+Duration: '1:38'
+URLs:
+- https://www.youtube.com/watch?v=FVKzNwxz6Vc
+MIDI Project Files:
+- Title: MIDI by IronInvoker47 (piano)
+  Files:
+  - 'i guess - IronInvoker47 (piano).mid'
+---
+Track: Riches to Ruins Movements, pt. II
+Additional Names:
+- Name: >-
+    Jake's Theme "Riches to Ruins Movements, pt. II"
+  Annotation: >-
+    [Steam](https://store.steampowered.com/app/1358520/Pesterquest_Soundtrack/)
+- Name: >-
+    Jake's Theme, *"Riches to Ruins Movement II"*
+  Anntation: >-
+    in-game credits
+Has Cover Art: false
+Artists:
+- Toby Fox
+Duration: '2:21'
+URLs:
+- https://www.youtube.com/watch?v=balNAX-OBGc
+Referenced Tracks:
+- Riches to Ruins Movements I & II
+---
+Track: Would you believe this was for something else
+Additional Names:
+- Name: >-
+    Roxy's Theme "Would you believe this was for something else"
+  Annotation: >-
+    [Steam](https://store.steampowered.com/app/1358520/Pesterquest_Soundtrack/)
+- Name: >-
+    Roxy's Theme, *"Would you believe this was for something else"*
+  Annotation: >-
+    in-game credits
+Has Cover Art: false
+Duration: '2:24'
+URLs:
+- https://www.youtube.com/watch?v=eciwBYIR8_k
+---
+Track: Even in Death (T'Morra's Belly Mix)
+Directory: even-in-death-pesterquest
+Originally Released As: track:even-in-death-tmorras-belly-mix
+Additional Names:
+- Name: >-
+    Roxy's Other theme "Even in Death (T'Morra's Belly Mix)"
+  Annotation: >-
+    [Steam](https://store.steampowered.com/app/1358520/Pesterquest_Soundtrack/)
+- Name: >-
+    Roxy's Theme 2, *"Even in Death (T'Morra's Belly Mix)"*
+  Annotation: >-
+    in-game credits
+Has Cover Art: false
+Duration: '4:08'
+URLs:
+- https://homestuck.bandcamp.com/track/even-in-death-tmorras-belly-mix-2
+- https://www.youtube.com/watch?v=nKqLPb9YDnM
+---
+Track: Unite Synchronization
+Directory: unite-synchronization-pesterquest
+Originally Released As: track:unite-synchronization
+Additional Names:
+- Name: >-
+    Dirk's Theme "Unite Synchronization"
+  Annotation: >-
+    [Steam](https://store.steampowered.com/app/1358520/Pesterquest_Soundtrack/)
+- Name: >-
+    Dirk's Theme 2, *"Unite Synchronization"*
+  Annotation: >-
+    in-game credits
+Has Cover Art: false
+Duration: '2:54'
+URLs:
+- https://homestuck.bandcamp.com/track/unite-synchronization-2
+- https://www.youtube.com/watch?v=X-kDKrpgPck
+---
+Track: Beatup
+Additional Names:
+- Name: >-
+    Ultimate Dirk's Theme "Beatup"
+  Annotation: >-
+    [Steam](https://store.steampowered.com/app/1358520/Pesterquest_Soundtrack/)
+- Name: >-
+    Ultimate Dirk's Theme, *"Beatup"*
+  Annotation: >-
+    in-game credits
+Directory: beatup-pesterquest
+Originally Released As: track:beatup
+Has Cover Art: false
+Duration: '5:14'
+URLs:
+- https://homestuck.bandcamp.com/track/beatup-2
+- https://www.youtube.com/watch?v=-nI-8HTHtLs
diff --git a/album/requiem-for-a-homestuck.yaml b/album/requiem-for-a-homestuck.yaml
index 5b6b440..2e6d318 100644
--- a/album/requiem-for-a-homestuck.yaml
+++ b/album/requiem-for-a-homestuck.yaml
@@ -17,6 +17,7 @@ Wallpaper Style: |-
     background-size: auto;
 Color: '#62c700'
 Groups:
+- James Roach
 - group:official
 Art Tags:
 - Gate
diff --git a/album/single-christmastime-is-here-lo-fi.yaml b/album/single-christmastime-is-here-lo-fi.yaml
index 789a55f..eb40fbe 100644
--- a/album/single-christmastime-is-here-lo-fi.yaml
+++ b/album/single-christmastime-is-here-lo-fi.yaml
@@ -8,8 +8,9 @@ Artists:
 Cover Artists:
 - James Roach
 Cover Art File Extension: jpg
-Color: '#5877b7'
+Color: '#7791C5'
 Groups:
+- James Roach
 - Beyond
 Commentary: |-
     <i>James Roach:</i> ([Twitter commentary](https://twitter.com/hamesatron/status/1601301915412807681))
diff --git a/album/songs-of-rivervale.yaml b/album/songs-of-rivervale.yaml
index 9e157a7..4ecbdf4 100644
--- a/album/songs-of-rivervale.yaml
+++ b/album/songs-of-rivervale.yaml
@@ -9,6 +9,7 @@ Cover Artists:
 - Lexxy
 Color: '#8799c1'
 Groups:
+- James Roach
 - Beyond
 Banner Artists:
 - Lexxy
diff --git a/album/the-grubbles.yaml b/album/the-grubbles.yaml
index cb367a2..47fbb4c 100644
--- a/album/the-grubbles.yaml
+++ b/album/the-grubbles.yaml
@@ -10,6 +10,7 @@ Cover Artists:
 - The Grubbels
 Color: '#dd0000'
 Groups:
+- James Roach
 - group:official
 ---
 Track: Broom Temperature
diff --git a/album/unreleased-tracks.yaml b/album/unreleased-tracks.yaml
index f71f494..9ed0016 100644
--- a/album/unreleased-tracks.yaml
+++ b/album/unreleased-tracks.yaml
@@ -699,206 +699,26 @@ Commentary: |-
 ---
 Section: Tracks featured in Pesterquest
 ---
-Track: Friendvangelion Rebuild
-Artists:
-- James Roach
-Art Tags:
-- Earth
-Duration: '2:55'
-URLs:
-- https://soundcloud.com/jamesroachmusic/the-note-desolation-plays
-- https://www.youtube.com/watch?v=hnBMOTxQfJ4
-Cover Artists:
-- Homestuck
-Referenced Tracks:
-- Homestuck
-Commentary: |-
-    <i>James Roach:</i>
-    how mysterious
----
-Track: sometimes i call andrew hussie 'andy' and so far he hasn't corrected me
-Artists:
-- James Roach
-Art Tags:
-- John
-Duration: '4:34'
-URLs:
-- https://soundcloud.com/jamesroachmusic/pesterquest-sometimes-i-call-andrew-hussie-andy-and-so-far-he-hasnt-corrected-me
-- https://www.youtube.com/watch?v=xSrT-SDN-uA
-Cover Artists:
-- Homestuck
-Referenced Tracks:
-- Showtime (Piano Refrain)
-- 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.
-    I don't know if I'll have as much time or energy to do the tracks for pesterquest like i did for friendsim since i got a new job. I will try my best.
----
-Track: please support The Trevor Project
-Artists:
-- James Roach
-Art Tags:
-- Rose
-- Earth
-Duration: '3:19'
-URLs:
-- https://soundcloud.com/jamesroachmusic/pesterquest-please-support-the-trevor-project
-- https://www.youtube.com/watch?v=urbot0kfsz8
-Cover Artists:
-- Homestuck
-Referenced Tracks:
-- Endless Climb
-Commentary: |-
-    <i>James Roach:</i>
-    I wasn't certain how to approach this one. I knew if I was going to use the theme from endless climb it wouldn't feel right accepting any money for it. These things don't exactly pay well to begin with tbh, so i thought I would use the platform i've been given to try and do something... even a little positive.
-    at first the song was just going to be called "play the rain" because naming it something stupid, while keeping up with tradition, seemed like it would be in bad taste. at some point while i was working on it i started looking into various charities i could donate the proceeds to, and it hit me that i could just ask to make the title in the credits a link to the charity.
-    suicide is something that is hard for me to talk about. its very personal. i tend to internalize feelings in order not to.. bother anyone. a few months ago i called a suicide hotline when i hit a really low point and i think just the act of calling made me feel... in charge somehow? feelings are fucked up. don't be afraid to talk to someone. even if it is a stranger at the other end of a call. take that step. you're not bad for feeling that way.
-    so anyway. endless climb was one of the very first homestuck songs that really drew me in, and doing a cover of it all those years ago really got me back into taking composition seriously. it could easily be argued that this song changed my life for the better.
-    if you want to know more about the trevor project, or just suicide prevention in general visit <a href="https://www.thetrevorproject.org/">thetrevorproject.org</a>
----
 Track: 2chords
+Additional Names:
+- Name: >-
+    Dave Route Prelude, *"2chords"*
+  Annotation: >-
+    in-game credits
 Artists:
 - James Roach
-Art Tags:
-- John
-- MSPA Reader
 Duration: '1:13'
 URLs:
 - https://www.youtube.com/watch?v=Q3JQPZ2T03k
-Cover Artists:
-- Homestuck
 Referenced Tracks:
 - Upward Movement (Dave Owns)
 ---
-Track: ill probably just name this one something normal oh no wait oh jeez aw beans
-Artists:
-- James Roach
-Art Tags:
-- Dave
-Duration: '4:50'
-URLs:
-- >-
-    https://soundcloud.com/jamesroachmusic/pesterquest-ill-probably-just-name-this-one-something-normal-oh-no-wait-oh-jeez-aw-beans
-- https://www.youtube.com/watch?v=DREQ4rJUXXQ
-Cover Artists:
-- Homestuck
-Referenced Tracks:
-- Davesprite
-Commentary: |-
-    <i>James Roach:</i>
-    well cats outta the bag i did the dave route. when andrew approached me about writing it i had very little writing experience outside of my personal projects. im glad andrew had faith in me and i hope you guys like it. itll come out at 11 AM EDT.
-    for this one and the next routes music im gonna try and keep with the tradition of uploading it the morning of.
----
-Track: 24/7 lo fi anime beats to question your sexuality to
-Artists:
-- James Roach
-Art Tags:
-- Dave
-- MSPA Reader
-Duration: '2:51'
-URLs:
-- https://soundcloud.com/jamesroachmusic/pesterquest-247-lo-fi-anime-beats-to-question-your-sexuality-to
-- https://www.youtube.com/watch?v=0I2ufAhRbf0
-Cover Artists:
-- Homestuck
-Referenced Tracks:
-- 2chords
-- Upward Movement (Dave Owns)
-- Sburban Jungle
-Commentary: |-
-    <i>James Roach:</i>
-    i just wanted to do more than one song so i did two and a half. hope you like it. thanks for all the support! also im in this image can u find me LMAO
-    <img src="media/misc/lo-fi-cover.jpg" alt="Pesterquest art of the inside of an Olive Garden, packed with Homestuck team members." width="350">
----
-Track: CAREFREE VICTORY (REMIX)
-Artists:
-- James Roach
-Art Tags:
-- Jade
-Duration: '6:02'
-URLs:
-- https://soundcloud.com/jamesroachmusic/pesterquest-james-roach-ft-speak-n-say-carefree-victory-remix
-- https://www.youtube.com/watch?v=c8aZFD8ic9A&
-Cover Artists:
-- Homestuck
-Referenced Tracks:
-- track:carefree-action
-- Carefree Victory
-Sampled Tracks:
-- Speak-N-Say
-Lyrics: |-
-    (<i>Arf</i>)
-
-    A B C D
-    1 2 3 4
-    E F G H
-    5 6 7 8
-
-    I J K
-    L M N
-    O P Q
-    R S T
-
-    U V W X
-    Y
-    Z
-    Correct
-
-    (<i>Arf</i>)
-
-    A B C D
-    1 2 3 4
-    E F G H
-    5 6 7 8
-
-    Above ancient angel anything
-    Beauty believe blood built
-    Bullet butcher child circuit
-    Danger
-    Danger
-
-    (<i>Arf</i>)
-
-    Bark
-Commentary: |-
-    <i>James Roach:</i>
-    jades theme! wow we've really come a long way huh fellas?
-    i always really liked carefree victory and its really one of the only songs that felt like uniquely hers. towards the end i try and do something that like... every homestuck musician i think tries at least once: getting all 4 of the kid's instruments to play something nice together. i think i did alright, i subbed in beatboxing for daves turntables cause its not like you can just carry those anywhere. i guess as opposed to johns piano?? LMAO
-    musically i have jade start on bass, and as more of her friends come in she gets a little more confident in her basslines. anyway thats my fanfic.
-    this is the last new piece i'll be doing for the forseeable future, or until i feel like doing another one which might be immediately. ive been doing this on a largely volunteer basis for a while since the budget constraints were tight and we need to pay the bg and sprite artists a reasonable amount. I wanted all four kids to have music by me and i think we'll be digging into the homestuck archive for other stuff.
-    anyway i hope you've enjoyed the ride! its been a little bittersweet at times for me but i'll miss posting new stuff every two weeks.
----
-Track: CRUSTacean
-Directory: crustacean-pq
-Always Reference By Directory: true
-Artists:
-- James Roach
-Art Tags:
-- Karkat
-Duration: '5:28'
-URLs:
-- https://soundcloud.com/jamesroachmusic/pesterquest-crustacean
-- https://www.youtube.com/watch?v=9hdPSPGCK3Q
-Cover Artists:
-- Homestuck
-Referenced Tracks:
-- Crustacean
-Commentary: |-
-    <i>James Roach:</i>
-    there are a handful of people out there who really thought we were just gonna put karkalicious in there.
----
 Track: the drone rhythmic motif which can be found in act 1 and act 2
-Directory: drone-pq
+Directory: drone-pesterquest
 Artists:
 - James Roach
-Art Tags:
-- Karkat
-- Alternia
 URLs:
 - https://www.youtube.com/watch?v=Ne8kXtFgkjg
-Cover Artists:
-- Homestuck
 Commentary: |-
     <i>James Roach:</i>
     oh yeah, the music you hear during Karkat's pesterquest route that isn't his theme is the rhythmic motif for the drones. it happens in a few other places in Act 1 and Friendsim, as well as multiple place in Act 2
@@ -908,173 +728,58 @@ Commentary: |-
     <i>Niklink:</i> (wiki editor)
     Unofficial name. Found in the game's files as 'DRONE_PQ'.
 ---
-Track: CH3CK TH3 M3T4D4T4
-Artists:
-- James Roach
-Art Tags:
-- Terezi
-Duration: '4:19'
-URLs:
-- https://soundcloud.com/jamesroachmusic/pesterquest-terezis-theme-ch3ck-th3-m3t4d4t4
-- https://www.youtube.com/watch?v=DuGQM9YsyXo
-Cover Artists:
-- Homestuck
-Referenced Tracks:
-- The Lemonsnout Turnabout
-Commentary: |-
-    <i>James Roach:</i>
-    dont actually do that you clowns
----
 Track: it's a cover of 'made of time'
 Artists:
 - James Roach
-Art Tags:
-- Aradia
-- Alternia
 Duration: '1:44'
 URLs:
 - https://www.youtube.com/watch?v=jOKeLCRtG_o
-Cover Artists:
-- Homestuck
 Referenced Tracks:
 - Made of Time
 Commentary: |-
     <i>Niklink:</i> (wiki editor)
     Unofficial name. Found in the game's files as 'ARADIA_INTRO-OUTRO'.
 ---
-Track: yeah, it is
-Artists:
-- James Roach
-Art Tags:
-- Aradia
-- Alternia
-Contributors:
-- Tamara Fritz (vocals)
-Duration: '5:41'
-URLs:
-- https://soundcloud.com/jamesroachmusic/pesterquest-aradias-theme-yeah-it-is
-- https://www.youtube.com/watch?v=MDqXkGBFPg0
-Cover Artists:
-- Homestuck
-Referenced Tracks:
-- it's a cover of 'made of time'
-- track:MeGaLoVania
-Commentary: |-
-    <i>James Roach:</i>
-    big ups to Tamara "TOTALSPIFFAGE" Fritz for really knocking it outta the park with these vocals.
----
 Track: IT'S NOTHING
 Artists:
 - James Roach
-Art Tags:
-- Aradia
 Duration: '1:39'
 URLs:
 - https://www.youtube.com/watch?v=tQqX-UMxj0s
-Cover Artists:
-- Homestuck
 Lyrics: |-
     [Unintelligible whispering]
 Commentary: |-
     <i>Niklink:</i> (wiki editor)
     Unofficial name. Found in the game's files as 'ITS_NOTHING'.
 ---
-Track: KWCOM DOT WAV
-Artists:
-- James Roach
-Art Tags:
-- Sollux
-Duration: '4:53'
-URLs:
-- https://www.youtube.com/watch?v=zrtnPsoAkQg
-Cover Artists:
-- Homestuck
----
-Track: Busker's Theme mk II
-Artists:
-- James Roach
-Art Tags:
-- Eridan
-Duration: '3:58'
-URLs:
-- https://soundcloud.com/jamesroachmusic/pesterquest-this-time-its-eridan-i-forgot-what-i-named-this
-- https://www.youtube.com/watch?v=sw8smnspCmU
-Cover Artists:
-- Homestuck
-Commentary: |-
-    <i>James Roach:</i>
-    (<a href="https://soundcloud.com/jamesroachmusic/pesterquest-this-time-its-eridan-i-forgot-what-i-named-this">SoundCloud</a>)
-    in its base form this song used to be about a cat and is like more than a decade old
-    (<a href="https://mkteres.tumblr.com/post/182160729885/jamesroachmusic-originally-there-was-a-troll-in">Tumblr</a>)
-    Originally there was a troll in act 2 code named "Busker" that was the alternian version of those like.. one man bands you see when you go to venice beach <a href="https://www.youtube.com/watch?v=PfINfEhxnLA">or like on the subway or w/e</a>. Just him and his weird accordion that also somehow made all these extra sounds.
-    Anyway if you went up to him and did the right dialogue he would play you his song, which was this. I think he got written out because he was kind of a <i>one note character</i> ',:^]
----
-Track: i guess
-Artists:
-- James Roach
-Art Tags:
-- Jane
-Duration: '1:38'
-URLs:
-- https://www.youtube.com/watch?v=FVKzNwxz6Vc
-Cover Artists:
-- Homestuck
-MIDI Project Files:
-- Title: MIDI by IronInvoker47 (piano)
-  Files:
-  - 'i guess - IronInvoker47 (piano).mid'
----
-Track: Would you believe this was for something else
-Artists:
-- James Roach
-Art Tags:
-- Roxy
-Duration: '2:24'
-URLs:
-- https://www.youtube.com/watch?v=eciwBYIR8_k
-Cover Artists:
-- Homestuck
----
-Track: Riches to Ruins Movement II
-Artists:
-- Toby Fox
-Art Tags:
-- Jake
-Duration: '1:10'
-URLs:
-- https://www.youtube.com/watch?v=mNu1KAi0Prk
-Cover Artists:
-- Homestuck
-Referenced Tracks:
-- Riches to Ruins Movements I & II
----
 Track: 'this is like... what was it... > [S] MSPAR: Remember'
+Additional Names:
+- Name: >-
+    Chaos Audio, *"this is like... what was it... > [S]MSPAR: Remember"*
+  Annotation: >-
+    in-game credits
 Directory: mspar-remember
 Artists:
 - James Roach
-Art Tags:
-- MSPA Reader
 Duration: '1:06'
 URLs:
 - https://www.youtube.com/watch?v=osip3rTivjM
-Cover Artists:
-- Homestuck
 Referenced Tracks:
 - Unite Synchronization
 - Penumbra Phantasm
 - Rex Duodecim Angelus
 ---
 Track: normal song name
+Additional Names:
+- Name: >-
+    Afterw@rd Theme, *"normal song name"*
+  Annotation: >-
+    in-game credits
 Artists:
 - James Roach
-Art Tags:
-- MSPA Reader
-- Felt Manor
 Duration: '1:56'
 URLs:
 - https://soundcloud.com/jamesroachmusic/afterw-rd-theme-normal-song-name#t=0:00
-Cover Artists:
-- Homestuck
 Referenced Tracks:
 - Rex Duodecim Angelus
 - track:moonsetter
@@ -1087,91 +792,3 @@ Referenced Tracks:
 Commentary: |-
     <i>James Roach:</i>
     its over
----
-Section: Tracks featured in Namco High
----
-Track: Namco Theme
-Artists:
-- Ryan Francis
-Duration: '1:36'
-URLs:
-- https://www.youtube.com/watch?v=-17X8revmwc
----
-Track: School
-Directory: school-namco-high
-Artists:
-- Ryan Francis
-Duration: '2:09'
-URLs:
-- https://www.youtube.com/watch?v=aL7aNkwNrUg
----
-Track: Around Town
-Artists:
-- Ryan Francis
-Duration: 0:38
-URLs:
-- https://www.youtube.com/watch?v=e-HKNpS-yx4
----
-Track: Private Times
-Artists:
-- Ryan Francis
-Duration: 0:32
-URLs:
-- https://www.youtube.com/watch?v=z4YUSJeSRUc
----
-Track: Sad Times
-Artists:
-- Ryan Francis
-Duration: '1:06'
-URLs:
-- https://www.youtube.com/watch?v=HnkiknLZU8k
----
-Track: Romance
-Artists:
-- Ryan Francis
-Duration: 0:37
-URLs:
-- https://www.youtube.com/watch?v=gXifOOgAwzM
----
-Track: Upbeat
-Artists:
-- Ryan Francis
-Duration: '1:49'
-URLs:
-- https://www.youtube.com/watch?v=IWi80QmUEw4
----
-Track: Upbeat (Half)
-Artists:
-- Ryan Francis
-Duration: '2:33'
-URLs:
-- https://www.youtube.com/watch?v=H_PyGnlM2w4
-Referenced Tracks:
-- Upbeat
----
-Track: Boss Theme
-Artists:
-- Ryan Francis
-Duration: '2:08'
-URLs:
-- https://www.youtube.com/watch?v=Q8ace06keaQ
-Referenced Tracks:
-- Namco Theme
----
-Track: Credits
-Artists:
-- Ryan Francis
-Contributors:
-- Mary Thomas (vocals)
-Duration: '2:43'
-URLs:
-- https://www.youtube.com/watch?v=QuWdIDEwjRk
-Referenced Tracks:
-- Namco Theme
-Lyrics: |-
-    Be true to yourself<br>Namco High
-    Please have a good time<br>Be satisfied with life<br>Take the high road<br>Remember the moon is watching us
-    Don't have an itch<br>The coffee's not going cold<br>Work your way for me<br>Therefore I'm here
-    (Hey!<br>How's it going?<br>Good! How 'bout you?<br>Geometry's really hard, I think I need help<br>Oh, well, I'm really good at it, so... if you need help just hit me up!<br>Awesome! Yeah, I'll do that)
-    Be true to yourself<br>Namco High
-    Be true to yourself<br>Namco High
diff --git a/artists.yaml b/artists.yaml
index 31dd76f..e55b99c 100644
--- a/artists.yaml
+++ b/artists.yaml
@@ -165,6 +165,7 @@ Artist: Ahvia
 Aliases:
 - Lindsay Woods
 URLs:
+- https://ahvia.tumblr.com
 - https://twitter.com/Ahvia/
 ---
 Artist: Aiden Griffin Hanks
@@ -691,6 +692,13 @@ Artist: aswfs
 Dead URLs:
 - https://aswfs.tumblr.com/
 ---
+Artist: '[AT]'
+Aliases:
+- D nD
+Dead URLs:
+- https://www.youtube.com/@dnd402/
+  # Not dead, but nothing particular here. They commented ":)) my art" during the Vol. 2 stream.
+---
 Artist: Atsushi Kosugi
 Aliases:
 - Atsushi "SUSHI" Kosugi
@@ -5927,6 +5935,10 @@ URLs:
 ---
 Artist: MK_97
 ---
+Artist: mkteres
+Dead URLs:
+- https://mkteres.tumblr.com
+---
 Artist: MLoreley
 URLs:
 - https://mloreley.tumblr.com
@@ -6121,6 +6133,16 @@ URLs:
 ---
 Artist: N.W.A.
 ---
+Artist: n3rdysk3tch3s
+Aliases:
+- Lulu
+URLs:
+- https://doodles-of-a-nerd-kid.tumblr.com/
+- https://www.instagram.com/n3rdysk3tch3s/
+- https://02x.lu/
+Dead URLs:
+- https://twitter.com/xLuDrawsx
+---
 Artist: Naofumi Hataya
 URLs:
 - https://twitter.com/hatayatoday
@@ -6135,6 +6157,8 @@ Artist: Naoto Tanaka
 ---
 Artist: Naoto Yagishita
 ---
+Artist: Namco High
+---
 Artist: Nancy Cartwright
 ---
 Artist: narcolepsyDriver
diff --git a/flashes.yaml b/flashes.yaml
index b656937..5ce0d64 100644
--- a/flashes.yaml
+++ b/flashes.yaml
@@ -2091,7 +2091,7 @@ Contributors:
 - 'Courtney Brendle (art: backgrounds, endings)'
 Date: October 2, 2019
 Featured Tracks:
-- CAREFREE VICTORY (REMIX)
+- track:carefree-victory-remix
 Flash: The Loneliest Girl In The World
 ---
 Directory: pq-vol5
@@ -2104,9 +2104,9 @@ Contributors:
 Date: October 16, 2019
 Featured Tracks:
 - 2chords
-- track:crustacean-pq
-- track:drone-pq
-- Darling Kanaya
+- track:crustacean-pesterquest
+- track:drone-pesterquest
+- track:darling-kanaya-pesterquest
 Flash: Skip to The Trolls
 ---
 Directory: pq-vol6
@@ -2118,7 +2118,8 @@ Contributors:
 - David Turnbull (programming)
 Date: October 30, 2019
 Featured Tracks:
-- track:miracles
+- track:miracles-pesterquest
+- track:midnight-calliope-pesterquest
 - Superego
 Flash: Clowns and Corsairs
 ---
@@ -2133,7 +2134,7 @@ Date: November 13, 2019
 Featured Tracks:
 - 2chords
 - CH3CK TH3 M3T4D4T4
-- Indigo Heir
+- track:indigo-heir-pesterquest
 Flash: Dragons and Dairy
 ---
 Directory: pq-vol8
@@ -2146,7 +2147,7 @@ Date: December 5, 2019
 Featured Tracks:
 - Bronze Rebel
 - it's a cover of 'made of time'
-- yeah, it is
+- yeah it is
 - IT'S NOTHING
 - END OF FRIENDVANGELION
 Flash: Team Charge
@@ -2162,7 +2163,7 @@ Contributors:
 Date: December 20, 2019
 Featured Tracks:
 - 2chords
-- track:requiem-labyrinths-heart
+- track:requiem-pesterquest
 - KWCOM DOT WAV
 Flash: Blood and Binary
 ---
@@ -2176,9 +2177,9 @@ Contributors:
 Date: January 15, 2020
 Featured Tracks:
 - 2chords
-- Busker's Theme mk II
+- THIS TIME ITS ERIDAN
 - The La2t Frontiier
-- Love You (Feferi's Theme)
+- track:love-you-pesterquest
 Flash: Wow Pesterquest Your Mom Lets You Have Two Fish ?
 ---
 Directory: pq-vol11
@@ -2202,7 +2203,7 @@ Contributors:
 Date: February 19, 2020
 Featured Tracks:
 - 2chords
-- Riches to Ruins Movement II
+- Riches to Ruins Movements, Pt. II
 Flash: Thats right ADVENTURE!!!!
 ---
 Directory: pq-vol13
@@ -2215,7 +2216,7 @@ Date: March 4, 2020
 Featured Tracks:
 - 2chords
 - Would you believe this was for something else
-- Even in Death (T'Morra's Belly Mix)
+- track:even-in-death-pesterquest
 Flash: Friendship Wozard
 ---
 Directory: pq-vol14
@@ -2229,8 +2230,8 @@ Date: April 1, 2020
 Featured Tracks:
 - 2chords
 - Stress
-- Beatup
-- Unite Synchronization
+- track:beatup-pesterquest
+- track:unite-synchronization-pesterquest
 - track:mspar-remember
 - normal song name
 - Embittered Shore
@@ -4396,7 +4397,7 @@ Featured Tracks:
 - Condescescion
 - WORST END
 - Let's Read A Webcomic ~ You're Welcome
-- yeah, it is
+- yeah it is
 - Eternity Served Cold
 - English
 URLs:
@@ -4672,16 +4673,16 @@ Contributors:
 - 'Der-shing Helmer (art: Tomari)'
 Date: December 17, 2013
 Featured Tracks:
-- Namco Theme
-- track:school-namco-high
+- track:title-theme-namco-high
+- School Times
 - Around Town
 - Private Times
 - Sad Times
-- Romance
-- Upbeat
-- Upbeat (Half)
-- Boss Theme
-- Credits
+- Romance Times
+- Upbeat Times
+- Upbeat Times (Half)
+- Battle Music
+- Namco High (Be True To Yourself)
 ---
 Flash: The Genesis Project
 Directory: the-genesis-project
diff --git a/groups.yaml b/groups.yaml
index 93e3134..ee3e765 100644
--- a/groups.yaml
+++ b/groups.yaml
@@ -160,6 +160,13 @@ Description: |-
     <i>"Born in Denver, Colorado. Bachelor of Music in Music Composition and Percussion Performance from University of Northern Colorado. Accidentally started writing music for Homestuck in 2009. Lover of aleatoric music, minimalism, and ."</i>
     [Description via Bandcamp.](https://jamesdever.bandcamp.com/)
 ---
+Group: James Roach
+URLs:
+- https://hames.bandcamp.com/
+- https://www.jamesroach.net/
+Description: |-
+    LA-based composer and audio engineer behind [[album:hiveswap-act-1-ost|Hiveswap]], [[album:pesterquest-soundtrack|Pesterquest]], and much more. He's been doing music for over twenty years; today, he's the creative director behind the HICU.
+---
 Group: Jamie Paige
 URLs:
 - https://jamiepaige.bandcamp.com/
diff --git a/static-page/changelog.yaml b/static-page/changelog.yaml
index b8c43e9..9cd3099 100644
--- a/static-page/changelog.yaml
+++ b/static-page/changelog.yaml
@@ -127,6 +127,9 @@ Content: |-
         - added [[album:agents-of-reality]] by [[artist:tycoon]]!
         - added [[album:comissions-i]] by [[artist:waterpsychiatrist]]!
         - added [[album:seven-seas]] and [[album:10-percent-of-my-strength]] by [[artist:worthikids]]!
+    - added proper albums for tracks that were previously under [[album:unreleased-tracks]]:
+        - added [[album:namco-high-official-soundtrack]] by [[artist:ryan-francis]]!
+        - added [[album:pesterquest-soundtrack]] by [[artist:james-roach]] & co!
     <h3>additional names</h3>
     - completely new feature, adding pre-release names, localizations, de-quirked names, names on other releases/platforms, variations in booklets and commentary, other "AKA" titles and more
     - appear only on track pages, but only for now; trivial to add to any thing-based page
@@ -145,6 +148,7 @@ Content: |-
     - tidied, touched up with links, and double-checked for accuracy almost all transcribed commentary originating in booklets, from albums: [[album:alternia]], [[album:sburb]], [[album:alterniabound]], [[album:homestuck-vol-10]], [[album:beyond-canon]]
     - added Bandcamp commentary/credit blurbs, as well as news and descriptions from whatpumpkin.com, across [[group:official]]
     - added various missing MSPA news blurbs across [[group:official]], including practically all albums, plus [[track:black]], [[track:unite-synchronization]] and [[track:eternity-served-cold]] (thanks, Lilith!)
+    - added new artworks (and listening link) to [[album:oceanfalls-vol-2]]! (thanks to leii for help with the art tags!)
     - added a bunch of fan animations (thanks, Jebb!)
         - added animations by [[artist:shadok]]: [[flash:homestuck-the-baby-is-you-animated]] through [[flash:noelle-is-spamtons-mom]]
         - added animations by [[artist:bugflower413]]: [[flash:damara-ascend]] through [[flash:dethrone-bugflower413]]
@@ -230,6 +234,7 @@ Content: |-
     - fixed [[track:skaian-overdrive]] not sampling [[track:anubis-septicflesh]]
     - fixed [[track:skaian-happy-flight]] not referencing [[track:bastians-happy-flight]]
     - fixed [[track:breeze]] not referencing [[track:evanescence-maria-schneider]]
+    - fixed [[track:this-time-its-eridan]] not referencing [[track:buskers-theme]]
     - fixed [[track:gog-rest-ye-merry-prospitians]] referencing [[track:santa-claus-is-comin-to-town]] instead of [[track:here-comes-santa-claus]] (thanks, Pyryte!)
     - fixed [[track:eternal-suffering]] not sampling [[track:through-fire-justice-is-served]] (thanks, Rosetta Leijonde, FF!)
     - fixed [[track:lullaby-of-the-furthest-ring]] not referencing [[track:lullaby-of-the-furthest-ring-feb-21]] (thanks, Lilith!)
@@ -243,7 +248,7 @@ Content: |-
     - fixed [[track:blue-blood-group]] not referencing [[track:vriskas-theme]] (thanks, Lilith!)
     - fixed [[track:made-in-heaven-canwave-3]] referencing [[track:the-show-must-go-on-friendsymphony]] instead of [[track:the-show-must-go-on-queen]]
     - fixed [[track:miasmatic-chacon]] not sampling [[track:phat1]] (thanks indirectly, Rosetta Leijonde!)
-    - fixed [[track:king-crab]] referencing [[track:crustacean]] instead of [[track:crustacean-pq]] (thanks, Jebb!)
+    - fixed [[track:king-crab]] referencing [[track:crustacean]] instead of [[track:crustacean-pesterquest]] (thanks, Jebb!)
     - fixed [[track:battle-with-a-legendary-fiduspawn]] not referencing [[track:english]] (thanks, FF!)
     - fixed [[track:dreams-of-a-better-future]] not sampling [[track:through-fire-justice-is-served]] (thanks, Pyryte, FF!)
     - fixed [[track:galactic-incoherence-cosmic-nan-propagation]] not referencing [[track:umbral-ultimatum]] (thanks, Jebb!)
@@ -262,8 +267,10 @@ Content: |-
         - fixed [[track:wieczna-wiedza]] not referencing [[track:royalty-unbind]]
         - fixed [[track:to-ashes-it-returns]] not referencing [[track:right-hand]]
     - fixed [[track:megalo-strike-back]] not referencing [[track:prologue-earthbound]] (thanks, FF, Cello!)
-    - fixed [[track:woman-i-never-met]] not referencing [[track:serenade-vol8]]
     - fixed [[track:a-heaven-broad-and-ochre]] not sampling [[track:scientific-method-omegalodon]] (thanks, Lilith!)
+    - fixed [[track:woman-i-never-met]] not referencing [[track:serenade-vol8]]
+    - fixed [[track:namco-high-be-true-to-yourself]] referencing [[track:title-theme-namco-high]], instead of the other way around (thanks, Niklink!)
+    - fixed [[track:battle-music]] referencing [[track:title-theme-namco-high]] instead of [[track:namco-high-be-true-to-yourself]]
     - fixed [[track:fallen-down-undertale]] not referencing [[track:fallen-down]]
     - fixed [[track:sunsetter-ska]] not referencing [[track:sunsetter]]
     - fixed [[track:old-skacret]] not referencing [[track:old-secret]], and added listening link (thanks, Rosetta Leijonde!)
@@ -287,7 +294,30 @@ Content: |-
     - fixed [[track:break-shot]] not being tagged [[tag:green-sun]] and [[tag:ah]] (thanks, Pyryte, FF!)
     - fixed [[track:lost-memories]] not being tagged [[tag:bk]] (thanks, Pyryte!)
     - fixed [[track:feels-jam]] being tagged [[tag:lomax]] instead of [[tag:lotak]] (thanks, Pyryte!)
+    - fixed [[track:random-encounter]] not being tagged [[tag:ludwig-oceanfalls]]
+    - fixed [[track:ghostdog-good-boy]] not being tagged [[tag:ludwig-oceanfalls]]
+    - fixed [[track:arts-and-crafts]] not being tagged [[tag:sis-oceanfalls]] (thanks, leii!)
+    - fixed [[track:encounter-with-hostile-maids]] not being tagged [[tag:avarita-oceanfalls]], [[tag:gula-oceanfalls]], and [[tag:ira-oceanfalls]] (thanks, leii!)
+    - fixed [[track:a-long-time-ago]] not being tagged [[tag:lady-oshen-oceanfalls]] (thanks, leii!)
+    - fixed [[track:sea-patrol-ocean-quarrel]] not being tagged [[tag:boyfriend-oceanfalls]]
+    - fixed [[track:best-boyfriend]] not being tagged [[tag:boyfriend-oceanfalls]]
+    - fixed [[track:adventure-at-sea]] not being tagged [[tag:blackfin-oceanfalls]], [[tag:warty-oceanfalls]], and [[tag:weddell-oceanfalls]] (thanks, leii!)
+    - fixed [[track:cinders-oceanfalls]] not being tagged [[tag:marzipan-aries-oceanfalls]] (thanks, leii!)
+    - fixed [[track:angry-cat-owo-oceanfalls-version]] not being tagged [[tag:cats]]
+    - fixed [[track:onyxs-theme]] not being tagged [[tag:onyx-oceanfalls]]
+    - fixed [[track:tale-of-valkyries]] not being tagged [[tag:herja-aquarius-oceanfalls]] (thanks, leii!)
+    - fixed [[track:galactic-princess-selene-battle-theme]] not being tagged [[tag:cats]]
+    - fixed [[track:sea-patrol-ocean-calm]] not being tagged [[tag:blackfin-oceanfalls]], [[tag:warty-oceanfalls]], and [[tag:weddell-oceanfalls]] (thanks, leii!)
+    - fixed [[track:oceancute]] not being tagged [[tag:boyfriend-oceanfalls]]
+    - fixed [[track:burning-wood-blocks]] not being tagged [[tag:sis-oceanfalls]]
+    - fixed [[track:portside]] not being tagged [[tag:warty-oceanfalls]] (thanks, leii!)
+    - fixed [[album:oceanfalls-vol-five]] not being tagged [[tag:sis-oceanfalls]]
+    - fixed [[track:metal-and-meat]] not being tagged [[tag:zachery-oceanfalls]] (thanks, leii!)
+    - fixed [[track:hollowed-halls]] not being tagged [[tag:sis-oceanfalls]]
+    - fixed [[track:emblems-of-a-magnum-opus]] not being tagged [[tag:sis-oceanfalls]]
+    - fixed [[track:cinq]] not being tagged [[tag:ludwig-oceanfalls]] and [[tag:boyfriend-oceanfalls]]
     - fixed [[flash:1940]] not featuring [[track:squiddles]] and [[track:friendship-aneurysm]] (thanks, Pyryte!)
+    - fixed [[flash:pq-vol6]] not featuring [[track:midnight-calliope-pesterquest]]
     - fixed domains for battleofthebits links on [[track:grrrarrr]] and [[artist:baron-knoxburry]] (thanks, Pyryte!)
     - fixed Bandcamp link for [[track:the-land-of-wind-and-shade]] (thanks, Pyryte!)
     - fixed YouTube link for [[track:old-secret]] (thanks, SoupyLenny, vriska/leo!)
@@ -306,6 +336,7 @@ Content: |-
         - listed referenced tracks in [[track:cascade]] also as sampled tracks
     - fixed [[artist:raizor]] having some credits under another name
     - added [[artist:buoyant]] to credits for [[track:switchback]] (thanks, Lilith!)
+    - added [[album:hiveswap-act-1-ost]] and [[album:hiveswap-act-2-ost]] to [[group:toby-fox]] group (as well as new [[group:james-roach]] group)
     - added details to cover art credits for [[album:prospit-and-derse]] (thanks, Lilith!)
     - tidied details in artist credits for [[track:takeover-havoc]] (was "Takeover / Havoc organ solo", "Takeover / Havoc guitar solo"; thanks, vriska/leo!)
     - added [[artist:tavia-morra]] to credits for [[track:maplehoofs-adventure]] (thanks, Lilith!)
@@ -332,6 +363,7 @@ Content: |-
     - updated [[group:cristata]] group description for legibility (thanks, Cello!)
     - changed [[artist:toby-fox]]'s credit on [[track:fiduspawn-go]] from contributor to co-artist
     - changed [[artist:nick-smalley]]'s credit on [[track:trollcops-radio-play]] from contributor to (lyrical) co-artist
+    - removed fan-made, unofficial artworks from [[album:pesterquest-soundtrack]] and unreleased Pesterquest tracks (for now)
     - changed directory of [[track:on-repeat]] from <code>on-repeat-intermission</code> to <code>on-repeat</code>
     - changed directory of [[track:revelations-vast-error]] from <code>revelations-bonus</code> to <code>revelations-vast-error</code>
     - changed directory of [[track:gone-vast-error]] from <code>gone-bonus</code> to <code>gone-vast-error</code>
@@ -340,6 +372,18 @@ Content: |-
     - changed directory of [[track:courage-catch-322]] from <code>courage-vast-error</code> to <code>courage-catch-322</code>
     - changed directory of [[track:mimesiswing]] from <code>intermission-mimesiswing</code> to <code>mimesiswing</code>
     - changed directory of [[track:the-show-must-go-on-friendsymphony]] from <code>the-show-must-go-on</code> to <code>the-show-must-go-on-friendsymphony</code>
+    - changed directory of [[track:title-theme-namco-high]] from <code>namco-theme</code> to <code>title-theme-namco-high</code>
+    - changed directory of [[track:school-times]] from <code>school-namco-high</code> to <code>school-times</code>
+    - changed directory of [[track:romance-times]] from <code>romance</code> to <code>romance-times</code>
+    - changed directory of [[track:upbeat-times]] from <code>upbeat</code> to <code>upbeat-times</code>
+    - changed directory of [[track:upbeat-times-half]] from <code>upbeat-half</code> to <code>upbeat-times-half</code>
+    - changed directory of [[track:battle-music]] from <code>boss-theme</code> to <code>battle-music</code>
+    - changed directory of [[track:namco-high-be-true-to-yourself]] from <code>credits</code> to <code>namco-high-be-true-to-yourself</code>
+    - changed directory of [[track:24-7-lo-fi-anime-beats-to-question-your-sexuality-to]] from <code>247-lo-fi-anime-beats-to-question-your-sexuality-to</code> to <code>24-7-lo-fi-anime-beats-to-question-your-sexuality-to</code>
+    - changed directory of [[track:drone-pesterquest]] from <code>drone-pq</code> to <code>drone-pesterquest</code>
+    - changed directory of [[track:crustacean-pesterquest]] from <code>crustacean-pq</code> to <code>crustacean-pesterquest</code>
+    - changed directory of [[track:this-time-its-eridan]] from <code>busters-theme-mk-ii</code> to <code>this-time-its-eridan</code>
+    - changed directory of [[track:riches-to-ruins-movements-pt-ii]] from <code>riches-to-ruins-movement-ii</code> to <code>riches-to-ruins-movements-pt-ii</code>
     - changed directory of [[track:lucaslee-mp3]] from <code>lucasleemp3</code> to <code>lucaslee-mp3</code>
     - changed directory of [[track:pokemon-theme]] from <code>pokmon-theme-gotta-catch-em-all</code> to <code>pokemon-theme</code>
     - changed a bunch of malformed, single-word, or inconsistent directories: (thanks, Rosetta Leijonde!)
@@ -1220,7 +1264,7 @@ Content: |-
     - fixed [[flash:5440|[S] ==>]] (the A6I4 intro flash) listing [[track:english]] instead of [[track:eternity-served-cold]]
     - fixed a number of syntax errors in data files, thanks to improved parsing and data review by Gio (thank you!) detecting misspelled names of various data fields (that would therefore would not display) for [[track:fuchsia-ruler]], [[track:frogsong]], [[track:schrodingers-harbinger]], [[artist:dsnake]], [[artist:first-turn-fold]], [[artist:thiefofstars]], and [[tag:carapacians]]
     - added Bandcamp links back to [[group:clark-powell]]'s albums: [[album:we-are-all-satellites]], [[album:namesake]], [[album:someday]], and [[album:labyrinths-heart]] (thanks, Celeste!), and also to  [[album:perfectly-generic-object]] (thanks, vriska/leo!)
-    - added YouTube links to [[album:perfectly-generic-album]] (thanks, vriska/leo!), also [[track:guardian]], [[track:nightlife-extended]], [[track:kinetic-verdancy]], [[track:rediscover-fusion-remix]], [[track:mutiny]], [[track:guardian-v2]], [[track:contention-vol4]], [[track:null-vol8]], [[track:its-good-to-see-you-again]], [[track:before-before-the-beginning]], [[track:isnt-this-is-this-the-end-again]], [[track:non-compos-mentis]], [[track:drone-pq]], [[track:its-a-cover-of-made-of-time]], [[track:its-nothing]]
+    - added YouTube links to [[album:perfectly-generic-album]] (thanks, vriska/leo!), also [[track:guardian]], [[track:nightlife-extended]], [[track:kinetic-verdancy]], [[track:rediscover-fusion-remix]], [[track:mutiny]], [[track:guardian-v2]], [[track:contention-vol4]], [[track:null-vol8]], [[track:its-good-to-see-you-again]], [[track:before-before-the-beginning]], [[track:isnt-this-is-this-the-end-again]], [[track:non-compos-mentis]], [[track:drone-pesterquest]], [[track:its-a-cover-of-made-of-time]], [[track:its-nothing]]
     - added Spotify listen links to [[album:mobius-trip-and-hadron-kaleido]], [[album:strife]], [[album:strife-2]], [[track:sburban-jungle]], and [[track:ascend]]
     - added listen links to [[artist:bill-bolin]]'s tracks on the official Homestuck albums
     - fixed wrong YouTube links for [[track:virgin-orb]] (thanks, Sgeo!) and  [[track:how-do-i-live-d8-night-version]] (thanks, Makin!)
@@ -1788,7 +1832,7 @@ Content: |-
         - added new tracks [[track:friendvangelion-rebuild]], [[track:its-a-cover-of-made-of-time]], and [[track:its-nothing]] to the <i>Tracks featured in Pesterquest</i> section
         - added [[track:its-a-cover-of-made-of-time]] to the reference list of [[track:yeah-it-is]]
         - moved [[track:seer-of-same-color-scalemate-combos]] from <i>Other tracks originating outside of Homestuck</i> to <i>Other Homestuck tracks</i>
-        - renamed "DRONE_PQ" to [[track:drone-pq]] and gave it track art from [[artist:tempest2k]]'s <a href="https://twitter.com/nueclear333/status/1331330835245535232">PESTERQUEST OST</a> collection
+        - renamed "DRONE_PQ" to [[track:drone-pesterquest]] and gave it track art from [[artist:tempest2k]]'s <a href="https://twitter.com/nueclear333/status/1331330835245535232">PESTERQUEST OST</a> collection
         - renamed "THIS TIME ITS ERIDAN (I FORGOT WHAT I NAMED THIS)" to [[track:buskers-theme-mk-ii]] and added commentary from James Roach's tumblr
         - removed a bunch of tracks that were moved into [[album:undertale-soundtrack]]
     - miscellaneous changes to data for [[site:flash/|Flashes &amp; Games]]
diff --git a/tags.yaml b/tags.yaml
index 333bc9a..bb94c49 100644
--- a/tags.yaml
+++ b/tags.yaml
@@ -826,30 +826,63 @@ Tag: Phoebe (Desynced)
 Color: '#9868bc'
 Tag: Aria (Oceanfalls)
 ---
+Color: '#fda27b'
+Tag: Avarita (Oceanfalls)
+---
+Color: '#cf7c72'
+Tag: Blackfin (Oceanfalls)
+---
+Color: '#47abc7'
+Tag: Boyfriend (Oceanfalls)
+---
 Color: '#a3cb6a'
 Tag: Corona (Oceanfalls)
 ---
 Color: '#c578d4'
 Tag: Five (Oceanfalls)
 ---
+Color: '#a2e69d'
+Tag: Gula (Oceanfalls)
+---
+Color: '#b9976a'
+Tag: Herja Aquarius (Oceanfalls)
+---
+Color: '#87a0fe'
+Tag: Ira (Oceanfalls)
+---
 Color: '#76d8fd'
 Tag: Kaji (Oceanfalls)
 ---
 Color: '#eb0013'
 Tag: Kotori (Oceanfalls)
 ---
+Color: '#6e78d4'
+Tag: Lady Oshen (Oceanfalls)
+---
+Color: '#c1c1c1'
+Tag: Ludwig (Oceanfalls)
+---
 Color: '#a380c4'
 Tag: Lune (Oceanfalls)
 ---
+Color: '#fec6ae'
+Tag: Marzipan Aries (Oceanfalls)
+---
 Color: '#318fee'
 Tag: Meimona (Oceanfalls)
 ---
 Color: '#359e41'
 Tag: Nino (Oceanfalls)
 ---
+Color: '#a1a1a1'
+Tag: Onyx (Oceanfalls)
+---
 Color: '#9a6062'
 Tag: Reed (Oceanfalls)
 ---
+Color: '#b9a6a2'
+Tag: Ruby (Oceanfalls)
+---
 Color: '#5c66e8'
 Tag: Ruit (Oceanfalls)
 ---
@@ -859,6 +892,9 @@ Tag: Ruta (Oceanfalls)
 Color: '#fef49f'
 Tag: Selene (Oceanfalls)
 ---
+Color: '#89e0a5'
+Tag: Sis (Oceanfalls)
+---
 Color: '#ff6600'
 Tag: Solis (Oceanfalls)
 ---
@@ -868,6 +904,15 @@ Tag: Suvillan (Oceanfalls)
 Color: '#e2b82c'
 Tag: The Queen (Oceanfalls)
 ---
+Color: '#fec294'
+Tag: Warty (Oceanfalls)
+---
+Color: '#a99586'
+Tag: Weddell (Oceanfalls)
+---
+Color: '#21f2c8'
+Tag: Zachery (Oceanfalls)
+---
 Color: '#b95c00'
 Tag: Arcjec (Vast Error)
 ---