17 files changed, 820 insertions, 58 deletions
diff --git a/album/basement-tale.yaml b/album/basement-tale.yaml
index 945155f..05d6628 100644
--- a/album/basement-tale.yaml
+++ b/album/basement-tale.yaml
@@ -179,7 +179,7 @@ URLs:
 Referenced Tracks:
 - RollerCoaster Tycoon Theme
 - Unity of Thorns
-- Archagent Everlasting
+- track:archagent-everlasting
 - Venom Pools for Eons
 - Misery Loves Company
 - track:chorale-for-jaspers
diff --git a/album/c-a-n-w-a-v-e.yaml b/album/c-a-n-w-a-v-e.yaml
index 195db55..63fef0b 100644
--- a/album/c-a-n-w-a-v-e.yaml
+++ b/album/c-a-n-w-a-v-e.yaml
@@ -666,11 +666,11 @@ URLs:
 - https://youtu.be/dYPWalWGSyg
 Referenced Tracks:
 - Flare
-- Flarezzzzzzz
+- track:flarezzzzzzz
 - Liquid Negrocity
 Sampled Tracks:
 - Flare
-- Flarezzzzzzz
+- track:flarezzzzzzz
 - Liquid Negrocity
 ---
 Track: Vaporous Heir
diff --git a/album/call-and-new.yaml b/album/call-and-new.yaml
index 8435178..8cdb060 100644
--- a/album/call-and-new.yaml
+++ b/album/call-and-new.yaml
@@ -319,7 +319,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/moshi-means-business
 - https://youtu.be/_A7-bvDGzek
 Referenced Tracks:
-- Moshi Moshpit
+- track:moshi-moshpit
 - Put A Donk On It
 - track:beatdown-strider-style
 - Freefall
@@ -583,7 +583,7 @@ URLs:
 - https://youtu.be/f055Au_nJ_A
 Referenced Tracks:
 - national treasure
-- Archagent Everlasting
+- track:archagent-everlasting
 - Meet the Flintstones
 - White Nuxxle Driver
 - track:doctor
@@ -659,7 +659,7 @@ Referenced Tracks:
 - Bad Radio
 - First Contact
 - Moshi Moshi?
-- Moshi Moshpit
+- track:moshi-moshpit
 - Good Grievous Bodily Harm
 - RollerCoaster Tycoon Theme
 - Snow halation
diff --git a/album/canwc-for-the-holidays.yaml b/album/canwc-for-the-holidays.yaml
index d38b869..7f294ee 100644
--- a/album/canwc-for-the-holidays.yaml
+++ b/album/canwc-for-the-holidays.yaml
@@ -1,5 +1,5 @@
 Album: CANWC for the Holidays
-Date: October 30, 2016
+Date: October 30, 2016, 12:01 AM
 Date Added: August 16, 2023
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/album/canwc-for-the-holidays
diff --git a/album/canwc-sound-test-1.yaml b/album/canwc-sound-test-1.yaml
index fb67ba5..77c6d98 100644
--- a/album/canwc-sound-test-1.yaml
+++ b/album/canwc-sound-test-1.yaml
@@ -1503,10 +1503,10 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/harmonize-beta
 - https://youtu.be/vhEq07X8npM
 Referenced Tracks:
-- Harmonize
+- track:harmonize
 - Fruity Pebbles Jingle
 Sampled Tracks:
-- Harmonize
+- track:harmonize
 - Fruity Pebbles Jingle
 Lyrics: |-
     Oh Diet Dr Pepper is the flavor that I savor
