23 files changed, 131 insertions, 61 deletions
diff --git a/album/basement-tale.yaml b/album/basement-tale.yaml
index 05d66281..8dd4ac9b 100644
--- a/album/basement-tale.yaml
+++ b/album/basement-tale.yaml
@@ -1,6 +1,6 @@
 Album: Basement Tale
 Date: October 15, 2016
-Date Added: August 14, 2023
+Date Added: August 18, 2023
 Artists:
 - Cecily Renns
 URLs:
diff --git a/album/c-a-n-w-a-v-e.yaml b/album/c-a-n-w-a-v-e.yaml
index c0650c5d..fdca569a 100644
--- a/album/c-a-n-w-a-v-e.yaml
+++ b/album/c-a-n-w-a-v-e.yaml
@@ -1,7 +1,7 @@
 Album: C A N W A V E
 Directory: canwave
 Date: October 10, 2016
-Date Added: August 13, 2023
+Date Added: August 18, 2023
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/album/c-a-n-w-a-v-e
 - https://www.youtube.com/playlist?list=PLMXVVm-BDvr_AQ9lFA2Nx50aylTvSz-6z
diff --git a/album/call-and-new.yaml b/album/call-and-new.yaml
index e088b99c..e3a5138e 100644
--- a/album/call-and-new.yaml
+++ b/album/call-and-new.yaml
@@ -1,6 +1,6 @@
 Album: call and new
 Date: September 23, 2016, 12:00:02
-Date Added: August 10, 2023
+Date Added: August 18, 2023
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/album/call-and-new
 - https://www.youtube.com/playlist?list=PLMXVVm-BDvr8x2a7395wWFEW0ZCpHWDyj
diff --git a/album/canwc-for-the-holidays.yaml b/album/canwc-for-the-holidays.yaml
index 7a2f2dd7..fb07fb68 100644
--- a/album/canwc-for-the-holidays.yaml
+++ b/album/canwc-for-the-holidays.yaml
@@ -1,6 +1,6 @@
 Album: CANWC for the Holidays
 Date: October 30, 2016, 12:01 AM
-Date Added: August 16, 2023
+Date Added: August 18, 2023
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/album/canwc-for-the-holidays
 - https://www.youtube.com/playlist?list=PLMXVVm-BDvr9R-ofsLG-ztzOmqYlOZlmW
@@ -446,6 +446,8 @@ Cover Artists:
 Art Tags:
 - Tavros
 - Terezi
+- 'cw: corpse'
+- 'cw: blood (abstract)'
 Duration: '02:16'
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/snowallavania
diff --git a/album/canwc-sound-test-1.yaml b/album/canwc-sound-test-1.yaml
index a2586c3b..b64831d7 100644
--- a/album/canwc-sound-test-1.yaml
+++ b/album/canwc-sound-test-1.yaml
@@ -1,7 +1,7 @@
 Album: 'CaNWC Sound Test Vol.1: REVENGE OF THE GIIVASUNNER'
 Directory: canwc-sound-test-1
 Date: September 23, 2016, 12:00:04
-Date Added: August 12, 2023
+Date Added: August 18, 2023
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/album/canwc-sound-test-vol-1-revenge-of-the-giivasunner
 - https://www.youtube.com/playlist?list=PLMXVVm-BDvr--0O6Qy5O5cf6KrbaTPsff
diff --git a/album/carne-vale-fusion-collab.yaml b/album/carne-vale-fusion-collab.yaml
index b65ed8f4..43df8d38 100644
--- a/album/carne-vale-fusion-collab.yaml
+++ b/album/carne-vale-fusion-collab.yaml
@@ -1,6 +1,6 @@
 Album: Carne Vale Fusion Collab
 Date: October 25, 2016
-Date Added: August 15, 2023
+Date Added: August 18, 2023
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/carne-vale-fusion-collab
 - https://www.youtube.com/watch?v=BcV3FcAgROI
diff --git a/album/cool-and-new-greatest-hits.yaml b/album/cool-and-new-greatest-hits.yaml
index c1bb3809..315d2524 100644
--- a/album/cool-and-new-greatest-hits.yaml
+++ b/album/cool-and-new-greatest-hits.yaml
@@ -1,10 +1,10 @@
 Album: Cool and New Greatest Hits
 Date: November 6, 2016
