Merge remote-tracking branch 'origin/preview' into makin/canwc

1 files changed, 8 insertions, 8 deletions

diff --git a/album/cool-and-new-volume-7.yaml b/album/cool-and-new-volume-7.yaml
index 80f25514..aec2ad08 100644
--- a/album/cool-and-new-volume-7.yaml
+++ b/album/cool-and-new-volume-7.yaml
@@ -54,7 +54,7 @@ URLs:
 Referenced Tracks:
 - track:disk1-lofam2
 Commentary: |-
-    <i>Makin:</i>
+    <i>Makin:</i> (team manager)
     I believe the art for this was submitted by an anonymous artist in 2012, intended to be the album art for [[album:lofam2]]. It instantly became a meme due to its outside artist-esque look. 
     The letters were added by a different artist, also lost to time.
 ---
@@ -106,7 +106,7 @@ URLs:
 Referenced Tracks:
 - Showtime (Original Mix)
 - Heartache
-- track:penumbra-phantasm
+- Penumbra Phantasm
 ---
 Track: Ocean Coasters Crashing
 Artists:
@@ -173,7 +173,7 @@ URLs:
 - https://youtu.be/vMnSL44GPAQ
 Referenced Tracks:
 - The Masked King
-- track:penumbra-phantasm
+- Penumbra Phantasm
 ---
 Track: Youth Stone
 Artists:
@@ -270,7 +270,7 @@ URLs:
 Referenced Tracks:
 - 'BL1ND JUST1C3 : 1NV3ST1G4T1ON !!'
 - Rex Duodecim Angelus
-- track:penumbra-phantasm
+- Penumbra Phantasm
 - track:MeGaLoVania
 - Terezi Owns
 - 'Deaf Injustice: Ignoration!!'
@@ -289,7 +289,7 @@ Referenced Tracks:
 - track:conflict
 - Delfino Plaza
 Commentary: |-
-    <i>Makin:</i>
+    <i>Makin:</i> (team manager)
     Not to be confused with [[track:conflicto-plaza]]
 ---
 Track: A Comprehensive Summary of Jaek Spanish
@@ -418,7 +418,7 @@ Lyrics: |-
     (Aw yeah. I'm having SO MUCH FUN. This is like a slumber party where there's nothing to do but play games ALL NIGHT LONG. Oh yeah, and NO BOYS ALLOWED. Not that I care - I can beat any boy at any game, any time, anywhere!)
     Puzzle games, fighting games, action, rpg<br>Shoot 'em ups, beat 'em ups, virtual reality<br>Dating sims, flight sims, CD-rom or console<br>Handheld, arcade, tabletopping oldschool<br>Turn-based, card-based, tactical, strategy<br>Text-based adventure, point-and-click mystery<br>FPS, racers, platforms, rhythm games<br>She's the bomb at anything you can name!
 Commentary: |-
-    <i>Makin:</i>
+    <i>Makin:</i> (team manager)
     Not to be confused with [[track:toongrl]]
 ---
 Track: Yu-Gi-Bro
@@ -497,7 +497,7 @@ URLs:
 Referenced Tracks:
 - track:conflict
 Commentary: |-
-    <i>Makin:</i>
+    <i>Makin:</i> (team manager)
     This track was originally named "licensed under a cc-by-nc-sa Creative Commons License" but the subject of parody complained.
     See also: [[track:confliction]]
 ---
@@ -926,7 +926,7 @@ Referenced Tracks:
 - Explore
 - Doctor
 - Sweet Bro Theme Song
-- track:penumbra-phantasm
+- Penumbra Phantasm
 - track:MeGaLoVania
 - Aggrieve
 - The Nutshack Intro