diff --git a/album/cool-and-new-greatest-hits.yaml b/album/cool-and-new-greatest-hits.yaml
new file mode 100644
index 0000000..7ea989c
--- /dev/null
+++ b/album/cool-and-new-greatest-hits.yaml
@@ -0,0 +1,774 @@
+Album: Cool and New Greatest Hits
+Date: November 6, 2016
+Date Added: August 16, 2016
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/album/cool-and-new-greatest-hits
+Cover Artists:
+- Angela Sham
+Art Tags:
+- Rose
+- Hecka Jef
+- Jhon
+- Hella Jeff
+- John
+Cover Art File Extension: png
+Track Art File Extension: png
+Color: '#b536da'
+Groups:
+- Cool and New Music Team
+- Fandom
+---
+Track: can you give me a HAND
+Directory: can-you-give-me-a-hand-canwc-gh
+Duration: '02:36'
+Cover Artists:
+- Griever
+Art Tags:
+- Jhon
+- Jack Noir
+- John
+Originally Released As: track:can-you-give-me-a-hand
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/can-you-give-me-a-hand-2
+- https://www.youtube.com/watch?v=Jqi_ZdJ1Tgk
+---
+Track: FOCUS
+Directory: focus-canwc-gh
+Duration: '02:41'
+Originally Released As: track:focus-canwc-vol-7
+Cover Artists:
+- Hadron
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/focus-2
+---
+Track: Ultralovania
+Artists:
+- Noisemaker
+Cover Artists:
+- CreatorOfJanespeak
+Art Tags:
+- Vriska
+- Aradia
+Duration: '02:41'
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/ultralovania
+Referenced Tracks:
+- track:megalovania-halloween
+- Mayorlovania
+Sampled Tracks:
+- Mayorlovania
+Commentary: |-
+    <i>Makin:</i>
+    This is [[track:mayorlovania]] without mayor samples.
+---
+Track: Three in the Morning (4⅓ Hours Late Remix)
+Directory: three-in-the-morning-4-13-hours-late-remix-canwc-gh
+Duration: '07:20'
+Artists:
+- Ngame
+Cover Artists:
+- Ngame
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/three-in-the-morning-4-hours-late-remix
+- https://www.youtube.com/watch?v=FvFjO-RXV34
+Referenced Tracks:
+- track:three-in-the-morning-4-13-hours-late-remix
+Sampled Tracks:
+- track:three-in-the-morning-4-13-hours-late-remix
+- BBC Nightly Stews
+- Rice Bucket Challenge
+- Comedy Santa
+- Fun Train Time
+- 'Harrison: An American Musical'
+Lyrics: |-
+    (My name is Constable "Meme Cubes" Houston, I will eat five BIG FUCKING SHIT-FILLED ADULT hat stores in one humdrum summer day, and then my crippling addiction to pornography will be buried alive.)
+
+    (My name is Sheriff "Pasta Man" Stutzman, I will eat five my brother Marvin in one minute, and then my copy of the Live Action Super Mario Brothers Movie on DVD will be buried alive.)
+
+    Always wear a coat, don't die
+
+    BOO, BOO, here come de ghost
+    I'm de voodoo priest from de skeleton coast
+    Trick-or-treat, trick-or-treat, you'll be stomping your feet
+    'Cause I'm sugarcane sweet with a Kingston beat
+
+    WHOA-OA-OA-OA watch out, here come de ghoul
+    I be spittin' out rhyme while you playing de fool
+    I'm a treetop monsta, dat dance all rasta
+    Going back to de island for de sticky-sweet ganja
+
+    (I'm THINKING of a number. Between my buttocks. Do you know what it is? It's my credit score, and it happens to be 720. I'm THINKING of a number. Between 450 and 850. Do you know what it is? It happens to be 720. Which is my free credit score. This number is between my buttocks. This number I'm thinking. Is between 450 and 850.)
+
+    Second age of steam
+
+    Oh Kellogg's Fruity Pebbles are the best thing about morning
+    Those colorful enchanting little specks
+    They make my taste buds spring to life without the slightest warning
+    In a way they never do when I eat Chex
+
+    Oh Kellogg's Fruity Pebbles are the breakfast I've been cravin'
+    I shove 'em by the fistful in my trap
+    They got vitamins and nutrients and even riboflavin
+    And make Cocoa Puffs look like a bowl of crap
+
+    Yeah Kellogg's Fruity Pebbles are a breakfast taste sensation
+    They're tiny tasty munchable and sweet
+    I'd like to start a bloody war and build a Pebbles nation
+    And murder every other breakfast treat
+
+    And the gallows will sway through the night
+    For Fruity Pebbles, Fruity Pebbles
+    All cereals bow down in fright
+    For Fruity Pebbles, Fruity Pebbles
+    Sycophants and cowards flee
+    From Fruity Pebbles, Fruity Pebbles
+    Captain Crunch on bended knee
+    For Fruity Pebbles, Fruity Pebbles
+
+    The balance of the world's askew
+    But Fruity Pebbles, Fruity Pebbles
+    Promise revolutions new
+    For Fruity Pebbles, Fruity Pebbles
+    What cereal 'mongst other things
+    But Fruity Pebbles, Fruity Pebbles
+    Stays crunchy in the blood of kings?
+    It's Fruity Pebbles, Fruity Pebbles
+
+    (My compulsive masturbation, Sullivan! You and me, and my erectile dysfunction, Sullivan! Then I paint all the surfaces of the eggs, Sullivan! It's a mirror collage, Sullivan! DETROIT! THE PASTA CITY! The place was Russia. The year, was 1917. You're under arrest! Just kidding! I now have two complete sets of human teeth
+    in
+    side
+    my
+    head.)
+
+    Bow, man
+    Mimimichael (Michael Bowma-a-a-a-a-a-a-a-a-) (Bowman Bowman Bowman Bobobo— Michael Bowman)
+    Bo-bobo-bobo-bowman (Michael Bowma-a-a-a-a-a-a-a-a-) (Bowman Bowman Bowman Bobobo— Michael Bowman)
+    I-i-is (Michael Bowma-a-a-a-a-a-a-a-a-) Awesome! Awesome! Awesome! Awesome!
+    Mi-chael-Bow-man...
+
+    Bowman Bowman Bowman Bobobo— (Michael Bowman)
+    Bowman Bowman Bowman Bobobo— (Michael Bowman)
+    Bowman Bowman Bowman Bobobo— (Michael Bowman)
+    Bowman Bowman Bowman Bobobo— (Michael Bowman)
+    Bowman Bowman Bowman Bobobo— (Michael Bowman)
+    Bowman Bowman Bowman Bobobo— (Michael Bowman)
+    Bowman Bowman Bowman Bobobo— (Michael Bowman)
+    Bowman Bowman Bowman Bobobo— (Michael Bowman)
+
+    Mi-mi-mi-mi-mi-michael Bowman
+    Mi-mi-mi-mi-mi-michael Bowman
+    Mi-mi-mi-mi-mi-michael Bowman
+    Mi-mi-mi-mi-mi-michael Bowman
+    Mi-mi-mi-mi-mi-michael Bowman
+    Mi-mi-mi-mi-mi-michael Bowman
+    Mi-mi-mi-mi-mi-michael Bowman
+    Mi-mi-mi-mi-mi-michael Bowman
+    Mi-mi-mi-mi-mi-michael Bowman
+
+    BACK YARD BACK YARD
+    BACK YARD BACK YARD
+    BACK YARD BACK YARD
+    BACK YARD BACK YARD
+    BACK YARD BACK YARD
+    BACK YARD BACK YARD
+    BACK YARD BACK YARD
+    BACK YARD BACK YARD
+    BACK YARD FUN!
+
+    (I'm Toby "Radiation" Fox!)
+
+    (That was the plan, to give you a— seven hundred and twenty— and you got one.)
+Commentary: |-
+    <i>Makin:</i>
+    99% of this is just the original song, but it has five new references to fill otherwise empty space.
+---
+Track: Midnight Suffer
+Directory: midnight-suffer-canwc-gh
+Originally Released As: track:midnight-suffer
+Duration: '02:26'
+Cover Artists:
+- Makin
+Art Tags:
+- Jack Noir
+- Veil
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/midnight-suffer-2
+- https://www.youtube.com/watch?v=zPwYMgKF-ek
+---
+Track: Dersite
+Artists:
+- Aris Martinian
+Duration: '01:47'
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/dersite
+- https://www.youtube.com/watch?v=g0pcJNTn37k
+Cover Artists:
+- avocado
+Art Tags:
+- Carapacians
+- Derse
+Referenced Tracks:
+- Flare
+- English
+- Derse Dreamers
+- Cascade (Beta)
+- Courser
+Commentary: |-
+    <i>Makin:</i>
+    This was originally part of [[track:something-familiar]] but was split off into its own track for this Greatest Hits release.
+---
+Track: Unintentional Touhou
+Directory: unintentional-touhou-canwc-gh
+Originally Released As: track:unintentional-touhou
+Duration: '03:04'
+Cover Artists:
+- koykoy13
+Art Tags:
+- Jhon
+- Hecka Jef
+- John
+- Hella Jeff
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/unintentional-touhou-2
+---
+Track: Moshi Moshpit
+Directory: moshi-moshpit-canwc-gh
+Originally Released As: track:moshi-moshpit
+Duration: '02:29'
+Cover Artists:
+- Makin
+Art Tags:
+- Vrasky
+- Vriska
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/moshi-moshpit-2
+- https://www.youtube.com/watch?v=0N3SVNuLNnM
+---
+Track: Transcend
+Directory: transcend-canwc-gh
+Originally Released As: track:transcend
+Duration: '03:01'
+Cover Artists:
+- Skyplayer
+Art Tags:
+- Jhon
+- John
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/transcend-2
+- https://www.youtube.com/watch?v=sCLZGr6Gg_Q
+---
+Track: Fake Fruit Fiesta
+Directory: fake-fruit-fiesta-canwc-gh
+Duration: '02:53'
+Cover Artists:
+- miraculousAvantgarde
+Art Tags:
+- Feferi
+- Eridan
+- Gamzee
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/fake-fruit-fiesta-2
+- https://www.youtube.com/watch?v=2XymKJjrr54
+Referenced Tracks:
+- track:fake-fruit-fiesta
+Sampled Tracks:
+- track:fake-fruit-fiesta
+Commentary: |-
+    <i>Makin:</i>
+    This track has been shortened and improved from the original.
+---
+Track: Feel (Good)
+Directory: feel-good-canwc-gh
+Originally Released As: track:feel-good
+Duration: '02:16'
+Cover Artists:
+- Makin
+Art Tags:
+- Jack Noir
+- Femorafreack
+- Rose
+- Hecka Jef
+- Hella Jeff
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/feel-good-2
+- https://www.youtube.com/watch?v=B2myDAap5GI
+---
+Track: Formation
+Directory: formation-canwc-gh
+Duration: '03:50'
+Originally Released As: track:formation
+Cover Artists:
+- Hadron
+Cover Art File Extension: jpg
+URLs:
+- https://www.youtube.com/watch?v=9QmggvzQpLs
+---
+Track: Cascante
+Directory: cascante-canwc-gh
+Originally Released As: track:cascante
+Duration: '03:05'
+Cover Artists:
+- Ahnock
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/cascante-2
+- https://www.youtube.com/watch?v=tjrtZgDIudw
+---
+Track: CANWCade (Alpha Mix)
+Directory: canwcade-alpha-mix-canwc-gh
+Originally Released As: track:canwcade-alpha-mix
+Duration: '03:10'
+Cover Artists:
+- Hadron
+Art Tags:
+- Jhon
+- John
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/canwcade-alpha-mix-2
+---
+Track: Fighting Spirit Redux
+Directory: fighting-spirit-redux-canwc-gh
+Originally Released As: track:fighting-spirit-redux
+Duration: '03:44'
+Cover Artists:
+- Minkt
+Art Tags:
+- Jhon
+- Dadd
+- John
+- John's dad
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/fighting-spirit-redux-2
+- https://www.youtube.com/watch?v=02VevlUHgX4
+---
+Track: Strife Mayhem
+Directory: strife-mayhem-canwc-gh
+Originally Released As: track:strife-mayhem
+Duration: '05:39'
+Cover Artists:
+- olkiswerve
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/strife-mayhem-2
+---
+Track: Archagent Everlasting
+Directory: archagent-everlasting-canwc-gh
+Originally Released As: track:archagent-everlasting
+Cover Artists:
+- miraculousAvantgarde
+Art Tags:
+- Jack Noir
+- Dabe
+- Jhon
+- Dave
+- John
+Duration: '02:07'
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/archagent-everlasting-2
+- https://www.youtube.com/watch?v=tEcVhPnwytY
+---
+Track: Penumbra Phantasm by Toby Fox (feat. "Radiation")
+Directory: penumbra-phantasm-by-toby-fox-featuring-radiation-canwc-gh
+Duration: '04:40'
+Cover Artists:
+- yazshu
+Art Tags:
+- LoWaS
+Originally Released As: track:penumbra-phantasm-by-toby-fox-featuring-radiation
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/penumbra-phantasm-by-toby-fox-feat-radiation
+---
+Track: The Gemoni Mustard Blood
+Directory: the-gemoni-mustard-blood-canwc-gh
+Originally Released As: track:the-gemoni-mustard-blood
+Duration: '02:04'
+Cover Artists:
+- CreatorOfJanespeak
+Art Tags:
+- Sollux
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/the-gemoni-mustard-blood-2
+- https://www.youtube.com/watch?v=P4qH12U3O4g
+---
+Track: Timestop
+Directory: timestop-canwc-gh
+Originally Released As: track:timestop
+Duration: '04:13'
+Cover Artists:
+- Makin
+Art Tags:
+- Jack Noir
+- WV
+- Ruined Earth
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/timestop-2
+- https://www.youtube.com/watch?v=LXgz92zs-m8
+---
+Track: Flarezzzzzzz
+Directory: flarezzzzzzz-canwc-gh
+Originally Released As: track:flarezzzzzzz
+Duration: '02:01'
+Cover Artists:
+- Makin
+Art Tags:
+- Jhon
+- Dabe
+- Jaed
+- Hecka Jef
+- Beq
+- Rubs Juice
+- Gate
+- John
+- Dave
+- Jaed
+- Hella Jeff
+- CD
+- 'cw: blood (abstract)'
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/flarezzzzzzz-2
+- https://www.youtube.com/watch?v=vEI57ViYVnQ
+---
+Track: Postdoctoral Research Position
+Directory: postdoctoral-research-position-canwc-gh
+Originally Released As: track:postdoctoral-research-position
+Duration: '05:10'
+Cover Artists:
+- Minkt
+Art Tags:
+- LoWaS
+- Skaia
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/postdoctoral-research-position-2
+- https://www.youtube.com/watch?v=tx2wd9HPEVg
+---
+Track: Black Yard, Green Fun
+Directory: black-yard-green-fun-canwc-gh
+Originally Released As: track:black-yard-green-fun
+Duration: '02:23'
+Cover Artists:
+- groeuf
+Art Tags:
+- Sollux
+- 'cw: blood'
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/black-yard-green-fun-2
+---
+Track: Harmonize
+Directory: harmonize-canwc-gh
+Originally Released As: track:harmonize
+Duration: '05:55'
+Cover Artists:
+- jakkyr
+Art Tags:
+- John
+- Rose
+- Dave
+- Jade
+- Jack Noir
+- Roxy
+- Derse
+- Hrates Bocars
+- Dacronian Dignity
+- Rubs Juice
+- Skaia
+- Vriska
+- Terexi
+- Rose
+- Dirk
+- HB
+- DD
+- CD
+- Horses
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/harmonize-2
+- https://www.youtube.com/watch?v=UVMp10r3vl0
+---
+Track: 25x SHOWDOWN COMBO
+Directory: 25x-showdown-combo-canwc-gh
+Originally Released As: track:25x-showdown-combo
+Duration: '04:13'
+Cover Artists:
+- Discfortune
+Art Tags:
+- Rose
+- Dave
+- Karkat
+- Terezi
+- Vriska
+- Meenah
+- Caliborn
+- Jack Noir
+- DD
+- John's dad
+- Lil Cal
+- Skaia
+- LoWaS
+- Meteor
+- Earth
+- Ruined Earth
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/25x-showdown-combo-2
+- https://www.youtube.com/watch?v=gOG0MpNa2Is
+---
+Track: Umbrella Tomato
+Directory: umbrella-tomato-canwc-gh
+Originally Released As: track:umbrella-tomato
+Duration: '03:32'
+Cover Artists:
+- groeuf
+Art Tags:
+- Jade
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/umbrella-tomato-2
+---
+Track: Dr. Pepper
+Directory: dr-pepper-canwc-gh
+Originally Released As: track:dr-pepper
+Duration: '03:14'
+Cover Artists:
+- bobthetacocat
+Art Tags:
+- Skaia
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/dr-pepper-2
+---
+Track: Stubborn Thr"o"es
+Directory: stubborn-throes-canwc-gh
+Originally Released As: track:stubborn-throes
+Duration: '03:08'
+Cover Artists:
+- Ephemerald
+Art Tags:
+- Hecka Jef
+- Rose
+- Hella Jeff
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/stubborn-throes-2
+- https://www.youtube.com/watch?v=u9QtXQ3ZdOk
+---
+Track: go down (cool and new Mix) (feat. John J “Damn, Now Those Are Some Tunes” Renns)
+Directory: go-down-cool-and-new-mix-feat-john-j-damn-now-those-are-some-tunes-renns-canwc-gh
+Originally Released As: track:go-down-cool-and-new-mix-feat-john-j-damn-now-those-are-some-tunes-renns
+Duration: '04:34'
+Cover Artists:
+- miraculousAvantgarde
+Art Tags:
+- Jhon
+- Dabe
+- John
+- Dave
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/go-down-cool-and-new-mix-feat-john-j-damn-now-those-are-some-tunes-renns-2
+- https://www.youtube.com/watch?v=wE0ugurvNBA
+---
+Track: SBOWBAN GLAMOUR
+Directory: sbowban-glamour-canwc-gh
+Originally Released As: track:sbowban-glamour
+Duration: '03:24'
+Cover Artists:
+- Pipko Fanfare
+Art Tags: 
+- Skaia
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/sbowban-glamour-2
+---
+Track: CONFERANCE CALL~~LAST CONTACT~~
+Directory: conferance-call-last-contact-canwc-gh
+Duration: '08:12'
+Originally Released As: track:conferance-call-last-contact
+Cover Artists:
+- Dap
+Art Tags:
+- Jhon
+- Jaed
+- Dabe
+- Rose
+- John
+- Jade
+- Dave
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/conferance-call-last-contact-2
+---
+Track: Spanish
+Artists:
+- Aris Martinian
+Cover Artists:
+- Toast
+Art Tags:
+- Lord English
+Duration: '02:42'
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/spanish
+- https://www.youtube.com/watch?v=inwLE84NnAc
+Referenced Tracks:
+- Tick
+- Meet the Flintstones
+- English
+- Flare
+- track:ruins
+Commentary: |-
+    <i>Makin:</i>
+    This was originally part of [[track:yet-cool-and-new]] but was split off into its own track for this Greatest Hits release.
+---
+Track: Cascadium
+Directory: cascadium-canwc-gh
+Originally Released As: track:cascadium
+Duration: '06:41'
+Cover Artists:
+- jakkyr
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/cascadium-2
+- https://www.youtube.com/watch?v=CbgFl3swLRQ
+---
+Track: Admiral Bone-To-Pick
+Directory: admiral-bone-to-pick-canwc-gh
+Originally Released As: track:admiral-bone-to-pick
+Duration: '03:17'
+Cover Artists:
+- olkiswerve
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/admiral-bone-to-pick-2
+---
+Track: Tick / Tock
+Artists:
+- Discfortune
+Cover Artists:
+- Bambosh
+- bobthetacocat
+Art Tags:
+- Swet Bro
+- Rose's mom
+- Sweet Bro
+- Momi
+Duration: '01:00'
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/tick-tock
+- https://www.youtube.com/watch?v=2bDwBkYk7es
+Referenced Tracks:
+- Tick
+- Tock
+Sampled Tracks:
+- Tick
+- Tock
+Commentary: |-
+    <i>Makin:</i>
+    The tracks [[track:tick]] and [[track:tock]] were combined into one track for this Greatest Hits release, as they were always meant to be.
+---
+Track: Drawing Deud
+Directory: drawing-deud-canwc-gh
+Originally Released As: track:drawing-deud
+Duration: '03:09'
+Cover Artists:
+- Ephemerald
+Art Tags:
+- Rubs Juice
+- Hrates Bocars
+- Dacronian Dignity
+- Jack Noir
+- CD
+- HB
+- DD
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/drawing-deud-2
+- https://www.youtube.com/watch?v=S8gff-A44EE
+---
+Track: Terexi
+Directory: terexi-canwc-gh
+Originally Released As: track:terexi
+Duration: '01:26'
+Cover Artists:
+- yazshu
+- Wights End
+Art Tags:
+- Terexi
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/terexi-2
+---
+Track: Vagabone
+Directory: vagabone-canwc-gh
+Originally Released As: track:vagabone
+Duration: '02:04'
+Cover Artists:
+- yazshu
+Art Tags:
+- WV
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/vagabone-2
+---
+Track: '!!~~~ the will to figt ~~~!!'
+Directory: the-will-to-figt-canwc-gh
+Originally Released As: track:the-will-to-figt
+Duration: '05:15'
+Cover Artists:
+- Cloudaria
+Art Tags:
+- John
+- Jhon
+- Rose
+- Denizens
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/the-will-to-figt-2
+---
+Track: The Endless Black
+Directory: the-endless-black-canwc-gh
+Originally Released As: track:the-endless-black-aka-clockwork-negrocity
+Duration: '04:31'
+Cover Artists:
+- Ephemerald
+Art Tags:
+- Jack Noir
+- Rose
+- Germy
+- Jhon
+- John
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/the-endless-black
+---
+Track: Final Confrontation
+Artists:
+- Aris Martinian
+Cover Artists:
+- nights
+Art Tags:
+- Rose
+Duration: '02:16'
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/final-confrontation
+Referenced Tracks:
+- track:game-over
+- track:sburban-jungle
+- track:MeGaLoVania
+- track:explore
+- Cascade (Beta)
+Commentary: |-
+    <i>Makin:</i>
+    This was originally part of [[track:something-familiar]] but was split off into its own track for this Greatest Hits release.
+---
+Track: Recooled Return
+Artists:
+- Aris Martinian
+Cover Artists:
+- Aris Martinian
+Art Tags:
+- Jhon
+- John
+Duration: '01:53'
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/recooled-return
+- https://www.youtube.com/watch?v=YsUqGYzj_GM
+Referenced Tracks:
+- Renewed Return
+Commentary: |-
+    <i>Makin:</i>
+    This is a completely new track made for the Greatest Hits album.
+---
+Track: A Very "O" Christmas
+Directory: a-very-o-christmas-canwc-gh
+Originally Released As: track:a-very-o-christmas
+Cover Artists:
+- olkiswerve
+Art Tags:
+- Hecka Jef
+- Hella Jeff
+Duration: '06:41'
+URLs:
+- https://coolandnewwebcomic.bandcamp.com/track/a-very-o-christmas-2
+- https://www.youtube.com/watch?v=BQOcTSnVTEk
\ No newline at end of file
diff --git a/album/cool-and-new-homestuck.yaml b/album/cool-and-new-homestuck.yaml
index 1f49b41..01cf76c 100644
--- a/album/cool-and-new-homestuck.yaml
+++ b/album/cool-and-new-homestuck.yaml
@@ -129,10 +129,10 @@ URLs:
 Art Tags:
 - John
 Referenced Tracks:
-- Cascante
+- track:cascante
 - track:sburban-countdown
 Sampled Tracks:
-- Cascante
+- track:cascante
 Commentary: |-
     <i>Noisemaker:</i>
     To be completely honest it's just [[track:cascante]] from [[album:cool-and-new-voulem1|Voulem 1]]. I regret not using my otamatone but at least [[artist:bambosh|Bambosh]] got some [[track:backyard-dumb|sweet use]] out of it.
@@ -689,7 +689,7 @@ Art Tags:
 Referenced Tracks:
 - track:black
 - track:the-ballad-of-jack-noir-original
-- Archagent Everlasting
+- track:archagent-everlasting
 - Unity of Thorns
 - go down (Fanon Cut)
 Sampled Tracks:
@@ -831,7 +831,7 @@ Referenced Tracks:
 - track:revelawesome
 - Venom Pools for Eons
 - RollerCoaster Tycoon Theme
-- Archagent Everlasting
+- track:archagent-everlasting
 - Courser
 - Homestuck Anthem
 - Gardener
@@ -1280,6 +1280,7 @@ URLs:
 Art Tags:
 - WV
 - Jack Noir
+- Ruined Earth
 Referenced Tracks:
 - Cascade (Beta)
 Commentary: |-
@@ -1414,10 +1415,10 @@ Duration: '13:10'
 URLs:
 - https://www.youtube.com/watch?v=5ci7EDcT-7M
 Referenced Tracks:
-- Timestop
-- Flarezzzzzzz
+- track:timestop
+- track:flarezzzzzzz
 - Savior of the Screaming Dead
-- Black Yard, Green Fun
+- track:black-yard-green-fun
 ---
 Track: Tick Tock Comes the Bad Wolf
 Artists:
diff --git a/album/cool-and-new-volume-7.yaml b/album/cool-and-new-volume-7.yaml
index 9d061e0..1900c54 100644
--- a/album/cool-and-new-volume-7.yaml
+++ b/album/cool-and-new-volume-7.yaml
@@ -79,7 +79,7 @@ Referenced Tracks:
 - justice must be a serve
 - revengn
 - Fruity Pebbles Jingle
-- Archagent Everlasting
+- track:archagent-everlasting
 - CONTACT
 ---
 Track: Showup
@@ -222,7 +222,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/arfchant-evenlasing
 - https://youtu.be/WOUC1rK_eWk
 Referenced Tracks:
-- Archagent Everlasting
+- track:archagent-everlasting
 - RollerCoaster Tycoon Theme
 Lyrics: |-
     I LOVE YOU DOGGY
@@ -265,7 +265,7 @@ Referenced Tracks:
 - track:MeGaLoVania
 - Terezi Owns
 - 'Deaf Injustice: Ignoration!!'
-- Terexi
+- track:terexi
 ---
 Track: Delfino Conflict
 Artists:
diff --git a/album/cool-and-new-volume-ii.yaml b/album/cool-and-new-volume-ii.yaml
index af80b6e..0a444c8 100644
--- a/album/cool-and-new-volume-ii.yaml
+++ b/album/cool-and-new-volume-ii.yaml
@@ -107,7 +107,7 @@ Referenced Tracks:
 - track:upward-movement-dave-owns
 - track:sburban-jungle
 - Walk-Stab-Walk (R&E)
-- Archagent Everlasting
+- track:archagent-everlasting
 Lyrics: |-
     Oh Kellogg's Fruity Pebbles are the best thing about morning
     Those colorful enchanting little specks
@@ -773,7 +773,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/25x-showdown-combo-memeless
 - https://www.youtube.com/watch?v=uM7ibMD8WbI
 Referenced Tracks:
-- 25x SHOWDOWN COMBO
+- track:25x-showdown-combo
 - English
 - Squiddles!
 - Tick
diff --git a/album/cool-and-new-volume-sx.yaml b/album/cool-and-new-volume-sx.yaml
index a06e629..7c7e506 100644
--- a/album/cool-and-new-volume-sx.yaml
+++ b/album/cool-and-new-volume-sx.yaml
@@ -562,6 +562,7 @@ Cover Artists:
 - Makin
 Art Tags:
 - Jack Noir
+- Veil
 Duration: '2:26'
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/midnight-suffer
@@ -834,15 +835,15 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/garden-of-cool-and-new
 - https://youtu.be/RieGQUhagPc
 Referenced Tracks:
-- Cascante
+- track:cascante
 - Fruity Pebbles Jingle
-- Archagent Everlasting
+- track:archagent-everlasting
 - Unity of Thorns
 - track:penumbra-phantasm
 - RollerCoaster Tycoon Theme
 - Meet the Flintstones
 - Fighting Spirit
-- Terexi
+- track:terexi
 - Tick
 - Tock
 - Lord Spanish
@@ -857,9 +858,9 @@ Referenced Tracks:
 - Madame Controversielle
 - Adventure Into The Unknown
 - Smackdown
-- Umbrella Tomato
+- track:umbrella-tomato
 - 'Deaf Injustice: Ignoration!!'
-- Timestop
+- track:timestop
 - Tick Tock Comes the Bad Wolf
 ---
 Track: the maymay sonb
@@ -1904,13 +1905,13 @@ Referenced Tracks:
 - Flare
 - Aggrievance
 - track:revelawesome
-- Terexi
+- track:terexi
 Sampled Tracks:
 - track:chorale-for-jaspers
 - Flare
 - Aggrievance
 - track:revelawesome
-- Terexi
+- track:terexi
 ---
 Track: Bro - Gameabout
 Artists:
@@ -2096,13 +2097,13 @@ URLs:
 Referenced Tracks:
 - 'Jungle #3'
 - Tock
-- Archagent Everlasting
+- track:archagent-everlasting
 - licord nacrasty
 - track:black
 - track:sburban-jungle
 - CONTACT
 - Descend
-- Dr. Pepper
+- track:dr-pepper
 - Ruins (With Strings)
 - 'Deaf Injustice: Ignoration!!'
 - Oppa Toby Style
diff --git a/album/cyclica.yaml b/album/cyclica.yaml
index d2b4d0d..ca2589e 100644
--- a/album/cyclica.yaml
+++ b/album/cyclica.yaml
@@ -73,7 +73,7 @@ Art Tags:
 Referenced Tracks:
 - Cascade (Beta)
 - 'femorafreack: invesetigat'
-- Archagent Everlasting
+- track:archagent-everlasting
 - The Lemonsnout Turnabout
 - RollerCoaster Tycoon Theme
 - track:penumbra-phantasm
diff --git a/album/lofam4.yaml b/album/lofam4.yaml
index 921f891..ca1dabf 100644
--- a/album/lofam4.yaml
+++ b/album/lofam4.yaml
@@ -235,7 +235,7 @@ Art Tags:
 - Jack Noir
 - LoTaK
 Referenced Tracks:
-- Midnight Suffer
+- track:midnight-suffer
 - Liquid Negrocity
 - Amen, Brother
 Commentary: |-
@@ -246,8 +246,8 @@ Commentary: |-
     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.
 ---
 Track: Dersite
-Artists:
-- Aris Martinian
+Directory: dersite-lofam4
+Originally Released As: track:dersite
 Duration: '1:51'
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/dersite
@@ -257,12 +257,6 @@ Cover Artists:
 Art Tags:
 - Carapacians
 - Derse
-Referenced Tracks:
-- Flare
-- English
-- Derse Dreamers
-- Cascade (Beta)
-- Courser
 Commentary: |-
     <i>Aris Martinian:</i>
     I'm actually not a huge fan of this song. See, I more or less made the whole album Cyclica in a couple of days, and this short "here are a bunch of melodies over the Flare arpeggios" only took me an huor or two. I really think there are parts of Cyclica that are better (if you haven't listened to Cyclica yet, you should do that; you can find the full album <a href="https://www.youtube.com/watch?v=ME3r64_NsnM">on YouTube</a>). A bunch of people seemed to like Dersite, and it made it onto Cool and New Greatest Hits, so here it is I guess. The violin note holds are unrealistic, the synth is weird as fuck, the piano is bad. But everyone liked it. Except for Veri. Veri didn't like it. Bless you Veri.
