add of troles and chiptumes

9 files changed, 400 insertions, 57 deletions

diff --git a/album/alterniabound.yaml b/album/alterniabound.yaml
index d4efda68..9f85e909 100644
--- a/album/alterniabound.yaml
+++ b/album/alterniabound.yaml
@@ -354,6 +354,7 @@ Commentary: |-
     <img src="media/misc/requiem-of-sunshine-and-rainbows.jpg" width="350" height="350">
 ---
 Track: Eridan's Theme
+Directory: eridans-theme
 Artists:
 - Toby Fox
 Contributors:
@@ -455,6 +456,7 @@ Cover Artists:
 - chocolatula
 Art Tags:
 - Equius
+- Horses
 - 'cw: asphyxiation (abstract)'
 Referenced Tracks:
 - Horschestra
diff --git a/album/cool-and-new-volume-ii.yaml b/album/cool-and-new-volume-ii.yaml
index 6e472c2c..8530ef17 100644
--- a/album/cool-and-new-volume-ii.yaml
+++ b/album/cool-and-new-volume-ii.yaml
@@ -480,6 +480,7 @@ Art Tags:
 - John
 - Jhon
 - 'cw: blood (abstract)'
+- 'cw: corpse'
 Referenced Tracks:
 - track:showtime-original-mix
 - track:doctor
@@ -728,6 +729,7 @@ Art Tags:
 - Earth
 - Sweet Bro
 - Swet Bro
+- 'cw: corpse'
 - 'cw: blood'
 Referenced Tracks:
 - Moonsetter
@@ -1414,7 +1416,6 @@ Art Tags:
 - Karkat
 Referenced Tracks:
 - Karkat's Theme
-- track:crustacean
 ---
 Track: troleplanet
 Artists:
@@ -1442,6 +1443,7 @@ Art Tags:
 - Dadd
 - John's dad
 - Skaia
+- 'cw: blood (abstract)'
 Referenced Tracks:
 - track:MeGaLoVania
 - Oppa Toby Style
diff --git a/album/lofam4.yaml b/album/lofam4.yaml
index 0c63d91e..88c672c9 100644
--- a/album/lofam4.yaml
+++ b/album/lofam4.yaml
@@ -219,7 +219,7 @@ Referenced Tracks:
 - Amen, Brother
 Commentary: |-
     <i>TirantBacon:</i>
-    As an acknowledgement, this song in many ways was mostly inspired by the tune "Black" By Radiation (or Toby Fox I guess). I made this song as a "remix" of sorts of the song called "Midnight Suffers", something I made for the mostly popular fanventure, cool and new web comic. If anything, I'd say it was directly copied from Black, and that I did a mostly poor effort to recreate the style... Nonetheless, I did focus on trying to incorporate some transition points in the song where it would actually deviate from the original arrangement, and I suppose it works quite well even when it's not on paper.
+    As an acknowledgement, this song in many ways was mostly inspired by the tune "Black" By Radiation (or Toby Fox I guess). I made this song as a "remix" of sorts of the song called "Midnight Suffers", something I made for the mostly popular fanventure, [[group:canmt|cool and new web comic]]. If anything, I'd say it was directly copied from Black, and that I did a mostly poor effort to recreate the style... Nonetheless, I did focus on trying to incorporate some transition points in the song where it would actually deviate from the original arrangement, and I suppose it works quite well even when it's not on paper.
     The main motif was taken from midnight suffers... A bluesy jazz type theme that was made with no real direction intended. This song is not necessarily "catchy", but at least it has direction and sounds good, which is always nice! Some of the most prominent instrumentation involved DVS saxophones, loud crazy drums, a heavy bassline, sharp synths and a really loud piano chord progression in the background. It's all crazy stuff.
     <i>Calicorn:</i>
     I chose Midnight as my track art, mostly just because of my love for Intermission. This song is absolutely fantastic, but since I'm not the most creative person around it took me a while to come up with any concrete designs at first. I was originally going to start off with a 50/50 bust drawing of Slick and Jack, but I soon discovered that might be a little too bland. I ended up listening to the song a dozen more times until I sketched out the base idea for the finalized idea. The main challenge had just been lining everything and getting the perspective to look pretty alright, although I'm not really an expert on perspective or composition. Either way, I'm really happy with how the piece turned out, especailly with the lighting on Slick himself.
@@ -354,7 +354,7 @@ Art Tags:
 - Skaia
 Commentary: |-
     <i>Difarem:</i>
-    This track has quite the story! It was originally meant to be fake "loading screen" music, to accompany a parodic video on the Cool and New Music Team youtube channel about Overseer v3 (a web-based sburb web game, whose development team I used to be part of) being shut down by What Pumpkin (though the C&amp;D was later found out to be fake). The project fell through, so I continued working on it and posted it on the LOFAM Discord server, where it got approved (thanks Lambda), though the deadline had tehcnically passed.
+    This track has quite the story! It was originally meant to be fake "loading screen" music, to accompany a parodic video on the [[group:canmt|Cool and New Music Team]] youtube channel about Overseer v3 (a web-based sburb web game, whose development team I used to be part of) being shut down by What Pumpkin (though the C&amp;D was later found out to be fake). The project fell through, so I continued working on it and posted it on the LOFAM Discord server, where it got approved (thanks Lambda), though the deadline had tehcnically passed.
     <i>Chumi:</i>
     it sounds like a song for the beginning of a cool adventure! so that's what i drew :o
 ---
@@ -435,7 +435,7 @@ Art Tags:
 - Earth
 Commentary: |-
     <i>Hadron:</i>
-    This song is for Cool and New Webcomic, but I like it a lot and a lot of people like it too, so I want the world to see it. It is inspired by a lot of the new-age synthpop, which itself is inspired by the 1980s. In this time of rapid community music projects being built I want y'all to remember; we're all musicians and that is the blood that festers throughout the body. We're all alike in our different ways. love you all thanks have fun :&gt;
+    This song is for [[group:canmt|Cool and New Webcomic]], but I like it a lot and a lot of people like it too, so I want the world to see it. It is inspired by a lot of the new-age synthpop, which itself is inspired by the 1980s. In this time of rapid community music projects being built I want y'all to remember; we're all musicians and that is the blood that festers throughout the body. We're all alike in our different ways. love you all thanks have fun :&gt;
     <i>meigender:</i>
     Formation has a very 80's vibe to it, so I decided to aim towards more of a Hotline Miami feel for the accompanying artwork. I'm not sure how well I achieved that, but I figure a combination of bright colours and guns is at least veering in the right direction.
 ---
@@ -551,7 +551,7 @@ Referenced Tracks:
 - At The Price of Oblivion
 Commentary: |-
     <i>SplitSuns:</i>