-Date Added: August 16, 2016
+Date Added: August 18, 2023
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/album/cool-and-new-greatest-hits
 Cover Artists:
-- Angela Sham
+- Aryll
 Art Tags:
 - Rose
 - Hecka Jef
@@ -13,6 +13,11 @@ Art Tags:
 - John
 Cover Art File Extension: png
 Track Art File Extension: png
+Wallpaper File Extension: png
+Wallpaper Artists:
+- Aryll
+- Niklink (edits for wiki)
+Wallpaper Style: 'opacity: 0.6;'
 Color: '#b536da'
 Groups:
 - Cool and New Music Team
@@ -289,6 +294,7 @@ Art Tags:
 - Rose
 - Hecka Jef
 - Hella Jeff
+- 'cw: cops'
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/feel-good-2
 - https://www.youtube.com/watch?v=B2myDAap5GI
diff --git a/album/cool-and-new-volume-7.yaml b/album/cool-and-new-volume-7.yaml
index 0415007f..b271cbfd 100644
--- a/album/cool-and-new-volume-7.yaml
+++ b/album/cool-and-new-volume-7.yaml
@@ -1,7 +1,7 @@
 Album: 'COOL AND NEW Volume 7: At the Price of $104.13'
 Directory: cool-and-new-volume-7
 Date: October 15, 2016
-Date Added: August 14, 2023
+Date Added: August 18, 2023
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/album/cool-and-new-volume-7-at-the-price-of-10413
 - https://www.youtube.com/playlist?list=PLrF40eVdI4_v1GAlNHMwCWp9dphdV0j9P
diff --git a/album/cool-and-new-volume-sx.yaml b/album/cool-and-new-volume-sx.yaml
index ba2934f8..5b408746 100644
--- a/album/cool-and-new-volume-sx.yaml
+++ b/album/cool-and-new-volume-sx.yaml
@@ -1,7 +1,7 @@
 Album: 'cool and new volume s*x: hair transplant'
 Directory: cool-and-new-volume-sx
 Date: September 23, 2016, 12:00:03
-Date Added: August 11, 2023
+Date Added: August 18, 2023
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/album/cool-and-new-volume-s-x-hair-transplant
 - https://www.youtube.com/playlist?list=PLMXVVm-BDvr_mA0qhPRoet8TZmvw7asTP
diff --git a/album/crossmound-vol-1.yaml b/album/crossmound-vol-1.yaml
index 8e1a7055..fed43586 100644
--- a/album/crossmound-vol-1.yaml
+++ b/album/crossmound-vol-1.yaml
@@ -1,5 +1,6 @@
 Album: Crossmound Vol. 1
 Date: March 23, 2023
+Date Added: August 18, 2023
 Color: '#f2d00e'
 Cover Artists:
 - GHSTHRLQN
diff --git a/album/cyber-city-sound-pak.yaml b/album/cyber-city-sound-pak.yaml
index 0cf9c828..e26ebc2f 100644
--- a/album/cyber-city-sound-pak.yaml
+++ b/album/cyber-city-sound-pak.yaml
@@ -2,7 +2,7 @@ Album: CYBER CITY SOUND PAK
 Artists:
 - Cristata
 Date: August 4, 2023
-Date Added: August 26, 2023
+Date Added: August 18, 2023
 URLs:
 - https://cristata.bandcamp.com/album/cyber-city-sound-pak
 Cover Artists:
diff --git a/album/gotta-hatch-em-all.yaml b/album/gotta-hatch-em-all.yaml
index 72da12ea..4b2a95c0 100644
--- a/album/gotta-hatch-em-all.yaml
+++ b/album/gotta-hatch-em-all.yaml
@@ -1,6 +1,6 @@
 Album: Gotta Hatch 'Em All!
 Date: July 22, 2023
-Date Added: August 26, 2023
+Date Added: August 18, 2023
 URLs:
 - https://sahcon.bandcamp.com/album/gotta-hatch-em-all-sahcon-2023-album
 - https://www.youtube.com/watch?v=TzdgUxWj7Tw