@@ -2904,7 +2898,7 @@ Referenced Tracks:
 - Ascend
 - track:MeGaLoVania
 - Moshi Moshi?
-- Unintentional Touhou
+- track:unintentional-touhou
 - CONTACT
 - track:upward-movement-dave-owns
 - track:formation
diff --git a/album/lofam5.yaml b/album/lofam5.yaml
index 5f87d79..c88fde0 100644
--- a/album/lofam5.yaml
+++ b/album/lofam5.yaml
@@ -84,7 +84,7 @@ Referenced Tracks:
 - track:in-the-beginning-canwc
 - Muse of Nanchos
 - track:aggrieve
-- Midnight Suffer
+- track:midnight-suffer
 - RollerCoaster Tycoon Theme
 - Unintentional Anime (Piano Version)
 Sampled Tracks:
@@ -909,7 +909,7 @@ Art Tags:
 - John
 - Green Sun
 Referenced Tracks:
-- A Very "O" Christmas
+- track:a-very-o-christmas
 Commentary: |-
     <i>Gryotharian:</i>
     Some sort of interpretation of Doc Scratch's manipulations, causing the heroes to create the green sun.
@@ -1191,7 +1191,7 @@ Referenced Tracks:
 - Moonsetter
 - Slamdown
 - Mayorlovania