-    This track was made for the Cool and New Music Team's Volume 7. It was based on the hypothetical question "What if Rose went grimdark?" which was based off of a series of shitposts on the /r/homestuck subreddit. With this song, I tried to make it mirror the chain of events that occur to Rose before and after she goes grimdark in the comic. It starts off relatively simple, but quickly goes ominous and unsettling as she stares into the cueball in "Seer: Ask." Then suddenly the song explodes into a blistering drum-and-bass track with booming organs to tell you that, in fact, shit just got real. The song was meant to be reminiscent of "Your Best Nightmare" from Undertale, and I hope I was able to pull that effect off. The song concludes in much the same way it began as Rose, in her newly darkened state, flies into space. All things considered, I had a lot of fun making this song.
+    This track was made for the [[group:canmt|Cool and New Music Team']]s Volume 7. It was based on the hypothetical question "What if Rose went grimdark?" which was based off of a series of shitposts on the /r/homestuck subreddit. With this song, I tried to make it mirror the chain of events that occur to Rose before and after she goes grimdark in the comic. It starts off relatively simple, but quickly goes ominous and unsettling as she stares into the cueball in "Seer: Ask." Then suddenly the song explodes into a blistering drum-and-bass track with booming organs to tell you that, in fact, shit just got real. The song was meant to be reminiscent of "Your Best Nightmare" from Undertale, and I hope I was able to pull that effect off. The song concludes in much the same way it began as Rose, in her newly darkened state, flies into space. All things considered, I had a lot of fun making this song.
     This track received brand new art for its release on LOFAM4, courtesy of the talented Neiratina! With this song portraying Rose succumbing to the broodfester throes and going Grimdark, this art features Rose beginning to slip away to the eldritch Horrorterrors as well. WIth her wand gripped firmly in hand, Rose looks fiercely determined to destroy anything in her path. Her aura of golden is inexorably being snuffed out by the black tentacles that pour out of the image, even interfering with the designs in Rose's shrit and snaking their way into the background. Marked with jagged lines and dripping ink, this piece perfectly caputres Rose's last moments of innocence as she throws caution to the wind and turns herself Grimdark.
 ---
 Track: My Lady Greensleeves
@@ -758,7 +758,7 @@ Referenced Tracks:
 - Spider's Claw
 Commentary: |-
     <i>Noisemaker:</i>
-    An extension of a very, very short segment of a group collaboration (7 GRAND END from the Cool and New Music Team), it seemed unfitting to leave something like this in its short, unfinished state.
+    An extension of a very, very short segment of a group collaboration (7 GRAND END from the [[group:canmt|Cool and New Music Team]]), it seemed unfitting to leave something like this in its short, unfinished state.
     <i><b>SplitSuns:</b></i>
     Buffskull was originally a part of the CANMT song "7 GRAND END," with the music syncing up to the final Act 7 flash in Homestuck. This part of the song played when Vriska and her army prepared to face off against Lord English, and the art reflects this tense moment. Vriska stands in the middle of the chaos, with the house juju towering behind her. All of this is reflected in the eye of Lord English himself, his normally radiating visage forced into the position of eight-balls. The detail on English's eye is both very sharp and a little unsettling. So although this art mirrors previous scenes in the comic, it adds its own interseting twists to the presentation to make it an exciting and engaging image.
 ---
@@ -1257,7 +1257,7 @@ Referenced Tracks:
 - track:showtime-original-mix
 Commentary: |-
     <i>Aris Martinian:</i>
-    Written for the Cool and New Music Team's Cool and New Homestuck 2, this is an attempt to remix Unite Synchronization in a way that fits better thematically with [S] Dirk: Synchronize and [S] Dirk: Unite. Some of the things I worked in were Orange Hat when Dirk wakes up, for example, Metamorphic Choices when the kernelsprite appears, Hate You for Meenah's cameo... Dirk's scateboard-riding I represented with Moshi Moshi?, a theme that's admittedly been a bit of a stickymotif for me (I've used it in way too many compositions). I like Moshi for an umber of reasons, not the least of which is the fact that it goes so well with so many things. What can I say? I like mashing themes together.
+    Written for the [[group:canmt|Cool and New Music Team's]] Cool and New Homestuck 2, this is an attempt to remix Unite Synchronization in a way that fits better thematically with [S] Dirk: Synchronize and [S] Dirk: Unite. Some of the things I worked in were Orange Hat when Dirk wakes up, for example, Metamorphic Choices when the kernelsprite appears, Hate You for Meenah's cameo... Dirk's scateboard-riding I represented with Moshi Moshi?, a theme that's admittedly been a bit of a stickymotif for me (I've used it in way too many compositions). I like Moshi for an umber of reasons, not the least of which is the fact that it goes so well with so many things. What can I say? I like mashing themes together.
     <i><b>WHATISLOSTINTHEMINES:</b></i>
     An illustration of the events of both [S] Dirk: Synchronize and [S] Dirk: Unite. As can clearly be seen, the Red Miles tore up the spacetime continuum, resulting in all the events happening concurrently. This is exactly what happened both here and in the flashes, and definitely isn't just a clever tactic by dazed-squid to create a pretty neat track art that depicts a lot of the best parts of said flashes.
 ---
@@ -1335,7 +1335,7 @@ Referenced Tracks:
 - Let's All Rock the Heist
 Commentary: |-
     <i>Cryptanark:</i>
-    AKA The One Time I Sold Out to LOFAM, Ringleader is a Crowbar song I had a lot of fun throwing together. I tried incorporating aspects of jazz and rock solbos, in addition to experimenting with a 7/8 time signature. I'm pleasantly surprised at how it turned out, considering how obtuse the concept felt to me when I was first planning out the track. Blah blah blah check out cool and new webcomic please
+    AKA The One Time I Sold Out to LOFAM, Ringleader is a Crowbar song I had a lot of fun throwing together. I tried incorporating aspects of jazz and rock solbos, in addition to experimenting with a 7/8 time signature. I'm pleasantly surprised at how it turned out, considering how obtuse the concept felt to me when I was first planning out the track. Blah blah blah check out [[group:canmt|cool and new webcomic]] please
     <i>nights:</i>
     Crypt's songs are always a delight to listen to, I'm so happy I got the chance to do art for one of them. (Plus it's a Crowbar track! Objectively the best Felt member. This is fact not opinion.)
 ---
@@ -1548,7 +1548,7 @@ Commentary: |-
     This song originated as a battle theme for Roxy, but as I moved along in the process, I thought "Hey, wouldn't it be cool to make some kind of medley for all of the alpha kids when they got their god tiers that would be pretty cool wouldn't it?" and started what at the time was the most ambitious song I made yet.
     My process when making the medley was to make some kind of... story I suppose? I'm not really a fan of stuff that shoves in references for the sake of shoving in references, so pretty much every reference I put in here was meant to connect ot the kids somehow. (Look fine Ruisn only has a really tangential connection to Jane but I didn't listen to Volume 9 because I'm a bad person)
     This song was made when I was first really digging my teeth into making music, and I feel like it shows. Generally I feel like the production and instrumentation in this song has... a lot to be desired. Even so, making this taught me lots of things that I wouldn't have learned otherwise, and I'm glad I made it, even if I can't stand to listen to it.
-    I tried to make another medley with this kind of format for the Cool and New Music Team recently, and it's essentially what I was trying to do with this song. (Although, with a different subject matter entirely.) You can find it on the Greatest Hits 2 album, under the name <i>Two Master Classes, A Knife Enthusiast, and A Green Dude Walk Into a Bar</i>. Yes, I know it's a shitty name.
+    I tried to make another medley with this kind of format for the [[group:canmt|Cool and New Music Team]] recently, and it's essentially what I was trying to do with this song. (Although, with a different subject matter entirely.) You can find it on the Greatest Hits 2 album, under the name <i>Two Master Classes, A Knife Enthusiast, and A Green Dude Walk Into a Bar</i>. Yes, I know it's a shitty name.
     After her fantastic work on the Volume 5 Anthology, a project to supply Homestuck Volume 5 with unique art for each track, Aeritus supplied this wonderful image. Here, the alpha kids lie in rest, waiting for the future of attaining god tier. It... can't be comfortable to lie in rest on stone slabs. That must be hell on your back.
 ---
 Track: Sunslammer (Cement City Remix)
@@ -1596,7 +1596,7 @@ Referenced Tracks:
 - track:endless-climb
 Commentary: |-
     <i>SplitSuns:</i>
-    This track was amde for the Cool and New Music Team's CANWAVE, an album entirely of Homestuck vaporwave parodies. This song in particular is a vaporwave edit of Endless Climb, hence the name. I tried to extends the vaporwave feel beyond just slowing the song down, splicing and editing the original song in interesting ways, adding 80's style instruments, and utilizing pitchbend and other distortion effects to provide an uneasy feel. The result is something that transcends meme status and enters "dream status," if you will. Actually that sounds kind of dumb. Forget I said that.
+    This track was amde for the [[group:canmt|Cool and New Music Team]]'s CANWAVE, an album entirely of Homestuck vaporwave parodies. This song in particular is a vaporwave edit of Endless Climb, hence the name. I tried to extends the vaporwave feel beyond just slowing the song down, splicing and editing the original song in interesting ways, adding 80's style instruments, and utilizing pitchbend and other distortion effects to provide an uneasy feel. The result is something that transcends meme status and enters "dream status," if you will. Actually that sounds kind of dumb. Forget I said that.
     The track art is a parody of the cover of the vaporwave album "Shader Complete" by Sacred Tapestry.
 ---
 Track: Beatup (Shutdown)
@@ -1747,6 +1747,8 @@ Commentary: |-
     Jojo and Homestuck sure do have a lot of things in common, don't they? Themes of predestination, weird time shit, luck being used as a weapon, a guy without the use of his legs, horses everywhere in a certain part...it's all kind of weird and interesting. So that's why I did an EPIC JOJOKE for this trackart. If you don't understand what's going on here, read some more Jojo, I guess. Or don't. Look, Hors is a great, funny track, and this is the dank artistry it deserves as accompaniment. You're welcome.
 ---
 Track: The Gemoni Mustard Blood
+Directory: the-gemoni-mustard-blood-lofam4
+Originally Released As: track:the-gemoni-mustard-blood
 Artists:
 - cookiefonster
 Duration: '2:04'
@@ -1766,7 +1768,7 @@ Referenced Tracks:
 - Gold Mage
 Commentary: |-
     <i>cookiefonster:</i>
-    You know, it's pretty funny that some Cool and New Webcomic songs (such as this one) are being re-released on this album, but at the same time it's kind of fitting, since after Volume 10 was released, the CaNWC soundtrack helped reignite the notion of Homestuck fan music.
+    You know, it's pretty funny that some [[group:canmt|Cool and New Webcomic]] songs (such as this one) are being re-released on this album, but at the same time it's kind of fitting, since after Volume 10 was released, the CaNWC soundtrack helped reignite the notion of Homestuck fan music.
     I made this song before I knew I'd be making a whole album full of songs like this, just as a Sollux song for the hell of it. Even though this was the first one I made, it pretty clearly turned out to be one of the best, and I recently figured out why: the vibrato feature in Famitracker adds magic to everything and this one uses that feature pretty heavily. I'm not even joking, that functionality makes chiptune songs so much better.
     Title is a reference to Tavros and Fairie: A Love Story, a trollfic that starts off funny but eventually becomes truly painful to read.
     <i><b>WHATISLOSTINTHEMINES:</b></i>
@@ -1905,7 +1907,7 @@ Referenced Tracks:
 - track:endless-climb
 Commentary: |-
     <i>Noisemaker:</i>
-    This track almost didn't see the light of day. I submitted it for the Cool and New Music Team's credits music contest, and ended up pulling an admirable 3rd place. At first, the track wasn't going to be used in the credits mix (partially due to recieving 3rd place, but also because it fell short of the 7 minute length requirement), but, after a miracle on-par with the birth of Christ took place, Resend was just barely able to squeeze in due to a mandatory meme credits addition.
+    This track almost didn't see the light of day. I submitted it for the [[group:canmt|Cool and New Music Team's]] credits music contest, and ended up pulling an admirable 3rd place. At first, the track wasn't going to be used in the credits mix (partially due to recieving 3rd place, but also because it fell short of the 7 minute length requirement), but, after a miracle on-par with the birth of Christ took place, Resend was just barely able to squeeze in due to a mandatory meme credits addition.
     <i>yazshu:</i>
     originally this song was going to be replaced by ocean man, per my request. it wasn't. fuck you bambosh
 ---
@@ -2017,7 +2019,7 @@ Referenced Tracks:
 - track:MeGaLoVania
 Commentary: |-
     <i>SplitSuns:</i>
-    This track was originally made for the Cool and New Music Team's "Cool and New Homestuck" project, remixing and parodying the various Homestuck Flashes. In case you can't tell, this song is a parody of Time on My Side. I mostly played it straight to the original song, changing the instrumentation and adding some twists of my own. Of course, there's some jokes thrown into the mix as well, such as the Crazy Frog theme song, Waters of Nazareth, and other subtle additions. All in all, I hope you like this song! It's good enough for Tensei to say "this is pretty good," so make of that what you will.
+    This track was originally made for the [[group:canmt|Cool and New Music Team's]] "Cool and New Homestuck" project, remixing and parodying the various Homestuck Flashes. In case you can't tell, this song is a parody of Time on My Side. I mostly played it straight to the original song, changing the instrumentation and adding some twists of my own. Of course, there's some jokes thrown into the mix as well, such as the Crazy Frog theme song, Waters of Nazareth, and other subtle additions. All in all, I hope you like this song! It's good enough for Tensei to say "this is pretty good," so make of that what you will.
     <i>TwinBuilder:</i>
     When I saw that Thyme on My Fries' art was still unclaimed, I knew what I had to do. This is the result - a love letter to the song and the Flash it's parodying.
     I wanted to make the dividing line horizontal, but I couldn't get it to work, so I went with the diagonal split, which I'm happier with. I wanted the Dirks to look like a playing card - maybe the Suicide King, as it looks like they're decapitating themselves. The hardest part of this was Derse. I knew I could take the easy way out and copy some buildings, but I pushed myself to draw everything on my own. I'm glad I did; I think it's the best part of the piece. (See if you can spot some familiar faces in the crowd of carapacians!)
@@ -2047,7 +2049,7 @@ Commentary: |-
     <i>Hadron:</i>
     Rise of the Conductor's baton is probably my most ambitious song I've made; I pulled all the stops for this song for [S] Finale of CANH. I knew from the start that I wanted to do an upbeat EDM-styled track, and I thought a remix of Beatfox's original Creata would be spectacular.
     <i><b>Makin:</b></i>
-    This track was amde way back in November for the [S] Finale animation, a culmination of Cool and New Web Comic lore Hadron had been working on for a long time. The track features a bunch of obscure little refefernces like Skaian Voyages and Celestial Fantasia, both amazing Beatfox songs you should probably look up, and Formation, the Hadron song you've already listened to. Beatfox is a music god, and Hadron knew just how to combine all the good leitmotifs in order to make the song feel as grand and epic as humanly possible. I actually named this track, as I feel cool Homestuck quotes like "Raise of the Conductor's Baton" ought to be used when they fit the content (and indeed, Rose raises her wand... conductorly... in the animation mentioned above. Seriously, <a href="https://www.youtube.com/watch?v=Vgw1yxGLStI">go watch</a> [S] Finale when you're done with this album).
+    This track was amde way back in November for the [S] Finale animation, a culmination of [[group:canmt|Cool and New Web Comic]] lore Hadron had been working on for a long time. The track features a bunch of obscure little refefernces like Skaian Voyages and Celestial Fantasia, both amazing Beatfox songs you should probably look up, and Formation, the Hadron song you've already listened to. Beatfox is a music god, and Hadron knew just how to combine all the good leitmotifs in order to make the song feel as grand and epic as humanly possible. I actually named this track, as I feel cool Homestuck quotes like "Raise of the Conductor's Baton" ought to be used when they fit the content (and indeed, Rose raises her wand... conductorly... in the animation mentioned above. Seriously, <a href="https://www.youtube.com/watch?v=Vgw1yxGLStI">go watch</a> [S] Finale when you're done with this album).
 ---
 Track: Radness from Concentrate
 Artists:
@@ -2641,7 +2643,7 @@ Referenced Tracks:
 - track:crustacean
 Commentary: |-
     <i>Noisemaker:</i>
-    If some of you thought this was le canrival from Cool and New Webcomic's V8LUME, then you'd be right! I initially made le canrival as a Cool and New Webcomic track, but the folks over on the Land of Fans and Music team took some interest in it. So, we arranged to have it put on the next LOFAM, under a new, more classy name.
+    If some of you thought this was le canrival from Cool and New Webcomic's V8LUME, then you'd be right! I initially made le canrival as a [[group:canmt|Cool and New Webcomic]] track, but the folks over on the Land of Fans and Music team took some interest in it. So, we arranged to have it put on the next LOFAM, under a new, more classy name.
     <i>0syTezy:</I>
     this track art you see right here took over two months of work as we needed to space out time for other projects as well. the setting takes place in the land of tents and mirth as shown. the experience of creating this project was sorta stressful but fun. it was mostly stressful for me since I had many other things I needed to work on. EllenZarael worked with me over the course of the drawing.
 ---
@@ -2776,7 +2778,7 @@ Referenced Tracks:
 - Hardchorale
 Commentary: |-
     <i>SplitSuns:</i>
-    This song was originally made for the Cool and New Music Team, but I went with a much more Homestuck slant than a cool and new one for this track. I wanted to take Upward Movement and change it into something more EDM and techno, so I chopped and screwed traditional strings and mixed them into the powerful drum tracks and synths you hear in the song. I wanted to include motifs from both Dave and Nepeta as they're two halves of Davepeta's whole. I also incorporated caws and meows for the same effect. Finally, I put the Undertale track CORE in the song because of that one scene in EOA6 (you know the one.) There's an additional reference at that point if you're listening carefully! Although this song was challenging to make, I think it turned out very well in the end.
+    This song was originally made for the [[group:canmt|Cool and New Music Team]], but I went with a much more Homestuck slant than a cool and new one for this track. I wanted to take Upward Movement and change it into something more EDM and techno, so I chopped and screwed traditional strings and mixed them into the powerful drum tracks and synths you hear in the song. I wanted to include motifs from both Dave and Nepeta as they're two halves of Davepeta's whole. I also incorporated caws and meows for the same effect. Finally, I put the Undertale track CORE in the song because of that one scene in EOA6 (you know the one.) There's an additional reference at that point if you're listening carefully! Although this song was challenging to make, I think it turned out very well in the end.
     <i>Shadok:</i>
     this used to be a normal edit of the Upward Movement cover but greatest hits 2 happened on the cool and new music team so i decided to redo it. i experimented a lot with the shading but in the end, i kept something simple
     <img src="media/misc/collision-course-bonus.png" width="1400" height="1400">
@@ -2825,7 +2827,7 @@ Referenced Tracks:
 - RollerCoaster Tycoon Theme
 Commentary: |-
     <i>Aris Martiniain:</i>
-    God, this was so much work. Oh yeah, and I lost the first half of the project file towards the end so I couldn't go back and edit it. Ugh. But all in all, I'm pretty happy with how it turned out. The original plan was to go through the CANMT discography and pick the most iconic songs over time. If you're unfamiliar with its discography, I highly recommend you at least <a href="https://coolandnewwebcomic.bandcamp.com/">go give it a glance</a>. I roughly settled on using Cascante, Tick/Tock, Fruity Pebbles Redux, Gunshow, Rex Mille Geromius, Doctor and Penumbra Phantasm (cool and new vol V), Contra (from Cool and New Homestuck), Moshi Moshi, Final Confrontation, Unintentional Touhou, In the Beginning/Contact, Formation, Jungle #3, Muse of Nanchos, Flintstones, Gunshow 2, and of course, the RCT theme and Bowman's credit score. Shoutouts to difarem for making the "it's between my buttocks" vocaloid for me. Revisit/Rewind, which is based heavily on Ascend, was released as the Cool and New Homestuck song for [S] Credits.
+    God, this was so much work. Oh yeah, and I lost the first half of the project file towards the end so I couldn't go back and edit it. Ugh. But all in all, I'm pretty happy with how it turned out. The original plan was to go through the CANMT discography and pick the most iconic songs over time. If you're unfamiliar with its discography, I highly recommend you at least [[group:canmt|go give it a glance]]. I roughly settled on using Cascante, Tick/Tock, Fruity Pebbles Redux, Gunshow, Rex Mille Geromius, Doctor and Penumbra Phantasm (cool and new vol V), Contra (from Cool and New Homestuck), Moshi Moshi, Final Confrontation, Unintentional Touhou, In the Beginning/Contact, Formation, Jungle #3, Muse of Nanchos, Flintstones, Gunshow 2, and of course, the RCT theme and Bowman's credit score. Shoutouts to difarem for making the "it's between my buttocks" vocaloid for me. Revisit/Rewind, which is based heavily on Ascend, was released as the Cool and New Homestuck song for [S] Credits.
     <i><b>wheals:</b></i>
     This art was made in like five hours on Christmas 2016 when i yelled at nights to make some John/Aradia art for Revisit/Rewind (it being based off Ascend, with its iconic John/Aradia art). That's basically the plot of The Christmas Carol and by writing this seven months later I'm now the Ghost of Christmas Future. I'll let Past Nights (the Ghost of Christmas Past) fill you in on the rest:
     <i>nights:</i>
diff --git a/album/lofam5.yaml b/album/lofam5.yaml
index b0083c07..ea3d00d2 100644
--- a/album/lofam5.yaml
+++ b/album/lofam5.yaml
@@ -391,7 +391,7 @@ Art Tags:
 - Kanaya
 Referenced Tracks:
 - track:aggrieve
-Commentary: "<i>cookiefonster:</i>\nAnother song from the Cool and New Music Team,\
+Commentary: "<i>cookiefonster:</i>\nAnother song from the [[group:canmt|Cool and New Music Team]],\
     \ this time for their final album: cool and new volume 3. I pretty much barfed\
     \ [[track:aggrieve]] onto Famitracker, changed some chords here and there, and\
     \ that's that. I think it came out pretty good.\n<i>Gryotharian:</i>\nUpon Makin’s\
@@ -438,7 +438,7 @@ Referenced Tracks:
 - track:endless-climb
 Commentary: |-
     <i>Makin:</i>
-    This track originates from CANWAVE 3, a vaporwave album for the Cool and New Music Team. Yes, we cursed the world with three of them, but it was all worth it if only for this SplitSuns track. For the less leitmotif-aware, this is a take on [[track:endless-climb]] by [[artist:buzinkai]]. Rest in peace.
+    This track originates from CANWAVE 3, a vaporwave album for the [[group:canmt|Cool and New Music Team]]. Yes, we cursed the world with three of them, but it was all worth it if only for this SplitSuns track. For the less leitmotif-aware, this is a take on [[track:endless-climb]] by [[artist:buzinkai]]. Rest in peace.
 ---
 Track: Pipe Dream
 Artists:
@@ -480,7 +480,7 @@ Referenced Tracks:
 - My Sharona
 Commentary: |-
     <i>Interrobang:</i>
-    I made this track for the Cool and New Music Team Felt/Midnight Crew album circa 2018 or so, and it was nominated for “the next LOFAM” long before any actual prep for this album had really started. I actually requested it be taken off of LOFAM5 because I felt it didn’t meet my standards anymore, but due to a miscommunication it stayed on. I found this out about 15 minutes before the release stream, which is happening as I type this - Album is sounding great, y’all! Anyway, hope it sounds better to you than it does to me.
+    I made this track for the C[[group:canmt|ool and New Music Team]] Felt/Midnight Crew album circa 2018 or so, and it was nominated for “the next LOFAM” long before any actual prep for this album had really started. I actually requested it be taken off of LOFAM5 because I felt it didn’t meet my standards anymore, but due to a miscommunication it stayed on. I found this out about 15 minutes before the release stream, which is happening as I type this - Album is sounding great, y’all! Anyway, hope it sounds better to you than it does to me.
 ---
 Track: A Dream Of Broken Clocks
 Artists:
@@ -759,7 +759,7 @@ Referenced Tracks:
 - Madame Controversielle
 Commentary: |-
     <i>cookiefonster:</i>
-    If you remember my song "The Gemoni Mustard Blood" from [[album:lofam4|LOFAM4]], that was originally from an old Cool and New Music Team (CANMT) album I made back in 2016 called "Of Troles and Chiptumes". While I had a lot of fun making that album, over the years I've come to regard its composition and instrumentation as somewhat amateurish; I was still rather new to Famitracker, the software I used to make all those songs.
+    If you remember my song "[[track:the-gemoni-mustard-blood-lofam4|The Gemoni Mustard Blood]]" from [[album:lofam4|LOFAM4]], that was originally from an old [[group:canmt|Cool and New Music Team (CANMT)]] album I made back in 2016 called "[[album:of-troles-and-chiptumes|Of Troles and Chiptumes]]". While I had a lot of fun making that album, over the years I've come to regard its composition and instrumentation as somewhat amateurish; I was still rather new to Famitracker, the software I used to make all those songs.
     While I had at one point wanted to remake the entire album using the chiptune skills I know today, the only song I ever ended up remaking was "[[Madame Controversielle]]", the album's song for Vriska. The remake was put on the CANMT album "troleplanet", and the reasoning behind its title was simply to take the original one and slap a 2 on it! So yes, there is indeed a Madame Controversielle 1, but I really don't get why you would want to listen to it over this version.
     <i>Gryotharian:</i>
     I’m not sure about how this one turned out. All the chiptune and vriska definitely made me think of like, a retro game player select screen, so I went back to my old pixel art style, and tried to fill it with the most vriska that vriska could vriska. But it had been a while since I was working with plain pixel art again, and that probably shows.
@@ -1619,7 +1619,7 @@ Referenced Tracks:
 - Exploring the Depths of Sburb
 Commentary: |-
     <i>Makin:</i>
-    This track art actually depicts Rose in her Lord of Space outfit from Cool and New Web Comic, since this track originates there. I cropped it a bit to not blow people’s minds too much. Wait, what is that drop OH MY GOD
+    This track art actually depicts Rose in her Lord of Space outfit from [[group:canmt|Cool and New Web Comic]], since this track originates there. I cropped it a bit to not blow people’s minds too much. Wait, what is that drop OH MY GOD
 ---
 Track: '[S] ==>'
 Directory: s-next-arrow
diff --git a/album/more-homestuck-fandom.yaml b/album/more-homestuck-fandom.yaml
index 207b6747..07d2b5a8 100644
--- a/album/more-homestuck-fandom.yaml
+++ b/album/more-homestuck-fandom.yaml
@@ -132,6 +132,13 @@ Commentary: |-
     <i>Tensei:</i>
     A slightly updated/different version of my section of Cascade. The most notable differences are the altered melodies at the start and numerous production improvements such as rerecorded guitars, improved string sections, etc.
 ---
+Track: Catscratch
+Artists:
+- Toby Fox
+Duration: 0:31
+URLs:
+- https://www.youtube.com/watch?v=ui4vXf3-PFo
+---
 Track: Chaotic Frenzy
 Artists:
 - Thomas Ferkol
@@ -291,6 +298,22 @@ Duration: '3:07'
 URLs:
 - https://svertofficialsoundtrack.bandcamp.com/track/eclipse
 ---
+Track: Eridan's Theme...?
+Directory: eridans-theme-question-mark
+Artists:
+- Nick Smalley
+Duration: 0:42
+URLs:
+- https://www.youtube.com/watch?v=ssFYgPWL6AI
+Lyrics: |-
+    Eridan is not that great you need to shut up now
+    Even though you think he's great, he is really not
+    You all think he's really great, even though he's not
+    You think he should have his song, here it is right now
+    Eridan is not that great and he does not deserve a theme
+
+    Oh, Nick Smalley guitar solo
+---
 Track: Exploring the Depths of Sburb
 Artists:
 - Thomas Ferkol
@@ -630,18 +653,12 @@ Lyrics: |-
 
     (Do I seriously have to spell this shit until the very end of the song? I mean, whoever fucking wrote the original never had access to spellcheck I guess, because T-A-S-T-E-Y does not spell TASTY. Was this Fergie douchemuffin illiterate or something? What do you mean human rap artists are the only ones brave enough to write their own grammatical train wrecks and call it music? What the fuck even is Will Smith doing? He doesn't throw down sick fires anymore? Fuck this shit, I quit!)
 ---
-Track: Madame Controversielle
+Track: Long Night Ahead
 Artists:
-- cookiefonster
-Duration: '2:50'
+- Tensei
+Duration: '4:21'
 URLs:
-- https://coolandnewwebcomic.bandcamp.com/track/madame-controversielle
-Referenced Tracks:
-- Killed by BR8K Spider!!!!!!!!
-- Vriska's Theme
-- track:MeGaLoVania
-- Crystalanthemums
-- Cobalt Corsair
+- https://www.youtube.com/watch?v=we8DQb_a2u4
 ---
 Track: Mayorlovania
 Artists:
@@ -801,29 +818,6 @@ Referenced Tracks:
 - Rex Duodecim Angelus
 - English
 ---
-Track: Rex Mille Geromius
-Artists:
-- cookiefonster
-Duration: '5:46'
-URLs:
-- https://coolandnewwebcomic.bandcamp.com/track/rex-mille-geromius
-Referenced Tracks:
-- Rex Duodecim Angelus
-- My Little Pony Theme
-- Karkat's Theme
-- Archagent Everlasting
-- track:atomyk-ebonpyre
-- Terezi's Theme
-- justice must be a serve
-- RollerCoaster Tycoon Theme
-- Dance of Thorns
-- track:harlequin
-- track:miracles-icp
-- Where making this hapen
-- Courser
-- Chalk Emerald
-- track:miracles
----
 Track: Ruins
 Artists:
 - Erik Scheele
diff --git a/album/of-troles-and-chiptumes.yaml b/album/of-troles-and-chiptumes.yaml
new file mode 100644
index 00000000..0a618979
--- /dev/null
+++ b/album/of-troles-and-chiptumes.yaml
@@ -0,0 +1,324 @@
+Album: Of Troles and Chiptumes
+Artists:
+- cookiefonster
+Date: August 20, 2016
+Date Added: May 22, 2022
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/album/of-troles-and-chiptumes
+- https://www.youtube.com/playlist?list=PLMXVVm-BDvr8Gp4S2Yr11DPGM-kO56FKO
+Cover Artists:
+- miraculousAvantgarde
+Art Tags:
+- Kraket
+- Terexi
+- Karkat
+- Terezi
+- Alternia
+Cover Art File Extension: png
+Track Art File Extension: png
+Color: '#842f9e'
+Groups:
+- Fandom
+- Cool and New Music Team
+Commentary:
+    <i>cookiefonster:</i>
+
+    All songs composed with FamiTracker
+
+    (<i>album art prototype</i>)
+    <img src="media/misc/Of Troles and Chiptunes - Album Art Prototype.png" width="400" height="400">
+---
+Group: Main album
+---
+Track: A Ghost Then a Frog Then a Robot Then a Fairy
+Duration: '02:59'
+Cover Artists:
+- DrWorm
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/a-ghost-then-a-frog-then-a-robot-then-a-fairy
+- https://www.youtube.com/watch?v=vzCFgF9zJKM
+Art Tags:
+- Aradia
+- 'cw: body horror (abstract)'
+Referenced Tracks:
+- psych0ruins
+- Rust Maid
+- Rust Servant
+- Crystalanthemums
+- Arisen Anew
+---
+Track: Mexican But Not Really
+Duration: '02:06'
+Cover Artists:
+- wank_wank
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/mexican-but-not-really
+- https://www.youtube.com/watch?v=rUH5yZlojL8
+Art Tags:
+- Tavros
+- 'cw: animal abuse'
+Referenced Tracks:
+- dESPERADO ROCKET CHAIRS,
+- FIDUSPAWN, GO!
+- track:breathtak1ng
+- Bronze Rebel
+- Penumbra Phantasm
+- Bronze Page
+---
+Track: The Gemoni Mustard Blood
+Cover Artists:
+- Bambosh
+Duration: '02:04'
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/the-gemoni-mustard-blood
+- https://www.youtube.com/watch?v=bRcjZBb7nKk
+Referenced Tracks:
+- track:the-mituna-method
+- The La2t Frontiier
+- Gold Mage
+- The Blind Prophet
+---
+Track: The Not-Fuckass Not-Waltz
+Cover Artists:
+- drXfactorz
+Duration: '02:41'
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/the-not-fuckass-not-waltz
+- https://www.youtube.com/watch?v=EZv9Pi70n3Q
+Art Tags:
+- Karkat
+Referenced Tracks:
+- Showdown
+- Karkat's Theme
+- Iron Knight
+---
+Track: Everyone Forgets She Kills Animals
+Cover Artists:
+- Sbahjsic
+Duration: '02:15'
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/everyone-forgets-she-kills-animals
+- https://www.youtube.com/watch?v=UWkHkExbv2w
+Art Tags:
+- Nepeta
+- Cats
+Referenced Tracks:
+- Walls Covered in Blood
+- Olive Rogue
+- Davesprite
+- Catscratch
+---
+Track: The Ascended Twilight Fangirl
+Cover Artists:
+- NyashAlex
+Duration: '02:28'
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/the-ascended-twilight-fangirl
+- https://www.youtube.com/watch?v=LSyfDp8Ibew
+Art Tags:
+- Kanaya
+- Earth
+Referenced Tracks:
+- Darling Kanaya
+- Jade Sylph
+- Gardener
+---
+Track: Detective Cherry Inspector
+Cover Artists:
+- XenoZane
+Cover Art File Extension: jpg
+Duration: '02:50'
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/detective-cherry-inspector
+- https://www.youtube.com/watch?v=kkC-nJI0K7o
+Art Tags:
+- Terezi
+- Sollux
+- Karkat
+- Tavros
+- 'cw: corpse'
+- 'cw: blood'
+Referenced Tracks:
+- Long Night Ahead 
+- 'BL1ND JUST1C3 : 1NV3ST1G4T1ON !!'
+- track:under-the-hat
+- Teal Seer
+---
+Track: Madame Controversielle
+Cover Artists:
+- cookiefonster
+Cover Art File Extension: jpg
+Duration: '2:50'
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/madame-controversielle
+- https://www.youtube.com/watch?v=5Mlwm5FhgWc
+Art Tags:
+- Vriska
+- Meenah
+- 'cw: blood'
+Referenced Tracks:
+- Killed by BR8K Spider!!!!!!!!
+- track:MeGaLoVania
+- Vriska's Theme
+- Crystalanthemums
+- Cobalt Corsair
+---
+Track: Yes, So Good
+Cover Artists:
+- Makin
+Duration: '02:35'
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/yes-so-good
+- https://www.youtube.com/watch?v=xTQBoUmVkxE
+Art Tags:
+- Equius
+- Nepeta
+- 'cw: body horror'
+Referenced Tracks:
+- Indigo Heir
+- Horschestra STRONG Version
+- Maplehoof's Adventure
+- Negastrife
+---
+Track: The March of the One True Juggalo
+Cover Artists:
+- Toast
+Duration: '02:09'
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/the-march-of-the-one-true-juggalo
+- https://www.youtube.com/watch?v=On0bJaZfGKw
+Art Tags:
+- Gamzee
+- Nepeta
+- Equius
+- Eridan
+- 'cw: decapitation'
+Referenced Tracks:
+- Purple Bard
+- Let's All Rock the Heist
+- Purple Tyrant
+- track:pious-noise
+- Carne Vale
+---
+Track: The Ridiculous Wwizard of Stupidity
+Cover Artists:
+- miraculousAvantgarde
+Duration: '02:07'
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/the-ridiculous-wwizard-of-stupidity
+- https://www.youtube.com/watch?v=Vga9wpQin5A
+Art Tags:
+- Eridan
+- Angels
+- LoWaA
+Referenced Tracks:
+- track:eridans-theme-question-mark
+- Eridan's Theme
+- Violet Prince
+- Nautical Nightmare
+- track:sburban-jungle
+- Keepers
+---
+Track: The Heiress Without a Role
+Cover Artists:
+- yazshu
+Duration: '01:43'
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/the-heiress-without-a-role
+- https://www.youtube.com/watch?v=-QGamX8zw3Y
+Art Tags:
+- Feferi
+Referenced Tracks:
+- Love You (Feferi's Theme)
+- Hate You
+- Fuchsia Witch
+- Keepers
+- track:fuchsia-ruler
+---
+Track: Rex Mille Geromius
+Duration: '5:46'
+Cover Artists:
+- miraculousAvantgarde
+- OpsCat
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/rex-mille-geromius
+- https://www.youtube.com/watch?v=11GXCl-anzg
+Art Tags:
+- BK
+- Germy
+- Hecka Jef
+- Jhon
+- Rose
+- Dabe
+- Jaed
+- Kraket
+- Kanaya
+- Terexi
+- Equihorse
+- Gametez
+- Jack Noir
+- Femorafreack
+- Dadd
+- Skaia
+- John
+- Dave
+- Jade
+- Karkat
+- Terezi
+- Equius
+- Gamzee
+- John's dad
+- Hella Jeff
+Referenced Tracks:
+- Rex Duodecim Angelus
+- My Little Pony Theme
+- Karkat's Theme
+- Archagent Everlasting
+- track:atomyk-ebonpyre
+- Terezi's Theme
+- justice must be a serve
+- RollerCoaster Tycoon Theme
+- Dance of Thorns
+- track:harlequin
+- track:miracles-icp
+- Where making this hapen
+- Courser
+- Chalk Emerald
+- track:miracles
+---
+Group: Bonus tracks
+---
+Track: of troles and frytunes
+Cover Artists:
+- XenoZane
+Cover Art File Extension: jpg
+Duration: '1:35'
+URLs:
+- https://www.youtube.com/watch?v=A97e3ujTAmc
+Art Tags:
+- 'cw: alcohol'
+Referenced Tracks:
+- A Ghost Then a Frog Then a Robot Then a Fairy
+- Yes, So Good
+- The Not-Fuckass Not-Waltz
+Sampled Tracks:
+- A Ghost Then a Frog Then a Robot Then a Fairy
+- Yes, So Good
+- The Not-Fuckass Not-Waltz
+- Futurama (S2E6, S2E4, S3E21, S2E5, S2E19, S4E6, others, S3E9)
+Lyrics: |-
+    (Ah, some good ol' high-gravity rain. That'll cool us off. OOF!)
+    (This is awesome! We're gonna be like pow-pow-pow, and they're gonna be like, AAAAAAAH [explosion noises] and then we'll have pancakes to celebrate and I'll be like [pancake-eating noises].)
+    (That's a stupid animal. You're stupid!)
+    (And as vice-chairman, I believe I speak for the entire board when I issue this challenge to Mom. Look at my butt!)
+    (Co-ed steam rooms! I love the future!) (Uh, Fry, you're in the women's steam room.) (Ah, futuristic!)
+    (How come when I wanna do fun stuff that'll kill me you're against it?)
+    (I didn't find him here 10 minutes ago so I thought it was time to check again.)
+    (I won! I'm the greatest!)
+    [Wheezing]
+    (Uh oh.) [Exclamations of pain]
+    (Whooooooooo!!)
+    [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
diff --git a/artists.yaml b/artists.yaml
index 49681651..8e3cfc82 100644
--- a/artists.yaml
+++ b/artists.yaml
@@ -1059,6 +1059,10 @@ Artist: Drake Stillman
 ---
 Artist: Drowning Pool
 ---
+Artist: drXfactorz
+---
+Artist: DrWorm
+---
 Artist: DSNAKE
 URLs:
 - https://www.instagram.com/disorderly.snake/
@@ -2444,6 +2448,7 @@ URLs:
 ---
 Artist: miraculousAvantgarde
 Aliases:
+- Mira
 - WaveJones
 ---
 Artist: Misha
@@ -2723,6 +2728,8 @@ Aliases:
 URLs:
 - https://nyanface.tumblr.com/
 ---
+Artist: NyashAlex
+---
 Artist: Nymelord
 ---
 Artist: O Brother, Where Art Thou?
@@ -3264,6 +3271,8 @@ Artist: Sarcastic Fringehead
 ---
 Artist: Saw
 ---
+Artist: Sbahjsic
+---
 Artist: Scarlet Schaefer
 ---
 Artist: Scarodactyl
@@ -3836,6 +3845,8 @@ URLs:
 - https://soundcloud.com/maxy3
 - https://soundcloud.com/tirantbacon
 ---
+Artist: Toast
+---
 Artist: ToastyGlow
 Aliases:
 - Abigail Bullock
@@ -4021,6 +4032,8 @@ Artist: Walter Donovan
 ---
 Artist: Walter Rollins
 ---
+Artist: wank_wank
+---
 Artist: Warner Bros.
 ---
 Artist: WarxTron
diff --git a/static-pages.yaml b/static-pages.yaml
index 5a38c702..5208947b 100644
--- a/static-pages.yaml
+++ b/static-pages.yaml
@@ -95,7 +95,7 @@ Content: |-
     - added [[album:lofam5]]!
         - new artists: [[artist:c4rl3tt]], [[artist:aradiawithgeese]], [[artist:bakustrider]], [[artist:cloudie]], [[artist:crabaqqle]], [[artist:dromswell]], [[artist:fabricio-podest]], [[artist:flaredragon]], [[artist:j-airshiper]], [[artist:l4vo5]], [[artist:mmueoul]], [[artist:momora]], [[artist:monckat]], [[artist:nagunkgunk]], [[artist:pagingpossum]], [[artist:shwan]], [[artist:subversiveasset]], [[artist:sylvarn]], [[artist:tamajikis]], [[artist:v-6]], [[artist:warxtron]]
             - updated links and names for several artists based on their credits for this album
-        - new [[album:more-homestuck-fandom|referenced fandom tracks]] for songs referenced in the album: [[track:a-very-o-christmas]], [[track:all-alone]], [[track:blankest-stare]], [[track:d-break-the-bow]], [[track:die]], [[track:dwelling-among-the-dream-bubbles]], [[track:eclipse-svert]], [[track:exploring-the-depths-of-sburb]], [[track:five-four-stress]], [[track:flight-of-the-white-wolf]], [[track:gentle-heat]], [[track:in-the-beginning-canwc]], [[track:it-looks-back]], [[track:jittery-optimist]], [[track:madame-controversielle]], [[track:mayorlovania]], [[track:miasmic-decay]], [[track:more-real-than-kraft-mayo]], [[track:saoidfisd]], [[track:slamdown]], [[track:snowfall]], [[track:song-for-rose-lalonde]], [[track:switchback]], [[track:temporal-virtuoso]], [[track:windwielder]]
+        - new [[album:more-homestuck-fandom|referenced fandom tracks]] for songs referenced in the album: [[track:a-very-o-christmas]], [[track:all-alone]], [[track:blankest-stare]], [[track:d-break-the-bow]], [[track:die]], [[track:dwelling-among-the-dream-bubbles]], [[track:eclipse-svert]], [[track:exploring-the-depths-of-sburb]], [[track:five-four-stress]], [[track:flight-of-the-white-wolf]], [[track:gentle-heat]], [[track:in-the-beginning-canwc]], [[track:it-looks-back]], [[track:jittery-optimist]], [[track:mayorlovania]], [[track:miasmic-decay]], [[track:more-real-than-kraft-mayo]], [[track:saoidfisd]], [[track:slamdown]], [[track:snowfall]], [[track:song-for-rose-lalonde]], [[track:switchback]], [[track:temporal-virtuoso]], [[track:windwielder]]
         - new [[album:references-beyond-homestuck|referenced non-homestuck tracks]] as well: [[track:boss-mode]], [[track:destroy-them-with-lazers]], [[track:lrad]], [[track:my-sharona]], [[track:no-more-elders]], [[track:plur-police]], [[track:schalas-theme]], [[track:shave-and-a-haircut]], [[track:title-mega-man-3]]
             - new artist entries for these in turn: [[artist:bambosh]], [[artist:braiden-brian]], [[artist:gordian]], [[artist:greentetrahedron]], [[artist:soluslunes]], [[artist:rowyn-berlan]], [[artist:knife-party]], [[artist:mega-man]], [[artist:the-knack]]
         - [[track:gold-mage-playtime-is-over-mix]] is now in [[album:lofam5|LoFaM5]] instead of [[album:unreleased-tracks]]
@@ -118,6 +118,9 @@ Content: |-
             - new [[album:references-beyond-homestuck|referenced non-homestuck tracks]]: [[track:300-this-is-sparta-remix]], [[track:boss-battle-pokemon-typing-adventure]], [[track:brodyquest]], [[track:chopsticks]], [[track:dragon-roost-island]], [[track:feel-good-inc]], [[track:futurama-main-theme]], [[track:megalo-strike-back]], [[track:messiah]], [[track:michael-rosen-rap]], [[track:moonlight-sonata]], [[track:red-like-roses-part-ii]], [[track:scary-monsters-and-nice-sprites]], [[track:splatoon-squid-kid-tv-commercial]], [[track:waluigi-pinball-wario-stadium]], [[track:where-the-guns-at]]
                 - new artists for these: [[artist:azusa-chiba]], [[artist:casey-lee-williams]], [[artist:christopher-tyng]], [[artist:euphemia-allen]], [[artist:george-frideric-handel]], [[artist:futurama]], [[artist:gorillaz]], [[artist:jeff-williams]], [[artist:joonas-turner]], [[artist:jukio-kallio]], [[artist:keaton-monger]], [[artist:kenta-nagata]], [[artist:kimihiro-abe]], [[artist:masaharu-iwata]], [[artist:michael-rosen]], [[artist:nuclear-throne]], [[artist:rwby]], [[artist:sandy-lee-casey]], [[artist:shinobu-tanaka]], [[artist:skrillex]], [[artist:toru-minegishi]]
         - added [[album:gunshow-singalong]] and new artist [[artist:dick2bombs]]!
+        - added [[album:of-troles-and-chiptumes]] by [[artist:cookiefonster]]!
+            - new artists: [[artist:drworm]], [[artist:drxfactorz]], [[artist:nyashalex]], [[artist:sbahjsic]], [[artist:toast]], [[artist:wankwank]]
+            - new [[album:more-homestuck-fandom|referenced fandom tracks]]: [[track:catscratch]], [[track:eridans-theme-question-mark]], [[track:long-night-ahead]], also [[track:rex-mille-geromius]] is no longer in this category
         - many new (and cool) art tags, check the end of this changelog for details
     - added [[album:deltarune-ch2-ost]] by [[group:toby-fox]], with some accompanying tweaks:
         - added a bunch of CD/vinyl release bonus tracks to [[album:undertale-soundtrack]]
@@ -666,7 +669,7 @@ Content: |-
         - [[track:on-golden-dreams]] now featured in [[track:emissary-of-dance]]
         - [[track:metamorphic-choices]] now featured in [[track:horizontal-headshot]]
         - [[track:gods-of-the-new-world]] now featured in [[track:dance-of-the-dead]]
-        - [[track:the-mituna-method]] now featured in [[track:the-gemoni-mustard-blood]]
+        - [[track:the-mituna-method]] now featured in [[track:the-gemoni-mustard-blood-lofam4]]
         - [[track:upward-movement-dave-owns]] now featured in [[track:collision-course-davepetas-movement]]
         - [[track:frost-vol6]] now featured in [[track:a-farewell-to-arms]]
         - [[track:dissension-original]] now featured in [[track:a-farewell-to-arms]]
diff --git a/tags.yaml b/tags.yaml
index ff4ac9af..31c9ab22 100644
--- a/tags.yaml
+++ b/tags.yaml
@@ -789,6 +789,9 @@ Tag: Shrek
 Tag: alcohol
 Is CW: true
 ---
+Tag: animal abuse
+Is CW: true
+---
 Tag: animal death
 Is CW: true
 ---