diff --git a/album/median.yaml b/album/median.yaml
index c0bd71e7..c9395b49 100644
--- a/album/median.yaml
+++ b/album/median.yaml
@@ -1,6 +1,6 @@
 Album: Median
 Date: November 12, 2016
-Date Added: August 16, 2023
+Date Added: August 18, 2023
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/album/median
 - https://www.youtube.com/playlist?list=PLMXVVm-BDvr-dJnICrVXKSkgrXcFj6gII
@@ -10,7 +10,15 @@ Cover Artists:
 - NyashAlex
 Cover Art File Extension: png
 Track Art File Extension: png
-Color: '#ffffff'
+Wallpaper File Extension: png
+Wallpaper Artists:
+- NyashAlex
+- Niklink (edits for wiki)
+Wallpaper Style: |-
+    opacity: 0.8;
+    background-repeat: repeat;
+    background-size: auto;
+Color: '#cccccc'
 Groups:
 - Cool and New Music Team
 - Fandom
diff --git a/album/oceanfables-ray-of-light.yaml b/album/oceanfables-ray-of-light.yaml
index 0fdc1ad2..2af32968 100644
--- a/album/oceanfables-ray-of-light.yaml
+++ b/album/oceanfables-ray-of-light.yaml
@@ -2,7 +2,7 @@ Album: 'Oceanfables: Ray of Light'
 Artists:
 - Ray "TheRadGuy" Mikey
 Date: March 18, 2022
-Date Added: August 26, 2023
+Date Added: August 18, 2023
 URLs:
 - https://nightslights.bandcamp.com/album/oceanfables-ray-of-light
 - https://www.youtube.com/watch?v=O_yN3ORNqI4
diff --git a/album/oceanfalls-vol-4.yaml b/album/oceanfalls-vol-4.yaml
index fd66efa4..1cc2c4da 100644
--- a/album/oceanfalls-vol-4.yaml
+++ b/album/oceanfalls-vol-4.yaml
@@ -1,6 +1,6 @@
 Album: Oceanfalls Vol. 4
 Date: January 25, 2023
-Date Added: August 26, 2023
+Date Added: August 18, 2023
 URLs:
 - https://nightslights.bandcamp.com/album/oceanfalls-vol-4
 - https://www.youtube.com/watch?v=FCYAQhBv0kE
diff --git a/album/oceanfalls-vol-five.yaml b/album/oceanfalls-vol-five.yaml
index 048495eb..1027ac7a 100644
--- a/album/oceanfalls-vol-five.yaml
+++ b/album/oceanfalls-vol-five.yaml
@@ -1,6 +1,6 @@
 Album: Oceanfalls Vol. Five
 Date: May 17, 2023
-Date Added: Auguest 26, 2023
+Date Added: August 18, 2023
 URLs:
 - https://nightslights.bandcamp.com/album/oceanfalls-vol-five
 - https://www.youtube.com/watch?v=V4Jr3MlfWA4
diff --git a/album/references-beyond-homestuck.yaml b/album/references-beyond-homestuck.yaml
index a258895a..4c8f6dd8 100644
--- a/album/references-beyond-homestuck.yaml
+++ b/album/references-beyond-homestuck.yaml
@@ -2614,10 +2614,11 @@ Referenced Tracks:
 ---
 Track: Space Pirates
 Artists:
+- Castle Crashers
 - Waterflame
-Duration: '2:45'
+Duration: '2:59'
 URLs:
-- https://www.youtube.com/watch?v=Cu7HaeRHMhM
+- https://waterflame.bandcamp.com/track/space-pirates
 ---
 Track: Splatoon "Squid Kid" TV Commercial
 # This is a TV ad.
@@ -6898,12 +6899,6 @@ Artists:
 URLs:
 - https://www.youtube.com/watch?v=kLp_Hh6DKWc
 ---
-Track: It's Beginning to Look a Lot Like Christmas
-Artists:
-- Meredith Willson
-URLs:
-- https://www.youtube.com/watch?v=aiQh7ir0TXI
----
 Track: Johnny Fill Up the Bowl
 Artists:
 - Traditional
@@ -8065,40 +8060,40 @@ Artists:
 URLs:
 - https://www.youtube.com/watch?v=jBwL3y-Wlms
 Lyrics: |-