-- Cascante
+- track:cascante
 - Even in Death
 - Pumpkin Party in Sea Hitler's Water Apocalypse
 - track:showtime-original-mix
@@ -1257,7 +1257,7 @@ Referenced Tracks:
 - The Lyrist
 - Reverie
 - track:carne-vale
-- Archagent Everlasting
+- track:archagent-everlasting
 Sampled Tracks:
 - Let the Squiddles Sleep (End Theme)
 - Mayor Maynot
diff --git a/album/more-homestuck-fandom.yaml b/album/more-homestuck-fandom.yaml
index 055f12a..7e54691 100644
--- a/album/more-homestuck-fandom.yaml
+++ b/album/more-homestuck-fandom.yaml
@@ -1388,7 +1388,6 @@ Referenced Tracks:
 - Gunshow 2 Theme (Instrumental)
 Lyrics: |-
     (The year is 2020. President Trump has led our nation into one of the worst econonic recessions in the history of the Earth. Imigrants are pouring through the southern border. Just look at that chaos! If you thought the econony was bad with Obana in charge, think again! And not only has Trump destroyed the country, but he's running for re-election! His challenger? Representative Cory Booker from New Jersey. It's up to the intrepid Jhon Ebgret to make his way to the White House and assassinate the president, evil Trump, so that he can finally have Cory in the House! Is he a bad enough dude to off the President of the United States himself? Don't turn that dial! It's... CANWAVE TWOOOOOO!)