-    We Three Kings of Orient are,
-    Bearing gifts we traverse afar,
-    Field and fountain,
-    Moor and mountain,
-    Following yonder Star.
-
-    O Star of Wonder, Star of Night,
-    Star with Royal Beauty bright,
-    Westward leading,
-    Still proceeding,
-    Guide us to Thy perfect Light.
-
-    Born a King on Bethlehem plain,
-    Gold I bring to crown Him again,
-    King for ever,
+    We Three Kings of Orient are
+    Bearing gifts we traverse afar
+    Field and fountain
+    Moor and mountain
+    Following yonder Star
+
+    O Star of Wonder, Star of Night
+    Star with Royal Beauty bright
+    Westward leading
+    Still proceeding
+    Guide us to Thy perfect Light
+
+    Born a King on Bethlehem plain
+    Gold I bring to crown Him again
+    King for ever
     Ceasing never
-    Over us all to reign.
+    Over us all to reign
 
-    Frankincense to offer have I,
-    Incense owns a Deity nigh:
+    Frankincense to offer have I
+    Incense owns a Deity nigh
     Prayer and praising
-    All men raising,
-    Worship Him God on High.
+    All men raising
+    Worship Him God on High
 
     Myrrh is mine; its bitter perfume
-    Breathes a life of gathering gloom;—
-    Sorrowing, sighing,
-    Bleeding, dying,
-    Sealed in the stone-cold tomb.
+    Breathes a life of gathering gloom
+    Sorrowing, sighing
+    Bleeding, dying
+    Sealed in the stone-cold tomb
 
-    Glorious now behold Him arise,
-    King, and God, and Sacrifice;
-    Heav'n sings Hallelujah:
-    Hallelujah the earth replies.
+    Glorious now behold Him arise
+    King, and God, and Sacrifice
+    Heav'n sings Hallelujah
+    Hallelujah the earth replies
 ---
 Track: Westminister Quarters
 Artists:
@@ -12682,6 +12677,53 @@ Lyrics: |-
 
     (Thanks, Lori.)
 ---
+Track: It's Beginning to Look a Lot Like Christmas
+Artists:
+- Meredith Willson
+URLs:
+- https://www.youtube.com/watch?v=KmddeUJJEuU
+Lyrics: |-
+    It's beginning to look a lot like Christmas
+    Everywhere you go
+    Take a look in the five and ten, glistening once again
+    With candy canes and silver lanes aglow
+
+    It's beginning to look a lot like Christmas
+    Toys in every store
+    But the prettiest sight to see is the holly that will be
+    On your own front door
+
+    A pair of Hop-a-long boots and a pistol that shoots
+    Is the wish of Barney and Ben
+    Dolls that will talk and will go for a walk
+    Is the hope for Janice and Jen
+    And Mom and Dad can hardly wait for school to start again
+
+    It's beginning to look a lot like Christmas
+    Everywhere you go
+    Now there's a tree in the Grand Hotel, one in the park as well
+    The sturdy kind that doesn't mind the snow
+
+    It's beginning to look a lot like Christmas
+    Soon the bells will start
+    And the thing that will make 'em ring is the carol that you sing
+    Right within your heart
+
+    A pair of Hop-a-long boots and a pistol that shoots
+    Is the wish of Barney and Ben
+    Dolls that will talk and will go for a walk
+    Is the hope for Janice and Jen
+    And Mom and Dad can hardly wait for school to start again
+    Haah aha aha aha aha aha aha!
+
+    It's beginning to look a lot like Christmas
+    Soon the bells will start
+    And the thing that will make 'em ring is the carol that you sing
+    Right within your heart
+Commentary: |-
+    <i>Niklink:</i>
+    Originally titled 'It's Beginning to Look Like Christmas'.
+---
 Track: Isle Unto Thyself
 Artists:
 - Miracle Musical
diff --git a/album/s-hecka-jef.yaml b/album/s-hecka-jef.yaml
index db66a31d..5f986f2f 100644
--- a/album/s-hecka-jef.yaml
+++ b/album/s-hecka-jef.yaml
@@ -1,7 +1,7 @@
 Album: s]hecka jef
 Directory: 's-hecka-jef'
 Date: October 30, 2016
-Date Added: August 15, 2023
+Date Added: August 18, 2023
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/album/s-hecka-jef
 - https://www.youtube.com/playlist?list=PLMXVVm-BDvr-F8SqOY64tdDaM9GI7pz3y
diff --git a/album/spelunky-classic.yaml b/album/spelunky-classic.yaml
index 8b400b39..2ddfdb9e 100644
--- a/album/spelunky-classic.yaml
+++ b/album/spelunky-classic.yaml
@@ -1,5 +1,6 @@
 Album: Spelunky Classic
 Date: December 21, 2008
+Date Added: August 18, 2023
 Color: '#c7ac92'
 URLs:
 - https://www.youtube.com/watch?v=jDG1moK6SCI
diff --git a/album/vast-error-vol-1-3.yaml b/album/vast-error-vol-1-3.yaml
index 45487d30..bbdfc1d5 100644
--- a/album/vast-error-vol-1-3.yaml
+++ b/album/vast-error-vol-1-3.yaml
@@ -1,8 +1,8 @@
 Album: Vast Error Vol. 1-3
 Directory: vast-error-vol-1-3
 Date: June 1, 2021
-Date Added: August 13, 2023
-Wallpaper Style: 'opacity: 0.90;'
+Date Added: August 18, 2023
+Wallpaper Style: 'opacity: 0.85;'
 Wallpaper File Extension: png
 Wallpaper Artists:
 - Vast Error
diff --git a/artists.yaml b/artists.yaml
index 56685262..86c61098 100644
--- a/artists.yaml
+++ b/artists.yaml
@@ -898,6 +898,8 @@ Artist: Carole Bayer Sager
 ---
 Artist: Casey Lee Williams
 ---
+Artist: Castle Crashers
+---
 Artist: Castlevania
 ---
 Artist: Casual Sunday
@@ -5946,6 +5948,10 @@ URLs:
 - https://soundcloud.com/user-98942170
 ---
 Artist: Waterflame
+Aliases:
+- Matthew Harwood
+URLs:
+- https://waterflame.bandcamp.com/
 ---
 Artist: Wayne Sharpe
 ---
diff --git a/homepage.yaml b/homepage.yaml
index 46cca257..18091117 100644
--- a/homepage.yaml
+++ b/homepage.yaml
@@ -43,14 +43,15 @@ Albums:
 - album:oceanfalls-vol-4
 - album:oceanfalls-vol-five
 
+- album:cool-and-new-greatest-hits
+- album:crossmound-vol-1
+- album:spelunky-classic
+
 - album:call-and-new
 - album:cool-and-new-volume-sx
-- album:canwc-sound-test-1
 - album:canwave
 - album:basement-tale
 - album:cool-and-new-volume-7
 - album:carne-vale-fusion-collab
 - album:s-hecka-jef
-
-- album:crossmound-vol-1
-- album:spelunky-classic
+- album:median
\ No newline at end of file
diff --git a/static-page/changelog.yaml b/static-page/changelog.yaml
index 6c86861f..e2637dd5 100644
--- a/static-page/changelog.yaml
+++ b/static-page/changelog.yaml
@@ -77,7 +77,7 @@ Content: |-
         - added [[album:oceanfables-ray-of-light]] by [[artist:ray-theradguy-mikey]]!
         - added [[album:oceanfalls-vol-4]]!
         - added [[album:oceanfalls-vol-five]]!
-    - added eight albums from [[group:canmt]]! (thanks, Makin!)
+    - added ELEVEN albums from [[group:canmt]]! (thanks, Makin!)
         - added [[album:call-and-new]]!
         - added [[album:cool-and-new-volume-sx]]!
         - added [[album:canwc-sound-test-1]]!
@@ -86,6 +86,9 @@ Content: |-
         - added [[album:cool-and-new-volume-7]]!
         - added [[album:carne-vale-fusion-collab]]!
         - added [[album:s-hecka-jef]]!
+        - added [[album:canwc-for-the-holidays]]!
+        - added [[album:cool-and-new-greatest-hits]]!
+        - added [[album:median]]!
     - added [[album:gotta-hatch-em-all]] from [[group:stuck-at-home-con]]!
     - added [[album:vast-error-vol-1-3]] from [[group:deconreconstruction]]! (thanks, koba!)
     - added [[album:crossmound-vol-1]]!