-
 ---
 Track: its time
 Artists:
@@ -1417,15 +1416,6 @@ URLs:
 Referenced Tracks:
 - its time
 ---
-Track: Ultralovania
-Artists:
-- Noisemaker
-Duration: '2:41'
-URLs:
-- https://coolandnewwebcomic.bandcamp.com/track/ultralovania
-Referenced Tracks:
-- track:megalovania-halloween
----
 Track: Unintentional Anime (Piano Version)
 Artists:
 - dbnet18
@@ -1434,7 +1424,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/unintentional-anime-piano-version
 - https://www.youtube.com/watch?v=2oKi4oxr2KU
 Referenced Tracks:
-- Unintentional Touhou
+- track:unintentional-touhou
 ---
 Track: when you are old
 Directory: when-you-are-old-canwc
diff --git a/album/of-troles-and-chiptumes.yaml b/album/of-troles-and-chiptumes.yaml
index 80c435e..a1158dd 100644
--- a/album/of-troles-and-chiptumes.yaml
+++ b/album/of-troles-and-chiptumes.yaml
@@ -288,7 +288,7 @@ Referenced Tracks:
 - Rex Duodecim Angelus
 - 'My Little Pony: Friendship is Magic Theme'
 - Karkat's Theme
-- Archagent Everlasting
+- track:archagent-everlasting
 - track:atomyk-ebonpyre
 - Terezi's Theme
 - justice must be a serve
diff --git a/album/sburban-neighborhood.yaml b/album/sburban-neighborhood.yaml
index 165d69b..4eb2777 100644
--- a/album/sburban-neighborhood.yaml
+++ b/album/sburban-neighborhood.yaml
@@ -411,7 +411,7 @@ Referenced Tracks:
 - track:MeGaLoVania
 - track:doctor
 - track:penumbra-phantasm
-- Terexi
+- track:terexi
 Commentary: |-
     <i>YoItsCro:</i>
     Featuring 40 references and motifs!
diff --git a/artists.yaml b/artists.yaml
index a882a76..ceefc4c 100644
--- a/artists.yaml
+++ b/artists.yaml
@@ -1343,6 +1343,8 @@ Artist: Danny Elfman
 ---
 Artist: Dante Basco
 ---
+Artist: Dap
+---
 Artist: Daria
 ---
 Artist: DarkHakao